From 710566be93debc87dadf28ce82cac51c177f9dbc Mon Sep 17 00:00:00 2001 From: van Hauser Date: Thu, 2 Jan 2020 10:51:14 +0100 Subject: remove unnecessary conditions --- src/afl-fuzz-one.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index 4d1ac541..87a1418c 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -482,6 +482,9 @@ u8 fuzz_one_original(char** argv) { if (use_radamsa > 1) goto radamsa_stage; + +//custom_stage: // not used - yet + if (custom_mutator) { stage_short = "custom"; @@ -541,9 +544,6 @@ u8 fuzz_one_original(char** argv) { : havoc_max_mult * 100)) || queue_cur->passed_det) { - if (use_radamsa > 1) - goto radamsa_stage; - else #ifdef USE_PYTHON goto python_stage; #else @@ -557,9 +557,6 @@ u8 fuzz_one_original(char** argv) { if (master_max && (queue_cur->exec_cksum % master_max) != master_id - 1) { - if (use_radamsa > 1) - goto radamsa_stage; - else #ifdef USE_PYTHON goto python_stage; #else @@ -2266,9 +2263,6 @@ retry_splicing: out_buf = ck_alloc_nozero(len); memcpy(out_buf, in_buf, len); - if (use_radamsa > 1) - goto radamsa_stage; - else #ifdef USE_PYTHON goto python_stage; #else -- cgit 1.4.1 From 80705aca6154e7862c586edd43f69a282e3fd76c Mon Sep 17 00:00:00 2001 From: hexcoder Date: Fri, 3 Jan 2020 07:46:21 +0100 Subject: Typo in name --- src/afl-fuzz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index f3927d4e..5e9a4169 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -591,7 +591,7 @@ int main(int argc, char** argv) { if (optind == argc || !in_dir || !out_dir) usage(argv[0]); OKF("afl++ is maintained by Marc \"van Hauser\" Heuse, Heiko \"hexcoder\" " - "Eissfeldt and Andrea Fioraldi"); + "Eißfeldt and Andrea Fioraldi"); OKF("afl++ is open source, get it at " "https://github.com/vanhauser-thc/AFLplusplus"); OKF("Power schedules from github.com/mboehme/aflfast"); -- cgit 1.4.1 From 67cbeeb395c7e0aa8820e79c92f5e8e1322f8be0 Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Mon, 6 Jan 2020 11:46:14 +0100 Subject: added ++ to copyright notes --- Makefile | 2 +- afl-cmin | 2 +- afl-plot | 2 +- afl-whatsup | 2 +- experimental/argv_fuzzing/Makefile | 2 +- experimental/argv_fuzzing/argv-fuzz-inl.h | 2 +- experimental/argv_fuzzing/argvfuzz.c | 2 +- experimental/asan_cgroups/limit_memory.sh | 2 +- experimental/canvas_harness/canvas_harness.html | 2 +- experimental/clang_asm_normalize/as | 2 +- experimental/crash_triage/triage_crashes.sh | 2 +- experimental/distributed_fuzzing/sync_script.sh | 2 +- experimental/persistent_demo/persistent_demo.c | 2 +- experimental/post_library/post_library.so.c | 2 +- experimental/post_library/post_library_png.so.c | 2 +- gcc_plugin/Makefile | 2 +- gcc_plugin/afl-gcc-fast.c | 2 +- gcc_plugin/afl-gcc-pass.so.cc | 2 +- gcc_plugin/afl-gcc-rt.o.c | 2 +- libdislocator/Makefile | 2 +- libdislocator/libdislocator.so.c | 2 +- libtokencap/Makefile | 2 +- libtokencap/libtokencap.so.c | 2 +- llvm_mode/Makefile | 2 +- llvm_mode/afl-clang-fast.c | 3 ++- llvm_mode/afl-llvm-pass.so.cc | 3 ++- llvm_mode/afl-llvm-rt.o.c | 3 ++- qemu_mode/build_qemu_support.sh | 2 +- qemu_mode/libcompcov/Makefile | 2 +- qemu_mode/unsigaction/Makefile | 2 +- src/afl-fuzz.c | 2 +- src/afl-gotcpu.c | 2 +- test-instr.c | 2 +- 33 files changed, 36 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/Makefile b/Makefile index 1bfa3f77..61d4318c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# american fuzzy lop - makefile +# american fuzzy lop++ - makefile # ----------------------------- # # Written by Michal Zalewski diff --git a/afl-cmin b/afl-cmin index e4e0fd85..471e4790 100755 --- a/afl-cmin +++ b/afl-cmin @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# american fuzzy lop - corpus minimization tool +# american fuzzy lop++ - corpus minimization tool # --------------------------------------------- # # Written by Michal Zalewski diff --git a/afl-plot b/afl-plot index b6108a09..51ed6787 100755 --- a/afl-plot +++ b/afl-plot @@ -1,6 +1,6 @@ #!/bin/sh # -# american fuzzy lop - Advanced Persistent Graphing +# american fuzzy lop++ - Advanced Persistent Graphing # ------------------------------------------------- # # Written by Michal Zalewski diff --git a/afl-whatsup b/afl-whatsup index 01f28aab..c31f0d22 100755 --- a/afl-whatsup +++ b/afl-whatsup @@ -1,6 +1,6 @@ #!/bin/sh # -# american fuzzy lop - status check tool +# american fuzzy lop++ - status check tool # -------------------------------------- # # Written by Michal Zalewski diff --git a/experimental/argv_fuzzing/Makefile b/experimental/argv_fuzzing/Makefile index 25b6f1f6..22e74f97 100644 --- a/experimental/argv_fuzzing/Makefile +++ b/experimental/argv_fuzzing/Makefile @@ -1,5 +1,5 @@ # -# american fuzzy lop - argvfuzz +# american fuzzy lop++ - argvfuzz # -------------------------------- # # Copyright 2019 Kjell Braden diff --git a/experimental/argv_fuzzing/argv-fuzz-inl.h b/experimental/argv_fuzzing/argv-fuzz-inl.h index 6b9be654..32c4bb3a 100644 --- a/experimental/argv_fuzzing/argv-fuzz-inl.h +++ b/experimental/argv_fuzzing/argv-fuzz-inl.h @@ -1,5 +1,5 @@ /* - american fuzzy lop - sample argv fuzzing wrapper + american fuzzy lop++ - sample argv fuzzing wrapper ------------------------------------------------ Written by Michal Zalewski diff --git a/experimental/argv_fuzzing/argvfuzz.c b/experimental/argv_fuzzing/argvfuzz.c index 65fb5e13..939bd540 100644 --- a/experimental/argv_fuzzing/argvfuzz.c +++ b/experimental/argv_fuzzing/argvfuzz.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - LD_PRELOAD for fuzzing argv in binaries + american fuzzy lop++ - LD_PRELOAD for fuzzing argv in binaries ------------------------------------------------------------ Copyright 2019 Kjell Braden diff --git a/experimental/asan_cgroups/limit_memory.sh b/experimental/asan_cgroups/limit_memory.sh index 97950410..ac3a90fe 100755 --- a/experimental/asan_cgroups/limit_memory.sh +++ b/experimental/asan_cgroups/limit_memory.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# american fuzzy lop - limit memory using cgroups +# american fuzzy lop++ - limit memory using cgroups # ----------------------------------------------- # # Written by Samir Khakimov and diff --git a/experimental/canvas_harness/canvas_harness.html b/experimental/canvas_harness/canvas_harness.html index 7b31d8b4..54583f70 100644 --- a/experimental/canvas_harness/canvas_harness.html +++ b/experimental/canvas_harness/canvas_harness.html @@ -1,7 +1,7 @@