nilsteampassnet / TeamPass

includes/libraries/phpcrypt/modes/CBC.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
         parent::__construct(PHP_Crypt::MODE_CBC, $cipher);
 
         // this works with only block Ciphers
-        if($cipher->type() != Cipher::BLOCK)
+        if ($cipher->type() != Cipher::BLOCK)
             trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
     }
 
@@ -83,7 +83,7 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = strlen($text) / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // get the current position in $text
             $pos = $i * $blocksz;
@@ -92,7 +92,7 @@ 
             $block = substr($text, $pos, $blocksz);
 
             // xor the block with the register
-            for($j = 0; $j < $blocksz; ++$j)
+            for ($j = 0; $j < $blocksz; ++$j)
                 $block[$j] = $block[$j] ^ $this->register[$j];
 
             // encrypt the block, and save it back to the register
@@ -126,7 +126,7 @@ 
         $blocksz = $this->cipher->blockSize();
 
         $max = strlen($text) / $blocksz;
-        for($i = 0; $i < $max; ++$i)
+        for ($i = 0; $i < $max; ++$i)
         {
             // get the current position in $text
             $pos = $i * $blocksz;
@@ -139,7 +139,7 @@ 
             $this->cipher->decrypt($block);
 
             // xor the block with the register
-            for($j = 0; $j < $blocksz; ++$j)
+            for ($j = 0; $j < $blocksz; ++$j)
                 $block[$j] = $block[$j] ^ $this->register[$j];
 
             // replace the block of cipher text with plain text

includes/libraries/Goodby/CSV/Import/Standard/Observer/SqlObserver.php

Spacing +4 added lines, -4 removed lines

@@ -50,13 +50,13 @@
                     return 'false';
                 }
 
-                return '"' . addslashes($value) . '"';
+                return '"'.addslashes($value).'"';
             }
 
-            throw new \InvalidArgumentException('value is invalid: ' . var_export($value, 1));
+            throw new \InvalidArgumentException('value is invalid: '.var_export($value, 1));
         }, $line);
 
-        return 'INSERT INTO ' . $this->table . '(' . join(', ', $this->columns) . ')' .
-                ' VALUES(' . join(', ', $line) . ');';
+        return 'INSERT INTO '.$this->table.'('.join(', ', $this->columns).')'.
+                ' VALUES('.join(', ', $line).');';
     }
 }

includes/libraries/Goodby/CSV/Import/Standard/Observer/PdoObserver.php

Spacing +3 added lines, -3 removed lines

@@ -55,15 +55,15 @@
                 return $value;
             }
 
-            throw new \InvalidArgumentException('value is invalid: ' . var_export($value, 1));
+            throw new \InvalidArgumentException('value is invalid: '.var_export($value, 1));
         }, $line);
 
         $prepare = array_map(function() {
             return '?';
         }, $line);
 
-        $sql = 'INSERT INTO ' . $this->table . '(' . join(', ', $this->columns) . ')' .
-                ' VALUES(' . join(',', $prepare) . ')';
+        $sql = 'INSERT INTO '.$this->table.'('.join(', ', $this->columns).')'.
+                ' VALUES('.join(',', $prepare).')';
 
         $stmt = $this->pdo->prepare($sql);
         $stmt->execute($line);

sources/datatable/datatable.users_logged.php

Spacing +5 added lines, -5 removed lines

@@ -48,20 +48,20 @@
 //Paging
 $sLimit = "";
 if (isset($_GET['iDisplayStart']) && $_GET['iDisplayLength'] != '-1') {
-    $sLimit = "LIMIT ". filter_var($_GET['iDisplayStart'], FILTER_SANITIZE_NUMBER_INT) .", ". filter_var($_GET['iDisplayLength'], FILTER_SANITIZE_NUMBER_INT)."";
+    $sLimit = "LIMIT ".filter_var($_GET['iDisplayStart'], FILTER_SANITIZE_NUMBER_INT).", ".filter_var($_GET['iDisplayLength'], FILTER_SANITIZE_NUMBER_INT)."";
 }
 
 //Ordering
 
 if (isset($_GET['iSortCol_0']) && in_array($_GET['iSortCol_0'], $aSortTypes)) {
     $sOrder = "ORDER BY  ";
-    for ($i=0; $i<intval($_GET['iSortingCols']); $i++) {
+    for ($i = 0; $i < intval($_GET['iSortingCols']); $i++) {
         if (
-            $_GET[ 'bSortable_'.filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)] == "true" &&
+            $_GET['bSortable_'.filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)] == "true" &&
             preg_match("#^(asc|desc)\$#i", $_GET['sSortDir_'.$i])
         ) {
-            $sOrder .= "".$aColumns[ filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT) ]." "
-            .mysqli_escape_string($link, $_GET['sSortDir_'.$i]) .", ";
+            $sOrder .= "".$aColumns[filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)]." "
+            .mysqli_escape_string($link, $_GET['sSortDir_'.$i]).", ";
         }
     }
 

sources/main.functions.php

Spacing +2 added lines, -2 removed lines

@@ -1347,11 +1347,11 @@
 /**
  * @param string $message
  */
-function send_syslog($message, $component = "teampass", $program = "php", $host , $port)
+function send_syslog($message, $component = "teampass", $program = "php", $host, $port)
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
         //$syslog_message = "<123>" . date('M d H:i:s ') . " " .$host . " " . $component . ": " . $message;
-    $syslog_message = "<123>" . date('M d H:i:s ') . $component . ": " . $message;
+    $syslog_message = "<123>".date('M d H:i:s ').$component.": ".$message;
         socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $host, $port);
     socket_close($sock);
 }

sources/admin.queries.php

Spacing +9 added lines, -9 removed lines

@@ -2048,31 +2048,31 @@
                 ldap_start_tls($ldapconn);
             }
 
-            $debug_ldap .= "LDAP connection : " . ($ldapconn ? "Connected" : "Failed") . "<br/>";
+            $debug_ldap .= "LDAP connection : ".($ldapconn ? "Connected" : "Failed")."<br/>";
 
             ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
             if ($ldapconn) {
                 $ldapbind = @ldap_bind($ldapconn, $dataReceived[0]['ldap_bind_dn'], $dataReceived[0]['ldap_bind_passwd']);
 
-                $debug_ldap .= "LDAP bind : " . ($ldapbind ? "Bound" : "Failed") . "<br/>";
+                $debug_ldap .= "LDAP bind : ".($ldapbind ? "Bound" : "Failed")."<br/>";
 
                 if ($ldapbind) {
-                    $filter="(&(" . $dataReceived[0]['ldap_user_attribute']. "=$username)(objectClass=" . $dataReceived[0]['ldap_object_class'] ."))";
-                    $result=ldap_search($ldapconn, $dataReceived[0]['ldap_search_base'], $filter, array('dn','mail','givenname','sn'));
+                    $filter = "(&(".$dataReceived[0]['ldap_user_attribute']."=$username)(objectClass=".$dataReceived[0]['ldap_object_class']."))";
+                    $result = ldap_search($ldapconn, $dataReceived[0]['ldap_search_base'], $filter, array('dn', 'mail', 'givenname', 'sn'));
                     if (isset($dataReceived[0]['ldap_usergroup'])) {
                         $filter_group = "memberUid=".$username;
-                        $result_group = ldap_search($ldapconn, $dataReceived[0]['ldap_usergroup'],$filter_group, array('dn'));
+                        $result_group = ldap_search($ldapconn, $dataReceived[0]['ldap_usergroup'], $filter_group, array('dn'));
 
-                        $debug_ldap .= 'Search filter (group): ' . $filter_group . "<br/>" .
-                                    'Results : ' . print_r(ldap_get_entries($ldapconn, $result_group), true) . "<br/>";
+                        $debug_ldap .= 'Search filter (group): '.$filter_group."<br/>".
+                                    'Results : '.print_r(ldap_get_entries($ldapconn, $result_group), true)."<br/>";
 
                         if (!ldap_count_entries($ldapconn, $result_group)) {
                                 $ldapConnection = "Error - No entries found";
                         }
                     }
 
-                    $debug_ldap .= 'Search filter : ' . $filter . "<br/>" .
-                            'Results : ' . print_r(ldap_get_entries($ldapconn, $result), true) . "<br/>";
+                    $debug_ldap .= 'Search filter : '.$filter."<br/>".
+                            'Results : '.print_r(ldap_get_entries($ldapconn, $result), true)."<br/>";
 
                     if (ldap_count_entries($ldapconn, $result)) {
                         // try auth

sources/identify.php

Spacing +7 added lines, -7 removed lines

@@ -350,25 +350,25 @@
                 ldap_start_tls($ldapconn);
             }
             if ($debugLdap == 1) {
-                fputs($dbgLdap, "LDAP connection : " . ($ldapconn ? "Connected" : "Failed") . "\n");
+                fputs($dbgLdap, "LDAP connection : ".($ldapconn ? "Connected" : "Failed")."\n");
             }
             ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
             if ($ldapconn) {
                 $ldapbind = ldap_bind($ldapconn, $_SESSION['settings']['ldap_bind_dn'], $_SESSION['settings']['ldap_bind_passwd']);
                 if ($debugLdap == 1) {
-                    fputs($dbgLdap, "LDAP bind : " . ($ldapbind ? "Bound" : "Failed") . "\n");
+                    fputs($dbgLdap, "LDAP bind : ".($ldapbind ? "Bound" : "Failed")."\n");
                 }
                 if ($ldapbind) {
-                    $filter="(&(" . $_SESSION['settings']['ldap_user_attribute']. "=$username)(objectClass=" . $_SESSION['settings']['ldap_object_class'] ."))";
-                    $result=ldap_search($ldapconn, $_SESSION['settings']['ldap_search_base'], $filter, array('dn','mail','givenname','sn'));
+                    $filter = "(&(".$_SESSION['settings']['ldap_user_attribute']."=$username)(objectClass=".$_SESSION['settings']['ldap_object_class']."))";
+                    $result = ldap_search($ldapconn, $_SESSION['settings']['ldap_search_base'], $filter, array('dn', 'mail', 'givenname', 'sn'));
                     if (isset($_SESSION['settings']['ldap_usergroup'])) {
                         $filter_group = "memberUid=".$username;
-                        $result_group = ldap_search($ldapconn, $_SESSION['settings']['ldap_usergroup'],$filter_group, array('dn'));
+                        $result_group = ldap_search($ldapconn, $_SESSION['settings']['ldap_usergroup'], $filter_group, array('dn'));
                         if ($debugLdap == 1) {
                                 fputs(
                                         $dbgLdap,
-                                        'Search filter (group): ' . $filter_group . "\n" .
-                                        'Results : ' . print_r(ldap_get_entries($ldapconn, $result_group), true) . "\n"
+                                        'Search filter (group): '.$filter_group."\n".
+                                        'Results : '.print_r(ldap_get_entries($ldapconn, $result_group), true)."\n"
                                 );
                         }
                         if (!ldap_count_entries($ldapconn, $result_group)) {

install/js/crypt/aes.class.php

Spacing +50 added lines, -50 removed lines

@@ -15,17 +15,17 @@ 
      * @return      ciphertext as byte-array (16 bytes)
      */
     public static function cipher($input, $w) {    // main cipher function [é5.1]
-    $Nb = 4;                 // block size (in words): no of columns in state (fixed at 4 for AES)
-    $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
+    $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+    $Nr = count($w) / $Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
-    $state = array();  // initialise 4xNb byte-array 'state' with input [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) {
-        $state[$i%4][floor($i/4)] = $input[$i];
+    $state = array(); // initialise 4xNb byte-array 'state' with input [é3.4]
+    for ($i = 0; $i < 4 * $Nb; $i++) {
+        $state[$i % 4][floor($i / 4)] = $input[$i];
     }
 
     $state = self::addRoundKey($state, $w, 0, $Nb);
 
-    for ($round=1; $round<$Nr; $round++) {  // apply Nr rounds
+    for ($round = 1; $round < $Nr; $round++) {  // apply Nr rounds
         $state = self::subBytes($state, $Nb);
         $state = self::shiftRows($state, $Nb);
         $state = self::mixColumns($state, $Nb);
@@ -36,8 +36,8 @@ 
     $state = self::shiftRows($state, $Nb);
     $state = self::addRoundKey($state, $w, $Nr, $Nb);
 
-    $output = array(4*$Nb);  // convert state to 1-d array before returning [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $output[$i] = $state[$i%4][floor($i/4)];
+    $output = array(4 * $Nb); // convert state to 1-d array before returning [é3.4]
+    for ($i = 0; $i < 4 * $Nb; $i++) $output[$i] = $state[$i % 4][floor($i / 4)];
 
     return $output;
   }
@@ -47,8 +47,8 @@ 
    * @param integer $Nb
    */
   private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
-    for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+    for ($r = 0; $r < 4; $r++) {
+      for ($c = 0; $c < $Nb; $c++) $state[$r][$c] ^= $w[$rnd * 4 + $c][$r];
     }
 
     return $state;
@@ -58,8 +58,8 @@ 
    * @param integer $Nb
    */
   private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
-    for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) {
+    for ($r = 0; $r < 4; $r++) {
+      for ($c = 0; $c < $Nb; $c++) {
           $s[$r][$c] = self::$sBox[$s[$r][$c]];
       }
     }
@@ -72,29 +72,29 @@ 
    */
   private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
     $t = array(4);
-    for ($r=1; $r<4; $r++) {
-      for ($c=0; $c<4; $c++) {
-          $t[$c] = $s[$r][($c+$r)%$Nb];
+    for ($r = 1; $r < 4; $r++) {
+      for ($c = 0; $c < 4; $c++) {
+          $t[$c] = $s[$r][($c + $r) % $Nb];
       }
       // shift into temp copy
-      for ($c=0; $c<4; $c++) {
+      for ($c = 0; $c < 4; $c++) {
           $s[$r][$c] = $t[$c];
       }
       // and copy back
     }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
-    return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
+    return $s; // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
   }
 
   /**
    * @param integer $Nb
    */
   private static function mixColumns($s, $Nb) {   // combine bytes of each col of state S [é5.1.3]
-    for ($c=0; $c<4; $c++) {
-      $a = array(4);  // 'a' is a copy of the current column from 's'
-      $b = array(4);  // 'b' is aé{02} in GF(2^8)
-      for ($i=0; $i<4; $i++) {
+    for ($c = 0; $c < 4; $c++) {
+      $a = array(4); // 'a' is a copy of the current column from 's'
+      $b = array(4); // 'b' is aé{02} in GF(2^8)
+      for ($i = 0; $i < 4; $i++) {
         $a[$i] = $s[$i][$c];
-        $b[$i] = $s[$i][$c]&0x80 ? $s[$i][$c]<<1 ^ 0x011b : $s[$i][$c]<<1;
+        $b[$i] = $s[$i][$c] & 0x80 ? $s[$i][$c] << 1 ^ 0x011b : $s[$i][$c] << 1;
       }
       // a[n] ^ b[n] is aé{03} in GF(2^8)
       $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
@@ -114,42 +114,42 @@ 
    * @return    key schedule as 2D byte-array (Nr+1 x Nb bytes)
    */
   public static function keyExpansion($key) {  // generate Key Schedule from Cipher Key [é5.2]
-    $Nb = 4;              // block size (in words): no of columns in state (fixed at 4 for AES)
-    $Nk = count($key)/4;  // key length (in words): 4/6/8 for 128/192/256-bit keys
-    $Nr = $Nk + 6;        // no of rounds: 10/12/14 for 128/192/256-bit keys
+    $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+    $Nk = count($key) / 4; // key length (in words): 4/6/8 for 128/192/256-bit keys
+    $Nr = $Nk + 6; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
     $w = array();
     $temp = array();
 
-    for ($i=0; $i<$Nk; $i++) {
-        $r = array($key[4*$i], $key[4*$i+1], $key[4*$i+2], $key[4*$i+3]);
+    for ($i = 0; $i < $Nk; $i++) {
+        $r = array($key[4 * $i], $key[4 * $i + 1], $key[4 * $i + 2], $key[4 * $i + 3]);
         $w[$i] = $r;
     }
 
-    for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
+    for ($i = $Nk; $i < ($Nb * ($Nr + 1)); $i++) {
         $w[$i] = array();
-        for ($t=0; $t<4; $t++) $temp[$t] = $w[$i-1][$t];
+        for ($t = 0; $t < 4; $t++) $temp[$t] = $w[$i - 1][$t];
         if ($i % $Nk == 0) {
         $temp = self::subWord(self::rotWord($temp));
-        for ($t=0; $t<4; $t++) $temp[$t] ^= self::$rCon[$i/$Nk][$t];
-        } elseif ($Nk > 6 && $i%$Nk == 4) {
+        for ($t = 0; $t < 4; $t++) $temp[$t] ^= self::$rCon[$i / $Nk][$t];
+        } elseif ($Nk > 6 && $i % $Nk == 4) {
         $temp = self::subWord($temp);
         }
-        for ($t=0; $t<4; $t++) $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+        for ($t = 0; $t < 4; $t++) $w[$i][$t] = $w[$i - $Nk][$t] ^ $temp[$t];
     }
 
     return $w;
     }
 
     private static function subWord($w) {    // apply SBox to 4-byte word w
-    for ($i=0; $i<4; $i++) $w[$i] = self::$sBox[$w[$i]];
+    for ($i = 0; $i < 4; $i++) $w[$i] = self::$sBox[$w[$i]];
 
     return $w;
     }
 
     private static function rotWord($w) {    // rotate 4-byte word w left by one byte
     $tmp = $w[0];
-    for ($i=0; $i<3; $i++) $w[$i] = $w[$i+1];
+    for ($i = 0; $i < 3; $i++) $w[$i] = $w[$i + 1];
     $w[3] = $tmp;
 
     return $w;
@@ -157,22 +157,22 @@ 
 
     // sBox is pre-computed multiplicative inverse in GF(2^8) used in subBytes and keyExpansion [é5.1.1]
     private static $sBox = array(
-    0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
-    0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
-    0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
-    0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
-    0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
-    0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
-    0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
-    0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
-    0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
-    0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
-    0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
-    0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
-    0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
-    0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
-    0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
-    0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16);
+    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+    0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+    0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+    0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+    0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+    0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+    0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+    0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+    0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+    0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+    0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16);
 
     // rCon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [é5.2]
     private static $rCon = array(

install/js/crypt/aesctr.class.php

Spacing +47 added lines, -47 removed lines

@@ -20,8 +20,8 @@ 
    */
   public static function encrypt($plaintext, $password, $nBits)
   {
-    $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+    $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+    if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) {
         return '';
     }
     // standard allows 128/192/256 bit keys
@@ -29,30 +29,30 @@ 
 
     // use AES itself to encrypt password to get cipher key (using plain password as source for
     // key expansion) - gives us well encrypted key
-    $nBytes = $nBits/8;  // no bytes in key
+    $nBytes = $nBits / 8; // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) {
-        $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i = 0; $i < $nBytes; $i++) {
+        $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
     }
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-    $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+    $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
     // initialise counter block (NIST SP800-38A §B.2): millisecond time-stamp for nonce in
     // 1st 8 bytes, block counter in 2nd 8 bytes
     $counterBlock = array();
-    $nonce = floor(microtime(true)*1000);   // timestamp: milliseconds since 1-Jan-1970
-    $nonceSec = floor($nonce/1000);
-    $nonceMs = $nonce%1000;
+    $nonce = floor(microtime(true) * 1000); // timestamp: milliseconds since 1-Jan-1970
+    $nonceSec = floor($nonce / 1000);
+    $nonceMs = $nonce % 1000;
     // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
-    for ($i=0; $i<4; $i++) {
-        $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
+    for ($i = 0; $i < 4; $i++) {
+        $counterBlock[$i] = self::urs($nonceSec, $i * 8) & 0xff;
     }
-    for ($i=0; $i<4; $i++) {
-        $counterBlock[$i+4] = $nonceMs & 0xff;
+    for ($i = 0; $i < 4; $i++) {
+        $counterBlock[$i + 4] = $nonceMs & 0xff;
     }
     // and convert it to a string to go on the front of the ciphertext
     $ctrTxt = '';
-    for ($i=0; $i<8; $i++) {
+    for ($i = 0; $i < 8; $i++) {
         $ctrTxt .= chr($counterBlock[$i]);
     }
 
@@ -60,26 +60,26 @@ 
     $keySchedule = Aes::keyExpansion($key);
     //print_r($keySchedule);
 
-    $blockCount = ceil(strlen($plaintext)/$blockSize);
-    $ciphertxt = array();  // ciphertext as array of strings
+    $blockCount = ceil(strlen($plaintext) / $blockSize);
+    $ciphertxt = array(); // ciphertext as array of strings
 
-    for ($b=0; $b<$blockCount; $b++) {
+    for ($b = 0; $b < $blockCount; $b++) {
         // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
         // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-        for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-        for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+        for ($c = 0; $c < 4; $c++) $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
+        for ($c = 0; $c < 4; $c++) $counterBlock[15 - $c - 4] = self::urs($b / 0x100000000, $c * 8);
 
-        $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
+        $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // -- encrypt counter block --
 
         // block size is reduced on final block
-        $blockLength = $b<$blockCount-1 ? $blockSize : (strlen($plaintext)-1)%$blockSize+1;
+        $blockLength = $b < $blockCount - 1 ? $blockSize : (strlen($plaintext) - 1) % $blockSize + 1;
         $cipherByte = array();
 
-        for ($i=0; $i<$blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
-        $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b*$blockSize+$i, 1));
+        for ($i = 0; $i < $blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
+        $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b * $blockSize + $i, 1));
         $cipherByte[$i] = chr($cipherByte[$i]);
         }
-        $ciphertxt[$b] = implode('', $cipherByte);  // escape troublesome characters in ciphertext
+        $ciphertxt[$b] = implode('', $cipherByte); // escape troublesome characters in ciphertext
     }
 
     // implode is more efficient than repeated string concatenation
@@ -99,54 +99,54 @@ 
    */
   public static function decrypt($ciphertext, $password, $nBits)
   {
-    $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+    $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+    if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) {
         return '';
     }
     // standard allows 128/192/256 bit keys
     $ciphertext = base64_decode($ciphertext);
 
     // use AES to encrypt password (mirroring encrypt routine)
-    $nBytes = $nBits/8;  // no bytes in key
+    $nBytes = $nBits / 8; // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) {
-        $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i = 0; $i < $nBytes; $i++) {
+        $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
     }
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-    $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+    $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
     // recover nonce from 1st element of ciphertext
     $counterBlock = array();
     $ctrTxt = substr($ciphertext, 0, 8);
-    for ($i=0; $i<8; $i++) {
-        $counterBlock[$i] = ord(substr($ctrTxt,$i,1));
+    for ($i = 0; $i < 8; $i++) {
+        $counterBlock[$i] = ord(substr($ctrTxt, $i, 1));
     }
 
     // generate key schedule
     $keySchedule = Aes::keyExpansion($key);
 
     // separate ciphertext into blocks (skipping past initial 8 bytes)
-    $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
+    $nBlocks = ceil((strlen($ciphertext) - 8) / $blockSize);
     $ct = array();
-    for ($b=0; $b<$nBlocks; $b++) {
-        $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+    for ($b = 0; $b < $nBlocks; $b++) {
+        $ct[$b] = substr($ciphertext, 8 + $b * $blockSize, 16);
     }
-    $ciphertext = $ct;  // ciphertext is now array of block-length strings
+    $ciphertext = $ct; // ciphertext is now array of block-length strings
 
     // plaintext will get generated block-by-block into array of block-length strings
     $plaintxt = array();
 
-    for ($b=0; $b<$nBlocks; $b++) {
+    for ($b = 0; $b < $nBlocks; $b++) {
         // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-        for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-        for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+        for ($c = 0; $c < 4; $c++) $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
+        for ($c = 0; $c < 4; $c++) $counterBlock[15 - $c - 4] = self::urs(($b + 1) / 0x100000000 - 1, $c * 8) & 0xff;
 
-        $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
+        $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // encrypt counter block
 
         $plaintxtByte = array();
-        for ($i=0; $i<strlen($ciphertext[$b]); $i++) {
+        for ($i = 0; $i < strlen($ciphertext[$b]); $i++) {
         // -- xor plaintext with ciphered counter byte-by-byte --
-        $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b],$i,1));
+        $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b], $i, 1));
         $plaintxtByte[$i] = chr($plaintxtByte[$i]);
 
         }
@@ -168,12 +168,12 @@ 
    */
     private static function urs($a, $b)
     {
-    $a &= 0xffffffff; $b &= 0x1f;  // (bounds check)
-    if ($a&0x80000000 && $b>0) {   // if left-most bit set
-        $a = ($a>>1) & 0x7fffffff;   //   right-shift one bit & clear left-most bit
-        $a = $a >> ($b-1);           //   remaining right-shifts
+    $a &= 0xffffffff; $b &= 0x1f; // (bounds check)
+    if ($a & 0x80000000 && $b > 0) {   // if left-most bit set
+        $a = ($a >> 1) & 0x7fffffff; //   right-shift one bit & clear left-most bit
+        $a = $a >> ($b - 1); //   remaining right-shifts
     } else {                       // otherwise
-        $a = ($a>>$b);               //   use normal right-shift
+        $a = ($a >> $b); //   use normal right-shift
     }
 
     return $a;