diff options
| author | beck <> | 2014-05-31 20:16:31 +0000 |
|---|---|---|
| committer | beck <> | 2014-05-31 20:16:31 +0000 |
| commit | 1bf73255d408c124f786420cbe3245b3fb44a0a7 (patch) | |
| tree | 9ac0a3b0a8b89dddb2da2e885fe78127ad6bed2b | |
| parent | abc09e7ca58bc425caf1f38342e5f0453cfcbc43 (diff) | |
| download | openbsd-1bf73255d408c124f786420cbe3245b3fb44a0a7.tar.gz openbsd-1bf73255d408c124f786420cbe3245b3fb44a0a7.tar.bz2 openbsd-1bf73255d408c124f786420cbe3245b3fb44a0a7.zip | |
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 <spider@skuggor.se> who apparently
spent hours chasing it down.
ok miod@
| -rw-r--r-- | src/lib/libcrypto/asn1/a_strnid.c | 2 | ||||
| -rw-r--r-- | 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, | |||
| 74 | * certain software (e.g. Netscape) has problems with them. | 74 | * certain software (e.g. Netscape) has problems with them. |
| 75 | */ | 75 | */ |
| 76 | 76 | ||
| 77 | static unsigned long global_mask = 0xFFFFFFFFL; | 77 | static unsigned long global_mask = B_ASN1_UTF8STRING; |
| 78 | 78 | ||
| 79 | void | 79 | void |
| 80 | ASN1_STRING_set_default_mask(unsigned long mask) | 80 | 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, | |||
| 74 | * certain software (e.g. Netscape) has problems with them. | 74 | * certain software (e.g. Netscape) has problems with them. |
| 75 | */ | 75 | */ |
| 76 | 76 | ||
| 77 | static unsigned long global_mask = 0xFFFFFFFFL; | 77 | static unsigned long global_mask = B_ASN1_UTF8STRING; |
| 78 | 78 | ||
| 79 | void | 79 | void |
| 80 | ASN1_STRING_set_default_mask(unsigned long mask) | 80 | ASN1_STRING_set_default_mask(unsigned long mask) |