diff options
| author | Pauli <pauli@openssl.org> | 2021-08-02 16:19:29 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-08-05 15:43:59 +1000 |
| commit | 736dba012fa43832aba753344f6dcb91c7314721 (patch) | |
| tree | 007d1cbe715498a560744064612b3ee1921f6200 /providers | |
| parent | f7d998a206383b6bab3fad32b28e58d3786fe08a (diff) | |
provider: add TLS13_KDF to the default and FIPS providers
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/16203)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/defltprov.c | 2 | ||||
| -rw-r--r-- | providers/fips/fipsprov.c | 2 |
2 files changed, 4 insertions, 0 deletions
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 }, |