From 45ae77caab1aabc002dca39564a42155a3cc2583 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 28 Nov 2023 21:04:58 +0100 Subject: [PATCH 1/2] chore(deps): use rustls --- Cargo.lock | 108 +---------------------------- crates/rpc/rpc/Cargo.toml | 4 +- examples/beacon-api-sse/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6b6cda0b5813..4947be0261de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2745,21 +2745,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -3335,19 +3320,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "iai" version = "0.1.1" @@ -4281,9 +4253,9 @@ dependencies = [ [[package]] name = "mev-share-sse" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e59928ecfd8f9dd3211f2eb08bdc260c78c2e2af34d1a652445a6287d3c95942" +checksum = "ba263a1c478aade75b60835fbeb6f57c0280fb0953742c3d84de45ea51139ae4" dependencies = [ "async-sse", "bytes", @@ -4396,24 +4368,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nibble_vec" version = "0.1.0" @@ -4665,50 +4619,12 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "openssl" -version = "0.10.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -5572,21 +5488,19 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "rustls", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", - "tokio-native-tls", "tokio-util", "tower-service", "url", @@ -8020,16 +7934,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -8646,12 +8550,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vergen" version = "8.2.6" diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index 44c90408830b..6e50bafbde79 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -40,9 +40,11 @@ jsonrpsee.workspace = true http = "0.2.8" http-body = "0.4.5" hyper = "0.14.24" -reqwest = { version = "0.11.20", optional = true } jsonwebtoken = "8" +## required for optimism sequencer delegation +reqwest = { version = "0.11", default-features = false, features = ["rustls"], optional = true } + # async async-trait.workspace = true tokio = { workspace = true, features = ["sync"] } diff --git a/examples/beacon-api-sse/Cargo.toml b/examples/beacon-api-sse/Cargo.toml index 892c2e229e73..60bb76c53656 100644 --- a/examples/beacon-api-sse/Cargo.toml +++ b/examples/beacon-api-sse/Cargo.toml @@ -15,4 +15,4 @@ tracing.workspace = true futures-util.workspace = true tokio = { workspace = true, features = ["time"] } -mev-share-sse = "0.1.5" \ No newline at end of file +mev-share-sse = { version = "0.1.6" , default-features = false } \ No newline at end of file From e672900bb5de83582cc22aed15a0f6915d5a5ebb Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 28 Nov 2023 21:17:56 +0100 Subject: [PATCH 2/2] ban openssl --- deny.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deny.toml b/deny.toml index 524ab567d81c..dd8e50780b73 100644 --- a/deny.toml +++ b/deny.toml @@ -19,9 +19,7 @@ wildcards = "allow" highlight = "all" # List of crates to deny deny = [ - # Each entry the name of a crate and a version range. If version is - # not specified, all versions will be matched. - #{ name = "ansi_term", version = "=0.11.0" }, + { name = "openssl" }, ] # Certain crates/versions that will be skipped when doing duplicate detection. skip = []