Merge branch 'main' into dev-panic-free

cryspen · Dec 20, 2024 · 2505360 · 2505360
2 parents fdbede1 + 50cacf4
commit 2505360
Show file tree

Hide file tree

Showing 80 changed files with 3,380 additions and 3,538 deletions.
diff --git a/benchmarks/benches/circl/go.mod b/benchmarks/benches/circl/go.mod
@@ -5,6 +5,6 @@ go 1.20
 require github.com/cloudflare/circl v1.3.7
 
 require (
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
 )
diff --git a/benchmarks/benches/circl/go.sum b/benchmarks/benches/circl/go.sum
@@ -1,6 +1,6 @@
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
diff --git a/libcrux-ml-dsa/cg.yaml b/libcrux-ml-dsa/cg.yaml
@@ -53,7 +53,8 @@ files:
     include_in_h:
       - '"intrinsics/libcrux_intrinsics_avx2.h"'
     api:
-      patterns:  
+      patterns:
+        - [libcrux_ml_dsa, samplex4, avx2, "*"]
         - [libcrux_ml_dsa, simd, avx2, "*"]
         - [libcrux_ml_dsa, hash_functions, simd256, "*"]
         - [libcrux_ml_dsa, ml_dsa_65, avx2, "*"]
@@ -76,6 +77,7 @@ files:
     api:
       patterns:
         - [libcrux_ml_dsa, "*"]
+        - [libcrux_ml_dsa, samplex4, portable, "*"]
         - [libcrux_ml_dsa, simd, "*"]
         - [libcrux_ml_dsa, hash_functions, portable, "*"]
         - [libcrux_ml_dsa, ml_dsa_65, portable, "*"]

diff --git a/libcrux-ml-dsa/cg/code_gen.txt b/libcrux-ml-dsa/cg/code_gen.txt
@@ -3,4 +3,4 @@ Charon: a68994d00017b76a805d0115ca06c1f2c1805e79
 Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
 Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
 F*: b0961063393215ca65927f017720cb365a193833-dirty
-Libcrux: d4b51bcb3af12fb1358ed37830e33cbd72d31590
+Libcrux: 00424f6ff03ac7c79f2922ed628bf6a5b8723be3
diff --git a/libcrux-ml-dsa/cg/header.txt b/libcrux-ml-dsa/cg/header.txt
@@ -8,5 +8,5 @@
  * Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
  * Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
  * F*: b0961063393215ca65927f017720cb365a193833-dirty
- * Libcrux: d4b51bcb3af12fb1358ed37830e33cbd72d31590
+ * Libcrux: 00424f6ff03ac7c79f2922ed628bf6a5b8723be3
  */
diff --git a/libcrux-ml-dsa/cg/libcrux_core.h b/libcrux-ml-dsa/cg/libcrux_core.h
@@ -8,7 +8,7 @@
  * Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
  * Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
  * F*: b0961063393215ca65927f017720cb365a193833-dirty
- * Libcrux: 87497297c8d9a6be6127d9daae13a942b5439e74
+ * Libcrux: 00424f6ff03ac7c79f2922ed628bf6a5b8723be3
  */
 
 #ifndef __libcrux_core_H
@@ -139,11 +139,11 @@ typedef struct libcrux_ml_dsa_ml_dsa_65_MLDSA65Signature_s {
 This function found in impl {libcrux_ml_dsa::types::MLDSASignature<SIZE>#4}
 */
 /**
-A monomorphic instance of libcrux_ml_dsa.types.as_raw_8f
+A monomorphic instance of libcrux_ml_dsa.types.as_ref_8f
 with const generics
 - SIZE= 3309
 */
-static inline uint8_t *libcrux_ml_dsa_types_as_raw_8f_fa(
+static inline uint8_t *libcrux_ml_dsa_types_as_ref_8f_fa(
     libcrux_ml_dsa_ml_dsa_65_MLDSA65Signature *self) {
   return self->value;
 }
@@ -216,11 +216,11 @@ This function found in impl
 {libcrux_ml_dsa::types::MLDSAVerificationKey<SIZE>#2}
 */
 /**
-A monomorphic instance of libcrux_ml_dsa.types.as_raw_66
+A monomorphic instance of libcrux_ml_dsa.types.as_ref_66
 with const generics
 - SIZE= 1952
 */
-static inline uint8_t *libcrux_ml_dsa_types_as_raw_66_97(
+static inline uint8_t *libcrux_ml_dsa_types_as_ref_66_97(
     libcrux_ml_dsa_types_MLDSAVerificationKey_ea *self) {
   return self->value;
 }
@@ -369,11 +369,11 @@ typedef struct libcrux_ml_dsa_types_MLDSASigningKey_22_s {
 This function found in impl {libcrux_ml_dsa::types::MLDSASigningKey<SIZE>}
 */
 /**
-A monomorphic instance of libcrux_ml_dsa.types.as_raw_9b
+A monomorphic instance of libcrux_ml_dsa.types.as_ref_9b
 with const generics
 - SIZE= 4032
 */
-static inline uint8_t *libcrux_ml_dsa_types_as_raw_9b_09(
+static inline uint8_t *libcrux_ml_dsa_types_as_ref_9b_09(
     libcrux_ml_dsa_types_MLDSASigningKey_22 *self) {
   return self->value;
 }