From 0fee1dffbb59f7dd0f8def60b945232554f3856c Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 30 Oct 2019 11:00:19 +1000 Subject: [PATCH] KDF: use string names not macros to align with other algorithms. Only the KDF and PRF algorithms used the macros for their names, all other algorithms used a string name directly. This brings the KDFs and PRFs into line with the rest. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/10293) --- providers/defltprov.c | 20 ++++++++++---------- providers/fips/fipsprov.c | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/providers/defltprov.c b/providers/defltprov.c index cf0a1755da..a0f3b8bb9f 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -326,21 +326,21 @@ static const OSSL_ALGORITHM deflt_macs[] = { }; static const OSSL_ALGORITHM deflt_kdfs[] = { - { OSSL_KDF_NAME_HKDF, "default=yes", kdf_hkdf_functions }, - { OSSL_KDF_NAME_SSKDF, "default=yes", kdf_sskdf_functions }, - { OSSL_KDF_NAME_PBKDF2, "default=yes", kdf_pbkdf2_functions }, - { OSSL_KDF_NAME_SSHKDF, "default=yes", kdf_sshkdf_functions }, - { OSSL_KDF_NAME_X963KDF, "default=yes", kdf_x963_kdf_functions }, - { OSSL_KDF_NAME_TLS1_PRF, "default=yes", kdf_tls1_prf_functions }, - { OSSL_KDF_NAME_KBKDF, "default=yes", kdf_kbkdf_functions }, + { "HKDF", "default=yes", kdf_hkdf_functions }, + { "SSKDF", "default=yes", kdf_sskdf_functions }, + { "PBKDF2", "default=yes", kdf_pbkdf2_functions }, + { "SSHKDF", "default=yes", kdf_sshkdf_functions }, + { "X963KDF", "default=yes", kdf_x963_kdf_functions }, + { "TLS1-PRF", "default=yes", kdf_tls1_prf_functions }, + { "KBKDF", "default=yes", kdf_kbkdf_functions }, #ifndef OPENSSL_NO_CMS - { OSSL_KDF_NAME_X942KDF, "default=yes", kdf_x942_kdf_functions }, + { "X942KDF", "default=yes", kdf_x942_kdf_functions }, #endif #ifndef OPENSSL_NO_SCRYPT { "SCRYPT:id-scrypt", "default=yes", kdf_scrypt_functions }, #endif - { OSSL_KDF_NAME_KRB5KDF, "default=yes", kdf_krb5kdf_functions }, - { NULL, NULL, NULL } + { "KRB5KDF", "default=yes", kdf_krb5kdf_functions }, + { NULL, NULL, NULL } }; static const OSSL_ALGORITHM deflt_keyexch[] = { diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index f0cf4a9bd0..05e5dd4a49 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -408,11 +408,11 @@ static const OSSL_ALGORITHM fips_macs[] = { }; static const OSSL_ALGORITHM fips_kdfs[] = { - { OSSL_KDF_NAME_HKDF, "fips=yes", kdf_hkdf_functions }, - { OSSL_KDF_NAME_SSKDF, "fips=yes", kdf_sskdf_functions }, - { OSSL_KDF_NAME_PBKDF2, "fips=yes", kdf_pbkdf2_functions }, - { OSSL_KDF_NAME_TLS1_PRF, "fips=yes", kdf_tls1_prf_functions }, - { OSSL_KDF_NAME_KBKDF, "fips=yes", kdf_kbkdf_functions }, + { "HKDF", "fips=yes", kdf_hkdf_functions }, + { "SSKDF", "fips=yes", kdf_sskdf_functions }, + { "PBKDF2", "fips=yes", kdf_pbkdf2_functions }, + { "TLS1-PRF", "fips=yes", kdf_tls1_prf_functions }, + { "KBKDF", "fips=yes", kdf_kbkdf_functions }, { NULL, NULL, NULL } }; -- 2.25.1