danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-11-27 12:44:38 +01:00
Code Issues Projects Releases Wiki Activity

- rm some legacy code and make Crypt_TripleDES better handle short keys

Browse Source 
git-svn-id: http://phpseclib.svn.sourceforge.net/svnroot/phpseclib/trunk@138 21d32557-59b3-4da0-833f-c5933fad653e
This commit is contained in:
Jim Wigginton 2010-12-02 04:59:46 +00:00
parent 354a0965e8
commit 4ab5b5c16f
1 changed files with 2 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
phpseclib/Crypt/TripleDES.php
View File

@ -346,6 +346,8 @@ class Crypt_TripleDES {
// if $key is between 64 and 128-bits, use the first 64-bits as the last, per this: // if $key is between 64 and 128-bits, use the first 64-bits as the last, per this:
// http://php.net/function.mcrypt-encrypt#47973 // http://php.net/function.mcrypt-encrypt#47973
//$key = $length <= 16 ? substr_replace($key, substr($key, 0, 8), 16) : substr($key, 0, 24); //$key = $length <= 16 ? substr_replace($key, substr($key, 0, 8), 16) : substr($key, 0, 24);
} else {
$key = str_pad($key, 8, chr(0));
} }
$this->key = $key; $this->key = $key;
switch (true) { switch (true) {
@ -800,99 +802,6 @@ class Crypt_TripleDES {
$this->decryptIV = $block; $this->decryptIV = $block;
} }
break; break;
$iv = $this->decryptIV;
for ($i = 0; $i < strlen($ciphertext); $i+=8) {
$block = substr($ciphertext, $i, 8);
$iv = $des[0]->_processBlock($iv, CRYPT_DES_ENCRYPT);
$iv = $des[1]->_processBlock($iv, CRYPT_DES_DECRYPT);
$iv = $des[2]->_processBlock($iv, CRYPT_DES_ENCRYPT);
$plaintext.= $iv ^ $block;
$iv = $block;
}
if ($this->continuousBuffer) {
$this->decryptIV = $block;
}
break;
if (!empty($buffer)) {
$plaintext = $ciphertext ^ $buffer['xor'];
$iv = $buffer['decrypted'] . $plaintext;
$start = strlen($plaintext);
$buffer = array();
} else {
$iv = $this->decryptIV;
$start = 0;
}
for ($i = $start; $i < strlen($ciphertext); $i+=8) {
$block = substr($ciphertext, $i, 8);
$xor = $des[0]->_processBlock($iv, CRYPT_DES_ENCRYPT);
$xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
$xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
/*
$xor = $des[2]->_processBlock($iv, CRYPT_DES_DECRYPT);
$xor = $des[1]->_processBlock($xor, CRYPT_DES_ENCRYPT);
$xor = $des[0]->_processBlock($xor, CRYPT_DES_DECRYPT);
*/
//$xor = $this->_encryptBlock($iv);
$iv = $block ^ $xor;
if ($continuousBuffer && strlen($iv) != 8) {
$buffer = array(
'decrypted' => $iv,
'xor' => substr($xor, strlen($iv))
);
}
$plaintext.= $iv;
}
if ($this->continuousBuffer) {
$this->decryptIV = $xor;
}
break;
$iv = $this->decryptIV;
for ($i = 0; $i < strlen($ciphertext); $i+=8) {
$block = substr($ciphertext, $i, 8);
$iv = $des[0]->_processBlock($iv, CRYPT_DES_ENCRYPT);
$iv = $des[1]->_processBlock($iv, CRYPT_DES_DECRYPT);
$iv = $des[2]->_processBlock($iv, CRYPT_DES_ENCRYPT);
$iv^= $block;
$plaintext.= $iv;
}
if ($this->continuousBuffer) {
$this->decryptIV = $iv;
}
break;
case CRYPT_DES_MODE_OFB: case CRYPT_DES_MODE_OFB:
$xor = $this->decryptIV; $xor = $this->decryptIV;
if (strlen($buffer)) { if (strlen($buffer)) {