Merge branch '3.0'

This commit is contained in:
terrafrost 2020-05-16 14:01:29 -05:00
commit 49afc58e04

View File

@ -3117,7 +3117,6 @@ abstract class SymmetricKey
if (strlen($this->nonce) == 12) {
$this->iv = $this->nonce . "\0\0\0\1";
} else {
$s = 16 * ceil(strlen($this->nonce) / 16) - strlen($this->nonce);
$this->iv = $this->ghash(
self::nullPad128($this->nonce) . str_repeat("\0", 8) . self::len64($this->nonce)
);