From: Pauli <pauli@openssl.org>
Date: Thu, 1 Jul 2021 04:00:03 +0000 (+1000)
Subject: provider: use #define for PBKDF1 algorithm name
X-Git-Tag: openssl-3.0.0-beta2~121
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=56cd5dc78b3cecd2c6cf98b0d235b126e82f0dd2

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 fd39c0229e..5aec4a0934 100644
--- 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_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"
diff --git a/providers/legacyprov.c b/providers/legacyprov.c
index b5fc5f523f..a5999c5f8b 100644
--- a/providers/legacyprov.c
+++ b/providers/legacyprov.c
@@ -144,7 +144,7 @@ static const OSSL_ALGORITHM legacy_ciphers[] = {
 };
 
 static const OSSL_ALGORITHM legacy_kdfs[] = {
-    ALG("PBKDF1", ossl_kdf_pbkdf1_functions),
+    ALG(PROV_NAMES_PBKDF1, ossl_kdf_pbkdf1_functions),
     { NULL, NULL, NULL }
 };