mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-18 03:05:11 +00:00
Merge branch '2.0' into 3.0
This commit is contained in:
commit
1b954b7852
@ -391,11 +391,11 @@ abstract class TestCase extends PhpseclibTestCase
|
|||||||
{
|
{
|
||||||
$plaintext = str_repeat('x', 16);
|
$plaintext = str_repeat('x', 16);
|
||||||
|
|
||||||
$aes = new Crypt_Rijndael();
|
$aes = new Rijndael();
|
||||||
$aes->setKey(str_repeat('a', 19));
|
$aes->setKey(str_repeat('a', 19));
|
||||||
$this->assertSame($aes->getKeyLength(), 160);
|
$this->assertSame($aes->getKeyLength(), 160);
|
||||||
|
|
||||||
$ref = new Crypt_Rijndael();
|
$ref = new Rijndael();
|
||||||
$ref->setKey(str_repeat('a', 19) . "\0");
|
$ref->setKey(str_repeat('a', 19) . "\0");
|
||||||
$this->assertSame(
|
$this->assertSame(
|
||||||
bin2hex($aes->encrypt($plaintext)),
|
bin2hex($aes->encrypt($plaintext)),
|
||||||
@ -403,11 +403,11 @@ abstract class TestCase extends PhpseclibTestCase
|
|||||||
'actual and expected value do not match for 168 bit Rijndael'
|
'actual and expected value do not match for 168 bit Rijndael'
|
||||||
);
|
);
|
||||||
|
|
||||||
$aes = new Crypt_AES();
|
$aes = new AES();
|
||||||
$aes->setKey(str_repeat('a', 19));
|
$aes->setKey(str_repeat('a', 19));
|
||||||
$this->assertSame($aes->getKeyLength(), 192);
|
$this->assertSame($aes->getKeyLength(), 192);
|
||||||
|
|
||||||
$ref = new Crypt_AES();
|
$ref = new AES();
|
||||||
$ref->setKey(str_repeat('a', 19) . "\0\0\0\0\0");
|
$ref->setKey(str_repeat('a', 19) . "\0\0\0\0\0");
|
||||||
$this->assertSame(
|
$this->assertSame(
|
||||||
bin2hex($aes->encrypt($plaintext)),
|
bin2hex($aes->encrypt($plaintext)),
|
||||||
|
Loading…
Reference in New Issue
Block a user