octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-27 00:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

AES.php in mcrypt mode always treated CFB as though it was a continuous cipher

Browse Source
This commit is contained in:
terrafrost 2013-01-06 19:09:43 -06:00
parent c1244dd339
commit edc6d9cf5b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/AES.php
View File

@ -311,7 +311,7 @@ class Crypt_AES extends Crypt_Rijndael {
// re: http://phpseclib.sourceforge.net/cfb-demo.phps // re: http://phpseclib.sourceforge.net/cfb-demo.phps
// using mcrypt's default handing of CFB the above would output two different things. using phpseclib's // using mcrypt's default handing of CFB the above would output two different things. using phpseclib's
// rewritten CFB implementation the above outputs the same thing twice. // rewritten CFB implementation the above outputs the same thing twice.
if ($this->mode == 'ncfb') { if ($this->mode == 'ncfb' && $this->continuousBuffer) {
if ($changed) { if ($changed) {
$this->ecb = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, ''); $this->ecb = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
mcrypt_generic_init($this->ecb, $this->key, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); mcrypt_generic_init($this->ecb, $this->key, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
@ -386,7 +386,7 @@ class Crypt_AES extends Crypt_Rijndael {
return $plaintext; return $plaintext;
} }
*/ */
if ($this->mode == 'ncfb') { if ($this->mode == 'ncfb' && $this->continuousBuffer) {
if ($changed) { if ($changed) {
$this->ecb = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, ''); $this->ecb = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
mcrypt_generic_init($this->ecb, $this->key, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); mcrypt_generic_init($this->ecb, $this->key, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");