From: Pauli <ppzgs1@gmail.com>
Date: Wed, 8 Jan 2025 01:54:49 +0000 (+1100)
Subject: update build infrastructure for ML-KEM in the FIPS provider
X-Git-Tag: openssl-3.5.0-alpha1~541
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=289c168996c24eab8451061a4ccce0404f14ee67;p=thirdparty%2Fopenssl.git

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 7eefeb922f7..e2ea88b35dc 100644
--- 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 901ccd862ab..8763b8471e8 100644
--- 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 6abc310e167..d9c333e41ec 100644
--- 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} -}]