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

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2019-09-18 08:42:47 -05:00
commit 4027717852
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -2,6 +2,8 @@ language: php
matrix:
include:
- php: 5.3
dist: precise
- php: 5.4
dist: precise
- php: 5.5.9

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

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

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

@ -795,6 +795,6 @@ ut3+b2Xvzq8yzmHMFtLIJ6Afu1jJpqD82BUAFcvi5vhnP8M7b974R18WCOpgNQvXDI+2/8ZINeU=
-----END CERTIFICATE-----');
$r = $x509->saveX509($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

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