octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-27 00:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
terrafrost 2017-01-27 14:44:21 -06:00
parent 7d2e44b430
commit 9220bcd49a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,21 +90,21 @@ class Unit_Crypt_BlowfishTest extends PhpseclibTestCase
public function testKeySizes() public function testKeySizes()
{ {
$objects = $engines = array(); $objects = $engines = array();
$temp = new Blowfish(Base::MODE_CTR); $temp = new Blowfish(Blowfish::MODE_CTR);
$temp->setPreferredEngine(Base::ENGINE_INTERNAL); $temp->setPreferredEngine(Blowfish::ENGINE_INTERNAL);
$objects[] = $temp; $objects[] = $temp;
$engines[] = 'internal'; $engines[] = 'internal';
if ($temp->isValidEngine(Base::ENGINE_MCRYPT)) { if ($temp->isValidEngine(Blowfish::ENGINE_MCRYPT)) {
$temp = new Blowfish(Base::MODE_CTR); $temp = new Blowfish(Blowfish::MODE_CTR);
$temp->setPreferredEngine(Base::ENGINE_MCRYPT); $temp->setPreferredEngine(Blowfish::ENGINE_MCRYPT);
$objects[] = $temp; $objects[] = $temp;
$engines[] = 'mcrypt'; $engines[] = 'mcrypt';
} }
if ($temp->isValidEngine(Base::ENGINE_OPENSSL)) { if ($temp->isValidEngine(Blowfish::ENGINE_OPENSSL)) {
$temp = new Blowfish(Base::MODE_CTR); $temp = new Blowfish(Blowfish::MODE_CTR);
$temp->setPreferredEngine(Base::ENGINE_OPENSSL); $temp->setPreferredEngine(Blowfish::ENGINE_OPENSSL);
$objects[] = $temp; $objects[] = $temp;
$engines[] = 'OpenSSL'; $engines[] = 'OpenSSL';
} }

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

@ -214,21 +214,21 @@ class Unit_Crypt_RC4Test extends PhpseclibTestCase
public function testKeySizes() public function testKeySizes()
{ {
$objects = $engines = array(); $objects = $engines = array();
$temp = new RC4(Base::MODE_CTR); $temp = new RC4(RC4::MODE_CTR);
$temp->setPreferredEngine(Base::ENGINE_INTERNAL); $temp->setPreferredEngine(RC4::ENGINE_INTERNAL);
$objects[] = $temp; $objects[] = $temp;
$engines[] = 'internal'; $engines[] = 'internal';
if ($temp->isValidEngine(Base::ENGINE_MCRYPT)) { if ($temp->isValidEngine(RC4::ENGINE_MCRYPT)) {
$temp = new RC4(Base::MODE_CTR); $temp = new RC4(RC4::MODE_CTR);
$temp->setPreferredEngine(Base::ENGINE_MCRYPT); $temp->setPreferredEngine(RC4::ENGINE_MCRYPT);
$objects[] = $temp; $objects[] = $temp;
$engines[] = 'mcrypt'; $engines[] = 'mcrypt';
} }
if ($temp->isValidEngine(Base::ENGINE_OPENSSL)) { if ($temp->isValidEngine(RC4::ENGINE_OPENSSL)) {
$temp = new RC4(Base::MODE_CTR); $temp = new RC4(RC4::MODE_CTR);
$temp->setPreferredEngine(Base::ENGINE_OPENSSL); $temp->setPreferredEngine(RC4::ENGINE_OPENSSL);
$objects[] = $temp; $objects[] = $temp;
$engines[] = 'OpenSSL'; $engines[] = 'OpenSSL';
} }