mirror of
https://github.com/phpseclib/phpseclib.git
synced 2025-01-26 08:38:29 +00:00
fix bad merge
This commit is contained in:
parent
7d2e44b430
commit
9220bcd49a
@ -90,21 +90,21 @@ class Unit_Crypt_BlowfishTest extends PhpseclibTestCase
|
||||
public function testKeySizes()
|
||||
{
|
||||
$objects = $engines = array();
|
||||
$temp = new Blowfish(Base::MODE_CTR);
|
||||
$temp->setPreferredEngine(Base::ENGINE_INTERNAL);
|
||||
$temp = new Blowfish(Blowfish::MODE_CTR);
|
||||
$temp->setPreferredEngine(Blowfish::ENGINE_INTERNAL);
|
||||
$objects[] = $temp;
|
||||
$engines[] = 'internal';
|
||||
|
||||
if ($temp->isValidEngine(Base::ENGINE_MCRYPT)) {
|
||||
$temp = new Blowfish(Base::MODE_CTR);
|
||||
$temp->setPreferredEngine(Base::ENGINE_MCRYPT);
|
||||
if ($temp->isValidEngine(Blowfish::ENGINE_MCRYPT)) {
|
||||
$temp = new Blowfish(Blowfish::MODE_CTR);
|
||||
$temp->setPreferredEngine(Blowfish::ENGINE_MCRYPT);
|
||||
$objects[] = $temp;
|
||||
$engines[] = 'mcrypt';
|
||||
}
|
||||
|
||||
if ($temp->isValidEngine(Base::ENGINE_OPENSSL)) {
|
||||
$temp = new Blowfish(Base::MODE_CTR);
|
||||
$temp->setPreferredEngine(Base::ENGINE_OPENSSL);
|
||||
if ($temp->isValidEngine(Blowfish::ENGINE_OPENSSL)) {
|
||||
$temp = new Blowfish(Blowfish::MODE_CTR);
|
||||
$temp->setPreferredEngine(Blowfish::ENGINE_OPENSSL);
|
||||
$objects[] = $temp;
|
||||
$engines[] = 'OpenSSL';
|
||||
}
|
||||
|
@ -214,21 +214,21 @@ class Unit_Crypt_RC4Test extends PhpseclibTestCase
|
||||
public function testKeySizes()
|
||||
{
|
||||
$objects = $engines = array();
|
||||
$temp = new RC4(Base::MODE_CTR);
|
||||
$temp->setPreferredEngine(Base::ENGINE_INTERNAL);
|
||||
$temp = new RC4(RC4::MODE_CTR);
|
||||
$temp->setPreferredEngine(RC4::ENGINE_INTERNAL);
|
||||
$objects[] = $temp;
|
||||
$engines[] = 'internal';
|
||||
|
||||
if ($temp->isValidEngine(Base::ENGINE_MCRYPT)) {
|
||||
$temp = new RC4(Base::MODE_CTR);
|
||||
$temp->setPreferredEngine(Base::ENGINE_MCRYPT);
|
||||
if ($temp->isValidEngine(RC4::ENGINE_MCRYPT)) {
|
||||
$temp = new RC4(RC4::MODE_CTR);
|
||||
$temp->setPreferredEngine(RC4::ENGINE_MCRYPT);
|
||||
$objects[] = $temp;
|
||||
$engines[] = 'mcrypt';
|
||||
}
|
||||
|
||||
if ($temp->isValidEngine(Base::ENGINE_OPENSSL)) {
|
||||
$temp = new RC4(Base::MODE_CTR);
|
||||
$temp->setPreferredEngine(Base::ENGINE_OPENSSL);
|
||||
if ($temp->isValidEngine(RC4::ENGINE_OPENSSL)) {
|
||||
$temp = new RC4(RC4::MODE_CTR);
|
||||
$temp->setPreferredEngine(RC4::ENGINE_OPENSSL);
|
||||
$objects[] = $temp;
|
||||
$engines[] = 'OpenSSL';
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user