summaryrefslogtreecommitdiffstats
path: root/crypto/cms
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-11-21 18:18:28 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-11-21 18:18:28 +0000
commit14d4074ee1d328e6dd70ad010f6a0ae50887794d (patch)
treea4fce092f98d7a3ea242460734349a243c72f4c0 /crypto/cms
parentd9f16c405ca8db85753c99970112bfef19e622c0 (diff)
Update from HEAD.
Diffstat (limited to 'crypto/cms')
-rw-r--r--crypto/cms/cms_smime.c3
1 files changed, 3 insertions, 0 deletions
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;