From 14d4074ee1d328e6dd70ad010f6a0ae50887794d Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 21 Nov 2008 18:18:28 +0000 Subject: [PATCH] Update from HEAD. --- crypto/cms/cms_smime.c | 3 +++ crypto/pkcs7/pk7_smime.c | 1 + 2 files changed, 4 insertions(+) diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index b35d28d411..b9463f9abb 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -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; diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index a6b13517fe..c34db1d6fe 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -282,6 +282,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. */ -- 2.25.1