From 3d09423b020594a1858ca6a73f8deb15a1a6dc6b Mon Sep 17 00:00:00 2001 From: giangndm <45644921+giangndm@users.noreply.github.com> Date: Wed, 27 Mar 2024 11:34:53 +0700 Subject: [PATCH] deps: fixing quinn deps (#17) * deps: fixing quin deps * deps: update lock --- Cargo.lock | 146 ++++++++++++++++++++++++++++++++++++++ crates/agent/Cargo.toml | 4 +- crates/relayer/Cargo.toml | 2 +- 3 files changed, 149 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6fad92e..17a515d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -629,6 +629,12 @@ dependencies = [ "libc", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -710,6 +716,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" version = "2.4.0" @@ -741,6 +757,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -1478,6 +1504,26 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "js-sys" version = "0.3.66" @@ -2007,6 +2053,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + [[package]] name = "ordered-float" version = "3.9.2" @@ -2406,6 +2458,7 @@ dependencies = [ "ring", "rustc-hash", "rustls", + "rustls-platform-verifier", "slab", "thiserror", "tinyvec", @@ -2698,12 +2751,62 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +dependencies = [ + "base64", + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "868e20fada228fefaf6b652e00cc73623d54f8171e7352c18bb281571f2d92da" +[[package]] +name = "rustls-platform-verifier" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034f511ae2823d6a657925d5f7cf821d7458367ce0a54fbe743c471fdddd8111" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-roots", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" + [[package]] name = "rustls-webpki" version = "0.102.2" @@ -2752,6 +2855,15 @@ dependencies = [ "tun", ] +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -2770,6 +2882,30 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "num-bigint", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "1.0.21" @@ -3152,6 +3288,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3425,6 +3562,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.4.2" diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml index 9317b4b..248a863 100644 --- a/crates/agent/Cargo.toml +++ b/crates/agent/Cargo.toml @@ -17,7 +17,7 @@ bincode = "1.3.3" serde = { version = "1.0.193", features = ["derive"] } protocol = { path = "../protocol", package = "atm0s-reverse-proxy-protocol" } protocol-ed25519 = { path = "../protocol_ed25519", package = "atm0s-reverse-proxy-protocol-ed25519", optional = true } -quinn = { git = "https://github.com/quinn-rs/quinn.git", branch = "rustls-0.22", default-features = false, features = ["runtime-async-std", "tls-rustls", "futures-io", "ring"] } +quinn = { git = "https://github.com/quinn-rs/quinn.git", branch = "rustls-0.22", features = ["runtime-async-std"]} rustls = { version = "0.23", features = ["ring", "std"] } [profile.release] @@ -28,4 +28,4 @@ codegen-units = 1 [features] default = ["binary"] -binary = ["protocol-ed25519", "tracing-subscriber"] \ No newline at end of file +binary = ["protocol-ed25519", "tracing-subscriber"] diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index 2a2bae8..ca2c50b 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1.0.193", features = ["derive"] } metrics-dashboard = { version = "0.1.3", features = ["system"], optional = true } poem = { version = "1.3.59", optional = true } metrics = { version = "0.21.1" } -quinn = { git = "https://github.com/quinn-rs/quinn.git", branch = "rustls-0.22", default-features = false, features = ["runtime-async-std", "tls-rustls", "futures-io", "ring"] } +quinn = { git = "https://github.com/quinn-rs/quinn.git", branch = "rustls-0.22", features = ["runtime-async-std", "futures-io"] } rustls = { version = "0.23", features = ["ring", "std"] } rcgen = "0.12.0" atm0s-sdn = { git = "https://github.com/8xFF/atm0s-sdn.git", rev = "7ee6dd7e50ae82f2c4e0d580aa6e6108b875f297" }