Update requirements (#714)

* Update requirements

* more updates

* nits

* more updates

* update nix for fuzzers

* use any regex 1 instead of 1.6

fuzzers/backtrace_baby_fuzzers/forkserver_executor/Cargo.toml

@@ -15,4 +15,4 @@ opt-level = 3
 
 [dependencies]
 libafl = { path = "../../../libafl/" }
-clap = { version = "3.1", features = ["default"] }
+clap = { version = "3.2", features = ["default"] }

fuzzers/forkserver_simple/Cargo.toml

@@ -17,5 +17,5 @@ opt-level = 3
 
 [dependencies]
 libafl = { path = "../../libafl/" }
-clap = { version = "3.1", features = ["default"] }
+clap = { version = "3.2", features = ["default"] }
-nix = "0.23"
+nix = "0.24"

fuzzers/frida_libpng/Cargo.toml

@@ -28,16 +28,16 @@ reqwest = { version = "0.11.4", features = ["blocking"] }
 
 [dependencies]
 libafl = { path = "../../libafl/", features = [ "std", "llmp_compression", "llmp_bind_public", "frida_cli" ] } #,  "llmp_small_maps", "llmp_debug"]}
-capstone = "0.10.0"
+capstone = "0.10"
-frida-gum = { version = "0.6.3", features = [ "auto-download", "event-sink", "invocation-listener"] }
+frida-gum = { version = "0.6.5", features = [ "auto-download", "event-sink", "invocation-listener"] }
 libafl_frida = { path = "../../libafl_frida", features = ["cmplog"] }
 libafl_targets = { path = "../../libafl_targets", features = ["sancov_cmplog"] }
 lazy_static = "1.4.0"
 libc = "0.2"
 libloading = "0.7"
-num-traits = "0.2.14"
+num-traits = "0.2"
 rangemap = "0.1"
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "3.2", features = ["derive"] }
 serde = "1.0"
 mimalloc = { version = "*", default-features = false }
 

fuzzers/fuzzbench/Cargo.toml

@@ -24,8 +24,8 @@ libafl = { path = "../../libafl/" }
 libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer"] }
 # TODO Include it only when building cc
 libafl_cc = { path = "../../libafl_cc/" }
-clap = { version = "3.1", features = ["default"] }
+clap = { version = "3.2", features = ["default"] }
-nix = "0.23"
+nix = "0.24"
 mimalloc = { version = "*", default-features = false }
 
 [lib]

fuzzers/fuzzbench_fork_qemu/Cargo.toml

@@ -14,5 +14,5 @@ debug = true
 [dependencies]
 libafl = { path = "../../libafl/" }
 libafl_qemu = { path = "../../libafl_qemu/", features = ["x86_64"] }
-clap = { version = "3.1", features = ["default"] }
+clap = { version = "3.2", features = ["default"] }
-nix = "0.23"
+nix = "0.24"

fuzzers/fuzzbench_qemu/Cargo.toml

@@ -14,5 +14,5 @@ debug = true
 [dependencies]
 libafl = { path = "../../libafl/" }
 libafl_qemu = { path = "../../libafl_qemu/", features = ["x86_64"] }
-clap = { version = "3.1", features = ["default"] }
+clap = { version = "3.2", features = ["default"] }
-nix = "0.23"
+nix = "0.24"

fuzzers/fuzzbench_text/Cargo.toml

@@ -24,8 +24,8 @@ libafl = { path = "../../libafl/" }
 libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer"] }
 # TODO Include it only when building cc
 libafl_cc = { path = "../../libafl_cc/" }
-clap = { version = "3.1", features = ["default"] }
+clap = { version = "3.2", features = ["default"] }
-nix = "0.23"
+nix = "0.24"
 mimalloc = { version = "*", default-features = false }
 content_inspector = "0.2.4"
 

fuzzers/fuzzbench_weighted/Cargo.toml

@@ -24,8 +24,8 @@ libafl = { path = "../../libafl/" }
 libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer"] }
 # TODO Include it only when building cc
 libafl_cc = { path = "../../libafl_cc/" }
-clap = { version = "3.1", features = ["default"] }
+clap = { version = "3.2", features = ["default"] }
-nix = "0.23"
+nix = "0.24"
 mimalloc = { version = "*", default-features = false }
 
 [lib]

fuzzers/libafl_atheris/Cargo.toml

@@ -22,7 +22,7 @@ num_cpus = "1.0"
 [dependencies]
 libafl = { path = "../../libafl/" }
 libafl_targets = { path = "../../libafl_targets/", features = ["pointer_maps", "sancov_cmplog", "libfuzzer"] }
-clap = { version = "3.1", features = ["default"] }
+clap = { version = "3.2", features = ["default"] }
 
 [lib]
 name = "afl_atheris"

fuzzers/libfuzzer_libpng_accounting/Cargo.toml

@@ -24,7 +24,7 @@ libafl = { path = "../../libafl/", features = ["std", "derive", "llmp_compressio
 libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] }
 # TODO Include it only when building cc
 libafl_cc = { path = "../../libafl_cc/" }
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "3.2", features = ["derive"] }
 mimalloc = { version = "*", default-features = false }
 
 [lib]

fuzzers/libfuzzer_libpng_ctx/Cargo.toml

@@ -24,7 +24,7 @@ libafl = { path = "../../libafl/", features = ["std", "derive", "llmp_compressio
 libafl_targets = { path = "../../libafl_targets/", features = ["libfuzzer"] }
 # TODO Include it only when building cc
 libafl_cc = { path = "../../libafl_cc/" }
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "3.2", features = ["derive"] }
 mimalloc = { version = "*", default-features = false }
 
 [lib]

fuzzers/libfuzzer_libpng_launcher/Cargo.toml

@@ -24,7 +24,7 @@ libafl = { path = "../../libafl/", features = ["std", "derive", "llmp_compressio
 libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] }
 # TODO Include it only when building cc
 libafl_cc = { path = "../../libafl_cc/" }
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "3.2", features = ["derive"] }
 mimalloc = { version = "*", default-features = false }
 
 [lib]

fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml

@@ -18,7 +18,7 @@ debug = true
 [dependencies]
 libafl = { path = "../../../libafl/", features = ["concolic_mutation"] }
 libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer"] }
-clap = { version = "3.1", features = ["derive"]}
+clap = { version = "3.2", features = ["derive"]}
 mimalloc = { version = "*", default-features = false }
 
 [build-dependencies]

libafl/Cargo.toml

@@ -43,43 +43,43 @@ rustversion = "1.0"
 
 [dev-dependencies]
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
-num_cpus = "^1.6.2" # cpu count, for llmp example
+num_cpus = "^1.13.1" # cpu count, for llmp example
-serial_test = "0.5"
+serial_test = "0.8"
 
 [dependencies]
 libafl_derive = { version = "0.8.0", optional = true, path = "../libafl_derive" }
 
 rustversion = "1.0"
 tuple_list = { version = "0.1.3" }
-hashbrown =  { version = "0.11", features = ["serde", "ahash-compile-time-rng"], default-features=false } # A faster hashmap, nostd compatible
+hashbrown =  { version = "0.12", features = ["serde", "ahash-compile-time-rng"], default-features=false } # A faster hashmap, nostd compatible
 num-traits = { version = "0.2", default-features = false }
-xxhash-rust = { version = "0.8.2", features = ["xxh3"] } # xxh3 hashing for rust
+xxhash-rust = { version = "0.8.5", features = ["xxh3"] } # xxh3 hashing for rust
 serde = { version = "1.0", default-features = false, features = ["alloc"] } # serialization lib
-erased-serde = { version = "0.3.12", default-features = false, features = ["alloc"] } # erased serde
+erased-serde = { version = "0.3.21", default-features = false, features = ["alloc"] } # erased serde
-postcard = { version = "0.7", features = ["alloc"] } # no_std compatible serde serialization fromat
+postcard = { version = "1.0", features = ["alloc"] } # no_std compatible serde serialization fromat
 bincode = {version = "1.3", optional = true }
 static_assertions = "1.1.0"
-num_enum = { version = "0.5.4", default-features = false }
+num_enum = { version = "0.5.7", default-features = false }
-num_cpus = { version = "^1.6.2", optional = true }
+num_cpus = { version = "^1.13.1", optional = true }
-typed-builder = "0.9.1" # Implement the builder pattern at compiletime
+typed-builder = "0.10.0" # Implement the builder pattern at compiletime
 ahash = { version = "0.7", default-features=false, features=["compile-time-rng"] } # The hash function already used in hashbrown
 intervaltree = { version = "0.2.7", default-features = false, features = ["serde"] }
 backtrace = {version = "0.3", optional = true} # Used to get the stacktrace in StacktraceObserver
 
 ctor = { optional = true, version = "0.1" }
 serde_json = { version = "1.0", optional = true, default-features = false, features = ["alloc"] }
-miniz_oxide = { version = "0.4.4", optional = true}
+miniz_oxide = { version = "0.5.3", 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.23", optional = true }
+nix = { version = "0.24", optional = true }
 regex = { version = "1", optional = true }
-uuid = { version = "0.8.2", optional = true, features = ["serde", "v4"] }
+uuid = { version = "1.1.2", optional = true, features = ["serde", "v4"] }
-byteorder = { version = "1.2", optional = true }
+byteorder = { version = "1.4", optional = true }
-once_cell = { version =  "1.2", optional = true }
+once_cell = { version =  "1.13", optional = true }
-libm = "0.2.1"
+libm = "0.2.2"
-tui = { version = "0.16", default-features = false, features = ['crossterm'], optional = true }
+tui = { version = "0.18", default-features = false, features = ['crossterm'], optional = true }
-crossterm = { version = "0.20", optional = true }
+crossterm = { version = "0.24", optional = true }
-clap = {version = "3.1", features = ["derive", "wrap_help"], optional = true}
+clap = {version = "3.2", features = ["derive", "wrap_help"], optional = true}
 
 wait-timeout = { version = "0.2", optional = true } # used by CommandExecutor to wait for child process
 
@@ -94,15 +94,15 @@ grammartec = { version = "0.1", optional = true }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2" # For (*nix) libc
-uds = "0.2.3"
+uds = "0.2.6"
-lock_api = "0.4.3"
+lock_api = "0.4.7"
-regex = "1.4.5"
+regex = "1"
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.37.0", features = ["Win32_Foundation", "Win32_System_Threading", "Win32_System_Diagnostics_Debug", "Win32_System_Kernel", "Win32_System_Memory", "Win32_Security", "Win32_System_SystemInformation"] }
+windows = { version = "0.39.0", features = ["Win32_Foundation", "Win32_System_Threading", "Win32_System_Diagnostics_Debug", "Win32_System_Kernel", "Win32_System_Memory", "Win32_Security", "Win32_System_SystemInformation"] }
 
 [target.'cfg(windows)'.build-dependencies]
-windows = "0.37.0"
+windows = "0.39.0"
 
 #[profile.release]
 #lto = true

libafl/src/bolts/build_id.rs

@@ -90,10 +90,10 @@ fn calculate() -> Uuid {
     hasher.write_u8(0);
     <byteorder::NativeEndian as byteorder::ByteOrder>::write_u64(&mut bytes[8..], hasher.finish());
 
-    uuid::Builder::from_bytes(bytes)
+    *uuid::Builder::from_bytes(bytes)
         .set_variant(uuid::Variant::RFC4122)
         .set_version(uuid::Version::Random)
-        .build()
+        .as_uuid()
 }
 
 struct HashWriter<T: Hasher>(T);

libafl/src/bolts/shmem.rs

@@ -1197,7 +1197,7 @@ pub mod win32_shmem {
         fn new_shmem(map_size: usize) -> Result<Self, Error> {
             unsafe {
                 let uuid = Uuid::new_v4();
-                let mut map_str = format!("libafl_{}", uuid.to_simple());
+                let mut map_str = format!("libafl_{}", uuid.simple());
                 let map_str_bytes = map_str.as_mut_vec();
                 map_str_bytes[19] = 0; // Trucate to size 20
                 let handle = CreateFileMappingA(

libafl_cc/Cargo.toml

@@ -15,7 +15,7 @@ categories = ["development-tools::testing", "emulators", "embedded", "os", "no-s
 
 [build-dependencies]
 cc = { version = "1.0", features = ["parallel"] }
-which = "4.2.2"
+which = "4.2.5"
 
 [target.'cfg(target_vendor = "apple")'.build-dependencies]
 glob = "0.3"

libafl_concolic/symcc_libafl/Cargo.toml

@@ -19,5 +19,5 @@ build = ["which", "cmake"] # common functionality to build symcc
 clone = ["which"] # common functionality to check out the symcc repo using git
 
 [dependencies]
-which = { version = "4.1", optional = true }
+which = { version = "4.2", optional = true }
 cmake = { version = "0.1", optional = true }

libafl_concolic/symcc_runtime/Cargo.toml

@@ -19,15 +19,15 @@ categories = ["development-tools::testing", "emulators", "embedded", "os", "no-s
 no-cpp-runtime = []
 
 [dependencies]
-unchecked_unwrap = "3"
+unchecked_unwrap = "4"
 ctor = "0.1"
 libc = "0.2"
 libafl = {path = "../../libafl", version="0.8", default-features=false, features=["std"]}
 
 [build-dependencies]
 cmake = "0.1"
-bindgen = "0.59"
+bindgen = "0.60"
 regex = "1"
 lazy_static = "1.4"
-which = "4.1"
+which = "4.2"
 symcc_libafl = {path = "../symcc_libafl", version="0.8"}

libafl_concolic/test/dump_constraints/Cargo.toml

@@ -15,4 +15,4 @@ categories = ["development-tools::testing", "emulators", "embedded", "os", "no-s
 
 [dependencies]
 libafl = {path = "../../../libafl"}
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "3.2", features = ["derive"] }

libafl_frida/Cargo.toml

@@ -22,20 +22,20 @@ cc = { version = "1.0", features = ["parallel"] }
 libafl = { path = "../libafl", version = "0.8.0", features = ["std", "libafl_derive", "frida_cli"] }
 libafl_targets = { path = "../libafl_targets", version = "0.8.0", features = ["std", "sancov_cmplog"] }
 
-nix = "0.23"
+nix = "0.24"
 libc = "0.2"
-hashbrown = "0.11"
+hashbrown = "0.12"
 libloading = "0.7"
-rangemap = "0.1"
+rangemap = "1.0"
 frida-gum-sys = { version = "0.3", features = [ "auto-download", "event-sink", "invocation-listener"] }
-frida-gum = { version = "0.6.3", features = [ "auto-download", "event-sink", "invocation-listener"] }
+frida-gum = { version = "0.6.5", features = [ "auto-download", "event-sink", "invocation-listener"] }
-regex = "1.4"
+regex = "1"
 dynasmrt = "1.2"
-capstone = "0.10.0"
+capstone = "0.10"
 color-backtrace ={ version = "0.5", features = [ "resolve-modules" ] }
-termcolor = "1.1.2"
+termcolor = "1.1.3"
 serde = "1.0"
 backtrace = { version = "0.3", default-features = false, features = ["std", "serde"] }
-num-traits = "0.2.14"
+num-traits = "0.2"
 ahash = "0.7"
 paste = "1.0"

libafl_qemu/Cargo.toml

@@ -30,24 +30,24 @@ libafl = { path = "../libafl", version = "0.8.0" }
 libafl_targets = { path = "../libafl_targets", version = "0.8.0" }
 
 serde = { version = "1.0", default-features = false, features = ["alloc"] } # serialization lib
-hashbrown =  { version = "0.11", features = ["serde", "ahash-compile-time-rng"] } # A faster hashmap, nostd compatible
+hashbrown =  { version = "0.12", features = ["serde", "ahash-compile-time-rng"] } # A faster hashmap, nostd compatible
 num-traits = "0.2"
-num_enum = "0.5.4"
+num_enum = "0.5.7"
-goblin = "0.4.2"
+goblin = "0.5.3"
 libc = "0.2"
-strum = "0.21"
+strum = "0.24"
-strum_macros = "0.21"
+strum_macros = "0.24"
-syscall-numbers = "2.0"
+syscall-numbers = "3.0"
-bio = "0.39"
+bio = "0.41"
-thread_local = "1.1.3"
+thread_local = "1.1.4"
 capstone = "0.10"
 #pyo3 = { version = "0.15", features = ["extension-module"], optional = true }
 pyo3 = { version = "0.15", optional = true }
 
 [build-dependencies]
 cc = { version = "1.0" }
-which = "4.1"
+which = "4.2"
-pyo3-build-config = { version = "0.15", optional = true }
+pyo3-build-config = { version = "0.16", optional = true }
 
 [lib]
 name = "libafl_qemu"

libafl_sugar/Cargo.toml

@@ -24,14 +24,14 @@ arm = ["libafl_qemu/arm"] # build qemu for arm
 aarch64 = ["libafl_qemu/aarch64"] # build qemu for aarch64
 
 [build-dependencies]
-pyo3-build-config = { version = "0.15", optional = true }
+pyo3-build-config = { version = "0.16", optional = true }
 
 [dependencies]
 libafl = { path = "../libafl", version = "0.8.0" }
 libafl_targets = { path = "../libafl_targets", version = "0.8.0" }
 libafl_qemu = { path = "../libafl_qemu", version = "0.8.0" }
 
-typed-builder = "0.9.1" # Implement the builder pattern at compiletime
+typed-builder = "0.10.0" # Implement the builder pattern at compiletime
 #pyo3 = { version = "0.15", features = ["extension-module"], optional = true }
 pyo3 = { version = "0.15", optional = true }
 

libafl_targets/Cargo.toml

@@ -32,6 +32,6 @@ cc = { version = "1.0", features = ["parallel"] }
 [dependencies]
 libafl = { path = "../libafl", version = "0.8.0", default-features = false, features = [] }
 
-rangemap = "0.1"
+rangemap = "1.0"
 serde = { version = "1.0", default-features = false, features = ["alloc"] } # serialization lib
 # serde-big-array = "0.3.2"

utils/gramatron/construct_automata/Cargo.toml

@@ -17,7 +17,7 @@ categories = ["development-tools::testing", "emulators", "embedded", "os", "no-s
 [dependencies]
 serde_json = "1.0"
 regex = "1"
-postcard = "0.7"
+postcard = "1.0"
 lazy_static = "1.4.0"
 libafl = { path = "../../../libafl" }
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "3.2", features = ["derive"] }

utils/libafl_benches/Cargo.toml

@@ -14,8 +14,8 @@ categories = ["development-tools::testing", "emulators", "embedded", "os", "no-s
 [dev-dependencies]
 criterion = "0.3" # Benchmarking
 ahash = { version = "0.7", default-features=false, features=["compile-time-rng"] } # The hash function already used in hashbrown
-rustc-hash = { version = "1.0", default-features=false } # yet another hash
+rustc-hash = { version = "1.1", default-features=false } # yet another hash
-xxhash-rust = { version = "0.8.2", features = ["xxh3"] } # xxh3 hashing for rust
+xxhash-rust = { version = "0.8.5", features = ["xxh3"] } # xxh3 hashing for rust
 libafl = { path = "../../libafl", default-features=false } # libafl
 
 [[bench]]