nilsteampassnet / TeamPass

includes/libraries/Authentication/phpseclib/Crypt/RC2.php

Indentation +3 added lines, -3 removed lines

@@ -693,9 +693,9 @@
             // Creates the inline-crypt function
             $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
                 array(
-                   'init_crypt'    => $init_crypt,
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
+                    'init_crypt'    => $init_crypt,
+                    'encrypt_block' => $encrypt_block,
+                    'decrypt_block' => $decrypt_block
                 )
             );
         }

Spacing +15 added lines, -15 removed lines

@@ -295,7 +295,7 @@ 
                     return false;
                 }
                 $this->cipher_name_openssl_ecb = 'rc2-ecb';
-                $this->cipher_name_openssl = 'rc2-' . $this->_openssl_translate_mode();
+                $this->cipher_name_openssl = 'rc2-'.$this->_openssl_translate_mode();
         }
 
         return parent::isValidEngine($engine);
@@ -315,7 +315,7 @@ 
     function setKeyLength($length)
     {
         if ($length < 8 || $length > 1024) {
-            throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys between 1 and 1024 bits, inclusive, are supported');
+            throw new \LengthException('Key size of '.$length.' bits is not supported by this algorithm. Only keys between 1 and 1024 bits, inclusive, are supported');
         }
 
         $this->default_key_length = $this->current_key_length = $length;
@@ -358,7 +358,7 @@ 
         }
 
         if ($t1 < 1 || $t1 > 1024) {
-            throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys between 1 and 1024 bits, inclusive, are supported');
+            throw new \LengthException('Key size of '.$length.' bits is not supported by this algorithm. Only keys between 1 and 1024 bits, inclusive, are supported');
         }
 
         $this->current_key_length = $t1;
@@ -575,18 +575,18 @@ 
      */
     function _setupInlineCrypt()
     {
-        $lambda_functions =& self::_getLambdaFunctions();
+        $lambda_functions = & self::_getLambdaFunctions();
 
         // The first 10 generated $lambda_functions will use the $keys hardcoded as integers
         // for the mixing rounds, for better inline crypt performance [~20% faster].
         // But for memory reason we have to limit those ultra-optimized $lambda_functions to an amount of 10.
         // (Currently, for Crypt_RC2, one generated $lambda_function cost on php5.5@32bit ~60kb unfreeable mem and ~100kb on php5.5@64bit)
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
+        $gen_hi_opt_code = (bool) (count($lambda_functions) < 10);
 
         // Generation of a unique hash for our generated code
         $code_hash = "Crypt_RC2, {$this->mode}";
         if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
+            $code_hash = str_pad($code_hash, 32).$this->_hashInlineCryptFunction($this->key);
         }
 
         // Is there a re-usable $lambda_functions in there?
@@ -601,7 +601,7 @@ 
                 default:
                     $keys = array();
                     foreach ($this->keys as $k => $v) {
-                        $keys[$k] = '$keys[' . $k . ']';
+                        $keys[$k] = '$keys['.$k.']';
                     }
             }
 
@@ -622,16 +622,16 @@ 
             for (;;) {
                 // Mixing round.
                 $encrypt_block .= '
-                    $r0 = (($r0 + ' . $keys[$j++] . ' +
+                    $r0 = (($r0 + ' . $keys[$j++].' +
                            ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
                     $r0 |= $r0 >> 16;
-                    $r1 = (($r1 + ' . $keys[$j++] . ' +
+                    $r1 = (($r1 + ' . $keys[$j++].' +
                            ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
                     $r1 |= $r1 >> 16;
-                    $r2 = (($r2 + ' . $keys[$j++] . ' +
+                    $r2 = (($r2 + ' . $keys[$j++].' +
                            ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
                     $r2 |= $r2 >> 16;
-                    $r3 = (($r3 + ' . $keys[$j++] . ' +
+                    $r3 = (($r3 + ' . $keys[$j++].' +
                            ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
                     $r3 |= $r3 >> 16;';
 
@@ -661,16 +661,16 @@ 
                 // R-mixing round.
                 $decrypt_block .= '
                     $r3 = ($r3 | ($r3 << 16)) >> 5;
-                    $r3 = ($r3 - ' . $keys[--$j] . ' -
+                    $r3 = ($r3 - ' . $keys[--$j].' -
                            ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
                     $r2 = ($r2 | ($r2 << 16)) >> 3;
-                    $r2 = ($r2 - ' . $keys[--$j] . ' -
+                    $r2 = ($r2 - ' . $keys[--$j].' -
                            ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
                     $r1 = ($r1 | ($r1 << 16)) >> 2;
-                    $r1 = ($r1 - ' . $keys[--$j] . ' -
+                    $r1 = ($r1 - ' . $keys[--$j].' -
                            ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
                     $r0 = ($r0 | ($r0 << 16)) >> 1;
-                    $r0 = ($r0 - ' . $keys[--$j] . ' -
+                    $r0 = ($r0 - ' . $keys[--$j].' -
                            ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;';
 
                 if ($j === $limit) {

includes/libraries/Authentication/phpseclib/Crypt/Random.php

Indentation +6 added lines, -6 removed lines

@@ -96,12 +96,12 @@
             session_start();
 
             $v = (isset($_SERVER) ? self::safe_serialize($_SERVER) : '') .
-                 (isset($_POST) ? self::safe_serialize($_POST) : '') .
-                 (isset($_GET) ? self::safe_serialize($_GET) : '') .
-                 (isset($_COOKIE) ? self::safe_serialize($_COOKIE) : '') .
-                 self::safe_serialize($GLOBALS) .
-                 self::safe_serialize($_SESSION) .
-                 self::safe_serialize($_OLD_SESSION);
+                    (isset($_POST) ? self::safe_serialize($_POST) : '') .
+                    (isset($_GET) ? self::safe_serialize($_GET) : '') .
+                    (isset($_COOKIE) ? self::safe_serialize($_COOKIE) : '') .
+                    self::safe_serialize($GLOBALS) .
+                    self::safe_serialize($_SESSION) .
+                    self::safe_serialize($_OLD_SESSION);
             $v = $seed = $_SESSION['seed'] = sha1($v, true);
             if (!isset($_SESSION['count'])) {
                 $_SESSION['count'] = 0;

Spacing +10 added lines, -10 removed lines

@@ -95,12 +95,12 @@ 
             session_cache_limiter('');
             session_start();
 
-            $v = (isset($_SERVER) ? self::safe_serialize($_SERVER) : '') .
-                 (isset($_POST) ? self::safe_serialize($_POST) : '') .
-                 (isset($_GET) ? self::safe_serialize($_GET) : '') .
-                 (isset($_COOKIE) ? self::safe_serialize($_COOKIE) : '') .
-                 self::safe_serialize($GLOBALS) .
-                 self::safe_serialize($_SESSION) .
+            $v = (isset($_SERVER) ? self::safe_serialize($_SERVER) : '').
+                 (isset($_POST) ? self::safe_serialize($_POST) : '').
+                 (isset($_GET) ? self::safe_serialize($_GET) : '').
+                 (isset($_COOKIE) ? self::safe_serialize($_COOKIE) : '').
+                 self::safe_serialize($GLOBALS).
+                 self::safe_serialize($_SESSION).
                  self::safe_serialize($_OLD_SESSION);
             $v = $seed = $_SESSION['seed'] = sha1($v, true);
             if (!isset($_SESSION['count'])) {
@@ -133,8 +133,8 @@ 
             // http://tools.ietf.org/html/rfc4253#section-7.2
             //
             // see the is_string($crypto) part for an example of how to expand the keys
-            $key = sha1($seed . 'A', true);
-            $iv = sha1($seed . 'C', true);
+            $key = sha1($seed.'A', true);
+            $iv = sha1($seed.'C', true);
 
             // ciphers are used as per the nist.gov link below. also, see this link:
             //
@@ -159,7 +159,7 @@ 
                     $crypto = new RC4();
                     break;
                 default:
-                    throw new \RuntimeException(__CLASS__ . ' requires at least one symmetric cipher be loaded');
+                    throw new \RuntimeException(__CLASS__.' requires at least one symmetric cipher be loaded');
             }
 
             $crypto->setKey(substr($key, 0, $crypto->getKeyLength() >> 3));
@@ -182,7 +182,7 @@ 
             $i = $crypto->encrypt(microtime()); // strlen(microtime()) == 21
             $r = $crypto->encrypt($i ^ $v); // strlen($v) == 20
             $v = $crypto->encrypt($r ^ $i); // strlen($r) == 20
-            $result.= $r;
+            $result .= $r;
         }
         return substr($result, 0, $length);
     }

includes/libraries/Authentication/phpseclib/Crypt/Rijndael.php

Indentation +15 added lines, -15 removed lines

@@ -372,9 +372,9 @@ 
         // subWord
         for ($i = 0; $i < $Nb; ++$i) {
             $state[$i] =   $sbox[$state[$i]       & 0x000000FF]        |
-                          ($sbox[$state[$i] >>  8 & 0x000000FF] <<  8) |
-                          ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) |
-                          ($sbox[$state[$i] >> 24 & 0x000000FF] << 24);
+                            ($sbox[$state[$i] >>  8 & 0x000000FF] <<  8) |
+                            ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) |
+                            ($sbox[$state[$i] >> 24 & 0x000000FF] << 24);
         }
 
         // shiftRows + addRoundKey
@@ -387,7 +387,7 @@ 
                         ($state[$j] & 0x00FF0000) ^
                         ($state[$k] & 0x0000FF00) ^
                         ($state[$l] & 0x000000FF) ^
-                         $w[$i];
+                            $w[$i];
             ++$i;
             $j = ($j + 1) % $Nb;
             $k = ($k + 1) % $Nb;
@@ -475,9 +475,9 @@ 
                     ($state[$l] & 0x000000FF);
 
             $temp[$i] = $dw[$i] ^ ($isbox[$word       & 0x000000FF]        |
-                                  ($isbox[$word >>  8 & 0x000000FF] <<  8) |
-                                  ($isbox[$word >> 16 & 0x000000FF] << 16) |
-                                  ($isbox[$word >> 24 & 0x000000FF] << 24));
+                                    ($isbox[$word >>  8 & 0x000000FF] <<  8) |
+                                    ($isbox[$word >> 16 & 0x000000FF] << 16) |
+                                    ($isbox[$word >> 24 & 0x000000FF] << 24));
             ++$i;
             $j = ($j + 1) % $Nb;
             $k = ($k + 1) % $Nb;
@@ -625,9 +625,9 @@ 
         }
 
         return  $sbox[$word       & 0x000000FF]        |
-               ($sbox[$word >>  8 & 0x000000FF] <<  8) |
-               ($sbox[$word >> 16 & 0x000000FF] << 16) |
-               ($sbox[$word >> 24 & 0x000000FF] << 24);
+                ($sbox[$word >>  8 & 0x000000FF] <<  8) |
+                ($sbox[$word >> 16 & 0x000000FF] << 16) |
+                ($sbox[$word >> 24 & 0x000000FF] << 24);
     }
 
     /**
@@ -966,11 +966,11 @@ 
 
             $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
                 array(
-                   'init_crypt'    => '',
-                   'init_encrypt'  => $init_encrypt,
-                   'init_decrypt'  => $init_decrypt,
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
+                    'init_crypt'    => '',
+                    'init_encrypt'  => $init_encrypt,
+                    'init_decrypt'  => $init_decrypt,
+                    'encrypt_block' => $encrypt_block,
+                    'decrypt_block' => $decrypt_block
                 )
             );
         }

Spacing +40 added lines, -40 removed lines

@@ -217,7 +217,7 @@ 
                 $this->key_length = $length >> 3;
                 break;
             default:
-                throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes 128, 160, 192, 224 or 256 bits are supported');
+                throw new \LengthException('Key size of '.$length.' bits is not supported by this algorithm. Only keys of sizes 128, 160, 192, 224 or 256 bits are supported');
         }
 
         parent::setKeyLength($length);
@@ -243,7 +243,7 @@ 
             case 32:
                 break;
             default:
-                throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16, 20, 24, 28 or 32 are supported');
+                throw new \LengthException('Key of size '.strlen($key).' not supported by this algorithm. Only keys of sizes 16, 20, 24, 28 or 32 are supported');
         }
 
         parent::setKey($key);
@@ -267,7 +267,7 @@ 
             case 256:
                 break;
             default:
-                throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes 128, 160, 192, 224 or 256 bits are supported');
+                throw new \LengthException('Key size of '.$length.' bits is not supported by this algorithm. Only keys of sizes 128, 160, 192, 224 or 256 bits are supported');
         }
 
         $this->Nb = $length >> 5;
@@ -293,11 +293,11 @@ 
                 if ($this->block_size != 16) {
                     return false;
                 }
-                $this->cipher_name_openssl_ecb = 'aes-' . ($this->key_length << 3) . '-ecb';
-                $this->cipher_name_openssl = 'aes-' . ($this->key_length << 3) . '-' . $this->_openssl_translate_mode();
+                $this->cipher_name_openssl_ecb = 'aes-'.($this->key_length << 3).'-ecb';
+                $this->cipher_name_openssl = 'aes-'.($this->key_length << 3).'-'.$this->_openssl_translate_mode();
                 break;
             case self::ENGINE_MCRYPT:
-                $this->cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
+                $this->cipher_name_mcrypt = 'rijndael-'.($this->block_size << 3);
                 if ($this->key_length % 8) { // is it a 160/224-bit key?
                     // mcrypt is not usable for them, only for 128/192/256-bit keys
                     return false;
@@ -358,8 +358,8 @@ 
             while ($i < $Nb) {
                 $temp[$i] = $t0[$state[$i] >> 24 & 0x000000FF] ^
                             $t1[$state[$j] >> 16 & 0x000000FF] ^
-                            $t2[$state[$k] >>  8 & 0x000000FF] ^
-                            $t3[$state[$l]       & 0x000000FF] ^
+                            $t2[$state[$k] >> 8 & 0x000000FF] ^
+                            $t3[$state[$l] & 0x000000FF] ^
                             $w[++$wc];
                 ++$i;
                 $j = ($j + 1) % $Nb;
@@ -371,8 +371,8 @@ 
 
         // subWord
         for ($i = 0; $i < $Nb; ++$i) {
-            $state[$i] =   $sbox[$state[$i]       & 0x000000FF]        |
-                          ($sbox[$state[$i] >>  8 & 0x000000FF] <<  8) |
+            $state[$i] = $sbox[$state[$i] & 0x000000FF] |
+                          ($sbox[$state[$i] >> 8 & 0x000000FF] << 8) |
                           ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) |
                           ($sbox[$state[$i] >> 24 & 0x000000FF] << 24);
         }
@@ -451,8 +451,8 @@ 
             while ($i < $Nb) {
                 $temp[$i] = $dt0[$state[$i] >> 24 & 0x000000FF] ^
                             $dt1[$state[$j] >> 16 & 0x000000FF] ^
-                            $dt2[$state[$k] >>  8 & 0x000000FF] ^
-                            $dt3[$state[$l]       & 0x000000FF] ^
+                            $dt2[$state[$k] >> 8 & 0x000000FF] ^
+                            $dt3[$state[$l] & 0x000000FF] ^
                             $dw[++$wc];
                 ++$i;
                 $j = ($j + 1) % $Nb;
@@ -474,8 +474,8 @@ 
                     ($state[$k] & 0x0000FF00) |
                     ($state[$l] & 0x000000FF);
 
-            $temp[$i] = $dw[$i] ^ ($isbox[$word       & 0x000000FF]        |
-                                  ($isbox[$word >>  8 & 0x000000FF] <<  8) |
+            $temp[$i] = $dw[$i] ^ ($isbox[$word & 0x000000FF] |
+                                  ($isbox[$word >> 8 & 0x000000FF] << 8) |
                                   ($isbox[$word >> 16 & 0x000000FF] << 16) |
                                   ($isbox[$word >> 24 & 0x000000FF] << 24));
             ++$i;
@@ -582,8 +582,8 @@ 
                         $dw = $this->_subWord($this->w[$row][$j]);
                         $temp[$j] = $dt0[$dw >> 24 & 0x000000FF] ^
                                     $dt1[$dw >> 16 & 0x000000FF] ^
-                                    $dt2[$dw >>  8 & 0x000000FF] ^
-                                    $dt3[$dw       & 0x000000FF];
+                                    $dt2[$dw >> 8 & 0x000000FF] ^
+                                    $dt3[$dw & 0x000000FF];
                         $j++;
                     }
                     $this->dw[$row] = $temp;
@@ -621,11 +621,11 @@ 
     {
         static $sbox;
         if (empty($sbox)) {
-            list(, , , , $sbox) = $this->_getTables();
+            list(,,,, $sbox) = $this->_getTables();
         }
 
-        return  $sbox[$word       & 0x000000FF]        |
-               ($sbox[$word >>  8 & 0x000000FF] <<  8) |
+        return  $sbox[$word & 0x000000FF] |
+               ($sbox[$word >> 8 & 0x000000FF] << 8) |
                ($sbox[$word >> 16 & 0x000000FF] << 16) |
                ($sbox[$word >> 24 & 0x000000FF] << 24);
     }
@@ -684,9 +684,9 @@ 
             ));
 
             foreach ($t3 as $t3i) {
-                $t0[] = (($t3i << 24) & 0xFF000000) | (($t3i >>  8) & 0x00FFFFFF);
+                $t0[] = (($t3i << 24) & 0xFF000000) | (($t3i >> 8) & 0x00FFFFFF);
                 $t1[] = (($t3i << 16) & 0xFFFF0000) | (($t3i >> 16) & 0x0000FFFF);
-                $t2[] = (($t3i <<  8) & 0xFFFFFF00) | (($t3i >> 24) & 0x000000FF);
+                $t2[] = (($t3i << 8) & 0xFFFFFF00) | (($t3i >> 24) & 0x000000FF);
             }
 
             $tables = array(
@@ -768,9 +768,9 @@ 
             ));
 
             foreach ($dt3 as $dt3i) {
-                $dt0[] = (($dt3i << 24) & 0xFF000000) | (($dt3i >>  8) & 0x00FFFFFF);
+                $dt0[] = (($dt3i << 24) & 0xFF000000) | (($dt3i >> 8) & 0x00FFFFFF);
                 $dt1[] = (($dt3i << 16) & 0xFFFF0000) | (($dt3i >> 16) & 0x0000FFFF);
-                $dt2[] = (($dt3i <<  8) & 0xFFFFFF00) | (($dt3i >> 24) & 0x000000FF);
+                $dt2[] = (($dt3i << 8) & 0xFFFFFF00) | (($dt3i >> 24) & 0x000000FF);
             };
 
             $tables = array(
@@ -815,17 +815,17 @@ 
         // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
         // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
 
-        $lambda_functions =& self::_getLambdaFunctions();
+        $lambda_functions = & self::_getLambdaFunctions();
 
         // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
         // (Currently, for Crypt_Rijndael/AES, one generated $lambda_function cost on php5.5@32bit ~80kb unfreeable mem and ~130kb on php5.5@64bit)
         // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
+        $gen_hi_opt_code = (bool) (count($lambda_functions) < 10);
 
         // Generation of a uniqe hash for our generated code
         $code_hash = "Crypt_Rijndael, {$this->mode}, {$this->Nr}, {$this->Nb}";
         if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
+            $code_hash = str_pad($code_hash, 32).$this->_hashInlineCryptFunction($this->key);
         }
 
         if (!isset($lambda_functions[$code_hash])) {
@@ -839,8 +839,8 @@ 
                     break;
                 default:
                     for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
-                        $w[]  = '$w['  . $i . ']';
-                        $dw[] = '$dw[' . $i . ']';
+                        $w[]  = '$w['.$i.']';
+                        $dw[] = '$dw['.$i.']';
                     }
                     $init_encrypt = '$w  = $self->w;';
                     $init_decrypt = '$dw = $self->dw;';
@@ -851,7 +851,7 @@ 
             $c  = $this->c;
 
             // Generating encrypt code:
-            $init_encrypt.= '
+            $init_encrypt .= '
                 static $tables;
                 if (empty($tables)) {
                     $tables = &$self->_getTables();
@@ -877,9 +877,9 @@ 
             for ($round = 1; $round < $Nr; ++$round) {
                 list($s, $e) = array($e, $s);
                 for ($i = 0; $i < $Nb; ++$i) {
-                    $encrypt_block.=
+                    $encrypt_block .=
                         '$'.$e.$i.' =
-                        $t0[($'.$s.$i                  .' >> 24) & 0xff] ^
+                        $t0[($'.$s.$i.' >> 24) & 0xff] ^
                         $t1[($'.$s.(($i + $c[1]) % $Nb).' >> 16) & 0xff] ^
                         $t2[($'.$s.(($i + $c[2]) % $Nb).' >>  8) & 0xff] ^
                         $t3[ $'.$s.(($i + $c[3]) % $Nb).'        & 0xff] ^
@@ -889,7 +889,7 @@ 
 
             // Finalround: subWord + shiftRows + addRoundKey
             for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block.=
+                $encrypt_block .=
                     '$'.$e.$i.' =
                      $sbox[ $'.$e.$i.'        & 0xff]        |
                     ($sbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
@@ -898,8 +898,8 @@ 
             }
             $encrypt_block .= '$in = pack("N*"'."\n";
             for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block.= ',
-                    ($'.$e.$i                  .' & '.((int)0xFF000000).') ^
+                $encrypt_block .= ',
+                    ($'.$e.$i.' & '.((int) 0xFF000000).') ^
                     ($'.$e.(($i + $c[1]) % $Nb).' &         0x00FF0000   ) ^
                     ($'.$e.(($i + $c[2]) % $Nb).' &         0x0000FF00   ) ^
                     ($'.$e.(($i + $c[3]) % $Nb).' &         0x000000FF   ) ^
@@ -908,7 +908,7 @@ 
             $encrypt_block .= ');';
 
             // Generating decrypt code:
-            $init_decrypt.= '
+            $init_decrypt .= '
                 static $invtables;
                 if (empty($invtables)) {
                     $invtables = &$self->_getInvTables();
@@ -934,9 +934,9 @@ 
             for ($round = 1; $round < $Nr; ++$round) {
                 list($s, $e) = array($e, $s);
                 for ($i = 0; $i < $Nb; ++$i) {
-                    $decrypt_block.=
+                    $decrypt_block .=
                         '$'.$e.$i.' =
-                        $dt0[($'.$s.$i                        .' >> 24) & 0xff] ^
+                        $dt0[($'.$s.$i.' >> 24) & 0xff] ^
                         $dt1[($'.$s.(($Nb + $i - $c[1]) % $Nb).' >> 16) & 0xff] ^
                         $dt2[($'.$s.(($Nb + $i - $c[2]) % $Nb).' >>  8) & 0xff] ^
                         $dt3[ $'.$s.(($Nb + $i - $c[3]) % $Nb).'        & 0xff] ^
@@ -946,7 +946,7 @@ 
 
             // Finalround: subWord + shiftRows + addRoundKey
             for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block.=
+                $decrypt_block .=
                     '$'.$e.$i.' =
                      $isbox[ $'.$e.$i.'        & 0xff]        |
                     ($isbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
@@ -955,8 +955,8 @@ 
             }
             $decrypt_block .= '$in = pack("N*"'."\n";
             for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block.= ',
-                    ($'.$e.$i.                        ' & '.((int)0xFF000000).') ^
+                $decrypt_block .= ',
+                    ($'.$e.$i.' & '.((int) 0xFF000000).') ^
                     ($'.$e.(($Nb + $i - $c[1]) % $Nb).' &         0x00FF0000   ) ^
                     ($'.$e.(($Nb + $i - $c[2]) % $Nb).' &         0x0000FF00   ) ^
                     ($'.$e.(($Nb + $i - $c[3]) % $Nb).' &         0x000000FF   ) ^

includes/libraries/Authentication/phpseclib/Common/Functions/ASN1.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     {
         $length = ord(Strings::shift($string));
         if ($length & 0x80) { // definite length, long form
-            $length&= 0x7F;
+            $length &= 0x7F;
             $temp = Strings::shift($string, $length);
             list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
         }

includes/libraries/phpcrypt/ciphers/AES256.php

Indentation +26 added lines, -26 removed lines

@@ -38,35 +38,35 @@
  */
 class Cipher_AES_256 extends Cipher_Rijndael_128
 {
-	/** @type integer BYTES_BLOCK The size of the block, in bytes */
-	const BYTES_BLOCK = 16; // 128 bits;
+    /** @type integer BYTES_BLOCK The size of the block, in bytes */
+    const BYTES_BLOCK = 16; // 128 bits;
 
-	/** @type integer BITS_KEY The size of the key, in bytes */
-	const BYTES_KEY = 32; // 256 bits;
+    /** @type integer BITS_KEY The size of the key, in bytes */
+    const BYTES_KEY = 32; // 256 bits;
 
-	/**
-	 * Constructor
-	 * Sets the key used for encryption.
-	 *
-	 * @param string $key string containing the user supplied encryption key
-	 * @return void
-	 */
-	public function __construct($key)
-	{
-		// Setup AES by calling the second constructor in Rijndael_128
-		// The block size is set here too, since all AES implementations use 128 bit blocks
-		parent::__construct1(PHP_Crypt::CIPHER_AES_256, $key, self::BYTES_KEY);
-	}
+    /**
+     * Constructor
+     * Sets the key used for encryption.
+     *
+     * @param string $key string containing the user supplied encryption key
+     * @return void
+     */
+    public function __construct($key)
+    {
+        // Setup AES by calling the second constructor in Rijndael_128
+        // The block size is set here too, since all AES implementations use 128 bit blocks
+        parent::__construct1(PHP_Crypt::CIPHER_AES_256, $key, self::BYTES_KEY);
+    }
 
 
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
 }
 ?>

includes/libraries/phpcrypt/ciphers/Enigma.php

Indentation +214 added lines, -214 removed lines

@@ -46,219 +46,219 @@
  */
 class Cipher_Enigma extends Cipher
 {
-	const MASK = 0377;
-
-	/** @type integer ROTORSZ The size of $t1,$t2,$t3,$deck */
-	const ROTORSZ = 256;
-
-	/** @type array $t1 An array of chars, ROTORSZ size */
-	private $t1 = array();
-
-	/** @type array $t2 An array of chars, ROTORSZ size */
-	private $t2 = array();
-
-	/** @type array $t3 An array of chars, ROTORSZ size */
-	private $t3 = array();
-
-	/** @type array $deck An array of chars, ROTORSZ size */
-	private $deck = array();
-
-	private $n1 = 0;
-	private $n2 = 0;
-	private $nr1 = 0;
-	private $nr2 = 0;
-
-	/** @type string $xkey Stores the modified key */
-	private $xkey = "";
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $key The key used for Encryption/Decryption
-	 * @return void
-	 */
-	public function __construct($key)
-	{
-		parent::__construct(PHP_Crypt::CIPHER_ENIGMA, $key, strlen($key));
-
-		$this->createKey();
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypt plain text data using Enigma
-	 *
-	 * @param string $str A plain text string of any length
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$str)
-	{
-		$this->operation(parent::ENCRYPT);
-		return $this->enigma($str);
-	}
-
-
-	/**
-	 * Decrypt an Enigma encrypted string
-	 *
-	 * @param string $str A Enigma encrypted string
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$str)
-	{
-		$this->operation(parent::DECRYPT);
-		return $this->enigma($str);
-	}
-
-
-	/**
-	 * Peforms the actual Enigma encryption/decryption. Since
-	 * the algorithm is the same for both, we do it all in
-	 * this one function
-	 *
-	 * @param string $str A string to encrypt or decrypt
-	 * @return boolean Returns true
-	 */
-	private function enigma(&$str)
-	{
-		// zero out the counters
-		$this->n1 = 0;
-		$this->n2 = 0;
-		$this->nr1 = 0;
-		$this->nr2 = 0;
-
-		$max = strlen($str);
-		for($j = 0; $j < $max; ++$j)
-		{
-			$i = ord($str[$j]);
-			$this->nr1 = $this->n1;
-
-			$pos1 = ($i + $this->nr1) & self::MASK;
-			$pos3 = ($this->t1[$pos1] + $this->nr2) & self::MASK;
-			$pos2 = ($this->t3[$pos3] - $this->nr2) & self::MASK;
-			$i = $this->t2[$pos2] - $this->nr1;
-
-			$str[$j] = chr($i);
-			$this->n1++;
-
-			if($this->n1 == self::ROTORSZ)
-			{
-				$this->n1 = 0;
-				$this->n2++;
-
-				if($this->n2 == self::ROTORSZ)
-					$this->n2 = 0;
-
-				$this->nr2 = $this->n2;
-			}
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * The code for this function was translated to PHP from mcrypt's enigma.c,
-	 * I was not able to find sufficient documentation to create my own
-	 * version of this function.
-	 * Enigma requires a 13 byte key, this function will
-	 * lengthen the key to get it to 13 bytes long if it's short. It also
-	 * Sets $deck, and $t1, $t2, $t3 which I think are the Enigma rotors.
-	 *
-	 * @return void
-	 */
-	private function createKey()
-	{
-		$this->deck = array();
-		$this->t1 = array();
-		$this->t2 = array_fill(0, self::ROTORSZ, 0);
-		$this->t3 = $this->t2;
-		$this->xkey = $this->key();
-		$klen = $this->keySize();
-
-		// get the key to exactly 13 bytes if it's less than 13
-		if($klen < 13)
-			$this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
-
-		$seed = 123;
-		for($i = 0; $i < 13; ++$i)
-			$seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
-
-		// sets $t1 and $deck
-		for($i = 0; $i < self::ROTORSZ; ++$i)
-		{
-			$this->t1[] = $i;
-			$this->deck[] = $i;
-		}
-
-		// sets $t3
-		for($i = 0; $i < self::ROTORSZ; ++$i)
-		{
-			// make sure the return values are 32 bit
-			$seed = 5 * parent::sInt32($seed) + ord($this->xkey[$i % 13]);
-			$seed = parent::sInt32($seed);
-
-			// force the returned value to be an unsigned int
-			//$random = parent::uint32($seed % 65521);
-			$random = parent::uInt($seed % 65521);
-
-			$k = self::ROTORSZ - 1 - $i;
-			$ic = ($random & self::MASK) % ($k + 1);
-
-			// make sure the returned value is an unsigned int
-			$random = parent::uInt($random >> 8);
-
-			$temp = $this->t1[$k];
-			$this->t1[$k] = $this->t1[$ic];
-			$this->t1[$ic] = $temp;
-			if($this->t3[$k] != 0)
-				continue;
-
-			$ic = ($random & self::MASK) % $k;
-			while($this->t3[$ic] != 0)
-				$ic = ($ic + 1) % $k;
-
-			$this->t3[$k] = $ic;
-			$this->t3[$ic] = $k;
-		}
-
-		// sets $t2
-		for($i = 0; $i < self::ROTORSZ; ++$i)
-		{
-			$pos = $this->t1[$i] & self::MASK;
-			$this->t2[$pos] = $i;
-		}
-
-		// now convert $t1, $t2, $t3, $deck values to signed chars,
-		// PHP's chr() function returns an unsigned char, so we have
-		// to use use our own
-		$this->t1   = array_map("parent::sChar", $this->t1);
-		$this->t2   = array_map("parent::sChar", $this->t2);
-		$this->t3   = array_map("parent::sChar", $this->t3);
-		$this->deck = array_map("parent::sChar", $this->deck);
-	}
-
-
-	/**
-	 * Indicates this is a stream cipher
-	 *
-	 * @return integer Returns Cipher::STREAM
-	 */
-	public function type()
-	{
-		return parent::STREAM;
-	}
+    const MASK = 0377;
+
+    /** @type integer ROTORSZ The size of $t1,$t2,$t3,$deck */
+    const ROTORSZ = 256;
+
+    /** @type array $t1 An array of chars, ROTORSZ size */
+    private $t1 = array();
+
+    /** @type array $t2 An array of chars, ROTORSZ size */
+    private $t2 = array();
+
+    /** @type array $t3 An array of chars, ROTORSZ size */
+    private $t3 = array();
+
+    /** @type array $deck An array of chars, ROTORSZ size */
+    private $deck = array();
+
+    private $n1 = 0;
+    private $n2 = 0;
+    private $nr1 = 0;
+    private $nr2 = 0;
+
+    /** @type string $xkey Stores the modified key */
+    private $xkey = "";
+
+
+    /**
+     * Constructor
+     *
+     * @param string $key The key used for Encryption/Decryption
+     * @return void
+     */
+    public function __construct($key)
+    {
+        parent::__construct(PHP_Crypt::CIPHER_ENIGMA, $key, strlen($key));
+
+        $this->createKey();
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypt plain text data using Enigma
+     *
+     * @param string $str A plain text string of any length
+     * @return boolean Returns true
+     */
+    public function encrypt(&$str)
+    {
+        $this->operation(parent::ENCRYPT);
+        return $this->enigma($str);
+    }
+
+
+    /**
+     * Decrypt an Enigma encrypted string
+     *
+     * @param string $str A Enigma encrypted string
+     * @return boolean Returns true
+     */
+    public function decrypt(&$str)
+    {
+        $this->operation(parent::DECRYPT);
+        return $this->enigma($str);
+    }
+
+
+    /**
+     * Peforms the actual Enigma encryption/decryption. Since
+     * the algorithm is the same for both, we do it all in
+     * this one function
+     *
+     * @param string $str A string to encrypt or decrypt
+     * @return boolean Returns true
+     */
+    private function enigma(&$str)
+    {
+        // zero out the counters
+        $this->n1 = 0;
+        $this->n2 = 0;
+        $this->nr1 = 0;
+        $this->nr2 = 0;
+
+        $max = strlen($str);
+        for($j = 0; $j < $max; ++$j)
+        {
+            $i = ord($str[$j]);
+            $this->nr1 = $this->n1;
+
+            $pos1 = ($i + $this->nr1) & self::MASK;
+            $pos3 = ($this->t1[$pos1] + $this->nr2) & self::MASK;
+            $pos2 = ($this->t3[$pos3] - $this->nr2) & self::MASK;
+            $i = $this->t2[$pos2] - $this->nr1;
+
+            $str[$j] = chr($i);
+            $this->n1++;
+
+            if($this->n1 == self::ROTORSZ)
+            {
+                $this->n1 = 0;
+                $this->n2++;
+
+                if($this->n2 == self::ROTORSZ)
+                    $this->n2 = 0;
+
+                $this->nr2 = $this->n2;
+            }
+        }
+
+        return true;
+    }
+
+
+    /**
+     * The code for this function was translated to PHP from mcrypt's enigma.c,
+     * I was not able to find sufficient documentation to create my own
+     * version of this function.
+     * Enigma requires a 13 byte key, this function will
+     * lengthen the key to get it to 13 bytes long if it's short. It also
+     * Sets $deck, and $t1, $t2, $t3 which I think are the Enigma rotors.
+     *
+     * @return void
+     */
+    private function createKey()
+    {
+        $this->deck = array();
+        $this->t1 = array();
+        $this->t2 = array_fill(0, self::ROTORSZ, 0);
+        $this->t3 = $this->t2;
+        $this->xkey = $this->key();
+        $klen = $this->keySize();
+
+        // get the key to exactly 13 bytes if it's less than 13
+        if($klen < 13)
+            $this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
+
+        $seed = 123;
+        for($i = 0; $i < 13; ++$i)
+            $seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
+
+        // sets $t1 and $deck
+        for($i = 0; $i < self::ROTORSZ; ++$i)
+        {
+            $this->t1[] = $i;
+            $this->deck[] = $i;
+        }
+
+        // sets $t3
+        for($i = 0; $i < self::ROTORSZ; ++$i)
+        {
+            // make sure the return values are 32 bit
+            $seed = 5 * parent::sInt32($seed) + ord($this->xkey[$i % 13]);
+            $seed = parent::sInt32($seed);
+
+            // force the returned value to be an unsigned int
+            //$random = parent::uint32($seed % 65521);
+            $random = parent::uInt($seed % 65521);
+
+            $k = self::ROTORSZ - 1 - $i;
+            $ic = ($random & self::MASK) % ($k + 1);
+
+            // make sure the returned value is an unsigned int
+            $random = parent::uInt($random >> 8);
+
+            $temp = $this->t1[$k];
+            $this->t1[$k] = $this->t1[$ic];
+            $this->t1[$ic] = $temp;
+            if($this->t3[$k] != 0)
+                continue;
+
+            $ic = ($random & self::MASK) % $k;
+            while($this->t3[$ic] != 0)
+                $ic = ($ic + 1) % $k;
+
+            $this->t3[$k] = $ic;
+            $this->t3[$ic] = $k;
+        }
+
+        // sets $t2
+        for($i = 0; $i < self::ROTORSZ; ++$i)
+        {
+            $pos = $this->t1[$i] & self::MASK;
+            $this->t2[$pos] = $i;
+        }
+
+        // now convert $t1, $t2, $t3, $deck values to signed chars,
+        // PHP's chr() function returns an unsigned char, so we have
+        // to use use our own
+        $this->t1   = array_map("parent::sChar", $this->t1);
+        $this->t2   = array_map("parent::sChar", $this->t2);
+        $this->t3   = array_map("parent::sChar", $this->t3);
+        $this->deck = array_map("parent::sChar", $this->deck);
+    }
+
+
+    /**
+     * Indicates this is a stream cipher
+     *
+     * @return integer Returns Cipher::STREAM
+     */
+    public function type()
+    {
+        return parent::STREAM;
+    }
 }
 ?>

Spacing +10 added lines, -10 removed lines

@@ -140,7 +140,7 @@ 
 		$this->nr2 = 0;
 
 		$max = strlen($str);
-		for($j = 0; $j < $max; ++$j)
+		for ($j = 0; $j < $max; ++$j)
 		{
 			$i = ord($str[$j]);
 			$this->nr1 = $this->n1;
@@ -153,12 +153,12 @@ 
 			$str[$j] = chr($i);
 			$this->n1++;
 
-			if($this->n1 == self::ROTORSZ)
+			if ($this->n1 == self::ROTORSZ)
 			{
 				$this->n1 = 0;
 				$this->n2++;
 
-				if($this->n2 == self::ROTORSZ)
+				if ($this->n2 == self::ROTORSZ)
 					$this->n2 = 0;
 
 				$this->nr2 = $this->n2;
@@ -189,22 +189,22 @@ 
 		$klen = $this->keySize();
 
 		// get the key to exactly 13 bytes if it's less than 13
-		if($klen < 13)
+		if ($klen < 13)
 			$this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
 
 		$seed = 123;
-		for($i = 0; $i < 13; ++$i)
+		for ($i = 0; $i < 13; ++$i)
 			$seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
 
 		// sets $t1 and $deck
-		for($i = 0; $i < self::ROTORSZ; ++$i)
+		for ($i = 0; $i < self::ROTORSZ; ++$i)
 		{
 			$this->t1[] = $i;
 			$this->deck[] = $i;
 		}
 
 		// sets $t3
-		for($i = 0; $i < self::ROTORSZ; ++$i)
+		for ($i = 0; $i < self::ROTORSZ; ++$i)
 		{
 			// make sure the return values are 32 bit
 			$seed = 5 * parent::sInt32($seed) + ord($this->xkey[$i % 13]);
@@ -223,11 +223,11 @@ 
 			$temp = $this->t1[$k];
 			$this->t1[$k] = $this->t1[$ic];
 			$this->t1[$ic] = $temp;
-			if($this->t3[$k] != 0)
+			if ($this->t3[$k] != 0)
 				continue;
 
 			$ic = ($random & self::MASK) % $k;
-			while($this->t3[$ic] != 0)
+			while ($this->t3[$ic] != 0)
 				$ic = ($ic + 1) % $k;
 
 			$this->t3[$k] = $ic;
@@ -235,7 +235,7 @@ 
 		}
 
 		// sets $t2
-		for($i = 0; $i < self::ROTORSZ; ++$i)
+		for ($i = 0; $i < self::ROTORSZ; ++$i)
 		{
 			$pos = $this->t1[$i] & self::MASK;
 			$this->t2[$pos] = $i;

Braces +15 added lines, -10 removed lines

@@ -158,8 +158,9 @@ 
 				$this->n1 = 0;
 				$this->n2++;
 
-				if($this->n2 == self::ROTORSZ)
-					$this->n2 = 0;
+				if($this->n2 == self::ROTORSZ) {
+									$this->n2 = 0;
+				}
 
 				$this->nr2 = $this->n2;
 			}
@@ -189,12 +190,14 @@ 
 		$klen = $this->keySize();
 
 		// get the key to exactly 13 bytes if it's less than 13
-		if($klen < 13)
-			$this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
+		if($klen < 13) {
+					$this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
+		}
 
 		$seed = 123;
-		for($i = 0; $i < 13; ++$i)
-			$seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
+		for($i = 0; $i < 13; ++$i) {
+					$seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
+		}
 
 		// sets $t1 and $deck
 		for($i = 0; $i < self::ROTORSZ; ++$i)
@@ -223,12 +226,14 @@ 
 			$temp = $this->t1[$k];
 			$this->t1[$k] = $this->t1[$ic];
 			$this->t1[$ic] = $temp;
-			if($this->t3[$k] != 0)
-				continue;
+			if($this->t3[$k] != 0) {
+							continue;
+			}
 
 			$ic = ($random & self::MASK) % $k;
-			while($this->t3[$ic] != 0)
-				$ic = ($ic + 1) % $k;
+			while($this->t3[$ic] != 0) {
+							$ic = ($ic + 1) % $k;
+			}
 
 			$this->t3[$k] = $ic;
 			$this->t3[$ic] = $k;

includes/libraries/phpcrypt/ciphers/Rijndael256.php

Indentation +28 added lines, -28 removed lines

@@ -38,39 +38,39 @@
  */
 class Cipher_Rijndael_256 extends Cipher_Rijndael
 {
-	/** @type integer BYTES_BLOCK The size of the block, in bytes */
-	const BYTES_BLOCK = 32; // 256 bits
+    /** @type integer BYTES_BLOCK The size of the block, in bytes */
+    const BYTES_BLOCK = 32; // 256 bits
 
-	//const BITS_KEY = 0;
+    //const BITS_KEY = 0;
 
 
-	/**
-	 * Constructor
-	 * Sets the key used for encryption. Also sets the requied block size
-	 *
-	 * @param string $key string containing the user supplied encryption key
-	 * @return void
-	 */
-	public function __construct($key)
-	{
-		// Set up the key
-		parent::__construct(PHP_Crypt::CIPHER_RIJNDAEL_256, $key);
+    /**
+     * Constructor
+     * Sets the key used for encryption. Also sets the requied block size
+     *
+     * @param string $key string containing the user supplied encryption key
+     * @return void
+     */
+    public function __construct($key)
+    {
+        // Set up the key
+        parent::__construct(PHP_Crypt::CIPHER_RIJNDAEL_256, $key);
 
-		// required block size in bits
-		$this->blockSize(self::BYTES_BLOCK);
+        // required block size in bits
+        $this->blockSize(self::BYTES_BLOCK);
 
-		// expand the key now that we know the key size, and the bit size
-		$this->expandKey();
-	}
+        // expand the key now that we know the key size, and the bit size
+        $this->expandKey();
+    }
 
 
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
 }

includes/libraries/phpcrypt/ciphers/AES128.php

Indentation +25 added lines, -25 removed lines

@@ -38,34 +38,34 @@
  */
 class Cipher_AES_128 extends Cipher_Rijndael_128
 {
-	/** @type integer BYTES_BLOCK The size of the block, in bytes */
-	const BYTES_BLOCK = 16; //128 bits;
+    /** @type integer BYTES_BLOCK The size of the block, in bytes */
+    const BYTES_BLOCK = 16; //128 bits;
 
-	/** @type integer BYTES_KEY The size of the key, in bytes */
-	const BYTES_KEY = 16; // 128 bits;
+    /** @type integer BYTES_KEY The size of the key, in bytes */
+    const BYTES_KEY = 16; // 128 bits;
 
-	/**
-	 * Constructor, Sets the key used for encryption.
-	 *
-	 * @param string $key string containing the user supplied encryption key
-	 * @return void
-	 */
-	public function __construct($key)
-	{
-		// Setup AES by calling the second constructor in Rijndael_128
-		// The block size is set here too, since all AES implementations use 128 bit blocks
-		parent::__construct1(PHP_Crypt::CIPHER_AES_128, $key, self::BYTES_KEY);
-	}
+    /**
+     * Constructor, Sets the key used for encryption.
+     *
+     * @param string $key string containing the user supplied encryption key
+     * @return void
+     */
+    public function __construct($key)
+    {
+        // Setup AES by calling the second constructor in Rijndael_128
+        // The block size is set here too, since all AES implementations use 128 bit blocks
+        parent::__construct1(PHP_Crypt::CIPHER_AES_128, $key, self::BYTES_KEY);
+    }
 
 
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
 }
 ?>

includes/libraries/phpcrypt/ciphers/Blowfish.php

Indentation +550 added lines, -550 removed lines

@@ -40,563 +40,563 @@
  */
 class Cipher_Blowfish extends Cipher
 {
-	/** @type integer BYTES_BLOCK The size of the block, in bytes */
-	const BYTES_BLOCK = 8; // 64 bits;
+    /** @type integer BYTES_BLOCK The size of the block, in bytes */
+    const BYTES_BLOCK = 8; // 64 bits;
 
-	// a variable length key, between 8 - 448 bits
-	//const BYTES_KEY = 0;
+    // a variable length key, between 8 - 448 bits
+    //const BYTES_KEY = 0;
 
-	/** @type array $_sbox1 S-Box 1 */
-	private static $_sbox1 = array();
+    /** @type array $_sbox1 S-Box 1 */
+    private static $_sbox1 = array();
 
-	/** @type string $_sbox2 S-Box 2 */
-	private static $_sbox2 = array();
+    /** @type string $_sbox2 S-Box 2 */
+    private static $_sbox2 = array();
 
-	/** @type string $_sbox3 S-Box 3 */
-	private static $_sbox3 = array();
+    /** @type string $_sbox3 S-Box 3 */
+    private static $_sbox3 = array();
 
-	/** @type string $_sbox4 S-Box 4 */
-	private static $_sbox4 = array();
+    /** @type string $_sbox4 S-Box 4 */
+    private static $_sbox4 = array();
 
-	/** @type array $_p The P-Array, 18 elements long */
-	private static $_p = array();
+    /** @type array $_p The P-Array, 18 elements long */
+    private static $_p = array();
 
-	/** @type integer $key_pos Used for keyChunk(), to determine the current
+    /** @type integer $key_pos Used for keyChunk(), to determine the current
 	position in the key */
-	private $key_pos = 0;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $key The key used for Encryption/Decryption
-	 * @return void
-	 */
-	public function __construct($key)
-	{
-		// the max length of the key is 448 bits (56 bytes)
-		$keylen = strlen($key);
-		if($keylen > 56)
-		{
-			$key = substr($key, 0, 56);
-			$keylen = 56;
-		}
-		else if($keylen < 1)
-		{
-			$msg  = "No key given. The key must be between 1 - 56 bytes.";
-			trigger_error($msg, E_USER_WARNING);
-		}
-
-		// set the key, make sure the required length is set in bits
-		parent::__construct(PHP_Crypt::CIPHER_BLOWFISH, $key, $keylen);
-
-		// set the block size
-		$this->blockSize(self::BYTES_BLOCK);
-
-		$this->initTables();
-		$this->subKeys();
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypt plain text data
-	 *
-	 * @param string $data A 64 bit (8 byte) plain text string
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$data)
-	{
-		$this->operation(parent::ENCRYPT);
-		return $this->blowfish($data);
-	}
-
-
-	/**
-	 * Decrypt an encrypted string
-	 *
-	 * @param string $data A 64 bit block of Blowfish encrypted data
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$data)
-	{
-		$this->operation(parent::DECRYPT);
-		return $this->blowfish($data);
-	}
-
-
-	/**
-	 * The same alorigthm is used for both Encryption, and Decryption
-	 *
-	 * @param string $data A 64 bit block of data
-	 * @return boolean Returns true
-	 */
-	private function blowfish(&$data)
-	{
-		// divide the data into into two 32 bit halves
-		$xl = parent::str2Dec(substr($data, 0, 4));
-		$xr = parent::str2Dec(substr($data, 4, 4));
-
-		for($i = 0; $i < 16; ++$i)
-		{
-			if($this->operation() == parent::ENCRYPT)
-				$xl ^= self::$_p[$i];
-			else
-				$xl ^= self::$_p[17-$i];
-
-			// perform F() on the left half, and XOR with the right half
-			$xr = $this->F($xl) ^ $xr;
-
-			// swap $xl and $xr
-			$tmp = $xr;
-			$xr = $xl;
-			$xl = $tmp;
-		}
-
-		// swap $xl and $xr after the 16th round to undo the last swap
-		$tmp = $xl;
-		$xl  = $xr;
-		$xr  = $tmp;
-
-		// XOR the final two elements of $_p
-		if($this->operation() == parent::ENCRYPT)
-		{
-			$xr ^= self::$_p[16];
-			$xl  = $xl ^ self::$_p[17];
-		}
-		else // parent::DECRYPT
-		{
-			$xr ^= self::$_p[1];
-			$xl ^= self::$_p[0];
-		}
-
-		// recombine the two halves, force them to be 4 bytes each
-		$data = parent::dec2Str($xl, 4).parent::dec2Str($xr, 4);
-
-		return true;
-	}
-
-
-	/**
-	 * Blowfish's F() function
-	 *
-	 * @param string $i A 32 bit integer
-	 */
-	private function F($i)
-	{
-		// split the 32 bits into four 8 bit parts
-		$x[0] = $i & 0xff; // first byte
-		$x[1] = ($i >> 8)  & 0xff; // second byte
-		$x[2] = ($i >> 16) & 0xff; // third byte
-		$x[3] = ($i >> 24) & 0xff; // fourth byte
-
-		// perform F(), make sure all values returned are
-		// unsigned 32 bit
-		$f  = parent::uInt32(self::$_sbox1[$x[3]] + self::$_sbox2[$x[2]]);
-		$f  = parent::uInt32($f ^ self::$_sbox3[$x[1]]);
-		$f  = parent::uInt32($f + self::$_sbox4[$x[0]]);
-
-		return $f;
-	}
-
-
-	/**
-	 * Generates the subkeys used in Blowfish
-	 *
-	 * @return void
-	 */
-	private function subKeys()
-	{
-		// now xor each element of $_p with 32 bits from the key
-		for($i = 0; $i < 18; ++$i)
-		{
-			$c = $this->keyChunk(4);
-			self::$_p[$i] ^= parent::str2Dec($c);
-		}
-
-		// start with an 8 byte null string
-		$zero = "\0\0\0\0\0\0\0\0";
-
-		// now we loop, each loop replacing elements of $_p, or an $_sbox with the
-		// repeatedly encrypted zero string
-		for($i = 0; $i < 1042; $i += 2)
-		{
-			// encrypt the 64 bit null string
-			$this->encrypt($zero);
-
-			// split the encrypted null string into two 32 bit parts
-			$z0 = parent::str2Dec(substr($zero, 0, 4));
-			$z1 = parent::str2Dec(substr($zero, 4, 4));
-
-			// now fill the $_p, $_sbox1, $_sbox2, $_sbox3, $_sbox4
-			// with 4 bytes from the repeatedly encrypted 8 byte null string
-			if($i < 18)
-			{
-				self::$_p[$i] = $z0;
-				self::$_p[$i + 1] = $z1;
-			}
-			else if($i >= 18 && $i < 274)
-			{
-				self::$_sbox1[$i - 18] = $z0;
-				self::$_sbox1[$i - 18 + 1] = $z1;
-			}
-			else if($i >= 274 && $i < 530)
-			{
-				self::$_sbox2[$i - 274] = $z0;
-				self::$_sbox2[$i - 274 + 1] = $z1;
-			}
-			else if($i >= 530 && $i < 786)
-			{
-				self::$_sbox3[$i - 530] = $z0;
-				self::$_sbox3[$i - 530 + 1] = $z1;
-			}
-			else if($i >= 786 && $i < 1042)
-			{
-				self::$_sbox4[$i -786] = $z0;
-				self::$_sbox4[$i - 786 + 1] = $z1;
-			}
-		}
-	}
-
-
-	/**
-	 * Returns a substring of $this->key. The size of the substring is set in the
-	 * parameter $size. Each call to this function returns a substring starting
-	 * in the position where the last substring ended. Effectively it rotates
-	 * through the key, when it reaches the end, it starts over at the
-	 * beginning of the key and continues on. You can reset the current position
-	 * by setting the parameter $reset=true, which will start the key back at the
-	 * first byte of the $this->key string.
-	 *
-	 * @param integer $size The size of the substring to return, in bytes
-	 * @param bool $reset If set to true, sets the position back to 0, the first
-	 *	byte of the key string
-	 * @return string The next substring of the key
-	 */
-	private function keyChunk($size = 1, $reset = false)
-	{
-		if($reset || $this->key_pos >= $this->keySize())
-			$this->key_pos = 0;
-
-		$bytes = substr($this->key(), $this->key_pos, $size);
-		$len = strlen($bytes);
-		if($len < $size)
-		{
-			$bytes .= substr($this->key(), 0, $size - $len);
-			$this->key_pos = $size - $len;
-		}
-		else
-			$this->key_pos += $size;
-
-		return $bytes;
-	}
-
-
-	/**
-	 * Initialize the tables used in Blowfish Encryption. These
-	 * are calculated from the value of PI. We grabbed
-	 * these from the mcrypt blowfish source, which already had
-	 * these values calculated
-	 *
-	 * @return void
-	 */
-	private function initTables()
-	{
-		self::$_sbox1 = array(
-			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-			0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-			0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-			0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-			0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-			0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-			0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-			0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-			0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-			0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-			0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-			0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-			0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-			0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-			0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-			0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-			0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-			0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-			0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-			0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-			0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-			0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-			0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-			0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-			0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-			0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-			0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-			0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-			0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-			0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-			0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-			0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-			0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-			0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-			0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-			0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-			0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-			0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-			0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-			0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-			0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-			0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-			0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-			0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-			0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-			0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-			0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-			0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-		);
-
-		self::$_sbox2 = array(
-			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-			0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-			0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-			0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-			0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-			0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-			0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-			0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-			0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-			0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-			0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-			0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-			0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-			0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-			0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-			0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-			0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-			0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-			0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-			0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-			0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-			0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-			0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-			0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-			0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-			0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-			0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-			0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-			0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-			0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-			0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-			0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-			0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-			0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-			0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-			0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-			0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-			0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-			0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-			0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-			0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-			0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-			0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-			0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-			0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-			0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-			0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-			0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-		);
-
-		self::$_sbox3 = array(
-			0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-			0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-			0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-			0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-			0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-			0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-			0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-			0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-			0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-			0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-			0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-			0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-			0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-			0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-			0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-			0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-			0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-			0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-			0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-			0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-			0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-			0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-			0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-			0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-			0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-			0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-			0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-			0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-			0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-			0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-			0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-			0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-			0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-			0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-			0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-			0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-			0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-			0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-			0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-			0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-			0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-			0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-			0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-			0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-			0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-			0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-			0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-		);
-
-		self::$_sbox4 = array(
-			0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-			0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-			0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-			0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-			0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-			0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-			0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-			0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-			0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-			0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-			0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-			0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-			0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-			0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-			0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-			0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-			0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-			0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-			0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-			0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-			0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-			0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-			0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-			0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-			0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-			0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-			0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-			0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-			0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-			0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-			0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-			0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-			0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-			0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-			0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-			0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-			0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-			0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-			0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-			0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-			0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-			0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-			0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-			0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-			0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-			0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-			0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-		);
-
-		self::$_p = array(
-			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-			0x9216d5d9, 0x8979fb1b
-		);
-	}
-
-
-	/**
-	 * Indicates this is a block cipher
-	 *
-	 * @return integer Returns Cipher::BLOCK
-	 */
-	public function type()
-	{
-		return parent::BLOCK;
-	}
+    private $key_pos = 0;
+
+    /**
+     * Constructor
+     *
+     * @param string $key The key used for Encryption/Decryption
+     * @return void
+     */
+    public function __construct($key)
+    {
+        // the max length of the key is 448 bits (56 bytes)
+        $keylen = strlen($key);
+        if($keylen > 56)
+        {
+            $key = substr($key, 0, 56);
+            $keylen = 56;
+        }
+        else if($keylen < 1)
+        {
+            $msg  = "No key given. The key must be between 1 - 56 bytes.";
+            trigger_error($msg, E_USER_WARNING);
+        }
+
+        // set the key, make sure the required length is set in bits
+        parent::__construct(PHP_Crypt::CIPHER_BLOWFISH, $key, $keylen);
+
+        // set the block size
+        $this->blockSize(self::BYTES_BLOCK);
+
+        $this->initTables();
+        $this->subKeys();
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypt plain text data
+     *
+     * @param string $data A 64 bit (8 byte) plain text string
+     * @return boolean Returns true
+     */
+    public function encrypt(&$data)
+    {
+        $this->operation(parent::ENCRYPT);
+        return $this->blowfish($data);
+    }
+
+
+    /**
+     * Decrypt an encrypted string
+     *
+     * @param string $data A 64 bit block of Blowfish encrypted data
+     * @return boolean Returns true
+     */
+    public function decrypt(&$data)
+    {
+        $this->operation(parent::DECRYPT);
+        return $this->blowfish($data);
+    }
+
+
+    /**
+     * The same alorigthm is used for both Encryption, and Decryption
+     *
+     * @param string $data A 64 bit block of data
+     * @return boolean Returns true
+     */
+    private function blowfish(&$data)
+    {
+        // divide the data into into two 32 bit halves
+        $xl = parent::str2Dec(substr($data, 0, 4));
+        $xr = parent::str2Dec(substr($data, 4, 4));
+
+        for($i = 0; $i < 16; ++$i)
+        {
+            if($this->operation() == parent::ENCRYPT)
+                $xl ^= self::$_p[$i];
+            else
+                $xl ^= self::$_p[17-$i];
+
+            // perform F() on the left half, and XOR with the right half
+            $xr = $this->F($xl) ^ $xr;
+
+            // swap $xl and $xr
+            $tmp = $xr;
+            $xr = $xl;
+            $xl = $tmp;
+        }
+
+        // swap $xl and $xr after the 16th round to undo the last swap
+        $tmp = $xl;
+        $xl  = $xr;
+        $xr  = $tmp;
+
+        // XOR the final two elements of $_p
+        if($this->operation() == parent::ENCRYPT)
+        {
+            $xr ^= self::$_p[16];
+            $xl  = $xl ^ self::$_p[17];
+        }
+        else // parent::DECRYPT
+        {
+            $xr ^= self::$_p[1];
+            $xl ^= self::$_p[0];
+        }
+
+        // recombine the two halves, force them to be 4 bytes each
+        $data = parent::dec2Str($xl, 4).parent::dec2Str($xr, 4);
+
+        return true;
+    }
+
+
+    /**
+     * Blowfish's F() function
+     *
+     * @param string $i A 32 bit integer
+     */
+    private function F($i)
+    {
+        // split the 32 bits into four 8 bit parts
+        $x[0] = $i & 0xff; // first byte
+        $x[1] = ($i >> 8)  & 0xff; // second byte
+        $x[2] = ($i >> 16) & 0xff; // third byte
+        $x[3] = ($i >> 24) & 0xff; // fourth byte
+
+        // perform F(), make sure all values returned are
+        // unsigned 32 bit
+        $f  = parent::uInt32(self::$_sbox1[$x[3]] + self::$_sbox2[$x[2]]);
+        $f  = parent::uInt32($f ^ self::$_sbox3[$x[1]]);
+        $f  = parent::uInt32($f + self::$_sbox4[$x[0]]);
+
+        return $f;
+    }
+
+
+    /**
+     * Generates the subkeys used in Blowfish
+     *
+     * @return void
+     */
+    private function subKeys()
+    {
+        // now xor each element of $_p with 32 bits from the key
+        for($i = 0; $i < 18; ++$i)
+        {
+            $c = $this->keyChunk(4);
+            self::$_p[$i] ^= parent::str2Dec($c);
+        }
+
+        // start with an 8 byte null string
+        $zero = "\0\0\0\0\0\0\0\0";
+
+        // now we loop, each loop replacing elements of $_p, or an $_sbox with the
+        // repeatedly encrypted zero string
+        for($i = 0; $i < 1042; $i += 2)
+        {
+            // encrypt the 64 bit null string
+            $this->encrypt($zero);
+
+            // split the encrypted null string into two 32 bit parts
+            $z0 = parent::str2Dec(substr($zero, 0, 4));
+            $z1 = parent::str2Dec(substr($zero, 4, 4));
+
+            // now fill the $_p, $_sbox1, $_sbox2, $_sbox3, $_sbox4
+            // with 4 bytes from the repeatedly encrypted 8 byte null string
+            if($i < 18)
+            {
+                self::$_p[$i] = $z0;
+                self::$_p[$i + 1] = $z1;
+            }
+            else if($i >= 18 && $i < 274)
+            {
+                self::$_sbox1[$i - 18] = $z0;
+                self::$_sbox1[$i - 18 + 1] = $z1;
+            }
+            else if($i >= 274 && $i < 530)
+            {
+                self::$_sbox2[$i - 274] = $z0;
+                self::$_sbox2[$i - 274 + 1] = $z1;
+            }
+            else if($i >= 530 && $i < 786)
+            {
+                self::$_sbox3[$i - 530] = $z0;
+                self::$_sbox3[$i - 530 + 1] = $z1;
+            }
+            else if($i >= 786 && $i < 1042)
+            {
+                self::$_sbox4[$i -786] = $z0;
+                self::$_sbox4[$i - 786 + 1] = $z1;
+            }
+        }
+    }
+
+
+    /**
+     * Returns a substring of $this->key. The size of the substring is set in the
+     * parameter $size. Each call to this function returns a substring starting
+     * in the position where the last substring ended. Effectively it rotates
+     * through the key, when it reaches the end, it starts over at the
+     * beginning of the key and continues on. You can reset the current position
+     * by setting the parameter $reset=true, which will start the key back at the
+     * first byte of the $this->key string.
+     *
+     * @param integer $size The size of the substring to return, in bytes
+     * @param bool $reset If set to true, sets the position back to 0, the first
+     *	byte of the key string
+     * @return string The next substring of the key
+     */
+    private function keyChunk($size = 1, $reset = false)
+    {
+        if($reset || $this->key_pos >= $this->keySize())
+            $this->key_pos = 0;
+
+        $bytes = substr($this->key(), $this->key_pos, $size);
+        $len = strlen($bytes);
+        if($len < $size)
+        {
+            $bytes .= substr($this->key(), 0, $size - $len);
+            $this->key_pos = $size - $len;
+        }
+        else
+            $this->key_pos += $size;
+
+        return $bytes;
+    }
+
+
+    /**
+     * Initialize the tables used in Blowfish Encryption. These
+     * are calculated from the value of PI. We grabbed
+     * these from the mcrypt blowfish source, which already had
+     * these values calculated
+     *
+     * @return void
+     */
+    private function initTables()
+    {
+        self::$_sbox1 = array(
+            0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+            0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+            0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+            0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+            0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+            0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+            0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+            0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+            0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+            0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+            0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+            0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+            0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+            0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+            0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+            0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+            0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+            0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+            0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+            0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+            0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+            0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+            0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+            0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+            0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+            0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+            0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+            0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+            0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+            0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+            0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+            0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+            0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+            0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+            0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+            0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+            0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+            0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+            0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+            0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+            0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+            0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+            0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+            0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+            0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+            0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+            0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+            0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+            0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+            0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+            0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+            0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+            0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+            0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+            0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+            0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+            0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+            0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+            0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+            0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+            0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+            0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+            0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+            0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+        );
+
+        self::$_sbox2 = array(
+            0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+            0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+            0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+            0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+            0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+            0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+            0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+            0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+            0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+            0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+            0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+            0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+            0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+            0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+            0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+            0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+            0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+            0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+            0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+            0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+            0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+            0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+            0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+            0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+            0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+            0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+            0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+            0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+            0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+            0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+            0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+            0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+            0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+            0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+            0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+            0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+            0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+            0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+            0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+            0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+            0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+            0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+            0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+            0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+            0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+            0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+            0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+            0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+            0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+            0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+            0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+            0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+            0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+            0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+            0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+            0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+            0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+            0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+            0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+            0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+            0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+            0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+            0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+            0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+        );
+
+        self::$_sbox3 = array(
+            0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+            0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+            0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+            0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+            0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+            0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+            0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+            0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+            0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+            0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+            0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+            0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+            0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+            0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+            0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+            0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+            0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+            0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+            0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+            0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+            0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+            0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+            0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+            0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+            0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+            0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+            0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+            0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+            0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+            0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+            0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+            0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+            0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+            0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+            0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+            0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+            0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+            0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+            0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+            0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+            0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+            0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+            0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+            0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+            0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+            0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+            0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+            0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+            0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+            0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+            0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+            0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+            0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+            0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+            0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+            0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+            0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+            0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+            0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+            0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+            0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+            0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+            0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+            0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+        );
+
+        self::$_sbox4 = array(
+            0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+            0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+            0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+            0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+            0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+            0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+            0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+            0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+            0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+            0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+            0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+            0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+            0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+            0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+            0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+            0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+            0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+            0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+            0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+            0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+            0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+            0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+            0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+            0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+            0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+            0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+            0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+            0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+            0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+            0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+            0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+            0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+            0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+            0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+            0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+            0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+            0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+            0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+            0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+            0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+            0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+            0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+            0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+            0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+            0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+            0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+            0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+            0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+            0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+            0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+            0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+            0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+            0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+            0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+            0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+            0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+            0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+            0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+            0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+            0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+            0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+            0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+            0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+            0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+        );
+
+        self::$_p = array(
+            0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+            0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+            0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+            0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+            0x9216d5d9, 0x8979fb1b
+        );
+    }
+
+
+    /**
+     * Indicates this is a block cipher
+     *
+     * @return integer Returns Cipher::BLOCK
+     */
+    public function type()
+    {
+        return parent::BLOCK;
+    }
 }
 ?>

Spacing +18 added lines, -18 removed lines

@@ -75,14 +75,14 @@ 
 	{
 		// the max length of the key is 448 bits (56 bytes)
 		$keylen = strlen($key);
-		if($keylen > 56)
+		if ($keylen > 56)
 		{
 			$key = substr($key, 0, 56);
 			$keylen = 56;
 		}
-		else if($keylen < 1)
+		else if ($keylen < 1)
 		{
-			$msg  = "No key given. The key must be between 1 - 56 bytes.";
+			$msg = "No key given. The key must be between 1 - 56 bytes.";
 			trigger_error($msg, E_USER_WARNING);
 		}
 
@@ -146,12 +146,12 @@ 
 		$xl = parent::str2Dec(substr($data, 0, 4));
 		$xr = parent::str2Dec(substr($data, 4, 4));
 
-		for($i = 0; $i < 16; ++$i)
+		for ($i = 0; $i < 16; ++$i)
 		{
-			if($this->operation() == parent::ENCRYPT)
+			if ($this->operation() == parent::ENCRYPT)
 				$xl ^= self::$_p[$i];
 			else
-				$xl ^= self::$_p[17-$i];
+				$xl ^= self::$_p[17 - $i];
 
 			// perform F() on the left half, and XOR with the right half
 			$xr = $this->F($xl) ^ $xr;
@@ -168,7 +168,7 @@ 
 		$xr  = $tmp;
 
 		// XOR the final two elements of $_p
-		if($this->operation() == parent::ENCRYPT)
+		if ($this->operation() == parent::ENCRYPT)
 		{
 			$xr ^= self::$_p[16];
 			$xl  = $xl ^ self::$_p[17];
@@ -195,7 +195,7 @@ 
 	{
 		// split the 32 bits into four 8 bit parts
 		$x[0] = $i & 0xff; // first byte
-		$x[1] = ($i >> 8)  & 0xff; // second byte
+		$x[1] = ($i >> 8) & 0xff; // second byte
 		$x[2] = ($i >> 16) & 0xff; // third byte
 		$x[3] = ($i >> 24) & 0xff; // fourth byte
 
@@ -217,7 +217,7 @@ 
 	private function subKeys()
 	{
 		// now xor each element of $_p with 32 bits from the key
-		for($i = 0; $i < 18; ++$i)
+		for ($i = 0; $i < 18; ++$i)
 		{
 			$c = $this->keyChunk(4);
 			self::$_p[$i] ^= parent::str2Dec($c);
@@ -228,7 +228,7 @@ 
 
 		// now we loop, each loop replacing elements of $_p, or an $_sbox with the
 		// repeatedly encrypted zero string
-		for($i = 0; $i < 1042; $i += 2)
+		for ($i = 0; $i < 1042; $i += 2)
 		{
 			// encrypt the 64 bit null string
 			$this->encrypt($zero);
@@ -239,29 +239,29 @@ 
 
 			// now fill the $_p, $_sbox1, $_sbox2, $_sbox3, $_sbox4
 			// with 4 bytes from the repeatedly encrypted 8 byte null string
-			if($i < 18)
+			if ($i < 18)
 			{
 				self::$_p[$i] = $z0;
 				self::$_p[$i + 1] = $z1;
 			}
-			else if($i >= 18 && $i < 274)
+			else if ($i >= 18 && $i < 274)
 			{
 				self::$_sbox1[$i - 18] = $z0;
 				self::$_sbox1[$i - 18 + 1] = $z1;
 			}
-			else if($i >= 274 && $i < 530)
+			else if ($i >= 274 && $i < 530)
 			{
 				self::$_sbox2[$i - 274] = $z0;
 				self::$_sbox2[$i - 274 + 1] = $z1;
 			}
-			else if($i >= 530 && $i < 786)
+			else if ($i >= 530 && $i < 786)
 			{
 				self::$_sbox3[$i - 530] = $z0;
 				self::$_sbox3[$i - 530 + 1] = $z1;
 			}
-			else if($i >= 786 && $i < 1042)
+			else if ($i >= 786 && $i < 1042)
 			{
-				self::$_sbox4[$i -786] = $z0;
+				self::$_sbox4[$i - 786] = $z0;
 				self::$_sbox4[$i - 786 + 1] = $z1;
 			}
 		}
@@ -284,12 +284,12 @@ 
 	 */
 	private function keyChunk($size = 1, $reset = false)
 	{
-		if($reset || $this->key_pos >= $this->keySize())
+		if ($reset || $this->key_pos >= $this->keySize())
 			$this->key_pos = 0;
 
 		$bytes = substr($this->key(), $this->key_pos, $size);
 		$len = strlen($bytes);
-		if($len < $size)
+		if ($len < $size)
 		{
 			$bytes .= substr($this->key(), 0, $size - $len);
 			$this->key_pos = $size - $len;

Braces +16 added lines, -20 removed lines

@@ -79,8 +79,7 @@ 
 		{
 			$key = substr($key, 0, 56);
 			$keylen = 56;
-		}
-		else if($keylen < 1)
+		} else if($keylen < 1)
 		{
 			$msg  = "No key given. The key must be between 1 - 56 bytes.";
 			trigger_error($msg, E_USER_WARNING);
@@ -148,10 +147,11 @@ 
 
 		for($i = 0; $i < 16; ++$i)
 		{
-			if($this->operation() == parent::ENCRYPT)
-				$xl ^= self::$_p[$i];
-			else
-				$xl ^= self::$_p[17-$i];
+			if($this->operation() == parent::ENCRYPT) {
+							$xl ^= self::$_p[$i];
+			} else {
+							$xl ^= self::$_p[17-$i];
+			}
 
 			// perform F() on the left half, and XOR with the right half
 			$xr = $this->F($xl) ^ $xr;
@@ -172,8 +172,7 @@ 
 		{
 			$xr ^= self::$_p[16];
 			$xl  = $xl ^ self::$_p[17];
-		}
-		else // parent::DECRYPT
+		} else // parent::DECRYPT
 		{
 			$xr ^= self::$_p[1];
 			$xl ^= self::$_p[0];
@@ -243,23 +242,19 @@ 
 			{
 				self::$_p[$i] = $z0;
 				self::$_p[$i + 1] = $z1;
-			}
-			else if($i >= 18 && $i < 274)
+			} else if($i >= 18 && $i < 274)
 			{
 				self::$_sbox1[$i - 18] = $z0;
 				self::$_sbox1[$i - 18 + 1] = $z1;
-			}
-			else if($i >= 274 && $i < 530)
+			} else if($i >= 274 && $i < 530)
 			{
 				self::$_sbox2[$i - 274] = $z0;
 				self::$_sbox2[$i - 274 + 1] = $z1;
-			}
-			else if($i >= 530 && $i < 786)
+			} else if($i >= 530 && $i < 786)
 			{
 				self::$_sbox3[$i - 530] = $z0;
 				self::$_sbox3[$i - 530 + 1] = $z1;
-			}
-			else if($i >= 786 && $i < 1042)
+			} else if($i >= 786 && $i < 1042)
 			{
 				self::$_sbox4[$i -786] = $z0;
 				self::$_sbox4[$i - 786 + 1] = $z1;
@@ -284,8 +279,9 @@ 
 	 */
 	private function keyChunk($size = 1, $reset = false)
 	{
-		if($reset || $this->key_pos >= $this->keySize())
-			$this->key_pos = 0;
+		if($reset || $this->key_pos >= $this->keySize()) {
+					$this->key_pos = 0;
+		}
 
 		$bytes = substr($this->key(), $this->key_pos, $size);
 		$len = strlen($bytes);
@@ -293,9 +289,9 @@ 
 		{
 			$bytes .= substr($this->key(), 0, $size - $len);
 			$this->key_pos = $size - $len;
+		} else {
+					$this->key_pos += $size;
 		}
-		else
-			$this->key_pos += $size;
 
 		return $bytes;
 	}