Commit 827c5574 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Tolerate a SEQUENCE in DN components.

parent e0c8c089

crypto/asn1/asn1.h

+2 −0
Original line number Diff line number Diff line
@@ -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 \

crypto/asn1/tasn_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */