diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-09-05 23:21:38 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-09-06 15:52:16 +0200 |
| commit | d3c3dfc5778ab2cca0d25c5959c8b814a334addb (patch) | |
| tree | 30a8881804bdc1fe38e0d61bc282fd0e8976c81b | |
| parent | add callback handler for setting DTLS timer interval (diff) | |
| download | openssl-d3c3dfc5778ab2cca0d25c5959c8b814a334addb.tar.xz openssl-d3c3dfc5778ab2cca0d25c5959c8b814a334addb.zip | |
Add checks for alloc failing.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4341)
| -rw-r--r-- | crypto/ct/ct_log.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_mutl.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/ct/ct_log.c b/crypto/ct/ct_log.c index 6db4c3eba1..ec6fa384d5 100644 --- a/crypto/ct/ct_log.c +++ b/crypto/ct/ct_log.c @@ -198,6 +198,8 @@ int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file) char *enabled_logs; CTLOG_STORE_LOAD_CTX* load_ctx = ctlog_store_load_ctx_new(); + if (load_ctx == NULL) + goto end; load_ctx->log_store = store; load_ctx->conf = NCONF_new(NULL); if (load_ctx->conf == NULL) diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index 899a12e134..a9e22026c3 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -124,8 +124,8 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen, PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_KEY_GEN_ERROR); return 0; } - hmac = HMAC_CTX_new(); - if (!HMAC_Init_ex(hmac, key, md_size, md_type, NULL) + if ((hmac = HMAC_CTX_new()) == NULL + || !HMAC_Init_ex(hmac, key, md_size, md_type, NULL) || !HMAC_Update(hmac, p12->authsafes->d.data->data, p12->authsafes->d.data->length) || !HMAC_Final(hmac, mac, maclen)) { |