X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=providers%2Ffips%2Ffipsprov.c;h=f59c2c1c911f9281b76a3d269d884310b7ae33e0;hp=ffb75100544ec330dd3d2adb0ce7648872a59c72;hb=89cccbea51fa52a1e4784a9ece35d96e4dcbfd30;hpb=8018352457cf9c98ce59f1e591fcd69f2153b649 diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index ffb7510054..f59c2c1c91 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -328,7 +328,10 @@ static const OSSL_ALGORITHM fips_kdfs[] = { { "SSKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_sskdf_functions }, { "PBKDF2", FIPS_DEFAULT_PROPERTIES, ossl_kdf_pbkdf2_functions }, { "SSHKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_sshkdf_functions }, - { "X963KDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_x963_kdf_functions }, + { "X963KDF:X942KDF-CONCAT", FIPS_DEFAULT_PROPERTIES, + ossl_kdf_x963_kdf_functions }, + { "X942KDF-ASN1:X942KDF", FIPS_DEFAULT_PROPERTIES, + ossl_kdf_x942_kdf_functions }, { "TLS1-PRF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_tls1_prf_functions }, { "KBKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_kbkdf_functions }, { NULL, NULL, NULL }