From 1bf73255d408c124f786420cbe3245b3fb44a0a7 Mon Sep 17 00:00:00 2001 From: beck <> Date: Sat, 31 May 2014 20:16:31 +0000 Subject: Change the actual default for returned asn1 strings to be utf8 in the code, rather than only in the config file, to trip people up later. Found, and fix pleaded for by who apparently spent hours chasing it down. ok miod@ --- src/lib/libcrypto/asn1/a_strnid.c | 2 +- src/lib/libssl/src/crypto/asn1/a_strnid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/libcrypto/asn1/a_strnid.c b/src/lib/libcrypto/asn1/a_strnid.c index d1b804aec1..ac5c374d33 100644 --- a/src/lib/libcrypto/asn1/a_strnid.c +++ b/src/lib/libcrypto/asn1/a_strnid.c @@ -74,7 +74,7 @@ static int sk_table_cmp(const ASN1_STRING_TABLE * const *a, * certain software (e.g. Netscape) has problems with them. */ -static unsigned long global_mask = 0xFFFFFFFFL; +static unsigned long global_mask = B_ASN1_UTF8STRING; void ASN1_STRING_set_default_mask(unsigned long mask) diff --git a/src/lib/libssl/src/crypto/asn1/a_strnid.c b/src/lib/libssl/src/crypto/asn1/a_strnid.c index d1b804aec1..ac5c374d33 100644 --- a/src/lib/libssl/src/crypto/asn1/a_strnid.c +++ b/src/lib/libssl/src/crypto/asn1/a_strnid.c @@ -74,7 +74,7 @@ static int sk_table_cmp(const ASN1_STRING_TABLE * const *a, * certain software (e.g. Netscape) has problems with them. */ -static unsigned long global_mask = 0xFFFFFFFFL; +static unsigned long global_mask = B_ASN1_UTF8STRING; void ASN1_STRING_set_default_mask(unsigned long mask) -- cgit v1.2.3-55-g6feb