From 1205c2144c5de93af9cb17ed99235e7e71f332ba Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Fri, 19 Jul 2024 18:24:24 +0200 Subject: [PATCH] Restructure the fuzzers folder (#2409) * move fuzzers in subfolders * add readme * remove redundent fuzzers --- .github/workflows/build_and_test.yml | 154 ++++++----- .gitignore | 1 - fuzzers/README.md | 24 ++ fuzzers/{ => baby}/baby_fuzzer/.gitignore | 0 fuzzers/{ => baby}/baby_fuzzer/Cargo.toml | 4 +- fuzzers/{ => baby}/baby_fuzzer/README.md | 0 fuzzers/{ => baby}/baby_fuzzer/src/main.rs | 0 .../baby_fuzzer_gramatron/.gitignore | 0 .../baby_fuzzer_gramatron/Cargo.toml | 4 +- .../baby_fuzzer_gramatron/README.md | 0 .../baby_fuzzer_gramatron/auto.json | 0 .../baby_fuzzer_gramatron/auto.postcard | Bin .../baby_fuzzer_gramatron/corpus/new file | 0 .../baby_fuzzer_gramatron/src/main.rs | 0 .../baby_fuzzer_grimoire/.gitignore | 0 .../baby_fuzzer_grimoire/Cargo.toml | 4 +- .../{ => baby}/baby_fuzzer_grimoire/README.md | 0 .../baby_fuzzer_grimoire/corpus/new file | 0 .../baby_fuzzer_grimoire/src/main.rs | 0 .../baby_fuzzer_minimizing/.gitignore | 0 .../baby_fuzzer_minimizing/Cargo.toml | 4 +- .../baby_fuzzer_minimizing/README.md | 0 .../baby_fuzzer_minimizing/src/main.rs | 0 .../{ => baby}/baby_fuzzer_multi/.gitignore | 0 .../{ => baby}/baby_fuzzer_multi/Cargo.toml | 4 +- .../{ => baby}/baby_fuzzer_multi/README.md | 0 .../{ => baby}/baby_fuzzer_multi/src/main.rs | 0 .../baby_fuzzer_nautilus/.gitignore | 0 .../baby_fuzzer_nautilus/Cargo.toml | 4 +- .../{ => baby}/baby_fuzzer_nautilus/README.md | 0 .../baby_fuzzer_nautilus/grammar.json | 0 .../baby_fuzzer_nautilus/src/main.rs | 0 .../baby_fuzzer_swap_differential/.gitignore | 0 .../baby_fuzzer_swap_differential/Cargo.toml | 8 +- .../Makefile.toml | 0 .../baby_fuzzer_swap_differential/README.md | 0 .../baby_fuzzer_swap_differential/build.rs | 0 .../baby_fuzzer_swap_differential/common.c | 0 .../baby_fuzzer_swap_differential/common.h | 0 .../baby_fuzzer_swap_differential/first.c | 0 .../baby_fuzzer_swap_differential/first.h | 0 .../baby_fuzzer_swap_differential/second.c | 0 .../baby_fuzzer_swap_differential/second.h | 0 .../src/bin/libafl_cc.rs | 0 .../baby_fuzzer_swap_differential/src/main.rs | 0 .../{ => baby}/baby_fuzzer_tokens/.gitignore | 0 .../{ => baby}/baby_fuzzer_tokens/Cargo.toml | 4 +- .../{ => baby}/baby_fuzzer_tokens/README.md | 0 .../baby_fuzzer_tokens/corpus/new file | 0 .../{ => baby}/baby_fuzzer_tokens/src/main.rs | 0 .../{ => baby}/baby_fuzzer_unicode/.gitignore | 0 .../{ => baby}/baby_fuzzer_unicode/Cargo.toml | 4 +- .../{ => baby}/baby_fuzzer_unicode/README.md | 0 .../baby_fuzzer_unicode/src/main.rs | 0 .../baby_fuzzer_wasm/.cargo/config.toml | 0 .../{ => baby}/baby_fuzzer_wasm/.gitignore | 0 .../{ => baby}/baby_fuzzer_wasm/Cargo.toml | 4 +- .../{ => baby}/baby_fuzzer_wasm/Makefile.toml | 0 fuzzers/{ => baby}/baby_fuzzer_wasm/README.md | 0 .../baby_fuzzer_wasm/pkg/.gitignore | 0 .../baby_fuzzer_wasm/pkg/index.html | 0 .../baby_fuzzer_wasm/pkg/package.json | 0 .../{ => baby}/baby_fuzzer_wasm/src/lib.rs | 0 .../{ => baby}/baby_fuzzer_wasm/src/utils.rs | 0 .../{ => baby}/baby_fuzzer_wasm/tests/web.rs | 0 .../baby_fuzzer_wasm/webdriver.json | 0 .../baby_fuzzer_with_forkexecutor/.gitignore | 0 .../baby_fuzzer_with_forkexecutor/Cargo.toml | 4 +- .../baby_fuzzer_with_forkexecutor/README.md | 0 .../baby_fuzzer_with_forkexecutor/src/main.rs | 0 fuzzers/{ => baby}/baby_no_std/.gitignore | 0 fuzzers/{ => baby}/baby_no_std/Cargo.toml | 4 +- fuzzers/{ => baby}/baby_no_std/Makefile.toml | 0 fuzzers/{ => baby}/baby_no_std/README.md | 0 fuzzers/{ => baby}/baby_no_std/build.rs | 0 fuzzers/{ => baby}/baby_no_std/rust-toolchain | 0 fuzzers/{ => baby}/baby_no_std/src/main.rs | 0 .../backtrace_baby_fuzzers/README.md | 0 .../c_code_with_fork_executor/.cargo/config | 0 .../c_code_with_fork_executor/.gitignore | 0 .../c_code_with_fork_executor/Cargo.toml | 4 +- .../c_code_with_fork_executor/build.rs | 0 .../c_code_with_fork_executor/src/harness.c | 0 .../c_code_with_fork_executor/src/main.rs | 0 .../.cargo/config | 0 .../c_code_with_inprocess_executor/.gitignore | 0 .../c_code_with_inprocess_executor/Cargo.toml | 4 +- .../c_code_with_inprocess_executor/build.rs | 0 .../src/harness.c | 0 .../src/main.rs | 0 .../command_executor/.cargo/config | 0 .../command_executor/.gitignore | 0 .../command_executor/Cargo.toml | 4 +- .../command_executor/build.rs | 0 .../command_executor/src/main.rs | 0 .../command_executor/src/test_command.c | 0 .../forkserver_executor/.gitignore | 0 .../forkserver_executor/Cargo.toml | 4 +- .../forkserver_executor/build.rs | 0 .../forkserver_executor/src/main.rs | 0 .../forkserver_executor/src/program.c | 0 .../.cargo/config | 0 .../rust_code_with_fork_executor/.gitignore | 0 .../rust_code_with_fork_executor/Cargo.toml | 4 +- .../rust_code_with_fork_executor/src/main.rs | 0 .../.cargo/config | 0 .../.gitignore | 0 .../Cargo.toml | 4 +- .../src/main.rs | 0 .../forkserver_libafl_cc/Cargo.toml | 8 +- .../forkserver_libafl_cc/Makefile.toml | 0 .../forkserver_libafl_cc/README.md | 0 .../forkserver_libafl_cc/corpus/testfile | 0 .../forkserver_libafl_cc/src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../forkserver_libafl_cc/src/lib.rs | 0 .../forkserver_libafl_cc/src/main.rs | 0 .../forkserver_libafl_cc/src/program.c | 0 .../forkserver_simple/.gitignore | 0 .../forkserver_simple/Cargo.toml | 4 +- .../forkserver_simple/README.md | 0 .../forkserver_simple/build.rs | 0 .../forkserver_simple/corpus/testfile | 0 .../forkserver_simple/src/main.rs | 0 .../forkserver_simple/src/program.c | 0 .../frida_executable_libpng/.gitignore | 0 .../frida_executable_libpng/Cargo.toml | 8 +- .../frida_executable_libpng/Makefile.toml | 0 .../frida_executable_libpng/README.md | 0 .../corpus/not_kitty.png | Bin .../corpus/not_kitty_alpha.png | Bin .../corpus/not_kitty_gamma.png | Bin .../corpus/not_kitty_icc.png | Bin .../frida_executable_libpng/harness.cc | 0 .../frida_executable_libpng/src/fuzzer.rs | 0 .../frida_executable_libpng/src/lib.rs | 0 fuzzers/{ => frida}/frida_gdiplus/.gitignore | 0 fuzzers/{ => frida}/frida_gdiplus/Cargo.toml | 8 +- .../{ => frida}/frida_gdiplus/Makefile.toml | 0 fuzzers/{ => frida}/frida_gdiplus/README.md | 0 .../{ => frida}/frida_gdiplus/cargo/.config | 0 .../{ => frida}/frida_gdiplus/cmplog_test.asm | 0 .../{ => frida}/frida_gdiplus/cmplog_test.def | 0 .../frida_gdiplus/corpus/not_kitty.png | Bin .../frida_gdiplus/corpus/not_kitty_alpha.png | Bin .../frida_gdiplus/corpus/not_kitty_gamma.png | Bin .../frida_gdiplus/corpus/not_kitty_icc.png | Bin fuzzers/{ => frida}/frida_gdiplus/harness.cc | 0 .../{ => frida}/frida_gdiplus/src/fuzzer.rs | 0 fuzzers/{ => frida}/frida_gdiplus/src/main.rs | 0 fuzzers/{ => frida}/frida_libpng/.gitignore | 0 fuzzers/{ => frida}/frida_libpng/Cargo.toml | 8 +- .../{ => frida}/frida_libpng/Makefile.toml | 0 fuzzers/{ => frida}/frida_libpng/README.md | 0 .../frida_libpng/corpus/not_kitty.png | Bin .../frida_libpng/corpus/not_kitty_alpha.png | Bin .../frida_libpng/corpus/not_kitty_gamma.png | Bin .../frida_libpng/corpus/not_kitty_icc.png | Bin fuzzers/{ => frida}/frida_libpng/harness.cc | 0 .../{ => frida}/frida_libpng/harness_win.cpp | 0 .../{ => frida}/frida_libpng/src/fuzzer.rs | 0 fuzzers/{ => frida}/frida_libpng/src/main.rs | 0 fuzzers/fuzzbench/{ => fuzzbench}/.gitignore | 0 fuzzers/fuzzbench/{ => fuzzbench}/Cargo.toml | 8 +- .../fuzzbench/{ => fuzzbench}/Makefile.toml | 0 fuzzers/fuzzbench/{ => fuzzbench}/README.md | 0 fuzzers/fuzzbench/{ => fuzzbench}/fuzz.c | 0 .../{ => fuzzbench}/src/bin/libafl_cc.rs | 0 .../fuzzbench}/src/bin/libafl_cxx.rs | 0 fuzzers/fuzzbench/{ => fuzzbench}/src/lib.rs | 0 .../fuzzbench}/stub_rt.c | 0 .../{ => fuzzbench}/fuzzbench_ctx/Cargo.toml | 8 +- .../fuzzbench_ctx/Makefile.toml | 0 fuzzers/{ => fuzzbench}/fuzzbench_ctx/fuzz.c | 0 .../fuzzbench_ctx/src/bin/libafl_cc.rs | 0 .../{ => fuzzbench_ctx}/src/bin/libafl_cxx.rs | 0 .../{ => fuzzbench}/fuzzbench_ctx/src/lib.rs | 0 .../fuzzbench/{ => fuzzbench_ctx}/stub_rt.c | 0 .../fuzzbench_fork_qemu/.gitignore | 0 .../fuzzbench_fork_qemu/Cargo.toml | 6 +- .../fuzzbench_fork_qemu/Makefile.toml | 2 +- .../fuzzbench_fork_qemu/libfuzzer_main.c | 0 .../fuzzbench_fork_qemu/src/fuzzer.rs | 0 .../fuzzbench_fork_qemu/src/main.rs | 0 .../fuzzbench_forkserver/.gitignore | 0 .../fuzzbench_forkserver/Cargo.toml | 6 +- .../fuzzbench_forkserver/src/main.rs | 0 .../fuzzbench_forkserver_cmplog/Cargo.toml | 6 +- .../fuzzbench_forkserver_cmplog/src/main.rs | 0 .../test/compile.sh | 0 .../test/test-cmplog.c | 0 .../{ => fuzzbench}/fuzzbench_qemu/.gitignore | 0 .../{ => fuzzbench}/fuzzbench_qemu/Cargo.toml | 6 +- .../fuzzbench_qemu/Makefile.toml | 4 +- .../{ => fuzzbench}/fuzzbench_qemu/README.md | 0 .../fuzzbench_qemu/libfuzzer_main.c | 0 .../fuzzbench_qemu/src/fuzzer.rs | 0 .../fuzzbench_qemu/src/main.rs | 0 .../{ => fuzzbench}/fuzzbench_text/.gitignore | 0 .../{ => fuzzbench}/fuzzbench_text/Cargo.toml | 8 +- .../fuzzbench_text/Makefile.toml | 0 .../{ => fuzzbench}/fuzzbench_text/README.md | 0 fuzzers/{ => fuzzbench}/fuzzbench_text/fuzz.c | 0 .../fuzzbench_text/src/bin/libafl_cc.rs | 0 .../fuzzbench_text}/src/bin/libafl_cxx.rs | 0 .../{ => fuzzbench}/fuzzbench_text/src/lib.rs | 0 fuzzers/libfuzzer_libpng_aflpp_ui/Cargo.toml | 34 --- .../libfuzzer_libpng_aflpp_ui/Makefile.toml | 194 -------------- fuzzers/libfuzzer_libpng_aflpp_ui/README.md | 72 ------ fuzzers/libfuzzer_libpng_aflpp_ui/src/lib.rs | 239 ------------------ .../libfuzzer_libpng_tcp_manager/harness.cc | 191 -------------- .../{ => libpng}/libfuzzer_libpng/.gitignore | 0 .../{ => libpng}/libfuzzer_libpng/Cargo.toml | 10 +- .../libfuzzer_libpng/Makefile.toml | 0 .../{ => libpng}/libfuzzer_libpng/README.md | 0 .../libfuzzer_libpng/corpus/not_kitty.png | Bin .../corpus/not_kitty_alpha.png | Bin .../corpus/not_kitty_gamma.png | Bin .../libfuzzer_libpng/corpus/not_kitty_icc.png | Bin .../{ => libpng}/libfuzzer_libpng/harness.cc | 0 .../libfuzzer_libpng/src/bin/libafl_cc.rs | 0 .../libfuzzer_libpng}/src/bin/libafl_cxx.rs | 0 .../{ => libpng}/libfuzzer_libpng/src/lib.rs | 0 .../libfuzzer_libpng_accounting/.gitignore | 0 .../libfuzzer_libpng_accounting/Cargo.toml | 8 +- .../libfuzzer_libpng_accounting/Makefile.toml | 0 .../libfuzzer_libpng_accounting/README.md | 0 .../corpus/not_kitty.png | Bin .../corpus/not_kitty_alpha.png | Bin .../corpus/not_kitty_gamma.png | Bin .../corpus/not_kitty_icc.png | Bin .../libfuzzer_libpng_accounting/harness.cc | 0 .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../libfuzzer_libpng_accounting/src/lib.rs | 0 .../libfuzzer_libpng_centralized/.gitignore | 0 .../libfuzzer_libpng_centralized/Cargo.toml | 8 +- .../Makefile.toml | 0 .../libfuzzer_libpng_centralized/README.md | 0 .../corpus/not_kitty.png | Bin .../corpus/not_kitty_alpha.png | Bin .../corpus/not_kitty_gamma.png | Bin .../corpus/not_kitty_icc.png | Bin .../libfuzzer_libpng_centralized/harness.cc | 0 .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../libfuzzer_libpng_centralized/src/lib.rs | 0 .../libfuzzer_libpng_cmin}/.gitignore | 0 .../libfuzzer_libpng_cmin/Cargo.toml | 10 +- .../libfuzzer_libpng_cmin/Makefile.toml | 0 .../libfuzzer_libpng_cmin/README.md | 0 .../corpus/not_kitty.png | Bin .../corpus/not_kitty_alpha.png | Bin .../corpus/not_kitty_gamma.png | Bin .../corpus/not_kitty_icc.png | Bin .../libfuzzer_libpng_cmin}/harness.cc | 0 .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../libfuzzer_libpng_cmin/src/lib.rs | 0 .../libfuzzer_libpng_launcher/.gitignore | 0 .../libfuzzer_libpng_launcher/Cargo.toml | 8 +- .../libfuzzer_libpng_launcher/Makefile.toml | 0 .../libfuzzer_libpng_launcher/README.md | 0 .../corpus/not_kitty.png | Bin .../corpus/not_kitty_alpha.png | Bin .../corpus/not_kitty_gamma.png | Bin .../corpus/not_kitty_icc.png | Bin .../libfuzzer_libpng_launcher/harness.cc | 0 .../src/bin/libafl_ar.rs | 0 .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../src/bin/libafl_libtool.rs | 0 .../libfuzzer_libpng_launcher/src/lib.rs | 0 .../libfuzzer_libpng_norestart/.gitignore | 0 .../libfuzzer_libpng_norestart/Cargo.toml | 8 +- .../libfuzzer_libpng_norestart/Makefile.toml | 0 .../libfuzzer_libpng_norestart/README.md | 0 .../libfuzzer_libpng_norestart/harness.cc | 0 .../seeds}/not_kitty.png | Bin .../seeds}/not_kitty_alpha.png | Bin .../seeds}/not_kitty_gamma.png | Bin .../seeds}/not_kitty_icc.png | Bin .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../libfuzzer_libpng_norestart/src/lib.rs | 0 .../libfuzzer_libpng_tcp_manager}/.gitignore | 0 .../libfuzzer_libpng_tcp_manager/Cargo.toml | 10 +- .../Makefile.toml | 0 .../libfuzzer_libpng_tcp_manager/README.md | 0 .../corpus}/not_kitty.png | Bin .../corpus}/not_kitty_alpha.png | Bin .../corpus}/not_kitty_gamma.png | Bin .../corpus}/not_kitty_icc.png | Bin .../libfuzzer_libpng_tcp_manager}/harness.cc | 0 .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../libfuzzer_libpng_tcp_manager/src/lib.rs | 0 .../{ => nyx}/nyx_libxml2_parallel/Cargo.toml | 8 +- .../nyx_libxml2_parallel/Makefile.toml | 0 .../{ => nyx}/nyx_libxml2_parallel/README.md | 0 .../nyx_libxml2_parallel/setup_libxml2.sh | 4 +- .../nyx_libxml2_parallel/src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../nyx_libxml2_parallel/src/main.rs | 0 .../nyx_libxml2_standalone/Cargo.toml | 8 +- .../nyx_libxml2_standalone/Makefile.toml | 0 .../nyx_libxml2_standalone/README.md | 0 .../nyx_libxml2_standalone/setup_libxml2.sh | 4 +- .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../nyx_libxml2_standalone/src/main.rs | 0 fuzzers/{ => others}/cargo_fuzz/Cargo.toml | 0 fuzzers/{ => others}/cargo_fuzz/Makefile.toml | 0 fuzzers/{ => others}/cargo_fuzz/README.md | 0 .../{ => others}/cargo_fuzz/fuzz/.gitignore | 0 .../{ => others}/cargo_fuzz/fuzz/Cargo.toml | 2 +- .../fuzz/fuzz_targets/fuzz_target_1.rs | 0 fuzzers/{ => others}/cargo_fuzz/src/lib.rs | 0 .../{ => others}/dynamic_analysis/Cargo.toml | 8 +- .../dynamic_analysis/Makefile.toml | 0 .../{ => others}/dynamic_analysis/README.md | 0 .../{ => others}/dynamic_analysis/build.rs | 0 .../{ => others}/dynamic_analysis/build.sh | 0 .../{ => others}/dynamic_analysis/clean.sh | 0 .../dynamic_analysis/cms_transform_fuzzer.cc | 0 .../dynamic_analysis/concatenator.py | 0 .../{ => others}/dynamic_analysis/corpus/seed | Bin .../dynamic_analysis/src/bin/libafl_cc.rs | 0 .../dynamic_analysis}/src/bin/libafl_cxx.rs | 0 .../{ => others}/dynamic_analysis/src/lib.rs | 0 .../dynamic_analysis}/stub_rt.c | 0 fuzzers/{ => others}/libafl-fuzz/Cargo.toml | 6 +- .../{ => others}/libafl-fuzz/Makefile.toml | 0 fuzzers/{ => others}/libafl-fuzz/README.md | 0 .../{ => others}/libafl-fuzz/src/afl_stats.rs | 0 .../{ => others}/libafl-fuzz/src/corpus.rs | 0 .../libafl-fuzz/src/env_parser.rs | 0 .../{ => others}/libafl-fuzz/src/executor.rs | 0 .../libafl-fuzz/src/feedback/filepath.rs | 0 .../libafl-fuzz/src/feedback/mod.rs | 0 .../src/feedback/persistent_record.rs | 0 .../libafl-fuzz/src/feedback/seed.rs | 0 .../{ => others}/libafl-fuzz/src/fuzzer.rs | 0 fuzzers/{ => others}/libafl-fuzz/src/hooks.rs | 0 fuzzers/{ => others}/libafl-fuzz/src/main.rs | 0 .../libafl-fuzz/src/mutational_stage.rs | 0 .../{ => others}/libafl-fuzz/src/scheduler.rs | 0 .../{ => others}/libafl-fuzz/test/seeds/init | 0 .../libafl-fuzz/test/seeds_cmplog/init | 0 .../libafl-fuzz/test/test-cmplog.c | 0 .../libafl-fuzz/test/test-instr.c | 0 fuzzers/{ => others}/libafl-fuzz/test/test.sh | 0 .../{ => others}/libafl_atheris/.gitignore | 0 .../{ => others}/libafl_atheris/Cargo.toml | 6 +- fuzzers/{ => others}/libafl_atheris/Makefile | 0 fuzzers/{ => others}/libafl_atheris/README.md | 0 .../{ => others}/libafl_atheris/src/lib.rs | 0 .../libfuzzer_libmozjpeg/.gitignore | 0 .../libfuzzer_libmozjpeg/Cargo.toml | 8 +- .../libfuzzer_libmozjpeg/Makefile.toml | 0 .../libfuzzer_libmozjpeg/README.md | 0 .../libfuzzer_libmozjpeg/build.rs | 0 .../libfuzzer_libmozjpeg/corpus/blank.jpg | Bin .../libfuzzer_libmozjpeg/harness.cc | 0 .../libfuzzer_libmozjpeg/hook_allocs.c | 0 .../libfuzzer_libmozjpeg/jpeg.dict | 0 .../libfuzzer_libmozjpeg/src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../libfuzzer_libmozjpeg/src/lib.rs | 0 .../libfuzzer_windows_asan/.gitignore | 0 .../libfuzzer_windows_asan/Cargo.toml | 8 +- .../libfuzzer_windows_asan/Makefile.toml | 0 .../libfuzzer_windows_asan/README.md | 0 .../libfuzzer_windows_asan/corpus/hello_world | 0 .../libfuzzer_windows_asan/harness.cpp | 0 .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../libfuzzer_windows_asan/src/lib.rs | 0 fuzzers/{ => others}/nautilus_sync/.gitignore | 0 fuzzers/{ => others}/nautilus_sync/Cargo.toml | 8 +- .../{ => others}/nautilus_sync/Makefile.toml | 4 +- .../{ => others}/nautilus_sync/rust-toolchain | 0 .../nautilus_sync/src/bin/libafl_cc.rs | 0 .../nautilus_sync}/src/bin/libafl_cxx.rs | 0 fuzzers/{ => others}/nautilus_sync/src/lib.rs | 0 .../push_harness}/.gitignore | 0 fuzzers/{ => others}/push_harness/Cargo.toml | 4 +- fuzzers/{ => others}/push_harness/README.md | 0 fuzzers/{ => others}/push_harness/src/main.rs | 0 .../push_stage_harness}/.gitignore | 0 .../push_stage_harness/Cargo.toml | 4 +- .../{ => others}/push_stage_harness/README.md | 0 .../push_stage_harness/src/main.rs | 0 .../Cargo.toml | 8 +- .../README.md | 0 .../sqlite_centralized_multi_machine/build.sh | 0 .../run_child.sh | 0 .../run_parent.sh | 0 .../src/bin/libafl_cc.rs | 0 .../src/bin/libafl_cxx.rs | 0 .../src/lib.rs | 0 fuzzers/others/tinyinst_simple/Cargo.toml | 13 + .../tinyinst_simple/Makefile.toml | 0 .../{ => others}/tinyinst_simple/README.md | 0 .../{ => others}/tinyinst_simple/src/main.rs | 0 .../tinyinst_simple/test/crash_input.txt | 0 .../tinyinst_simple/test/ok_input.txt | 0 .../tinyinst_simple/test/test.cpp | 0 fuzzers/{ => others}/tutorial/Cargo.toml | 8 +- fuzzers/{ => others}/tutorial/rust-toolchain | 0 .../tutorial/src/bin/libafl_cc.rs | 0 .../tutorial}/src/bin/libafl_cxx.rs | 0 fuzzers/{ => others}/tutorial/src/input.rs | 0 fuzzers/{ => others}/tutorial/src/lib.rs | 0 fuzzers/{ => others}/tutorial/src/metadata.rs | 0 fuzzers/{ => others}/tutorial/src/mutator.rs | 0 fuzzers/{ => others}/tutorial/target.c | 0 fuzzers/push_stage_harness/.gitignore | 1 - fuzzers/{ => qemu}/python_qemu/README.md | 0 fuzzers/{ => qemu}/python_qemu/fuzz.c | 0 fuzzers/{ => qemu}/python_qemu/fuzzer.py | 0 fuzzers/{ => qemu}/qemu_cmin/.gitignore | 0 fuzzers/{ => qemu}/qemu_cmin/Cargo.toml | 6 +- fuzzers/{ => qemu}/qemu_cmin/Makefile.toml | 0 fuzzers/{ => qemu}/qemu_cmin/README.md | 0 fuzzers/{ => qemu}/qemu_cmin/build.rs | 0 .../qemu_cmin}/corpus/not_kitty.png | Bin .../qemu_cmin}/corpus/not_kitty_alpha.png | Bin .../qemu_cmin}/corpus/not_kitty_gamma.png | Bin .../qemu_cmin}/corpus/not_kitty_icc.png | Bin fuzzers/{ => qemu}/qemu_cmin/harness.cc | 0 fuzzers/{ => qemu}/qemu_cmin/src/fuzzer.rs | 0 fuzzers/{ => qemu}/qemu_cmin/src/main.rs | 0 fuzzers/{ => qemu}/qemu_coverage/.gitignore | 0 fuzzers/{ => qemu}/qemu_coverage/Cargo.toml | 6 +- .../{ => qemu}/qemu_coverage/Makefile.toml | 0 fuzzers/{ => qemu}/qemu_coverage/README.md | 0 fuzzers/{ => qemu}/qemu_coverage/build.rs | 0 .../qemu_coverage}/corpus/not_kitty.png | Bin .../qemu_coverage}/corpus/not_kitty_alpha.png | Bin .../qemu_coverage}/corpus/not_kitty_gamma.png | Bin .../qemu_coverage}/corpus/not_kitty_icc.png | Bin fuzzers/{ => qemu}/qemu_coverage/harness.cc | 0 .../{ => qemu}/qemu_coverage/src/fuzzer.rs | 0 fuzzers/{ => qemu}/qemu_coverage/src/main.rs | 0 fuzzers/{ => qemu}/qemu_launcher/.gitignore | 0 fuzzers/{ => qemu}/qemu_launcher/Cargo.toml | 6 +- .../{ => qemu}/qemu_launcher/Makefile.toml | 0 fuzzers/{ => qemu}/qemu_launcher/README.md | 0 fuzzers/{ => qemu}/qemu_launcher/build.rs | 0 .../qemu_launcher}/corpus/not_kitty.png | Bin .../qemu_launcher}/corpus/not_kitty_alpha.png | Bin .../qemu_launcher}/corpus/not_kitty_gamma.png | Bin .../qemu_launcher}/corpus/not_kitty_icc.png | Bin fuzzers/{ => qemu}/qemu_launcher/harness.cc | 0 .../qemu_launcher/injection_test/Makefile | 0 .../qemu_launcher/injection_test/README.md | 0 .../qemu_launcher/injection_test/example.db | Bin .../qemu_launcher/injection_test/sqltest.c | 0 .../{ => qemu}/qemu_launcher/injections.toml | 0 .../{ => qemu}/qemu_launcher/injections.yaml | 0 .../{ => qemu}/qemu_launcher/src/client.rs | 0 .../{ => qemu}/qemu_launcher/src/fuzzer.rs | 0 .../{ => qemu}/qemu_launcher/src/harness.rs | 0 .../{ => qemu}/qemu_launcher/src/instance.rs | 0 fuzzers/{ => qemu}/qemu_launcher/src/main.rs | 0 .../{ => qemu}/qemu_launcher/src/options.rs | 0 .../{ => qemu}/qemu_launcher/src/version.rs | 0 fuzzers/{ => qemu}/qemu_systemmode/.gitignore | 0 fuzzers/{ => qemu}/qemu_systemmode/Cargo.toml | 10 +- .../{ => qemu}/qemu_systemmode/Makefile.toml | 0 fuzzers/{ => qemu}/qemu_systemmode/README.md | 0 fuzzers/{ => qemu}/qemu_systemmode/build.rs | 0 .../{ => qemu}/qemu_systemmode/corpus/random | 0 .../{ => qemu}/qemu_systemmode/corpus/zero | Bin .../{ => qemu}/qemu_systemmode/example/main.c | 0 .../qemu_systemmode/example/mps2_m3.ld | 0 .../qemu_systemmode/example/startup.c | 0 .../qemu_systemmode/src/fuzzer_breakpoint.rs | 0 .../qemu_systemmode/src/fuzzer_classic.rs | 0 .../qemu_systemmode/src/fuzzer_sync_exit.rs | 0 .../{ => qemu}/qemu_systemmode/src/main.rs | 0 fuzzers/qemu_launcher/corpus/not_kitty.png | Bin 218 -> 0 bytes .../qemu_launcher/corpus/not_kitty_alpha.png | Bin 376 -> 0 bytes .../qemu_launcher/corpus/not_kitty_gamma.png | Bin 228 -> 0 bytes .../qemu_launcher/corpus/not_kitty_icc.png | Bin 427 -> 0 bytes .../src/bin/libafl_cc.rs | 36 --- .../{ => stb}/libfuzzer_stb_image/.gitignore | 0 .../{ => stb}/libfuzzer_stb_image/Cargo.toml | 6 +- .../libfuzzer_stb_image/Makefile.toml | 0 .../{ => stb}/libfuzzer_stb_image/README.md | 0 .../{ => stb}/libfuzzer_stb_image/build.rs | 0 .../libfuzzer_stb_image}/corpus/not_kitty.png | Bin .../corpus/not_kitty_alpha.png | Bin .../corpus/not_kitty_gamma.png | Bin .../corpus/not_kitty_icc.png | Bin .../{ => stb}/libfuzzer_stb_image/harness.c | 0 .../{ => stb}/libfuzzer_stb_image/src/main.rs | 0 .../{ => stb}/libfuzzer_stb_image/stb_image.h | 0 .../Makefile.toml | 0 .../libfuzzer_stb_image_concolic/README.md | 0 .../fuzzer/.gitignore | 0 .../fuzzer/Cargo.toml | 8 +- .../fuzzer/build.rs | 0 .../fuzzer}/corpus/not_kitty.png | Bin .../fuzzer}/corpus/not_kitty_alpha.png | Bin .../fuzzer}/corpus/not_kitty_gamma.png | Bin .../fuzzer}/corpus/not_kitty_icc.png | Bin .../fuzzer/harness.c | 0 .../fuzzer/harness_symcc.c | 0 .../fuzzer/src/main.rs | 0 .../fuzzer/stb_image.h | 0 .../runtime/Cargo.toml | 2 +- .../runtime/src/lib.rs | 0 .../libfuzzer_stb_image_sugar/.gitignore | 0 .../libfuzzer_stb_image_sugar/Cargo.toml | 8 +- .../libfuzzer_stb_image_sugar/Makefile.toml | 0 .../libfuzzer_stb_image_sugar/README.md | 0 .../libfuzzer_stb_image_sugar/build.rs | 0 .../corpus/not_kitty.png | Bin .../corpus/not_kitty_alpha.png | Bin .../corpus/not_kitty_gamma.png | Bin .../corpus/not_kitty_icc.png | Bin .../libfuzzer_stb_image_sugar/harness.c | 0 .../libfuzzer_stb_image_sugar/src/main.rs | 0 .../libfuzzer_stb_image_sugar/stb_image.h | 0 fuzzers/tinyinst_simple/Cargo.toml | 13 - fuzzers/tutorial/src/bin/libafl_cxx.rs | 5 - scripts/check_tested_fuzzers.sh | 4 +- 529 files changed, 312 insertions(+), 1047 deletions(-) create mode 100644 fuzzers/README.md rename fuzzers/{ => baby}/baby_fuzzer/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer/Cargo.toml (79%) rename fuzzers/{ => baby}/baby_fuzzer/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_gramatron/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_gramatron/Cargo.toml (73%) rename fuzzers/{ => baby}/baby_fuzzer_gramatron/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_gramatron/auto.json (100%) rename fuzzers/{ => baby}/baby_fuzzer_gramatron/auto.postcard (100%) rename fuzzers/{ => baby}/baby_fuzzer_gramatron/corpus/new file (100%) rename fuzzers/{ => baby}/baby_fuzzer_gramatron/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_grimoire/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_grimoire/Cargo.toml (79%) rename fuzzers/{ => baby}/baby_fuzzer_grimoire/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_grimoire/corpus/new file (100%) rename fuzzers/{ => baby}/baby_fuzzer_grimoire/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_minimizing/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_minimizing/Cargo.toml (74%) rename fuzzers/{ => baby}/baby_fuzzer_minimizing/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_minimizing/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_multi/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_multi/Cargo.toml (76%) rename fuzzers/{ => baby}/baby_fuzzer_multi/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_multi/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_nautilus/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_nautilus/Cargo.toml (73%) rename fuzzers/{ => baby}/baby_fuzzer_nautilus/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_nautilus/grammar.json (100%) rename fuzzers/{ => baby}/baby_fuzzer_nautilus/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/Cargo.toml (67%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/Makefile.toml (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/build.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/common.c (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/common.h (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/first.c (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/first.h (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/second.c (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/second.h (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/src/bin/libafl_cc.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_swap_differential/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_tokens/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_tokens/Cargo.toml (79%) rename fuzzers/{ => baby}/baby_fuzzer_tokens/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_tokens/corpus/new file (100%) rename fuzzers/{ => baby}/baby_fuzzer_tokens/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_unicode/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_unicode/Cargo.toml (75%) rename fuzzers/{ => baby}/baby_fuzzer_unicode/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_unicode/src/main.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/.cargo/config.toml (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/Cargo.toml (85%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/Makefile.toml (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/pkg/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/pkg/index.html (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/pkg/package.json (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/src/lib.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/src/utils.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/tests/web.rs (100%) rename fuzzers/{ => baby}/baby_fuzzer_wasm/webdriver.json (100%) rename fuzzers/{ => baby}/baby_fuzzer_with_forkexecutor/.gitignore (100%) rename fuzzers/{ => baby}/baby_fuzzer_with_forkexecutor/Cargo.toml (79%) rename fuzzers/{ => baby}/baby_fuzzer_with_forkexecutor/README.md (100%) rename fuzzers/{ => baby}/baby_fuzzer_with_forkexecutor/src/main.rs (100%) rename fuzzers/{ => baby}/baby_no_std/.gitignore (100%) rename fuzzers/{ => baby}/baby_no_std/Cargo.toml (72%) rename fuzzers/{ => baby}/baby_no_std/Makefile.toml (100%) rename fuzzers/{ => baby}/baby_no_std/README.md (100%) rename fuzzers/{ => baby}/baby_no_std/build.rs (100%) rename fuzzers/{ => baby}/baby_no_std/rust-toolchain (100%) rename fuzzers/{ => baby}/baby_no_std/src/main.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/README.md (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_fork_executor/.cargo/config (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_fork_executor/.gitignore (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_fork_executor/Cargo.toml (73%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_fork_executor/build.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_fork_executor/src/harness.c (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_fork_executor/src/main.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.cargo/config (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.gitignore (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml (74%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_inprocess_executor/build.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/harness.c (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/main.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/command_executor/.cargo/config (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/command_executor/.gitignore (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/command_executor/Cargo.toml (70%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/command_executor/build.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/command_executor/src/main.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/command_executor/src/test_command.c (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/forkserver_executor/.gitignore (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/forkserver_executor/Cargo.toml (67%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/forkserver_executor/build.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/forkserver_executor/src/main.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/forkserver_executor/src/program.c (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/rust_code_with_fork_executor/.cargo/config (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/rust_code_with_fork_executor/.gitignore (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/rust_code_with_fork_executor/Cargo.toml (73%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/rust_code_with_fork_executor/src/main.rs (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.cargo/config (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.gitignore (100%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/Cargo.toml (73%) rename fuzzers/{ => baby}/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/src/main.rs (100%) rename fuzzers/{ => forkserver}/forkserver_libafl_cc/Cargo.toml (69%) rename fuzzers/{ => forkserver}/forkserver_libafl_cc/Makefile.toml (100%) rename fuzzers/{ => forkserver}/forkserver_libafl_cc/README.md (100%) rename fuzzers/{ => forkserver}/forkserver_libafl_cc/corpus/testfile (100%) rename fuzzers/{ => forkserver}/forkserver_libafl_cc/src/bin/libafl_cc.rs (100%) rename fuzzers/{dynamic_analysis => forkserver/forkserver_libafl_cc}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => forkserver}/forkserver_libafl_cc/src/lib.rs (100%) rename fuzzers/{ => forkserver}/forkserver_libafl_cc/src/main.rs (100%) rename fuzzers/{ => forkserver}/forkserver_libafl_cc/src/program.c (100%) rename fuzzers/{ => forkserver}/forkserver_simple/.gitignore (100%) rename fuzzers/{ => forkserver}/forkserver_simple/Cargo.toml (79%) rename fuzzers/{ => forkserver}/forkserver_simple/README.md (100%) rename fuzzers/{ => forkserver}/forkserver_simple/build.rs (100%) rename fuzzers/{ => forkserver}/forkserver_simple/corpus/testfile (100%) rename fuzzers/{ => forkserver}/forkserver_simple/src/main.rs (100%) rename fuzzers/{ => forkserver}/forkserver_simple/src/program.c (100%) rename fuzzers/{ => frida}/frida_executable_libpng/.gitignore (100%) rename fuzzers/{ => frida}/frida_executable_libpng/Cargo.toml (62%) rename fuzzers/{ => frida}/frida_executable_libpng/Makefile.toml (100%) rename fuzzers/{ => frida}/frida_executable_libpng/README.md (100%) rename fuzzers/{ => frida}/frida_executable_libpng/corpus/not_kitty.png (100%) rename fuzzers/{ => frida}/frida_executable_libpng/corpus/not_kitty_alpha.png (100%) rename fuzzers/{ => frida}/frida_executable_libpng/corpus/not_kitty_gamma.png (100%) rename fuzzers/{ => frida}/frida_executable_libpng/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => frida}/frida_executable_libpng/harness.cc (100%) rename fuzzers/{ => frida}/frida_executable_libpng/src/fuzzer.rs (100%) rename fuzzers/{ => frida}/frida_executable_libpng/src/lib.rs (100%) rename fuzzers/{ => frida}/frida_gdiplus/.gitignore (100%) rename fuzzers/{ => frida}/frida_gdiplus/Cargo.toml (70%) rename fuzzers/{ => frida}/frida_gdiplus/Makefile.toml (100%) rename fuzzers/{ => frida}/frida_gdiplus/README.md (100%) rename fuzzers/{ => frida}/frida_gdiplus/cargo/.config (100%) rename fuzzers/{ => frida}/frida_gdiplus/cmplog_test.asm (100%) rename fuzzers/{ => frida}/frida_gdiplus/cmplog_test.def (100%) rename fuzzers/{ => frida}/frida_gdiplus/corpus/not_kitty.png (100%) rename fuzzers/{ => frida}/frida_gdiplus/corpus/not_kitty_alpha.png (100%) rename fuzzers/{ => frida}/frida_gdiplus/corpus/not_kitty_gamma.png (100%) rename fuzzers/{ => frida}/frida_gdiplus/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => frida}/frida_gdiplus/harness.cc (100%) rename fuzzers/{ => frida}/frida_gdiplus/src/fuzzer.rs (100%) rename fuzzers/{ => frida}/frida_gdiplus/src/main.rs (100%) rename fuzzers/{ => frida}/frida_libpng/.gitignore (100%) rename fuzzers/{ => frida}/frida_libpng/Cargo.toml (68%) rename fuzzers/{ => frida}/frida_libpng/Makefile.toml (100%) rename fuzzers/{ => frida}/frida_libpng/README.md (100%) rename fuzzers/{ => frida}/frida_libpng/corpus/not_kitty.png (100%) rename fuzzers/{ => frida}/frida_libpng/corpus/not_kitty_alpha.png (100%) rename fuzzers/{ => frida}/frida_libpng/corpus/not_kitty_gamma.png (100%) rename fuzzers/{ => frida}/frida_libpng/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => frida}/frida_libpng/harness.cc (100%) rename fuzzers/{ => frida}/frida_libpng/harness_win.cpp (100%) rename fuzzers/{ => frida}/frida_libpng/src/fuzzer.rs (100%) rename fuzzers/{ => frida}/frida_libpng/src/main.rs (100%) rename fuzzers/fuzzbench/{ => fuzzbench}/.gitignore (100%) rename fuzzers/fuzzbench/{ => fuzzbench}/Cargo.toml (74%) rename fuzzers/fuzzbench/{ => fuzzbench}/Makefile.toml (100%) rename fuzzers/fuzzbench/{ => fuzzbench}/README.md (100%) rename fuzzers/fuzzbench/{ => fuzzbench}/fuzz.c (100%) rename fuzzers/fuzzbench/{ => fuzzbench}/src/bin/libafl_cc.rs (100%) rename fuzzers/{forkserver_libafl_cc => fuzzbench/fuzzbench}/src/bin/libafl_cxx.rs (100%) rename fuzzers/fuzzbench/{ => fuzzbench}/src/lib.rs (100%) rename fuzzers/{dynamic_analysis => fuzzbench/fuzzbench}/stub_rt.c (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_ctx/Cargo.toml (73%) rename fuzzers/{ => fuzzbench}/fuzzbench_ctx/Makefile.toml (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_ctx/fuzz.c (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_ctx/src/bin/libafl_cc.rs (100%) rename fuzzers/fuzzbench/{ => fuzzbench_ctx}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_ctx/src/lib.rs (100%) rename fuzzers/fuzzbench/{ => fuzzbench_ctx}/stub_rt.c (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_fork_qemu/.gitignore (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_fork_qemu/Cargo.toml (73%) rename fuzzers/{ => fuzzbench}/fuzzbench_fork_qemu/Makefile.toml (97%) rename fuzzers/{ => fuzzbench}/fuzzbench_fork_qemu/libfuzzer_main.c (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_fork_qemu/src/fuzzer.rs (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_fork_qemu/src/main.rs (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_forkserver/.gitignore (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_forkserver/Cargo.toml (78%) rename fuzzers/{ => fuzzbench}/fuzzbench_forkserver/src/main.rs (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_forkserver_cmplog/Cargo.toml (71%) rename fuzzers/{ => fuzzbench}/fuzzbench_forkserver_cmplog/src/main.rs (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_forkserver_cmplog/test/compile.sh (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_forkserver_cmplog/test/test-cmplog.c (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_qemu/.gitignore (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_qemu/Cargo.toml (73%) rename fuzzers/{ => fuzzbench}/fuzzbench_qemu/Makefile.toml (93%) rename fuzzers/{ => fuzzbench}/fuzzbench_qemu/README.md (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_qemu/libfuzzer_main.c (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_qemu/src/fuzzer.rs (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_qemu/src/main.rs (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_text/.gitignore (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_text/Cargo.toml (73%) rename fuzzers/{ => fuzzbench}/fuzzbench_text/Makefile.toml (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_text/README.md (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_text/fuzz.c (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_text/src/bin/libafl_cc.rs (100%) rename fuzzers/{fuzzbench_ctx => fuzzbench/fuzzbench_text}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => fuzzbench}/fuzzbench_text/src/lib.rs (100%) delete mode 100644 fuzzers/libfuzzer_libpng_aflpp_ui/Cargo.toml delete mode 100644 fuzzers/libfuzzer_libpng_aflpp_ui/Makefile.toml delete mode 100644 fuzzers/libfuzzer_libpng_aflpp_ui/README.md delete mode 100644 fuzzers/libfuzzer_libpng_aflpp_ui/src/lib.rs delete mode 100644 fuzzers/libfuzzer_libpng_tcp_manager/harness.cc rename fuzzers/{ => libpng}/libfuzzer_libpng/.gitignore (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/Cargo.toml (61%) rename fuzzers/{ => libpng}/libfuzzer_libpng/Makefile.toml (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/README.md (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/corpus/not_kitty.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/corpus/not_kitty_alpha.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/corpus/not_kitty_gamma.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/harness.cc (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/src/bin/libafl_cc.rs (100%) rename fuzzers/{fuzzbench_text => libpng/libfuzzer_libpng}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng/src/lib.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/.gitignore (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/Cargo.toml (62%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/Makefile.toml (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/README.md (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/corpus/not_kitty.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/corpus/not_kitty_alpha.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/corpus/not_kitty_gamma.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/harness.cc (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libmozjpeg => libpng/libfuzzer_libpng_accounting}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_accounting/src/lib.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_centralized/.gitignore (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_centralized/Cargo.toml (61%) rename fuzzers/{ => libpng}/libfuzzer_libpng_centralized/Makefile.toml (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_centralized/README.md (100%) rename fuzzers/{libfuzzer_libpng_aflpp_ui => libpng/libfuzzer_libpng_centralized}/corpus/not_kitty.png (100%) rename fuzzers/{libfuzzer_libpng_aflpp_ui => libpng/libfuzzer_libpng_centralized}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_libpng_aflpp_ui => libpng/libfuzzer_libpng_centralized}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_libpng_aflpp_ui => libpng/libfuzzer_libpng_centralized}/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_centralized/harness.cc (100%) rename fuzzers/{libfuzzer_libpng_aflpp_ui => libpng/libfuzzer_libpng_centralized}/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libpng => libpng/libfuzzer_libpng_centralized}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_centralized/src/lib.rs (100%) rename fuzzers/{libfuzzer_libpng_aflpp_ui => libpng/libfuzzer_libpng_cmin}/.gitignore (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_cmin/Cargo.toml (64%) rename fuzzers/{ => libpng}/libfuzzer_libpng_cmin/Makefile.toml (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_cmin/README.md (100%) rename fuzzers/{libfuzzer_libpng_centralized => libpng/libfuzzer_libpng_cmin}/corpus/not_kitty.png (100%) rename fuzzers/{libfuzzer_libpng_centralized => libpng/libfuzzer_libpng_cmin}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_libpng_centralized => libpng/libfuzzer_libpng_cmin}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_libpng_centralized => libpng/libfuzzer_libpng_cmin}/corpus/not_kitty_icc.png (100%) rename fuzzers/{libfuzzer_libpng_aflpp_ui => libpng/libfuzzer_libpng_cmin}/harness.cc (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_cmin/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libpng_accounting => libpng/libfuzzer_libpng_cmin}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_cmin/src/lib.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/.gitignore (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/Cargo.toml (65%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/Makefile.toml (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/README.md (100%) rename fuzzers/{libfuzzer_libpng_cmin => libpng/libfuzzer_libpng_launcher}/corpus/not_kitty.png (100%) rename fuzzers/{libfuzzer_libpng_cmin => libpng/libfuzzer_libpng_launcher}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_libpng_cmin => libpng/libfuzzer_libpng_launcher}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_libpng_cmin => libpng/libfuzzer_libpng_launcher}/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/harness.cc (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libpng_aflpp_ui => libpng/libfuzzer_libpng_launcher}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_launcher/src/lib.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_norestart/.gitignore (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_norestart/Cargo.toml (69%) rename fuzzers/{ => libpng}/libfuzzer_libpng_norestart/Makefile.toml (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_norestart/README.md (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_norestart/harness.cc (100%) rename fuzzers/{libfuzzer_libpng_launcher/corpus => libpng/libfuzzer_libpng_norestart/seeds}/not_kitty.png (100%) rename fuzzers/{libfuzzer_libpng_launcher/corpus => libpng/libfuzzer_libpng_norestart/seeds}/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_libpng_launcher/corpus => libpng/libfuzzer_libpng_norestart/seeds}/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_libpng_launcher/corpus => libpng/libfuzzer_libpng_norestart/seeds}/not_kitty_icc.png (100%) rename fuzzers/{libfuzzer_libpng_centralized => libpng/libfuzzer_libpng_norestart}/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libpng_centralized => libpng/libfuzzer_libpng_norestart}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_norestart/src/lib.rs (100%) rename fuzzers/{libfuzzer_libpng_cmin => libpng/libfuzzer_libpng_tcp_manager}/.gitignore (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_tcp_manager/Cargo.toml (61%) rename fuzzers/{ => libpng}/libfuzzer_libpng_tcp_manager/Makefile.toml (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_tcp_manager/README.md (100%) rename fuzzers/{libfuzzer_libpng_norestart/seeds => libpng/libfuzzer_libpng_tcp_manager/corpus}/not_kitty.png (100%) rename fuzzers/{libfuzzer_libpng_norestart/seeds => libpng/libfuzzer_libpng_tcp_manager/corpus}/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_libpng_norestart/seeds => libpng/libfuzzer_libpng_tcp_manager/corpus}/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_libpng_norestart/seeds => libpng/libfuzzer_libpng_tcp_manager/corpus}/not_kitty_icc.png (100%) rename fuzzers/{libfuzzer_libpng_cmin => libpng/libfuzzer_libpng_tcp_manager}/harness.cc (100%) rename fuzzers/{libfuzzer_libpng_norestart => libpng/libfuzzer_libpng_tcp_manager}/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libpng_cmin => libpng/libfuzzer_libpng_tcp_manager}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => libpng}/libfuzzer_libpng_tcp_manager/src/lib.rs (100%) rename fuzzers/{ => nyx}/nyx_libxml2_parallel/Cargo.toml (50%) rename fuzzers/{ => nyx}/nyx_libxml2_parallel/Makefile.toml (100%) rename fuzzers/{ => nyx}/nyx_libxml2_parallel/README.md (100%) rename fuzzers/{ => nyx}/nyx_libxml2_parallel/setup_libxml2.sh (87%) rename fuzzers/{ => nyx}/nyx_libxml2_parallel/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libpng_launcher => nyx/nyx_libxml2_parallel}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => nyx}/nyx_libxml2_parallel/src/main.rs (100%) rename fuzzers/{ => nyx}/nyx_libxml2_standalone/Cargo.toml (50%) rename fuzzers/{ => nyx}/nyx_libxml2_standalone/Makefile.toml (100%) rename fuzzers/{ => nyx}/nyx_libxml2_standalone/README.md (100%) rename fuzzers/{ => nyx}/nyx_libxml2_standalone/setup_libxml2.sh (87%) rename fuzzers/{ => nyx}/nyx_libxml2_standalone/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libpng_norestart => nyx/nyx_libxml2_standalone}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => nyx}/nyx_libxml2_standalone/src/main.rs (100%) rename fuzzers/{ => others}/cargo_fuzz/Cargo.toml (100%) rename fuzzers/{ => others}/cargo_fuzz/Makefile.toml (100%) rename fuzzers/{ => others}/cargo_fuzz/README.md (100%) rename fuzzers/{ => others}/cargo_fuzz/fuzz/.gitignore (100%) rename fuzzers/{ => others}/cargo_fuzz/fuzz/Cargo.toml (90%) rename fuzzers/{ => others}/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs (100%) rename fuzzers/{ => others}/cargo_fuzz/src/lib.rs (100%) rename fuzzers/{ => others}/dynamic_analysis/Cargo.toml (74%) rename fuzzers/{ => others}/dynamic_analysis/Makefile.toml (100%) rename fuzzers/{ => others}/dynamic_analysis/README.md (100%) rename fuzzers/{ => others}/dynamic_analysis/build.rs (100%) rename fuzzers/{ => others}/dynamic_analysis/build.sh (100%) rename fuzzers/{ => others}/dynamic_analysis/clean.sh (100%) rename fuzzers/{ => others}/dynamic_analysis/cms_transform_fuzzer.cc (100%) rename fuzzers/{ => others}/dynamic_analysis/concatenator.py (100%) rename fuzzers/{ => others}/dynamic_analysis/corpus/seed (100%) rename fuzzers/{ => others}/dynamic_analysis/src/bin/libafl_cc.rs (100%) rename fuzzers/{libfuzzer_libpng_tcp_manager => others/dynamic_analysis}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => others}/dynamic_analysis/src/lib.rs (100%) rename fuzzers/{fuzzbench_ctx => others/dynamic_analysis}/stub_rt.c (100%) rename fuzzers/{ => others}/libafl-fuzz/Cargo.toml (60%) rename fuzzers/{ => others}/libafl-fuzz/Makefile.toml (100%) rename fuzzers/{ => others}/libafl-fuzz/README.md (100%) rename fuzzers/{ => others}/libafl-fuzz/src/afl_stats.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/corpus.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/env_parser.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/executor.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/feedback/filepath.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/feedback/mod.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/feedback/persistent_record.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/feedback/seed.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/fuzzer.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/hooks.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/main.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/mutational_stage.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/src/scheduler.rs (100%) rename fuzzers/{ => others}/libafl-fuzz/test/seeds/init (100%) rename fuzzers/{ => others}/libafl-fuzz/test/seeds_cmplog/init (100%) rename fuzzers/{ => others}/libafl-fuzz/test/test-cmplog.c (100%) rename fuzzers/{ => others}/libafl-fuzz/test/test-instr.c (100%) rename fuzzers/{ => others}/libafl-fuzz/test/test.sh (100%) rename fuzzers/{ => others}/libafl_atheris/.gitignore (100%) rename fuzzers/{ => others}/libafl_atheris/Cargo.toml (68%) rename fuzzers/{ => others}/libafl_atheris/Makefile (100%) rename fuzzers/{ => others}/libafl_atheris/README.md (100%) rename fuzzers/{ => others}/libafl_atheris/src/lib.rs (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/.gitignore (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/Cargo.toml (66%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/Makefile.toml (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/README.md (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/build.rs (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/corpus/blank.jpg (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/harness.cc (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/hook_allocs.c (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/jpeg.dict (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/src/bin/libafl_cc.rs (100%) rename fuzzers/{nautilus_sync => others/libfuzzer_libmozjpeg}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => others}/libfuzzer_libmozjpeg/src/lib.rs (100%) rename fuzzers/{ => others}/libfuzzer_windows_asan/.gitignore (100%) rename fuzzers/{ => others}/libfuzzer_windows_asan/Cargo.toml (61%) rename fuzzers/{ => others}/libfuzzer_windows_asan/Makefile.toml (100%) rename fuzzers/{ => others}/libfuzzer_windows_asan/README.md (100%) rename fuzzers/{ => others}/libfuzzer_windows_asan/corpus/hello_world (100%) rename fuzzers/{ => others}/libfuzzer_windows_asan/harness.cpp (100%) rename fuzzers/{ => others}/libfuzzer_windows_asan/src/bin/libafl_cc.rs (100%) rename fuzzers/{ => others}/libfuzzer_windows_asan/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => others}/libfuzzer_windows_asan/src/lib.rs (100%) rename fuzzers/{ => others}/nautilus_sync/.gitignore (100%) rename fuzzers/{ => others}/nautilus_sync/Cargo.toml (66%) rename fuzzers/{ => others}/nautilus_sync/Makefile.toml (93%) rename fuzzers/{ => others}/nautilus_sync/rust-toolchain (100%) rename fuzzers/{ => others}/nautilus_sync/src/bin/libafl_cc.rs (100%) rename fuzzers/{nyx_libxml2_parallel => others/nautilus_sync}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => others}/nautilus_sync/src/lib.rs (100%) rename fuzzers/{libfuzzer_libpng_tcp_manager => others/push_harness}/.gitignore (100%) rename fuzzers/{ => others}/push_harness/Cargo.toml (83%) rename fuzzers/{ => others}/push_harness/README.md (100%) rename fuzzers/{ => others}/push_harness/src/main.rs (100%) rename fuzzers/{push_harness => others/push_stage_harness}/.gitignore (100%) rename fuzzers/{ => others}/push_stage_harness/Cargo.toml (79%) rename fuzzers/{ => others}/push_stage_harness/README.md (100%) rename fuzzers/{ => others}/push_stage_harness/src/main.rs (100%) rename fuzzers/{ => others}/sqlite_centralized_multi_machine/Cargo.toml (55%) rename fuzzers/{ => others}/sqlite_centralized_multi_machine/README.md (100%) rename fuzzers/{ => others}/sqlite_centralized_multi_machine/build.sh (100%) rename fuzzers/{ => others}/sqlite_centralized_multi_machine/run_child.sh (100%) rename fuzzers/{ => others}/sqlite_centralized_multi_machine/run_parent.sh (100%) rename fuzzers/{libfuzzer_libpng_tcp_manager => others/sqlite_centralized_multi_machine}/src/bin/libafl_cc.rs (100%) rename fuzzers/{nyx_libxml2_standalone => others/sqlite_centralized_multi_machine}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => others}/sqlite_centralized_multi_machine/src/lib.rs (100%) create mode 100644 fuzzers/others/tinyinst_simple/Cargo.toml rename fuzzers/{ => others}/tinyinst_simple/Makefile.toml (100%) rename fuzzers/{ => others}/tinyinst_simple/README.md (100%) rename fuzzers/{ => others}/tinyinst_simple/src/main.rs (100%) rename fuzzers/{ => others}/tinyinst_simple/test/crash_input.txt (100%) rename fuzzers/{ => others}/tinyinst_simple/test/ok_input.txt (100%) rename fuzzers/{ => others}/tinyinst_simple/test/test.cpp (100%) rename fuzzers/{ => others}/tutorial/Cargo.toml (72%) rename fuzzers/{ => others}/tutorial/rust-toolchain (100%) rename fuzzers/{ => others}/tutorial/src/bin/libafl_cc.rs (100%) rename fuzzers/{sqlite_centralized_multi_machine => others/tutorial}/src/bin/libafl_cxx.rs (100%) rename fuzzers/{ => others}/tutorial/src/input.rs (100%) rename fuzzers/{ => others}/tutorial/src/lib.rs (100%) rename fuzzers/{ => others}/tutorial/src/metadata.rs (100%) rename fuzzers/{ => others}/tutorial/src/mutator.rs (100%) rename fuzzers/{ => others}/tutorial/target.c (100%) delete mode 100644 fuzzers/push_stage_harness/.gitignore rename fuzzers/{ => qemu}/python_qemu/README.md (100%) rename fuzzers/{ => qemu}/python_qemu/fuzz.c (100%) rename fuzzers/{ => qemu}/python_qemu/fuzzer.py (100%) rename fuzzers/{ => qemu}/qemu_cmin/.gitignore (100%) rename fuzzers/{ => qemu}/qemu_cmin/Cargo.toml (82%) rename fuzzers/{ => qemu}/qemu_cmin/Makefile.toml (100%) rename fuzzers/{ => qemu}/qemu_cmin/README.md (100%) rename fuzzers/{ => qemu}/qemu_cmin/build.rs (100%) rename fuzzers/{libfuzzer_libpng_tcp_manager => qemu/qemu_cmin}/corpus/not_kitty.png (100%) rename fuzzers/{libfuzzer_libpng_tcp_manager => qemu/qemu_cmin}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_libpng_tcp_manager => qemu/qemu_cmin}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_libpng_tcp_manager => qemu/qemu_cmin}/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => qemu}/qemu_cmin/harness.cc (100%) rename fuzzers/{ => qemu}/qemu_cmin/src/fuzzer.rs (100%) rename fuzzers/{ => qemu}/qemu_cmin/src/main.rs (100%) rename fuzzers/{ => qemu}/qemu_coverage/.gitignore (100%) rename fuzzers/{ => qemu}/qemu_coverage/Cargo.toml (82%) rename fuzzers/{ => qemu}/qemu_coverage/Makefile.toml (100%) rename fuzzers/{ => qemu}/qemu_coverage/README.md (100%) rename fuzzers/{ => qemu}/qemu_coverage/build.rs (100%) rename fuzzers/{libfuzzer_stb_image => qemu/qemu_coverage}/corpus/not_kitty.png (100%) rename fuzzers/{libfuzzer_stb_image => qemu/qemu_coverage}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_stb_image => qemu/qemu_coverage}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_stb_image => qemu/qemu_coverage}/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => qemu}/qemu_coverage/harness.cc (100%) rename fuzzers/{ => qemu}/qemu_coverage/src/fuzzer.rs (100%) rename fuzzers/{ => qemu}/qemu_coverage/src/main.rs (100%) rename fuzzers/{ => qemu}/qemu_launcher/.gitignore (100%) rename fuzzers/{ => qemu}/qemu_launcher/Cargo.toml (85%) rename fuzzers/{ => qemu}/qemu_launcher/Makefile.toml (100%) rename fuzzers/{ => qemu}/qemu_launcher/README.md (100%) rename fuzzers/{ => qemu}/qemu_launcher/build.rs (100%) rename fuzzers/{libfuzzer_stb_image_concolic/fuzzer => qemu/qemu_launcher}/corpus/not_kitty.png (100%) rename fuzzers/{libfuzzer_stb_image_concolic/fuzzer => qemu/qemu_launcher}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_stb_image_concolic/fuzzer => qemu/qemu_launcher}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_stb_image_concolic/fuzzer => qemu/qemu_launcher}/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => qemu}/qemu_launcher/harness.cc (100%) rename fuzzers/{ => qemu}/qemu_launcher/injection_test/Makefile (100%) rename fuzzers/{ => qemu}/qemu_launcher/injection_test/README.md (100%) rename fuzzers/{ => qemu}/qemu_launcher/injection_test/example.db (100%) rename fuzzers/{ => qemu}/qemu_launcher/injection_test/sqltest.c (100%) rename fuzzers/{ => qemu}/qemu_launcher/injections.toml (100%) rename fuzzers/{ => qemu}/qemu_launcher/injections.yaml (100%) rename fuzzers/{ => qemu}/qemu_launcher/src/client.rs (100%) rename fuzzers/{ => qemu}/qemu_launcher/src/fuzzer.rs (100%) rename fuzzers/{ => qemu}/qemu_launcher/src/harness.rs (100%) rename fuzzers/{ => qemu}/qemu_launcher/src/instance.rs (100%) rename fuzzers/{ => qemu}/qemu_launcher/src/main.rs (100%) rename fuzzers/{ => qemu}/qemu_launcher/src/options.rs (100%) rename fuzzers/{ => qemu}/qemu_launcher/src/version.rs (100%) rename fuzzers/{ => qemu}/qemu_systemmode/.gitignore (100%) rename fuzzers/{ => qemu}/qemu_systemmode/Cargo.toml (63%) rename fuzzers/{ => qemu}/qemu_systemmode/Makefile.toml (100%) rename fuzzers/{ => qemu}/qemu_systemmode/README.md (100%) rename fuzzers/{ => qemu}/qemu_systemmode/build.rs (100%) rename fuzzers/{ => qemu}/qemu_systemmode/corpus/random (100%) rename fuzzers/{ => qemu}/qemu_systemmode/corpus/zero (100%) rename fuzzers/{ => qemu}/qemu_systemmode/example/main.c (100%) rename fuzzers/{ => qemu}/qemu_systemmode/example/mps2_m3.ld (100%) rename fuzzers/{ => qemu}/qemu_systemmode/example/startup.c (100%) rename fuzzers/{ => qemu}/qemu_systemmode/src/fuzzer_breakpoint.rs (100%) rename fuzzers/{ => qemu}/qemu_systemmode/src/fuzzer_classic.rs (100%) rename fuzzers/{ => qemu}/qemu_systemmode/src/fuzzer_sync_exit.rs (100%) rename fuzzers/{ => qemu}/qemu_systemmode/src/main.rs (100%) delete mode 100644 fuzzers/qemu_launcher/corpus/not_kitty.png delete mode 100644 fuzzers/qemu_launcher/corpus/not_kitty_alpha.png delete mode 100644 fuzzers/qemu_launcher/corpus/not_kitty_gamma.png delete mode 100644 fuzzers/qemu_launcher/corpus/not_kitty_icc.png delete mode 100644 fuzzers/sqlite_centralized_multi_machine/src/bin/libafl_cc.rs rename fuzzers/{ => stb}/libfuzzer_stb_image/.gitignore (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image/Cargo.toml (57%) rename fuzzers/{ => stb}/libfuzzer_stb_image/Makefile.toml (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image/README.md (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image/build.rs (100%) rename fuzzers/{libfuzzer_stb_image_sugar => stb/libfuzzer_stb_image}/corpus/not_kitty.png (100%) rename fuzzers/{libfuzzer_stb_image_sugar => stb/libfuzzer_stb_image}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{libfuzzer_stb_image_sugar => stb/libfuzzer_stb_image}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{libfuzzer_stb_image_sugar => stb/libfuzzer_stb_image}/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image/harness.c (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image/src/main.rs (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image/stb_image.h (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/Makefile.toml (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/README.md (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/fuzzer/.gitignore (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml (63%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/fuzzer/build.rs (100%) rename fuzzers/{qemu_cmin => stb/libfuzzer_stb_image_concolic/fuzzer}/corpus/not_kitty.png (100%) rename fuzzers/{qemu_cmin => stb/libfuzzer_stb_image_concolic/fuzzer}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{qemu_cmin => stb/libfuzzer_stb_image_concolic/fuzzer}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{qemu_cmin => stb/libfuzzer_stb_image_concolic/fuzzer}/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/fuzzer/harness.c (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/fuzzer/src/main.rs (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/fuzzer/stb_image.h (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/runtime/Cargo.toml (89%) rename fuzzers/{ => stb}/libfuzzer_stb_image_concolic/runtime/src/lib.rs (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_sugar/.gitignore (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_sugar/Cargo.toml (67%) rename fuzzers/{ => stb}/libfuzzer_stb_image_sugar/Makefile.toml (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_sugar/README.md (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_sugar/build.rs (100%) rename fuzzers/{qemu_coverage => stb/libfuzzer_stb_image_sugar}/corpus/not_kitty.png (100%) rename fuzzers/{qemu_coverage => stb/libfuzzer_stb_image_sugar}/corpus/not_kitty_alpha.png (100%) rename fuzzers/{qemu_coverage => stb/libfuzzer_stb_image_sugar}/corpus/not_kitty_gamma.png (100%) rename fuzzers/{qemu_coverage => stb/libfuzzer_stb_image_sugar}/corpus/not_kitty_icc.png (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_sugar/harness.c (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_sugar/src/main.rs (100%) rename fuzzers/{ => stb}/libfuzzer_stb_image_sugar/stb_image.h (100%) delete mode 100644 fuzzers/tinyinst_simple/Cargo.toml delete mode 100644 fuzzers/tutorial/src/bin/libafl_cxx.rs diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 2cee053087..9b2db7a050 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -243,7 +243,7 @@ jobs: - name: Run a maturin build run: export LLVM_CONFIG=llvm-config-16 && cd ./bindings/pylibafl && python3 -m venv .env && . .env/bin/activate && pip install --upgrade --force-reinstall . && ./test.sh - name: Run python test - run: . ./bindings/pylibafl/.env/bin/activate # && cd ./fuzzers/python_qemu/ && python3 fuzzer.py 2>&1 | grep "Bye" + run: . ./bindings/pylibafl/.env/bin/activate # && cd ./fuzzers/qemu/python_qemu/ && python3 fuzzer.py 2>&1 | grep "Bye" cargo-fmt: runs-on: ubuntu-latest @@ -282,62 +282,76 @@ jobs: matrix: os: [ ubuntu-latest ] fuzzer: - - ./fuzzers/cargo_fuzz - - ./fuzzers/fuzzbench_fork_qemu - - ./fuzzers/libfuzzer_stb_image_sugar - - ./fuzzers/nyx_libxml2_standalone - - ./fuzzers/baby_fuzzer_gramatron - - ./fuzzers/tinyinst_simple - - ./fuzzers/baby_fuzzer_with_forkexecutor - - ./fuzzers/baby_no_std - - ./fuzzers/baby_fuzzer_swap_differential - - ./fuzzers/baby_fuzzer_grimoire - - ./fuzzers/baby_fuzzer - - ./fuzzers/libfuzzer_libpng_launcher - - ./fuzzers/libfuzzer_libpng_accounting - - ./fuzzers/forkserver_libafl_cc - # - ./fuzzers/libfuzzer_libpng_tcp_manager - # - ./fuzzers/sqlite_centralized_multi_machine - - ./fuzzers/backtrace_baby_fuzzers - - ./fuzzers/fuzzbench_qemu - - ./fuzzers/nyx_libxml2_parallel - - ./fuzzers/frida_gdiplus - - ./fuzzers/libfuzzer_stb_image_concolic - - ./fuzzers/nautilus_sync - - ./fuzzers/push_harness - - ./fuzzers/libfuzzer_libpng_centralized - - ./fuzzers/baby_fuzzer_nautilus - - ./fuzzers/fuzzbench_text - - ./fuzzers/libfuzzer_libpng_cmin - - ./fuzzers/forkserver_simple - - ./fuzzers/baby_fuzzer_unicode - - ./fuzzers/libfuzzer_libpng_norestart - - ./fuzzers/baby_fuzzer_multi - - ./fuzzers/libafl_atheris - - ./fuzzers/frida_libpng - - ./fuzzers/fuzzbench_ctx - - ./fuzzers/fuzzbench_forkserver_cmplog - - ./fuzzers/push_stage_harness - - ./fuzzers/libfuzzer_libmozjpeg - - ./fuzzers/libfuzzer_libpng_aflpp_ui - - ./fuzzers/libfuzzer_libpng - - ./fuzzers/baby_fuzzer_wasm - - ./fuzzers/fuzzbench - - ./fuzzers/libfuzzer_stb_image - - ./fuzzers/fuzzbench_forkserver - # - ./fuzzers/libfuzzer_windows_asan - # - ./fuzzers/dynamic_analysis - - ./fuzzers/baby_fuzzer_minimizing - - ./fuzzers/frida_executable_libpng - - ./fuzzers/tutorial - - ./fuzzers/baby_fuzzer_tokens - - ./fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor - - ./fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor - - ./fuzzers/backtrace_baby_fuzzers/command_executor - - ./fuzzers/backtrace_baby_fuzzers/forkserver_executor - - ./fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor - - ./fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor - - ./fuzzers/libafl-fuzz + # Baby + - ./fuzzers/baby/baby_fuzzer_with_forkexecutor + - ./fuzzers/baby/baby_no_std + - ./fuzzers/baby/baby_fuzzer_swap_differential + - ./fuzzers/baby/baby_fuzzer_grimoire + - ./fuzzers/baby/baby_fuzzer_gramatron + - ./fuzzers/baby/baby_fuzzer + - ./fuzzers/baby/baby_fuzzer_nautilus + # - ./fuzzers/baby/backtrace_baby_fuzzers + - ./fuzzers/baby/baby_fuzzer_unicode + - ./fuzzers/baby/baby_fuzzer_multi + - ./fuzzers/baby/baby_fuzzer_wasm + - ./fuzzers/baby/baby_fuzzer_minimizing + - ./fuzzers/baby/baby_fuzzer_tokens + - ./fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor + - ./fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor + - ./fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor + - ./fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor + - ./fuzzers/baby/backtrace_baby_fuzzers/command_executor + - ./fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor + + # Forkserver + - ./fuzzers/forkserver/forkserver_simple + - ./fuzzers/forkserver/forkserver_libafl_cc + + # Frida + - ./fuzzers/frida/frida_executable_libpng + - ./fuzzers/frida/frida_gdiplus + - ./fuzzers/frida/frida_libpng + + # Fuzzbench + - ./fuzzers/fuzzbench/fuzzbench + - ./fuzzers/fuzzbench/fuzzbench_qemu + - ./fuzzers/fuzzbench/fuzzbench_fork_qemu + - ./fuzzers/fuzzbench/fuzzbench_text + - ./fuzzers/fuzzbench/fuzzbench_ctx + - ./fuzzers/fuzzbench/fuzzbench_forkserver_cmplog + - ./fuzzers/fuzzbench/fuzzbench_forkserver + + # LibPNG + - ./fuzzers/libpng/libfuzzer_libpng + - ./fuzzers/libpng/libfuzzer_libpng_launcher + - ./fuzzers/libpng/libfuzzer_libpng_accounting + - ./fuzzers/libpng/libfuzzer_libpng_centralized + - ./fuzzers/libpng/libfuzzer_libpng_cmin + - ./fuzzers/libpng/libfuzzer_libpng_norestart + # - ./fuzzers/libpng/libfuzzer_libpng_tcp_manager + + # Nyx + - ./fuzzers/nyx/nyx_libxml2_standalone + - ./fuzzers/nyx/nyx_libxml2_parallel + + # Stb + - ./fuzzers/stb/libfuzzer_stb_image_sugar + - ./fuzzers/stb/libfuzzer_stb_image + - ./fuzzers/stb/libfuzzer_stb_image_concolic + + # Others + - ./fuzzers/others/cargo_fuzz + # - ./fuzzers/others/dynamic_analysis + - ./fuzzers/others/libafl_atheris + - ./fuzzers/others/libafl-fuzz + - ./fuzzers/others/libfuzzer_libmozjpeg + # - ./fuzzers/others/libfuzzer_windows_asan + - ./fuzzers/others/nautilus_sync + - ./fuzzers/others/push_harness + - ./fuzzers/others/push_stage_harness + # - ./fuzzers/others/sqlite_centralized_multi_machine + - ./fuzzers/others/tinyinst_simple + - ./fuzzers/others/tutorial runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -374,10 +388,10 @@ jobs: matrix: os: [ubuntu-latest] fuzzer: - - ./fuzzers/qemu_cmin - - ./fuzzers/qemu_systemmode - - ./fuzzers/qemu_coverage - - ./fuzzers/qemu_launcher + - ./fuzzers/qemu/qemu_cmin + - ./fuzzers/qemu/qemu_systemmode + - ./fuzzers/qemu/qemu_coverage + - ./fuzzers/qemu/qemu_launcher runs-on: [ self-hosted, qemu ] container: registry.gitlab.com/qemu-project/qemu/qemu/ubuntu2204:latest @@ -403,9 +417,9 @@ jobs: - name: Add targets run: rustup target add arm-linux-androideabi && rustup target add thumbv6m-none-eabi - name: Build aarch64-unknown-none - run: cd ./fuzzers/baby_no_std && cargo +nightly build -Zbuild-std=core,alloc --target aarch64-unknown-none -v --release && cd ../.. + run: cd ./fuzzers/baby/baby_no_std && cargo +nightly build -Zbuild-std=core,alloc --target aarch64-unknown-none -v --release && cd ../.. - name: run x86_64 until panic! - run: cd ./fuzzers/baby_no_std && cargo +nightly run || test $? -ne 0 || exit 1 + run: cd ./fuzzers/baby/baby_no_std && cargo +nightly run || test $? -ne 0 || exit 1 - name: no_std tests run: cd ./libafl && cargo test --no-default-features @@ -442,7 +456,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/workflows/windows-tester-prepare - name: Build fuzzers/frida_libpng - run: cd fuzzers/frida_libpng/ && cargo make test + run: cd fuzzers/frida/frida_libpng/ && cargo make test windows-frida-libfuzzer-stb-image: runs-on: windows-latest @@ -451,8 +465,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ./.github/workflows/windows-tester-prepare - - name: Build fuzzers/libfuzzer_stb_image - run: cd fuzzers/libfuzzer_stb_image && cargo build --release + - name: Build fuzzers/stb/libfuzzer_stb_image + run: cd fuzzers/stb/libfuzzer_stb_image && cargo build --release windows-frida-gdiplus: runs-on: windows-latest @@ -461,8 +475,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ./.github/workflows/windows-tester-prepare - - name: Build fuzzers/frida_gdiplus - run: cd fuzzers/frida_gdiplus/ && cargo make test && cargo make test_cmplog + - name: Build fuzzers/frida/frida_gdiplus + run: cd fuzzers/frida/frida_gdiplus/ && cargo make test && cargo make test_cmplog windows-tinyinst-simple: runs-on: windows-latest @@ -473,8 +487,8 @@ jobs: - uses: ./.github/workflows/windows-tester-prepare - name: install cxx bridge run: cargo install cxxbridge-cmd - - name: Build fuzzers/tinyinst_simple - run: cd fuzzers/tinyinst_simple/ && cargo make test + - name: Build fuzzers/others/tinyinst_simple + run: cd fuzzers/others/tinyinst_simple/ && cargo make test windows-clippy: runs-on: windows-latest diff --git a/.gitignore b/.gitignore index 7f58fd3d22..0baea31779 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ test.dict .idea/ # Ignore all built fuzzers -fuzzer_* AFLplusplus test_* *_fuzzer diff --git a/fuzzers/README.md b/fuzzers/README.md new file mode 100644 index 0000000000..3971102fad --- /dev/null +++ b/fuzzers/README.md @@ -0,0 +1,24 @@ +# LibAFL Fuzzers + +## Example fuzzers + +You can find here all the example fuzzers built on top of LibAFL. +They are sorted by fuzzer types: + +- `baby`: Minimal fuzzers demonstrating a specific feature. +- `forkserver`: Fuzzers using a forkserver-style executor. +- `frida`: Fuzzers using [Frida](../libafl_frida). +- `fuzzbench`: Fuzzbench fuzzers. +- `libpng`: Fuzzers targeting libpng. +- `nyx`: Fuzzers based on [Nyx](../libafl_nyx). +- `others`: Various fuzzers, with no specific categories. +- `qemu`: Fuzzers using [Qemu](../libafl_qemu). +- `stb`: Fuzzers targeting stb. + +## Paper Artifacts + +Multiple papers based on LibAFL have been published alongside artifacts. +Here is a list of LibAFL artifacts: + +- Fuzzbench implementation: https://github.com/AFLplusplus/libafl_fuzzbench +- LibAFL QEMU experiments: https://github.com/AFLplusplus/libafl_qemu_artifacts diff --git a/fuzzers/baby_fuzzer/.gitignore b/fuzzers/baby/baby_fuzzer/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer/.gitignore rename to fuzzers/baby/baby_fuzzer/.gitignore diff --git a/fuzzers/baby_fuzzer/Cargo.toml b/fuzzers/baby/baby_fuzzer/Cargo.toml similarity index 79% rename from fuzzers/baby_fuzzer/Cargo.toml rename to fuzzers/baby/baby_fuzzer/Cargo.toml index fe557e3466..4a6e58079a 100644 --- a/fuzzers/baby_fuzzer/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer/Cargo.toml @@ -20,5 +20,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } diff --git a/fuzzers/baby_fuzzer/README.md b/fuzzers/baby/baby_fuzzer/README.md similarity index 100% rename from fuzzers/baby_fuzzer/README.md rename to fuzzers/baby/baby_fuzzer/README.md diff --git a/fuzzers/baby_fuzzer/src/main.rs b/fuzzers/baby/baby_fuzzer/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer/src/main.rs rename to fuzzers/baby/baby_fuzzer/src/main.rs diff --git a/fuzzers/baby_fuzzer_gramatron/.gitignore b/fuzzers/baby/baby_fuzzer_gramatron/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_gramatron/.gitignore rename to fuzzers/baby/baby_fuzzer_gramatron/.gitignore diff --git a/fuzzers/baby_fuzzer_gramatron/Cargo.toml b/fuzzers/baby/baby_fuzzer_gramatron/Cargo.toml similarity index 73% rename from fuzzers/baby_fuzzer_gramatron/Cargo.toml rename to fuzzers/baby/baby_fuzzer_gramatron/Cargo.toml index 90cf3bd181..901372a828 100644 --- a/fuzzers/baby_fuzzer_gramatron/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_gramatron/Cargo.toml @@ -19,6 +19,6 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } postcard = { version = "1.0", features = ["alloc"], default-features = false } # no_std compatible serde serialization format \ No newline at end of file diff --git a/fuzzers/baby_fuzzer_gramatron/README.md b/fuzzers/baby/baby_fuzzer_gramatron/README.md similarity index 100% rename from fuzzers/baby_fuzzer_gramatron/README.md rename to fuzzers/baby/baby_fuzzer_gramatron/README.md diff --git a/fuzzers/baby_fuzzer_gramatron/auto.json b/fuzzers/baby/baby_fuzzer_gramatron/auto.json similarity index 100% rename from fuzzers/baby_fuzzer_gramatron/auto.json rename to fuzzers/baby/baby_fuzzer_gramatron/auto.json diff --git a/fuzzers/baby_fuzzer_gramatron/auto.postcard b/fuzzers/baby/baby_fuzzer_gramatron/auto.postcard similarity index 100% rename from fuzzers/baby_fuzzer_gramatron/auto.postcard rename to fuzzers/baby/baby_fuzzer_gramatron/auto.postcard diff --git a/fuzzers/baby_fuzzer_gramatron/corpus/new file b/fuzzers/baby/baby_fuzzer_gramatron/corpus/new file similarity index 100% rename from fuzzers/baby_fuzzer_gramatron/corpus/new file rename to fuzzers/baby/baby_fuzzer_gramatron/corpus/new file diff --git a/fuzzers/baby_fuzzer_gramatron/src/main.rs b/fuzzers/baby/baby_fuzzer_gramatron/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_gramatron/src/main.rs rename to fuzzers/baby/baby_fuzzer_gramatron/src/main.rs diff --git a/fuzzers/baby_fuzzer_grimoire/.gitignore b/fuzzers/baby/baby_fuzzer_grimoire/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_grimoire/.gitignore rename to fuzzers/baby/baby_fuzzer_grimoire/.gitignore diff --git a/fuzzers/baby_fuzzer_grimoire/Cargo.toml b/fuzzers/baby/baby_fuzzer_grimoire/Cargo.toml similarity index 79% rename from fuzzers/baby_fuzzer_grimoire/Cargo.toml rename to fuzzers/baby/baby_fuzzer_grimoire/Cargo.toml index 2508cfc245..2d4ee55832 100644 --- a/fuzzers/baby_fuzzer_grimoire/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_grimoire/Cargo.toml @@ -19,5 +19,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } diff --git a/fuzzers/baby_fuzzer_grimoire/README.md b/fuzzers/baby/baby_fuzzer_grimoire/README.md similarity index 100% rename from fuzzers/baby_fuzzer_grimoire/README.md rename to fuzzers/baby/baby_fuzzer_grimoire/README.md diff --git a/fuzzers/baby_fuzzer_grimoire/corpus/new file b/fuzzers/baby/baby_fuzzer_grimoire/corpus/new file similarity index 100% rename from fuzzers/baby_fuzzer_grimoire/corpus/new file rename to fuzzers/baby/baby_fuzzer_grimoire/corpus/new file diff --git a/fuzzers/baby_fuzzer_grimoire/src/main.rs b/fuzzers/baby/baby_fuzzer_grimoire/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_grimoire/src/main.rs rename to fuzzers/baby/baby_fuzzer_grimoire/src/main.rs diff --git a/fuzzers/baby_fuzzer_minimizing/.gitignore b/fuzzers/baby/baby_fuzzer_minimizing/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_minimizing/.gitignore rename to fuzzers/baby/baby_fuzzer_minimizing/.gitignore diff --git a/fuzzers/baby_fuzzer_minimizing/Cargo.toml b/fuzzers/baby/baby_fuzzer_minimizing/Cargo.toml similarity index 74% rename from fuzzers/baby_fuzzer_minimizing/Cargo.toml rename to fuzzers/baby/baby_fuzzer_minimizing/Cargo.toml index 36b6c98b1b..1afdf121b3 100644 --- a/fuzzers/baby_fuzzer_minimizing/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_minimizing/Cargo.toml @@ -20,5 +20,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/", features = ["prelude"] } -libafl_bolts = { path = "../../libafl_bolts/", features = ["prelude"] } +libafl = { path = "../../../libafl/", features = ["prelude"] } +libafl_bolts = { path = "../../../libafl_bolts/", features = ["prelude"] } diff --git a/fuzzers/baby_fuzzer_minimizing/README.md b/fuzzers/baby/baby_fuzzer_minimizing/README.md similarity index 100% rename from fuzzers/baby_fuzzer_minimizing/README.md rename to fuzzers/baby/baby_fuzzer_minimizing/README.md diff --git a/fuzzers/baby_fuzzer_minimizing/src/main.rs b/fuzzers/baby/baby_fuzzer_minimizing/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_minimizing/src/main.rs rename to fuzzers/baby/baby_fuzzer_minimizing/src/main.rs diff --git a/fuzzers/baby_fuzzer_multi/.gitignore b/fuzzers/baby/baby_fuzzer_multi/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_multi/.gitignore rename to fuzzers/baby/baby_fuzzer_multi/.gitignore diff --git a/fuzzers/baby_fuzzer_multi/Cargo.toml b/fuzzers/baby/baby_fuzzer_multi/Cargo.toml similarity index 76% rename from fuzzers/baby_fuzzer_multi/Cargo.toml rename to fuzzers/baby/baby_fuzzer_multi/Cargo.toml index 04ab2364b4..7071ae3f1d 100644 --- a/fuzzers/baby_fuzzer_multi/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_multi/Cargo.toml @@ -20,5 +20,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/", features = ["multipart_inputs"] } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/", features = ["multipart_inputs"] } +libafl_bolts = { path = "../../../libafl_bolts/" } diff --git a/fuzzers/baby_fuzzer_multi/README.md b/fuzzers/baby/baby_fuzzer_multi/README.md similarity index 100% rename from fuzzers/baby_fuzzer_multi/README.md rename to fuzzers/baby/baby_fuzzer_multi/README.md diff --git a/fuzzers/baby_fuzzer_multi/src/main.rs b/fuzzers/baby/baby_fuzzer_multi/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_multi/src/main.rs rename to fuzzers/baby/baby_fuzzer_multi/src/main.rs diff --git a/fuzzers/baby_fuzzer_nautilus/.gitignore b/fuzzers/baby/baby_fuzzer_nautilus/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_nautilus/.gitignore rename to fuzzers/baby/baby_fuzzer_nautilus/.gitignore diff --git a/fuzzers/baby_fuzzer_nautilus/Cargo.toml b/fuzzers/baby/baby_fuzzer_nautilus/Cargo.toml similarity index 73% rename from fuzzers/baby_fuzzer_nautilus/Cargo.toml rename to fuzzers/baby/baby_fuzzer_nautilus/Cargo.toml index 36f0e0208f..d58b39ebf4 100644 --- a/fuzzers/baby_fuzzer_nautilus/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_nautilus/Cargo.toml @@ -19,5 +19,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/", features = ["default", "nautilus"] } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/", features = ["default", "nautilus"] } +libafl_bolts = { path = "../../../libafl_bolts/" } diff --git a/fuzzers/baby_fuzzer_nautilus/README.md b/fuzzers/baby/baby_fuzzer_nautilus/README.md similarity index 100% rename from fuzzers/baby_fuzzer_nautilus/README.md rename to fuzzers/baby/baby_fuzzer_nautilus/README.md diff --git a/fuzzers/baby_fuzzer_nautilus/grammar.json b/fuzzers/baby/baby_fuzzer_nautilus/grammar.json similarity index 100% rename from fuzzers/baby_fuzzer_nautilus/grammar.json rename to fuzzers/baby/baby_fuzzer_nautilus/grammar.json diff --git a/fuzzers/baby_fuzzer_nautilus/src/main.rs b/fuzzers/baby/baby_fuzzer_nautilus/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_nautilus/src/main.rs rename to fuzzers/baby/baby_fuzzer_nautilus/src/main.rs diff --git a/fuzzers/baby_fuzzer_swap_differential/.gitignore b/fuzzers/baby/baby_fuzzer_swap_differential/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/.gitignore rename to fuzzers/baby/baby_fuzzer_swap_differential/.gitignore diff --git a/fuzzers/baby_fuzzer_swap_differential/Cargo.toml b/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml similarity index 67% rename from fuzzers/baby_fuzzer_swap_differential/Cargo.toml rename to fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml index 5851188313..f52fdabfeb 100644 --- a/fuzzers/baby_fuzzer_swap_differential/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml @@ -25,12 +25,12 @@ bindgen = "0.69.4" cc = "1.0" [dependencies] -libafl = { path = "../../libafl" } -libafl_bolts = { path = "../../libafl_bolts" } -libafl_targets = { path = "../../libafl_targets", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog", "pointer_maps"] } +libafl = { path = "../../../libafl" } +libafl_bolts = { path = "../../../libafl_bolts" } +libafl_targets = { path = "../../../libafl_targets", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog", "pointer_maps"] } mimalloc = { version = "*", default-features = false } -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } [[bin]] name = "fuzzer_sd" diff --git a/fuzzers/baby_fuzzer_swap_differential/Makefile.toml b/fuzzers/baby/baby_fuzzer_swap_differential/Makefile.toml similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/Makefile.toml rename to fuzzers/baby/baby_fuzzer_swap_differential/Makefile.toml diff --git a/fuzzers/baby_fuzzer_swap_differential/README.md b/fuzzers/baby/baby_fuzzer_swap_differential/README.md similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/README.md rename to fuzzers/baby/baby_fuzzer_swap_differential/README.md diff --git a/fuzzers/baby_fuzzer_swap_differential/build.rs b/fuzzers/baby/baby_fuzzer_swap_differential/build.rs similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/build.rs rename to fuzzers/baby/baby_fuzzer_swap_differential/build.rs diff --git a/fuzzers/baby_fuzzer_swap_differential/common.c b/fuzzers/baby/baby_fuzzer_swap_differential/common.c similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/common.c rename to fuzzers/baby/baby_fuzzer_swap_differential/common.c diff --git a/fuzzers/baby_fuzzer_swap_differential/common.h b/fuzzers/baby/baby_fuzzer_swap_differential/common.h similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/common.h rename to fuzzers/baby/baby_fuzzer_swap_differential/common.h diff --git a/fuzzers/baby_fuzzer_swap_differential/first.c b/fuzzers/baby/baby_fuzzer_swap_differential/first.c similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/first.c rename to fuzzers/baby/baby_fuzzer_swap_differential/first.c diff --git a/fuzzers/baby_fuzzer_swap_differential/first.h b/fuzzers/baby/baby_fuzzer_swap_differential/first.h similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/first.h rename to fuzzers/baby/baby_fuzzer_swap_differential/first.h diff --git a/fuzzers/baby_fuzzer_swap_differential/second.c b/fuzzers/baby/baby_fuzzer_swap_differential/second.c similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/second.c rename to fuzzers/baby/baby_fuzzer_swap_differential/second.c diff --git a/fuzzers/baby_fuzzer_swap_differential/second.h b/fuzzers/baby/baby_fuzzer_swap_differential/second.h similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/second.h rename to fuzzers/baby/baby_fuzzer_swap_differential/second.h diff --git a/fuzzers/baby_fuzzer_swap_differential/src/bin/libafl_cc.rs b/fuzzers/baby/baby_fuzzer_swap_differential/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/src/bin/libafl_cc.rs rename to fuzzers/baby/baby_fuzzer_swap_differential/src/bin/libafl_cc.rs diff --git a/fuzzers/baby_fuzzer_swap_differential/src/main.rs b/fuzzers/baby/baby_fuzzer_swap_differential/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_swap_differential/src/main.rs rename to fuzzers/baby/baby_fuzzer_swap_differential/src/main.rs diff --git a/fuzzers/baby_fuzzer_tokens/.gitignore b/fuzzers/baby/baby_fuzzer_tokens/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_tokens/.gitignore rename to fuzzers/baby/baby_fuzzer_tokens/.gitignore diff --git a/fuzzers/baby_fuzzer_tokens/Cargo.toml b/fuzzers/baby/baby_fuzzer_tokens/Cargo.toml similarity index 79% rename from fuzzers/baby_fuzzer_tokens/Cargo.toml rename to fuzzers/baby/baby_fuzzer_tokens/Cargo.toml index bc000fb097..b1cefd7b64 100644 --- a/fuzzers/baby_fuzzer_tokens/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_tokens/Cargo.toml @@ -19,5 +19,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } diff --git a/fuzzers/baby_fuzzer_tokens/README.md b/fuzzers/baby/baby_fuzzer_tokens/README.md similarity index 100% rename from fuzzers/baby_fuzzer_tokens/README.md rename to fuzzers/baby/baby_fuzzer_tokens/README.md diff --git a/fuzzers/baby_fuzzer_tokens/corpus/new file b/fuzzers/baby/baby_fuzzer_tokens/corpus/new file similarity index 100% rename from fuzzers/baby_fuzzer_tokens/corpus/new file rename to fuzzers/baby/baby_fuzzer_tokens/corpus/new file diff --git a/fuzzers/baby_fuzzer_tokens/src/main.rs b/fuzzers/baby/baby_fuzzer_tokens/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_tokens/src/main.rs rename to fuzzers/baby/baby_fuzzer_tokens/src/main.rs diff --git a/fuzzers/baby_fuzzer_unicode/.gitignore b/fuzzers/baby/baby_fuzzer_unicode/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_unicode/.gitignore rename to fuzzers/baby/baby_fuzzer_unicode/.gitignore diff --git a/fuzzers/baby_fuzzer_unicode/Cargo.toml b/fuzzers/baby/baby_fuzzer_unicode/Cargo.toml similarity index 75% rename from fuzzers/baby_fuzzer_unicode/Cargo.toml rename to fuzzers/baby/baby_fuzzer_unicode/Cargo.toml index ff8bb2d732..2dd5b227ab 100644 --- a/fuzzers/baby_fuzzer_unicode/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_unicode/Cargo.toml @@ -20,5 +20,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/", features = ["unicode"] } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/", features = ["unicode"] } +libafl_bolts = { path = "../../../libafl_bolts/" } diff --git a/fuzzers/baby_fuzzer_unicode/README.md b/fuzzers/baby/baby_fuzzer_unicode/README.md similarity index 100% rename from fuzzers/baby_fuzzer_unicode/README.md rename to fuzzers/baby/baby_fuzzer_unicode/README.md diff --git a/fuzzers/baby_fuzzer_unicode/src/main.rs b/fuzzers/baby/baby_fuzzer_unicode/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_unicode/src/main.rs rename to fuzzers/baby/baby_fuzzer_unicode/src/main.rs diff --git a/fuzzers/baby_fuzzer_wasm/.cargo/config.toml b/fuzzers/baby/baby_fuzzer_wasm/.cargo/config.toml similarity index 100% rename from fuzzers/baby_fuzzer_wasm/.cargo/config.toml rename to fuzzers/baby/baby_fuzzer_wasm/.cargo/config.toml diff --git a/fuzzers/baby_fuzzer_wasm/.gitignore b/fuzzers/baby/baby_fuzzer_wasm/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_wasm/.gitignore rename to fuzzers/baby/baby_fuzzer_wasm/.gitignore diff --git a/fuzzers/baby_fuzzer_wasm/Cargo.toml b/fuzzers/baby/baby_fuzzer_wasm/Cargo.toml similarity index 85% rename from fuzzers/baby_fuzzer_wasm/Cargo.toml rename to fuzzers/baby/baby_fuzzer_wasm/Cargo.toml index 18548132ba..e98dcd7ff3 100644 --- a/fuzzers/baby_fuzzer_wasm/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_wasm/Cargo.toml @@ -14,8 +14,8 @@ default = ["console_error_panic_hook"] js-sys = "0.3" wasm-bindgen = "0.2.63" -libafl = { path = "../../libafl", default-features = false } -libafl_bolts = { path = "../../libafl_bolts", default-features = false } +libafl = { path = "../../../libafl", default-features = false } +libafl_bolts = { path = "../../../libafl_bolts", default-features = false } # The `console_error_panic_hook` crate provides better debugging of panics by # logging them with `console.error`. This is great for development, but requires diff --git a/fuzzers/baby_fuzzer_wasm/Makefile.toml b/fuzzers/baby/baby_fuzzer_wasm/Makefile.toml similarity index 100% rename from fuzzers/baby_fuzzer_wasm/Makefile.toml rename to fuzzers/baby/baby_fuzzer_wasm/Makefile.toml diff --git a/fuzzers/baby_fuzzer_wasm/README.md b/fuzzers/baby/baby_fuzzer_wasm/README.md similarity index 100% rename from fuzzers/baby_fuzzer_wasm/README.md rename to fuzzers/baby/baby_fuzzer_wasm/README.md diff --git a/fuzzers/baby_fuzzer_wasm/pkg/.gitignore b/fuzzers/baby/baby_fuzzer_wasm/pkg/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_wasm/pkg/.gitignore rename to fuzzers/baby/baby_fuzzer_wasm/pkg/.gitignore diff --git a/fuzzers/baby_fuzzer_wasm/pkg/index.html b/fuzzers/baby/baby_fuzzer_wasm/pkg/index.html similarity index 100% rename from fuzzers/baby_fuzzer_wasm/pkg/index.html rename to fuzzers/baby/baby_fuzzer_wasm/pkg/index.html diff --git a/fuzzers/baby_fuzzer_wasm/pkg/package.json b/fuzzers/baby/baby_fuzzer_wasm/pkg/package.json similarity index 100% rename from fuzzers/baby_fuzzer_wasm/pkg/package.json rename to fuzzers/baby/baby_fuzzer_wasm/pkg/package.json diff --git a/fuzzers/baby_fuzzer_wasm/src/lib.rs b/fuzzers/baby/baby_fuzzer_wasm/src/lib.rs similarity index 100% rename from fuzzers/baby_fuzzer_wasm/src/lib.rs rename to fuzzers/baby/baby_fuzzer_wasm/src/lib.rs diff --git a/fuzzers/baby_fuzzer_wasm/src/utils.rs b/fuzzers/baby/baby_fuzzer_wasm/src/utils.rs similarity index 100% rename from fuzzers/baby_fuzzer_wasm/src/utils.rs rename to fuzzers/baby/baby_fuzzer_wasm/src/utils.rs diff --git a/fuzzers/baby_fuzzer_wasm/tests/web.rs b/fuzzers/baby/baby_fuzzer_wasm/tests/web.rs similarity index 100% rename from fuzzers/baby_fuzzer_wasm/tests/web.rs rename to fuzzers/baby/baby_fuzzer_wasm/tests/web.rs diff --git a/fuzzers/baby_fuzzer_wasm/webdriver.json b/fuzzers/baby/baby_fuzzer_wasm/webdriver.json similarity index 100% rename from fuzzers/baby_fuzzer_wasm/webdriver.json rename to fuzzers/baby/baby_fuzzer_wasm/webdriver.json diff --git a/fuzzers/baby_fuzzer_with_forkexecutor/.gitignore b/fuzzers/baby/baby_fuzzer_with_forkexecutor/.gitignore similarity index 100% rename from fuzzers/baby_fuzzer_with_forkexecutor/.gitignore rename to fuzzers/baby/baby_fuzzer_with_forkexecutor/.gitignore diff --git a/fuzzers/baby_fuzzer_with_forkexecutor/Cargo.toml b/fuzzers/baby/baby_fuzzer_with_forkexecutor/Cargo.toml similarity index 79% rename from fuzzers/baby_fuzzer_with_forkexecutor/Cargo.toml rename to fuzzers/baby/baby_fuzzer_with_forkexecutor/Cargo.toml index 84425a3465..fa6aab4372 100644 --- a/fuzzers/baby_fuzzer_with_forkexecutor/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_with_forkexecutor/Cargo.toml @@ -19,5 +19,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } diff --git a/fuzzers/baby_fuzzer_with_forkexecutor/README.md b/fuzzers/baby/baby_fuzzer_with_forkexecutor/README.md similarity index 100% rename from fuzzers/baby_fuzzer_with_forkexecutor/README.md rename to fuzzers/baby/baby_fuzzer_with_forkexecutor/README.md diff --git a/fuzzers/baby_fuzzer_with_forkexecutor/src/main.rs b/fuzzers/baby/baby_fuzzer_with_forkexecutor/src/main.rs similarity index 100% rename from fuzzers/baby_fuzzer_with_forkexecutor/src/main.rs rename to fuzzers/baby/baby_fuzzer_with_forkexecutor/src/main.rs diff --git a/fuzzers/baby_no_std/.gitignore b/fuzzers/baby/baby_no_std/.gitignore similarity index 100% rename from fuzzers/baby_no_std/.gitignore rename to fuzzers/baby/baby_no_std/.gitignore diff --git a/fuzzers/baby_no_std/Cargo.toml b/fuzzers/baby/baby_no_std/Cargo.toml similarity index 72% rename from fuzzers/baby_no_std/Cargo.toml rename to fuzzers/baby/baby_no_std/Cargo.toml index dafc5ae928..f546a1ffa6 100644 --- a/fuzzers/baby_no_std/Cargo.toml +++ b/fuzzers/baby/baby_no_std/Cargo.toml @@ -15,8 +15,8 @@ opt-level = 3 debug = true [dependencies] -libafl = { default-features = false, path = "../../libafl/" } -libafl_bolts = { default-features = false, path = "../../libafl_bolts/" } +libafl = { default-features = false, path = "../../../libafl/" } +libafl_bolts = { default-features = false, path = "../../../libafl_bolts/" } static-alloc = "0.2.3" [target.'cfg(unix)'.dependencies] diff --git a/fuzzers/baby_no_std/Makefile.toml b/fuzzers/baby/baby_no_std/Makefile.toml similarity index 100% rename from fuzzers/baby_no_std/Makefile.toml rename to fuzzers/baby/baby_no_std/Makefile.toml diff --git a/fuzzers/baby_no_std/README.md b/fuzzers/baby/baby_no_std/README.md similarity index 100% rename from fuzzers/baby_no_std/README.md rename to fuzzers/baby/baby_no_std/README.md diff --git a/fuzzers/baby_no_std/build.rs b/fuzzers/baby/baby_no_std/build.rs similarity index 100% rename from fuzzers/baby_no_std/build.rs rename to fuzzers/baby/baby_no_std/build.rs diff --git a/fuzzers/baby_no_std/rust-toolchain b/fuzzers/baby/baby_no_std/rust-toolchain similarity index 100% rename from fuzzers/baby_no_std/rust-toolchain rename to fuzzers/baby/baby_no_std/rust-toolchain diff --git a/fuzzers/baby_no_std/src/main.rs b/fuzzers/baby/baby_no_std/src/main.rs similarity index 100% rename from fuzzers/baby_no_std/src/main.rs rename to fuzzers/baby/baby_no_std/src/main.rs diff --git a/fuzzers/backtrace_baby_fuzzers/README.md b/fuzzers/baby/backtrace_baby_fuzzers/README.md similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/README.md rename to fuzzers/baby/backtrace_baby_fuzzers/README.md diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/.cargo/config b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/.cargo/config similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/.cargo/config rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/.cargo/config diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/.gitignore b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/.gitignore similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/.gitignore rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/.gitignore diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/Cargo.toml b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/Cargo.toml similarity index 73% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/Cargo.toml rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/Cargo.toml index 4c3981f802..041bd6ef62 100644 --- a/fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/Cargo.toml +++ b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/Cargo.toml @@ -15,8 +15,8 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../../libafl/" } -libafl_bolts = { path = "../../../libafl_bolts/" } +libafl = { path = "../../../../libafl/" } +libafl_bolts = { path = "../../../../libafl_bolts/" } libc = "0.2" [build-dependencies] diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/build.rs b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/build.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/build.rs rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/build.rs diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/src/harness.c b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/src/harness.c similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/src/harness.c rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/src/harness.c diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/src/main.rs b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/src/main.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_fork_executor/src/main.rs rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor/src/main.rs diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.cargo/config b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.cargo/config similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.cargo/config rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.cargo/config diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.gitignore b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.gitignore similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.gitignore rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/.gitignore diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml similarity index 74% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml index 5eb3f1e931..88aa993fbd 100644 --- a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml +++ b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml @@ -15,8 +15,8 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../../libafl/" } -libafl_bolts = { path = "../../../libafl_bolts/" } +libafl = { path = "../../../../libafl/" } +libafl_bolts = { path = "../../../../libafl_bolts/" } libc = "0.2" [build-dependencies] diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/build.rs b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/build.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/build.rs rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/build.rs diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/harness.c b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/harness.c similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/harness.c rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/harness.c diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/main.rs b/fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/main.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/main.rs rename to fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor/src/main.rs diff --git a/fuzzers/backtrace_baby_fuzzers/command_executor/.cargo/config b/fuzzers/baby/backtrace_baby_fuzzers/command_executor/.cargo/config similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/command_executor/.cargo/config rename to fuzzers/baby/backtrace_baby_fuzzers/command_executor/.cargo/config diff --git a/fuzzers/backtrace_baby_fuzzers/command_executor/.gitignore b/fuzzers/baby/backtrace_baby_fuzzers/command_executor/.gitignore similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/command_executor/.gitignore rename to fuzzers/baby/backtrace_baby_fuzzers/command_executor/.gitignore diff --git a/fuzzers/backtrace_baby_fuzzers/command_executor/Cargo.toml b/fuzzers/baby/backtrace_baby_fuzzers/command_executor/Cargo.toml similarity index 70% rename from fuzzers/backtrace_baby_fuzzers/command_executor/Cargo.toml rename to fuzzers/baby/backtrace_baby_fuzzers/command_executor/Cargo.toml index 90d7377d6a..b5c47681f7 100644 --- a/fuzzers/backtrace_baby_fuzzers/command_executor/Cargo.toml +++ b/fuzzers/baby/backtrace_baby_fuzzers/command_executor/Cargo.toml @@ -17,5 +17,5 @@ debug = true cc = "*" [dependencies] -libafl = { path = "../../../libafl/" } -libafl_bolts = { path = "../../../libafl_bolts/" } +libafl = { path = "../../../../libafl/" } +libafl_bolts = { path = "../../../../libafl_bolts/" } diff --git a/fuzzers/backtrace_baby_fuzzers/command_executor/build.rs b/fuzzers/baby/backtrace_baby_fuzzers/command_executor/build.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/command_executor/build.rs rename to fuzzers/baby/backtrace_baby_fuzzers/command_executor/build.rs diff --git a/fuzzers/backtrace_baby_fuzzers/command_executor/src/main.rs b/fuzzers/baby/backtrace_baby_fuzzers/command_executor/src/main.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/command_executor/src/main.rs rename to fuzzers/baby/backtrace_baby_fuzzers/command_executor/src/main.rs diff --git a/fuzzers/backtrace_baby_fuzzers/command_executor/src/test_command.c b/fuzzers/baby/backtrace_baby_fuzzers/command_executor/src/test_command.c similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/command_executor/src/test_command.c rename to fuzzers/baby/backtrace_baby_fuzzers/command_executor/src/test_command.c diff --git a/fuzzers/backtrace_baby_fuzzers/forkserver_executor/.gitignore b/fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/.gitignore similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/forkserver_executor/.gitignore rename to fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/.gitignore diff --git a/fuzzers/backtrace_baby_fuzzers/forkserver_executor/Cargo.toml b/fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/Cargo.toml similarity index 67% rename from fuzzers/backtrace_baby_fuzzers/forkserver_executor/Cargo.toml rename to fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/Cargo.toml index fa8933adb7..5554a9f9e8 100644 --- a/fuzzers/backtrace_baby_fuzzers/forkserver_executor/Cargo.toml +++ b/fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/Cargo.toml @@ -14,5 +14,5 @@ codegen-units = 1 opt-level = 3 [dependencies] -libafl = { path = "../../../libafl/" } -libafl_bolts = { path = "../../../libafl_bolts/" } +libafl = { path = "../../../../libafl/" } +libafl_bolts = { path = "../../../../libafl_bolts/" } diff --git a/fuzzers/backtrace_baby_fuzzers/forkserver_executor/build.rs b/fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/build.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/forkserver_executor/build.rs rename to fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/build.rs diff --git a/fuzzers/backtrace_baby_fuzzers/forkserver_executor/src/main.rs b/fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/src/main.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/forkserver_executor/src/main.rs rename to fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/src/main.rs diff --git a/fuzzers/backtrace_baby_fuzzers/forkserver_executor/src/program.c b/fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/src/program.c similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/forkserver_executor/src/program.c rename to fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor/src/program.c diff --git a/fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/.cargo/config b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/.cargo/config similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/.cargo/config rename to fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/.cargo/config diff --git a/fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/.gitignore b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/.gitignore similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/.gitignore rename to fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/.gitignore diff --git a/fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/Cargo.toml b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/Cargo.toml similarity index 73% rename from fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/Cargo.toml rename to fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/Cargo.toml index e41acff6a0..1dc4f3cce7 100644 --- a/fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/Cargo.toml +++ b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/Cargo.toml @@ -18,5 +18,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../../libafl/" } -libafl_bolts = { path = "../../../libafl_bolts/" } +libafl = { path = "../../../../libafl/" } +libafl_bolts = { path = "../../../../libafl_bolts/" } diff --git a/fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/src/main.rs b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/src/main.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/rust_code_with_fork_executor/src/main.rs rename to fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor/src/main.rs diff --git a/fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.cargo/config b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.cargo/config similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.cargo/config rename to fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.cargo/config diff --git a/fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.gitignore b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.gitignore similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.gitignore rename to fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/.gitignore diff --git a/fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/Cargo.toml b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/Cargo.toml similarity index 73% rename from fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/Cargo.toml rename to fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/Cargo.toml index 5d09172a78..53dac59ab9 100644 --- a/fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/Cargo.toml +++ b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/Cargo.toml @@ -18,5 +18,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../../libafl/" } -libafl_bolts = { path = "../../../libafl_bolts/" } +libafl = { path = "../../../../libafl/" } +libafl_bolts = { path = "../../../../libafl_bolts/" } diff --git a/fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/src/main.rs b/fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/src/main.rs similarity index 100% rename from fuzzers/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/src/main.rs rename to fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_inprocess_executor/src/main.rs diff --git a/fuzzers/forkserver_libafl_cc/Cargo.toml b/fuzzers/forkserver/forkserver_libafl_cc/Cargo.toml similarity index 69% rename from fuzzers/forkserver_libafl_cc/Cargo.toml rename to fuzzers/forkserver/forkserver_libafl_cc/Cargo.toml index 1c8c9c384d..118391588d 100644 --- a/fuzzers/forkserver_libafl_cc/Cargo.toml +++ b/fuzzers/forkserver/forkserver_libafl_cc/Cargo.toml @@ -23,10 +23,10 @@ which = { version = "6.0" } [dependencies] clap = { version = "4.5", features = ["derive"] } nix = { version = "0.29", features = ["signal"] } -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_cc = { path = "../../libafl_cc/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "pointer_maps"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_cc = { path = "../../../libafl_cc/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "pointer_maps"] } env_logger = "0.11" [lib] diff --git a/fuzzers/forkserver_libafl_cc/Makefile.toml b/fuzzers/forkserver/forkserver_libafl_cc/Makefile.toml similarity index 100% rename from fuzzers/forkserver_libafl_cc/Makefile.toml rename to fuzzers/forkserver/forkserver_libafl_cc/Makefile.toml diff --git a/fuzzers/forkserver_libafl_cc/README.md b/fuzzers/forkserver/forkserver_libafl_cc/README.md similarity index 100% rename from fuzzers/forkserver_libafl_cc/README.md rename to fuzzers/forkserver/forkserver_libafl_cc/README.md diff --git a/fuzzers/forkserver_libafl_cc/corpus/testfile b/fuzzers/forkserver/forkserver_libafl_cc/corpus/testfile similarity index 100% rename from fuzzers/forkserver_libafl_cc/corpus/testfile rename to fuzzers/forkserver/forkserver_libafl_cc/corpus/testfile diff --git a/fuzzers/forkserver_libafl_cc/src/bin/libafl_cc.rs b/fuzzers/forkserver/forkserver_libafl_cc/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/forkserver_libafl_cc/src/bin/libafl_cc.rs rename to fuzzers/forkserver/forkserver_libafl_cc/src/bin/libafl_cc.rs diff --git a/fuzzers/dynamic_analysis/src/bin/libafl_cxx.rs b/fuzzers/forkserver/forkserver_libafl_cc/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/dynamic_analysis/src/bin/libafl_cxx.rs rename to fuzzers/forkserver/forkserver_libafl_cc/src/bin/libafl_cxx.rs diff --git a/fuzzers/forkserver_libafl_cc/src/lib.rs b/fuzzers/forkserver/forkserver_libafl_cc/src/lib.rs similarity index 100% rename from fuzzers/forkserver_libafl_cc/src/lib.rs rename to fuzzers/forkserver/forkserver_libafl_cc/src/lib.rs diff --git a/fuzzers/forkserver_libafl_cc/src/main.rs b/fuzzers/forkserver/forkserver_libafl_cc/src/main.rs similarity index 100% rename from fuzzers/forkserver_libafl_cc/src/main.rs rename to fuzzers/forkserver/forkserver_libafl_cc/src/main.rs diff --git a/fuzzers/forkserver_libafl_cc/src/program.c b/fuzzers/forkserver/forkserver_libafl_cc/src/program.c similarity index 100% rename from fuzzers/forkserver_libafl_cc/src/program.c rename to fuzzers/forkserver/forkserver_libafl_cc/src/program.c diff --git a/fuzzers/forkserver_simple/.gitignore b/fuzzers/forkserver/forkserver_simple/.gitignore similarity index 100% rename from fuzzers/forkserver_simple/.gitignore rename to fuzzers/forkserver/forkserver_simple/.gitignore diff --git a/fuzzers/forkserver_simple/Cargo.toml b/fuzzers/forkserver/forkserver_simple/Cargo.toml similarity index 79% rename from fuzzers/forkserver_simple/Cargo.toml rename to fuzzers/forkserver/forkserver_simple/Cargo.toml index 015a0176ae..4f92c1bdad 100644 --- a/fuzzers/forkserver_simple/Cargo.toml +++ b/fuzzers/forkserver/forkserver_simple/Cargo.toml @@ -17,7 +17,7 @@ opt-level = 3 [dependencies] env_logger = "0.11" -libafl = { path = "../../libafl/", features = ["std", "derive"] } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/", features = ["std", "derive"] } +libafl_bolts = { path = "../../../libafl_bolts/" } clap = { version = "4.0", features = ["derive"] } nix = { version = "0.29", features = ["signal"] } diff --git a/fuzzers/forkserver_simple/README.md b/fuzzers/forkserver/forkserver_simple/README.md similarity index 100% rename from fuzzers/forkserver_simple/README.md rename to fuzzers/forkserver/forkserver_simple/README.md diff --git a/fuzzers/forkserver_simple/build.rs b/fuzzers/forkserver/forkserver_simple/build.rs similarity index 100% rename from fuzzers/forkserver_simple/build.rs rename to fuzzers/forkserver/forkserver_simple/build.rs diff --git a/fuzzers/forkserver_simple/corpus/testfile b/fuzzers/forkserver/forkserver_simple/corpus/testfile similarity index 100% rename from fuzzers/forkserver_simple/corpus/testfile rename to fuzzers/forkserver/forkserver_simple/corpus/testfile diff --git a/fuzzers/forkserver_simple/src/main.rs b/fuzzers/forkserver/forkserver_simple/src/main.rs similarity index 100% rename from fuzzers/forkserver_simple/src/main.rs rename to fuzzers/forkserver/forkserver_simple/src/main.rs diff --git a/fuzzers/forkserver_simple/src/program.c b/fuzzers/forkserver/forkserver_simple/src/program.c similarity index 100% rename from fuzzers/forkserver_simple/src/program.c rename to fuzzers/forkserver/forkserver_simple/src/program.c diff --git a/fuzzers/frida_executable_libpng/.gitignore b/fuzzers/frida/frida_executable_libpng/.gitignore similarity index 100% rename from fuzzers/frida_executable_libpng/.gitignore rename to fuzzers/frida/frida_executable_libpng/.gitignore diff --git a/fuzzers/frida_executable_libpng/Cargo.toml b/fuzzers/frida/frida_executable_libpng/Cargo.toml similarity index 62% rename from fuzzers/frida_executable_libpng/Cargo.toml rename to fuzzers/frida/frida_executable_libpng/Cargo.toml index 1d9ddda7ab..a00188bc51 100644 --- a/fuzzers/frida_executable_libpng/Cargo.toml +++ b/fuzzers/frida/frida_executable_libpng/Cargo.toml @@ -18,11 +18,11 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/", features = [ "std", "llmp_compression", "llmp_bind_public", "frida_cli" ] } #, "llmp_small_maps", "llmp_debug"]} -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/", features = [ "std", "llmp_compression", "llmp_bind_public", "frida_cli" ] } #, "llmp_small_maps", "llmp_debug"]} +libafl_bolts = { path = "../../../libafl_bolts/" } frida-gum = { version = "0.13.6", features = [ "auto-download", "event-sink", "invocation-listener"] } -libafl_frida = { path = "../../libafl_frida", features = ["cmplog"] } -libafl_targets = { path = "../../libafl_targets", features = ["sancov_cmplog"] } +libafl_frida = { path = "../../../libafl_frida", features = ["cmplog"] } +libafl_targets = { path = "../../../libafl_targets", features = ["sancov_cmplog"] } libc = "0.2" libloading = "0.7" num-traits = "0.2" diff --git a/fuzzers/frida_executable_libpng/Makefile.toml b/fuzzers/frida/frida_executable_libpng/Makefile.toml similarity index 100% rename from fuzzers/frida_executable_libpng/Makefile.toml rename to fuzzers/frida/frida_executable_libpng/Makefile.toml diff --git a/fuzzers/frida_executable_libpng/README.md b/fuzzers/frida/frida_executable_libpng/README.md similarity index 100% rename from fuzzers/frida_executable_libpng/README.md rename to fuzzers/frida/frida_executable_libpng/README.md diff --git a/fuzzers/frida_executable_libpng/corpus/not_kitty.png b/fuzzers/frida/frida_executable_libpng/corpus/not_kitty.png similarity index 100% rename from fuzzers/frida_executable_libpng/corpus/not_kitty.png rename to fuzzers/frida/frida_executable_libpng/corpus/not_kitty.png diff --git a/fuzzers/frida_executable_libpng/corpus/not_kitty_alpha.png b/fuzzers/frida/frida_executable_libpng/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/frida_executable_libpng/corpus/not_kitty_alpha.png rename to fuzzers/frida/frida_executable_libpng/corpus/not_kitty_alpha.png diff --git a/fuzzers/frida_executable_libpng/corpus/not_kitty_gamma.png b/fuzzers/frida/frida_executable_libpng/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/frida_executable_libpng/corpus/not_kitty_gamma.png rename to fuzzers/frida/frida_executable_libpng/corpus/not_kitty_gamma.png diff --git a/fuzzers/frida_executable_libpng/corpus/not_kitty_icc.png b/fuzzers/frida/frida_executable_libpng/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/frida_executable_libpng/corpus/not_kitty_icc.png rename to fuzzers/frida/frida_executable_libpng/corpus/not_kitty_icc.png diff --git a/fuzzers/frida_executable_libpng/harness.cc b/fuzzers/frida/frida_executable_libpng/harness.cc similarity index 100% rename from fuzzers/frida_executable_libpng/harness.cc rename to fuzzers/frida/frida_executable_libpng/harness.cc diff --git a/fuzzers/frida_executable_libpng/src/fuzzer.rs b/fuzzers/frida/frida_executable_libpng/src/fuzzer.rs similarity index 100% rename from fuzzers/frida_executable_libpng/src/fuzzer.rs rename to fuzzers/frida/frida_executable_libpng/src/fuzzer.rs diff --git a/fuzzers/frida_executable_libpng/src/lib.rs b/fuzzers/frida/frida_executable_libpng/src/lib.rs similarity index 100% rename from fuzzers/frida_executable_libpng/src/lib.rs rename to fuzzers/frida/frida_executable_libpng/src/lib.rs diff --git a/fuzzers/frida_gdiplus/.gitignore b/fuzzers/frida/frida_gdiplus/.gitignore similarity index 100% rename from fuzzers/frida_gdiplus/.gitignore rename to fuzzers/frida/frida_gdiplus/.gitignore diff --git a/fuzzers/frida_gdiplus/Cargo.toml b/fuzzers/frida/frida_gdiplus/Cargo.toml similarity index 70% rename from fuzzers/frida_gdiplus/Cargo.toml rename to fuzzers/frida/frida_gdiplus/Cargo.toml index e9ee61437c..6ca773d9b5 100644 --- a/fuzzers/frida_gdiplus/Cargo.toml +++ b/fuzzers/frida/frida_gdiplus/Cargo.toml @@ -15,12 +15,12 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/", features = [ "std", "llmp_compression", +libafl = { path = "../../../libafl/", features = [ "std", "llmp_compression", "llmp_bind_public", "frida_cli", "errors_backtrace" ] } #, "llmp_small_maps", "llmp_debug"]} -libafl_bolts = { path = "../../libafl_bolts/" } +libafl_bolts = { path = "../../../libafl_bolts/" } frida-gum = { version = "0.13.6", features = ["auto-download", "event-sink", "invocation-listener"] } -libafl_frida = { path = "../../libafl_frida", features = ["cmplog"] } -libafl_targets = { path = "../../libafl_targets", features = ["sancov_cmplog"] } +libafl_frida = { path = "../../../libafl_frida", features = ["cmplog"] } +libafl_targets = { path = "../../../libafl_targets", features = ["sancov_cmplog"] } libloading = "0.7" mimalloc = { version = "*", default-features = false } dlmalloc ={version = "0.2.6", features = ["global"]} diff --git a/fuzzers/frida_gdiplus/Makefile.toml b/fuzzers/frida/frida_gdiplus/Makefile.toml similarity index 100% rename from fuzzers/frida_gdiplus/Makefile.toml rename to fuzzers/frida/frida_gdiplus/Makefile.toml diff --git a/fuzzers/frida_gdiplus/README.md b/fuzzers/frida/frida_gdiplus/README.md similarity index 100% rename from fuzzers/frida_gdiplus/README.md rename to fuzzers/frida/frida_gdiplus/README.md diff --git a/fuzzers/frida_gdiplus/cargo/.config b/fuzzers/frida/frida_gdiplus/cargo/.config similarity index 100% rename from fuzzers/frida_gdiplus/cargo/.config rename to fuzzers/frida/frida_gdiplus/cargo/.config diff --git a/fuzzers/frida_gdiplus/cmplog_test.asm b/fuzzers/frida/frida_gdiplus/cmplog_test.asm similarity index 100% rename from fuzzers/frida_gdiplus/cmplog_test.asm rename to fuzzers/frida/frida_gdiplus/cmplog_test.asm diff --git a/fuzzers/frida_gdiplus/cmplog_test.def b/fuzzers/frida/frida_gdiplus/cmplog_test.def similarity index 100% rename from fuzzers/frida_gdiplus/cmplog_test.def rename to fuzzers/frida/frida_gdiplus/cmplog_test.def diff --git a/fuzzers/frida_gdiplus/corpus/not_kitty.png b/fuzzers/frida/frida_gdiplus/corpus/not_kitty.png similarity index 100% rename from fuzzers/frida_gdiplus/corpus/not_kitty.png rename to fuzzers/frida/frida_gdiplus/corpus/not_kitty.png diff --git a/fuzzers/frida_gdiplus/corpus/not_kitty_alpha.png b/fuzzers/frida/frida_gdiplus/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/frida_gdiplus/corpus/not_kitty_alpha.png rename to fuzzers/frida/frida_gdiplus/corpus/not_kitty_alpha.png diff --git a/fuzzers/frida_gdiplus/corpus/not_kitty_gamma.png b/fuzzers/frida/frida_gdiplus/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/frida_gdiplus/corpus/not_kitty_gamma.png rename to fuzzers/frida/frida_gdiplus/corpus/not_kitty_gamma.png diff --git a/fuzzers/frida_gdiplus/corpus/not_kitty_icc.png b/fuzzers/frida/frida_gdiplus/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/frida_gdiplus/corpus/not_kitty_icc.png rename to fuzzers/frida/frida_gdiplus/corpus/not_kitty_icc.png diff --git a/fuzzers/frida_gdiplus/harness.cc b/fuzzers/frida/frida_gdiplus/harness.cc similarity index 100% rename from fuzzers/frida_gdiplus/harness.cc rename to fuzzers/frida/frida_gdiplus/harness.cc diff --git a/fuzzers/frida_gdiplus/src/fuzzer.rs b/fuzzers/frida/frida_gdiplus/src/fuzzer.rs similarity index 100% rename from fuzzers/frida_gdiplus/src/fuzzer.rs rename to fuzzers/frida/frida_gdiplus/src/fuzzer.rs diff --git a/fuzzers/frida_gdiplus/src/main.rs b/fuzzers/frida/frida_gdiplus/src/main.rs similarity index 100% rename from fuzzers/frida_gdiplus/src/main.rs rename to fuzzers/frida/frida_gdiplus/src/main.rs diff --git a/fuzzers/frida_libpng/.gitignore b/fuzzers/frida/frida_libpng/.gitignore similarity index 100% rename from fuzzers/frida_libpng/.gitignore rename to fuzzers/frida/frida_libpng/.gitignore diff --git a/fuzzers/frida_libpng/Cargo.toml b/fuzzers/frida/frida_libpng/Cargo.toml similarity index 68% rename from fuzzers/frida_libpng/Cargo.toml rename to fuzzers/frida/frida_libpng/Cargo.toml index b401c47fb7..6ed108c655 100644 --- a/fuzzers/frida_libpng/Cargo.toml +++ b/fuzzers/frida/frida_libpng/Cargo.toml @@ -15,12 +15,12 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/", features = [ "std", "llmp_compression", +libafl = { path = "../../../libafl/", features = [ "std", "llmp_compression", "llmp_bind_public", "frida_cli", "errors_backtrace" ] } #, "llmp_small_maps", "llmp_debug"]} -libafl_bolts = { path = "../../libafl_bolts/" } +libafl_bolts = { path = "../../../libafl_bolts/" } frida-gum = { version = "0.13.6", features = ["auto-download", "event-sink", "invocation-listener"] } -libafl_frida = { path = "../../libafl_frida", features = ["cmplog"] } -libafl_targets = { path = "../../libafl_targets", features = ["sancov_cmplog"] } +libafl_frida = { path = "../../../libafl_frida", features = ["cmplog"] } +libafl_targets = { path = "../../../libafl_targets", features = ["sancov_cmplog"] } libloading = "0.7" mimalloc = { version = "*", default-features = false } color-backtrace = "0.5" diff --git a/fuzzers/frida_libpng/Makefile.toml b/fuzzers/frida/frida_libpng/Makefile.toml similarity index 100% rename from fuzzers/frida_libpng/Makefile.toml rename to fuzzers/frida/frida_libpng/Makefile.toml diff --git a/fuzzers/frida_libpng/README.md b/fuzzers/frida/frida_libpng/README.md similarity index 100% rename from fuzzers/frida_libpng/README.md rename to fuzzers/frida/frida_libpng/README.md diff --git a/fuzzers/frida_libpng/corpus/not_kitty.png b/fuzzers/frida/frida_libpng/corpus/not_kitty.png similarity index 100% rename from fuzzers/frida_libpng/corpus/not_kitty.png rename to fuzzers/frida/frida_libpng/corpus/not_kitty.png diff --git a/fuzzers/frida_libpng/corpus/not_kitty_alpha.png b/fuzzers/frida/frida_libpng/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/frida_libpng/corpus/not_kitty_alpha.png rename to fuzzers/frida/frida_libpng/corpus/not_kitty_alpha.png diff --git a/fuzzers/frida_libpng/corpus/not_kitty_gamma.png b/fuzzers/frida/frida_libpng/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/frida_libpng/corpus/not_kitty_gamma.png rename to fuzzers/frida/frida_libpng/corpus/not_kitty_gamma.png diff --git a/fuzzers/frida_libpng/corpus/not_kitty_icc.png b/fuzzers/frida/frida_libpng/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/frida_libpng/corpus/not_kitty_icc.png rename to fuzzers/frida/frida_libpng/corpus/not_kitty_icc.png diff --git a/fuzzers/frida_libpng/harness.cc b/fuzzers/frida/frida_libpng/harness.cc similarity index 100% rename from fuzzers/frida_libpng/harness.cc rename to fuzzers/frida/frida_libpng/harness.cc diff --git a/fuzzers/frida_libpng/harness_win.cpp b/fuzzers/frida/frida_libpng/harness_win.cpp similarity index 100% rename from fuzzers/frida_libpng/harness_win.cpp rename to fuzzers/frida/frida_libpng/harness_win.cpp diff --git a/fuzzers/frida_libpng/src/fuzzer.rs b/fuzzers/frida/frida_libpng/src/fuzzer.rs similarity index 100% rename from fuzzers/frida_libpng/src/fuzzer.rs rename to fuzzers/frida/frida_libpng/src/fuzzer.rs diff --git a/fuzzers/frida_libpng/src/main.rs b/fuzzers/frida/frida_libpng/src/main.rs similarity index 100% rename from fuzzers/frida_libpng/src/main.rs rename to fuzzers/frida/frida_libpng/src/main.rs diff --git a/fuzzers/fuzzbench/.gitignore b/fuzzers/fuzzbench/fuzzbench/.gitignore similarity index 100% rename from fuzzers/fuzzbench/.gitignore rename to fuzzers/fuzzbench/fuzzbench/.gitignore diff --git a/fuzzers/fuzzbench/Cargo.toml b/fuzzers/fuzzbench/fuzzbench/Cargo.toml similarity index 74% rename from fuzzers/fuzzbench/Cargo.toml rename to fuzzers/fuzzbench/fuzzbench/Cargo.toml index 728a7f8091..6dd6a1a315 100644 --- a/fuzzers/fuzzbench/Cargo.toml +++ b/fuzzers/fuzzbench/fuzzbench/Cargo.toml @@ -25,11 +25,11 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["default"] } nix = { version = "0.29", features = ["fs"] } mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/fuzzbench/Makefile.toml b/fuzzers/fuzzbench/fuzzbench/Makefile.toml similarity index 100% rename from fuzzers/fuzzbench/Makefile.toml rename to fuzzers/fuzzbench/fuzzbench/Makefile.toml diff --git a/fuzzers/fuzzbench/README.md b/fuzzers/fuzzbench/fuzzbench/README.md similarity index 100% rename from fuzzers/fuzzbench/README.md rename to fuzzers/fuzzbench/fuzzbench/README.md diff --git a/fuzzers/fuzzbench/fuzz.c b/fuzzers/fuzzbench/fuzzbench/fuzz.c similarity index 100% rename from fuzzers/fuzzbench/fuzz.c rename to fuzzers/fuzzbench/fuzzbench/fuzz.c diff --git a/fuzzers/fuzzbench/src/bin/libafl_cc.rs b/fuzzers/fuzzbench/fuzzbench/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/fuzzbench/src/bin/libafl_cc.rs rename to fuzzers/fuzzbench/fuzzbench/src/bin/libafl_cc.rs diff --git a/fuzzers/forkserver_libafl_cc/src/bin/libafl_cxx.rs b/fuzzers/fuzzbench/fuzzbench/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/forkserver_libafl_cc/src/bin/libafl_cxx.rs rename to fuzzers/fuzzbench/fuzzbench/src/bin/libafl_cxx.rs diff --git a/fuzzers/fuzzbench/src/lib.rs b/fuzzers/fuzzbench/fuzzbench/src/lib.rs similarity index 100% rename from fuzzers/fuzzbench/src/lib.rs rename to fuzzers/fuzzbench/fuzzbench/src/lib.rs diff --git a/fuzzers/dynamic_analysis/stub_rt.c b/fuzzers/fuzzbench/fuzzbench/stub_rt.c similarity index 100% rename from fuzzers/dynamic_analysis/stub_rt.c rename to fuzzers/fuzzbench/fuzzbench/stub_rt.c diff --git a/fuzzers/fuzzbench_ctx/Cargo.toml b/fuzzers/fuzzbench/fuzzbench_ctx/Cargo.toml similarity index 73% rename from fuzzers/fuzzbench_ctx/Cargo.toml rename to fuzzers/fuzzbench/fuzzbench_ctx/Cargo.toml index 824dac8131..09c1961fc2 100644 --- a/fuzzers/fuzzbench_ctx/Cargo.toml +++ b/fuzzers/fuzzbench/fuzzbench_ctx/Cargo.toml @@ -25,11 +25,11 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer", "sancov_ctx"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer", "sancov_ctx"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["default"] } nix = { version = "0.29", features = ["fs"] } mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/fuzzbench_ctx/Makefile.toml b/fuzzers/fuzzbench/fuzzbench_ctx/Makefile.toml similarity index 100% rename from fuzzers/fuzzbench_ctx/Makefile.toml rename to fuzzers/fuzzbench/fuzzbench_ctx/Makefile.toml diff --git a/fuzzers/fuzzbench_ctx/fuzz.c b/fuzzers/fuzzbench/fuzzbench_ctx/fuzz.c similarity index 100% rename from fuzzers/fuzzbench_ctx/fuzz.c rename to fuzzers/fuzzbench/fuzzbench_ctx/fuzz.c diff --git a/fuzzers/fuzzbench_ctx/src/bin/libafl_cc.rs b/fuzzers/fuzzbench/fuzzbench_ctx/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/fuzzbench_ctx/src/bin/libafl_cc.rs rename to fuzzers/fuzzbench/fuzzbench_ctx/src/bin/libafl_cc.rs diff --git a/fuzzers/fuzzbench/src/bin/libafl_cxx.rs b/fuzzers/fuzzbench/fuzzbench_ctx/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/fuzzbench/src/bin/libafl_cxx.rs rename to fuzzers/fuzzbench/fuzzbench_ctx/src/bin/libafl_cxx.rs diff --git a/fuzzers/fuzzbench_ctx/src/lib.rs b/fuzzers/fuzzbench/fuzzbench_ctx/src/lib.rs similarity index 100% rename from fuzzers/fuzzbench_ctx/src/lib.rs rename to fuzzers/fuzzbench/fuzzbench_ctx/src/lib.rs diff --git a/fuzzers/fuzzbench/stub_rt.c b/fuzzers/fuzzbench/fuzzbench_ctx/stub_rt.c similarity index 100% rename from fuzzers/fuzzbench/stub_rt.c rename to fuzzers/fuzzbench/fuzzbench_ctx/stub_rt.c diff --git a/fuzzers/fuzzbench_fork_qemu/.gitignore b/fuzzers/fuzzbench/fuzzbench_fork_qemu/.gitignore similarity index 100% rename from fuzzers/fuzzbench_fork_qemu/.gitignore rename to fuzzers/fuzzbench/fuzzbench_fork_qemu/.gitignore diff --git a/fuzzers/fuzzbench_fork_qemu/Cargo.toml b/fuzzers/fuzzbench/fuzzbench_fork_qemu/Cargo.toml similarity index 73% rename from fuzzers/fuzzbench_fork_qemu/Cargo.toml rename to fuzzers/fuzzbench/fuzzbench_fork_qemu/Cargo.toml index 6ed8b590de..7e41255019 100644 --- a/fuzzers/fuzzbench_fork_qemu/Cargo.toml +++ b/fuzzers/fuzzbench/fuzzbench_fork_qemu/Cargo.toml @@ -20,9 +20,9 @@ debug = false strip = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_qemu = { path = "../../libafl_qemu/", features = ["x86_64", "usermode"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_qemu = { path = "../../../libafl_qemu/", features = ["x86_64", "usermode"] } clap = { version = "4.5", features = ["default"] } nix = { version = "0.29", features = ["fs"] } diff --git a/fuzzers/fuzzbench_fork_qemu/Makefile.toml b/fuzzers/fuzzbench/fuzzbench_fork_qemu/Makefile.toml similarity index 97% rename from fuzzers/fuzzbench_fork_qemu/Makefile.toml rename to fuzzers/fuzzbench/fuzzbench_fork_qemu/Makefile.toml index 00ac7f259e..940f250527 100644 --- a/fuzzers/fuzzbench_fork_qemu/Makefile.toml +++ b/fuzzers/fuzzbench/fuzzbench_fork_qemu/Makefile.toml @@ -50,7 +50,7 @@ make -C libpng-1.6.37 cc -c "${PROJECT_DIR}/libfuzzer_main.c" # Build the libpng harness c++ \ - ../libfuzzer_libpng/harness.cc \ + ../../libpng/libfuzzer_libpng/harness.cc \ ./libpng-1.6.37/.libs/libpng16.a \ ./libfuzzer_main.o \ -I./libpng-1.6.37/ \ diff --git a/fuzzers/fuzzbench_fork_qemu/libfuzzer_main.c b/fuzzers/fuzzbench/fuzzbench_fork_qemu/libfuzzer_main.c similarity index 100% rename from fuzzers/fuzzbench_fork_qemu/libfuzzer_main.c rename to fuzzers/fuzzbench/fuzzbench_fork_qemu/libfuzzer_main.c diff --git a/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs b/fuzzers/fuzzbench/fuzzbench_fork_qemu/src/fuzzer.rs similarity index 100% rename from fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs rename to fuzzers/fuzzbench/fuzzbench_fork_qemu/src/fuzzer.rs diff --git a/fuzzers/fuzzbench_fork_qemu/src/main.rs b/fuzzers/fuzzbench/fuzzbench_fork_qemu/src/main.rs similarity index 100% rename from fuzzers/fuzzbench_fork_qemu/src/main.rs rename to fuzzers/fuzzbench/fuzzbench_fork_qemu/src/main.rs diff --git a/fuzzers/fuzzbench_forkserver/.gitignore b/fuzzers/fuzzbench/fuzzbench_forkserver/.gitignore similarity index 100% rename from fuzzers/fuzzbench_forkserver/.gitignore rename to fuzzers/fuzzbench/fuzzbench_forkserver/.gitignore diff --git a/fuzzers/fuzzbench_forkserver/Cargo.toml b/fuzzers/fuzzbench/fuzzbench_forkserver/Cargo.toml similarity index 78% rename from fuzzers/fuzzbench_forkserver/Cargo.toml rename to fuzzers/fuzzbench/fuzzbench_forkserver/Cargo.toml index 55d426c3cb..ddcbfbe883 100644 --- a/fuzzers/fuzzbench_forkserver/Cargo.toml +++ b/fuzzers/fuzzbench/fuzzbench_forkserver/Cargo.toml @@ -20,8 +20,8 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/" } clap = { version = "4.5", features = ["default"] } nix = { version = "0.29", features = ["signal"] } diff --git a/fuzzers/fuzzbench_forkserver/src/main.rs b/fuzzers/fuzzbench/fuzzbench_forkserver/src/main.rs similarity index 100% rename from fuzzers/fuzzbench_forkserver/src/main.rs rename to fuzzers/fuzzbench/fuzzbench_forkserver/src/main.rs diff --git a/fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml b/fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/Cargo.toml similarity index 71% rename from fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml rename to fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/Cargo.toml index 316a3ba8bb..04b22237a8 100644 --- a/fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml +++ b/fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/Cargo.toml @@ -20,8 +20,8 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/" } clap = { version = "4.5", features = ["default"] } nix = { version = "0.29", features = ["signal"] } \ No newline at end of file diff --git a/fuzzers/fuzzbench_forkserver_cmplog/src/main.rs b/fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/src/main.rs similarity index 100% rename from fuzzers/fuzzbench_forkserver_cmplog/src/main.rs rename to fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/src/main.rs diff --git a/fuzzers/fuzzbench_forkserver_cmplog/test/compile.sh b/fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/test/compile.sh similarity index 100% rename from fuzzers/fuzzbench_forkserver_cmplog/test/compile.sh rename to fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/test/compile.sh diff --git a/fuzzers/fuzzbench_forkserver_cmplog/test/test-cmplog.c b/fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/test/test-cmplog.c similarity index 100% rename from fuzzers/fuzzbench_forkserver_cmplog/test/test-cmplog.c rename to fuzzers/fuzzbench/fuzzbench_forkserver_cmplog/test/test-cmplog.c diff --git a/fuzzers/fuzzbench_qemu/.gitignore b/fuzzers/fuzzbench/fuzzbench_qemu/.gitignore similarity index 100% rename from fuzzers/fuzzbench_qemu/.gitignore rename to fuzzers/fuzzbench/fuzzbench_qemu/.gitignore diff --git a/fuzzers/fuzzbench_qemu/Cargo.toml b/fuzzers/fuzzbench/fuzzbench_qemu/Cargo.toml similarity index 73% rename from fuzzers/fuzzbench_qemu/Cargo.toml rename to fuzzers/fuzzbench/fuzzbench_qemu/Cargo.toml index 92f800359a..6384df6402 100644 --- a/fuzzers/fuzzbench_qemu/Cargo.toml +++ b/fuzzers/fuzzbench/fuzzbench_qemu/Cargo.toml @@ -20,9 +20,9 @@ debug = false strip = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_qemu = { path = "../../libafl_qemu/", features = ["x86_64", "usermode"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_qemu = { path = "../../../libafl_qemu/", features = ["x86_64", "usermode"] } clap = { version = "4.5", features = ["default"] } nix = { version = "0.29", features = ["fs"] } diff --git a/fuzzers/fuzzbench_qemu/Makefile.toml b/fuzzers/fuzzbench/fuzzbench_qemu/Makefile.toml similarity index 93% rename from fuzzers/fuzzbench_qemu/Makefile.toml rename to fuzzers/fuzzbench/fuzzbench_qemu/Makefile.toml index df0edf93ba..b34b02fa24 100644 --- a/fuzzers/fuzzbench_qemu/Makefile.toml +++ b/fuzzers/fuzzbench/fuzzbench_qemu/Makefile.toml @@ -50,7 +50,7 @@ make -C libpng-1.6.37 cc -c "${PROJECT_DIR}/libfuzzer_main.c" # Build the libpng harness c++ \ - ../libfuzzer_libpng/harness.cc \ + ../../libpng/libfuzzer_libpng/harness.cc \ ./libpng-1.6.37/.libs/libpng16.a \ ./libfuzzer_main.o \ -I./libpng-1.6.37/ \ @@ -67,7 +67,7 @@ windows_alias = "unsupported" [tasks.run_unix] command = "cargo" -args = ["run", "--profile", "${PROFILE}", "./${FUZZER_NAME}", "--", "--libafl-in", "../libfuzzer_libpng/corpus", "--libafl-out", "./out", "./${FUZZER_NAME}"] +args = ["run", "--profile", "${PROFILE}", "./${FUZZER_NAME}", "--", "--libafl-in", "../../libpng/libfuzzer_libpng/corpus", "--libafl-out", "./out", "./${FUZZER_NAME}"] dependencies = [ "harness", "fuzzer" ] # Run the fuzzer diff --git a/fuzzers/fuzzbench_qemu/README.md b/fuzzers/fuzzbench/fuzzbench_qemu/README.md similarity index 100% rename from fuzzers/fuzzbench_qemu/README.md rename to fuzzers/fuzzbench/fuzzbench_qemu/README.md diff --git a/fuzzers/fuzzbench_qemu/libfuzzer_main.c b/fuzzers/fuzzbench/fuzzbench_qemu/libfuzzer_main.c similarity index 100% rename from fuzzers/fuzzbench_qemu/libfuzzer_main.c rename to fuzzers/fuzzbench/fuzzbench_qemu/libfuzzer_main.c diff --git a/fuzzers/fuzzbench_qemu/src/fuzzer.rs b/fuzzers/fuzzbench/fuzzbench_qemu/src/fuzzer.rs similarity index 100% rename from fuzzers/fuzzbench_qemu/src/fuzzer.rs rename to fuzzers/fuzzbench/fuzzbench_qemu/src/fuzzer.rs diff --git a/fuzzers/fuzzbench_qemu/src/main.rs b/fuzzers/fuzzbench/fuzzbench_qemu/src/main.rs similarity index 100% rename from fuzzers/fuzzbench_qemu/src/main.rs rename to fuzzers/fuzzbench/fuzzbench_qemu/src/main.rs diff --git a/fuzzers/fuzzbench_text/.gitignore b/fuzzers/fuzzbench/fuzzbench_text/.gitignore similarity index 100% rename from fuzzers/fuzzbench_text/.gitignore rename to fuzzers/fuzzbench/fuzzbench_text/.gitignore diff --git a/fuzzers/fuzzbench_text/Cargo.toml b/fuzzers/fuzzbench/fuzzbench_text/Cargo.toml similarity index 73% rename from fuzzers/fuzzbench_text/Cargo.toml rename to fuzzers/fuzzbench/fuzzbench_text/Cargo.toml index 599a3ccefc..61c8bca89e 100644 --- a/fuzzers/fuzzbench_text/Cargo.toml +++ b/fuzzers/fuzzbench/fuzzbench_text/Cargo.toml @@ -20,11 +20,11 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["default"] } nix = { version = "0.29", features = ["fs"] } mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/fuzzbench_text/Makefile.toml b/fuzzers/fuzzbench/fuzzbench_text/Makefile.toml similarity index 100% rename from fuzzers/fuzzbench_text/Makefile.toml rename to fuzzers/fuzzbench/fuzzbench_text/Makefile.toml diff --git a/fuzzers/fuzzbench_text/README.md b/fuzzers/fuzzbench/fuzzbench_text/README.md similarity index 100% rename from fuzzers/fuzzbench_text/README.md rename to fuzzers/fuzzbench/fuzzbench_text/README.md diff --git a/fuzzers/fuzzbench_text/fuzz.c b/fuzzers/fuzzbench/fuzzbench_text/fuzz.c similarity index 100% rename from fuzzers/fuzzbench_text/fuzz.c rename to fuzzers/fuzzbench/fuzzbench_text/fuzz.c diff --git a/fuzzers/fuzzbench_text/src/bin/libafl_cc.rs b/fuzzers/fuzzbench/fuzzbench_text/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/fuzzbench_text/src/bin/libafl_cc.rs rename to fuzzers/fuzzbench/fuzzbench_text/src/bin/libafl_cc.rs diff --git a/fuzzers/fuzzbench_ctx/src/bin/libafl_cxx.rs b/fuzzers/fuzzbench/fuzzbench_text/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/fuzzbench_ctx/src/bin/libafl_cxx.rs rename to fuzzers/fuzzbench/fuzzbench_text/src/bin/libafl_cxx.rs diff --git a/fuzzers/fuzzbench_text/src/lib.rs b/fuzzers/fuzzbench/fuzzbench_text/src/lib.rs similarity index 100% rename from fuzzers/fuzzbench_text/src/lib.rs rename to fuzzers/fuzzbench/fuzzbench_text/src/lib.rs diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/Cargo.toml b/fuzzers/libfuzzer_libpng_aflpp_ui/Cargo.toml deleted file mode 100644 index 46fe7f76a5..0000000000 --- a/fuzzers/libfuzzer_libpng_aflpp_ui/Cargo.toml +++ /dev/null @@ -1,34 +0,0 @@ -[package] -name = "libfuzzer_libpng_AFLStyle_UI" -version = "0.0.1" -authors = ["Heng Zhang ", "Dominik Maier "] -edition = "2021" - -[features] -default = ["std"] -std = [] -# Forces a crash -crash = [] - -[profile.release] -lto = true -codegen-units = 1 -opt-level = 3 -debug = true - -[build-dependencies] -cc = { version = "1.0", features = ["parallel"] } -which = "6.0" - -[dependencies] -libafl = { path = "../../libafl/", features = ["default"] } -# libafl = { path = "../../libafl/", features = ["default"] } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } -# TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } -mimalloc = { version = "*", default-features = false } - -[lib] -name = "libfuzzer_libpng" -crate-type = ["staticlib"] diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/Makefile.toml b/fuzzers/libfuzzer_libpng_aflpp_ui/Makefile.toml deleted file mode 100644 index 3624a0b321..0000000000 --- a/fuzzers/libfuzzer_libpng_aflpp_ui/Makefile.toml +++ /dev/null @@ -1,194 +0,0 @@ -# Variables -[env] -FUZZER_NAME='fuzzer_libpng' -PROJECT_DIR = { script = ["pwd"] } -CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target"} -PROFILE = { value = "release", condition = {env_not_set = ["PROFILE"]} } -PROFILE_DIR = {value = "release", condition = {env_not_set = ["PROFILE_DIR"] }} -LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc' -LIBAFL_CXX = '${CARGO_TARGET_DIR}/${PROFILE}/libafl_cxx' -FUZZER = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/${FUZZER_NAME}' - -[tasks.unsupported] -script_runner="@shell" -script=''' -echo "Cargo-make not integrated yet on this" -''' - -# libpng -[tasks.libpng] -linux_alias = "libpng_unix" -mac_alias = "libpng_unix" -windows_alias = "unsupported" - -[tasks.libpng_unix] -condition = { files_not_exist = ["./libpng-1.6.37"]} -script_runner="@shell" -script=''' -wget https://github.com/glennrp/libpng/archive/refs/tags/v1.6.37.tar.gz -tar -xvf v1.6.37.tar.gz -''' - -# Compilers -[tasks.cxx] -linux_alias = "cxx_unix" -mac_alias = "cxx_unix" -windows_alias = "unsupported" - -[tasks.cxx_unix] -command = "cargo" -args = ["build" , "--profile", "${PROFILE}"] - -[tasks.cc] -linux_alias = "cc_unix" -mac_alias = "cc_unix" -windows_alias = "unsupported" - -[tasks.cc_unix] -command = "cargo" -args = ["build" , "--profile", "${PROFILE}"] - -[tasks.crash_cxx] -linux_alias = "crash_cxx_unix" -mac_alias = "crash_cxx_unix" -windows_alias = "unsupported" - -[tasks.crash_cxx_unix] -command = "cargo" -args = ["build" , "--profile", "${PROFILE}", "--features=crash"] - -[tasks.crash_cc] -linux_alias = "crash_cc_unix" -mac_alias = "crash_cc_unix" -windows_alias = "unsupported" - -[tasks.crash_cc_unix] -command = "cargo" -args = ["build" , "--profile", "${PROFILE}", "--features=crash"] - -# Library -[tasks.lib] -linux_alias = "lib_unix" -mac_alias = "lib_unix" -windows_alias = "unsupported" - -[tasks.lib_unix] -script_runner="@shell" -script=''' -cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes -cd "${PROJECT_DIR}" -make -C libpng-1.6.37 CC="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc" CXX="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" -''' -dependencies = [ "libpng", "cxx", "cc" ] - -# Library -[tasks.crash_lib] -linux_alias = "crash_lib_unix" -mac_alias = "crash_lib_unix" -windows_alias = "unsupported" - -[tasks.crash_lib_unix] -script_runner="@shell" -script=''' -cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes -cd "${PROJECT_DIR}" -make -C libpng-1.6.37 CC="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc" CXX="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" -''' -dependencies = [ "libpng", "crash_cxx", "crash_cc" ] - -# Harness -[tasks.fuzzer] -linux_alias = "fuzzer_unix" -mac_alias = "fuzzer_unix" -windows_alias = "unsupported" - -[tasks.fuzzer_unix] -command = "${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" -args = ["${PROJECT_DIR}/harness.cc", "${PROJECT_DIR}/libpng-1.6.37/.libs/libpng16.a", "-I", "${PROJECT_DIR}/libpng-1.6.37/", "-o", "${FUZZER_NAME}", "-lm", "-lz"] -dependencies = [ "lib", "cxx", "cc" ] - -# Crashing Harness -[tasks.fuzzer_crash] -linux_alias = "fuzzer_crash_unix" -mac_alias = "fuzzer_crash_unix" -windows_alias = "unsupported" - -[tasks.fuzzer_crash_unix] -command = "${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" -args = ["${PROJECT_DIR}/harness.cc", "${PROJECT_DIR}/libpng-1.6.37/.libs/libpng16.a", "-I", "${PROJECT_DIR}/libpng-1.6.37/", "-o", "${FUZZER_NAME}_crash", "-lm", "-lz"] -dependencies = [ "crash_lib", "crash_cxx", "crash_cc" ] - -# Run the fuzzer -[tasks.run] -linux_alias = "run_unix" -mac_alias = "run_unix" -windows_alias = "unsupported" - -[tasks.run_unix] -script_runner = "@shell" -script=''' -./${FUZZER_NAME} & -sleep 0.2 -./${FUZZER_NAME} 2>/dev/null -''' -dependencies = [ "fuzzer" ] - - -# Run the fuzzer with a crash -[tasks.crash] -linux_alias = "crash_unix" -mac_alias = "crash_unix" -windows_alias = "unsupported" - -[tasks.crash_unix] -script_runner = "@shell" -script=''' -./${FUZZER_NAME}_crash & -sleep 0.2 -./${FUZZER_NAME}_crash 2>/dev/null -''' -dependencies = [ "fuzzer_crash" ] - - - -# Test -[tasks.test] -linux_alias = "test_unix" -mac_alias = "test_mac" -windows_alias = "unsupported" - -[tasks.test_unix] -script_runner = "@shell" -script=''' -rm -rf libafl_unix_shmem_server || true -(timeout --foreground 11s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true) & -sleep 0.2 -timeout --foreground 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true -''' -dependencies = [ "fuzzer" ] - -[tasks.test_mac] -script_runner = "@shell" -script=''' -rm -rf libafl_unix_shmem_server || true -(timeout --foreground 11s ./${FUZZER_NAME} | tee fuzz_stdout.log 2>/dev/null || true) & -sleep 0.2 -timeout --foreground 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true -''' -dependencies = [ "fuzzer" ] - -# Clean up -[tasks.clean] -linux_alias = "clean_unix" -mac_alias = "clean_unix" -windows_alias = "unsupported" - -[tasks.clean_unix] -# Disable default `clean` definition -clear = true -script_runner="@shell" -script=''' -rm -f ./${FUZZER_NAME} -make -C libpng-1.6.37 clean -cargo clean -''' diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/README.md b/fuzzers/libfuzzer_libpng_aflpp_ui/README.md deleted file mode 100644 index f87639b920..0000000000 --- a/fuzzers/libfuzzer_libpng_aflpp_ui/README.md +++ /dev/null @@ -1,72 +0,0 @@ -# Libfuzzer for libpng, with AFL-style UI - -This folder contains an example fuzzer for libpng, using LLMP for fast multi-process fuzzing and crash detection. - -In contrast to other fuzzer examples, it keeps track of AFL style metrics and display them in the terminal. - -## Build - -To build this example, run - -```bash -cargo build --release -``` - -This will build the library with the fuzzer (src/lib.rs) with the libfuzzer compatibility layer and the SanitizerCoverage runtime functions for coverage feedback. -In addition, it will also build two C and C++ compiler wrappers (bin/libafl_c(libafl_c/xx).rs) that you must use to compile the target. - -The compiler wrappers, `libafl_cc` and `libafl_cxx`, will end up in `./target/release/` (or `./target/debug`, in case you did not build with the `--release` flag). - -Then download libpng, and unpack the archive: -```bash -wget https://github.com/glennrp/libpng/archive/refs/tags/v1.6.37.tar.gz -tar -xvf v1.6.37.tar.gz -``` - -Now compile libpng, using the libafl_cc compiler wrapper: - -```bash -cd libpng-1.6.37 -./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes -make CC="$(pwd)/../target/release/libafl_cc" CXX="$(pwd)/../target/release/libafl_cxx" -j `nproc` -``` - -You can find the static lib at `libpng-1.6.37/.libs/libpng16.a`. - -Now, we have to build the libfuzzer harness and link all together to create our fuzzer binary. - -``` -cd .. -./target/release/libafl_cxx ./harness.cc libpng-1.6.37/.libs/libpng16.a -I libpng-1.6.37/ -o fuzzer_libpng -lz -lm -``` - -Afterward, the fuzzer will be ready to run. -Note that, unless you use the `launcher`, you will have to run the binary multiple times to actually start the fuzz process, see `Run` in the following. -This allows you to run multiple different builds of the same fuzzer alongside, for example, with and without ASAN (`-fsanitize=address`) or with different mutators. - -## Run - -The first time you run the binary, the broker will open a tcp port (currently on port `1337`), waiting for fuzzer clients to connect. This port is local and only used for the initial handshake. All further communication happens via shared map, to be independent of the kernel. Currently, you must run the clients from the libfuzzer_libpng directory for them to be able to access the PNG corpus. - -``` -./fuzzer_libpng -``` - -And after running the above again in a separate terminal: - -``` -[libafl/src/bolts/llmp.rs:1464] "New connection" = "New connection" -[libafl/src/bolts/llmp.rs:1464] addr = 127.0.0.1:33500 -[libafl/src/bolts/llmp.rs:1464] stream.peer_addr().unwrap() = 127.0.0.1:33500 -[LOG Debug]: Loaded 4 initial testcases. -[New Testcase #2] clients: 3, corpus: 6, objectives: 0, executions: 5, exec/sec: 0 -< fuzzing stats > -``` -You will get an AFL-Style UI in your terminal. - -As this example uses in-process fuzzing, we added a Restarting Event Manager (`setup_restarting_mgr`). -This means each client will start itself again to listen for crashes and timeouts. -By restarting the actual fuzzer, it can recover from these exit conditions. - -In any real-world scenario, you should use `taskset` to pin each client to an empty CPU core, the lib does not pick an empty core automatically (yet). - diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/src/lib.rs b/fuzzers/libfuzzer_libpng_aflpp_ui/src/lib.rs deleted file mode 100644 index af8a885aa8..0000000000 --- a/fuzzers/libfuzzer_libpng_aflpp_ui/src/lib.rs +++ /dev/null @@ -1,239 +0,0 @@ -//! A libfuzzer-like fuzzer with llmp-multithreading support and restarts -//! The example harness is built for libpng. -use core::time::Duration; -#[cfg(feature = "crash")] -use std::ptr; -use std::{env, path::PathBuf}; - -use libafl::{ - corpus::{Corpus, InMemoryOnDiskCorpus, OnDiskCorpus}, - events::{setup_restarting_mgr_std, EventConfig, EventRestarter}, - executors::{inprocess::InProcessExecutor, ExitKind}, - feedback_or, feedback_or_fast, - feedbacks::{CrashFeedback, MaxMapFeedback, TimeFeedback, TimeoutFeedback}, - fuzzer::{Fuzzer, StdFuzzer}, - inputs::{BytesInput, HasTargetBytes}, - monitors::tui::TuiMonitor, - mutators::{ - scheduled::{havoc_mutations, tokens_mutations, StdScheduledMutator}, - token_mutations::Tokens, - }, - observers::{CanTrack, HitcountsMapObserver, StdMapObserver, TimeObserver}, - schedulers::{ - powersched::PowerSchedule, IndexesLenTimeMinimizerScheduler, StdWeightedScheduler, - }, - stages::{calibrate::CalibrationStage, power::StdPowerMutationalStage, stats::AflStatsStage}, - state::{HasCorpus, StdState}, - Error, HasMetadata, -}; -use libafl_bolts::{ - rands::StdRand, - tuples::{tuple_list, Merge}, - AsSlice, -}; -use libafl_targets::{libfuzzer_initialize, libfuzzer_test_one_input, EDGES_MAP, MAX_EDGES_FOUND}; -use mimalloc::MiMalloc; - -#[global_allocator] -static GLOBAL: MiMalloc = MiMalloc; - -/// The main fn, `no_mangle` as it is a C main -#[cfg(not(test))] -#[no_mangle] -pub extern "C" fn libafl_main() { - // Registry the metadata types used in this fuzzer - // Needed only on no_std - // unsafe { RegistryBuilder::register::(); } - - println!( - "Workdir: {:?}", - env::current_dir().unwrap().to_string_lossy().to_string() - ); - fuzz( - &[PathBuf::from("./corpus")], - PathBuf::from("./out"), - PathBuf::from("./crashes"), - 1337, - ) - .expect("An error occurred while fuzzing"); -} - -/// The actual fuzzer -#[cfg(not(test))] -fn fuzz( - initial_input_dirs: &[PathBuf], - corpus_dir: PathBuf, - objective_dir: PathBuf, - broker_port: u16, -) -> Result<(), Error> { - // 'While the stats are state, they are usually used in the broker - which is likely never restarted - // let monitor = MultiMonitor::new(|s| println!("{s}")); - - // Setup an Monitor with AFL-Style UI to display the stats - let monitor = TuiMonitor::builder() - .title("Libfuzzer in LibAFL") - .version("0.0.1") - .enhanced_graphics(true) - .build(); - - // The restarting state will spawn the same process again as child, then restarted it each time it crashes. - let (state, mut restarting_mgr) = - match setup_restarting_mgr_std(monitor, broker_port, EventConfig::AlwaysUnique) { - Ok(res) => res, - Err(err) => match err { - Error::ShuttingDown => { - return Ok(()); - } - _ => { - panic!("Failed to setup the restarter: {err}"); - } - }, - }; - - // Create an observation channel using the coverage map - let edges_observer = unsafe { - HitcountsMapObserver::new(StdMapObserver::from_mut_ptr( - "edges", - EDGES_MAP.as_mut_ptr(), - MAX_EDGES_FOUND, - )) - .track_indices() - }; - - // Create an observation channel to keep track of the execution time - let time_observer = TimeObserver::new("time"); - - let map_feedback = MaxMapFeedback::new(&edges_observer); - - let calibration = CalibrationStage::new(&map_feedback); - - // Feedback to rate the interestingness of an input - // This one is composed by two Feedbacks in OR - let mut feedback = feedback_or!( - // New maximization map feedback linked to the edges observer and the feedback state - map_feedback, - // Time feedback, this one does not need a feedback state - TimeFeedback::new(&time_observer) - ); - - // A feedback to choose if an input is a solution or not - let mut objective = feedback_or_fast!(CrashFeedback::new(), TimeoutFeedback::new()); - - // If not restarting, create a State from scratch - let mut state = state.unwrap_or_else(|| { - StdState::new( - // RNG - StdRand::new(), - // Corpus that will be evolved, we keep it in memory for performance - InMemoryOnDiskCorpus::new(corpus_dir).unwrap(), - // Corpus in which we store solutions (crashes in this example), - // on disk so the user can get them after stopping the fuzzer - OnDiskCorpus::new(objective_dir).unwrap(), - // States of the feedbacks. - // The feedbacks can report the data that should persist in the State. - &mut feedback, - // Same for objective feedbacks - &mut objective, - ) - .unwrap() - }); - - println!("We're a client, let's fuzz :)"); - - // Create a PNG dictionary if not existing - if state.metadata_map().get::().is_none() { - state.add_metadata(Tokens::from([ - vec![137, 80, 78, 71, 13, 10, 26, 10], // PNG header - "IHDR".as_bytes().to_vec(), - "IDAT".as_bytes().to_vec(), - "PLTE".as_bytes().to_vec(), - "IEND".as_bytes().to_vec(), - ])); - } - - // Setup a basic mutator with a mutational stage - let mutator = StdScheduledMutator::new(havoc_mutations().merge(tokens_mutations())); - - let power = StdPowerMutationalStage::new(mutator); - - // Setup a stage that can collect and send the AFL-like data - let aflstats = AflStatsStage::new(Duration::from_secs(3)); - - let mut stages = tuple_list!(calibration, power, aflstats); - - // A minimization+queue policy to get testcasess from the corpus - let scheduler = IndexesLenTimeMinimizerScheduler::new( - &edges_observer, - StdWeightedScheduler::with_schedule(&mut state, &edges_observer, Some(PowerSchedule::FAST)), - ); - - // A fuzzer with feedbacks and a corpus scheduler - let mut fuzzer = StdFuzzer::new(scheduler, feedback, objective); - - // The wrapped harness function, calling out to the LLVM-style harness - let mut harness = |input: &BytesInput| { - let target = input.target_bytes(); - let buf = target.as_slice(); - #[cfg(feature = "crash")] - if buf.len() > 4 && buf[4] == 0 { - unsafe { - eprintln!("Crashing (for testing purposes)"); - let addr = ptr::null_mut(); - *addr = 1; - } - } - libfuzzer_test_one_input(buf); - ExitKind::Ok - }; - - // Create the executor for an in-process function with one observer for edge coverage and one for the execution time - let mut executor = InProcessExecutor::with_timeout( - &mut harness, - tuple_list!(edges_observer, time_observer), - &mut fuzzer, - &mut state, - &mut restarting_mgr, - Duration::new(10, 0), - )?; - - // The actual target run starts here. - // Call LLVMFUzzerInitialize() if present. - let args: Vec = env::args().collect(); - if libfuzzer_initialize(&args) == -1 { - println!("Warning: LLVMFuzzerInitialize failed with -1"); - } - - // In case the corpus is empty (on first run), reset - if state.must_load_initial_inputs() { - state - .load_initial_inputs( - &mut fuzzer, - &mut executor, - &mut restarting_mgr, - initial_input_dirs, - ) - .unwrap_or_else(|_| { - panic!("Failed to load initial corpus at {:?}", &initial_input_dirs) - }); - println!("We imported {} inputs from disk.", state.corpus().count()); - } - - // This fuzzer restarts after 1 mio `fuzz_one` executions. - // Each fuzz_one will internally do many executions of the target. - // If your target is very instable, setting a low count here may help. - // However, you will lose a lot of performance that way. - let iters = 1_000_000; - fuzzer.fuzz_loop_for( - &mut stages, - &mut executor, - &mut state, - &mut restarting_mgr, - iters, - )?; - - // It's important, that we store the state before restarting! - // Else, the parent will not respawn a new child and quit. - restarting_mgr.on_restart(&mut state)?; - - Ok(()) -} diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/harness.cc b/fuzzers/libfuzzer_libpng_tcp_manager/harness.cc deleted file mode 100644 index 5c36517376..0000000000 --- a/fuzzers/libfuzzer_libpng_tcp_manager/harness.cc +++ /dev/null @@ -1,191 +0,0 @@ -// libpng_read_fuzzer.cc -// Copyright 2017-2018 Glenn Randers-Pehrson -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that may -// be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE - -// Last changed in libpng 1.6.35 [July 15, 2018] - -// The modifications in 2017 by Glenn Randers-Pehrson include -// 1. addition of a PNG_CLEANUP macro, -// 2. setting the option to ignore ADLER32 checksums, -// 3. adding "#include " which is needed on some platforms -// to provide memcpy(). -// 4. adding read_end_info() and creating an end_info structure. -// 5. adding calls to png_set_*() transforms commonly used by browsers. - -#include -#include -#include - -#include - -#define PNG_INTERNAL -#include "png.h" - -#define PNG_CLEANUP \ - if (png_handler.png_ptr) { \ - if (png_handler.row_ptr) { \ - png_free(png_handler.png_ptr, png_handler.row_ptr); \ - } \ - if (png_handler.end_info_ptr) { \ - png_destroy_read_struct(&png_handler.png_ptr, &png_handler.info_ptr, \ - &png_handler.end_info_ptr); \ - } else if (png_handler.info_ptr) { \ - png_destroy_read_struct(&png_handler.png_ptr, &png_handler.info_ptr, \ - nullptr); \ - } else { \ - png_destroy_read_struct(&png_handler.png_ptr, nullptr, nullptr); \ - } \ - png_handler.png_ptr = nullptr; \ - png_handler.row_ptr = nullptr; \ - png_handler.info_ptr = nullptr; \ - png_handler.end_info_ptr = nullptr; \ - } - -struct BufState { - const uint8_t *data; - size_t bytes_left; -}; - -struct PngObjectHandler { - png_infop info_ptr = nullptr; - png_structp png_ptr = nullptr; - png_infop end_info_ptr = nullptr; - png_voidp row_ptr = nullptr; - BufState *buf_state = nullptr; - - ~PngObjectHandler() { - if (row_ptr) { png_free(png_ptr, row_ptr); } - if (end_info_ptr) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info_ptr); - } else if (info_ptr) { - png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); - } else { - png_destroy_read_struct(&png_ptr, nullptr, nullptr); - } - delete buf_state; - } -}; - -void user_read_data(png_structp png_ptr, png_bytep data, size_t length) { - BufState *buf_state = static_cast(png_get_io_ptr(png_ptr)); - if (length > buf_state->bytes_left) { png_error(png_ptr, "read error"); } - memcpy(data, buf_state->data, length); - buf_state->bytes_left -= length; - buf_state->data += length; -} - -static const int kPngHeaderSize = 8; - -// Entry point for LibFuzzer. -// Roughly follows the libpng book example: -// http://www.libpng.org/pub/png/book/chapter13.html -extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - if (size < kPngHeaderSize) { return 0; } - - std::vector v(data, data + size); - if (png_sig_cmp(v.data(), 0, kPngHeaderSize)) { - // not a PNG. - return 0; - } - - PngObjectHandler png_handler; - png_handler.png_ptr = nullptr; - png_handler.row_ptr = nullptr; - png_handler.info_ptr = nullptr; - png_handler.end_info_ptr = nullptr; - - png_handler.png_ptr = - png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); - if (!png_handler.png_ptr) { return 0; } - - png_handler.info_ptr = png_create_info_struct(png_handler.png_ptr); - if (!png_handler.info_ptr) { - PNG_CLEANUP - return 0; - } - - png_handler.end_info_ptr = png_create_info_struct(png_handler.png_ptr); - if (!png_handler.end_info_ptr) { - PNG_CLEANUP - return 0; - } - - png_set_crc_action(png_handler.png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); -#ifdef PNG_IGNORE_ADLER32 - png_set_option(png_handler.png_ptr, PNG_IGNORE_ADLER32, PNG_OPTION_ON); -#endif - - // Setting up reading from buffer. - png_handler.buf_state = new BufState(); - png_handler.buf_state->data = data + kPngHeaderSize; - png_handler.buf_state->bytes_left = size - kPngHeaderSize; - png_set_read_fn(png_handler.png_ptr, png_handler.buf_state, user_read_data); - png_set_sig_bytes(png_handler.png_ptr, kPngHeaderSize); - - if (setjmp(png_jmpbuf(png_handler.png_ptr))) { - PNG_CLEANUP - return 0; - } - - // Reading. - png_read_info(png_handler.png_ptr, png_handler.info_ptr); - - // reset error handler to put png_deleter into scope. - if (setjmp(png_jmpbuf(png_handler.png_ptr))) { - PNG_CLEANUP - return 0; - } - - png_uint_32 width, height; - int bit_depth, color_type, interlace_type, compression_type; - int filter_type; - - if (!png_get_IHDR(png_handler.png_ptr, png_handler.info_ptr, &width, &height, - &bit_depth, &color_type, &interlace_type, &compression_type, - &filter_type)) { - PNG_CLEANUP - return 0; - } - - // This is going to be too slow. - if (width && height > 100000000 / width) { - PNG_CLEANUP -#ifdef HAS_DUMMY_CRASH - #ifdef __aarch64__ - asm volatile(".word 0xf7f0a000\n"); - #else - asm("ud2"); - #endif -#endif - return 0; - } - - // Set several transforms that browsers typically use: - png_set_gray_to_rgb(png_handler.png_ptr); - png_set_expand(png_handler.png_ptr); - png_set_packing(png_handler.png_ptr); - png_set_scale_16(png_handler.png_ptr); - png_set_tRNS_to_alpha(png_handler.png_ptr); - - int passes = png_set_interlace_handling(png_handler.png_ptr); - - png_read_update_info(png_handler.png_ptr, png_handler.info_ptr); - - png_handler.row_ptr = - png_malloc(png_handler.png_ptr, - png_get_rowbytes(png_handler.png_ptr, png_handler.info_ptr)); - - for (int pass = 0; pass < passes; ++pass) { - for (png_uint_32 y = 0; y < height; ++y) { - png_read_row(png_handler.png_ptr, - static_cast(png_handler.row_ptr), nullptr); - } - } - - png_read_end(png_handler.png_ptr, png_handler.end_info_ptr); - - PNG_CLEANUP - return 0; -} diff --git a/fuzzers/libfuzzer_libpng/.gitignore b/fuzzers/libpng/libfuzzer_libpng/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libpng/.gitignore rename to fuzzers/libpng/libfuzzer_libpng/.gitignore diff --git a/fuzzers/libfuzzer_libpng/Cargo.toml b/fuzzers/libpng/libfuzzer_libpng/Cargo.toml similarity index 61% rename from fuzzers/libfuzzer_libpng/Cargo.toml rename to fuzzers/libpng/libfuzzer_libpng/Cargo.toml index 6e95e0c336..4e8b96e5e8 100644 --- a/fuzzers/libfuzzer_libpng/Cargo.toml +++ b/fuzzers/libpng/libfuzzer_libpng/Cargo.toml @@ -21,12 +21,12 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/", features = ["default"] } -# libafl = { path = "../../libafl/", features = ["default"] } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } +libafl = { path = "../../../libafl/", features = ["default"] } +# libafl = { path = "../../../libafl/", features = ["default"] } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } mimalloc = { version = "*", default-features = false } [lib] diff --git a/fuzzers/libfuzzer_libpng/Makefile.toml b/fuzzers/libpng/libfuzzer_libpng/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_libpng/Makefile.toml rename to fuzzers/libpng/libfuzzer_libpng/Makefile.toml diff --git a/fuzzers/libfuzzer_libpng/README.md b/fuzzers/libpng/libfuzzer_libpng/README.md similarity index 100% rename from fuzzers/libfuzzer_libpng/README.md rename to fuzzers/libpng/libfuzzer_libpng/README.md diff --git a/fuzzers/libfuzzer_libpng/corpus/not_kitty.png b/fuzzers/libpng/libfuzzer_libpng/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_libpng/corpus/not_kitty.png rename to fuzzers/libpng/libfuzzer_libpng/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_libpng/corpus/not_kitty_alpha.png b/fuzzers/libpng/libfuzzer_libpng/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_libpng/corpus/not_kitty_alpha.png rename to fuzzers/libpng/libfuzzer_libpng/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_libpng/corpus/not_kitty_gamma.png b/fuzzers/libpng/libfuzzer_libpng/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_libpng/corpus/not_kitty_gamma.png rename to fuzzers/libpng/libfuzzer_libpng/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_libpng/corpus/not_kitty_icc.png b/fuzzers/libpng/libfuzzer_libpng/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_libpng/corpus/not_kitty_icc.png rename to fuzzers/libpng/libfuzzer_libpng/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_libpng/harness.cc b/fuzzers/libpng/libfuzzer_libpng/harness.cc similarity index 100% rename from fuzzers/libfuzzer_libpng/harness.cc rename to fuzzers/libpng/libfuzzer_libpng/harness.cc diff --git a/fuzzers/libfuzzer_libpng/src/bin/libafl_cc.rs b/fuzzers/libpng/libfuzzer_libpng/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libpng/src/bin/libafl_cc.rs rename to fuzzers/libpng/libfuzzer_libpng/src/bin/libafl_cc.rs diff --git a/fuzzers/fuzzbench_text/src/bin/libafl_cxx.rs b/fuzzers/libpng/libfuzzer_libpng/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/fuzzbench_text/src/bin/libafl_cxx.rs rename to fuzzers/libpng/libfuzzer_libpng/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_libpng/src/lib.rs b/fuzzers/libpng/libfuzzer_libpng/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_libpng/src/lib.rs rename to fuzzers/libpng/libfuzzer_libpng/src/lib.rs diff --git a/fuzzers/libfuzzer_libpng_accounting/.gitignore b/fuzzers/libpng/libfuzzer_libpng_accounting/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/.gitignore rename to fuzzers/libpng/libfuzzer_libpng_accounting/.gitignore diff --git a/fuzzers/libfuzzer_libpng_accounting/Cargo.toml b/fuzzers/libpng/libfuzzer_libpng_accounting/Cargo.toml similarity index 62% rename from fuzzers/libfuzzer_libpng_accounting/Cargo.toml rename to fuzzers/libpng/libfuzzer_libpng_accounting/Cargo.toml index 9231d538f4..94394e4e01 100644 --- a/fuzzers/libfuzzer_libpng_accounting/Cargo.toml +++ b/fuzzers/libpng/libfuzzer_libpng_accounting/Cargo.toml @@ -19,11 +19,11 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/", features = ["std", "derive", "llmp_compression", "introspection"] } -libafl_bolts = { path = "../../libafl_bolts/", features = ["std", "derive", "llmp_compression"] } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } +libafl = { path = "../../../libafl/", features = ["std", "derive", "llmp_compression", "introspection"] } +libafl_bolts = { path = "../../../libafl_bolts/", features = ["std", "derive", "llmp_compression"] } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["derive"] } mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/libfuzzer_libpng_accounting/Makefile.toml b/fuzzers/libpng/libfuzzer_libpng_accounting/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/Makefile.toml rename to fuzzers/libpng/libfuzzer_libpng_accounting/Makefile.toml diff --git a/fuzzers/libfuzzer_libpng_accounting/README.md b/fuzzers/libpng/libfuzzer_libpng_accounting/README.md similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/README.md rename to fuzzers/libpng/libfuzzer_libpng_accounting/README.md diff --git a/fuzzers/libfuzzer_libpng_accounting/corpus/not_kitty.png b/fuzzers/libpng/libfuzzer_libpng_accounting/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/corpus/not_kitty.png rename to fuzzers/libpng/libfuzzer_libpng_accounting/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_libpng_accounting/corpus/not_kitty_alpha.png b/fuzzers/libpng/libfuzzer_libpng_accounting/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/corpus/not_kitty_alpha.png rename to fuzzers/libpng/libfuzzer_libpng_accounting/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_libpng_accounting/corpus/not_kitty_gamma.png b/fuzzers/libpng/libfuzzer_libpng_accounting/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/corpus/not_kitty_gamma.png rename to fuzzers/libpng/libfuzzer_libpng_accounting/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_libpng_accounting/corpus/not_kitty_icc.png b/fuzzers/libpng/libfuzzer_libpng_accounting/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/corpus/not_kitty_icc.png rename to fuzzers/libpng/libfuzzer_libpng_accounting/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_libpng_accounting/harness.cc b/fuzzers/libpng/libfuzzer_libpng_accounting/harness.cc similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/harness.cc rename to fuzzers/libpng/libfuzzer_libpng_accounting/harness.cc diff --git a/fuzzers/libfuzzer_libpng_accounting/src/bin/libafl_cc.rs b/fuzzers/libpng/libfuzzer_libpng_accounting/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/src/bin/libafl_cc.rs rename to fuzzers/libpng/libfuzzer_libpng_accounting/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libmozjpeg/src/bin/libafl_cxx.rs b/fuzzers/libpng/libfuzzer_libpng_accounting/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/src/bin/libafl_cxx.rs rename to fuzzers/libpng/libfuzzer_libpng_accounting/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_libpng_accounting/src/lib.rs b/fuzzers/libpng/libfuzzer_libpng_accounting/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/src/lib.rs rename to fuzzers/libpng/libfuzzer_libpng_accounting/src/lib.rs diff --git a/fuzzers/libfuzzer_libpng_centralized/.gitignore b/fuzzers/libpng/libfuzzer_libpng_centralized/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/.gitignore rename to fuzzers/libpng/libfuzzer_libpng_centralized/.gitignore diff --git a/fuzzers/libfuzzer_libpng_centralized/Cargo.toml b/fuzzers/libpng/libfuzzer_libpng_centralized/Cargo.toml similarity index 61% rename from fuzzers/libfuzzer_libpng_centralized/Cargo.toml rename to fuzzers/libpng/libfuzzer_libpng_centralized/Cargo.toml index c9eca1beea..9801ecd2c1 100644 --- a/fuzzers/libfuzzer_libpng_centralized/Cargo.toml +++ b/fuzzers/libpng/libfuzzer_libpng_centralized/Cargo.toml @@ -19,11 +19,11 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/", features = ["std", "derive", "rand_trait", "fork", "prelude", "gzip", "regex", "scalability_introspection"] } -libafl_bolts = { path = "../../libafl_bolts/", features = ["errors_backtrace"] } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } +libafl = { path = "../../../libafl/", features = ["std", "derive", "rand_trait", "fork", "prelude", "gzip", "regex", "scalability_introspection"] } +libafl_bolts = { path = "../../../libafl_bolts/", features = ["errors_backtrace"] } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["derive"] } mimalloc = { version = "*", default-features = false } env_logger = "0.10" diff --git a/fuzzers/libfuzzer_libpng_centralized/Makefile.toml b/fuzzers/libpng/libfuzzer_libpng_centralized/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/Makefile.toml rename to fuzzers/libpng/libfuzzer_libpng_centralized/Makefile.toml diff --git a/fuzzers/libfuzzer_libpng_centralized/README.md b/fuzzers/libpng/libfuzzer_libpng_centralized/README.md similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/README.md rename to fuzzers/libpng/libfuzzer_libpng_centralized/README.md diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/corpus/not_kitty.png b/fuzzers/libpng/libfuzzer_libpng_centralized/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_libpng_aflpp_ui/corpus/not_kitty.png rename to fuzzers/libpng/libfuzzer_libpng_centralized/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/corpus/not_kitty_alpha.png b/fuzzers/libpng/libfuzzer_libpng_centralized/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_libpng_aflpp_ui/corpus/not_kitty_alpha.png rename to fuzzers/libpng/libfuzzer_libpng_centralized/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/corpus/not_kitty_gamma.png b/fuzzers/libpng/libfuzzer_libpng_centralized/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_libpng_aflpp_ui/corpus/not_kitty_gamma.png rename to fuzzers/libpng/libfuzzer_libpng_centralized/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/corpus/not_kitty_icc.png b/fuzzers/libpng/libfuzzer_libpng_centralized/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_libpng_aflpp_ui/corpus/not_kitty_icc.png rename to fuzzers/libpng/libfuzzer_libpng_centralized/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_libpng_centralized/harness.cc b/fuzzers/libpng/libfuzzer_libpng_centralized/harness.cc similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/harness.cc rename to fuzzers/libpng/libfuzzer_libpng_centralized/harness.cc diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/src/bin/libafl_cc.rs b/fuzzers/libpng/libfuzzer_libpng_centralized/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_aflpp_ui/src/bin/libafl_cc.rs rename to fuzzers/libpng/libfuzzer_libpng_centralized/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libpng/src/bin/libafl_cxx.rs b/fuzzers/libpng/libfuzzer_libpng_centralized/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libpng/src/bin/libafl_cxx.rs rename to fuzzers/libpng/libfuzzer_libpng_centralized/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_libpng_centralized/src/lib.rs b/fuzzers/libpng/libfuzzer_libpng_centralized/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/src/lib.rs rename to fuzzers/libpng/libfuzzer_libpng_centralized/src/lib.rs diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/.gitignore b/fuzzers/libpng/libfuzzer_libpng_cmin/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libpng_aflpp_ui/.gitignore rename to fuzzers/libpng/libfuzzer_libpng_cmin/.gitignore diff --git a/fuzzers/libfuzzer_libpng_cmin/Cargo.toml b/fuzzers/libpng/libfuzzer_libpng_cmin/Cargo.toml similarity index 64% rename from fuzzers/libfuzzer_libpng_cmin/Cargo.toml rename to fuzzers/libpng/libfuzzer_libpng_cmin/Cargo.toml index 8a0a29ad05..e38c882f70 100644 --- a/fuzzers/libfuzzer_libpng_cmin/Cargo.toml +++ b/fuzzers/libpng/libfuzzer_libpng_cmin/Cargo.toml @@ -22,12 +22,12 @@ which = "6.0" [dependencies] env_logger = "0.10" -libafl = { path = "../../libafl/", features = ["default", "cmin"] } -# libafl = { path = "../../libafl/", features = ["default"] } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } +libafl = { path = "../../../libafl/", features = ["default", "cmin"] } +# libafl = { path = "../../../libafl/", features = ["default"] } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } mimalloc = { version = "*", default-features = false } [lib] diff --git a/fuzzers/libfuzzer_libpng_cmin/Makefile.toml b/fuzzers/libpng/libfuzzer_libpng_cmin/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/Makefile.toml rename to fuzzers/libpng/libfuzzer_libpng_cmin/Makefile.toml diff --git a/fuzzers/libfuzzer_libpng_cmin/README.md b/fuzzers/libpng/libfuzzer_libpng_cmin/README.md similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/README.md rename to fuzzers/libpng/libfuzzer_libpng_cmin/README.md diff --git a/fuzzers/libfuzzer_libpng_centralized/corpus/not_kitty.png b/fuzzers/libpng/libfuzzer_libpng_cmin/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/corpus/not_kitty.png rename to fuzzers/libpng/libfuzzer_libpng_cmin/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_libpng_centralized/corpus/not_kitty_alpha.png b/fuzzers/libpng/libfuzzer_libpng_cmin/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/corpus/not_kitty_alpha.png rename to fuzzers/libpng/libfuzzer_libpng_cmin/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_libpng_centralized/corpus/not_kitty_gamma.png b/fuzzers/libpng/libfuzzer_libpng_cmin/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/corpus/not_kitty_gamma.png rename to fuzzers/libpng/libfuzzer_libpng_cmin/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_libpng_centralized/corpus/not_kitty_icc.png b/fuzzers/libpng/libfuzzer_libpng_cmin/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/corpus/not_kitty_icc.png rename to fuzzers/libpng/libfuzzer_libpng_cmin/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/harness.cc b/fuzzers/libpng/libfuzzer_libpng_cmin/harness.cc similarity index 100% rename from fuzzers/libfuzzer_libpng_aflpp_ui/harness.cc rename to fuzzers/libpng/libfuzzer_libpng_cmin/harness.cc diff --git a/fuzzers/libfuzzer_libpng_cmin/src/bin/libafl_cc.rs b/fuzzers/libpng/libfuzzer_libpng_cmin/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/src/bin/libafl_cc.rs rename to fuzzers/libpng/libfuzzer_libpng_cmin/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libpng_accounting/src/bin/libafl_cxx.rs b/fuzzers/libpng/libfuzzer_libpng_cmin/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_accounting/src/bin/libafl_cxx.rs rename to fuzzers/libpng/libfuzzer_libpng_cmin/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_libpng_cmin/src/lib.rs b/fuzzers/libpng/libfuzzer_libpng_cmin/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/src/lib.rs rename to fuzzers/libpng/libfuzzer_libpng_cmin/src/lib.rs diff --git a/fuzzers/libfuzzer_libpng_launcher/.gitignore b/fuzzers/libpng/libfuzzer_libpng_launcher/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/.gitignore rename to fuzzers/libpng/libfuzzer_libpng_launcher/.gitignore diff --git a/fuzzers/libfuzzer_libpng_launcher/Cargo.toml b/fuzzers/libpng/libfuzzer_libpng_launcher/Cargo.toml similarity index 65% rename from fuzzers/libfuzzer_libpng_launcher/Cargo.toml rename to fuzzers/libpng/libfuzzer_libpng_launcher/Cargo.toml index 712685d0a1..8d4de66eaf 100644 --- a/fuzzers/libfuzzer_libpng_launcher/Cargo.toml +++ b/fuzzers/libpng/libfuzzer_libpng_launcher/Cargo.toml @@ -19,11 +19,11 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/", features = ["std", "derive", "llmp_compression", "introspection"] } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } +libafl = { path = "../../../libafl/", features = ["std", "derive", "llmp_compression", "introspection"] } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["derive"] } mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/libfuzzer_libpng_launcher/Makefile.toml b/fuzzers/libpng/libfuzzer_libpng_launcher/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/Makefile.toml rename to fuzzers/libpng/libfuzzer_libpng_launcher/Makefile.toml diff --git a/fuzzers/libfuzzer_libpng_launcher/README.md b/fuzzers/libpng/libfuzzer_libpng_launcher/README.md similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/README.md rename to fuzzers/libpng/libfuzzer_libpng_launcher/README.md diff --git a/fuzzers/libfuzzer_libpng_cmin/corpus/not_kitty.png b/fuzzers/libpng/libfuzzer_libpng_launcher/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/corpus/not_kitty.png rename to fuzzers/libpng/libfuzzer_libpng_launcher/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_libpng_cmin/corpus/not_kitty_alpha.png b/fuzzers/libpng/libfuzzer_libpng_launcher/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/corpus/not_kitty_alpha.png rename to fuzzers/libpng/libfuzzer_libpng_launcher/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_libpng_cmin/corpus/not_kitty_gamma.png b/fuzzers/libpng/libfuzzer_libpng_launcher/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/corpus/not_kitty_gamma.png rename to fuzzers/libpng/libfuzzer_libpng_launcher/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_libpng_cmin/corpus/not_kitty_icc.png b/fuzzers/libpng/libfuzzer_libpng_launcher/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/corpus/not_kitty_icc.png rename to fuzzers/libpng/libfuzzer_libpng_launcher/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_libpng_launcher/harness.cc b/fuzzers/libpng/libfuzzer_libpng_launcher/harness.cc similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/harness.cc rename to fuzzers/libpng/libfuzzer_libpng_launcher/harness.cc diff --git a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs b/fuzzers/libpng/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs rename to fuzzers/libpng/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs diff --git a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs b/fuzzers/libpng/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs rename to fuzzers/libpng/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libpng_aflpp_ui/src/bin/libafl_cxx.rs b/fuzzers/libpng/libfuzzer_libpng_launcher/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_aflpp_ui/src/bin/libafl_cxx.rs rename to fuzzers/libpng/libfuzzer_libpng_launcher/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs b/fuzzers/libpng/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs rename to fuzzers/libpng/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs diff --git a/fuzzers/libfuzzer_libpng_launcher/src/lib.rs b/fuzzers/libpng/libfuzzer_libpng_launcher/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/src/lib.rs rename to fuzzers/libpng/libfuzzer_libpng_launcher/src/lib.rs diff --git a/fuzzers/libfuzzer_libpng_norestart/.gitignore b/fuzzers/libpng/libfuzzer_libpng_norestart/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/.gitignore rename to fuzzers/libpng/libfuzzer_libpng_norestart/.gitignore diff --git a/fuzzers/libfuzzer_libpng_norestart/Cargo.toml b/fuzzers/libpng/libfuzzer_libpng_norestart/Cargo.toml similarity index 69% rename from fuzzers/libfuzzer_libpng_norestart/Cargo.toml rename to fuzzers/libpng/libfuzzer_libpng_norestart/Cargo.toml index 9b47e029ad..0d27fa1eda 100644 --- a/fuzzers/libfuzzer_libpng_norestart/Cargo.toml +++ b/fuzzers/libpng/libfuzzer_libpng_norestart/Cargo.toml @@ -20,11 +20,11 @@ which = "6.0" [dependencies] env_logger = "0.10" -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/", features = ["errors_backtrace"] } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/", features = ["errors_backtrace"] } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["derive"] } mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/libfuzzer_libpng_norestart/Makefile.toml b/fuzzers/libpng/libfuzzer_libpng_norestart/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/Makefile.toml rename to fuzzers/libpng/libfuzzer_libpng_norestart/Makefile.toml diff --git a/fuzzers/libfuzzer_libpng_norestart/README.md b/fuzzers/libpng/libfuzzer_libpng_norestart/README.md similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/README.md rename to fuzzers/libpng/libfuzzer_libpng_norestart/README.md diff --git a/fuzzers/libfuzzer_libpng_norestart/harness.cc b/fuzzers/libpng/libfuzzer_libpng_norestart/harness.cc similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/harness.cc rename to fuzzers/libpng/libfuzzer_libpng_norestart/harness.cc diff --git a/fuzzers/libfuzzer_libpng_launcher/corpus/not_kitty.png b/fuzzers/libpng/libfuzzer_libpng_norestart/seeds/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/corpus/not_kitty.png rename to fuzzers/libpng/libfuzzer_libpng_norestart/seeds/not_kitty.png diff --git a/fuzzers/libfuzzer_libpng_launcher/corpus/not_kitty_alpha.png b/fuzzers/libpng/libfuzzer_libpng_norestart/seeds/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/corpus/not_kitty_alpha.png rename to fuzzers/libpng/libfuzzer_libpng_norestart/seeds/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_libpng_launcher/corpus/not_kitty_gamma.png b/fuzzers/libpng/libfuzzer_libpng_norestart/seeds/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/corpus/not_kitty_gamma.png rename to fuzzers/libpng/libfuzzer_libpng_norestart/seeds/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_libpng_launcher/corpus/not_kitty_icc.png b/fuzzers/libpng/libfuzzer_libpng_norestart/seeds/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/corpus/not_kitty_icc.png rename to fuzzers/libpng/libfuzzer_libpng_norestart/seeds/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_libpng_centralized/src/bin/libafl_cc.rs b/fuzzers/libpng/libfuzzer_libpng_norestart/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/src/bin/libafl_cc.rs rename to fuzzers/libpng/libfuzzer_libpng_norestart/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libpng_centralized/src/bin/libafl_cxx.rs b/fuzzers/libpng/libfuzzer_libpng_norestart/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_centralized/src/bin/libafl_cxx.rs rename to fuzzers/libpng/libfuzzer_libpng_norestart/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_libpng_norestart/src/lib.rs b/fuzzers/libpng/libfuzzer_libpng_norestart/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/src/lib.rs rename to fuzzers/libpng/libfuzzer_libpng_norestart/src/lib.rs diff --git a/fuzzers/libfuzzer_libpng_cmin/.gitignore b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/.gitignore rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/.gitignore diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/Cargo.toml similarity index 61% rename from fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/Cargo.toml index 4bfc3d5b04..6a5d3cffbd 100644 --- a/fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml +++ b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/Cargo.toml @@ -21,12 +21,12 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/", features = ["default", "tcp_manager"] } -# libafl = { path = "../../libafl/", features = ["default"] } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } +libafl = { path = "../../../libafl/", features = ["default", "tcp_manager"] } +# libafl = { path = "../../../libafl/", features = ["default"] } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } mimalloc = { version = "*", default-features = false } [lib] diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/Makefile.toml b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/Makefile.toml rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/Makefile.toml diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/README.md b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/README.md similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/README.md rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/README.md diff --git a/fuzzers/libfuzzer_libpng_norestart/seeds/not_kitty.png b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/seeds/not_kitty.png rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_libpng_norestart/seeds/not_kitty_alpha.png b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/seeds/not_kitty_alpha.png rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_libpng_norestart/seeds/not_kitty_gamma.png b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/seeds/not_kitty_gamma.png rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_libpng_norestart/seeds/not_kitty_icc.png b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/seeds/not_kitty_icc.png rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_libpng_cmin/harness.cc b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/harness.cc similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/harness.cc rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/harness.cc diff --git a/fuzzers/libfuzzer_libpng_norestart/src/bin/libafl_cc.rs b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/src/bin/libafl_cc.rs rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libpng_cmin/src/bin/libafl_cxx.rs b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_cmin/src/bin/libafl_cxx.rs rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/src/lib.rs b/fuzzers/libpng/libfuzzer_libpng_tcp_manager/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/src/lib.rs rename to fuzzers/libpng/libfuzzer_libpng_tcp_manager/src/lib.rs diff --git a/fuzzers/nyx_libxml2_parallel/Cargo.toml b/fuzzers/nyx/nyx_libxml2_parallel/Cargo.toml similarity index 50% rename from fuzzers/nyx_libxml2_parallel/Cargo.toml rename to fuzzers/nyx/nyx_libxml2_parallel/Cargo.toml index a342857811..e15bdc4e1f 100644 --- a/fuzzers/nyx_libxml2_parallel/Cargo.toml +++ b/fuzzers/nyx/nyx_libxml2_parallel/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" default-run = "nyx_libxml2_parallel" [dependencies] -libafl = { path = "../../libafl" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_cc = { path = "../../libafl_cc" } -libafl_nyx = { path = "../../libafl_nyx" } +libafl = { path = "../../../libafl" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_cc = { path = "../../../libafl_cc" } +libafl_nyx = { path = "../../../libafl_nyx" } [profile.release] codegen-units = 1 diff --git a/fuzzers/nyx_libxml2_parallel/Makefile.toml b/fuzzers/nyx/nyx_libxml2_parallel/Makefile.toml similarity index 100% rename from fuzzers/nyx_libxml2_parallel/Makefile.toml rename to fuzzers/nyx/nyx_libxml2_parallel/Makefile.toml diff --git a/fuzzers/nyx_libxml2_parallel/README.md b/fuzzers/nyx/nyx_libxml2_parallel/README.md similarity index 100% rename from fuzzers/nyx_libxml2_parallel/README.md rename to fuzzers/nyx/nyx_libxml2_parallel/README.md diff --git a/fuzzers/nyx_libxml2_parallel/setup_libxml2.sh b/fuzzers/nyx/nyx_libxml2_parallel/setup_libxml2.sh similarity index 87% rename from fuzzers/nyx_libxml2_parallel/setup_libxml2.sh rename to fuzzers/nyx/nyx_libxml2_parallel/setup_libxml2.sh index e942831e02..f169faa0c7 100755 --- a/fuzzers/nyx_libxml2_parallel/setup_libxml2.sh +++ b/fuzzers/nyx/nyx_libxml2_parallel/setup_libxml2.sh @@ -26,7 +26,7 @@ cd ./libxml2/ || exit ./autogen.sh --enable-shared=no || exit make -j || exit cd - || exit -python3 "../../libafl_nyx/packer/packer/nyx_packer.py" \ +python3 "../../../libafl_nyx/packer/packer/nyx_packer.py" \ ./libxml2/xmllint \ /tmp/nyx_libxml2 \ afl \ @@ -36,4 +36,4 @@ python3 "../../libafl_nyx/packer/packer/nyx_packer.py" \ --fast_reload_mode \ --purge || exit -python3 ../../libafl_nyx/packer/packer/nyx_config_gen.py /tmp/nyx_libxml2/ Kernel || exit +python3 ../../../libafl_nyx/packer/packer/nyx_config_gen.py /tmp/nyx_libxml2/ Kernel || exit diff --git a/fuzzers/nyx_libxml2_parallel/src/bin/libafl_cc.rs b/fuzzers/nyx/nyx_libxml2_parallel/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/nyx_libxml2_parallel/src/bin/libafl_cc.rs rename to fuzzers/nyx/nyx_libxml2_parallel/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cxx.rs b/fuzzers/nyx/nyx_libxml2_parallel/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cxx.rs rename to fuzzers/nyx/nyx_libxml2_parallel/src/bin/libafl_cxx.rs diff --git a/fuzzers/nyx_libxml2_parallel/src/main.rs b/fuzzers/nyx/nyx_libxml2_parallel/src/main.rs similarity index 100% rename from fuzzers/nyx_libxml2_parallel/src/main.rs rename to fuzzers/nyx/nyx_libxml2_parallel/src/main.rs diff --git a/fuzzers/nyx_libxml2_standalone/Cargo.toml b/fuzzers/nyx/nyx_libxml2_standalone/Cargo.toml similarity index 50% rename from fuzzers/nyx_libxml2_standalone/Cargo.toml rename to fuzzers/nyx/nyx_libxml2_standalone/Cargo.toml index 8fd819fe1b..a4ec456ab7 100644 --- a/fuzzers/nyx_libxml2_standalone/Cargo.toml +++ b/fuzzers/nyx/nyx_libxml2_standalone/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" default-run = "nyx_libxml2_standalone" [dependencies] -libafl = { path = "../../libafl" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_cc = { path = "../../libafl_cc" } -libafl_nyx = { path = "../../libafl_nyx" } +libafl = { path = "../../../libafl" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_cc = { path = "../../../libafl_cc" } +libafl_nyx = { path = "../../../libafl_nyx" } [profile.release] codegen-units = 1 diff --git a/fuzzers/nyx_libxml2_standalone/Makefile.toml b/fuzzers/nyx/nyx_libxml2_standalone/Makefile.toml similarity index 100% rename from fuzzers/nyx_libxml2_standalone/Makefile.toml rename to fuzzers/nyx/nyx_libxml2_standalone/Makefile.toml diff --git a/fuzzers/nyx_libxml2_standalone/README.md b/fuzzers/nyx/nyx_libxml2_standalone/README.md similarity index 100% rename from fuzzers/nyx_libxml2_standalone/README.md rename to fuzzers/nyx/nyx_libxml2_standalone/README.md diff --git a/fuzzers/nyx_libxml2_standalone/setup_libxml2.sh b/fuzzers/nyx/nyx_libxml2_standalone/setup_libxml2.sh similarity index 87% rename from fuzzers/nyx_libxml2_standalone/setup_libxml2.sh rename to fuzzers/nyx/nyx_libxml2_standalone/setup_libxml2.sh index e942831e02..f169faa0c7 100755 --- a/fuzzers/nyx_libxml2_standalone/setup_libxml2.sh +++ b/fuzzers/nyx/nyx_libxml2_standalone/setup_libxml2.sh @@ -26,7 +26,7 @@ cd ./libxml2/ || exit ./autogen.sh --enable-shared=no || exit make -j || exit cd - || exit -python3 "../../libafl_nyx/packer/packer/nyx_packer.py" \ +python3 "../../../libafl_nyx/packer/packer/nyx_packer.py" \ ./libxml2/xmllint \ /tmp/nyx_libxml2 \ afl \ @@ -36,4 +36,4 @@ python3 "../../libafl_nyx/packer/packer/nyx_packer.py" \ --fast_reload_mode \ --purge || exit -python3 ../../libafl_nyx/packer/packer/nyx_config_gen.py /tmp/nyx_libxml2/ Kernel || exit +python3 ../../../libafl_nyx/packer/packer/nyx_config_gen.py /tmp/nyx_libxml2/ Kernel || exit diff --git a/fuzzers/nyx_libxml2_standalone/src/bin/libafl_cc.rs b/fuzzers/nyx/nyx_libxml2_standalone/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/nyx_libxml2_standalone/src/bin/libafl_cc.rs rename to fuzzers/nyx/nyx_libxml2_standalone/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libpng_norestart/src/bin/libafl_cxx.rs b/fuzzers/nyx/nyx_libxml2_standalone/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_norestart/src/bin/libafl_cxx.rs rename to fuzzers/nyx/nyx_libxml2_standalone/src/bin/libafl_cxx.rs diff --git a/fuzzers/nyx_libxml2_standalone/src/main.rs b/fuzzers/nyx/nyx_libxml2_standalone/src/main.rs similarity index 100% rename from fuzzers/nyx_libxml2_standalone/src/main.rs rename to fuzzers/nyx/nyx_libxml2_standalone/src/main.rs diff --git a/fuzzers/cargo_fuzz/Cargo.toml b/fuzzers/others/cargo_fuzz/Cargo.toml similarity index 100% rename from fuzzers/cargo_fuzz/Cargo.toml rename to fuzzers/others/cargo_fuzz/Cargo.toml diff --git a/fuzzers/cargo_fuzz/Makefile.toml b/fuzzers/others/cargo_fuzz/Makefile.toml similarity index 100% rename from fuzzers/cargo_fuzz/Makefile.toml rename to fuzzers/others/cargo_fuzz/Makefile.toml diff --git a/fuzzers/cargo_fuzz/README.md b/fuzzers/others/cargo_fuzz/README.md similarity index 100% rename from fuzzers/cargo_fuzz/README.md rename to fuzzers/others/cargo_fuzz/README.md diff --git a/fuzzers/cargo_fuzz/fuzz/.gitignore b/fuzzers/others/cargo_fuzz/fuzz/.gitignore similarity index 100% rename from fuzzers/cargo_fuzz/fuzz/.gitignore rename to fuzzers/others/cargo_fuzz/fuzz/.gitignore diff --git a/fuzzers/cargo_fuzz/fuzz/Cargo.toml b/fuzzers/others/cargo_fuzz/fuzz/Cargo.toml similarity index 90% rename from fuzzers/cargo_fuzz/fuzz/Cargo.toml rename to fuzzers/others/cargo_fuzz/fuzz/Cargo.toml index e67e8e7c5f..edbf645648 100644 --- a/fuzzers/cargo_fuzz/fuzz/Cargo.toml +++ b/fuzzers/others/cargo_fuzz/fuzz/Cargo.toml @@ -15,7 +15,7 @@ cargo-fuzz = true path = ".." [dependencies.libfuzzer-sys] -path = "../../../libafl_libfuzzer" +path = "../../../../libafl_libfuzzer" package = "libafl_libfuzzer" [[bin]] diff --git a/fuzzers/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs b/fuzzers/others/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs similarity index 100% rename from fuzzers/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs rename to fuzzers/others/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs diff --git a/fuzzers/cargo_fuzz/src/lib.rs b/fuzzers/others/cargo_fuzz/src/lib.rs similarity index 100% rename from fuzzers/cargo_fuzz/src/lib.rs rename to fuzzers/others/cargo_fuzz/src/lib.rs diff --git a/fuzzers/dynamic_analysis/Cargo.toml b/fuzzers/others/dynamic_analysis/Cargo.toml similarity index 74% rename from fuzzers/dynamic_analysis/Cargo.toml rename to fuzzers/others/dynamic_analysis/Cargo.toml index a08676c96d..80aa2bdf9f 100644 --- a/fuzzers/dynamic_analysis/Cargo.toml +++ b/fuzzers/others/dynamic_analysis/Cargo.toml @@ -27,11 +27,11 @@ which = "6.0" [dependencies] env_logger = "0.11" once_cell = "1.19" -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer", "function-logging"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "sancov_cmplog", "libfuzzer", "function-logging"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["default"] } nix = { version = "0.29", features = ["fs"] } mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/dynamic_analysis/Makefile.toml b/fuzzers/others/dynamic_analysis/Makefile.toml similarity index 100% rename from fuzzers/dynamic_analysis/Makefile.toml rename to fuzzers/others/dynamic_analysis/Makefile.toml diff --git a/fuzzers/dynamic_analysis/README.md b/fuzzers/others/dynamic_analysis/README.md similarity index 100% rename from fuzzers/dynamic_analysis/README.md rename to fuzzers/others/dynamic_analysis/README.md diff --git a/fuzzers/dynamic_analysis/build.rs b/fuzzers/others/dynamic_analysis/build.rs similarity index 100% rename from fuzzers/dynamic_analysis/build.rs rename to fuzzers/others/dynamic_analysis/build.rs diff --git a/fuzzers/dynamic_analysis/build.sh b/fuzzers/others/dynamic_analysis/build.sh similarity index 100% rename from fuzzers/dynamic_analysis/build.sh rename to fuzzers/others/dynamic_analysis/build.sh diff --git a/fuzzers/dynamic_analysis/clean.sh b/fuzzers/others/dynamic_analysis/clean.sh similarity index 100% rename from fuzzers/dynamic_analysis/clean.sh rename to fuzzers/others/dynamic_analysis/clean.sh diff --git a/fuzzers/dynamic_analysis/cms_transform_fuzzer.cc b/fuzzers/others/dynamic_analysis/cms_transform_fuzzer.cc similarity index 100% rename from fuzzers/dynamic_analysis/cms_transform_fuzzer.cc rename to fuzzers/others/dynamic_analysis/cms_transform_fuzzer.cc diff --git a/fuzzers/dynamic_analysis/concatenator.py b/fuzzers/others/dynamic_analysis/concatenator.py similarity index 100% rename from fuzzers/dynamic_analysis/concatenator.py rename to fuzzers/others/dynamic_analysis/concatenator.py diff --git a/fuzzers/dynamic_analysis/corpus/seed b/fuzzers/others/dynamic_analysis/corpus/seed similarity index 100% rename from fuzzers/dynamic_analysis/corpus/seed rename to fuzzers/others/dynamic_analysis/corpus/seed diff --git a/fuzzers/dynamic_analysis/src/bin/libafl_cc.rs b/fuzzers/others/dynamic_analysis/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/dynamic_analysis/src/bin/libafl_cc.rs rename to fuzzers/others/dynamic_analysis/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/src/bin/libafl_cxx.rs b/fuzzers/others/dynamic_analysis/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/src/bin/libafl_cxx.rs rename to fuzzers/others/dynamic_analysis/src/bin/libafl_cxx.rs diff --git a/fuzzers/dynamic_analysis/src/lib.rs b/fuzzers/others/dynamic_analysis/src/lib.rs similarity index 100% rename from fuzzers/dynamic_analysis/src/lib.rs rename to fuzzers/others/dynamic_analysis/src/lib.rs diff --git a/fuzzers/fuzzbench_ctx/stub_rt.c b/fuzzers/others/dynamic_analysis/stub_rt.c similarity index 100% rename from fuzzers/fuzzbench_ctx/stub_rt.c rename to fuzzers/others/dynamic_analysis/stub_rt.c diff --git a/fuzzers/libafl-fuzz/Cargo.toml b/fuzzers/others/libafl-fuzz/Cargo.toml similarity index 60% rename from fuzzers/libafl-fuzz/Cargo.toml rename to fuzzers/others/libafl-fuzz/Cargo.toml index a39745e561..fcf7cc35fd 100644 --- a/fuzzers/libafl-fuzz/Cargo.toml +++ b/fuzzers/others/libafl-fuzz/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" [dependencies] clap = { version = "4.5", features = ["derive", "env"] } env_logger = "0.11.3" -libafl = { path = "../../libafl", features = ["std", "derive", "track_hit_feedbacks", "clap", "errors_backtrace"]} -libafl_bolts = { path = "../../libafl_bolts", features = ["std", "errors_backtrace"]} -libafl_targets = { path = "../../libafl_targets"} +libafl = { path = "../../../libafl", features = ["std", "derive", "track_hit_feedbacks", "clap", "errors_backtrace"]} +libafl_bolts = { path = "../../../libafl_bolts", features = ["std", "errors_backtrace"]} +libafl_targets = { path = "../../../libafl_targets"} memmap2 = "0.9.4" nix = {version = "0.29", features = ["fs"]} regex = "1.10.5" diff --git a/fuzzers/libafl-fuzz/Makefile.toml b/fuzzers/others/libafl-fuzz/Makefile.toml similarity index 100% rename from fuzzers/libafl-fuzz/Makefile.toml rename to fuzzers/others/libafl-fuzz/Makefile.toml diff --git a/fuzzers/libafl-fuzz/README.md b/fuzzers/others/libafl-fuzz/README.md similarity index 100% rename from fuzzers/libafl-fuzz/README.md rename to fuzzers/others/libafl-fuzz/README.md diff --git a/fuzzers/libafl-fuzz/src/afl_stats.rs b/fuzzers/others/libafl-fuzz/src/afl_stats.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/afl_stats.rs rename to fuzzers/others/libafl-fuzz/src/afl_stats.rs diff --git a/fuzzers/libafl-fuzz/src/corpus.rs b/fuzzers/others/libafl-fuzz/src/corpus.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/corpus.rs rename to fuzzers/others/libafl-fuzz/src/corpus.rs diff --git a/fuzzers/libafl-fuzz/src/env_parser.rs b/fuzzers/others/libafl-fuzz/src/env_parser.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/env_parser.rs rename to fuzzers/others/libafl-fuzz/src/env_parser.rs diff --git a/fuzzers/libafl-fuzz/src/executor.rs b/fuzzers/others/libafl-fuzz/src/executor.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/executor.rs rename to fuzzers/others/libafl-fuzz/src/executor.rs diff --git a/fuzzers/libafl-fuzz/src/feedback/filepath.rs b/fuzzers/others/libafl-fuzz/src/feedback/filepath.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/feedback/filepath.rs rename to fuzzers/others/libafl-fuzz/src/feedback/filepath.rs diff --git a/fuzzers/libafl-fuzz/src/feedback/mod.rs b/fuzzers/others/libafl-fuzz/src/feedback/mod.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/feedback/mod.rs rename to fuzzers/others/libafl-fuzz/src/feedback/mod.rs diff --git a/fuzzers/libafl-fuzz/src/feedback/persistent_record.rs b/fuzzers/others/libafl-fuzz/src/feedback/persistent_record.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/feedback/persistent_record.rs rename to fuzzers/others/libafl-fuzz/src/feedback/persistent_record.rs diff --git a/fuzzers/libafl-fuzz/src/feedback/seed.rs b/fuzzers/others/libafl-fuzz/src/feedback/seed.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/feedback/seed.rs rename to fuzzers/others/libafl-fuzz/src/feedback/seed.rs diff --git a/fuzzers/libafl-fuzz/src/fuzzer.rs b/fuzzers/others/libafl-fuzz/src/fuzzer.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/fuzzer.rs rename to fuzzers/others/libafl-fuzz/src/fuzzer.rs diff --git a/fuzzers/libafl-fuzz/src/hooks.rs b/fuzzers/others/libafl-fuzz/src/hooks.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/hooks.rs rename to fuzzers/others/libafl-fuzz/src/hooks.rs diff --git a/fuzzers/libafl-fuzz/src/main.rs b/fuzzers/others/libafl-fuzz/src/main.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/main.rs rename to fuzzers/others/libafl-fuzz/src/main.rs diff --git a/fuzzers/libafl-fuzz/src/mutational_stage.rs b/fuzzers/others/libafl-fuzz/src/mutational_stage.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/mutational_stage.rs rename to fuzzers/others/libafl-fuzz/src/mutational_stage.rs diff --git a/fuzzers/libafl-fuzz/src/scheduler.rs b/fuzzers/others/libafl-fuzz/src/scheduler.rs similarity index 100% rename from fuzzers/libafl-fuzz/src/scheduler.rs rename to fuzzers/others/libafl-fuzz/src/scheduler.rs diff --git a/fuzzers/libafl-fuzz/test/seeds/init b/fuzzers/others/libafl-fuzz/test/seeds/init similarity index 100% rename from fuzzers/libafl-fuzz/test/seeds/init rename to fuzzers/others/libafl-fuzz/test/seeds/init diff --git a/fuzzers/libafl-fuzz/test/seeds_cmplog/init b/fuzzers/others/libafl-fuzz/test/seeds_cmplog/init similarity index 100% rename from fuzzers/libafl-fuzz/test/seeds_cmplog/init rename to fuzzers/others/libafl-fuzz/test/seeds_cmplog/init diff --git a/fuzzers/libafl-fuzz/test/test-cmplog.c b/fuzzers/others/libafl-fuzz/test/test-cmplog.c similarity index 100% rename from fuzzers/libafl-fuzz/test/test-cmplog.c rename to fuzzers/others/libafl-fuzz/test/test-cmplog.c diff --git a/fuzzers/libafl-fuzz/test/test-instr.c b/fuzzers/others/libafl-fuzz/test/test-instr.c similarity index 100% rename from fuzzers/libafl-fuzz/test/test-instr.c rename to fuzzers/others/libafl-fuzz/test/test-instr.c diff --git a/fuzzers/libafl-fuzz/test/test.sh b/fuzzers/others/libafl-fuzz/test/test.sh similarity index 100% rename from fuzzers/libafl-fuzz/test/test.sh rename to fuzzers/others/libafl-fuzz/test/test.sh diff --git a/fuzzers/libafl_atheris/.gitignore b/fuzzers/others/libafl_atheris/.gitignore similarity index 100% rename from fuzzers/libafl_atheris/.gitignore rename to fuzzers/others/libafl_atheris/.gitignore diff --git a/fuzzers/libafl_atheris/Cargo.toml b/fuzzers/others/libafl_atheris/Cargo.toml similarity index 68% rename from fuzzers/libafl_atheris/Cargo.toml rename to fuzzers/others/libafl_atheris/Cargo.toml index f6dcdab6e3..fe686292d0 100644 --- a/fuzzers/libafl_atheris/Cargo.toml +++ b/fuzzers/others/libafl_atheris/Cargo.toml @@ -19,9 +19,9 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["pointer_maps", "sancov_cmplog", "libfuzzer", "sancov_8bit"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["pointer_maps", "sancov_cmplog", "libfuzzer", "sancov_8bit"] } clap = { version = "4.5", features = ["default"] } [lib] diff --git a/fuzzers/libafl_atheris/Makefile b/fuzzers/others/libafl_atheris/Makefile similarity index 100% rename from fuzzers/libafl_atheris/Makefile rename to fuzzers/others/libafl_atheris/Makefile diff --git a/fuzzers/libafl_atheris/README.md b/fuzzers/others/libafl_atheris/README.md similarity index 100% rename from fuzzers/libafl_atheris/README.md rename to fuzzers/others/libafl_atheris/README.md diff --git a/fuzzers/libafl_atheris/src/lib.rs b/fuzzers/others/libafl_atheris/src/lib.rs similarity index 100% rename from fuzzers/libafl_atheris/src/lib.rs rename to fuzzers/others/libafl_atheris/src/lib.rs diff --git a/fuzzers/libfuzzer_libmozjpeg/.gitignore b/fuzzers/others/libfuzzer_libmozjpeg/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/.gitignore rename to fuzzers/others/libfuzzer_libmozjpeg/.gitignore diff --git a/fuzzers/libfuzzer_libmozjpeg/Cargo.toml b/fuzzers/others/libfuzzer_libmozjpeg/Cargo.toml similarity index 66% rename from fuzzers/libfuzzer_libmozjpeg/Cargo.toml rename to fuzzers/others/libfuzzer_libmozjpeg/Cargo.toml index b8b0f67929..bfb062090a 100644 --- a/fuzzers/libfuzzer_libmozjpeg/Cargo.toml +++ b/fuzzers/others/libfuzzer_libmozjpeg/Cargo.toml @@ -15,11 +15,11 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_value_profile", "libfuzzer"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_value_profile", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } mimalloc = { version = "*", default-features = false } [build-dependencies] diff --git a/fuzzers/libfuzzer_libmozjpeg/Makefile.toml b/fuzzers/others/libfuzzer_libmozjpeg/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/Makefile.toml rename to fuzzers/others/libfuzzer_libmozjpeg/Makefile.toml diff --git a/fuzzers/libfuzzer_libmozjpeg/README.md b/fuzzers/others/libfuzzer_libmozjpeg/README.md similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/README.md rename to fuzzers/others/libfuzzer_libmozjpeg/README.md diff --git a/fuzzers/libfuzzer_libmozjpeg/build.rs b/fuzzers/others/libfuzzer_libmozjpeg/build.rs similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/build.rs rename to fuzzers/others/libfuzzer_libmozjpeg/build.rs diff --git a/fuzzers/libfuzzer_libmozjpeg/corpus/blank.jpg b/fuzzers/others/libfuzzer_libmozjpeg/corpus/blank.jpg similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/corpus/blank.jpg rename to fuzzers/others/libfuzzer_libmozjpeg/corpus/blank.jpg diff --git a/fuzzers/libfuzzer_libmozjpeg/harness.cc b/fuzzers/others/libfuzzer_libmozjpeg/harness.cc similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/harness.cc rename to fuzzers/others/libfuzzer_libmozjpeg/harness.cc diff --git a/fuzzers/libfuzzer_libmozjpeg/hook_allocs.c b/fuzzers/others/libfuzzer_libmozjpeg/hook_allocs.c similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/hook_allocs.c rename to fuzzers/others/libfuzzer_libmozjpeg/hook_allocs.c diff --git a/fuzzers/libfuzzer_libmozjpeg/jpeg.dict b/fuzzers/others/libfuzzer_libmozjpeg/jpeg.dict similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/jpeg.dict rename to fuzzers/others/libfuzzer_libmozjpeg/jpeg.dict diff --git a/fuzzers/libfuzzer_libmozjpeg/src/bin/libafl_cc.rs b/fuzzers/others/libfuzzer_libmozjpeg/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/src/bin/libafl_cc.rs rename to fuzzers/others/libfuzzer_libmozjpeg/src/bin/libafl_cc.rs diff --git a/fuzzers/nautilus_sync/src/bin/libafl_cxx.rs b/fuzzers/others/libfuzzer_libmozjpeg/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/nautilus_sync/src/bin/libafl_cxx.rs rename to fuzzers/others/libfuzzer_libmozjpeg/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_libmozjpeg/src/lib.rs b/fuzzers/others/libfuzzer_libmozjpeg/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_libmozjpeg/src/lib.rs rename to fuzzers/others/libfuzzer_libmozjpeg/src/lib.rs diff --git a/fuzzers/libfuzzer_windows_asan/.gitignore b/fuzzers/others/libfuzzer_windows_asan/.gitignore similarity index 100% rename from fuzzers/libfuzzer_windows_asan/.gitignore rename to fuzzers/others/libfuzzer_windows_asan/.gitignore diff --git a/fuzzers/libfuzzer_windows_asan/Cargo.toml b/fuzzers/others/libfuzzer_windows_asan/Cargo.toml similarity index 61% rename from fuzzers/libfuzzer_windows_asan/Cargo.toml rename to fuzzers/others/libfuzzer_windows_asan/Cargo.toml index 515cb3b7ac..6ebe426302 100644 --- a/fuzzers/libfuzzer_windows_asan/Cargo.toml +++ b/fuzzers/others/libfuzzer_windows_asan/Cargo.toml @@ -14,10 +14,10 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["libfuzzer", "sancov_pcguard_edges"] } -libafl_cc = { path = "../../libafl_cc/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["libfuzzer", "sancov_pcguard_edges"] } +libafl_cc = { path = "../../../libafl_cc/" } [build-dependencies] cc = { version = "1.0" } diff --git a/fuzzers/libfuzzer_windows_asan/Makefile.toml b/fuzzers/others/libfuzzer_windows_asan/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_windows_asan/Makefile.toml rename to fuzzers/others/libfuzzer_windows_asan/Makefile.toml diff --git a/fuzzers/libfuzzer_windows_asan/README.md b/fuzzers/others/libfuzzer_windows_asan/README.md similarity index 100% rename from fuzzers/libfuzzer_windows_asan/README.md rename to fuzzers/others/libfuzzer_windows_asan/README.md diff --git a/fuzzers/libfuzzer_windows_asan/corpus/hello_world b/fuzzers/others/libfuzzer_windows_asan/corpus/hello_world similarity index 100% rename from fuzzers/libfuzzer_windows_asan/corpus/hello_world rename to fuzzers/others/libfuzzer_windows_asan/corpus/hello_world diff --git a/fuzzers/libfuzzer_windows_asan/harness.cpp b/fuzzers/others/libfuzzer_windows_asan/harness.cpp similarity index 100% rename from fuzzers/libfuzzer_windows_asan/harness.cpp rename to fuzzers/others/libfuzzer_windows_asan/harness.cpp diff --git a/fuzzers/libfuzzer_windows_asan/src/bin/libafl_cc.rs b/fuzzers/others/libfuzzer_windows_asan/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_windows_asan/src/bin/libafl_cc.rs rename to fuzzers/others/libfuzzer_windows_asan/src/bin/libafl_cc.rs diff --git a/fuzzers/libfuzzer_windows_asan/src/bin/libafl_cxx.rs b/fuzzers/others/libfuzzer_windows_asan/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/libfuzzer_windows_asan/src/bin/libafl_cxx.rs rename to fuzzers/others/libfuzzer_windows_asan/src/bin/libafl_cxx.rs diff --git a/fuzzers/libfuzzer_windows_asan/src/lib.rs b/fuzzers/others/libfuzzer_windows_asan/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_windows_asan/src/lib.rs rename to fuzzers/others/libfuzzer_windows_asan/src/lib.rs diff --git a/fuzzers/nautilus_sync/.gitignore b/fuzzers/others/nautilus_sync/.gitignore similarity index 100% rename from fuzzers/nautilus_sync/.gitignore rename to fuzzers/others/nautilus_sync/.gitignore diff --git a/fuzzers/nautilus_sync/Cargo.toml b/fuzzers/others/nautilus_sync/Cargo.toml similarity index 66% rename from fuzzers/nautilus_sync/Cargo.toml rename to fuzzers/others/nautilus_sync/Cargo.toml index 66405bf28c..fe067299f5 100644 --- a/fuzzers/nautilus_sync/Cargo.toml +++ b/fuzzers/others/nautilus_sync/Cargo.toml @@ -20,11 +20,11 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/", features = ["default", "nautilus"] } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } +libafl = { path = "../../../libafl/", features = ["default", "nautilus"] } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } clap = { version = "4.5", features = ["derive"] } mimalloc = { version = "*", default-features = false } diff --git a/fuzzers/nautilus_sync/Makefile.toml b/fuzzers/others/nautilus_sync/Makefile.toml similarity index 93% rename from fuzzers/nautilus_sync/Makefile.toml rename to fuzzers/others/nautilus_sync/Makefile.toml index c741b0d41e..0422ce776e 100644 --- a/fuzzers/nautilus_sync/Makefile.toml +++ b/fuzzers/others/nautilus_sync/Makefile.toml @@ -59,7 +59,7 @@ script_runner="@shell" script=''' cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes cd "${PROJECT_DIR}" -cp ../baby_fuzzer_nautilus/grammar.json . +cp ../../baby/baby_fuzzer_nautilus/grammar.json . make -C libpng-1.6.37 CC="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc" CXX="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" ''' dependencies = [ "libpng", "cxx", "cc" ] @@ -73,7 +73,7 @@ windows_alias = "unsupported" [tasks.fuzzer_unix] command = "${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" -args = ["${PROJECT_DIR}/../libfuzzer_libpng/harness.cc", "${PROJECT_DIR}/libpng-1.6.37/.libs/libpng16.a", "-I", "${PROJECT_DIR}/libpng-1.6.37/", "-o", "${FUZZER_NAME}", "-lm", "-lz"] +args = ["${PROJECT_DIR}/../../libpng/libfuzzer_libpng/harness.cc", "${PROJECT_DIR}/libpng-1.6.37/.libs/libpng16.a", "-I", "${PROJECT_DIR}/libpng-1.6.37/", "-o", "${FUZZER_NAME}", "-lm", "-lz"] dependencies = [ "lib", "cxx", "cc" ] # Run the fuzzer diff --git a/fuzzers/nautilus_sync/rust-toolchain b/fuzzers/others/nautilus_sync/rust-toolchain similarity index 100% rename from fuzzers/nautilus_sync/rust-toolchain rename to fuzzers/others/nautilus_sync/rust-toolchain diff --git a/fuzzers/nautilus_sync/src/bin/libafl_cc.rs b/fuzzers/others/nautilus_sync/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/nautilus_sync/src/bin/libafl_cc.rs rename to fuzzers/others/nautilus_sync/src/bin/libafl_cc.rs diff --git a/fuzzers/nyx_libxml2_parallel/src/bin/libafl_cxx.rs b/fuzzers/others/nautilus_sync/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/nyx_libxml2_parallel/src/bin/libafl_cxx.rs rename to fuzzers/others/nautilus_sync/src/bin/libafl_cxx.rs diff --git a/fuzzers/nautilus_sync/src/lib.rs b/fuzzers/others/nautilus_sync/src/lib.rs similarity index 100% rename from fuzzers/nautilus_sync/src/lib.rs rename to fuzzers/others/nautilus_sync/src/lib.rs diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/.gitignore b/fuzzers/others/push_harness/.gitignore similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/.gitignore rename to fuzzers/others/push_harness/.gitignore diff --git a/fuzzers/push_harness/Cargo.toml b/fuzzers/others/push_harness/Cargo.toml similarity index 83% rename from fuzzers/push_harness/Cargo.toml rename to fuzzers/others/push_harness/Cargo.toml index 4903acfd84..727e6daa79 100644 --- a/fuzzers/push_harness/Cargo.toml +++ b/fuzzers/others/push_harness/Cargo.toml @@ -19,6 +19,6 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } klo-routines = { version = "0.1.0", git = "https://github.com/andreafioraldi/klo-routines.git", rev = "b8e2fb6" } diff --git a/fuzzers/push_harness/README.md b/fuzzers/others/push_harness/README.md similarity index 100% rename from fuzzers/push_harness/README.md rename to fuzzers/others/push_harness/README.md diff --git a/fuzzers/push_harness/src/main.rs b/fuzzers/others/push_harness/src/main.rs similarity index 100% rename from fuzzers/push_harness/src/main.rs rename to fuzzers/others/push_harness/src/main.rs diff --git a/fuzzers/push_harness/.gitignore b/fuzzers/others/push_stage_harness/.gitignore similarity index 100% rename from fuzzers/push_harness/.gitignore rename to fuzzers/others/push_stage_harness/.gitignore diff --git a/fuzzers/push_stage_harness/Cargo.toml b/fuzzers/others/push_stage_harness/Cargo.toml similarity index 79% rename from fuzzers/push_stage_harness/Cargo.toml rename to fuzzers/others/push_stage_harness/Cargo.toml index 8fda3e74e7..7f6bbfbfb2 100644 --- a/fuzzers/push_stage_harness/Cargo.toml +++ b/fuzzers/others/push_stage_harness/Cargo.toml @@ -19,5 +19,5 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } diff --git a/fuzzers/push_stage_harness/README.md b/fuzzers/others/push_stage_harness/README.md similarity index 100% rename from fuzzers/push_stage_harness/README.md rename to fuzzers/others/push_stage_harness/README.md diff --git a/fuzzers/push_stage_harness/src/main.rs b/fuzzers/others/push_stage_harness/src/main.rs similarity index 100% rename from fuzzers/push_stage_harness/src/main.rs rename to fuzzers/others/push_stage_harness/src/main.rs diff --git a/fuzzers/sqlite_centralized_multi_machine/Cargo.toml b/fuzzers/others/sqlite_centralized_multi_machine/Cargo.toml similarity index 55% rename from fuzzers/sqlite_centralized_multi_machine/Cargo.toml rename to fuzzers/others/sqlite_centralized_multi_machine/Cargo.toml index e0bb7a844b..6ec4236d04 100644 --- a/fuzzers/sqlite_centralized_multi_machine/Cargo.toml +++ b/fuzzers/others/sqlite_centralized_multi_machine/Cargo.toml @@ -20,11 +20,11 @@ which = "6.0" [dependencies] # no llmp compression for now, better perfs. -libafl = { path = "../../libafl", default-features = false, features = ["std", "derive", "llmp_small_maps", "llmp_broker_timeouts", "rand_trait", "fork", "prelude", "gzip", "regex", "serdeany_autoreg", "tui_monitor", "std", "derive", "rand_trait", "fork", "prelude", "gzip", "regex", "scalability_introspection", "multi_machine", "errors_backtrace"] } -libafl_bolts = { path = "../../libafl_bolts", features = ["xxh3"] } -libafl_targets = { path = "../../libafl_targets", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } +libafl = { path = "../../../libafl", default-features = false, features = ["std", "derive", "llmp_small_maps", "llmp_broker_timeouts", "rand_trait", "fork", "prelude", "gzip", "regex", "serdeany_autoreg", "tui_monitor", "std", "derive", "rand_trait", "fork", "prelude", "gzip", "regex", "scalability_introspection", "multi_machine", "errors_backtrace"] } +libafl_bolts = { path = "../../../libafl_bolts", features = ["xxh3"] } +libafl_targets = { path = "../../../libafl_targets", features = ["sancov_pcguard_hitcounts", "libfuzzer"] } # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc" } +libafl_cc = { path = "../../../libafl_cc" } clap = { version = "4.5", features = ["derive"] } mimalloc = { version = "*", default-features = false } env_logger = "0.11" diff --git a/fuzzers/sqlite_centralized_multi_machine/README.md b/fuzzers/others/sqlite_centralized_multi_machine/README.md similarity index 100% rename from fuzzers/sqlite_centralized_multi_machine/README.md rename to fuzzers/others/sqlite_centralized_multi_machine/README.md diff --git a/fuzzers/sqlite_centralized_multi_machine/build.sh b/fuzzers/others/sqlite_centralized_multi_machine/build.sh similarity index 100% rename from fuzzers/sqlite_centralized_multi_machine/build.sh rename to fuzzers/others/sqlite_centralized_multi_machine/build.sh diff --git a/fuzzers/sqlite_centralized_multi_machine/run_child.sh b/fuzzers/others/sqlite_centralized_multi_machine/run_child.sh similarity index 100% rename from fuzzers/sqlite_centralized_multi_machine/run_child.sh rename to fuzzers/others/sqlite_centralized_multi_machine/run_child.sh diff --git a/fuzzers/sqlite_centralized_multi_machine/run_parent.sh b/fuzzers/others/sqlite_centralized_multi_machine/run_parent.sh similarity index 100% rename from fuzzers/sqlite_centralized_multi_machine/run_parent.sh rename to fuzzers/others/sqlite_centralized_multi_machine/run_parent.sh diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/src/bin/libafl_cc.rs b/fuzzers/others/sqlite_centralized_multi_machine/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/src/bin/libafl_cc.rs rename to fuzzers/others/sqlite_centralized_multi_machine/src/bin/libafl_cc.rs diff --git a/fuzzers/nyx_libxml2_standalone/src/bin/libafl_cxx.rs b/fuzzers/others/sqlite_centralized_multi_machine/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/nyx_libxml2_standalone/src/bin/libafl_cxx.rs rename to fuzzers/others/sqlite_centralized_multi_machine/src/bin/libafl_cxx.rs diff --git a/fuzzers/sqlite_centralized_multi_machine/src/lib.rs b/fuzzers/others/sqlite_centralized_multi_machine/src/lib.rs similarity index 100% rename from fuzzers/sqlite_centralized_multi_machine/src/lib.rs rename to fuzzers/others/sqlite_centralized_multi_machine/src/lib.rs diff --git a/fuzzers/others/tinyinst_simple/Cargo.toml b/fuzzers/others/tinyinst_simple/Cargo.toml new file mode 100644 index 0000000000..538a7e772d --- /dev/null +++ b/fuzzers/others/tinyinst_simple/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "tinyinst_simple" +version = "0.13.0" +edition = "2021" + +[dependencies] +libafl = { path = "../../../libafl", features = ["introspection"] } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_tinyinst = { path = "../../../libafl_tinyinst" } + +[profile.release] +codegen-units = 1 +opt-level = 3 diff --git a/fuzzers/tinyinst_simple/Makefile.toml b/fuzzers/others/tinyinst_simple/Makefile.toml similarity index 100% rename from fuzzers/tinyinst_simple/Makefile.toml rename to fuzzers/others/tinyinst_simple/Makefile.toml diff --git a/fuzzers/tinyinst_simple/README.md b/fuzzers/others/tinyinst_simple/README.md similarity index 100% rename from fuzzers/tinyinst_simple/README.md rename to fuzzers/others/tinyinst_simple/README.md diff --git a/fuzzers/tinyinst_simple/src/main.rs b/fuzzers/others/tinyinst_simple/src/main.rs similarity index 100% rename from fuzzers/tinyinst_simple/src/main.rs rename to fuzzers/others/tinyinst_simple/src/main.rs diff --git a/fuzzers/tinyinst_simple/test/crash_input.txt b/fuzzers/others/tinyinst_simple/test/crash_input.txt similarity index 100% rename from fuzzers/tinyinst_simple/test/crash_input.txt rename to fuzzers/others/tinyinst_simple/test/crash_input.txt diff --git a/fuzzers/tinyinst_simple/test/ok_input.txt b/fuzzers/others/tinyinst_simple/test/ok_input.txt similarity index 100% rename from fuzzers/tinyinst_simple/test/ok_input.txt rename to fuzzers/others/tinyinst_simple/test/ok_input.txt diff --git a/fuzzers/tinyinst_simple/test/test.cpp b/fuzzers/others/tinyinst_simple/test/test.cpp similarity index 100% rename from fuzzers/tinyinst_simple/test/test.cpp rename to fuzzers/others/tinyinst_simple/test/test.cpp diff --git a/fuzzers/tutorial/Cargo.toml b/fuzzers/others/tutorial/Cargo.toml similarity index 72% rename from fuzzers/tutorial/Cargo.toml rename to fuzzers/others/tutorial/Cargo.toml index e1274a7220..6d818f6365 100644 --- a/fuzzers/tutorial/Cargo.toml +++ b/fuzzers/others/tutorial/Cargo.toml @@ -19,13 +19,13 @@ cc = { version = "1.0", features = ["parallel"] } which = "6.0" [dependencies] -libafl = { path = "../../libafl/", features = ["default", "rand_trait"] } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } +libafl = { path = "../../../libafl/", features = ["default", "rand_trait"] } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_hitcounts", "libfuzzer", "sancov_cmplog"] } serde = { version = "1.0", default-features = false, features = ["alloc"] } # serialization lib lain = { version = "0.5", features = ["serde_support"], git = "https://github.com/AFLplusplus/lain.git", rev = "208e927bcf411f62f8a1f51ac2d9f9423a1ec5d3" } # We're using a lain fork compatible with libafl's rand version # TODO Include it only when building cc -libafl_cc = { path = "../../libafl_cc/" } +libafl_cc = { path = "../../../libafl_cc/" } [lib] name = "tutorial" diff --git a/fuzzers/tutorial/rust-toolchain b/fuzzers/others/tutorial/rust-toolchain similarity index 100% rename from fuzzers/tutorial/rust-toolchain rename to fuzzers/others/tutorial/rust-toolchain diff --git a/fuzzers/tutorial/src/bin/libafl_cc.rs b/fuzzers/others/tutorial/src/bin/libafl_cc.rs similarity index 100% rename from fuzzers/tutorial/src/bin/libafl_cc.rs rename to fuzzers/others/tutorial/src/bin/libafl_cc.rs diff --git a/fuzzers/sqlite_centralized_multi_machine/src/bin/libafl_cxx.rs b/fuzzers/others/tutorial/src/bin/libafl_cxx.rs similarity index 100% rename from fuzzers/sqlite_centralized_multi_machine/src/bin/libafl_cxx.rs rename to fuzzers/others/tutorial/src/bin/libafl_cxx.rs diff --git a/fuzzers/tutorial/src/input.rs b/fuzzers/others/tutorial/src/input.rs similarity index 100% rename from fuzzers/tutorial/src/input.rs rename to fuzzers/others/tutorial/src/input.rs diff --git a/fuzzers/tutorial/src/lib.rs b/fuzzers/others/tutorial/src/lib.rs similarity index 100% rename from fuzzers/tutorial/src/lib.rs rename to fuzzers/others/tutorial/src/lib.rs diff --git a/fuzzers/tutorial/src/metadata.rs b/fuzzers/others/tutorial/src/metadata.rs similarity index 100% rename from fuzzers/tutorial/src/metadata.rs rename to fuzzers/others/tutorial/src/metadata.rs diff --git a/fuzzers/tutorial/src/mutator.rs b/fuzzers/others/tutorial/src/mutator.rs similarity index 100% rename from fuzzers/tutorial/src/mutator.rs rename to fuzzers/others/tutorial/src/mutator.rs diff --git a/fuzzers/tutorial/target.c b/fuzzers/others/tutorial/target.c similarity index 100% rename from fuzzers/tutorial/target.c rename to fuzzers/others/tutorial/target.c diff --git a/fuzzers/push_stage_harness/.gitignore b/fuzzers/push_stage_harness/.gitignore deleted file mode 100644 index a977a2ca5b..0000000000 --- a/fuzzers/push_stage_harness/.gitignore +++ /dev/null @@ -1 +0,0 @@ -libpng-* \ No newline at end of file diff --git a/fuzzers/python_qemu/README.md b/fuzzers/qemu/python_qemu/README.md similarity index 100% rename from fuzzers/python_qemu/README.md rename to fuzzers/qemu/python_qemu/README.md diff --git a/fuzzers/python_qemu/fuzz.c b/fuzzers/qemu/python_qemu/fuzz.c similarity index 100% rename from fuzzers/python_qemu/fuzz.c rename to fuzzers/qemu/python_qemu/fuzz.c diff --git a/fuzzers/python_qemu/fuzzer.py b/fuzzers/qemu/python_qemu/fuzzer.py similarity index 100% rename from fuzzers/python_qemu/fuzzer.py rename to fuzzers/qemu/python_qemu/fuzzer.py diff --git a/fuzzers/qemu_cmin/.gitignore b/fuzzers/qemu/qemu_cmin/.gitignore similarity index 100% rename from fuzzers/qemu_cmin/.gitignore rename to fuzzers/qemu/qemu_cmin/.gitignore diff --git a/fuzzers/qemu_cmin/Cargo.toml b/fuzzers/qemu/qemu_cmin/Cargo.toml similarity index 82% rename from fuzzers/qemu_cmin/Cargo.toml rename to fuzzers/qemu/qemu_cmin/Cargo.toml index c4a741256b..ce9792115d 100644 --- a/fuzzers/qemu_cmin/Cargo.toml +++ b/fuzzers/qemu/qemu_cmin/Cargo.toml @@ -26,8 +26,8 @@ vergen = { version = "8.2.1", features = ["build", "cargo", "git", "gitcl", "rus [dependencies] clap = { version = "4.5", features = ["derive", "string"]} -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_qemu = { path = "../../libafl_qemu/", features = ["usermode"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_qemu = { path = "../../../libafl_qemu/", features = ["usermode"] } log = {version = "0.4.20" } rangemap = { version = "1.3" } diff --git a/fuzzers/qemu_cmin/Makefile.toml b/fuzzers/qemu/qemu_cmin/Makefile.toml similarity index 100% rename from fuzzers/qemu_cmin/Makefile.toml rename to fuzzers/qemu/qemu_cmin/Makefile.toml diff --git a/fuzzers/qemu_cmin/README.md b/fuzzers/qemu/qemu_cmin/README.md similarity index 100% rename from fuzzers/qemu_cmin/README.md rename to fuzzers/qemu/qemu_cmin/README.md diff --git a/fuzzers/qemu_cmin/build.rs b/fuzzers/qemu/qemu_cmin/build.rs similarity index 100% rename from fuzzers/qemu_cmin/build.rs rename to fuzzers/qemu/qemu_cmin/build.rs diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/corpus/not_kitty.png b/fuzzers/qemu/qemu_cmin/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/corpus/not_kitty.png rename to fuzzers/qemu/qemu_cmin/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/corpus/not_kitty_alpha.png b/fuzzers/qemu/qemu_cmin/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/corpus/not_kitty_alpha.png rename to fuzzers/qemu/qemu_cmin/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/corpus/not_kitty_gamma.png b/fuzzers/qemu/qemu_cmin/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/corpus/not_kitty_gamma.png rename to fuzzers/qemu/qemu_cmin/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_libpng_tcp_manager/corpus/not_kitty_icc.png b/fuzzers/qemu/qemu_cmin/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_libpng_tcp_manager/corpus/not_kitty_icc.png rename to fuzzers/qemu/qemu_cmin/corpus/not_kitty_icc.png diff --git a/fuzzers/qemu_cmin/harness.cc b/fuzzers/qemu/qemu_cmin/harness.cc similarity index 100% rename from fuzzers/qemu_cmin/harness.cc rename to fuzzers/qemu/qemu_cmin/harness.cc diff --git a/fuzzers/qemu_cmin/src/fuzzer.rs b/fuzzers/qemu/qemu_cmin/src/fuzzer.rs similarity index 100% rename from fuzzers/qemu_cmin/src/fuzzer.rs rename to fuzzers/qemu/qemu_cmin/src/fuzzer.rs diff --git a/fuzzers/qemu_cmin/src/main.rs b/fuzzers/qemu/qemu_cmin/src/main.rs similarity index 100% rename from fuzzers/qemu_cmin/src/main.rs rename to fuzzers/qemu/qemu_cmin/src/main.rs diff --git a/fuzzers/qemu_coverage/.gitignore b/fuzzers/qemu/qemu_coverage/.gitignore similarity index 100% rename from fuzzers/qemu_coverage/.gitignore rename to fuzzers/qemu/qemu_coverage/.gitignore diff --git a/fuzzers/qemu_coverage/Cargo.toml b/fuzzers/qemu/qemu_coverage/Cargo.toml similarity index 82% rename from fuzzers/qemu_coverage/Cargo.toml rename to fuzzers/qemu/qemu_coverage/Cargo.toml index 30f1501935..347540eb60 100644 --- a/fuzzers/qemu_coverage/Cargo.toml +++ b/fuzzers/qemu/qemu_coverage/Cargo.toml @@ -26,8 +26,8 @@ vergen = { version = "8.2.1", features = ["build", "cargo", "git", "gitcl", "rus [dependencies] clap = { version = "4.5", features = ["derive", "string"]} -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_qemu = { path = "../../libafl_qemu/", features = ["usermode"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_qemu = { path = "../../../libafl_qemu/", features = ["usermode"] } log = {version = "0.4.20" } rangemap = { version = "1.3" } diff --git a/fuzzers/qemu_coverage/Makefile.toml b/fuzzers/qemu/qemu_coverage/Makefile.toml similarity index 100% rename from fuzzers/qemu_coverage/Makefile.toml rename to fuzzers/qemu/qemu_coverage/Makefile.toml diff --git a/fuzzers/qemu_coverage/README.md b/fuzzers/qemu/qemu_coverage/README.md similarity index 100% rename from fuzzers/qemu_coverage/README.md rename to fuzzers/qemu/qemu_coverage/README.md diff --git a/fuzzers/qemu_coverage/build.rs b/fuzzers/qemu/qemu_coverage/build.rs similarity index 100% rename from fuzzers/qemu_coverage/build.rs rename to fuzzers/qemu/qemu_coverage/build.rs diff --git a/fuzzers/libfuzzer_stb_image/corpus/not_kitty.png b/fuzzers/qemu/qemu_coverage/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_stb_image/corpus/not_kitty.png rename to fuzzers/qemu/qemu_coverage/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_stb_image/corpus/not_kitty_alpha.png b/fuzzers/qemu/qemu_coverage/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_stb_image/corpus/not_kitty_alpha.png rename to fuzzers/qemu/qemu_coverage/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_stb_image/corpus/not_kitty_gamma.png b/fuzzers/qemu/qemu_coverage/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_stb_image/corpus/not_kitty_gamma.png rename to fuzzers/qemu/qemu_coverage/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_stb_image/corpus/not_kitty_icc.png b/fuzzers/qemu/qemu_coverage/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_stb_image/corpus/not_kitty_icc.png rename to fuzzers/qemu/qemu_coverage/corpus/not_kitty_icc.png diff --git a/fuzzers/qemu_coverage/harness.cc b/fuzzers/qemu/qemu_coverage/harness.cc similarity index 100% rename from fuzzers/qemu_coverage/harness.cc rename to fuzzers/qemu/qemu_coverage/harness.cc diff --git a/fuzzers/qemu_coverage/src/fuzzer.rs b/fuzzers/qemu/qemu_coverage/src/fuzzer.rs similarity index 100% rename from fuzzers/qemu_coverage/src/fuzzer.rs rename to fuzzers/qemu/qemu_coverage/src/fuzzer.rs diff --git a/fuzzers/qemu_coverage/src/main.rs b/fuzzers/qemu/qemu_coverage/src/main.rs similarity index 100% rename from fuzzers/qemu_coverage/src/main.rs rename to fuzzers/qemu/qemu_coverage/src/main.rs diff --git a/fuzzers/qemu_launcher/.gitignore b/fuzzers/qemu/qemu_launcher/.gitignore similarity index 100% rename from fuzzers/qemu_launcher/.gitignore rename to fuzzers/qemu/qemu_launcher/.gitignore diff --git a/fuzzers/qemu_launcher/Cargo.toml b/fuzzers/qemu/qemu_launcher/Cargo.toml similarity index 85% rename from fuzzers/qemu_launcher/Cargo.toml rename to fuzzers/qemu/qemu_launcher/Cargo.toml index b919716541..42c4592f16 100644 --- a/fuzzers/qemu_launcher/Cargo.toml +++ b/fuzzers/qemu/qemu_launcher/Cargo.toml @@ -37,9 +37,9 @@ vergen = { version = "8.2", features = ["build", "cargo", "git", "gitcl", "rustc [dependencies] clap = { version = "4.3", features = ["derive", "string"]} -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/", features = ["errors_backtrace"] } -libafl_qemu = { path = "../../libafl_qemu/", features = ["usermode"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/", features = ["errors_backtrace"] } +libafl_qemu = { path = "../../../libafl_qemu/", features = ["usermode"] } log = {version = "0.4.20" } nix = { version = "0.29", features = ["fs"] } rangemap = { version = "1.3" } diff --git a/fuzzers/qemu_launcher/Makefile.toml b/fuzzers/qemu/qemu_launcher/Makefile.toml similarity index 100% rename from fuzzers/qemu_launcher/Makefile.toml rename to fuzzers/qemu/qemu_launcher/Makefile.toml diff --git a/fuzzers/qemu_launcher/README.md b/fuzzers/qemu/qemu_launcher/README.md similarity index 100% rename from fuzzers/qemu_launcher/README.md rename to fuzzers/qemu/qemu_launcher/README.md diff --git a/fuzzers/qemu_launcher/build.rs b/fuzzers/qemu/qemu_launcher/build.rs similarity index 100% rename from fuzzers/qemu_launcher/build.rs rename to fuzzers/qemu/qemu_launcher/build.rs diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png b/fuzzers/qemu/qemu_launcher/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png rename to fuzzers/qemu/qemu_launcher/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png b/fuzzers/qemu/qemu_launcher/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png rename to fuzzers/qemu/qemu_launcher/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png b/fuzzers/qemu/qemu_launcher/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png rename to fuzzers/qemu/qemu_launcher/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png b/fuzzers/qemu/qemu_launcher/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png rename to fuzzers/qemu/qemu_launcher/corpus/not_kitty_icc.png diff --git a/fuzzers/qemu_launcher/harness.cc b/fuzzers/qemu/qemu_launcher/harness.cc similarity index 100% rename from fuzzers/qemu_launcher/harness.cc rename to fuzzers/qemu/qemu_launcher/harness.cc diff --git a/fuzzers/qemu_launcher/injection_test/Makefile b/fuzzers/qemu/qemu_launcher/injection_test/Makefile similarity index 100% rename from fuzzers/qemu_launcher/injection_test/Makefile rename to fuzzers/qemu/qemu_launcher/injection_test/Makefile diff --git a/fuzzers/qemu_launcher/injection_test/README.md b/fuzzers/qemu/qemu_launcher/injection_test/README.md similarity index 100% rename from fuzzers/qemu_launcher/injection_test/README.md rename to fuzzers/qemu/qemu_launcher/injection_test/README.md diff --git a/fuzzers/qemu_launcher/injection_test/example.db b/fuzzers/qemu/qemu_launcher/injection_test/example.db similarity index 100% rename from fuzzers/qemu_launcher/injection_test/example.db rename to fuzzers/qemu/qemu_launcher/injection_test/example.db diff --git a/fuzzers/qemu_launcher/injection_test/sqltest.c b/fuzzers/qemu/qemu_launcher/injection_test/sqltest.c similarity index 100% rename from fuzzers/qemu_launcher/injection_test/sqltest.c rename to fuzzers/qemu/qemu_launcher/injection_test/sqltest.c diff --git a/fuzzers/qemu_launcher/injections.toml b/fuzzers/qemu/qemu_launcher/injections.toml similarity index 100% rename from fuzzers/qemu_launcher/injections.toml rename to fuzzers/qemu/qemu_launcher/injections.toml diff --git a/fuzzers/qemu_launcher/injections.yaml b/fuzzers/qemu/qemu_launcher/injections.yaml similarity index 100% rename from fuzzers/qemu_launcher/injections.yaml rename to fuzzers/qemu/qemu_launcher/injections.yaml diff --git a/fuzzers/qemu_launcher/src/client.rs b/fuzzers/qemu/qemu_launcher/src/client.rs similarity index 100% rename from fuzzers/qemu_launcher/src/client.rs rename to fuzzers/qemu/qemu_launcher/src/client.rs diff --git a/fuzzers/qemu_launcher/src/fuzzer.rs b/fuzzers/qemu/qemu_launcher/src/fuzzer.rs similarity index 100% rename from fuzzers/qemu_launcher/src/fuzzer.rs rename to fuzzers/qemu/qemu_launcher/src/fuzzer.rs diff --git a/fuzzers/qemu_launcher/src/harness.rs b/fuzzers/qemu/qemu_launcher/src/harness.rs similarity index 100% rename from fuzzers/qemu_launcher/src/harness.rs rename to fuzzers/qemu/qemu_launcher/src/harness.rs diff --git a/fuzzers/qemu_launcher/src/instance.rs b/fuzzers/qemu/qemu_launcher/src/instance.rs similarity index 100% rename from fuzzers/qemu_launcher/src/instance.rs rename to fuzzers/qemu/qemu_launcher/src/instance.rs diff --git a/fuzzers/qemu_launcher/src/main.rs b/fuzzers/qemu/qemu_launcher/src/main.rs similarity index 100% rename from fuzzers/qemu_launcher/src/main.rs rename to fuzzers/qemu/qemu_launcher/src/main.rs diff --git a/fuzzers/qemu_launcher/src/options.rs b/fuzzers/qemu/qemu_launcher/src/options.rs similarity index 100% rename from fuzzers/qemu_launcher/src/options.rs rename to fuzzers/qemu/qemu_launcher/src/options.rs diff --git a/fuzzers/qemu_launcher/src/version.rs b/fuzzers/qemu/qemu_launcher/src/version.rs similarity index 100% rename from fuzzers/qemu_launcher/src/version.rs rename to fuzzers/qemu/qemu_launcher/src/version.rs diff --git a/fuzzers/qemu_systemmode/.gitignore b/fuzzers/qemu/qemu_systemmode/.gitignore similarity index 100% rename from fuzzers/qemu_systemmode/.gitignore rename to fuzzers/qemu/qemu_systemmode/.gitignore diff --git a/fuzzers/qemu_systemmode/Cargo.toml b/fuzzers/qemu/qemu_systemmode/Cargo.toml similarity index 63% rename from fuzzers/qemu_systemmode/Cargo.toml rename to fuzzers/qemu/qemu_systemmode/Cargo.toml index c5e4c744c4..c0253977ac 100644 --- a/fuzzers/qemu_systemmode/Cargo.toml +++ b/fuzzers/qemu/qemu_systemmode/Cargo.toml @@ -21,11 +21,11 @@ lto = "fat" codegen-units = 1 [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_qemu = { path = "../../libafl_qemu/", features = ["arm", "systemmode"] } -libafl_qemu_sys = { path = "../../libafl_qemu/libafl_qemu_sys", features = ["arm", "systemmode"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_qemu = { path = "../../../libafl_qemu/", features = ["arm", "systemmode"] } +libafl_qemu_sys = { path = "../../../libafl_qemu/libafl_qemu_sys", features = ["arm", "systemmode"] } env_logger = "*" [build-dependencies] -libafl_qemu_build = { path = "../../libafl_qemu/libafl_qemu_build" } +libafl_qemu_build = { path = "../../../libafl_qemu/libafl_qemu_build" } diff --git a/fuzzers/qemu_systemmode/Makefile.toml b/fuzzers/qemu/qemu_systemmode/Makefile.toml similarity index 100% rename from fuzzers/qemu_systemmode/Makefile.toml rename to fuzzers/qemu/qemu_systemmode/Makefile.toml diff --git a/fuzzers/qemu_systemmode/README.md b/fuzzers/qemu/qemu_systemmode/README.md similarity index 100% rename from fuzzers/qemu_systemmode/README.md rename to fuzzers/qemu/qemu_systemmode/README.md diff --git a/fuzzers/qemu_systemmode/build.rs b/fuzzers/qemu/qemu_systemmode/build.rs similarity index 100% rename from fuzzers/qemu_systemmode/build.rs rename to fuzzers/qemu/qemu_systemmode/build.rs diff --git a/fuzzers/qemu_systemmode/corpus/random b/fuzzers/qemu/qemu_systemmode/corpus/random similarity index 100% rename from fuzzers/qemu_systemmode/corpus/random rename to fuzzers/qemu/qemu_systemmode/corpus/random diff --git a/fuzzers/qemu_systemmode/corpus/zero b/fuzzers/qemu/qemu_systemmode/corpus/zero similarity index 100% rename from fuzzers/qemu_systemmode/corpus/zero rename to fuzzers/qemu/qemu_systemmode/corpus/zero diff --git a/fuzzers/qemu_systemmode/example/main.c b/fuzzers/qemu/qemu_systemmode/example/main.c similarity index 100% rename from fuzzers/qemu_systemmode/example/main.c rename to fuzzers/qemu/qemu_systemmode/example/main.c diff --git a/fuzzers/qemu_systemmode/example/mps2_m3.ld b/fuzzers/qemu/qemu_systemmode/example/mps2_m3.ld similarity index 100% rename from fuzzers/qemu_systemmode/example/mps2_m3.ld rename to fuzzers/qemu/qemu_systemmode/example/mps2_m3.ld diff --git a/fuzzers/qemu_systemmode/example/startup.c b/fuzzers/qemu/qemu_systemmode/example/startup.c similarity index 100% rename from fuzzers/qemu_systemmode/example/startup.c rename to fuzzers/qemu/qemu_systemmode/example/startup.c diff --git a/fuzzers/qemu_systemmode/src/fuzzer_breakpoint.rs b/fuzzers/qemu/qemu_systemmode/src/fuzzer_breakpoint.rs similarity index 100% rename from fuzzers/qemu_systemmode/src/fuzzer_breakpoint.rs rename to fuzzers/qemu/qemu_systemmode/src/fuzzer_breakpoint.rs diff --git a/fuzzers/qemu_systemmode/src/fuzzer_classic.rs b/fuzzers/qemu/qemu_systemmode/src/fuzzer_classic.rs similarity index 100% rename from fuzzers/qemu_systemmode/src/fuzzer_classic.rs rename to fuzzers/qemu/qemu_systemmode/src/fuzzer_classic.rs diff --git a/fuzzers/qemu_systemmode/src/fuzzer_sync_exit.rs b/fuzzers/qemu/qemu_systemmode/src/fuzzer_sync_exit.rs similarity index 100% rename from fuzzers/qemu_systemmode/src/fuzzer_sync_exit.rs rename to fuzzers/qemu/qemu_systemmode/src/fuzzer_sync_exit.rs diff --git a/fuzzers/qemu_systemmode/src/main.rs b/fuzzers/qemu/qemu_systemmode/src/main.rs similarity index 100% rename from fuzzers/qemu_systemmode/src/main.rs rename to fuzzers/qemu/qemu_systemmode/src/main.rs diff --git a/fuzzers/qemu_launcher/corpus/not_kitty.png b/fuzzers/qemu_launcher/corpus/not_kitty.png deleted file mode 100644 index eff7c1707b936a8f8df725814f604d454b78b5c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X_yc@GT+_~+`TzevkY_wIZRYx+5&y#hyq+?%!C8<`)MX5lF!N|bSRM)^r*U&J;z}U*bz{;0L z1Vuw`eoAIqC5i?kD`P_|6GMoGiCWXn12ss3YzWRzD=AMbN@Z|N$xljE@XSq2PYp^< WOsOn9nQ8-6#Ng@b=d#Wzp$PyV*n0l} diff --git a/fuzzers/qemu_launcher/corpus/not_kitty_gamma.png b/fuzzers/qemu_launcher/corpus/not_kitty_gamma.png deleted file mode 100644 index 939d9d29a9b9f95bac5e9a72854361ee85469921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmTQ929t;oCfmw1AIbU z)6Sgv|NlRbXFM})=KnKxKI=t+9LW;bh?3y^w370~qErUQl>DSr1<%~X^wgl##FWay zlc_d9MbVxvjv*GO?@o5)YH;9THa`3B|5>?^8?LvjJ}xLe>!7e@k)r^sLedir0mCVe z=5sMjEm$*~tHD+}{NS_$nMdb|ABqg-@UGMMsZ=uY-X%Cq@&3vmZ%&@H{P?6&+U!yq VvuXWlo?M_c44$rjF6*2UngF4cP+$N6 diff --git a/fuzzers/qemu_launcher/corpus/not_kitty_icc.png b/fuzzers/qemu_launcher/corpus/not_kitty_icc.png deleted file mode 100644 index f0c7804d99829cc6307c1c6ae9915cf42d555414..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 427 zcmV;c0aX5pP)9xSWu9|B*4Isn^#g47m^r~thH)GiR<@yX0fO)OF<2Kt#qCldyUF#H?{4jV?XGw9)psxE&K1B1m^ z1_tH{2(hG@3=G>_85ksPA;eS`Ffj19FfeR8pIlm01~rBeWCZ{dbvfq;rA3DT000kA zOjJc?%*_A){{R30GnreSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM003J_L_t(I%iWVf3V=Wi12fJ3|IHp$*hSlV@t||fKp?cDK@bHXV&o_g zF_hw;3ILUGteXmeJsVfSmcVJno)^MdQwU3bFHCtNG)uY>mLcD%`0UBaIq~Fq8#dBr V12uok3~c}a002ovPDHLkV1nKBo!S5Z diff --git a/fuzzers/sqlite_centralized_multi_machine/src/bin/libafl_cc.rs b/fuzzers/sqlite_centralized_multi_machine/src/bin/libafl_cc.rs deleted file mode 100644 index f542ca070c..0000000000 --- a/fuzzers/sqlite_centralized_multi_machine/src/bin/libafl_cc.rs +++ /dev/null @@ -1,36 +0,0 @@ -use std::env; - -use libafl_cc::{ClangWrapper, CompilerWrapper, ToolWrapper}; - -pub fn main() { - let args: Vec = env::args().collect(); - if args.len() > 1 { - let mut dir = env::current_exe().unwrap(); - let wrapper_name = dir.file_name().unwrap().to_str().unwrap(); - - let is_cpp = match wrapper_name[wrapper_name.len()-2..].to_lowercase().as_str() { - "cc" => false, - "++" | "pp" | "xx" => true, - _ => panic!("Could not figure out if c or c++ wrapper was called. Expected {dir:?} to end with c or cxx"), - }; - - dir.pop(); - - let mut cc = ClangWrapper::new(); - if let Some(code) = cc - .cpp(is_cpp) - // silence the compiler wrapper output, needed for some configure scripts. - .silence(true) - .parse_args(&args) - .expect("Failed to parse the command line") - .link_staticlib(&dir, "libfuzzer_libpng") - .add_arg("-fsanitize-coverage=trace-pc-guard") - .run() - .expect("Failed to run the wrapped compiler") - { - std::process::exit(code); - } - } else { - panic!("LibAFL CC: No Arguments given"); - } -} diff --git a/fuzzers/libfuzzer_stb_image/.gitignore b/fuzzers/stb/libfuzzer_stb_image/.gitignore similarity index 100% rename from fuzzers/libfuzzer_stb_image/.gitignore rename to fuzzers/stb/libfuzzer_stb_image/.gitignore diff --git a/fuzzers/libfuzzer_stb_image/Cargo.toml b/fuzzers/stb/libfuzzer_stb_image/Cargo.toml similarity index 57% rename from fuzzers/libfuzzer_stb_image/Cargo.toml rename to fuzzers/stb/libfuzzer_stb_image/Cargo.toml index c36ea21cbc..10e318c003 100644 --- a/fuzzers/libfuzzer_stb_image/Cargo.toml +++ b/fuzzers/stb/libfuzzer_stb_image/Cargo.toml @@ -16,9 +16,9 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer", "libfuzzer_no_link_main"] } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer", "libfuzzer_no_link_main"] } mimalloc = { version = "*", default-features = false } [build-dependencies] diff --git a/fuzzers/libfuzzer_stb_image/Makefile.toml b/fuzzers/stb/libfuzzer_stb_image/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_stb_image/Makefile.toml rename to fuzzers/stb/libfuzzer_stb_image/Makefile.toml diff --git a/fuzzers/libfuzzer_stb_image/README.md b/fuzzers/stb/libfuzzer_stb_image/README.md similarity index 100% rename from fuzzers/libfuzzer_stb_image/README.md rename to fuzzers/stb/libfuzzer_stb_image/README.md diff --git a/fuzzers/libfuzzer_stb_image/build.rs b/fuzzers/stb/libfuzzer_stb_image/build.rs similarity index 100% rename from fuzzers/libfuzzer_stb_image/build.rs rename to fuzzers/stb/libfuzzer_stb_image/build.rs diff --git a/fuzzers/libfuzzer_stb_image_sugar/corpus/not_kitty.png b/fuzzers/stb/libfuzzer_stb_image/corpus/not_kitty.png similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/corpus/not_kitty.png rename to fuzzers/stb/libfuzzer_stb_image/corpus/not_kitty.png diff --git a/fuzzers/libfuzzer_stb_image_sugar/corpus/not_kitty_alpha.png b/fuzzers/stb/libfuzzer_stb_image/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/corpus/not_kitty_alpha.png rename to fuzzers/stb/libfuzzer_stb_image/corpus/not_kitty_alpha.png diff --git a/fuzzers/libfuzzer_stb_image_sugar/corpus/not_kitty_gamma.png b/fuzzers/stb/libfuzzer_stb_image/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/corpus/not_kitty_gamma.png rename to fuzzers/stb/libfuzzer_stb_image/corpus/not_kitty_gamma.png diff --git a/fuzzers/libfuzzer_stb_image_sugar/corpus/not_kitty_icc.png b/fuzzers/stb/libfuzzer_stb_image/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/corpus/not_kitty_icc.png rename to fuzzers/stb/libfuzzer_stb_image/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_stb_image/harness.c b/fuzzers/stb/libfuzzer_stb_image/harness.c similarity index 100% rename from fuzzers/libfuzzer_stb_image/harness.c rename to fuzzers/stb/libfuzzer_stb_image/harness.c diff --git a/fuzzers/libfuzzer_stb_image/src/main.rs b/fuzzers/stb/libfuzzer_stb_image/src/main.rs similarity index 100% rename from fuzzers/libfuzzer_stb_image/src/main.rs rename to fuzzers/stb/libfuzzer_stb_image/src/main.rs diff --git a/fuzzers/libfuzzer_stb_image/stb_image.h b/fuzzers/stb/libfuzzer_stb_image/stb_image.h similarity index 100% rename from fuzzers/libfuzzer_stb_image/stb_image.h rename to fuzzers/stb/libfuzzer_stb_image/stb_image.h diff --git a/fuzzers/libfuzzer_stb_image_concolic/Makefile.toml b/fuzzers/stb/libfuzzer_stb_image_concolic/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/Makefile.toml rename to fuzzers/stb/libfuzzer_stb_image_concolic/Makefile.toml diff --git a/fuzzers/libfuzzer_stb_image_concolic/README.md b/fuzzers/stb/libfuzzer_stb_image_concolic/README.md similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/README.md rename to fuzzers/stb/libfuzzer_stb_image_concolic/README.md diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/.gitignore b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/.gitignore similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/.gitignore rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/.gitignore diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml similarity index 63% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml index c4f818827e..0633734e71 100644 --- a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml +++ b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml @@ -16,9 +16,9 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../../libafl/", features = ["concolic_mutation"] } -libafl_bolts = { path = "../../../libafl_bolts/" } -libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer"] } +libafl = { path = "../../../../libafl/", features = ["concolic_mutation"] } +libafl_bolts = { path = "../../../../libafl_bolts/" } +libafl_targets = { path = "../../../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer"] } clap = { version = "4.0", features = ["derive"]} mimalloc = { version = "*", default-features = false } @@ -26,4 +26,4 @@ mimalloc = { version = "*", default-features = false } cc = { version = "1.0", features = ["parallel"] } cmake = "0.1" which = "4.4" -symcc_libafl = {path = "../../../libafl_concolic/symcc_libafl"} +symcc_libafl = {path = "../../../../libafl_concolic/symcc_libafl"} diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/build.rs b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/build.rs similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/build.rs rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/build.rs diff --git a/fuzzers/qemu_cmin/corpus/not_kitty.png b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png similarity index 100% rename from fuzzers/qemu_cmin/corpus/not_kitty.png rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png diff --git a/fuzzers/qemu_cmin/corpus/not_kitty_alpha.png b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/qemu_cmin/corpus/not_kitty_alpha.png rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png diff --git a/fuzzers/qemu_cmin/corpus/not_kitty_gamma.png b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/qemu_cmin/corpus/not_kitty_gamma.png rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png diff --git a/fuzzers/qemu_cmin/corpus/not_kitty_icc.png b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/qemu_cmin/corpus/not_kitty_icc.png rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/harness.c b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/harness.c similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/harness.c rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/harness.c diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/src/main.rs b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/src/main.rs similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/src/main.rs rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/src/main.rs diff --git a/fuzzers/libfuzzer_stb_image_concolic/fuzzer/stb_image.h b/fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/stb_image.h similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/fuzzer/stb_image.h rename to fuzzers/stb/libfuzzer_stb_image_concolic/fuzzer/stb_image.h diff --git a/fuzzers/libfuzzer_stb_image_concolic/runtime/Cargo.toml b/fuzzers/stb/libfuzzer_stb_image_concolic/runtime/Cargo.toml similarity index 89% rename from fuzzers/libfuzzer_stb_image_concolic/runtime/Cargo.toml rename to fuzzers/stb/libfuzzer_stb_image_concolic/runtime/Cargo.toml index b8efd0c371..7865c69bb0 100644 --- a/fuzzers/libfuzzer_stb_image_concolic/runtime/Cargo.toml +++ b/fuzzers/stb/libfuzzer_stb_image_concolic/runtime/Cargo.toml @@ -20,4 +20,4 @@ panic = "abort" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -symcc_runtime = { path = "../../../libafl_concolic/symcc_runtime" } +symcc_runtime = { path = "../../../../libafl_concolic/symcc_runtime" } diff --git a/fuzzers/libfuzzer_stb_image_concolic/runtime/src/lib.rs b/fuzzers/stb/libfuzzer_stb_image_concolic/runtime/src/lib.rs similarity index 100% rename from fuzzers/libfuzzer_stb_image_concolic/runtime/src/lib.rs rename to fuzzers/stb/libfuzzer_stb_image_concolic/runtime/src/lib.rs diff --git a/fuzzers/libfuzzer_stb_image_sugar/.gitignore b/fuzzers/stb/libfuzzer_stb_image_sugar/.gitignore similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/.gitignore rename to fuzzers/stb/libfuzzer_stb_image_sugar/.gitignore diff --git a/fuzzers/libfuzzer_stb_image_sugar/Cargo.toml b/fuzzers/stb/libfuzzer_stb_image_sugar/Cargo.toml similarity index 67% rename from fuzzers/libfuzzer_stb_image_sugar/Cargo.toml rename to fuzzers/stb/libfuzzer_stb_image_sugar/Cargo.toml index baccedd900..1550a6121c 100644 --- a/fuzzers/libfuzzer_stb_image_sugar/Cargo.toml +++ b/fuzzers/stb/libfuzzer_stb_image_sugar/Cargo.toml @@ -17,10 +17,10 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../libafl/" } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer"] } -libafl_sugar = { path = "../../libafl_sugar/" } +libafl = { path = "../../../libafl/" } +libafl_bolts = { path = "../../../libafl_bolts/" } +libafl_targets = { path = "../../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer"] } +libafl_sugar = { path = "../../../libafl_sugar/" } mimalloc = { version = "*", default-features = false } [build-dependencies] diff --git a/fuzzers/libfuzzer_stb_image_sugar/Makefile.toml b/fuzzers/stb/libfuzzer_stb_image_sugar/Makefile.toml similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/Makefile.toml rename to fuzzers/stb/libfuzzer_stb_image_sugar/Makefile.toml diff --git a/fuzzers/libfuzzer_stb_image_sugar/README.md b/fuzzers/stb/libfuzzer_stb_image_sugar/README.md similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/README.md rename to fuzzers/stb/libfuzzer_stb_image_sugar/README.md diff --git a/fuzzers/libfuzzer_stb_image_sugar/build.rs b/fuzzers/stb/libfuzzer_stb_image_sugar/build.rs similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/build.rs rename to fuzzers/stb/libfuzzer_stb_image_sugar/build.rs diff --git a/fuzzers/qemu_coverage/corpus/not_kitty.png b/fuzzers/stb/libfuzzer_stb_image_sugar/corpus/not_kitty.png similarity index 100% rename from fuzzers/qemu_coverage/corpus/not_kitty.png rename to fuzzers/stb/libfuzzer_stb_image_sugar/corpus/not_kitty.png diff --git a/fuzzers/qemu_coverage/corpus/not_kitty_alpha.png b/fuzzers/stb/libfuzzer_stb_image_sugar/corpus/not_kitty_alpha.png similarity index 100% rename from fuzzers/qemu_coverage/corpus/not_kitty_alpha.png rename to fuzzers/stb/libfuzzer_stb_image_sugar/corpus/not_kitty_alpha.png diff --git a/fuzzers/qemu_coverage/corpus/not_kitty_gamma.png b/fuzzers/stb/libfuzzer_stb_image_sugar/corpus/not_kitty_gamma.png similarity index 100% rename from fuzzers/qemu_coverage/corpus/not_kitty_gamma.png rename to fuzzers/stb/libfuzzer_stb_image_sugar/corpus/not_kitty_gamma.png diff --git a/fuzzers/qemu_coverage/corpus/not_kitty_icc.png b/fuzzers/stb/libfuzzer_stb_image_sugar/corpus/not_kitty_icc.png similarity index 100% rename from fuzzers/qemu_coverage/corpus/not_kitty_icc.png rename to fuzzers/stb/libfuzzer_stb_image_sugar/corpus/not_kitty_icc.png diff --git a/fuzzers/libfuzzer_stb_image_sugar/harness.c b/fuzzers/stb/libfuzzer_stb_image_sugar/harness.c similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/harness.c rename to fuzzers/stb/libfuzzer_stb_image_sugar/harness.c diff --git a/fuzzers/libfuzzer_stb_image_sugar/src/main.rs b/fuzzers/stb/libfuzzer_stb_image_sugar/src/main.rs similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/src/main.rs rename to fuzzers/stb/libfuzzer_stb_image_sugar/src/main.rs diff --git a/fuzzers/libfuzzer_stb_image_sugar/stb_image.h b/fuzzers/stb/libfuzzer_stb_image_sugar/stb_image.h similarity index 100% rename from fuzzers/libfuzzer_stb_image_sugar/stb_image.h rename to fuzzers/stb/libfuzzer_stb_image_sugar/stb_image.h diff --git a/fuzzers/tinyinst_simple/Cargo.toml b/fuzzers/tinyinst_simple/Cargo.toml deleted file mode 100644 index d44e8052cf..0000000000 --- a/fuzzers/tinyinst_simple/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "tinyinst_simple" -version = "0.13.0" -edition = "2021" - -[dependencies] -libafl = { path = "../../libafl", features = ["introspection"] } -libafl_bolts = { path = "../../libafl_bolts/" } -libafl_tinyinst = { path = "../../libafl_tinyinst" } - -[profile.release] -codegen-units = 1 -opt-level = 3 diff --git a/fuzzers/tutorial/src/bin/libafl_cxx.rs b/fuzzers/tutorial/src/bin/libafl_cxx.rs deleted file mode 100644 index dabd22971a..0000000000 --- a/fuzzers/tutorial/src/bin/libafl_cxx.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub mod libafl_cc; - -fn main() { - libafl_cc::main(); -} diff --git a/scripts/check_tested_fuzzers.sh b/scripts/check_tested_fuzzers.sh index 8b33c42931..a191f01d9f 100755 --- a/scripts/check_tested_fuzzers.sh +++ b/scripts/check_tested_fuzzers.sh @@ -11,8 +11,8 @@ while read -r fuzzdir; do echo "Fuzzer ${fuzzdir} is explicitly ignored" fi done < <( - find ./fuzzers -mindepth 1 -maxdepth 1 -type d - find ./fuzzers/backtrace_baby_fuzzers -mindepth 1 -maxdepth 1 -type d + find ./fuzzers -mindepth 2 -maxdepth 2 -type d + find ./fuzzers/baby/backtrace_baby_fuzzers -mindepth 1 -maxdepth 1 -type d ) exit $ret \ No newline at end of file