diff --git a/Cargo.lock b/Cargo.lock index 22adc10..b4f59a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -454,19 +454,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "derive_arbitrary" version = "1.3.2" @@ -527,7 +514,7 @@ checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "windows-sys 0.48.0", ] @@ -550,83 +537,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" - -[[package]] -name = "futures-executor" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-util" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - [[package]] name = "getrandom" version = "0.2.11" @@ -873,16 +783,6 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.20" @@ -995,29 +895,6 @@ version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - [[package]] name = "paste" version = "1.0.14" @@ -1036,18 +913,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - [[package]] name = "pkg-config" version = "0.3.27" @@ -1184,15 +1049,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" version = "1.10.2" @@ -1265,7 +1121,6 @@ dependencies = [ "rosenpass-to", "rosenpass-util", "serde", - "serial_test", "stacker", "static_assertions", "test_bin", @@ -1490,52 +1345,12 @@ dependencies = [ "serde", ] -[[package]] -name = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "shlex" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - [[package]] name = "spin" version = "0.9.8" diff --git a/Cargo.toml b/Cargo.toml index ede1cb6..7020bb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,5 +57,4 @@ arbitrary = { version = "1.3.2", features = ["derive"] } anyhow = { version = "1.0.75", features = ["backtrace", "std"] } mio = { version = "0.8.9", features = ["net", "os-poll"] } libsodium-sys-stable= { version = "1.20.4", features = ["use-pkg-config"] } -oqs-sys = { version = "0.8", default-features = false, features = ['classic_mceliece', 'kyber'] } -serial_test = "2.0.0" \ No newline at end of file +oqs-sys = { version = "0.8", default-features = false, features = ['classic_mceliece', 'kyber'] } \ No newline at end of file diff --git a/rosenpass/Cargo.toml b/rosenpass/Cargo.toml index f0192ab..f8f4634 100644 --- a/rosenpass/Cargo.toml +++ b/rosenpass/Cargo.toml @@ -42,5 +42,4 @@ anyhow = { workspace = true } [dev-dependencies] criterion = { workspace = true } test_bin = { workspace = true } -stacker = { workspace = true } -serial_test = {workspace = true} \ No newline at end of file +stacker = { workspace = true } \ No newline at end of file diff --git a/rosenpass/src/config.rs b/rosenpass/src/config.rs index 75ec941..6746cb3 100644 --- a/rosenpass/src/config.rs +++ b/rosenpass/src/config.rs @@ -370,7 +370,6 @@ impl Default for Verbosity { #[cfg(test)] mod test { use super::*; - use serial_test::parallel; use std::net::IpAddr; fn split_str(s: &str) -> Vec { @@ -378,7 +377,6 @@ mod test { } #[test] - #[parallel] fn test_simple_cli_parse() { let args = split_str( "public-key /my/public-key secret-key /my/secret-key verbose \ @@ -408,7 +406,6 @@ mod test { } #[test] - #[parallel] fn test_cli_parse_multiple_peers() { let args = split_str( "public-key /my/public-key secret-key /my/secret-key verbose \ diff --git a/rosenpass/src/msgs.rs b/rosenpass/src/msgs.rs index 344e7a6..4f83781 100644 --- a/rosenpass/src/msgs.rs +++ b/rosenpass/src/msgs.rs @@ -191,22 +191,18 @@ pub const BISCUIT_CT_LEN: usize = BISCUIT_PT_LEN + xaead::NONCE_LEN + xaead::TAG mod test_constants { use crate::msgs::{BISCUIT_CT_LEN, BISCUIT_PT_LEN}; use rosenpass_ciphers::{xaead, KEY_LEN}; - use serial_test::parallel; #[test] - #[parallel] fn sodium_keysize() { assert_eq!(KEY_LEN, 32); } #[test] - #[parallel] fn biscuit_pt_len() { assert_eq!(BISCUIT_PT_LEN, 2 * KEY_LEN + 12); } #[test] - #[parallel] fn biscuit_ct_len() { assert_eq!( BISCUIT_CT_LEN, diff --git a/rosenpass/src/protocol.rs b/rosenpass/src/protocol.rs index a007060..54b57f8 100644 --- a/rosenpass/src/protocol.rs +++ b/rosenpass/src/protocol.rs @@ -2041,13 +2041,11 @@ impl CryptoServer { #[cfg(test)] mod test { - use serial_test::serial; use std::{net::SocketAddrV4, thread::sleep, time::Duration}; use super::*; #[test] - #[serial] /// Ensure that the protocol implementation can deal with truncated /// messages and with overlong messages. /// @@ -2139,7 +2137,6 @@ mod test { } #[test] - #[serial] fn cookie_reply_mechanism_responder_under_load() { rosenpass_sodium::init().unwrap(); @@ -2222,7 +2219,6 @@ mod test { } #[test] - #[serial] fn cookie_reply_mechanism_initiator_bails_on_message_under_load() { rosenpass_sodium::init().unwrap(); stacker::grow(8 * 1024 * 1024, || {