Skip to content

Commit

Permalink
fix(mtls-quic): adding support for mTLS in QUIC [no ci] - broken
Browse files Browse the repository at this point in the history
Signed-off-by: gabrik <[email protected]>
  • Loading branch information
gabrik committed Apr 24, 2024
1 parent c98654f commit 6682595
Show file tree
Hide file tree
Showing 9 changed files with 388 additions and 447 deletions.
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ petgraph = "0.6.3"
pnet = "0.34"
pnet_datalink = "0.34"
proc-macro2 = "1.0.51"
quinn = "0.10.1"
quinn = {version = "0.10.1"}
quote = "1.0.23"
rand = { version = "0.8.5", default-features = false } # Default features are disabled due to usage in no_std crates
rand_chacha = "0.3.1"
Expand All @@ -132,7 +132,7 @@ ron = "0.8.1"
ringbuffer-spsc = "0.1.9"
rsa = "0.9"
rustc_version = "0.4.0"
rustls = "0.22.2"
rustls = {version = "0.23", features = ["ring"]}
rustls-native-certs = "0.7.0"
rustls-pemfile = "2.0.0"
rustls-webpki = "0.102.0"
Expand All @@ -155,7 +155,7 @@ token-cell = { version = "1.4.2", default-features = false }
tokio = { version = "1.35.1", default-features = false } # Default features are disabled due to some crates' requirements
tokio-util = "0.7.10"
tokio-tungstenite = "0.21"
tokio-rustls = "0.25.0"
tokio-rustls = "0.26.0"
# tokio-vsock = see: io/zenoh-links/zenoh-link-vsock/Cargo.toml (workspaces does not support platform dependent dependencies)
console-subscriber = "0.2"
typenum = "1.16.0"
Expand Down
42 changes: 27 additions & 15 deletions io/zenoh-link-commons/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,49 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-link-commons"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
authors = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
categories = { workspace = true }
description = "Internal crate for zenoh."
edition = { workspace = true }
homepage = { workspace = true }
license = { workspace = true }
name = "zenoh-link-commons"
repository = { workspace = true }
rust-version = { workspace = true }
version = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[features]
compression = []
tls = [
"base64",
"rustls",
"rustls-native-certs",
"rustls-pemfile",
"rustls-webpki",
"webpki-roots",
]

[dependencies]
async-trait = { workspace = true }
rustls = { workspace = true }
rustls-webpki = { workspace = true }
base64 = { workspace = true, optional = true }
flume = { workspace = true }
tracing = {workspace = true}
serde = { workspace = true, features = ["default"] }
secrecy = {workspace = true }
tokio = { workspace = true, features = [
"fs",
"io-util",
"net",
"sync",
"time",
] }
tokio-util = { workspace = true, features = ["rt"] }
webpki-roots = { workspace = true, optional = true }
zenoh-buffers = { workspace = true }
zenoh-codec = { workspace = true }
zenoh-core = { workspace = true }
zenoh-config = { workspace = true }
zenoh-core = { workspace = true }
zenoh-protocol = { workspace = true }
zenoh-result = { workspace = true }
zenoh-util = { workspace = true }
zenoh-runtime = { workspace = true }
tokio = { workspace = true, features = ["io-util", "net", "fs", "sync", "time"] }
tokio-util = { workspace = true, features = ["rt"] }
futures = { workspace = true }
zenoh-util = { workspace = true }
2 changes: 2 additions & 0 deletions io/zenoh-link-commons/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ extern crate alloc;

mod listener;
mod multicast;
#[cfg(feature = "tls")]
pub mod tls;

mod unicast;

use alloc::{borrow::ToOwned, boxed::Box, string::String, vec, vec::Vec};
Expand Down
Loading

0 comments on commit 6682595

Please sign in to comment.