From: Job Snijders Date: Tue, 17 Dec 2024 13:05:49 +0000 (+0000) Subject: Clean up ASN1_STRING comment and improve example in docs X-Git-Tag: openssl-3.1.8~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4901e66747a8877b9febefe38dc4e034adf6a38;p=thirdparty%2Fopenssl.git Clean up ASN1_STRING comment and improve example in docs Reviewed-by: Hugo Landau Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/26195) (cherry picked from commit 2e36bb07b50a1dc55f97aeccbec9fbc5048290d1) --- diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c index d052935661d..098b12d40eb 100644 --- a/crypto/asn1/a_strnid.c +++ b/crypto/asn1/a_strnid.c @@ -39,10 +39,10 @@ unsigned long ASN1_STRING_get_default_mask(void) * This function sets the default to various "flavours" of configuration. * based on an ASCII string. Currently this is: * MASK:XXXX : a numerical mask value. - * nobmp : Don't use BMPStrings (just Printable, T61). - * pkix : PKIX recommendation in RFC2459. - * utf8only : only use UTF8Strings (RFC2459 recommendation for 2004). - * default: the default value, Printable, T61, BMP. + * default : use Printable, IA5, T61, BMP, and UTF8 string types + * nombstr : any string type except variable-sized BMPStrings or UTF8Strings + * pkix : PKIX recommendation in RFC2459 + * utf8only : this is the default, use UTF8Strings */ int ASN1_STRING_set_default_mask_asc(const char *p) diff --git a/doc/man1/openssl-req.pod.in b/doc/man1/openssl-req.pod.in index a56f548de8e..c4a5312d873 100644 --- a/doc/man1/openssl-req.pod.in +++ b/doc/man1/openssl-req.pod.in @@ -638,7 +638,7 @@ Sample configuration file prompting for field values: attributes = req_attributes req_extensions = v3_ca - dirstring_type = nobmp + dirstring_type = nombstr [ req_distinguished_name ] countryName = Country Name (2 letter code)