octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-02-04 12:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'asn1-class-fix' into asn1-class-fix-test

Browse Source
This commit is contained in:
terrafrost 2018-04-15 08:34:15 -05:00
commit 3f226be600
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -8,7 +8,7 @@
- SFTP: fix issue with extended attributes on 64-bit PHP installs (#1248) - SFTP: fix issue with extended attributes on 64-bit PHP installs (#1248)
- SSH2: more channel handling updates (#1200) - SSH2: more channel handling updates (#1200)
- X509: use anonymous functions in PHP >= 5.3.0 - X509: use anonymous functions in PHP >= 5.3.0
- X509: revise logic for validateLogic (#1213) - X509: revise logic for validateSignature (#1213)
- X509: fix 7.2 error when extensions were removed and new ones added (#1243) - X509: fix 7.2 error when extensions were removed and new ones added (#1243)
- fix float to int conversions on ARM CPU's (#1220) - fix float to int conversions on ARM CPU's (#1220)

4
phpseclib/File/ASN1.php
View File

@ -666,7 +666,7 @@ class File_ASN1
$childClass = $tempClass = FILE_ASN1_CLASS_UNIVERSAL; $childClass = $tempClass = FILE_ASN1_CLASS_UNIVERSAL;
$constant = null; $constant = null;
if (isset($temp['constant'])) { if (isset($temp['constant'])) {
$tempClass = isset($temp['class']) ? $temp['class'] : FILE_ASN1_CLASS_CONTEXT_SPECIFIC; $tempClass = $temp['type'];
} }
if (isset($child['class'])) { if (isset($child['class'])) {
$childClass = $child['class']; $childClass = $child['class'];
@ -729,7 +729,7 @@ class File_ASN1
$temp = $decoded['content'][$i]; $temp = $decoded['content'][$i];
$tempClass = FILE_ASN1_CLASS_UNIVERSAL; $tempClass = FILE_ASN1_CLASS_UNIVERSAL;
if (isset($temp['constant'])) { if (isset($temp['constant'])) {
$tempClass = isset($temp['class']) ? $temp['class'] : FILE_ASN1_CLASS_CONTEXT_SPECIFIC; $tempClass = $temp['type'];
} }
foreach ($mapping['children'] as $key => $child) { foreach ($mapping['children'] as $key => $child) {

2
phpseclib/File/X509.php
View File

@ -3698,7 +3698,7 @@ class File_X509
'tbsCertificate' => 'tbsCertificate' =>
array( array(
'version' => 'v3', 'version' => 'v3',
'serialNumber' => $serialNumber, // $this->setserialNumber() 'serialNumber' => $serialNumber, // $this->setSerialNumber()
'signature' => array('algorithm' => $signatureAlgorithm), 'signature' => array('algorithm' => $signatureAlgorithm),
'issuer' => false, // this is going to be overwritten later 'issuer' => false, // this is going to be overwritten later
'validity' => array( 'validity' => array(