Include "legacy" in the name of the various MAC bridge functions

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12637)

diff --git a/providers/defltprov.c b/providers/defltprov.c
index ff5768af74e24a1748a0c48bce59dc8cc46d79e6..943bdc6136b190bb82f69bfa7e2d8574f0058139 100644 (file)
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -364,13 +364,13 @@ static const OSSL_ALGORITHM deflt_signature[] = {
     { "ED448:Ed448", "provider=default", ed448_signature_functions },
     { "ECDSA", "provider=default", ecdsa_signature_functions },
 #endif
-    { "HMAC", "provider=default", mac_hmac_signature_functions },
-    { "SIPHASH", "provider=default", mac_siphash_signature_functions },
+    { "HMAC", "provider=default", mac_legacy_hmac_signature_functions },
+    { "SIPHASH", "provider=default", mac_legacy_siphash_signature_functions },
 #ifndef OPENSSL_NO_POLY1305
-    { "POLY1305", "provider=default", mac_poly1305_signature_functions },
+    { "POLY1305", "provider=default", mac_legacy_poly1305_signature_functions },
 #endif
 #ifndef OPENSSL_NO_CMAC
-    { "CMAC", "provider=default", mac_cmac_signature_functions },
+    { "CMAC", "provider=default", mac_legacy_cmac_signature_functions },
 #endif
     { NULL, NULL, NULL }
 };
@@ -400,13 +400,13 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = {
     { "TLS1-PRF", "provider=default", kdf_keymgmt_functions },
     { "HKDF", "provider=default", kdf_keymgmt_functions },
     { "SCRYPT:id-scrypt", "provider=default", kdf_keymgmt_functions },
-    { "HMAC", "provider=default", mac_keymgmt_functions },
-    { "SIPHASH", "provider=default", mac_keymgmt_functions },
+    { "HMAC", "provider=default", mac_legacy_keymgmt_functions },
+    { "SIPHASH", "provider=default", mac_legacy_keymgmt_functions },
 #ifndef OPENSSL_NO_POLY1305
-    { "POLY1305", "provider=default", mac_keymgmt_functions },
+    { "POLY1305", "provider=default", mac_legacy_keymgmt_functions },
 #endif
 #ifndef OPENSSL_NO_CMAC
-    { "CMAC", "provider=default", cmac_keymgmt_functions },
+    { "CMAC", "provider=default", cmac_legacy_keymgmt_functions },
 #endif
     { NULL, NULL, NULL }
 };

diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index 0ab24434ba1b169e96d0d46bf1a02433a9ec5c0b..c9867f998cf30b34d323e416dfd7bb5a1927c14b 100644 (file)
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -436,9 +436,9 @@ static const OSSL_ALGORITHM fips_signature[] = {
     { "ED448", FIPS_DEFAULT_PROPERTIES, ed448_signature_functions },
     { "ECDSA", FIPS_DEFAULT_PROPERTIES, ecdsa_signature_functions },
 #endif
-    { "HMAC", FIPS_DEFAULT_PROPERTIES, mac_hmac_signature_functions },
+    { "HMAC", FIPS_DEFAULT_PROPERTIES, mac_legacy_hmac_signature_functions },
 #ifndef OPENSSL_NO_CMAC
-    { "CMAC", FIPS_DEFAULT_PROPERTIES, mac_cmac_signature_functions },
+    { "CMAC", FIPS_DEFAULT_PROPERTIES, mac_legacy_cmac_signature_functions },
 #endif
     { NULL, NULL, NULL }
 };
@@ -468,9 +468,9 @@ static const OSSL_ALGORITHM fips_keymgmt[] = {
 #endif
     { "TLS1-PRF", FIPS_DEFAULT_PROPERTIES, kdf_keymgmt_functions },
     { "HKDF", FIPS_DEFAULT_PROPERTIES, kdf_keymgmt_functions },
-    { "HMAC", FIPS_DEFAULT_PROPERTIES, mac_keymgmt_functions },
+    { "HMAC", FIPS_DEFAULT_PROPERTIES, mac_legacy_keymgmt_functions },
 #ifndef OPENSSL_NO_CMAC
-    { "CMAC", FIPS_DEFAULT_PROPERTIES, cmac_keymgmt_functions },
+    { "CMAC", FIPS_DEFAULT_PROPERTIES, cmac_legacy_keymgmt_functions },
 #endif
     { NULL, NULL, NULL }
 };

diff --git a/providers/implementations/include/prov/implementations.h b/providers/implementations/include/prov/implementations.h
index e266bd7554557fa99027cfdc4622b6fbf023f305..1b8642415fd26aa66bd7fe45f1e905153e00134c 100644 (file)
--- a/providers/implementations/include/prov/implementations.h
+++ b/providers/implementations/include/prov/implementations.h
@@ -278,8 +278,8 @@ extern const OSSL_DISPATCH ed25519_keymgmt_functions[];
 extern const OSSL_DISPATCH ed448_keymgmt_functions[];
 extern const OSSL_DISPATCH ec_keymgmt_functions[];
 extern const OSSL_DISPATCH kdf_keymgmt_functions[];
-extern const OSSL_DISPATCH mac_keymgmt_functions[];
-extern const OSSL_DISPATCH cmac_keymgmt_functions[];
+extern const OSSL_DISPATCH mac_legacy_keymgmt_functions[];
+extern const OSSL_DISPATCH cmac_legacy_keymgmt_functions[];
 
 /* Key Exchange */
 extern const OSSL_DISPATCH dh_keyexch_functions[];
@@ -296,10 +296,10 @@ extern const OSSL_DISPATCH rsa_signature_functions[];
 extern const OSSL_DISPATCH ed25519_signature_functions[];
 extern const OSSL_DISPATCH ed448_signature_functions[];
 extern const OSSL_DISPATCH ecdsa_signature_functions[];
-extern const OSSL_DISPATCH mac_hmac_signature_functions[];
-extern const OSSL_DISPATCH mac_siphash_signature_functions[];
-extern const OSSL_DISPATCH mac_poly1305_signature_functions[];
-extern const OSSL_DISPATCH mac_cmac_signature_functions[];
+extern const OSSL_DISPATCH mac_legacy_hmac_signature_functions[];
+extern const OSSL_DISPATCH mac_legacy_siphash_signature_functions[];
+extern const OSSL_DISPATCH mac_legacy_poly1305_signature_functions[];
+extern const OSSL_DISPATCH mac_legacy_cmac_signature_functions[];
 
 /* Asym Cipher */
 extern const OSSL_DISPATCH rsa_asym_cipher_functions[];

diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c
index 779240e036f8f72d65a1e1f0032b2246ef0f63d4..dd18eecf12e539fb74c258bc7d2d07d320541758 100644 (file)
--- a/providers/implementations/keymgmt/mac_legacy_kmgmt.c
+++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.c
@@ -320,7 +320,6 @@ static const OSSL_PARAM *cmac_gettable_params(void *provctx)
     return gettable_params;
 }
 
-
 static int mac_set_params(void *keydata, const OSSL_PARAM params[])
 {
     MAC_KEY *key = keydata;
@@ -469,7 +468,7 @@ static void mac_gen_cleanup(void *genctx)
     OPENSSL_free(gctx);
 }
 
-const OSSL_DISPATCH mac_keymgmt_functions[] = {
+const OSSL_DISPATCH mac_legacy_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))mac_new },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))mac_free },
     { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))mac_get_params },
@@ -491,7 +490,7 @@ const OSSL_DISPATCH mac_keymgmt_functions[] = {
     { 0, NULL }
 };
 
-const OSSL_DISPATCH cmac_keymgmt_functions[] = {
+const OSSL_DISPATCH cmac_legacy_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))mac_new_cmac },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))mac_free },
     { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))mac_get_params },

diff --git a/providers/implementations/signature/mac_legacy.c b/providers/implementations/signature/mac_legacy.c
index 76ed3b5fddf405e4e18a39074b79d8ca67153780..2b8edcad9d1737d4b6e942173bd2432fb60b981e 100644 (file)
--- a/providers/implementations/signature/mac_legacy.c
+++ b/providers/implementations/signature/mac_legacy.c
@@ -85,7 +85,6 @@ static int mac_digest_sign_init(void *vpmacctx, const char *mdname, void *vkey)
     if (pmacctx == NULL || vkey == NULL || !mac_key_up_ref(vkey))
         return 0;
 
-
     mac_key_free(pmacctx->key);
     pmacctx->key = vkey;
 
@@ -173,7 +172,7 @@ static void *mac_dupctx(void *vpmacctx)
 }
 
 #define MAC_SIGNATURE_FUNCTIONS(funcname) \
-    const OSSL_DISPATCH mac_##funcname##_signature_functions[] = { \
+    const OSSL_DISPATCH mac_legacy_##funcname##_signature_functions[] = { \
         { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))mac_##funcname##_newctx }, \
         { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT, \
         (void (*)(void))mac_digest_sign_init }, \