From 78df5f6b1afd14e3e2d4c436fa63f10994d8f29a Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Mon, 6 Oct 2025 16:23:27 +0200 Subject: [PATCH 01/10] update old crates --- CONTRIBUTING.md | 7 + Cargo.lock | 204 +++++++++--------- Cargo.toml | 44 ++-- crates/libafl/Cargo.toml | 4 +- .../src/common/nautilus/grammartec/context.rs | 4 +- .../grammartec/python_grammar_loader.rs | 4 +- .../src/common/nautilus/grammartec/rule.rs | 8 +- .../src/common/nautilus/grammartec/tree.rs | 12 +- crates/libafl_asan/Cargo.toml | 6 +- crates/libafl_bolts/Cargo.toml | 7 +- crates/libafl_bolts/src/lib.rs | 4 +- crates/libafl_bolts/src/serdeany.rs | 9 +- crates/libafl_bolts/src/tuples.rs | 2 + crates/libafl_intelpt/src/linux.rs | 2 +- .../runtime/Cargo.toml.template | 2 +- 15 files changed, 159 insertions(+), 160 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7961bc3f2e6..d5cda992e1d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,6 +29,13 @@ Some of the parts in this list may be hard, don't be afraid to open a PR if you Some of these checks can be performed automatically during commit using [pre-commit](https://pre-commit.com/). Once the package is installed, simply run `pre-commit install` to enable the hooks, the checks will run automatically before the commit becomes effective. +### Adding dependencies + +Avoid adding additional crates dependencies if it can be avoided in general. +Check if the dependency to add is not already present in the root `Cargo.toml` file or in other crates. +If it is the case, use the dependency using `workspace = true` when adding the dependency. +As a rule of thumb, if a given dependency is used more than once, it should be added in the root `Cargo.toml` file. + ## LibAFL Code Rules Before making your pull requests, try to see if your code follows these rules. diff --git a/Cargo.lock b/Cargo.lock index 26266b18e13..b141adc4548 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,6 +201,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825297538d77367557b912770ca3083f778a196054b3ee63b22673c4a3cae0a5" +[[package]] +name = "arbitrary-int" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c858caffa49edfc4ecc45a4bec37abd3e88041a2903816f10f990b7b41abc281" + [[package]] name = "arrayref" version = "0.3.9" @@ -638,7 +644,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec187a89ab07e209270175faf9e07ceb2755d984954e58a2296e325ddece2762" dependencies = [ - "arbitrary-int", + "arbitrary-int 1.3.0", "proc-macro2", "quote", "syn 2.0.106", @@ -2471,17 +2477,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", - "serde", -] - [[package]] name = "hashbrown" version = "0.15.5" @@ -2498,6 +2493,12 @@ name = "hashbrown" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash 0.2.0", + "serde", +] [[package]] name = "heck" @@ -3101,7 +3102,7 @@ name = "libafl" version = "0.15.4" dependencies = [ "ahash", - "arbitrary-int", + "arbitrary-int 2.0.0", "arrayvec 0.7.6", "async-std", "backtrace", @@ -3119,7 +3120,7 @@ dependencies = [ "fastbloom", "fs2", "futures", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl_bolts", "libafl_derive", "libafl_intelpt", @@ -3151,7 +3152,7 @@ dependencies = [ "uuid", "wait-timeout", "winapi", - "windows 0.59.0", + "windows 0.62.1", "z3", ] @@ -3166,7 +3167,7 @@ dependencies = [ "dlmalloc", "document-features", "env_logger", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "itertools 0.14.0", "libc", "log", @@ -3220,7 +3221,7 @@ dependencies = [ "ctor", "document-features", "erased-serde", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "hostname", "itertools 0.14.0", "libafl_derive", @@ -3245,8 +3246,8 @@ dependencies = [ "uds", "uuid", "winapi", - "windows 0.59.0", - "windows-result 0.3.4", + "windows 0.62.1", + "windows-result 0.4.0", "xxhash-rust", ] @@ -3283,7 +3284,7 @@ dependencies = [ "errno", "frida-gum", "frida-gum-sys", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "iced-x86", "libafl", "libafl_bolts", @@ -3312,7 +3313,7 @@ dependencies = [ name = "libafl_intelpt" version = "0.15.4" dependencies = [ - "arbitrary-int", + "arbitrary-int 2.0.0", "bitbybit", "caps", "libafl_bolts", @@ -3373,7 +3374,7 @@ dependencies = [ "enum-map", "getset", "goblin", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "just", "libafl", "libafl_bolts", @@ -3391,7 +3392,7 @@ dependencies = [ "object", "paste", "pyo3", - "pyo3-build-config 0.25.1", + "pyo3-build-config", "rangemap", "rustversion", "serde", @@ -3443,7 +3444,7 @@ dependencies = [ "num_enum", "paste", "pyo3", - "pyo3-build-config 0.25.1", + "pyo3-build-config", "rustversion", "strum 0.27.2", "strum_macros 0.27.2", @@ -3460,7 +3461,7 @@ dependencies = [ "libafl_targets", "log", "pyo3", - "pyo3-build-config 0.25.1", + "pyo3-build-config", "typed-builder", ] @@ -3470,7 +3471,7 @@ version = "0.15.4" dependencies = [ "bindgen 0.72.1", "cc", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl", "libafl_bolts", "libc", @@ -3784,18 +3785,18 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "lua-src" -version = "547.0.0" +version = "548.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edaf29e3517b49b8b746701e5648ccb5785cde1c119062cbabbc5d5cd115e42" +checksum = "bdc4e1aff422ad5f08cffb4719603dcdbc2be2307f4c1510d7aab74b7fa88ca8" dependencies = [ "cc", ] [[package]] name = "luajit-src" -version = "210.5.12+a4f56a4" +version = "210.6.1+f9140a6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a8e7962a5368d5f264d045a5a255e90f9aa3fc1941ae15a8d2940d42cac671" +checksum = "813bd31f2759443affa687c0d9c5eb5cf6cb0e898810ab197408431d746054bf" dependencies = [ "cc", "which 7.0.3", @@ -3933,9 +3934,9 @@ dependencies = [ [[package]] name = "mlua" -version = "0.10.5" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f5f8fbebc7db5f671671134b9321c4b9aa9adeafccfd9a8c020ae45c6a35d0" +checksum = "9be1c2bfc684b8a228fbaebf954af7a47a98ec27721986654a4cc2c40a20cc7e" dependencies = [ "bstr", "either", @@ -3949,9 +3950,9 @@ dependencies = [ [[package]] name = "mlua-sys" -version = "0.6.8" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380c1f7e2099cafcf40e51d3a9f20a346977587aa4d012eae1f043149a728a93" +checksum = "3d4dc9cfc5a7698899802e97480617d9726f7da78c910db989d4d0fd4991d900" dependencies = [ "cc", "cfg-if 1.0.3", @@ -3962,11 +3963,11 @@ dependencies = [ [[package]] name = "mlua_derive" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870d71c172fcf491c6b5fb4c04160619a2ee3e5a42a1402269c66bcbf1dd4deb" +checksum = "465bddde514c4eb3b50b543250e97c1d4b284fa3ef7dc0ba2992c77545dbceb2" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "once_cell", "proc-macro-error2", "proc-macro2", @@ -4636,18 +4637,17 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ - "cfg-if 1.0.3", "indoc", "inventory", "libc", "memoffset 0.9.1", "once_cell", "portable-atomic", - "pyo3-build-config 0.24.2", + "pyo3-build-config", "pyo3-ffi", "pyo3-macros", "serde", @@ -4656,39 +4656,28 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-build-config" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598" -dependencies = [ - "once_cell", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", - "pyo3-build-config 0.24.2", + "pyo3-build-config", ] [[package]] name = "pyo3-macros" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -4698,13 +4687,13 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck 0.5.0", "proc-macro2", - "pyo3-build-config 0.24.2", + "pyo3-build-config", "quote", "syn 2.0.106", ] @@ -6456,18 +6445,18 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typed-builder" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef81aec2ca29576f9f6ae8755108640d0a86dd3161b2e8bca6cfa554e98f77d" +checksum = "398a3a3c918c96de527dc11e6e846cd549d4508030b8a33e1da12789c856b81a" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecb9ecf7799210407c14a8cfdfe0173365780968dc57973ed082211958e0b18" +checksum = "0e48cea23f68d1f78eb7bc092881b6bb88d3d6b5b7e6234f6f9c911da1ffb221" dependencies = [ "proc-macro2", "quote", @@ -6989,12 +6978,23 @@ dependencies = [ [[package]] name = "windows" -version = "0.59.0" +version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +checksum = "49e6c4a1f363c8210c6f77ba24f645c61c6fb941eccf013da691f7e09515b8ac" dependencies = [ - "windows-core 0.59.0", - "windows-targets 0.53.4", + "windows-collections", + "windows-core 0.62.1", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "123e712f464a8a60ce1a13f4c446d2d43ab06464cb5842ff68f5c71b6fb7852e" +dependencies = [ + "windows-core 0.62.1", ] [[package]] @@ -7009,19 +7009,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" -dependencies = [ - "windows-implement 0.59.0", - "windows-interface 0.59.2", - "windows-result 0.3.4", - "windows-strings 0.3.1", - "windows-targets 0.53.4", -] - [[package]] name = "windows-core" version = "0.62.1" @@ -7032,25 +7019,25 @@ dependencies = [ "windows-interface 0.59.2", "windows-link 0.2.0", "windows-result 0.4.0", - "windows-strings 0.5.0", + "windows-strings", ] [[package]] -name = "windows-implement" -version = "0.57.0" +name = "windows-future" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +checksum = "68f3db6b24b120200d649cd4811b4947188ed3a8d2626f7075146c5d178a9a4a" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", + "windows-core 0.62.1", + "windows-link 0.2.0", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.59.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", @@ -7103,21 +7090,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] -name = "windows-result" -version = "0.1.2" +name = "windows-numerics" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8" dependencies = [ - "windows-targets 0.52.6", + "windows-core 0.62.1", + "windows-link 0.2.0", ] [[package]] name = "windows-result" -version = "0.3.4" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-link 0.1.3", + "windows-targets 0.52.6", ] [[package]] @@ -7129,15 +7117,6 @@ dependencies = [ "windows-link 0.2.0", ] -[[package]] -name = "windows-strings" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows-strings" version = "0.5.0" @@ -7240,6 +7219,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118" +dependencies = [ + "windows-link 0.2.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" diff --git a/Cargo.toml b/Cargo.toml index 3d28aaa195e..1ad40d96a4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,48 +93,48 @@ libafl_jumper = { path = "./utils/libafl_jumper", version = "0.15.4", default-fe # External deps ahash = { version = "0.8.12", default-features = false } # The hash function already used in hashbrown -arbitrary-int = "1.2.7" # arbitrary sized integers, useful in combination with bitfields (bitbybit crate) +arbitrary-int = "2.0.0" # arbitrary sized integers, useful in combination with bitfields (bitbybit crate) backtrace = { version = "0.3.74", default-features = false } # Used to get the stacktrace in StacktraceObserver bindgen = "0.72.1" bitbybit = "1.4.0" # bitfields, use this for bit fields and bit enums capstone = "0.13.0" # Disassembler used in libafl_unicorn to provide disassembly on crash -clap = "4.5.45" -cc = "1.1.21" -cmake = "0.1.51" -document-features = "0.2.10" +clap = "4.5.48" +cc = "1.2.40" +cmake = "0.1.54" +document-features = "0.2.11" fastbloom = { version = "0.14.0", default-features = false } -hashbrown = { version = "0.14.5", default-features = false } # A faster hashmap, nostd compatible +hashbrown = { version = "0.16.0", default-features = false } # A faster hashmap, nostd compatible just = "=1.40.0" libc = "0.2.159" # For (*nix) libc libipt = { version = "0.4.0", features = ["libipt_master"] } -log = "0.4.22" +log = "0.4.28" meminterval = "0.4.2" mimalloc = { version = "0.1.48", default-features = false } nix = { version = "0.30.1", default-features = false } -num_enum = { version = "0.7.3", default-features = false } +num_enum = { version = "0.7.4", default-features = false } num-traits = { version = "0.2.19", default-features = false } paste = "1.0.15" -postcard = { version = "1.0.10", features = [ +postcard = { version = "1.1.3", features = [ "alloc", ], default-features = false } # no_std compatible serde serialization format -pyo3 = { version = "0.24.1", features = ["auto-initialize"] } -pyo3-build-config = "0.25.0" -rangemap = "1.5.1" -regex = "1.10.6" +pyo3 = { version = "0.26.0", features = ["auto-initialize"] } +pyo3-build-config = "0.26.0" +rangemap = "1.6.0" +regex = "1.11.3" rustversion = "1.0.22" -serde = { version = "1.0.210", default-features = false } # serialization lib +serde = { version = "1.0.228", default-features = false } # serialization lib serial_test = { version = "3.2.0", default-features = false } -serde_json = { version = "1.0.128", default-features = false } +serde_json = { version = "1.0.145", default-features = false } serde_yaml = { version = "0.9.34" } # For parsing the injections yaml file static_assertions = "1.1.0" -strum = "0.27.0" -strum_macros = "0.27.0" -toml = "0.9.0" # For parsing the injections toml file -typed-builder = "0.21.2" # Implement the builder pattern at compiletime -typeid = "1.0.0" # Safe type_eq that doesn't rely on std specialization -uuid = { version = "1.18.0", features = ["serde", "v4"] } +strum = "0.27.2" +strum_macros = "0.27.2" +toml = "0.9.7" # For parsing the injections toml file +typed-builder = "0.22.0" # Implement the builder pattern at compiletime +typeid = "1.0.3" # Safe type_eq that doesn't rely on std specialization +uuid = { version = "1.18.1", features = ["serde", "v4"] } which = "8.0.0" -windows = "0.59.0" +windows = "0.62.1" z3 = { git = "https://github.com/prove-rs/z3.rs", rev = "z3-v0.18.2", default-features = false, features = [ "bundled", ] } diff --git a/crates/libafl/Cargo.toml b/crates/libafl/Cargo.toml index 1649e98dfb0..1e003a444af 100644 --- a/crates/libafl/Cargo.toml +++ b/crates/libafl/Cargo.toml @@ -227,7 +227,7 @@ rustversion = { workspace = true } tuple_list = { version = "0.1.3" } hashbrown = { workspace = true, features = [ "serde", - "ahash", + "default-hasher", ], default-features = false } # A faster hashmap, nostd compatible num-traits = { workspace = true, default-features = false } serde = { workspace = true, features = ["alloc"] } # serialization lib @@ -308,7 +308,7 @@ num_enum = { workspace = true, optional = true } fastbloom = { workspace = true, optional = true } # For Lua Mutators # TODO: macros is not needed/ a temporary fix for docsrs, see -mlua = { version = "0.10.3", features = [ +mlua = { version = "0.11.4", features = [ "lua54", "vendored", "macros", diff --git a/crates/libafl/src/common/nautilus/grammartec/context.rs b/crates/libafl/src/common/nautilus/grammartec/context.rs index 8635ed951ac..f510ba2b35c 100644 --- a/crates/libafl/src/common/nautilus/grammartec/context.rs +++ b/crates/libafl/src/common/nautilus/grammartec/context.rs @@ -6,7 +6,7 @@ use libafl_bolts::{ rands::{Rand, RomuDuoJrRand}, }; #[cfg(feature = "nautilus_py")] -use pyo3::prelude::PyObject; +use pyo3::prelude::{Py, PyAny}; use super::{ newtypes::{NTermId, RuleId}, @@ -85,7 +85,7 @@ impl Context { } #[cfg(feature = "nautilus_py")] - pub fn add_script(&mut self, nt: &str, nts: &[String], script: PyObject) -> RuleId { + pub fn add_script(&mut self, nt: &str, nts: &[String], script: Py) -> RuleId { let rid = self.rules.len().into(); let rule = Rule::from_script(self, nt, nts, script); let ntid = self.aquire_nt_id(nt); diff --git a/crates/libafl/src/common/nautilus/grammartec/python_grammar_loader.rs b/crates/libafl/src/common/nautilus/grammartec/python_grammar_loader.rs index c7288eec602..1cdf474b5a2 100644 --- a/crates/libafl/src/common/nautilus/grammartec/python_grammar_loader.rs +++ b/crates/libafl/src/common/nautilus/grammartec/python_grammar_loader.rs @@ -39,7 +39,7 @@ impl PyContext { } #[expect(clippy::needless_pass_by_value)] - fn script(&mut self, nt: &str, nts: Vec, script: PyObject) { + fn script(&mut self, nt: &str, nts: Vec, script: Py) { self.ctx.add_script(nt, &nts, script); } @@ -58,7 +58,7 @@ fn loader(py: Python, grammar: &str) -> PyResult { /// Create a `NautilusContext` from a python grammar file #[must_use] pub fn load_python_grammar(grammar: &str) -> Context { - Python::with_gil(|py| { + Python::attach(|py| { loader(py, grammar) .map_err(|e| e.print_and_set_sys_last_vars(py)) .expect("failed to parse python grammar") diff --git a/crates/libafl/src/common/nautilus/grammartec/rule.rs b/crates/libafl/src/common/nautilus/grammartec/rule.rs index c825215542e..ff196208ea8 100644 --- a/crates/libafl/src/common/nautilus/grammartec/rule.rs +++ b/crates/libafl/src/common/nautilus/grammartec/rule.rs @@ -3,7 +3,7 @@ use std::sync::OnceLock; use libafl_bolts::rands::Rand; #[cfg(feature = "nautilus_py")] -use pyo3::prelude::{PyObject, Python}; +use pyo3::prelude::{Py, PyAny, Python}; use regex_syntax::hir::Hir; use serde::{Deserialize, Serialize}; @@ -115,7 +115,7 @@ impl RegExpRule { pub struct ScriptRule { pub nonterm: NTermId, pub nonterms: Vec, - pub script: PyObject, + pub script: Py, } #[cfg(feature = "nautilus_py")] @@ -155,7 +155,7 @@ impl PlainRule { #[cfg(feature = "nautilus_py")] impl Clone for ScriptRule { fn clone(&self) -> Self { - Python::with_gil(|py| ScriptRule { + Python::attach(|py| ScriptRule { nonterm: self.nonterm, nonterms: self.nonterms.clone(), script: self.script.clone_ref(py), @@ -169,7 +169,7 @@ impl Rule { ctx: &mut Context, nonterm: &str, nterms: &[String], - script: PyObject, + script: Py, ) -> Self { Self::Script(ScriptRule { nonterm: ctx.aquire_nt_id(nonterm), diff --git a/crates/libafl/src/common/nautilus/grammartec/tree.rs b/crates/libafl/src/common/nautilus/grammartec/tree.rs index 795a37039c2..cfb608c0958 100644 --- a/crates/libafl/src/common/nautilus/grammartec/tree.rs +++ b/crates/libafl/src/common/nautilus/grammartec/tree.rs @@ -7,7 +7,7 @@ use libafl_bolts::rands::Rand; #[cfg(feature = "nautilus_py")] use pyo3::{ PyTypeInfo, - prelude::{PyObject, PyResult, Python}, + prelude::{Py, PyAny, PyResult, Python}, types::{PyAnyMethods, PyBytes, PyBytesMethods, PyString, PyStringMethods, PyTuple}, }; use serde::{Deserialize, Serialize}; @@ -26,7 +26,7 @@ enum UnparseStep<'dat> { Term(&'dat [u8]), Nonterm(NTermId), #[cfg(feature = "nautilus_py")] - Script(usize, PyObject), + Script(usize, Py), #[cfg(feature = "nautilus_py")] PushBuffer(), } @@ -82,8 +82,8 @@ impl<'data, 'tree: 'data, 'ctx: 'data, W: Write, T: TreeLike> Unparser<'data, 't } #[cfg(feature = "nautilus_py")] - fn unwrap_script(&mut self, num: usize, expr: &PyObject) { - Python::with_gil(|py| { + fn unwrap_script(&mut self, num: usize, expr: &Py) { + Python::attach(|py| { self.script(py, num, expr) .map_err(|e| e.print_and_set_sys_last_vars(py)) .unwrap(); @@ -91,7 +91,7 @@ impl<'data, 'tree: 'data, 'ctx: 'data, W: Write, T: TreeLike> Unparser<'data, 't } #[cfg(feature = "nautilus_py")] - fn script(&mut self, py: Python, num: usize, expr: &PyObject) -> PyResult<()> { + fn script(&mut self, py: Python, num: usize, expr: &Py) -> PyResult<()> { let bufs = self.buffers.split_off(self.buffers.len() - num); let bufs = bufs.into_iter().map(Cursor::into_inner).collect::>(); let byte_arrays = bufs.iter().map(|b| PyBytes::new(py, b)); @@ -141,7 +141,7 @@ impl<'data, 'tree: 'data, 'ctx: 'data, W: Write, T: TreeLike> Unparser<'data, 't #[cfg(feature = "nautilus_py")] fn next_script(&mut self, r: &ScriptRule) { - Python::with_gil(|py| { + Python::attach(|py| { self.stack.push(UnparseStep::Script( r.nonterms.len(), r.script.clone_ref(py), diff --git a/crates/libafl_asan/Cargo.toml b/crates/libafl_asan/Cargo.toml index c7f1b2d4e11..f3eb1ae6052 100644 --- a/crates/libafl_asan/Cargo.toml +++ b/crates/libafl_asan/Cargo.toml @@ -64,7 +64,7 @@ baby-mimalloc = { version = "0.2.1", default-features = false, features = [ "spin_mutex", ], optional = true } bitflags = { version = "2.8.0", default-features = false } -document-features = { version = "0.2.11", optional = true } +document-features = { workspace = true, optional = true } dlmalloc = { version = "0.2.11", default-features = false, optional = true } itertools = { version = "0.14.0", default-features = false } log = { version = "0.4.22", default-features = false, features = [ @@ -90,8 +90,8 @@ spin = { version = "0.10.0", default-features = false, features = [ ] } syscalls = { version = "0.7.0", default-features = false, optional = true } thiserror = { version = "2.0.16", default-features = false } -ahash = { version = "0.8.12", default-features = false } -hashbrown = { version = "0.15.3", default-features = false } +ahash = { workspace = true, default-features = false } +hashbrown = { workspace = true, default-features = false } [build-dependencies] cc = { version = "1.2.13" } diff --git a/crates/libafl_bolts/Cargo.toml b/crates/libafl_bolts/Cargo.toml index 36dd2835e73..6345418d9ea 100644 --- a/crates/libafl_bolts/Cargo.toml +++ b/crates/libafl_bolts/Cargo.toml @@ -129,7 +129,7 @@ rustversion = { workspace = true } [dev-dependencies] clap = { version = "4.5", features = ["derive", "env"] } rand = "0.9.0" -chrono = "0.4.40" +chrono = "0.4.42" itertools = "0.14.0" [dependencies] @@ -140,7 +140,8 @@ typeid = { workspace = true } tuple_list = { version = "0.1.3" } hashbrown = { workspace = true, features = [ "serde", - "ahash", + "default-hasher", + "raw-entry", ], default-features = false, optional = true } # A faster hashmap, nostd compatible xxhash-rust = { version = "0.8.12", features = [ "xxh3", @@ -211,7 +212,7 @@ winapi = { version = "0.3", features = [ "winbase", "winnt", ] } -windows-result = "0.3.0" +windows-result = "0.4.0" [target.'cfg(windows)'.build-dependencies] windows = { workspace = true } diff --git a/crates/libafl_bolts/src/lib.rs b/crates/libafl_bolts/src/lib.rs index 27268dac104..c5694218e59 100644 --- a/crates/libafl_bolts/src/lib.rs +++ b/crates/libafl_bolts/src/lib.rs @@ -696,7 +696,7 @@ impl From for Error { #[cfg(feature = "python")] impl From for Error { fn from(err: pyo3::PyErr) -> Self { - pyo3::Python::with_gil(|py| { + pyo3::Python::attach(|py| { if err .matches( py, @@ -1472,7 +1472,7 @@ pub mod pybind { match &mut $wrapper { $( $wrapper_type::$wrapper_option(py_wrapper) => { - Python::with_gil(|py| -> PyResult<_> { + Python::attach(|py| -> PyResult<_> { let mut borrowed = py_wrapper.borrow_mut(py); let $name = &mut borrowed.inner; Ok($body) diff --git a/crates/libafl_bolts/src/serdeany.rs b/crates/libafl_bolts/src/serdeany.rs index 0c712f54fd4..ed78bccf1d6 100644 --- a/crates/libafl_bolts/src/serdeany.rs +++ b/crates/libafl_bolts/src/serdeany.rs @@ -118,11 +118,12 @@ pub mod serdeany_registry { boxed::Box, string::{String, ToString}, }; - use core::{any::TypeId, fmt, hash::BuildHasherDefault}; + use core::{any::TypeId, fmt}; use hashbrown::{ HashMap, hash_map::{Values, ValuesMut}, + DefaultHashBuilder, }; use serde::{Deserialize, Serialize, de}; @@ -373,7 +374,7 @@ pub mod serdeany_registry { '_, TypeRepr, Box, - BuildHasherDefault, + DefaultHashBuilder, > where T: crate::serdeany::SerdeAny, @@ -701,7 +702,7 @@ pub mod serdeany_registry { '_, String, Box, - BuildHasherDefault, + DefaultHashBuilder, > where T: crate::serdeany::SerdeAny, @@ -719,7 +720,7 @@ pub mod serdeany_registry { '_, String, Box, - BuildHasherDefault, + DefaultHashBuilder, > where T: crate::serdeany::SerdeAny, diff --git a/crates/libafl_bolts/src/tuples.rs b/crates/libafl_bolts/src/tuples.rs index 716b8c3a94b..459d8f520b6 100644 --- a/crates/libafl_bolts/src/tuples.rs +++ b/crates/libafl_bolts/src/tuples.rs @@ -1300,6 +1300,7 @@ mod test { #[expect(clippy::let_unit_value)] let recovered = tuple.get_all(tuple_list!()); #[allow(clippy::unit_cmp)] + // needs its own scope to make the clippy expect work { assert_eq!(recovered, ()); } @@ -1346,6 +1347,7 @@ mod test { #[expect(clippy::let_unit_value)] let recovered = tuple.get_all_mut(tuple_list!()); #[allow(clippy::unit_cmp)] + // needs its own scope to make the clippy expect work { assert_eq!(recovered, tuple_list!()); } diff --git a/crates/libafl_intelpt/src/linux.rs b/crates/libafl_intelpt/src/linux.rs index e9045ce8e01..15e05bf2778 100644 --- a/crates/libafl_intelpt/src/linux.rs +++ b/crates/libafl_intelpt/src/linux.rs @@ -805,7 +805,7 @@ fn current_cpu() -> Option { #[cfg(test)] mod test { - use arbitrary_int::Number; + use arbitrary_int::prelude::*; use super::*; #[test] diff --git a/crates/libafl_libfuzzer/runtime/Cargo.toml.template b/crates/libafl_libfuzzer/runtime/Cargo.toml.template index 09f8ff2d52d..a0cc57a5f73 100644 --- a/crates/libafl_libfuzzer/runtime/Cargo.toml.template +++ b/crates/libafl_libfuzzer/runtime/Cargo.toml.template @@ -76,7 +76,7 @@ rand = "0.8.5" serde = { version = "1.0.210", default-features = true, features = [ "derive", ] } # serialization lib -hashbrown = { version = "0.14.5", default-features = true } +hashbrown = { version = "0.16.0", default-features = true, features = ["serde"] } # for identifying if we can grimoire-ify utf8-chars = "3.0.4" From 4aa95cb5902d386a566d92c4888c062b26b7cb93 Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Mon, 6 Oct 2025 16:33:28 +0200 Subject: [PATCH 02/10] cleaning up --- Cargo.lock | 5 -- crates/libafl_qemu/Cargo.toml | 3 -- .../libafl_qemu/libafl_qemu_build/Cargo.toml | 2 - .../src/bindings/x86_64_stub_bindings.rs | 6 +-- .../libafl_qemu/libvharness_sys/src/stub.rs | 54 ++++++++----------- 5 files changed, 24 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b141adc4548..3d377a0cedd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3366,10 +3366,8 @@ name = "libafl_qemu" version = "0.15.4" dependencies = [ "addr2line", - "bindgen 0.72.1", "bytes-utils", "capstone", - "cc", "document-features", "enum-map", "getset", @@ -3380,7 +3378,6 @@ dependencies = [ "libafl_bolts", "libafl_derive", "libafl_intelpt", - "libafl_qemu_build", "libafl_qemu_sys", "libafl_targets", "libc", @@ -3412,8 +3409,6 @@ dependencies = [ "bindgen 0.72.1", "cc", "json", - "pkg-config", - "regex", "rustc_version 0.4.1", "rustversion", "shell-words", diff --git a/crates/libafl_qemu/Cargo.toml b/crates/libafl_qemu/Cargo.toml index aa7828bdbe6..6e61284a64b 100644 --- a/crates/libafl_qemu/Cargo.toml +++ b/crates/libafl_qemu/Cargo.toml @@ -154,11 +154,8 @@ libvharness_sys = { workspace = true } document-features = { workspace = true, optional = true } [build-dependencies] -libafl_qemu_build = { workspace = true, default-features = true } pyo3-build-config = { workspace = true, optional = true } rustversion = { workspace = true } -bindgen = { workspace = true } -cc = { workspace = true } just = { workspace = true } [lib] diff --git a/crates/libafl_qemu/libafl_qemu_build/Cargo.toml b/crates/libafl_qemu/libafl_qemu_build/Cargo.toml index 759b8c8f2ac..9005504424d 100644 --- a/crates/libafl_qemu/libafl_qemu_build/Cargo.toml +++ b/crates/libafl_qemu/libafl_qemu_build/Cargo.toml @@ -39,9 +39,7 @@ bindgen = { workspace = true } which = { workspace = true } json = "0.12.4" shell-words = "1.1.0" -pkg-config = "0.3.31" cc = { workspace = true } -regex = { workspace = true } rustversion = { workspace = true } rustc_version = "0.4.1" diff --git a/crates/libafl_qemu/libafl_qemu_sys/src/bindings/x86_64_stub_bindings.rs b/crates/libafl_qemu/libafl_qemu_sys/src/bindings/x86_64_stub_bindings.rs index 7dfec665860..b24fbd3b398 100644 --- a/crates/libafl_qemu/libafl_qemu_sys/src/bindings/x86_64_stub_bindings.rs +++ b/crates/libafl_qemu/libafl_qemu_sys/src/bindings/x86_64_stub_bindings.rs @@ -1,6 +1,6 @@ -/* 1.91.0-nightly */ -/* qemu git hash: f4f85db0e69df08b5dce208a8d4c58cfe68f1a80 */ -/* automatically generated by rust-bindgen 0.72.0 */ +/* 1.92.0-nightly */ +/* qemu git hash: b6884369419cd439c7133ef7fada4c336354a0c3 */ +/* automatically generated by rust-bindgen 0.72.1 */ use libc::siginfo_t; diff --git a/crates/libafl_qemu/libvharness_sys/src/stub.rs b/crates/libafl_qemu/libvharness_sys/src/stub.rs index 912da449e9e..d0e00fd8ace 100644 --- a/crates/libafl_qemu/libvharness_sys/src/stub.rs +++ b/crates/libafl_qemu/libvharness_sys/src/stub.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.72.0 */ +/* automatically generated by rust-bindgen 0.72.1 */ #[repr(C)] #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] @@ -142,7 +142,7 @@ pub struct __BindgenComplex { pub re: T, pub im: T, } -pub const LQEMU_WORD_SIZE: u32 = 64; +pub const VHARNESS_WORD_SIZE: u32 = 64; pub const __bool_true_false_are_defined: u32 = 1; pub const true_: u32 = 1; pub const false_: u32 = 0; @@ -938,7 +938,7 @@ unsafe extern "C" { ... ) -> ::std::os::raw::c_int; } -pub type __cfloat128 = __BindgenComplex; +pub type __cfloat128 = __BindgenComplex; pub type _Float128 = u128; pub type _Float32 = f32; pub type _Float64 = f64; @@ -1204,7 +1204,7 @@ unsafe extern "C" { unsafe extern "C" { pub fn __overflow(arg1: *mut FILE, arg2: ::std::os::raw::c_int) -> ::std::os::raw::c_int; } -pub type lqword = u64; +pub type vword = u64; pub const lqemu_map_kind_LQEMU_MAP_COV: lqemu_map_kind = lqemu_map_kind(0); pub const lqemu_map_kind_LQEMU_MAP_CMP: lqemu_map_kind = lqemu_map_kind(1); impl ::std::ops::BitOr for lqemu_map_kind { @@ -1272,8 +1272,8 @@ pub struct lqemu_addr_kind(pub ::std::os::raw::c_uint); pub struct lqemu_map { pub map_kind: lqemu_map_kind, pub addr_kind: lqemu_addr_kind, - pub addr: lqword, - pub len: lqword, + pub addr: vword, + pub len: vword, pub is_physically_contiguous: bool, } #[allow(clippy::unnecessary_operation, clippy::identity_op)] @@ -1375,46 +1375,34 @@ impl ::std::ops::BitAndAssign for LibaflQemuCommand { pub struct LibaflQemuCommand(pub ::std::os::raw::c_uint); pub use self::LibaflQemuCommand as LibaflExit; unsafe extern "C" { - pub fn _lqemu_custom_insn_call0(cmd: lqword) -> lqword; + pub fn _lqemu_custom_insn_call0(cmd: vword) -> vword; } unsafe extern "C" { - pub fn _lqemu_custom_insn_call1(cmd: lqword, arg1: lqword) -> lqword; + pub fn _lqemu_custom_insn_call1(cmd: vword, arg1: vword) -> vword; } unsafe extern "C" { - pub fn _lqemu_custom_insn_call2(cmd: lqword, arg1: lqword, arg2: lqword) -> lqword; + pub fn _lqemu_custom_insn_call2(cmd: vword, arg1: vword, arg2: vword) -> vword; } unsafe extern "C" { - pub fn _lqemu_backdoor_call0(cmd: lqword) -> lqword; + pub fn _lqemu_backdoor_call0(cmd: vword) -> vword; } unsafe extern "C" { - pub fn _lqemu_backdoor_call1(cmd: lqword, arg1: lqword) -> lqword; + pub fn _lqemu_backdoor_call1(cmd: vword, arg1: vword) -> vword; } unsafe extern "C" { - pub fn _lqemu_backdoor_call2(cmd: lqword, arg1: lqword, arg2: lqword) -> lqword; + pub fn _lqemu_backdoor_call2(cmd: vword, arg1: vword, arg2: vword) -> vword; } unsafe extern "C" { - pub fn libafl_qemu_start_virt( - buf_vaddr: *mut ::std::os::raw::c_void, - max_len: lqword, - ) -> lqword; + pub fn libafl_qemu_start_virt(buf_vaddr: *mut ::std::os::raw::c_void, max_len: vword) -> vword; } unsafe extern "C" { - pub fn libafl_qemu_start_phys( - buf_paddr: *mut ::std::os::raw::c_void, - max_len: lqword, - ) -> lqword; + pub fn libafl_qemu_start_phys(buf_paddr: *mut ::std::os::raw::c_void, max_len: vword) -> vword; } unsafe extern "C" { - pub fn libafl_qemu_input_virt( - buf_vaddr: *mut ::std::os::raw::c_void, - max_len: lqword, - ) -> lqword; + pub fn libafl_qemu_input_virt(buf_vaddr: *mut ::std::os::raw::c_void, max_len: vword) -> vword; } unsafe extern "C" { - pub fn libafl_qemu_input_phys( - buf_paddr: *mut ::std::os::raw::c_void, - max_len: lqword, - ) -> lqword; + pub fn libafl_qemu_input_phys(buf_paddr: *mut ::std::os::raw::c_void, max_len: vword) -> vword; } unsafe extern "C" { pub fn libafl_qemu_end(status: LibaflQemuEndStatus); @@ -1426,7 +1414,7 @@ unsafe extern "C" { pub fn libafl_qemu_load(); } unsafe extern "C" { - pub fn libafl_qemu_version() -> lqword; + pub fn libafl_qemu_version() -> vword; } unsafe extern "C" { pub fn libafl_qemu_page_current_allow(); @@ -1438,20 +1426,20 @@ unsafe extern "C" { pub fn libafl_qemu_test(); } unsafe extern "C" { - pub fn libafl_qemu_trace_vaddr_range(start: lqword, end: lqword); + pub fn libafl_qemu_trace_vaddr_range(start: vword, end: vword); } unsafe extern "C" { - pub fn libafl_qemu_trace_vaddr_size(start: lqword, size: lqword); + pub fn libafl_qemu_trace_vaddr_size(start: vword, size: vword); } unsafe extern "C" { pub fn libafl_qemu_set_covmap_virt( vaddr: *mut ::std::os::raw::c_char, - len: lqword, + len: vword, is_physically_contiguous: bool, ); } unsafe extern "C" { - pub fn libafl_qemu_set_covmap_phys(paddr: *mut ::std::os::raw::c_char, len: lqword); + pub fn libafl_qemu_set_covmap_phys(paddr: *mut ::std::os::raw::c_char, len: vword); } unsafe extern "C" { pub fn lqprintf(fmt: *const ::std::os::raw::c_char, ...); From d574e60d85669f0ea32df1afde38d7db0cfcaea4 Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Mon, 6 Oct 2025 16:47:51 +0200 Subject: [PATCH 03/10] fix windows --- Cargo.toml | 1 + crates/libafl_bolts/Cargo.toml | 1 + crates/libafl_bolts/src/os/windows_exceptions.rs | 5 +++-- crates/libafl_bolts/src/serdeany.rs | 10 ++-------- crates/libafl_libfuzzer/runtime/Cargo.toml.template | 4 +++- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1ad40d96a4f..aed14ea569c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -135,6 +135,7 @@ typeid = "1.0.3" # Safe type_eq that doesn't rely on std specialization uuid = { version = "1.18.1", features = ["serde", "v4"] } which = "8.0.0" windows = "0.62.1" +windows-core = "0.62.1" z3 = { git = "https://github.com/prove-rs/z3.rs", rev = "z3-v0.18.2", default-features = false, features = [ "bundled", ] } diff --git a/crates/libafl_bolts/Cargo.toml b/crates/libafl_bolts/Cargo.toml index 6345418d9ea..3c447456195 100644 --- a/crates/libafl_bolts/Cargo.toml +++ b/crates/libafl_bolts/Cargo.toml @@ -203,6 +203,7 @@ windows = { workspace = true, features = [ "Win32_System_SystemInformation", "Win32_System_Console", ] } +windows-core = { workspace = true } once_cell = "1.10.0" winapi = { version = "0.3", features = [ "fileapi", diff --git a/crates/libafl_bolts/src/os/windows_exceptions.rs b/crates/libafl_bolts/src/os/windows_exceptions.rs index 68f1ee7865f..9504348b8fb 100644 --- a/crates/libafl_bolts/src/os/windows_exceptions.rs +++ b/crates/libafl_bolts/src/os/windows_exceptions.rs @@ -12,7 +12,7 @@ use std::os::raw::{c_long, c_void}; use num_enum::FromPrimitive; pub use windows::Win32::{ - Foundation::{BOOL, NTSTATUS}, + Foundation::NTSTATUS, System::{ Console::{CTRL_BREAK_EVENT, CTRL_C_EVENT, PHANDLER_ROUTINE, SetConsoleCtrlHandler}, Diagnostics::Debug::{ @@ -21,6 +21,7 @@ pub use windows::Win32::{ Threading::{IsProcessorFeaturePresent, PROCESSOR_FEATURE_ID}, }, }; +pub use windows_core::BOOL; use crate::Error; @@ -618,7 +619,7 @@ pub(crate) unsafe fn setup_ctrl_handler( compiler_fence(Ordering::SeqCst); // Log the result of SetConsoleCtrlHandler - let result = unsafe { SetConsoleCtrlHandler(Some(Some(ctrl_handler)), true) }; + let result = unsafe { SetConsoleCtrlHandler(Some(ctrl_handler), true) }; match result { Ok(()) => { log::info!("SetConsoleCtrlHandler succeeded"); diff --git a/crates/libafl_bolts/src/serdeany.rs b/crates/libafl_bolts/src/serdeany.rs index ed78bccf1d6..9535c039639 100644 --- a/crates/libafl_bolts/src/serdeany.rs +++ b/crates/libafl_bolts/src/serdeany.rs @@ -121,9 +121,8 @@ pub mod serdeany_registry { use core::{any::TypeId, fmt}; use hashbrown::{ - HashMap, + DefaultHashBuilder, HashMap, hash_map::{Values, ValuesMut}, - DefaultHashBuilder, }; use serde::{Deserialize, Serialize, de}; @@ -698,12 +697,7 @@ pub mod serdeany_registry { fn entry( &mut self, name: String, - ) -> hashbrown::hash_map::Entry< - '_, - String, - Box, - DefaultHashBuilder, - > + ) -> hashbrown::hash_map::Entry<'_, String, Box, DefaultHashBuilder> where T: crate::serdeany::SerdeAny, { diff --git a/crates/libafl_libfuzzer/runtime/Cargo.toml.template b/crates/libafl_libfuzzer/runtime/Cargo.toml.template index a0cc57a5f73..f26330afd52 100644 --- a/crates/libafl_libfuzzer/runtime/Cargo.toml.template +++ b/crates/libafl_libfuzzer/runtime/Cargo.toml.template @@ -76,7 +76,9 @@ rand = "0.8.5" serde = { version = "1.0.210", default-features = true, features = [ "derive", ] } # serialization lib -hashbrown = { version = "0.16.0", default-features = true, features = ["serde"] } +hashbrown = { version = "0.16.0", default-features = true, features = [ + "serde", +] } # for identifying if we can grimoire-ify utf8-chars = "3.0.4" From ce34d2417a74a14f22857f64274038a3b5126f8b Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Mon, 6 Oct 2025 16:49:41 +0200 Subject: [PATCH 04/10] lua --- crates/libafl/src/mutators/lua.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/libafl/src/mutators/lua.rs b/crates/libafl/src/mutators/lua.rs index 224b979fa6d..4251629f32f 100644 --- a/crates/libafl/src/mutators/lua.rs +++ b/crates/libafl/src/mutators/lua.rs @@ -115,7 +115,7 @@ fn create_lua_fn( timeouted_once_cb.set(false); Ok(VmState::Continue) } - }); + })?; } let func = mutator_lua_fn.to_string(); From 108740e6cc69ea8258c8ad8b5b9c41530b83cd8e Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Mon, 6 Oct 2025 16:59:31 +0200 Subject: [PATCH 05/10] fix now --- Cargo.lock | 1 + .../baby_fuzzer_swap_differential/Cargo.lock | 704 ++++++++++-------- .../baby_fuzzer_swap_differential/Cargo.toml | 4 +- 3 files changed, 389 insertions(+), 320 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d377a0cedd..94a92348a30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3247,6 +3247,7 @@ dependencies = [ "uuid", "winapi", "windows 0.62.1", + "windows-core 0.62.1", "windows-result 0.4.0", "xxhash-rust", ] diff --git a/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.lock b/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.lock index edf601d347e..fde3d17cfaa 100644 --- a/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.lock +++ b/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.lock @@ -4,18 +4,18 @@ version = 4 [[package]] name = "addr2line" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "gimli", ] [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "ahash" @@ -46,9 +46,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "arbitrary-int" @@ -56,15 +56,21 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825297538d77367557b912770ca3083f778a196054b3ee63b22673c4a3cae0a5" +[[package]] +name = "arbitrary-int" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c858caffa49edfc4ecc45a4bec37abd3e88041a2903816f10f990b7b41abc281" + [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "baby_fuzzer_swap_differential" -version = "0.15.2" +version = "0.15.4" dependencies = [ "anyhow", "bindgen", @@ -79,9 +85,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.75" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", "cfg-if", @@ -89,23 +95,34 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", + "windows-link 0.2.0", ] [[package]] name = "bincode" -version = "1.3.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" dependencies = [ + "bincode_derive", "serde", + "unty", +] + +[[package]] +name = "bincode_derive" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" +dependencies = [ + "virtue", ] [[package]] name = "bindgen" -version = "0.71.1" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ "bitflags", "cexpr", @@ -123,11 +140,11 @@ dependencies = [ [[package]] name = "bitbybit" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb157f9753a7cddfcf4a4f5fed928fbf4ce1b7b64b6bcc121d7a9f95d698997b" +checksum = "ec187a89ab07e209270175faf9e07ceb2755d984954e58a2296e325ddece2762" dependencies = [ - "arbitrary-int", + "arbitrary-int 1.3.0", "proc-macro2", "quote", "syn", @@ -135,21 +152,21 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.9.1" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" -version = "1.23.0" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" [[package]] name = "cassowary" @@ -159,19 +176,20 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "castaway" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a" dependencies = [ "rustversion", ] [[package]] name = "cc" -version = "1.2.7" +version = "1.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -188,9 +206,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "cfg_aliases" @@ -211,9 +229,12 @@ dependencies = [ [[package]] name = "cobs" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror", +] [[package]] name = "compact_str" @@ -231,9 +252,9 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" dependencies = [ "const_format_proc_macros", ] @@ -251,9 +272,12 @@ dependencies = [ [[package]] name = "const_panic" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2459fc9262a1aa204eb4b5764ad4f189caec88aea9634389c0a25f8be7f6265e" +checksum = "e262cdaac42494e3ae34c43969f9cdeb7da178bdb4b66fa6a1ea2edb4c8ae652" +dependencies = [ + "typewit", +] [[package]] name = "convert_case" @@ -292,7 +316,7 @@ dependencies = [ "document-features", "mio", "parking_lot", - "rustix 1.0.7", + "rustix 1.1.2", "signal-hook", "signal-hook-mio", "winapi", @@ -309,9 +333,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4735f265ba6a1188052ca32d461028a7d1125868be18e287e756019da7607b5" +checksum = "67773048316103656a637612c4a62477603b777d91d9c62ff2290f9cde178fdb" dependencies = [ "ctor-proc-macro", "dtor", @@ -319,9 +343,9 @@ dependencies = [ [[package]] name = "ctor-proc-macro" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d" +checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2" [[package]] name = "darling" @@ -390,18 +414,18 @@ dependencies = [ [[package]] name = "dtor" -version = "0.0.6" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8" +checksum = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934" dependencies = [ "dtor-proc-macro", ] [[package]] name = "dtor-proc-macro" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055" +checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5" [[package]] name = "either" @@ -435,35 +459,42 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "erased-serde" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7" +checksum = "259d404d09818dec19332e31d94558aeb442fea04c817006456c24b5460bbd4b" dependencies = [ "serde", + "serde_core", "typeid", ] [[package]] name = "errno" -version = "0.3.12" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.1", ] [[package]] name = "fastbloom" -version = "0.9.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27cea6e7f512d43b098939ff4d5a5d6fe3db07971e1d05176fe26c642d33f5b8" +checksum = "18c1ddb9231d8554c2d6bdf4cfaabf0c59251658c68b6c95cd52dd0c513a912a" dependencies = [ "getrandom", + "libm", "siphasher", - "wide 0.7.32 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" + [[package]] name = "fnv" version = "1.0.7" @@ -476,6 +507,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "fs2" version = "0.4.3" @@ -495,41 +532,42 @@ dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasi 0.14.7+wasi-0.2.4", ] [[package]] name = "gimli" -version = "0.31.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "ahash", "allocator-api2", - "serde", + "equivalent", + "foldhash 0.1.5", ] [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.2.0", + "serde", ] [[package]] @@ -546,7 +584,7 @@ checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -563,9 +601,9 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" [[package]] name = "instability" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf9fed6d91cfb734e7476a06bde8300a1b94e217e1b523b6f0cd1a01998c71d" +checksum = "435d80800b936787d62688c927b6490e887c7ef5ff9ce922c6c6050fca75eb9a" dependencies = [ "darling", "indoc", @@ -591,9 +629,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jobserver" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ "getrandom", "libc", @@ -601,9 +639,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -611,10 +649,10 @@ dependencies = [ [[package]] name = "libafl" -version = "0.15.2" +version = "0.15.4" dependencies = [ "ahash", - "arbitrary-int", + "arbitrary-int 2.0.0", "backtrace", "bincode", "bitbybit", @@ -623,7 +661,7 @@ dependencies = [ "crossterm 0.29.0", "fastbloom", "fs2", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl_bolts", "libafl_derive", "libc", @@ -649,15 +687,16 @@ dependencies = [ [[package]] name = "libafl_bolts" -version = "0.15.2" +version = "0.15.4" dependencies = [ "ahash", "backtrace", "ctor", "erased-serde", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "hostname", "libafl_derive", + "libafl_wide", "libc", "log", "mach2", @@ -675,16 +714,16 @@ dependencies = [ "typeid", "uds", "uuid", - "wide 0.7.32 (git+https://github.com/Lokathor/wide?rev=71b5df0b2620da753836fafce5f99076181a49fe)", "winapi", "windows", + "windows-core", "windows-result", "xxhash-rust", ] [[package]] name = "libafl_cc" -version = "0.15.2" +version = "0.15.4" dependencies = [ "cc", "glob", @@ -694,7 +733,7 @@ dependencies = [ [[package]] name = "libafl_derive" -version = "0.15.2" +version = "0.15.4" dependencies = [ "proc-macro2", "quote", @@ -703,11 +742,11 @@ dependencies = [ [[package]] name = "libafl_targets" -version = "0.15.2" +version = "0.15.4" dependencies = [ "bindgen", "cc", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl", "libafl_bolts", "libc", @@ -719,20 +758,30 @@ dependencies = [ "serde", ] +[[package]] +name = "libafl_wide" +version = "0.7.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2f28d525f6e361b6cd55c0da5347027860a902d638d15194c16dc2f39a5ba9f" +dependencies = [ + "bytemuck", + "safe_arch", +] + [[package]] name = "libc" -version = "0.2.172" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libloading" -version = "0.8.7" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets 0.53.0", + "windows-link 0.2.0", ] [[package]] @@ -743,9 +792,9 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libmimalloc-sys" -version = "0.1.42" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9d6fac27761dabcd4ee73571cdb06b7022dc99089acbe5435691edffaac0f4" +checksum = "667f4fec20f29dfc6bc7357c582d91796c169ad7e2fce709468aefeb2c099870" dependencies = [ "cc", "libc", @@ -759,31 +808,30 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litrs" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" +checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[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 = "lru" @@ -791,29 +839,29 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.3", + "hashbrown 0.15.5", ] [[package]] name = "mach2" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea" dependencies = [ "libc", ] [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "meminterval" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f8614cf855d251be1c2138d330c04f134923fddec0dcfc8b6f58ac499bf248" +checksum = "8e0f9a537564310a87dc77d5c88a407e27dd0aa740e070f0549439cfcc68fcfd" dependencies = [ "num-traits", "serde", @@ -830,9 +878,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.46" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995942f432bbb4822a7e9c3faa87a695185b0d09273ba85f097b54f4e458f2af" +checksum = "e1ee66a4b64c74f4ef288bcbb9192ad9c3feaad75193129ac8509af543894fd8" dependencies = [ "libmimalloc-sys", ] @@ -845,30 +893,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", ] [[package]] name = "nix" -version = "0.29.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ "bitflags", "cfg-if", @@ -898,18 +946,19 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ "proc-macro2", "quote", @@ -918,9 +967,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] @@ -933,9 +982,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -943,15 +992,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.6", + "windows-link 0.2.0", ] [[package]] @@ -962,9 +1011,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "postcard" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -974,9 +1023,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.32" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", "syn", @@ -984,27 +1033,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand_core" @@ -1014,9 +1063,9 @@ checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" [[package]] name = "rangemap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" [[package]] name = "ratatui" @@ -1041,18 +1090,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.12" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -1062,9 +1111,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -1073,15 +1122,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustc-hash" @@ -1104,22 +1153,22 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.7" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ "bitflags", "errno", "libc", - "linux-raw-sys 0.9.4", - "windows-sys 0.59.0", + "linux-raw-sys 0.11.0", + "windows-sys 0.61.1", ] [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" @@ -1138,9 +1187,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22b2d775fb28f245817589471dd49c5edf64237f4a19d10ce9a92ff4651a27f4" +checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" dependencies = [ "sdd", ] @@ -1153,24 +1202,34 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sdd" -version = "3.0.8" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21" +checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1179,14 +1238,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1242,9 +1302,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.5" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" dependencies = [ "libc", ] @@ -1257,9 +1317,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "static_assertions" @@ -1297,15 +1357,35 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.101" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "thiserror" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tuple_list" version = "0.1.3" @@ -1314,18 +1394,18 @@ checksum = "141fb9f71ee586d956d7d6e4d5a9ef8e946061188520140f7591b668841d502e" [[package]] name = "typed-builder" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce63bcaf7e9806c206f7d7b9c1f38e0dce8bb165a80af0898161058b19248534" +checksum = "398a3a3c918c96de527dc11e6e846cd549d4508030b8a33e1da12789c856b81a" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d8d828da2a3d759d3519cdf29a5bac49c77d039ad36d0782edadbf9cd5415b" +checksum = "0e48cea23f68d1f78eb7bc092881b6bb88d3d6b5b7e6234f6f9c911da1ffb221" dependencies = [ "proc-macro2", "quote", @@ -1338,6 +1418,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" +[[package]] +name = "typewit" +version = "1.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c1ae7cc0fdb8b842d65d127cb981574b0d2b249b74d1c7a2986863dc134f71" + [[package]] name = "uds" version = "0.4.2" @@ -1349,9 +1435,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-segmentation" @@ -1388,11 +1474,17 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "unty" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" + [[package]] name = "uuid" -version = "1.17.0" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ "getrandom", "js-sys", @@ -1406,6 +1498,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "virtue" +version = "0.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" + [[package]] name = "wait-timeout" version = "0.2.1" @@ -1417,36 +1515,46 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.14.2+wasi-0.2.4" +version = "0.14.7+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" dependencies = [ - "wit-bindgen-rt", + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", @@ -1458,9 +1566,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1468,9 +1576,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -1481,44 +1589,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] [[package]] name = "which" -version = "7.0.3" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" +checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d" dependencies = [ - "either", "env_home", - "rustix 1.0.7", + "rustix 1.1.2", "winsafe", ] -[[package]] -name = "wide" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b5576b9a81633f3e8df296ce0063042a73507636cbe956c61133dd7034ab22" -dependencies = [ - "bytemuck", - "safe_arch", -] - -[[package]] -name = "wide" -version = "0.7.32" -source = "git+https://github.com/Lokathor/wide?rev=71b5df0b2620da753836fafce5f99076181a49fe#71b5df0b2620da753836fafce5f99076181a49fe" -dependencies = [ - "bytemuck", - "safe_arch", -] - [[package]] name = "winapi" version = "0.3.9" @@ -1543,32 +1631,54 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.59.0" +version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +checksum = "49e6c4a1f363c8210c6f77ba24f645c61c6fb941eccf013da691f7e09515b8ac" +dependencies = [ + "windows-collections", + "windows-core", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "123e712f464a8a60ce1a13f4c446d2d43ab06464cb5842ff68f5c71b6fb7852e" dependencies = [ "windows-core", - "windows-targets 0.53.0", ] [[package]] name = "windows-core" -version = "0.59.0" +version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" +checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" dependencies = [ "windows-implement", "windows-interface", + "windows-link 0.2.0", "windows-result", "windows-strings", - "windows-targets 0.53.0", +] + +[[package]] +name = "windows-future" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f3db6b24b120200d649cd4811b4947188ed3a8d2626f7075146c5d178a9a4a" +dependencies = [ + "windows-core", + "windows-link 0.2.0", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.59.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0" dependencies = [ "proc-macro2", "quote", @@ -1577,9 +1687,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5" dependencies = [ "proc-macro2", "quote", @@ -1588,44 +1698,60 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.1" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" + +[[package]] +name = "windows-numerics" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8" +dependencies = [ + "windows-core", + "windows-link 0.2.0", +] [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" dependencies = [ - "windows-link", + "windows-link 0.2.0", ] [[package]] name = "windows-strings" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" dependencies = [ - "windows-link", + "windows-link 0.2.0", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" dependencies = [ - "windows-targets 0.52.6", + "windows-link 0.2.0", ] [[package]] @@ -1634,30 +1760,23 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] -name = "windows-targets" -version = "0.53.0" +name = "windows-threading" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +checksum = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118" dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link 0.2.0", ] [[package]] @@ -1666,96 +1785,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - [[package]] name = "winsafe" version = "0.0.19" @@ -1763,13 +1834,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "xxhash-rust" @@ -1779,18 +1847,18 @@ checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" [[package]] name = "zerocopy" -version = "0.8.25" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.25" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", diff --git a/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml b/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml index 01d0abb6659..dfd346f1bdf 100644 --- a/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml @@ -21,8 +21,8 @@ debug = true [build-dependencies] anyhow = "1.0.89" -bindgen = "0.71.1" -cc = "=1.2.7" # fix me later +bindgen = "0.72.1" +cc = "1.2.40" [dependencies] libafl = { path = "../../../crates/libafl", features = ["tui_monitor"] } From 31805bb1c514119531acc7d8c6d091cd8dcb487d Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Mon, 6 Oct 2025 17:00:15 +0200 Subject: [PATCH 06/10] update bindings --- bindings/pylibafl/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/pylibafl/Cargo.toml b/bindings/pylibafl/Cargo.toml index a331285b3ad..9632df17e8f 100644 --- a/bindings/pylibafl/Cargo.toml +++ b/bindings/pylibafl/Cargo.toml @@ -9,8 +9,8 @@ edition = "2024" categories = ["development-tools::testing", "emulators", "embedded", "os"] [dependencies] -pyo3 = { version = "0.24.0", features = ["extension-module"] } -pyo3-log = { version = "0.12.2" } +pyo3 = { version = "0.26.0", features = ["extension-module"] } +pyo3-log = { version = "0.13.1" } libafl_sugar = { path = "../../crates/libafl_sugar", version = "0.15.4", features = [ "python", ] } @@ -24,7 +24,7 @@ libafl_qemu = { path = "../../crates/libafl_qemu", version = "0.15.4", features ] } [build-dependencies] -pyo3-build-config = "0.24.0" +pyo3-build-config = "0.26.0" [lib] name = "pylibafl" From eb8605919c810d95412e385cd89e64cc97f95ed1 Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Mon, 6 Oct 2025 17:01:56 +0200 Subject: [PATCH 07/10] lua --- crates/libafl/src/mutators/lua.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/libafl/src/mutators/lua.rs b/crates/libafl/src/mutators/lua.rs index 4251629f32f..9822d7f26b0 100644 --- a/crates/libafl/src/mutators/lua.rs +++ b/crates/libafl/src/mutators/lua.rs @@ -115,7 +115,7 @@ fn create_lua_fn( timeouted_once_cb.set(false); Ok(VmState::Continue) } - })?; + }).unwrap(); } let func = mutator_lua_fn.to_string(); From 1a5ed1063fa72b11985a4d42f9e098406f7f118d Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Mon, 6 Oct 2025 17:09:38 +0200 Subject: [PATCH 08/10] fmt --- crates/libafl/src/mutators/lua.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/libafl/src/mutators/lua.rs b/crates/libafl/src/mutators/lua.rs index 9822d7f26b0..a328982c0cc 100644 --- a/crates/libafl/src/mutators/lua.rs +++ b/crates/libafl/src/mutators/lua.rs @@ -115,7 +115,8 @@ fn create_lua_fn( timeouted_once_cb.set(false); Ok(VmState::Continue) } - }).unwrap(); + }) + .unwrap(); } let func = mutator_lua_fn.to_string(); From 45ee07a57f64606774aea99b8e01ccdcdac96357 Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Tue, 7 Oct 2025 09:28:32 +0200 Subject: [PATCH 09/10] fix deprecated pyo3 --- crates/libafl_qemu/src/qemu/mod.rs | 6 +- crates/libafl_qemu/src/qemu/usermode.rs | 10 +- crates/libafl_sugar/src/inprocess.rs | 4 +- crates/libafl_sugar/src/qemu.rs | 4 +- fuzzers/binary_only/qemu_launcher/Cargo.lock | 290 +++++++++++------- fuzzers/full_system/qemu_baremetal/Cargo.lock | 246 +++++++++------ .../full_system/qemu_linux_process/Cargo.lock | 246 +++++++++------ 7 files changed, 511 insertions(+), 295 deletions(-) diff --git a/crates/libafl_qemu/src/qemu/mod.rs b/crates/libafl_qemu/src/qemu/mod.rs index d58e302316a..23ddc64ddf8 100644 --- a/crates/libafl_qemu/src/qemu/mod.rs +++ b/crates/libafl_qemu/src/qemu/mod.rs @@ -1305,14 +1305,14 @@ pub mod pybind { pub use super::usermode::pybind::*; use super::{GuestAddr, GuestUsize}; - static mut PY_GENERIC_HOOKS: Vec<(GuestAddr, PyObject)> = vec![]; + static mut PY_GENERIC_HOOKS: Vec<(GuestAddr, Py)> = vec![]; extern "C" fn py_generic_hook_wrapper(idx: u64, _pc: GuestAddr) { let obj = unsafe { let hooks = &raw mut PY_GENERIC_HOOKS; &(&(*hooks))[idx as usize].1 }; - Python::with_gil(|py| { + Python::attach(|py| { obj.call0(py).expect("Error in the hook"); }); } @@ -1387,7 +1387,7 @@ pub mod pybind { /// # Safety /// Removes a hooke from `PY_GENERIC_HOOKS` -> may not be called concurrently! - unsafe fn set_hook(&self, addr: GuestAddr, hook: PyObject) { + unsafe fn set_hook(&self, addr: GuestAddr, hook: Py) { unsafe { let hooks = &raw mut PY_GENERIC_HOOKS; let idx = (*hooks).len(); diff --git a/crates/libafl_qemu/src/qemu/usermode.rs b/crates/libafl_qemu/src/qemu/usermode.rs index f04d0fce8d8..cf9f4f2a1ea 100644 --- a/crates/libafl_qemu/src/qemu/usermode.rs +++ b/crates/libafl_qemu/src/qemu/usermode.rs @@ -161,7 +161,7 @@ impl GuestMaps { } fn __next__(mut slf: PyRefMut) -> Option> { - Python::with_gil(|py| slf.next().map(|x| x.into_pyobject(py).unwrap().into())) + Python::attach(|py| slf.next().map(|x| x.into_pyobject(py).unwrap().into())) } } @@ -473,7 +473,7 @@ impl Qemu { pub mod pybind { use libafl_qemu_sys::{GuestAddr, MmapPerms}; use pyo3::{ - Bound, FromPyObject, PyObject, PyResult, Python, + Bound, FromPyObject, Py, PyAny, PyResult, Python, exceptions::PyValueError, pyclass, pymethods, types::{PyAnyMethods, PyInt}, @@ -481,7 +481,7 @@ pub mod pybind { use crate::{pybind::Qemu, qemu::hooks}; - static mut PY_SYSCALL_HOOK: Option = None; + static mut PY_SYSCALL_HOOK: Option> = None; #[pyclass] #[derive(FromPyObject)] @@ -507,7 +507,7 @@ pub mod pybind { || hooks::SyscallHookResult::Run, |obj| { let args = (sys_num, a0, a1, a2, a3, a4, a5, a6, a7); - Python::with_gil(|py| { + Python::attach(|py| { let ret = obj.call1(py, args).expect("Error in the syscall hook"); let any = ret.bind(py); if any.is_none() { @@ -588,7 +588,7 @@ pub mod pybind { /// # Safety /// Accesses the global `PY_SYSCALL_HOOK` and may not be called concurrently. - unsafe fn set_syscall_hook(&self, hook: PyObject) { + unsafe fn set_syscall_hook(&self, hook: Py) { unsafe { PY_SYSCALL_HOOK = Some(hook); } diff --git a/crates/libafl_sugar/src/inprocess.rs b/crates/libafl_sugar/src/inprocess.rs index ea48f104160..eb0c90cfb22 100644 --- a/crates/libafl_sugar/src/inprocess.rs +++ b/crates/libafl_sugar/src/inprocess.rs @@ -440,14 +440,14 @@ pub mod pybind { /// Run the fuzzer #[expect(clippy::needless_pass_by_value)] - pub fn run(&self, harness: PyObject) { + pub fn run(&self, harness: Py) { inprocess::InProcessBytesCoverageSugar::builder() .input_dirs(&self.input_dirs) .output_dir(self.output_dir.clone()) .broker_port(self.broker_port) .cores(&self.cores) .harness(|buf| { - Python::with_gil(|py| -> PyResult<()> { + Python::attach(|py| -> PyResult<()> { let args = (PyBytes::new(py, buf),); // TODO avoid copy harness.call1(py, args)?; Ok(()) diff --git a/crates/libafl_sugar/src/qemu.rs b/crates/libafl_sugar/src/qemu.rs index 72392390067..49940019e9f 100644 --- a/crates/libafl_sugar/src/qemu.rs +++ b/crates/libafl_sugar/src/qemu.rs @@ -593,14 +593,14 @@ pub mod pybind { /// Run the fuzzer #[expect(clippy::needless_pass_by_value)] - pub fn run(&self, qemu: &Qemu, harness: PyObject) { + pub fn run(&self, qemu: &Qemu, harness: Py) { qemu::QemuBytesCoverageSugar::builder() .input_dirs(&self.input_dirs) .output_dir(self.output_dir.clone()) .broker_port(self.broker_port) .cores(&self.cores) .harness(|buf| { - Python::with_gil(|py| -> PyResult<()> { + Python::attach(|py| -> PyResult<()> { let args = (PyBytes::new(py, buf),); // TODO avoid copy harness.call1(py, args)?; Ok(()) diff --git a/fuzzers/binary_only/qemu_launcher/Cargo.lock b/fuzzers/binary_only/qemu_launcher/Cargo.lock index 5cdea88ddaf..2284f6618f6 100644 --- a/fuzzers/binary_only/qemu_launcher/Cargo.lock +++ b/fuzzers/binary_only/qemu_launcher/Cargo.lock @@ -146,6 +146,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825297538d77367557b912770ca3083f778a196054b3ee63b22673c4a3cae0a5" +[[package]] +name = "arbitrary-int" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c858caffa49edfc4ecc45a4bec37abd3e88041a2903816f10f990b7b41abc281" + [[package]] name = "arrayref" version = "0.3.9" @@ -225,7 +231,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec187a89ab07e209270175faf9e07ceb2755d984954e58a2296e325ddece2762" dependencies = [ - "arbitrary-int", + "arbitrary-int 1.3.0", "proc-macro2", "quote", "syn", @@ -369,10 +375,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.24" +version = "1.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7" +checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -410,7 +417,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-link", + "windows-link 0.1.1", ] [[package]] @@ -495,9 +502,12 @@ dependencies = [ [[package]] name = "cobs" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror", +] [[package]] name = "colorchoice" @@ -998,6 +1008,12 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "find-msvc-tools" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" + [[package]] name = "flate2" version = "1.1.1" @@ -1020,6 +1036,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1132,24 +1154,25 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ - "ahash", "allocator-api2", - "serde", + "equivalent", + "foldhash 0.1.5", ] [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.2.0", + "serde", ] [[package]] @@ -1172,7 +1195,7 @@ checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows-link", + "windows-link 0.1.1", ] [[package]] @@ -1314,9 +1337,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", "hashbrown 0.15.3", @@ -1475,7 +1498,7 @@ name = "libafl" version = "0.15.4" dependencies = [ "ahash", - "arbitrary-int", + "arbitrary-int 2.0.0", "backtrace", "bincode", "bitbybit", @@ -1484,7 +1507,7 @@ dependencies = [ "crossterm 0.29.0", "fastbloom", "fs2", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl_bolts", "libafl_derive", "libc", @@ -1501,11 +1524,11 @@ dependencies = [ "serde_json", "serial_test", "tuple_list", - "typed-builder 0.21.2", + "typed-builder 0.22.0", "uuid", "wait-timeout", "winapi", - "windows 0.59.0", + "windows 0.62.2", ] [[package]] @@ -1516,7 +1539,7 @@ dependencies = [ "backtrace", "ctor", "erased-serde", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "hostname", "libafl_derive", "libafl_wide", @@ -1538,8 +1561,9 @@ dependencies = [ "uds", "uuid", "winapi", - "windows 0.59.0", - "windows-result 0.3.4", + "windows 0.62.2", + "windows-core 0.62.2", + "windows-result 0.4.1", "xxhash-rust", ] @@ -1557,19 +1581,16 @@ name = "libafl_qemu" version = "0.15.4" dependencies = [ "addr2line 0.25.0", - "bindgen", "bytes-utils", "capstone", - "cc", "enum-map", "getset", "goblin", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "just", "libafl", "libafl_bolts", "libafl_derive", - "libafl_qemu_build", "libafl_qemu_sys", "libafl_targets", "libc", @@ -1589,7 +1610,7 @@ dependencies = [ "syscall-numbers", "thread_local", "toml", - "typed-builder 0.21.2", + "typed-builder 0.22.0", ] [[package]] @@ -1599,8 +1620,6 @@ dependencies = [ "bindgen", "cc", "json", - "pkg-config", - "regex", "rustc_version", "rustversion", "shell-words", @@ -1626,7 +1645,7 @@ version = "0.15.4" dependencies = [ "bindgen", "cc", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl", "libafl_bolts", "libc", @@ -1748,9 +1767,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 = "lru" @@ -1890,18 +1909,19 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2029,9 +2049,9 @@ dependencies = [ [[package]] name = "postcard" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -2177,9 +2197,9 @@ dependencies = [ [[package]] name = "rangemap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" [[package]] name = "ratatui" @@ -2245,9 +2265,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -2257,9 +2277,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -2407,18 +2427,28 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -2427,23 +2457,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] name = "serde_spanned" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" +checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -2793,14 +2824,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" +checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0" dependencies = [ "indexmap", - "serde", + "serde_core", "serde_spanned", - "toml_datetime 0.7.0", + "toml_datetime 0.7.2", "toml_parser", "toml_writer", "winnow", @@ -2814,11 +2845,11 @@ checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" [[package]] name = "toml_datetime" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" +checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -2834,18 +2865,18 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" +checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" dependencies = [ "winnow", ] [[package]] name = "toml_writer" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" +checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109" [[package]] name = "tuple_list" @@ -2876,11 +2907,11 @@ dependencies = [ [[package]] name = "typed-builder" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef81aec2ca29576f9f6ae8755108640d0a86dd3161b2e8bca6cfa554e98f77d" +checksum = "398a3a3c918c96de527dc11e6e846cd549d4508030b8a33e1da12789c856b81a" dependencies = [ - "typed-builder-macro 0.21.2", + "typed-builder-macro 0.22.0", ] [[package]] @@ -2896,9 +2927,9 @@ dependencies = [ [[package]] name = "typed-builder-macro" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecb9ecf7799210407c14a8cfdfe0173365780968dc57973ed082211958e0b18" +checksum = "0e48cea23f68d1f78eb7bc092881b6bb88d3d6b5b7e6234f6f9c911da1ffb221" dependencies = [ "proc-macro2", "quote", @@ -3202,12 +3233,23 @@ dependencies = [ [[package]] name = "windows" -version = "0.59.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ - "windows-core 0.59.0", - "windows-targets 0.53.0", + "windows-collections", + "windows-core 0.62.2", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" +dependencies = [ + "windows-core 0.62.2", ] [[package]] @@ -3224,46 +3266,46 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.59.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.59.0", - "windows-interface 0.59.1", + "windows-implement 0.60.2", + "windows-interface 0.59.3", + "windows-link 0.1.1", "windows-result 0.3.4", - "windows-strings 0.3.1", - "windows-targets 0.53.0", + "windows-strings 0.4.2", ] [[package]] name = "windows-core" -version = "0.61.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", - "windows-link", - "windows-result 0.3.4", - "windows-strings 0.4.2", + "windows-implement 0.60.2", + "windows-interface 0.59.3", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", ] [[package]] -name = "windows-implement" -version = "0.57.0" +name = "windows-future" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-core 0.62.2", + "windows-link 0.2.1", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.59.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", @@ -3272,9 +3314,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -3294,9 +3336,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -3309,6 +3351,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -3324,16 +3382,16 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.1", ] [[package]] -name = "windows-strings" -version = "0.3.1" +name = "windows-result" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -3342,7 +3400,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.1", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", ] [[package]] @@ -3395,6 +3462,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -3493,9 +3569,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.10" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" dependencies = [ "memchr", ] diff --git a/fuzzers/full_system/qemu_baremetal/Cargo.lock b/fuzzers/full_system/qemu_baremetal/Cargo.lock index fbd6f831c95..759c46bd256 100644 --- a/fuzzers/full_system/qemu_baremetal/Cargo.lock +++ b/fuzzers/full_system/qemu_baremetal/Cargo.lock @@ -140,6 +140,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825297538d77367557b912770ca3083f778a196054b3ee63b22673c4a3cae0a5" +[[package]] +name = "arbitrary-int" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c858caffa49edfc4ecc45a4bec37abd3e88041a2903816f10f990b7b41abc281" + [[package]] name = "arrayref" version = "0.3.9" @@ -219,7 +225,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec187a89ab07e209270175faf9e07ceb2755d984954e58a2296e325ddece2762" dependencies = [ - "arbitrary-int", + "arbitrary-int 1.3.0", "proc-macro2", "quote", "syn", @@ -322,10 +328,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.24" +version = "1.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7" +checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -363,7 +370,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-link", + "windows-link 0.1.1", ] [[package]] @@ -448,9 +455,12 @@ dependencies = [ [[package]] name = "cobs" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror", +] [[package]] name = "colorchoice" @@ -769,6 +779,12 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "find-msvc-tools" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" + [[package]] name = "flate2" version = "1.1.1" @@ -779,6 +795,12 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "fs2" version = "0.4.3" @@ -869,20 +891,21 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", - "serde", -] +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", + "serde", +] [[package]] name = "heck" @@ -904,7 +927,7 @@ checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows-link", + "windows-link 0.1.1", ] [[package]] @@ -1075,7 +1098,7 @@ name = "libafl" version = "0.15.4" dependencies = [ "ahash", - "arbitrary-int", + "arbitrary-int 2.0.0", "backtrace", "bincode", "bitbybit", @@ -1083,7 +1106,7 @@ dependencies = [ "const_panic", "fastbloom", "fs2", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl_bolts", "libafl_derive", "libc", @@ -1114,7 +1137,7 @@ dependencies = [ "backtrace", "ctor", "erased-serde", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "hostname", "libafl_derive", "libafl_wide", @@ -1137,7 +1160,8 @@ dependencies = [ "uuid", "winapi", "windows", - "windows-result", + "windows-core 0.62.2", + "windows-result 0.4.1", "xxhash-rust", ] @@ -1155,19 +1179,16 @@ name = "libafl_qemu" version = "0.15.4" dependencies = [ "addr2line 0.25.0", - "bindgen", "bytes-utils", "capstone", - "cc", "enum-map", "getset", "goblin", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "just", "libafl", "libafl_bolts", "libafl_derive", - "libafl_qemu_build", "libafl_qemu_sys", "libafl_targets", "libc", @@ -1195,8 +1216,6 @@ dependencies = [ "bindgen", "cc", "json", - "pkg-config", - "regex", "rustc_version", "rustversion", "shell-words", @@ -1222,7 +1241,7 @@ version = "0.15.4" dependencies = [ "bindgen", "cc", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl", "libafl_bolts", "libc", @@ -1302,9 +1321,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 = "mach2" @@ -1408,18 +1427,19 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1500,12 +1520,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - [[package]] name = "plain" version = "0.2.3" @@ -1529,9 +1543,9 @@ dependencies = [ [[package]] name = "postcard" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -1657,9 +1671,9 @@ dependencies = [ [[package]] name = "rangemap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" [[package]] name = "rayon-core" @@ -1693,9 +1707,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -1705,9 +1719,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -1839,18 +1853,28 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1859,14 +1883,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -2119,18 +2144,18 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typed-builder" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef81aec2ca29576f9f6ae8755108640d0a86dd3161b2e8bca6cfa554e98f77d" +checksum = "398a3a3c918c96de527dc11e6e846cd549d4508030b8a33e1da12789c856b81a" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecb9ecf7799210407c14a8cfdfe0173365780968dc57973ed082211958e0b18" +checksum = "0e48cea23f68d1f78eb7bc092881b6bb88d3d6b5b7e6234f6f9c911da1ffb221" dependencies = [ "proc-macro2", "quote", @@ -2335,25 +2360,23 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.59.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ - "windows-core 0.59.0", - "windows-targets 0.53.0", + "windows-collections", + "windows-core 0.62.2", + "windows-future", + "windows-numerics", ] [[package]] -name = "windows-core" -version = "0.59.0" +name = "windows-collections" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "windows-implement 0.59.0", - "windows-interface", - "windows-result", - "windows-strings 0.3.1", - "windows-targets 0.53.0", + "windows-core 0.62.2", ] [[package]] @@ -2362,29 +2385,42 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.60.0", + "windows-implement", "windows-interface", - "windows-link", - "windows-result", + "windows-link 0.1.1", + "windows-result 0.3.4", "windows-strings 0.4.2", ] [[package]] -name = "windows-implement" -version = "0.59.0" +name = "windows-core" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-implement", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -2393,9 +2429,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -2408,22 +2444,38 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", +] + [[package]] name = "windows-result" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.1", ] [[package]] -name = "windows-strings" -version = "0.3.1" +name = "windows-result" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -2432,7 +2484,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.1", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", ] [[package]] @@ -2476,6 +2537,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" diff --git a/fuzzers/full_system/qemu_linux_process/Cargo.lock b/fuzzers/full_system/qemu_linux_process/Cargo.lock index 7d953bf9842..48cb499b6db 100644 --- a/fuzzers/full_system/qemu_linux_process/Cargo.lock +++ b/fuzzers/full_system/qemu_linux_process/Cargo.lock @@ -140,6 +140,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825297538d77367557b912770ca3083f778a196054b3ee63b22673c4a3cae0a5" +[[package]] +name = "arbitrary-int" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c858caffa49edfc4ecc45a4bec37abd3e88041a2903816f10f990b7b41abc281" + [[package]] name = "arrayref" version = "0.3.9" @@ -219,7 +225,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec187a89ab07e209270175faf9e07ceb2755d984954e58a2296e325ddece2762" dependencies = [ - "arbitrary-int", + "arbitrary-int 1.3.0", "proc-macro2", "quote", "syn", @@ -322,10 +328,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.24" +version = "1.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7" +checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -363,7 +370,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-link", + "windows-link 0.1.1", ] [[package]] @@ -448,9 +455,12 @@ dependencies = [ [[package]] name = "cobs" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror", +] [[package]] name = "colorchoice" @@ -769,6 +779,12 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "find-msvc-tools" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" + [[package]] name = "flate2" version = "1.1.1" @@ -779,6 +795,12 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "fs2" version = "0.4.3" @@ -869,20 +891,21 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", - "serde", -] +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", + "serde", +] [[package]] name = "heck" @@ -904,7 +927,7 @@ checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows-link", + "windows-link 0.1.1", ] [[package]] @@ -1075,7 +1098,7 @@ name = "libafl" version = "0.15.4" dependencies = [ "ahash", - "arbitrary-int", + "arbitrary-int 2.0.0", "backtrace", "bincode", "bitbybit", @@ -1083,7 +1106,7 @@ dependencies = [ "const_panic", "fastbloom", "fs2", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl_bolts", "libafl_derive", "libc", @@ -1114,7 +1137,7 @@ dependencies = [ "backtrace", "ctor", "erased-serde", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "hostname", "libafl_derive", "libafl_wide", @@ -1137,7 +1160,8 @@ dependencies = [ "uuid", "winapi", "windows", - "windows-result", + "windows-core 0.62.2", + "windows-result 0.4.1", "xxhash-rust", ] @@ -1155,19 +1179,16 @@ name = "libafl_qemu" version = "0.15.4" dependencies = [ "addr2line 0.25.0", - "bindgen", "bytes-utils", "capstone", - "cc", "enum-map", "getset", "goblin", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "just", "libafl", "libafl_bolts", "libafl_derive", - "libafl_qemu_build", "libafl_qemu_sys", "libafl_targets", "libc", @@ -1195,8 +1216,6 @@ dependencies = [ "bindgen", "cc", "json", - "pkg-config", - "regex", "rustc_version", "rustversion", "shell-words", @@ -1222,7 +1241,7 @@ version = "0.15.4" dependencies = [ "bindgen", "cc", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl", "libafl_bolts", "libc", @@ -1302,9 +1321,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 = "mach2" @@ -1408,18 +1427,19 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1500,12 +1520,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - [[package]] name = "plain" version = "0.2.3" @@ -1529,9 +1543,9 @@ dependencies = [ [[package]] name = "postcard" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -1657,9 +1671,9 @@ dependencies = [ [[package]] name = "rangemap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" [[package]] name = "rayon-core" @@ -1693,9 +1707,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -1705,9 +1719,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -1839,18 +1853,28 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1859,14 +1883,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -2119,18 +2144,18 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typed-builder" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef81aec2ca29576f9f6ae8755108640d0a86dd3161b2e8bca6cfa554e98f77d" +checksum = "398a3a3c918c96de527dc11e6e846cd549d4508030b8a33e1da12789c856b81a" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecb9ecf7799210407c14a8cfdfe0173365780968dc57973ed082211958e0b18" +checksum = "0e48cea23f68d1f78eb7bc092881b6bb88d3d6b5b7e6234f6f9c911da1ffb221" dependencies = [ "proc-macro2", "quote", @@ -2335,25 +2360,23 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.59.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ - "windows-core 0.59.0", - "windows-targets 0.53.0", + "windows-collections", + "windows-core 0.62.2", + "windows-future", + "windows-numerics", ] [[package]] -name = "windows-core" -version = "0.59.0" +name = "windows-collections" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "windows-implement 0.59.0", - "windows-interface", - "windows-result", - "windows-strings 0.3.1", - "windows-targets 0.53.0", + "windows-core 0.62.2", ] [[package]] @@ -2362,29 +2385,42 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.60.0", + "windows-implement", "windows-interface", - "windows-link", - "windows-result", + "windows-link 0.1.1", + "windows-result 0.3.4", "windows-strings 0.4.2", ] [[package]] -name = "windows-implement" -version = "0.59.0" +name = "windows-core" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-implement", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -2393,9 +2429,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -2408,22 +2444,38 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", +] + [[package]] name = "windows-result" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.1", ] [[package]] -name = "windows-strings" -version = "0.3.1" +name = "windows-result" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -2432,7 +2484,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.1", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", ] [[package]] @@ -2476,6 +2537,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" From 209ea4304de5ade23afac4f2955024e4535179ab Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Tue, 7 Oct 2025 09:28:44 +0200 Subject: [PATCH 10/10] cargo lock --- .../full_system/qemu_linux_kernel/Cargo.lock | 246 +++++++++++------- 1 file changed, 158 insertions(+), 88 deletions(-) diff --git a/fuzzers/full_system/qemu_linux_kernel/Cargo.lock b/fuzzers/full_system/qemu_linux_kernel/Cargo.lock index 8f76230712c..139b3b042cc 100644 --- a/fuzzers/full_system/qemu_linux_kernel/Cargo.lock +++ b/fuzzers/full_system/qemu_linux_kernel/Cargo.lock @@ -140,6 +140,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825297538d77367557b912770ca3083f778a196054b3ee63b22673c4a3cae0a5" +[[package]] +name = "arbitrary-int" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c858caffa49edfc4ecc45a4bec37abd3e88041a2903816f10f990b7b41abc281" + [[package]] name = "arrayref" version = "0.3.9" @@ -219,7 +225,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec187a89ab07e209270175faf9e07ceb2755d984954e58a2296e325ddece2762" dependencies = [ - "arbitrary-int", + "arbitrary-int 1.3.0", "proc-macro2", "quote", "syn", @@ -322,10 +328,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.24" +version = "1.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7" +checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -363,7 +370,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-link", + "windows-link 0.1.1", ] [[package]] @@ -448,9 +455,12 @@ dependencies = [ [[package]] name = "cobs" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror", +] [[package]] name = "colorchoice" @@ -769,6 +779,12 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "find-msvc-tools" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" + [[package]] name = "flate2" version = "1.1.1" @@ -779,6 +795,12 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "fs2" version = "0.4.3" @@ -869,20 +891,21 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", - "serde", -] +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", + "serde", +] [[package]] name = "heck" @@ -904,7 +927,7 @@ checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows-link", + "windows-link 0.1.1", ] [[package]] @@ -1075,7 +1098,7 @@ name = "libafl" version = "0.15.4" dependencies = [ "ahash", - "arbitrary-int", + "arbitrary-int 2.0.0", "backtrace", "bincode", "bitbybit", @@ -1083,7 +1106,7 @@ dependencies = [ "const_panic", "fastbloom", "fs2", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl_bolts", "libafl_derive", "libc", @@ -1114,7 +1137,7 @@ dependencies = [ "backtrace", "ctor", "erased-serde", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "hostname", "libafl_derive", "libafl_wide", @@ -1137,7 +1160,8 @@ dependencies = [ "uuid", "winapi", "windows", - "windows-result", + "windows-core 0.62.2", + "windows-result 0.4.1", "xxhash-rust", ] @@ -1155,19 +1179,16 @@ name = "libafl_qemu" version = "0.15.4" dependencies = [ "addr2line 0.25.0", - "bindgen", "bytes-utils", "capstone", - "cc", "enum-map", "getset", "goblin", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "just", "libafl", "libafl_bolts", "libafl_derive", - "libafl_qemu_build", "libafl_qemu_sys", "libafl_targets", "libc", @@ -1195,8 +1216,6 @@ dependencies = [ "bindgen", "cc", "json", - "pkg-config", - "regex", "rustc_version", "rustversion", "shell-words", @@ -1222,7 +1241,7 @@ version = "0.15.4" dependencies = [ "bindgen", "cc", - "hashbrown 0.14.5", + "hashbrown 0.16.0", "libafl", "libafl_bolts", "libc", @@ -1302,9 +1321,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 = "mach2" @@ -1408,18 +1427,19 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1500,12 +1520,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - [[package]] name = "plain" version = "0.2.3" @@ -1529,9 +1543,9 @@ dependencies = [ [[package]] name = "postcard" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -1658,9 +1672,9 @@ dependencies = [ [[package]] name = "rangemap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" [[package]] name = "rayon-core" @@ -1694,9 +1708,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -1706,9 +1720,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -1840,18 +1854,28 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1860,14 +1884,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -2120,18 +2145,18 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typed-builder" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef81aec2ca29576f9f6ae8755108640d0a86dd3161b2e8bca6cfa554e98f77d" +checksum = "398a3a3c918c96de527dc11e6e846cd549d4508030b8a33e1da12789c856b81a" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecb9ecf7799210407c14a8cfdfe0173365780968dc57973ed082211958e0b18" +checksum = "0e48cea23f68d1f78eb7bc092881b6bb88d3d6b5b7e6234f6f9c911da1ffb221" dependencies = [ "proc-macro2", "quote", @@ -2336,25 +2361,23 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.59.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ - "windows-core 0.59.0", - "windows-targets 0.53.0", + "windows-collections", + "windows-core 0.62.2", + "windows-future", + "windows-numerics", ] [[package]] -name = "windows-core" -version = "0.59.0" +name = "windows-collections" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "windows-implement 0.59.0", - "windows-interface", - "windows-result", - "windows-strings 0.3.1", - "windows-targets 0.53.0", + "windows-core 0.62.2", ] [[package]] @@ -2363,29 +2386,42 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.60.0", + "windows-implement", "windows-interface", - "windows-link", - "windows-result", + "windows-link 0.1.1", + "windows-result 0.3.4", "windows-strings 0.4.2", ] [[package]] -name = "windows-implement" -version = "0.59.0" +name = "windows-core" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-implement", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -2394,9 +2430,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -2409,22 +2445,38 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", +] + [[package]] name = "windows-result" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.1", ] [[package]] -name = "windows-strings" -version = "0.3.1" +name = "windows-result" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -2433,7 +2485,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.1", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", ] [[package]] @@ -2477,6 +2538,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6"