cleanup

Cargo.toml

@@ -22,7 +22,7 @@ std = []
 serialization = ["serde", "tls_codec", "tls_codec/serde", "std"]
 hazmat = []
 hpke-test = ["std"]
-hpke-test-prng = []                                                     # ⚠️ Enable testing PRNG - DO NOT USE
+hpke-test-prng = []                                              # ⚠️ Enable testing PRNG - DO NOT USE
 
 [dev-dependencies]
 hpke-rs-crypto = { version = "0.2.0", path = "./traits", features = ["std"] }
@@ -38,6 +38,7 @@ hpke-rs-rust-crypto = { version = "0.2.0", path = "./rust_crypto_provider", feat
 rand = { version = "0.8" }
 pretty_env_logger = "0.5"
 criterion = { version = "0.5", features = ["html_reports"] }
+hpke-rs-tests = { path = "./hpke-rs-tests", version = "*" }
 
 [[bench]]
 name = "bench"

hpke-rs-tests/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "hpke-rs-tests"
 version = "0.1.0"
-authors = [ "Cryspen" ]
+authors = ["Cryspen"]
 edition = "2021"
 license = "MPL-2.0"
 readme = "Readme.md"
 description = "Tests for crypto providers"
-repository = "https://github.com/franziskuskiefer/hpke-rs"
+repository = "https://github.com/cryspen/hpke-rs"
 
 [dependencies]
 hpke-rs = { version = "0.2.0", features = [

hpke-rs-tests/src/test_hpke_kat.rs

@@ -272,12 +272,11 @@ pub fn test_kat<Crypto: HpkeCrypto + 'static>() {
     let now = Instant::now();
     kat::<Crypto>(tests.clone());
     let time = now.elapsed();
-    log::info!("Test vectors with Rust Crypto took: {}s", time.as_secs());
-
-    // let now = Instant::now();
-    // kat::<HpkeEvercrypt>(tests);
-    // let time = now.elapsed();
-    // log::info!("Test vectors with Evercrypt took: {}s", time.as_secs());
+    log::info!(
+        "Test vectors with {} took: {}s",
+        Crypto::name(),
+        time.as_secs()
+    );
 }
 
 #[macro_export]

tests/hpke.rs

@@ -0,0 +1,6 @@
+#![allow(non_snake_case)]
+
+use hpke_rs_tests::{kat_fun, test_funs};
+
+test_funs!(hpke_rs_rust_crypto::HpkeRustCrypto);
+kat_fun!(hpke_rs_rust_crypto::HpkeRustCrypto);