octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-09-19 11:09:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source 
* 2.0:
  X509: set one more parameter to null
  X509: set another parameters field to null
This commit is contained in:
Andreas Fischer 2015-06-30 12:27:06 +02:00
commit 8cad45cd6b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpseclib/File/X509.php
View File

@ -1491,6 +1491,9 @@ class X509
it seems like perhaps the ASN.1 description ought not say the parameters field is OPTIONAL, but whatever. it seems like perhaps the ASN.1 description ought not say the parameters field is OPTIONAL, but whatever.
*/ */
$cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = null; $cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = null;
// https://tools.ietf.org/html/rfc3279#section-2.2.1
$cert['signatureAlgorithm']['parameters'] = null;
$cert['tbsCertificate']['signature']['parameters'] = null;
} }
} }

2
tests/Unit/File/X509/X509Test.php
View File

@ -140,6 +140,8 @@ aBtsWpliLSex/HHhtRW9AkBGcq67zKmEpJ9kXcYLEjJii3flFS+Ct/rNm+Hhm1l7
$cert = $x509->loadX509($cert); $cert = $x509->loadX509($cert);
$this->assertArrayHasKey('parameters', $cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']); $this->assertArrayHasKey('parameters', $cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']);
$this->assertArrayHasKey('parameters', $cert['signatureAlgorithm']);
$this->assertArrayHasKey('parameters', $cert['tbsCertificate']['signature']);
} }
private function _encodeOID($oid) private function _encodeOID($oid)