@@ -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 | } |
@@ -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 | * |
@@ -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; |
@@ -23,8 +23,8 @@ discard block |
||
| 23 | 23 | * @license http://opensource.org/licenses/MIT The MIT License (MIT) |
| 24 | 24 | * @link https://github.com/mmeyer2k/dcrypt |
| 25 | 25 | */ |
| 26 | -final class OpensslKeyGenerator |
|
| 27 | -{
|
|
| 26 | +final class OpensslKeyGenerator |
|
| 27 | +{ |
|
| 28 | 28 | private $hash; |
| 29 | 29 | private $algo; |
| 30 | 30 | private $ivr; |
@@ -38,8 +38,8 @@ discard block |
||
| 38 | 38 | * @param string $ivr |
| 39 | 39 | * @param int $cost |
| 40 | 40 | */ |
| 41 | - public function __construct(string $algo, string $pass, string $cipher, string $ivr, int $cost) |
|
| 42 | - {
|
|
| 41 | + public function __construct(string $algo, string $pass, string $cipher, string $ivr, int $cost) |
|
| 42 | + { |
|
| 43 | 43 | // Derive the key from the password and store in object |
| 44 | 44 | $this->hash = \hash_pbkdf2($algo, ($pass . $cipher), $ivr, $cost, 0, true); |
| 45 | 45 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | {
|
| 82 | 82 | $key = \hash_hkdf($this->algo, $this->hash, 0, $authinfo, $this->ivr); |
| 83 | 83 | |
| 84 | - if ($key === false) {
|
|
| 84 | + if ($key === false) { |
|
| 85 | 85 | throw new \Exception("Hash algo $this->algo is not supported");
|
| 86 | 86 | } |
| 87 | 87 | |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Dcrypt\Exceptions; |
| 4 | 4 | |
| 5 | -class InvalidChecksum extends \Exception |
|
| 6 | -{
|
|
| 5 | +class InvalidChecksum extends \Exception |
|
| 6 | +{ |
|
| 7 | 7 | |
| 8 | 8 | } |
| 9 | 9 | \ No newline at end of file |