octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-14 18:59:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from monnerat/crl

Browse Source 
ASN1: Fix default value optimization upon encoding.
This commit is contained in:
terrafrost 2012-10-19 05:14:11 -07:00
commit ecd9512ea8
1 changed files with 25 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
phpseclib/File/ASN1.php
View File

@ -728,8 +728,8 @@ class File_ASN1 {
return $source->element; return $source->element;
} }
// do not encode optional fields with value set to default // do not encode (implicitly optional) fields with value set to default
if (!empty($mapping['optional']) && isset($mapping['default']) && $source === $mapping['default']) { if (isset($mapping['default']) && $source === $mapping['default']) {
return ''; return '';
} }
@ -740,6 +740,7 @@ class File_ASN1 {
$tag = $mapping['type']; $tag = $mapping['type'];
switch ($tag) { switch ($tag) {
case FILE_ASN1_TYPE_SET: // Children order is not important, thus process in sequence.
case FILE_ASN1_TYPE_SEQUENCE: case FILE_ASN1_TYPE_SEQUENCE:
$tag|= 0x20; // set the constructed bit $tag|= 0x20; // set the constructed bit
$value = ''; $value = '';
@ -766,13 +767,19 @@ class File_ASN1 {
continue; continue;
} }
// if isset($child['constant']) is true then isset($child['optional']) should be true as well
if (isset($child['constant'])) {
$temp = $this->_encode_der($source[$key], $child, $key); $temp = $this->_encode_der($source[$key], $child, $key);
if ($temp === false) { if ($temp === false) {
return false; return false;
} }
// An empty child encoding means it has been optimized out.
// Else we should have at least one tag byte.
if ($temp === '') {
continue;
}
// if isset($child['constant']) is true then isset($child['optional']) should be true as well
if (isset($child['constant'])) {
/* /*
From X.680-0207.pdf#page=58 (30.6): From X.680-0207.pdf#page=58 (30.6):
@ -789,65 +796,10 @@ class File_ASN1 {
$subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']); $subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
$temp = $subtag . substr($temp, 1); $temp = $subtag . substr($temp, 1);
} }
} else {
$temp = $this->_encode_der($source[$key], $child, $key);
if ($temp === false) {
return false;
}
} }
$value.= $temp; $value.= $temp;
} }
break; break;
// the main diff between sets and sequences is the encapsulation of the foreach in another for loop
case FILE_ASN1_TYPE_SET:
$tag|= 0x20;
$value = '';
// ignore the min and max
if (isset($mapping['min']) && isset($mapping['max'])) {
$child = $mapping['children'];
foreach ($source as $content) {
$temp = $this->_encode_der($content, $child);
if ($temp === false) {
return false;
}
$value.= $temp;
}
break;
}
for ($i = 0; $i < count($source[$key]); $i++) {
foreach ($mapping['children'] as $key => $child) {
if (!isset($source[$key])) {
if (!isset($child['optional'])) {
return false;
}
continue;
}
// if isset($child['constant']) is true then isset($child['optional']) should be true as well
if (isset($child['constant'])) {
$temp = $this->_encode_der($source[$key][$i], $child, $key);
if ($temp === false) {
return false;
}
if (isset($child['explicit']) || $child['type'] == FILE_ASN1_TYPE_CHOICE) {
$subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
$temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
} else {
$subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
$temp = $subtag . substr($temp, 1);
}
} else {
$temp = $this->_encode_der($source[$key][$i], $child, $key);
if ($temp === false) {
return false;
}
}
$value.= $temp;
}
}
break;
case FILE_ASN1_TYPE_CHOICE: case FILE_ASN1_TYPE_CHOICE:
$temp = false; $temp = false;
@ -857,13 +809,20 @@ class File_ASN1 {
} }
$temp = $this->_encode_der($source[$key], $child, $key); $temp = $this->_encode_der($source[$key], $child, $key);
if ($temp === false) {
return false;
}
// An empty child encoding means it has been optimized out.
// Else we should have at least one tag byte.
if ($temp === '') {
continue;
}
$tag = ord($temp[0]); $tag = ord($temp[0]);
// if isset($child['constant']) is true then isset($child['optional']) should be true as well // if isset($child['constant']) is true then isset($child['optional']) should be true as well
if (isset($child['constant'])) { if (isset($child['constant'])) {
if ($temp === false) {
return false;
}
if (isset($child['explicit']) || $child['type'] == FILE_ASN1_TYPE_CHOICE) { if (isset($child['explicit']) || $child['type'] == FILE_ASN1_TYPE_CHOICE) {
$subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']); $subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
$temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp; $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
@ -871,10 +830,6 @@ class File_ASN1 {
$subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']); $subtag = chr((FILE_ASN1_CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
$temp = $subtag . substr($temp, 1); $temp = $subtag . substr($temp, 1);
} }
} else {
if ($temp === false) {
return false;
}
} }
} }
@ -882,7 +837,7 @@ class File_ASN1 {
array_pop($this->location); array_pop($this->location);
} }
if (isset($mapping['cast'])) { if ($temp && isset($mapping['cast'])) {
$temp[0] = chr(($mapping['class'] << 6) | ($tag & 0x20) | $mapping['cast']); $temp[0] = chr(($mapping['class'] << 6) | ($tag & 0x20) | $mapping['cast']);
} }