Completed
Pull Request — master (#19)
by Michael
10:53
created
src/Pkcs7.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
src/Hash.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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];
Please login to merge, or discard this patch.
phpunit.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
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';
Please login to merge, or discard this patch.
src/Str.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,8 +48,8 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
src/Otp.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
examples/support.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
src/Rot128.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@
 block discarded – undo
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
      *
Please login to merge, or discard this patch.
src/OpensslStatic.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.