Trying to redo workspace deps again after #2672

AFLplusplus · Nov 9, 2024 · 2df741b · 2df741b
1 parent 21f8b1d
commit 2df741b
Show file tree

Hide file tree

Showing 48 changed files with 191 additions and 160 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,7 +1,6 @@
 version: 2
 updates:
   - package-ecosystem: "cargo"
-    directories:
-      - "*"
+    directory: "/"
     schedule:
       interval: "daily"
diff --git a/Cargo.toml b/Cargo.toml
@@ -49,6 +49,43 @@ exclude = [
 [workspace.package]
 version = "0.13.2"
 
+[workspace.dependencies]
+ahash = { version = "0.8.11", default-features = false } # The hash function already used in hashbrown
+backtrace = { version = "0.3.74", default-features = false } # Used to get the stacktrace in StacktraceObserver
+bindgen = "0.70.1"
+clap = "4.5.18"
+cc = "1.1.21"
+cmake = "0.1.51"
+document-features = "0.2.10"
+hashbrown = { version = "0.14.5", default-features = false } # A faster hashmap, nostd compatible
+libc = "0.2.159" # For (*nix) libc
+log = "0.4.22"
+meminterval = "0.4.1"
+mimalloc = { version = "0.1.43", default-features = false }
+nix = { version = "0.29.0", default-features = false }
+num_enum = { version = "0.7.3", default-features = false }
+num-traits = { version = "0.2.19", default-features = false }
+paste = "1.0.15"
+postcard = { version = "1.0.10", features = [
+  "alloc",
+], default-features = false } # no_std compatible serde serialization format
+rangemap = "1.5.1"
+regex = "1.10.6"
+rustversion = "1.0.17"
+serde = { version = "1.0.210", default-features = false } # serialization lib
+serial_test = { version = "3.1.1", default-features = false }
+serde_json = { version = "1.0.128", default-features = false }
+serde_yaml = { version = "0.9.34" } # For parsing the injections yaml file
+strum = "0.26.3"
+strum_macros = "0.26.4"
+toml = "0.8.19" # For parsing the injections toml file
+typed-builder = "0.20.0" # Implement the builder pattern at compiletime
+uuid = { version = "1.10.0", features = ["serde", "v4"] }
+which = "6.0.3"
+windows = "0.58.0"
+z3 = "0.12.1"
+
+
 [workspace.lints.rust]
 # Forbid
 unexpected_cfgs = "forbid"

diff --git a/fuzzers/baby/tutorial/Cargo.toml b/fuzzers/baby/tutorial/Cargo.toml
@@ -19,7 +19,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl", features = ["default", "rand_trait"] }

diff --git a/fuzzers/forkserver/forkserver_libafl_cc/Cargo.toml b/fuzzers/forkserver/forkserver_libafl_cc/Cargo.toml
@@ -18,7 +18,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = { version = "6.0.3" }
 
 [dependencies]
 clap = { version = "4.5.18", features = ["derive"] }

diff --git a/fuzzers/forkserver/fuzzbench_forkserver/Cargo.toml b/fuzzers/forkserver/fuzzbench_forkserver/Cargo.toml
@@ -20,7 +20,7 @@ strip = true
 
 [build-dependencies]
 cc = { version = "1.1.22", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl" }

diff --git a/fuzzers/forkserver/fuzzbench_forkserver_cmplog/Cargo.toml b/fuzzers/forkserver/fuzzbench_forkserver_cmplog/Cargo.toml
@@ -20,7 +20,7 @@ strip = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl" }

diff --git a/fuzzers/fuzz_anything/libafl_atheris/Cargo.toml b/fuzzers/fuzz_anything/libafl_atheris/Cargo.toml
@@ -19,7 +19,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl" }

diff --git a/fuzzers/inprocess/dynamic_analysis/Cargo.toml b/fuzzers/inprocess/dynamic_analysis/Cargo.toml
@@ -25,7 +25,7 @@ strip = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 env_logger = "0.11.5"

diff --git a/fuzzers/inprocess/fuzzbench/Cargo.toml b/fuzzers/inprocess/fuzzbench/Cargo.toml
@@ -25,7 +25,7 @@ strip = true
 
 [build-dependencies]
 cc = { version = "1.0.106", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl" }

diff --git a/fuzzers/inprocess/fuzzbench_ctx/Cargo.toml b/fuzzers/inprocess/fuzzbench_ctx/Cargo.toml
@@ -25,7 +25,7 @@ strip = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl" }

diff --git a/fuzzers/inprocess/fuzzbench_text/Cargo.toml b/fuzzers/inprocess/fuzzbench_text/Cargo.toml
@@ -20,7 +20,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl" }

diff --git a/fuzzers/inprocess/libfuzzer_libpng/Cargo.toml b/fuzzers/inprocess/libfuzzer_libpng/Cargo.toml
@@ -21,7 +21,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl", features = ["default"] }

diff --git a/fuzzers/inprocess/libfuzzer_libpng_accounting/Cargo.toml b/fuzzers/inprocess/libfuzzer_libpng_accounting/Cargo.toml
@@ -19,7 +19,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl", features = [

diff --git a/fuzzers/inprocess/libfuzzer_libpng_centralized/Cargo.toml b/fuzzers/inprocess/libfuzzer_libpng_centralized/Cargo.toml
@@ -19,7 +19,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl", features = [

diff --git a/fuzzers/inprocess/libfuzzer_libpng_cmin/Cargo.toml b/fuzzers/inprocess/libfuzzer_libpng_cmin/Cargo.toml
@@ -22,7 +22,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl", features = ["default", "cmin"] }

diff --git a/fuzzers/inprocess/libfuzzer_libpng_launcher/Cargo.toml b/fuzzers/inprocess/libfuzzer_libpng_launcher/Cargo.toml
@@ -19,7 +19,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl", features = [

diff --git a/fuzzers/inprocess/libfuzzer_libpng_norestart/Cargo.toml b/fuzzers/inprocess/libfuzzer_libpng_norestart/Cargo.toml
@@ -19,7 +19,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 env_logger = "0.11.5"

diff --git a/fuzzers/inprocess/libfuzzer_libpng_tcp_manager/Cargo.toml b/fuzzers/inprocess/libfuzzer_libpng_tcp_manager/Cargo.toml
@@ -21,7 +21,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 libafl = { path = "../../../libafl", features = ["default", "tcp_manager"] }

diff --git a/fuzzers/inprocess/sqlite_centralized_multi_machine/Cargo.toml b/fuzzers/inprocess/sqlite_centralized_multi_machine/Cargo.toml
@@ -20,7 +20,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.1.21", features = ["parallel"] }
-which = { version = "7.0.0" }
+which = "6.0.3"
 
 [dependencies]
 # no llmp compression for now, better perfs.

diff --git a/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml
@@ -34,5 +34,5 @@ mimalloc = { version = "0.1.43", default-features = false }
 [build-dependencies]
 cc = { version = "1.1.22", features = ["parallel"] }
 cmake = "0.1.51"
-which = { version = "7.0.0" }
+which = "6.0.3"
 symcc_libafl = { path = "../../../../libafl_concolic/symcc_libafl" }
diff --git a/libafl/Cargo.toml b/libafl/Cargo.toml
@@ -189,7 +189,7 @@ nautilus = [
 rustversion = "1.0.17"
 
 [dev-dependencies]
-serde_json = { version = "1.0.128", default-features = false, features = [
+serde_json = { workspace = true, default-features = false, features = [
   "alloc",
 ] }
 # clippy-suggested optimised byte counter
@@ -201,32 +201,28 @@ libafl_bolts = { version = "0.13.2", path = "../libafl_bolts", default-features
 ] }
 libafl_derive = { version = "0.13.2", path = "../libafl_derive", optional = true }
 
-rustversion = { version = "1.0.17" }
+rustversion = { workspace = true }
 tuple_list = { version = "0.1.3" }
-hashbrown = { version = "0.15.0", features = [
+hashbrown = { workspace = true, features = [
   "serde",
-  "default-hasher",
+  "ahash",
 ], default-features = false } # A faster hashmap, nostd compatible
-num-traits = { version = "0.2.19", default-features = false }
-serde = { version = "1.0.210", default-features = false, features = [
-  "alloc",
-] } # serialization lib
-postcard = { version = "1.0.10", features = [
-  "alloc",
-], default-features = false } # no_std compatible serde serialization format
+num-traits = { workspace = true, default-features = false }
+serde = { workspace = true, features = ["alloc"] } # serialization lib
+postcard = { workspace = true } # no_std compatible serde serialization format
 bincode = { version = "1.3.3", optional = true }
 c2rust-bitfields = { version = "0.19.0", features = ["no_std"] }
-ahash = { version = "0.8.11", default-features = false } # The hash function already used in hashbrown
-meminterval = { version = "0.4.1", features = ["serde"] }
-backtrace = { version = "0.3.74", default-features = false, optional = true } # Used to get the stacktrace in StacktraceObserver
-typed-builder = { version = "0.20.0", optional = true } # Implement the builder pattern at compiletime
+ahash = { workspace = true } # The hash function already used in hashbrown
+meminterval = { workspace = true, features = ["serde"] }
+backtrace = { workspace = true, optional = true } # Used to get the stacktrace in StacktraceObserver
+typed-builder = { workspace = true, optional = true } # Implement the builder pattern at compiletime
 
-serde_json = { version = "1.0.128", optional = true, default-features = false, features = [
+serde_json = { workspace = true, optional = true, default-features = false, features = [
   "alloc",
 ] }
-nix = { version = "0.29.0", default-features = true, optional = true }
-regex = { version = "1.10.6", optional = true }
-uuid = { version = "1.10.0", optional = true, features = ["serde", "v4"] }
+nix = { workspace = true, default-features = true, optional = true }
+regex = { workspace = true, optional = true }
+uuid = { workspace = true, optional = true, features = ["serde", "v4"] }
 libm = "0.2.8"
 ratatui = { version = "0.29.0", default-features = false, features = [
   'crossterm',
@@ -237,7 +233,7 @@ prometheus-client = { version = "0.22.3", optional = true } # For the prometheus
 tide = { version = "0.16.0", optional = true }
 async-std = { version = "1.13.0", features = ["attributes"], optional = true }
 futures = { version = "0.3.30", optional = true }
-log = { version = "0.4.22" }
+log = { workspace = true }
 tokio = { version = "1.40.0", optional = true, features = [
   "sync",
   "net",
@@ -268,24 +264,24 @@ pyo3 = { version = "0.22.3", features = ["gil-refs"], optional = true }
 regex-syntax = { version = "0.8.4", optional = true }                   # For nautilus
 
 # optional-dev deps (change when target.'cfg(accessible(::std))'.test-dependencies will be stable)
-serial_test = { version = "3.1.1", optional = true, default-features = false, features = [
+serial_test = { workspace = true, optional = true, default-features = false, features = [
   "logging",
 ] }
 
 # Document all features of this crate (for `cargo doc`)
-document-features = { version = "0.2.10", optional = true }
+document-features = { workspace = true, optional = true }
 # Optional
-clap = { version = "4.5.18", optional = true }
+clap = { workspace = true, optional = true }
 
 [lints]
 workspace = true
 
 [target.'cfg(unix)'.dependencies]
-libc = { version = "0.2.59" }                # For (*nix) libc
-z3 = { version = "0.12.1", optional = true } # for concolic mutation
+libc = { workspace = true }                # For (*nix) libc
+z3 = { workspace = true, optional = true } # for concolic mutation
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.58.0", features = [
+windows = { workspace = true, features = [
   "Win32_Foundation",
   "Win32_System_Threading",
   "Win32_System_Diagnostics_Debug",
@@ -296,4 +292,4 @@ windows = { version = "0.58.0", features = [
 ] }
 
 [target.'cfg(windows)'.build-dependencies]
-windows = { version = "0.58.0" }
+windows = { workspace = true }