diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-02-19 13:44:47 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-02-19 13:44:47 +0000 |
| commit | 827c55741ba86495805486faeac98271fc1091b2 (patch) | |
| tree | 8723e23c53c86c3ffac4367f0e5ce1e2767a97f0 /crypto/asn1 | |
| parent | e0c8c08936660c49664909d4e29e142817681f52 (diff) | |
| download | openssl-827c55741ba86495805486faeac98271fc1091b2.tar.gz | |
Tolerate a SEQUENCE in DN components.
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/asn1.h | 2 | ||||
| -rw-r--r-- | crypto/asn1/tasn_dec.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 8b09dcda87..821a17a62a 100644 --- 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 @@ -591,6 +592,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 4fcc8e86a6..0eefcfb6e0 100644 --- 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 */ |