summaryrefslogtreecommitdiff
path: root/providers
diff options
context:
space:
mode:
authorslontis <shane.lontis@oracle.com>2022-06-23 13:10:55 +1000
committerHugo Landau <hlandau@openssl.org>2022-06-28 19:48:36 +0100
commit7260709e9ef155c8b3fccaa32e8ba496a3059905 (patch)
treebb72cf2c063ec05723543c7e0496bec69c39691e /providers
parentd842b6eff0940b6ce337536cb718a8d561290f50 (diff)
downloadopenssl-new-7260709e9ef155c8b3fccaa32e8ba496a3059905.tar.gz
kdf objects missing a return if malloc fails.
I have searched through all references of ERR_R_MALLOC_FAILURE for any other instances.. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18638)
Diffstat (limited to 'providers')
-rw-r--r--providers/implementations/kdfs/tls1_prf.c4
-rw-r--r--providers/implementations/kdfs/x942kdf.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c
index 96eab4ea41..fd46283d3a 100644
--- a/providers/implementations/kdfs/tls1_prf.c
+++ b/providers/implementations/kdfs/tls1_prf.c
@@ -103,8 +103,10 @@ static void *kdf_tls1_prf_new(void *provctx)
if (!ossl_prov_is_running())
return NULL;
- if ((ctx = OPENSSL_zalloc(sizeof(*ctx))) == NULL)
+ if ((ctx = OPENSSL_zalloc(sizeof(*ctx))) == NULL) {
ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
+ return NULL;
+ }
ctx->provctx = provctx;
return ctx;
}
diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c
index 487c3295f2..51b2ebf26b 100644
--- a/providers/implementations/kdfs/x942kdf.c
+++ b/providers/implementations/kdfs/x942kdf.c
@@ -333,10 +333,12 @@ static void *x942kdf_new(void *provctx)
KDF_X942 *ctx;
if (!ossl_prov_is_running())
- return 0;
+ return NULL;
- if ((ctx = OPENSSL_zalloc(sizeof(*ctx))) == NULL)
+ if ((ctx = OPENSSL_zalloc(sizeof(*ctx))) == NULL) {
ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
+ return NULL;
+ }
ctx->provctx = provctx;
ctx->use_keybits = 1;
return ctx;