diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 19:59:47 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 20:57:02 -0400 |
| commit | 8aa7b05b29941b07940857ff6f60bcc60eaa59a9 (patch) | |
| tree | acf3d988cfbd1977723f93285bda5152d096b92e /openssl/crypto/asn1 | |
| parent | d2d01e39531d9fb823b2271244c324aad0a6575d (diff) | |
| download | vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.gz vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.bz2 vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.zip | |
Update openssl to version openssl-1.0.1j
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/asn1')
| -rw-r--r-- | openssl/crypto/asn1/a_strex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openssl/crypto/asn1/a_strex.c b/openssl/crypto/asn1/a_strex.c index ead37ac32..8fb4193bc 100644 --- a/openssl/crypto/asn1/a_strex.c +++ b/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; |