This commit is contained in:
terrafrost 2021-03-20 06:09:38 -05:00
parent 8f31e59efa
commit 78364b0127

View File

@ -2436,6 +2436,8 @@ abstract class SymmetricKey
case self::ENGINE_MCRYPT: case self::ENGINE_MCRYPT:
$this->enchanged = $this->dechanged = true; $this->enchanged = $this->dechanged = true;
set_error_handler(function() {});
if (!isset($this->enmcrypt)) { if (!isset($this->enmcrypt)) {
static $mcrypt_modes = [ static $mcrypt_modes = [
self::MODE_CTR => 'ctr', self::MODE_CTR => 'ctr',
@ -2447,8 +2449,6 @@ abstract class SymmetricKey
self::MODE_STREAM => MCRYPT_MODE_STREAM, self::MODE_STREAM => MCRYPT_MODE_STREAM,
]; ];
set_error_handler(function() {});
$this->demcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], ''); $this->demcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
$this->enmcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], ''); $this->enmcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
@ -2459,12 +2459,14 @@ abstract class SymmetricKey
$this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, ''); $this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
} }
restore_error_handler();
} // else should mcrypt_generic_deinit be called? } // else should mcrypt_generic_deinit be called?
if ($this->mode == self::MODE_CFB) { if ($this->mode == self::MODE_CFB) {
mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size)); mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
} }
restore_error_handler();
break; break;
case self::ENGINE_INTERNAL: case self::ENGINE_INTERNAL:
$this->setupKey(); $this->setupKey();