diff options
| author | Nils Larsch <nils@openssl.org> | 2006-01-14 09:21:33 +0000 |
|---|---|---|
| committer | Nils Larsch <nils@openssl.org> | 2006-01-14 09:21:33 +0000 |
| commit | 802d7fa6d5a41a0e27693781ba50b64b536739d8 (patch) | |
| tree | 6b7d0119859e89275415cb1bfe50d89dadc12526 | |
| parent | 3798cb818214ff3a75e44495278866febb555287 (diff) | |
| download | openssl-new-802d7fa6d5a41a0e27693781ba50b64b536739d8.tar.gz | |
support numeric strings in ASN1_generate_nconf
| -rw-r--r-- | crypto/asn1/asn1_gen.c | 3 | ||||
| -rw-r--r-- | doc/crypto/ASN1_generate_nconf.pod | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index e6e04a1cd7..dd5853c02f 100644 --- a/crypto/asn1/asn1_gen.c +++ b/crypto/asn1/asn1_gen.c @@ -584,6 +584,8 @@ static int asn1_str2tag(const char *tagstr, int len) ASN1_GEN_STR("TELETEXSTRING", V_ASN1_T61STRING), ASN1_GEN_STR("GeneralString", V_ASN1_GENERALSTRING), ASN1_GEN_STR("GENSTR", V_ASN1_GENERALSTRING), + ASN1_GEN_STR("NUMERIC", V_ASN1_NUMERICSTRING), + ASN1_GEN_STR("NUMERICSTRING", V_ASN1_NUMERICSTRING), /* Special cases */ ASN1_GEN_STR("SEQUENCE", V_ASN1_SEQUENCE), @@ -727,6 +729,7 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype) case V_ASN1_VISIBLESTRING: case V_ASN1_UNIVERSALSTRING: case V_ASN1_GENERALSTRING: + case V_ASN1_NUMERICSTRING: if (format == ASN1_GEN_FORMAT_ASCII) format = MBSTRING_ASC; diff --git a/doc/crypto/ASN1_generate_nconf.pod b/doc/crypto/ASN1_generate_nconf.pod index ba6e3c2e81..0ac0f16f49 100644 --- a/doc/crypto/ASN1_generate_nconf.pod +++ b/doc/crypto/ASN1_generate_nconf.pod @@ -97,7 +97,8 @@ 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<GeneralString> +B<T61STRING>, B<TELETEXSTRING>, B<GeneralString>, B<NUMERICSTRING>, +B<NUMERIC> These encode the corresponding string types. B<value> represents the contents of this structure. The format can be B<ASCII> or B<UTF8>. |