mmeyer2k / dcrypt

src/OpensslBridge.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
         $cost = \unpack('L*', $itr ^ \hash_hmac(static::CHKSUM, $ivr, $pass, true))[1];
 
         // 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);
 
         // Calculate verification checksum
         $chk = \hash_hmac(static::CHKSUM, $msg, $key, true);
@@ -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);
@@ -98,6 +98,6 @@ 
         $chk = \hash_hmac(static::CHKSUM, $msg, $key, 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

@@ -53,7 +53,7 @@ 
         $hash = \hash_pbkdf2(self::ALGO, $password, $salt, $cost, 0, true);
 
         // Return the salt + cost blob + hmac
-        return $salt . self::costEncrypt($cost, $salt, $password) . $hash;
+        return $salt.self::costEncrypt($cost, $salt, $password).$hash;
     }
 
     /**
@@ -70,7 +70,7 @@ 
         $packed = pack('L*', $cost);
 
         // Encrypt the string with the Otp stream cipher
-        return Otp::crypt($packed, ($password . $salt), self::ALGO);
+        return Otp::crypt($packed, ($password.$salt), self::ALGO);
     }
 
     /**
@@ -103,7 +103,7 @@ 
         $cost = Str::substr($hash, 16, 4);
 
         // Decrypt the cost value stored in the 32bit int
-        $cost = Otp::crypt($cost, ($password . $salt), self::ALGO);
+        $cost = Otp::crypt($cost, ($password.$salt), self::ALGO);
 
         // Unpack the value back to an integer
         $cost = unpack('L*', $cost)[1];