From b0706354d34aa4ffdd934ca69674ca225550d0ba Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 25 Sep 2024 15:49:20 +0200 Subject: [PATCH] chore: Format all Cargo.toml files Signed-off-by: Paul Spooren --- Cargo.toml | 20 +++++++++++--------- ciphers/Cargo.toml | 2 +- rosenpass/Cargo.toml | 20 +++++++++++++------- rp/Cargo.toml | 8 ++++---- secret-memory/Cargo.toml | 6 +++--- wireguard-broker/Cargo.toml | 18 +++++++++--------- 6 files changed, 41 insertions(+), 33 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 09399ec..3b45207 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ rosenpass-secret-memory = { path = "secret-memory" } rosenpass-oqs = { path = "oqs" } rosenpass-wireguard-broker = { path = "wireguard-broker" } doc-comment = "0.3.3" -base64ct = {version = "1.6.0", default-features=false} +base64ct = { version = "1.6.0", default-features = false } zeroize = "1.8.1" memoffset = "0.9.1" thiserror = "1.0.64" @@ -41,7 +41,9 @@ env_logger = "0.10.2" toml = "0.7.8" static_assertions = "1.1.0" allocator-api2 = "0.2.14" -memsec = { git="https://github.com/rosenpass/memsec.git" ,rev="aceb9baee8aec6844125bd6612f92e9a281373df", features = [ "alloc_ext", ] } +memsec = { git = "https://github.com/rosenpass/memsec.git", rev = "aceb9baee8aec6844125bd6612f92e9a281373df", features = [ + "alloc_ext", +] } rand = "0.8.5" typenum = "1.17.0" log = { version = "0.4.22" } @@ -51,23 +53,23 @@ arbitrary = { version = "1.3.2", features = ["derive"] } anyhow = { version = "1.0.89", features = ["backtrace", "std"] } mio = { version = "1.0.2", features = ["net", "os-poll"] } oqs-sys = { version = "0.9.1", default-features = false, features = [ - 'classic_mceliece', - 'kyber', + 'classic_mceliece', + 'kyber', ] } blake2 = "0.10.6" chacha20poly1305 = { version = "0.10.1", default-features = false, features = [ - "std", - "heapless", + "std", + "heapless", ] } zerocopy = { version = "0.7.35", features = ["derive"] } home = "0.5.9" derive_builder = "0.20.1" tokio = { version = "1.40", features = ["macros", "rt-multi-thread"] } -postcard= {version = "1.0.10", features = ["alloc"]} +postcard = { version = "1.0.10", features = ["alloc"] } libcrux = { version = "0.0.2-pre.2" } hex-literal = { version = "0.4.1" } hex = { version = "0.4.3" } -heck = { version = "0.5.0" } +heck = { version = "0.5.0" } libc = { version = "0.2" } uds = { git = "https://github.com/rosenpass/uds" } @@ -79,7 +81,7 @@ libfuzzer-sys = "0.4" test_bin = "0.4.0" criterion = "0.4.0" allocator-api2-tests = "0.2.15" -procspawn = {version = "1.0.1", features= ["test-support"]} +procspawn = { version = "1.0.1", features = ["test-support"] } #Broker dependencies (might need cleanup or changes) diff --git a/ciphers/Cargo.toml b/ciphers/Cargo.toml index 7249ca7..9e5312d 100644 --- a/ciphers/Cargo.toml +++ b/ciphers/Cargo.toml @@ -23,4 +23,4 @@ static_assertions = { workspace = true } zeroize = { workspace = true } chacha20poly1305 = { workspace = true } blake2 = { workspace = true } -libcrux = { workspace = true, optional = true } +libcrux = { workspace = true, optional = true } diff --git a/rosenpass/Cargo.toml b/rosenpass/Cargo.toml index 70c9577..902ead4 100644 --- a/rosenpass/Cargo.toml +++ b/rosenpass/Cargo.toml @@ -51,8 +51,8 @@ mio = { workspace = true } rand = { workspace = true } zerocopy = { workspace = true } home = { workspace = true } -derive_builder = {workspace = true} -rosenpass-wireguard-broker = {workspace = true} +derive_builder = { workspace = true } +rosenpass-wireguard-broker = { workspace = true } zeroize = { workspace = true } hex-literal = { workspace = true, optional = true } hex = { workspace = true, optional = true } @@ -68,15 +68,21 @@ anyhow = { workspace = true } criterion = { workspace = true } test_bin = { workspace = true } stacker = { workspace = true } -serial_test = {workspace = true} -procspawn = {workspace = true} +serial_test = { workspace = true } +procspawn = { workspace = true } tempfile = { workspace = true } -rustix = {workspace = true} +rustix = { workspace = true } [features] default = ["experiment_api"] experiment_memfd_secret = ["rosenpass-wireguard-broker/experiment_memfd_secret"] experiment_libcrux = ["rosenpass-ciphers/experiment_libcrux"] -experiment_api = ["hex-literal", "uds", "command-fds", "rosenpass-util/experiment_file_descriptor_passing", "rosenpass-wireguard-broker/experiment_api"] -internal_testing = [] +experiment_api = [ + "hex-literal", + "uds", + "command-fds", + "rosenpass-util/experiment_file_descriptor_passing", + "rosenpass-wireguard-broker/experiment_api", +] +internal_testing = [] internal_bin_gen_ipc_msg_types = ["hex", "heck"] diff --git a/rp/Cargo.toml b/rp/Cargo.toml index 9166bdc..7e1073d 100644 --- a/rp/Cargo.toml +++ b/rp/Cargo.toml @@ -20,9 +20,9 @@ rosenpass-ciphers = { workspace = true } rosenpass-cipher-traits = { workspace = true } rosenpass-secret-memory = { workspace = true } rosenpass-util = { workspace = true } -rosenpass-wireguard-broker = {workspace = true} +rosenpass-wireguard-broker = { workspace = true } -tokio = {workspace = true} +tokio = { workspace = true } [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies] ctrlc-async = "3.2" @@ -35,8 +35,8 @@ netlink-packet-generic = "0.3" netlink-packet-wireguard = "0.2" [dev-dependencies] -tempfile = {workspace = true} -stacker = {workspace = true} +tempfile = { workspace = true } +stacker = { workspace = true } [features] experiment_memfd_secret = [] diff --git a/secret-memory/Cargo.toml b/secret-memory/Cargo.toml index f434e59..e186ec7 100644 --- a/secret-memory/Cargo.toml +++ b/secret-memory/Cargo.toml @@ -21,6 +21,6 @@ log = { workspace = true } [dev-dependencies] allocator-api2-tests = { workspace = true } -tempfile = {workspace = true} -base64ct = {workspace = true} -procspawn = {workspace = true} +tempfile = { workspace = true } +base64ct = { workspace = true } +procspawn = { workspace = true } diff --git a/wireguard-broker/Cargo.toml b/wireguard-broker/Cargo.toml index 089af3a..2783453 100644 --- a/wireguard-broker/Cargo.toml +++ b/wireguard-broker/Cargo.toml @@ -12,7 +12,7 @@ readme = "readme.md" [dependencies] thiserror = { workspace = true } zerocopy = { workspace = true } -rosenpass-secret-memory = {workspace = true} +rosenpass-secret-memory = { workspace = true } # Privileged only wireguard-uapi = { workspace = true } @@ -24,20 +24,20 @@ anyhow = { workspace = true } clap = { workspace = true } env_logger = { workspace = true } log = { workspace = true } -derive_builder = {workspace = true} -postcard = {workspace = true} +derive_builder = { workspace = true } +postcard = { workspace = true } # Problem in CI, unknown reasons: dependency (libc) specified without providing a local path, Git repository, version, or workspace dependency to use # Maybe something about the combination of features and optional crates? -rustix = { version = "0.38.37", optional = true } -libc = { version = "0.2", optional = true } +rustix = { version = "0.38.37", optional = true } +libc = { version = "0.2", optional = true } # Mio broker client mio = { workspace = true } rosenpass-util = { workspace = true } [dev-dependencies] -rand = {workspace = true} -procspawn = {workspace = true} +rand = { workspace = true } +procspawn = { workspace = true } [features] experiment_api = ["rustix", "libc"] @@ -49,7 +49,7 @@ path = "src/bin/priviledged.rs" test = false doc = false required-features = ["experiment_api"] -cfg = { target_os = "linux" } +cfg = { target_os = "linux" } [[bin]] name = "rosenpass-wireguard-broker-socket-handler" @@ -57,4 +57,4 @@ test = false path = "src/bin/socket_handler.rs" doc = false required-features = ["experiment_api"] -cfg = { target_os = "linux" } +cfg = { target_os = "linux" }