From 9220bcd49a1f981791ee45f8e8178658c8951ed2 Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@php.net>
Date: Fri, 27 Jan 2017 14:44:21 -0600
Subject: [PATCH] fix bad merge

---
 tests/Unit/Crypt/BlowfishTest.php | 16 ++++++++--------
 tests/Unit/Crypt/RC4Test.php      | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/Unit/Crypt/BlowfishTest.php b/tests/Unit/Crypt/BlowfishTest.php
index a7b6a057..c516da25 100644
--- a/tests/Unit/Crypt/BlowfishTest.php
+++ b/tests/Unit/Crypt/BlowfishTest.php
@@ -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';
         }
diff --git a/tests/Unit/Crypt/RC4Test.php b/tests/Unit/Crypt/RC4Test.php
index b6a8760e..a8405354 100644
--- a/tests/Unit/Crypt/RC4Test.php
+++ b/tests/Unit/Crypt/RC4Test.php
@@ -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';
         }