From e99c2daa415d4102ea63f468304c30ada4840508 Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Mon, 15 Feb 2021 16:54:33 +0100
Subject: [PATCH] libafl package

---
 Cargo.toml                                    |   6 -
 fuzzers/libfuzzer_dummy/Cargo.toml            |  11 +-
 fuzzers/libfuzzer_dummy/src/mod.rs            |  14 +-
 fuzzers/libfuzzer_libpng/Cargo.toml           |  12 +-
 fuzzers/libfuzzer_libpng/src/mod.rs           |   6 +-
 fuzzers/libfuzzer_test/Cargo.toml             |  32 ----
 fuzzers/libfuzzer_test/build.rs               |  32 ----
 fuzzers/libfuzzer_test/in1/a                  |   1 -
 fuzzers/libfuzzer_test/in2/b                  |   1 -
 fuzzers/libfuzzer_test/src/mod.rs             | 163 ------------------
 fuzzers/libfuzzer_test/test.sh                |  18 --
 fuzzers/libfuzzer_test/test/test.c            |  43 -----
 {afl => libafl}/Cargo.toml                    |   4 +-
 {afl => libafl}/benches/hash_speeds.rs        |   2 +-
 {afl => libafl}/benches/rand_speeds.rs        |   2 +-
 {afl => libafl}/examples/llmp_test/main.rs    |   2 +-
 {afl => libafl}/src/bolts/llmp.rs             |   0
 {afl => libafl}/src/bolts/mod.rs              |   0
 {afl => libafl}/src/bolts/ownedref.rs         |   0
 {afl => libafl}/src/bolts/serdeany.rs         |   0
 {afl => libafl}/src/bolts/shmem.rs            |   0
 {afl => libafl}/src/bolts/tuples.rs           |   0
 {afl => libafl}/src/corpus/inmemory.rs        |   0
 {afl => libafl}/src/corpus/mod.rs             |   0
 {afl => libafl}/src/corpus/ondisk.rs          |   0
 {afl => libafl}/src/corpus/queue.rs           |   0
 {afl => libafl}/src/corpus/testcase.rs        |   0
 {afl => libafl}/src/events/llmp.rs            |   0
 {afl => libafl}/src/events/logger.rs          |   0
 {afl => libafl}/src/events/mod.rs             |   0
 {afl => libafl}/src/executors/inprocess.rs    |   0
 {afl => libafl}/src/executors/mod.rs          |   0
 {afl => libafl}/src/executors/runtime.rs      |   0
 {afl => libafl}/src/feedbacks/map.rs          |   0
 {afl => libafl}/src/feedbacks/mod.rs          |   0
 {afl => libafl}/src/generators/mod.rs         |   0
 {afl => libafl}/src/inputs/bytes.rs           |   0
 {afl => libafl}/src/inputs/mod.rs             |   0
 {afl => libafl}/src/lib.rs                    |   0
 {afl => libafl}/src/mutators/mod.rs           |   0
 {afl => libafl}/src/mutators/mutations.rs     |   0
 {afl => libafl}/src/mutators/scheduled.rs     |   0
 .../src/mutators/token_mutations.rs           |   0
 {afl => libafl}/src/observers/map.rs          |   0
 {afl => libafl}/src/observers/mod.rs          |   0
 {afl => libafl}/src/stages/mod.rs             |   0
 {afl => libafl}/src/stages/mutational.rs      |   0
 {afl => libafl}/src/state/mod.rs              |   0
 {afl => libafl}/src/stats/mod.rs              |   0
 {afl => libafl}/src/utils.rs                  |   0
 50 files changed, 22 insertions(+), 327 deletions(-)
 delete mode 100644 Cargo.toml
 delete mode 100644 fuzzers/libfuzzer_test/Cargo.toml
 delete mode 100644 fuzzers/libfuzzer_test/build.rs
 delete mode 100644 fuzzers/libfuzzer_test/in1/a
 delete mode 100644 fuzzers/libfuzzer_test/in2/b
 delete mode 100644 fuzzers/libfuzzer_test/src/mod.rs
 delete mode 100644 fuzzers/libfuzzer_test/test.sh
 delete mode 100644 fuzzers/libfuzzer_test/test/test.c
 rename {afl => libafl}/Cargo.toml (93%)
 rename {afl => libafl}/benches/hash_speeds.rs (96%)
 rename {afl => libafl}/benches/rand_speeds.rs (97%)
 rename {afl => libafl}/examples/llmp_test/main.rs (99%)
 rename {afl => libafl}/src/bolts/llmp.rs (100%)
 rename {afl => libafl}/src/bolts/mod.rs (100%)
 rename {afl => libafl}/src/bolts/ownedref.rs (100%)
 rename {afl => libafl}/src/bolts/serdeany.rs (100%)
 rename {afl => libafl}/src/bolts/shmem.rs (100%)
 rename {afl => libafl}/src/bolts/tuples.rs (100%)
 rename {afl => libafl}/src/corpus/inmemory.rs (100%)
 rename {afl => libafl}/src/corpus/mod.rs (100%)
 rename {afl => libafl}/src/corpus/ondisk.rs (100%)
 rename {afl => libafl}/src/corpus/queue.rs (100%)
 rename {afl => libafl}/src/corpus/testcase.rs (100%)
 rename {afl => libafl}/src/events/llmp.rs (100%)
 rename {afl => libafl}/src/events/logger.rs (100%)
 rename {afl => libafl}/src/events/mod.rs (100%)
 rename {afl => libafl}/src/executors/inprocess.rs (100%)
 rename {afl => libafl}/src/executors/mod.rs (100%)
 rename {afl => libafl}/src/executors/runtime.rs (100%)
 rename {afl => libafl}/src/feedbacks/map.rs (100%)
 rename {afl => libafl}/src/feedbacks/mod.rs (100%)
 rename {afl => libafl}/src/generators/mod.rs (100%)
 rename {afl => libafl}/src/inputs/bytes.rs (100%)
 rename {afl => libafl}/src/inputs/mod.rs (100%)
 rename {afl => libafl}/src/lib.rs (100%)
 rename {afl => libafl}/src/mutators/mod.rs (100%)
 rename {afl => libafl}/src/mutators/mutations.rs (100%)
 rename {afl => libafl}/src/mutators/scheduled.rs (100%)
 rename {afl => libafl}/src/mutators/token_mutations.rs (100%)
 rename {afl => libafl}/src/observers/map.rs (100%)
 rename {afl => libafl}/src/observers/mod.rs (100%)
 rename {afl => libafl}/src/stages/mod.rs (100%)
 rename {afl => libafl}/src/stages/mutational.rs (100%)
 rename {afl => libafl}/src/state/mod.rs (100%)
 rename {afl => libafl}/src/stats/mod.rs (100%)
 rename {afl => libafl}/src/utils.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
deleted file mode 100644
index 4e03584182..0000000000
--- a/Cargo.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[workspace]
-
-members = [
-    "afl",
-    "fuzzers/libfuzzer_libpng",
-]
diff --git a/fuzzers/libfuzzer_dummy/Cargo.toml b/fuzzers/libfuzzer_dummy/Cargo.toml
index 3d05f303ca..5bdca325a5 100644
--- a/fuzzers/libfuzzer_dummy/Cargo.toml
+++ b/fuzzers/libfuzzer_dummy/Cargo.toml
@@ -1,11 +1,9 @@
 [package]
 name = "libfuzzer_dummy"
 version = "0.1.0"
-authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>"]
+authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
 edition = "2018"
 
-[workspace]
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
@@ -23,13 +21,10 @@ cc = { version = "1.0", features = ["parallel"] }
 num_cpus = "1.0"
 
 [dependencies]
-clap = "2.32.0"
-serde = { version = "1.0", default-features = false, features = ["alloc"] }
-postcard = { version = "0.5.1", features = ["alloc"] }
-afl = { path = "../../afl/" }
+libafl = { path = "../../libafl/" }
 
 [[bin]]
-name = "libfuzzer"
+name = "libfuzzer_dummy"
 path = "./src/mod.rs"
 test = false
 bench = false
diff --git a/fuzzers/libfuzzer_dummy/src/mod.rs b/fuzzers/libfuzzer_dummy/src/mod.rs
index 1cf3588e80..b2c70d4160 100644
--- a/fuzzers/libfuzzer_dummy/src/mod.rs
+++ b/fuzzers/libfuzzer_dummy/src/mod.rs
@@ -4,7 +4,7 @@
 use std::{path::PathBuf};
 use std::io::{self, BufRead};
 
-use afl::{
+use libafl::{
     bolts::{tuples::tuple_list, shmem::UnixShMem},
     corpus::{Corpus, InMemoryCorpus},
     events::setup_restarting_mgr,
@@ -23,8 +23,8 @@ use afl::{
 /// The name of the coverage map observer, to find it again in the observer list
 const NAME_COV_MAP: &str = "cov_map";
 
-static mut __lafl_edges_map: [u8; 32] = [0; 32];
-static __lafl_max_edges_size: u32 = 32;
+static mut EDGES_MAP: [u8; 32] = [0; 32];
+static EDGES_SIZE: u32 = 32;
 
 /// The wrapped harness function, calling out to the llvm-style libfuzzer harness
 fn harness<E, I>(_executor: &E, buf: &[u8]) -> ExitKind
@@ -35,11 +35,11 @@ where
     //println!("{:?}", buf);
 
     unsafe {
-      __lafl_edges_map[0] = 1;
+      EDGES_MAP[0] = 1;
       if buf.len() > 0 && buf[0] == 'a' as u8 {
-        __lafl_edges_map[2] = 1;
+        EDGES_MAP[2] = 1;
         if buf.len() > 1 && buf[1] == 'b'  as u8 {
-          __lafl_edges_map[3] = 1;
+          EDGES_MAP[3] = 1;
             //std::process::abort();
         }
       }
@@ -67,7 +67,7 @@ fn fuzz(input: Option<Vec<PathBuf>>, broker_port: u16) -> Result<(), Error> {
         setup_restarting_mgr::<_, _, _, _, _, _, UnixShMem, _>(stats, broker_port).expect("Failed to setup the restarter".into());
 
     let edges_observer =
-    StdMapObserver::new_from_ptr(&NAME_COV_MAP, unsafe { &mut __lafl_edges_map[0] as *mut u8 }, __lafl_max_edges_size as usize);
+    StdMapObserver::new_from_ptr(&NAME_COV_MAP, unsafe { &mut EDGES_MAP[0] as *mut u8 }, EDGES_SIZE as usize);
 
     let mut state = match state_opt {
         Some(s) => s,
diff --git a/fuzzers/libfuzzer_libpng/Cargo.toml b/fuzzers/libfuzzer_libpng/Cargo.toml
index 6b2bbff093..ebfadecb72 100644
--- a/fuzzers/libfuzzer_libpng/Cargo.toml
+++ b/fuzzers/libfuzzer_libpng/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "libfuzzer"
+name = "libfuzzer_libpng"
 version = "0.1.0"
-authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>"]
+authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
 edition = "2018"
 build = "build.rs"
 
@@ -22,14 +22,10 @@ cc = { version = "1.0", features = ["parallel"] }
 num_cpus = "1.0"
 
 [dependencies]
-clap = "2.32.0"
-serde = { version = "1.0", default-features = false, features = ["alloc"] }
-postcard = { version = "0.5.1", features = ["alloc"] }
-afl = { path = "../../afl/" }
-# libc = "0.2"
+libafl = { path = "../../libafl/" }
 
 [[bin]]
-name = "libfuzzer"
+name = "libfuzzer_libpng"
 path = "./src/mod.rs"
 test = false
 bench = false
diff --git a/fuzzers/libfuzzer_libpng/src/mod.rs b/fuzzers/libfuzzer_libpng/src/mod.rs
index 3c29bd3c74..9e0c9e04a8 100644
--- a/fuzzers/libfuzzer_libpng/src/mod.rs
+++ b/fuzzers/libfuzzer_libpng/src/mod.rs
@@ -3,7 +3,7 @@
 
 use std::{env, path::PathBuf};
 
-use afl::{
+use libafl::{
     bolts::{serdeany::RegistryBuilder, shmem::UnixShMem, tuples::tuple_list},
     corpus::{Corpus, InMemoryCorpus, OnDiskCorpus},
     events::setup_restarting_mgr,
@@ -16,7 +16,7 @@ use afl::{
     stages::mutational::StdMutationalStage,
     state::{HasCorpus, HasMetadata, State},
     stats::SimpleStats,
-    utils::StdRand,
+    utils::{current_nanos, StdRand},
     Error, Fuzzer, StdFuzzer,
 };
 
@@ -69,7 +69,7 @@ pub fn main() {
 
 /// The actual fuzzer
 fn fuzz(corpus_dirs: Vec<PathBuf>, objective_dir: PathBuf, broker_port: u16) -> Result<(), Error> {
-    let mut rand = StdRand::new(afl::utils::current_nanos());
+    let mut rand = StdRand::new(current_nanos());
     // 'While the stats are state, they are usually used in the broker - which is likely never restarted
     let stats = SimpleStats::new(|s| println!("{}", s));
 
diff --git a/fuzzers/libfuzzer_test/Cargo.toml b/fuzzers/libfuzzer_test/Cargo.toml
deleted file mode 100644
index a08acebfa4..0000000000
--- a/fuzzers/libfuzzer_test/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[package]
-name = "libfuzzer"
-version = "0.1.0"
-authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>"]
-edition = "2018"
-build = "build.rs"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[features]
-default = ["std"]
-std = []
-
-[profile.release]
-lto = true
-codegen-units = 1
-opt-level = 3
-debug = true
-
-[build-dependencies]
-cc = { version = "1.0", features = ["parallel"] }
-num_cpus = "1.0"
-
-[dependencies]
-clap = "2.32.0"
-afl = { path = "../../afl/", features = ["std", "runtime"] }
-
-[[bin]]
-name = "libfuzzer"
-path = "./src/mod.rs"
-test = false
-bench = false
\ No newline at end of file
diff --git a/fuzzers/libfuzzer_test/build.rs b/fuzzers/libfuzzer_test/build.rs
deleted file mode 100644
index 9995ba6d67..0000000000
--- a/fuzzers/libfuzzer_test/build.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// build.rs
-
-use std::env;
-use std::path::Path;
-
-fn main() {
-    let out_dir = env::var_os("OUT_DIR").unwrap();
-    let _cwd = env::current_dir().unwrap().to_string_lossy().to_string();
-    let out_dir = out_dir.to_string_lossy().to_string();
-    let _out_dir_path = Path::new(&out_dir);
-
-    println!("cargo:rerun-if-changed=../libfuzzer_runtime/rt.c",);
-    println!("cargo:rerun-if-changed=./test/test.c");
-
-    // We need clang for pc-guard support
-    std::env::set_var("CC", "clang");
-
-    /*
-    cc::Build::new()
-        .file("../libfuzzer_runtime/rt.c")
-        .compile("libfuzzer-sys-rt");
-        */
-
-    cc::Build::new()
-        .file("./test/test.c")
-        .flag("-fsanitize-coverage=trace-pc-guard")
-        .compile("libfuzzer-sys-target");
-
-    println!("cargo:rustc-link-search=native={}", &out_dir);
-
-    println!("cargo:rerun-if-changed=build.rs");
-}
diff --git a/fuzzers/libfuzzer_test/in1/a b/fuzzers/libfuzzer_test/in1/a
deleted file mode 100644
index 2e65efe2a1..0000000000
--- a/fuzzers/libfuzzer_test/in1/a
+++ /dev/null
@@ -1 +0,0 @@
-a
\ No newline at end of file
diff --git a/fuzzers/libfuzzer_test/in2/b b/fuzzers/libfuzzer_test/in2/b
deleted file mode 100644
index 2e65efe2a1..0000000000
--- a/fuzzers/libfuzzer_test/in2/b
+++ /dev/null
@@ -1 +0,0 @@
-a
\ No newline at end of file
diff --git a/fuzzers/libfuzzer_test/src/mod.rs b/fuzzers/libfuzzer_test/src/mod.rs
deleted file mode 100644
index a4d677e067..0000000000
--- a/fuzzers/libfuzzer_test/src/mod.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-#![cfg_attr(not(feature = "std"), no_std)]
-
-#[macro_use]
-extern crate clap;
-extern crate alloc;
-
-use clap::{App, Arg};
-use std::env;
-use std::path::PathBuf;
-
-use afl::corpus::Corpus;
-use afl::corpus::InMemoryCorpus;
-use afl::engines::Engine;
-use afl::engines::Fuzzer;
-use afl::engines::State;
-use afl::engines::StdFuzzer;
-use afl::events::{LlmpEventManager, SimpleStats};
-use afl::executors::inmemory::InProcessExecutor;
-use afl::executors::{Executor, ExitKind};
-use afl::feedbacks::MaxMapFeedback;
-use afl::generators::RandPrintablesGenerator;
-use afl::mutators::scheduled::HavocBytesMutator;
-use afl::mutators::HasMaxSize;
-use afl::observers::StdMapObserver;
-use afl::stages::mutational::StdMutationalStage;
-use afl::tuples::tuple_list;
-use afl::utils::StdRand;
-
-extern "C" {
-    /// int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
-    fn LLVMFuzzerTestOneInput(data: *const u8, size: usize) -> i32;
-
-    static __lafl_edges_map: *mut u8;
-    static __lafl_cmp_map: *mut u8;
-    static __lafl_max_edges_size: u32;
-}
-
-fn harness<I>(_executor: &dyn Executor<I>, buf: &[u8]) -> ExitKind {
-    unsafe {
-        LLVMFuzzerTestOneInput(buf.as_ptr(), buf.len());
-    }
-    ExitKind::Ok
-}
-
-const NAME_COV_MAP: &str = "cov_map";
-
-pub fn main() {
-    let matches = App::new("libAFLrs fuzzer harness")
-        .about("libAFLrs fuzzer harness help options.")
-        .arg(
-            Arg::with_name("port")
-                .short("p")
-                .value_name("PORT")
-                .takes_value(true)
-                .help("Broker TCP port to use."),
-        )
-        .arg(
-            Arg::with_name("dictionary")
-                .short("x")
-                .value_name("DICTIONARY")
-                .takes_value(true)
-                .multiple(true)
-                .help("Dictionary file to use, can be specified multiple times."),
-        )
-        .arg(
-            Arg::with_name("statstime")
-                .short("T")
-                .value_name("STATSTIME")
-                .takes_value(true)
-                .help("How often to print statistics in seconds [default: 5, disable: 0]"),
-        )
-        .arg(Arg::with_name("workdir")
-                               .help("Where to write the corpus, also reads the data on start. If more than one is supplied the first will be the work directory, all others will just be initially read from.")
-                                .multiple(true)
-                                .value_name("WORKDIR")
-                               )
-        .get_matches();
-
-    let _ = value_t!(matches, "statstime", u32).unwrap_or(5);
-    let broker_port = value_t!(matches, "port", u16).unwrap_or(1337);
-
-    let workdir = if matches.is_present("workdir") {
-        matches.value_of("workdir").unwrap().to_string()
-    } else {
-        env::current_dir().unwrap().to_string_lossy().to_string()
-    };
-
-    let mut dictionary: Option<Vec<PathBuf>> = None;
-
-    if matches.is_present("dictionary") {
-        dictionary = Some(values_t!(matches, "dictionary", PathBuf).unwrap_or_else(|e| e.exit()));
-    }
-
-    let mut input: Option<Vec<PathBuf>> = None;
-    if matches.is_present("workdir") {
-        input = Some(values_t!(matches, "workdir", PathBuf).unwrap_or_else(|e| e.exit()));
-    }
-
-    if dictionary != None || input != None {
-        println!("Information: the first process started is the broker and only processes the \'-p PORT\' option if present.");
-    }
-
-    println!("Workdir: {:?}", workdir);
-
-    let mut rand = StdRand::new(0);
-    let mut corpus = InMemoryCorpus::new();
-    let mut generator = RandPrintablesGenerator::new(32);
-    let stats = SimpleStats::new(|s| println!("{}", s));
-    let mut mgr = LlmpEventManager::new_on_port_std(broker_port, stats).unwrap();
-
-    if mgr.is_broker() {
-        println!("Doing broker things. Run this tool again to start fuzzing in a client.");
-        mgr.broker_loop().unwrap();
-    }
-
-    println!("We're a client, let's fuzz :)");
-
-    let edges_observer =
-        StdMapObserver::new_from_ptr(&NAME_COV_MAP, unsafe { __lafl_edges_map }, unsafe {
-            __lafl_max_edges_size as usize
-        });
-    let edges_feedback = MaxMapFeedback::new_with_observer(&NAME_COV_MAP, &edges_observer);
-
-    let executor = InProcessExecutor::new("Libfuzzer", harness, tuple_list!(edges_observer));
-    let mut state = State::new(tuple_list!(edges_feedback));
-
-    let mut engine = Engine::new(executor);
-
-    match input {
-        Some(x) => state
-            .load_initial_inputs(&mut corpus, &mut generator, &mut engine, &mut mgr, &x)
-            .expect(&format!("Failed to load initial corpus at {:?}", &x)),
-        None => (),
-    }
-
-    if corpus.count() < 1 {
-        println!("Generating random inputs");
-        state
-            .generate_initial_inputs(
-                &mut rand,
-                &mut corpus,
-                &mut generator,
-                &mut engine,
-                &mut mgr,
-                4,
-            )
-            .expect("Failed to generate initial inputs");
-    }
-
-    println!("We have {} inputs.", corpus.count());
-
-    let mut mutator = HavocBytesMutator::new_default();
-    mutator.set_max_size(4096);
-
-    let stage = StdMutationalStage::new(mutator);
-    let mut fuzzer = StdFuzzer::new(tuple_list!(stage));
-
-    fuzzer
-        .fuzz_loop(&mut rand, &mut state, &mut corpus, &mut engine, &mut mgr)
-        .expect("Fuzzer fatal error");
-    #[cfg(feature = "std")]
-    println!("OK");
-}
diff --git a/fuzzers/libfuzzer_test/test.sh b/fuzzers/libfuzzer_test/test.sh
deleted file mode 100644
index bdfc3fd8de..0000000000
--- a/fuzzers/libfuzzer_test/test.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-cargo build --release || exit 1
-cp ./target/release/libfuzzer ./.libfuzzer_test.elf
-
-RUST_BACKTRACE=full taskset -c 0 ./.libfuzzer_test.elf &
-
-test "$!" -gt 0 && {
-
-  usleep 250
-  RUST_BACKTRACE=full taskset -c 1 ./.libfuzzer_test.elf -x a -x b -T5 in1 in2 &
-
-}
-
-sleep 15
-echo "[+] Done"
-killall .libfuzzer_test.elf
-rm -rf ./.libfuzzer_test.elf
\ No newline at end of file
diff --git a/fuzzers/libfuzzer_test/test/test.c b/fuzzers/libfuzzer_test/test/test.c
deleted file mode 100644
index 04d002b2ae..0000000000
--- a/fuzzers/libfuzzer_test/test/test.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-
-int target_func(const uint8_t *buf, size_t size) {
-
-  /*printf("BUF (%ld): ", size);
-  for (int i = 0; i < size; i++) {
-      printf("%02X", buf[i]);
-  }
-  printf("\n");*/
-  
-  if (size == 0) return 0;
-  
-  switch (buf[0]) {
-
-    case 1:
-      if (buf[1] == 0x44) {
-        //__builtin_trap();
-        return 8;
-      }
-
-      break;
-    case 0xff:
-      if (buf[2] == 0xff) {
-        if (buf[1] == 0x44) {
-          //*(char *)(0xdeadbeef) = 1;
-          return 9;
-        }
-      }
-
-      break;
-    default:
-      break;
-
-  }
-
-  return 1;
-
-}
-
-int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-  return target_func(Data, Size);
-}
diff --git a/afl/Cargo.toml b/libafl/Cargo.toml
similarity index 93%
rename from afl/Cargo.toml
rename to libafl/Cargo.toml
index a5e92dc3e1..550b82cd5b 100644
--- a/afl/Cargo.toml
+++ b/libafl/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "afl"
+name = "libafl"
 version = "0.1.0"
-authors = ["Dominik Maier <domenukk@gmail.com>"]
+authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/afl/benches/hash_speeds.rs b/libafl/benches/hash_speeds.rs
similarity index 96%
rename from afl/benches/hash_speeds.rs
rename to libafl/benches/hash_speeds.rs
index 8e6d4734ba..20d22f5748 100644
--- a/afl/benches/hash_speeds.rs
+++ b/libafl/benches/hash_speeds.rs
@@ -6,7 +6,7 @@ use std::hash::Hasher;
 use xxhash_rust::const_xxh3;
 use xxhash_rust::xxh3;
 
-use afl::utils::{Rand, StdRand};
+use libafl::utils::{Rand, StdRand};
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 fn criterion_benchmark(c: &mut Criterion) {
diff --git a/afl/benches/rand_speeds.rs b/libafl/benches/rand_speeds.rs
similarity index 97%
rename from afl/benches/rand_speeds.rs
rename to libafl/benches/rand_speeds.rs
index 495d7018e0..ad97bd747b 100644
--- a/afl/benches/rand_speeds.rs
+++ b/libafl/benches/rand_speeds.rs
@@ -1,6 +1,6 @@
 //! Compare the speed of rand implementations
 
-use afl::utils::{
+use libafl::utils::{
     Lehmer64Rand, Rand, RomuDuoJrRand, RomuTrioRand, XorShift64Rand, Xoshiro256StarRand,
 };
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
diff --git a/afl/examples/llmp_test/main.rs b/libafl/examples/llmp_test/main.rs
similarity index 99%
rename from afl/examples/llmp_test/main.rs
rename to libafl/examples/llmp_test/main.rs
index ce7b36d546..139030a833 100644
--- a/afl/examples/llmp_test/main.rs
+++ b/libafl/examples/llmp_test/main.rs
@@ -6,7 +6,7 @@ extern crate alloc;
 use core::{convert::TryInto, time::Duration};
 use std::{thread, time};
 
-use afl::{
+use libafl::{
     bolts::{llmp, shmem::UnixShMem},
     Error,
 };
diff --git a/afl/src/bolts/llmp.rs b/libafl/src/bolts/llmp.rs
similarity index 100%
rename from afl/src/bolts/llmp.rs
rename to libafl/src/bolts/llmp.rs
diff --git a/afl/src/bolts/mod.rs b/libafl/src/bolts/mod.rs
similarity index 100%
rename from afl/src/bolts/mod.rs
rename to libafl/src/bolts/mod.rs
diff --git a/afl/src/bolts/ownedref.rs b/libafl/src/bolts/ownedref.rs
similarity index 100%
rename from afl/src/bolts/ownedref.rs
rename to libafl/src/bolts/ownedref.rs
diff --git a/afl/src/bolts/serdeany.rs b/libafl/src/bolts/serdeany.rs
similarity index 100%
rename from afl/src/bolts/serdeany.rs
rename to libafl/src/bolts/serdeany.rs
diff --git a/afl/src/bolts/shmem.rs b/libafl/src/bolts/shmem.rs
similarity index 100%
rename from afl/src/bolts/shmem.rs
rename to libafl/src/bolts/shmem.rs
diff --git a/afl/src/bolts/tuples.rs b/libafl/src/bolts/tuples.rs
similarity index 100%
rename from afl/src/bolts/tuples.rs
rename to libafl/src/bolts/tuples.rs
diff --git a/afl/src/corpus/inmemory.rs b/libafl/src/corpus/inmemory.rs
similarity index 100%
rename from afl/src/corpus/inmemory.rs
rename to libafl/src/corpus/inmemory.rs
diff --git a/afl/src/corpus/mod.rs b/libafl/src/corpus/mod.rs
similarity index 100%
rename from afl/src/corpus/mod.rs
rename to libafl/src/corpus/mod.rs
diff --git a/afl/src/corpus/ondisk.rs b/libafl/src/corpus/ondisk.rs
similarity index 100%
rename from afl/src/corpus/ondisk.rs
rename to libafl/src/corpus/ondisk.rs
diff --git a/afl/src/corpus/queue.rs b/libafl/src/corpus/queue.rs
similarity index 100%
rename from afl/src/corpus/queue.rs
rename to libafl/src/corpus/queue.rs
diff --git a/afl/src/corpus/testcase.rs b/libafl/src/corpus/testcase.rs
similarity index 100%
rename from afl/src/corpus/testcase.rs
rename to libafl/src/corpus/testcase.rs
diff --git a/afl/src/events/llmp.rs b/libafl/src/events/llmp.rs
similarity index 100%
rename from afl/src/events/llmp.rs
rename to libafl/src/events/llmp.rs
diff --git a/afl/src/events/logger.rs b/libafl/src/events/logger.rs
similarity index 100%
rename from afl/src/events/logger.rs
rename to libafl/src/events/logger.rs
diff --git a/afl/src/events/mod.rs b/libafl/src/events/mod.rs
similarity index 100%
rename from afl/src/events/mod.rs
rename to libafl/src/events/mod.rs
diff --git a/afl/src/executors/inprocess.rs b/libafl/src/executors/inprocess.rs
similarity index 100%
rename from afl/src/executors/inprocess.rs
rename to libafl/src/executors/inprocess.rs
diff --git a/afl/src/executors/mod.rs b/libafl/src/executors/mod.rs
similarity index 100%
rename from afl/src/executors/mod.rs
rename to libafl/src/executors/mod.rs
diff --git a/afl/src/executors/runtime.rs b/libafl/src/executors/runtime.rs
similarity index 100%
rename from afl/src/executors/runtime.rs
rename to libafl/src/executors/runtime.rs
diff --git a/afl/src/feedbacks/map.rs b/libafl/src/feedbacks/map.rs
similarity index 100%
rename from afl/src/feedbacks/map.rs
rename to libafl/src/feedbacks/map.rs
diff --git a/afl/src/feedbacks/mod.rs b/libafl/src/feedbacks/mod.rs
similarity index 100%
rename from afl/src/feedbacks/mod.rs
rename to libafl/src/feedbacks/mod.rs
diff --git a/afl/src/generators/mod.rs b/libafl/src/generators/mod.rs
similarity index 100%
rename from afl/src/generators/mod.rs
rename to libafl/src/generators/mod.rs
diff --git a/afl/src/inputs/bytes.rs b/libafl/src/inputs/bytes.rs
similarity index 100%
rename from afl/src/inputs/bytes.rs
rename to libafl/src/inputs/bytes.rs
diff --git a/afl/src/inputs/mod.rs b/libafl/src/inputs/mod.rs
similarity index 100%
rename from afl/src/inputs/mod.rs
rename to libafl/src/inputs/mod.rs
diff --git a/afl/src/lib.rs b/libafl/src/lib.rs
similarity index 100%
rename from afl/src/lib.rs
rename to libafl/src/lib.rs
diff --git a/afl/src/mutators/mod.rs b/libafl/src/mutators/mod.rs
similarity index 100%
rename from afl/src/mutators/mod.rs
rename to libafl/src/mutators/mod.rs
diff --git a/afl/src/mutators/mutations.rs b/libafl/src/mutators/mutations.rs
similarity index 100%
rename from afl/src/mutators/mutations.rs
rename to libafl/src/mutators/mutations.rs
diff --git a/afl/src/mutators/scheduled.rs b/libafl/src/mutators/scheduled.rs
similarity index 100%
rename from afl/src/mutators/scheduled.rs
rename to libafl/src/mutators/scheduled.rs
diff --git a/afl/src/mutators/token_mutations.rs b/libafl/src/mutators/token_mutations.rs
similarity index 100%
rename from afl/src/mutators/token_mutations.rs
rename to libafl/src/mutators/token_mutations.rs
diff --git a/afl/src/observers/map.rs b/libafl/src/observers/map.rs
similarity index 100%
rename from afl/src/observers/map.rs
rename to libafl/src/observers/map.rs
diff --git a/afl/src/observers/mod.rs b/libafl/src/observers/mod.rs
similarity index 100%
rename from afl/src/observers/mod.rs
rename to libafl/src/observers/mod.rs
diff --git a/afl/src/stages/mod.rs b/libafl/src/stages/mod.rs
similarity index 100%
rename from afl/src/stages/mod.rs
rename to libafl/src/stages/mod.rs
diff --git a/afl/src/stages/mutational.rs b/libafl/src/stages/mutational.rs
similarity index 100%
rename from afl/src/stages/mutational.rs
rename to libafl/src/stages/mutational.rs
diff --git a/afl/src/state/mod.rs b/libafl/src/state/mod.rs
similarity index 100%
rename from afl/src/state/mod.rs
rename to libafl/src/state/mod.rs
diff --git a/afl/src/stats/mod.rs b/libafl/src/stats/mod.rs
similarity index 100%
rename from afl/src/stats/mod.rs
rename to libafl/src/stats/mod.rs
diff --git a/afl/src/utils.rs b/libafl/src/utils.rs
similarity index 100%
rename from afl/src/utils.rs
rename to libafl/src/utils.rs