octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into 3.0

Browse Source
This commit is contained in:
terrafrost 2019-09-18 08:46:54 -05:00
commit 666cde2b11
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,21 +370,21 @@ class Unit_File_ASN1Test extends PhpseclibTestCase
*/ */
public function testExplicitImplicitDate() public function testExplicitImplicitDate()
{ {
$map = [ $map = array(
'type' => ASN1::TYPE_SEQUENCE, 'type' => ASN1::TYPE_SEQUENCE,
'children' => [ 'children' => array(
'notBefore' => [ 'notBefore' => array(
'constant' => 0, 'constant' => 0,
'optional' => true, 'optional' => true,
'implicit' => true, 'implicit' => true,
'type' => ASN1::TYPE_GENERALIZED_TIME], 'type' => ASN1::TYPE_GENERALIZED_TIME),
'notAfter' => [ 'notAfter' => array(
'constant' => 1, 'constant' => 1,
'optional' => true, 'optional' => true,
'implicit' => true, 'implicit' => true,
'type' => ASN1::TYPE_GENERALIZED_TIME] 'type' => ASN1::TYPE_GENERALIZED_TIME)
] )
]; );
$a = pack('H*', '3026a011180f32303137303432313039303535305aa111180f32303138303432313230353935395a'); $a = pack('H*', '3026a011180f32303137303432313039303535305aa111180f32303138303432313230353935395a');
$a = ASN1::decodeBER($a); $a = ASN1::decodeBER($a);

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

@ -1001,6 +1001,6 @@ ut3+b2Xvzq8yzmHMFtLIJ6Afu1jJpqD82BUAFcvi5vhnP8M7b974R18WCOpgNQvXDI+2/8ZINeU=
-----END CERTIFICATE-----'); -----END CERTIFICATE-----');
$r = $x509->saveX509($r); $r = $x509->saveX509($r);
$r = $x509->loadX509($r); $r = $x509->loadX509($r);
$this->assertSame($r['tbsCertificate']['extensions'][5]['extnValue']['excludedSubtrees'][1]['base']['iPAddress'], ['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'));
} }
} }

4
tests/Unit/Math/BigInteger/TestCase.php
View File

@ -488,10 +488,10 @@ abstract class Unit_Math_BigInteger_TestCase extends PhpseclibTestCase
public function testNegativePrecision() public function testNegativePrecision()
{ {
$vals = [ $vals = array(
'-9223372036854775808', // eg. 8000 0000 0000 0000 '-9223372036854775808', // eg. 8000 0000 0000 0000
'-1' '-1'
]; );
foreach ($vals as $val) { foreach ($vals as $val) {
$x = $this->getInstance($val); $x = $this->getInstance($val);
$x->setPrecision(64); // ie. 8 bytes $x->setPrecision(64); // ie. 8 bytes