Remove openssl and replace with rustls + ring + webpki_roots

kaspanet · Sep 7, 2024 · 12f3028 · 12f3028
1 parent afbcf9e
commit 12f3028
Show file tree

Hide file tree

Showing 15 changed files with 163 additions and 238 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -250,7 +250,7 @@ thiserror = "1.0.50"
 tokio = { version = "1.33.0", features = ["sync", "rt-multi-thread"] }
 tokio-stream = "0.1.14"
 toml = "0.8.8"
-tonic = { version = "0.10.2", features = ["tls", "gzip", "transport"] }
+tonic = { version = "0.10.2", features = ["tls-webpki-roots", "gzip", "transport"] }
 tonic-build = { version = "0.10.2", features = ["prost"] }
 triggered = "0.1.2"
 uuid = { version = "1.5.0", features = ["v4", "fast-rng", "serde"] }
@@ -274,50 +274,53 @@ indexed_db_futures = "0.5.0"
 # workflow-perf-monitor = { path = "../../../workflow-perf-monitor-rs" }
 workflow-perf-monitor = "0.0.2"
 nw-sys = "0.1.6"
+rustls = { version = "0.23", default-features = false, features = ["ring"] }
 
 # workflow dependencies
-workflow-core = { version = "0.17.0" }
-workflow-d3 = { version = "0.17.0" }
-workflow-dom = { version = "0.17.0" }
-workflow-http = { version = "0.17.0" }
-workflow-log = { version = "0.17.0" }
-workflow-node = { version = "0.17.0" }
-workflow-nw = { version = "0.17.0" }
-workflow-rpc = { version = "0.17.0" }
-workflow-serializer = { version = "0.17.0" }
-workflow-store = { version = "0.17.0" }
-workflow-terminal = { version = "0.17.0" }
-workflow-wasm = { version = "0.17.0" }
+# workflow-core = { version = "0.17.0" }
+# workflow-d3 = { version = "0.17.0" }
+# workflow-dom = { version = "0.17.0" }
+# workflow-http = { version = "0.17.0" }
+# workflow-log = { version = "0.17.0" }
+# workflow-node = { version = "0.17.0" }
+# workflow-nw = { version = "0.17.0" }
+# workflow-rpc = { version = "0.17.0" }
+# workflow-serializer = { version = "0.17.0" }
+# workflow-store = { version = "0.17.0" }
+# workflow-terminal = { version = "0.17.0" }
+# workflow-wasm = { version = "0.17.0" }
 
 # if below is enabled, this means that there is an ongoing work
 # on the workflow-rs crate. This requires that you clone workflow-rs
 # into a sibling folder from https://github.com/workflow-rs/workflow-rs
 # workflow-core = { path = "../workflow-rs/core" }
 # workflow-d3 = { path = "../workflow-rs/d3" }
 # workflow-dom = { path = "../workflow-rs/dom" }
-# workflow-http = { path = "../workflow-rs/http" }
+# # Same features as default but with rustls-tls-webpki-roots instead of native-tls
+# workflow-http = { path = "../workflow-rs/http", default-features = false, features = ["rustls-tls-webpki-roots", "http2", "charset", "macos-system-configuration"] }
 # workflow-log = { path = "../workflow-rs/log" }
 # workflow-node = { path = "../workflow-rs/node" }
 # workflow-nw = { path = "../workflow-rs/nw" }
-# workflow-rpc = { path = "../workflow-rs/rpc" }
+# workflow-rpc = { path = "../workflow-rs/rpc", default-features = false, features = ["rustls-tls-webpki-roots"] }
 # workflow-serializer = { path = "../workflow-rs/serializer" }
 # workflow-store = { path = "../workflow-rs/store" }
 # workflow-terminal = { path = "../workflow-rs/terminal" }
 # workflow-wasm = { path = "../workflow-rs/wasm" }
 
+
 # ---
-# workflow-core = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-d3 = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-dom = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-http = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-log = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-node = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-nw = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-rpc = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-serializer = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-store = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-terminal = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
-# workflow-wasm = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+workflow-core = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-d3 = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-dom = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-http = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head", default-features = false, features = ["rustls-tls-webpki-roots", "http2", "charset", "macos-system-configuration"] }
+workflow-log = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-node = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-nw = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-rpc = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head", default-features = false, features = ["rustls-tls-webpki-roots"]  }
+workflow-serializer = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-store = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-terminal = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
+workflow-wasm = { git = "https://github.com/workflow-rs/workflow-rs.git", rev = "refs/pull/13/head" }
 # https://github.com/aspectron/nw-sys
 # nw-sys = { path = "../nw-sys" }
 

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -63,6 +63,7 @@ workflow-nw.workspace = true
 workflow-store.workspace = true
 workflow-terminal.workspace = true
 workflow-wasm.workspace = true
+rustls.workspace = true
 
 [dependencies.web-sys]
 workspace = true

diff --git a/cli/src/cli.rs b/cli/src/cli.rs
@@ -99,6 +99,8 @@ impl KaspaCli {
             }
         }
 
+        rustls::crypto::ring::default_provider().install_default().unwrap();
+
         workflow_log::set_colors_enabled(true);
     }
 

diff --git a/kaspad/Cargo.toml b/kaspad/Cargo.toml
@@ -55,6 +55,7 @@ tempfile.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] }
 workflow-log.workspace = true
+rustls.workspace = true
 
 toml = "0.8.10"
 serde_with = "3.7.0"

diff --git a/kaspad/src/main.rs b/kaspad/src/main.rs
@@ -22,6 +22,8 @@ pub fn main() {
 
     init_allocator_with_default_settings();
 
+    rustls::crypto::ring::default_provider().install_default().unwrap();
+
     let args = parse_args();
 
     match fd_budget::try_set_fd_limit(DESIRED_DAEMON_SOFT_FD_LIMIT) {

diff --git a/rpc/wrpc/examples/subscriber/Cargo.toml b/rpc/wrpc/examples/subscriber/Cargo.toml
@@ -20,3 +20,4 @@ tokio.workspace = true
 workflow-core.workspace = true
 workflow-log.workspace = true
 ctrlc.workspace = true
+rustls.workspace = true
diff --git a/rpc/wrpc/examples/subscriber/src/main.rs b/rpc/wrpc/examples/subscriber/src/main.rs
@@ -268,6 +268,7 @@ impl Listener {
 
 #[tokio::main]
 async fn main() -> Result<()> {
+    rustls::crypto::ring::default_provider().install_default().unwrap();
     let listener = Listener::try_new(NetworkId::new(NetworkType::Mainnet), None)?;
 
     let (shutdown_sender, shutdown_receiver) = oneshot::<()>();

diff --git a/rpc/wrpc/proxy/Cargo.toml b/rpc/wrpc/proxy/Cargo.toml
@@ -23,6 +23,7 @@ tokio.workspace = true
 workflow-core.workspace = true
 workflow-log.workspace = true
 workflow-rpc.workspace = true
+rustls.workspace = true
 
 [package.metadata.emanate.build]
 folder = "setup"
diff --git a/rpc/wrpc/proxy/src/main.rs b/rpc/wrpc/proxy/src/main.rs
@@ -51,6 +51,8 @@ struct Args {
 
 #[tokio::main]
 async fn main() -> Result<()> {
+    rustls::crypto::ring::default_provider().install_default().unwrap();
+
     let Args { testnet, simnet, devnet, grpc_proxy_address, interface, verbose, threads, encoding } = Args::parse();
 
     let network_type = if testnet {

diff --git a/rpc/wrpc/server/Cargo.toml b/rpc/wrpc/server/Cargo.toml
@@ -33,14 +33,4 @@ tokio.workspace = true
 workflow-core.workspace = true
 workflow-log.workspace = true
 workflow-rpc.workspace = true
-workflow-serializer.workspace = true
-
-# Adding explicitely the openssl dependency here is needed for a successful build with zigbuild and musl
-# as used in the release deployment in GitHub CI
-# see: https://github.com/rust-cross/cargo-zigbuild/issues/127
-
-[target.x86_64-unknown-linux-gnu.dependencies]
-openssl = { version = "0.10", features = ["vendored"] }
-
-[target.x86_64-unknown-linux-musl.dependencies]
-openssl = { version = "0.10", features = ["vendored"] }
+workflow-serializer.workspace = true
diff --git a/rpc/wrpc/wasm/Cargo.toml b/rpc/wrpc/wasm/Cargo.toml
@@ -40,6 +40,7 @@ js-sys.workspace = true
 wasm-bindgen-futures.workspace = true
 workflow-core.workspace = true
 futures.workspace = true
+ring = { version = "0.17", features = ["wasm32_unknown_unknown_js"] }
 
 [lints]
 workspace = true
diff --git a/simpa/Cargo.toml b/simpa/Cargo.toml
@@ -11,7 +11,7 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-kaspa-alloc.workspace = true            # This changes the global allocator for all of the next dependencies so should be kept first 
+kaspa-alloc.workspace = true            # This changes the global allocator for all of the next dependencies so should be kept first
 kaspa-consensus-core.workspace = true
 kaspa-consensus-notify.workspace = true
 kaspa-consensus.workspace = true
@@ -36,6 +36,7 @@ rand.workspace = true
 rayon.workspace = true
 secp256k1.workspace = true
 tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] }
+rustls.workspace = true
 
 [features]
 heap = ["dhat", "kaspa-alloc/heap"]

diff --git a/simpa/src/main.rs b/simpa/src/main.rs
@@ -134,6 +134,8 @@ fn main() {
 
     init_allocator_with_default_settings();
 
+    rustls::crypto::ring::default_provider().install_default().unwrap();
+
     // Get CLI arguments
     let args = Args::parse();
 

diff --git a/wallet/wasm/Cargo.toml b/wallet/wasm/Cargo.toml
@@ -23,4 +23,4 @@ wasm-bindgen-futures.workspace = true
 wasm-bindgen.workspace = true
 workflow-log.workspace = true
 workflow-terminal.workspace = true
-workflow-wasm.workspace = true
+workflow-wasm.workspace = true