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

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      * Decrypt raw data string
      *
      * @param string $data
-     * @param string $pass
+     * @param string $passkey
      * @param string $cipher
      * @param string $algo
      * @return string

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/vectors.php

Spacing +4 added lines, -4 removed lines

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

 use \Dcrypt\OpensslStatic;

 

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

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

 

 $out = [];

 

@@ -14,12 +14,12 @@ 
 

     try {

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

-    } 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 = [];

 

@@ -31,4 +31,4 @@ 
     $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 10));

 }

 

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

Braces +2 added lines, -2 removed lines

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

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

     $cipher = strtolower($cipher);

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

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

     }

 

@@ -25,7 +25,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, 10));

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/InvalidChecksum.php

Braces +2 added lines, -2 removed lines

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

 namespace Dcrypt\Exceptions;

 

-class InvalidChecksum extends \Exception

-{

+class InvalidChecksum extends \Exception
+{
 

 }
\ No newline at end of file

src/OpensslKeyGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
             $this->key = $passkey;

         } else {

             // Derive the key from the password and store in object

-            $this->key = \hash_pbkdf2($algo, ($passkey . $cipher), $ivr, $cost, 0, true);

+            $this->key = \hash_pbkdf2($algo, ($passkey.$cipher), $ivr, $cost, 0, true);

         }

 

         // Store algo in object

Braces +7 added lines, -7 removed lines

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

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

  */

-final class OpensslKeyGenerator

-{

+final class OpensslKeyGenerator
+{
     private $key;

     private $algo;

     private $ivr;

@@ -38,12 +38,12 @@ 
      * @param string $ivr

      * @param int $cost

      */

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

-    {

-        if ($cost === 0) {

+    public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost)
+    {
+        if ($cost === 0) {
             // If no cost value is specified, assume passkey is a key

             $this->key = $passkey;

-        } else {

+        } else {
             // Derive the key from the password and store in object

             $this->key = \hash_pbkdf2($algo, ($passkey . $cipher), $ivr, $cost, 0, true);

         }

@@ -86,7 +86,7 @@ 
     {

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

 

-        if ($key === false) {

+        if ($key === false) {
             throw new \Exception("Hash algo $this->algo is not supported");

         }