mmeyer2k / dcrypt

support.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php

 

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

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

 

 foreach (hash_algos() as $algo) {

     foreach (openssl_get_cipher_methods() as $meth) {

Braces +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 foreach (hash_algos() as $algo) {

     foreach (openssl_get_cipher_methods() as $meth) {

         // Skip any unsupported ciphers

-        if (!\openssl_cipher_iv_length($meth)) {

+        if (!\openssl_cipher_iv_length($meth)) {
             continue;

         }

 

phpunit.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php
 
-require __DIR__ . '/vendor/autoload.php';
-require __DIR__ . '/tests/AesBase.php';
\ No newline at end of file
+require __DIR__.'/vendor/autoload.php';
+require __DIR__.'/tests/AesBase.php';
\ No newline at end of file

src/AesOfb.php

Braces +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
  * @link     https://github.com/mmeyer2k/dcrypt

  * @link     https://apigen.ci/github/mmeyer2k/dcrypt/namespace-Dcrypt.html

  */

-class AesOfb extends AesCbc

-{

+class AesOfb extends AesCbc
+{
     /**

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

      *

src/OpensslStatic.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
         $msg = Str::substr($data, $isz + $hsz + $tsz + 4);

 

         // Calculate verification checksum

-        $chk = \hash_hmac($algo, ($msg . $itr . $ivr), $pass, true);

+        $chk = \hash_hmac($algo, ($msg.$itr.$ivr), $pass, true);

 

         // Verify HMAC before decrypting

         if (!Str::equal($chk, $sum)) {

@@ -55,7 +55,7 @@ 
         $cost = \unpack('N', $itr ^ \hash_hmac($algo, $ivr, $pass, true))[1];

 

         // Derive key from password

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

+        $key = \hash_pbkdf2($algo, ($pass.$cipher), $ivr, $cost, 0, true);

 

         // Decrypt message and return

         return OpensslWrapper::decrypt($msg, $cipher, $key, $ivr, $tag);

@@ -68,7 +68,7 @@ 
 

         // Derive key from password with hash_pbkdf2 function.

         // Append CIPHER to password beforehand so that cross-method decryptions will fail at checksum step

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

+        $key = \hash_pbkdf2($algo, ($pass.$cipher), $ivr, $cost, 0, true);

 

         // Create a placeholder for the authentication tag to be passed by reference

         $tag = '';

@@ -80,10 +80,10 @@ 
         $itr = \pack('N', $cost) ^ \hash_hmac($algo, $ivr, $pass, true);

 

         // Generate the ciphertext checksum to prevent bit tampering

-        $chk = \hash_hmac($algo, ($msg . $itr . $ivr), $pass, true);

+        $chk = \hash_hmac($algo, ($msg.$itr.$ivr), $pass, true);

 

         // Return iv + checksum + iterations + cyphertext + tag

-        return $ivr . $chk . $tag . $itr . $msg;

+        return $ivr.$chk.$tag.$itr.$msg;

     }

 

     /**

Braces +4 added lines, -4 removed lines

@@ -14,8 +14,8 @@ 
 

 namespace Dcrypt;

 

-class OpensslStatic

-{

+class OpensslStatic
+{
     public static function decrypt(string $data, string $pass, string $cipher, string $algo): string

     {

         // Calculate the hash checksum size in bytes for the specified algo

@@ -47,7 +47,7 @@ 
         $chk = \hash_hmac($algo, ($msg . $itr . $ivr), $pass, true);

 

         // Verify HMAC before decrypting

-        if (!Str::equal($chk, $sum)) {

+        if (!Str::equal($chk, $sum)) {
             throw new \InvalidArgumentException('Decryption can not proceed due to invalid cyphertext checksum.');

         }

 

@@ -102,7 +102,7 @@ 
         ];

 

         foreach ($needle_tips as $needle) {

-            if (strpos($cipher, $needle)) {

+            if (strpos($cipher, $needle)) {
                 return true;

             }

         }

src/AesGcm.php

Braces +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
  * @link     https://github.com/mmeyer2k/dcrypt

  * @link     https://apigen.ci/github/mmeyer2k/dcrypt/namespace-Dcrypt.html

  */

-class AesGcm extends AesCbc

-{

+class AesGcm extends AesCbc
+{
     /**

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

      *