diff options
| author |   miod <miod@openbsd.org> | 2015-07-18 14:40:59 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2015-07-18 14:40:59 +0000 |
| commit | dc151f5b3a6ff9dd1be2cddd385a17fb965fd849 (patch) | |
| tree | 48434659f8a808da88ff3c0fa27385ade4e23979 /lib/libssl/src | |
| parent | Fix check against NULL which was reverted by accident in r1.56. (diff) | |
| download | wireguard-openbsd-dc151f5b3a6ff9dd1be2cddd385a17fb965fd849.tar.xz wireguard-openbsd-dc151f5b3a6ff9dd1be2cddd385a17fb965fd849.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 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/asn1/asn1_gen.c | 13 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/pkcs7/pk7_doit.c | 7 |
2 files changed, 14 insertions, 6 deletions
diff --git a/lib/libssl/src/crypto/asn1/asn1_gen.c b/lib/libssl/src/crypto/asn1/asn1_gen.c index 384088308f7..08a5dec4a67 100644 --- a/lib/libssl/src/crypto/asn1/asn1_gen.c +++ b/lib/libssl/src/crypto/asn1/asn1_gen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1_gen.c,v 1.13 2015/02/12 06:04:24 jsg Exp $ */ +/* $OpenBSD: asn1_gen.c,v 1.14 2015/07/18 14:40:59 miod Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2002. */ @@ -740,9 +740,14 @@ asn1_str2type(const char *str, int format, int utype) atmp->value.asn1_string->length = rdlen; atmp->value.asn1_string->type = utype; - } else if (format == ASN1_GEN_FORMAT_ASCII) - ASN1_STRING_set(atmp->value.asn1_string, str, -1); - else if ((format == ASN1_GEN_FORMAT_BITLIST) && + } else if (format == ASN1_GEN_FORMAT_ASCII) { + if (ASN1_STRING_set(atmp->value.asn1_string, str, + -1) == 0) { + ASN1err(ASN1_F_ASN1_STR2TYPE, + ERR_R_MALLOC_FAILURE); + goto bad_str; + } + } else if ((format == ASN1_GEN_FORMAT_BITLIST) && (utype == V_ASN1_BIT_STRING)) { if (!CONF_parse_list(str, ',', 1, bitstr_cb, atmp->value.bit_string)) { diff --git a/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/lib/libssl/src/crypto/pkcs7/pk7_doit.c index 5631d35712a..d6fcaca745a 100644 --- a/lib/libssl/src/crypto/pkcs7/pk7_doit.c +++ b/lib/libssl/src/crypto/pkcs7/pk7_doit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_doit.c,v 1.33 2015/07/15 17:44:20 miod Exp $ */ +/* $OpenBSD: pk7_doit.c,v 1.34 2015/07/18 14:40:59 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -850,12 +850,15 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio) } else if (i == NID_pkcs7_digest) { unsigned char md_data[EVP_MAX_MD_SIZE]; unsigned int md_len; + if (!PKCS7_find_digest(&mdc, bio, OBJ_obj2nid(p7->d.digest->md->algorithm))) goto err; if (!EVP_DigestFinal_ex(mdc, md_data, &md_len)) goto err; - M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len); + if (M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, + md_len) == 0) + goto err; } if (!PKCS7_is_detached(p7)) { |