ML-KEM move to the FIPS module (aws#1802)

Move the ML-KEM implementation to the FIPS module.
justsmth · Aug 26, 2024 · 4ec9993 · 4ec9993
1 parent f3f9fe7
commit 4ec9993
Show file tree

Hide file tree

Showing 33 changed files with 615 additions and 615 deletions.
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
@@ -446,7 +446,6 @@ add_library(
   kyber/kem_kyber.c
   lhash/lhash.c
   mem.c
-  ml_kem/ml_kem.c
   obj/obj.c
   obj/obj_xref.c
   ocsp/ocsp_asn.c

diff --git a/crypto/evp_extra/evp_extra_test.cc b/crypto/evp_extra/evp_extra_test.cc
@@ -2072,9 +2072,9 @@ static const struct KnownKEM kKEMs[] = {
   {"Kyber512r3", NID_KYBER512_R3, 800, 1632, 768, 32, 64, 32, "kyber/kat/kyber512r3.txt"},
   {"Kyber768r3", NID_KYBER768_R3, 1184, 2400, 1088, 32, 64, 32, "kyber/kat/kyber768r3.txt"},
   {"Kyber1024r3", NID_KYBER1024_R3, 1568, 3168, 1568, 32, 64, 32, "kyber/kat/kyber1024r3.txt"},
-  {"MLKEM512", NID_MLKEM512, 800, 1632, 768, 32, 64, 32, "ml_kem/kat/mlkem512.txt"},
-  {"MLKEM768", NID_MLKEM768, 1184, 2400, 1088, 32, 64, 32, "ml_kem/kat/mlkem768.txt"},
-  {"MLKEM1024", NID_MLKEM1024, 1568, 3168, 1568, 32, 64, 32, "ml_kem/kat/mlkem1024.txt"},
+  {"MLKEM512", NID_MLKEM512, 800, 1632, 768, 32, 64, 32, "fipsmodule/ml_kem/kat/mlkem512.txt"},
+  {"MLKEM768", NID_MLKEM768, 1184, 2400, 1088, 32, 64, 32, "fipsmodule/ml_kem/kat/mlkem768.txt"},
+  {"MLKEM1024", NID_MLKEM1024, 1568, 3168, 1568, 32, 64, 32, "fipsmodule/ml_kem/kat/mlkem1024.txt"},
 };
 
 class PerKEMTest : public testing::TestWithParam<KnownKEM> {};

diff --git a/crypto/fipsmodule/bcm.c b/crypto/fipsmodule/bcm.c
@@ -118,6 +118,7 @@
 #include "kdf/sskdf.c"
 #include "md4/md4.c"
 #include "md5/md5.c"
+#include "ml_kem/ml_kem.c"
 #include "modes/cbc.c"
 #include "modes/cfb.c"
 #include "modes/ctr.c"

diff --git a/crypto/ml_kem/README.md → crypto/fipsmodule/ml_kem/README.md b/crypto/ml_kem/README.md → crypto/fipsmodule/ml_kem/README.md
diff --git a/crypto/ml_kem/kat/mlkem1024.txt → crypto/fipsmodule/ml_kem/kat/mlkem1024.txt b/crypto/ml_kem/kat/mlkem1024.txt → crypto/fipsmodule/ml_kem/kat/mlkem1024.txt
diff --git a/crypto/ml_kem/kat/mlkem512.txt → crypto/fipsmodule/ml_kem/kat/mlkem512.txt b/crypto/ml_kem/kat/mlkem512.txt → crypto/fipsmodule/ml_kem/kat/mlkem512.txt
diff --git a/crypto/ml_kem/kat/mlkem768.txt → crypto/fipsmodule/ml_kem/kat/mlkem768.txt b/crypto/ml_kem/kat/mlkem768.txt → crypto/fipsmodule/ml_kem/kat/mlkem768.txt
diff --git a/crypto/ml_kem/ml_kem.c → crypto/fipsmodule/ml_kem/ml_kem.c b/crypto/ml_kem/ml_kem.c → crypto/fipsmodule/ml_kem/ml_kem.c
diff --git a/crypto/ml_kem/ml_kem.h → crypto/fipsmodule/ml_kem/ml_kem.h b/crypto/ml_kem/ml_kem.h → crypto/fipsmodule/ml_kem/ml_kem.h
diff --git a/crypto/ml_kem/ml_kem_ref/cbd.c → crypto/fipsmodule/ml_kem/ml_kem_ref/cbd.c b/crypto/ml_kem/ml_kem_ref/cbd.c → crypto/fipsmodule/ml_kem/ml_kem_ref/cbd.c
diff --git a/crypto/ml_kem/ml_kem_ref/cbd.h → crypto/fipsmodule/ml_kem/ml_kem_ref/cbd.h b/crypto/ml_kem/ml_kem_ref/cbd.h → crypto/fipsmodule/ml_kem/ml_kem_ref/cbd.h
diff --git a/crypto/ml_kem/ml_kem_ref/indcpa.c → crypto/fipsmodule/ml_kem/ml_kem_ref/indcpa.c b/crypto/ml_kem/ml_kem_ref/indcpa.c → crypto/fipsmodule/ml_kem/ml_kem_ref/indcpa.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "../../internal.h"
+#include "../../../internal.h"
 
 #include "params.h"
 #include "indcpa.h"
@@ -162,7 +162,7 @@ static unsigned int rej_uniform(int16_t *r,
 **************************************************/
 #define GEN_MATRIX_NBLOCKS ((12*KYBER_N/8*(1 << 12)/KYBER_Q + XOF_BLOCKBYTES)/XOF_BLOCKBYTES)
 // Not static for benchmarking
-void gen_matrix(ml_kem_params *params, polyvec *a, const uint8_t *seed, int transposed)
+void gen_matrix(ml_kem_params *params, polyvec *a, const uint8_t seed[KYBER_SYMBYTES], int transposed)
 {
   unsigned int ctr, i, j, k;
   unsigned int buflen, off;
@@ -267,7 +267,7 @@ void indcpa_enc(ml_kem_params *params,
                 uint8_t *c,
                 const uint8_t *m,
                 const uint8_t *pk,
-                const uint8_t *coins)
+                const uint8_t coins[KYBER_SYMBYTES])
 {
   unsigned int i;
   uint8_t seed[KYBER_SYMBYTES];

diff --git a/crypto/ml_kem/ml_kem_ref/indcpa.h → crypto/fipsmodule/ml_kem/ml_kem_ref/indcpa.h b/crypto/ml_kem/ml_kem_ref/indcpa.h → crypto/fipsmodule/ml_kem/ml_kem_ref/indcpa.h
@@ -6,7 +6,7 @@
 #include "polyvec.h"
 
 #define gen_matrix KYBER_NAMESPACE(gen_matrix)
-void gen_matrix(ml_kem_params *params, polyvec *a, const uint8_t *seed, int transposed);
+void gen_matrix(ml_kem_params *params, polyvec *a, const uint8_t seed[KYBER_SYMBYTES], int transposed);
 
 #define indcpa_keypair_derand KYBER_NAMESPACE(indcpa_keypair_derand)
 void indcpa_keypair_derand(ml_kem_params *params,
@@ -19,7 +19,7 @@ void indcpa_enc(ml_kem_params *params,
                 uint8_t *c,
                 const uint8_t *m,
                 const uint8_t *pk,
-                const uint8_t *coins);
+                const uint8_t coins[KYBER_SYMBYTES]);
 
 #define indcpa_dec KYBER_NAMESPACE(indcpa_dec)
 void indcpa_dec(ml_kem_params *params,

diff --git a/crypto/ml_kem/ml_kem_ref/kem.c → crypto/fipsmodule/ml_kem/ml_kem_ref/kem.c b/crypto/ml_kem/ml_kem_ref/kem.c → crypto/fipsmodule/ml_kem/ml_kem_ref/kem.c
diff --git a/crypto/ml_kem/ml_kem_ref/kem.h → crypto/fipsmodule/ml_kem/ml_kem_ref/kem.h b/crypto/ml_kem/ml_kem_ref/kem.h → crypto/fipsmodule/ml_kem/ml_kem_ref/kem.h
diff --git a/crypto/ml_kem/ml_kem_ref/ntt.c → crypto/fipsmodule/ml_kem/ml_kem_ref/ntt.c b/crypto/ml_kem/ml_kem_ref/ntt.c → crypto/fipsmodule/ml_kem/ml_kem_ref/ntt.c
diff --git a/crypto/ml_kem/ml_kem_ref/ntt.h → crypto/fipsmodule/ml_kem/ml_kem_ref/ntt.h b/crypto/ml_kem/ml_kem_ref/ntt.h → crypto/fipsmodule/ml_kem/ml_kem_ref/ntt.h
diff --git a/crypto/ml_kem/ml_kem_ref/params.c → crypto/fipsmodule/ml_kem/ml_kem_ref/params.c b/crypto/ml_kem/ml_kem_ref/params.c → crypto/fipsmodule/ml_kem/ml_kem_ref/params.c
diff --git a/crypto/ml_kem/ml_kem_ref/params.h → crypto/fipsmodule/ml_kem/ml_kem_ref/params.h b/crypto/ml_kem/ml_kem_ref/params.h → crypto/fipsmodule/ml_kem/ml_kem_ref/params.h
diff --git a/crypto/ml_kem/ml_kem_ref/poly.c → crypto/fipsmodule/ml_kem/ml_kem_ref/poly.c b/crypto/ml_kem/ml_kem_ref/poly.c → crypto/fipsmodule/ml_kem/ml_kem_ref/poly.c
@@ -9,7 +9,7 @@
 #include "cbd.h"
 #include "symmetric.h"
 
-#include "../../internal.h"
+#include "../../../internal.h"
 
 /*************************************************
 * Name:        poly_compress