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

Fix from HEAD.

parent ae268485

crypto/pkcs7/pk7_smime.c

+2 −1
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, 
			PKCS7_add_certificate(p7, sk_X509_value(certs, i));

	}



	if(flags & PKCS7_DETACHED)PKCS7_set_detached(p7, 1);



	if(!(p7bio = PKCS7_dataInit(p7, NULL))) {

		PKCS7err(PKCS7_F_PKCS7_SIGN,ERR_R_MALLOC_FAILURE);

		return NULL;
@@ -133,7 +135,6 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, 
		}

	}



	if(flags & PKCS7_DETACHED)PKCS7_set_detached(p7, 1);



        if (!PKCS7_dataFinal(p7,p7bio)) {

		PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_DATASIGN);