danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-04 18:48:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.0' into 3.0

Browse Source
This commit is contained in:
terrafrost 2020-03-02 10:57:07 -06:00
commit 6e55470431
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/File/ASN1.php
View File

@ -518,6 +518,10 @@ abstract class ASN1
*/ */
public static function asn1map($decoded, $mapping, $special = []) public static function asn1map($decoded, $mapping, $special = [])
{ {
if (!is_array($decoded)) {
return false;
}
if (isset($mapping['explicit']) && is_array($decoded['content'])) { if (isset($mapping['explicit']) && is_array($decoded['content'])) {
$decoded = $decoded['content'][0]; $decoded = $decoded['content'][0];
} }

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

@ -1047,4 +1047,18 @@ ut3+b2Xvzq8yzmHMFtLIJ6Afu1jJpqD82BUAFcvi5vhnP8M7b974R18WCOpgNQvXDI+2/8ZINeU=
$r = $x509->loadX509($r); $r = $x509->loadX509($r);
$this->assertSame($r['tbsCertificate']['extensions'][5]['extnValue']['excludedSubtrees'][1]['base']['iPAddress'], array('0.0.0.0', '0.0.0.0')); $this->assertSame($r['tbsCertificate']['extensions'][5]['extnValue']['excludedSubtrees'][1]['base']['iPAddress'], array('0.0.0.0', '0.0.0.0'));
} }
/**
* @group github1456
*/
public function testRandomString()
{
$a = 'da7e705569d4196cd49cf3b3d92cd435ca34ccbe';
$a = pack('H*', $a);
$x509 = new X509();
$r = $x509->loadX509($a);
$this->assertFalse($r);
}
} }