@@ -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; |
@@ -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 | $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 |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | |
9 | 9 | foreach (\Dcrypt\OpensslSupported::ciphers() as $cipher) { |
10 | 10 | $cipher = strtolower($cipher); |
11 | - if (isset($out[$cipher])) { |
|
11 | + if (isset($out[$cipher])) { |
|
12 | 12 | continue; |
13 | 13 | } |
14 | 14 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | foreach (\Dcrypt\OpensslSupported::algos() as $algo) { |
27 | 27 | $cipher = strtolower($algo); |
28 | - if (isset($out[$algo])) { |
|
28 | + if (isset($out[$algo])) { |
|
29 | 29 | continue; |
30 | 30 | } |
31 | 31 | $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 10)); |
@@ -7,8 +7,8 @@ |
||
7 | 7 | * |
8 | 8 | * This is useful for medium security situations where minimal space consumption is important. |
9 | 9 | */ |
10 | -class TinyFish extends \Dcrypt\OpensslBridge |
|
11 | -{ |
|
10 | +class TinyFish extends \Dcrypt\OpensslBridge |
|
11 | +{ |
|
12 | 12 | /** |
13 | 13 | * Specify using blowfish ofb cipher method |
14 | 14 | * |