diff --git a/Cargo.lock b/Cargo.lock index bc4bc32..088cf04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -266,15 +266,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct 0.6.1", -] - [[package]] name = "ctrlc" version = "3.2.1" @@ -672,7 +663,7 @@ dependencies = [ "httpdate", "itoa 0.4.8", "pin-project-lite", - "socket2 0.4.4", + "socket2", "tokio", "tower-service", "tracing", @@ -687,7 +678,7 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ "http", "hyper", - "rustls 0.20.4", + "rustls", "tokio", "tokio-rustls", ] @@ -859,19 +850,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "mio" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - [[package]] name = "mio" version = "0.8.2" @@ -1287,12 +1265,12 @@ dependencies = [ "ctrlc", "futures-util", "hyper", - "quinn 0.8.5", + "quinn", "rand", "rcgen", "reqwest", "rmp-serde", - "rustls 0.20.4", + "rustls", "structopt", "tokio", "tracing", @@ -1307,7 +1285,7 @@ dependencies = [ "blake3", "fltk", "ptth_quic", - "quinn 0.7.2", + "quinn", "rand", "rand_chacha", "reqwest", @@ -1432,26 +1410,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" -[[package]] -name = "quinn" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82c0a393b300104f989f3db8b8637c0d11f7a32a9c214560b47849ba8f119aa" -dependencies = [ - "bytes", - "futures", - "lazy_static", - "libc", - "mio 0.7.13", - "quinn-proto 0.7.3", - "rustls 0.19.1", - "socket2 0.3.19", - "thiserror", - "tokio", - "tracing", - "webpki 0.21.4", -] - [[package]] name = "quinn" version = "0.8.5" @@ -1462,32 +1420,13 @@ dependencies = [ "futures-channel", "futures-util", "fxhash", - "quinn-proto 0.8.4", + "quinn-proto", "quinn-udp", - "rustls 0.20.4", + "rustls", "thiserror", "tokio", "tracing", - "webpki 0.22.0", -] - -[[package]] -name = "quinn-proto" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047aa96ec7ee6acabad7a1318dff72e9aff8994316bf2166c9b94cbec78ca54c" -dependencies = [ - "bytes", - "ct-logs", - "rand", - "ring", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -1500,14 +1439,14 @@ dependencies = [ "fxhash", "rand", "ring", - "rustls 0.20.4", - "rustls-native-certs 0.6.2", + "rustls", + "rustls-native-certs", "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.0", + "webpki", ] [[package]] @@ -1518,8 +1457,8 @@ checksum = "9f832d8958db3e84d2ec93b5eb2272b45aa23cf7f8fe6e79f578896f4e6c231b" dependencies = [ "futures-util", "libc", - "quinn-proto 0.8.4", - "socket2 0.4.4", + "quinn-proto", + "socket2", "tokio", "tracing", ] @@ -1654,7 +1593,7 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite", - "rustls 0.20.4", + "rustls", "rustls-pemfile 0.3.0", "serde", "serde_json", @@ -1741,19 +1680,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.4" @@ -1762,20 +1688,8 @@ checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "sct", + "webpki", ] [[package]] @@ -1860,16 +1774,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -2001,17 +1905,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if", - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.4.4" @@ -2156,13 +2049,13 @@ dependencies = [ "bytes", "libc", "memchr", - "mio 0.8.2", + "mio", "num_cpus", "once_cell", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.4", + "socket2", "tokio-macros", "winapi", ] @@ -2194,9 +2087,9 @@ version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" dependencies = [ - "rustls 0.20.4", + "rustls", "tokio", - "webpki 0.22.0", + "webpki", ] [[package]] @@ -2559,16 +2452,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.0" @@ -2585,7 +2468,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] diff --git a/crates/ptth_quic_client_gui/Cargo.toml b/crates/ptth_quic_client_gui/Cargo.toml index f485ac0..e04bcbd 100644 --- a/crates/ptth_quic_client_gui/Cargo.toml +++ b/crates/ptth_quic_client_gui/Cargo.toml @@ -12,7 +12,7 @@ anyhow = "1.0.38" blake3 = "1.0.0" fltk = "1.2.8" ptth_quic = { path = "../ptth_quic" } -quinn = "0.7.2" +quinn = "0.8.5" rand = "0.8.4" rand_chacha = "0.3.1" reqwest = "0.11.4" diff --git a/crates/ptth_quic_client_gui/src/main.rs b/crates/ptth_quic_client_gui/src/main.rs index b48bf05..fa58aa8 100644 --- a/crates/ptth_quic_client_gui/src/main.rs +++ b/crates/ptth_quic_client_gui/src/main.rs @@ -238,7 +238,7 @@ fn main () -> anyhow::Result <()> { let quinn::NewConnection { connection, .. - } = protocol::p2_connect_to_p3 (&endpoint, &relay_addr, &client_id).await + } = protocol::p2_connect_to_p3 (&endpoint, relay_addr, &client_id).await .context ("P2 can't connect to P3")?; Ok::<_, anyhow::Error> (connection)