From 736dba012fa43832aba753344f6dcb91c7314721 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 2 Aug 2021 16:19:29 +1000 Subject: [PATCH] provider: add TLS13_KDF to the default and FIPS providers Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/16203) --- providers/defltprov.c | 2 ++ providers/fips/fipsprov.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/providers/defltprov.c b/providers/defltprov.c index cb8a90f1cd..498c4eaa2a 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -320,6 +320,8 @@ static const OSSL_ALGORITHM deflt_macs[] = { static const OSSL_ALGORITHM deflt_kdfs[] = { { PROV_NAMES_HKDF, "provider=default", ossl_kdf_hkdf_functions }, + { PROV_NAMES_TLS1_3_KDF, "provider=default", + ossl_kdf_tls1_3_kdf_functions }, { PROV_NAMES_SSKDF, "provider=default", ossl_kdf_sskdf_functions }, { PROV_NAMES_PBKDF2, "provider=default", ossl_kdf_pbkdf2_functions }, { PROV_NAMES_PKCS12KDF, "provider=default", ossl_kdf_pkcs12_functions }, diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index b69299e046..f4605dcd6c 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -346,6 +346,8 @@ static const OSSL_ALGORITHM fips_macs[] = { static const OSSL_ALGORITHM fips_kdfs[] = { { PROV_NAMES_HKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_hkdf_functions }, + { PROV_NAMES_TLS1_3_KDF, FIPS_DEFAULT_PROPERTIES, + ossl_kdf_tls1_3_kdf_functions }, { PROV_NAMES_SSKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_sskdf_functions }, { PROV_NAMES_PBKDF2, FIPS_DEFAULT_PROPERTIES, ossl_kdf_pbkdf2_functions }, { PROV_NAMES_SSHKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_sshkdf_functions }, -- 2.34.1