From b0179b4498414351bf828683c2b4a0456ac28262 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Thu, 17 Aug 2023 17:15:03 +0200 Subject: [PATCH] Update some deps, clippy (#1422) * More less default * More clippy * updated rangemap * Clean up depencdencies * Undo accidental remove * Fix * trying to fix qemu build * hexagon be gone --- fuzzers/forkserver_libafl_cc/Cargo.toml | 2 +- fuzzers/frida_executable_libpng/Cargo.toml | 4 ++-- fuzzers/frida_gdiplus/Cargo.toml | 2 +- fuzzers/frida_libpng/Cargo.toml | 2 +- fuzzers/fuzzbench/Cargo.toml | 2 +- fuzzers/fuzzbench_forkserver/Cargo.toml | 2 +- fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml | 2 +- fuzzers/fuzzbench_text/Cargo.toml | 2 +- fuzzers/libafl_atheris/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_accounting/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_centralized/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_cmin/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_ctx/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_launcher/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_norestart/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml | 2 +- fuzzers/libfuzzer_reachability/Cargo.toml | 2 +- fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml | 2 +- fuzzers/libfuzzer_stb_image_concolic/fuzzer/src/main.rs | 2 +- fuzzers/qemu_coverage/Cargo.toml | 2 +- fuzzers/qemu_launcher/Cargo.toml | 2 +- fuzzers/tutorial/Cargo.toml | 2 +- libafl/Cargo.toml | 4 ++-- libafl_bolts/Cargo.toml | 9 ++++----- libafl_bolts/src/build_id.rs | 6 +++--- libafl_bolts/src/minibsod.rs | 2 +- libafl_cc/Cargo.toml | 4 ++-- libafl_concolic/symcc_libafl/Cargo.toml | 4 ++-- libafl_concolic/symcc_runtime/Cargo.toml | 2 +- libafl_frida/Cargo.toml | 4 ++-- libafl_qemu/Cargo.toml | 4 ++-- libafl_qemu/libafl_qemu_build/Cargo.toml | 2 +- libafl_qemu/src/hexagon.rs | 2 +- libafl_sugar/Cargo.toml | 2 +- libafl_sugar/src/qemu.rs | 5 ++++- libafl_targets/Cargo.toml | 4 ++-- libafl_tinyinst/Cargo.toml | 2 +- utils/deexit/Cargo.toml | 2 +- utils/gramatron/construct_automata/Cargo.toml | 2 +- utils/noaslr/noaslr/Cargo.toml | 2 +- 41 files changed, 56 insertions(+), 54 deletions(-) diff --git a/fuzzers/forkserver_libafl_cc/Cargo.toml b/fuzzers/forkserver_libafl_cc/Cargo.toml index c981ec8dd8..39120c06e0 100644 --- a/fuzzers/forkserver_libafl_cc/Cargo.toml +++ b/fuzzers/forkserver_libafl_cc/Cargo.toml @@ -18,7 +18,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = { version = "4.4" } [dependencies] clap = { version = "4.0", features = ["derive"] } diff --git a/fuzzers/frida_executable_libpng/Cargo.toml b/fuzzers/frida_executable_libpng/Cargo.toml index 5bef5fc35f..e4614b01b3 100644 --- a/fuzzers/frida_executable_libpng/Cargo.toml +++ b/fuzzers/frida_executable_libpng/Cargo.toml @@ -19,7 +19,7 @@ debug = true [build-dependencies] cc = { version = "1.0.42", features = ["parallel"] } -which = "4.1" +which = "4.4" xz2 = "0.1.6" flate2 = "1.0.22" tar = "0.4.37" @@ -35,7 +35,7 @@ libafl_targets = { path = "../../libafl_targets", features = ["sancov_cmplog"] } libc = "0.2" libloading = "0.7" num-traits = "0.2" -rangemap = "1" +rangemap = "1.3" clap = { version = "4.0", features = ["derive"] } serde = "1.0" mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/frida_gdiplus/Cargo.toml b/fuzzers/frida_gdiplus/Cargo.toml index 471ca57a4a..b02aeecde4 100644 --- a/fuzzers/frida_gdiplus/Cargo.toml +++ b/fuzzers/frida_gdiplus/Cargo.toml @@ -17,7 +17,7 @@ debug = true [build-dependencies] cc = { version = "1.0.42", features = ["parallel"] } num_cpus = "1.0" -which = "4.1" +which = "4.4" xz2 = "0.1.6" flate2 = "1.0.22" tar = "0.4.37" diff --git a/fuzzers/frida_libpng/Cargo.toml b/fuzzers/frida_libpng/Cargo.toml index a7669897b3..1946d97ee1 100644 --- a/fuzzers/frida_libpng/Cargo.toml +++ b/fuzzers/frida_libpng/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0.42", features = ["parallel"] } -which = "4.1" +which = "4.4" xz2 = "0.1.6" flate2 = "1.0.22" tar = "0.4.37" diff --git a/fuzzers/fuzzbench/Cargo.toml b/fuzzers/fuzzbench/Cargo.toml index 82a9acee12..26aba1037c 100644 --- a/fuzzers/fuzzbench/Cargo.toml +++ b/fuzzers/fuzzbench/Cargo.toml @@ -17,7 +17,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/" } diff --git a/fuzzers/fuzzbench_forkserver/Cargo.toml b/fuzzers/fuzzbench_forkserver/Cargo.toml index 1b2f24cda3..3bb765eab4 100644 --- a/fuzzers/fuzzbench_forkserver/Cargo.toml +++ b/fuzzers/fuzzbench_forkserver/Cargo.toml @@ -12,7 +12,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/" } diff --git a/fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml b/fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml index 398954a1c4..ff8fc1c70b 100644 --- a/fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml +++ b/fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml @@ -12,7 +12,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/" } diff --git a/fuzzers/fuzzbench_text/Cargo.toml b/fuzzers/fuzzbench_text/Cargo.toml index 5ff5240342..f51fd45214 100644 --- a/fuzzers/fuzzbench_text/Cargo.toml +++ b/fuzzers/fuzzbench_text/Cargo.toml @@ -17,7 +17,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/" } diff --git a/fuzzers/libafl_atheris/Cargo.toml b/fuzzers/libafl_atheris/Cargo.toml index f0303f0d23..d7629d6636 100644 --- a/fuzzers/libafl_atheris/Cargo.toml +++ b/fuzzers/libafl_atheris/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/" } diff --git a/fuzzers/libfuzzer_libpng/Cargo.toml b/fuzzers/libfuzzer_libpng/Cargo.toml index a129bb9c2e..a3dbdffeee 100644 --- a/fuzzers/libfuzzer_libpng/Cargo.toml +++ b/fuzzers/libfuzzer_libpng/Cargo.toml @@ -18,7 +18,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/", features = ["default"] } diff --git a/fuzzers/libfuzzer_libpng_accounting/Cargo.toml b/fuzzers/libfuzzer_libpng_accounting/Cargo.toml index 9f6457a0de..dcd5e9dd5e 100644 --- a/fuzzers/libfuzzer_libpng_accounting/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_accounting/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/", features = ["std", "derive", "llmp_compression", "introspection"] } diff --git a/fuzzers/libfuzzer_libpng_centralized/Cargo.toml b/fuzzers/libfuzzer_libpng_centralized/Cargo.toml index ef2e6533da..e7ec8168fa 100644 --- a/fuzzers/libfuzzer_libpng_centralized/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_centralized/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/", features = ["std", "derive", "rand_trait", "fork", "prelude", "gzip", "regex"] } diff --git a/fuzzers/libfuzzer_libpng_cmin/Cargo.toml b/fuzzers/libfuzzer_libpng_cmin/Cargo.toml index daabd22c68..f6b75a5132 100644 --- a/fuzzers/libfuzzer_libpng_cmin/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_cmin/Cargo.toml @@ -18,7 +18,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/", features = ["default", "cmin"] } diff --git a/fuzzers/libfuzzer_libpng_ctx/Cargo.toml b/fuzzers/libfuzzer_libpng_ctx/Cargo.toml index f6e8d24b19..1f078b6a17 100644 --- a/fuzzers/libfuzzer_libpng_ctx/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_ctx/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/", features = ["std", "derive", "llmp_compression", "introspection"] } diff --git a/fuzzers/libfuzzer_libpng_launcher/Cargo.toml b/fuzzers/libfuzzer_libpng_launcher/Cargo.toml index 3905eac90e..e7dda26c3d 100644 --- a/fuzzers/libfuzzer_libpng_launcher/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_launcher/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/", features = ["std", "derive", "llmp_compression", "introspection"] } diff --git a/fuzzers/libfuzzer_libpng_norestart/Cargo.toml b/fuzzers/libfuzzer_libpng_norestart/Cargo.toml index 117a5751a8..61d661504f 100644 --- a/fuzzers/libfuzzer_libpng_norestart/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_norestart/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/" } diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml b/fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml index 90460254ef..53de59461b 100644 --- a/fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml @@ -18,7 +18,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/", features = ["default", "tcp_manager"] } diff --git a/fuzzers/libfuzzer_reachability/Cargo.toml b/fuzzers/libfuzzer_reachability/Cargo.toml index 55f600f4ca..c6a9e1b466 100644 --- a/fuzzers/libfuzzer_reachability/Cargo.toml +++ b/fuzzers/libfuzzer_reachability/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/" } diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml b/fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml index fc3cc3b9c3..41fb942702 100644 --- a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml +++ b/fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml @@ -25,5 +25,5 @@ mimalloc = { version = "*", default-features = false } [build-dependencies] cc = { version = "1.0", features = ["parallel"] } cmake = "0.1" -which = "4.1" +which = "4.4" symcc_libafl = {path = "../../../libafl_concolic/symcc_libafl"} diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/src/main.rs b/fuzzers/libfuzzer_stb_image_concolic/fuzzer/src/main.rs index 4894e806a3..5c09379419 100644 --- a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/src/main.rs +++ b/fuzzers/libfuzzer_stb_image_concolic/fuzzer/src/main.rs @@ -216,7 +216,7 @@ fn fuzz( // Create a concolic trace ConcolicTracingStage::new( TracingStage::new( - MyCommandConfigurator::default().into_executor(tuple_list!(concolic_observer)) + MyCommandConfigurator.into_executor(tuple_list!(concolic_observer)) ), concolic_observer_name, ), diff --git a/fuzzers/qemu_coverage/Cargo.toml b/fuzzers/qemu_coverage/Cargo.toml index 318b0cefab..7932f09b60 100644 --- a/fuzzers/qemu_coverage/Cargo.toml +++ b/fuzzers/qemu_coverage/Cargo.toml @@ -29,4 +29,4 @@ clap = { version = "4.3.0", features = ["derive", "string"]} libafl = { path = "../../libafl/" } libafl_bolts = { path = "../../libafl_bolts/" } libafl_qemu = { path = "../../libafl_qemu/", features = ["usermode"] } -rangemap = { version = "1.0.3" } +rangemap = { version = "1.3" } diff --git a/fuzzers/qemu_launcher/Cargo.toml b/fuzzers/qemu_launcher/Cargo.toml index b3e5561388..92b6cf2227 100644 --- a/fuzzers/qemu_launcher/Cargo.toml +++ b/fuzzers/qemu_launcher/Cargo.toml @@ -29,4 +29,4 @@ clap = { version = "4.3.0", features = ["derive", "string"]} libafl = { path = "../../libafl/" } libafl_bolts = { path = "../../libafl_bolts/" } libafl_qemu = { path = "../../libafl_qemu/", features = ["usermode"] } -rangemap = { version = "1.0.3" } +rangemap = { version = "1.3" } diff --git a/fuzzers/tutorial/Cargo.toml b/fuzzers/tutorial/Cargo.toml index 6671c14fa1..141fdc115a 100644 --- a/fuzzers/tutorial/Cargo.toml +++ b/fuzzers/tutorial/Cargo.toml @@ -16,7 +16,7 @@ debug = true [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = { version = "4.0.2" } +which = "4.4" [dependencies] libafl = { path = "../../libafl/", features = ["default", "rand_trait"] } diff --git a/libafl/Cargo.toml b/libafl/Cargo.toml index b5cc2b0596..29fc52d1ab 100644 --- a/libafl/Cargo.toml +++ b/libafl/Cargo.toml @@ -80,7 +80,7 @@ typed-builder = { version = "0.15.2", optional = true } # Implement the builder serde_json = { version = "1.0", optional = true, default-features = false, features = ["alloc"] } nix = { version = "0.26", optional = true } regex = { version = "1", optional = true } -uuid = { version = "1.1.2", optional = true, features = ["serde", "v4"] } +uuid = { version = "1.4", optional = true, features = ["serde", "v4"] } libm = "0.2.2" tui = { version = "0.19", default-features = false, features = ['crossterm'], optional = true } # Commandline rendering, for TUI Monitor crossterm = { version = "0.25", optional = true } @@ -89,7 +89,7 @@ prometheus-client = { version= "0.19", optional = true} # For the prometheus mon tide = { version = "0.16.0", optional = true } async-std = { version = "1.12.0", features = ["attributes"], optional = true } futures = { version = "0.3.24", optional = true } -log = "0.4.18" +log = "0.4.20" tokio = { version = "1.28.1", optional = true, features = ["sync", "net", "rt", "io-util", "macros"] } # only used for TCP Event Manager right now wait-timeout = { version = "0.2", optional = true } # used by CommandExecutor to wait for child process diff --git a/libafl_bolts/Cargo.toml b/libafl_bolts/Cargo.toml index 09ec7512a6..420d36d7f0 100644 --- a/libafl_bolts/Cargo.toml +++ b/libafl_bolts/Cargo.toml @@ -13,7 +13,7 @@ categories = ["development-tools::testing", "emulators", "embedded", "os", "no-s [features] default = ["std", "derive", "llmp_compression", "llmp_small_maps", "rand_trait", "prelude", "gzip", "serdeany_autoreg", "alloc"] -std = ["serde_json", "serde_json/std", "hostname", "nix", "serde/std", "once_cell", "uuid", "byteorder", "backtrace", "uds", "serial_test", "alloc"] # print, env, ... support +std = ["serde_json", "serde_json/std", "hostname", "nix", "serde/std", "uuid", "byteorder", "backtrace", "uds", "serial_test", "alloc"] # print, env, ... support alloc = ["serde/alloc", "hashbrown", "postcard", "erased-serde/alloc", "ahash"] # Enables all features that allocate in no_std derive = ["libafl_derive"] # provide derive(SerdeAny) macro. rand_trait = ["rand_core"] # If set, libafl's rand implementations will implement `rand::Rng` @@ -51,7 +51,7 @@ xxhash-rust = { version = "0.8.5", features = ["xxh3"] } # xxh3 hashing for rust serde = { version = "1.0", default-features = false, features = ["derive"] } # serialization lib erased-serde = { version = "0.3.21", default-features = false, optional = true } # erased serde postcard = { version = "1.0", features = ["alloc"], optional = true } # no_std compatible serde serialization format -num_enum = { version = "0.5.7", default-features = false } +num_enum = { version = "0.6", default-features = false } ahash = { version = "0.8", default-features=false, optional = true } # The hash function already used in hashbrown backtrace = {version = "0.3", optional = true} # Used to get the stacktrace in StacktraceObserver @@ -61,11 +61,10 @@ miniz_oxide = { version = "0.7.1", optional = true} hostname = { version = "^0.3", optional = true } # Is there really no gethostname in the stdlib? rand_core = { version = "0.6", optional = true } nix = { version = "0.26", optional = true } -uuid = { version = "1.1.2", optional = true, features = ["serde", "v4"] } +uuid = { version = "1.4", optional = true, features = ["serde", "v4"] } byteorder = { version = "1.4", optional = true } -once_cell = { version = "1.13", optional = true } clap = {version = "4.0", features = ["derive", "wrap_help"], optional = true} # CLI parsing, for libafl_bolts::cli / the `cli` feature -log = "0.4.18" +log = "0.4.20" pyo3 = { version = "0.18.3", optional = true, features = ["serde", "macros"] } diff --git a/libafl_bolts/src/build_id.rs b/libafl_bolts/src/build_id.rs index 2a2ccc8693..d9e2433e13 100644 --- a/libafl_bolts/src/build_id.rs +++ b/libafl_bolts/src/build_id.rs @@ -7,12 +7,12 @@ use std::{ fs::File, hash::{Hash, Hasher}, io, + sync::OnceLock, }; -use once_cell::sync::Lazy; use uuid::Uuid; -static BUILD_ID: Lazy = Lazy::new(calculate); +static BUILD_ID: OnceLock = OnceLock::new(); /// Returns a [Uuid] uniquely representing the build of the current binary. /// @@ -48,7 +48,7 @@ static BUILD_ID: Lazy = Lazy::new(calculate); #[inline] #[must_use] pub fn get() -> Uuid { - *BUILD_ID + *BUILD_ID.get_or_init(calculate) } fn from_exe(mut hasher: H) -> Result { diff --git a/libafl_bolts/src/minibsod.rs b/libafl_bolts/src/minibsod.rs index 7cbf724e4b..67120d1dbb 100644 --- a/libafl_bolts/src/minibsod.rs +++ b/libafl_bolts/src/minibsod.rs @@ -790,7 +790,7 @@ fn write_minibsod(writer: &mut BufWriter) -> Result<(), std::io::Er /// Generates a mini-BSOD given a signal and context. #[cfg(unix)] -#[allow(clippy::non_ascii_literal)] +#[allow(clippy::non_ascii_literal, clippy::too_many_lines)] pub fn generate_minibsod( writer: &mut BufWriter, signal: Signal, diff --git a/libafl_cc/Cargo.toml b/libafl_cc/Cargo.toml index b64f5c8f0a..a1be312c26 100644 --- a/libafl_cc/Cargo.toml +++ b/libafl_cc/Cargo.toml @@ -15,11 +15,11 @@ categories = ["development-tools::testing", "emulators", "embedded", "os", "no-s [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -which = "4.2.5" +which = "4.4" [target.'cfg(target_vendor = "apple")'.build-dependencies] glob = "0.3" [dependencies] serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] } # serialization lib -log = "0.4.17" +log = "0.4.20" diff --git a/libafl_concolic/symcc_libafl/Cargo.toml b/libafl_concolic/symcc_libafl/Cargo.toml index 1ca5417989..e760b9b48a 100644 --- a/libafl_concolic/symcc_libafl/Cargo.toml +++ b/libafl_concolic/symcc_libafl/Cargo.toml @@ -19,6 +19,6 @@ build = ["which", "cmake"] # common functionality to build symcc clone = ["which"] # common functionality to check out the symcc repo using git [dependencies] -which = { version = "4.2", optional = true } +which = { version = "4.4", optional = true } cmake = { version = "0.1", optional = true } -log = "0.4.17" +log = "0.4.20" diff --git a/libafl_concolic/symcc_runtime/Cargo.toml b/libafl_concolic/symcc_runtime/Cargo.toml index 5b64c88452..b45d87c343 100644 --- a/libafl_concolic/symcc_runtime/Cargo.toml +++ b/libafl_concolic/symcc_runtime/Cargo.toml @@ -30,5 +30,5 @@ cmake = "0.1" bindgen = "0.63" regex = "1" lazy_static = "1.4" -which = "4.2" +which = "4.4" symcc_libafl = { path = "../symcc_libafl", version = "0.10.1" } diff --git a/libafl_frida/Cargo.toml b/libafl_frida/Cargo.toml index a0ea44014a..39126508d4 100644 --- a/libafl_frida/Cargo.toml +++ b/libafl_frida/Cargo.toml @@ -27,7 +27,7 @@ libafl_targets = { path = "../libafl_targets", version = "0.10.1", features = [" nix = "0.26" libc = "0.2" hashbrown = "0.14" -rangemap = "1.0" +rangemap = "1.3" frida-gum-sys = { version = "0.4.1", features = [ "auto-download", "event-sink", "invocation-listener"] } frida-gum = { version = "0.8.1", features = [ "auto-download", "event-sink", "invocation-listener"] } dynasmrt = "2" @@ -39,7 +39,7 @@ backtrace = { version = "0.3", default-features = false, features = ["std", "ser num-traits = "0.2" ahash = "0.8" paste = "1.0" -log = "0.4.17" +log = "0.4.20" [dev-dependencies] serial_test = "1" diff --git a/libafl_qemu/Cargo.toml b/libafl_qemu/Cargo.toml index 2454a8f769..19bfc62b47 100644 --- a/libafl_qemu/Cargo.toml +++ b/libafl_qemu/Cargo.toml @@ -57,8 +57,8 @@ meminterval = "0.3" thread_local = "1.1.4" capstone = "0.11.0" pyo3 = { version = "0.18.3", optional = true } -rangemap = "1.0" -log = "0.4.17" +rangemap = "1.3" +log = "0.4.20" [build-dependencies] pyo3-build-config = { version = "0.15", optional = true } diff --git a/libafl_qemu/libafl_qemu_build/Cargo.toml b/libafl_qemu/libafl_qemu_build/Cargo.toml index 1afe9b5622..e98def0c6e 100644 --- a/libafl_qemu/libafl_qemu_build/Cargo.toml +++ b/libafl_qemu/libafl_qemu_build/Cargo.toml @@ -24,7 +24,7 @@ clippy = [] # special feature for clippy, don't use in normal projects§ [dependencies] bindgen = "0.66" -which = "4.2" +which = "4.4" json = "0.12" shell-words = "1.1" pkg-config = "0.3.26" diff --git a/libafl_qemu/src/hexagon.rs b/libafl_qemu/src/hexagon.rs index fde8de98ce..5381e147eb 100644 --- a/libafl_qemu/src/hexagon.rs +++ b/libafl_qemu/src/hexagon.rs @@ -90,7 +90,7 @@ impl crate::ArchExtras for crate::CPU { &self, conv: CallingConvention, idx: i32, - val: T, + _val: T, ) -> Result<(), String> where T: Into, diff --git a/libafl_sugar/Cargo.toml b/libafl_sugar/Cargo.toml index 60fdf7e106..d0e2fde7a1 100644 --- a/libafl_sugar/Cargo.toml +++ b/libafl_sugar/Cargo.toml @@ -37,7 +37,7 @@ libafl_qemu = { path = "../libafl_qemu", version = "0.10.1" } typed-builder = "0.15.2" # Implement the builder pattern at compiletime pyo3 = { version = "0.18.3", optional = true } -log = "0.4.17" +log = "0.4.20" [lib] name = "libafl_sugar" diff --git a/libafl_sugar/src/qemu.rs b/libafl_sugar/src/qemu.rs index 1c86555669..36b813e743 100644 --- a/libafl_sugar/src/qemu.rs +++ b/libafl_sugar/src/qemu.rs @@ -35,7 +35,9 @@ use libafl_bolts::{ AsSlice, }; pub use libafl_qemu::emu::Emulator; -use libafl_qemu::{edges, QemuCmpLogHelper, QemuEdgeCoverageHelper, QemuExecutor, QemuHooks}; +#[cfg(not(any(feature = "mips", feature = "hexagon")))] +use libafl_qemu::QemuCmpLogHelper; +use libafl_qemu::{edges, QemuEdgeCoverageHelper, QemuExecutor, QemuHooks}; use libafl_targets::{edges_map_mut_slice, CmpLogObserver}; use typed_builder::TypedBuilder; @@ -215,6 +217,7 @@ where emulator, tuple_list!( QemuEdgeCoverageHelper::default(), + #[cfg(not(any(cpu_target = "mips", cpu_target = "hexagon")))] QemuCmpLogHelper::default(), ), ); diff --git a/libafl_targets/Cargo.toml b/libafl_targets/Cargo.toml index f934dcae94..1936d6f211 100644 --- a/libafl_targets/Cargo.toml +++ b/libafl_targets/Cargo.toml @@ -34,9 +34,9 @@ cc = { version = "1.0", features = ["parallel"] } [dependencies] libafl = { path = "../libafl", version = "0.10.1", default-features = false, features = [] } libafl_bolts = { path = "../libafl_bolts", version = "0.10.1", default-features = false, features = [] } -log = "0.4.17" +log = "0.4.20" -rangemap = "1.0" +rangemap = "1.3" serde = { version = "1.0", default-features = false, features = ["alloc"] } # serialization lib intervaltree = { version = "0.2.7", default-features = false, features = ["serde"], optional = true } ahash = { version = "0.8.3", default-features = false, optional = true } diff --git a/libafl_tinyinst/Cargo.toml b/libafl_tinyinst/Cargo.toml index 86e9082ea4..3cf98bd775 100644 --- a/libafl_tinyinst/Cargo.toml +++ b/libafl_tinyinst/Cargo.toml @@ -22,7 +22,7 @@ libafl_bolts = { path = "../libafl_bolts", version = "0.10.1", features = [ ] } tinyinst = { git = "https://github.com/AFLplusplus/tinyinst-rs" } # tinyinst-rs = { path = "../../tinyinst-rs" } -log = "0.4.17" +log = "0.4.20" [build-dependencies] cmake = "0.1" diff --git a/utils/deexit/Cargo.toml b/utils/deexit/Cargo.toml index 55f50a7d87..d763cbf5a0 100644 --- a/utils/deexit/Cargo.toml +++ b/utils/deexit/Cargo.toml @@ -14,7 +14,7 @@ categories = ["development-tools::testing", "emulators", "embedded", "os", "no-s # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -log = "0.4.17" +log = "0.4.20" [lib] name = "deexit" diff --git a/utils/gramatron/construct_automata/Cargo.toml b/utils/gramatron/construct_automata/Cargo.toml index c3932c8f90..8056226fa8 100644 --- a/utils/gramatron/construct_automata/Cargo.toml +++ b/utils/gramatron/construct_automata/Cargo.toml @@ -21,4 +21,4 @@ postcard = "1.0" lazy_static = "1.4.0" libafl = { path = "../../../libafl" } clap = { version = "4.0", features = ["derive"] } -log = "0.4.17" +log = "0.4.20" diff --git a/utils/noaslr/noaslr/Cargo.toml b/utils/noaslr/noaslr/Cargo.toml index 6708c8c26a..51d6d3b65c 100644 --- a/utils/noaslr/noaslr/Cargo.toml +++ b/utils/noaslr/noaslr/Cargo.toml @@ -9,7 +9,7 @@ vergen = { version = "8.1.1", features = ["build", "cargo", "git", "gitcl", "rus [dependencies] anyhow = { version = "1.0.71", default-features = false } clap = { version = "4.2.0", default-features = false, features = ["derive", "string", "std", "help", "derive", "error-context", "usage"] } -log = { version = "0.4.19", default-features = false } +log = { version = "0.4.20", default-features = false } nix = { version = "0.26.2", default-features = false, features = ["process", "personality"] } readonly = { version = "0.2.8", default-features = false } simplelog = { version = "0.12.1", default-features = false }