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

Set memory BIOs up properly when stripping text headers from S/MIME messages.

parent 31636a3e

crypto/cms/cms_smime.c

+3 −0
Original line number Diff line number Diff line
@@ -68,7 +68,10 @@ static int cms_copy_content(BIO *out, BIO *in, unsigned int flags) 
	if (out == NULL)

		tmpout = BIO_new(BIO_s_null());

	else if (flags & CMS_TEXT)

		{

		tmpout = BIO_new(BIO_s_mem());

		BIO_set_mem_eof_return(tmpout, 0);

		}

	else

		tmpout = out;

crypto/pkcs7/pk7_smime.c

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, 
			PKCS7err(PKCS7_F_PKCS7_VERIFY,ERR_R_MALLOC_FAILURE);

			goto err;

		}

		BIO_set_mem_eof_return(tmpout, 0);

	} else tmpout = out;



	/* We now have to 'read' from p7bio to calculate digests etc. */