octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-26 11:37:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix E_NOTICEs in the rewritten CFB mode

Browse Source
This commit is contained in:
terrafrost 2013-01-06 19:08:36 -06:00
parent 1626c0a3c7
commit fc2bf41588
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpseclib/Crypt/Rijndael.php
View File

@ -768,6 +768,7 @@ class Crypt_Rijndael {
$iv = $this->encryptIV; $iv = $this->encryptIV;
$pos = $this->continuousBuffer === true ? $buffer['pos'] : 0; $pos = $this->continuousBuffer === true ? $buffer['pos'] : 0;
$len = strlen($plaintext); $len = strlen($plaintext);
$i = 0;
if ($pos) { if ($pos) {
$orig_pos = $pos; $orig_pos = $pos;
$max = $block_size - $pos; $max = $block_size - $pos;
@ -780,7 +781,7 @@ class Crypt_Rijndael {
$pos+= $len; $pos+= $len;
$len = 0; $len = 0;
} }
// ie. $i = min($max, $len), $len-= $i, $pos+= $i // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
$ciphertext = substr($iv, $orig_pos) ^ $plaintext; $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
$iv = substr_replace($iv, $ciphertext, $orig_pos, $i); $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
} }
@ -796,7 +797,6 @@ class Crypt_Rijndael {
$block = substr($iv, $pos) ^ substr($plaintext, $i); $block = substr($iv, $pos) ^ substr($plaintext, $i);
$iv = substr_replace($iv, $block, $pos, $len); $iv = substr_replace($iv, $block, $pos, $len);
$ciphertext.= $block; $ciphertext.= $block;
$i+= $len;
$pos+= $len; $pos+= $len;
} }
if($this->continuousBuffer) { if($this->continuousBuffer) {
@ -899,7 +899,7 @@ class Crypt_Rijndael {
$iv = $this->decryptIV; $iv = $this->decryptIV;
$pos = $this->continuousBuffer === true ? $buffer['pos'] : 0; $pos = $this->continuousBuffer === true ? $buffer['pos'] : 0;
$len = strlen($ciphertext); $len = strlen($ciphertext);
$i = 0;
if ($pos) { if ($pos) {
$orig_pos = $pos; $orig_pos = $pos;
$max = $block_size - $pos; $max = $block_size - $pos;
@ -912,9 +912,9 @@ class Crypt_Rijndael {
$pos+= $len; $pos+= $len;
$len = 0; $len = 0;
} }
// ie. $i = min($max, $len), $len-= $i, $pos+= $i // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
$plaintext = substr($iv, $orig_pos) ^ $ciphertext; $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
$iv = substr_replace($iv, $ciphertext, $orig_pos, $i); $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
} }
while ($len >= $block_size) { while ($len >= $block_size) {
$iv = $this->_encryptBlock($iv); $iv = $this->_encryptBlock($iv);
@ -928,7 +928,6 @@ class Crypt_Rijndael {
$iv = $this->_encryptBlock($iv); $iv = $this->_encryptBlock($iv);
$plaintext.= substr($iv, $pos) ^ substr($ciphertext, $i); $plaintext.= substr($iv, $pos) ^ substr($ciphertext, $i);
$iv = substr_replace($iv, substr($ciphertext, $i, $len), $pos, $len); $iv = substr_replace($iv, substr($ciphertext, $i, $len), $pos, $len);
$i+= $len;
$pos+= $len; $pos+= $len;
} }
if ($this->continuousBuffer) { if ($this->continuousBuffer) {