@@ -19,7 +19,6 @@ |
||
| 19 | 19 | use ParagonIE\ConstantTime\Hex; |
| 20 | 20 | use phpseclib\Crypt\Common\BlockCipher; |
| 21 | 21 | use phpseclib\Crypt\AES; |
| 22 | -use phpseclib\Crypt\Base; |
|
| 23 | 22 | use phpseclib\Crypt\DES; |
| 24 | 23 | use phpseclib\Crypt\TripleDES; |
| 25 | 24 | use phpseclib\Math\BigInteger; |
@@ -26,10 +26,8 @@ |
||
| 26 | 26 | |
| 27 | 27 | use ParagonIE\ConstantTime\Base64; |
| 28 | 28 | use ParagonIE\ConstantTime\Hex; |
| 29 | -use phpseclib\Crypt\AES; |
|
| 30 | 29 | use phpseclib\Crypt\DES; |
| 31 | 30 | use phpseclib\Crypt\Random; |
| 32 | -use phpseclib\Crypt\TripleDES; |
|
| 33 | 31 | use phpseclib\Math\BigInteger; |
| 34 | 32 | use phpseclib\Common\Functions\ASN1; |
| 35 | 33 | |
@@ -48,7 +48,6 @@ |
||
| 48 | 48 | |
| 49 | 49 | namespace phpseclib\Net; |
| 50 | 50 | |
| 51 | -use ParagonIE\ConstantTime\Hex; |
|
| 52 | 51 | use phpseclib\Crypt\DES; |
| 53 | 52 | use phpseclib\Crypt\Random; |
| 54 | 53 | use phpseclib\Crypt\TripleDES; |
@@ -79,7 +79,6 @@ |
||
| 79 | 79 | // phpcrypt |
| 80 | 80 | require_once $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/phpcrypt/phpCrypt.php'; |
| 81 | 81 | use PHP_Crypt\PHP_Crypt as PHP_Crypt; |
| 82 | -use PHP_Crypt\Cipher as Cipher; |
|
| 83 | 82 | |
| 84 | 83 | // prepare Encryption class calls |
| 85 | 84 | use \Defuse\Crypto\Crypto; |
@@ -25,7 +25,6 @@ |
||
| 25 | 25 | require_once $_SESSION['settings']['cpassman_dir'] . '/includes/config/settings.php'; |
| 26 | 26 | } |
| 27 | 27 | use PHP_Crypt\PHP_Crypt as PHP_Crypt; |
| 28 | -use PHP_Crypt\Cipher as Cipher; |
|
| 29 | 28 | |
| 30 | 29 | |
| 31 | 30 | // prepare Encryption class calls |
@@ -107,84 +107,84 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | switch($cipher) |
| 109 | 109 | { |
| 110 | - case self::CIPHER_3DES: |
|
| 111 | - $this->cipher = new Cipher_3DES($key); |
|
| 112 | - break; |
|
| 110 | + case self::CIPHER_3DES: |
|
| 111 | + $this->cipher = new Cipher_3DES($key); |
|
| 112 | + break; |
|
| 113 | 113 | |
| 114 | - case self::CIPHER_3WAY: |
|
| 115 | - $this->cipher = new Cipher_3WAY($key); |
|
| 116 | - break; |
|
| 114 | + case self::CIPHER_3WAY: |
|
| 115 | + $this->cipher = new Cipher_3WAY($key); |
|
| 116 | + break; |
|
| 117 | 117 | |
| 118 | - case self::CIPHER_AES_128: |
|
| 119 | - $this->cipher = new Cipher_AES_128($key); |
|
| 120 | - break; |
|
| 118 | + case self::CIPHER_AES_128: |
|
| 119 | + $this->cipher = new Cipher_AES_128($key); |
|
| 120 | + break; |
|
| 121 | 121 | |
| 122 | - case self::CIPHER_AES_192: |
|
| 123 | - $this->cipher = new Cipher_AES_192($key); |
|
| 124 | - break; |
|
| 122 | + case self::CIPHER_AES_192: |
|
| 123 | + $this->cipher = new Cipher_AES_192($key); |
|
| 124 | + break; |
|
| 125 | 125 | |
| 126 | - case self::CIPHER_AES_256: |
|
| 127 | - $this->cipher = new Cipher_AES_256($key); |
|
| 128 | - break; |
|
| 126 | + case self::CIPHER_AES_256: |
|
| 127 | + $this->cipher = new Cipher_AES_256($key); |
|
| 128 | + break; |
|
| 129 | 129 | |
| 130 | - case self::CIPHER_ARC4: // an alternative to RC4 |
|
| 131 | - $this->cipher = new Cipher_ARC4($key); |
|
| 132 | - break; |
|
| 130 | + case self::CIPHER_ARC4: // an alternative to RC4 |
|
| 131 | + $this->cipher = new Cipher_ARC4($key); |
|
| 132 | + break; |
|
| 133 | 133 | |
| 134 | - case self::CIPHER_BLOWFISH: |
|
| 135 | - $this->cipher = new Cipher_Blowfish($key); |
|
| 136 | - break; |
|
| 134 | + case self::CIPHER_BLOWFISH: |
|
| 135 | + $this->cipher = new Cipher_Blowfish($key); |
|
| 136 | + break; |
|
| 137 | 137 | |
| 138 | - case self::CIPHER_CAST_128: |
|
| 139 | - $this->cipher = new Cipher_CAST_128($key); |
|
| 140 | - break; |
|
| 138 | + case self::CIPHER_CAST_128: |
|
| 139 | + $this->cipher = new Cipher_CAST_128($key); |
|
| 140 | + break; |
|
| 141 | 141 | |
| 142 | - case self::CIPHER_CAST_256: |
|
| 143 | - $this->cipher = new Cipher_CAST_256($key); |
|
| 144 | - break; |
|
| 142 | + case self::CIPHER_CAST_256: |
|
| 143 | + $this->cipher = new Cipher_CAST_256($key); |
|
| 144 | + break; |
|
| 145 | 145 | |
| 146 | - case self::CIPHER_DES: |
|
| 147 | - $this->cipher = new Cipher_DES($key); |
|
| 148 | - break; |
|
| 146 | + case self::CIPHER_DES: |
|
| 147 | + $this->cipher = new Cipher_DES($key); |
|
| 148 | + break; |
|
| 149 | 149 | |
| 150 | - case self::CIPHER_ENIGMA: |
|
| 151 | - $this->cipher = new Cipher_Enigma($key); |
|
| 152 | - break; |
|
| 150 | + case self::CIPHER_ENIGMA: |
|
| 151 | + $this->cipher = new Cipher_Enigma($key); |
|
| 152 | + break; |
|
| 153 | 153 | |
| 154 | - case self::CIPHER_GOST: |
|
| 155 | - $this->cipher = new Cipher_GOST($key); |
|
| 156 | - break; |
|
| 154 | + case self::CIPHER_GOST: |
|
| 155 | + $this->cipher = new Cipher_GOST($key); |
|
| 156 | + break; |
|
| 157 | 157 | |
| 158 | - case self::CIPHER_RC2: |
|
| 159 | - $this->cipher = new Cipher_RC2($key); |
|
| 160 | - break; |
|
| 158 | + case self::CIPHER_RC2: |
|
| 159 | + $this->cipher = new Cipher_RC2($key); |
|
| 160 | + break; |
|
| 161 | 161 | |
| 162 | - case self::CIPHER_RIJNDAEL_128: |
|
| 163 | - $this->cipher = new Cipher_Rijndael_128($key); |
|
| 164 | - break; |
|
| 162 | + case self::CIPHER_RIJNDAEL_128: |
|
| 163 | + $this->cipher = new Cipher_Rijndael_128($key); |
|
| 164 | + break; |
|
| 165 | 165 | |
| 166 | - case self::CIPHER_RIJNDAEL_192: |
|
| 167 | - $this->cipher = new Cipher_Rijndael_192($key); |
|
| 168 | - break; |
|
| 166 | + case self::CIPHER_RIJNDAEL_192: |
|
| 167 | + $this->cipher = new Cipher_Rijndael_192($key); |
|
| 168 | + break; |
|
| 169 | 169 | |
| 170 | - case self::CIPHER_RIJNDAEL_256: |
|
| 171 | - $this->cipher = new Cipher_Rijndael_256($key); |
|
| 172 | - break; |
|
| 170 | + case self::CIPHER_RIJNDAEL_256: |
|
| 171 | + $this->cipher = new Cipher_Rijndael_256($key); |
|
| 172 | + break; |
|
| 173 | 173 | |
| 174 | - case self::CIPHER_SIMPLEXOR: |
|
| 175 | - $this->cipher = new Cipher_Simple_XOR($key); |
|
| 176 | - break; |
|
| 174 | + case self::CIPHER_SIMPLEXOR: |
|
| 175 | + $this->cipher = new Cipher_Simple_XOR($key); |
|
| 176 | + break; |
|
| 177 | 177 | |
| 178 | - case self::CIPHER_SKIPJACK: |
|
| 179 | - $this->cipher = new Cipher_Skipjack($key); |
|
| 180 | - break; |
|
| 178 | + case self::CIPHER_SKIPJACK: |
|
| 179 | + $this->cipher = new Cipher_Skipjack($key); |
|
| 180 | + break; |
|
| 181 | 181 | |
| 182 | - case self::CIPHER_VIGENERE: |
|
| 183 | - $this->cipher = new Cipher_Vigenere($key); |
|
| 184 | - break; |
|
| 182 | + case self::CIPHER_VIGENERE: |
|
| 183 | + $this->cipher = new Cipher_Vigenere($key); |
|
| 184 | + break; |
|
| 185 | 185 | |
| 186 | - default: |
|
| 187 | - trigger_error("$cipher is not a valid cipher", E_USER_WARNING); |
|
| 186 | + default: |
|
| 187 | + trigger_error("$cipher is not a valid cipher", E_USER_WARNING); |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | |
@@ -193,48 +193,48 @@ discard block |
||
| 193 | 193 | */ |
| 194 | 194 | switch($mode) |
| 195 | 195 | { |
| 196 | - case self::MODE_CBC: |
|
| 197 | - $this->mode = new Mode_CBC($this->cipher); |
|
| 198 | - break; |
|
| 196 | + case self::MODE_CBC: |
|
| 197 | + $this->mode = new Mode_CBC($this->cipher); |
|
| 198 | + break; |
|
| 199 | 199 | |
| 200 | - case self::MODE_CFB: |
|
| 201 | - $this->mode = new Mode_CFB($this->cipher); |
|
| 202 | - break; |
|
| 200 | + case self::MODE_CFB: |
|
| 201 | + $this->mode = new Mode_CFB($this->cipher); |
|
| 202 | + break; |
|
| 203 | 203 | |
| 204 | - case self::MODE_CTR: |
|
| 205 | - $this->mode = new Mode_CTR($this->cipher); |
|
| 206 | - break; |
|
| 204 | + case self::MODE_CTR: |
|
| 205 | + $this->mode = new Mode_CTR($this->cipher); |
|
| 206 | + break; |
|
| 207 | 207 | |
| 208 | - case self::MODE_ECB: |
|
| 209 | - $this->mode = new Mode_ECB($this->cipher); |
|
| 210 | - break; |
|
| 208 | + case self::MODE_ECB: |
|
| 209 | + $this->mode = new Mode_ECB($this->cipher); |
|
| 210 | + break; |
|
| 211 | 211 | |
| 212 | - case self::MODE_NCFB: |
|
| 213 | - $this->mode = new Mode_NCFB($this->cipher); |
|
| 214 | - break; |
|
| 212 | + case self::MODE_NCFB: |
|
| 213 | + $this->mode = new Mode_NCFB($this->cipher); |
|
| 214 | + break; |
|
| 215 | 215 | |
| 216 | - case self::MODE_NOFB: |
|
| 217 | - $this->mode = new Mode_NOFB($this->cipher); |
|
| 218 | - break; |
|
| 216 | + case self::MODE_NOFB: |
|
| 217 | + $this->mode = new Mode_NOFB($this->cipher); |
|
| 218 | + break; |
|
| 219 | 219 | |
| 220 | - case self::MODE_OFB: |
|
| 221 | - $this->mode = new Mode_OFB($this->cipher); |
|
| 222 | - break; |
|
| 220 | + case self::MODE_OFB: |
|
| 221 | + $this->mode = new Mode_OFB($this->cipher); |
|
| 222 | + break; |
|
| 223 | 223 | |
| 224 | - case self::MODE_PCBC: |
|
| 225 | - $this->mode = new Mode_PCBC($this->cipher); |
|
| 226 | - break; |
|
| 224 | + case self::MODE_PCBC: |
|
| 225 | + $this->mode = new Mode_PCBC($this->cipher); |
|
| 226 | + break; |
|
| 227 | 227 | |
| 228 | - case self::MODE_RAW: |
|
| 229 | - $this->mode = new Mode_RAW($this->cipher); |
|
| 230 | - break; |
|
| 228 | + case self::MODE_RAW: |
|
| 229 | + $this->mode = new Mode_RAW($this->cipher); |
|
| 230 | + break; |
|
| 231 | 231 | |
| 232 | - case self::MODE_STREAM: |
|
| 233 | - $this->mode = new Mode_Stream($this->cipher); |
|
| 234 | - break; |
|
| 232 | + case self::MODE_STREAM: |
|
| 233 | + $this->mode = new Mode_Stream($this->cipher); |
|
| 234 | + break; |
|
| 235 | 235 | |
| 236 | - default: |
|
| 237 | - trigger_error("$mode is not a valid mode", E_USER_WARNING); |
|
| 236 | + default: |
|
| 237 | + trigger_error("$mode is not a valid mode", E_USER_WARNING); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | // set the default padding |