octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-17 02:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/phpseclib/phpseclib

Browse Source
This commit is contained in:
terrafrost 2013-03-03 11:30:54 -06:00
commit 7ce05ed591
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
phpseclib/Crypt/Rijndael.php
View File

@ -834,7 +834,9 @@ class Crypt_Rijndael {
if (strlen($buffer['encrypted'])) { if (strlen($buffer['encrypted'])) {
for ($i = 0; $i < strlen($plaintext); $i+=$block_size) { for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
$block = substr($plaintext, $i, $block_size); $block = substr($plaintext, $i, $block_size);
$buffer['encrypted'].= $this->_encryptBlock($this->_generate_xor($block_size, $xor)); if (strlen($block) > strlen($buffer['encrypted'])) {
$buffer['encrypted'].= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
}
$key = $this->_string_shift($buffer['encrypted'], $block_size); $key = $this->_string_shift($buffer['encrypted'], $block_size);
$ciphertext.= $block ^ $key; $ciphertext.= $block ^ $key;
} }
@ -971,7 +973,9 @@ class Crypt_Rijndael {
if (strlen($buffer['ciphertext'])) { if (strlen($buffer['ciphertext'])) {
for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) { for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
$block = substr($ciphertext, $i, $block_size); $block = substr($ciphertext, $i, $block_size);
$buffer['ciphertext'].= $this->_encryptBlock($this->_generate_xor($block_size, $xor)); if (strlen($block) > strlen($buffer['ciphertext'])) {
$buffer['ciphertext'].= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
}
$key = $this->_string_shift($buffer['ciphertext'], $block_size); $key = $this->_string_shift($buffer['ciphertext'], $block_size);
$plaintext.= $block ^ $key; $plaintext.= $block ^ $key;
} }
@ -1794,9 +1798,11 @@ class Crypt_Rijndael {
if (strlen($buffer["encrypted"])) { if (strlen($buffer["encrypted"])) {
for ($i = 0; $i < $plaintext_len; $i+= '.$block_size.') { for ($i = 0; $i < $plaintext_len; $i+= '.$block_size.') {
$block = substr($text, $i, '.$block_size.'); $block = substr($text, $i, '.$block_size.');
$in = $self->_generate_xor('.$block_size.', $xor); if (strlen($block) > strlen($buffer["encrypted"])) {
'.$_encryptBlock.' $in = $self->_generate_xor('.$block_size.', $xor);
$buffer["encrypted"].= $in; '.$_encryptBlock.'
$buffer["encrypted"].= $in;
}
$key = $self->_string_shift($buffer["encrypted"], '.$block_size.'); $key = $self->_string_shift($buffer["encrypted"], '.$block_size.');
$ciphertext.= $block ^ $key; $ciphertext.= $block ^ $key;
} }
@ -1828,9 +1834,11 @@ class Crypt_Rijndael {
if (strlen($buffer["ciphertext"])) { if (strlen($buffer["ciphertext"])) {
for ($i = 0; $i < $ciphertext_len; $i+= '.$block_size.') { for ($i = 0; $i < $ciphertext_len; $i+= '.$block_size.') {
$block = substr($text, $i, '.$block_size.'); $block = substr($text, $i, '.$block_size.');
$in = $self->_generate_xor('.$block_size.', $xor); if (strlen($block) > strlen($buffer["ciphertext"])) {
'.$_encryptBlock.' $in = $self->_generate_xor('.$block_size.', $xor);
$buffer["ciphertext"].= $in; '.$_encryptBlock.'
$buffer["ciphertext"].= $in;
}
$key = $self->_string_shift($buffer["ciphertext"], '.$block_size.'); $key = $self->_string_shift($buffer["ciphertext"], '.$block_size.');
$plaintext.= $block ^ $key; $plaintext.= $block ^ $key;
} }

24
phpseclib/Crypt/TripleDES.php
View File

@ -605,11 +605,13 @@ class Crypt_TripleDES {
if (strlen($buffer['encrypted'])) { if (strlen($buffer['encrypted'])) {
for ($i = 0; $i < strlen($plaintext); $i+=8) { for ($i = 0; $i < strlen($plaintext); $i+=8) {
$block = substr($plaintext, $i, 8); $block = substr($plaintext, $i, 8);
$key = $this->_generate_xor($xor); if (strlen($block) > strlen($buffer['encrypted'])) {
$key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT); $key = $this->_generate_xor($xor);
$key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT); $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
$key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT); $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
$buffer['encrypted'].= $key; $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
$buffer['encrypted'].= $key;
}
$key = $this->_string_shift($buffer['encrypted'], 8); $key = $this->_string_shift($buffer['encrypted'], 8);
$ciphertext.= $block ^ $key; $ciphertext.= $block ^ $key;
} }
@ -809,11 +811,13 @@ class Crypt_TripleDES {
if (strlen($buffer['ciphertext'])) { if (strlen($buffer['ciphertext'])) {
for ($i = 0; $i < strlen($ciphertext); $i+=8) { for ($i = 0; $i < strlen($ciphertext); $i+=8) {
$block = substr($ciphertext, $i, 8); $block = substr($ciphertext, $i, 8);
$key = $this->_generate_xor($xor); if (strlen($block) > strlen($buffer['ciphertext'])) {
$key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT); $key = $this->_generate_xor($xor);
$key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT); $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
$key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT); $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
$buffer['ciphertext'].= $key; $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
$buffer['ciphertext'].= $key;
}
$key = $this->_string_shift($buffer['ciphertext'], 8); $key = $this->_string_shift($buffer['ciphertext'], 8);
$plaintext.= $block ^ $key; $plaintext.= $block ^ $key;
} }