aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/asn1
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2014-10-15 19:12:05 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2014-10-15 19:12:05 +0000
commitfa5fddf17153bfcd7ee6e86d24ca4b3f71689aa4 (patch)
treec23fa858f36ae42eb7fe9898b481a136f3f8733b /crypto/openssl/crypto/asn1
parent99b9076c210de967b6a9a34209b53285a8e64b3b (diff)
parent58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5 (diff)
downloadsrc-fa5fddf17153bfcd7ee6e86d24ca4b3f71689aa4.tar.gz
src-fa5fddf17153bfcd7ee6e86d24ca4b3f71689aa4.zip
Merge OpenSSL 1.0.1j.
Notes
Notes: svn path=/head/; revision=273144
Diffstat (limited to 'crypto/openssl/crypto/asn1')
-rw-r--r--crypto/openssl/crypto/asn1/a_strex.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/openssl/crypto/asn1/a_strex.c b/crypto/openssl/crypto/asn1/a_strex.c
index ead37ac32582..8fb4193bc0b2 100644
--- a/crypto/openssl/crypto/asn1/a_strex.c
+++ b/crypto/openssl/crypto/asn1/a_strex.c
@@ -568,6 +568,7 @@ int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in)
mbflag |= MBSTRING_FLAG;
stmp.data = NULL;
stmp.length = 0;
+ stmp.flags = 0;
ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag, B_ASN1_UTF8STRING);
if(ret < 0) return ret;
*out = stmp.data;