diff options
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | afl-cmin | 2 | ||||
-rwxr-xr-x | afl-plot | 2 | ||||
-rwxr-xr-x | afl-whatsup | 5 | ||||
-rw-r--r-- | experimental/argv_fuzzing/argv-fuzz-inl.h | 2 | ||||
-rw-r--r-- | experimental/canvas_harness/canvas_harness.html | 2 | ||||
-rwxr-xr-x | experimental/clang_asm_normalize/as | 2 | ||||
-rwxr-xr-x | experimental/crash_triage/triage_crashes.sh | 2 | ||||
-rwxr-xr-x | experimental/distributed_fuzzing/sync_script.sh | 5 | ||||
-rw-r--r-- | experimental/persistent_demo/persistent_demo.c | 2 | ||||
-rw-r--r-- | experimental/post_library/post_library.so.c | 2 | ||||
-rw-r--r-- | experimental/post_library/post_library_png.so.c | 2 | ||||
-rw-r--r-- | gcc_plugin/Makefile | 1 | ||||
-rw-r--r-- | libdislocator/Makefile | 2 | ||||
-rw-r--r-- | libdislocator/libdislocator.so.c | 2 | ||||
-rw-r--r-- | libtokencap/Makefile | 2 | ||||
-rw-r--r-- | libtokencap/libtokencap.so.c | 2 | ||||
-rw-r--r-- | src/afl-fuzz-one.c | 15 | ||||
-rw-r--r-- | src/afl-fuzz.c | 3 | ||||
-rw-r--r-- | test-instr.c | 3 |
20 files changed, 32 insertions, 28 deletions
diff --git a/Makefile b/Makefile index 1d64d9f8..4a498a66 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # american fuzzy lop++ - makefile # ----------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved. # diff --git a/afl-cmin b/afl-cmin index 471e4790..60fc7016 100755 --- a/afl-cmin +++ b/afl-cmin @@ -3,7 +3,7 @@ # american fuzzy lop++ - corpus minimization tool # --------------------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2014, 2015 Google Inc. All rights reserved. # diff --git a/afl-plot b/afl-plot index 51ed6787..d99abff0 100755 --- a/afl-plot +++ b/afl-plot @@ -3,7 +3,7 @@ # american fuzzy lop++ - Advanced Persistent Graphing # ------------------------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # Based on a design & prototype by Michael Rash. # # Copyright 2014, 2015 Google Inc. All rights reserved. diff --git a/afl-whatsup b/afl-whatsup index c31f0d22..6a8c5669 100755 --- a/afl-whatsup +++ b/afl-whatsup @@ -1,11 +1,12 @@ #!/bin/sh # # american fuzzy lop++ - status check tool -# -------------------------------------- +# ---------------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2015 Google Inc. All rights reserved. +# Copyright 2019-2020 AFLplusplus Project. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/experimental/argv_fuzzing/argv-fuzz-inl.h b/experimental/argv_fuzzing/argv-fuzz-inl.h index 32c4bb3a..4d880020 100644 --- a/experimental/argv_fuzzing/argv-fuzz-inl.h +++ b/experimental/argv_fuzzing/argv-fuzz-inl.h @@ -2,7 +2,7 @@ american fuzzy lop++ - sample argv fuzzing wrapper ------------------------------------------------ - Written by Michal Zalewski + Originally written by Michal Zalewski Copyright 2015 Google Inc. All rights reserved. diff --git a/experimental/canvas_harness/canvas_harness.html b/experimental/canvas_harness/canvas_harness.html index 54583f70..a37b6937 100644 --- a/experimental/canvas_harness/canvas_harness.html +++ b/experimental/canvas_harness/canvas_harness.html @@ -4,7 +4,7 @@ american fuzzy lop++ - <canvas> harness ------------------------------------- - Written by Michal Zalewski + Originally written by Michal Zalewski Copyright 2013, 2014 Google Inc. All rights reserved. diff --git a/experimental/clang_asm_normalize/as b/experimental/clang_asm_normalize/as index ecbc8f24..45537cae 100755 --- a/experimental/clang_asm_normalize/as +++ b/experimental/clang_asm_normalize/as @@ -3,7 +3,7 @@ # american fuzzy lop++ - clang assembly normalizer # ---------------------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # The idea for this wrapper comes from Ryan Govostes. # # Copyright 2013, 2014 Google Inc. All rights reserved. diff --git a/experimental/crash_triage/triage_crashes.sh b/experimental/crash_triage/triage_crashes.sh index 8e84c1eb..6d026d61 100755 --- a/experimental/crash_triage/triage_crashes.sh +++ b/experimental/crash_triage/triage_crashes.sh @@ -3,7 +3,7 @@ # american fuzzy lop++ - crash triage utility # ----------------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2013, 2014, 2017 Google Inc. All rights reserved. # diff --git a/experimental/distributed_fuzzing/sync_script.sh b/experimental/distributed_fuzzing/sync_script.sh index b300d7a2..c45ae69b 100755 --- a/experimental/distributed_fuzzing/sync_script.sh +++ b/experimental/distributed_fuzzing/sync_script.sh @@ -1,11 +1,12 @@ #!/bin/sh # # american fuzzy lop++ - fuzzer synchronization tool -# ------------------------------------------------ +# -------------------------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2014 Google Inc. All rights reserved. +# Copyright 2019-2020 AFLplusplus Project. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/experimental/persistent_demo/persistent_demo.c b/experimental/persistent_demo/persistent_demo.c index ab0d879c..7d8638fb 100644 --- a/experimental/persistent_demo/persistent_demo.c +++ b/experimental/persistent_demo/persistent_demo.c @@ -2,7 +2,7 @@ american fuzzy lop++ - persistent mode example -------------------------------------------- - Written by Michal Zalewski + Originally written by Michal Zalewski Copyright 2015 Google Inc. All rights reserved. diff --git a/experimental/post_library/post_library.so.c b/experimental/post_library/post_library.so.c index acc5fa2c..487b9a6d 100644 --- a/experimental/post_library/post_library.so.c +++ b/experimental/post_library/post_library.so.c @@ -2,7 +2,7 @@ american fuzzy lop++ - postprocessor library example -------------------------------------------------- - Written by Michal Zalewski + Originally written by Michal Zalewski Copyright 2015 Google Inc. All rights reserved. diff --git a/experimental/post_library/post_library_png.so.c b/experimental/post_library/post_library_png.so.c index 4ab325e5..43cb1101 100644 --- a/experimental/post_library/post_library_png.so.c +++ b/experimental/post_library/post_library_png.so.c @@ -2,7 +2,7 @@ american fuzzy lop++ - postprocessor for PNG ------------------------------------------ - Written by Michal Zalewski + Originally written by Michal Zalewski Copyright 2015 Google Inc. All rights reserved. diff --git a/gcc_plugin/Makefile b/gcc_plugin/Makefile index 156dd023..9ad5c382 100644 --- a/gcc_plugin/Makefile +++ b/gcc_plugin/Makefile @@ -11,6 +11,7 @@ # from Laszlo Szekeres. # # Copyright 2015 Google Inc. All rights reserved. +# Copyright 2019-2020 AFLplusplus Project. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/libdislocator/Makefile b/libdislocator/Makefile index a7507918..07d98a0d 100644 --- a/libdislocator/Makefile +++ b/libdislocator/Makefile @@ -2,7 +2,7 @@ # american fuzzy lop++ - libdislocator # ---------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2016 Google Inc. All rights reserved. # diff --git a/libdislocator/libdislocator.so.c b/libdislocator/libdislocator.so.c index 326fda26..20649470 100644 --- a/libdislocator/libdislocator.so.c +++ b/libdislocator/libdislocator.so.c @@ -3,7 +3,7 @@ american fuzzy lop++ - dislocator, an abusive allocator ----------------------------------------------------- - Written by Michal Zalewski + Originally written by Michal Zalewski Copyright 2016 Google Inc. All rights reserved. Copyright 2019-2020 AFLplusplus Project. All rights reserved. diff --git a/libtokencap/Makefile b/libtokencap/Makefile index 858f0dcb..0253d3d1 100644 --- a/libtokencap/Makefile +++ b/libtokencap/Makefile @@ -2,7 +2,7 @@ # american fuzzy lop++ - libtokencap # -------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2016 Google Inc. All rights reserved. # diff --git a/libtokencap/libtokencap.so.c b/libtokencap/libtokencap.so.c index aa02094b..b6ef05f3 100644 --- a/libtokencap/libtokencap.so.c +++ b/libtokencap/libtokencap.so.c @@ -3,7 +3,7 @@ american fuzzy lop++ - extract tokens passed to strcmp / memcmp ------------------------------------------------------------- - Written by Michal Zalewski + Originally written by Michal Zalewski Copyright 2016 Google Inc. All rights reserved. Copyright 2019-2020 AFLplusplus Project. All rights reserved. diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index 87a1418c..74123300 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -482,8 +482,7 @@ u8 fuzz_one_original(char** argv) { if (use_radamsa > 1) goto radamsa_stage; - -//custom_stage: // not used - yet + // custom_stage: // not used - yet if (custom_mutator) { @@ -545,9 +544,9 @@ u8 fuzz_one_original(char** argv) { queue_cur->passed_det) { #ifdef USE_PYTHON - goto python_stage; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } @@ -558,9 +557,9 @@ u8 fuzz_one_original(char** argv) { if (master_max && (queue_cur->exec_cksum % master_max) != master_id - 1) { #ifdef USE_PYTHON - goto python_stage; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } @@ -2264,9 +2263,9 @@ retry_splicing: memcpy(out_buf, in_buf, len); #ifdef USE_PYTHON - goto python_stage; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index e75ab48a..0af8b35f 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -144,7 +144,8 @@ static void usage(u8* argv0) { argv0, EXEC_TIMEOUT, MEM_LIMIT); #ifdef USE_PYTHON - SAYF("Compiled with Python %s module support, see docs/python_mutators.txt\n", (char*)PYTHON_VERSION); + SAYF("Compiled with Python %s module support, see docs/python_mutators.txt\n", + (char*)PYTHON_VERSION); #endif SAYF("For additional help please consult %s/README.md\n\n", doc_path); diff --git a/test-instr.c b/test-instr.c index 7d59fd9c..ddfd3695 100644 --- a/test-instr.c +++ b/test-instr.c @@ -2,9 +2,10 @@ american fuzzy lop++ - a trivial program to test the build -------------------------------------------------------- - Written by Michal Zalewski + Originally written by Michal Zalewski Copyright 2014 Google Inc. All rights reserved. + Copyright 2019-2020 AFLplusplus Project. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. |