mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-25 11:20:03 +00:00
fix bad merge
This commit is contained in:
parent
c25dff2ef0
commit
c5d9534ada
@ -51,7 +51,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"paragonie/constant_time_encoding": "^1",
|
"paragonie/constant_time_encoding": "^1|^2",
|
||||||
"paragonie/random_compat": "^1.4|^2.0",
|
"paragonie/random_compat": "^1.4|^2.0",
|
||||||
"php": ">=5.6.1"
|
"php": ">=5.6.1"
|
||||||
},
|
},
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
use phpseclib3\Crypt\AES;
|
use phpseclib3\Crypt\AES;
|
||||||
use phpseclib3\Crypt\Common\BlockCipher;
|
use phpseclib3\Crypt\Common\BlockCipher;
|
||||||
use phpseclib3\Crypt\Rijndael;
|
use phpseclib3\Crypt\Rijndael;
|
||||||
|
use phpseclib3\Exception\InconsistentSetupException;
|
||||||
|
use phpseclib3\Exception\InsufficientSetupException;
|
||||||
|
|
||||||
abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
|
abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
|
||||||
{
|
{
|
||||||
@ -105,10 +107,11 @@ abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @group github451
|
* @group github451
|
||||||
* @expectedException \LengthException
|
|
||||||
*/
|
*/
|
||||||
public function testKeyPaddingAES()
|
public function testKeyPaddingAES()
|
||||||
{
|
{
|
||||||
|
$this->expectException('LengthException');
|
||||||
|
|
||||||
// same as the above - just with a different ciphertext
|
// same as the above - just with a different ciphertext
|
||||||
|
|
||||||
$aes = new AES('cbc');
|
$aes = new AES('cbc');
|
||||||
@ -347,11 +350,10 @@ abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
|
|||||||
$this->assertSame($aes->getKeyLength(), 192);
|
$this->assertSame($aes->getKeyLength(), 192);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\InconsistentSetupException
|
|
||||||
*/
|
|
||||||
public function testSetKeyLengthWithLargerKey()
|
public function testSetKeyLengthWithLargerKey()
|
||||||
{
|
{
|
||||||
|
$this->expectException(InconsistentSetupException::class);
|
||||||
|
|
||||||
$aes = new AES('cbc');
|
$aes = new AES('cbc');
|
||||||
$aes->setKeyLength(128);
|
$aes->setKeyLength(128);
|
||||||
$aes->setKey(str_repeat('a', 24));
|
$aes->setKey(str_repeat('a', 24));
|
||||||
@ -362,11 +364,10 @@ abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
|
|||||||
$this->assertSame($aes->getKeyLength(), 128);
|
$this->assertSame($aes->getKeyLength(), 128);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\InconsistentSetupException
|
|
||||||
*/
|
|
||||||
public function testSetKeyLengthWithSmallerKey()
|
public function testSetKeyLengthWithSmallerKey()
|
||||||
{
|
{
|
||||||
|
$this->expectException(InconsistentSetupException::class);
|
||||||
|
|
||||||
$aes = new AES('cbc');
|
$aes = new AES('cbc');
|
||||||
$aes->setKeyLength(256);
|
$aes->setKeyLength(256);
|
||||||
$aes->setKey(str_repeat('a', 16));
|
$aes->setKey(str_repeat('a', 16));
|
||||||
@ -408,11 +409,10 @@ abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
|
|||||||
$this->assertEquals($plaintext, $actual);
|
$this->assertEquals($plaintext, $actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\InsufficientSetupException
|
|
||||||
*/
|
|
||||||
public function testNoKey()
|
public function testNoKey()
|
||||||
{
|
{
|
||||||
|
$this->expectException(InsufficientSetupException::class);
|
||||||
|
|
||||||
$aes = new AES('cbc');
|
$aes = new AES('cbc');
|
||||||
$aes->setPreferredEngine($this->engine);
|
$aes->setPreferredEngine($this->engine);
|
||||||
$aes->setIV(str_repeat('x', 16));
|
$aes->setIV(str_repeat('x', 16));
|
||||||
|
@ -13,14 +13,14 @@ use phpseclib3\Crypt\DSA\Formats\Keys\PKCS1;
|
|||||||
use phpseclib3\Crypt\DSA\Formats\Keys\PKCS8;
|
use phpseclib3\Crypt\DSA\Formats\Keys\PKCS8;
|
||||||
use phpseclib3\Crypt\DSA\Formats\Keys\PuTTY;
|
use phpseclib3\Crypt\DSA\Formats\Keys\PuTTY;
|
||||||
use phpseclib3\Math\BigInteger;
|
use phpseclib3\Math\BigInteger;
|
||||||
|
use phpseclib3\Exception\NoKeyLoadedException;
|
||||||
|
|
||||||
class Unit_Crypt_DSA_LoadDSAKeyTest extends PhpseclibTestCase
|
class Unit_Crypt_DSA_LoadDSAKeyTest extends PhpseclibTestCase
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\NoKeyLoadedException
|
|
||||||
*/
|
|
||||||
public function testBadKey()
|
public function testBadKey()
|
||||||
{
|
{
|
||||||
|
$this->expectException(NoKeyLoadedException::class);
|
||||||
|
|
||||||
$key = 'zzzzzzzzzzzzzz';
|
$key = 'zzzzzzzzzzzzzz';
|
||||||
PublicKeyLoader::load($key);
|
PublicKeyLoader::load($key);
|
||||||
}
|
}
|
||||||
@ -156,11 +156,10 @@ Syea3pSvWdBpVhWzOX4A7qbxs+bhWAQWAhQiF7sFfCtZ7oOgCb2aJ9ySC9sTug==
|
|||||||
$this->assertInstanceOf(Parameters::class, $dsa->getParameters());
|
$this->assertInstanceOf(Parameters::class, $dsa->getParameters());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\NoKeyLoadedException
|
|
||||||
*/
|
|
||||||
public function testPuTTYBadMAC()
|
public function testPuTTYBadMAC()
|
||||||
{
|
{
|
||||||
|
$this->expectException(NoKeyLoadedException::class);
|
||||||
|
|
||||||
$key = 'PuTTY-User-Key-File-2: ssh-dss
|
$key = 'PuTTY-User-Key-File-2: ssh-dss
|
||||||
Encryption: none
|
Encryption: none
|
||||||
Comment: dsa-key-20161223
|
Comment: dsa-key-20161223
|
||||||
|
@ -27,7 +27,7 @@ Stf/0U65RhWgBwYFK4EEACKhZANiAASVZJGIs6m/TZhbFoTwBtpvU1JcyixD2YI3
|
|||||||
5YnoIx/6Q1oqJg1vrrmUoXaeEpaO6JH8RgItTl9lYMdmOk5309WJka6tI1QAAK3+
|
5YnoIx/6Q1oqJg1vrrmUoXaeEpaO6JH8RgItTl9lYMdmOk5309WJka6tI1QAAK3+
|
||||||
Jq9z4moG4whp3JsuiBQG9wnaHVrQPA4=
|
Jq9z4moG4whp3JsuiBQG9wnaHVrQPA4=
|
||||||
-----END EC PRIVATE KEY-----');
|
-----END EC PRIVATE KEY-----');
|
||||||
$this->assertSame('secp384r1', $key->getCurve());
|
$this->assertSameNL('secp384r1', $key->getCurve());
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem
|
// openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem
|
||||||
@ -38,9 +38,9 @@ MHQCAQEEIEzUawcXqUsQhaEQ51JLeOIY0ddzlO2nNgwDk32ETqwkoAcGBSuBBAAK
|
|||||||
oUQDQgAEFuVcVb9iCUhg2cknHPE+BouHGhQ39ORjMaMI3T4RfRxr6dj5HAXdEqVZ
|
oUQDQgAEFuVcVb9iCUhg2cknHPE+BouHGhQ39ORjMaMI3T4RfRxr6dj5HAXdEqVZ
|
||||||
1W94KMe30ndmTndcJ8BPeT1Dd15FdQ==
|
1W94KMe30ndmTndcJ8BPeT1Dd15FdQ==
|
||||||
-----END EC PRIVATE KEY-----');
|
-----END EC PRIVATE KEY-----');
|
||||||
$this->assertSame('secp256k1', $key->getCurve());
|
$this->assertSameNL('secp256k1', $key->getCurve());
|
||||||
//PKCS1::useNamedCurve();
|
//PKCS1::useNamedCurve();
|
||||||
$this->assertSame($expected, $key->toString('PKCS1'));
|
$this->assertSameNL($expected, $key->toString('PKCS1'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem -param_enc explicit
|
// openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem -param_enc explicit
|
||||||
@ -54,7 +54,7 @@ o8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu
|
|||||||
3OavSKA7v9JejNA2QUECAQGhRANCAASCTRhjXqmdbqphSdxNkfTNAOmDW5cZ5fnZ
|
3OavSKA7v9JejNA2QUECAQGhRANCAASCTRhjXqmdbqphSdxNkfTNAOmDW5cZ5fnZ
|
||||||
ys0Tk4pUv/XdiMZtVCGTNsotGeFbT5X64JkP/BFi3PVqjwy2VhOc
|
ys0Tk4pUv/XdiMZtVCGTNsotGeFbT5X64JkP/BFi3PVqjwy2VhOc
|
||||||
-----END EC PRIVATE KEY-----');
|
-----END EC PRIVATE KEY-----');
|
||||||
$this->assertSame('secp256k1', $key->getCurve());
|
$this->assertSameNL('secp256k1', $key->getCurve());
|
||||||
|
|
||||||
// this key and the above key have a few small differences.
|
// this key and the above key have a few small differences.
|
||||||
// in both keys the coefficient's are 0 and 7. in the above
|
// in both keys the coefficient's are 0 and 7. in the above
|
||||||
@ -75,7 +75,7 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAABwRBBHm+Zn753LusVaBilc6HCwcCm/zbLc4o
|
|||||||
E5w=
|
E5w=
|
||||||
-----END EC PRIVATE KEY-----';
|
-----END EC PRIVATE KEY-----';
|
||||||
PKCS1::useSpecifiedCurve();
|
PKCS1::useSpecifiedCurve();
|
||||||
$this->assertSame($expected, $key->toString('PKCS1'));
|
$this->assertSameNL($expected, $key->toString('PKCS1'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem
|
// openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem
|
||||||
@ -87,8 +87,8 @@ MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgAYCXwnhqMT6fCIKIkQ0w
|
|||||||
cac7QqHrn4TCQMF9a+im74WhRANCAATwCjyGuP8xQbvVjznqazL36oeAnD32I+X2
|
cac7QqHrn4TCQMF9a+im74WhRANCAATwCjyGuP8xQbvVjznqazL36oeAnD32I+X2
|
||||||
+wscW3OmyTDpk41HaWYPh+j+BoufsSkCwf8dBRGEQbCieZbbZogy
|
+wscW3OmyTDpk41HaWYPh+j+BoufsSkCwf8dBRGEQbCieZbbZogy
|
||||||
-----END PRIVATE KEY-----');
|
-----END PRIVATE KEY-----');
|
||||||
$this->assertSame('secp256k1', $key->getCurve());
|
$this->assertSameNL('secp256k1', $key->getCurve());
|
||||||
$this->assertSame($expected, $key->toString('PKCS8'));
|
$this->assertSameNL($expected, $key->toString('PKCS8'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem -param_enc explicit
|
// openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem -param_enc explicit
|
||||||
@ -104,7 +104,7 @@ IKFfw3vfd5pqA5SZOTFtpr7hdJoKP/rmTPMCggkAOA35oUQDQgAEnX66+UCzUW3T
|
|||||||
/fkLGIIfZjJm5bIMwAV85LpDom2hI441JRx+/W4WqtGuW+B/LABS6ZHp+qzepThC
|
/fkLGIIfZjJm5bIMwAV85LpDom2hI441JRx+/W4WqtGuW+B/LABS6ZHp+qzepThC
|
||||||
HsjS3Q9Pew==
|
HsjS3Q9Pew==
|
||||||
-----END PRIVATE KEY-----');
|
-----END PRIVATE KEY-----');
|
||||||
$this->assertSame('secp256k1', $key->getCurve());
|
$this->assertSameNL('secp256k1', $key->getCurve());
|
||||||
|
|
||||||
// see testPKCS1PrivateKeySpecifiedCurve for an explanation
|
// see testPKCS1PrivateKeySpecifiedCurve for an explanation
|
||||||
// of how this key and the above key differ
|
// of how this key and the above key differ
|
||||||
@ -119,7 +119,7 @@ AASdfrr5QLNRbdP9+QsYgh9mMmblsgzABXzkukOibaEjjjUlHH79bhaq0a5b4H8s
|
|||||||
AFLpken6rN6lOEIeyNLdD097
|
AFLpken6rN6lOEIeyNLdD097
|
||||||
-----END PRIVATE KEY-----';
|
-----END PRIVATE KEY-----';
|
||||||
PKCS8::useSpecifiedCurve();
|
PKCS8::useSpecifiedCurve();
|
||||||
$this->assertSame($expected, $key->toString('PKCS8'));
|
$this->assertSameNL($expected, $key->toString('PKCS8'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem
|
// openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem
|
||||||
@ -129,10 +129,10 @@ AFLpken6rN6lOEIeyNLdD097
|
|||||||
MEECAQEEDwBZdP4eSzKk/uQa6jdtfKAHBgUrgQQABKEiAyAABAHqCoNb++mK5qvE
|
MEECAQEEDwBZdP4eSzKk/uQa6jdtfKAHBgUrgQQABKEiAyAABAHqCoNb++mK5qvE
|
||||||
c4rCzQEuI19czqvXpEPcAWSXew==
|
c4rCzQEuI19czqvXpEPcAWSXew==
|
||||||
-----END EC PRIVATE KEY-----');
|
-----END EC PRIVATE KEY-----');
|
||||||
$this->assertSame('sect113r1', $key->getCurve());
|
$this->assertSameNL('sect113r1', $key->getCurve());
|
||||||
|
|
||||||
PKCS1::useNamedCurve();
|
PKCS1::useNamedCurve();
|
||||||
$this->assertSame($expected, $key->toString('PKCS1'));
|
$this->assertSameNL($expected, $key->toString('PKCS1'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem -param_enc explicit
|
// openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem -param_enc explicit
|
||||||
@ -145,7 +145,7 @@ AxUAEOcjqxTWluZ2h1YVF1b+v4/LSakEHwQAnXNhbzX0qxQH1zViwQ8ApSgwJ3lY
|
|||||||
7oTRMV7TGIYCDwEAAAAAAAAA2czsijnlbwIBAqEiAyAABAFC7c50y7uw+iuHeMCt
|
7oTRMV7TGIYCDwEAAAAAAAAA2czsijnlbwIBAqEiAyAABAFC7c50y7uw+iuHeMCt
|
||||||
WwCpKNBUcVeiHme609Dv/g==
|
WwCpKNBUcVeiHme609Dv/g==
|
||||||
-----END EC PRIVATE KEY-----');
|
-----END EC PRIVATE KEY-----');
|
||||||
$this->assertSame('sect113r1', $key->getCurve());
|
$this->assertSameNL('sect113r1', $key->getCurve());
|
||||||
|
|
||||||
// this key and the above key have a few small differences.
|
// this key and the above key have a few small differences.
|
||||||
// the above key has the (optional) seed for the verifiably
|
// the above key has the (optional) seed for the verifiably
|
||||||
@ -159,7 +159,7 @@ BACdc2FvNfSrFAfXNWLBDwClKDAneVjuhNExXtMYhgIPAQAAAAAAAADZzOyKOeVv
|
|||||||
oSIDIAAEAULtznTLu7D6K4d4wK1bAKko0FRxV6IeZ7rT0O/+
|
oSIDIAAEAULtznTLu7D6K4d4wK1bAKko0FRxV6IeZ7rT0O/+
|
||||||
-----END EC PRIVATE KEY-----';
|
-----END EC PRIVATE KEY-----';
|
||||||
PKCS1::useSpecifiedCurve();
|
PKCS1::useSpecifiedCurve();
|
||||||
$this->assertSame($expected, $key->toString('PKCS1'));
|
$this->assertSameNL($expected, $key->toString('PKCS1'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem
|
// openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem
|
||||||
@ -171,10 +171,10 @@ oSIDIAAEAULtznTLu7D6K4d4wK1bAKko0FRxV6IeZ7rT0O/+
|
|||||||
MFECAQAwEAYHKoZIzj0CAQYFK4EEAAQEOjA4AgEBBA8A5OuqAY8HYoFOaz9mE6mh
|
MFECAQAwEAYHKoZIzj0CAQYFK4EEAAQEOjA4AgEBBA8A5OuqAY8HYoFOaz9mE6mh
|
||||||
IgMgAAQASF3rOTPXvH0QdRBvsrMBdLMf27yd8AWABrZTxvI=
|
IgMgAAQASF3rOTPXvH0QdRBvsrMBdLMf27yd8AWABrZTxvI=
|
||||||
-----END PRIVATE KEY-----');
|
-----END PRIVATE KEY-----');
|
||||||
$this->assertSame('sect113r1', $key->getCurve());
|
$this->assertSameNL('sect113r1', $key->getCurve());
|
||||||
|
|
||||||
PKCS8::useNamedCurve();
|
PKCS8::useNamedCurve();
|
||||||
$this->assertSame($expected, $key->toString('PKCS8'));
|
$this->assertSameNL($expected, $key->toString('PKCS8'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem -param_enc explicit
|
// openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem -param_enc explicit
|
||||||
@ -188,7 +188,7 @@ AgMCAgEJMDcEDjCIJQym58f+ZJzoWCD3BA7ovuTT4iYHRBiL4OnHIwMVABDnI6sU
|
|||||||
Ag8BAAAAAAAAANnM7Io55W8CAQIEOjA4AgEBBA8AXtfDMRsRTx8snPbWHquhIgMg
|
Ag8BAAAAAAAAANnM7Io55W8CAQIEOjA4AgEBBA8AXtfDMRsRTx8snPbWHquhIgMg
|
||||||
AAQA9xdWGJ6vV23+vkdq0C8BLJVg5E3amMyf/5keGa4=
|
AAQA9xdWGJ6vV23+vkdq0C8BLJVg5E3amMyf/5keGa4=
|
||||||
-----END PRIVATE KEY-----');
|
-----END PRIVATE KEY-----');
|
||||||
$this->assertSame('sect113r1', $key->getCurve());
|
$this->assertSameNL('sect113r1', $key->getCurve());
|
||||||
|
|
||||||
// see testBinaryPKCS1PrivateKeySpecifiedCurve() for an
|
// see testBinaryPKCS1PrivateKeySpecifiedCurve() for an
|
||||||
// explanation of the differences between the above key
|
// explanation of the differences between the above key
|
||||||
@ -201,7 +201,7 @@ BA8AXtfDMRsRTx8snPbWHquhIgMgAAQA9xdWGJ6vV23+vkdq0C8BLJVg5E3amMyf
|
|||||||
/5keGa4=
|
/5keGa4=
|
||||||
-----END PRIVATE KEY-----';
|
-----END PRIVATE KEY-----';
|
||||||
PKCS8::useSpecifiedCurve();
|
PKCS8::useSpecifiedCurve();
|
||||||
$this->assertSame($expected, $key->toString('PKCS8'));
|
$this->assertSameNL($expected, $key->toString('PKCS8'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// openssl ecparam -name sect131r1 -genkey -noout -out sect131r1.pem -param_enc explicit
|
// openssl ecparam -name sect131r1 -genkey -noout -out sect131r1.pem -param_enc explicit
|
||||||
@ -215,7 +215,7 @@ AhfAVhCIS2O5xscpFnj500EDFQBNaW5naHVhUXWYW9OtutohtDqX4gQjBACBuvkf
|
|||||||
35gzxA+cGBNDY4OZB4xufqOMAB9zyBNLG0754VACEQQAAAAAAAAAAjEjlTqUZLVN
|
35gzxA+cGBNDY4OZB4xufqOMAB9zyBNLG0754VACEQQAAAAAAAAAAjEjlTqUZLVN
|
||||||
AgECoSYDJAAEBEIolGjo5lnsYqNagqYPOaEGOglkllDO2aWPtB6n+x/WXw==
|
AgECoSYDJAAEBEIolGjo5lnsYqNagqYPOaEGOglkllDO2aWPtB6n+x/WXw==
|
||||||
-----END EC PRIVATE KEY-----');
|
-----END EC PRIVATE KEY-----');
|
||||||
$this->assertSame('sect131r1', $key->getCurve());
|
$this->assertSameNL('sect131r1', $key->getCurve());
|
||||||
|
|
||||||
// see testBinaryPKCS1PrivateKeySpecifiedCurve() for an
|
// see testBinaryPKCS1PrivateKeySpecifiedCurve() for an
|
||||||
// explanation of the differences between the above key
|
// explanation of the differences between the above key
|
||||||
@ -228,7 +228,7 @@ SxtO+eFQAhEEAAAAAAAAAAIxI5U6lGS1TaEmAyQABARCKJRo6OZZ7GKjWoKmDzmh
|
|||||||
BjoJZJZQztmlj7Qep/sf1l8=
|
BjoJZJZQztmlj7Qep/sf1l8=
|
||||||
-----END EC PRIVATE KEY-----';
|
-----END EC PRIVATE KEY-----';
|
||||||
PKCS1::useSpecifiedCurve();
|
PKCS1::useSpecifiedCurve();
|
||||||
$this->assertSame($expected, $key->toString('PKCS1'));
|
$this->assertSameNL($expected, $key->toString('PKCS1'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// from https://tools.ietf.org/html/draft-ietf-curdle-pkix-07#section-10.1
|
// from https://tools.ietf.org/html/draft-ietf-curdle-pkix-07#section-10.1
|
||||||
@ -237,7 +237,7 @@ BjoJZJZQztmlj7Qep/sf1l8=
|
|||||||
$key = PublicKeyLoader::load('-----BEGIN PUBLIC KEY-----
|
$key = PublicKeyLoader::load('-----BEGIN PUBLIC KEY-----
|
||||||
MCowBQYDK2VwAyEAGb9ECWmEzf6FQbrBZ9w7lshQhqowtrbLDFw4rXAxZuE=
|
MCowBQYDK2VwAyEAGb9ECWmEzf6FQbrBZ9w7lshQhqowtrbLDFw4rXAxZuE=
|
||||||
-----END PUBLIC KEY-----');
|
-----END PUBLIC KEY-----');
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
|
|
||||||
// in the above key AlgorithmIdentifier has a single "child". in the
|
// in the above key AlgorithmIdentifier has a single "child". in the
|
||||||
// following key it has two. The second one is ("optional") NULL.
|
// following key it has two. The second one is ("optional") NULL.
|
||||||
@ -246,7 +246,7 @@ MCowBQYDK2VwAyEAGb9ECWmEzf6FQbrBZ9w7lshQhqowtrbLDFw4rXAxZuE=
|
|||||||
$expected = '-----BEGIN PUBLIC KEY-----
|
$expected = '-----BEGIN PUBLIC KEY-----
|
||||||
MCwwBwYDK2VwBQADIQAZv0QJaYTN/oVBusFn3DuWyFCGqjC2tssMXDitcDFm4Q==
|
MCwwBwYDK2VwBQADIQAZv0QJaYTN/oVBusFn3DuWyFCGqjC2tssMXDitcDFm4Q==
|
||||||
-----END PUBLIC KEY-----';
|
-----END PUBLIC KEY-----';
|
||||||
$this->assertSame($expected, $key->toString('PKCS8'));
|
$this->assertSameNL($expected, $key->toString('PKCS8'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// from https://tools.ietf.org/html/draft-ietf-curdle-pkix-07#section-10.3
|
// from https://tools.ietf.org/html/draft-ietf-curdle-pkix-07#section-10.3
|
||||||
@ -256,8 +256,8 @@ MCwwBwYDK2VwBQADIQAZv0QJaYTN/oVBusFn3DuWyFCGqjC2tssMXDitcDFm4Q==
|
|||||||
$key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
|
$key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
|
||||||
MC4CAQAwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC
|
MC4CAQAwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC
|
||||||
-----END PRIVATE KEY-----');
|
-----END PRIVATE KEY-----');
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
$this->assertSame('Ed25519', $key->getPublicKey()->getCurve());
|
$this->assertSameNL('Ed25519', $key->getPublicKey()->getCurve());
|
||||||
|
|
||||||
// with public key
|
// with public key
|
||||||
$key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
|
$key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
|
||||||
@ -265,8 +265,8 @@ MHICAQEwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC
|
|||||||
oB8wHQYKKoZIhvcNAQkJFDEPDA1DdXJkbGUgQ2hhaXJzgSEAGb9ECWmEzf6FQbrB
|
oB8wHQYKKoZIhvcNAQkJFDEPDA1DdXJkbGUgQ2hhaXJzgSEAGb9ECWmEzf6FQbrB
|
||||||
Z9w7lshQhqowtrbLDFw4rXAxZuE=
|
Z9w7lshQhqowtrbLDFw4rXAxZuE=
|
||||||
-----END PRIVATE KEY-----');
|
-----END PRIVATE KEY-----');
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
$this->assertSame('Ed25519', $key->getPublicKey()->getCurve());
|
$this->assertSameNL('Ed25519', $key->getPublicKey()->getCurve());
|
||||||
|
|
||||||
// the above key not only omits NULL - it also includes a
|
// the above key not only omits NULL - it also includes a
|
||||||
// unstructuredName attribute with a value of "Curdle Chairs"
|
// unstructuredName attribute with a value of "Curdle Chairs"
|
||||||
@ -275,12 +275,12 @@ Z9w7lshQhqowtrbLDFw4rXAxZuE=
|
|||||||
MFMCAQEwBwYDK2VwBQAEIgQg1O5y2/kTWErVttjx92n4rTr+fCjL8dT74Jeoj0R1
|
MFMCAQEwBwYDK2VwBQAEIgQg1O5y2/kTWErVttjx92n4rTr+fCjL8dT74Jeoj0R1
|
||||||
WEKBIQAZv0QJaYTN/oVBusFn3DuWyFCGqjC2tssMXDitcDFm4Q==
|
WEKBIQAZv0QJaYTN/oVBusFn3DuWyFCGqjC2tssMXDitcDFm4Q==
|
||||||
-----END PRIVATE KEY-----';
|
-----END PRIVATE KEY-----';
|
||||||
$this->assertSame($expected, $key->toString('PKCS8'));
|
$this->assertSameNL($expected, $key->toString('PKCS8'));
|
||||||
|
|
||||||
$expected = EC::createKey('Ed25519')->toString('PKCS8');
|
$expected = EC::createKey('Ed25519')->toString('PKCS8');
|
||||||
$key = PublicKeyLoader::load($expected);
|
$key = PublicKeyLoader::load($expected);
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
$this->assertSame('Ed25519', $key->getPublicKey()->getCurve());
|
$this->assertSameNL('Ed25519', $key->getPublicKey()->getCurve());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testPuTTYnistp256()
|
public function testPuTTYnistp256()
|
||||||
@ -296,16 +296,16 @@ Private-Lines: 1
|
|||||||
AAAAIQDwaPlajbXY1SxhuwsUqN1CEZ5g4adsbmJsKm+ZbUVm4g==
|
AAAAIQDwaPlajbXY1SxhuwsUqN1CEZ5g4adsbmJsKm+ZbUVm4g==
|
||||||
Private-MAC: b85ca0eb7c612df5d18af85128821bd53faaa3ef
|
Private-MAC: b85ca0eb7c612df5d18af85128821bd53faaa3ef
|
||||||
');
|
');
|
||||||
$this->assertSame('secp256r1', $key->getCurve());
|
$this->assertSameNL('secp256r1', $key->getCurve());
|
||||||
|
|
||||||
PuTTY::setComment('ecdsa-key-20181105');
|
PuTTY::setComment('ecdsa-key-20181105');
|
||||||
$this->assertSame($expected, $key->toString('PuTTY'));
|
$this->assertSameNL($expected, $key->toString('PuTTY'));
|
||||||
|
|
||||||
$key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJEXCsWA8s18m25MJlVE1urbXPYFi4q8oMbb2H0kE2f5WPxizsKXRmb1J68paXQizryL9fC4FTqICJ1+UnaPfk0= ecdsa-key-20181105');
|
$key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJEXCsWA8s18m25MJlVE1urbXPYFi4q8oMbb2H0kE2f5WPxizsKXRmb1J68paXQizryL9fC4FTqICJ1+UnaPfk0= ecdsa-key-20181105');
|
||||||
$this->assertSame('secp256r1', $key->getCurve());
|
$this->assertSameNL('secp256r1', $key->getCurve());
|
||||||
|
|
||||||
OpenSSH::setComment('ecdsa-key-20181105');
|
OpenSSH::setComment('ecdsa-key-20181105');
|
||||||
$this->assertSame($expected, $key->toString('OpenSSH'));
|
$this->assertSameNL($expected, $key->toString('OpenSSH'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testPuTTYnistp384()
|
public function testPuTTYnistp384()
|
||||||
@ -322,16 +322,16 @@ AAAAMQCEMkGMDg6N7bUqdvLXe0YmY4qBSi8hmAuMvU38RDoVFVmV+R4RYmMueyrX
|
|||||||
be9Oyus=
|
be9Oyus=
|
||||||
Private-MAC: 97a990a3d5f6b8f268d4be9c4ab9ebfd8fa79849
|
Private-MAC: 97a990a3d5f6b8f268d4be9c4ab9ebfd8fa79849
|
||||||
');
|
');
|
||||||
$this->assertSame('secp384r1', $key->getCurve());
|
$this->assertSameNL('secp384r1', $key->getCurve());
|
||||||
|
|
||||||
PuTTY::setComment('ecdsa-key-20181105');
|
PuTTY::setComment('ecdsa-key-20181105');
|
||||||
$this->assertSame($expected, $key->toString('PuTTY'));
|
$this->assertSameNL($expected, $key->toString('PuTTY'));
|
||||||
|
|
||||||
$key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBOI53wHG3CdcAJZq5PXWZAEAxxsNVFQlQgOX9toWEOgqQF5LbK2nWLKRvaHMzocUXaTYZDccSS0ATZFPT3j1Er1LU9cu4PHpyS07v262jdzkxIvKCPcAeISuV80MC7rHog== ecdsa-key-20181105');
|
$key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBOI53wHG3CdcAJZq5PXWZAEAxxsNVFQlQgOX9toWEOgqQF5LbK2nWLKRvaHMzocUXaTYZDccSS0ATZFPT3j1Er1LU9cu4PHpyS07v262jdzkxIvKCPcAeISuV80MC7rHog== ecdsa-key-20181105');
|
||||||
$this->assertSame('secp384r1', $key->getCurve());
|
$this->assertSameNL('secp384r1', $key->getCurve());
|
||||||
|
|
||||||
OpenSSH::setComment('ecdsa-key-20181105');
|
OpenSSH::setComment('ecdsa-key-20181105');
|
||||||
$this->assertSame($expected, $key->toString('OpenSSH'));
|
$this->assertSameNL($expected, $key->toString('OpenSSH'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -350,16 +350,16 @@ AAAAQgHJl8/dIArolFymdzhagXCfd2l8UF3CQXWGVGDQ0R04nnntlyztYiVdRXXK
|
|||||||
r84NnzS7dJcAsR9YaUOZ69NRKNiUAQ==
|
r84NnzS7dJcAsR9YaUOZ69NRKNiUAQ==
|
||||||
Private-MAC: 6d49ce289b85549a43d74422dd8bb3ba8798c72c
|
Private-MAC: 6d49ce289b85549a43d74422dd8bb3ba8798c72c
|
||||||
');
|
');
|
||||||
$this->assertSame('secp521r1', $key->getCurve());
|
$this->assertSameNL('secp521r1', $key->getCurve());
|
||||||
|
|
||||||
PuTTY::setComment('ecdsa-key-20181105');
|
PuTTY::setComment('ecdsa-key-20181105');
|
||||||
$this->assertSame($expected, $key->toString('PuTTY'));
|
$this->assertSameNL($expected, $key->toString('PuTTY'));
|
||||||
|
|
||||||
$key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAF1Eg0MjaJwooFj6HCNh4RWbvmQRY+sdczJyBdT3EaTc/6IUcCfW7w7rAeRp2CDdE9RlAVD8IuLqW7DJH06Xeov8wBO5G6jUqXu0rlHsOSiC6VcCxBJuWVNB1IorHnS7PX0f6HdLlIEme73P77drqpn5YY0XLtP6hFrF7H5XfCxpNyaJA== ecdsa-key-20181105');
|
$key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAF1Eg0MjaJwooFj6HCNh4RWbvmQRY+sdczJyBdT3EaTc/6IUcCfW7w7rAeRp2CDdE9RlAVD8IuLqW7DJH06Xeov8wBO5G6jUqXu0rlHsOSiC6VcCxBJuWVNB1IorHnS7PX0f6HdLlIEme73P77drqpn5YY0XLtP6hFrF7H5XfCxpNyaJA== ecdsa-key-20181105');
|
||||||
$this->assertSame('secp521r1', $key->getCurve());
|
$this->assertSameNL('secp521r1', $key->getCurve());
|
||||||
|
|
||||||
OpenSSH::setComment('ecdsa-key-20181105');
|
OpenSSH::setComment('ecdsa-key-20181105');
|
||||||
$this->assertSame($expected, $key->toString('OpenSSH'));
|
$this->assertSameNL($expected, $key->toString('OpenSSH'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testPuTTYed25519()
|
public function testPuTTYed25519()
|
||||||
@ -374,16 +374,16 @@ Private-Lines: 1
|
|||||||
AAAAIAHu1uI7dxFzo/SleEI2CekXKmgqlXwOgvfaRWxiX4Jd
|
AAAAIAHu1uI7dxFzo/SleEI2CekXKmgqlXwOgvfaRWxiX4Jd
|
||||||
Private-MAC: 8a06821a1c8b8b40fc40f876e543c4ea3fb81bb9
|
Private-MAC: 8a06821a1c8b8b40fc40f876e543c4ea3fb81bb9
|
||||||
');
|
');
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
|
|
||||||
PuTTY::setComment('ed25519-key-20181105');
|
PuTTY::setComment('ed25519-key-20181105');
|
||||||
$this->assertSame($expected, $key->toString('PuTTY'));
|
$this->assertSameNL($expected, $key->toString('PuTTY'));
|
||||||
|
|
||||||
$key = PublicKeyLoader::load($expected = 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6I6RyYAqtBcWXws9EDqGbhFtc5rKG4NMn/G7temQtu ed25519-key-20181105');
|
$key = PublicKeyLoader::load($expected = 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6I6RyYAqtBcWXws9EDqGbhFtc5rKG4NMn/G7temQtu ed25519-key-20181105');
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
|
|
||||||
OpenSSH::setComment('ed25519-key-20181105');
|
OpenSSH::setComment('ed25519-key-20181105');
|
||||||
$this->assertSame($expected, $key->toString('OpenSSH'));
|
$this->assertSameNL($expected, $key->toString('OpenSSH'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testlibsodium()
|
public function testlibsodium()
|
||||||
@ -395,12 +395,12 @@ Private-MAC: 8a06821a1c8b8b40fc40f876e543c4ea3fb81bb9
|
|||||||
$kp = sodium_crypto_sign_keypair();
|
$kp = sodium_crypto_sign_keypair();
|
||||||
|
|
||||||
$key = EC::loadFormat('libsodium', $expected = sodium_crypto_sign_secretkey($kp));
|
$key = EC::loadFormat('libsodium', $expected = sodium_crypto_sign_secretkey($kp));
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
$this->assertSame($expected, $key->toString('libsodium'));
|
$this->assertSameNL($expected, $key->toString('libsodium'));
|
||||||
|
|
||||||
$key = EC::loadFormat('libsodium', $expected = sodium_crypto_sign_publickey($kp));
|
$key = EC::loadFormat('libsodium', $expected = sodium_crypto_sign_publickey($kp));
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
$this->assertSame($expected, $key->toString('libsodium'));
|
$this->assertSameNL($expected, $key->toString('libsodium'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ssh-keygen -t ed25519
|
// ssh-keygen -t ed25519
|
||||||
@ -413,7 +413,7 @@ eQAAAAtzc2gtZWQyNTUxOQAAACCpm7dS1/WDTW+uuhp2+aFLPKaJle6+oJqDGLXhlQAX4A
|
|||||||
AAAEDltCTSbrr42IS4hhkS6ly0W2XItRQwxjLT+03bIyA+V6mbt1LX9YNNb666Gnb5oUs8
|
AAAEDltCTSbrr42IS4hhkS6ly0W2XItRQwxjLT+03bIyA+V6mbt1LX9YNNb666Gnb5oUs8
|
||||||
pomV7r6gmoMYteGVABfgAAAAD3ZhZ3JhbnRAdmFncmFudAECAwQFBg==
|
pomV7r6gmoMYteGVABfgAAAAD3ZhZ3JhbnRAdmFncmFudAECAwQFBg==
|
||||||
-----END OPENSSH PRIVATE KEY-----');
|
-----END OPENSSH PRIVATE KEY-----');
|
||||||
$this->assertSame('Ed25519', $key->getCurve());
|
$this->assertSameNL('Ed25519', $key->getCurve());
|
||||||
|
|
||||||
// testing this key is a little difficult because of this format's
|
// testing this key is a little difficult because of this format's
|
||||||
// two back to back checkint fields. both fields correspond to the
|
// two back to back checkint fields. both fields correspond to the
|
||||||
@ -423,7 +423,7 @@ pomV7r6gmoMYteGVABfgAAAAD3ZhZ3JhbnRAdmFncmFudAECAwQFBg==
|
|||||||
// none-the-less, because of the randomized component we can't easily
|
// none-the-less, because of the randomized component we can't easily
|
||||||
// see if the key string is equal to another known string
|
// see if the key string is equal to another known string
|
||||||
$key2 = PublicKeyLoader::load($key->toString('OpenSSH'));
|
$key2 = PublicKeyLoader::load($key->toString('OpenSSH'));
|
||||||
$this->assertSame('Ed25519', $key2->getCurve());
|
$this->assertSameNL('Ed25519', $key2->getCurve());
|
||||||
}
|
}
|
||||||
|
|
||||||
// from https://www.w3.org/TR/xmldsig-core/#sec-RFC4050Compat
|
// from https://www.w3.org/TR/xmldsig-core/#sec-RFC4050Compat
|
||||||
@ -438,7 +438,7 @@ pomV7r6gmoMYteGVABfgAAAAD3ZhZ3JhbnRAdmFncmFudAECAwQFBg==
|
|||||||
<Y Value="102403352136827775240910267217779508359028642524881540878079119895764161434936" />
|
<Y Value="102403352136827775240910267217779508359028642524881540878079119895764161434936" />
|
||||||
</PublicKey>
|
</PublicKey>
|
||||||
</ECDSAKeyValue>');
|
</ECDSAKeyValue>');
|
||||||
$this->assertSame('secp256r1', $key->getCurve());
|
$this->assertSameNL('secp256r1', $key->getCurve());
|
||||||
|
|
||||||
XML::enableRFC4050Syntax();
|
XML::enableRFC4050Syntax();
|
||||||
|
|
||||||
@ -452,14 +452,14 @@ pomV7r6gmoMYteGVABfgAAAAD3ZhZ3JhbnRAdmFncmFudAECAwQFBg==
|
|||||||
$dom->loadXML($key->toString('XML'));
|
$dom->loadXML($key->toString('XML'));
|
||||||
$actual = $dom->C14N();
|
$actual = $dom->C14N();
|
||||||
|
|
||||||
$this->assertSame($expected, $actual);
|
$this->assertSameNL($expected, $actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function assertSame($expected, $actual, $message = '')
|
public function assertSameNL($expected, $actual, $message = '')
|
||||||
{
|
{
|
||||||
$expected = str_replace("\r\n", "\n", $expected);
|
$expected = str_replace("\r\n", "\n", $expected);
|
||||||
$actual = str_replace("\r\n", "\n", $actual);
|
$actual = str_replace("\r\n", "\n", $actual);
|
||||||
return parent::assertSame($expected, $actual, $message);
|
$this->assertSame($expected, $actual, $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testOpenSSHPrivateEC()
|
public function testOpenSSHPrivateEC()
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
use phpseclib3\Crypt\Hash;
|
use phpseclib3\Crypt\Hash;
|
||||||
|
use phpseclib3\Exception\UnsupportedAlgorithmException;
|
||||||
|
|
||||||
class Unit_Crypt_HashTest extends PhpseclibTestCase
|
class Unit_Crypt_HashTest extends PhpseclibTestCase
|
||||||
{
|
{
|
||||||
@ -373,19 +374,17 @@ class Unit_Crypt_HashTest extends PhpseclibTestCase
|
|||||||
$this->assertSame($hash->getHash(), 'sha256');
|
$this->assertSame($hash->getHash(), 'sha256');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\UnsupportedAlgorithmException
|
|
||||||
*/
|
|
||||||
public function testConstructorArgumentInvalid()
|
public function testConstructorArgumentInvalid()
|
||||||
{
|
{
|
||||||
|
$this->expectException(UnsupportedAlgorithmException::class);
|
||||||
|
|
||||||
new Hash('abcdefghijklmnopqrst');
|
new Hash('abcdefghijklmnopqrst');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\UnsupportedAlgorithmException
|
|
||||||
*/
|
|
||||||
public function testSetHashInvalid()
|
public function testSetHashInvalid()
|
||||||
{
|
{
|
||||||
|
$this->expectException(UnsupportedAlgorithmException::class);
|
||||||
|
|
||||||
$hash = new Hash('md5');
|
$hash = new Hash('md5');
|
||||||
$hash->setHash('abcdefghijklmnopqrst-96');
|
$hash->setHash('abcdefghijklmnopqrst-96');
|
||||||
}
|
}
|
||||||
@ -465,22 +464,3 @@ class Unit_Crypt_HashTest extends PhpseclibTestCase
|
|||||||
$this->assertSame($hash->hash($message), pack('H*', $tag), $error);
|
$this->assertSame($hash->hash($message), pack('H*', $tag), $error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class HashTest extends Unit_Crypt_HashTest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\UnsupportedAlgorithmException
|
|
||||||
*/
|
|
||||||
public function testConstructorArgumentInvalid()
|
|
||||||
{
|
|
||||||
parent::testConstructorArgumentInvalid();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\UnsupportedAlgorithmException
|
|
||||||
*/
|
|
||||||
public function testSetHashInvalid()
|
|
||||||
{
|
|
||||||
parent::testSetHashInvalid();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -15,6 +15,8 @@ use phpseclib3\Crypt\RSA\Formats\Keys\PuTTY;
|
|||||||
use phpseclib3\Crypt\RSA\Formats\Keys\OpenSSH;
|
use phpseclib3\Crypt\RSA\Formats\Keys\OpenSSH;
|
||||||
use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
|
use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
|
||||||
use phpseclib3\Math\BigInteger;
|
use phpseclib3\Math\BigInteger;
|
||||||
|
use phpseclib3\Exception\UnsupportedFormatException;
|
||||||
|
use phpseclib3\Exception\NoKeyLoadedException;
|
||||||
|
|
||||||
class Unit_Crypt_RSA_LoadKeyTest extends PhpseclibTestCase
|
class Unit_Crypt_RSA_LoadKeyTest extends PhpseclibTestCase
|
||||||
{
|
{
|
||||||
@ -24,11 +26,10 @@ class Unit_Crypt_RSA_LoadKeyTest extends PhpseclibTestCase
|
|||||||
OpenSSH::setComment('phpseclib-generated-key');
|
OpenSSH::setComment('phpseclib-generated-key');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\NoKeyLoadedException
|
|
||||||
*/
|
|
||||||
public function testBadKey()
|
public function testBadKey()
|
||||||
{
|
{
|
||||||
|
$this->expectException(NoKeyLoadedException::class);
|
||||||
|
|
||||||
$key = 'zzzzzzzzzzzzzz';
|
$key = 'zzzzzzzzzzzzzz';
|
||||||
PublicKeyLoader::load($key);
|
PublicKeyLoader::load($key);
|
||||||
}
|
}
|
||||||
@ -1016,11 +1017,10 @@ YYFw8pfGesIFoEuVth4HKyF8k1y4mRUnYHP1XNMNMJl1JcEArC2asV8sHf6zSPVffozZ
|
|||||||
$this->assertInstanceOf(PublicKey::class, $key);
|
$this->assertInstanceOf(PublicKey::class, $key);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \phpseclib3\Exception\UnsupportedFormatException
|
|
||||||
*/
|
|
||||||
public function testSavePasswordXML()
|
public function testSavePasswordXML()
|
||||||
{
|
{
|
||||||
|
$this->expectException(UnsupportedFormatException::class);
|
||||||
|
|
||||||
$key = '-----BEGIN RSA PRIVATE KEY-----
|
$key = '-----BEGIN RSA PRIVATE KEY-----
|
||||||
MIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8Qu
|
MIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8Qu
|
||||||
KUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEm
|
KUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEm
|
||||||
|
@ -67,11 +67,10 @@ p0GbMJDyR4e9T04ZZwIDAQAB
|
|||||||
$this->assertTrue($rsa->verify('zzzz', $sig));
|
$this->assertTrue($rsa->verify('zzzz', $sig));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \LengthException
|
|
||||||
*/
|
|
||||||
public function testSmallModulo()
|
public function testSmallModulo()
|
||||||
{
|
{
|
||||||
|
$this->expectException('LengthException');
|
||||||
|
|
||||||
$plaintext = 'x';
|
$plaintext = 'x';
|
||||||
|
|
||||||
$key = PKCS8::savePublicKey(
|
$key = PKCS8::savePublicKey(
|
||||||
|
@ -7,11 +7,13 @@
|
|||||||
|
|
||||||
use \phpseclib3\Math\BigInteger\Engines\PHP64;
|
use \phpseclib3\Math\BigInteger\Engines\PHP64;
|
||||||
|
|
||||||
class Unit_Math_BigInteger_PHP64OpenSSLTest extends Unit_Math_BigInteger_PHP64Test
|
class Unit_Math_BigInteger_PHP64OpenSSLTest extends Unit_Math_BigInteger_TestCase
|
||||||
{
|
{
|
||||||
public static function setUpBeforeClass()
|
public static function setUpBeforeClass()
|
||||||
{
|
{
|
||||||
parent::setUpBeforeClass();
|
if (!PHP64::isValidEngine()) {
|
||||||
|
self::markTestSkipped('64-bit integers are not available.');
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PHP64::setModExpEngine('OpenSSL');
|
PHP64::setModExpEngine('OpenSSL');
|
||||||
@ -19,4 +21,22 @@ class Unit_Math_BigInteger_PHP64OpenSSLTest extends Unit_Math_BigInteger_PHP64Te
|
|||||||
self::markTestSkipped('openssl_public_encrypt() function is not available.');
|
self::markTestSkipped('openssl_public_encrypt() function is not available.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getInstance($x = 0, $base = 10)
|
||||||
|
{
|
||||||
|
return new PHP64($x, $base);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testInternalRepresentation()
|
||||||
|
{
|
||||||
|
$x = new PHP64('FFFFFFFFFFFFFFFFC90FDA', 16);
|
||||||
|
$y = new PHP64("$x");
|
||||||
|
|
||||||
|
$this->assertSame(self::getVar($x, 'value'), self::getVar($y, 'value'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getStaticClass()
|
||||||
|
{
|
||||||
|
return 'phpseclib3\Math\BigInteger\Engines\PHP64';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,19 +25,17 @@ then
|
|||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n setUpBeforeClass()/n setUpBeforeClass(): void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n setUpBeforeClass()/n setUpBeforeClass(): void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n setUp()/n setUp(): void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n setUp()/n setUp(): void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n tearDown()/n tearDown(): void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n tearDown()/n tearDown(): void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n assertSame()/n assertSame(): void/g'
|
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsArray([^)]*)\)/\1: void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsArray([^)]*)\)/\1: void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsString([^)]*)\)/\1: void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsString([^)]*)\)/\1: void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsResource([^)]*)\)/\1: void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsResource([^)]*)\)/\1: void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsObject([^)]*)\)/\1: void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsObject([^)]*)\)/\1: void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringContainsString([^)]*)\)/\1: void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringContainsString([^)]*)\)/\1: void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringNotContainsString([^)]*)\)/\1: void/g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringNotContainsString([^)]*)\)/\1: void/g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_Crypt_\(AES\|Hash\|RSA\)_/class /g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_Crypt_\(AES\|DSA\|EC\|RSA\)_/class /g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_File_\(X509\)_/class /g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_File_\(X509\)_/class /g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_Math_\(BigInteger\)_/class /g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_Math_\(BigInteger\)_/class /g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_\(Crypt\|File\|Math\|Net\)_/class /g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_\(Crypt\|File\|Math\|Net\)_/class /g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Functional_Net_/class /g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Functional_Net_/class /g'
|
||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/extends Unit_Crypt_Hash_\(SHA512Test\|SHA256Test\)/extends \1/g'
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '>=');"` = "1" ]
|
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '>=');"` = "1" ]
|
||||||
|
Loading…
Reference in New Issue
Block a user