summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-02-27 10:13:13 +0100
committerDavid Lönnhager <david.l@mullvad.net>2025-03-05 23:32:26 +0100
commite90ea8ffe6a5a247f396f0418683a66d1c7abbc4 (patch)
treef8c2fd51c33d7cf927e238a441ae057985e2d2f2
parent81939bb9b2ae030c33a37590ec23a5e3f5c3dcee (diff)
downloadmullvadvpn-e90ea8ffe6a5a247f396f0418683a66d1c7abbc4.tar.xz
mullvadvpn-e90ea8ffe6a5a247f396f0418683a66d1c7abbc4.zip
Switch to rustls for installer-downloader
This also increases the file size limit with around 1M
-rw-r--r--.github/workflows/downloader.yml4
-rw-r--r--Cargo.lock128
-rw-r--r--installer-downloader/Cargo.toml2
-rw-r--r--mullvad-update/Cargo.toml3
4 files changed, 4 insertions, 133 deletions
diff --git a/.github/workflows/downloader.yml b/.github/workflows/downloader.yml
index 9b25aa783b..c8c90716ae 100644
--- a/.github/workflows/downloader.yml
+++ b/.github/workflows/downloader.yml
@@ -38,7 +38,7 @@ jobs:
env:
# If the file is larger than this, a regression has probably been introduced.
# You should think twice before increasing this limit.
- MAX_BINARY_SIZE: 1572864
+ MAX_BINARY_SIZE: 2621440
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
env:
# If the file is larger than this, a regression has probably been introduced.
# You should think twice before increasing this limit.
- MAX_BINARY_SIZE: 2097152
+ MAX_BINARY_SIZE: 3145728
steps:
- name: Checkout repository
uses: actions/checkout@v4
diff --git a/Cargo.lock b/Cargo.lock
index f12769e2f1..0df261a8e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1753,22 +1753,6 @@ dependencies = [
]
[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
name = "hyper-util"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2917,23 +2901,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
[[package]]
-name = "native-tls"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
name = "native-windows-gui"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3307,50 +3274,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
[[package]]
-name = "openssl"
-version = "0.10.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.89",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.106"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
name = "openvpn-plugin"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4138,13 +4061,11 @@ dependencies = [
"http-body-util",
"hyper",
"hyper-rustls",
- "hyper-tls",
"hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
- "native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
@@ -4157,7 +4078,6 @@ dependencies = [
"serde_urlencoded",
"sync_wrapper 1.0.1",
"tokio",
- "tokio-native-tls",
"tokio-rustls 0.26.0",
"tower-service",
"url",
@@ -4383,15 +4303,6 @@ dependencies = [
]
[[package]]
-name = "schannel"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4421,29 +4332,6 @@ dependencies = [
]
[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
name = "semver"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5306,16 +5194,6 @@ dependencies = [
]
[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
name = "tokio-rustls"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5713,12 +5591,6 @@ dependencies = [
]
[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/installer-downloader/Cargo.toml b/installer-downloader/Cargo.toml
index 7b04f34474..7eaed28082 100644
--- a/installer-downloader/Cargo.toml
+++ b/installer-downloader/Cargo.toml
@@ -27,7 +27,7 @@ chrono = { workspace = true, features = ["clock"] }
fern = { version = "0.6", default-features = false }
log = { workspace = true }
-mullvad-update = { path = "../mullvad-update", features = ["client", "native-tls"] }
+mullvad-update = { path = "../mullvad-update", features = ["client"] }
[target.'cfg(target_os = "windows")'.dependencies]
windows-sys = { workspace = true, features = ["Win32_UI", "Win32_UI_WindowsAndMessaging", "Win32_Graphics", "Win32_Graphics_Gdi"] }
diff --git a/mullvad-update/Cargo.toml b/mullvad-update/Cargo.toml
index 1a21d7aa12..12434e3545 100644
--- a/mullvad-update/Cargo.toml
+++ b/mullvad-update/Cargo.toml
@@ -14,7 +14,6 @@ workspace = true
default = []
sign = ["rand", "clap"]
client = ["async-trait", "reqwest", "sha2", "tokio", "thiserror"]
-native-tls = ["reqwest/native-tls"]
[dependencies]
anyhow = { workspace = true }
@@ -26,7 +25,7 @@ serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
async-trait = { version = "0.1", optional = true }
-reqwest = { version = "0.12.9", default-features = false, optional = true }
+reqwest = { version = "0.12.9", default-features = false, features = ["rustls-tls"], optional = true }
sha2 = { version = "0.10", optional = true }
tokio = { workspace = true, features = ["rt-multi-thread", "fs", "process"], optional = true }
thiserror = { workspace = true, optional = true }