danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-11-30 04:39:02 +01:00
Code Issues Projects Releases Wiki Activity

Crypt: OpenSSL apparently supports variable size keys

Browse Source
This commit is contained in:
terrafrost 2017-01-24 07:04:59 -06:00
parent 43bbe485cc
commit 1bde98fc42
4 changed files with 86 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Crypt/Blowfish.php
View File

@ -390,7 +390,7 @@ class Crypt_Blowfish extends Crypt_Base
function isValidEngine($engine)
{
if ($engine == CRYPT_ENGINE_OPENSSL) {
if ($this->key_length != 16) {
if ($this->key_length < 16) {
return false;
}
$this->cipher_name_openssl_ecb = 'bf-ecb';

17
phpseclib/Crypt/RC4.php
View File

@ -189,21 +189,8 @@ class Crypt_RC4 extends Crypt_Base
*/
function isValidEngine($engine)
{
switch ($engine) {
case CRYPT_ENGINE_OPENSSL:
switch (strlen($this->key)) {
case 5:
$this->cipher_name_openssl = 'rc4-40';
break;
case 8:
$this->cipher_name_openssl = 'rc4-64';
break;
case 16:
$this->cipher_name_openssl = 'rc4';
break;
default:
return false;
}
if ($engine == CRYPT_ENGINE_OPENSSL) {
$this->cipher_name_openssl = 'rc4-40';
}
return parent::isValidEngine($engine);

44
tests/Unit/Crypt/BlowfishTest.php
View File

@ -6,6 +6,7 @@
*/
require_once 'Crypt/Blowfish.php';
require_once 'Crypt/Random.php';
class Unit_Crypt_BlowfishTest extends PhpseclibTestCase
{
@ -83,4 +84,47 @@ class Unit_Crypt_BlowfishTest extends PhpseclibTestCase
$plaintext = bin2hex($plaintext);
$this->assertEquals($result, $expected, "Failed asserting that $plaintext yielded expected output in $engineName engine");
}
public function testKeySizes()
{
$objects = $engines = array();
$temp = new Crypt_Blowfish(CRYPT_MODE_CTR);
$temp->setPreferredEngine(CRYPT_ENGINE_INTERNAL);
$objects[] = $temp;
$engines[] = 'internal';
if ($temp->isValidEngine(CRYPT_ENGINE_MCRYPT)) {
$temp = new Crypt_Blowfish(CRYPT_MODE_CTR);
$temp->setPreferredEngine(CRYPT_ENGINE_MCRYPT);
$objects[] = $temp;
$engines[] = 'mcrypt';
}
if ($temp->isValidEngine(CRYPT_ENGINE_OPENSSL)) {
$temp = new Crypt_Blowfish(CRYPT_MODE_CTR);
$temp->setPreferredEngine(CRYPT_ENGINE_OPENSSL);
$objects[] = $temp;
$engines[] = 'OpenSSL';
}
if (count($objects) < 2) {
self::markTestSkipped('Unable to initialize two or more engines');
}
for ($i = 0; $i < count($objects); $i++) {
$objects[$i]->setIV(str_repeat('x', $objects[$i]->getBlockLength() >> 3));
}
$plaintext = str_repeat('.', 100);
for ($keyLen = 4; $keyLen <= 56; $keyLen++) {
$key = crypt_random_string($keyLen);
$objects[0]->setKey($key);
$ref = $objects[0]->encrypt($plaintext);
for ($i = 1; $i < count($objects); $i++) {
$objects[$i]->setKey($key);
$this->assertEquals($ref, $objects[$i]->encrypt($plaintext), "Failed asserting that {$engines[$i]} yields the same output as the internal engine with a key size of $keyLen");
}
}
}
}

39
tests/Unit/Crypt/RC4Test.php
View File

@ -208,4 +208,43 @@ class Unit_Crypt_RC4Test extends PhpseclibTestCase
$result = $rc4->encrypt(str_repeat("\0", $offset + 16));
$this->assertEquals(bin2hex(substr($result, -16)), $expected, "Failed asserting that key $key yielded expected output at offset $offset in $engineName engine");
}
public function testKeySizes()
{
$objects = $engines = array();
$temp = new Crypt_RC4(CRYPT_MODE_CTR);
$temp->setPreferredEngine(CRYPT_ENGINE_INTERNAL);
$objects[] = $temp;
$engines[] = 'internal';
if ($temp->isValidEngine(CRYPT_ENGINE_MCRYPT)) {
$temp = new Crypt_RC4(CRYPT_MODE_CTR);
$temp->setPreferredEngine(CRYPT_ENGINE_MCRYPT);
$objects[] = $temp;
$engines[] = 'mcrypt';
}
if ($temp->isValidEngine(CRYPT_ENGINE_OPENSSL)) {
$temp = new Crypt_RC4(CRYPT_MODE_CTR);
$temp->setPreferredEngine(CRYPT_ENGINE_OPENSSL);
$objects[] = $temp;
$engines[] = 'OpenSSL';
}
if (count($objects) < 2) {
self::markTestSkipped('Unable to initialize two or more engines');
}
$plaintext = str_repeat('.', 100);
for ($keyLen = 5; $keyLen <= 256; $keyLen++) {
$key = crypt_random_string($keyLen);
$objects[0]->setKey($key);
$ref = $objects[0]->encrypt($plaintext);
for ($i = 1; $i < count($objects); $i++) {
$objects[$i]->setKey($key);
$this->assertEquals($ref, $objects[$i]->encrypt($plaintext), "Failed asserting that {$engines[$i]} yields the same output as the internal engine with a key size of $keyLen");
}
}
}
}