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

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