Update to latest LibAFL, reduce default core count

Author: domenukk

cargo-libafl/cargo-libafl-runtime/Cargo.toml

@@ -13,11 +13,11 @@ edition = "2021"
 [workspace]
 
 [dependencies]
-libafl = { git = "https://github.com/AFLplusplus/LibAFL.git", rev = "4375206" }
-libafl_targets = { git = "https://github.com/AFLplusplus/LibAFL.git", rev = "4375206", features = ["sancov_8bit", "sancov_cmplog"] }
+libafl = { git = "https://github.com/AFLplusplus/LibAFL.git", rev = "7ed1ac9" }
+libafl_targets = { git = "https://github.com/AFLplusplus/LibAFL.git", rev = "7ed1ac9", features = ["sancov_8bit", "sancov_cmplog"] }
 mimalloc = { version = "*", default-features = false }
 portpicker = "0.1.1"
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.0", features = ["derive"] }
 
 [profile.release]
 lto = true

cargo-libafl/cargo-libafl-runtime/runtime.rs

@@ -62,86 +62,71 @@ fn timeout_from_millis_str(time: &str) -> Result<Duration, Error> {
 }
 
 #[derive(Parser, Debug)]
-#[clap(
+#[command(
     name = "cargo-libafl",
     about = "A `cargo` wrapper to fuzz Rust code with `LibAFL`",
     author = "Andrea Fioraldi <andreafioraldi@gmail.com> and the LibAFL team"
 )]
 struct Opt {
-    #[clap(
+    #[arg(
         short,
         long,
-        parse(try_from_str = Cores::from_cmdline),
+        value_parser = Cores::from_cmdline,
         help = "Spawn a client in each of the provided cores. Broker runs in the 0th core. 'all' to select all available cores. 'none' to run a client without binding to any core. eg: '1,2-4,6' selects the cores 1,2,3,4,6.",
-        default_value = "all",
+        default_value = "1",
         name = "CORES"
     )]
     cores: Cores,
 
-    #[clap(
+    #[arg(
         short = 'p',
         long,
         help = "Choose the broker TCP port, otherwise pick one at random",
         name = "PORT"
     )]
     broker_port: Option<u16>,
 
-    #[clap(
-        parse(try_from_str),
-        short = 'a',
-        long,
-        help = "Specify a remote broker",
-        name = "REMOTE"
-    )]
+    #[arg(short = 'a', long, help = "Specify a remote broker", name = "REMOTE")]
     remote_broker_addr: Option<SocketAddr>,
 
-    #[clap(
-        parse(try_from_str),
-        short,
-        long,
-        help = "Set an initial corpus directory",
-        name = "INPUT"
-    )]
+    #[arg(short, long, help = "Set an initial corpus directory", name = "INPUT")]
     input: Vec<PathBuf>,
 
-    #[clap(
+    #[arg(
         short,
         long,
-        parse(try_from_str),
         help = "Set the output directory, default is ./out",
         name = "OUTPUT",
         default_value = "./out"
     )]
     output: PathBuf,
 
-    #[clap(
-        parse(try_from_str = timeout_from_millis_str),
+    #[arg(
+        value_parser = timeout_from_millis_str,
         short,
         long,
-        help = "Set the execuution timeout in milliseconds, default is 1000",
+        help = "Set the execution timeout in milliseconds, default is 1000",
         name = "TIMEOUT",
         default_value = "1000"
     )]
     timeout: Duration,
 
-    #[clap(
-        parse(from_os_str),
+    #[arg(
         short = 'x',
         long,
         help = "Feed the fuzzer with an user-specified list of tokens (often called \"dictionary\")",
-        name = "TOKENS",
-        multiple = true
+        name = "TOKENS"
     )]
     tokens: Vec<PathBuf>,
 
-    #[clap(
+    #[arg(
         long,
         help = "Disable unicode in the UI (for old terminals)",
         name = "DISABLE_UNICODE"
     )]
     disable_unicode: bool,
 
-    #[clap(
+    #[arg(
         short = 'g',
         long,
         help = "Use GRIMOIRE, a mutator for text-based inputs",