546bf97
diff -up openssl-1.0.1e/crypto/pkcs7/pk7_doit.c.missing-content openssl-1.0.1e/crypto/pkcs7/pk7_doit.c
546bf97
--- openssl-1.0.1e/crypto/pkcs7/pk7_doit.c.missing-content	2015-05-25 12:03:41.000000000 +0200
546bf97
+++ openssl-1.0.1e/crypto/pkcs7/pk7_doit.c	2015-06-09 15:21:21.377951520 +0200
546bf97
@@ -472,6 +472,12 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKE
546bf97
 	switch (i)
546bf97
 		{
546bf97
 	case NID_pkcs7_signed:
546bf97
+		/*
546bf97
+		 * p7->d.sign->contents is a PKCS7 structure consisting of a contentType
546bf97
+		 * field and optional content.
546bf97
+		 * data_body is NULL if that structure has no (=detached) content
546bf97
+		 * or if the contentType is wrong (i.e., not "data").
546bf97
+		 */
546bf97
 		data_body=PKCS7_get_octet_string(p7->d.sign->contents);
546bf97
 		if (!PKCS7_is_detached(p7) && data_body == NULL)
546bf97
 			{
546bf97
@@ -484,6 +490,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKE
546bf97
 	case NID_pkcs7_signedAndEnveloped:
546bf97
 		rsk=p7->d.signed_and_enveloped->recipientinfo;
546bf97
 		md_sk=p7->d.signed_and_enveloped->md_algs;
546bf97
+		/* data_body is NULL if the optional EncryptedContent is missing. */
546bf97
 		data_body=p7->d.signed_and_enveloped->enc_data->enc_data;
546bf97
 		enc_alg=p7->d.signed_and_enveloped->enc_data->algorithm;
546bf97
 		evp_cipher=EVP_get_cipherbyobj(enc_alg->algorithm);
546bf97
@@ -496,6 +503,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKE
546bf97
 	case NID_pkcs7_enveloped:
546bf97
 		rsk=p7->d.enveloped->recipientinfo;
546bf97
 		enc_alg=p7->d.enveloped->enc_data->algorithm;
546bf97
+		/* data_body is NULL if the optional EncryptedContent is missing. */
546bf97
 		data_body=p7->d.enveloped->enc_data->enc_data;
546bf97
 		evp_cipher=EVP_get_cipherbyobj(enc_alg->algorithm);
546bf97
 		if (evp_cipher == NULL)
546bf97
@@ -509,6 +517,13 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKE
546bf97
 	        goto err;
546bf97
 		}
546bf97
 
546bf97
+	/* Detached content must be supplied via in_bio instead. */
546bf97
+	if (data_body == NULL && in_bio == NULL)
546bf97
+		{
546bf97
+		PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT);
546bf97
+		goto err;
546bf97
+		}
546bf97
+
546bf97
 	/* We will be checking the signature */
546bf97
 	if (md_sk != NULL)
546bf97
 		{
546bf97
@@ -665,7 +680,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKE
546bf97
 		}
546bf97
 
546bf97
 #if 1
546bf97
-	if (PKCS7_is_detached(p7) || (in_bio != NULL))
546bf97
+	if (in_bio != NULL)
546bf97
 		{
546bf97
 		bio=in_bio;
546bf97
 		}