Add GENERIC SKEYMGMT to the legacy provider

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28369)

diff --git a/providers/implementations/skeymgmt/build.info b/providers/implementations/skeymgmt/build.info
index 8bccdd72f6c63adc89b0579f7c87fee62e983081..4143b572b109c3d429efdada55653f5daa5e9686 100644 (file)
--- a/providers/implementations/skeymgmt/build.info
+++ b/providers/implementations/skeymgmt/build.info
@@ -2,7 +2,11 @@
 # switch each to the Legacy provider when needed.
 
 $AES_GOAL=../../libdefault.a ../../libfips.a
-$GENERIC_GOAL=../../libdefault.a ../../libfips.a
+IF[{- !$disabled{module} -}]
+  $GENERIC_GOAL=../../libdefault.a ../../libfips.a ../../liblegacy.a
+ELSE
+  $GENERIC_GOAL=../../libdefault.a ../../libfips.a
+ENDIF
 
 SOURCE[$AES_GOAL]=aes_skmgmt.c
 SOURCE[$GENERIC_GOAL]=generic.c

diff --git a/providers/legacyprov.c b/providers/legacyprov.c
index 4aacedeee0e3120224fa05ee5cedde5a48ea1e12..bceb620c557afed9050e20b24b09511524bad030 100644 (file)
--- a/providers/legacyprov.c
+++ b/providers/legacyprov.c
@@ -167,6 +167,11 @@ static const OSSL_ALGORITHM legacy_kdfs[] = {
     { NULL, NULL, NULL }
 };
 
+static const OSSL_ALGORITHM legacy_skeymgmt[] = {
+    ALG(PROV_NAMES_GENERIC, ossl_generic_skeymgmt_functions),
+    { NULL, NULL, NULL }
+};
+
 static const OSSL_ALGORITHM *legacy_query(void *provctx, int operation_id,
                                           int *no_cache)
 {
@@ -178,6 +183,8 @@ static const OSSL_ALGORITHM *legacy_query(void *provctx, int operation_id,
         return legacy_ciphers;
     case OSSL_OP_KDF:
         return legacy_kdfs;
+    case OSSL_OP_SKEYMGMT:
+        return legacy_skeymgmt;
     }
     return NULL;
 }