chamilo / chamilo-lms

main/inc/lib/rights.lib.php

Spacing +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
  */
 class Rights {
 	private static $rights_cache = array();
-	private static $rights = array (
+	private static $rights = array(
 		'show_tabs:reports' =>
-			array (
+			array(
 				'type' => 'const',
 				'const' => 'true' )
 		);

main/inc/lib/table_sort.class.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 
                 $new_data_order = array();
                 if (!empty($docs_to_sort)) {
-                    foreach($docs_to_sort as $id => $document) {
+                    foreach ($docs_to_sort as $id => $document) {
                         if (isset($new_data[$id])) {
                             $new_data_order[] = $new_data[$id];
                         }
@@ -165,7 +165,7 @@ 
                 }
 
                 if (!empty($folder_to_sort)) {
-                    foreach($folder_to_sort as $id => $document) {
+                    foreach ($folder_to_sort as $id => $document) {
                         if (isset($new_data[$id])) {
                             $new_data_order[] = $new_data[$id];
                         }

main/inc/lib/plugin.lib.php

Spacing +2 added lines, -2 removed lines

@@ -425,7 +425,7 @@ 
             //extra options
             $plugin_settings = api_get_settings_params(
                 array(
-                    "subkey = ? AND category = ? AND type = ? " => array($plugin_name, 'Plugins','setting')
+                    "subkey = ? AND category = ? AND type = ? " => array($plugin_name, 'Plugins', 'setting')
                 )
             );
             $settings_filtered = array();
@@ -530,7 +530,7 @@ 
             if (!empty($obj->course_settings)) {
                 if (is_file(api_get_path(SYS_CODE_PATH).'img/icons/'.ICON_SIZE_SMALL.'/'.$plugin_name.'.png')) {
                     $icon = Display::return_icon(
-                        $plugin_name . '.png',
+                        $plugin_name.'.png',
                         Security::remove_XSS($pluginTitle),
                         '',
                         ICON_SIZE_SMALL

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

Spacing +10 added lines, -10 removed lines

@@ -145,12 +145,12 @@ 
         session_start();
 
         $v = $seed = $_SESSION['seed'] = pack('H*', sha1(
-            serialize($_SERVER) .
-            serialize($_POST) .
-            serialize($_GET) .
-            serialize($_COOKIE) .
-            serialize($GLOBALS) .
-            serialize($_SESSION) .
+            serialize($_SERVER).
+            serialize($_POST).
+            serialize($_GET).
+            serialize($_COOKIE).
+            serialize($GLOBALS).
+            serialize($_SESSION).
             serialize($_OLD_SESSION)
         ));
         if (!isset($_SESSION['count'])) {
@@ -183,8 +183,8 @@ 
         // http://tools.ietf.org/html/rfc4253#section-7.2
         //
         // see the is_string($crypto) part for an example of how to expand the keys
-        $key = pack('H*', sha1($seed . 'A'));
-        $iv = pack('H*', sha1($seed . 'C'));
+        $key = pack('H*', sha1($seed.'A'));
+        $iv = pack('H*', sha1($seed.'C'));
 
         // ciphers are used as per the nist.gov link below. also, see this link:
         //
@@ -231,7 +231,7 @@ 
             $i = pack('H*', sha1(microtime()));
             $r = pack('H*', sha1($i ^ $v));
             $v = pack('H*', sha1($r ^ $i));
-            $result.= $r;
+            $result .= $r;
         }
         return substr($result, 0, $length);
     }
@@ -243,7 +243,7 @@ 
         $i = $crypto->encrypt(microtime());
         $r = $crypto->encrypt($i ^ $v);
         $v = $crypto->encrypt($r ^ $i);
-        $result.= $r;
+        $result .= $r;
     }
     return substr($result, 0, $length);
 }

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

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

Spacing +18 added lines, -18 removed lines

@@ -177,7 +177,7 @@ 
      */
     function Crypt_AES($mode = CRYPT_AES_MODE_CBC)
     {
-        if ( !defined('CRYPT_AES_MODE') ) {
+        if (!defined('CRYPT_AES_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('rijndael-128', mcrypt_list_algorithms()):
                     define('CRYPT_AES_MODE', CRYPT_AES_MODE_MCRYPT);
@@ -187,7 +187,7 @@ 
             }
         }
 
-        switch ( CRYPT_AES_MODE ) {
+        switch (CRYPT_AES_MODE) {
             case CRYPT_AES_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_AES_MODE_ECB:
@@ -267,7 +267,7 @@ 
     function setIV($iv)
     {
         parent::setIV($iv);
-        if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
+        if (CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT) {
             $this->changed = true;
         }
     }
@@ -291,7 +291,7 @@ 
      */
     function encrypt($plaintext)
     {
-        if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
+        if (CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT) {
             $this->_mcryptSetup();
 
             // re: http://phpseclib.sourceforge.net/cfb-demo.phps
@@ -308,11 +308,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;
@@ -325,15 +325,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;
                         }
                     }
                 }
@@ -342,7 +342,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;
                 }
 
@@ -376,7 +376,7 @@ 
      */
     function decrypt($ciphertext)
     {
-        if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
+        if (CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT) {
             $this->_mcryptSetup();
 
             if ($this->mode == 'ncfb' && $this->continuousBuffer) {
@@ -390,11 +390,11 @@ 
                     $max = 16 - $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
@@ -403,13 +403,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;
                 }

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

Spacing +45 added lines, -45 removed lines

@@ -278,7 +278,7 @@ 
      * @access private
      * @var    array
      */
-    var $sbox0 = array (
+    var $sbox0 = array(
         0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
         0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
         0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
@@ -469,7 +469,7 @@ 
      */
     function Crypt_Blowfish($mode = CRYPT_BLOWFISH_MODE_CBC)
     {
-        if ( !defined('CRYPT_BLOWFISH_MODE') ) {
+        if (!defined('CRYPT_BLOWFISH_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('blowfish', mcrypt_list_algorithms()):
                     define('CRYPT_BLOWFISH_MODE', CRYPT_BLOWFISH_MODE_MCRYPT);
@@ -479,7 +479,7 @@ 
             }
         }
 
-        switch ( CRYPT_BLOWFISH_MODE ) {
+        switch (CRYPT_BLOWFISH_MODE) {
             case CRYPT_BLOWFISH_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_BLOWFISH_MODE_ECB:
@@ -590,13 +590,13 @@ 
         $datar = 0;
         for ($i = 0; $i < 18; $i += 2) {
             $this->_encryptBlock($datal, $datar);
-            $this->bctx['p'][$i    ] = $datal;
+            $this->bctx['p'][$i] = $datal;
             $this->bctx['p'][$i + 1] = $datar;
         }
         for ($i = 0; $i < 4; ++$i) {
             for ($j = 0; $j < 256; $j += 2) {
                 $this->_encryptBlock($datal, $datar);
-                $this->bctx['sb'][$i][$j    ] = $datal;
+                $this->bctx['sb'][$i][$j] = $datal;
                 $this->bctx['sb'][$i][$j + 1] = $datar;
             }
         }
@@ -622,17 +622,17 @@ 
 
         $i = -1;
         while ($i < 15) {
-            $l^= $p[++$i];
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
-                  $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff];
-
-            $r^= $p[++$i];
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
-                  $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff];
+            $l ^= $p[++$i];
+            $r ^= ($sb_0[$l >> 24 & 0xff] +
+                  $sb_1[$l >> 16 & 0xff] ^
+                  $sb_2[$l >> 8 & 0xff]) +
+                  $sb_3[$l & 0xff];
+
+            $r ^= $p[++$i];
+            $l ^= ($sb_0[$r >> 24 & 0xff] +
+                  $sb_1[$r >> 16 & 0xff] ^
+                  $sb_2[$r >> 8 & 0xff]) +
+                  $sb_3[$r & 0xff];
 
         }
         $Xr = $l ^ $p[16];
@@ -656,7 +656,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -680,12 +680,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;
                 }
         }
 
@@ -727,7 +727,7 @@ 
      */
     function encrypt($plaintext)
     {
-        if ( CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT ) {
+        if (CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT) {
             if ($this->paddable) {
                 $plaintext = $this->_pad($plaintext);
             }
@@ -753,11 +753,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;
@@ -770,15 +770,15 @@ 
                             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);
-                        $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;
                         }
                     }
                 }
@@ -786,7 +786,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;
@@ -818,7 +818,7 @@ 
      */
     function decrypt($ciphertext)
     {
-        if ( CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT ) {
+        if (CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_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."
@@ -846,11 +846,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;
@@ -858,13 +858,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;
                 }
@@ -1032,7 +1032,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":
@@ -1058,7 +1058,7 @@ 
      */
     function inline_crypt_setup()
     {/*{{{*/
-        $lambda_functions =& Crypt_Blowfish::get_lambda_functions();
+        $lambda_functions = & Crypt_Blowfish::get_lambda_functions();
         $block_size = 8;
         $mode = $this->mode;
         $code_hash = "$mode";
@@ -1075,8 +1075,8 @@ 
                 $l = $in[1];
                 $r = $in[2];
             ';
-            for ($i = 0; $i < 16; $i+= 2) {
-                $_encryptBlock.= '
+            for ($i = 0; $i < 16; $i += 2) {
+                $_encryptBlock .= '
                     $l^= $p_'.($i).';
                     $r^= ($sb_0[$l >> 24 & 0xff]  +
                           $sb_1[$l >> 16 & 0xff]  ^
@@ -1090,7 +1090,7 @@ 
                           $sb_3[$r       & 0xff];
                 ';
             }
-            $_encryptBlock.= '
+            $_encryptBlock .= '
                 $in = pack("N*", $r ^ $p_17, $l ^ $p_16);
             ';
 
@@ -1101,8 +1101,8 @@ 
                 $r = $in[2];
             ';
 
-            for ($i = 17; $i > 2; $i-= 2) {
-                $_decryptBlock.= '
+            for ($i = 17; $i > 2; $i -= 2) {
+                $_decryptBlock .= '
                     $l^= $p_'.($i).';
                     $r^= ($sb_0[$l >> 24 & 0xff]  +
                           $sb_1[$l >> 16 & 0xff]  ^
@@ -1117,7 +1117,7 @@ 
                 ';
             }
 
-            $_decryptBlock.= '
+            $_decryptBlock .= '
                 $in = pack("N*", $r ^ $p_0, $l ^ $p_1);
             ';
 
@@ -1439,12 +1439,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];

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

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

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;