diff --git a/Cargo.lock b/Cargo.lock index 7189eff2..74d5db44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" dependencies = [ "backtrace", ] @@ -143,7 +143,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -160,7 +160,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -775,7 +775,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -804,7 +804,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -813,7 +813,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f" dependencies = [ - "thiserror", + "thiserror 1.0.61", ] [[package]] @@ -851,7 +851,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -990,7 +990,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -1074,7 +1074,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -1251,7 +1251,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "thiserror", + "thiserror 1.0.61", "tinyvec", "tokio", "tracing", @@ -1274,7 +1274,7 @@ dependencies = [ "rand", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.61", "tokio", "tracing", ] @@ -1292,7 +1292,7 @@ dependencies = [ "futures-util", "hickory-proto", "serde", - "thiserror", + "thiserror 1.0.61", "time", "tokio", "tokio-util", @@ -1447,9 +1447,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.4" +version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" +checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b" dependencies = [ "bytemuck", "byteorder-lite", @@ -1980,7 +1980,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -2108,9 +2108,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -2135,7 +2135,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -2233,7 +2233,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -2246,7 +2246,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -2458,9 +2458,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -2502,7 +2502,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -2572,9 +2572,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2617,9 +2617,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -2640,24 +2640,23 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sysinfo" -version = "0.29.11" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", - "winapi", + "windows 0.57.0", ] [[package]] name = "tar" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -2691,7 +2690,16 @@ version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.61", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", ] [[package]] @@ -2702,7 +2710,18 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] @@ -2772,9 +2791,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -2796,7 +2815,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -2913,7 +2932,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -2949,9 +2968,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun" -version = "0.7.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224cb7686e768be38d03dc660f88947b8976c1d68b8ee731324fe4b761ab80a2" +checksum = "f3c3f82bccbec181c56278683da7d915cf875a6cf8a450b3bcf1367de222775e" dependencies = [ "bytes", "cfg-if", @@ -2961,7 +2980,7 @@ dependencies = [ "libc", "log", "nix 0.29.0", - "thiserror", + "thiserror 2.0.3", "tokio", "tokio-util", "windows-sys 0.59.0", @@ -3092,7 +3111,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", "wasm-bindgen-shared", ] @@ -3114,7 +3133,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3185,7 +3204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6b6833a760d1c36b489314a5541a12a39d162dc8341d8f6f400212b96d3df1" dependencies = [ "etherparse", - "thiserror", + "thiserror 1.0.61", "windivert-sys", "windows 0.48.0", ] @@ -3197,7 +3216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "832bc4af9272458a8a64395b3aabe10dc4089546486fcbd0e19b9b6d28ba6e54" dependencies = [ "cc", - "thiserror", + "thiserror 1.0.61", "windows 0.48.0", ] @@ -3240,7 +3259,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -3251,7 +3270,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] [[package]] @@ -3458,7 +3477,7 @@ dependencies = [ "futures", "libloading", "log", - "thiserror", + "thiserror 1.0.61", "windows-sys 0.59.0", ] @@ -3502,5 +3521,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.90", ] diff --git a/Cargo.toml b/Cargo.toml index 3036800f..c5a5c9b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,17 +32,17 @@ rust-version.workspace = true publish.workspace = true [dependencies] -anyhow = { version = "1.0.92", features = ["backtrace"] } +anyhow = { version = "1.0.93", features = ["backtrace"] } log = "0.4.22" once_cell = "1" pretty-hex = "0.4.1" rand_core = { version = "0.6.4", features = ["getrandom"] } smoltcp = "0.11" -tokio = { version = "1.41.0", features = ["macros", "net", "rt-multi-thread", "sync", "time", "io-util", "process"] } +tokio = { version = "1.41.1", features = ["macros", "net", "rt-multi-thread", "sync", "time", "io-util", "process"] } boringtun = { version = "0.6", default-features = false } x25519-dalek = "2.0.0" console-subscriber = { version = "0.4.1", optional = true } -image = { version = "0.25.4", default-features = false, features = ["png", "tiff"] } +image = { version = "0.25.5", default-features = false, features = ["png", "tiff"] } prost = "0.13.3" tokio-util = { version = "0.7.12", features = ["codec"] } futures-util = { version = "0.3.31", features = ["sink"] } @@ -50,7 +50,7 @@ lru_time_cache = "0.11.11" internet-packet = { version = "0.2.2", features = ["smoltcp"] } data-encoding = "2.4.0" hickory-resolver = "0.24.1" -socket2 = "0.5.7" +socket2 = "0.5.8" [patch.crates-io] # tokio = { path = "../tokio/tokio" } @@ -74,16 +74,16 @@ features = [ ] [target.'cfg(target_os = "macos")'.dependencies] -security-framework = "3.0.0" +security-framework = "3.0.1" nix = { version = "0.29.0", default-features = false, features = ["fs"] } core-graphics = "0.24" core-foundation = "0.10" cocoa = "0.26" objc = "0.2" -sysinfo = "0.29.10" +sysinfo = "0.32.0" [target.'cfg(target_os = "linux")'.dependencies] -tun = { version = "0.7.1", features = ["async"] } +tun = { version = "0.7.5", features = ["async"] } [dev-dependencies] env_logger = "0.11" diff --git a/mitmproxy-macos/certificate-truster/Cargo.toml b/mitmproxy-macos/certificate-truster/Cargo.toml index 924c9413..1695178d 100644 --- a/mitmproxy-macos/certificate-truster/Cargo.toml +++ b/mitmproxy-macos/certificate-truster/Cargo.toml @@ -9,4 +9,4 @@ rust-version.workspace = true publish.workspace = true [target.'cfg(target_os = "macos")'.dependencies] -security-framework = "3.0.0" +security-framework = "3.0.1" diff --git a/mitmproxy-rs/Cargo.toml b/mitmproxy-rs/Cargo.toml index 097fbdc6..932f96ef 100644 --- a/mitmproxy-rs/Cargo.toml +++ b/mitmproxy-rs/Cargo.toml @@ -17,7 +17,7 @@ crate-type = ["lib", "cdylib"] [dependencies] mitmproxy = { path = "../" } -anyhow = { version = "1.0.92", features = ["backtrace"] } +anyhow = { version = "1.0.93", features = ["backtrace"] } data-encoding = "2.6.0" log = "0.4.22" once_cell = "1" @@ -27,7 +27,7 @@ pyo3-log = "0.11.0" rand_core = { version = "0.6.4", features = ["getrandom"] } tokio = { version = "1.41", features = ["macros", "net", "rt-multi-thread", "sync"] } boringtun = "0.6" -tar = "0.4.42" +tar = "0.4.43" console-subscriber = { version = "0.4.1", optional = true } diff --git a/mitmproxy-windows/redirector/Cargo.toml b/mitmproxy-windows/redirector/Cargo.toml index 15398701..ee84c796 100644 --- a/mitmproxy-windows/redirector/Cargo.toml +++ b/mitmproxy-windows/redirector/Cargo.toml @@ -16,7 +16,7 @@ workspace = true [target.'cfg(windows)'.dependencies] mitmproxy = { path = "../../" } tokio = { version = "1.41", features = ["macros", "net", "rt-multi-thread", "sync", "io-util"] } -anyhow = { version = "1.0.92", features = ["backtrace"] } +anyhow = { version = "1.0.93", features = ["backtrace"] } windivert = "0.6.0" lru_time_cache = "0.11.11" log = "0.4.22" diff --git a/wireguard-test-client/Cargo.toml b/wireguard-test-client/Cargo.toml index 05d00e6c..2e8a5787 100644 --- a/wireguard-test-client/Cargo.toml +++ b/wireguard-test-client/Cargo.toml @@ -13,7 +13,7 @@ publish.workspace = true workspace = true [dependencies] -anyhow = "1.0.92" +anyhow = "1.0.93" data-encoding = "2.6.0" boringtun = "0.6" hex = "0.4"