chamilo / chamilo-lms

main/inc/lib/phpseclib/Crypt/DES.php

Doc Comments +2 added lines

@@ -742,6 +742,7 @@ 
      * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
      *
      * @param optional Integer $mode
+     * @param integer $mode
      * @return Crypt_DES
      * @access public
      */
@@ -1445,6 +1446,7 @@ 
      *
      * @see Crypt_DES::_unpad()
      * @access private
+     * @param string $text
      */
     function _pad($text)
     {

Indentation +28 added lines, -28 removed lines

@@ -1137,7 +1137,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1332,7 +1332,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1518,13 +1518,13 @@ 
         $t = unpack('Nl/Nr', $block);
         list($l, $r) = array($t['l'], $t['r']);
         $block = ($shuffle[$ipmap[$r & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                 ($shuffle[$ipmap[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                 ($shuffle[$ipmap[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                 ($shuffle[$ipmap[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                 ($shuffle[$ipmap[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                 ($shuffle[$ipmap[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                 ($shuffle[$ipmap[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                 ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                    ($shuffle[$ipmap[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffle[$ipmap[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffle[$ipmap[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffle[$ipmap[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffle[$ipmap[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffle[$ipmap[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
 
         // Extract L0 and R0.
         $t = unpack('Nl/Nr', $block);
@@ -1540,9 +1540,9 @@ 
 
             // 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;
+                    $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
+                    $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^
+                    $sbox7[$b1 & 0x3F] ^ $sbox8[$b2 & 0x3F] ^ $l;
             // end of "the Feistel (F) function"
 
             $l = $r;
@@ -1551,13 +1551,13 @@ 
 
         // Perform the inverse IP permutation.
         return ($shuffle[$invipmap[($l >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-               ($shuffle[$invipmap[($r >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-               ($shuffle[$invipmap[($l >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-               ($shuffle[$invipmap[($r >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-               ($shuffle[$invipmap[($l >> 8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-               ($shuffle[$invipmap[($r >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-               ($shuffle[$invipmap[$l & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-               ($shuffle[$invipmap[$r & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                ($shuffle[$invipmap[($r >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                ($shuffle[$invipmap[($l >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                ($shuffle[$invipmap[($r >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                ($shuffle[$invipmap[($l >> 8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                ($shuffle[$invipmap[($r >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                ($shuffle[$invipmap[$l & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                ($shuffle[$invipmap[$r & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
     }
 
     /**
@@ -2025,13 +2025,13 @@ 
         $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") |
-               ($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 >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
-               ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\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 >> 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;
         $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
@@ -2045,9 +2045,9 @@ 
 
             // Perform the PC-2 transformation.
             $cp = $pc2mapc1[$c >> 24] | $pc2mapc2[($c >> 16) & 0xFF] |
-                  $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[$c & 0xFF];
+                    $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[$c & 0xFF];
             $dp = $pc2mapd1[$d >> 24] | $pc2mapd2[($d >> 16) & 0xFF] |
-                  $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[$d & 0xFF];
+                    $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[$d & 0xFF];
 
             // Reorder: odd bytes/even bytes. Push the result in key schedule.
             $keys[] = array(

Spacing +95 added lines, -95 removed lines

@@ -747,7 +747,7 @@ 
      */
     function Crypt_DES($mode = CRYPT_DES_MODE_CBC)
     {
-        if ( !defined('CRYPT_DES_MODE') ) {
+        if (!defined('CRYPT_DES_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('des', mcrypt_list_algorithms()):
                     define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
@@ -757,7 +757,7 @@ 
             }
         }
 
-        switch ( CRYPT_DES_MODE ) {
+        switch (CRYPT_DES_MODE) {
             case CRYPT_DES_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_DES_MODE_ECB:
@@ -823,7 +823,7 @@ 
      */
     function setKey($key)
     {
-        $this->keys = ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) ? str_pad(substr($key, 0, 8), 8, chr(0)) : $this->_prepareKey($key);
+        $this->keys = (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) ? str_pad(substr($key, 0, 8), 8, chr(0)) : $this->_prepareKey($key);
         $this->enchanged = true;
         $this->dechanged = true;
     }
@@ -845,7 +845,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -869,12 +869,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; $j++) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -911,7 +911,7 @@ 
     function _generate_xor(&$iv)
     {
         $xor = $iv;
-        for ($j = 4; $j <= 8; $j+=4) {
+        for ($j = 4; $j <= 8; $j += 4) {
             $temp = substr($iv, -$j, 4);
             switch ($temp) {
                 case "\xFF\xFF\xFF\xFF":
@@ -953,7 +953,7 @@ 
             $plaintext = $this->_pad($plaintext);
         }
 
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
+        if (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) {
             if ($this->enchanged) {
                 mcrypt_generic_init($this->enmcrypt, $this->keys, $this->encryptIV);
                 if ($this->mode == 'ncfb') {
@@ -975,11 +975,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -992,15 +992,15 @@ 
                             mcrypt_generic_init($this->enmcrypt, $this->keys, $iv);
                             $this->enbuffer['enmcrypt_init'] = false;
                         }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
+                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
                         $iv = substr($ciphertext, -8);
-                        $len%= 8;
+                        $len %= 8;
                     } else {
                         while ($len >= 8) {
                             $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, 8);
-                            $ciphertext.= $iv;
-                            $len-= 8;
-                            $i+= 8;
+                            $ciphertext .= $iv;
+                            $len -= 8;
+                            $i += 8;
                         }
                     }
                 } 
@@ -1008,7 +1008,7 @@ 
                     $iv = mcrypt_generic($this->ecb, $iv);
                     $block = $iv ^ substr($plaintext, -$len);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
@@ -1035,17 +1035,17 @@ 
         $ciphertext = '';
         switch ($this->mode) {
             case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $ciphertext.= $this->_processBlock(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
+                for ($i = 0; $i < strlen($plaintext); $i += 8) {
+                    $ciphertext .= $this->_processBlock(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
                 }
                 break;
             case CRYPT_DES_MODE_CBC:
                 $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                for ($i = 0; $i < strlen($plaintext); $i += 8) {
                     $block = substr($plaintext, $i, 8);
                     $block = $this->_processBlock($block ^ $xor, CRYPT_DES_ENCRYPT);
                     $xor = $block;
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
@@ -1054,25 +1054,25 @@ 
             case CRYPT_DES_MODE_CTR:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['encrypted'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         if (strlen($block) > strlen($buffer['encrypted'])) {
-                            $buffer['encrypted'].= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
+                            $buffer['encrypted'] .= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
                         }
                         $key = $this->_string_shift($buffer['encrypted']);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         $key = $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                        $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+                        $buffer['encrypted'] = substr($key, $start).$buffer['encrypted'];
                     }
                 }
                 break;
@@ -1091,11 +1091,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -1103,41 +1103,41 @@ 
                 }
                 while ($len >= 8) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT) ^ substr($plaintext, $i, 8);
-                    $ciphertext.= $iv;
-                    $len-= 8;
-                    $i+= 8;
+                    $ciphertext .= $iv;
+                    $len -= 8;
+                    $i += 8;
                 }
                 if ($len) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
                     $block = $iv ^ substr($plaintext, $i);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
             case CRYPT_DES_MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor']);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                        $ciphertext.= substr($plaintext, $i, 8) ^ $xor;
+                        $ciphertext .= substr($plaintext, $i, 8) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -1162,7 +1162,7 @@ 
             $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
         }
 
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
+        if (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) {
             if ($this->dechanged) {
                 mcrypt_generic_init($this->demcrypt, $this->keys, $this->decryptIV);
                 if ($this->mode == 'ncfb') {
@@ -1184,11 +1184,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -1196,13 +1196,13 @@ 
                 }
                 if ($len >= 8) {
                     $cb = substr($ciphertext, $i, $len - $len % 8);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $plaintext .= mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
                     $iv = substr($cb, -8);
-                    $len%= 8;
+                    $len %= 8;
                 }
                 if ($len) {
                     $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $plaintext .= $iv ^ substr($ciphertext, -$len);
                     $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
                     $pos = $len;
                 }
@@ -1230,15 +1230,15 @@ 
         $plaintext = '';
         switch ($this->mode) {
             case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $plaintext.= $this->_processBlock(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
+                for ($i = 0; $i < strlen($ciphertext); $i += 8) {
+                    $plaintext .= $this->_processBlock(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
                 }
                 break;
             case CRYPT_DES_MODE_CBC:
                 $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                     $block = substr($ciphertext, $i, 8);
-                    $plaintext.= $this->_processBlock($block, CRYPT_DES_DECRYPT) ^ $xor;
+                    $plaintext .= $this->_processBlock($block, CRYPT_DES_DECRYPT) ^ $xor;
                     $xor = $block;
                 }
                 if ($this->continuousBuffer) {
@@ -1248,25 +1248,25 @@ 
             case CRYPT_DES_MODE_CTR:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
+                            $buffer['ciphertext'] .= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
                         }
                         $key = $this->_string_shift($buffer['ciphertext']);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         $key = $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                        $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                     }
                 }
                 break;
@@ -1285,11 +1285,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -1298,14 +1298,14 @@ 
                 while ($len >= 8) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
                     $cb = substr($ciphertext, $i, 8);
-                    $plaintext.= $iv ^ $cb;
+                    $plaintext .= $iv ^ $cb;
                     $iv = $cb;
-                    $len-= 8;
-                    $i+= 8;
+                    $len -= 8;
+                    $i += 8;
                 }
                 if ($len) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
+                    $plaintext .= $iv ^ substr($ciphertext, $i);
                     $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
                     $pos = $len;
                 }
@@ -1313,26 +1313,26 @@ 
             case CRYPT_DES_MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor']);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                        $plaintext.= substr($ciphertext, $i, 8) ^ $xor;
+                        $plaintext .= substr($ciphertext, $i, 8) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -2100,7 +2100,7 @@ 
      */
     function inline_crypt_setup($des_rounds = 1)
     {
-        $lambda_functions =& Crypt_DES::get_lambda_functions();
+        $lambda_functions = & Crypt_DES::get_lambda_functions();
         $block_size = 8;
         $mode = $this->mode;
 
@@ -2139,7 +2139,7 @@ 
                     ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
                 );
 
-                '.'' /* Extract L0 and R0 */ .'
+                '.'' /* Extract L0 and R0 */.'
                 $l = $in[1];
                 $r = $in[2];
             ';
@@ -2153,19 +2153,19 @@ 
                 // Merge key schedule.
                 for ($i = 0; $i < 8; ++$i) {
                     $_cryptBlock .= '
-                        $b1 = (($' . $r . ' >>  3) & 0x1FFFFFFF)  ^ ($' . $r . ' << 29) ^ $k_'.(++$ki).';
-                        $b2 = (($' . $r . ' >> 31) & 0x00000001)  ^ ($' . $r . ' <<  1) ^ $k_'.(++$ki).';
-                        $' . $l . '  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+                        $b1 = (($' . $r.' >>  3) & 0x1FFFFFFF)  ^ ($'.$r.' << 29) ^ $k_'.(++$ki).';
+                        $b2 = (($' . $r.' >> 31) & 0x00000001)  ^ ($'.$r.' <<  1) ^ $k_'.(++$ki).';
+                        $' . $l.'  = $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 . ';
+                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $l.';
 
-                        $b1 = (($' . $l . ' >>  3) & 0x1FFFFFFF)  ^ ($' . $l . ' << 29) ^ $k_'.(++$ki).';
-                        $b2 = (($' . $l . ' >> 31) & 0x00000001)  ^ ($' . $l . ' <<  1) ^ $k_'.(++$ki).';
-                        $' . $r . '  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+                        $b1 = (($' . $l.' >>  3) & 0x1FFFFFFF)  ^ ($'.$l.' << 29) ^ $k_'.(++$ki).';
+                        $b2 = (($' . $l.' >> 31) & 0x00000001)  ^ ($'.$l.' <<  1) ^ $k_'.(++$ki).';
+                        $' . $r.'  = $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] ^ $' . $r . ';
+                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $r.';
                     ';
                 }
 
@@ -2177,21 +2177,21 @@ 
 
             // Perform the inverse IP permutation.
             $_cryptBlock .= '$in = (
-                    ($shuffle[$invipmap[($' . $r . ' >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                    ($shuffle[$invipmap[($' . $l . ' >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                    ($shuffle[$invipmap[($' . $r . ' >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                    ($shuffle[$invipmap[($' . $l . ' >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                    ($shuffle[$invipmap[($' . $r . ' >>  8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                    ($shuffle[$invipmap[($' . $l . ' >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                    ($shuffle[$invipmap[ $' . $r . '        & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                    ($shuffle[$invipmap[ $' . $l . '        & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
+                    ($shuffle[$invipmap[($' . $r.' >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+                    ($shuffle[$invipmap[($' . $l.' >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffle[$invipmap[($' . $r.' >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffle[$invipmap[($' . $l.' >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffle[$invipmap[($' . $r.' >>  8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffle[$invipmap[($' . $l.' >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffle[$invipmap[ $' . $r.'        & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffle[$invipmap[ $' . $l.'        & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
                 );
             ';
 
             // Generating mode of operation code:
             switch ($mode) {
                 case CRYPT_DES_MODE_ECB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2205,7 +2205,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_DECRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2220,7 +2220,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CBC:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2240,7 +2240,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_DECRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2262,7 +2262,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CTR:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2299,7 +2299,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2337,7 +2337,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CFB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $buffer = &$self->enbuffer;
@@ -2386,7 +2386,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $buffer = &$self->debuffer;
@@ -2438,7 +2438,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_OFB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2475,7 +2475,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);

main/inc/lib/phpseclib/Crypt/Hash.php

Doc Comments +1 added lines, -2 removed lines

@@ -783,8 +783,7 @@
      * _sha256() adds multiple unsigned 32-bit integers.  Since PHP doesn't support unsigned integers and since the
      * possibility of overflow exists, care has to be taken.  Math_BigInteger() could be used but this should be faster.
      *
-     * @param Integer $...
-     * @return Integer
+     * @return double
      * @see _sha256()
      * @access private
      */

Indentation +34 added lines, -34 removed lines

@@ -257,27 +257,27 @@ 
         switch ($hash) {
             case 'md2':
                  $this->b = 16;
-                 $this->hash = array($this, '_md2');
-                 break;
+                    $this->hash = array($this, '_md2');
+                    break;
             case 'md5':
             case 'md5-96':
                  $this->b = 64;
-                 $this->hash = array($this, '_md5');
-                 break;
+                    $this->hash = array($this, '_md5');
+                    break;
             case 'sha256':
                  $this->b = 64;
-                 $this->hash = array($this, '_sha256');
-                 break;
+                    $this->hash = array($this, '_sha256');
+                    break;
             case 'sha384':
             case 'sha512':
                  $this->b = 128;
-                 $this->hash = array($this, '_sha512');
-                 break;
+                    $this->hash = array($this, '_sha512');
+                    break;
             case 'sha1':
             case 'sha1-96':
             default:
                  $this->b = 64;
-                 $this->hash = array($this, '_sha1');
+                    $this->hash = array($this, '_sha1');
         }
 
         $this->ipad = str_repeat(chr(0x36), $this->b);
@@ -378,24 +378,24 @@ 
     function _md2($m)
     {
         static $s = array(
-             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
-             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
-             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
+                41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
+                19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
+                76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
             138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
             245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
             148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
-             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
+                39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
             181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
             150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
             112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
-             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
-             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
+                96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
+                85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
             234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
             129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
-              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
+                8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
             203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
             166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
-             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
+                31,  26, 219, 153, 141,  51, 159,  17, 131, 20
         );
 
         // Step 1. Append Padding Bytes
@@ -494,11 +494,11 @@ 
             // Extend the sixteen 32-bit words into sixty-four 32-bit words
             for ($i = 16; $i < 64; $i++) {
                 $s0 = $this->_rightRotate($w[$i - 15],  7) ^
-                      $this->_rightRotate($w[$i - 15], 18) ^
-                      $this->_rightShift( $w[$i - 15],  3);
+                        $this->_rightRotate($w[$i - 15], 18) ^
+                        $this->_rightShift( $w[$i - 15],  3);
                 $s1 = $this->_rightRotate($w[$i - 2], 17) ^
-                      $this->_rightRotate($w[$i - 2], 19) ^
-                      $this->_rightShift( $w[$i - 2], 10);
+                        $this->_rightRotate($w[$i - 2], 19) ^
+                        $this->_rightShift( $w[$i - 2], 10);
                 $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
 
             }
@@ -509,18 +509,18 @@ 
             // Main loop
             for ($i = 0; $i < 64; $i++) {
                 $s0 = $this->_rightRotate($a,  2) ^
-                      $this->_rightRotate($a, 13) ^
-                      $this->_rightRotate($a, 22);
+                        $this->_rightRotate($a, 13) ^
+                        $this->_rightRotate($a, 22);
                 $maj = ($a & $b) ^
-                       ($a & $c) ^
-                       ($b & $c);
+                        ($a & $c) ^
+                        ($b & $c);
                 $t2 = $this->_add($s0, $maj);
 
                 $s1 = $this->_rightRotate($e,  6) ^
-                      $this->_rightRotate($e, 11) ^
-                      $this->_rightRotate($e, 25);
+                        $this->_rightRotate($e, 11) ^
+                        $this->_rightRotate($e, 25);
                 $ch = ($e & $f) ^
-                      ($this->_not($e) & $g);
+                        ($this->_not($e) & $g);
                 $t1 = $this->_add($h, $s1, $ch, $k[$i], $w[$i]);
 
                 $h = $g;
@@ -635,16 +635,16 @@ 
             // Extend the sixteen 32-bit words into eighty 32-bit words
             for ($i = 16; $i < 80; $i++) {
                 $temp = array(
-                          $w[$i - 15]->bitwise_rightRotate(1),
-                          $w[$i - 15]->bitwise_rightRotate(8),
-                          $w[$i - 15]->bitwise_rightShift(7)
+                            $w[$i - 15]->bitwise_rightRotate(1),
+                            $w[$i - 15]->bitwise_rightRotate(8),
+                            $w[$i - 15]->bitwise_rightShift(7)
                 );
                 $s0 = $temp[0]->bitwise_xor($temp[1]);
                 $s0 = $s0->bitwise_xor($temp[2]);
                 $temp = array(
-                          $w[$i - 2]->bitwise_rightRotate(19),
-                          $w[$i - 2]->bitwise_rightRotate(61),
-                          $w[$i - 2]->bitwise_rightShift(6)
+                            $w[$i - 2]->bitwise_rightRotate(19),
+                            $w[$i - 2]->bitwise_rightRotate(61),
+                            $w[$i - 2]->bitwise_rightShift(6)
                 );
                 $s1 = $temp[0]->bitwise_xor($temp[1]);
                 $s1 = $s1->bitwise_xor($temp[2]);

Spacing +48 added lines, -48 removed lines

@@ -66,11 +66,11 @@ 
 /**
  * Toggles the mhash() implementation, which has been deprecated on PHP 5.3.0+.
  */
-define('CRYPT_HASH_MODE_MHASH',    2);
+define('CRYPT_HASH_MODE_MHASH', 2);
 /**
  * Toggles the hash() implementation, which works on PHP 5.1.2+.
  */
-define('CRYPT_HASH_MODE_HASH',     3);
+define('CRYPT_HASH_MODE_HASH', 3);
 /**#@-*/
 
 /**
@@ -145,7 +145,7 @@ 
      */
     function Crypt_Hash($hash = 'sha1')
     {
-        if ( !defined('CRYPT_HASH_MODE') ) {
+        if (!defined('CRYPT_HASH_MODE')) {
             switch (true) {
                 case extension_loaded('hash'):
                     define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_HASH);
@@ -218,7 +218,7 @@ 
                 $mode = CRYPT_HASH_MODE;
         }
 
-        switch ( $mode ) {
+        switch ($mode) {
             case CRYPT_HASH_MODE_MHASH:
                 switch ($hash) {
                     case 'md5':
@@ -296,7 +296,7 @@ 
         $mode = is_array($this->hash) ? CRYPT_HASH_MODE_INTERNAL : CRYPT_HASH_MODE;
 
         if (!empty($this->key) || is_string($this->key)) {
-            switch ( $mode ) {
+            switch ($mode) {
                 case CRYPT_HASH_MODE_MHASH:
                     $output = mhash($this->hash, $text, $this->key);
                     break;
@@ -310,16 +310,16 @@ 
                         -- http://tools.ietf.org/html/rfc2104#section-2 */
                     $key = strlen($this->key) > $this->b ? call_user_func($this->hash, $this->key) : $this->key;
 
-                    $key    = str_pad($key, $this->b, chr(0));      // step 1
-                    $temp   = $this->ipad ^ $key;                   // step 2
-                    $temp  .= $text;                                // step 3
-                    $temp   = call_user_func($this->hash, $temp);   // step 4
-                    $output = $this->opad ^ $key;                   // step 5
-                    $output.= $temp;                                // step 6
+                    $key    = str_pad($key, $this->b, chr(0)); // step 1
+                    $temp   = $this->ipad ^ $key; // step 2
+                    $temp  .= $text; // step 3
+                    $temp   = call_user_func($this->hash, $temp); // step 4
+                    $output = $this->opad ^ $key; // step 5
+                    $output .= $temp; // step 6
                     $output = call_user_func($this->hash, $output); // step 7
             }
         } else {
-            switch ( $mode ) {
+            switch ($mode) {
                 case CRYPT_HASH_MODE_MHASH:
                     $output = mhash($this->hash, $text);
                     break;
@@ -378,36 +378,36 @@ 
     function _md2($m)
     {
         static $s = array(
-             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
-             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
-             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
-            138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
-            245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
-            148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
-             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
-            181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
-            150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
-            112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
-             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
-             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
-            234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
-            129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
-              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
-            203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
-            166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
-             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
+             41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
+             19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
+             76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24,
+            138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251,
+            245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63,
+            148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50,
+             39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165,
+            181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210,
+            150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157,
+            112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27,
+             96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15,
+             85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197,
+            234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65,
+            129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123,
+              8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233,
+            203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228,
+            166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237,
+             31, 26, 219, 153, 141, 51, 159, 17, 131, 20
         );
 
         // Step 1. Append Padding Bytes
         $pad = 16 - (strlen($m) & 0xF);
-        $m.= str_repeat(chr($pad), $pad);
+        $m .= str_repeat(chr($pad), $pad);
 
         $length = strlen($m);
 
         // Step 2. Append Checksum
         $c = str_repeat(chr(0), 16);
         $l = chr(0);
-        for ($i = 0; $i < $length; $i+= 16) {
+        for ($i = 0; $i < $length; $i += 16) {
             for ($j = 0; $j < 16; $j++) {
                 // RFC1319 incorrectly states that C[j] should be set to S[c xor L]
                 //$c[$j] = chr($s[ord($m[$i + $j] ^ $l)]);
@@ -416,15 +416,15 @@ 
                 $l = $c[$j];
             }
         }
-        $m.= $c;
+        $m .= $c;
 
-        $length+= 16;
+        $length += 16;
 
         // Step 3. Initialize MD Buffer
         $x = str_repeat(chr(0), 48);
 
         // Step 4. Process Message in 16-Byte Blocks
-        for ($i = 0; $i < $length; $i+= 16) {
+        for ($i = 0; $i < $length; $i += 16) {
             for ($j = 0; $j < 16; $j++) {
                 $x[$j + 16] = $m[$i + $j];
                 $x[$j + 32] = $x[$j + 16] ^ $x[$j];
@@ -477,10 +477,10 @@ 
         // Pre-processing
         $length = strlen($m);
         // to round to nearest 56 mod 64, we'll add 64 - (length + (64 - 56)) % 64
-        $m.= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
+        $m .= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
         $m[$length] = chr(0x80);
         // we don't support hashing strings 512MB long
-        $m.= pack('N2', 0, $length << 3);
+        $m .= pack('N2', 0, $length << 3);
 
         // Process the message in successive 512-bit chunks
         $chunks = str_split($m, 64);
@@ -493,12 +493,12 @@ 
 
             // Extend the sixteen 32-bit words into sixty-four 32-bit words
             for ($i = 16; $i < 64; $i++) {
-                $s0 = $this->_rightRotate($w[$i - 15],  7) ^
+                $s0 = $this->_rightRotate($w[$i - 15], 7) ^
                       $this->_rightRotate($w[$i - 15], 18) ^
-                      $this->_rightShift( $w[$i - 15],  3);
+                      $this->_rightShift($w[$i - 15], 3);
                 $s1 = $this->_rightRotate($w[$i - 2], 17) ^
                       $this->_rightRotate($w[$i - 2], 19) ^
-                      $this->_rightShift( $w[$i - 2], 10);
+                      $this->_rightShift($w[$i - 2], 10);
                 $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
 
             }
@@ -508,7 +508,7 @@ 
 
             // Main loop
             for ($i = 0; $i < 64; $i++) {
-                $s0 = $this->_rightRotate($a,  2) ^
+                $s0 = $this->_rightRotate($a, 2) ^
                       $this->_rightRotate($a, 13) ^
                       $this->_rightRotate($a, 22);
                 $maj = ($a & $b) ^
@@ -516,7 +516,7 @@ 
                        ($b & $c);
                 $t2 = $this->_add($s0, $maj);
 
-                $s1 = $this->_rightRotate($e,  6) ^
+                $s1 = $this->_rightRotate($e, 6) ^
                       $this->_rightRotate($e, 11) ^
                       $this->_rightRotate($e, 25);
                 $ch = ($e & $f) ^
@@ -617,10 +617,10 @@ 
         // Pre-processing
         $length = strlen($m);
         // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
-        $m.= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
+        $m .= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
         $m[$length] = chr(0x80);
         // we don't support hashing strings 512MB long
-        $m.= pack('N4', 0, 0, 0, $length << 3);
+        $m .= pack('N4', 0, 0, 0, $length << 3);
 
         // Process the message in successive 1024-bit chunks
         $chunks = str_split($m, 128);
@@ -724,10 +724,10 @@ 
 
         // Produce the final hash value (big-endian)
         // (Crypt_Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
-        $temp = $hash[0]->toBytes() . $hash[1]->toBytes() . $hash[2]->toBytes() . $hash[3]->toBytes() .
-                $hash[4]->toBytes() . $hash[5]->toBytes();
+        $temp = $hash[0]->toBytes().$hash[1]->toBytes().$hash[2]->toBytes().$hash[3]->toBytes().
+                $hash[4]->toBytes().$hash[5]->toBytes();
         if ($this->l != 48) {
-            $temp.= $hash[6]->toBytes() . $hash[7]->toBytes();
+            $temp .= $hash[6]->toBytes().$hash[7]->toBytes();
         }
 
         return $temp;
@@ -798,7 +798,7 @@ 
         $result = 0;
         $arguments = func_get_args();
         foreach ($arguments as $argument) {
-            $result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
+            $result += $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
         }
 
         return fmod($result, $mod);

main/inc/lib/phpseclib/Crypt/Rijndael.php

Doc Comments +2 added lines

@@ -1456,6 +1456,7 @@ 
      *
      * @see Crypt_Rijndael::_unpad()
      * @access private
+     * @param string $text
      */
     function _pad($text)
     {
@@ -1483,6 +1484,7 @@ 
      *
      * @see Crypt_Rijndael::_pad()
      * @access private
+     * @param string $text
      */
     function _unpad($text)
     {

Indentation +12 added lines, -12 removed lines

@@ -917,7 +917,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1058,7 +1058,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % $block_size) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1137,7 +1137,7 @@ 
                         ($state[$j] & 0x00FF0000) ^
                         ($state[$k] & 0x0000FF00) ^
                         ($state[$l] & 0x000000FF) ^
-                         $w[$Nr][$i];
+                            $w[$Nr][$i];
             ++$i;
             $j = ($j + 1) % $Nb;
             $k = ($k + 1) % $Nb;
@@ -1223,9 +1223,9 @@ 
         while ($i < $Nb) {
             $temp[$i] = $dw[0][$i] ^ 
                         $this->_invSubWord(($state[$i] & 0xFF000000) | 
-                                           ($state[$j] & 0x00FF0000) | 
-                                           ($state[$k] & 0x0000FF00) | 
-                                           ($state[$l] & 0x000000FF));
+                                            ($state[$j] & 0x00FF0000) | 
+                                            ($state[$k] & 0x0000FF00) | 
+                                            ($state[$l] & 0x000000FF));
             ++$i;
             $j = ($j + 1) % $Nb;
             $k = ($k + 1) % $Nb;
@@ -1393,9 +1393,9 @@ 
         $sbox = $this->sbox;
 
         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);
     }
 
     /**
@@ -1408,9 +1408,9 @@ 
         $isbox = $this->isbox;
 
         return  $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);
     }
 
     /**

Spacing +88 added lines, -88 removed lines

@@ -550,13 +550,13 @@ 
         );
 
         for ($i = 0; $i < 256; $i++) {
-            $t2[] = (($t3[$i] <<  8) & 0xFFFFFF00) | (($t3[$i] >> 24) & 0x000000FF);
+            $t2[] = (($t3[$i] << 8) & 0xFFFFFF00) | (($t3[$i] >> 24) & 0x000000FF);
             $t1[] = (($t3[$i] << 16) & 0xFFFF0000) | (($t3[$i] >> 16) & 0x0000FFFF);
-            $t0[] = (($t3[$i] << 24) & 0xFF000000) | (($t3[$i] >>  8) & 0x00FFFFFF);
+            $t0[] = (($t3[$i] << 24) & 0xFF000000) | (($t3[$i] >> 8) & 0x00FFFFFF);
 
-            $dt2[] = (($dt3[$i] <<  8) & 0xFFFFFF00) | (($dt3[$i] >> 24) & 0x000000FF);
+            $dt2[] = (($dt3[$i] << 8) & 0xFFFFFF00) | (($dt3[$i] >> 24) & 0x000000FF);
             $dt1[] = (($dt3[$i] << 16) & 0xFFFF0000) | (($dt3[$i] >> 16) & 0x0000FFFF);
-            $dt0[] = (($dt3[$i] << 24) & 0xFF000000) | (($dt3[$i] >>  8) & 0x00FFFFFF);
+            $dt0[] = (($dt3[$i] << 24) & 0xFF000000) | (($dt3[$i] >> 8) & 0x00FFFFFF);
         }
 
         // sbox for the S-Box substitution
@@ -679,7 +679,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -703,12 +703,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; $j++) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -755,8 +755,8 @@ 
         $block_size = $this->block_size;
         $num_blocks = floor(($length + ($block_size - 1)) / $block_size);
         for ($i = 0; $i < $num_blocks; $i++) {
-            $xor.= $iv;
-            for ($j = 4; $j <= $block_size; $j+=4) {
+            $xor .= $iv;
+            for ($j = 4; $j <= $block_size; $j += 4) {
                 $temp = substr($iv, -$j, 4);
                 switch ($temp) {
                     case "\xFF\xFF\xFF\xFF":
@@ -812,17 +812,17 @@ 
         $ciphertext = '';
         switch ($this->mode) {
             case CRYPT_RIJNDAEL_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                    $ciphertext .= $this->_encryptBlock(substr($plaintext, $i, $block_size));
                 }
                 break;
             case CRYPT_RIJNDAEL_MODE_CBC:
                 $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                     $block = substr($plaintext, $i, $block_size);
                     $block = $this->_encryptBlock($block ^ $xor);
                     $xor = $block;
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
@@ -831,25 +831,25 @@ 
             case CRYPT_RIJNDAEL_MODE_CTR:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['encrypted'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['encrypted'])) {
-                            $buffer['encrypted'].= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
+                            $buffer['encrypted'] .= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
                         }
                         $key = $this->_string_shift($buffer['encrypted'], $block_size);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         $key = $this->_encryptBlock($this->_generate_xor($block_size, $xor));
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+                        $buffer['encrypted'] = substr($key, $start).$buffer['encrypted'];
                     }
                 }
                 break;
@@ -870,11 +870,11 @@ 
                     $max = $block_size - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -883,41 +883,41 @@ 
                 }
                 while ($len >= $block_size) {
                     $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
-                    $ciphertext.= $iv;
-                    $len-= $block_size;
-                    $i+= $block_size;
+                    $ciphertext .= $iv;
+                    $len -= $block_size;
+                    $i += $block_size;
                 }
                 if ($len) {
                     $iv = $this->_encryptBlock($iv);
                     $block = $iv ^ substr($plaintext, $i);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 break;
             case CRYPT_RIJNDAEL_MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $xor = $this->_encryptBlock($xor);
-                        $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
+                        $ciphertext .= substr($plaintext, $i, $block_size) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -955,15 +955,15 @@ 
         $plaintext = '';
         switch ($this->mode) {
             case CRYPT_RIJNDAEL_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
+                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                    $plaintext .= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
                 }
                 break;
             case CRYPT_RIJNDAEL_MODE_CBC:
                 $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                     $block = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
+                    $plaintext .= $this->_decryptBlock($block) ^ $xor;
                     $xor = $block;
                 }
                 if ($this->continuousBuffer) {
@@ -973,25 +973,25 @@ 
             case CRYPT_RIJNDAEL_MODE_CTR:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
+                            $buffer['ciphertext'] .= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
                         }
                         $key = $this->_string_shift($buffer['ciphertext'], $block_size);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         $key = $this->_encryptBlock($this->_generate_xor($block_size, $xor));
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                        $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                     }
                 }
                 break;
@@ -1010,11 +1010,11 @@ 
                     $max = $block_size - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -1024,14 +1024,14 @@ 
                 while ($len >= $block_size) {
                     $iv = $this->_encryptBlock($iv);
                     $cb = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $iv ^ $cb;
+                    $plaintext .= $iv ^ $cb;
                     $iv = $cb;
-                    $len-= $block_size;
-                    $i+= $block_size;
+                    $len -= $block_size;
+                    $i += $block_size;
                 }
                 if ($len) {
                     $iv = $this->_encryptBlock($iv);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
+                    $plaintext .= $iv ^ substr($ciphertext, $i);
                     $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
                     $pos = $len;
                 }
@@ -1039,26 +1039,26 @@ 
             case CRYPT_RIJNDAEL_MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $xor = $this->_encryptBlock($xor);
-                        $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
+                        $plaintext .= substr($ciphertext, $i, $block_size) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % $block_size) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -1111,8 +1111,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[$round][$i];
                 ++$i;
                 $j = ($j + 1) % $Nb;
@@ -1203,8 +1203,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[$round][$i];
                 ++$i;
                 $j = ($j + 1) % $Nb;
@@ -1348,8 +1348,8 @@ 
                         $dw = $this->_subWord($this->w[$row][$j]);
                         $temp[$j] = $this->dt0[$dw >> 24 & 0x000000FF] ^ 
                                     $this->dt1[$dw >> 16 & 0x000000FF] ^ 
-                                    $this->dt2[$dw >>  8 & 0x000000FF] ^ 
-                                    $this->dt3[$dw       & 0x000000FF];
+                                    $this->dt2[$dw >> 8 & 0x000000FF] ^ 
+                                    $this->dt3[$dw & 0x000000FF];
                         $j++;
                     }
                     $this->dw[$row] = $temp;
@@ -1392,8 +1392,8 @@ 
     {
         $sbox = $this->sbox;
 
-        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);
     }
@@ -1407,8 +1407,8 @@ 
     {
         $isbox = $this->isbox;
 
-        return  $isbox[$word       & 0x000000FF]        |
-               ($isbox[$word >>  8 & 0x000000FF] <<  8) |
+        return  $isbox[$word & 0x000000FF] |
+               ($isbox[$word >> 8 & 0x000000FF] << 8) |
                ($isbox[$word >> 16 & 0x000000FF] << 16) |
                ($isbox[$word >> 24 & 0x000000FF] << 24);
     }
@@ -1588,7 +1588,7 @@ 
         // 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 =& Crypt_Rijndael::get_lambda_functions();
+        $lambda_functions = & Crypt_Rijndael::get_lambda_functions();
         $block_size = $this->block_size;
         $mode = $this->mode;
 
@@ -1609,7 +1609,7 @@ 
             $init_decryptBlock = 'extract($self->dw, EXTR_PREFIX_ALL, "dw");';
         }
 
-        $code_hash = md5("$mode, $block_size, " . implode(',', $w));
+        $code_hash = md5("$mode, $block_size, ".implode(',', $w));
 
         if (!isset($lambda_functions[$code_hash])) {
             $Nr = $this->Nr;
@@ -1617,7 +1617,7 @@ 
             $c  = $this->c;
 
             // Generating encrypt code:
-            $init_encryptBlock.= '
+            $init_encryptBlock .= '
                 $t0 = $self->t0;
                 $t1 = $self->t1;
                 $t2 = $self->t2;
@@ -1638,9 +1638,9 @@ 
             for ($round = 1; $round < $Nr; ++$round) {
                 list($s, $e) = array($e, $s);
                 for ($i = 0; $i < $Nb; ++$i) {
-                    $_encryptBlock.=
+                    $_encryptBlock .=
                         '$'.$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] ^
@@ -1650,7 +1650,7 @@ 
 
             // Finalround: subWord + shiftRows + addRoundKey
             for ($i = 0; $i < $Nb; ++$i) {
-                $_encryptBlock.=
+                $_encryptBlock .=
                     '$'.$e.$i.' =
                      $sbox[ $'.$e.$i.'        & 0xff]        |
                     ($sbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
@@ -1659,8 +1659,8 @@ 
             }
             $_encryptBlock .= '$in = pack("N*"'."\n";
             for ($i = 0; $i < $Nb; ++$i) {
-                $_encryptBlock.= ',
-                    ($'.$e.$i                  .' & 0xFF000000) ^
+                $_encryptBlock .= ',
+                    ($'.$e.$i.' & 0xFF000000) ^
                     ($'.$e.(($i + $c[1]) % $Nb).' & 0x00FF0000) ^
                     ($'.$e.(($i + $c[2]) % $Nb).' & 0x0000FF00) ^
                     ($'.$e.(($i + $c[3]) % $Nb).' & 0x000000FF) ^
@@ -1669,7 +1669,7 @@ 
             $_encryptBlock .= ');';
 
             // Generating decrypt code:
-            $init_decryptBlock.= '
+            $init_decryptBlock .= '
                 $dt0 = $self->dt0;
                 $dt1 = $self->dt1;
                 $dt2 = $self->dt2;
@@ -1690,9 +1690,9 @@ 
             for ($round = 1; $round < $Nr; ++$round) {
                 list($s, $e) = array($e, $s);
                 for ($i = 0; $i < $Nb; ++$i) {
-                    $_decryptBlock.=
+                    $_decryptBlock .=
                         '$'.$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] ^
@@ -1702,7 +1702,7 @@ 
 
             // Finalround: subWord + shiftRows + addRoundKey
             for ($i = 0; $i < $Nb; ++$i) {
-                $_decryptBlock.=
+                $_decryptBlock .=
                     '$'.$e.$i.' =
                      $isbox[ $'.$e.$i.'        & 0xff]        |
                     ($isbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
@@ -1711,8 +1711,8 @@ 
             }
             $_decryptBlock .= '$in = pack("N*"'."\n";
             for ($i = 0; $i < $Nb; ++$i) {
-                $_decryptBlock.= ',
-                    ($'.$e.$i.                        ' & 0xFF000000) ^
+                $_decryptBlock .= ',
+                    ($'.$e.$i.' & 0xFF000000) ^
                     ($'.$e.(($Nb + $i - $c[1]) % $Nb).' & 0x00FF0000) ^
                     ($'.$e.(($Nb + $i - $c[2]) % $Nb).' & 0x0000FF00) ^
                     ($'.$e.(($Nb + $i - $c[3]) % $Nb).' & 0x000000FF) ^
@@ -1723,7 +1723,7 @@ 
             // Generating mode of operation code:
             switch ($mode) {
                 case CRYPT_RIJNDAEL_MODE_ECB:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $text = $self->_pad($text);
                         $plaintext_len = strlen($text);
@@ -1737,7 +1737,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_decryptBlock . '
+                    $decrypt = $init_decryptBlock.'
                         $plaintext = "";
                         $text = str_pad($text, strlen($text) + ('.$block_size.' - strlen($text) % '.$block_size.') % '.$block_size.', chr(0));
                         $ciphertext_len = strlen($text);
@@ -1752,7 +1752,7 @@ 
                         ';
                     break;
                 case CRYPT_RIJNDAEL_MODE_CBC:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $text = $self->_pad($text);
                         $plaintext_len = strlen($text);
@@ -1772,7 +1772,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_decryptBlock . '
+                    $decrypt = $init_decryptBlock.'
                         $plaintext = "";
                         $text = str_pad($text, strlen($text) + ('.$block_size.' - strlen($text) % '.$block_size.') % '.$block_size.', chr(0));
                         $ciphertext_len = strlen($text);
@@ -1794,7 +1794,7 @@ 
                         ';
                     break;
                 case CRYPT_RIJNDAEL_MODE_CTR:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
                         $xor = $self->encryptIV;
@@ -1830,7 +1830,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_encryptBlock . '
+                    $decrypt = $init_encryptBlock.'
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
                         $xor = $self->decryptIV;
@@ -1867,7 +1867,7 @@ 
                         ';
                     break;
                 case CRYPT_RIJNDAEL_MODE_CFB:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $buffer = &$self->enbuffer;
 
@@ -1915,7 +1915,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_encryptBlock . '
+                    $decrypt = $init_encryptBlock.'
                         $plaintext = "";
                         $buffer = &$self->debuffer;
 
@@ -1966,7 +1966,7 @@ 
                         ';
                     break;
                 case CRYPT_RIJNDAEL_MODE_OFB:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
                         $xor = $self->encryptIV;
@@ -2002,7 +2002,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_encryptBlock . '
+                    $decrypt = $init_encryptBlock.'
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
                         $xor = $self->decryptIV;

main/inc/lib/phpseclib/Crypt/RSA.php

Doc Comments +5 added lines, -12 removed lines

@@ -677,7 +677,6 @@ 
      *
      * @access private
      * @see setPrivateKeyFormat()
-     * @param String $RSAPrivateKey
      * @return String
      */
     function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
@@ -830,7 +829,6 @@ 
      *
      * @access private
      * @see setPublicKeyFormat()
-     * @param String $RSAPrivateKey
      * @return String
      */
     function _convertPublicKey($n, $e)
@@ -1491,7 +1489,6 @@ 
      *
      * @see getPublicKey()
      * @access public
-     * @param String $key
      * @param Integer $type optional
      */
     function getPublicKey($type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
@@ -1514,7 +1511,6 @@ 
      *
      * @see getPublicKey()
      * @access public
-     * @param String $key
      * @param Integer $type optional
      */
     function getPrivateKey($type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
@@ -1538,8 +1534,7 @@ 
      *
      * @see getPrivateKey()
      * @access private
-     * @param String $key
-     * @param Integer $type optional
+     * @param integer $mode
      */
     function _getPrivatePublicKey($mode = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
     {
@@ -1742,7 +1737,6 @@ 
      *    of the hash function Hash) and 0.
      *
      * @access public
-     * @param Integer $format
      */
     function setSaltLength($sLen)
     {
@@ -1991,7 +1985,6 @@ 
      *
      * @access private
      * @param String $mgfSeed
-     * @param Integer $mgfLen
      * @return String
      */
     function _mgf1($mgfSeed, $maskLen)
@@ -2284,7 +2277,7 @@ 
      * @param String $m
      * @param String $em
      * @param Integer $emBits
-     * @return String
+     * @return boolean
      */
     function _emsa_pss_verify($m, $em, $emBits)
     {
@@ -2356,7 +2349,7 @@ 
      * @access private
      * @param String $m
      * @param String $s
-     * @return String
+     * @return boolean
      */
     function _rsassa_pss_verify($m, $s)
     {
@@ -2477,7 +2470,8 @@ 
      *
      * @access private
      * @param String $m
-     * @return String
+     * @param string $s
+     * @return boolean
      */
     function _rsassa_pkcs1_v1_5_verify($m, $s)
     {
@@ -2610,7 +2604,6 @@ 
      *
      * @see encrypt()
      * @access public
-     * @param String $plaintext
      * @return String
      */
     function decrypt($ciphertext)

Indentation +23 added lines, -23 removed lines

@@ -703,15 +703,15 @@ 
                     return false;
                 }
                 return "<RSAKeyValue>\r\n" .
-                       '  <Modulus>' . base64_encode($raw['modulus']) . "</Modulus>\r\n" .
-                       '  <Exponent>' . base64_encode($raw['publicExponent']) . "</Exponent>\r\n" .
-                       '  <P>' . base64_encode($raw['prime1']) . "</P>\r\n" .
-                       '  <Q>' . base64_encode($raw['prime2']) . "</Q>\r\n" .
-                       '  <DP>' . base64_encode($raw['exponent1']) . "</DP>\r\n" .
-                       '  <DQ>' . base64_encode($raw['exponent2']) . "</DQ>\r\n" .
-                       '  <InverseQ>' . base64_encode($raw['coefficient']) . "</InverseQ>\r\n" .
-                       '  <D>' . base64_encode($raw['privateExponent']) . "</D>\r\n" .
-                       '</RSAKeyValue>';
+                        '  <Modulus>' . base64_encode($raw['modulus']) . "</Modulus>\r\n" .
+                        '  <Exponent>' . base64_encode($raw['publicExponent']) . "</Exponent>\r\n" .
+                        '  <P>' . base64_encode($raw['prime1']) . "</P>\r\n" .
+                        '  <Q>' . base64_encode($raw['prime2']) . "</Q>\r\n" .
+                        '  <DP>' . base64_encode($raw['exponent1']) . "</DP>\r\n" .
+                        '  <DQ>' . base64_encode($raw['exponent2']) . "</DQ>\r\n" .
+                        '  <InverseQ>' . base64_encode($raw['coefficient']) . "</InverseQ>\r\n" .
+                        '  <D>' . base64_encode($raw['privateExponent']) . "</D>\r\n" .
+                        '</RSAKeyValue>';
                 break;
             case CRYPT_RSA_PRIVATE_FORMAT_PUTTY:
                 if ($num_primes != 2) {
@@ -725,8 +725,8 @@ 
                     strlen('ssh-rsa'), 'ssh-rsa', strlen($raw['publicExponent']), $raw['publicExponent'], strlen($raw['modulus']), $raw['modulus']
                 );
                 $source = pack('Na*Na*Na*Na*',
-                              strlen('ssh-rsa'), 'ssh-rsa', strlen($encryption), $encryption,
-                              strlen($this->comment), $this->comment, strlen($public), $public
+                                strlen('ssh-rsa'), 'ssh-rsa', strlen($encryption), $encryption,
+                                strlen($this->comment), $this->comment, strlen($public), $public
                 );
                 $public = base64_encode($public);
                 $key.= "Public-Lines: " . ((strlen($public) + 32) >> 6) . "\r\n";
@@ -810,15 +810,15 @@ 
                     $des->setIV($iv);
                     $iv = strtoupper(bin2hex($iv));
                     $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                                     "Proc-Type: 4,ENCRYPTED\r\n" .
-                                     "DEK-Info: DES-EDE3-CBC,$iv\r\n" .
-                                     "\r\n" .
-                                     chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) .
-                                     '-----END RSA PRIVATE KEY-----';
+                                        "Proc-Type: 4,ENCRYPTED\r\n" .
+                                        "DEK-Info: DES-EDE3-CBC,$iv\r\n" .
+                                        "\r\n" .
+                                        chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) .
+                                        '-----END RSA PRIVATE KEY-----';
                 } else {
                     $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                                     chunk_split(base64_encode($RSAPrivateKey), 64) .
-                                     '-----END RSA PRIVATE KEY-----';
+                                        chunk_split(base64_encode($RSAPrivateKey), 64) .
+                                        '-----END RSA PRIVATE KEY-----';
                 }
 
                 return $RSAPrivateKey;
@@ -843,9 +843,9 @@ 
                 return array('e' => $e->copy(), 'n' => $n->copy());
             case CRYPT_RSA_PUBLIC_FORMAT_XML:
                 return "<RSAKeyValue>\r\n" .
-                       '  <Modulus>' . base64_encode($modulus) . "</Modulus>\r\n" .
-                       '  <Exponent>' . base64_encode($publicExponent) . "</Exponent>\r\n" .
-                       '</RSAKeyValue>';
+                        '  <Modulus>' . base64_encode($modulus) . "</Modulus>\r\n" .
+                        '  <Exponent>' . base64_encode($publicExponent) . "</Exponent>\r\n" .
+                        '</RSAKeyValue>';
                 break;
             case CRYPT_RSA_PUBLIC_FORMAT_OPENSSH:
                 // from <http://tools.ietf.org/html/rfc4253#page-15>:
@@ -884,8 +884,8 @@ 
                 }
 
                 $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-                                 chunk_split(base64_encode($RSAPublicKey), 64) .
-                                 '-----END PUBLIC KEY-----';
+                                    chunk_split(base64_encode($RSAPublicKey), 64) .
+                                    '-----END PUBLIC KEY-----';
 
                 return $RSAPublicKey;
         }

Spacing +72 added lines, -72 removed lines

@@ -100,7 +100,7 @@ 
  * @see Crypt_RSA::setHash()
  * @see Crypt_RSA::setMGFHash()
  */
-define('CRYPT_RSA_ENCRYPTION_OAEP',  1);
+define('CRYPT_RSA_ENCRYPTION_OAEP', 1);
 /**
  * Use PKCS#1 padding.
  *
@@ -124,7 +124,7 @@ 
  * @see Crypt_RSA::setSaltLength()
  * @see Crypt_RSA::setMGFHash()
  */
-define('CRYPT_RSA_SIGNATURE_PSS',  1);
+define('CRYPT_RSA_SIGNATURE_PSS', 1);
 /**
  * Use the PKCS#1 scheme by default.
  *
@@ -141,7 +141,7 @@ 
 /**
  * ASN1 Integer
  */
-define('CRYPT_RSA_ASN1_INTEGER',   2);
+define('CRYPT_RSA_ASN1_INTEGER', 2);
 /**
  * ASN1 Bit String
  */
@@ -171,7 +171,7 @@ 
 /**
  * Default openSSL configuration file.
  */
-define('CRYPT_RSA_OPENSSL_CONFIG', dirname(__FILE__) . '/../openssl.cnf');
+define('CRYPT_RSA_OPENSSL_CONFIG', dirname(__FILE__).'/../openssl.cnf');
 
 
 /**#@+
@@ -467,7 +467,7 @@ 
 
         $this->configFile = CRYPT_RSA_OPENSSL_CONFIG;
 
-        if ( !defined('CRYPT_RSA_MODE') ) {
+        if (!defined('CRYPT_RSA_MODE')) {
             switch (true) {
                 case extension_loaded('openssl') && version_compare(PHP_VERSION, '4.2.0', '>=') && file_exists($this->configFile):
                     define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_OPENSSL);
@@ -518,7 +518,7 @@ 
         }
 
         // OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
-        if ( CRYPT_RSA_MODE == CRYPT_RSA_MODE_OPENSSL && $bits >= 384 && CRYPT_RSA_EXPONENT == 65537) {
+        if (CRYPT_RSA_MODE == CRYPT_RSA_MODE_OPENSSL && $bits >= 384 && CRYPT_RSA_EXPONENT == 65537) {
             $config = array();
             if (isset($this->configFile)) {
                 $config['config'] = $this->configFile;
@@ -578,7 +578,7 @@ 
         do {
             for ($i = $i0; $i <= $num_primes; $i++) {
                 if ($timeout !== false) {
-                    $timeout-= time() - $start;
+                    $timeout -= time() - $start;
                     $start = time();
                     if ($timeout <= 0) {
                         return array(
@@ -702,15 +702,15 @@ 
                 if ($num_primes != 2) {
                     return false;
                 }
-                return "<RSAKeyValue>\r\n" .
-                       '  <Modulus>' . base64_encode($raw['modulus']) . "</Modulus>\r\n" .
-                       '  <Exponent>' . base64_encode($raw['publicExponent']) . "</Exponent>\r\n" .
-                       '  <P>' . base64_encode($raw['prime1']) . "</P>\r\n" .
-                       '  <Q>' . base64_encode($raw['prime2']) . "</Q>\r\n" .
-                       '  <DP>' . base64_encode($raw['exponent1']) . "</DP>\r\n" .
-                       '  <DQ>' . base64_encode($raw['exponent2']) . "</DQ>\r\n" .
-                       '  <InverseQ>' . base64_encode($raw['coefficient']) . "</InverseQ>\r\n" .
-                       '  <D>' . base64_encode($raw['privateExponent']) . "</D>\r\n" .
+                return "<RSAKeyValue>\r\n".
+                       '  <Modulus>'.base64_encode($raw['modulus'])."</Modulus>\r\n".
+                       '  <Exponent>'.base64_encode($raw['publicExponent'])."</Exponent>\r\n".
+                       '  <P>'.base64_encode($raw['prime1'])."</P>\r\n".
+                       '  <Q>'.base64_encode($raw['prime2'])."</Q>\r\n".
+                       '  <DP>'.base64_encode($raw['exponent1'])."</DP>\r\n".
+                       '  <DQ>'.base64_encode($raw['exponent2'])."</DQ>\r\n".
+                       '  <InverseQ>'.base64_encode($raw['coefficient'])."</InverseQ>\r\n".
+                       '  <D>'.base64_encode($raw['privateExponent'])."</D>\r\n".
                        '</RSAKeyValue>';
                 break;
             case CRYPT_RSA_PRIVATE_FORMAT_PUTTY:
@@ -719,8 +719,8 @@ 
                 }
                 $key = "PuTTY-User-Key-File-2: ssh-rsa\r\nEncryption: ";
                 $encryption = (!empty($this->password) || is_string($this->password)) ? 'aes256-cbc' : 'none';
-                $key.= $encryption;
-                $key.= "\r\nComment: " . $this->comment . "\r\n";
+                $key .= $encryption;
+                $key .= "\r\nComment: ".$this->comment."\r\n";
                 $public = pack('Na*Na*Na*',
                     strlen('ssh-rsa'), 'ssh-rsa', strlen($raw['publicExponent']), $raw['publicExponent'], strlen($raw['modulus']), $raw['modulus']
                 );
@@ -729,18 +729,18 @@ 
                               strlen($this->comment), $this->comment, strlen($public), $public
                 );
                 $public = base64_encode($public);
-                $key.= "Public-Lines: " . ((strlen($public) + 32) >> 6) . "\r\n";
-                $key.= chunk_split($public, 64);
+                $key .= "Public-Lines: ".((strlen($public) + 32) >> 6)."\r\n";
+                $key .= chunk_split($public, 64);
                 $private = pack('Na*Na*Na*Na*',
                     strlen($raw['privateExponent']), $raw['privateExponent'], strlen($raw['prime1']), $raw['prime1'],
                     strlen($raw['prime2']), $raw['prime2'], strlen($raw['coefficient']), $raw['coefficient']
                 );
                 if (empty($this->password) && !is_string($this->password)) {
-                    $source.= pack('Na*', strlen($private), $private);
+                    $source .= pack('Na*', strlen($private), $private);
                     $hashkey = 'putty-private-key-file-mac-key';
                 } else {
-                    $private.= crypt_random_string(16 - (strlen($private) & 15));
-                    $source.= pack('Na*', strlen($private), $private);
+                    $private .= crypt_random_string(16 - (strlen($private) & 15));
+                    $source .= pack('Na*', strlen($private), $private);
                     if (!class_exists('Crypt_AES')) {
                         require_once('Crypt/AES.php');
                     }
@@ -748,7 +748,7 @@ 
                     $symkey = '';
                     while (strlen($symkey) < 32) {
                         $temp = pack('Na*', $sequence++, $this->password);
-                        $symkey.= pack('H*', sha1($temp));
+                        $symkey .= pack('H*', sha1($temp));
                     }
                     $symkey = substr($symkey, 0, 32);
                     $crypto = new Crypt_AES();
@@ -756,18 +756,18 @@ 
                     $crypto->setKey($symkey);
                     $crypto->disablePadding();
                     $private = $crypto->encrypt($private);
-                    $hashkey = 'putty-private-key-file-mac-key' . $this->password;
+                    $hashkey = 'putty-private-key-file-mac-key'.$this->password;
                 }
 
                 $private = base64_encode($private);
-                $key.= 'Private-Lines: ' . ((strlen($private) + 32) >> 6) . "\r\n";
-                $key.= chunk_split($private, 64);
+                $key .= 'Private-Lines: '.((strlen($private) + 32) >> 6)."\r\n";
+                $key .= chunk_split($private, 64);
                 if (!class_exists('Crypt_Hash')) {
                     require_once('Crypt/Hash.php');
                 }
                 $hash = new Crypt_Hash('sha1');
                 $hash->setKey(pack('H*', sha1($hashkey)));
-                $key.= 'Private-MAC: ' . bin2hex($hash->hash($source)) . "\r\n";
+                $key .= 'Private-MAC: '.bin2hex($hash->hash($source))."\r\n";
 
                 return $key;
             default: // eg. CRYPT_RSA_PRIVATE_FORMAT_PKCS1
@@ -789,19 +789,19 @@ 
                         //     coefficient       INTEGER   -- ti
                         // }
                         $OtherPrimeInfo = pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($primes[$i]->toBytes(true))), $primes[$i]->toBytes(true));
-                        $OtherPrimeInfo.= pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
-                        $OtherPrimeInfo.= pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
-                        $OtherPrimeInfos.= pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
+                        $OtherPrimeInfo .= pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
+                        $OtherPrimeInfo .= pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
+                        $OtherPrimeInfos .= pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
                     }
-                    $RSAPrivateKey.= pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
+                    $RSAPrivateKey .= pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
                 }
 
                 $RSAPrivateKey = pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
 
                 if (!empty($this->password) || is_string($this->password)) {
                     $iv = crypt_random_string(8);
-                    $symkey = pack('H*', md5($this->password . $iv)); // symkey is short for symmetric key
-                    $symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
+                    $symkey = pack('H*', md5($this->password.$iv)); // symkey is short for symmetric key
+                    $symkey .= substr(pack('H*', md5($symkey.$this->password.$iv)), 0, 8);
                     if (!class_exists('Crypt_TripleDES')) {
                         require_once('Crypt/TripleDES.php');
                     }
@@ -809,15 +809,15 @@ 
                     $des->setKey($symkey);
                     $des->setIV($iv);
                     $iv = strtoupper(bin2hex($iv));
-                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                                     "Proc-Type: 4,ENCRYPTED\r\n" .
-                                     "DEK-Info: DES-EDE3-CBC,$iv\r\n" .
-                                     "\r\n" .
-                                     chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) .
+                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n".
+                                     "Proc-Type: 4,ENCRYPTED\r\n".
+                                     "DEK-Info: DES-EDE3-CBC,$iv\r\n".
+                                     "\r\n".
+                                     chunk_split(base64_encode($des->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-----';
                 }
 
@@ -842,9 +842,9 @@ 
             case CRYPT_RSA_PUBLIC_FORMAT_RAW:
                 return array('e' => $e->copy(), 'n' => $n->copy());
             case CRYPT_RSA_PUBLIC_FORMAT_XML:
-                return "<RSAKeyValue>\r\n" .
-                       '  <Modulus>' . base64_encode($modulus) . "</Modulus>\r\n" .
-                       '  <Exponent>' . base64_encode($publicExponent) . "</Exponent>\r\n" .
+                return "<RSAKeyValue>\r\n".
+                       '  <Modulus>'.base64_encode($modulus)."</Modulus>\r\n".
+                       '  <Exponent>'.base64_encode($publicExponent)."</Exponent>\r\n".
                        '</RSAKeyValue>';
                 break;
             case CRYPT_RSA_PUBLIC_FORMAT_OPENSSH:
@@ -853,7 +853,7 @@ 
                 // mpint     e
                 // mpint     n
                 $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
-                $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . $this->comment;
+                $RSAPublicKey = 'ssh-rsa '.base64_encode($RSAPublicKey).' '.$this->comment;
 
                 return $RSAPublicKey;
             default: // eg. CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW or CRYPT_RSA_PUBLIC_FORMAT_PKCS1
@@ -875,16 +875,16 @@ 
                 if ($this->publicKeyFormat == CRYPT_RSA_PUBLIC_FORMAT_PKCS1) {
                     // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
                     $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-                    $RSAPublicKey = chr(0) . $RSAPublicKey;
-                    $RSAPublicKey = chr(3) . $this->_encodeLength(strlen($RSAPublicKey)) . $RSAPublicKey;
+                    $RSAPublicKey = chr(0).$RSAPublicKey;
+                    $RSAPublicKey = chr(3).$this->_encodeLength(strlen($RSAPublicKey)).$RSAPublicKey;
 
                     $RSAPublicKey = pack('Ca*a*',
-                        CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($rsaOID . $RSAPublicKey)), $rsaOID . $RSAPublicKey
+                        CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($rsaOID.$RSAPublicKey)), $rsaOID.$RSAPublicKey
                     );
                 }
 
-                $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-                                 chunk_split(base64_encode($RSAPublicKey), 64) .
+                $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n".
+                                 chunk_split(base64_encode($RSAPublicKey), 64).
                                  '-----END PUBLIC KEY-----';
 
                 return $RSAPublicKey;
@@ -959,8 +959,8 @@ 
                    * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
                 if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
                     $iv = pack('H*', trim($matches[2]));
-                    $symkey = pack('H*', md5($this->password . substr($iv, 0, 8))); // symkey is short for symmetric key
-                    $symkey.= pack('H*', md5($symkey . $this->password . substr($iv, 0, 8)));
+                    $symkey = pack('H*', md5($this->password.substr($iv, 0, 8))); // symkey is short for symmetric key
+                    $symkey .= pack('H*', md5($symkey.$this->password.substr($iv, 0, 8)));
                     $ciphertext = preg_replace('#.+(\r|\n|\r\n)\1|[\r\n]|-.+-| #s', '', $key);
                     $ciphertext = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $ciphertext) ? base64_decode($ciphertext) : false;
                     if ($ciphertext === false) {
@@ -1179,7 +1179,7 @@ 
                 xml_set_element_handler($xml, '_start_element_handler', '_stop_element_handler');
                 xml_set_character_data_handler($xml, '_data_handler');
                 // add <xml></xml> to account for "dangling" tags like <BitStrength>...</BitStrength> that are sometimes added
-                if (!xml_parse($xml, '<xml>' . $key . '</xml>')) {
+                if (!xml_parse($xml, '<xml>'.$key.'</xml>')) {
                     return false;
                 }
 
@@ -1215,7 +1215,7 @@ 
                         $sequence = 0;
                         while (strlen($symkey) < 32) {
                             $temp = pack('Na*', $sequence++, $this->password);
-                            $symkey.= pack('H*', sha1($temp));
+                            $symkey .= pack('H*', sha1($temp));
                         }
                         $symkey = substr($symkey, 0, 32);
                         $crypto = new Crypt_AES();
@@ -1350,7 +1350,7 @@ 
         if (!isset($this->current) || is_object($this->current)) {
             return;
         }
-        $this->current.= trim($data);
+        $this->current .= trim($data);
     }
 
     /**
@@ -1583,8 +1583,8 @@ 
         $max = str_repeat(chr(0xFF), $bytes);
         $msb = $bits & 7;
         if ($msb) {
-            $min = chr(1 << ($msb - 1)) . $min;
-            $max = chr((1 << $msb) - 1) . $max;
+            $min = chr(1 << ($msb - 1)).$min;
+            $max = chr((1 << $msb) - 1).$max;
         } else {
             $min[0] = chr(0x80);
         }
@@ -1608,8 +1608,8 @@ 
     function _decodeLength(&$string)
     {
         $length = ord($this->_string_shift($string));
-        if ( $length & 0x80 ) { // definite length, long form
-            $length&= 0x7F;
+        if ($length & 0x80) { // definite length, long form
+            $length &= 0x7F;
             $temp = $this->_string_shift($string, $length);
             list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
         }
@@ -2002,7 +2002,7 @@ 
         $count = ceil($maskLen / $this->mgfHLen);
         for ($i = 0; $i < $count; $i++) {
             $c = pack('N', $i);
-            $t.= $this->mgfHash->hash($mgfSeed . $c);
+            $t .= $this->mgfHash->hash($mgfSeed.$c);
         }
 
         return substr($t, 0, $maskLen);
@@ -2037,13 +2037,13 @@ 
 
         $lHash = $this->hash->hash($l);
         $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
-        $db = $lHash . $ps . chr(1) . $m;
+        $db = $lHash.$ps.chr(1).$m;
         $seed = crypt_random_string($this->hLen);
         $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
         $maskedDB = $db ^ $dbMask;
         $seedMask = $this->_mgf1($maskedDB, $this->hLen);
         $maskedSeed = $seed ^ $seedMask;
-        $em = chr(0) . $maskedSeed . $maskedDB;
+        $em = chr(0).$maskedSeed.$maskedDB;
 
         // RSA encryption
 
@@ -2158,7 +2158,7 @@ 
         while (strlen($ps) != $psLen) {
             $temp = crypt_random_string($psLen - strlen($ps));
             $temp = str_replace("\x00", '', $temp);
-            $ps.= $temp;
+            $ps .= $temp;
         }
         $type = 2;
         // see the comments of _rsaes_pkcs1_v1_5_decrypt() to understand why this is being done
@@ -2167,7 +2167,7 @@ 
             // "The padding string PS shall consist of k-3-||D|| octets. ... for block type 01, they shall have value FF"
             $ps = str_repeat("\xFF", $psLen);
         }
-        $em = chr(0) . chr($type) . $ps . chr(0) . $m;
+        $em = chr(0).chr($type).$ps.chr(0).$m;
 
         // RSA encryption
         $m = $this->_os2ip($em);
@@ -2263,14 +2263,14 @@ 
         }
 
         $salt = crypt_random_string($sLen);
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $m2 = "\0\0\0\0\0\0\0\0".$mHash.$salt;
         $h = $this->hash->hash($m2);
         $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
-        $db = $ps . chr(1) . $salt;
+        $db = $ps.chr(1).$salt;
         $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
         $maskedDB = $db ^ $dbMask;
         $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
-        $em = $maskedDB . $h . chr(0xBC);
+        $em = $maskedDB.$h.chr(0xBC);
 
         return $em;
     }
@@ -2317,7 +2317,7 @@ 
             return false;
         }
         $salt = substr($db, $temp + 1); // should be $sLen long
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $m2 = "\0\0\0\0\0\0\0\0".$mHash.$salt;
         $h2 = $this->hash->hash($m2);
         return $this->_equals($h, $h2);
     }
@@ -2425,7 +2425,7 @@ 
             case 'sha512':
                 $t = pack('H*', '3051300d060960864801650304020305000440');
         }
-        $t.= $h;
+        $t .= $h;
         $tLen = strlen($t);
 
         if ($emLen < $tLen + 11) {
@@ -2586,7 +2586,7 @@ 
                 $plaintext = str_split($plaintext, $length);
                 $ciphertext = '';
                 foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_rsaes_pkcs1_v1_5_encrypt($m);
+                    $ciphertext .= $this->_rsaes_pkcs1_v1_5_encrypt($m);
                 }
                 return $ciphertext;
             //case CRYPT_RSA_ENCRYPTION_OAEP:
@@ -2599,7 +2599,7 @@ 
                 $plaintext = str_split($plaintext, $length);
                 $ciphertext = '';
                 foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_rsaes_oaep_encrypt($m);
+                    $ciphertext .= $this->_rsaes_oaep_encrypt($m);
                 }
                 return $ciphertext;
         }
@@ -2638,7 +2638,7 @@ 
             if ($temp === false) {
                 return false;
             }
-            $plaintext.= $temp;
+            $plaintext .= $temp;
         }
 
         return $plaintext;

main/inc/lib/phpseclib/Crypt/TripleDES.php

Doc Comments +2 added lines

@@ -98,6 +98,7 @@ 
      * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
      *
      * @param optional Integer $mode
+     * @param integer $mode
      * @return Crypt_TripleDES
      * @access public
      */
@@ -318,6 +319,7 @@ 
      *
      * @access public
      * @param String $plaintext
+     * @return string
      */
     function encrypt($plaintext)
     {

Indentation +2 added lines, -2 removed lines

@@ -538,7 +538,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -757,7 +757,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }

Spacing +65 added lines, -65 removed lines

@@ -103,7 +103,7 @@ 
      */
     function Crypt_TripleDES($mode = CRYPT_DES_MODE_CBC)
     {
-        if ( !defined('CRYPT_DES_MODE') ) {
+        if (!defined('CRYPT_DES_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('tripledes', mcrypt_list_algorithms()):
                     define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
@@ -113,7 +113,7 @@ 
             }
         }
 
-        if ( $mode == CRYPT_DES_MODE_3CBC ) {
+        if ($mode == CRYPT_DES_MODE_3CBC) {
             $this->mode = CRYPT_DES_MODE_3CBC;
             $this->des = array(
                 new Crypt_DES(CRYPT_DES_MODE_CBC),
@@ -130,7 +130,7 @@ 
             return;
         }
 
-        switch ( CRYPT_DES_MODE ) {
+        switch (CRYPT_DES_MODE) {
             case CRYPT_DES_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_DES_MODE_ECB:
@@ -218,8 +218,8 @@ 
         switch (true) {
             case CRYPT_DES_MODE == CRYPT_DES_MODE_INTERNAL:
             case $this->mode == CRYPT_DES_MODE_3CBC:
-                $this->des[0]->setKey(substr($key,  0, 8));
-                $this->des[1]->setKey(substr($key,  8, 8));
+                $this->des[0]->setKey(substr($key, 0, 8));
+                $this->des[1]->setKey(substr($key, 8, 8));
                 $this->des[2]->setKey(substr($key, 16, 8));
 
                 // Merge the three DES-1-dim-key-arrays for 3DES-inline-en/decrypting  
@@ -258,7 +258,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -281,12 +281,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; $j++) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -332,7 +332,7 @@ 
             return $ciphertext;
         }
 
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
+        if (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) {
             if ($this->enchanged) {
                 mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
                 if ($this->mode == 'ncfb') {
@@ -354,11 +354,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -371,16 +371,16 @@ 
                             mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
                             $this->enbuffer['enmcrypt_init'] = false;
                         }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
+                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
                         $iv = substr($ciphertext, -8);
                         $i = strlen($ciphertext);
-                        $len%= 8;
+                        $len %= 8;
                     } else {
                         while ($len >= 8) {
                             $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, 8);
-                            $ciphertext.= $iv;
-                            $len-= 8;
-                            $i+= 8;
+                            $ciphertext .= $iv;
+                            $len -= 8;
+                            $i += 8;
                         }
                     }
                 } 
@@ -388,7 +388,7 @@ 
                     $iv = mcrypt_generic($this->ecb, $iv);
                     $block = $iv ^ substr($plaintext, $i);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
@@ -419,7 +419,7 @@ 
         $ciphertext = '';
         switch ($this->mode) {
             case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                for ($i = 0; $i < strlen($plaintext); $i += 8) {
                     $block = substr($plaintext, $i, 8);
                     // all of these _processBlock calls could, in theory, be put in a function - say Crypt_TripleDES::_ede_encrypt() or something.
                     // only problem with that: it would slow encryption and decryption down.  $this->des would have to be called every time that
@@ -430,18 +430,18 @@ 
                     $block = $des[0]->_processBlock($block, CRYPT_DES_ENCRYPT);
                     $block = $des[1]->_processBlock($block, CRYPT_DES_DECRYPT);
                     $block = $des[2]->_processBlock($block, CRYPT_DES_ENCRYPT);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                 }
                 break;
             case CRYPT_DES_MODE_CBC:
                 $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                for ($i = 0; $i < strlen($plaintext); $i += 8) {
                     $block = substr($plaintext, $i, 8) ^ $xor;
                     $block = $des[0]->_processBlock($block, CRYPT_DES_ENCRYPT);
                     $block = $des[1]->_processBlock($block, CRYPT_DES_DECRYPT);
                     $block = $des[2]->_processBlock($block, CRYPT_DES_ENCRYPT);
                     $xor = $block;
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
@@ -450,41 +450,41 @@ 
             case CRYPT_DES_MODE_CTR:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['encrypted'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         if (strlen($block) > strlen($buffer['encrypted'])) {
                             $key = $this->_generate_xor($xor);
                             $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
                             $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
                             $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
-                            $buffer['encrypted'].= $key;
+                            $buffer['encrypted'] .= $key;
                         }
                         $key = $this->_string_shift($buffer['encrypted']);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         $key = $this->_generate_xor($xor);
                         $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
                         $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
                         $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                        $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+                        $buffer['encrypted'] = substr($key, $start).$buffer['encrypted'];
                     }
                 }
                 break;
             case CRYPT_DES_MODE_CFB:
                 if (strlen($buffer['xor'])) {
                     $ciphertext = $plaintext ^ $buffer['xor'];
-                    $iv = $buffer['encrypted'] . $ciphertext;
+                    $iv = $buffer['encrypted'].$ciphertext;
                     $start = strlen($ciphertext);
-                    $buffer['encrypted'].= $ciphertext;
+                    $buffer['encrypted'] .= $ciphertext;
                     $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
                 } else {
                     $ciphertext = '';
@@ -492,11 +492,11 @@ 
                     $start = 0;
                 }
 
-                for ($i = $start; $i < strlen($plaintext); $i+=8) {
+                for ($i = $start; $i < strlen($plaintext); $i += 8) {
                     $block = substr($plaintext, $i, 8);
                     $iv = $des[0]->_processBlock($iv, CRYPT_DES_ENCRYPT);
                     $iv = $des[1]->_processBlock($iv, CRYPT_DES_DECRYPT);
-                    $xor= $des[2]->_processBlock($iv, CRYPT_DES_ENCRYPT);
+                    $xor = $des[2]->_processBlock($iv, CRYPT_DES_ENCRYPT);
 
                     $iv = $block ^ $xor;
                     if ($continuousBuffer && strlen($iv) != 8) {
@@ -505,7 +505,7 @@ 
                             'xor' => substr($xor, strlen($iv))
                         );
                     }
-                    $ciphertext.= $iv;
+                    $ciphertext .= $iv;
                 }
 
                 if ($this->continuousBuffer) {
@@ -515,30 +515,30 @@ 
             case CRYPT_DES_MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $des[0]->_processBlock($xor, CRYPT_DES_ENCRYPT);
                             $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
                             $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor']);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $xor = $des[0]->_processBlock($xor, CRYPT_DES_ENCRYPT);
                         $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
                         $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                        $ciphertext.= substr($plaintext, $i, 8) ^ $xor;
+                        $ciphertext .= substr($plaintext, $i, 8) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -566,7 +566,7 @@ 
             $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
         }
 
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
+        if (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) {
             if ($this->dechanged) {
                 mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
                 if ($this->mode == 'ncfb') {
@@ -588,11 +588,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -600,14 +600,14 @@ 
                 }
                 if ($len >= 8) {
                     $cb = substr($ciphertext, $i, $len - $len % 8);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $plaintext .= mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
                     $iv = substr($cb, -8);
-                    $len%= 8;
+                    $len %= 8;
                 }
                 if ($len) {
                     $iv = mcrypt_generic($this->ecb, $iv);
                     $cb = substr($ciphertext, -$len);
-                    $plaintext.= $iv ^ $cb;
+                    $plaintext .= $iv ^ $cb;
                     $iv = substr_replace($iv, $cb, 0, $len);
                     $pos = $len;
                 }
@@ -639,22 +639,22 @@ 
         $plaintext = '';
         switch ($this->mode) {
             case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                     $block = substr($ciphertext, $i, 8);
                     $block = $des[2]->_processBlock($block, CRYPT_DES_DECRYPT);
                     $block = $des[1]->_processBlock($block, CRYPT_DES_ENCRYPT);
                     $block = $des[0]->_processBlock($block, CRYPT_DES_DECRYPT);
-                    $plaintext.= $block;
+                    $plaintext .= $block;
                 }
                 break;
             case CRYPT_DES_MODE_CBC:
                 $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                     $orig = $block = substr($ciphertext, $i, 8);
                     $block = $des[2]->_processBlock($block, CRYPT_DES_DECRYPT);
                     $block = $des[1]->_processBlock($block, CRYPT_DES_ENCRYPT);
                     $block = $des[0]->_processBlock($block, CRYPT_DES_DECRYPT);
-                    $plaintext.= $block ^ $xor;
+                    $plaintext .= $block ^ $xor;
                     $xor = $orig;
                 }
                 if ($this->continuousBuffer) {
@@ -664,39 +664,39 @@ 
             case CRYPT_DES_MODE_CTR:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
                             $key = $this->_generate_xor($xor);
                             $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
                             $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
                             $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
-                            $buffer['ciphertext'].= $key;
+                            $buffer['ciphertext'] .= $key;
                         }
                         $key = $this->_string_shift($buffer['ciphertext']);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         $key = $this->_generate_xor($xor);
                         $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
                         $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
                         $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                        $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                     }
                 }
                 break;
             case CRYPT_DES_MODE_CFB:
                 if (strlen($buffer['ciphertext'])) {
                     $plaintext = $ciphertext ^ substr($this->decryptIV, strlen($buffer['ciphertext']));
-                    $buffer['ciphertext'].= substr($ciphertext, 0, strlen($plaintext));
+                    $buffer['ciphertext'] .= substr($ciphertext, 0, strlen($plaintext));
                     if (strlen($buffer['ciphertext']) != 8) {
                         $block = $this->decryptIV;
                     } else {
@@ -715,11 +715,11 @@ 
                     $start = 0;
                 }
 
-                for ($i = $start; $i < strlen($ciphertext); $i+=8) {
+                for ($i = $start; $i < strlen($ciphertext); $i += 8) {
                     $block = substr($ciphertext, $i, 8);
-                    $plaintext.= $block ^ $xor;
+                    $plaintext .= $block ^ $xor;
                     if ($continuousBuffer && strlen($block) != 8) {
-                        $buffer['ciphertext'].= $block;
+                        $buffer['ciphertext'] .= $block;
                         $block = $xor;
                     } else if (strlen($block) == 8) {
                         $xor = $des[0]->_processBlock($block, CRYPT_DES_ENCRYPT);
@@ -734,30 +734,30 @@ 
             case CRYPT_DES_MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $des[0]->_processBlock($xor, CRYPT_DES_ENCRYPT);
                             $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
                             $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor']);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $xor = $des[0]->_processBlock($xor, CRYPT_DES_ENCRYPT);
                         $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
                         $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                        $plaintext.= substr($ciphertext, $i, 8) ^ $xor;
+                        $plaintext .= substr($ciphertext, $i, 8) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }

main/inc/lib/phpseclib/Crypt/Twofish.php

Doc Comments +3 added lines

@@ -563,6 +563,7 @@ 
      * If not explictly set, CRYPT_TWOFISH_MODE_CBC will be used.
      *
      * @param optional Integer $mode
+     * @param integer $mode
      * @access public
      */
     function Crypt_Twofish($mode = CRYPT_TWOFISH_MODE_CBC)
@@ -1072,6 +1073,7 @@ 
      *
      * @see Crypt_Twofish::_unpad()
      * @access private
+     * @param string $text
      */
     function _pad($text)
     {
@@ -1099,6 +1101,7 @@ 
      *
      * @see Crypt_Twofish::_pad()
      * @access private
+     * @param string $text
      */
     function _unpad($text)
     {

Indentation +18 added lines, -18 removed lines

@@ -678,13 +678,13 @@ 
                 list ($s3, $s2, $s1, $s0) = $this->mds_rem($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]] ^
-                         $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
-                         $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
-                         $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]];
+                            $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
+                            $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
+                            $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]];
                     $B = $m0[$q0[$q0[$j] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
+                            $m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]] ^
+                            $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
+                            $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
                     $K[] = $A+= $B;
                     $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
@@ -702,13 +702,13 @@ 
                 list ($s3, $s2, $s1, $s0) = $this->mds_rem($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]] ^
-                         $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]];
+                            $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]];
                     $B = $m0[$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
+                            $m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
+                            $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
+                            $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
                     $K[] = $A+= $B;
                     $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
@@ -727,13 +727,13 @@ 
                 list ($s3, $s2, $s1, $s0) = $this->mds_rem($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]] ^
-                         $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]];
+                            $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]];
                     $B = $m0[$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
+                            $m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
+                            $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
+                            $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
                     $K[] = $A+= $B;
                     $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);

Spacing +56 added lines, -56 removed lines

@@ -276,7 +276,7 @@ 
      * @var Array
      * @access private
      */
-    var $q0 = array (
+    var $q0 = array(
         0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76,
         0x9A, 0x92, 0x80, 0x78, 0xE4, 0xDD, 0xD1, 0x38,
         0x0D, 0xC6, 0x35, 0x98, 0x18, 0xF7, 0xEC, 0x6C,
@@ -317,7 +317,7 @@ 
      * @var Array
      * @access private
      */
-    var $q1 = array (
+    var $q1 = array(
         0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8,
         0x4A, 0xD3, 0xE6, 0x6B, 0x45, 0x7D, 0xE8, 0x4B,
         0xD6, 0x32, 0xD8, 0xFD, 0x37, 0x71, 0xF1, 0xE1,
@@ -358,7 +358,7 @@ 
      * @var Array
      * @access private
      */
-    var $m0 = array (
+    var $m0 = array(
         0xBCBC3275, 0xECEC21F3, 0x202043C6, 0xB3B3C9F4, 0xDADA03DB, 0x02028B7B, 0xE2E22BFB, 0x9E9EFAC8,
         0xC9C9EC4A, 0xD4D409D3, 0x18186BE6, 0x1E1E9F6B, 0x98980E45, 0xB2B2387D, 0xA6A6D2E8, 0x2626B74B,
         0x3C3C57D6, 0x93938A32, 0x8282EED8, 0x525298FD, 0x7B7BD437, 0xBBBB3771, 0x5B5B97F1, 0x474783E1,
@@ -399,7 +399,7 @@ 
      * @var Array
      * @access private
      */
-    var $m1 = array (
+    var $m1 = array(
         0xA9D93939, 0x67901717, 0xB3719C9C, 0xE8D2A6A6, 0x04050707, 0xFD985252, 0xA3658080, 0x76DFE4E4,
         0x9A084545, 0x92024B4B, 0x80A0E0E0, 0x78665A5A, 0xE4DDAFAF, 0xDDB06A6A, 0xD1BF6363, 0x38362A2A,
         0x0D54E6E6, 0xC6432020, 0x3562CCCC, 0x98BEF2F2, 0x181E1212, 0xF724EBEB, 0xECD7A1A1, 0x6C774141,
@@ -440,7 +440,7 @@ 
      * @var Array
      * @access private
      */
-    var $m2 = array (
+    var $m2 = array(
         0xBC75BC32, 0xECF3EC21, 0x20C62043, 0xB3F4B3C9, 0xDADBDA03, 0x027B028B, 0xE2FBE22B, 0x9EC89EFA,
         0xC94AC9EC, 0xD4D3D409, 0x18E6186B, 0x1E6B1E9F, 0x9845980E, 0xB27DB238, 0xA6E8A6D2, 0x264B26B7,
         0x3CD63C57, 0x9332938A, 0x82D882EE, 0x52FD5298, 0x7B377BD4, 0xBB71BB37, 0x5BF15B97, 0x47E14783,
@@ -481,7 +481,7 @@ 
      * @var Array
      * @access private
      */
-    var $m3 = array (
+    var $m3 = array(
         0xD939A9D9, 0x90176790, 0x719CB371, 0xD2A6E8D2, 0x05070405, 0x9852FD98, 0x6580A365, 0xDFE476DF,
         0x08459A08, 0x024B9202, 0xA0E080A0, 0x665A7866, 0xDDAFE4DD, 0xB06ADDB0, 0xBF63D1BF, 0x362A3836,
         0x54E60D54, 0x4320C643, 0x62CC3562, 0xBEF298BE, 0x1E12181E, 0x24EBF724, 0xD7A1ECD7, 0x77416C77,
@@ -567,7 +567,7 @@ 
      */
     function Crypt_Twofish($mode = CRYPT_TWOFISH_MODE_CBC)
     {
-        if ( !defined('CRYPT_TWOFISH_MODE') ) {
+        if (!defined('CRYPT_TWOFISH_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('twofish', mcrypt_list_algorithms()):
                     define('CRYPT_TWOFISH_MODE', CRYPT_TWOFISH_MODE_MCRYPT);
@@ -577,7 +577,7 @@ 
             }
         }
 
-        switch ( CRYPT_TWOFISH_MODE ) {
+        switch (CRYPT_TWOFISH_MODE) {
             case CRYPT_TWOFISH_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_TWOFISH_MODE_ECB:
@@ -640,13 +640,13 @@ 
         $keylength = strlen($key);
         switch (true) {
             case $keylength <= 16:
-                $key.= str_repeat("\0", 16 - $keylength);
+                $key .= str_repeat("\0", 16 - $keylength);
                 break;
             case $keylength <= 24:
-                $key.= str_repeat("\0", 24 - $keylength);
+                $key .= str_repeat("\0", 24 - $keylength);
                 break;
             case $keylength <= 32:
-                $key.= str_repeat("\0", 32 - $keylength);
+                $key .= str_repeat("\0", 32 - $keylength);
                 break;
             default:
                 $key = substr($key, 0, 32);
@@ -676,8 +676,8 @@ 
             case 16:
                 list ($s7, $s6, $s5, $s4) = $this->mds_rem($le_longs[1], $le_longs[2]);
                 list ($s3, $s2, $s1, $s0) = $this->mds_rem($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]];
@@ -686,8 +686,8 @@ 
                          $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+                    $K[] = $A += $B;
+                    $K[] = (($A += $B) << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$i] ^ $s4] ^ $s0];
@@ -700,8 +700,8 @@ 
                 list ($sb, $sa, $s9, $s8) = $this->mds_rem($le_longs[1], $le_longs[2]);
                 list ($s7, $s6, $s5, $s4) = $this->mds_rem($le_longs[3], $le_longs[4]);
                 list ($s3, $s2, $s1, $s0) = $this->mds_rem($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]];
@@ -710,8 +710,8 @@ 
                          $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+                    $K[] = $A += $B;
+                    $K[] = (($A += $B) << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$q1[$i] ^ $s8] ^ $s4] ^ $s0];
@@ -725,8 +725,8 @@ 
                 list ($sb, $sa, $s9, $s8) = $this->mds_rem($le_longs[3], $le_longs[4]);
                 list ($s7, $s6, $s5, $s4) = $this->mds_rem($le_longs[5], $le_longs[6]);
                 list ($s3, $s2, $s1, $s0) = $this->mds_rem($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]];
@@ -735,8 +735,8 @@ 
                          $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+                    $K[] = $A += $B;
+                    $K[] = (($A += $B) << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$q1[$q1[$i] ^ $sc] ^ $s8] ^ $s4] ^ $s0];
@@ -770,7 +770,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -793,12 +793,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; ++$j) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -840,7 +840,7 @@ 
      */
     function encrypt($plaintext)
     {
-        if ( CRYPT_TWOFISH_MODE == CRYPT_TWOFISH_MODE_MCRYPT ) {
+        if (CRYPT_TWOFISH_MODE == CRYPT_TWOFISH_MODE_MCRYPT) {
             if ($this->paddable) {
                 $plaintext = $this->_pad($plaintext);
             }
@@ -866,11 +866,11 @@ 
                     $max = 16 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -883,15 +883,15 @@ 
                             mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
                             $this->enbuffer['enmcrypt_init'] = false;
                         }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 16));
+                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 16));
                         $iv = substr($ciphertext, -16);
-                        $len%= 16;
+                        $len %= 16;
                     } else {
                         while ($len >= 16) {
                             $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, 16);
-                            $ciphertext.= $iv;
-                            $len-= 16;
-                            $i+= 16;
+                            $ciphertext .= $iv;
+                            $len -= 16;
+                            $i += 16;
                         }
                     }
                 }
@@ -899,7 +899,7 @@ 
                     $iv = mcrypt_generic($this->ecb, $iv);
                     $block = $iv ^ substr($plaintext, -$len);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
@@ -931,7 +931,7 @@ 
      */
     function decrypt($ciphertext)
     {
-        if ( CRYPT_TWOFISH_MODE == CRYPT_TWOFISH_MODE_MCRYPT ) {
+        if (CRYPT_TWOFISH_MODE == CRYPT_TWOFISH_MODE_MCRYPT) {
             if ($this->paddable) {
                 // we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
                 // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
@@ -959,11 +959,11 @@ 
                     $max = 16 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -971,13 +971,13 @@ 
                 }
                 if ($len >= 16) {
                     $cb = substr($ciphertext, $i, $len - $len % 16);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $plaintext .= mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
                     $iv = substr($cb, -16);
-                    $len%= 16;
+                    $len %= 16;
                 }
                 if ($len) {
                     $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $plaintext .= $iv ^ substr($ciphertext, -$len);
                     $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
                     $pos = $len;
                 }
@@ -1145,7 +1145,7 @@ 
     function _generate_xor(&$iv)
     {
         $xor = $iv;
-        for ($j = 4; $j <= 16; $j+=4) {
+        for ($j = 4; $j <= 16; $j += 4) {
             $temp = substr($iv, -$j, 4);
             switch ($temp) {
                 case "\xFF\xFF\xFF\xFF":
@@ -1181,32 +1181,32 @@ 
 
             // Shift the others up.
             $B = ($B << 8) | (0xff & ($A >> 24));
-            $A<<= 8;
+            $A <<= 8;
 
             $u = $t << 1;
 
             // Subtract the modular polynomial on overflow.
             if ($t & 0x80) {
-                $u^= 0x14d;
+                $u ^= 0x14d;
             }
 
             // Remove t * (a * x^2 + 1).
             $B ^= $t ^ ($u << 16);
 
             // Form u = a*t + t/a = t*(a + 1/a).
-            $u^= 0x7fffffff & ($t >> 1);
+            $u ^= 0x7fffffff & ($t >> 1);
 
             // Add the modular polynomial on underflow.
-            if ($t & 0x01) $u^= 0xa6 ;
+            if ($t & 0x01) $u ^= 0xa6;
 
             // Remove t * (a + 1/a) * (x^3 + x).
-            $B^= ($u << 24) | ($u << 8);
+            $B ^= ($u << 24) | ($u << 8);
         }
 
         return array(
             0xff & $B >> 24,
             0xff & $B >> 16,
-            0xff & $B >>  8,
+            0xff & $B >> 8,
             0xff & $B);
     }
 
@@ -1217,7 +1217,7 @@ 
      */
     function inline_crypt_setup()
     {
-        $lambda_functions =& Crypt_Twofish::get_lambda_functions();
+        $lambda_functions = & Crypt_Twofish::get_lambda_functions();
         $block_size = 16;
         $mode = $this->mode;
         $code_hash = "$mode";
@@ -1240,7 +1240,7 @@ 
                 $R3 = $K_3 ^ $in[4];
             ';
             for ($ki = 7, $i = 0; $i < 8; ++$i) {
-                $_encryptBlock.= '
+                $_encryptBlock .= '
                     $t0 = $S0[ $R0        & 0xff] ^
                           $S1[($R0 >>  8) & 0xff] ^
                           $S2[($R0 >> 16) & 0xff] ^
@@ -1266,7 +1266,7 @@ 
                     $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K_'.(++$ki).');
                 ';
             }
-            $_encryptBlock.= '
+            $_encryptBlock .= '
                 $in = pack("V4", $K_4 ^ $R2,
                                  $K_5 ^ $R3,
                                  $K_6 ^ $R0,
@@ -1282,7 +1282,7 @@ 
                 $R3 = $K_7 ^ $in[4];
             ';
             for ($ki = 40, $i = 0; $i < 8; ++$i) {
-                $_decryptBlock.= '
+                $_decryptBlock .= '
                     $t0 = $S0[$R0       & 0xff] ^
                           $S1[$R0 >>  8 & 0xff] ^
                           $S2[$R0 >> 16 & 0xff] ^
@@ -1308,7 +1308,7 @@ 
                     $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K_'.(--$ki).');
                 ';
             }
-            $_decryptBlock.= '
+            $_decryptBlock .= '
                 $in = pack("V4", $K_0 ^ $R2,
                                  $K_1 ^ $R3,
                                  $K_2 ^ $R0,
@@ -1635,12 +1635,12 @@ 
                     break;
             }
             $fnc_head = '$action, &$self, $text';
-            $fnc_body = $init_cryptBlock . 'if ($action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }';
+            $fnc_body = $init_cryptBlock.'if ($action == "encrypt") { '.$encrypt.' } else { '.$decrypt.' }';
 
             if (function_exists('create_function') && is_callable('create_function')) {
                 $lambda_functions[$code_hash] = create_function($fnc_head, $fnc_body);
             } else {
-                eval('function ' . ($lambda_functions[$code_hash] = 'f' . md5(microtime())) . '(' . $fnc_head . ') { ' . $fnc_body . ' }');
+                eval('function '.($lambda_functions[$code_hash] = 'f'.md5(microtime())).'('.$fnc_head.') { '.$fnc_body.' }');
             }
         }
         $this->inline_crypt = $lambda_functions[$code_hash];

Braces +3 added lines, -1 removed lines

@@ -1197,7 +1197,9 @@
             $u^= 0x7fffffff & ($t >> 1);
 
             // Add the modular polynomial on underflow.
-            if ($t & 0x01) $u^= 0xa6 ;
+            if ($t & 0x01) {
+                $u^= 0xa6 ;
+            }
 
             // Remove t * (a + 1/a) * (x^3 + x).
             $B^= ($u << 24) | ($u << 8);

main/inc/lib/phpseclib/File/ANSI.php

Doc Comments +1 added lines, -2 removed lines

@@ -250,9 +250,8 @@
     /**
      * Set the number of lines that should be logged past the terminal height
      *
-     * @param Integer $x
-     * @param Integer $y
      * @access public
+     * @param integer $history
      */
     function setHistory($history)
     {

Spacing +20 added lines, -20 removed lines

@@ -281,7 +281,7 @@ 
     {
         for ($i = 0; $i < strlen($source); $i++) {
             if (strlen($this->ansi)) {
-                $this->ansi.= $source[$i];
+                $this->ansi .= $source[$i];
                 $chr = ord($source[$i]);
                 // http://en.wikipedia.org/wiki/ANSI_escape_code#Sequence_elements
                 // single character CSI's not currently supported
@@ -350,10 +350,10 @@ 
                                         case 0: // Turn off character attributes
                                             $this->attrs[$this->y][$this->x] = '';
 
-                                            if ($this->bold) $this->attrs[$this->y][$this->x].= '</b>';
-                                            if ($this->underline) $this->attrs[$this->y][$this->x].= '</underline>';
-                                            if ($this->blink) $this->attrs[$this->y][$this->x].= '</blink>';
-                                            if ($this->color) $this->attrs[$this->y][$this->x].= '</span>';
+                                            if ($this->bold) $this->attrs[$this->y][$this->x] .= '</b>';
+                                            if ($this->underline) $this->attrs[$this->y][$this->x] .= '</underline>';
+                                            if ($this->blink) $this->attrs[$this->y][$this->x] .= '</blink>';
+                                            if ($this->color) $this->attrs[$this->y][$this->x] .= '</span>';
 
                                             if ($this->reverse) {
                                                 $temp = $this->background;
@@ -386,9 +386,9 @@ 
                                             $temp = $this->background;
                                             $this->background = $this->foreground;
                                             $this->foreground = $temp;
-                                            $this->attrs[$this->y][$this->x] = '<span style="color: ' . $this->foreground . '; background: ' . $this->background . '">';
+                                            $this->attrs[$this->y][$this->x] = '<span style="color: '.$this->foreground.'; background: '.$this->background.'">';
                                             if ($this->color) {
-                                                $this->attrs[$this->y][$this->x] = '</span>' . $this->attrs[$this->y][$this->x];
+                                                $this->attrs[$this->y][$this->x] = '</span>'.$this->attrs[$this->y][$this->x];
                                             }
                                             $this->color = true;
                                             break;
@@ -417,15 +417,15 @@ 
                                                 case 47: $back = 'white'; break;
 
                                                 default:
-                                                    user_error('Unsupported attribute: ' . $mod);
+                                                    user_error('Unsupported attribute: '.$mod);
                                                     $this->ansi = '';
                                                     break 2;
                                             }
 
                                             unset($temp);
-                                            $this->attrs[$this->y][$this->x] = '<span style="color: ' . $this->foreground . '; background: ' . $this->background . '">';
+                                            $this->attrs[$this->y][$this->x] = '<span style="color: '.$this->foreground.'; background: '.$this->background.'">';
                                             if ($this->color) {
-                                                $this->attrs[$this->y][$this->x] = '</span>' . $this->attrs[$this->y][$this->x];
+                                                $this->attrs[$this->y][$this->x] = '</span>'.$this->attrs[$this->y][$this->x];
                                             }
                                             $this->color = true;
                                     }
@@ -449,7 +449,7 @@ 
                 case "\x0F": // shift
                     break;
                 case "\x1B": // start ANSI escape code
-                    $this->ansi.= "\x1B";
+                    $this->ansi .= "\x1B";
                     break;
                 default:
                     $this->screen[$this->y] = substr_replace(
@@ -511,13 +511,13 @@ 
         for ($i = 0; $i <= $this->max_y; $i++) {
             for ($j = 0; $j <= $this->max_x + 1; $j++) {
                 if (isset($this->attrs[$i][$j])) {
-                    $output.= $this->attrs[$i][$j];
+                    $output .= $this->attrs[$i][$j];
                 }
                 if (isset($this->screen[$i][$j])) {
-                    $output.= htmlspecialchars($this->screen[$i][$j]);
+                    $output .= htmlspecialchars($this->screen[$i][$j]);
                 }
             }
-            $output.= "\r\n";
+            $output .= "\r\n";
         }
         return rtrim($output);
     }
@@ -530,7 +530,7 @@ 
      */
     function getScreen()
     {
-        return '<pre style="color: white; background: black" width="' . ($this->max_x + 1) . '">' . $this->_getScreen() . '</pre>';
+        return '<pre style="color: white; background: black" width="'.($this->max_x + 1).'">'.$this->_getScreen().'</pre>';
     }
 
     /**
@@ -545,16 +545,16 @@ 
         for ($i = 0; $i < count($this->history); $i++) {
             for ($j = 0; $j <= $this->max_x + 1; $j++) {
                 if (isset($this->history_attrs[$i][$j])) {
-                    $scrollback.= $this->history_attrs[$i][$j];
+                    $scrollback .= $this->history_attrs[$i][$j];
                 }
                 if (isset($this->history[$i][$j])) {
-                    $scrollback.= htmlspecialchars($this->history[$i][$j]);
+                    $scrollback .= htmlspecialchars($this->history[$i][$j]);
                 }
             }
-            $scrollback.= "\r\n";
+            $scrollback .= "\r\n";
         }
-        $scrollback.= $this->_getScreen();
+        $scrollback .= $this->_getScreen();
 
-        return '<pre style="color: white; background: black" width="' . ($this->max_x + 1) . '">' . $scrollback . '</pre>';
+        return '<pre style="color: white; background: black" width="'.($this->max_x + 1).'">'.$scrollback.'</pre>';
     }
 }
\ No newline at end of file

Braces +12 added lines, -4 removed lines

@@ -350,10 +350,18 @@
                                         case 0: // Turn off character attributes
                                             $this->attrs[$this->y][$this->x] = '';
 
-                                            if ($this->bold) $this->attrs[$this->y][$this->x].= '</b>';
-                                            if ($this->underline) $this->attrs[$this->y][$this->x].= '</underline>';
-                                            if ($this->blink) $this->attrs[$this->y][$this->x].= '</blink>';
-                                            if ($this->color) $this->attrs[$this->y][$this->x].= '</span>';
+                                            if ($this->bold) {
+                                                $this->attrs[$this->y][$this->x].= '</b>';
+                                            }
+                                            if ($this->underline) {
+                                                $this->attrs[$this->y][$this->x].= '</underline>';
+                                            }
+                                            if ($this->blink) {
+                                                $this->attrs[$this->y][$this->x].= '</blink>';
+                                            }
+                                            if ($this->color) {
+                                                $this->attrs[$this->y][$this->x].= '</span>';
+                                            }
 
                                             if ($this->reverse) {
                                                 $temp = $this->background;

main/inc/lib/phpseclib/File/ASN1.php

Doc Comments +2 added lines, -3 removed lines

@@ -263,7 +263,7 @@ 
      * Serves a similar purpose to openssl's asn1parse
      *
      * @param String $encoded
-     * @return Array
+     * @return string
      * @access public
      */
     function decodeBER($encoded)
@@ -776,7 +776,6 @@ 
      *
      * @param String $source
      * @param String $mapping
-     * @param Integer $idx
      * @return String
      * @access public
      */
@@ -1095,7 +1094,7 @@ 
      * @access private
      * @param String $content
      * @param Integer $tag
-     * @return String
+     * @return double
      */
     function _decodeTime($content, $tag)
     {

Spacing +62 added lines, -64 removed lines

@@ -46,10 +46,10 @@ 
  * @access private
  * @link http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=12
  */
-define('FILE_ASN1_CLASS_UNIVERSAL',        0);
-define('FILE_ASN1_CLASS_APPLICATION',      1);
+define('FILE_ASN1_CLASS_UNIVERSAL', 0);
+define('FILE_ASN1_CLASS_APPLICATION', 1);
 define('FILE_ASN1_CLASS_CONTEXT_SPECIFIC', 2);
-define('FILE_ASN1_CLASS_PRIVATE',          3);
+define('FILE_ASN1_CLASS_PRIVATE', 3);
 /**#@-*/
 
 /**#@+
@@ -58,21 +58,21 @@ 
  * @access private
  * @link http://www.obj-sys.com/asn1tutorial/node124.html
  */
-define('FILE_ASN1_TYPE_BOOLEAN',          1);
-define('FILE_ASN1_TYPE_INTEGER',          2);
-define('FILE_ASN1_TYPE_BIT_STRING',       3);
-define('FILE_ASN1_TYPE_OCTET_STRING',     4);
-define('FILE_ASN1_TYPE_NULL',             5);
-define('FILE_ASN1_TYPE_OBJECT_IDENTIFIER',6);
+define('FILE_ASN1_TYPE_BOOLEAN', 1);
+define('FILE_ASN1_TYPE_INTEGER', 2);
+define('FILE_ASN1_TYPE_BIT_STRING', 3);
+define('FILE_ASN1_TYPE_OCTET_STRING', 4);
+define('FILE_ASN1_TYPE_NULL', 5);
+define('FILE_ASN1_TYPE_OBJECT_IDENTIFIER', 6);
 //define('FILE_ASN1_TYPE_OBJECT_DESCRIPTOR',7);
 //define('FILE_ASN1_TYPE_INSTANCE_OF',      8); // EXTERNAL
-define('FILE_ASN1_TYPE_REAL',             9);
-define('FILE_ASN1_TYPE_ENUMERATED',      10);
+define('FILE_ASN1_TYPE_REAL', 9);
+define('FILE_ASN1_TYPE_ENUMERATED', 10);
 //define('FILE_ASN1_TYPE_EMBEDDED',        11);
-define('FILE_ASN1_TYPE_UTF8_STRING',     12);
+define('FILE_ASN1_TYPE_UTF8_STRING', 12);
 //define('FILE_ASN1_TYPE_RELATIVE_OID',    13);
-define('FILE_ASN1_TYPE_SEQUENCE',        16); // SEQUENCE OF
-define('FILE_ASN1_TYPE_SET',             17); // SET OF
+define('FILE_ASN1_TYPE_SEQUENCE', 16); // SEQUENCE OF
+define('FILE_ASN1_TYPE_SET', 17); // SET OF
 /**#@-*/
 /**#@+
  * More Tag Classes
@@ -80,19 +80,19 @@ 
  * @access private
  * @link http://www.obj-sys.com/asn1tutorial/node10.html
  */
-define('FILE_ASN1_TYPE_NUMERIC_STRING',  18);
-define('FILE_ASN1_TYPE_PRINTABLE_STRING',19);
-define('FILE_ASN1_TYPE_TELETEX_STRING',  20); // T61String
+define('FILE_ASN1_TYPE_NUMERIC_STRING', 18);
+define('FILE_ASN1_TYPE_PRINTABLE_STRING', 19);
+define('FILE_ASN1_TYPE_TELETEX_STRING', 20); // T61String
 define('FILE_ASN1_TYPE_VIDEOTEX_STRING', 21);
-define('FILE_ASN1_TYPE_IA5_STRING',      22);
-define('FILE_ASN1_TYPE_UTC_TIME',        23);
-define('FILE_ASN1_TYPE_GENERALIZED_TIME',24);
-define('FILE_ASN1_TYPE_GRAPHIC_STRING',  25);
-define('FILE_ASN1_TYPE_VISIBLE_STRING',  26); // ISO646String
-define('FILE_ASN1_TYPE_GENERAL_STRING',  27);
-define('FILE_ASN1_TYPE_UNIVERSAL_STRING',28);
+define('FILE_ASN1_TYPE_IA5_STRING', 22);
+define('FILE_ASN1_TYPE_UTC_TIME', 23);
+define('FILE_ASN1_TYPE_GENERALIZED_TIME', 24);
+define('FILE_ASN1_TYPE_GRAPHIC_STRING', 25);
+define('FILE_ASN1_TYPE_VISIBLE_STRING', 26); // ISO646String
+define('FILE_ASN1_TYPE_GENERAL_STRING', 27);
+define('FILE_ASN1_TYPE_UNIVERSAL_STRING', 28);
 //define('FILE_ASN1_TYPE_CHARACTER_STRING',29);
-define('FILE_ASN1_TYPE_BMP_STRING',      30);
+define('FILE_ASN1_TYPE_BMP_STRING', 30);
 /**#@-*/
 
 /**#@+
@@ -102,8 +102,8 @@ 
  *
  * @access private
  */
-define('FILE_ASN1_TYPE_CHOICE',          -1);
-define('FILE_ASN1_TYPE_ANY',             -2);
+define('FILE_ASN1_TYPE_CHOICE', -1);
+define('FILE_ASN1_TYPE_ANY', -2);
 /**#@-*/
 
 /**
@@ -292,7 +292,7 @@ 
     {
         $decoded = array();
 
-        while ( strlen($encoded) ) {
+        while (strlen($encoded)) {
             $current = array('start' => $start);
 
             $type = ord($this->_string_shift($encoded));
@@ -309,30 +309,30 @@ 
                     $tag <<= 7;
                     $tag |= ord($this->_string_shift($encoded)) & 0x7F;
                     $start++;
-                } while ( $loop );
+                } while ($loop);
             }
 
             // Length, as discussed in paragraph 8.1.3 of X.690-0207.pdf#page=13
             $length = ord($this->_string_shift($encoded));
             $start++;
-            if ( $length == 0x80 ) { // indefinite length
+            if ($length == 0x80) { // indefinite length
                 // "[A sender shall] use the indefinite form (see 8.1.3.6) if the encoding is constructed and is not all 
                 //  immediately available." -- paragraph 8.1.3.2.c
                 //if ( !$constructed ) {
                 //    return false;
                 //}
                 $length = strlen($encoded);
-            } elseif ( $length & 0x80 ) { // definite length, long form
+            } elseif ($length & 0x80) { // definite length, long form
                 // technically, the long form of the length can be represented by up to 126 octets (bytes), but we'll only
                 // support it up to four.
-                $length&= 0x7F;
+                $length &= 0x7F;
                 $temp = $this->_string_shift($encoded, $length);
                 // tags of indefinite length don't really have a header length; this length includes the tag
-                $current+= array('headerlength' => $length + 2);
-                $start+= $length;
+                $current += array('headerlength' => $length + 2);
+                $start += $length;
                 extract(unpack('Nlength', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4)));
             } else {
-                $current+= array('headerlength' => 2);
+                $current += array('headerlength' => 2);
             }
 
             // End-of-content, see paragraphs 8.1.1.3, 8.1.3.2, 8.1.3.6, 8.1.5, and (for an example) 8.6.4.2
@@ -361,11 +361,11 @@ 
                         'content'  => $constructed ? $this->_decode_ber($content, $start) : $content,
                         'length'   => $length + $start - $current['start']
                     ) + $current;
-                    $start+= $length;
+                    $start += $length;
                     continue 2;
             }
 
-            $current+= array('type' => $tag);
+            $current += array('type' => $tag);
 
             // decode UNIVERSAL tags
             switch ($tag) {
@@ -390,20 +390,20 @@ 
                         $current['content'] = $content;
                     } else {
                         $temp = $this->_decode_ber($content, $start);
-                        $length-= strlen($content);
+                        $length -= strlen($content);
                         $last = count($temp) - 1;
                         for ($i = 0; $i < $last; $i++) {
                             // all subtags should be bit strings
                             //if ($temp[$i]['type'] != FILE_ASN1_TYPE_BIT_STRING) {
                             //    return false;
                             //}
-                            $current['content'].= substr($temp[$i]['content'], 1);
+                            $current['content'] .= substr($temp[$i]['content'], 1);
                         }
                         // all subtags should be bit strings
                         //if ($temp[$last]['type'] != FILE_ASN1_TYPE_BIT_STRING) {
                         //    return false;
                         //}
-                        $current['content'] = $temp[$last]['content'][0] . $current['content'] . substr($temp[$i]['content'], 1);
+                        $current['content'] = $temp[$last]['content'][0].$current['content'].substr($temp[$i]['content'], 1);
                     }
                     break;
                 case FILE_ASN1_TYPE_OCTET_STRING:
@@ -411,13 +411,13 @@ 
                         $current['content'] = $content;
                     } else {
                         $temp = $this->_decode_ber($content, $start);
-                        $length-= strlen($content);
+                        $length -= strlen($content);
                         for ($i = 0, $size = count($temp); $i < $size; $i++) {
                             // all subtags should be octet strings
                             //if ($temp[$i]['type'] != FILE_ASN1_TYPE_OCTET_STRING) {
                             //    return false;
                             //}
-                            $current['content'].= $temp[$i]['content'];
+                            $current['content'] .= $temp[$i]['content'];
                         }
                         // $length = 
                     }
@@ -442,7 +442,7 @@ 
                         $valuen <<= 7;
                         $valuen |= $temp & 0x7F;
                         if (~$temp & 0x80) {
-                            $current['content'].= ".$valuen";
+                            $current['content'] .= ".$valuen";
                             $valuen = 0;
                         }
                     }
@@ -488,7 +488,7 @@ 
 
             }
 
-            $start+= $length;
+            $start += $length;
             $decoded[] = $current + array('length' => $start - $current['start']);
         }
 
@@ -620,7 +620,7 @@ 
                 }
 
                 // Fail mapping if all input items have not been consumed.
-                return $i < $n? NULL: $map;
+                return $i < $n ? NULL : $map;
 
             // the main diff between sets and sequences is the encapsulation of the foreach in another for loop
             case FILE_ASN1_TYPE_SET:
@@ -761,8 +761,7 @@ 
                 if (isset($mapping['mapping'])) {
                     $temp = (int) $temp->toString();
                     return isset($mapping['mapping'][$temp]) ?
-                        $mapping['mapping'][$temp] :
-                        false;
+                        $mapping['mapping'][$temp] : false;
                 }
                 return $temp;
         }
@@ -815,7 +814,7 @@ 
         switch ($tag) {
             case FILE_ASN1_TYPE_SET:    // Children order is not important, thus process in sequence.
             case FILE_ASN1_TYPE_SEQUENCE:
-                $tag|= 0x20; // set the constructed bit
+                $tag |= 0x20; // set the constructed bit
                 $value = '';
 
                 // ignore the min and max
@@ -827,7 +826,7 @@ 
                         if ($temp === false) {
                             return false;
                         }
-                        $value.= $temp;
+                        $value .= $temp;
                     }
                     break;
                 }
@@ -864,13 +863,13 @@ 
                          */
                         if (isset($child['explicit']) || $child['type'] == FILE_ASN1_TYPE_CHOICE) {
                             $subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
-                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
+                            $temp = $subtag.$this->_encodeLength(strlen($temp)).$temp;
                         } else {
                             $subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
-                            $temp = $subtag . substr($temp, 1);
+                            $temp = $subtag.substr($temp, 1);
                         }
                     }
-                    $value.= $temp;
+                    $value .= $temp;
                 }
                 break;
             case FILE_ASN1_TYPE_CHOICE:
@@ -898,10 +897,10 @@ 
                     if (isset($child['constant'])) {
                         if (isset($child['explicit']) || $child['type'] == FILE_ASN1_TYPE_CHOICE) {
                             $subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
-                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
+                            $temp = $subtag.$this->_encodeLength(strlen($temp)).$temp;
                         } else {
                             $subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
-                            $temp = $subtag . substr($temp, 1);
+                            $temp = $subtag.substr($temp, 1);
                         }
                     }
                 }
@@ -934,8 +933,8 @@ 
             case FILE_ASN1_TYPE_UTC_TIME:
             case FILE_ASN1_TYPE_GENERALIZED_TIME:
                 $format = $mapping['type'] == FILE_ASN1_TYPE_UTC_TIME ? 'y' : 'Y';
-                $format.= 'mdHis';
-                $value = @gmdate($format, strtotime($source)) . 'Z';
+                $format .= 'mdHis';
+                $value = @gmdate($format, strtotime($source)).'Z';
                 break;
             case FILE_ASN1_TYPE_BIT_STRING:
                 if (isset($mapping['mapping'])) {
@@ -960,7 +959,7 @@ 
                     $bits = implode('', array_pad($bits, $size + $offset + 1, 0));
                     $bytes = explode(' ', rtrim(chunk_split($bits, 8, ' ')));
                     foreach ($bytes as $byte) {
-                        $value.= chr(bindec($byte));
+                        $value .= chr(bindec($byte));
                     }
 
                     break;
@@ -987,12 +986,12 @@ 
                         $temp = "\0";
                     } else {
                         while ($parts[$i]) {
-                            $temp = chr(0x80 | ($parts[$i] & 0x7F)) . $temp;
+                            $temp = chr(0x80 | ($parts[$i] & 0x7F)).$temp;
                             $parts[$i] >>= 7;
                         }
                         $temp[strlen($temp) - 1] = $temp[strlen($temp) - 1] & chr(0x7F);
                     }
-                    $value.= $temp;
+                    $value .= $temp;
                 }
                 break;
             case FILE_ASN1_TYPE_ANY:
@@ -1028,7 +1027,7 @@ 
                     $filters = $filters[$part];
                 }
                 if ($filters === false) {
-                    user_error('No filters defined for ' . implode('/', $loc));
+                    user_error('No filters defined for '.implode('/', $loc));
                     return false;
                 }
                 return $this->_encode_der($source, $filters + $mapping);
@@ -1052,7 +1051,7 @@ 
                 $value = $source ? "\xFF" : "\x00";
                 break;
             default:
-                user_error('Mapping provides no type definition for ' . implode('/', $this->location));
+                user_error('Mapping provides no type definition for '.implode('/', $this->location));
                 return false;
         }
 
@@ -1064,7 +1063,7 @@ 
             $tag = ($mapping['class'] << 6) | ($tag & 0x20) | $mapping['cast'];
         }
 
-        return chr($tag) . $this->_encodeLength(strlen($value)) . $value;
+        return chr($tag).$this->_encodeLength(strlen($value)).$value;
     }
 
     /**
@@ -1108,8 +1107,7 @@ 
            http://www.obj-sys.com/asn1tutorial/node14.html */
 
         $pattern = $tag == FILE_ASN1_TYPE_UTC_TIME ?
-            '#(..)(..)(..)(..)(..)(..)(.*)#' :
-            '#(....)(..)(..)(..)(..)(..).*([Z+-].*)$#';
+            '#(..)(..)(..)(..)(..)(..)(.*)#' : '#(....)(..)(..)(..)(..)(..).*([Z+-].*)$#';
 
         preg_match($pattern, $content, $matches);
 

Braces +2 added lines, -4 removed lines

@@ -586,8 +586,7 @@ 
                             if (isset($child['class'])) {
                                 $childClass = $child['class'];
                                 $constant = $child['cast'];
-                            }
-                            elseif (isset($child['constant'])) {
+                            } elseif (isset($child['constant'])) {
                                 $childClass = FILE_ASN1_CLASS_CONTEXT_SPECIFIC;
                                 $constant = $child['constant'];
                             }
@@ -656,8 +655,7 @@ 
                             if (isset($child['class'])) {
                                 $childClass = $child['class'];
                                 $constant = $child['cast'];
-                            }
-                            elseif (isset($child['constant'])) {
+                            } elseif (isset($child['constant'])) {
                                 $childClass = FILE_ASN1_CLASS_CONTEXT_SPECIFIC;
                                 $constant = $child['constant'];
                             }

main/inc/lib/phpseclib/File/X509.php

Doc Comments +8 added lines, -9 removed lines

@@ -1653,7 +1653,7 @@ 
      *
      * @param Array ref $root
      * @param String $path
-     * @param Object $asn1
+     * @param File_ASN1 $asn1
      * @access private
      */
     function _mapInAttributes(&$root, $path, $asn1)
@@ -1694,7 +1694,7 @@ 
      *
      * @param Array ref $root
      * @param String $path
-     * @param Object $asn1
+     * @param File_ASN1 $asn1
      * @access private
      */
     function _mapOutAttributes(&$root, $path, $asn1)
@@ -2111,7 +2111,7 @@ 
      * @param String $signature
      * @param String $signatureSubject
      * @access private
-     * @return Integer
+     * @return null|boolean
      */
     function _validateSignature($publicKeyAlgorithm, $publicKey, $signatureAlgorithm, $signature, $signatureSubject)
     {
@@ -2179,7 +2179,7 @@ 
      *
      * @param String $propName
      * @access private
-     * @return Mixed
+     * @return string|false
      */
     function _translateDNProp($propName)
     {
@@ -2421,7 +2421,7 @@ 
     /**
      * Get the Distinguished Name for a certificates subject
      *
-     * @param Mixed $format optional
+     * @param integer $format optional
      * @param Array $dn optional
      * @access public
      * @return Boolean
@@ -2568,7 +2568,7 @@ 
      *
      * @param Integer $format optional
      * @access public
-     * @return Mixed
+     * @return boolean
      */
     function getIssuerDN($format = FILE_X509_DN_ARRAY)
     {
@@ -2590,7 +2590,7 @@ 
      *
      * @param Integer $format optional
      * @access public
-     * @return Mixed
+     * @return boolean
      */
     function getSubjectDN($format = FILE_X509_DN_ARRAY)
     {
@@ -2706,7 +2706,7 @@ 
      *
      * @param Object $key
      * @access public
-     * @return Boolean
+     * @return boolean|null
      */
     function setPublicKey($key)
     {
@@ -3427,7 +3427,6 @@ 
      * X.509 certificate signing helper function.
      *
      * @param Object $key
-     * @param File_X509 $subject
      * @param String $signatureAlgorithm
      * @access public
      * @return Mixed

Indentation +254 added lines, -254 removed lines

@@ -394,10 +394,10 @@ 
             'children' => array(
                 'extnId'   => array('type' => FILE_ASN1_TYPE_OBJECT_IDENTIFIER),
                 'critical' => array(
-                                  'type'     => FILE_ASN1_TYPE_BOOLEAN,
-                                  'optional' => true,
-                                  'default'  => false
-                              ),
+                                    'type'     => FILE_ASN1_TYPE_BOOLEAN,
+                                    'optional' => true,
+                                    'default'  => false
+                                ),
                 'extnValue' => array('type' => FILE_ASN1_TYPE_OCTET_STRING)
             )
         );
@@ -452,11 +452,11 @@ 
                 // technically, default implies optional, but we'll define it as being optional, none-the-less, just to
                 // reenforce that fact
                 'version'             => array(
-                                             'constant' => 0,
-                                             'optional' => true,
-                                             'explicit' => true,
-                                             'default'  => 'v1'
-                                         ) + $Version,
+                                                'constant' => 0,
+                                                'optional' => true,
+                                                'explicit' => true,
+                                                'default'  => 'v1'
+                                            ) + $Version,
                 'serialNumber'         => $CertificateSerialNumber,
                 'signature'            => $AlgorithmIdentifier,
                 'issuer'               => $this->Name,
@@ -465,31 +465,31 @@ 
                 'subjectPublicKeyInfo' => $SubjectPublicKeyInfo,
                 // implicit means that the T in the TLV structure is to be rewritten, regardless of the type
                 'issuerUniqueID'       => array(
-                                               'constant' => 1,
-                                               'optional' => true,
-                                               'implicit' => true
-                                           ) + $UniqueIdentifier,
+                                                'constant' => 1,
+                                                'optional' => true,
+                                                'implicit' => true
+                                            ) + $UniqueIdentifier,
                 'subjectUniqueID'       => array(
-                                               'constant' => 2,
-                                               'optional' => true,
-                                               'implicit' => true
-                                           ) + $UniqueIdentifier,
+                                                'constant' => 2,
+                                                'optional' => true,
+                                                'implicit' => true
+                                            ) + $UniqueIdentifier,
                 // <http://tools.ietf.org/html/rfc2459#page-74> doesn't use the EXPLICIT keyword but if
                 // it's not IMPLICIT, it's EXPLICIT
                 'extensions'            => array(
-                                               'constant' => 3,
-                                               'optional' => true,
-                                               'explicit' => true
-                                           ) + $this->Extensions
+                                                'constant' => 3,
+                                                'optional' => true,
+                                                'explicit' => true
+                                            ) + $this->Extensions
             )
         );
 
         $this->Certificate = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
-                 'tbsCertificate'     => $TBSCertificate,
-                 'signatureAlgorithm' => $AlgorithmIdentifier,
-                 'signature'          => array('type' => FILE_ASN1_TYPE_BIT_STRING)
+                    'tbsCertificate'     => $TBSCertificate,
+                    'signatureAlgorithm' => $AlgorithmIdentifier,
+                    'signature'          => array('type' => FILE_ASN1_TYPE_BIT_STRING)
             )
         );
 
@@ -512,14 +512,14 @@ 
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'cA'                => array(
-                                                 'type'     => FILE_ASN1_TYPE_BOOLEAN,
-                                                 'optional' => true,
-                                                 'default'  => false
-                                       ),
+                                                    'type'     => FILE_ASN1_TYPE_BOOLEAN,
+                                                    'optional' => true,
+                                                    'default'  => false
+                                        ),
                 'pathLenConstraint' => array(
-                                                 'type' => FILE_ASN1_TYPE_INTEGER,
-                                                 'optional' => true
-                                       )
+                                                    'type' => FILE_ASN1_TYPE_INTEGER,
+                                                    'optional' => true
+                                        )
             )
         );
 
@@ -536,29 +536,29 @@ 
             'type'     => FILE_ASN1_TYPE_SET,
             'children' => array(
                 'surname'              => array(
-                                           'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
-                                           'constant' => 0,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
+                                            'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
+                                            'constant' => 0,
+                                            'optional' => true,
+                                            'implicit' => true
+                                            ),
                 'given-name'           => array(
-                                           'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
-                                           'constant' => 1,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
+                                            'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
+                                            'constant' => 1,
+                                            'optional' => true,
+                                            'implicit' => true
+                                            ),
                 'initials'             => array(
-                                           'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
-                                           'constant' => 2,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
+                                            'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
+                                            'constant' => 2,
+                                            'optional' => true,
+                                            'implicit' => true
+                                            ),
                 'generation-qualifier' => array(
-                                           'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
-                                           'constant' => 3,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         )
+                                            'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
+                                            'constant' => 3,
+                                            'optional' => true,
+                                            'implicit' => true
+                                            )
             )
         );
 
@@ -605,26 +605,26 @@ 
         $AnotherName = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
-                 'type-id' => array('type' => FILE_ASN1_TYPE_OBJECT_IDENTIFIER),
-                 'value'   => array(
-                                  'type' => FILE_ASN1_TYPE_ANY,
-                                  'constant' => 0,
-                                  'optional' => true,
-                                  'explicit' => true
-                              )
+                    'type-id' => array('type' => FILE_ASN1_TYPE_OBJECT_IDENTIFIER),
+                    'value'   => array(
+                                    'type' => FILE_ASN1_TYPE_ANY,
+                                    'constant' => 0,
+                                    'optional' => true,
+                                    'explicit' => true
+                                )
             )
         );
 
         $ExtensionAttribute = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
-                 'extension-attribute-type'  => array(
+                    'extension-attribute-type'  => array(
                                                     'type' => FILE_ASN1_TYPE_PRINTABLE_STRING,
                                                     'constant' => 0,
                                                     'optional' => true,
                                                     'implicit' => true
                                                 ),
-                 'extension-attribute-value' => array(
+                    'extension-attribute-value' => array(
                                                     'type' => FILE_ASN1_TYPE_ANY,
                                                     'constant' => 1,
                                                     'optional' => true,
@@ -643,8 +643,8 @@ 
         $BuiltInDomainDefinedAttribute = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
-                 'type'  => array('type' => FILE_ASN1_TYPE_PRINTABLE_STRING),
-                 'value' => array('type' => FILE_ASN1_TYPE_PRINTABLE_STRING)
+                    'type'  => array('type' => FILE_ASN1_TYPE_PRINTABLE_STRING),
+                    'value' => array('type' => FILE_ASN1_TYPE_PRINTABLE_STRING)
             )
         );
 
@@ -661,63 +661,63 @@ 
                 'country-name'               => array('optional' => true) + $CountryName,
                 'administration-domain-name' => array('optional' => true) + $AdministrationDomainName,
                 'network-address'            => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $NetworkAddress,
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $NetworkAddress,
                 'terminal-identifier'        => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $TerminalIdentifier,
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $TerminalIdentifier,
                 'private-domain-name'        => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                               ) + $PrivateDomainName,
+                                                    'constant' => 2,
+                                                    'optional' => true,
+                                                    'explicit' => true
+                                                ) + $PrivateDomainName,
                 'organization-name'          => array(
-                                                 'constant' => 3,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $OrganizationName,
+                                                    'constant' => 3,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $OrganizationName,
                 'numeric-user-identifier'    => array(
-                                                 'constant' => 4,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $NumericUserIdentifier,
+                                                    'constant' => 4,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $NumericUserIdentifier,
                 'personal-name'              => array(
-                                                 'constant' => 5,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $PersonalName,
+                                                    'constant' => 5,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $PersonalName,
                 'organizational-unit-names'  => array(
-                                                 'constant' => 6,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $OrganizationalUnitNames
+                                                    'constant' => 6,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $OrganizationalUnitNames
             )
         );
 
         $ORAddress = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
-                 'built-in-standard-attributes'       => $BuiltInStandardAttributes,
-                 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes,
-                 'extension-attributes'               => array('optional' => true) + $ExtensionAttributes
+                    'built-in-standard-attributes'       => $BuiltInStandardAttributes,
+                    'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes,
+                    'extension-attributes'               => array('optional' => true) + $ExtensionAttributes
             )
         );
 
         $EDIPartyName = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
-                 'nameAssigner' => array(
+                    'nameAssigner' => array(
                                     'constant' => 0,
                                     'optional' => true,
                                     'implicit' => true
                                 ) + $this->DirectoryString,
-                 // partyName is technically required but File_ASN1 doesn't currently support non-optional constants and
-                 // setting it to optional gets the job done in any event.
-                 'partyName'    => array(
+                    // partyName is technically required but File_ASN1 doesn't currently support non-optional constants and
+                    // setting it to optional gets the job done in any event.
+                    'partyName'    => array(
                                     'constant' => 1,
                                     'optional' => true,
                                     'implicit' => true
@@ -729,55 +729,55 @@ 
             'type'     => FILE_ASN1_TYPE_CHOICE,
             'children' => array(
                 'otherName'                 => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $AnotherName,
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $AnotherName,
                 'rfc822Name'                => array(
-                                                 'type' => FILE_ASN1_TYPE_IA5_STRING,
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
+                                                    'type' => FILE_ASN1_TYPE_IA5_STRING,
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ),
                 'dNSName'                   => array(
-                                                 'type' => FILE_ASN1_TYPE_IA5_STRING,
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
+                                                    'type' => FILE_ASN1_TYPE_IA5_STRING,
+                                                    'constant' => 2,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ),
                 'x400Address'               => array(
-                                                 'constant' => 3,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $ORAddress,
+                                                    'constant' => 3,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $ORAddress,
                 'directoryName'             => array(
-                                                 'constant' => 4,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                               ) + $this->Name,
+                                                    'constant' => 4,
+                                                    'optional' => true,
+                                                    'explicit' => true
+                                                ) + $this->Name,
                 'ediPartyName'              => array(
-                                                 'constant' => 5,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $EDIPartyName,
+                                                    'constant' => 5,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $EDIPartyName,
                 'uniformResourceIdentifier' => array(
-                                                 'type' => FILE_ASN1_TYPE_IA5_STRING,
-                                                 'constant' => 6,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
+                                                    'type' => FILE_ASN1_TYPE_IA5_STRING,
+                                                    'constant' => 6,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ),
                 'iPAddress'                 => array(
-                                                 'type' => FILE_ASN1_TYPE_OCTET_STRING,
-                                                 'constant' => 7,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
+                                                    'type' => FILE_ASN1_TYPE_OCTET_STRING,
+                                                    'constant' => 7,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ),
                 'registeredID'              => array(
-                                                 'type' => FILE_ASN1_TYPE_OBJECT_IDENTIFIER,
-                                                 'constant' => 8,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               )
+                                                    'type' => FILE_ASN1_TYPE_OBJECT_IDENTIFIER,
+                                                    'constant' => 8,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                )
             )
         );
 
@@ -809,15 +809,15 @@ 
             'type'     => FILE_ASN1_TYPE_CHOICE,
             'children' => array(
                 'fullName'                => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $GeneralNames,
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                        ) + $GeneralNames,
                 'nameRelativeToCRLIssuer' => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $this->RelativeDistinguishedName
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                        ) + $this->RelativeDistinguishedName
             )
         );
 
@@ -825,20 +825,20 @@ 
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'distributionPoint' => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                       ) + $DistributionPointName,
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'explicit' => true
+                                        ) + $DistributionPointName,
                 'reasons'           => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $ReasonFlags,
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                        ) + $ReasonFlags,
                 'cRLIssuer'         => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $GeneralNames
+                                                    'constant' => 2,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                        ) + $GeneralNames
             )
         );
 
@@ -853,20 +853,20 @@ 
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'keyIdentifier'             => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $this->KeyIdentifier,
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $this->KeyIdentifier,
                 'authorityCertIssuer'       => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $GeneralNames,
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $GeneralNames,
                 'authorityCertSerialNumber' => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $CertificateSerialNumber
+                                                    'constant' => 2,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $CertificateSerialNumber
             )
         );
 
@@ -887,12 +887,12 @@ 
             'children' => array(
                 'policyIdentifier' => $CertPolicyId,
                 'policyQualifiers' => array(
-                                          'type'     => FILE_ASN1_TYPE_SEQUENCE,
-                                          'min'      => 0,
-                                          'max'      => -1,
-                                          'optional' => true,
-                                          'children' => $PolicyQualifierInfo
-                                      )
+                                            'type'     => FILE_ASN1_TYPE_SEQUENCE,
+                                            'min'      => 0,
+                                            'max'      => -1,
+                                            'optional' => true,
+                                            'children' => $PolicyQualifierInfo
+                                        )
             )
         );
 
@@ -908,12 +908,12 @@ 
             'min'      => 1,
             'max'      => -1,
             'children' => array(
-                              'type'     => FILE_ASN1_TYPE_SEQUENCE,
-                              'children' => array(
-                                  'issuerDomainPolicy' => $CertPolicyId,
-                                  'subjectDomainPolicy' => $CertPolicyId
-                              )
-                       )
+                                'type'     => FILE_ASN1_TYPE_SEQUENCE,
+                                'children' => array(
+                                    'issuerDomainPolicy' => $CertPolicyId,
+                                    'subjectDomainPolicy' => $CertPolicyId
+                                )
+                        )
         );
 
         $KeyPurposeId = array('type' => FILE_ASN1_TYPE_OBJECT_IDENTIFIER);
@@ -946,15 +946,15 @@ 
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'notBefore' => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true,
-                                                 'type' => FILE_ASN1_TYPE_GENERALIZED_TIME),
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'implicit' => true,
+                                                    'type' => FILE_ASN1_TYPE_GENERALIZED_TIME),
                 'notAfter'  => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true,
-                                                 'type' => FILE_ASN1_TYPE_GENERALIZED_TIME)
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'implicit' => true,
+                                                    'type' => FILE_ASN1_TYPE_GENERALIZED_TIME)
             )
         );
 
@@ -965,16 +965,16 @@ 
             'children' => array(
                 'base'    => $GeneralName,
                 'minimum' => array(
-                                 'constant' => 0,
-                                 'optional' => true,
-                                 'implicit' => true,
-                                 'default' => new Math_BigInteger(0)
-                             ) + $BaseDistance,
+                                    'constant' => 0,
+                                    'optional' => true,
+                                    'implicit' => true,
+                                    'default' => new Math_BigInteger(0)
+                                ) + $BaseDistance,
                 'maximum' => array(
-                                 'constant' => 1,
-                                 'optional' => true,
-                                 'implicit' => true,
-                             ) + $BaseDistance
+                                    'constant' => 1,
+                                    'optional' => true,
+                                    'implicit' => true,
+                                ) + $BaseDistance
             )
         );
 
@@ -989,15 +989,15 @@ 
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'permittedSubtrees' => array(
-                                           'constant' => 0,
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $GeneralSubtrees,
+                                            'constant' => 0,
+                                            'optional' => true,
+                                            'implicit' => true
+                                        ) + $GeneralSubtrees,
                 'excludedSubtrees'  => array(
-                                           'constant' => 1,
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $GeneralSubtrees
+                                            'constant' => 1,
+                                            'optional' => true,
+                                            'implicit' => true
+                                        ) + $GeneralSubtrees
             )
         );
 
@@ -1018,11 +1018,11 @@ 
             'children' => array(
                 'organization'  => $DisplayText,
                 'noticeNumbers' => array(
-                                       'type'     => FILE_ASN1_TYPE_SEQUENCE,
-                                       'min'      => 1,
-                                       'max'      => 200,
-                                       'children' => array('type' => FILE_ASN1_TYPE_INTEGER)
-                                   )
+                                        'type'     => FILE_ASN1_TYPE_SEQUENCE,
+                                        'min'      => 1,
+                                        'max'      => 200,
+                                        'children' => array('type' => FILE_ASN1_TYPE_INTEGER)
+                                    )
             )
         );
 
@@ -1030,13 +1030,13 @@ 
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'noticeRef' => array(
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $NoticeReference,
+                                            'optional' => true,
+                                            'implicit' => true
+                                        ) + $NoticeReference,
                 'explicitText'  => array(
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $DisplayText
+                                            'optional' => true,
+                                            'implicit' => true
+                                        ) + $DisplayText
             )
         );
 
@@ -1065,11 +1065,11 @@ 
             'children' => array(
                 'type' => $AttributeType,
                 'value'=> array(
-                              'type'     => FILE_ASN1_TYPE_SET,
-                              'min'      => 1,
-                              'max'      => -1,
-                              'children' => $this->AttributeValue
-                          )
+                                'type'     => FILE_ASN1_TYPE_SET,
+                                'min'      => 1,
+                                'max'      => -1,
+                                'children' => $this->AttributeValue
+                            )
             )
         );
 
@@ -1086,16 +1086,16 @@ 
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'version'       => array(
-                                       'type' => FILE_ASN1_TYPE_INTEGER,
-                                       'mapping' => array('v1')
-                                   ),
+                                        'type' => FILE_ASN1_TYPE_INTEGER,
+                                        'mapping' => array('v1')
+                                    ),
                 'subject'       => $this->Name,
                 'subjectPKInfo' => $SubjectPublicKeyInfo,
                 'attributes'    => array(
-                                       'constant' => 0,
-                                       'optional' => true,
-                                       'implicit' => true
-                                   ) + $Attributes,
+                                        'constant' => 0,
+                                        'optional' => true,
+                                        'implicit' => true
+                                    ) + $Attributes,
             )
         );
 
@@ -1111,39 +1111,39 @@ 
         $RevokedCertificate = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
-                              'userCertificate'    => $CertificateSerialNumber,
-                              'revocationDate'     => $Time,
-                              'crlEntryExtensions' => array(
-                                                          'optional' => true
-                                                      ) + $this->Extensions
-                          )
+                                'userCertificate'    => $CertificateSerialNumber,
+                                'revocationDate'     => $Time,
+                                'crlEntryExtensions' => array(
+                                                            'optional' => true
+                                                        ) + $this->Extensions
+                            )
         );
 
         $TBSCertList = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'version'             => array(
-                                             'optional' => true,
-                                             'default'  => 'v1'
-                                         ) + $Version,
+                                                'optional' => true,
+                                                'default'  => 'v1'
+                                            ) + $Version,
                 'signature'           => $AlgorithmIdentifier,
                 'issuer'              => $this->Name,
                 'thisUpdate'          => $Time,
                 'nextUpdate'          => array(
-                                             'optional' => true
-                                         ) + $Time,
+                                                'optional' => true
+                                            ) + $Time,
                 'revokedCertificates' => array(
-                                             'type'     => FILE_ASN1_TYPE_SEQUENCE,
-                                             'optional' => true,
-                                             'min'      => 0,
-                                             'max'      => -1,
-                                             'children' => $RevokedCertificate
-                                         ),
+                                                'type'     => FILE_ASN1_TYPE_SEQUENCE,
+                                                'optional' => true,
+                                                'min'      => 0,
+                                                'max'      => -1,
+                                                'children' => $RevokedCertificate
+                                            ),
                 'crlExtensions'       => array(
-                                             'constant' => 0,
-                                             'optional' => true,
-                                             'explicit' => true
-                                         ) + $this->Extensions
+                                                'constant' => 0,
+                                                'optional' => true,
+                                                'explicit' => true
+                                            ) + $this->Extensions
             )
         );
 
@@ -1159,7 +1159,7 @@ 
         $this->CRLNumber = array('type' => FILE_ASN1_TYPE_INTEGER);
 
         $this->CRLReason = array('type' => FILE_ASN1_TYPE_ENUMERATED,
-           'mapping' => array(
+            'mapping' => array(
                             'unspecified',
                             'keyCompromise',
                             'cACompromise',
@@ -1214,7 +1214,7 @@ 
                                                     'default'  => false,
                                                     'implicit' => true
                                                 )
-                          )
+                            )
         );
 
         $this->InvalidityDate = array('type' => FILE_ASN1_TYPE_GENERALIZED_TIME);
@@ -4132,7 +4132,7 @@ 
 
         $i = count($rclist);
         $rclist[] = array('userCertificate' => $serial,
-                          'revocationDate'  => array('generalTime' => @date('D, d M y H:i:s O')));
+                            'revocationDate'  => array('generalTime' => @date('D, d M y H:i:s O')));
         return $i;
     }
 

Spacing +28 added lines, -28 removed lines

@@ -655,7 +655,7 @@ 
             'children' => $BuiltInDomainDefinedAttribute
         );
 
-        $BuiltInStandardAttributes =  array(
+        $BuiltInStandardAttributes = array(
             'type'     => FILE_ASN1_TYPE_SEQUENCE,
             'children' => array(
                 'country-name'               => array('optional' => true) + $CountryName,
@@ -1493,7 +1493,7 @@ 
                 switch ($algorithm) {
                     case 'rsaEncryption':
                         $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'] = 
-                            base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])));
+                            base64_encode("\0".base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])));
                 }
         }
 
@@ -1531,7 +1531,7 @@ 
                 return $cert;
             // case FILE_X509_FORMAT_PEM:
             default:
-                return "-----BEGIN CERTIFICATE-----\r\n" . chunk_split(base64_encode($cert), 64) . '-----END CERTIFICATE-----';
+                return "-----BEGIN CERTIFICATE-----\r\n".chunk_split(base64_encode($cert), 64).'-----END CERTIFICATE-----';
         }
     }
 
@@ -1625,7 +1625,7 @@ 
                     case 'id-ce-authorityKeyIdentifier': // use 00 as the serial number instead of an empty string
                         if (isset($value['authorityCertSerialNumber'])) {
                             if ($value['authorityCertSerialNumber']->toBytes() == '') {
-                                $temp = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | 2) . "\1\0";
+                                $temp = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | 2)."\1\0";
                                 $value['authorityCertSerialNumber'] = new File_ASN1_Element($temp);
                             }
                         }
@@ -1636,7 +1636,7 @@ 
                 $map = $this->_getMapping($id);
                 if (is_bool($map)) {
                     if (!$map) {
-                        user_error($id . ' is not a currently supported extension');
+                        user_error($id.' is not a currently supported extension');
                         unset($extensions[$i]);
                     }
                 } else {
@@ -1709,7 +1709,7 @@ 
                 $id = $attributes[$i]['type'];
                 $map = $this->_getMapping($id);
                 if ($map === false) {
-                    user_error($id . ' is not a currently supported attribute', E_USER_NOTICE);
+                    user_error($id.' is not a currently supported attribute', E_USER_NOTICE);
                     unset($attributes[$i]);
                 }
                 elseif (is_array($attributes[$i]['value'])) {
@@ -1925,7 +1925,7 @@ 
                            field in the Subject field of the certificate MUST be used. Although
                            the use of the Common Name is existing practice, it is deprecated and
                            Certification Authorities are encouraged to use the dNSName instead. */
-                        if (preg_match('#^' . $value . '$#', $components['host'])) {
+                        if (preg_match('#^'.$value.'$#', $components['host'])) {
                             return true;
                         }
                         break;
@@ -1935,7 +1935,7 @@ 
                            In some cases, the URI is specified as an IP address rather than a
                            hostname. In this case, the iPAddress subjectAltName must be present
                            in the certificate and must exactly match the IP in the URI. */
-                        if (preg_match('#(?:\d{1-3}\.){4}#', $components['host'] . '.') && preg_match('#^' . $value . '$#', $components['host'])) {
+                        if (preg_match('#(?:\d{1-3}\.){4}#', $components['host'].'.') && preg_match('#^'.$value.'$#', $components['host'])) {
                             return true;
                         }
                 }
@@ -1945,7 +1945,7 @@ 
 
         if ($value = $this->getDNProp('id-at-commonName')) {
             $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value[0]);
-            return preg_match('#^' . $value . '$#', $components['host']);
+            return preg_match('#^'.$value.'$#', $components['host']);
         }
 
         return false;
@@ -2163,11 +2163,11 @@ 
         switch ($algorithm) {
             case 'rsaEncryption':
                 return
-                    "-----BEGIN PUBLIC KEY-----\r\n" .
+                    "-----BEGIN PUBLIC KEY-----\r\n".
                     // subjectPublicKey is stored as a bit string in X.509 certs.  the first byte of a bit string represents how many bits
                     // in the last byte should be ignored.  the following only supports non-zero stuff but as none of the X.509 certs Firefox
                     // uses as a cert authority actually use a non-zero bit I think it's safe to assume that none do.
-                    chunk_split(base64_encode(substr(base64_decode($key), 1)), 64) .
+                    chunk_split(base64_encode(substr(base64_decode($key), 1)), 64).
                     '-----END PUBLIC KEY-----';
             default:
                 return $key;
@@ -2407,7 +2407,7 @@ 
 
         // handles everything else
         $results = preg_split('#((?:^|, *|/)(?:C=|O=|OU=|CN=|L=|ST=|SN=|postalCode=|streetAddress=|emailAddress=|serialNumber=|organizationalUnitName=|title=|description=|role=|x500UniqueIdentifier=))#', $dn, -1, PREG_SPLIT_DELIM_CAPTURE);
-        for ($i = 1; $i < count($results); $i+=2) {
+        for ($i = 1; $i < count($results); $i += 2) {
             $prop = trim($results[$i], ', =/');
             $value = $results[$i + 1];
             if (!$this->setDNProp($prop, $value, $type)) {
@@ -2535,11 +2535,11 @@ 
                     break;
                 default:
                     $delim = '/';
-                    $desc = preg_replace('#.+-([^-]+)$#', '$1',  $prop) . '=';
+                    $desc = preg_replace('#.+-([^-]+)$#', '$1', $prop).'=';
             }
 
             if (!$start) {
-                $output.= $delim;
+                $output .= $delim;
             }
             if (is_array($value)) {
                 foreach ($value as $type => $v) {
@@ -2556,7 +2556,7 @@ 
                     $value = array_pop($value); // Always strip data type.
                 }
             }
-            $output.= $desc . $value;
+            $output .= $desc.$value;
             $start = false;
         }
 
@@ -2868,7 +2868,7 @@ 
                 switch ($algorithm) {
                     case 'rsaEncryption':
                         $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'] = 
-                            base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])));
+                            base64_encode("\0".base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])));
                 }
         }
 
@@ -2890,7 +2890,7 @@ 
                 return $csr;
             // case FILE_X509_FORMAT_PEM:
             default:
-                return "-----BEGIN CERTIFICATE REQUEST-----\r\n" . chunk_split(base64_encode($csr), 64) . '-----END CERTIFICATE REQUEST-----';
+                return "-----BEGIN CERTIFICATE REQUEST-----\r\n".chunk_split(base64_encode($csr), 64).'-----END CERTIFICATE REQUEST-----';
         }
     }
 
@@ -3013,7 +3013,7 @@ 
         $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
         $this->_mapInExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
-        $rclist = &$this->_subArray($crl,'tbsCertList/revokedCertificates');
+        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
         if (is_array($rclist)) {
             foreach ($rclist as $i => $extension) {
                 $this->_mapInExtensions($rclist, "$i/crlEntryExtensions", $asn1);
@@ -3063,7 +3063,7 @@ 
         $asn1->loadFilters($filters);
 
         $this->_mapOutExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
-        $rclist = &$this->_subArray($crl,'tbsCertList/revokedCertificates');
+        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
         if (is_array($rclist)) {
             foreach ($rclist as $i => $extension) {
                 $this->_mapOutExtensions($rclist, "$i/crlEntryExtensions", $asn1);
@@ -3077,7 +3077,7 @@ 
                 return $crl;
             // case FILE_X509_FORMAT_PEM:
             default:
-                return "-----BEGIN X509 CRL-----\r\n" . chunk_split(base64_encode($crl), 64) . '-----END X509 CRL-----';
+                return "-----BEGIN X509 CRL-----\r\n".chunk_split(base64_encode($crl), 64).'-----END X509 CRL-----';
         }
     }
 
@@ -3105,7 +3105,7 @@ 
         }
 
         $currentCert = isset($this->currentCert) ? $this->currentCert : NULL;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: NULL;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : NULL;
 
         if (isset($subject->currentCert) && is_array($subject->currentCert) && isset($subject->currentCert['tbsCertificate'])) {
             $this->currentCert = $subject->currentCert;
@@ -3258,7 +3258,7 @@ 
         $this->publicKey = $origPublicKey;
 
         $currentCert = isset($this->currentCert) ? $this->currentCert : NULL;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: NULL;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : NULL;
 
         if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['certificationRequestInfo'])) {
             $this->currentCert['signatureAlgorithm']['algorithm'] =
@@ -3447,7 +3447,7 @@ 
                         $key->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
                         $key->setSignatureMode(CRYPT_RSA_SIGNATURE_PKCS1);
 
-                        $this->currentCert['signature'] = base64_encode("\0" . $key->sign($this->signatureSubject));
+                        $this->currentCert['signature'] = base64_encode("\0".$key->sign($this->signatureSubject));
                         return $this->currentCert;
                 }
             default:
@@ -3484,7 +3484,7 @@ 
         if (strtolower($date) == 'lifetime') {
             $temp = '99991231235959Z';
             $asn1 = new File_ASN1();
-            $temp = chr(FILE_ASN1_TYPE_GENERALIZED_TIME) . $asn1->_encodeLength(strlen($temp)) . $temp;
+            $temp = chr(FILE_ASN1_TYPE_GENERALIZED_TIME).$asn1->_encodeLength(strlen($temp)).$temp;
             $this->endDate = new File_ASN1_Element($temp);
         } else {
             $this->endDate = @date('D, d M y H:i:s O', @strtotime($date));
@@ -3938,7 +3938,7 @@ 
                 $attributes[$last]['value'][] = $value;
                 break;
             default:
-                $attributes[] = array('type' => $id, 'value' => $disposition == FILE_X509_ATTR_ALL ? $value: array($value));
+                $attributes[] = array('type' => $id, 'value' => $disposition == FILE_X509_ATTR_ALL ? $value : array($value));
                 break;
         }
 
@@ -4013,12 +4013,12 @@ 
                 }
                 $key = new Crypt_RSA();
                 if (!$key->loadKey($raw)) {
-                    return false;   // Not an unencrypted RSA key.
+                    return false; // Not an unencrypted RSA key.
                 }
                 if ($key->getPrivateKey() !== false) {  // If private.
                     return $this->computeKeyIdentifier($key, $method);
                 }
-                $key = $raw;    // Is a public key.
+                $key = $raw; // Is a public key.
                 break;
             case strtolower(get_class($key)) == 'file_x509':
                 if (isset($key->publicKey)) {
@@ -4268,7 +4268,7 @@ 
 
         if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
             if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                return $this->_getExtension($id, $crl,  "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+                return $this->_getExtension($id, $crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
             }
         }
 

Braces +3 added lines, -6 removed lines

@@ -1711,8 +1711,7 @@ 
                 if ($map === false) {
                     user_error($id . ' is not a currently supported attribute', E_USER_NOTICE);
                     unset($attributes[$i]);
-                }
-                elseif (is_array($attributes[$i]['value'])) {
+                } elseif (is_array($attributes[$i]['value'])) {
                     $values = &$attributes[$i]['value'];
                     for ($j = 0; $j < count($values); $j++) {
                         switch ($id) {
@@ -3345,8 +3344,7 @@ 
 
         if (!empty($this->serialNumber)) {
             $crlNumber = $this->serialNumber;
-        }
-        else {
+        } else {
             $crlNumber = $this->getExtension('id-ce-cRLNumber');
             $crlNumber = $crlNumber !== false ? $crlNumber->add(new Math_BigInteger(1)) : NULL;
         }
@@ -3359,8 +3357,7 @@ 
         if (!$version) {
             if (!empty($tbsCertList['crlExtensions'])) {
                 $version = 1; // v2.
-            }
-            elseif (!empty($tbsCertList['revokedCertificates'])) {
+            } elseif (!empty($tbsCertList['revokedCertificates'])) {
                 foreach ($tbsCertList['revokedCertificates'] as $cert) {
                     if (!empty($cert['crlEntryExtensions'])) {
                         $version = 1; // v2.