From: Matt Caswell <matt@openssl.org>
Date: Fri, 7 Aug 2020 15:55:42 +0000 (+0100)
Subject: Make the provider side EVP PKEY MAC bridge available in default and fips
X-Git-Tag: openssl-3.0.0-alpha7~458
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b571e662cdc06febabeac3a117726deaf812afd7;p=thirdparty%2Fopenssl.git

Make the provider side EVP PKEY MAC bridge available in default and fips

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

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 7fd5339537b..efec516ac23 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -151,7 +151,6 @@ static int is_legacy_alg(int id, const char *keytype)
      */
     case EVP_PKEY_SM2:
     case EVP_PKEY_CMAC:
-    case EVP_PKEY_HMAC:
     case EVP_PKEY_SIPHASH:
     case EVP_PKEY_POLY1305:
         return 1;
diff --git a/providers/defltprov.c b/providers/defltprov.c
index 9aefa801a17..c5b3407894a 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -364,6 +364,7 @@ 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 },
     { NULL, NULL, NULL }
 };
 
@@ -392,6 +393,7 @@ 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 },
     { NULL, NULL, NULL }
 };
 
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index b29cae509c0..745d5320ba6 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -436,6 +436,7 @@ 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 },
     { NULL, NULL, NULL }
 };
 
@@ -464,6 +465,7 @@ 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 },
     { NULL, NULL, NULL }
 };