mmeyer2k / dcrypt

src/OpensslBridge.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
         $cost = \unpack('N', $itr ^ \hash_hmac(static::CHKSUM, $ivr, $pass, true))[1];
 
         // Calculate verification checksum
-        $chk = \hash_hmac(static::CHKSUM, ($msg . $itr . $ivr), $pass, true);
+        $chk = \hash_hmac(static::CHKSUM, ($msg.$itr.$ivr), $pass, true);
 
         // Verify HMAC before decrypting
         if (!Str::equal($chk, $sum)) {
@@ -65,7 +65,7 @@ 
         }
 
         // Derive key from password
-        $key = \hash_pbkdf2(static::CHKSUM, ($pass . static::CIPHER), $ivr, $cost, 0, true);
+        $key = \hash_pbkdf2(static::CHKSUM, ($pass.static::CIPHER), $ivr, $cost, 0, true);
 
         // Decrypt message and return
         return OpensslWrapper::decrypt($msg, static::CIPHER, $key, $ivr);
@@ -86,7 +86,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(static::CHKSUM, ($pass . static::CIPHER), $ivr, $cost, 0, true);
+        $key = \hash_pbkdf2(static::CHKSUM, ($pass.static::CIPHER), $ivr, $cost, 0, true);
 
         // Encrypt the plaintext data
         $msg = OpensslWrapper::encrypt($data, static::CIPHER, $key, $ivr);
@@ -95,9 +95,9 @@ 
         $itr = \pack('N', $cost) ^ \hash_hmac(static::CHKSUM, $ivr, $pass, true);
 
         // Generate the ciphertext checksum to prevent bit tampering
-        $chk = \hash_hmac(static::CHKSUM, ($msg . $itr . $ivr), $pass, true);
+        $chk = \hash_hmac(static::CHKSUM, ($msg.$itr.$ivr), $pass, true);
 
         // Return iv + checksum + iterations + cyphertext
-        return $ivr . $chk . $itr . $msg;
+        return $ivr.$chk.$itr.$msg;
     }
 }

src/Hash.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
         $chsh = self::costHash($cost, $pass);
 
         // Return the salt + cost + hmac as a single string
-        return $salt . $chsh . $cost . $hash;
+        return $salt.$chsh.$cost.$hash;
     }
 
     /**
@@ -84,7 +84,7 @@ 
         $packed = pack('N', $cost);
 
         // Encrypt the string with the Otp stream cipher
-        return Otp::crypt($packed, ($pass . $salt), self::ALGO);
+        return Otp::crypt($packed, ($pass.$salt), self::ALGO);
     }
 
     /**
@@ -98,7 +98,7 @@ 
     private static function costDecrypt(string $pack, string $salt, string $pass): int
     {
         // Decrypt the cost value stored in the 32bit int
-        $pack = Otp::crypt($pack, ($pass . $salt), self::ALGO);
+        $pack = Otp::crypt($pack, ($pass.$salt), self::ALGO);
 
         // Unpack the value back to an integer and return to caller
         return unpack('N', $pack)[1];