danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-03 18:17:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62 from petrich/patch-4

Browse Source 
DES: Fixed CFB decrypt() using MODE_MCRYPT and ContinuousBuffer
This commit is contained in:
terrafrost 2013-01-20 22:57:24 -08:00
commit e11998787c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpseclib/Crypt/DES.php
View File

@ -536,7 +536,6 @@ class Crypt_DES {
} }
$ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8)); $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
$iv = substr($ciphertext, -8); $iv = substr($ciphertext, -8);
$i = strlen($ciphertext);
$len%= 8; $len%= 8;
} else { } else {
while ($len >= 8) { while ($len >= 8) {
@ -549,7 +548,7 @@ class Crypt_DES {
} }
if ($len) { if ($len) {
$iv = mcrypt_generic($this->ecb, $iv); $iv = mcrypt_generic($this->ecb, $iv);
$block = $iv ^ substr($plaintext, $i); $block = $iv ^ substr($plaintext, -$len);
$iv = substr_replace($iv, $block, 0, $len); $iv = substr_replace($iv, $block, 0, $len);
$ciphertext.= $block; $ciphertext.= $block;
$pos = $len; $pos = $len;
@ -726,7 +725,6 @@ class Crypt_DES {
} }
$plaintext = substr($iv, $orig_pos) ^ $ciphertext; $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
$iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i); $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
$this->debuffer['demcrypt_init'] = true;
} }
if ($len >= 8) { if ($len >= 8) {
$cb = substr($ciphertext, $i, $len - $len % 8); $cb = substr($ciphertext, $i, $len - $len % 8);
@ -736,8 +734,8 @@ class Crypt_DES {
} }
if ($len) { if ($len) {
$iv = mcrypt_generic($this->ecb, $iv); $iv = mcrypt_generic($this->ecb, $iv);
$plaintext.= $iv ^ substr($ciphertext, $i); $plaintext.= $iv ^ substr($ciphertext, -$len);
$iv = substr_replace($iv, substr($ciphertext, $i, $len), 0, $len); $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
$pos = $len; $pos = $len;
} }
return $plaintext; return $plaintext;
@ -833,7 +831,7 @@ class Crypt_DES {
if ($len) { if ($len) {
$iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT); $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
$plaintext.= $iv ^ substr($ciphertext, $i); $plaintext.= $iv ^ substr($ciphertext, $i);
$iv = substr_replace($iv, substr($ciphertext, $i, $len), 0, $len); $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
$pos = $len; $pos = $len;
} }
return $plaintext; return $plaintext;