From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 1 Jun 2004 20:00:26 +0000 (+0000)
Subject: - bugfix from openssl CVS
X-Git-Tag: auto/ac/openssl-0_9_7d-3~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=commitdiff_plain;h=548ff2c306ece0585e38ff3fac66ca04cf429b26

- bugfix from openssl CVS

Changed files:
    openssl-smime.patch -> 1.1
---

diff --git a/openssl-smime.patch b/openssl-smime.patch
new file mode 100644
index 0000000..907ca4e
--- /dev/null
+++ b/openssl-smime.patch
@@ -0,0 +1,23 @@
+From openssl CVS, "Make S/MIME encrypt work again."
+--- openssl-0.9.7d/crypto/pkcs7/pk7_doit.c.orig	2003-11-10 02:29:27.000000000 +0100
++++ openssl-0.9.7d/crypto/pkcs7/pk7_doit.c	2004-06-01 21:42:38.199995776 +0200
+@@ -257,10 +257,15 @@
+ 			bio=BIO_new(BIO_s_null());
+ 		else
+ 			{
+-			ASN1_OCTET_STRING *os;
+-			os = PKCS7_get_octet_string(p7->d.sign->contents);
+-			if (os && os->length > 0)
+-				bio = BIO_new_mem_buf(os->data, os->length);
++			if (PKCS7_type_is_signed(p7))
++				{
++				ASN1_OCTET_STRING *os;
++				os = PKCS7_get_octet_string(
++							p7->d.sign->contents);
++				if (os && os->length > 0)
++					bio = BIO_new_mem_buf(os->data,
++								os->length);
++				}
+ 			if(bio == NULL)
+ 				{
+ 				bio=BIO_new(BIO_s_mem());