mmeyer2k / dcrypt

src/OpensslStatic.php

Spacing +1 added lines, -1 removed lines

@@ -102,6 +102,6 @@
         $chk = \hash_hmac($algo, $msg, $key->authenticationKey(), true);
 
         // Return iv + checksum + tag + cyphertext
-        return $ivr . $chk . $tag . $msg;
+        return $ivr.$chk.$tag.$msg;
     }
 }

src/Aes256Ecb.php

Braces +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)

  * @link     https://github.com/mmeyer2k/dcrypt

  */

-class Aes256Ecb extends Aes256Gcm

-{

+class Aes256Ecb extends Aes256Gcm
+{
     /**

      * AES-256 cipher identifier that will be passed to openssl

      *

examples/TinyFish.php

Braces +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
  *

  * This is useful for medium security situations where minimal space consumption is important.

  */

-class TinyFish extends \Dcrypt\OpensslBridge

-{

+class TinyFish extends \Dcrypt\OpensslBridge
+{
     /**

      * Specify using blowfish ofb cipher method

      *

src/Exceptions/InvalidKeyException.php

Braces +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 

 namespace Dcrypt\Exceptions;

 

-class InvalidKeyException extends \Exception

-{

+class InvalidKeyException extends \Exception
+{
 

 }
\ No newline at end of file

src/Exceptions/InvalidChecksumException.php

Braces +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 

 namespace Dcrypt\Exceptions;

 

-class InvalidChecksumException extends \Exception

-{

+class InvalidChecksumException extends \Exception
+{
 

 }
\ No newline at end of file

examples/vectors.php

Braces +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 

 foreach (\Dcrypt\OpensslSupported::ciphers() as $cipher) {

     $cipher = strtolower($cipher);

-    if (isset($out[$cipher])) {

+    if (isset($out[$cipher])) {
         continue;

     }

 

@@ -29,7 +29,7 @@ 
 

 foreach (\Dcrypt\OpensslSupported::algos() as $algo) {

     $cipher = strtolower($algo);

-    if (isset($out[$algo])) {

+    if (isset($out[$algo])) {
         continue;

     }

     $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 1000));

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
 

 use \Dcrypt\OpensslStatic;

 

-require __DIR__ . '/../vendor/autoload.php';

+require __DIR__.'/../vendor/autoload.php';

 

 $out = [];

 

@@ -18,12 +18,12 @@ 
 

     try {

         $out[$cipher] = base64_encode(OpensslStatic::encrypt('hello', 'world', $cipher, 'sha256', 1000));

-    } catch (\Exception|\Error $e) {

+    } catch (\Exception | \Error $e) {

 

     }

 }

 

-file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT));

+file_put_contents(__DIR__.'/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT));

 

 $out = [];

 

@@ -35,7 +35,7 @@ 
     $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 1000));

 }

 

-file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT));

+file_put_contents(__DIR__.'/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT));

 

 $out = [];

 

@@ -45,4 +45,4 @@ 
     $out[$mult] = \base64_encode(\Dcrypt\Otp::crypt(str_repeat('A', $mult), 'password', 1000));

 }

 

-file_put_contents(__DIR__ . '/../tests/vectors/otp.json', \json_encode($out, JSON_PRETTY_PRINT));
\ No newline at end of file
+file_put_contents(__DIR__.'/../tests/vectors/otp.json', \json_encode($out, JSON_PRETTY_PRINT));
\ No newline at end of file

src/OpensslKeyGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
      */

     public function deriveKey(string $info): string

     {

-        $info = $info . '|' . $this->cipher;

+        $info = $info.'|'.$this->cipher;

 

         $key = \hash_hkdf($this->algo, $this->key, 0, $info, $this->ivr);

 

Braces +11 added lines, -11 removed lines

@@ -26,8 +26,8 @@ 
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)

  * @link     https://github.com/mmeyer2k/dcrypt

  */

-final class OpensslKeyGenerator

-{

+final class OpensslKeyGenerator
+{
     /**

      * @var string

      */

@@ -57,23 +57,23 @@ 
      * @param string $ivr

      * @param int $cost

      */

-    public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost)

-    {

+    public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost)
+    {
         // When cost is 0 then we are in key mode

-        if ($cost === 0) {

+        if ($cost === 0) {
             // Attempt to decode the passkey

             $passkey = \base64_decode($passkey);

 

             // Make sure key was properly decoded and meets minimum required length

-            if (Str::strlen($passkey) < 256) {

+            if (Str::strlen($passkey) < 256) {
                 throw new InvalidKeyException("Key must be at least 2048 bits long and base64 encoded.");

             }

 

             // Store the key as what was supplied

             $this->key = $passkey;

-        } else {

+        } else {
             // Make sure that the user is not attempting to use a key in password word mode

-            if (Str::strlen($passkey) >= 256) {

+            if (Str::strlen($passkey) >= 256) {
                 throw new InvalidPasswordException("Passwords must be less than 2048 bits (256 bytes) long.");

             }

 

@@ -124,7 +124,7 @@ 
 

         $key = \hash_hkdf($this->algo, $this->key, 0, $info, $this->ivr);

 

-        if ($key === false) {

+        if ($key === false) {
             throw new Exceptions\InvalidAlgoException("Hash algo $this->algo is not supported by hash_hkdf.");

         }

 

@@ -140,11 +140,11 @@ 
      */

     public static function newKey(int $size = 2048): string

     {

-        if ($size < 2048) {

+        if ($size < 2048) {
             throw new InvalidKeyException('Key must be at least 2048 bits long.');

         }

 

-        if ($size % 8 !== 0) {

+        if ($size % 8 !== 0) {
             throw new InvalidKeyException('Key must be divisible by 8.');

         }

 

src/Otp.php

Spacing +2 added lines, -2 removed lines

@@ -41,10 +41,10 @@
 
         $length = Str::strlen($input);
 
-        $key = new OpensslKeyGenerator($algo, $passkey, '', (string)$length, $cost);
+        $key = new OpensslKeyGenerator($algo, $passkey, '', (string) $length, $cost);
 
         foreach ($chunks as $i => &$chunk) {
-            $info = $length . $i . $cost;
+            $info = $length.$i.$cost;
             $chunk = $chunk ^ $key->deriveKey($info);
         }
 

examples/Aes256Base64.php

Braces +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 

 namespace Dcrypt\Examples;

 

-class Aes256Base64 extends \Dcrypt\OpensslBridge

-{

+class Aes256Base64 extends \Dcrypt\OpensslBridge
+{
     const CIPHER = 'aes-256-gcm';

 

     const ALGO = 'sha256';