diff options
author | miod <> | 2015-07-18 14:40:59 +0000 |
---|---|---|
committer | miod <> | 2015-07-18 14:40:59 +0000 |
commit | fb4b9046bf049484f0a34a724bc5b6c7a17f967a (patch) | |
tree | c74957e7e8a714ac10a0f4f77da884dfd2183ae1 /src/lib/libcrypto/pkcs7 | |
parent | dd1a8feef3ef54128aab53a720a711d669b98c21 (diff) | |
download | openbsd-fb4b9046bf049484f0a34a724bc5b6c7a17f967a.tar.gz openbsd-fb4b9046bf049484f0a34a724bc5b6c7a17f967a.tar.bz2 openbsd-fb4b9046bf049484f0a34a724bc5b6c7a17f967a.zip |
Check the return value of ASN1_STRING_set(), for it may fail to allocate
memory. Coverity CID 24810, 24846.
ok bcook@ doug@
Diffstat (limited to 'src/lib/libcrypto/pkcs7')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_doit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index 5631d35712..d6fcaca745 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk7_doit.c,v 1.33 2015/07/15 17:44:20 miod Exp $ */ | 1 | /* $OpenBSD: pk7_doit.c,v 1.34 2015/07/18 14:40:59 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -850,12 +850,15 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio) | |||
850 | } else if (i == NID_pkcs7_digest) { | 850 | } else if (i == NID_pkcs7_digest) { |
851 | unsigned char md_data[EVP_MAX_MD_SIZE]; | 851 | unsigned char md_data[EVP_MAX_MD_SIZE]; |
852 | unsigned int md_len; | 852 | unsigned int md_len; |
853 | |||
853 | if (!PKCS7_find_digest(&mdc, bio, | 854 | if (!PKCS7_find_digest(&mdc, bio, |
854 | OBJ_obj2nid(p7->d.digest->md->algorithm))) | 855 | OBJ_obj2nid(p7->d.digest->md->algorithm))) |
855 | goto err; | 856 | goto err; |
856 | if (!EVP_DigestFinal_ex(mdc, md_data, &md_len)) | 857 | if (!EVP_DigestFinal_ex(mdc, md_data, &md_len)) |
857 | goto err; | 858 | goto err; |
858 | M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len); | 859 | if (M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, |
860 | md_len) == 0) | ||
861 | goto err; | ||
859 | } | 862 | } |
860 | 863 | ||
861 | if (!PKCS7_is_detached(p7)) { | 864 | if (!PKCS7_is_detached(p7)) { |