diff options
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/exchange/dh_exch.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/providers/implementations/exchange/dh_exch.c b/providers/implementations/exchange/dh_exch.c index cd92f26957..3cfb580687 100644 --- a/providers/implementations/exchange/dh_exch.c +++ b/providers/implementations/exchange/dh_exch.c @@ -292,7 +292,12 @@ static void *dh_dupctx(void *vpdhctx) if (dstctx->kdf_ukm == NULL) goto err; } - dstctx->kdf_cekalg = OPENSSL_strdup(srcctx->kdf_cekalg); + + if (srcctx->kdf_cekalg != NULL) { + dstctx->kdf_cekalg = OPENSSL_strdup(srcctx->kdf_cekalg); + if (dstctx->kdf_cekalg == NULL) + goto err; + } return dstctx; err: @@ -389,9 +394,16 @@ static int dh_set_ctx_params(void *vpdhctx, const OSSL_PARAM params[]) p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_CEK_ALG); if (p != NULL) { str = name; - if (!OSSL_PARAM_get_utf8_string(p, &str, sizeof(name))) - return 0; - pdhctx->kdf_cekalg = OPENSSL_strdup(name); + + OPENSSL_free(pdhctx->kdf_cekalg); + pdhctx->kdf_cekalg = NULL; + if (p->data != NULL && p->data_size != 0) { + if (!OSSL_PARAM_get_utf8_string(p, &str, sizeof(name))) + return 0; + pdhctx->kdf_cekalg = OPENSSL_strdup(name); + if (pdhctx->kdf_cekalg == NULL) + return 0; + } } return 1; } |