[PSQ] Allow using Classic McEliece for PQ KEM

libcrux-psq/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "libcrux-psq"
 description = "Libcrux Pre-Shared post-Quantum key establishement protocol"
-version = "0.0.3"
+version = "0.0.4"
 readme = "README.md"
 
 authors.workspace = true
@@ -48,17 +48,22 @@ log = "0.4.26"
 pretty_env_logger = "0.5.0"
 
 [features]
+v1 = []
 classic-mceliece = ["dep:classic-mceliece-rust", "rand_old"]
 # DO NOT USE: This feature enables implementations backed
 # by non-post-quantum KEMs and should only be used for
 # testing purposes and benchmark baselines.
-test-utils = []
+test-utils = ["v1"]
 
 [[bench]]
 name = "psq"
 harness = false
-required-features = ["classic-mceliece", "test-utils"]
+required-features = ["v1", "classic-mceliece", "test-utils"]
 
 [[bench]]
 name = "psq_v2"
 harness = false
+
+[[example]]
+name = "psq"
+required-features = ["v1"]

libcrux-psq/benches/psq.rs

@@ -1,5 +1,5 @@
 use classic_mceliece_rust::{decapsulate_boxed, encapsulate_boxed};
-use libcrux_psq::traits::PSQ;
+use libcrux_psq::v1::traits::PSQ;
 use libcrux_traits::kem::KEM;
 use std::time::Duration;
 
@@ -166,11 +166,11 @@ pub fn psq_encaps(c: &mut Criterion) {
             });
         };
     }
-    encaps_bench!("libcrux ML-KEM-768", libcrux_psq::impls::MlKem768);
-    encaps_bench!("libcrux X25519", libcrux_psq::impls::X25519);
+    encaps_bench!("libcrux ML-KEM-768", libcrux_psq::v1::impls::MlKem768);
+    encaps_bench!("libcrux X25519", libcrux_psq::v1::impls::X25519);
     encaps_bench!(
         "libcrux XWingKemDraft06",
-        libcrux_psq::impls::XWingKemDraft06
+        libcrux_psq::v1::impls::XWingKemDraft06
     );
     encaps_bench!(
         "classic_mceliece_rust (mceliece460896f)",
@@ -212,11 +212,11 @@ pub fn psq_decaps(c: &mut Criterion) {
             });
         };
     }
-    decaps_bench!("libcrux ML-KEM-768", libcrux_psq::impls::MlKem768);
-    decaps_bench!("libcrux X25519", libcrux_psq::impls::X25519);
+    decaps_bench!("libcrux ML-KEM-768", libcrux_psq::v1::impls::MlKem768);
+    decaps_bench!("libcrux X25519", libcrux_psq::v1::impls::X25519);
     decaps_bench!(
         "libcrux XWingKemDraft06",
-        libcrux_psq::impls::XWingKemDraft06
+        libcrux_psq::v1::impls::XWingKemDraft06
     );
     decaps_bench!(
         "classic_mceliece_rust (mceliece460896f)",