|
@@ -46,7 +46,7 @@ discard block |
|
|
block discarded – undo |
|
46
|
46
|
$sum = \hash_hmac($algo, $cyphertext, $key, true); |
|
47
|
47
|
|
|
48
|
48
|
// ... then hash other elements with previous hmac and return |
|
49
|
|
- return \hash_hmac($algo, $sum . $iv . $mode . $cipher, $key, true); |
|
|
49
|
+ return \hash_hmac($algo, $sum.$iv.$mode.$cipher, $key, true); |
|
50
|
50
|
} |
|
51
|
51
|
|
|
52
|
52
|
/** |
|
@@ -96,7 +96,7 @@ discard block |
|
|
block discarded – undo |
|
96
|
96
|
} |
|
97
|
97
|
|
|
98
|
98
|
// Perform key derivation |
|
99
|
|
- $key = Hash::ihmac($iv . $cipher . $mode, $password, $cost, $algo); |
|
|
99
|
+ $key = Hash::ihmac($iv.$cipher.$mode, $password, $cost, $algo); |
|
100
|
100
|
|
|
101
|
101
|
// Return hash normalized to key length |
|
102
|
102
|
return self::hashNormalize($key, $keysize, $algo); |
Please login to merge, or discard this patch.