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

ASN1: make developing new ASN.1 scripts a little easier

Browse Source
This commit is contained in:
terrafrost 2014-04-10 13:49:28 -05:00
parent c8bf68ac02
commit 61cd5e4f5a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpseclib/File/ASN1.php
View File

@ -509,7 +509,7 @@ class File_ASN1
*/ */
function asn1map($decoded, $mapping, $special = array()) function asn1map($decoded, $mapping, $special = array())
{ {
if (isset($mapping['explicit'])) { if (isset($mapping['explicit']) && is_array($decoded['content'])) {
$decoded = $decoded['content'][0]; $decoded = $decoded['content'][0];
} }
@ -550,8 +550,16 @@ class File_ASN1
case $decoded['type'] == $mapping['type']: case $decoded['type'] == $mapping['type']:
break; break;
default: default:
// if $decoded['type'] and $mapping['type'] are both strings, but different types of strings,
// let it through
switch (true) {
case $decoded['type'] < 18: // FILE_ASN1_TYPE_NUMERIC_STRING == 18
case $decoded['type'] > 30: // FILE_ASN1_TYPE_BMP_STRING == 30
case $mapping['type'] < 18:
case $mapping['type'] > 30:
return null; return null;
} }
}
if (isset($mapping['implicit'])) { if (isset($mapping['implicit'])) {
$decoded['type'] = $mapping['type']; $decoded['type'] = $mapping['type'];