summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-03-11 12:10:40 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-03-11 12:10:40 +0100
commitf767bc04283067c7c5dd90b68d6f57423c550f49 (patch)
tree5634e87dde0a9bb84630926380a83210c76696c3
parentf85d5b39493379fae6004ba12a3ec5643af057a4 (diff)
parentfeb462a9352887e81b4a5366d2e69a791dd11b71 (diff)
downloadmullvadvpn-f767bc04283067c7c5dd90b68d6f57423c550f49.tar.xz
mullvadvpn-f767bc04283067c7c5dd90b68d6f57423c550f49.zip
Merge branch 'fix-rustsec-2025-0014'
-rw-r--r--Cargo.lock194
-rw-r--r--Cargo.toml2
-rw-r--r--mullvad-leak-checker/Cargo.toml2
-rw-r--r--mullvad-leak-checker/examples/leaker-cli.rs2
-rw-r--r--test/Cargo.lock117
-rw-r--r--test/Cargo.toml2
-rw-r--r--test/deny.toml3
-rw-r--r--test/osv-scanner.toml10
8 files changed, 204 insertions, 128 deletions
diff --git a/Cargo.lock b/Cargo.lock
index de888dff51..03ab60ca35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -201,7 +201,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -221,7 +221,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -472,7 +472,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn 2.0.89",
+ "syn 2.0.100",
"tempfile",
"toml 0.8.19",
]
@@ -598,7 +598,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -818,7 +818,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -842,7 +842,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -853,7 +853,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -934,7 +934,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -944,7 +944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
dependencies = [
"derive_builder_core",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -993,7 +993,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -1083,7 +1083,7 @@ dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -1103,7 +1103,17 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
]
[[package]]
@@ -1118,15 +1128,15 @@ dependencies = [
[[package]]
name = "env_logger"
-version = "0.10.2"
+version = "0.11.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
dependencies = [
- "humantime",
- "is-terminal",
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
"log",
- "regex",
- "termcolor",
]
[[package]]
@@ -1327,7 +1337,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -1687,12 +1697,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
name = "hybrid-array"
version = "0.2.0-rc.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1910,7 +1914,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -2054,7 +2058,7 @@ version = "0.0.0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -2141,6 +2145,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
+name = "jiff"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
+[[package]]
name = "jni"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2282,7 +2310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
dependencies = [
"cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2679,7 +2707,7 @@ dependencies = [
name = "mullvad-encrypted-dns-proxy"
version = "0.0.0"
dependencies = [
- "env_logger 0.10.2",
+ "env_logger 0.11.7",
"hickory-resolver",
"log",
"rustls 0.21.11",
@@ -2757,11 +2785,11 @@ version = "0.1.0"
dependencies = [
"anyhow",
"clap",
+ "env_logger 0.11.7",
"futures",
"log",
"nix 0.29.0",
"pnet_packet 0.35.0",
- "pretty_env_logger",
"reqwest",
"serde",
"socket2",
@@ -2819,7 +2847,7 @@ dependencies = [
"clap",
"dirs",
"duct",
- "env_logger 0.10.2",
+ "env_logger 0.11.7",
"log",
"mullvad-api",
"mullvad-paths",
@@ -2856,7 +2884,7 @@ name = "mullvad-setup"
version = "0.0.0"
dependencies = [
"clap",
- "env_logger 0.10.2",
+ "env_logger 0.11.7",
"mullvad-api",
"mullvad-daemon",
"mullvad-management-interface",
@@ -2967,7 +2995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b"
dependencies = [
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"syn-mid",
]
@@ -3467,7 +3495,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3558,7 +3586,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3616,7 +3644,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3628,7 +3656,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3697,6 +3725,21 @@ dependencies = [
]
[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
name = "powerfmt"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3709,23 +3752,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
-name = "pretty_env_logger"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
-dependencies = [
- "env_logger 0.10.2",
- "log",
-]
-
-[[package]]
name = "prettyplease"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550"
dependencies = [
"proc-macro2",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3739,9 +3772,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
dependencies = [
"unicode-ident",
]
@@ -3803,7 +3836,7 @@ dependencies = [
"prost 0.12.4",
"prost-types 0.12.4",
"regex",
- "syn 2.0.89",
+ "syn 2.0.100",
"tempfile",
]
@@ -3817,7 +3850,7 @@ dependencies = [
"itertools 0.12.1",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3830,7 +3863,7 @@ dependencies = [
"itertools 0.12.1",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3921,9 +3954,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
dependencies = [
"proc-macro2",
]
@@ -4396,7 +4429,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -4721,9 +4754,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.89"
+version = "2.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
dependencies = [
"proc-macro2",
"quote",
@@ -4738,7 +4771,7 @@ checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -4764,7 +4797,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -4917,7 +4950,7 @@ dependencies = [
name = "talpid-openvpn-plugin"
version = "0.0.0"
dependencies = [
- "env_logger 0.10.2",
+ "env_logger 0.11.7",
"futures",
"hyper-util",
"log",
@@ -5098,15 +5131,6 @@ dependencies = [
]
[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
name = "thiserror"
version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5132,7 +5156,7 @@ checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -5143,7 +5167,7 @@ checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -5216,7 +5240,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -5391,7 +5415,7 @@ dependencies = [
"proc-macro2",
"prost-build",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -5459,7 +5483,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -5689,7 +5713,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"wasm-bindgen-shared",
]
@@ -5723,7 +5747,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -5896,7 +5920,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -5907,7 +5931,7 @@ checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -5930,7 +5954,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -5941,7 +5965,7 @@ checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -6433,7 +6457,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"synstructure",
]
@@ -6454,7 +6478,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"synstructure",
]
@@ -6475,7 +6499,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -6497,5 +6521,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
diff --git a/Cargo.toml b/Cargo.toml
index 5c38824b47..1ce482a632 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,7 +100,7 @@ hyper-util = { version = "0.1.8", features = [
"http1",
] }
-env_logger = "0.10.0"
+env_logger = "0.11.7"
thiserror = "2.0"
anyhow = "1.0"
log = "0.4"
diff --git a/mullvad-leak-checker/Cargo.toml b/mullvad-leak-checker/Cargo.toml
index 32092aa238..b60fb59673 100644
--- a/mullvad-leak-checker/Cargo.toml
+++ b/mullvad-leak-checker/Cargo.toml
@@ -24,7 +24,7 @@ reqwest = { version = "0.12.9", optional = true, default-features = false, featu
[dev-dependencies]
tokio = { workspace = true, features = ["full"] }
-pretty_env_logger = "0.5.0"
+env_logger = { workspace = true }
[target.'cfg(unix)'.dependencies]
pnet_packet.workspace = true
diff --git a/mullvad-leak-checker/examples/leaker-cli.rs b/mullvad-leak-checker/examples/leaker-cli.rs
index 220542bc5f..5ef6588b09 100644
--- a/mullvad-leak-checker/examples/leaker-cli.rs
+++ b/mullvad-leak-checker/examples/leaker-cli.rs
@@ -19,7 +19,7 @@ pub enum LeakMethod {
#[tokio::main]
async fn main() -> anyhow::Result<()> {
- pretty_env_logger::formatted_builder()
+ env_logger::builder()
.filter_level(log::LevelFilter::Debug)
.parse_default_env()
.init();
diff --git a/test/Cargo.lock b/test/Cargo.lock
index 86cfe94da8..e2e014cce3 100644
--- a/test/Cargo.lock
+++ b/test/Cargo.lock
@@ -170,7 +170,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -191,7 +191,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -373,7 +373,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn 2.0.89",
+ "syn 2.0.100",
"tempfile",
"toml",
]
@@ -484,7 +484,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -656,7 +656,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -744,7 +744,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -813,7 +813,7 @@ dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -826,7 +826,7 @@ dependencies = [
"num-traits",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -841,14 +841,14 @@ dependencies = [
[[package]]
name = "env_logger"
-version = "0.11.3"
+version = "0.11.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
dependencies = [
"anstream",
"anstyle",
"env_filter",
- "humantime",
+ "jiff",
"log",
]
@@ -1033,7 +1033,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -1561,7 +1561,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -1646,7 +1646,7 @@ version = "0.0.0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -1723,6 +1723,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
+name = "jiff"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
+[[package]]
name = "jni"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2421,7 +2445,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -2495,7 +2519,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -2543,6 +2567,21 @@ dependencies = [
]
[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
name = "powerfmt"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2561,7 +2600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550"
dependencies = [
"proc-macro2",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -2575,9 +2614,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
dependencies = [
"unicode-ident",
]
@@ -2619,7 +2658,7 @@ dependencies = [
"prost 0.12.4",
"prost-types 0.12.4",
"regex",
- "syn 2.0.89",
+ "syn 2.0.100",
"tempfile",
]
@@ -2633,7 +2672,7 @@ dependencies = [
"itertools 0.12.1",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -2646,7 +2685,7 @@ dependencies = [
"itertools 0.12.1",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -2732,9 +2771,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
dependencies = [
"proc-macro2",
]
@@ -3147,7 +3186,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3430,9 +3469,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.89"
+version = "2.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
dependencies = [
"proc-macro2",
"quote",
@@ -3462,7 +3501,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3700,7 +3739,7 @@ checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3711,7 +3750,7 @@ checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3806,7 +3845,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -3987,7 +4026,7 @@ dependencies = [
"proc-macro2",
"prost-build",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -4056,7 +4095,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -4266,7 +4305,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"wasm-bindgen-shared",
]
@@ -4300,7 +4339,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -4743,7 +4782,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"synstructure",
]
@@ -4764,7 +4803,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
"synstructure",
]
@@ -4785,7 +4824,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
[[package]]
@@ -4807,5 +4846,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.89",
+ "syn 2.0.100",
]
diff --git a/test/Cargo.toml b/test/Cargo.toml
index c5f216217f..09c26ae1a7 100644
--- a/test/Cargo.toml
+++ b/test/Cargo.toml
@@ -67,7 +67,7 @@ hyper-util = { version = "0.1.8", features = [
] }
# Logging
-env_logger = "0.11.0"
+env_logger = "0.11.7"
thiserror = "2.0"
log = "0.4"
colored = "2.0.0"
diff --git a/test/deny.toml b/test/deny.toml
index 70584012e1..2fc0d17751 100644
--- a/test/deny.toml
+++ b/test/deny.toml
@@ -20,6 +20,9 @@ yanked = "deny"
ignore = [
# Ignored audit issues. This list should be kept short, and effort should be
# put into removing items from the list.
+ #
+ # RUSTSEC-2025-0014 - `humantime` is unmaintained: https://github.com/tailhook/humantime/issues/31
+ "RUSTSEC-2025-0014"
]
diff --git a/test/osv-scanner.toml b/test/osv-scanner.toml
index 9d95c0b636..51e3e1d894 100644
--- a/test/osv-scanner.toml
+++ b/test/osv-scanner.toml
@@ -1,3 +1,13 @@
# See repository root `osv-scanner.toml` for instructions and rules for this file.
#
# Keep this file in sync with test/deny.toml
+
+# The `humantime` crate is no longer maintained
+[[IgnoredVulns]]
+id = "RUSTSEC-2025-0014"
+ignoreUntil = 2025-06-11
+reason = """
+The `humantime` crate is no longer maintained. `tarpc` depend on it, and there is currently no "fix" for this.
+We have no reason to suspect that `humantime` is vulnerable in any way. An issue has been opened upstream:
+https://github.com/google/tarpc/issues/509
+"""