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 branch 'crypt-fix-old-openssl' into 2.0

Browse Source
This commit is contained in:
terrafrost 2017-05-13 23:21:14 -05:00
commit 9fc9d2fa19
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpseclib/Crypt/Blowfish.php
View File

@ -317,6 +317,9 @@ class Blowfish extends Base
function isValidEngine($engine) function isValidEngine($engine)
{ {
if ($engine == self::ENGINE_OPENSSL) { if ($engine == self::ENGINE_OPENSSL) {
if (version_compare(PHP_VERSION, '5.3.7') < 0 && $this->key_length != 16) {
return false;
}
if ($this->key_length < 16) { if ($this->key_length < 16) {
return false; return false;
} }

18
phpseclib/Crypt/RC4.php
View File

@ -145,7 +145,23 @@ class RC4 extends Base
function isValidEngine($engine) function isValidEngine($engine)
{ {
if ($engine == Base::ENGINE_OPENSSL) { if ($engine == Base::ENGINE_OPENSSL) {
$this->cipher_name_openssl = 'rc4-40'; if (version_compare(PHP_VERSION, '5.3.7') >= 0) {
$this->cipher_name_openssl = 'rc4-40';
} else {
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;
}
}
} }
return parent::isValidEngine($engine); return parent::isValidEngine($engine);