summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs7
diff options
context:
space:
mode:
authorDmitry Belyavskiy <beldmit@gmail.com>2020-10-07 13:23:01 +0300
committerDmitry Belyavskiy <beldmit@gmail.com>2020-10-08 18:17:44 +0300
commit13c5ec569ea9286ff18e019fb2d53be64829c62c (patch)
tree759ae93e7305772c97379dfc94638fa2fa1e95fc /crypto/pkcs7
parent947fb813458cd93fdc31f6248f5806d9f4fddff3 (diff)
Fix zero-length content verification in S/MIME format
Fixes #13082 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13087)
Diffstat (limited to 'crypto/pkcs7')
-rw-r--r--crypto/pkcs7/pk7_smime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 5cbc18c63e..e9ae4f3394 100644
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -311,7 +311,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
char *ptr;
long len;
len = BIO_get_mem_data(indata, &ptr);
- tmpin = BIO_new_mem_buf(ptr, len);
+ tmpin = (len == 0) ? indata : BIO_new_mem_buf(ptr, len);
if (tmpin == NULL) {
PKCS7err(0, ERR_R_MALLOC_FAILURE);
goto err;