@@ -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 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | use \Dcrypt\OpensslStatic; |
| 4 | 4 | |
| 5 | -require __DIR__ . '/../vendor/autoload.php'; |
|
| 5 | +require __DIR__.'/../vendor/autoload.php'; |
|
| 6 | 6 | |
| 7 | 7 | $out = []; |
| 8 | 8 | |
@@ -14,12 +14,12 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | try {
|
| 16 | 16 | $out[$cipher] = base64_encode(OpensslStatic::encrypt('hello', 'world', $cipher, 'sha256', 10));
|
| 17 | - } catch (\Exception|\Error $e) {
|
|
| 17 | + } catch (\Exception | \Error $e) {
|
|
| 18 | 18 | |
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | -file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
| 22 | +file_put_contents(__DIR__.'/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
| 23 | 23 | |
| 24 | 24 | $out = []; |
| 25 | 25 | |
@@ -31,4 +31,4 @@ discard block |
||
| 31 | 31 | $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 10));
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | -file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
| 35 | 34 | \ No newline at end of file |
| 35 | +file_put_contents(__DIR__.'/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
| 36 | 36 | \ No newline at end of file |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | public function __construct(string $algo, string $pass, string $cipher, string $ivr, int $cost) |
| 42 | 42 | {
|
| 43 | 43 | // Derive the key from the password and store in object |
| 44 | - $this->hash = \hash_pbkdf2($algo, ($pass . $cipher), $ivr, $cost, 0, true); |
|
| 44 | + $this->hash = \hash_pbkdf2($algo, ($pass.$cipher), $ivr, $cost, 0, true); |
|
| 45 | 45 | |
| 46 | 46 | // Store algo in object |
| 47 | 47 | $this->algo = $algo; |