nilsteampassnet / TeamPass

includes/libraries/phpcrypt/phpCrypt.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     // The source of random data used to create keys and IV's
     // Used for PHP_Crypt::createKey(), PHP_Crypt::createIV()
     const RAND = "rand"; // uses mt_rand(), windows & unix
-    const RAND_DEV_RAND	= "/dev/random"; // unix only
+    const RAND_DEV_RAND = "/dev/random"; // unix only
     const RAND_DEV_URAND = "/dev/urandom"; // unix only
     const RAND_WIN_COM = "wincom"; // windows only, COM extension
     const RAND_DEFAULT_SZ = 32; // the default number of bytes returned

includes/libraries/phpcrypt/modes/CBC.php

Braces +9 added lines, -6 removed lines

@@ -48,8 +48,9 @@ 
         parent::__construct(PHP_Crypt::MODE_CBC, $cipher);
 
         // this works with only block Ciphers
-        if ($cipher->type() != Cipher::BLOCK)
-            trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
+        if ($cipher->type() != Cipher::BLOCK) {
+                    trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
+        }
     }
 
 
@@ -92,8 +93,9 @@ 
             $block = substr($text, $pos, $blocksz);
 
             // xor the block with the register
-            for ($j = 0; $j < $blocksz; ++$j)
-                $block[$j] = $block[$j] ^ $this->register[$j];
+            for ($j = 0; $j < $blocksz; ++$j) {
+                            $block[$j] = $block[$j] ^ $this->register[$j];
+            }
 
             // encrypt the block, and save it back to the register
             $this->cipher->encrypt($block);
@@ -139,8 +141,9 @@ 
             $this->cipher->decrypt($block);
 
             // xor the block with the register
-            for ($j = 0; $j < $blocksz; ++$j)
-                $block[$j] = $block[$j] ^ $this->register[$j];
+            for ($j = 0; $j < $blocksz; ++$j) {
+                            $block[$j] = $block[$j] ^ $this->register[$j];
+            }
 
             // replace the block of cipher text with plain text
             $text = substr_replace($text, $block, $pos, $blocksz);

includes/libraries/phpcrypt/modes/NCFB.php

Braces +15 added lines, -10 removed lines

@@ -48,8 +48,9 @@ 
         parent::__construct(PHP_Crypt::MODE_NCFB, $cipher);
 
         // this works with only block Ciphers
-        if ($cipher->type() != Cipher::BLOCK)
-            trigger_error("NCFB mode requires a block cipher", E_USER_WARNING);
+        if ($cipher->type() != Cipher::BLOCK) {
+                    trigger_error("NCFB mode requires a block cipher", E_USER_WARNING);
+        }
     }
 
 
@@ -88,8 +89,9 @@ 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
 
-            if (($pos + $byte_len) > $len)
-                $byte_len -= ($pos + $byte_len) - $len;
+            if (($pos + $byte_len) > $len) {
+                            $byte_len -= ($pos + $byte_len) - $len;
+            }
 
             // encrypt the register
             $this->enc_register = $this->register;
@@ -99,8 +101,9 @@ 
             $block = substr($text, $pos, $byte_len);
 
             // xor the block
-            for ($j = 0; $j < $byte_len; ++$j)
-                $block[$j] = $block[$j] ^ $this->enc_register[$j];
+            for ($j = 0; $j < $byte_len; ++$j) {
+                            $block[$j] = $block[$j] ^ $this->enc_register[$j];
+            }
 
             // replace the plain text block with the encrypted block
             $text = substr_replace($text, $block, $pos, $byte_len);
@@ -135,8 +138,9 @@ 
 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
-            if (($pos + $byte_len) > $len)
-                $byte_len -= ($pos + $byte_len) - $len;
+            if (($pos + $byte_len) > $len) {
+                            $byte_len -= ($pos + $byte_len) - $len;
+            }
 
             // encrypt the register
             $this->enc_register = $this->register;
@@ -147,8 +151,9 @@ 
             $this->register = $block;
 
             // xor the block
-            for ($j = 0; $j < $byte_len; ++$j)
-                $block[$j] = $block[$j] ^ $this->enc_register[$j];
+            for ($j = 0; $j < $byte_len; ++$j) {
+                            $block[$j] = $block[$j] ^ $this->enc_register[$j];
+            }
 
             // replace the encrypted block with the plain text block
             $text = substr_replace($text, $block, $pos, $byte_len);

includes/libraries/phpcrypt/modes/OFB.php

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
         parent::__construct(PHP_Crypt::MODE_OFB, $cipher);
 
         // this works with only block Ciphers
-        if ($cipher->type() != Cipher::BLOCK)
-            trigger_error("OFB mode requires a block cipher", E_USER_WARNING);
+        if ($cipher->type() != Cipher::BLOCK) {
+                    trigger_error("OFB mode requires a block cipher", E_USER_WARNING);
+        }
     }
 
 

includes/libraries/phpcrypt/modes/ECB.php

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
         parent::__construct(PHP_Crypt::MODE_ECB, $cipher);
 
         // this works with only block Ciphers
-        if ($cipher->type() != Cipher::BLOCK)
-            trigger_error("ECB mode requires a block cipher", E_USER_WARNING);
+        if ($cipher->type() != Cipher::BLOCK) {
+                    trigger_error("ECB mode requires a block cipher", E_USER_WARNING);
+        }
     }
 
 

includes/libraries/phpcrypt/modes/CFB.php

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
         parent::__construct(PHP_Crypt::MODE_CFB, $cipher);
 
         // this works with only block Ciphers
-        if ($cipher->type() != Cipher::BLOCK)
-            trigger_error("CFB mode requires a block cipher", E_USER_WARNING);
+        if ($cipher->type() != Cipher::BLOCK) {
+                    trigger_error("CFB mode requires a block cipher", E_USER_WARNING);
+        }
     }
 
 

includes/libraries/phpcrypt/modes/Stream.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
         parent::__construct1(PHP_Crypt::MODE_STREAM, $cipher);
 
         // this works with only stream Ciphers
-        if ($cipher->type() != Cipher::STREAM)
-            trigger_error("Stream mode requires a stream cipher", E_USER_WARNING);
+        if ($cipher->type() != Cipher::STREAM) {
+                    trigger_error("Stream mode requires a stream cipher", E_USER_WARNING);
+        }
     }
 
 

includes/libraries/phpcrypt/modes/PCBC.php

Braces +15 added lines, -10 removed lines

@@ -48,8 +48,9 @@ 
         parent::__construct(PHP_Crypt::MODE_PCBC, $cipher);
 
         // this works with only block Ciphers
-        if ($cipher->type() != Cipher::BLOCK)
-            trigger_error("PCBC mode requires a block cipher", E_USER_WARNING);
+        if ($cipher->type() != Cipher::BLOCK) {
+                    trigger_error("PCBC mode requires a block cipher", E_USER_WARNING);
+        }
     }
 
 
@@ -86,16 +87,18 @@ 
             $plain_block = $block;
 
             // xor the register with plain text
-            for ($j = 0; $j < $blocksz; ++$j)
-                $block[$j] = $this->register[$j] ^ $block[$j];
+            for ($j = 0; $j < $blocksz; ++$j) {
+                            $block[$j] = $this->register[$j] ^ $block[$j];
+            }
 
             // encrypt the block creating the cipher text
             $this->cipher->encrypt($block);
 
             // xor the encrypted block with the plain text block to create
             // the register in the next round
-            for ($j = 0; $j < $blocksz; ++$j)
-                $this->register[$j] = $block[$j] ^ $plain_block[$j];
+            for ($j = 0; $j < $blocksz; ++$j) {
+                            $this->register[$j] = $block[$j] ^ $plain_block[$j];
+            }
 
             // copy the encrypted block back to $text
             $text = substr_replace($text, $block, $pos, $blocksz);
@@ -130,12 +133,14 @@ 
 
             // xor the decrypted block with the register, to create
             // the plain text block
-            for ($j = 0; $j < $blocksz; ++$j)
-                $block[$j] = $this->register[$j] ^ $block[$j];
+            for ($j = 0; $j < $blocksz; ++$j) {
+                            $block[$j] = $this->register[$j] ^ $block[$j];
+            }
 
             // now xor the $enc_block with the unencrypted $block
-            for ($j = 0; $j < $blocksz; ++$j)
-                $this->register[$j] = $block[$j] ^ $enc_block[$j];
+            for ($j = 0; $j < $blocksz; ++$j) {
+                            $this->register[$j] = $block[$j] ^ $enc_block[$j];
+            }
 
             // copy the plain text block back to $text
             $text = substr_replace($text, $block, $pos, $blocksz);

includes/libraries/phpcrypt/modes/NOFB.php

Braces +15 added lines, -10 removed lines

@@ -49,8 +49,9 @@ 
         parent::__construct(PHP_Crypt::MODE_NOFB, $cipher);
 
         // this works with only block Ciphers
-        if ($cipher->type() != Cipher::BLOCK)
-            trigger_error("NOFB mode requires a block cipher", E_USER_WARNING);
+        if ($cipher->type() != Cipher::BLOCK) {
+                    trigger_error("NOFB mode requires a block cipher", E_USER_WARNING);
+        }
     }
 
 
@@ -84,8 +85,9 @@ 
 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
-            if (($pos + $blocksz) > $len)
-                $byte_len -= ($pos + $blocksz) - $len;
+            if (($pos + $blocksz) > $len) {
+                            $byte_len -= ($pos + $blocksz) - $len;
+            }
 
             // encrypt the register
             $this->enc_register = $this->register;
@@ -93,8 +95,9 @@ 
 
             // now grab a block of text and a block of from the register, and XOR them
             $block = substr($text, $pos, $byte_len);
-            for ($j = 0; $j < $byte_len; ++$j)
-                $block[$j] = $block[$j] ^ $this->enc_register[$j];
+            for ($j = 0; $j < $byte_len; ++$j) {
+                            $block[$j] = $block[$j] ^ $this->enc_register[$j];
+            }
 
             // replace the plain text block with encrypted text
             $text = substr_replace($text, $block, $pos, $byte_len);
@@ -127,8 +130,9 @@ 
 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
-            if (($pos + $byte_len) > $len)
-                $byte_len -= ($pos + $byte_len) - $len;
+            if (($pos + $byte_len) > $len) {
+                            $byte_len -= ($pos + $byte_len) - $len;
+            }
 
             // encrypt the register
             $this->enc_register = $this->register;
@@ -140,8 +144,9 @@ 
 
             // now grab a block of text and xor with the register
             $block = substr($text, $pos, $byte_len);
-            for ($j = 0; $j < $byte_len; ++$j)
-                $block[$j] = $block[$j] ^ $this->enc_register[$j];
+            for ($j = 0; $j < $byte_len; ++$j) {
+                            $block[$j] = $block[$j] ^ $this->enc_register[$j];
+            }
 
             // replace the encrypted block with plain text
             $text = substr_replace($text, $block, $pos, $byte_len);