mmeyer2k / dcrypt

load.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     );
 
     foreach ($files as $f) {
-        require_once __DIR__ . "/src/$f.php";
+        require_once __DIR__."/src/$f.php";
     }
 }
 // @codeCoverageIgnoreEnd

src/Pkcs7.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         $pad = self::paddingString(Str::strlen($input), $blocksize);
 
         // Return input + padding
-        return $input . $pad;
+        return $input.$pad;
     }
 
     /**

phpunit.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . '/vendor/autoload.php';
+require __DIR__.'/vendor/autoload.php';
 
 // backward compatibility
 if (!class_exists('\PHPUnit\Framework\TestCase')) {

src/Otp.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         $length = Str::strlen($input);
         
         foreach ($chunks as $i => &$chunk) {
-            $chunk = $chunk ^ \hash_hmac($algo, $password . $length, $i, true);
+            $chunk = $chunk ^ \hash_hmac($algo, $password.$length, $i, true);
         }
 
         return \implode($chunks);

src/Hash.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
         $hash = self::ihmac($input, $key, $cost, self::ALGO);
 
         // Return the salt + cost blob + hmac
-        return $salt . self::costHash($cost, $salt, $password) . $hash;
+        return $salt.self::costHash($cost, $salt, $password).$hash;
     }
 
     /**
@@ -83,7 +83,7 @@ 
         // Convert cost to base 256 then encrypt with OTP stream cipher
         $cost = Otp::crypt(self::dec2bin($cost), $password);
 
-        return $hash . $cost;
+        return $hash.$cost;
     }
 
     /**
@@ -104,7 +104,7 @@ 
         // Perform iterative hmac calls
         // Make sure $iter value of 0 is handled
         for ($i = 0; $i <= $iter; $i++) {
-            $data = self::hmac($data . $i . $iter, $key, $algo);
+            $data = self::hmac($data.$i.$iter, $key, $algo);
         }
 
         return $data;

Indentation +3 added lines, -3 removed lines

@@ -70,9 +70,9 @@
      */
     private static function cost(int $cost): int
     {
-		if ($cost < 0 || $cost > \pow(2, 32)) {
-			throw new \InvalidArgumentException("Hashing cost parameter must between 0 and 2^32");
-		}
+        if ($cost < 0 || $cost > \pow(2, 32)) {
+            throw new \InvalidArgumentException("Hashing cost parameter must between 0 and 2^32");
+        }
 		
         return $cost;
     }

src/OpensslBridge.php

Indentation +10 added lines, -10 removed lines

@@ -35,11 +35,11 @@ 
      */
     public static function decrypt(string $data, string $pass): string
     {
-		// Calculate the hash checksum size in bytes for the specified algo
-		$hsz = Str::hashSize(static::CHKSUM);
+        // Calculate the hash checksum size in bytes for the specified algo
+        $hsz = Str::hashSize(static::CHKSUM);
 		
-		// Ask openssl for the IV size needed for specified cipher
-		$isz = self::ivsize();
+        // Ask openssl for the IV size needed for specified cipher
+        $isz = self::ivsize();
 		
         // Find the IV at the beginning of the cypher text
         $ivr = Str::substr($data, 0, $isz);
@@ -47,8 +47,8 @@ 
         // Gather the checksum portion of the ciphertext
         $sum = Str::substr($data, $isz, $hsz);
 
-		// Gather the iterations portion of the cipher text as packed/encrytped unsigned long
-		$itr = Str::substr($data, $isz + $hsz, 4);
+        // Gather the iterations portion of the cipher text as packed/encrytped unsigned long
+        $itr = Str::substr($data, $isz + $hsz, 4);
 
         // Gather message portion of ciphertext after iv and checksum
         $msg = Str::substr($data, $isz + $hsz + 4);
@@ -85,11 +85,11 @@ 
         // Encrypt the plaintext
         $msg = OpensslWrapper::encrypt($data, static::CIPHER, $key, $ivr);
 
-		// Convert cost integer into 4 byte string and XOR it with the derived key
-		$itr = pack('L*', $cost) ^ $key;
+        // Convert cost integer into 4 byte string and XOR it with the derived key
+        $itr = pack('L*', $cost) ^ $key;
 		
-		// Generate the ciphertext checksum
-		$chk = \hash_hmac(static::CHKSUM, $msg, $key, true);
+        // Generate the ciphertext checksum
+        $chk = \hash_hmac(static::CHKSUM, $msg, $key, true);
 
         // Return iv + checksum + iterations + cyphertext
         return $ivr . $chk . $itr . $msg;

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 		$chk = \hash_hmac(static::CHKSUM, $msg, $key, true);
 
         // Return iv + checksum + iterations + cyphertext
-        return $ivr . $chk . $itr . $msg;
+        return $ivr.$chk.$itr.$msg;
     }
 
     /**
@@ -106,7 +106,7 @@ 
     private static function key(string $pass, string $iv, int $cost): string
     {
         // Create the authentication string to be hashed
-        $data = $iv . self::RIJNDA . static::CIPHER;
+        $data = $iv.self::RIJNDA.static::CIPHER;
 
         return Hash::ihmac($data, $pass, $cost, static::CHKSUM);
     }

src/OpensslWrapper.php

Indentation +4 added lines, -4 removed lines

@@ -74,10 +74,10 @@
     {
         $ret = \openssl_cipher_iv_length(static::CIPHER);
 		
-		if ($ret === false) {
-			throw new \Exception("Failed to determine correct IV size.");
-		}
+        if ($ret === false) {
+            throw new \Exception("Failed to determine correct IV size.");
+        }
 		
-		return $ret;
+        return $ret;
     }
 }