openssl -> vendored feature

tari-project · Nov 28, 2024 · 5cb9561 · 5cb9561
1 parent a75e0c6
commit 5cb9561
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -58,7 +58,7 @@ log4rs = { version = "1.3.0", default-features = false, features = [
 qrcode = { version = "0.12" }
 rand = "0.8"
 regex = "1.5.4"
-reqwest = "0.11.18"
+reqwest = { version =  "0.11.18", features = ["native-tls-vendored"] }
 rpassword = "5.0"
 rustyline = "9.0"
 serde = "1.0.136"

diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml
@@ -41,7 +41,7 @@ log4rs = { version = "1.3.0", default-features = false, features = [
     "size_trigger",
     "fixed_window_roller",
 ] }
-native-tls = "0.2"
+native-tls = { version = "0.2", features = ["vendored"] }
 num_cpus = "1.13"
 rand = "0.8"
 serde = { version = "1.0", default-features = false, features = ["derive"] }

diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -94,7 +94,11 @@ tiny-keccak = { package = "tari-tiny-keccak", version = "2.0.2", features = [
     "keccak",
 ] }
 dirs-next = "1.0.2"
-hickory-client = { version = "0.25.0-alpha.2", features = ["dns-over-rustls", "dnssec-openssl"], optional = true }
+hickory-client = { version = "0.25.0-alpha.2", features = [
+    "dns-over-native-tls",
+    "dnssec-openssl"
+], optional = true }
+openssl = { version = "0.10.66", features = ["vendored"] }
 anyhow = "1.0.53"
 
 [dev-dependencies]
@@ -126,3 +130,9 @@ unexpected_cfgs = { level = "warn", check-cfg = [
     'cfg(tari_target_network_nextnet)',
     'cfg(tari_target_network_testnet)',
 ] }
+
+[package.metadata.cargo-machete]
+openssl = [
+    # We need to specify extra features for openssl even though it is not used directly in this crate
+    "openssl",
+]