| commit | 754106713fd349be267ec0dfe6f4f8a97c1b3cdb | [log] [tgz] |
|---|---|---|
| author | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Aug 08 09:50:01 2012 -0400 |
| committer | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Aug 08 09:50:01 2012 -0400 |
| tree | 767702dc681aea550f7c8c626e936e019981b7dc | |
| parent | ace91efcc58b8704c3e8e9c03e33afc1a59aecc3 [diff] [blame] |
#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/asn1/x_name.c b/jni/openssl/crypto/asn1/x_name.c index d7c2318..49be08b 100644 --- a/jni/openssl/crypto/asn1/x_name.c +++ b/jni/openssl/crypto/asn1/x_name.c
@@ -399,7 +399,8 @@ /* If type not in bitmask just copy string across */ if (!(ASN1_tag2bit(in->type) & ASN1_MASK_CANON)) { - if (!ASN1_STRING_copy(out, in)) + out->type = in->type; + if (!ASN1_STRING_set(out, in->data, in->length)) return 0; return 1; }