mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-15 17:57:12 +00:00
Merge branch '3.0'
This commit is contained in:
commit
5fcb2d4e34
@ -485,7 +485,7 @@ abstract class PKCS8 extends PKCS
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ($public['publicKeyAlgorithm']['algorithm'] != static::OID_NAME) {
|
if ($public['publicKeyAlgorithm']['algorithm'] != static::OID_NAME) {
|
||||||
throw new UnsupportedAlgorithmException('Only ' . static::OID_NAME . ' keys are supported; this is a ' . $private['publicKeyAlgorithm']['algorithm'] . ' key');
|
throw new UnsupportedAlgorithmException('Only ' . static::OID_NAME . ' keys are supported; this is a ' . $public['publicKeyAlgorithm']['algorithm'] . ' key');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isset($public['publicKeyAlgorithm']['parameters']) && !$public['publicKeyAlgorithm']['parameters'] instanceof ASN1\Element && isset($decoded[0]['content'][0]['content'][1])) {
|
if (isset($public['publicKeyAlgorithm']['parameters']) && !$public['publicKeyAlgorithm']['parameters'] instanceof ASN1\Element && isset($decoded[0]['content'][0]['content'][1])) {
|
||||||
|
Loading…
Reference in New Issue
Block a user