From: Pauli <ppzgs1@gmail.com>
Date: Thu, 28 Aug 2025 04:47:52 +0000 (+1000)
Subject: hkdf: avoid using ossl_prov_digest_load_from_params()
X-Git-Tag: 4.0-PRE-CLANG-FORMAT-WEBKIT~586
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce3714c474898969305ab42554efef5056ecce99;p=thirdparty%2Fopenssl.git

hkdf: avoid using ossl_prov_digest_load_from_params()

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28361)
---

diff --git a/providers/implementations/kdfs/hkdf.c.in b/providers/implementations/kdfs/hkdf.c.in
index 30e5e1cd4a2..3e0bbb53f3d 100644
--- a/providers/implementations/kdfs/hkdf.c.in
+++ b/providers/implementations/kdfs/hkdf.c.in
@@ -501,16 +501,15 @@ static void *kdf_hkdf_fixed_digest_new(void *provctx, const char *digest)
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     KDF_HKDF *ctx;
-    OSSL_PARAM params[2];
+    OSSL_PARAM param;
 
     ctx = kdf_hkdf_new(provctx);
     if (ctx == NULL)
         return NULL;
 
-    params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_DIGEST,
-                                                 (char *)digest, 0);
-    params[1] = OSSL_PARAM_construct_end();
-    if (!ossl_prov_digest_load_from_params(&ctx->digest, params, libctx)) {
+    param = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_DIGEST,
+                                             (char *)digest, 0);
+    if (!ossl_prov_digest_load(&ctx->digest, &param, NULL, NULL, libctx)) {
         kdf_hkdf_free(ctx);
         return NULL;
     }