aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/asn1
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2014-06-09 05:50:57 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2014-06-09 05:50:57 +0000
commit94ad176c6825318dda7216a27ac1be5527c1cb21 (patch)
tree3b5358dd257bf44bb4ea15442ad4bdb078b6795f /crypto/openssl/crypto/asn1
parent7f82c6c17f30a5aad5c29f342a9a28f672ce737f (diff)
parent2e22f5e2e00c1f1f599b03634ca27bb5b9ac471e (diff)
downloadsrc-94ad176c6825318dda7216a27ac1be5527c1cb21.tar.gz
src-94ad176c6825318dda7216a27ac1be5527c1cb21.zip
Merge OpenSSL 1.0.1h.
Approved by: so (delphij)
Notes
Notes: svn path=/head/; revision=267256
Diffstat (limited to 'crypto/openssl/crypto/asn1')
-rw-r--r--crypto/openssl/crypto/asn1/a_strnid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/asn1/a_strnid.c b/crypto/openssl/crypto/asn1/a_strnid.c
index 2fc48c1551a5..2afd5a41368d 100644
--- a/crypto/openssl/crypto/asn1/a_strnid.c
+++ b/crypto/openssl/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)
{