provider: use #define for PBKDF1 algorithm name

This seems to be standard practice so bringing PBKDF1 into line.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15967)

diff --git a/providers/implementations/include/prov/names.h b/providers/implementations/include/prov/names.h
index fd39c0229e0ece885a0cd198eb7a8931e97a8614..5aec4a0934eab265a91b81b1612dba8d01adf795 100644 (file)
--- a/providers/implementations/include/prov/names.h
+++ b/providers/implementations/include/prov/names.h
@@ -250,6 +250,7 @@
 #define PROV_NAMES_HKDF "HKDF"
 #define PROV_DESCS_HKDF_SIGN "OpenSSL HKDF via EVP_PKEY implementation"
 #define PROV_NAMES_SSKDF "SSKDF"
 #define PROV_NAMES_HKDF "HKDF"
 #define PROV_DESCS_HKDF_SIGN "OpenSSL HKDF via EVP_PKEY implementation"
 #define PROV_NAMES_SSKDF "SSKDF"

+#define PROV_NAMES_PBKDF1 "PBKDF1"

 #define PROV_NAMES_PBKDF2 "PBKDF2:1.2.840.113549.1.5.12"
 #define PROV_NAMES_SSHKDF "SSHKDF"
 #define PROV_NAMES_X963KDF "X963KDF:X942KDF-CONCAT"
 #define PROV_NAMES_PBKDF2 "PBKDF2:1.2.840.113549.1.5.12"
 #define PROV_NAMES_SSHKDF "SSHKDF"
 #define PROV_NAMES_X963KDF "X963KDF:X942KDF-CONCAT"

diff --git a/providers/legacyprov.c b/providers/legacyprov.c
index b5fc5f523f34b17bfa81ee785f73900ce83d0d0e..a5999c5f8b2f3617723df971d2a99a1a27fdcc31 100644 (file)
--- a/providers/legacyprov.c
+++ b/providers/legacyprov.c
@@ -144,7 +144,7 @@ static const OSSL_ALGORITHM legacy_ciphers[] = {
 };
 
 static const OSSL_ALGORITHM legacy_kdfs[] = {
 };
 
 static const OSSL_ALGORITHM legacy_kdfs[] = {

-    ALG("PBKDF1", ossl_kdf_pbkdf1_functions),
+    ALG(PROV_NAMES_PBKDF1, ossl_kdf_pbkdf1_functions),

     { NULL, NULL, NULL }
 };
 
     { NULL, NULL, NULL }
 };