mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-28 12:10:59 +00:00
X509: CSRs and CRLs didn't have the signatureSubject variable saved properly
This commit is contained in:
parent
661eb8db3f
commit
1abc7e742b
@ -2544,8 +2544,9 @@ class File_X509 {
|
|||||||
$temp = preg_replace('#^(?:[^-].+[\r\n]+)+|-.+-|[\r\n]| #', '', $csr);
|
$temp = preg_replace('#^(?:[^-].+[\r\n]+)+|-.+-|[\r\n]| #', '', $csr);
|
||||||
$temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
|
$temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
|
||||||
if ($temp != false) {
|
if ($temp != false) {
|
||||||
$orig = $csr = $temp;
|
$csr = $temp;
|
||||||
}
|
}
|
||||||
|
$orig = $csr;
|
||||||
|
|
||||||
if ($csr === false) {
|
if ($csr === false) {
|
||||||
$this->currentCert = false;
|
$this->currentCert = false;
|
||||||
@ -2641,8 +2642,9 @@ class File_X509 {
|
|||||||
$temp = preg_replace('#^(?:[^-].+[\r\n]+)+|-.+-|[\r\n]| #', '', $csr);
|
$temp = preg_replace('#^(?:[^-].+[\r\n]+)+|-.+-|[\r\n]| #', '', $csr);
|
||||||
$temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
|
$temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
|
||||||
if ($temp != false) {
|
if ($temp != false) {
|
||||||
$orig = $crl = $temp;
|
$crl = $temp;
|
||||||
}
|
}
|
||||||
|
$orig = $crl;
|
||||||
|
|
||||||
if ($crl === false) {
|
if ($crl === false) {
|
||||||
$this->currentCert = false;
|
$this->currentCert = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user