ML-DSA: reduce amount of duplicate compiled code

Reported-by: "Becker, Hanno" <beckphan@amazon.co.uk>
Signed-off-by: Stephan Mueller <smueller@chronox.de>

Author: smuellerDD

CHANGES.md

@@ -17,6 +17,8 @@ Changes 1.7.0-prerelease
 
 * ML-KEM/DSA: add safety measures against compilers trying to reason about code they should not reason about. Changes are suggested by "Becker, Hanno" <beckphan@amazon.co.uk> and derived from https://github.com/pq-code-package/ml[dsa|kem]-native/
 
+* ML-DSA: reduce amount of duplicate code compilation suggested by "Becker, Hanno" <beckphan@amazon.co.uk>
+
 Changes 1.6.0
 * ASN.1: use stack for small generator for small use cases
 

linux_kernel/Kbuild.ml-dsa

@@ -7,44 +7,42 @@
 # Dilithium Common
 leancrypto-$(CONFIG_LEANCRYPTO_DILITHIUM)				       \
 				+= ../ml-dsa/src/dilithium_api.o	       \
+				   ../ml-dsa/src/dilithium_ntt.o	       \
+				   ../ml-dsa/src/dilithium_poly.o	       \
+				   ../ml-dsa/src/dilithium_rounding.o	       \
 				   ../ml-dsa/src/dilithium_zetas.o	       \
 				   leancrypto_kernel_dilithium.o
 
 # Dilithium 87
 leancrypto-$(CONFIG_LEANCRYPTO_DILITHIUM_87)				       \
-				+= ../ml-dsa/src/dilithium_ntt.o	       \
-				   ../ml-dsa/src/dilithium_poly.o	       \
-				   ../ml-dsa/src/dilithium_rounding.o	       \
+				+= ../ml-dsa/src/dilithium_poly_type.o	       \
+				   ../ml-dsa/src/dilithium_rounding_type.o     \
 				   ../ml-dsa/src/dilithium_selftest.o	       \
 				   ../ml-dsa/src/dilithium_signature_c.o       \
 				   ../ml-dsa/src/dilithium_signature_helper.o
 
 # Dilithium 65
 leancrypto-$(CONFIG_LEANCRYPTO_DILITHIUM_65)				       \
-				+= dilithium65/dilithium_ntt.o		       \
-				   dilithium65/dilithium_poly.o		       \
-				   dilithium65/dilithium_rounding.o	       \
+				+= dilithium65/dilithium_poly_type.o	       \
+				   dilithium65/dilithium_rounding_type.o       \
 				   dilithium65/dilithium_selftest.o	       \
 				   dilithium65/dilithium_signature_c.o         \
 				   dilithium65/dilithium_signature_helper.o
-CFLAGS_dilithium65/dilithium_ntt.o			:= -DLC_DILITHIUM_TYPE_65
-CFLAGS_dilithium65/dilithium_poly.o			:= -DLC_DILITHIUM_TYPE_65
-CFLAGS_dilithium65/dilithium_rounding.o			:= -DLC_DILITHIUM_TYPE_65
+CFLAGS_dilithium65/dilithium_poly_type.o		:= -DLC_DILITHIUM_TYPE_65
+CFLAGS_dilithium65/dilithium_rounding_type.o		:= -DLC_DILITHIUM_TYPE_65
 CFLAGS_dilithium65/dilithium_selftest.o			:= -DLC_DILITHIUM_TYPE_65
 CFLAGS_dilithium65/dilithium_signature_c.o		:= -DLC_DILITHIUM_TYPE_65
 CFLAGS_dilithium65/dilithium_signature_helper.o		:= -DLC_DILITHIUM_TYPE_65
 
 # Dilithium 44
 leancrypto-$(CONFIG_LEANCRYPTO_DILITHIUM_44)				       \
-				+= dilithium44/dilithium_ntt.o		       \
-				   dilithium44/dilithium_poly.o		       \
-				   dilithium44/dilithium_rounding.o	       \
+				+= dilithium44/dilithium_poly_type.o	       \
+				   dilithium44/dilithium_rounding_type.o       \
 				   dilithium44/dilithium_selftest.o	       \
 				   dilithium44/dilithium_signature_c.o         \
 				   dilithium44/dilithium_signature_helper.o
-CFLAGS_dilithium44/dilithium_ntt.o			:= -DLC_DILITHIUM_TYPE_44
-CFLAGS_dilithium44/dilithium_poly.o			:= -DLC_DILITHIUM_TYPE_44
-CFLAGS_dilithium44/dilithium_rounding.o			:= -DLC_DILITHIUM_TYPE_44
+CFLAGS_dilithium44/dilithium_poly_type.o		:= -DLC_DILITHIUM_TYPE_44
+CFLAGS_dilithium44/dilithium_rounding_type.o		:= -DLC_DILITHIUM_TYPE_44
 CFLAGS_dilithium44/dilithium_selftest.o			:= -DLC_DILITHIUM_TYPE_44
 CFLAGS_dilithium44/dilithium_signature_c.o		:= -DLC_DILITHIUM_TYPE_44
 CFLAGS_dilithium44/dilithium_signature_helper.o		:= -DLC_DILITHIUM_TYPE_44

linux_kernel/dilithium44/dilithium_ntt.c

@@ -0,0 +1 @@
+../../ml-dsa/src/dilithium_poly_type.c

linux_kernel/dilithium44/dilithium_poly.c

@@ -0,0 +1 @@
+../../ml-dsa/src/dilithium_rounding_type.c

linux_kernel/dilithium44/dilithium_poly_type.c

@@ -0,0 +1 @@
+../../ml-dsa/src/dilithium_poly_type.c