From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 10 Apr 2008 11:12:42 +0000 (+0000)
Subject: Ignore nonsensical flags for signed receipts.
X-Git-Tag: OpenSSL_0_9_8k^2~452
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=eaee098e1f3204cdb9f44eee6c0a0f898f26049e

Ignore nonsensical flags for signed receipts.
---

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 1e778e866d..b18c789f64 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -426,6 +426,7 @@ int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
 			X509_STORE *store, unsigned int flags)
 	{
 	int r;
+	flags &= ~(CMS_DETACHED|CMS_TEXT);
 	r = CMS_verify(rcms, certs, store, NULL, NULL, flags);
 	if (r <= 0)
 		return r;
@@ -483,7 +484,7 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
 	BIO *rct_cont = NULL;
 	int r = 0;
 
-	flags &= ~CMS_STREAM;
+	flags &= ~(CMS_STREAM|CMS_TEXT);
 	/* Not really detached but avoids content being allocated */
 	flags |= CMS_PARTIAL|CMS_BINARY|CMS_DETACHED;
 	if (!pkey || !signcert)