More breaking out common code.

formosa-crypto · Dec 6, 2024 · 1b47a0c · 1b47a0c
1 parent 7a65a1b
commit 1b47a0c
Show file tree

Hide file tree

Showing 46 changed files with 44 additions and 2,304 deletions.
diff --git a/Makefile b/Makefile
@@ -16,7 +16,9 @@ IMPLEMENTATION_SOURCES = $(IMPLEMENTATION)/ml_dsa.jazz \
 						 $(wildcard $(IMPLEMENTATION)/sample/*.jinc) \
 						 $(wildcard $(IMPLEMENTATION)/arithmetic/*.jinc) \
 						 $(wildcard $(COMMON)/*.jinc) \
-						 $(wildcard $(COMMON)/keccak/*.jinc)
+						 $(wildcard $(COMMON)/arithmetic/*.jinc) \
+						 $(wildcard $(COMMON)/keccak/*.jinc) \
+						 $(wildcard $(COMMON)/sample/*.jinc)
 
 OUTPUT_FILE_NAME = ml_dsa_$(PARAMETER_SET)_$(IMPLEMENTATION_TYPE)
 

diff --git a/ref/ml_dsa_44/arithmetic/modular.jinc → ref/common/arithmetic/modular.jinc b/ref/ml_dsa_44/arithmetic/modular.jinc → ref/common/arithmetic/modular.jinc
@@ -1,5 +1,3 @@
-require "../constants.jinc"
-
 param int INVERSE_OF_MODULUS_MOD_MONTGOMERY_R = 58_728_449;
 
 inline

diff --git a/ref/ml_dsa_87/arithmetic/ntt.jinc → ref/common/arithmetic/ntt.jinc b/ref/ml_dsa_87/arithmetic/ntt.jinc → ref/common/arithmetic/ntt.jinc
@@ -1,5 +1,4 @@
 require "modular.jinc"
-require "../constants.jinc"
 
 u32[256] ZETAS_TIMES_MONTGOMERY_R = {
     25847, -2608894, -518909, 237124, -777960, -876248, 466468, 1826347, 2353451, -359251, -2091905, 3119733, -2884855, 3111497, 2680103, 2725464,

diff --git a/ref/ml_dsa_87/column_vector.jinc → ref/common/column_vector.jinc b/ref/ml_dsa_87/column_vector.jinc → ref/common/column_vector.jinc
@@ -1,6 +1,6 @@
+from Common require "arithmetic/ntt.jinc"
+
 require "polynomial.jinc"
-require "arithmetic/rounding.jinc"
-require "arithmetic/ntt.jinc"
 
 // A column vector has dimensions ROWS_IN_MATRIX_A * 1
 namespace column_vector {

diff --git a/ref/ml_dsa_87/constants.jinc → ref/common/constants.jinc b/ref/ml_dsa_87/constants.jinc → ref/common/constants.jinc
diff --git a/ref/ml_dsa_44/polynomial.jinc → ref/common/polynomial.jinc b/ref/ml_dsa_44/polynomial.jinc → ref/common/polynomial.jinc
@@ -1,4 +1,3 @@
-require "arithmetic/rounding.jinc"
 require "arithmetic/modular.jinc"
 
 namespace polynomial {

diff --git a/ref/ml_dsa_65/row_vector.jinc → ref/common/row_vector.jinc b/ref/ml_dsa_65/row_vector.jinc → ref/common/row_vector.jinc
@@ -1,6 +1,5 @@
-require "polynomial.jinc"
-require "arithmetic/rounding.jinc"
 require "arithmetic/ntt.jinc"
+require "polynomial.jinc"
 
 // A row vector has dimensions 1 * COLUMNS_IN_MATRIX_A
 namespace row_vector {

diff --git a/ref/ml_dsa_44/sample/challenge.jinc → ref/common/sample/challenge.jinc b/ref/ml_dsa_44/sample/challenge.jinc → ref/common/sample/challenge.jinc
diff --git a/ref/ml_dsa_65/sample/mask.jinc → ref/common/sample/mask.jinc b/ref/ml_dsa_65/sample/mask.jinc → ref/common/sample/mask.jinc
diff --git a/ref/ml_dsa_65/sample/matrix_A.jinc → ref/common/sample/matrix_A.jinc b/ref/ml_dsa_65/sample/matrix_A.jinc → ref/common/sample/matrix_A.jinc
@@ -1,3 +1,5 @@
+require "../hashing.jinc"
+
 inline
 fn absorb_for_shake128(
     reg ptr u64[25] state,

diff --git a/ref/ml_dsa_44/arithmetic/ntt.jinc b/ref/ml_dsa_44/arithmetic/ntt.jinc