@@ -41,7 +41,7 @@ |
||
41 | 41 | $pad = self::paddingString(Str::strlen($input), $blocksize); |
42 | 42 | |
43 | 43 | // Return input + padding |
44 | - return $input . $pad; |
|
44 | + return $input.$pad; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $chsh = self::costHash($cost, $pass); |
68 | 68 | |
69 | 69 | // Return the salt + cost + hmac as a single string |
70 | - return $salt . $chsh . $cost . $hash; |
|
70 | + return $salt.$chsh.$cost.$hash; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $packed = pack('N', $cost); |
85 | 85 | |
86 | 86 | // Encrypt the string with the Otp stream cipher |
87 | - return Otp::crypt($packed, ($pass . $salt), self::ALGO); |
|
87 | + return Otp::crypt($packed, ($pass.$salt), self::ALGO); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | private static function costDecrypt(string $pack, string $salt, string $pass): int |
99 | 99 | { |
100 | 100 | // Decrypt the cost value stored in the 32bit int |
101 | - $pack = Otp::crypt($pack, ($pass . $salt), self::ALGO); |
|
101 | + $pack = Otp::crypt($pack, ($pass.$salt), self::ALGO); |
|
102 | 102 | |
103 | 103 | // Unpack the value back to an integer and return to caller |
104 | 104 | return unpack('N', $pack)[1]; |
@@ -1,4 +1,4 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require __DIR__ . '/vendor/autoload.php'; |
|
4 | -require __DIR__ . '/tests/AesBase.php'; |
|
3 | +require __DIR__.'/vendor/autoload.php'; |
|
4 | +require __DIR__.'/tests/AesBase.php'; |
@@ -48,8 +48,8 @@ |
||
48 | 48 | // We hash the 2 inputs at this point because hash_equals is still |
49 | 49 | // vulnerable to timing attacks when the inputs have different sizes. |
50 | 50 | // Inputs are also cast to string like in symfony stringutils. |
51 | - $known = \hash_hmac('sha256', (string)$known, $nonce, true); |
|
52 | - $given = \hash_hmac('sha256', (string)$given, $nonce, true); |
|
51 | + $known = \hash_hmac('sha256', (string) $known, $nonce, true); |
|
52 | + $given = \hash_hmac('sha256', (string) $given, $nonce, true); |
|
53 | 53 | |
54 | 54 | return \hash_equals($known, $given); |
55 | 55 | } |
@@ -42,7 +42,7 @@ |
||
42 | 42 | $length = Str::strlen($input); |
43 | 43 | |
44 | 44 | foreach ($chunks as $i => &$chunk) { |
45 | - $chunk = $chunk ^ \hash_hmac($algo, $password . $length, (string)$i, true); |
|
45 | + $chunk = $chunk ^ \hash_hmac($algo, $password.$length, (string) $i, true); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | return \implode($chunks); |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require __DIR__ . '/../vendor/autoload.php'; |
|
3 | +require __DIR__.'/../vendor/autoload.php'; |
|
4 | 4 | |
5 | 5 | foreach (hash_algos() as $algo) { |
6 | 6 | foreach (openssl_get_cipher_methods() as $meth) { |
@@ -23,8 +23,8 @@ |
||
23 | 23 | * @license http://opensource.org/licenses/MIT The MIT License (MIT) |
24 | 24 | * @link https://github.com/mmeyer2k/dcrypt |
25 | 25 | */ |
26 | -class Rot128 |
|
27 | -{ |
|
26 | +class Rot128 |
|
27 | +{ |
|
28 | 28 | /** |
29 | 29 | * Rot-128 encode a binary string with strtr. |
30 | 30 | * |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $msg = Str::substr($data, $isz + $hsz + $tsz + 4); |
66 | 66 | |
67 | 67 | // Calculate verification checksum |
68 | - $chk = \hash_hmac($algo, ($msg . $itr . $ivr . $cipher), $pass, true); |
|
68 | + $chk = \hash_hmac($algo, ($msg.$itr.$ivr.$cipher), $pass, true); |
|
69 | 69 | |
70 | 70 | // Verify HMAC before decrypting |
71 | 71 | if (!Str::equal($chk, $sum)) { |
@@ -115,9 +115,9 @@ discard block |
||
115 | 115 | $itr = \pack('N', $cost) ^ \hash_hmac($algo, $ivr, $pass, true); |
116 | 116 | |
117 | 117 | // Generate the ciphertext checksum to prevent bit tampering |
118 | - $chk = \hash_hmac($algo, ($msg . $itr . $ivr . $cipher), $pass, true); |
|
118 | + $chk = \hash_hmac($algo, ($msg.$itr.$ivr.$cipher), $pass, true); |
|
119 | 119 | |
120 | 120 | // Return iv + checksum + tag + iterations + cyphertext |
121 | - return $ivr . $chk . $tag . $itr . $msg; |
|
121 | + return $ivr.$chk.$tag.$itr.$msg; |
|
122 | 122 | } |
123 | 123 | } |