summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-02-22 17:07:47 +0100
committerDavid Lönnhager <david.l@mullvad.net>2025-03-05 23:32:14 +0100
commit0e62c2f3f611f4a300fd481d6d6f073d53d8e220 (patch)
tree1fae202dfd865b2b54669d23341a6c86557cf03b
parent5191c455b76fed7cfaac0e3a7593f422553d42a8 (diff)
downloadmullvadvpn-0e62c2f3f611f4a300fd481d6d6f073d53d8e220.tar.xz
mullvadvpn-0e62c2f3f611f4a300fd481d6d6f073d53d8e220.zip
Hide components that are not needed on Linux in mullvad-update
-rw-r--r--Cargo.lock456
-rw-r--r--installer-downloader/Cargo.toml13
-rw-r--r--installer-downloader/src/lib.rs4
-rw-r--r--installer-downloader/tests/controller.rs2
-rw-r--r--mullvad-update/Cargo.toml20
-rw-r--r--mullvad-update/src/client/api.rs (renamed from mullvad-update/src/api.rs)4
-rw-r--r--mullvad-update/src/client/app.rs (renamed from mullvad-update/src/app.rs)0
-rw-r--r--mullvad-update/src/client/dir.rs (renamed from mullvad-update/src/dir.rs)0
-rw-r--r--mullvad-update/src/client/fetch.rs (renamed from mullvad-update/src/fetch.rs)0
-rw-r--r--mullvad-update/src/client/mod.rs5
-rw-r--r--mullvad-update/src/client/snapshots/mullvad_update__client__api__test__http_version_provider.snap (renamed from mullvad-update/src/snapshots/mullvad_update__api__test__http_version_provider.snap)0
-rw-r--r--mullvad-update/src/client/verify.rs (renamed from mullvad-update/src/verify.rs)0
-rw-r--r--mullvad-update/src/lib.rs11
13 files changed, 140 insertions, 375 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c65542b0dc..b7fac4207b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,12 +24,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
-[[package]]
name = "aead"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -205,8 +199,8 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -225,8 +219,8 @@ version = "0.1.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -456,8 +450,8 @@ dependencies = [
"heck 0.4.1",
"indexmap 1.9.3",
"log",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"serde",
"serde_json",
"syn 1.0.109",
@@ -474,8 +468,8 @@ dependencies = [
"heck 0.4.1",
"indexmap 2.2.6",
"log",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"serde",
"serde_json",
"syn 2.0.89",
@@ -602,8 +596,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
dependencies = [
"heck 0.5.0",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -625,12 +619,6 @@ dependencies = [
]
[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -759,25 +747,6 @@ dependencies = [
]
[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
name = "crossbeam-utils"
version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -847,8 +816,8 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -870,8 +839,8 @@ checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
dependencies = [
"fnv",
"ident_case",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"strsim",
"syn 2.0.89",
]
@@ -883,7 +852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
- "quote 1.0.36",
+ "quote",
"syn 2.0.89",
]
@@ -918,16 +887,6 @@ dependencies = [
]
[[package]]
-name = "deflate"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
-[[package]]
name = "der"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -952,8 +911,8 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "302ccf094df1151173bb6f5a2282fcd2f45accd5eae1bdf82dcbfefbc501ad5c"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 1.0.109",
]
@@ -973,8 +932,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
dependencies = [
"darling",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -1032,8 +991,8 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -1115,23 +1074,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
name = "enum-as-inner"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
dependencies = [
"heck 0.4.1",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -1150,8 +1100,8 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -1374,8 +1324,8 @@ version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -1455,16 +1405,6 @@ dependencies = [
]
[[package]]
-name = "gif"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af"
-dependencies = [
- "color_quant",
- "lzw",
-]
-
-[[package]]
name = "gimli"
version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1983,8 +1923,8 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -2016,24 +1956,6 @@ dependencies = [
]
[[package]]
-name = "image"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebdff791af04e30089bde8ad2a632b86af433b40c04db8d70ad4b21487db7a6a"
-dependencies = [
- "byteorder",
- "gif",
- "jpeg-decoder",
- "lzw",
- "num-derive",
- "num-iter",
- "num-rational",
- "num-traits",
- "png",
- "scoped_threadpool",
-]
-
-[[package]]
name = "indexmap"
version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2054,15 +1976,6 @@ dependencies = [
]
[[package]]
-name = "inflate"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
-dependencies = [
- "adler32",
-]
-
-[[package]]
name = "inotify"
version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2128,7 +2041,6 @@ dependencies = [
"insta",
"mullvad-update",
"native-windows-gui",
- "nsvg",
"objc_id",
"rand 0.8.5",
"serde",
@@ -2147,8 +2059,8 @@ checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16"
name = "intersection-derive"
version = "0.0.0"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -2274,21 +2186,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "002f4dfe6d97ae88c33f3489c0d31ffc6f81d9a492de98ff113b127d73bafff8"
dependencies = [
"heck 0.4.1",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 1.0.109",
]
[[package]]
-name = "jpeg-decoder"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
-dependencies = [
- "rayon",
-]
-
-[[package]]
name = "js-sys"
version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2470,12 +2373,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd"
[[package]]
-name = "lzw"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
-
-[[package]]
name = "malloc_buf"
version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3024,9 +2921,9 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
[[package]]
name = "native-tls"
-version = "0.2.12"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
dependencies = [
"libc",
"log",
@@ -3082,7 +2979,7 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b"
dependencies = [
- "quote 1.0.36",
+ "quote",
"syn 2.0.89",
"syn-mid",
]
@@ -3269,63 +3166,12 @@ dependencies = [
]
[[package]]
-name = "nsvg"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfa50149c05ca80b01c6a30452084a98d96279f911df8b6840bd18b068cc120"
-dependencies = [
- "cc",
- "image",
-]
-
-[[package]]
name = "num-conv"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
-name = "num-derive"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
name = "num-traits"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3478,9 +3324,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
[[package]]
name = "openssl"
-version = "0.10.68"
+version = "0.10.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
dependencies = [
"bitflags 2.6.0",
"cfg-if",
@@ -3497,22 +3343,22 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
[[package]]
name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
[[package]]
name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
dependencies = [
"cc",
"libc",
@@ -3685,8 +3531,8 @@ checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
dependencies = [
"pest",
"pest_meta",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -3776,8 +3622,8 @@ version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -3851,8 +3697,8 @@ version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"regex",
"syn 2.0.89",
]
@@ -3863,8 +3709,8 @@ version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13325ac86ee1a80a480b0bc8e3d30c25d133616112bb16e86f712dcf8a71c863"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"regex",
"syn 2.0.89",
]
@@ -3912,18 +3758,6 @@ dependencies = [
]
[[package]]
-name = "png"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54b9600d584d3b8a739e1662a595fab051329eff43f20e7d8cc22872962145b"
-dependencies = [
- "bitflags 1.3.2",
- "deflate",
- "inflate",
- "num-iter",
-]
-
-[[package]]
name = "poly1305"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3974,7 +3808,7 @@ version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550"
dependencies = [
- "proc-macro2 1.0.92",
+ "proc-macro2",
"syn 2.0.89",
]
@@ -3989,15 +3823,6 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "proc-macro2"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
@@ -4074,8 +3899,8 @@ checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48"
dependencies = [
"anyhow",
"itertools 0.12.1",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -4087,8 +3912,8 @@ checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
dependencies = [
"anyhow",
"itertools 0.12.1",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -4180,20 +4005,11 @@ dependencies = [
[[package]]
name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
- "proc-macro2 1.0.92",
+ "proc-macro2",
]
[[package]]
@@ -4287,26 +4103,6 @@ dependencies = [
]
[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
name = "redox_syscall"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4369,11 +4165,8 @@ checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
dependencies = [
"base64 0.22.1",
"bytes",
- "encoding_rs",
- "futures-channel",
"futures-core",
"futures-util",
- "h2 0.4.4",
"http 1.1.0",
"http-body",
"http-body-util",
@@ -4397,7 +4190,6 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"sync_wrapper 1.0.1",
- "system-configuration 0.6.1",
"tokio",
"tokio-native-tls",
"tokio-rustls 0.26.0",
@@ -4634,12 +4426,6 @@ dependencies = [
]
[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
-[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4728,8 +4514,8 @@ version = "1.0.217"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -5054,23 +4840,12 @@ dependencies = [
[[package]]
name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid",
-]
-
-[[package]]
-name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"unicode-ident",
]
@@ -5080,8 +4855,8 @@ version = "2.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"unicode-ident",
]
@@ -5091,8 +4866,8 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -5117,8 +4892,8 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -5130,18 +4905,7 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
- "system-configuration-sys 0.5.0",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "system-configuration-sys 0.6.0",
+ "system-configuration-sys",
]
[[package]]
@@ -5155,16 +4919,6 @@ dependencies = [
]
[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
name = "talpid-core"
version = "0.0.0"
dependencies = [
@@ -5194,7 +4948,7 @@ dependencies = [
"resolv-conf",
"serde",
"serde_json",
- "system-configuration 0.5.1",
+ "system-configuration",
"talpid-dbus",
"talpid-macos",
"talpid-net",
@@ -5335,7 +5089,7 @@ dependencies = [
"netlink-sys",
"nix 0.28.0",
"rtnetlink",
- "system-configuration 0.5.1",
+ "system-configuration",
"talpid-types",
"talpid-windows",
"thiserror 2.0.9",
@@ -5506,8 +5260,8 @@ version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -5517,8 +5271,8 @@ version = "2.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -5590,8 +5344,8 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -5774,9 +5528,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
dependencies = [
"prettyplease",
- "proc-macro2 1.0.92",
+ "proc-macro2",
"prost-build",
- "quote 1.0.36",
+ "quote",
"syn 2.0.89",
]
@@ -5843,8 +5597,8 @@ version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -5953,12 +5707,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
-[[package]]
name = "universal-hash"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6085,8 +5833,8 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
"wasm-bindgen-shared",
]
@@ -6109,7 +5857,7 @@ version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
dependencies = [
- "quote 1.0.36",
+ "quote",
"wasm-bindgen-macro-support",
]
@@ -6119,8 +5867,8 @@ version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
@@ -6292,8 +6040,8 @@ version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -6303,8 +6051,8 @@ version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -6325,8 +6073,8 @@ version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -6336,8 +6084,8 @@ version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -6828,8 +6576,8 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
"synstructure",
]
@@ -6849,8 +6597,8 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
"synstructure",
]
@@ -6870,8 +6618,8 @@ version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
@@ -6892,7 +6640,7 @@ version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "proc-macro2",
+ "quote",
"syn 2.0.89",
]
diff --git a/installer-downloader/Cargo.toml b/installer-downloader/Cargo.toml
index 029a10dcbb..d15008254d 100644
--- a/installer-downloader/Cargo.toml
+++ b/installer-downloader/Cargo.toml
@@ -11,18 +11,18 @@ rust-version.workspace = true
workspace = true
[build-dependencies]
-anyhow = "1.0"
+anyhow = { workspace = true }
winres = "0.1"
-windows-sys = { version = "0.52.0", features = ["Win32_System", "Win32_System_LibraryLoader", "Win32_System_SystemServices"] }
+windows-sys = { workspace = true, features = ["Win32_System", "Win32_System_LibraryLoader", "Win32_System_SystemServices"] }
[target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies]
-anyhow = "1.0"
-tokio = { version = "1", features = ["full"] }
+anyhow = { workspace = true }
+tokio = { workspace = true, features = ["rt-multi-thread", "fs"] }
async-trait = "0.1"
rand = { version = "0.8.5" }
serde = { workspace = true, features = ["derive"] }
-mullvad-update = { path = "../mullvad-update" }
+mullvad-update = { path = "../mullvad-update", features = ["client", "native-tls"] }
[target.'cfg(target_os = "windows")'.dependencies]
windows-sys = { workspace = true, features = ["Win32_UI", "Win32_UI_WindowsAndMessaging", "Win32_Graphics", "Win32_Graphics_Gdi"] }
@@ -30,12 +30,11 @@ native-windows-gui = { version = "1.0.12", features = ["image-decoder"] }
[target.'cfg(target_os = "macos")'.dependencies]
cacao = "0.3.2"
-nsvg = "0.5.1"
objc_id = "0.1"
[target.'cfg(any(target_os = "windows", target_os = "macos"))'.dev-dependencies]
serde = { workspace = true, features = ["derive"] }
-tokio = { workspace = true, features = ["test-util"] }
+tokio = { workspace = true, features = ["test-util", "macros"] }
insta = { workspace = true, features = ["yaml"] }
[package.metadata.winres]
diff --git a/installer-downloader/src/lib.rs b/installer-downloader/src/lib.rs
index 724b546998..2a9896ab4c 100644
--- a/installer-downloader/src/lib.rs
+++ b/installer-downloader/src/lib.rs
@@ -1,4 +1,8 @@
+#[cfg(any(target_os = "windows", target_os = "macos"))]
pub mod controller;
+#[cfg(any(target_os = "windows", target_os = "macos"))]
pub mod delegate;
+#[cfg(any(target_os = "windows", target_os = "macos"))]
pub mod resource;
+#[cfg(any(target_os = "windows", target_os = "macos"))]
pub mod ui_downloader;
diff --git a/installer-downloader/tests/controller.rs b/installer-downloader/tests/controller.rs
index 4c8f94813b..b1a05a0578 100644
--- a/installer-downloader/tests/controller.rs
+++ b/installer-downloader/tests/controller.rs
@@ -1,3 +1,5 @@
+#![cfg(any(target_os = "windows", target_os = "macos"))]
+
//! Tests for integrations between UI controller and other components
//!
//! The tests rely on `insta` for snapshot testing. If they fail due to snapshot assertions,
diff --git a/mullvad-update/Cargo.toml b/mullvad-update/Cargo.toml
index 5fbf620adf..f601f26ad3 100644
--- a/mullvad-update/Cargo.toml
+++ b/mullvad-update/Cargo.toml
@@ -13,33 +13,39 @@ workspace = true
[features]
default = []
sign = ["rand", "clap"]
+client = ["async-trait", "mullvad-paths", "reqwest", "sha2", "tokio", "thiserror"]
+native-tls = ["reqwest/native-tls"]
[dependencies]
-anyhow = "1.0"
+anyhow = { workspace = true }
json-canon = "0.1"
chrono = { workspace = true, features = ["serde", "now"] }
ed25519-dalek = { version = "2.1" }
hex = { version = "0.4" }
-reqwest = { version = "0.12.9", features = ["blocking", "json"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
-sha2 = "0.10"
-thiserror = { workspace = true }
-tokio = { version = "1", features = ["full"] }
-async-trait = "0.1"
-mullvad-paths = { path = "../mullvad-paths" }
+async-trait = { version = "0.1", optional = true }
+reqwest = { version = "0.12.9", default-features = false, optional = true }
+sha2 = { version = "0.10", optional = true }
+tokio = { workspace = true, features = ["rt-multi-thread", "fs", "process"], optional = true }
+thiserror = { workspace = true, optional = true }
+
mullvad-version = { path = "../mullvad-version", features = ["serde"] }
# features required by binaries
clap = { workspace = true, optional = true }
rand = { version = "0.8.5", optional = true }
+[target.'cfg(target_os = "windows")'.dependencies]
+mullvad-paths = { path = "../mullvad-paths", optional = true }
+
[dev-dependencies]
async-tempfile = "0.6"
insta = { workspace = true }
mockito = "1.6.1"
rand = "0.8.5"
+tokio = { workspace = true, features = ["test-util", "time", "macros"] }
[[bin]]
name = "mullvad-version-metadata"
diff --git a/mullvad-update/src/api.rs b/mullvad-update/src/client/api.rs
index 8695daa215..0146f19d33 100644
--- a/mullvad-update/src/api.rs
+++ b/mullvad-update/src/client/api.rs
@@ -103,7 +103,7 @@ mod test {
#[tokio::test]
async fn test_http_version_provider() -> anyhow::Result<()> {
let verifying_key =
- crate::format::key::VerifyingKey::from_hex(include_str!("../test-pubkey"))
+ crate::format::key::VerifyingKey::from_hex(include_str!("../../test-pubkey"))
.expect("valid key");
// Start HTTP server
@@ -111,7 +111,7 @@ mod test {
let _mock = server
.mock("GET", "/version")
// Respond with some version response payload
- .with_body(include_bytes!("../test-version-response.json"))
+ .with_body(include_bytes!("../../test-version-response.json"))
.create();
let url = format!("{}/version", server.url());
diff --git a/mullvad-update/src/app.rs b/mullvad-update/src/client/app.rs
index 8987cb73bd..8987cb73bd 100644
--- a/mullvad-update/src/app.rs
+++ b/mullvad-update/src/client/app.rs
diff --git a/mullvad-update/src/dir.rs b/mullvad-update/src/client/dir.rs
index cf3a85eb24..cf3a85eb24 100644
--- a/mullvad-update/src/dir.rs
+++ b/mullvad-update/src/client/dir.rs
diff --git a/mullvad-update/src/fetch.rs b/mullvad-update/src/client/fetch.rs
index 8ba821a5f4..8ba821a5f4 100644
--- a/mullvad-update/src/fetch.rs
+++ b/mullvad-update/src/client/fetch.rs
diff --git a/mullvad-update/src/client/mod.rs b/mullvad-update/src/client/mod.rs
new file mode 100644
index 0000000000..ac9ca6641c
--- /dev/null
+++ b/mullvad-update/src/client/mod.rs
@@ -0,0 +1,5 @@
+pub mod api;
+pub mod app;
+pub mod dir;
+pub mod fetch;
+pub mod verify;
diff --git a/mullvad-update/src/snapshots/mullvad_update__api__test__http_version_provider.snap b/mullvad-update/src/client/snapshots/mullvad_update__client__api__test__http_version_provider.snap
index 1cb23ff5e5..1cb23ff5e5 100644
--- a/mullvad-update/src/snapshots/mullvad_update__api__test__http_version_provider.snap
+++ b/mullvad-update/src/client/snapshots/mullvad_update__client__api__test__http_version_provider.snap
diff --git a/mullvad-update/src/verify.rs b/mullvad-update/src/client/verify.rs
index a6bc3c9bc0..a6bc3c9bc0 100644
--- a/mullvad-update/src/verify.rs
+++ b/mullvad-update/src/client/verify.rs
diff --git a/mullvad-update/src/lib.rs b/mullvad-update/src/lib.rs
index f6f0b74e10..2c78908089 100644
--- a/mullvad-update/src/lib.rs
+++ b/mullvad-update/src/lib.rs
@@ -1,10 +1,11 @@
//! Support functions for securely installing or updating Mullvad VPN
-pub mod api;
-pub mod app;
-pub mod dir;
-pub mod fetch;
-pub mod verify;
+#[cfg(all(feature = "client", any(target_os = "windows", target_os = "macos")))]
+mod client;
+
+#[cfg(all(feature = "client", any(target_os = "windows", target_os = "macos")))]
+pub use client::*;
+
pub mod version;
/// Parser and serializer for version metadata