working C pqcp-mlkem

Signed-off-by: Basil Hess <[email protected]>
open-quantum-safe · Dec 10, 2024 · 9b0fe0f · 9b0fe0f
1 parent 28d2932
commit 9b0fe0f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/docs/algorithms/kem/ml_kem.md b/docs/algorithms/kem/ml_kem.md
@@ -7,7 +7,7 @@
 - **Authors' website**: https://pq-crystals.org/kyber/ and https://csrc.nist.gov/pubs/fips/203
 - **Specification version**: ML-KEM.
 - **Primary Source**<a name="primary-source"></a>:
-  - **Source**: https://github.com/bhess/mlkem-native/commit/2b650d6676bf6a3a82ab7e9ecd96acd397ca71cd
+  - **Source**: https://github.com/bhess/mlkem-native/commit/d02922e301696f82c996f6844d83b5f9a7933ad1
   - **Implementation license (SPDX-Identifier)**: CC0-1.0 or Apache-2.0
 
 

diff --git a/docs/algorithms/kem/ml_kem.yml b/docs/algorithms/kem/ml_kem.yml
@@ -17,7 +17,7 @@ website: https://pq-crystals.org/kyber/ and https://csrc.nist.gov/pubs/fips/203
 nist-round: FIPS203
 spec-version: ML-KEM
 primary-upstream:
-  source: https://github.com/bhess/mlkem-native/commit/2b650d6676bf6a3a82ab7e9ecd96acd397ca71cd
+  source: https://github.com/bhess/mlkem-native/commit/d02922e301696f82c996f6844d83b5f9a7933ad1
   spdx-license-identifier: CC0-1.0 or Apache-2.0
 parameter-sets:
 - name: ML-KEM-512

diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml
@@ -42,7 +42,7 @@ upstreams:
     name: mlkem-native
     git_url: https://github.com/bhess/mlkem-native.git
     git_branch: updates
-    git_commit: 14141720b0149cad6c2f91b037e3e6a15882840c
+    git_commit: d02922e301696f82c996f6844d83b5f9a7933ad1
     kem_meta_path: '{pretty_name_full}_META.yml'
     kem_scheme_path: '.'
   -

diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/indcpa.c b/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/indcpa.c
@@ -22,7 +22,6 @@
 
 #include "cbmc.h"
 
-
 /*************************************************
  * Name:        pack_pk
  *

diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/params.h b/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/params.h
@@ -8,8 +8,9 @@
 #include "common.h"
 #include "cpucap.h"
 
+#ifndef KECCAK_WAY
 #define KECCAK_WAY 4
-
+#endif
 
 #ifndef MLKEM_K
 #define MLKEM_K 3 /* Change this for different security strengths */

diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/indcpa.c b/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/indcpa.c
@@ -22,7 +22,6 @@
 
 #include "cbmc.h"
 
-
 /*************************************************
  * Name:        pack_pk
  *

diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/params.h b/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/params.h
@@ -8,7 +8,9 @@
 #include "common.h"
 #include "cpucap.h"
 
+#ifndef KECCAK_WAY
 #define KECCAK_WAY 4
+#endif
 
 #ifndef MLKEM_K
 #define MLKEM_K 3 /* Change this for different security strengths */

diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/indcpa.c b/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/indcpa.c
@@ -22,8 +22,6 @@
 
 #include "cbmc.h"
 
-
-
 /*************************************************
  * Name:        pack_pk
  *

diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/params.h b/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/params.h
@@ -8,7 +8,9 @@
 #include "common.h"
 #include "cpucap.h"
 
+#ifndef KECCAK_WAY
 #define KECCAK_WAY 4
+#endif
 
 #ifndef MLKEM_K
 #define MLKEM_K 3 /* Change this for different security strengths */
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ @@
     #include "cbmc.h"
     /*************************************************
      * Name:        pack_pk
      *
@@ Expand Down @@