From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 18 Apr 2008 11:19:56 +0000 (+0000)
Subject: Update from HEAD.
X-Git-Tag: OpenSSL_0_9_8h~37
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d14089025989d7d1defe7d7e7f113883a2d243ca;p=oweals%2Fopenssl.git

Update from HEAD.
---

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index c42de11f9e..f79c504e91 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -462,23 +462,23 @@ CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
 	{
 	CMS_ContentInfo *cms;
 	int i;
+
 	cms = CMS_ContentInfo_new();
-	if (!cms)
+	if (!cms || !CMS_SignedData_init(cms))
 		goto merr;
+
 	if (pkey && !CMS_add1_signer(cms, signcert, pkey, NULL, flags))
 		{
 		CMSerr(CMS_F_CMS_SIGN, CMS_R_ADD_SIGNER_ERROR);
 		goto err;
 		}
+
 	for (i = 0; i < sk_X509_num(certs); i++)
 		{
 		X509 *x = sk_X509_value(certs, i);
 		if (!CMS_add1_cert(cms, x))
 			goto merr;
 		}
-	/* If no signer or certs initialize signedData */
-	if (!pkey && !i && !CMS_SignedData_init(cms))
-		goto merr;
 
 	if(!(flags & CMS_DETACHED))
 		{
diff --git a/test/cms-test.pl b/test/cms-test.pl
index 7421f1c19d..a84e089ddc 100644
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -81,6 +81,7 @@ my @smime_pkcs7_tests = (
     [
         "signed content DER format, RSA key",
         "-sign -in smcont.txt -outform DER -nodetach"
+          . " -certfile $smdir/smroot.pem"
           . " -signer $smdir/smrsa1.pem -out test.cms",
         "-verify -in test.cms -inform DER "
           . " -CAfile $smdir/smroot.pem -out smtst.txt"