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

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
      *
      * @param int    $cost
      * @param string $salt
-     * @param string $passw
+     * @param string $pass
      * @return string
      */
     private static function costEncrypt(int $cost, string $salt, string $pass): string

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
         $cost = self::costEncrypt($cost, $salt, $password);
 
         // Return the salt + cost + hmac as a single string
-        return $salt . $cost . $hash;
+        return $salt.$cost.$hash;
     }
 
     /**
@@ -76,7 +76,7 @@ 
         $packed = pack('L*', $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);
     }
 
     /**
@@ -90,7 +90,7 @@ 
     private static function costDecrypt(string $pack, string $salt, string $pass): int
     {
         // Decrypt the cost value stored in the 32bit int
-        $cost = Otp::crypt($pack, ($pass . $salt), self::ALGO);
+        $cost = Otp::crypt($pack, ($pass.$salt), self::ALGO);
 
         // Unpack the value back to an integer and return to caller
         return unpack('L*', $cost)[1];