[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  7f3e6f8c243710b8dc89f385196987ad83c7848d (commit)
      from  eb05f17344c6538d9ee48770d963ae2c1822d070 (commit)


- Log -----------------------------------------------------------------
commit 7f3e6f8c243710b8dc89f385196987ad83c7848d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Oct 18 00:54:13 2015 +0100

    set string type when embedding
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/tasn_new.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 33a8e97..6a2ad62 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -352,6 +352,7 @@ static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
         if (embed) {
             str = *(ASN1_STRING **)pval;
             memset(str, 0, sizeof(*str));
+            str->type = utype;
             str->flags = ASN1_STRING_FLAG_EMBED;
         } else {
             str = ASN1_STRING_type_new(utype);