From 2cbbe1bc98f8f947f78f839da6095607c6634aaf Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 21 Aug 2022 15:34:40 +0800 Subject: [PATCH] feat: v0.2.0 use rustls --- Cargo.lock | 95 +----------------------------------------------------- Cargo.toml | 4 +-- 2 files changed, 3 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d558085..35eed77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,9 +201,6 @@ name = "cc" version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -dependencies = [ - "jobserver", -] [[package]] name = "cfg-if" @@ -232,15 +229,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "cmake" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" -dependencies = [ - "cc", -] - [[package]] name = "crossbeam-channel" version = "0.4.4" @@ -552,15 +540,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" -[[package]] -name = "jobserver" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" version = "0.3.59" @@ -726,19 +705,6 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" -[[package]] -name = "openssl-sys" -version = "0.9.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -794,12 +760,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - [[package]] name = "ppv-lite86" version = "0.2.16" @@ -1064,7 +1024,7 @@ dependencies = [ "s2n-codec", "s2n-quic-core", "s2n-quic-platform", - "s2n-quic-tls-default", + "s2n-quic-rustls", "s2n-quic-transport", "tokio", "zerocopy", @@ -1138,31 +1098,6 @@ dependencies = [ "s2n-quic-crypto", ] -[[package]] -name = "s2n-quic-tls" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d991e5d8d3d530f71f847f3a0a4d8b9e5352ae2117d461945a244d0aafe2b8" -dependencies = [ - "bytes", - "errno", - "libc", - "s2n-codec", - "s2n-quic-core", - "s2n-quic-crypto", - "s2n-tls", -] - -[[package]] -name = "s2n-quic-tls-default" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871c91bce7ec0157bf3b3aeef7cb70aaf4ce8ee2141b5e92cead0bf1747bafe7" -dependencies = [ - "s2n-quic-rustls", - "s2n-quic-tls", -] - [[package]] name = "s2n-quic-transport" version = "0.10.0" @@ -1181,28 +1116,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "s2n-tls" -version = "0.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeefdd0126513d72e744e3b5f8e46eafe6d73d5ddb5b483ab2e3ef2c4e7bdbfb" -dependencies = [ - "libc", - "s2n-tls-sys", -] - -[[package]] -name = "s2n-tls-sys" -version = "0.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4976ecab24e75d85a9c92f1958b2fdf03bf9f78da662016511a37322156e4970" -dependencies = [ - "cc", - "cmake", - "libc", - "openssl-sys", -] - [[package]] name = "scopeguard" version = "1.1.0" @@ -1490,12 +1403,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vec_map" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 226dbba..d4a7ad8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "simple-rust-http3-proxy" -version = "0.1.0" +version = "0.2.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] tokio = { version = "1", features = ["full"] } -s2n-quic = "1.9" +s2n-quic = { version = "1.9", default-features = false, features = ["provider-address-token-default", "provider-tls-rustls"] } clap = "2.33" rust_util = "0.6" futures = "0.3"