mmeyer2k / dcrypt

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);

 

examples/vectors.php

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/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);
         }
 

src/OpensslStatic.php

Spacing +1 added lines, -1 removed lines

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

examples/support.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * Displays supported
  */
 
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 $key = \Dcrypt\OpensslKeyGenerator::newKey();
 
@@ -27,7 +27,7 @@ 
         $d = \Dcrypt\OpensslStatic::decrypt($e, $key, $meth, 'sha256');
 
         echo " [pass] ";
-    } catch (\Exception|\Error $e) {
+    } catch (\Exception | \Error $e) {
         $m = $e->getMessage();
         echo " [fail] [$m]";
     } finally {
@@ -50,7 +50,7 @@ 
         $d = \Dcrypt\OpensslStatic::decrypt($e, $key, 'aes-256-gcm', $algo);
 
         echo " [pass] ";
-    } catch (\Exception|\Error $e) {
+    } catch (\Exception | \Error $e) {
         $m = $e->getMessage();
         echo " [fail] [$m]";
     } finally {