octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into 3.0

This commit is contained in:
terrafrost 2024-02-24 13:23:11 -06:00
parent e17409a3e3 e67c9dd555
commit 0192fcc4aa
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpseclib/File/ASN1.php
View File

@ -1148,6 +1148,11 @@ abstract class ASN1
$oid = [];
$pos = 0;
$len = strlen($content);
// see https://github.com/openjdk/jdk/blob/2deb318c9f047ec5a4b160d66a4b52f93688ec42/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java#L55
if ($len > 4096) {
//user_error('Object Identifier size is limited to 4096 bytes');
return false;
}
if (ord($content[$len - 1]) & 0x80) {
return false;

BIN
tests/Unit/File/ASN1/mal-cert-02.der Normal file
View File

Binary file not shown.

13
tests/Unit/File/ASN1Test.php
View File

@ -450,4 +450,17 @@ class ASN1Test extends PhpseclibTestCase
$decoded = ASN1::decodeBER($em);
$this->assertNull($decoded);
}
public function testLongOID()
{
$cert = file_get_contents(dirname(__FILE__) . '/ASN1/mal-cert-02.der');
$asn1 = new ASN1();
//$this->setExpectedException('PHPUnit_Framework_Error_Notice');
$decoded = $asn1->decodeBER($cert);
$this->assertFalse($decoded[0]);
//$x509 = new X509();
//$x509->loadX509($cert);
}
}