Merge branch '3.0'

This commit is contained in:
terrafrost 2020-06-02 08:53:59 -05:00
commit dad0c699cd

View File

@ -2101,7 +2101,12 @@ class X509
}
if (isset($this->currentCert) && is_array($this->currentCert)) {
foreach (['tbsCertificate/subjectPublicKeyInfo', 'certificationRequestInfo/subjectPKInfo'] as $path) {
$paths = [
'tbsCertificate/subjectPublicKeyInfo',
'certificationRequestInfo/subjectPKInfo',
'publicKeyAndChallenge/spki'
];
foreach ($paths as $path) {
$keyinfo = $this->subArray($this->currentCert, $path);
if (!empty($keyinfo)) {
break;