Merge pull request #2260 from input-output-hk/djo/2252/use-tls-vendored-from-reqwest

Supersede openssl bundling with `native-tls-vendored` from `reqwest`

Author: Alenar

.github/workflows/ci.yml

@@ -33,12 +33,12 @@ jobs:
       # We separate the build in 2 steps as we want to avoid side effects with Rust feature unification.
       - name: Cargo build - Tooling
         shell: bash
-        run: cargo build --release --bin mithril-end-to-end --bin load-aggregator
+        run: cargo build --release --bin mithril-end-to-end --bin load-aggregator --features bundle_tls
 
       - name: Build Mithril workspace & publish artifacts
         uses: ./.github/workflows/actions/build-upload-mithril-artifact
         with:
-          binaries-build-args: --bin mithril-aggregator --bin mithril-signer --bin mithril-client --bin mithril-relay --features bundle_openssl,full
+          binaries-build-args: --bin mithril-aggregator --bin mithril-signer --bin mithril-client --bin mithril-relay --features bundle_tls,full
           libraries-build-args: --package mithril-stm --package mithril-client --features full,unstable
 
       - name: Build Debian packages
@@ -81,15 +81,15 @@ jobs:
         include:
           # Only build client on windows & mac
           - os: macos-14
-            binaries-build-args: --bin mithril-client --features bundle_openssl
+            binaries-build-args: --bin mithril-client --features bundle_tls
             libraries-build-args: --package mithril-stm --package mithril-client --features full,unstable
           - os: macos-14-large
-            binaries-build-args: --bin mithril-client --features bundle_openssl
+            binaries-build-args: --bin mithril-client --features bundle_tls
             libraries-build-args: --package mithril-stm --package mithril-client --features full,unstable
           - os: windows-latest
             # Use `--bins --package <package>` instead of `--bin <package>`, otherwise the 'windows' compatibility
             # hack in mithril common cargo.toml doesn't apply (we have no idea why).
-            binaries-build-args: --bins --package mithril-client-cli --features bundle_openssl
+            binaries-build-args: --bins --package mithril-client-cli --features bundle_tls
             libraries-build-args: --package mithril-stm --package mithril-client --no-default-features --features num-integer-backend,full,unstable
     runs-on: ${{ matrix.os }}
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.6.22"
+version = "0.6.23"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -30,8 +30,6 @@ mithril-common = { path = "../mithril-common", features = ["full"] }
 mithril-doc = { path = "../internal/mithril-doc" }
 mithril-metric = { path = "../internal/mithril-metric" }
 mithril-persistence = { path = "../internal/mithril-persistence" }
-openssl = { version = "0.10.68", features = ["vendored"], optional = true }
-openssl-probe = { version = "0.1.5", optional = true }
 paste = "1.0.15"
 prometheus = "0.13.4"
 rayon = "1.10.0"
@@ -80,5 +78,5 @@ tempfile = "3.14.0"
 [features]
 default = ["jemallocator"]
 
-bundle_openssl = ["dep:openssl", "dep:openssl-probe"]
+bundle_tls = ["reqwest/native-tls-vendored"]
 jemallocator = ["dep:tikv-jemallocator"]

mithril-aggregator/Cargo.toml

@@ -5,7 +5,7 @@ CARGO = cargo
 all: test build
 
 build:
-	${CARGO} build --release --features bundle_openssl
+	${CARGO} build
 	cp ../target/release/mithril-aggregator .
 
 run: build

mithril-aggregator/Makefile

@@ -34,8 +34,5 @@ async fn main() -> StdResult<()> {
     let args = MainOpts::parse();
     let root_logger = build_logger(&args);
 
-    #[cfg(feature = "bundle_openssl")]
-    openssl_probe::init_ssl_cert_env_vars();
-
     args.execute(root_logger).await
 }

mithril-aggregator/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client-cli"
-version = "0.10.7"
+version = "0.10.8"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -34,8 +34,6 @@ human_bytes = { version = "0.4.3", features = ["fast"] }
 indicatif = { version = "0.17.9", features = ["tokio"] }
 mithril-client = { path = "../mithril-client", features = ["fs", "unstable"] }
 mithril-doc = { path = "../internal/mithril-doc" }
-openssl = { version = "0.10.68", features = ["vendored"], optional = true }
-openssl-probe = { version = "0.1.5", optional = true }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.134"
 slog = { version = "2.7.0", features = [
@@ -52,4 +50,4 @@ tokio = { version = "1.42.0", features = ["full"] }
 mithril-common = { path = "../mithril-common", features = ["test_tools"] }
 
 [features]
-bundle_openssl = ["dep:openssl", "dep:openssl-probe"]
+bundle_tls = ["mithril-client/native-tls-vendored"]

mithril-client-cli/Cargo.toml

@@ -10,7 +10,7 @@ CARGO = cargo
 all: test build
 
 build:
-	${CARGO} build --release --features bundle_openssl
+	${CARGO} build
 	cp ../target/release/mithril-client .
 
 run: build

mithril-client-cli/Makefile

@@ -244,8 +244,5 @@ async fn main() -> MithrilResult<()> {
     });
     let logger = args.build_logger()?;
 
-    #[cfg(feature = "bundle_openssl")]
-    openssl_probe::init_ssl_cert_env_vars();
-
     args.execute(logger).await
 }

mithril-client-cli/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-relay"
-version = "0.1.31"
+version = "0.1.32"
 description = "A Mithril relay"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -50,3 +50,6 @@ warp = "0.3.7"
 [dev-dependencies]
 slog-scope = "4.4.0"
 slog-term = "2.9.1"
+
+[features]
+bundle_tls = ["reqwest/native-tls-vendored"]

mithril-relay/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-signer"
-version = "0.2.224"
+version = "0.2.225"
 description = "A Mithril Signer"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -25,8 +25,6 @@ mithril-common = { path = "../mithril-common", features = ["full"] }
 mithril-doc = { path = "../internal/mithril-doc" }
 mithril-metric = { path = "../internal/mithril-metric" }
 mithril-persistence = { path = "../internal/mithril-persistence" }
-openssl = { version = "0.10.68", features = ["vendored"], optional = true }
-openssl-probe = { version = "0.1.5", optional = true }
 paste = "1.0.15"
 prometheus = "0.13.4"
 rand_chacha = "0.3.1"
@@ -60,5 +58,5 @@ slog-term = "2.9.1"
 [features]
 default = ["jemallocator"]
 
-bundle_openssl = ["dep:openssl", "dep:openssl-probe"]
+bundle_tls = ["reqwest/native-tls-vendored"]
 jemallocator = ["dep:tikv-jemallocator"]

mithril-signer/Cargo.toml

@@ -5,7 +5,7 @@ CARGO = cargo
 all: test build
 
 build:
-	${CARGO} build --release --features bundle_openssl
+	${CARGO} build --release
 	cp ../target/release/mithril-signer .
 
 run: build

mithril-signer/Makefile

@@ -136,9 +136,6 @@ async fn main() -> StdResult<()> {
             .map_err(|message| anyhow!(message));
     }
 
-    #[cfg(feature = "bundle_openssl")]
-    openssl_probe::init_ssl_cert_env_vars();
-
     debug!(root_logger, "Starting"; "node_version" => env!("CARGO_PKG_VERSION"));
 
     // Load config

mithril-signer/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-end-to-end"
-version = "0.4.64"
+version = "0.4.65"
 authors = { workspace = true }
 edition = { workspace = true }
 documentation = { workspace = true }
@@ -42,3 +42,4 @@ tokio-util = { version = "0.7.13", features = ["codec"] }
 [features]
 default = []
 allow_skip_signer_certification = []
+bundle_tls = ["reqwest/native-tls-vendored"]