Merge branch '3.0'

This commit is contained in:
terrafrost 2020-05-31 10:07:11 -05:00
commit 8c8863eca5

View File

@ -2194,12 +2194,12 @@ class X509
chunk_split(base64_encode($key), 64) .
"-----END PUBLIC KEY-----";
$this->publicKey = null;
$this->publicKey = $this->getPublicKey();
$this->currentKeyIdentifier = null;
$this->currentCert = $csr;
$this->publicKey = null;
$this->publicKey = $this->getPublicKey();
return $csr;
}
@ -2305,12 +2305,12 @@ class X509
chunk_split(base64_encode($key), 64) .
"-----END PUBLIC KEY-----";
$this->publicKey = null;
$this->publicKey = $this->getPublicKey();
$this->currentKeyIdentifier = null;
$this->currentCert = $spkac;
$this->publicKey = null;
$this->publicKey = $this->getPublicKey();
return $spkac;
}