|
@@ -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.