diff options
| author | hexcoder- <heiko@hexco.de> | 2020-01-07 07:12:05 +0100 |
|---|---|---|
| committer | hexcoder- <heiko@hexco.de> | 2020-01-07 07:12:05 +0100 |
| commit | f88910755b280fdd8681dfcfff62d76a4fc416e5 (patch) | |
| tree | 320e534c6b347b9289eb0f43538f8ff132cf44d6 | |
| parent | d176c59ea28c3830dce2b7aa5ac404bbd769420b (diff) | |
| parent | b2bee5c32a4bd4d7b063f1189ac71a9658114f71 (diff) | |
| download | afl++-f88910755b280fdd8681dfcfff62d76a4fc416e5.tar.gz | |
Merge branch 'master' of https://github.com/vanhauser-thc/AFLplusplus
39 files changed, 89 insertions, 81 deletions
@@ -129,6 +129,7 @@ cc_library_static { vendor_available: true, host_supported: true, recovery_available: true, + sdk_version: "9", defaults: [ "afl-defaults", @@ -1,8 +1,8 @@ # -# american fuzzy lop - makefile +# american fuzzy lop++ - makefile # ----------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved. # @@ -400,7 +400,7 @@ endif set -e; if [ -f afl-clang-fast ] ; then ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang ; ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang++ ; else ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/afl-clang ; ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/afl-clang++; fi mkdir -m 0755 -p ${DESTDIR}$(MAN_PATH) - install -m0644 -D *.8 ${DESTDIR}$(MAN_PATH) + install -m0644 *.8 ${DESTDIR}$(MAN_PATH) install -m 755 afl-as $${DESTDIR}$(HELPER_PATH) ln -sf afl-as $${DESTDIR}$(HELPER_PATH)/as @@ -1,9 +1,9 @@ #!/usr/bin/env sh # -# american fuzzy lop - corpus minimization tool +# american fuzzy lop++ - corpus minimization tool # --------------------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2014, 2015 Google Inc. All rights reserved. # @@ -1,9 +1,9 @@ #!/bin/sh # -# american fuzzy lop - Advanced Persistent Graphing +# 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 01f28aab..6a8c5669 100755 --- a/afl-whatsup +++ b/afl-whatsup @@ -1,11 +1,12 @@ #!/bin/sh # -# american fuzzy lop - status check tool -# -------------------------------------- +# 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/docs/ChangeLog b/docs/ChangeLog index 745f2587..d3b27e35 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -17,8 +17,9 @@ sending a mail to <afl-users+subscribe@googlegroups.com>. Version ++2.60d (develop): -------------------------- - - exciting new stuff is coming up :-) - - all the best for the new year! + - afl-fuzz: + - now prints the real python version support compiled in + - added fix from Debian project to compile libdislocator and libtokencap -------------------------- diff --git a/experimental/argv_fuzzing/Makefile b/experimental/argv_fuzzing/Makefile index 917b24bc..7f9378e8 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-2020 Kjell Braden <afflux@pentabarf.de> diff --git a/experimental/argv_fuzzing/argv-fuzz-inl.h b/experimental/argv_fuzzing/argv-fuzz-inl.h index 6b9be654..4d880020 100644 --- a/experimental/argv_fuzzing/argv-fuzz-inl.h +++ b/experimental/argv_fuzzing/argv-fuzz-inl.h @@ -1,8 +1,8 @@ /* - american fuzzy lop - sample argv fuzzing wrapper + 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/argv_fuzzing/argvfuzz.c b/experimental/argv_fuzzing/argvfuzz.c index 1e1c3822..4251ca4c 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-2020 Kjell Braden <afflux@pentabarf.de> 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 <samir.hakim@nyu.edu> and diff --git a/experimental/canvas_harness/canvas_harness.html b/experimental/canvas_harness/canvas_harness.html index 7b31d8b4..a37b6937 100644 --- a/experimental/canvas_harness/canvas_harness.html +++ b/experimental/canvas_harness/canvas_harness.html @@ -1,10 +1,10 @@ <html> <!-- - american fuzzy lop - <canvas> harness + 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 bd83c4ff..45537cae 100755 --- a/experimental/clang_asm_normalize/as +++ b/experimental/clang_asm_normalize/as @@ -1,9 +1,9 @@ #!/bin/sh # -# american fuzzy lop - clang assembly normalizer +# 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 205bc143..6d026d61 100755 --- a/experimental/crash_triage/triage_crashes.sh +++ b/experimental/crash_triage/triage_crashes.sh @@ -1,9 +1,9 @@ #!/bin/sh # -# american fuzzy lop - crash triage utility +# 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 31b0e436..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 -# ------------------------------------------------ +# 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 d8d59905..7d8638fb 100644 --- a/experimental/persistent_demo/persistent_demo.c +++ b/experimental/persistent_demo/persistent_demo.c @@ -1,8 +1,8 @@ /* - american fuzzy lop - persistent mode example + 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 90d45e3f..487b9a6d 100644 --- a/experimental/post_library/post_library.so.c +++ b/experimental/post_library/post_library.so.c @@ -1,8 +1,8 @@ /* - american fuzzy lop - postprocessor library example + 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 093c6022..43cb1101 100644 --- a/experimental/post_library/post_library_png.so.c +++ b/experimental/post_library/post_library_png.so.c @@ -1,8 +1,8 @@ /* - american fuzzy lop - postprocessor for PNG + 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 b6b44a98..9ad5c382 100644 --- a/gcc_plugin/Makefile +++ b/gcc_plugin/Makefile @@ -1,5 +1,5 @@ # -# american fuzzy lop - GCC plugin instrumentation +# american fuzzy lop++ - GCC plugin instrumentation # ----------------------------------------------- # # Written by Austin Seipp <aseipp@pobox.com> and @@ -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/gcc_plugin/afl-gcc-fast.c b/gcc_plugin/afl-gcc-fast.c index 9536bdf6..3117ccf0 100644 --- a/gcc_plugin/afl-gcc-fast.c +++ b/gcc_plugin/afl-gcc-fast.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - GCC wrapper for GCC plugin + american fuzzy lop++ - GCC wrapper for GCC plugin ------------------------------------------------ Written by Austin Seipp <aseipp@pobox.com> and diff --git a/gcc_plugin/afl-gcc-pass.so.cc b/gcc_plugin/afl-gcc-pass.so.cc index dbf5914f..f77af5fa 100644 --- a/gcc_plugin/afl-gcc-pass.so.cc +++ b/gcc_plugin/afl-gcc-pass.so.cc @@ -8,7 +8,7 @@ // /* - american fuzzy lop - GCC instrumentation pass + american fuzzy lop++ - GCC instrumentation pass --------------------------------------------- Written by Austin Seipp <aseipp@pobox.com> with bits from diff --git a/gcc_plugin/afl-gcc-rt.o.c b/gcc_plugin/afl-gcc-rt.o.c index 37cdbeb3..1831f935 100644 --- a/gcc_plugin/afl-gcc-rt.o.c +++ b/gcc_plugin/afl-gcc-rt.o.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - GCC plugin instrumentation bootstrap + american fuzzy lop++ - GCC plugin instrumentation bootstrap --------------------------------------------------------- Written by Austin Seipp <aseipp@pobox.com> and diff --git a/include/hash.h b/include/hash.h index 1a8ac252..5d00f3e5 100644 --- a/include/hash.h +++ b/include/hash.h @@ -15,6 +15,7 @@ Other code written by Michal Zalewski Copyright 2016 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 dae187e5..07d98a0d 100644 --- a/libdislocator/Makefile +++ b/libdislocator/Makefile @@ -1,8 +1,8 @@ # -# american fuzzy lop - libdislocator +# american fuzzy lop++ - libdislocator # ---------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2016 Google Inc. All rights reserved. # @@ -18,8 +18,8 @@ HELPER_PATH = $(PREFIX)/lib/afl VERSION = $(shell grep '^\#define VERSION ' ../config.h | cut -d '"' -f2) -CFLAGS ?= -O3 -funroll-loops -I ../include/ -CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign +CFLAGS ?= -O3 -funroll-loops +CFLAGS += -I ../include/ -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign ifdef USEHUGEPAGE CFLAGS += -DUSEHUGEPAGE diff --git a/libdislocator/libdislocator.so.c b/libdislocator/libdislocator.so.c index 0eb3f628..20649470 100644 --- a/libdislocator/libdislocator.so.c +++ b/libdislocator/libdislocator.so.c @@ -1,11 +1,12 @@ /* - american fuzzy lop - dislocator, an abusive allocator + 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. 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/libtokencap/Makefile b/libtokencap/Makefile index 3ecbf471..0253d3d1 100644 --- a/libtokencap/Makefile +++ b/libtokencap/Makefile @@ -1,8 +1,8 @@ # -# american fuzzy lop - libtokencap +# american fuzzy lop++ - libtokencap # -------------------------------- # -# Written by Michal Zalewski +# Originally written by Michal Zalewski # # Copyright 2016 Google Inc. All rights reserved. # @@ -18,8 +18,8 @@ HELPER_PATH = $(PREFIX)/lib/afl VERSION = $(shell grep '^\#define VERSION ' ../config.h | cut -d '"' -f2) -CFLAGS ?= -O3 -funroll-loops -I ../include/ -CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign +CFLAGS ?= -O3 -funroll-loops +CFLAGS += -I ../include/ -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign ifeq "$(shell uname)" "Linux" TARGETS = libtokencap.so diff --git a/libtokencap/libtokencap.so.c b/libtokencap/libtokencap.so.c index 5abed0f6..b6ef05f3 100644 --- a/libtokencap/libtokencap.so.c +++ b/libtokencap/libtokencap.so.c @@ -1,11 +1,12 @@ /* - american fuzzy lop - extract tokens passed to strcmp / memcmp + 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. 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/llvm_mode/Makefile b/llvm_mode/Makefile index 0e3da147..0e290ffc 100644 --- a/llvm_mode/Makefile +++ b/llvm_mode/Makefile @@ -1,5 +1,5 @@ # -# american fuzzy lop - LLVM instrumentation +# american fuzzy lop++ - LLVM instrumentation # ----------------------------------------- # # Written by Laszlo Szekeres <lszekeres@google.com> and @@ -261,5 +261,5 @@ vpath % .. ln -sf afl-clang-fast.8 ../afl-clang-fast++.8 clean: - rm -f *.o *.so *~ a.out core core.[1-9][0-9]* .test2 test-instr .test-instr0 .test-instr1 + rm -f *.o *.so *~ a.out core core.[1-9][0-9]* .test2 test-instr .test-instr0 .test-instr1 afl-llvm-pass.dwo rm -f $(PROGS) ../afl-clang-fast++ ../afl-clang-fast*.8 diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c index a1da83b2..6d40bb4c 100644 --- a/llvm_mode/afl-clang-fast.c +++ b/llvm_mode/afl-clang-fast.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - LLVM-mode wrapper for clang + american fuzzy lop++ - LLVM-mode wrapper for clang ------------------------------------------------ Written by Laszlo Szekeres <lszekeres@google.com> and @@ -8,6 +8,7 @@ LLVM integration design comes from Laszlo Szekeres. Copyright 2015, 2016 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/llvm_mode/afl-llvm-pass.so.cc b/llvm_mode/afl-llvm-pass.so.cc index 1601a4f8..a2753a6b 100644 --- a/llvm_mode/afl-llvm-pass.so.cc +++ b/llvm_mode/afl-llvm-pass.so.cc @@ -1,5 +1,5 @@ /* - american fuzzy lop - LLVM-mode instrumentation pass + american fuzzy lop++ - LLVM-mode instrumentation pass --------------------------------------------------- Written by Laszlo Szekeres <lszekeres@google.com> and @@ -9,6 +9,7 @@ from afl-as.c are Michal's fault. Copyright 2015, 2016 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/llvm_mode/afl-llvm-rt.o.c b/llvm_mode/afl-llvm-rt.o.c index 5740fe42..a5602501 100644 --- a/llvm_mode/afl-llvm-rt.o.c +++ b/llvm_mode/afl-llvm-rt.o.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - LLVM instrumentation bootstrap + american fuzzy lop++ - LLVM instrumentation bootstrap --------------------------------------------------- Written by Laszlo Szekeres <lszekeres@google.com> and @@ -8,6 +8,7 @@ LLVM integration design comes from Laszlo Szekeres. Copyright 2015, 2016 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/qemu_mode/build_qemu_support.sh b/qemu_mode/build_qemu_support.sh index 2c8cef3d..6f2bc448 100755 --- a/qemu_mode/build_qemu_support.sh +++ b/qemu_mode/build_qemu_support.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# american fuzzy lop - QEMU build script +# american fuzzy lop++ - QEMU build script # -------------------------------------- # # Originally written by Andrew Griffiths <agriffiths@google.com> and diff --git a/qemu_mode/libcompcov/Makefile b/qemu_mode/libcompcov/Makefile index 5a796587..07bab99d 100644 --- a/qemu_mode/libcompcov/Makefile +++ b/qemu_mode/libcompcov/Makefile @@ -1,5 +1,5 @@ # -# american fuzzy lop - libcompcov +# american fuzzy lop++ - libcompcov # -------------------------------- # # Written by Andrea Fioraldi <andreafioraldi@gmail.com> diff --git a/qemu_mode/unsigaction/Makefile b/qemu_mode/unsigaction/Makefile index def1a780..31fa8c55 100644 --- a/qemu_mode/unsigaction/Makefile +++ b/qemu_mode/unsigaction/Makefile @@ -1,5 +1,5 @@ # -# american fuzzy lop - unsigaction +# american fuzzy lop++ - unsigaction # -------------------------------- # # Written by Andrea Fioraldi <andreafioraldi@gmail.com> diff --git a/qemu_mode/unsigaction/README.md b/qemu_mode/unsigaction/README.md index 0f3707fd..db7eac83 100644 --- a/qemu_mode/unsigaction/README.md +++ b/qemu_mode/unsigaction/README.md @@ -1,7 +1,7 @@ -# unsigation +# unsigaction -This library disable sigaction when preloaded. +This library disables sigaction handlers when preloaded. Mainly needed by Wine mode but can be used as a separate tool. -A similar solution can be found in is [preeny](https://github.com/zardus/preeny). +A similar solution can be found in [preeny](https://github.com/zardus/preeny). diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index 4d1ac541..74123300 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -482,6 +482,8 @@ 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,13 +543,10 @@ 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; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } @@ -557,13 +556,10 @@ 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; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } @@ -2266,13 +2262,10 @@ 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; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index f3927d4e..0af8b35f 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - fuzzer code + american fuzzy lop++ - fuzzer code -------------------------------- Originally written by Michal Zalewski @@ -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); @@ -591,7 +592,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"); diff --git a/src/afl-gotcpu.c b/src/afl-gotcpu.c index 21785a9e..9a56159c 100644 --- a/src/afl-gotcpu.c +++ b/src/afl-gotcpu.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - free CPU gizmo + american fuzzy lop++ - free CPU gizmo ----------------------------------- Originally written by Michal Zalewski diff --git a/test-instr.c b/test-instr.c index 0b58eec0..ddfd3695 100644 --- a/test-instr.c +++ b/test-instr.c @@ -1,10 +1,11 @@ /* - american fuzzy lop - a trivial program to test the build + 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. diff --git a/test/test.sh b/test/test.sh index 44cced08..86a76529 100755 --- a/test/test.sh +++ b/test/test.sh @@ -13,6 +13,8 @@ OK=OK diff -q test.1 test.2 >/dev/null 2>&1 || OK= rm -f test.1 test.2 test -z "$OK" && { echo Error: diff -q is not working ; exit 1 ; } +test -z "$LLVM_CONFIG" && LLVM_CONFIG=llvm-config + ECHO="printf %b\\n" $ECHO \\101 2>&1 | grep -qE '^A' || { @@ -179,7 +181,7 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && { if which clang >/dev/null; then export AFL_CC=`which clang` else - export AFL_CC=`llvm-config --bindir`/clang + export AFL_CC=`$LLVM_CONFIG --bindir`/clang fi ../afl-clang-fast -o test-instr.plain ../test-instr.c > /dev/null 2>&1 AFL_HARDEN=1 ../afl-clang-fast -o test-compcov.harden test-compcov.c > /dev/null 2>&1 |