nilsteampassnet / TeamPass

includes/libraries/Authentication/phpseclib/Crypt/RSA/PKCS.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use ParagonIE\ConstantTime\Hex;
 use phpseclib\Crypt\Common\BlockCipher;
 use phpseclib\Crypt\AES;
-use phpseclib\Crypt\Base;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\TripleDES;
 use phpseclib\Math\BigInteger;

includes/libraries/Authentication/phpseclib/Crypt/RSA/PKCS1.php

Unused Use Statements -2 removed lines

@@ -26,10 +26,8 @@
 
 use ParagonIE\ConstantTime\Base64;
 use ParagonIE\ConstantTime\Hex;
-use phpseclib\Crypt\AES;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\Random;
-use phpseclib\Crypt\TripleDES;
 use phpseclib\Math\BigInteger;
 use phpseclib\Common\Functions\ASN1;
 

Indentation +7 added lines, -7 removed lines

@@ -123,15 +123,15 @@
             $cipher->setIV($iv);
             $iv = strtoupper(Hex::encode($iv));
             $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                     "Proc-Type: 4,ENCRYPTED\r\n" .
-                     "DEK-Info: " . self::$defaultEncryptionAlgorithm . ",$iv\r\n" .
-                     "\r\n" .
-                     chunk_split(Base64::encode($cipher->encrypt($RSAPrivateKey)), 64) .
-                     '-----END RSA PRIVATE KEY-----';
+                        "Proc-Type: 4,ENCRYPTED\r\n" .
+                        "DEK-Info: " . self::$defaultEncryptionAlgorithm . ",$iv\r\n" .
+                        "\r\n" .
+                        chunk_split(Base64::encode($cipher->encrypt($RSAPrivateKey)), 64) .
+                        '-----END RSA PRIVATE KEY-----';
         } else {
             $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                     chunk_split(Base64::encode($RSAPrivateKey), 64) .
-                     '-----END RSA PRIVATE KEY-----';
+                        chunk_split(Base64::encode($RSAPrivateKey), 64) .
+                        '-----END RSA PRIVATE KEY-----';
         }
 
         return $RSAPrivateKey;

includes/libraries/Authentication/phpseclib/Net/SSH1.php

Unused Use Statements -1 removed lines

@@ -48,7 +48,6 @@
 
 namespace phpseclib\Net;
 
-use ParagonIE\ConstantTime\Hex;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\Random;
 use phpseclib\Crypt\TripleDES;

sources/items.queries.php

Unused Use Statements -1 removed lines

@@ -79,7 +79,6 @@
 // phpcrypt
 require_once $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/phpcrypt/phpCrypt.php';
 use PHP_Crypt\PHP_Crypt as PHP_Crypt;
-use PHP_Crypt\Cipher as Cipher;
 
 // prepare Encryption class calls
 use \Defuse\Crypto\Crypto;

Indentation +36 added lines, -36 removed lines

@@ -50,7 +50,7 @@ 
     70 => array(70, $LANG['complex_level4']),
     80 => array(80, $LANG['complex_level5']),
     90 => array(90, $LANG['complex_level6'])
-   );
+    );
 
 //Class loader
 require_once $_SESSION['settings']['cpassman_dir'].'/sources/SplClassLoader.php';
@@ -207,7 +207,7 @@ 
                         'perso' => ($dataReceived['salt_key_set'] == 1 && isset($dataReceived['salt_key_set']) && $dataReceived['is_pf'] == 1 && isset($dataReceived['is_pf'])) ? '1' : '0',
                         'anyone_can_modify' => (isset($dataReceived['anyone_can_modify']) && $dataReceived['anyone_can_modify'] == "on") ? '1' : '0',
                         'complexity_level' => $dataReceived['complexity_level']
-                       )
+                        )
                 );
                 $newID = DB::insertId();
                 $pw = $passwd['string'];
@@ -259,7 +259,7 @@ 
                             'del_enabled' => 1, // 0=deactivated;1=activated
                             'del_type' => $date_stamp != false ? 2 : 1, // 1=counter;2=date
                             'del_value' => $date_stamp != false ? $date_stamp : $dataReceived['to_be_deleted']
-                           )
+                            )
                     );
                 }
 
@@ -271,7 +271,7 @@ 
                             array(
                                 'role_id' => $role,
                                 'item_id' => $newID
-                               )
+                                )
                         );
                     }
                 }
@@ -286,7 +286,7 @@ 
                             array(
                                 'item_id' => $newID,
                                 'tag' => strtolower($tag)
-                               )
+                                )
                         );
                     }
                 }
@@ -302,7 +302,7 @@ 
                             prefix_table('files'),
                             array(
                                 'id_item' => $newID
-                               ),
+                                ),
                             "id=%i", $record['id']
                         );
                     }
@@ -390,7 +390,7 @@ 
                     "new_entry" => $html,
                     "array_items" => $itemsIDList,
                     "show_clipboard_small_icons" => (isset($_SESSION['settings']['copy_to_clipboard_small_icons']) && $_SESSION['settings']['copy_to_clipboard_small_icons'] == 1) ? 1 : 0
-                   );
+                    );
             } elseif (isset($_SESSION['settings']['duplicate_item']) && $_SESSION['settings']['duplicate_item'] == 0 && $itemExists == 1) {
                 $returnValues = array("error" => "item_exists");
             }
@@ -475,7 +475,7 @@ 
                     )
                     ||
                     (@in_array($_POST['id'], $_SESSION['list_folders_limited'][$_POST['folder_id']]))
-                 ) {
+                    ) {
 
                     // is pwd empty?
                     if (empty($pw) && isset($_SESSION['user_settings']['create_item_without_password']) && $_SESSION['user_settings']['create_item_without_password'] !== "1") {
@@ -563,7 +563,7 @@ 
                             'restricted_to' => $dataReceived['restricted_to'],
                             'anyone_can_modify' => (isset($dataReceived['anyone_can_modify']) && $dataReceived['anyone_can_modify'] == "on") ? '1' : '0',
                             'complexity_level' => $dataReceived['complexity_level']
-                           ),
+                            ),
                         "id=%i",
                         $dataReceived['id']
                     );
@@ -688,7 +688,7 @@ 
                                         'del_enabled' => 1,
                                         'del_type' => is_numeric($dataReceived['to_be_deleted']) ? 1 : 2,
                                         'del_value' => is_numeric($dataReceived['to_be_deleted']) ? $dataReceived['to_be_deleted'] : dateToStamp($dataReceived['to_be_deleted'])
-                                       )
+                                        )
                                 );
                                 // update LOG
                                 logItems($dataReceived['id'], $label, $_SESSION['user_id'], 'at_modification', $_SESSION['login'], 'at_automatic_del : '.$dataReceived['to_be_deleted']);
@@ -702,7 +702,7 @@ 
                                     array(
                                         'del_type' => is_numeric($dataReceived['to_be_deleted']) ? 1 : 2,
                                         'del_value' => is_numeric($dataReceived['to_be_deleted']) ? $dataReceived['to_be_deleted'] : dateToStamp($dataReceived['to_be_deleted'])
-                                       ),
+                                        ),
                                     "item_id = %i",
                                     $dataReceived['id']
                                 );
@@ -772,7 +772,7 @@ 
                                 array(
                                     'role_id' => $role,
                                     'item_id' => $dataReceived['id']
-                                   )
+                                    )
                             );
                             $dataTmp = DB::queryfirstrow("SELECT title FROM ".prefix_table("roles_title")." WHERE id= ".$role);
                             if (empty($listOfRestricted)) {
@@ -954,7 +954,7 @@ 
                                     ),
                                 'receivers' => $mailing,
                                 'status' => ''
-                               )
+                                )
                         );
                     }
 
@@ -970,7 +970,7 @@ 
                         "list_of_restricted" => $listOfRestricted,
                         "tags" => $return_tags,
                         "error" => ""
-                       );
+                        );
                 } else {
                     echo prepareExchangedData(array("error" => "ERR_NOT_ALLOWED_TO_EDIT"), "encode");
                     break;
@@ -1157,7 +1157,7 @@ 
                             'extension' => $record['extension'],
                             'type' => $record['type'],
                             'file' => $record['file']
-                           )
+                            )
                     );
                 }
 
@@ -1169,7 +1169,7 @@ 
                         array(
                             'item_id' => $newID,
                             'role_id' => $record['role_id']
-                           )
+                            )
                     );
                 }
 
@@ -1181,7 +1181,7 @@ 
                         array(
                             'item_id' => $newID,
                             'tag' => $record['tag']
-                           )
+                            )
                     );
                 }
 
@@ -1548,14 +1548,14 @@ 
                                 $pre."automatic_del",
                                 array(
                                     'del_value' => $dataDelete['del_value'] - 1
-                                   ),
+                                    ),
                                 "item_id = %i",
                                 $_POST['id']
                             );
                             // store value
                             $arrData['to_be_deleted'] = $dataDelete['del_value'] - 1;
                         } elseif ($dataDelete['del_type'] == 1 && $dataDelete['del_value'] <= 1 || $dataDelete['del_type'] == 2 && $dataDelete['del_value'] < time()
-                               )
+                                )
                         {
                             $arrData['show_details'] = 0;
                             // delete item
@@ -1565,7 +1565,7 @@ 
                                 prefix_table("items"),
                                 array(
                                     'inactif' => '1',
-                                   ),
+                                    ),
                                 "id = %i",
                                 $_POST['id']
                             );
@@ -1595,7 +1595,7 @@ 
                                 'body' => str_replace(array('#tp_item_author#', '#tp_user#', '#tp_item#'), array(" ".addslashes($arrData['author']), addslashes($_SESSION['login']), addslashes($dataItem['label'])), $LANG['email_on_open_notification_mail']),
                                 'receivers' => $listNotificationEmails,
                                 'status' => ''
-                               )
+                                )
                         );
                     //}
                 } else {
@@ -1744,7 +1744,7 @@ 
                     prefix_table("users"),
                     array(
                         'latest_items' => implode(';', $_SESSION['latest_items'])
-                       ),
+                        ),
                     "id=".$_SESSION['user_id']
                 );
             }
@@ -1788,7 +1788,7 @@ 
                 prefix_table("items"),
                 array(
                     'inactif' => '1',
-                   ),
+                    ),
                 "id = %i",
                 $_POST['id']
             );
@@ -1869,7 +1869,7 @@ 
                     prefix_table("nested_tree"),
                     array(
                         'title' => $title
-                       ),
+                        ),
                     'id=%s',
                     $dataReceived['folder']
                 );
@@ -1878,7 +1878,7 @@ 
                     prefix_table("misc"),
                     array(
                         'valeur' => $dataReceived['complexity']
-                       ),
+                        ),
                     'intitule = %s AND type = %s',
                     $dataReceived['folder'],
                     "complex"
@@ -1949,7 +1949,7 @@ 
                     prefix_table("nested_tree"),
                     array(
                         'parent_id' => $dataReceived['target_folder_id']
-                       ),
+                        ),
                     'id=%s',
                     $dataReceived['source_folder_id']
                 );
@@ -1970,7 +1970,7 @@ 
                 prefix_table("nested_tree"),
                 array(
                     'parent_id' => $_POST['destination']
-                   ),
+                    ),
                 'id = %i',
                 $_POST['source']
             );
@@ -2586,7 +2586,7 @@ 
                         $_SESSION['is_admin'] == 1
                         || ($_SESSION['user_manager'] == 1)
                         || (
-                           isset($_SESSION['settings']['enable_user_can_create_folders'])
+                            isset($_SESSION['settings']['enable_user_can_create_folders'])
                            && $_SESSION['settings']['enable_user_can_create_folders'] == 1
                         )
                         || (
@@ -2762,7 +2762,7 @@ 
                     prefix_table("users"),
                     array(
                         'favourites' => implode(';', $_SESSION['favourites'])
-                       ),
+                        ),
                     'id = %i',
                     $_SESSION['user_id']
                 );
@@ -2771,7 +2771,7 @@ 
                 $_SESSION['favourites_tab'][$_POST['id']] = array(
                     'label' => $data['label'],
                     'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$_POST['id']
-                   );
+                    );
             } elseif ($_POST['action'] == 0) {
                 // delete from session
                 foreach ($_SESSION['favourites'] as $key => $value) {
@@ -2832,7 +2832,7 @@ 
                     prefix_table("items"),
                     array(
                         'id_tree' => $_POST['folder_id']
-                       ),
+                        ),
                     "id=%i",
                     $_POST['item_id']
                 );
@@ -2939,7 +2939,7 @@ 
                             prefix_table("items"),
                             array(
                                 'id_tree' => $_POST['folder_id']
-                               ),
+                                ),
                             "id=%i",
                             $item_id
                         );
@@ -3051,7 +3051,7 @@ 
                         prefix_table("items"),
                         array(
                             'inactif' => '1',
-                           ),
+                            ),
                         "id = %i",
                         $item_id
                     );
@@ -3132,7 +3132,7 @@ 
                             prefix_table("items"),
                             array(
                                 'notification' => empty($data['notification']) ? $_POST['user_id'].";" : $data['notification'].$_POST['user_id']
-                               ),
+                                ),
                             "id=%i",
                             $_POST['item_id']
                         );
@@ -3145,7 +3145,7 @@ 
                             prefix_table("items"),
                             array(
                                 'notification' => empty($data['notification']) ? $_POST['user_id'] : $data['notification'].";".$_POST['user_id']
-                               ),
+                                ),
                             "id=%i",
                             $_POST['item_id']
                         );
@@ -3280,7 +3280,7 @@ 
                     'timestamp' => time(),
                     'originator' => intval($_SESSION['user_id']),
                     'code' => $otv_code
-                   )
+                    )
             );
             $newID = DB::insertId();
 

sources/main.functions.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
     require_once $_SESSION['settings']['cpassman_dir'] . '/includes/config/settings.php';
 }
 use PHP_Crypt\PHP_Crypt as PHP_Crypt;
-use PHP_Crypt\Cipher as Cipher;
 
 
 // prepare Encryption class calls

Indentation +9 added lines, -9 removed lines

@@ -159,9 +159,9 @@ 
     }
 
     if (!empty($personalSalt)) {
-         $staticSalt = $personalSalt;
+            $staticSalt = $personalSalt;
     } else {
-         $staticSalt = SALT;
+            $staticSalt = SALT;
     }
 
     //set our salt to a variable
@@ -898,7 +898,7 @@ 
                     'author' => $record['id_user'],
                     'renewal_period' => isset($resNT['renewal_period']) ? $resNT['renewal_period'] : "0",
                     'timestamp' => $record['date']
-                   )
+                    )
             );
         }
         // UPDATE an item
@@ -943,7 +943,7 @@ 
                 'login' => isset($data['login']) ? $data['login'] : "",
                 'folder' => $folder,
                 'author' => $_SESSION['user_id'],
-               ),
+                ),
             "id = %i",
             $id
         );
@@ -996,7 +996,7 @@ 
                 'folder' => $folder,
                 'author' => $_SESSION['user_id'],
                 'timestamp' => $data['date']
-               )
+                )
         );
         // DELETE an item
     } elseif ($action === "delete_value") {
@@ -1008,7 +1008,7 @@ 
 *
 */
 function getStatisticsData() {
-     DB::query(
+        DB::query(
         "SELECT id FROM ".prefix_table("nested_tree")." WHERE personal_folder = %i",
         0
     );
@@ -1582,7 +1582,7 @@ 
 
     $cf_diff = array_diff($source_cf, $target_cf);
     if (count($cf_diff) > 0) {
-       return false;
+        return false;
     }
 
     return true;
@@ -1645,7 +1645,7 @@ 
                 prefix_table('files'),
                 array(
                     'status' => 'encrypted'
-                   ),
+                    ),
                 "id=%i",
                 substr($_POST['uri'], 1)
             );
@@ -1688,7 +1688,7 @@ 
                 prefix_table('files'),
                 array(
                     'status' => 'clear'
-                   ),
+                    ),
                 "id=%i",
                 substr($_POST['uri'], 1)
             );

profile.php

Indentation +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 
 // if DUOSecurity enabled then changing PWD is not allowed
 if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0)
-   echo '
+    echo '
     <div id="div_change_password" style="display:none; padding:5px;" class="ui-widget ui-state-default">
         <div style="text-align:center;margin:5px;padding:3px;" id="change_pwd_complexPw" class="ui-widget ui-state-active ui-corner-all"></div>
         <label for="new_pw" class="form_label">'.$LANG['index_new_pw'].' :</label>

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'"
                         ));

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),

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;
-  }
+    }
 
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */