danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-09 07:28:57 +01:00
Code Issues Projects Releases Wiki Activity

Use length multiplier

Browse Source
This commit is contained in:
Daniil Gentili 2019-06-14 13:14:28 +02:00
parent 0aff25ea25
commit c85ddd3e5c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpseclib/Crypt/Common/SymmetricKey.php
View File

@ -194,12 +194,12 @@ abstract class SymmetricKey
protected $block_size = 16; protected $block_size = 16;
/** /**
* The IV Length of the block cipher * The IV length multiplier of the block cipher
* *
* @var int * @var int
* @access private * @access private
*/ */
protected $iv_size = 16; protected $iv_length_multiplier = 1;
/** /**
* The Key * The Key
@ -639,7 +639,7 @@ abstract class SymmetricKey
$this->paddable = true; $this->paddable = true;
break; break;
case self::MODE_IGE: case self::MODE_IGE:
$this->iv_size = $this->block_size*2; $this->iv_length_multiplier = 2;
case self::MODE_CTR: case self::MODE_CTR:
case self::MODE_CFB: case self::MODE_CFB:
case self::MODE_CFB8: case self::MODE_CFB8:
@ -688,8 +688,8 @@ abstract class SymmetricKey
throw new \BadMethodCallException('This algorithm does not use an IV.'); throw new \BadMethodCallException('This algorithm does not use an IV.');
} }
if (strlen($iv) != $this->iv_size) { if (strlen($iv) != $this->block_size * $this->iv_length_multiplier) {
throw new \LengthException('Received initialization vector of size ' . strlen($iv) . ', but size ' . $this->iv_size. ' is required'); throw new \LengthException('Received initialization vector of size ' . strlen($iv) . ', but size ' . ($this->block_size * $this->iv_length_multiplier). ' is required');
} }
$this->iv = $this->origIV = $iv; $this->iv = $this->origIV = $iv;
@ -2486,7 +2486,7 @@ abstract class SymmetricKey
if (!isset($this->enmcrypt)) { if (!isset($this->enmcrypt)) {
static $mcrypt_modes = [ static $mcrypt_modes = [
self::MODE_IGE => 'ige', self::MODE_IGE => MCRYPT_MODE_ECB,
self::MODE_CTR => 'ctr', self::MODE_CTR => 'ctr',
self::MODE_ECB => MCRYPT_MODE_ECB, self::MODE_ECB => MCRYPT_MODE_ECB,
self::MODE_CBC => MCRYPT_MODE_CBC, self::MODE_CBC => MCRYPT_MODE_CBC,