diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-02-01 18:29:47 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-02-03 20:39:52 +0100 |
| commit | 83b4049ab75e9da1815e9c854a9297bca3d4af6b (patch) | |
| tree | 35e657e8100ec911f851e3ecb09daf0093a0c173 /crypto/asn1/a_digest.c | |
| parent | 21f198ec4874f7e2780a0afd0bdd3c038f69ed11 (diff) | |
Combined patch against master branch for the following issues:
Fixed a memory leak in ASN1_digest and ASN1_item_digest.
Reworked error handling in asn1_item_embed_new.
Fixed error handling in int_ctx_new and EVP_PKEY_CTX_dup.
Fixed a memory leak in CRYPTO_free_ex_data.
Reworked error handing in x509_name_ex_d2i, x509_name_encode and x509_name_canon.
Check for null pointer in tls_process_cert_verify.
Fixes #2103 #2104 #2105 #2109 #2111 #2115
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2342)
Diffstat (limited to 'crypto/asn1/a_digest.c')
| -rw-r--r-- | crypto/asn1/a_digest.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index 2f9b63b2a1..46bff0d88f 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -37,8 +37,10 @@ int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data, p = str; i2d(data, &p); - if (!EVP_Digest(str, i, md, len, type, NULL)) + if (!EVP_Digest(str, i, md, len, type, NULL)) { + OPENSSL_free(str); return 0; + } OPENSSL_free(str); return (1); } @@ -55,8 +57,10 @@ int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *asn, if (!str) return (0); - if (!EVP_Digest(str, i, md, len, type, NULL)) + if (!EVP_Digest(str, i, md, len, type, NULL)) { + OPENSSL_free(str); return 0; + } OPENSSL_free(str); return (1); } |