diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | docs/ChangeLog | 2 | ||||
| -rw-r--r-- | llvm_mode/Makefile | 3 | ||||
| -rw-r--r-- | llvm_mode/afl-clang-fast.c | 5 | ||||
| -rwxr-xr-x | test/test.sh | 2 | ||||
| -rw-r--r-- | unicorn_mode/README.md | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/TODO b/TODO index 4e602592..8a8fdd41 100644 --- a/TODO +++ b/TODO @@ -2,9 +2,6 @@ Roadmap 2.61+: ============== -llvm_mode: - - hard-code the clang/clang++ with -D from the Makefile via llvm-config values - gcc_plugin: - laf-intel - better instrumentation diff --git a/docs/ChangeLog b/docs/ChangeLog index d3b27e35..f034d251 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -19,6 +19,8 @@ Version ++2.60d (develop): - afl-fuzz: - now prints the real python version support compiled in + - afl-clang-fast now shows in the help output for which llvm version it + was compiled for. - added fix from Debian project to compile libdislocator and libtokencap diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile index 0e290ffc..ebe6b9de 100644 --- a/llvm_mode/Makefile +++ b/llvm_mode/Makefile @@ -67,7 +67,8 @@ endif CFLAGS ?= -O3 -funroll-loops CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign -I ../include/ \ -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \ - -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" + -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" \ + -DLLVM_VERSION=\"$(LLVMVER)\" ifdef AFL_TRACE_PC CFLAGS += -DUSE_TRACE_PC=1 endif diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c index 6d40bb4c..2b359cdf 100644 --- a/llvm_mode/afl-clang-fast.c +++ b/llvm_mode/afl-clang-fast.c @@ -443,8 +443,9 @@ int main(int argc, char** argv) { "You can specify custom next-stage toolchain via AFL_CC and AFL_CXX. " "Setting\n" - "AFL_HARDEN enables hardening optimizations in the compiled code.\n\n", - BIN_PATH, BIN_PATH); + "AFL_HARDEN enables hardening optimizations in the compiled code.\n\n" + "afl-clang-fast was built for llvm %s with the llvm binary path of \"%s\".\n\n", + BIN_PATH, BIN_PATH, LLVM_VERSION, LLVM_BINDIR); exit(1); diff --git a/test/test.sh b/test/test.sh index 86a76529..51b53de4 100755 --- a/test/test.sh +++ b/test/test.sh @@ -157,7 +157,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" && { $ECHO "$RED[!] afl-cmin did not correctly minimize testcase numbers" CODE=1 } - ../afl-tmin -i in/in2 -o in2/in2 -- ./test-instr.plain > /dev/null 2>&1 + ../afl-tmin -m200 -i in/in2 -o in2/in2 -- ./test-instr.plain > /dev/null 2>&1 SIZE=`ls -l in2/in2 2> /dev/null | awk '{print$5}'` test "$SIZE" = 1 && $ECHO "$GREEN[+] afl-tmin correctly minimized the testcase" test "$SIZE" = 1 || { diff --git a/unicorn_mode/README.md b/unicorn_mode/README.md index e6d3dfcf..07dca451 100644 --- a/unicorn_mode/README.md +++ b/unicorn_mode/README.md @@ -93,7 +93,7 @@ comes with a sub-instruction based instrumentation similar in purpose to laf-int The options that enable Unicorn CompareCoverage are the same used for QEMU. AFL_COMPCOV_LEVEL=1 is to instrument comparisons with only immediate -values. QEMU_COMPCOV_LEVEL=2 instruments all +values. AFL_COMPCOV_LEVEL=2 instruments all comparison instructions. Comparison instructions are currently instrumented only for the x86, x86_64 and ARM targets. |