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

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2021-01-12 11:12:51 -06:00
commit b3bff1eb2c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Crypt/PublicKeyLoader.php
View File

@ -15,8 +15,8 @@
namespace phpseclib3\Crypt; namespace phpseclib3\Crypt;
use phpseclib3\Crypt\Common\AsymmetricKey;
use phpseclib3\Exception\NoKeyLoadedException; use phpseclib3\Exception\NoKeyLoadedException;
use phpseclib3\Crypt\Common\PrivateKey;
use phpseclib3\File\X509; use phpseclib3\File\X509;
/** /**

4
phpseclib/File/ASN1.php
View File

@ -826,7 +826,7 @@ abstract class ASN1
* *
* "Special" mappings can be applied via $special. * "Special" mappings can be applied via $special.
* *
* @param string $source * @param Element|string|array $source
* @param array $mapping * @param array $mapping
* @param array $special * @param array $special
* @return string * @return string
@ -841,7 +841,7 @@ abstract class ASN1
/** /**
* ASN.1 Encode (Helper function) * ASN.1 Encode (Helper function)
* *
* @param string $source * @param Element|string|array $source
* @param array $mapping * @param array $mapping
* @param int $idx * @param int $idx
* @param array $special * @param array $special

2
phpseclib/File/X509.php
View File

@ -3061,7 +3061,7 @@ class X509
-- http://tools.ietf.org/html/rfc5280#section-4.1.2.5 -- http://tools.ietf.org/html/rfc5280#section-4.1.2.5
*/ */
if (strtolower($date) == 'lifetime') { if (is_string($date) && strtolower($date) === 'lifetime') {
$temp = '99991231235959Z'; $temp = '99991231235959Z';
$temp = chr(ASN1::TYPE_GENERALIZED_TIME) . ASN1::encodeLength(strlen($temp)) . $temp; $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . ASN1::encodeLength(strlen($temp)) . $temp;
$this->endDate = new Element($temp); $this->endDate = new Element($temp);

8
tests/Unit/Crypt/DHTest.php
View File

@ -19,11 +19,11 @@ class Unit_Crypt_DHTest extends PhpseclibTestCase
{ {
$a = DH::createParameters('diffie-hellman-group1-sha1'); $a = DH::createParameters('diffie-hellman-group1-sha1');
$a = str_replace("\r\n", "\n", trim($a)); $a = str_replace("\r\n", "\n", trim($a));
$b = '-----BEGIN DH PARAMETERS----- $b = str_replace("\r\n", "\n", '-----BEGIN DH PARAMETERS-----
MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR
Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC /1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC
-----END DH PARAMETERS-----'; -----END DH PARAMETERS-----');
$this->assertSame($b, "$a"); $this->assertSame($b, "$a");
} }
@ -43,11 +43,11 @@ Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
$base = new BigInteger(2); $base = new BigInteger(2);
$a = DH::createParameters($prime, $base); $a = DH::createParameters($prime, $base);
$a = str_replace("\r\n", "\n", trim($a)); $a = str_replace("\r\n", "\n", trim($a));
$b = '-----BEGIN DH PARAMETERS----- $b = str_replace("\r\n", "\n", '-----BEGIN DH PARAMETERS-----
MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR
Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC /1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC
-----END DH PARAMETERS-----'; -----END DH PARAMETERS-----');
$this->assertSame($b, "$a"); $this->assertSame($b, "$a");
} }