diff --git a/Cargo.lock b/Cargo.lock index c0053f99..ca2d734a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,9 +50,9 @@ checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" dependencies = [ "backtrace", ] @@ -317,6 +317,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" version = "0.9.1" @@ -888,9 +894,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -945,6 +951,15 @@ dependencies = [ "byteorder", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -971,12 +986,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" dependencies = [ "atomic-polyfill", - "hash32", + "hash32 0.2.1", "rustc_version", "spin 0.9.8", "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32 0.3.1", + "stable_deref_trait", +] + [[package]] name = "hermit-abi" version = "0.3.3" @@ -1076,9 +1101,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", @@ -1130,7 +1155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95d8d20ad61a92e71edf571fa568e14aeba0c5f00548acd491fbf694ce9a5ad8" dependencies = [ "internet-checksum", - "smoltcp", + "smoltcp 0.10.0", ] [[package]] @@ -1222,9 +1247,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "linux-raw-sys" @@ -1244,9 +1269,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru_time_cache" @@ -1338,7 +1363,7 @@ dependencies = [ "boringtun", "data-encoding", "hex", - "smoltcp", + "smoltcp 0.11.0", ] [[package]] @@ -1357,16 +1382,16 @@ dependencies = [ "internet-packet", "log", "lru_time_cache", - "nix 0.27.1", + "nix 0.28.0", "once_cell", "pretty-hex", "prost", "rand", "rand_core", - "smoltcp", + "smoltcp 0.11.0", "tokio", "tokio-util", - "windows 0.52.0", + "windows 0.54.0", "x25519-dalek", ] @@ -1404,12 +1429,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.4.0", "cfg-if", + "cfg_aliases", "libc", ] @@ -2027,7 +2053,23 @@ dependencies = [ "byteorder", "cfg-if", "defmt", - "heapless", + "heapless 0.7.16", + "libc", + "log", + "managed", +] + +[[package]] +name = "smoltcp" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a1a996951e50b5971a2c8c0fa05a381480d70a933064245c4a223ddc87ccc97" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "cfg-if", + "defmt", + "heapless 0.8.0", "libc", "log", "managed", @@ -2187,9 +2229,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -2515,9 +2557,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "winapi" @@ -2584,21 +2626,22 @@ dependencies = [ [[package]] name = "windows" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-targets 0.52.0", + "windows-result", + "windows-targets 0.52.4", ] [[package]] @@ -2618,6 +2661,15 @@ dependencies = [ "winres", ] +[[package]] +name = "windows-result" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +dependencies = [ + "windows-targets 0.52.4", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -2644,17 +2696,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -2665,9 +2717,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -2677,9 +2729,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -2689,9 +2741,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -2701,9 +2753,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -2713,9 +2765,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -2725,9 +2777,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -2737,9 +2789,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winres" diff --git a/Cargo.toml b/Cargo.toml index d48ead11..e82143ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,18 +29,18 @@ rust-version.workspace = true publish.workspace = true [dependencies] -anyhow = { version = "1.0.79", features = ["backtrace"] } -log = "0.4.18" +anyhow = { version = "1.0.80", features = ["backtrace"] } +log = "0.4.21" once_cell = "1" pretty-hex = "0.4.1" rand_core = { version = "0.6.4", features = ["getrandom"] } -smoltcp = "0.10" -tokio = { version = "1.35.1", features = ["macros", "net", "rt-multi-thread", "sync", "time", "io-util", "process"] } +smoltcp = "0.11" +tokio = { version = "1.36.0", features = ["macros", "net", "rt-multi-thread", "sync", "time", "io-util", "process"] } boringtun = { version = "0.6", default-features = false } x25519-dalek = "=2.0.0-rc.3" async-trait = "0.1.77" console-subscriber = { version = "0.2.0", optional = true } -image = "0.24.8" +image = "0.24.9" prost = "0.12.3" tokio-util = { version = "0.7.10", features = ["codec"] } futures-util = { version = "0.3.30", features = ["sink"] } @@ -52,7 +52,7 @@ internet-packet = { version = "0.2.0", features = ["smoltcp"] } # smoltcp = { git = 'https://github.com/mhils/smoltcp', rev = 'f65351adfa92db5193f368368cb668bac721fe43' } [target.'cfg(windows)'.dependencies.windows] -version = "0.52.0" +version = "0.54.0" features = [ "Win32_Foundation", "Win32_Graphics_Dwm", @@ -69,7 +69,7 @@ features = [ [target.'cfg(target_os = "macos")'.dependencies] apple-security-framework = "2.9.2" -nix = { version = "0.27.1", default-features = false, features = ["fs"] } +nix = { version = "0.28.0", default-features = false, features = ["fs"] } [dev-dependencies] env_logger = "0.10" diff --git a/mitmproxy-rs/Cargo.toml b/mitmproxy-rs/Cargo.toml index 3cf9cb85..2b7f7ac6 100644 --- a/mitmproxy-rs/Cargo.toml +++ b/mitmproxy-rs/Cargo.toml @@ -14,15 +14,15 @@ crate-type = ["cdylib"] [dependencies] mitmproxy = { path = "../" } -anyhow = { version = "1.0.79", features = ["backtrace"] } +anyhow = { version = "1.0.80", features = ["backtrace"] } data-encoding = "2.5.0" -log = "0.4.18" +log = "0.4.21" once_cell = "1" pyo3 = { version = "0.19.2", features = ["abi3", "abi3-py310", "extension-module", "anyhow"] } pyo3-asyncio = { version = "0.19.0", features = ["tokio-runtime"] } pyo3-log = "0.9.0" rand_core = { version = "0.6.4", features = ["getrandom"] } -tokio = { version = "1.35", features = ["macros", "net", "rt-multi-thread", "sync"] } +tokio = { version = "1.36", features = ["macros", "net", "rt-multi-thread", "sync"] } boringtun = "0.6" tar = "0.4.40" console-subscriber = { version = "0.2.0", optional = true } diff --git a/mitmproxy-windows/redirector/Cargo.toml b/mitmproxy-windows/redirector/Cargo.toml index 9f01ff12..6a9a843d 100644 --- a/mitmproxy-windows/redirector/Cargo.toml +++ b/mitmproxy-windows/redirector/Cargo.toml @@ -12,11 +12,11 @@ publish.workspace = true [target.'cfg(windows)'.dependencies] mitmproxy = { path = "../../" } -tokio = { version = "1.35", features = ["macros", "net", "rt-multi-thread", "sync", "io-util"] } -anyhow = { version = "1.0.79", features = ["backtrace"] } +tokio = { version = "1.36", features = ["macros", "net", "rt-multi-thread", "sync", "io-util"] } +anyhow = { version = "1.0.80", features = ["backtrace"] } windivert = "0.6.0" lru_time_cache = "0.11.11" -log = "0.4.18" +log = "0.4.21" env_logger = "0.10.2" prost = "0.12.3" internet-packet = { version = "0.2.0", features = ["checksums"] } diff --git a/wireguard-test-client/Cargo.toml b/wireguard-test-client/Cargo.toml index 7fcbc57f..be13844c 100644 --- a/wireguard-test-client/Cargo.toml +++ b/wireguard-test-client/Cargo.toml @@ -10,8 +10,8 @@ rust-version.workspace = true publish.workspace = true [dependencies] -anyhow = "1.0.79" +anyhow = "1.0.80" data-encoding = "2.5.0" boringtun = "0.6" hex = "0.4" -smoltcp = "0.10" +smoltcp = "0.11"