| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Dcrypt\Exceptions; | 
| 4 | 4 | |
| 5 | -class InvalidAlgoException extends \Exception | |
| 6 | -{
 | |
| 5 | +class InvalidAlgoException extends \Exception | |
| 6 | +{ | |
| 7 | 7 | |
| 8 | 8 | } | 
| 9 | 9 | \ No newline at end of file | 
| @@ -134,7 +134,6 @@ | ||
| 134 | 134 | /** | 
| 135 | 135 | * Generate a new key that meets requirements for dcrypt | 
| 136 | 136 | * | 
| 137 | - * @param int $size Size of key in bytes | |
| 138 | 137 | * @return string | 
| 139 | 138 | * @throws Exceptions\InvalidKeyException | 
| 140 | 139 | */ | 
| @@ -26,8 +26,8 @@ discard block | ||
| 26 | 26 | * @license http://opensource.org/licenses/MIT The MIT License (MIT) | 
| 27 | 27 | * @link https://github.com/mmeyer2k/dcrypt | 
| 28 | 28 | */ | 
| 29 | -final class OpensslKeyGenerator | |
| 30 | -{
 | |
| 29 | +final class OpensslKeyGenerator | |
| 30 | +{ | |
| 31 | 31 | /** | 
| 32 | 32 | * @var string | 
| 33 | 33 | */ | 
| @@ -57,23 +57,23 @@ discard block | ||
| 57 | 57 | * @param string $ivr Initialization vactor | 
| 58 | 58 | * @param int $cost Cost value for PBKDF2 | 
| 59 | 59 | */ | 
| 60 | - public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost = 0) | |
| 61 | -    {
 | |
| 60 | + public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost = 0) | |
| 61 | +    { | |
| 62 | 62 | // When cost is 0 then we are in key mode | 
| 63 | -        if ($cost === 0) {
 | |
| 63 | +        if ($cost === 0) { | |
| 64 | 64 | // Attempt to decode the passkey | 
| 65 | 65 | $passkey = \base64_decode($passkey); | 
| 66 | 66 | |
| 67 | 67 | // Make sure key was properly decoded and meets minimum required length | 
| 68 | -            if (Str::strlen($passkey) < 256) {
 | |
| 68 | +            if (Str::strlen($passkey) < 256) { | |
| 69 | 69 |                  throw new InvalidKeyException("Key must be at least 256 bytes and base64 encoded.");
 | 
| 70 | 70 | } | 
| 71 | 71 | |
| 72 | 72 | // Store the key as what was supplied | 
| 73 | 73 | $this->key = $passkey; | 
| 74 | -        } else {
 | |
| 74 | +        } else { | |
| 75 | 75 | // Make sure that the user is not attempting to use a key in password word mode | 
| 76 | -            if (Str::strlen($passkey) >= 256) {
 | |
| 76 | +            if (Str::strlen($passkey) >= 256) { | |
| 77 | 77 |                  throw new InvalidPasswordException("Passwords must be less than 256 bytes.");
 | 
| 78 | 78 | } | 
| 79 | 79 | |
| @@ -124,7 +124,7 @@ discard block | ||
| 124 | 124 | |
| 125 | 125 | $key = \hash_hkdf($this->algo, $this->key, 0, $info, $this->ivr); | 
| 126 | 126 | |
| 127 | -        if ($key === false) {
 | |
| 127 | +        if ($key === false) { | |
| 128 | 128 |              throw new Exceptions\InvalidAlgoException("Hash algo $this->algo is not supported by hash_hkdf.");
 | 
| 129 | 129 | } | 
| 130 | 130 | |
| @@ -140,7 +140,7 @@ discard block | ||
| 140 | 140 | */ | 
| 141 | 141 | public static function newKey(int $bytes = 256): string | 
| 142 | 142 |      {
 | 
| 143 | -        if ($bytes < 256) {
 | |
| 143 | +        if ($bytes < 256) { | |
| 144 | 144 |              throw new InvalidKeyException('Key must be at least 256 bytes long.');
 | 
| 145 | 145 | } | 
| 146 | 146 | |
| @@ -103,6 +103,6 @@ | ||
| 103 | 103 | $chk = \hash_hmac($algo, $msg, $key->authenticationKey(), 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 | 
| 9 | 9 | */ | 
| 10 | 10 | |
| 11 | -require __DIR__ . '/../vendor/autoload.php'; | |
| 11 | +require __DIR__.'/../vendor/autoload.php'; | |
| 12 | 12 | |
| 13 | 13 | $key = \Dcrypt\OpensslKeyGenerator::newKey(); | 
| 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] [$m]"; | 
| 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] [$m]"; | 
| 56 | 56 |      } finally { |