Commit e6ef05d5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make certs argument work in CMS_sign() add test case. 

PR:1664
parent 0f401ff0

crypto/cms/cms_smime.c

+4 −4
Original line number Diff line number Diff line
@@ -457,23 +457,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))

		CMS_set_detached(cms, 0);

test/cms-test.pl

+1 −0
Original line number Diff line number Diff line
@@ -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"