@@ -48,8 +48,8 @@ |
||
| 48 | 48 | // We hash the 2 inputs at this point because hash_equals is still |
| 49 | 49 | // vulnerable to timing attacks when the inputs have different sizes. |
| 50 | 50 | // Inputs are also cast to string like in symfony stringutils. |
| 51 | - $known = \hash_hmac('sha256', (string)$known, $nonce, true); |
|
| 52 | - $given = \hash_hmac('sha256', (string)$given, $nonce, true); |
|
| 51 | + $known = \hash_hmac('sha256', (string) $known, $nonce, true); |
|
| 52 | + $given = \hash_hmac('sha256', (string) $given, $nonce, true); |
|
| 53 | 53 | |
| 54 | 54 | return \hash_equals($known, $given); |
| 55 | 55 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | $length = Str::strlen($input); |
| 43 | 43 | |
| 44 | 44 | foreach ($chunks as $i => &$chunk) { |
| 45 | - $chunk = $chunk ^ \hash_hmac($algo, $password . $length, (string)$i, true); |
|
| 45 | + $chunk = $chunk ^ \hash_hmac($algo, $password.$length, (string) $i, true); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | return \implode($chunks); |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require __DIR__ . '/../vendor/autoload.php'; |
|
| 3 | +require __DIR__.'/../vendor/autoload.php'; |
|
| 4 | 4 | |
| 5 | 5 | foreach (hash_algos() as $algo) { |
| 6 | 6 | foreach (openssl_get_cipher_methods() as $meth) { |
@@ -102,6 +102,6 @@ |
||
| 102 | 102 | $chk = \hash_hmac($algo, $msg, $key->authenticationKey(), true); |
| 103 | 103 | |
| 104 | 104 | // Return iv + checksum + tag + cyphertext |
| 105 | - return $ivr . $chk . $tag . $msg; |
|
| 105 | + return $ivr.$chk.$tag.$msg; |
|
| 106 | 106 | } |
| 107 | 107 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | public function __construct(string $algo, string $pass, string $cipher, string $ivr, int $cost) |
| 32 | 32 | {
|
| 33 | 33 | // |
| 34 | - $this->hash = \hash_pbkdf2($algo, ($pass . $cipher), $ivr, $cost, 0, true); |
|
| 34 | + $this->hash = \hash_pbkdf2($algo, ($pass.$cipher), $ivr, $cost, 0, true); |
|
| 35 | 35 | |
| 36 | 36 | // |
| 37 | 37 | $this->algo = $algo; |
@@ -14,8 +14,8 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | namespace Dcrypt; |
| 16 | 16 | |
| 17 | -final class OpensslKeyGenerator |
|
| 18 | -{
|
|
| 17 | +final class OpensslKeyGenerator |
|
| 18 | +{ |
|
| 19 | 19 | private $hash; |
| 20 | 20 | private $algo; |
| 21 | 21 | private $ivr; |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | * @param string $ivr |
| 29 | 29 | * @param int $cost |
| 30 | 30 | */ |
| 31 | - public function __construct(string $algo, string $pass, string $cipher, string $ivr, int $cost) |
|
| 32 | - {
|
|
| 31 | + public function __construct(string $algo, string $pass, string $cipher, string $ivr, int $cost) |
|
| 32 | + { |
|
| 33 | 33 | // |
| 34 | 34 | $this->hash = \hash_pbkdf2($algo, ($pass . $cipher), $ivr, $cost, 0, true); |
| 35 | 35 | |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require __DIR__ . '/../vendor/autoload.php'; |
|
| 3 | +require __DIR__.'/../vendor/autoload.php'; |
|
| 4 | 4 | |
| 5 | 5 | $out1 = []; |
| 6 | 6 | |
@@ -160,6 +160,6 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | $echo = json_encode($out1, JSON_PRETTY_PRINT); |
| 162 | 162 | |
| 163 | -file_put_contents(__DIR__ . '/../tests/vectors.txt', $echo); |
|
| 163 | +file_put_contents(__DIR__.'/../tests/vectors.txt', $echo); |
|
| 164 | 164 | |
| 165 | 165 | echo $echo; |
| 166 | 166 | \ No newline at end of file |
@@ -23,8 +23,8 @@ |
||
| 23 | 23 | * @license http://opensource.org/licenses/MIT The MIT License (MIT) |
| 24 | 24 | * @link https://github.com/mmeyer2k/dcrypt |
| 25 | 25 | */ |
| 26 | -class AesEcb extends AesCbc |
|
| 27 | -{
|
|
| 26 | +class AesEcb extends AesCbc |
|
| 27 | +{ |
|
| 28 | 28 | /** |
| 29 | 29 | * AES-256 cipher identifier that will be passed to openssl |
| 30 | 30 | * |