@@ -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 | * |
@@ -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 | $abcd = OpensslStatic::encrypt('hello', 'world', 'aes-256-cbc', 'sha256', 10); |
8 | 8 | $efgh = OpensslStatic::decrypt($abcd, 'world', 'aes-256-cbc', 'sha256', 10); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $out[$cipher] = base64_encode(OpensslStatic::encrypt('hello', 'world', $cipher, 'sha256', 10)); |
18 | 18 | } |
19 | 19 | |
20 | -file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
20 | +file_put_contents(__DIR__.'/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
21 | 21 | |
22 | 22 | $out = []; |
23 | 23 | |
@@ -29,4 +29,4 @@ discard block |
||
29 | 29 | $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 10)); |
30 | 30 | } |
31 | 31 | |
32 | -file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
33 | 32 | \ No newline at end of file |
33 | +file_put_contents(__DIR__.'/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
34 | 34 | \ No newline at end of file |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | foreach (\Dcrypt\OpensslSupported::ciphers() as $cipher) { |
13 | 13 | $cipher = strtolower($cipher); |
14 | - if (isset($out[$cipher])) { |
|
14 | + if (isset($out[$cipher])) { |
|
15 | 15 | continue; |
16 | 16 | } |
17 | 17 | $out[$cipher] = base64_encode(OpensslStatic::encrypt('hello', 'world', $cipher, 'sha256', 10)); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | |
24 | 24 | foreach (\Dcrypt\OpensslSupported::algos() as $algo) { |
25 | 25 | $cipher = strtolower($algo); |
26 | - if (isset($out[$algo])) { |
|
26 | + if (isset($out[$algo])) { |
|
27 | 27 | continue; |
28 | 28 | } |
29 | 29 | $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 10)); |