From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 11 Oct 2015 22:25:08 +0000 (+0100)
Subject: Handle embed flag in ASN1_STRING_copy().
X-Git-Tag: OpenSSL_1_1_0-pre1~421
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4002da0f52828dc4a495f7ac163d9e77c2774f3e;p=oweals%2Fopenssl.git

Handle embed flag in ASN1_STRING_copy().

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 12248dbf78..ef9223c485 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -284,7 +284,9 @@ int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str)
     dst->type = str->type;
     if (!ASN1_STRING_set(dst, str->data, str->length))
         return 0;
-    dst->flags = str->flags;
+    /* Copy flags but preserve embed value */
+    dst->flags &= ASN1_STRING_FLAG_EMBED;
+    dst->flags |= str->flags & ~ASN1_STRING_FLAG_EMBED;
     return 1;
 }