From 7e74360540c30d10e73dbb3d9b3bad67629d1a41 Mon Sep 17 00:00:00 2001 From: thedevbirb Date: Tue, 14 Jan 2025 15:22:40 +0100 Subject: [PATCH] chore(sidecar): add TLS provider --- bolt-sidecar/Cargo.lock | 26 +++++++++++++------------- bolt-sidecar/Cargo.toml | 1 + bolt-sidecar/bin/sidecar.rs | 5 +++++ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/bolt-sidecar/Cargo.lock b/bolt-sidecar/Cargo.lock index 00a9f0c5..2bcd2999 100644 --- a/bolt-sidecar/Cargo.lock +++ b/bolt-sidecar/Cargo.lock @@ -1275,7 +1275,7 @@ dependencies = [ "alloy-transport 0.8.0", "futures", "http 1.2.0", - "rustls 0.23.19", + "rustls 0.23.21", "serde_json", "tokio", "tokio-tungstenite 0.24.0", @@ -1293,7 +1293,7 @@ dependencies = [ "alloy-transport 0.9.2", "futures", "http 1.2.0", - "rustls 0.23.19", + "rustls 0.23.21", "serde_json", "tokio", "tokio-tungstenite 0.24.0", @@ -1656,9 +1656,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3" +checksum = "f409eb70b561706bf8abba8ca9c112729c481595893fd06a2dd9af8ed8441148" dependencies = [ "aws-lc-sys", "paste", @@ -1667,16 +1667,15 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.23.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7" +checksum = "923ded50f602b3007e5e63e3f094c479d9c8a9b42d7f4034e4afe456aa48bfd2" dependencies = [ "bindgen", "cc", "cmake", "dunce", "fs_extra", - "libc", "paste", ] @@ -2132,6 +2131,7 @@ dependencies = [ "reqwest 0.12.9", "reth-primitives", "reth-primitives-traits", + "rustls 0.23.21", "secp256k1", "serde", "serde_json", @@ -4529,7 +4529,7 @@ dependencies = [ "hyper 1.5.1", "hyper-util", "log", - "rustls 0.23.19", + "rustls 0.23.21", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -7073,9 +7073,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.19" +version = "0.23.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" dependencies = [ "aws-lc-rs", "log", @@ -8356,7 +8356,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.19", + "rustls 0.23.21", "tokio", ] @@ -8380,7 +8380,7 @@ checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", - "rustls 0.23.19", + "rustls 0.23.21", "rustls-pki-types", "tokio", "tokio-rustls 0.26.1", @@ -8684,7 +8684,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls 0.23.19", + "rustls 0.23.21", "rustls-pki-types", "sha1", "thiserror 1.0.69", diff --git a/bolt-sidecar/Cargo.toml b/bolt-sidecar/Cargo.toml index dc3cc571..ef79212b 100644 --- a/bolt-sidecar/Cargo.toml +++ b/bolt-sidecar/Cargo.toml @@ -17,6 +17,7 @@ tower-http = { version = "0.5.2", features = ["timeout"] } tower = "0.5.1" http-body-util = "0.1.2" futures = "0.3" +rustls = "0.23.21" # tokio tokio = { version = "1", features = ["full"] } diff --git a/bolt-sidecar/bin/sidecar.rs b/bolt-sidecar/bin/sidecar.rs index 8053b9c6..7091c6ed 100644 --- a/bolt-sidecar/bin/sidecar.rs +++ b/bolt-sidecar/bin/sidecar.rs @@ -18,6 +18,11 @@ async fn main() -> eyre::Result<()> { println!("{}", BOLT); println!("Running version: {}", BOLT_SIDECAR_VERSION.clone()); + // Init the default rustls provider + if let Err(e) = rustls::crypto::ring::default_provider().install_default() { + bail!("Failed to install default TLS provider: {:?}", e); + } + let opts = Opts::try_parse()?; init_telemetry_stack(opts.telemetry.metrics_port())?;