]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
hkdf: avoid using ossl_prov_digest_load_from_params()
authorPauli <ppzgs1@gmail.com>
Thu, 28 Aug 2025 04:47:52 +0000 (14:47 +1000)
committerPauli <ppzgs1@gmail.com>
Wed, 3 Sep 2025 00:26:24 +0000 (10:26 +1000)
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)

providers/implementations/kdfs/hkdf.c.in

index 30e5e1cd4a2b35e61e95605228b1100b6e3cbb50..3e0bbb53f3dba10869494eba172b5d0965cf0a6c 100644 (file)
@@ -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;
     }