nilsteampassnet / TeamPass

install/upgrade_ajax.php

Indentation +1 added lines, -1 removed lines

@@ -469,7 +469,7 @@
                 } else {
                     // user said that database has not being used for an older version
                     // no old sk is available
-                     $tmp = mysqli_num_rows(mysqli_query(
+                        $tmp = mysqli_num_rows(mysqli_query(
                             $dbTmp,
                             "SELECT * FROM `".$var['tbl_prefix']."misc` WHERE type = 'admin' AND intitule = 'saltkey_ante_2127'"
                         ));

Braces +7 added lines, -4 removed lines

@@ -100,9 +100,12 @@ 
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 //define pbkdf2 iteration count
 @define('ITCOUNT', '2072');
@@ -852,7 +855,7 @@ 
                         }
                         if(($r+1) == $row_count || ($r % 400) == 399){
                             $contents .= ");\n\n";
-                        }else{
+                        } else{
                             $contents .= "),\n";
                         }
                         $r++;

install/js/crypt/aes.class.php

Indentation +61 added lines, -61 removed lines

@@ -6,15 +6,15 @@ 
 
 class Aes
 {
-  /**
-   * AES Cipher function: encrypt 'input' with Rijndael algorithm
-   *
-   * @param input message as byte-array (16 bytes)
-   * @param w     key schedule as 2D byte-array (Nr+1 x Nb bytes) -
-   *              generated from the cipher key by keyExpansion()
-   * @return      ciphertext as byte-array (16 bytes)
-   */
-  public static function cipher($input, $w) {    // main cipher function [é5.1]
+    /**
+     * AES Cipher function: encrypt 'input' with Rijndael algorithm
+     *
+     * @param input message as byte-array (16 bytes)
+     * @param w     key schedule as 2D byte-array (Nr+1 x Nb bytes) -
+     *              generated from the cipher key by keyExpansion()
+     * @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
 
@@ -24,10 +24,10 @@ 
     $state = self::addRoundKey($state, $w, 0, $Nb);
 
     for ($round=1; $round<$Nr; $round++) {  // apply Nr rounds
-      $state = self::subBytes($state, $Nb);
-      $state = self::shiftRows($state, $Nb);
-      $state = self::mixColumns($state, $Nb);
-      $state = self::addRoundKey($state, $w, $round, $Nb);
+        $state = self::subBytes($state, $Nb);
+        $state = self::shiftRows($state, $Nb);
+        $state = self::mixColumns($state, $Nb);
+        $state = self::addRoundKey($state, $w, $round, $Nb);
     }
 
     $state = self::subBytes($state, $Nb);
@@ -38,59 +38,59 @@ 
     for ($i=0; $i<4*$Nb; $i++) $output[$i] = $state[$i%4][floor($i/4)];
 
     return $output;
-  }
+    }
 
-  private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
+    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 ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
     }
 
     return $state;
-  }
+    }
 
-  private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
+    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++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
+        for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
     }
 
     return $s;
-  }
+    }
 
-  private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
+    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];  // shift into temp copy
-      for ($c=0; $c<4; $c++) $s[$r][$c] = $t[$c];           // and copy back
+        for ($c=0; $c<4; $c++) $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
+        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
-  }
+    }
 
-  private static function mixColumns($s, $Nb) {   // combine bytes of each col of state S [é5.1.3]
+    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++) {
+        $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;
-      }
-      // 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
-      $s[1][$c] = $a[0] ^ $b[1] ^ $a[2] ^ $b[2] ^ $a[3]; // a0 * 2*a1 + 3*a2 + a3
-      $s[2][$c] = $a[0] ^ $a[1] ^ $b[2] ^ $a[3] ^ $b[3]; // a0 + a1 + 2*a2 + 3*a3
-      $s[3][$c] = $a[0] ^ $b[0] ^ $a[1] ^ $a[2] ^ $b[3]; // 3*a0 + a1 + a2 + 2*a3
+        }
+        // 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
+        $s[1][$c] = $a[0] ^ $b[1] ^ $a[2] ^ $b[2] ^ $a[3]; // a0 * 2*a1 + 3*a2 + a3
+        $s[2][$c] = $a[0] ^ $a[1] ^ $b[2] ^ $a[3] ^ $b[3]; // a0 + a1 + 2*a2 + 3*a3
+        $s[3][$c] = $a[0] ^ $b[0] ^ $a[1] ^ $a[2] ^ $b[3]; // 3*a0 + a1 + a2 + 2*a3
     }
 
     return $s;
-  }
-
-  /**
-   * Key expansion for Rijndael cipher(): performs key expansion on cipher key
-   * to generate a key schedule
-   *
-   * @param key cipher key byte-array (16 bytes)
-   * @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]
+    }
+
+    /**
+     * Key expansion for Rijndael cipher(): performs key expansion on cipher key
+     * to generate a key schedule
+     *
+     * @param key cipher key byte-array (16 bytes)
+     * @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
@@ -99,41 +99,41 @@ 
     $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]);
-      $w[$i] = $r;
+        $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++) {
-      $w[$i] = array();
-      for ($t=0; $t<4; $t++) $temp[$t] = $w[$i-1][$t];
-      if ($i % $Nk == 0) {
+        $w[$i] = array();
+        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) {
+        } 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
+    private static function subWord($w) {    // apply SBox to 4-byte word w
     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
+    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];
     $w[3] = $tmp;
 
     return $w;
-  }
+    }
 
-  // sBox is pre-computed multiplicative inverse in GF(2^8) used in subBytes and keyExpansion [é5.1.1]
-  private static $sBox = array(
+    // 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,
@@ -151,8 +151,8 @@ 
     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(
+    // 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(
     array(0x00, 0x00, 0x00, 0x00),
     array(0x01, 0x00, 0x00, 0x00),
     array(0x02, 0x00, 0x00, 0x00),

Braces +35 added lines, -11 removed lines

@@ -19,7 +19,9 @@ 
     $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];
+    for ($i=0; $i<4*$Nb; $i++) {
+        $state[$i%4][floor($i/4)] = $input[$i];
+    }
 
     $state = self::addRoundKey($state, $w, 0, $Nb);
 
@@ -35,14 +37,18 @@ 
     $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)];
+    for ($i=0; $i<4*$Nb; $i++) {
+        $output[$i] = $state[$i%4][floor($i/4)];
+    }
 
     return $output;
   }
 
   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 ($c=0; $c<$Nb; $c++) {
+          $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+      }
     }
 
     return $state;
@@ -50,7 +56,9 @@ 
 
   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++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
+      for ($c=0; $c<$Nb; $c++) {
+          $s[$r][$c] = self::$sBox[$s[$r][$c]];
+      }
     }
 
     return $s;
@@ -59,8 +67,14 @@ 
   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];  // shift into temp copy
-      for ($c=0; $c<4; $c++) $s[$r][$c] = $t[$c];           // and copy back
+      for ($c=0; $c<4; $c++) {
+          $t[$c] = $s[$r][($c+$r)%$Nb];
+      }
+      // shift into temp copy
+      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
   }
@@ -105,28 +119,38 @@ 
 
     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) {
         $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;

install/js/crypt/aesctr.class.php

Indentation +51 added lines, -51 removed lines

@@ -7,19 +7,19 @@ 
 
 class AesCtr extends Aes
 {
-  /**
-   * Encrypt a text using AES encryption in Counter mode of operation
-   *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-   *
-   * Unicode multi-byte character safe
-   *
-   * @param plaintext source text to be encrypted
-   * @param password  the password to use to generate a key
-   * @param nBits     number of bits to be used in the key (128, 192, or 256)
-   * @return          encrypted text
-   */
-  public static function encrypt($plaintext, $password, $nBits)
-  {
+    /**
+     * Encrypt a text using AES encryption in Counter mode of operation
+     *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+     *
+     * Unicode multi-byte character safe
+     *
+     * @param plaintext source text to be encrypted
+     * @param password  the password to use to generate a key
+     * @param nBits     number of bits to be used in the key (128, 192, or 256)
+     * @return          encrypted text
+     */
+    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)) return '';  // standard allows 128/192/256 bit keys
     // note PHP (5) gives us plaintext and password in UTF8 encoding!
@@ -53,22 +53,22 @@ 
     $ciphertxt = array();  // ciphertext as array of strings
 
     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);
+        // 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);
 
-      $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;
-      $cipherByte = array();
+        // block size is reduced on final block
+        $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 --
+        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
@@ -76,18 +76,18 @@ 
     $ciphertext = base64_encode($ciphertext);
 
     return $ciphertext;
-  }
+    }
 
-  /**
-   * Decrypt a text encrypted by AES in counter mode of operation
-   *
-   * @param ciphertext source text to be decrypted
-   * @param password   the password to use to generate a key
-   * @param nBits      number of bits to be used in the key (128, 192, or 256)
-   * @return           decrypted text
-   */
-  public static function decrypt($ciphertext, $password, $nBits)
-  {
+    /**
+     * Decrypt a text encrypted by AES in counter mode of operation
+     *
+     * @param ciphertext source text to be decrypted
+     * @param password   the password to use to generate a key
+     * @param nBits      number of bits to be used in the key (128, 192, or 256)
+     * @return           decrypted text
+     */
+    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)) return '';  // standard allows 128/192/256 bit keys
     $ciphertext = base64_decode($ciphertext);
@@ -117,47 +117,47 @@ 
     $plaintxt = array();
 
     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;
+        // 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;
 
-      $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++) {
+        $plaintxtByte = array();
+        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] = chr($plaintxtByte[$i]);
 
-      }
-      $plaintxt[$b] = implode('', $plaintxtByte);
+        }
+        $plaintxt[$b] = implode('', $plaintxtByte);
     }
 
     // join array of blocks into single plaintext string
     $plaintext = implode('',$plaintxt);
 
     return $plaintext;
-  }
+    }
 
-  /*
+    /*
    * Unsigned right shift function, since PHP has neither >>> operator nor unsigned ints
    *
    * @param a  number to be shifted (32-bit integer)
    * @param b  number of bits to shift a to the right (0..31)
    * @return   a right-shifted and zero-filled by b bits
    */
-  private static function urs($a, $b)
-  {
+    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 = ($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;
-  }
+    }
 
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */

Braces +41 added lines, -13 removed lines

@@ -21,14 +21,19 @@ 
   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)) return '';  // standard allows 128/192/256 bit keys
+    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+        return '';
+    }
+    // standard allows 128/192/256 bit keys
     // note PHP (5) gives us plaintext and password in UTF8 encoding!
 
     // 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
     $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
 
@@ -39,11 +44,17 @@ 
     $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+4] = $nonceMs & 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;
+    }
     // and convert it to a string to go on the front of the ciphertext
     $ctrTxt = '';
-    for ($i=0; $i<8; $i++) $ctrTxt .= chr($counterBlock[$i]);
+    for ($i=0; $i<8; $i++) {
+        $ctrTxt .= chr($counterBlock[$i]);
+    }
 
     // generate key schedule - an expansion of the key into distinct Key Rounds for each round
     $keySchedule = Aes::keyExpansion($key);
@@ -55,8 +66,12 @@ 
     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 --
 
@@ -89,20 +104,27 @@ 
   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)) return '';  // standard allows 128/192/256 bit keys
+    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
     $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
 
     // 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);
@@ -110,7 +132,9 @@ 
     // separate ciphertext into blocks (skipping past initial 8 bytes)
     $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
 
     // plaintext will get generated block-by-block into array of block-length strings
@@ -118,8 +142,12 @@ 
 
     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
 

install/install.queries.php

Braces +15 added lines, -10 removed lines

@@ -23,14 +23,16 @@ 
     $dp = opendir($dir);
     $res = true;
     while($file = readdir($dp)) {
-        if (($file == ".") || ($file == ".."))
-            continue;
+        if (($file == ".") || ($file == "..")) {
+                    continue;
+        }
 
         $fullPath = $dir."/".$file;
 
         if(is_dir($fullPath)) {
-            if ($res = @chmod($fullPath, $dirPermissions))
-                $res = @chmod_r($fullPath, $dirPermissions, $filePermissions);
+            if ($res = @chmod($fullPath, $dirPermissions)) {
+                            $res = @chmod_r($fullPath, $dirPermissions, $filePermissions);
+            }
         } else {
             $res = chmod($fullPath, $filePermissions);
         }
@@ -40,8 +42,9 @@ 
         }
     }
     closedir($dp);
-    if (is_dir($dir) && $res)
-        $res = @chmod($dir, $dirPermissions);
+    if (is_dir($dir) && $res) {
+            $res = @chmod($dir, $dirPermissions);
+    }
 
     return $res;
 }
@@ -995,10 +998,12 @@ 
                     if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
                         // Change directory permissions
                         $result = chmod_r($_SESSION['abspath'], 0770, 0740);
-                        if ($result )
-                            $result = chmod_r($_SESSION['abspath'].'/files', 0770, 0770);
-                        if  ($result)
-                            $result = chmod_r($_SESSION['abspath'].'/upload', 0770, 0770);
+                        if ($result ) {
+                                                    $result = chmod_r($_SESSION['abspath'].'/files', 0770, 0770);
+                        }
+                        if  ($result) {
+                                                    $result = chmod_r($_SESSION['abspath'].'/upload', 0770, 0770);
+                        }
                     }
 
                     if ($result === false) {

install/upgrade_run_db_original.php

Braces +6 added lines, -3 removed lines

@@ -89,9 +89,12 @@
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 //define pbkdf2 iteration count
 @define('ITCOUNT', '2072');

install/upgrade_run_final.php

Braces +6 added lines, -2 removed lines

@@ -101,8 +101,12 @@
         }
 
         // temp data
-        if (!isset($record['login'])) $record['login'] = "";
-        if (!isset($resNT['renewal_period'])) $resNT['renewal_period'] = "0";
+        if (!isset($record['login'])) {
+            $record['login'] = "";
+        }
+        if (!isset($resNT['renewal_period'])) {
+            $resNT['renewal_period'] = "0";
+        }
 
         // store data
         $res = mysqli_query($dbTmp,

install/upgrade_run_2.1.27.php

Braces +18 added lines, -7 removed lines

@@ -83,16 +83,27 @@
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 function cleanFields($txt) {
     $tmp = str_replace(",", ";", trim($txt));
-    if (empty($tmp)) return $tmp;
-    if ($tmp === ";") return "";
-    if (strpos($tmp, ';') === 0) $tmp = substr($tmp, 1);
-    if (substr($tmp, -1) !== ";") $tmp = $tmp.";";
+    if (empty($tmp)) {
+        return $tmp;
+    }
+    if ($tmp === ";") {
+        return "";
+    }
+    if (strpos($tmp, ';') === 0) {
+        $tmp = substr($tmp, 1);
+    }
+    if (substr($tmp, -1) !== ";") {
+        $tmp = $tmp.";";
+    }
     return $tmp;
 }
 

install/upgrade.php

Indentation +6 added lines, -6 removed lines

@@ -423,8 +423,8 @@ 
                      <h3>Step 2</h3>
                      <fieldset><legend>DataBase Informations</legend>';
 
-                     // check if all database  info are available
-                     if (
+                        // check if all database  info are available
+                        if (
                         isset($_SESSION['server']) && !empty($_SESSION['server'])
                         && isset($_SESSION['database']) && !empty($_SESSION['database'])
                         && isset($_SESSION['user']) && !empty($_SESSION['user'])
@@ -437,15 +437,15 @@ 
                         The database information has been retreived from the settings file.<br>
                         If you need to change them, please edit file `/includes/config/settings.php` and relaunch the upgrade process.
                         </div>';
-                     } else {
+                        } else {
                         echo '
                         <div style="">
                         The database information has not been retreived from the settings file.<br>
                         You need to adapt the file `/includes/config/settings.php` and relaunch the upgrade process.
                         </div>';
-                     }
+                        }
 
-                     echo '
+                        echo '
                      <a href="'.$protocol.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/') - 8).'/install/upgrade.php">Restart upgrade process</a>
                      </fieldset>
 
@@ -475,7 +475,7 @@ 
                      </div>';
 
                     // teampass_version = 2.1.27 and no encrypt_key in db
-                     echo '
+                        echo '
                      <div id="no_encrypt_key" style="display:none;">
                      <fieldset>
                         <legend>Database Origine</legend>

install/libs/aesctr.php

Indentation +17 added lines, -17 removed lines

@@ -214,16 +214,16 @@ 
 {
 
     /**
-    * Encrypt a text using AES encryption in Counter mode of operation
-    *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-    *
-    * Unicode multi-byte character safe
-    *
-    * @param plaintext source text to be encrypted
-    * @param password  the password to use to generate a key
-    * @param nBits     number of bits to be used in the key (128, 192, or 256)
-    * @return          encrypted text
-    */
+     * Encrypt a text using AES encryption in Counter mode of operation
+     *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+     *
+     * Unicode multi-byte character safe
+     *
+     * @param plaintext source text to be encrypted
+     * @param password  the password to use to generate a key
+     * @param nBits     number of bits to be used in the key (128, 192, or 256)
+     * @return          encrypted text
+     */
     public static function encrypt($plaintext, $password, $nBits)
     {
         $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
@@ -298,13 +298,13 @@ 
     }
 
     /**
-    * Decrypt a text encrypted by AES in counter mode of operation
-    *
-    * @param ciphertext source text to be decrypted
-    * @param password   the password to use to generate a key
-    * @param nBits      number of bits to be used in the key (128, 192, or 256)
-    * @return           decrypted text
-    */
+     * Decrypt a text encrypted by AES in counter mode of operation
+     *
+     * @param ciphertext source text to be decrypted
+     * @param password   the password to use to generate a key
+     * @param nBits      number of bits to be used in the key (128, 192, or 256)
+     * @return           decrypted text
+     */
     public static function decrypt($ciphertext, $password, $nBits)
     {
         $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES