Merge branch 'dev' into jonas/psq

cryspen · Jun 26, 2024 · 03f9269 · 03f9269
2 parents 464826c + 9018f21
commit 03f9269
Show file tree

Hide file tree

Showing 60 changed files with 4,402 additions and 330 deletions.
diff --git a/.github/workflows/mlkem.yml b/.github/workflows/mlkem.yml
@@ -145,6 +145,12 @@ jobs:
           cargo clean
           LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo test --verbose --release $RUST_TARGET_FLAG
 
+      - name: 🏃🏻‍♀️ Test Kyber
+        run: |
+          cargo clean
+          cargo test --features kyber --verbose $RUST_TARGET_FLAG
+
+
   benchmarks:
     strategy:
       fail-fast: true

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -14,7 +14,7 @@ publish = false
 [dev-dependencies]
 libcrux = { path = "../", features = ["rand", "tests"] }
 libcrux-kem = { path = "../libcrux-kem", features = ["tests"] }
-libcrux-ml-kem = { path = "../libcrux-ml-kem", features = ["tests"] }
+libcrux-ml-kem = { path = "../libcrux-ml-kem" }
 rand = { version = "0.8" }
 rand_core = { version = "0.6" }
 # Benchmarking "RustCrypto"

diff --git a/libcrux-kem/Cargo.toml b/libcrux-kem/Cargo.toml
@@ -20,6 +20,7 @@ rand = { version = "0.8" }
 
 [features]
 tests = [] # Expose functions for testing.
+kyber = ["libcrux-ml-kem/kyber"]
 
 [dev-dependencies]
 libcrux-kem = { version = "0.0.2-pre.2", path = "./", features = ["tests"] }