From 71f59faa8c531e39ddbdda2a362d7a7c14946b39 Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 9 Apr 2025 12:42:10 +1000 Subject: [PATCH] hkdf: allow salt to be set to null Reviewed-by: Viktor Dukhovni Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/27305) (cherry picked from commit 12eb6c58ff2a8d857924b3020d30c8d485ace0a7) --- providers/implementations/kdfs/hkdf.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c index 15ff8bbdade..dbe7ff82d69 100644 --- a/providers/implementations/kdfs/hkdf.c +++ b/providers/implementations/kdfs/hkdf.c @@ -263,13 +263,11 @@ static int hkdf_common_set_ctx_params(KDF_HKDF *ctx, const OSSL_PARAM params[]) } if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_SALT)) != NULL) { - if (p->data_size != 0 && p->data != NULL) { - OPENSSL_free(ctx->salt); - ctx->salt = NULL; - if (!OSSL_PARAM_get_octet_string(p, (void **)&ctx->salt, 0, - &ctx->salt_len)) - return 0; - } + OPENSSL_free(ctx->salt); + ctx->salt = NULL; + if (!OSSL_PARAM_get_octet_string(p, (void **)&ctx->salt, 0, + &ctx->salt_len)) + return 0; } return 1; -- 2.47.2