octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 03:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASN1: asn1map(): fix handling of optional CHOICE and ANY children in SEQUENCE.

Browse Source
This commit is contained in:
monnerat 2012-10-12 01:04:24 +01:00
parent b05cff1320
commit a75de60478
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpseclib/File/ASN1.php
View File

@ -531,14 +531,9 @@ class File_ASN1 {
$temp = $decoded['content'][$i]; $temp = $decoded['content'][$i];
} }
} elseif (!isset($child['constant'])) { } elseif (!isset($child['constant'])) {
if ($child['type'] == FILE_ASN1_TYPE_CHOICE) {
$map[$key] = $this->asn1map($temp, $child);
$i++;
continue;
}
// we could do this, as well: // we could do this, as well:
// $buffer = $this->asn1map($temp, $child); if (isset($buffer)) { $map[$key] = $buffer; } // $buffer = $this->asn1map($temp, $child); if (isset($buffer)) { $map[$key] = $buffer; }
if ($child['type'] == $temp['type']) { if ($child['type'] == $temp['type'] || $child['type'] == FILE_ASN1_TYPE_ANY) {
$map[$key] = $this->asn1map($temp, $child); $map[$key] = $this->asn1map($temp, $child);
$i++; $i++;
if (count($decoded['content']) == $i) { if (count($decoded['content']) == $i) {