generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from HEAD.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2008-11-21 18:18:28 +00:00
parent d9f16c405c
commit 14d4074ee1
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/cms/cms_smime.c
View File

@@ -68,7 +68,10 @@ static int cms_copy_content(BIO *out, BIO *in, unsigned int flags)
if (out == NULL) if (out == NULL)
tmpout = BIO_new(BIO_s_null()); tmpout = BIO_new(BIO_s_null());
else if (flags & CMS_TEXT) else if (flags & CMS_TEXT)
{
tmpout = BIO_new(BIO_s_mem()); tmpout = BIO_new(BIO_s_mem());
BIO_set_mem_eof_return(tmpout, 0);
}
else else
tmpout = out; tmpout = out;

1
crypto/pkcs7/pk7_smime.c
View File

@@ -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); PKCS7err(PKCS7_F_PKCS7_VERIFY,ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
BIO_set_mem_eof_return(tmpout, 0);
} else tmpout = out; } else tmpout = out;
/* We now have to 'read' from p7bio to calculate digests etc. */ /* We now have to 'read' from p7bio to calculate digests etc. */