Fix from HEAD.

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 88dd1edb98054d2c7332573cb2de0da739138f91..30f1eecd5b90bb47ecea31573be97a20bdbe6643 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -149,6 +149,7 @@ extern "C" {
 #define B_ASN1_UTF8STRING      0x2000
 #define B_ASN1_UTCTIME         0x4000
 #define B_ASN1_GENERALIZEDTIME 0x8000
+#define B_ASN1_SEQUENCE                0x10000
 
 /* For use with ASN1_mbstring_copy() */
 #define MBSTRING_FLAG          0x1000
@@ -594,6 +595,7 @@ typedef struct BIT_STRING_BITNAME_st {
                        B_ASN1_UNIVERSALSTRING|\
                        B_ASN1_BMPSTRING|\
                        B_ASN1_UTF8STRING|\
+                       B_ASN1_SEQUENCE|\
                        B_ASN1_UNKNOWN
 
 #define B_ASN1_DIRECTORYSTRING \

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 73dad048bea18f80dac8d1f66a214941dd290133..f8b27cffdbf4e8a094387a3d29ed09c90e8f9012 100644 (file)
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -98,7 +98,7 @@ static unsigned long tag2bit[32] = {
 B_ASN1_OCTET_STRING,   0,      0,              B_ASN1_UNKNOWN,/* tags  4- 7 */
 B_ASN1_UNKNOWN,        B_ASN1_UNKNOWN, B_ASN1_UNKNOWN, B_ASN1_UNKNOWN,/* tags  8-11 */
 B_ASN1_UTF8STRING,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,/* tags 12-15 */
-0,     0,      B_ASN1_NUMERICSTRING,B_ASN1_PRINTABLESTRING,   /* tags 16-19 */
+B_ASN1_SEQUENCE,0,B_ASN1_NUMERICSTRING,B_ASN1_PRINTABLESTRING, /* tags 16-19 */
 B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,       /* tags 20-22 */
 B_ASN1_UTCTIME, B_ASN1_GENERALIZEDTIME,                               /* tags 23-24 */ 
 B_ASN1_GRAPHICSTRING,B_ASN1_ISO64STRING,B_ASN1_GENERALSTRING,  /* tags 25-27 */