mirror of
https://github.com/danog/phpseclib.git
synced 2024-12-15 02:17:04 +01:00
Merge branch '3.0'
This commit is contained in:
commit
8c8863eca5
@ -2194,12 +2194,12 @@ class X509
|
|||||||
chunk_split(base64_encode($key), 64) .
|
chunk_split(base64_encode($key), 64) .
|
||||||
"-----END PUBLIC KEY-----";
|
"-----END PUBLIC KEY-----";
|
||||||
|
|
||||||
$this->publicKey = null;
|
|
||||||
$this->publicKey = $this->getPublicKey();
|
|
||||||
|
|
||||||
$this->currentKeyIdentifier = null;
|
$this->currentKeyIdentifier = null;
|
||||||
$this->currentCert = $csr;
|
$this->currentCert = $csr;
|
||||||
|
|
||||||
|
$this->publicKey = null;
|
||||||
|
$this->publicKey = $this->getPublicKey();
|
||||||
|
|
||||||
return $csr;
|
return $csr;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2305,12 +2305,12 @@ class X509
|
|||||||
chunk_split(base64_encode($key), 64) .
|
chunk_split(base64_encode($key), 64) .
|
||||||
"-----END PUBLIC KEY-----";
|
"-----END PUBLIC KEY-----";
|
||||||
|
|
||||||
$this->publicKey = null;
|
|
||||||
$this->publicKey = $this->getPublicKey();
|
|
||||||
|
|
||||||
$this->currentKeyIdentifier = null;
|
$this->currentKeyIdentifier = null;
|
||||||
$this->currentCert = $spkac;
|
$this->currentCert = $spkac;
|
||||||
|
|
||||||
|
$this->publicKey = null;
|
||||||
|
$this->publicKey = $this->getPublicKey();
|
||||||
|
|
||||||
return $spkac;
|
return $spkac;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user