nilsteampassnet / TeamPass

includes/libraries/phpcrypt/modes/NOFB.php

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
         parent::__construct(PHP_Crypt::MODE_NOFB, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
+        if ($cipher->type() != Cipher::BLOCK)
             trigger_error("NOFB mode requires a block cipher", E_USER_WARNING);
     }
 
@@ -77,14 +77,14 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = $len / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // current position in the text
             $pos = $i * $blocksz;
 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
-            if(($pos + $blocksz) > $len)
+            if (($pos + $blocksz) > $len)
                 $byte_len -= ($pos + $blocksz) - $len;
 
             // encrypt the register
@@ -93,7 +93,7 @@ 
 
             // 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)
+            for ($j = 0; $j < $byte_len; ++$j)
                 $block[$j] = $block[$j] ^ $this->enc_register[$j];
 
             // replace the plain text block with encrypted text
@@ -120,14 +120,14 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = $len / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // current position within $text
             $pos = $i * $blocksz;
 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
-            if(($pos + $byte_len) > $len)
+            if (($pos + $byte_len) > $len)
                 $byte_len -= ($pos + $byte_len) - $len;
 
             // encrypt the register
@@ -140,7 +140,7 @@ 
 
             // now grab a block of text and xor with the register
             $block = substr($text, $pos, $byte_len);
-            for($j = 0; $j < $byte_len; ++$j)
+            for ($j = 0; $j < $byte_len; ++$j)
                 $block[$j] = $block[$j] ^ $this->enc_register[$j];
 
             // replace the encrypted block with plain text

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);

includes/libraries/phpcrypt/modes/CTR.php

Spacing +9 added lines, -9 removed lines

@@ -48,7 +48,7 @@ 
         parent::__construct(PHP_CRYPT::MODE_CTR, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
+        if ($cipher->type() != Cipher::BLOCK)
             trigger_error("CTR mode requires a block cipher", E_USER_WARNING);
     }
 
@@ -76,14 +76,14 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = $len / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // get the current position in $text
             $pos = $i * $blocksz;
 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
-            if(($pos + $byte_len) > $len)
+            if (($pos + $byte_len) > $len)
                 $byte_len -= ($pos + $byte_len) - $len;
 
             // encrypt the register
@@ -94,7 +94,7 @@ 
             $block = substr($text, $pos, $byte_len);
 
             // xor the block
-            for($j = 0; $j < $byte_len; ++$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
@@ -120,14 +120,14 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = $len / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // get the current position in $text
             $pos = $i * $blocksz;
 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
-            if(($pos + $byte_len) > $len)
+            if (($pos + $byte_len) > $len)
                 $byte_len -= ($pos + $byte_len) - $len;
 
             // encrypt the register
@@ -138,7 +138,7 @@ 
             $block = substr($text, $pos, $byte_len);
 
             // xor the block with the register (which contains the IV)
-            for($j = 0; $j < $byte_len; ++$j)
+            for ($j = 0; $j < $byte_len; ++$j)
                 $block[$j] = $block[$j] ^ $this->enc_register[$j];
 
             // replace the encrypted block with the plain text
@@ -184,11 +184,11 @@ 
 
         // starting at the last byte, loop through each byte until
         // we find one that can be incremented
-        for($i = $pos; $i >= 0; --$i)
+        for ($i = $pos; $i >= 0; --$i)
         {
             // if we reached the last byte, set it to 0x00, then
             // loop one more time to increment the next byte
-            if(ord($this->register[$i]) == 0xff)
+            if (ord($this->register[$i]) == 0xff)
                 $this->register[$i] = chr(0x00);
             else
             {

Braces +18 added lines, -13 removed lines

@@ -48,8 +48,9 @@ 
         parent::__construct(PHP_CRYPT::MODE_CTR, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
-            trigger_error("CTR mode requires a block cipher", E_USER_WARNING);
+        if($cipher->type() != Cipher::BLOCK) {
+                    trigger_error("CTR mode requires a block cipher", E_USER_WARNING);
+        }
     }
 
 
@@ -83,8 +84,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;
@@ -94,8 +96,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);
@@ -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;
@@ -138,8 +142,9 @@ 
             $block = substr($text, $pos, $byte_len);
 
             // xor the block with the register (which contains the IV)
-            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
             $text = substr_replace($text, $block, $pos, $byte_len);
@@ -188,9 +193,9 @@ 
         {
             // if we reached the last byte, set it to 0x00, then
             // loop one more time to increment the next byte
-            if(ord($this->register[$i]) == 0xff)
-                $this->register[$i] = chr(0x00);
-            else
+            if(ord($this->register[$i]) == 0xff) {
+                            $this->register[$i] = chr(0x00);
+            } else
             {
                 // now increment the byte by 1
                 $this->register[$i] = chr(ord($this->register[$i]) + 1);

includes/libraries/phpcrypt/modes/Stream.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
         parent::__construct(PHP_Crypt::MODE_PCBC, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
+        if ($cipher->type() != Cipher::BLOCK)
             trigger_error("PCBC mode requires a block cipher", E_USER_WARNING);
     }
 
@@ -76,7 +76,7 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = strlen($text) / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // current position in the text
             $pos = $i * $blocksz;
@@ -86,7 +86,7 @@ 
             $plain_block = $block;
 
             // xor the register with plain text
-            for($j = 0; $j < $blocksz; ++$j)
+            for ($j = 0; $j < $blocksz; ++$j)
                 $block[$j] = $this->register[$j] ^ $block[$j];
 
             // encrypt the block creating the cipher text
@@ -94,7 +94,7 @@ 
 
             // xor the encrypted block with the plain text block to create
             // the register in the next round
-            for($j = 0; $j < $blocksz; ++$j)
+            for ($j = 0; $j < $blocksz; ++$j)
                 $this->register[$j] = $block[$j] ^ $plain_block[$j];
 
             // copy the encrypted block back to $text
@@ -116,7 +116,7 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = strlen($text) / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // current position in the text
             $pos = $i * $blocksz;
@@ -130,11 +130,11 @@ 
 
             // xor the decrypted block with the register, to create
             // the plain text block
-            for($j = 0; $j < $blocksz; ++$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)
+            for ($j = 0; $j < $blocksz; ++$j)
                 $this->register[$j] = $block[$j] ^ $enc_block[$j];
 
             // copy the plain text block back to $text

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/OFB.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
         parent::__construct(PHP_Crypt::MODE_OFB, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
+        if ($cipher->type() != Cipher::BLOCK)
             trigger_error("OFB mode requires a block cipher", E_USER_WARNING);
     }
 
@@ -73,7 +73,7 @@ 
     public function encrypt(&$text)
     {
         $max = strlen($text);
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             $this->enc_register = $this->register;
             $this->cipher->encrypt($this->enc_register);
@@ -97,7 +97,7 @@ 
     public function decrypt(&$text)
     {
         $max = strlen($text);
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             $this->enc_register = $this->register;
             $this->cipher->encrypt($this->enc_register);

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/NCFB.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
         parent::__construct(PHP_Crypt::MODE_NCFB, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
+        if ($cipher->type() != Cipher::BLOCK)
             trigger_error("NCFB mode requires a block cipher", E_USER_WARNING);
     }
 
@@ -80,7 +80,7 @@ 
         // if $len is less than blockSize() this will still work, as even
         // a fraction is greater than 0
         $max = $len / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // current position in the text
             $pos = $i * $blocksz;
@@ -88,7 +88,7 @@ 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
 
-            if(($pos + $byte_len) > $len)
+            if (($pos + $byte_len) > $len)
                 $byte_len -= ($pos + $byte_len) - $len;
 
             // encrypt the register
@@ -99,7 +99,7 @@ 
             $block = substr($text, $pos, $byte_len);
 
             // xor the block
-            for($j = 0; $j < $byte_len; ++$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
@@ -128,14 +128,14 @@ 
         // if $len is less than blockSize() this will still work, as even
         // a fraction is greater than 0
         $max = $len / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // get the current position in text
             $pos = $i * $blocksz;
 
             // make sure we don't extend past the length of $text
             $byte_len = $blocksz;
-            if(($pos + $byte_len) > $len)
+            if (($pos + $byte_len) > $len)
                 $byte_len -= ($pos + $byte_len) - $len;
 
             // encrypt the register
@@ -147,7 +147,7 @@ 
             $this->register = $block;
 
             // xor the block
-            for($j = 0; $j < $byte_len; ++$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

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/CBC.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
         parent::__construct(PHP_Crypt::MODE_CBC, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
+        if ($cipher->type() != Cipher::BLOCK)
             trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
     }
 
@@ -83,7 +83,7 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = strlen($text) / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // get the current position in $text
             $pos = $i * $blocksz;
@@ -92,7 +92,7 @@ 
             $block = substr($text, $pos, $blocksz);
 
             // xor the block with the register
-            for($j = 0; $j < $blocksz; ++$j)
+            for ($j = 0; $j < $blocksz; ++$j)
                 $block[$j] = $block[$j] ^ $this->register[$j];
 
             // encrypt the block, and save it back to the register
@@ -126,7 +126,7 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = strlen($text) / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // get the current position in $text
             $pos = $i * $blocksz;
@@ -139,7 +139,7 @@ 
             $this->cipher->decrypt($block);
 
             // xor the block with the register
-            for($j = 0; $j < $blocksz; ++$j)
+            for ($j = 0; $j < $blocksz; ++$j)
                 $block[$j] = $block[$j] ^ $this->register[$j];
 
             // replace the block of cipher text with plain text

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/ECB.php

Indentation +101 added lines, -101 removed lines

@@ -36,106 +36,106 @@
  */
 class Mode_ECB extends Mode
 {
-	/**
-	 * Constructor
-	 * Sets the cipher object that will be used for encryption
-	 *
-	 * @param object $cipher one of the phpCrypt encryption cipher objects
-	 * @return void
-	 */
-	public function __construct($cipher)
-	{
-		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);
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypts an the entire string $plain_text using the cipher passed
-	 * to the constructor in ECB mode
-	 *
-	 * @param string $text The string to be encrypted in ECB mode
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$text)
-	{
-		$this->pad($text);
-		$blocksz = $this->cipher->blockSize();
-
-		$max = strlen($text) / $blocksz;
-		for ($i = 0; $i < $max; ++$i)
-		{
-			// get the current position within $text
-			$pos = $i * $blocksz;
-
-			// grab a block of text
-			$block = substr($text, $pos, $blocksz);
-
-			// encrypt the block
-			$this->cipher->encrypt($block);
-
-			// replace the plain text with the cipher text
-			$text = substr_replace($text, $block, $pos, $blocksz);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Decrypts an the entire string $plain_text using the cipher passed
-	 * to the constructor in ECB mode
-	 *
-	 * @param string $text The string to be decrypted in ECB mode
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$text)
-	{
-		$blocksz = $this->cipher->blockSize();
-
-		$max = strlen($text) / $blocksz;
-		for ($i = 0; $i < $max; ++$i)
-		{
-			// get the current position within $text
-			$pos = $i * $blocksz;
-
-			// get a block of cipher text
-			$block = substr($text, $pos, $blocksz);
-
-			// decrypt the block
-			$this->cipher->decrypt($block);
-
-			// replace the block of cipher text with plain text
-			$text = substr_replace($text, $block, $pos, $blocksz);
-		}
-
-		$this->strip($text);
-		return true;
-	}
-
-
-	/**
-	 * This mode does not require an IV
-	 *
-	 * @return boolean Returns false
-	 */
-	public function requiresIV()
-	{
-		return false;
-	}
+    /**
+     * Constructor
+     * Sets the cipher object that will be used for encryption
+     *
+     * @param object $cipher one of the phpCrypt encryption cipher objects
+     * @return void
+     */
+    public function __construct($cipher)
+    {
+        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);
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypts an the entire string $plain_text using the cipher passed
+     * to the constructor in ECB mode
+     *
+     * @param string $text The string to be encrypted in ECB mode
+     * @return boolean Returns true
+     */
+    public function encrypt(&$text)
+    {
+        $this->pad($text);
+        $blocksz = $this->cipher->blockSize();
+
+        $max = strlen($text) / $blocksz;
+        for ($i = 0; $i < $max; ++$i)
+        {
+            // get the current position within $text
+            $pos = $i * $blocksz;
+
+            // grab a block of text
+            $block = substr($text, $pos, $blocksz);
+
+            // encrypt the block
+            $this->cipher->encrypt($block);
+
+            // replace the plain text with the cipher text
+            $text = substr_replace($text, $block, $pos, $blocksz);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Decrypts an the entire string $plain_text using the cipher passed
+     * to the constructor in ECB mode
+     *
+     * @param string $text The string to be decrypted in ECB mode
+     * @return boolean Returns true
+     */
+    public function decrypt(&$text)
+    {
+        $blocksz = $this->cipher->blockSize();
+
+        $max = strlen($text) / $blocksz;
+        for ($i = 0; $i < $max; ++$i)
+        {
+            // get the current position within $text
+            $pos = $i * $blocksz;
+
+            // get a block of cipher text
+            $block = substr($text, $pos, $blocksz);
+
+            // decrypt the block
+            $this->cipher->decrypt($block);
+
+            // replace the block of cipher text with plain text
+            $text = substr_replace($text, $block, $pos, $blocksz);
+        }
+
+        $this->strip($text);
+        return true;
+    }
+
+
+    /**
+     * This mode does not require an IV
+     *
+     * @return boolean Returns false
+     */
+    public function requiresIV()
+    {
+        return false;
+    }
 }
 ?>

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/csrfp/libs/csrf/csrfprotector.php

Braces +6 added lines, -4 removed lines

@@ -262,8 +262,9 @@ 
          */
         private static function failedValidationAction()
         {
-            if (!file_exists(__DIR__."/../".self::$config['logDirectory']))
-                throw new logDirectoryNotFoundException("OWASP CSRFProtector: Log Directory Not Found!");
+            if (!file_exists(__DIR__."/../".self::$config['logDirectory'])) {
+                            throw new logDirectoryNotFoundException("OWASP CSRFProtector: Log Directory Not Found!");
+            }
 
             //call the logging function
             static::logCSRFattack();
@@ -522,8 +523,9 @@ 
             foreach (self::$config['verifyGetFor'] as $key => $value) {
                 $value = str_replace(array('/', '*'), array('\/', '(.*)'), $value);
                 preg_match('/'.$value.'/', self::getCurrentUrl(), $output);
-                if (count($output) > 0)
-                    return false;
+                if (count($output) > 0) {
+                                    return false;
+                }
             }
             return true;
         }