diff --git a/Cargo.lock b/Cargo.lock index 5a08e02..8525ab7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3221,6 +3221,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "openssl-src" +version = "300.5.4+3.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507b3792995dae9b0df8a1c1e3771e8418b7c2d9f0baeba32e6fe8b06c7cb72" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.111" @@ -3229,6 +3238,7 @@ checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/apps/gpclient/Cargo.toml b/apps/gpclient/Cargo.toml index 9db9105..c5eabc7 100644 --- a/apps/gpclient/Cargo.toml +++ b/apps/gpclient/Cargo.toml @@ -24,12 +24,17 @@ serde_json.workspace = true serde_urlencoded.workspace = true whoami.workspace = true tempfile.workspace = true -reqwest.workspace = true directories.workspace = true compile-time.workspace = true netdev.workspace = true xmltree.workspace = true +[target.'cfg(target_os="windows")'.dependencies] +reqwest = { workspace = true, features = ["native-tls-vendored", "json"] } + +[target.'cfg(target_family="unix")'.dependencies] +reqwest.workspace = true + [features] default = ["webview-auth"] webview-auth = ["gpapi/webview-auth"] diff --git a/apps/gpgui-helper/src-tauri/Cargo.toml b/apps/gpgui-helper/src-tauri/Cargo.toml index d77be92..ab22a91 100644 --- a/apps/gpgui-helper/src-tauri/Cargo.toml +++ b/apps/gpgui-helper/src-tauri/Cargo.toml @@ -21,7 +21,12 @@ compile-time.workspace = true env_logger.workspace = true futures-util.workspace = true tempfile.workspace = true -reqwest = { workspace = true, features = ["stream"] } + +[target.'cfg(target_os="windows")'.dependencies] +reqwest = { workspace = true, features = ["native-tls-vendored", "stream"] } + +[target.'cfg(target_family="unix")'.dependencies] +reqwest = { workspace = true, features = ["native-tls", "stream"] } [features] default = ["tauri/custom-protocol"] diff --git a/crates/gpapi/Cargo.toml b/crates/gpapi/Cargo.toml index 67ed366..f854542 100644 --- a/crates/gpapi/Cargo.toml +++ b/crates/gpapi/Cargo.toml @@ -11,8 +11,6 @@ anyhow.workspace = true base64.workspace = true dns-lookup.workspace = true log.workspace = true -reqwest.workspace = true -openssl.workspace = true version-compare = "0.2" pem.workspace = true xmltree.workspace = true @@ -51,8 +49,14 @@ os_info = { version = "3", default-features = false } [target.'cfg(not(any(target_os="macos", target_os="windows")))'.dependencies] gtk = "0.18" +[target.'cfg(target_os="windows")'.dependencies] +reqwest = { workspace = true, features = ["native-tls-vendored", "json"] } +openssl = { workspace = true, features = ["vendored"] } + # Dependencies for Unix-like systems only [target.'cfg(target_family="unix")'.dependencies] +reqwest.workspace = true +openssl.workspace = true uzers.workspace = true [features]