mmeyer2k / dcrypt

src/OpensslKey.php

Doc Comments -1 removed lines

@@ -110,7 +110,6 @@
     /**

      * Generate a new key that meets requirements for dcrypt

      *

-     * @param int $size Size of key in bytes

      * @return string

      * @throws InvalidKeyException

      */

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
      */

     public function authenticationKey(string $info): string

     {

-        return $this->deriveKey(__FUNCTION__ . '|' . $info);

+        return $this->deriveKey(__FUNCTION__.'|'.$info);

     }

 

     /**

@@ -91,7 +91,7 @@ 
      */

     public function encryptionKey(string $info): string

     {

-        return $this->deriveKey(__FUNCTION__ . '|' . $info);

+        return $this->deriveKey(__FUNCTION__.'|'.$info);

     }

 

     /**

Braces +7 added lines, -7 removed lines

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

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

  */

-final class OpensslKey

-{

+final class OpensslKey
+{
     /**

      * @var string

      */

@@ -50,18 +50,18 @@ 
      * @param string $ivr  Initialization vactor

      * @throws InvalidKeyException

      */

-    public function __construct(string $algo, string $key, string $ivr)

-    {

+    public function __construct(string $algo, string $key, string $ivr)
+    {
         // Store the key as what was supplied

         $this->key = \base64_decode($key);

 

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

-        if (!is_string($this->key) || Str::strlen($this->key) < 2048) {

+        if (!is_string($this->key) || Str::strlen($this->key) < 2048) {
             throw new InvalidKeyException("Key must be at least 256 bytes and base64 encoded.");

         }

 

         // Make sure key meets minimum entropy requirement

-        if (\count(\array_unique(\str_split($this->key))) < 250) {

+        if (\count(\array_unique(\str_split($this->key))) < 250) {
             throw new InvalidKeyException("Key does not contain the minimum amount of entropy.");

         }

 

@@ -116,7 +116,7 @@ 
      */

     public static function create(int $bytes = 2048): string

     {

-        if ($bytes < 2048) {

+        if ($bytes < 2048) {
             throw new InvalidKeyException('Keys must be at least 2048 bytes long.');

         }

 

src/OpensslStatic.php

Spacing +1 added lines, -1 removed lines

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

src/OneTimePad.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $key = new OpensslKey($algo, $key, '');
 
         foreach ($chunks as $i => &$chunk) {
-            $info = $length . $i;
+            $info = $length.$i;
             $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\Aes256Gcm

-{

+class Aes256Base64 extends \Dcrypt\Aes256Gcm
+{
     public static function decrypt(string $data, string $key): string

     {

         return parent::decrypt(\base64_decode($data), $key);

examples/support.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * Displays supported ciphers and algos
  */
 
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 $key = \Dcrypt\OpensslKey::create();
 
@@ -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] [!!!]";
     } 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] [!!!]";
     } finally {

examples/vectors.php

Spacing +5 added lines, -5 removed lines

@@ -6,11 +6,11 @@ 
 

 use \Dcrypt\OpensslStatic;

 

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

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

 

 $key = \Dcrypt\OpensslKey::create();

 

-file_put_contents(__DIR__ . '/../tests/vectors/.testkey', $key);

+file_put_contents(__DIR__.'/../tests/vectors/.testkey', $key);

 

 $out = [

     'key' => $key,

@@ -27,7 +27,7 @@ 
 

     try {

         $out['ciphers'][$cipher] = base64_encode(OpensslStatic::encrypt('a secret', $key, $cipher, 'sha3-256'));

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

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

 

     }

 }

@@ -40,7 +40,7 @@ 
     $out['algos'][$algo] = base64_encode(OpensslStatic::encrypt('a secret', $key, 'aes-256-gcm', $algo));

 }

 

-foreach(['Gcm', 'Ctr', 'Ofb', 'Cbc', 'Ecb'] as $mode){

+foreach (['Gcm', 'Ctr', 'Ofb', 'Cbc', 'Ecb'] as $mode) {

     $c = "\\Dcrypt\\Aes256$mode";

     $out['aes256'][$c] = base64_encode($c::encrypt('a secret', $key));

 }

@@ -51,4 +51,4 @@ 
     $out['otp'][$mult] = \base64_encode(\Dcrypt\OneTimePad::crypt(str_repeat('A', $mult), $key));

 }

 

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