From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 11 Feb 2003 14:06:27 +0000 (+0000)
Subject: GeneralString support in mini-ASN1 compiler
X-Git-Tag: BEN_FIPS_TEST_1~38^2~324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8f5b2ed50f0aedc618d0364fa5b517b50216f48;p=thirdparty%2Fopenssl.git

GeneralString support in mini-ASN1 compiler
---

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 097b4b8ecfe..3d9d2ce07b9 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -578,6 +578,8 @@ static int asn1_str2tag(const char *tagstr, int len)
 		ASN1_GEN_STR("T61", V_ASN1_T61STRING),
 		ASN1_GEN_STR("T61STRING", V_ASN1_T61STRING),
 		ASN1_GEN_STR("TELETEXSTRING", V_ASN1_T61STRING),
+		ASN1_GEN_STR("GeneralString", V_ASN1_GENERALSTRING),
+		ASN1_GEN_STR("GENSTR", V_ASN1_GENERALSTRING),
 
 		/* Special cases */
 		ASN1_GEN_STR("SEQUENCE", V_ASN1_SEQUENCE),
diff --git a/doc/crypto/ASN1_generate_nconf.pod b/doc/crypto/ASN1_generate_nconf.pod
index b4c89377f6a..ba6e3c2e814 100644
--- a/doc/crypto/ASN1_generate_nconf.pod
+++ b/doc/crypto/ASN1_generate_nconf.pod
@@ -97,7 +97,7 @@ bits is set to zero.
 =item B<UNIVERSALSTRING>, B<UNIV>, B<IA5>, B<IA5STRING>, B<UTF8>,
 B<UTF8String>, B<BMP>, B<BMPSTRING>, B<VISIBLESTRING>,
 B<VISIBLE>, B<PRINTABLESTRING>, B<PRINTABLE>, B<T61>,
-B<T61STRING>, B<TELETEXSTRING>
+B<T61STRING>, B<TELETEXSTRING>, B<GeneralString>
 
 These encode the corresponding string types. B<value> represents the
 contents of this structure. The format can be B<ASCII> or B<UTF8>.