update build infrastructure for ML-KEM in the FIPS provider

Also avoid a file name conflict when adding ML-KEM to the FIPS provider.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Hugo Landau <hlandau@devever.net>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26338)

diff --git a/crypto/ml_kem/build.info b/crypto/ml_kem/build.info
index 7eefeb922f7a8a6663b06e6690109e573f03b3b0..e2ea88b35dcff6f9feabcb0092eaa467e7febd00 100644 (file)
--- a/crypto/ml_kem/build.info
+++ b/crypto/ml_kem/build.info
@@ -2,4 +2,5 @@ LIBS = ../../libcrypto
 
 IF[{- !$disabled{'ml-kem'} -}]
     SOURCE[../../libcrypto]=ml_kem.c
+    SOURCE[../../providers/libfips.a]=ml_kem.c
 ENDIF

diff --git a/providers/implementations/kem/build.info b/providers/implementations/kem/build.info
index 901ccd862ab6b0bd7e5b76459d47c4180fcace92..8763b8471e81abf872e783fd2bab4481f24b5cf5 100644 (file)
--- a/providers/implementations/kem/build.info
+++ b/providers/implementations/kem/build.info
@@ -4,7 +4,7 @@
 $RSA_KEM_GOAL=../../libdefault.a ../../libfips.a
 $EC_KEM_GOAL=../../libdefault.a
 $TEMPLATE_KEM_GOAL=../../libtemplate.a
-$ML_KEM_GOAL=../../libdefault.a
+$ML_KEM_GOAL=../../libdefault.a ../../libfips.a
 $TLS_ML_KEM_HYBRID_GOAL=../../libdefault.a
 
 SOURCE[$RSA_KEM_GOAL]=rsa_kem.c
@@ -20,7 +20,7 @@ IF[{- !$disabled{'ml-kem'} -}]
   IF[{- !$disabled{ec} -}]
     SOURCE[$TLS_ML_KEM_HYBRID_GOAL]=mlx_kem.c
   ENDIF
-  SOURCE[$ML_KEM_GOAL] = ml_kem.c
+  SOURCE[$ML_KEM_GOAL] = ml_kem_kem.c
 ENDIF
 
 SOURCE[$TEMPLATE_KEM_GOAL]=template_kem.c

diff --git a/providers/implementations/kem/ml_kem.c b/providers/implementations/kem/ml_kem_kem.c
similarity index 100%
rename from providers/implementations/kem/ml_kem.c
rename to providers/implementations/kem/ml_kem_kem.c

diff --git a/providers/implementations/keymgmt/build.info b/providers/implementations/keymgmt/build.info
index 6abc310e167329b5fbcca4d568b09d3dd3cb988e..d9c333e41ecfd9ec06b593e1dd8d8a19cfc582ec 100644 (file)
--- a/providers/implementations/keymgmt/build.info
+++ b/providers/implementations/keymgmt/build.info
@@ -10,7 +10,7 @@ $MAC_GOAL=../../libdefault.a ../../libfips.a
 $RSA_GOAL=../../libdefault.a ../../libfips.a
 $TEMPLATE_GOAL=../../libtemplate.a
 $ML_DSA_GOAL=../../libdefault.a ../../libfips.a
-$ML_KEM_GOAL=../../libdefault.a
+$ML_KEM_GOAL=../../libdefault.a ../../libfips.a
 $TLS_ML_KEM_HYBRID_GOAL=../../libdefault.a
 
 IF[{- !$disabled{dh} -}]