From cd0a4998a006f00d1e5c271cfcd8e1fd1f0b3c41 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 7 Aug 2020 12:22:29 +0100 Subject: [PATCH] Extend the EVP_PKEY KDF to KDF provider bridge to the FIPS provider Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/12573) --- providers/fips/fipsprov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index e39c306e481..4711a99b016 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -421,6 +421,8 @@ static const OSSL_ALGORITHM fips_keyexch[] = { { "X25519", FIPS_DEFAULT_PROPERTIES, x25519_keyexch_functions }, { "X448", FIPS_DEFAULT_PROPERTIES, x448_keyexch_functions }, #endif + { "TLS1-PRF", FIPS_DEFAULT_PROPERTIES, kdf_tls1_prf_keyexch_functions }, + { "HKDF", FIPS_DEFAULT_PROPERTIES, kdf_hkdf_keyexch_functions }, { NULL, NULL, NULL } }; @@ -459,6 +461,8 @@ static const OSSL_ALGORITHM fips_keymgmt[] = { { "ED25519", FIPS_DEFAULT_PROPERTIES, ed25519_keymgmt_functions }, { "ED448", FIPS_DEFAULT_PROPERTIES, ed448_keymgmt_functions }, #endif + { "TLS1-PRF", FIPS_DEFAULT_PROPERTIES, kdf_keymgmt_functions }, + { "HKDF", FIPS_DEFAULT_PROPERTIES, kdf_keymgmt_functions }, { NULL, NULL, NULL } }; -- 2.47.2