From: Pauli <ppzgs1@gmail.com>
Date: Fri, 26 Feb 2021 00:09:07 +0000 (+1000)
Subject: fips: add additional argument to KDF derive call in self test
X-Git-Tag: openssl-3.0.0-alpha13~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6bcd32a43fffc944c1f06f018dd52eeefd286e7c;p=thirdparty%2Fopenssl.git

fips: add additional argument to KDF derive call in self test

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
---

diff --git a/providers/fips/self_test_kats.c b/providers/fips/self_test_kats.c
index 79b78f0ba5c..7f59bb508af 100644
--- a/providers/fips/self_test_kats.c
+++ b/providers/fips/self_test_kats.c
@@ -217,12 +217,10 @@ static int self_test_kdf(const ST_KAT_KDF *t, OSSL_SELF_TEST *st,
     params = OSSL_PARAM_BLD_to_param(bld);
     if (params == NULL)
         goto err;
-    if (!EVP_KDF_CTX_set_params(ctx, params))
-        goto err;
 
     if (t->expected_len > sizeof(out))
         goto err;
-    if (EVP_KDF_derive(ctx, out, t->expected_len) <= 0)
+    if (EVP_KDF_derive(ctx, out, t->expected_len, params) <= 0)
         goto err;
 
     OSSL_SELF_TEST_oncorrupt_byte(st, out);