From adc378bb69e23185e1b03e34a1235ade6a857b98 Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@php.net>
Date: Thu, 21 Sep 2023 15:16:25 -0500
Subject: [PATCH 1/2] Tests/Rijndael: update tests to work with 2.0 branch

---
 tests/Unit/Crypt/AES/TestCase.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Unit/Crypt/AES/TestCase.php b/tests/Unit/Crypt/AES/TestCase.php
index a243e0f4..1099a51e 100644
--- a/tests/Unit/Crypt/AES/TestCase.php
+++ b/tests/Unit/Crypt/AES/TestCase.php
@@ -380,11 +380,11 @@ abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
     {
         $plaintext = str_repeat('x', 16);
 
-        $aes = new Crypt_Rijndael();
+        $aes = new Rijndael();
         $aes->setKey(str_repeat('a', 19));
         $this->assertSame($aes->getKeyLength(), 160);
 
-        $ref = new Crypt_Rijndael();
+        $ref = new Rijndael();
         $ref->setKey(str_repeat('a', 19) . "\0");
         $this->assertSame(
             bin2hex($aes->encrypt($plaintext)),
@@ -392,11 +392,11 @@ abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
             'actual and expected value do not match for 168 bit Rijndael'
         );
 
-        $aes = new Crypt_AES();
+        $aes = new AES();
         $aes->setKey(str_repeat('a', 19));
         $this->assertSame($aes->getKeyLength(), 192);
 
-        $ref = new Crypt_AES();
+        $ref = new AES();
         $ref->setKey(str_repeat('a', 19) . "\0\0\0\0\0");
         $this->assertSame(
             bin2hex($aes->encrypt($plaintext)),

From eb456ee3198a6a89812380cae1830d5e5951195b Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@php.net>
Date: Thu, 21 Sep 2023 15:17:30 -0500
Subject: [PATCH 2/2] Tests/AES: rm test from 3.0 branch as 3.0 is super strict
 with size

---
 tests/Unit/Crypt/AES/TestCase.php | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/tests/Unit/Crypt/AES/TestCase.php b/tests/Unit/Crypt/AES/TestCase.php
index 74d8875f..e42fbc3f 100644
--- a/tests/Unit/Crypt/AES/TestCase.php
+++ b/tests/Unit/Crypt/AES/TestCase.php
@@ -387,35 +387,6 @@ abstract class TestCase extends PhpseclibTestCase
         $this->assertSame($aes->getKeyLength(), 256);
     }
 
-    public function testInvalidLengthKeyWithAES()
-    {
-        $plaintext = str_repeat('x', 16);
-
-        $aes = new Rijndael();
-        $aes->setKey(str_repeat('a', 19));
-        $this->assertSame($aes->getKeyLength(), 160);
-
-        $ref = new Rijndael();
-        $ref->setKey(str_repeat('a', 19) . "\0");
-        $this->assertSame(
-            bin2hex($aes->encrypt($plaintext)),
-            bin2hex($ref->encrypt($plaintext)),
-            'actual and expected value do not match for 168 bit Rijndael'
-        );
-
-        $aes = new AES();
-        $aes->setKey(str_repeat('a', 19));
-        $this->assertSame($aes->getKeyLength(), 192);
-
-        $ref = new AES();
-        $ref->setKey(str_repeat('a', 19) . "\0\0\0\0\0");
-        $this->assertSame(
-            bin2hex($aes->encrypt($plaintext)),
-            bin2hex($ref->encrypt($plaintext)),
-            'actual and expected value do not match for 168 bit AES'
-        );
-    }
-
     /**
      * @group github938
      */