nilsteampassnet / TeamPass

includes/libraries/phpcrypt/ciphers/3Way.php

Spacing +4 added lines, -4 removed lines

@@ -140,12 +140,12 @@ 
         $key = array_map("parent::str2Dec", $key);
 
         // determine which round constant to use
-        if($this->operation() == parent::ENCRYPT)
+        if ($this->operation() == parent::ENCRYPT)
             $rcon = self::$_rcon_enc;
         else
             $rcon = self::$_rcon_dec;
 
-        if($this->operation() == parent::DECRYPT)
+        if ($this->operation() == parent::DECRYPT)
         {
             $this->theta($key);
             $this->invertBits($key);
@@ -153,7 +153,7 @@ 
         }
 
         // 3Way uses 11 rounds
-        for($i = 0; $i < self::ROUNDS; ++$i)
+        for ($i = 0; $i < self::ROUNDS; ++$i)
         {
             $data[0] = parent::uInt32($data[0] ^ $key[0] ^ ($rcon[$i] << 16));
             $data[1] = parent::uInt32($data[1] ^ $key[1]);
@@ -168,7 +168,7 @@ 
 
         $this->theta($data);
 
-        if($this->operation() == parent::DECRYPT)
+        if ($this->operation() == parent::DECRYPT)
             $this->invertBits($data);
 
         // assemble the three 32 bit parts back to a 96 bit string

includes/libraries/phpcrypt/ciphers/Skipjack.php

Spacing +3 added lines, -3 removed lines

@@ -269,7 +269,7 @@ 
     {
         $w = str_split($bytes, 2);
 
-        if($this->operation() == parent::ENCRYPT)
+        if ($this->operation() == parent::ENCRYPT)
         {
             /*
 			 * Set the new W3 as the old W2
@@ -333,9 +333,9 @@ 
         $key = $this->key();
         $pos = 0;
 
-        for($i = 0; $i < 128; ++$i)
+        for ($i = 0; $i < 128; ++$i)
         {
-            if($pos == $key_bytes)
+            if ($pos == $key_bytes)
                 $pos = 0;
 
             $this->expanded_key .= $key[$pos];

includes/libraries/phpcrypt/Cipher.php

Spacing +9 added lines, -9 removed lines

@@ -150,7 +150,7 @@ 
      */
     public function operation($op = 0)
     {
-        if($op == self::ENCRYPT || $op == self::DECRYPT)
+        if ($op == self::ENCRYPT || $op == self::DECRYPT)
             $this->operation = $op;
 
         return $this->operation;
@@ -164,7 +164,7 @@ 
      */
     public function name($name = "")
     {
-        if($name != "")
+        if ($name != "")
             $this->cipher_name = $name;
 
         return $this->cipher_name;
@@ -179,12 +179,12 @@ 
      */
     public function blockSize($bytes = 0)
     {
-        if($bytes > 0)
+        if ($bytes > 0)
             $this->block_size = $bytes;
 
         // in some cases a blockSize is not set, such as stream ciphers.
         // so just return 0 for the block size
-        if(!isset($this->block_size))
+        if (!isset($this->block_size))
             return 0;
 
         return $this->block_size;
@@ -217,27 +217,27 @@ 
      */
     public function key($key = "", $req_sz = 0)
     {
-        if($key != "" && $key != null)
+        if ($key != "" && $key != null)
         {
             // in the case where the key is changed changed after
             // creating a new Cipher object and the $req_sz was not
             // given, we need to make sure the new key meets the size
             // requirements. This can be determined from the $this->key_len
             // member set from the previous key
-            if($this->key_len > 0 && $req_sz == 0)
+            if ($this->key_len > 0 && $req_sz == 0)
                 $req_sz = $this->key_len;
             else
                 $this->key_len = strlen($key);
 
-            if($req_sz > 0)
+            if ($req_sz > 0)
             {
-                if($this->key_len > $req_sz)
+                if ($this->key_len > $req_sz)
                 {
                     // shorten the key length
                     $key = substr($key, 0, $req_sz);
                     $this->key_len = $req_sz;
                 }
-                else if($this->key_len < $req_sz)
+                else if ($this->key_len < $req_sz)
                 {
                     // send a notice that the key was too small
                     // NEVER PAD THE KEY, THIS WOULD BE INSECURE!!!!!

includes/libraries/phpcrypt/modes/CFB.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
         parent::__construct(PHP_Crypt::MODE_CFB, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
+        if ($cipher->type() != Cipher::BLOCK)
             trigger_error("CFB 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)
         {
             // copy the register, and then encrypt it
             $this->enc_register = $this->register;
@@ -100,7 +100,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);

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

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
             {

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

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

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