Merge branch '2.0'

This commit is contained in:
terrafrost 2016-07-20 00:18:17 -05:00
commit d31c89a8ae

View File

@ -844,7 +844,7 @@ class ASN1
NOTE - The padding octets are for comparison purposes only and do not appear in the encodings."
-- sec 11.6 of http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf */
if ($mapping['type'] == FILE_ASN1_TYPE_SET) {
if ($mapping['type'] == self::TYPE_SET) {
sort($value);
}
$value = implode($value, '');