@@ -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 |