@@ -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; |
@@ -29,8 +29,8 @@ discard block |
||
| 29 | 29 | * @param string $ivr |
| 30 | 30 | * @param int $cost |
| 31 | 31 | */ |
| 32 | - public function __construct(string $algo, string $pass, string $cipher, string $ivr, int $cost) |
|
| 33 | - {
|
|
| 32 | + public function __construct(string $algo, string $pass, string $cipher, string $ivr, int $cost) |
|
| 33 | + { |
|
| 34 | 34 | // |
| 35 | 35 | $this->hash = \hash_pbkdf2($algo, ($pass . $cipher), $ivr, $cost, 0, true); |
| 36 | 36 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | {
|
| 62 | 62 | $key = \hash_hkdf($this->algo, $this->hash, 0, $authinfo, $this->ivr); |
| 63 | 63 | |
| 64 | - if ($key === false) {
|
|
| 64 | + if ($key === false) { |
|
| 65 | 65 | throw new \Exception("Hash algo $this->algo is not supported");
|
| 66 | 66 | } |
| 67 | 67 | |
@@ -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 Aes256Ecb extends Aes256Gcm |
|
| 27 | -{
|
|
| 26 | +class Aes256Ecb extends Aes256Gcm |
|
| 27 | +{ |
|
| 28 | 28 | /** |
| 29 | 29 | * AES-256 cipher identifier that will be passed to openssl |
| 30 | 30 | * |
@@ -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 | $out = []; |
| 6 | 6 | |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | $out[strtolower($cipher)] = base64_encode(\Dcrypt\OpensslStatic::encrypt('hello', 'world', $cipher, 'sha256', 1));
|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | -file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
| 11 | +file_put_contents(__DIR__.'/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
| 12 | 12 | |
| 13 | 13 | $out = []; |
| 14 | 14 | |
@@ -16,4 +16,4 @@ discard block |
||
| 16 | 16 | $out[strtolower($algo)] = base64_encode(\Dcrypt\OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 1));
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | -file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
| 20 | 19 | \ No newline at end of file |
| 20 | +file_put_contents(__DIR__.'/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
| 21 | 21 | \ No newline at end of file |