From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 10 Feb 2009 12:13:08 +0000 (+0000)
Subject: Submitted by: Peter Sylvester <Peter.Sylvester@edelweb.fr>
X-Git-Tag: OpenSSL_0_9_8k^2~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ede6ef5e0813e87b27648c32d1d6de212d967d4e;p=oweals%2Fopenssl.git

Submitted by: Peter Sylvester <Peter.Sylvester@edelweb.fr>
Reviewed by: steve

If tagging is universal and SET or SEQUENCE set constructed bit.
---

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 04395d2281..ec18cbff4f 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -245,8 +245,14 @@ ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf)
 	/* If IMPLICIT, output tag */
 
 	if (asn1_tags.imp_tag != -1)
+		{
+		if (asn1_tags.imp_class == V_ASN1_UNIVERSAL 
+		    && (asn1_tags.imp_tag == V_ASN1_SEQUENCE
+		     || asn1_tags.imp_tag == V_ASN1_SET) )
+			hdr_constructed = V_ASN1_CONSTRUCTED;
 		ASN1_put_object(&p, hdr_constructed, hdr_len,
 					asn1_tags.imp_tag, asn1_tags.imp_class);
+		}
 
 	/* Copy across original encoding */
 	memcpy(p, cpy_start, cpy_len);