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

Merge remote-tracking branch 'petrich/patch-2' into petrich

Browse Source 
Conflicts:
	phpseclib/Crypt/Rijndael.php
This commit is contained in:
terrafrost 2013-01-05 17:54:22 -06:00
commit fba455dfb2
3 changed files with 100 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -6,4 +6,4 @@ php:
- 5.4 - 5.4
script: script:
- phpunit - phpunit --verbose

143
phpseclib/Crypt/Rijndael.php
View File

@ -387,7 +387,7 @@ class Crypt_Rijndael {
* @var String * @var String
* @access private * @access private
*/ */
var $enbuffer = array('encrypted' => '', 'xor' => ''); var $enbuffer = array('encrypted' => '', 'xor' => '', 'pos' => 0);
/** /**
* Decryption buffer for CTR, OFB and CFB modes * Decryption buffer for CTR, OFB and CFB modes
@ -396,7 +396,7 @@ class Crypt_Rijndael {
* @var String * @var String
* @access private * @access private
*/ */
var $debuffer = array('ciphertext' => ''); var $debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0);
/** /**
* Default Constructor. * Default Constructor.
@ -763,42 +763,46 @@ class Crypt_Rijndael {
} }
break; break;
case CRYPT_RIJNDAEL_MODE_CFB: case CRYPT_RIJNDAEL_MODE_CFB:
if (strlen($buffer['xor'])) { $iv = $this->encryptIV;
$ciphertext = $plaintext ^ $buffer['xor']; $pos = $this->continuousBuffer === true ? $buffer['pos'] : 0;
$iv = $buffer['encrypted'] . $ciphertext; $len = strlen($plaintext);
$start = strlen($ciphertext);
$buffer['encrypted'].= $ciphertext;
$buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
} else {
$ciphertext = '';
$iv = $this->encryptIV;
$start = 0;
}
for ($i = $start; $i < strlen($plaintext); $i+=$block_size) { for ($i=0; $pos && $len; --$len, ++$i)
$block = substr($plaintext, $i, $block_size); {
$xor = $this->_encryptBlock($iv); $iv[$pos] = $iv[$pos] ^ $plaintext[$i];
$iv = $block ^ $xor; $ciphertext .= $iv[$pos];
if ($continuousBuffer && strlen($iv) != $block_size) { $pos = ($pos+1) % $block_size;
$buffer = array(
'encrypted' => $iv,
'xor' => substr($xor, strlen($iv))
);
} }
$ciphertext.= $iv; for (; $len >= $block_size; $len-=$block_size, $i+=$block_size)
} {
$iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
$ciphertext .= $iv;
}
if ($len)
{
$iv = $this->_encryptBlock($iv);
while ($len--)
{
$iv[$pos] = $iv[$pos] ^ $plaintext[$i];
$ciphertext .= $iv[$pos];
if ($this->continuousBuffer) { ++$i;
$this->encryptIV = $iv; ++$pos;
} }
}
if($this->continuousBuffer)
{
$this->encryptIV = $iv;
$buffer['pos'] = $pos;
}
break; break;
case CRYPT_RIJNDAEL_MODE_OFB: case CRYPT_RIJNDAEL_MODE_OFB:
$xor = $this->encryptIV; $xor = $this->encryptIV;
if (strlen($buffer)) { if (strlen($buffer['xor'])) {
for ($i = 0; $i < strlen($plaintext); $i+=$block_size) { for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
$xor = $this->_encryptBlock($xor); $xor = $this->_encryptBlock($xor);
$buffer.= $xor; $buffer['xor'].= $xor;
$key = $this->_string_shift($buffer, $block_size); $key = $this->_string_shift($buffer['xor'], $block_size);
$ciphertext.= substr($plaintext, $i, $block_size) ^ $key; $ciphertext.= substr($plaintext, $i, $block_size) ^ $key;
} }
} else { } else {
@ -811,7 +815,7 @@ class Crypt_Rijndael {
if ($this->continuousBuffer) { if ($this->continuousBuffer) {
$this->encryptIV = $xor; $this->encryptIV = $xor;
if ($start = strlen($plaintext) % $block_size) { if ($start = strlen($plaintext) % $block_size) {
$buffer = substr($key, $start) . $buffer; $buffer['xor'] = substr($key, $start) . $buffer['xor'];
} }
} }
} }
@ -879,49 +883,56 @@ class Crypt_Rijndael {
if ($this->continuousBuffer) { if ($this->continuousBuffer) {
$this->decryptIV = $xor; $this->decryptIV = $xor;
if ($start = strlen($ciphertext) % $block_size) { if ($start = strlen($ciphertext) % $block_size) {
$buffer['ciphertext'] = substr($key, $start) . $buffer['encrypted']; $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
} }
} }
break; break;
case CRYPT_RIJNDAEL_MODE_CFB: case CRYPT_RIJNDAEL_MODE_CFB:
if (strlen($buffer['ciphertext'])) { $iv = $this->decryptIV;
$plaintext = $ciphertext ^ substr($this->decryptIV, strlen($buffer['ciphertext'])); $pos = $this->continuousBuffer === true ? $buffer['pos'] : 0;
$buffer['ciphertext'].= substr($ciphertext, 0, strlen($plaintext)); $len = strlen($ciphertext);
if (strlen($buffer['ciphertext']) != $block_size) {
$block = $this->decryptIV;
} else {
$block = $buffer['ciphertext'];
$xor = $this->_encryptBlock($buffer['ciphertext']);
$buffer['ciphertext'] = '';
}
$start = strlen($plaintext);
} else {
$plaintext = '';
$xor = $this->_encryptBlock($this->decryptIV);
$start = 0;
}
for ($i = $start; $i < strlen($ciphertext); $i+=$block_size) { // cfb routines inspired by: http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1
$block = substr($ciphertext, $i, $block_size); for ($i=0; $pos && $len; --$len, ++$i)
$plaintext.= $block ^ $xor; {
if ($continuousBuffer && strlen($block) != $block_size) { $plaintext .= $iv[$pos] ^ $ciphertext[$i];
$buffer['ciphertext'].= $block; $iv[$pos] = $ciphertext[$i];
$block = $xor; $pos = ($pos+1) % $block_size;
} else if (strlen($block) == $block_size) { }
$xor = $this->_encryptBlock($block);
for (; $len >= $block_size; $len-=$block_size, $i+=$block_size)
{
$iv = $this->_encryptBlock($iv);
$cb = substr($ciphertext, $i, $block_size);
$plaintext .= $iv ^ $cb;
$iv = $cb;
}
if ($len)
{
$iv = $this->_encryptBlock($iv);
while ($len--)
{
$plaintext .= $iv[$pos] ^ $ciphertext[$i];
$iv[$pos] = $ciphertext[$i];
++$i;
++$pos;
}
}
if ($this->continuousBuffer)
{
$this->decryptIV = $iv;
$buffer['pos'] = $pos;
} }
}
if ($this->continuousBuffer) {
$this->decryptIV = $block;
}
break; break;
case CRYPT_RIJNDAEL_MODE_OFB: case CRYPT_RIJNDAEL_MODE_OFB:
$xor = $this->decryptIV; $xor = $this->decryptIV;
if (strlen($buffer)) { if (strlen($buffer['xor'])) {
for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) { for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
$xor = $this->_encryptBlock($xor); $xor = $this->_encryptBlock($xor);
$buffer.= $xor; $buffer['xor'].= $xor;
$key = $this->_string_shift($buffer, $block_size); $key = $this->_string_shift($buffer['xor'], $block_size);
$plaintext.= substr($ciphertext, $i, $block_size) ^ $key; $plaintext.= substr($ciphertext, $i, $block_size) ^ $key;
} }
} else { } else {
@ -934,7 +945,7 @@ class Crypt_Rijndael {
if ($this->continuousBuffer) { if ($this->continuousBuffer) {
$this->decryptIV = $xor; $this->decryptIV = $xor;
if ($start = strlen($ciphertext) % $block_size) { if ($start = strlen($ciphertext) % $block_size) {
$buffer = substr($key, $start) . $buffer; $buffer['xor'] = substr($key, $start) . $buffer['xor'];
} }
} }
} }
@ -1456,6 +1467,8 @@ class Crypt_Rijndael {
$this->continuousBuffer = false; $this->continuousBuffer = false;
$this->encryptIV = $this->iv; $this->encryptIV = $this->iv;
$this->decryptIV = $this->iv; $this->decryptIV = $this->iv;
$this->enbuffer = array('encrypted' => '', 'xor' => '', 'pos' => 0);
$this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0);
} }
/** /**
@ -1495,4 +1508,4 @@ class Crypt_Rijndael {
} }
// vim: ts=4:sw=4:et: // vim: ts=4:sw=4:et:
// vim6: fdl=1: // vim6: fdl=1:

22
tests/bootstrap.php
View File

@ -9,14 +9,34 @@
// class files of phpseclib require() other dependencies. // class files of phpseclib require() other dependencies.
set_include_path(implode(PATH_SEPARATOR, array( set_include_path(implode(PATH_SEPARATOR, array(
dirname(__FILE__) . '/../phpseclib/', dirname(__FILE__) . '/../phpseclib/',
dirname(__FILE__) . '/',
get_include_path(), get_include_path(),
))); )));
function phpseclib_is_includable($suffix)
{
foreach (explode(PATH_SEPARATOR, get_include_path()) as $prefix)
{
$ds = substr($prefix, -1) == DIRECTORY_SEPARATOR ? '' : DIRECTORY_SEPARATOR;
$file = $prefix . $ds . $suffix;
if (file_exists($file))
{
return true;
}
}
return false;
}
function phpseclib_autoload($class) function phpseclib_autoload($class)
{ {
$file = str_replace('_', '/', $class) . '.php'; $file = str_replace('_', '/', $class) . '.php';
require $file; if (phpseclib_is_includable($file))
{
require $file;
}
} }
spl_autoload_register('phpseclib_autoload'); spl_autoload_register('phpseclib_autoload');