diff --git a/Cargo.lock b/Cargo.lock index 5e4c4a0c..a5303a20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" dependencies = [ "backtrace", ] @@ -1149,6 +1149,26 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "fax" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -1823,12 +1843,13 @@ dependencies = [ [[package]] name = "image" -version = "0.25.6" +version = "0.25.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a" +checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7" dependencies = [ "bytemuck", "byteorder-lite", + "moxcms", "num-traits", "png", "tiff", @@ -2002,12 +2023,6 @@ dependencies = [ "syn 2.0.101", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" version = "0.3.77" @@ -2026,9 +2041,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.174" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "libloading" @@ -2081,9 +2096,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "loom" @@ -2349,6 +2364,16 @@ dependencies = [ "uuid", ] +[[package]] +name = "moxcms" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd32fa8935aeadb8a8a6b6b351e40225570a37c43de67690383d87ef170cd08" +dependencies = [ + "num-traits", + "pxfm", +] + [[package]] name = "nix" version = "0.25.1" @@ -2619,11 +2644,11 @@ dependencies = [ [[package]] name = "png" -version = "0.17.16" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" +checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.9.0", "crc32fast", "fdeflate", "flate2", @@ -2832,6 +2857,15 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "pxfm" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55f4fedc84ed39cb7a489322318976425e42a147e2be79d8f878e2884f94e84" +dependencies = [ + "num-traits", +] + [[package]] name = "pyo3" version = "0.25.1" @@ -2933,6 +2967,12 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quote" version = "1.0.40" @@ -3038,9 +3078,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" dependencies = [ "aho-corasick", "memchr", @@ -3201,9 +3241,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" +checksum = "60b369d18893388b345804dc0007963c99b7d665ae71d275812d828c6f089640" dependencies = [ "bitflags 2.9.0", "core-foundation", @@ -3214,9 +3254,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.14.0" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -3460,9 +3500,9 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" [[package]] name = "tempfile" -version = "3.20.0" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e" dependencies = [ "fastrand", "getrandom 0.3.2", @@ -3523,13 +3563,16 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" dependencies = [ + "fax", "flate2", - "jpeg-decoder", + "half", + "quick-error", "weezl", + "zune-jpeg", ] [[package]] @@ -3630,9 +3673,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", @@ -3789,9 +3832,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.25.8" +version = "0.25.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7b8994f367f16e6fa14b5aebbcb350de5d7cbea82dc5b00ae997dd71680dd2" +checksum = "ccd2a058a86cfece0bf96f7cce1021efef9c8ed0e892ab74639173e5ed7a34fa" dependencies = [ "cc", "regex", @@ -3813,9 +3856,9 @@ dependencies = [ [[package]] name = "tree-sitter-highlight" -version = "0.25.8" +version = "0.25.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bf7a0dfbd45d88e75c89da0d13fc46f477cc20ce15617b54ebf73978eb66aec" +checksum = "c89fa29ef0aa9595898934922482181db525a45657ab5bb7d1127ffde1682826" dependencies = [ "regex", "streaming-iterator", @@ -3825,9 +3868,9 @@ dependencies = [ [[package]] name = "tree-sitter-javascript" -version = "0.23.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf40bf599e0416c16c125c3cec10ee5ddc7d1bb8b0c60fa5c4de249ad34dc1b1" +checksum = "68204f2abc0627a90bdf06e605f5c470aa26fdcb2081ea553a04bdad756693f5" dependencies = [ "cc", "tree-sitter-language", @@ -4081,9 +4124,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" +checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3" [[package]] name = "which" @@ -4717,3 +4760,18 @@ dependencies = [ "quote", "syn 2.0.101", ] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" +dependencies = [ + "zune-core", +] diff --git a/mitmproxy-contentviews/Cargo.toml b/mitmproxy-contentviews/Cargo.toml index 11ce7de8..bb63b1d8 100644 --- a/mitmproxy-contentviews/Cargo.toml +++ b/mitmproxy-contentviews/Cargo.toml @@ -12,8 +12,8 @@ publish.workspace = true workspace = true [dependencies] -anyhow = { version = "1.0.97", features = ["backtrace"] } -log = "0.4.27" +anyhow = { version = "1.0.99", features = ["backtrace"] } +log = "0.4.28" data-encoding = "2.8.0" pretty-hex = "0.4.1" mitmproxy-highlight = { path = "../mitmproxy-highlight" } @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.9" rmp-serde = "1.1" protobuf = "3.7.2" -regex = "1.10.3" +regex = "1.11.2" flate2 = "1.1" protobuf-parse = "3.7" diff --git a/mitmproxy-highlight/Cargo.toml b/mitmproxy-highlight/Cargo.toml index 68c99471..ed330416 100644 --- a/mitmproxy-highlight/Cargo.toml +++ b/mitmproxy-highlight/Cargo.toml @@ -12,11 +12,11 @@ publish.workspace = true workspace = true [dependencies] -anyhow = { version = "1.0.97", features = ["backtrace"] } -tree-sitter = "0.25.8" +anyhow = { version = "1.0.99", features = ["backtrace"] } +tree-sitter = "0.25.9" tree-sitter-css = "0.23.2" -tree-sitter-highlight = "0.25.8" -tree-sitter-javascript = "0.23.1" +tree-sitter-highlight = "0.25.9" +tree-sitter-javascript = "0.25.0" tree-sitter-xml = "0.7.0" tree-sitter-yaml = "0.7.1" diff --git a/mitmproxy-linux/Cargo.toml b/mitmproxy-linux/Cargo.toml index febfeab7..74adda42 100644 --- a/mitmproxy-linux/Cargo.toml +++ b/mitmproxy-linux/Cargo.toml @@ -22,16 +22,16 @@ tun = { workspace = true, features = ["async"] } aya = { workspace = true } aya-log = { workspace = true } tokio = { version = "1.47", features = ["macros", "net", "rt-multi-thread", "sync", "io-util", "signal"] } -anyhow = { version = "1.0.97", features = ["backtrace"] } -log = "0.4.27" +anyhow = { version = "1.0.99", features = ["backtrace"] } +log = "0.4.28" env_logger = "0.11.5" prost = "0.14.1" internet-packet = { version = "0.2.0", features = ["checksums"] } -libc = "0.2.174" +libc = "0.2.175" const-sha1 = "0.3.0" [target.'cfg(target_os = "linux")'.build-dependencies] -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } aya-build = "0.1.2" mitmproxy-linux-ebpf = { path = "../mitmproxy-linux-ebpf" } diff --git a/mitmproxy-macos/certificate-truster/Cargo.toml b/mitmproxy-macos/certificate-truster/Cargo.toml index 6325a7dc..51f5b099 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.2.0" +security-framework = "3.4.0" diff --git a/mitmproxy-rs/Cargo.toml b/mitmproxy-rs/Cargo.toml index 5f1fe903..3ea8cbb8 100644 --- a/mitmproxy-rs/Cargo.toml +++ b/mitmproxy-rs/Cargo.toml @@ -19,9 +19,9 @@ crate-type = ["lib", "cdylib"] mitmproxy = { path = "../" } mitmproxy-highlight = { path = "../mitmproxy-highlight" } mitmproxy-contentviews = { path = "../mitmproxy-contentviews" } -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } data-encoding = "2.8.0" -log = "0.4.27" +log = "0.4.28" pyo3 = { version = "0.25", features = ["abi3", "abi3-py312", "anyhow"] } pyo3-async-runtimes = { version = "0.25", features = ["tokio-runtime", "testing", "attributes"] } pyo3-log = "0.12" diff --git a/mitmproxy-windows/redirector/Cargo.toml b/mitmproxy-windows/redirector/Cargo.toml index c84940d2..78769cca 100644 --- a/mitmproxy-windows/redirector/Cargo.toml +++ b/mitmproxy-windows/redirector/Cargo.toml @@ -16,10 +16,10 @@ workspace = true [target.'cfg(windows)'.dependencies] mitmproxy = { path = "../../" } tokio = { version = "1.47", features = ["macros", "net", "rt-multi-thread", "sync", "io-util"] } -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } windivert = "0.6.0" lru_time_cache = "0.11.11" -log = "0.4.27" +log = "0.4.28" env_logger = "0.11.5" prost = "0.14.1" internet-packet = { version = "0.2.2", features = ["checksums"] } diff --git a/wireguard-test-client/Cargo.toml b/wireguard-test-client/Cargo.toml index 896f31dc..04344595 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.97" +anyhow = "1.0.99" data-encoding = "2.8.0" boringtun = "0.6" hex = "0.4"