nilsteampassnet / TeamPass

install/js/crypt/aes.class.php

Spacing +30 added lines, -30 removed lines

@@ -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,33 +114,33 @@ 
      * @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];
+        for ($t = 0; $t < 4; $t++) {
+            $temp[$t] ^= self::$rCon[$i / $Nk][$t];
         }
-        } elseif ($Nk > 6 && $i%$Nk == 4) {
+        } 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];
         }
     }
 
@@ -148,7 +148,7 @@ 
     }
 
     private static function subWord($w) {    // apply SBox to 4-byte word w
-    for ($i=0; $i<4; $i++) {
+    for ($i = 0; $i < 4; $i++) {
         $w[$i] = self::$sBox[$w[$i]];
     }
 
@@ -157,8 +157,8 @@ 
 
     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;
 

install/js/crypt/aesctr.class.php

Spacing +22 added lines, -22 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
@@ -99,58 +99,58 @@ 
      */
     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] = 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 - 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]);
 
         }

includes/libraries/Database/Meekrodb/db.class.php

Spacing +2 added lines, -2 removed lines

@@ -321,14 +321,14 @@
     /**
      * @param string $which
      */
-    public function insertOrReplace($which, $table, $datas, $options=array()) {
+    public function insertOrReplace($which, $table, $datas, $options = array()) {
     $datas = unserialize(serialize($datas)); // break references within array
     $keys = $values = array();
 
     if (isset($datas[0]) && is_array($datas[0])) {
         foreach ($datas as $datum) {
         ksort($datum);
-        if (! $keys) {
+        if (!$keys) {
             $keys = array_keys($datum);
         }
         $values[] = array_values($datum);

includes/libraries/Pdf/Tfpdf/font/unifont/ttfonts.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 var $maxStrLenRead;
 
     function __construct() {
-        $this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
+        $this->maxStrLenRead = 200000; // Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
     }
 
 
@@ -79,7 +79,7 @@ 
      */
     function getMetrics($file) {
         $this->filename = $file;
-        $this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
+        $this->fh = fopen($file, 'rb') or die('Can\'t open file '.$file);
         $this->_pos = 0;
         $this->charWidths = '';
         $this->glyphPos = array();
@@ -1037,7 +1037,7 @@ 
     /**
      * @param integer $unicode_cmap_offset
      */
-    function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
+    function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph) {
         $this->maxUniChar = 0;
         $this->seek($unicode_cmap_offset + 2);
         $length = $this->read_ushort();

includes/libraries/phpcrypt/ciphers/RC2.php

Spacing +2 added lines, -2 removed lines

@@ -163,7 +163,7 @@ 
         for ($i = 0; $i < $max; ++$i)
         {
             $pos = $i * 2;
-            $text[$pos]   = chr($w[$i]);
+            $text[$pos] = chr($w[$i]);
             $text[$pos + 1] = chr($w[$i] >> 8);
         }
 
@@ -237,7 +237,7 @@ 
         for ($i = 0; $i < $max; ++$i)
         {
             $pos = $i * 2;
-            $text[$pos]   = chr($w[$i]);
+            $text[$pos] = chr($w[$i]);
             $text[$pos + 1] = chr($w[$i] >> 8);
         }
 

includes/libraries/phpcrypt/phpCrypt.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     // The source of random data used to create keys and IV's
     // Used for PHP_Crypt::createKey(), PHP_Crypt::createIV()
     const RAND = "rand"; // uses mt_rand(), windows & unix
-    const RAND_DEV_RAND	= "/dev/random"; // unix only
+    const RAND_DEV_RAND = "/dev/random"; // unix only
     const RAND_DEV_URAND = "/dev/urandom"; // unix only
     const RAND_WIN_COM = "wincom"; // windows only, COM extension
     const RAND_DEFAULT_SZ = 32; // the default number of bytes returned