summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-04-07 10:57:16 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-04-07 10:57:16 +0200
commitd6696d5f403189f87b29838663269662bc477568 (patch)
tree965313702c5abadf0ddeca99bfdc40dd0bf8f90d
parentf67c02e9b2a3d67344c60b83cab079e0816291c3 (diff)
parent0f7b1f5a0449451ef21e3221a35c82162cdc1361 (diff)
downloadmullvadvpn-d6696d5f403189f87b29838663269662bc477568.tar.xz
mullvadvpn-d6696d5f403189f87b29838663269662bc477568.zip
Merge branch 'fix-rustsec-2025-0023'
-rw-r--r--Cargo.lock8
-rw-r--r--Cargo.toml2
-rw-r--r--test/Cargo.lock12
-rw-r--r--test/Cargo.toml2
4 files changed, 12 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1314bc2b8e..4fbf93a399 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5338,9 +5338,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.42.0"
+version = "1.44.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
dependencies = [
"backtrace",
"bytes",
@@ -5356,9 +5356,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [
"proc-macro2",
"quote",
diff --git a/Cargo.toml b/Cargo.toml
index eedb961b2c..bdda557981 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,7 +86,7 @@ implicit_clone = "warn"
hickory-proto = "0.24.3"
hickory-resolver = "0.24.3"
hickory-server = { version = "0.24.3", features = ["resolver"] }
-tokio = { version = "1.42" }
+tokio = { version = "1.44" }
parity-tokio-ipc = "0.9"
futures = "0.3.15"
diff --git a/test/Cargo.lock b/test/Cargo.lock
index 80c061ad0e..37ef8576ac 100644
--- a/test/Cargo.lock
+++ b/test/Cargo.lock
@@ -1854,9 +1854,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
[[package]]
name = "libloading"
@@ -3889,9 +3889,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.42.0"
+version = "1.44.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
dependencies = [
"backtrace",
"bytes",
@@ -3907,9 +3907,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [
"proc-macro2",
"quote",
diff --git a/test/Cargo.toml b/test/Cargo.toml
index c346316df8..a46acb7237 100644
--- a/test/Cargo.toml
+++ b/test/Cargo.toml
@@ -38,7 +38,7 @@ implicit_clone = "warn"
[workspace.dependencies]
futures = "0.3"
-tokio = { version = "1.42", features = [
+tokio = { version = "1.44", features = [
"macros",
"rt",
"process",