diff options
| author | Pauli <paul.dale@oracle.com> | 2019-10-30 11:00:19 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-10-31 13:20:09 +1000 |
| commit | 0fee1dffbb59f7dd0f8def60b945232554f3856c (patch) | |
| tree | 3493215b2194a9bbc95e73eb61af7adcdc22ec6e /providers/defltprov.c | |
| parent | d9b8c7237cb0e970bf508613421ee6ba280f8388 (diff) | |
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 <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10293)
Diffstat (limited to 'providers/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 20 |
1 files changed, 10 insertions, 10 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[] = { |