From a35b34745d52c41c083b46913b860b8dcdcd31d3 Mon Sep 17 00:00:00 2001
From: toka <tokazerkje@outlook.com>
Date: Thu, 15 Jun 2023 15:02:43 +0200
Subject: [PATCH] more

---
 grimoire/src/bin/grimoire_cc.rs | 12 ++++----
 grimoire/src/lib.rs             | 52 +++++++++------------------------
 2 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/grimoire/src/bin/grimoire_cc.rs b/grimoire/src/bin/grimoire_cc.rs
index b4e42c3..920b1ba 100644
--- a/grimoire/src/bin/grimoire_cc.rs
+++ b/grimoire/src/bin/grimoire_cc.rs
@@ -32,12 +32,12 @@ pub fn main() {
             .add_arg("-fsanitize-coverage=trace-pc-guard,trace-cmp")
             .add_pass(LLVMPasses::CmpLogRtn)
             // needed by Nautilus
-            .add_link_arg("-Wl,--push-state,-Bstatic")
-            .add_link_arg("-L/usr/local/lib/python3.8/config-3.8-x86_64-linux-gnu/")
-            .add_link_arg("-L/usr/lib/python3.8/config-3.8-x86_64-linux-gnu/")
-            .add_link_arg("-lpython3.8")
-            .add_link_arg("-Wl,--pop-state")
-            .add_link_arg("-lutil")
+            // .add_link_arg("-Wl,--push-state,-Bstatic")
+            // .add_link_arg("-L/usr/local/lib/python3.8/config-3.8-x86_64-linux-gnu/")
+            // .add_link_arg("-L/usr/lib/python3.8/config-3.8-x86_64-linux-gnu/")
+            // .add_link_arg("-lpython3.8")
+            // .add_link_arg("-Wl,--pop-state")
+            // .add_link_arg("-lutil")
             .run()
             .expect("Failed to run the wrapped compiler")
         {
diff --git a/grimoire/src/lib.rs b/grimoire/src/lib.rs
index be90582..ecf845f 100644
--- a/grimoire/src/lib.rs
+++ b/grimoire/src/lib.rs
@@ -75,12 +75,6 @@ pub fn libafl_main() {
                 .long("output")
                 .help("The directory to place finds in ('corpus')"),
         )
-        .arg(
-            Arg::new("report")
-                .short('r')
-                .long("report")
-                .help("The directory to place dumped testcases ('corpus')"),
-        )
         .arg(
             Arg::new("tokens")
                 .short('x')
@@ -95,10 +89,10 @@ pub fn libafl_main() {
                 .default_value("12000"),
         )
         .arg(
-            Arg::new("dump")
-                .short('d')
-                .long("dump")
-                .help("Dump serialized testcases to bytes"),
+            Arg::new("in")
+                .short('i')
+                .long("input")
+                .help("The directory to read initial inputs from ('seeds')"),
         )
         .arg(Arg::new("remaining"))
         .try_get_matches()
@@ -142,24 +136,18 @@ pub fn libafl_main() {
             return;
         }
     }
-    let mut initial_dir = out_dir.clone();
-    initial_dir.push("initial");
-    fs::create_dir_all(&initial_dir).unwrap();
     let mut crashes = out_dir.clone();
     crashes.push("crashes");
     out_dir.push("queue");
 
-    let report_dir = PathBuf::from(
-        res.get_one::<String>("report")
-            .expect("The --report parameter is missing")
+    let in_dir = PathBuf::from(
+        res.get_one::<String>("in")
+            .expect("The --input parameter is missing")
             .to_string(),
     );
-    if fs::create_dir(&report_dir).is_err() {
-        println!("Report dir at {:?} already exists.", &report_dir);
-        if !report_dir.is_dir() {
-            println!("Report dir at {:?} is not a valid directory!", &report_dir);
-            return;
-        }
+    if !in_dir.is_dir() {
+        println!("In dir at {:?} is not a valid directory!", &in_dir);
+        return;
     }
 
     let tokens = res.get_one::<String>("tokens").map(PathBuf::from);
@@ -172,7 +160,7 @@ pub fn libafl_main() {
             .expect("Could not parse timeout in milliseconds"),
     );
 
-    fuzz(initial_dir, out_dir, crashes, report_dir, tokens, timeout)
+    fuzz(in_dir, out_dir, crashes, tokens, timeout)
         .expect("An error occurred while fuzzing");
 }
 
@@ -207,10 +195,9 @@ fn run_testcases(filenames: &[&str]) {
 
 /// The actual fuzzer
 fn fuzz(
-    initial_dir: PathBuf,
+    in_dir: PathBuf,
     corpus_dir: PathBuf,
     objective_dir: PathBuf,
-    report_dir: PathBuf,
     tokenfile: Option<PathBuf>,
     timeout: Duration,
 ) -> Result<(), Error> {
@@ -374,9 +361,9 @@ fn fuzz(
     // In case the corpus is empty (on first run), reset
     if state.corpus().count() < 1 {
         state
-            .load_initial_inputs(&mut fuzzer, &mut executor, &mut mgr, &[initial_dir.clone()])
+            .load_initial_inputs(&mut fuzzer, &mut executor, &mut mgr, &[in_dir.clone()])
             .unwrap_or_else(|_| {
-                println!("Failed to load initial corpus at {:?}", &initial_dir);
+                println!("Failed to load initial corpus at {:?}", &in_dir);
                 std::process::exit(0);
             });
         println!("We imported {} inputs from disk.", state.corpus().count());
@@ -398,18 +385,7 @@ fn fuzz(
         3,
     );
 
-    let fuzzbench = libafl::stages::DumpToDiskStage::new(
-        |input: &BytesInput, state: &StdState<_, _, _, _>| {
-            let (res, _) = input.clone().try_transform_into(state).unwrap();
-            res.bytes().to_vec()
-        },
-        &report_dir.join("queue"),
-        &report_dir.join("crashes"),
-    )
-    .unwrap();
-
     let mut stages = tuple_list!(
-        fuzzbench,
         generalization,
         tracing,
         i2s,