@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | */ |
81 | 81 | public function authenticationKey(string $info): string |
82 | 82 | { |
83 | - return $this->deriveKey(__FUNCTION__ . '|' . $info); |
|
83 | + return $this->deriveKey(__FUNCTION__.'|'.$info); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function encryptionKey(string $info): string |
93 | 93 | { |
94 | - return $this->deriveKey(__FUNCTION__ . '|' . $info); |
|
94 | + return $this->deriveKey(__FUNCTION__.'|'.$info); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -103,6 +103,6 @@ |
||
103 | 103 | $chk = \hash_hmac($algo, $msg, $key->authenticationKey($cipher), true); |
104 | 104 | |
105 | 105 | // Return iv + checksum + tag + ciphertext |
106 | - return $ivr . $chk . $tag . $msg; |
|
106 | + return $ivr.$chk.$tag.$msg; |
|
107 | 107 | } |
108 | 108 | } |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * Displays supported ciphers and algos |
9 | 9 | */ |
10 | 10 | |
11 | -require __DIR__ . '/../vendor/autoload.php'; |
|
11 | +require __DIR__.'/../vendor/autoload.php'; |
|
12 | 12 | |
13 | 13 | $key = \Dcrypt\OpensslKey::create(); |
14 | 14 | |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $d = \Dcrypt\OpensslStatic::decrypt($e, $key, $meth, 'sha256'); |
28 | 28 | |
29 | 29 | echo " [pass] "; |
30 | - } catch (\Exception|\Error $e) { |
|
30 | + } catch (\Exception | \Error $e) { |
|
31 | 31 | $m = $e->getMessage(); |
32 | 32 | echo " [fail] [!!!]"; |
33 | 33 | } finally { |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $d = \Dcrypt\OpensslStatic::decrypt($e, $key, 'aes-256-gcm', $algo); |
51 | 51 | |
52 | 52 | echo " [pass] "; |
53 | - } catch (\Exception|\Error $e) { |
|
53 | + } catch (\Exception | \Error $e) { |
|
54 | 54 | $m = $e->getMessage(); |
55 | 55 | echo " [fail] [!!!]"; |
56 | 56 | } finally { |
@@ -6,11 +6,11 @@ discard block |
||
6 | 6 | |
7 | 7 | use \Dcrypt\OpensslStatic; |
8 | 8 | |
9 | -require __DIR__ . '/../vendor/autoload.php'; |
|
9 | +require __DIR__.'/../vendor/autoload.php'; |
|
10 | 10 | |
11 | 11 | $key = \Dcrypt\OpensslKey::create(); |
12 | 12 | |
13 | -file_put_contents(__DIR__ . '/../tests/vectors/.testkey', $key); |
|
13 | +file_put_contents(__DIR__.'/../tests/vectors/.testkey', $key); |
|
14 | 14 | |
15 | 15 | $out = [ |
16 | 16 | 'key' => $key, |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | try { |
29 | 29 | $out['ciphers'][$cipher] = base64_encode(OpensslStatic::encrypt('a secret', $key, $cipher, 'sha3-256')); |
30 | - } catch (\Exception|\Error $e) { |
|
30 | + } catch (\Exception | \Error $e) { |
|
31 | 31 | |
32 | 32 | } |
33 | 33 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $out['algos'][$algo] = base64_encode(OpensslStatic::encrypt('a secret', $key, 'aes-256-gcm', $algo)); |
41 | 41 | } |
42 | 42 | |
43 | -foreach(['Gcm', 'Ctr', 'Ofb', 'Cbc', 'Ecb'] as $mode){ |
|
43 | +foreach (['Gcm', 'Ctr', 'Ofb', 'Cbc', 'Ecb'] as $mode) { |
|
44 | 44 | $c = "\\Dcrypt\\Aes256$mode"; |
45 | 45 | $out['aes256'][$c] = base64_encode($c::encrypt('a secret', $key)); |
46 | 46 | } |
@@ -51,4 +51,4 @@ discard block |
||
51 | 51 | $out['otp'][$mult] = \base64_encode(\Dcrypt\OneTimePad::crypt(str_repeat('A', $mult), $key)); |
52 | 52 | } |
53 | 53 | |
54 | -file_put_contents(__DIR__ . '/../tests/.vectors.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
55 | 54 | \ No newline at end of file |
55 | +file_put_contents(__DIR__.'/../tests/.vectors.json', \json_encode($out, JSON_PRETTY_PRINT)); |
|
56 | 56 | \ No newline at end of file |
@@ -44,7 +44,7 @@ |
||
44 | 44 | |
45 | 45 | foreach ($chunks as $i => &$chunk) { |
46 | 46 | // Create the info key based on counter |
47 | - $info = $length . $i; |
|
47 | + $info = $length.$i; |
|
48 | 48 | |
49 | 49 | // Xor the derived key with the data chunk |
50 | 50 | $chunk = $chunk ^ $key->deriveKey($info); |