octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 19:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it so loadCA() doesn't have to be called before loadX509() or loadCRL()

Browse Source
This commit is contained in:
terrafrost 2012-11-13 00:43:45 -06:00
parent d492d19748
commit 691f4d1e62
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpseclib/File/X509.php
View File

@ -1660,8 +1660,16 @@ class File_X509 {
*/ */
function loadCA($cert) function loadCA($cert)
{ {
$olddn = $this->dn;
$oldcert = $this->currentCert;
$oldsigsubj = $this->signatureSubject;
$cert = $this->loadX509($cert); $cert = $this->loadX509($cert);
if (!$cert) { if (!$cert) {
$this->dn = $olddn;
$this->currentCert = $oldcert;
$this->signatureSubject = $oldsigsubj;
return false; return false;
} }
@ -1690,8 +1698,10 @@ class File_X509 {
//} //}
$this->CAs[] = $cert; $this->CAs[] = $cert;
unset($this->currentCert);
unset($this->signatureSubject); $this->dn = $olddn;
$this->currentCert = $oldcert;
$this->signatureSubject = $oldsigsubj;
return true; return true;
} }