nilsteampassnet / TeamPass

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

Spacing +6 added lines, -6 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'])) {

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

Spacing +24 added lines, -24 removed lines

@@ -419,18 +419,18 @@ 
         $l = $in[1];
         $r = $in[2];
 
-        for ($i = 0; $i < 16; $i+= 2) {
-            $l^= $p[$i];
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
-                  $sb_1[$l >> 16 & 0xff]  ^
-                    $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff];
-
-            $r^= $p[$i + 1];
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
-                  $sb_1[$r >> 16 & 0xff]  ^
-                    $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff];
+        for ($i = 0; $i < 16; $i += 2) {
+            $l ^= $p[$i];
+            $r ^= ($sb_0[$l >> 24 & 0xff] +
+                  $sb_1[$l >> 16 & 0xff] ^
+                    $sb_2[$l >> 8 & 0xff]) +
+                  $sb_3[$l & 0xff];
+
+            $r ^= $p[$i + 1];
+            $l ^= ($sb_0[$r >> 24 & 0xff] +
+                  $sb_1[$r >> 16 & 0xff] ^
+                    $sb_2[$r >> 8 & 0xff]) +
+                  $sb_3[$r & 0xff];
         }
         return pack("N*", $r ^ $p[17], $l ^ $p[16]);
     }
@@ -454,18 +454,18 @@ 
         $l = $in[1];
         $r = $in[2];
 
-        for ($i = 17; $i > 2; $i-= 2) {
-            $l^= $p[$i];
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
-                  $sb_1[$l >> 16 & 0xff]  ^
-                    $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff];
-
-            $r^= $p[$i - 1];
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
-                  $sb_1[$r >> 16 & 0xff]  ^
-                    $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff];
+        for ($i = 17; $i > 2; $i -= 2) {
+            $l ^= $p[$i];
+            $r ^= ($sb_0[$l >> 24 & 0xff] +
+                  $sb_1[$l >> 16 & 0xff] ^
+                    $sb_2[$l >> 8 & 0xff]) +
+                  $sb_3[$l & 0xff];
+
+            $r ^= $p[$i - 1];
+            $l ^= ($sb_0[$r >> 24 & 0xff] +
+                  $sb_1[$r >> 16 & 0xff] ^
+                    $sb_2[$r >> 8 & 0xff]) +
+                  $sb_3[$r & 0xff];
         }
         return pack("N*", $r ^ $p[0], $l ^ $p[1]);
     }

includes/libraries/Authentication/phpseclib/Crypt/RSA/PKCS1.php

Spacing +7 added lines, -7 removed lines

@@ -120,15 +120,15 @@
             $cipher->setKey(self::generateSymmetricKey($password, $iv, $cipher->getKeyLength() >> 3));
             $cipher->setIV($iv);
             $iv = strtoupper(Hex::encode($iv));
-            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                        "Proc-Type: 4,ENCRYPTED\r\n" .
-                        "DEK-Info: " . self::$defaultEncryptionAlgorithm . ",$iv\r\n" .
-                        "\r\n" .
-                        chunk_split(Base64::encode($cipher->encrypt($RSAPrivateKey)), 64) .
+            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n".
+                        "Proc-Type: 4,ENCRYPTED\r\n".
+                        "DEK-Info: ".self::$defaultEncryptionAlgorithm.",$iv\r\n".
+                        "\r\n".
+                        chunk_split(Base64::encode($cipher->encrypt($RSAPrivateKey)), 64).
                         '-----END RSA PRIVATE KEY-----';
         } else {
-            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                        chunk_split(Base64::encode($RSAPrivateKey), 64) .
+            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n".
+                        chunk_split(Base64::encode($RSAPrivateKey), 64).
                         '-----END RSA PRIVATE KEY-----';
         }
 

includes/libraries/Authentication/phpseclib/Crypt/RSA/PuTTY.php

Spacing +3 added lines, -3 removed lines

@@ -287,9 +287,9 @@
             strlen($n),
             $n
         );
-        $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n" .
-                'Comment: "' . str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment) . "\"\r\n";
-                chunk_split(Base64::encode($key), 64) .
+        $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n".
+                'Comment: "'.str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment)."\"\r\n";
+                chunk_split(Base64::encode($key), 64).
                 '---- END SSH2 PUBLIC KEY ----';
 
         return $key;

includes/libraries/Authentication/phpseclib/Crypt/RSA/PKCS8.php

Spacing +4 added lines, -4 removed lines

@@ -149,12 +149,12 @@
 
             $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, ASN1::encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
 
-            $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" .
-                    chunk_split(Base64::encode($RSAPrivateKey), 64) .
+            $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n".
+                    chunk_split(Base64::encode($RSAPrivateKey), 64).
                     '-----END ENCRYPTED PRIVATE KEY-----';
         } else {
-            $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n" .
-                    chunk_split(Base64::encode($RSAPrivateKey), 64) .
+            $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n".
+                    chunk_split(Base64::encode($RSAPrivateKey), 64).
                     '-----END PRIVATE KEY-----';
         }
 

includes/libraries/Authentication/phpseclib/Crypt/RSA/XML.php

Spacing +12 added lines, -12 removed lines

@@ -118,15 +118,15 @@ 
         if (count($primes) != 2) {
             return false;
         }
-        return "<RSAKeyValue>\r\n" .
-                '  <Modulus>' . Base64::encode($n->toBytes()) . "</Modulus>\r\n" .
-                '  <Exponent>' . Base64::encode($e->toBytes()) . "</Exponent>\r\n" .
-                '  <P>' . Base64::encode($primes[1]->toBytes()) . "</P>\r\n" .
-                '  <Q>' . Base64::encode($primes[2]->toBytes()) . "</Q>\r\n" .
-                '  <DP>' . Base64::encode($exponents[1]->toBytes()) . "</DP>\r\n" .
-                '  <DQ>' . Base64::encode($exponents[2]->toBytes()) . "</DQ>\r\n" .
-                '  <InverseQ>' . Base64::encode($coefficients[2]->toBytes()) . "</InverseQ>\r\n" .
-                '  <D>' . Base64::encode($d->toBytes()) . "</D>\r\n" .
+        return "<RSAKeyValue>\r\n".
+                '  <Modulus>'.Base64::encode($n->toBytes())."</Modulus>\r\n".
+                '  <Exponent>'.Base64::encode($e->toBytes())."</Exponent>\r\n".
+                '  <P>'.Base64::encode($primes[1]->toBytes())."</P>\r\n".
+                '  <Q>'.Base64::encode($primes[2]->toBytes())."</Q>\r\n".
+                '  <DP>'.Base64::encode($exponents[1]->toBytes())."</DP>\r\n".
+                '  <DQ>'.Base64::encode($exponents[2]->toBytes())."</DQ>\r\n".
+                '  <InverseQ>'.Base64::encode($coefficients[2]->toBytes())."</InverseQ>\r\n".
+                '  <D>'.Base64::encode($d->toBytes())."</D>\r\n".
                 '</RSAKeyValue>';
     }
 
@@ -140,9 +140,9 @@ 
      */
     static function savePublicKey(BigInteger $n, BigInteger $e)
     {
-        return "<RSAKeyValue>\r\n" .
-                '  <Modulus>' . Base64::encode($n->toBytes()) . "</Modulus>\r\n" .
-                '  <Exponent>' . Base64::encode($e->toBytes()) . "</Exponent>\r\n" .
+        return "<RSAKeyValue>\r\n".
+                '  <Modulus>'.Base64::encode($n->toBytes())."</Modulus>\r\n".
+                '  <Exponent>'.Base64::encode($e->toBytes())."</Exponent>\r\n".
                 '</RSAKeyValue>';
     }
 }

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

Spacing +29 added lines, -29 removed lines

@@ -708,12 +708,12 @@ 
         // Do the initial IP permutation.
         $t = unpack('Nl/Nr', $block);
         list($l, $r) = array($t['l'], $t['r']);
-        $block = ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                    ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+        $block = ($shuffleip[$r & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+                    ($shuffleip[($r >> 8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
                     ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
                     ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                    ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                    ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffleip[$l & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffleip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
                     ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
                     ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
 
@@ -727,14 +727,14 @@ 
                 // start of "the Feistel (F) function" - see the following URL:
                 // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
                 // Merge key schedule.
-                $b1 = (($r >>  3) & 0x1FFFFFFF) ^ ($r << 29) ^ $keys[++$ki];
-                $b2 = (($r >> 31) & 0x00000001) ^ ($r <<  1) ^ $keys[++$ki];
+                $b1 = (($r >> 3) & 0x1FFFFFFF) ^ ($r << 29) ^ $keys[++$ki];
+                $b2 = (($r >> 31) & 0x00000001) ^ ($r << 1) ^ $keys[++$ki];
 
                 // S-box indexing.
                 $t = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
                         $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
-                        $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                        $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $l;
+                        $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^
+                        $sbox7[$b1 & 0x3F] ^ $sbox8[$b2 & 0x3F] ^ $l;
                 // end of "the Feistel (F) function"
 
                 $l = $r;
@@ -752,10 +752,10 @@ 
                 ($shuffleinvip[($l >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
                 ($shuffleinvip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
                 ($shuffleinvip[($l >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                ($shuffleinvip[($r >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                ($shuffleinvip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                ($shuffleinvip[ $r        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                ($shuffleinvip[ $l        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                ($shuffleinvip[($r >> 8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                ($shuffleinvip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                ($shuffleinvip[$r & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                ($shuffleinvip[$l & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
     }
 
     /**
@@ -1229,43 +1229,43 @@ 
             // Perform the PC/1 transformation and compute C and D.
             $t = unpack('Nl/Nr', $key);
             list($l, $r) = array($t['l'], $t['r']);
-            $key = ($this->shuffle[$pc1map[ $r        & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
-                    ($this->shuffle[$pc1map[($r >>  8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
+            $key = ($this->shuffle[$pc1map[$r & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
+                    ($this->shuffle[$pc1map[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
                     ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
                     ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
-                    ($this->shuffle[$pc1map[ $l        & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
-                    ($this->shuffle[$pc1map[($l >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
+                    ($this->shuffle[$pc1map[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
+                    ($this->shuffle[$pc1map[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
                     ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
                     ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
             $key = unpack('Nc/Nd', $key);
-            $c = ( $key['c'] >> 4) & 0x0FFFFFFF;
+            $c = ($key['c'] >> 4) & 0x0FFFFFFF;
             $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
 
             $keys[$des_round] = array(
                 self::ENCRYPT => array(),
                 self::DECRYPT => array_fill(0, 32, 0)
             );
-            for ($i = 0, $ki = 31; $i < 16; ++$i, $ki-= 2) {
+            for ($i = 0, $ki = 31; $i < 16; ++$i, $ki -= 2) {
                 $c <<= $shifts[$i];
                 $c = ($c | ($c >> 28)) & 0x0FFFFFFF;
                 $d <<= $shifts[$i];
                 $d = ($d | ($d >> 28)) & 0x0FFFFFFF;
 
                 // Perform the PC-2 transformation.
-                $cp = $pc2mapc1[ $c >> 24        ] | $pc2mapc2[($c >> 16) & 0xFF] |
-                        $pc2mapc3[($c >>  8) & 0xFF] | $pc2mapc4[ $c        & 0xFF];
-                $dp = $pc2mapd1[ $d >> 24        ] | $pc2mapd2[($d >> 16) & 0xFF] |
-                        $pc2mapd3[($d >>  8) & 0xFF] | $pc2mapd4[ $d        & 0xFF];
+                $cp = $pc2mapc1[$c >> 24] | $pc2mapc2[($c >> 16) & 0xFF] |
+                        $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[$c & 0xFF];
+                $dp = $pc2mapd1[$d >> 24] | $pc2mapd2[($d >> 16) & 0xFF] |
+                        $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[$d & 0xFF];
 
                 // Reorder: odd bytes/even bytes. Push the result in key schedule.
-                $val1 = ( $cp        & 0xFF000000) | (($cp <<  8) & 0x00FF0000) |
-                        (($dp >> 16) & 0x0000FF00) | (($dp >>  8) & 0x000000FF);
-                $val2 = (($cp <<  8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
-                        (($dp >>  8) & 0x0000FF00) | ( $dp        & 0x000000FF);
-                $keys[$des_round][self::ENCRYPT][       ] = $val1;
+                $val1 = ($cp & 0xFF000000) | (($cp << 8) & 0x00FF0000) |
+                        (($dp >> 16) & 0x0000FF00) | (($dp >> 8) & 0x000000FF);
+                $val2 = (($cp << 8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
+                        (($dp >> 8) & 0x0000FF00) | ($dp & 0x000000FF);
+                $keys[$des_round][self::ENCRYPT][] = $val1;
                 $keys[$des_round][self::DECRYPT][$ki - 1] = $val1;
-                $keys[$des_round][self::ENCRYPT][       ] = $val2;
-                $keys[$des_round][self::DECRYPT][$ki    ] = $val2;
+                $keys[$des_round][self::ENCRYPT][] = $val2;
+                $keys[$des_round][self::DECRYPT][$ki] = $val2;
             }
         }
 

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

Spacing +26 added lines, -26 removed lines

@@ -462,8 +462,8 @@ 
             case 16:
                 list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[1], $le_longs[2]);
                 list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[3], $le_longs[4]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
-                    $A = $m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]] ^
+                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
+                    $A = $m0[$q0[$q0[$i] ^ $key[9]] ^ $key[1]] ^
                             $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
                             $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
                             $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]];
@@ -486,8 +486,8 @@ 
                 list($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[1], $le_longs[2]);
                 list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[3], $le_longs[4]);
                 list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[5], $le_longs[6]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
-                    $A = $m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
+                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
+                    $A = $m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[9]] ^ $key[1]] ^
                             $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
                             $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
                             $m3[$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]] ^ $key[4]];
@@ -511,8 +511,8 @@ 
                 list($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[3], $le_longs[4]);
                 list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[5], $le_longs[6]);
                 list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[7], $le_longs[8]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
-                    $A = $m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
+                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
+                    $A = $m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[9]] ^ $key[1]] ^
                             $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
                             $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
                             $m3[$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]] ^ $key[4]];
@@ -610,27 +610,27 @@ 
 
         $ki = 7;
         while ($ki < 39) {
-            $t0 = $S0[ $R0        & 0xff] ^
-                    $S1[($R0 >>  8) & 0xff] ^
+            $t0 = $S0[$R0 & 0xff] ^
+                    $S1[($R0 >> 8) & 0xff] ^
                     $S2[($R0 >> 16) & 0xff] ^
                     $S3[($R0 >> 24) & 0xff];
             $t1 = $S0[($R1 >> 24) & 0xff] ^
-                    $S1[ $R1        & 0xff] ^
-                    $S2[($R1 >>  8) & 0xff] ^
+                    $S1[$R1 & 0xff] ^
+                    $S2[($R1 >> 8) & 0xff] ^
                     $S3[($R1 >> 16) & 0xff];
-            $R2^= $t0 + $t1 + $K[++$ki];
+            $R2 ^= $t0 + $t1 + $K[++$ki];
             $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
             $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
 
-            $t0 = $S0[ $R2        & 0xff] ^
-                    $S1[($R2 >>  8) & 0xff] ^
+            $t0 = $S0[$R2 & 0xff] ^
+                    $S1[($R2 >> 8) & 0xff] ^
                     $S2[($R2 >> 16) & 0xff] ^
                     $S3[($R2 >> 24) & 0xff];
             $t1 = $S0[($R3 >> 24) & 0xff] ^
-                    $S1[ $R3        & 0xff] ^
-                    $S2[($R3 >>  8) & 0xff] ^
+                    $S1[$R3 & 0xff] ^
+                    $S2[($R3 >> 8) & 0xff] ^
                     $S3[($R3 >> 16) & 0xff];
-            $R0^= ($t0 + $t1 + $K[++$ki]);
+            $R0 ^= ($t0 + $t1 + $K[++$ki]);
             $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
             $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
         }
@@ -666,27 +666,27 @@ 
 
         $ki = 40;
         while ($ki > 8) {
-            $t0 = $S0[$R0       & 0xff] ^
-                    $S1[$R0 >>  8 & 0xff] ^
+            $t0 = $S0[$R0 & 0xff] ^
+                    $S1[$R0 >> 8 & 0xff] ^
                     $S2[$R0 >> 16 & 0xff] ^
                     $S3[$R0 >> 24 & 0xff];
             $t1 = $S0[$R1 >> 24 & 0xff] ^
-                    $S1[$R1       & 0xff] ^
-                    $S2[$R1 >>  8 & 0xff] ^
+                    $S1[$R1 & 0xff] ^
+                    $S2[$R1 >> 8 & 0xff] ^
                     $S3[$R1 >> 16 & 0xff];
-            $R3^= $t0 + ($t1 << 1) + $K[--$ki];
+            $R3 ^= $t0 + ($t1 << 1) + $K[--$ki];
             $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
             $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + $K[--$ki]);
 
-            $t0 = $S0[$R2       & 0xff] ^
-                    $S1[$R2 >>  8 & 0xff] ^
+            $t0 = $S0[$R2 & 0xff] ^
+                    $S1[$R2 >> 8 & 0xff] ^
                     $S2[$R2 >> 16 & 0xff] ^
                     $S3[$R2 >> 24 & 0xff];
             $t1 = $S0[$R3 >> 24 & 0xff] ^
-                    $S1[$R3       & 0xff] ^
-                    $S2[$R3 >>  8 & 0xff] ^
+                    $S1[$R3 & 0xff] ^
+                    $S2[$R3 >> 8 & 0xff] ^
                     $S3[$R3 >> 16 & 0xff];
-            $R1^= $t0 + ($t1 << 1) + $K[--$ki];
+            $R1 ^= $t0 + ($t1 << 1) + $K[--$ki];
             $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
             $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K[--$ki]);
         }

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

Spacing +7 added lines, -7 removed lines

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