diff --git a/Makefile b/Makefile index 6df3e538..29043a94 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # PROGNAME = afl -VERSION = 2.00b +VERSION = 2.01b PREFIX ?= /usr/local BIN_PATH = $(PREFIX)/bin @@ -22,7 +22,7 @@ HELPER_PATH = $(PREFIX)/lib/afl DOC_PATH = $(PREFIX)/share/doc/afl MISC_PATH = $(PREFIX)/share/afl -PROGS = afl-gcc afl-as afl-fuzz afl-showmap afl-tmin afl-gotcpu afl-analyze +PROGS = afl-gcc afl-fuzz afl-showmap afl-tmin afl-gotcpu afl-analyze SH_PROGS = afl-plot afl-cmin afl-whatsup CFLAGS ?= -O3 -funroll-loops @@ -42,7 +42,7 @@ endif COMM_HDR = alloc-inl.h config.h debug.h types.h -all: test_x86 $(PROGS) test_build all_done +all: test_x86 $(PROGS) afl-as test_build all_done ifndef AFL_NOX86 @@ -108,7 +108,7 @@ all_done: test_build .NOTPARALLEL: clean clean: - rm -f $(PROGS) as afl-g++ afl-clang afl-clang++ *.o *~ a.out core core.[1-9][0-9]* *.stackdump test .test test-instr .test-instr0 .test-instr1 qemu_mode/qemu-2.3.0.tar.bz2 afl-qemu-trace + rm -f $(PROGS) afl-as as afl-g++ afl-clang afl-clang++ *.o *~ a.out core core.[1-9][0-9]* *.stackdump test .test test-instr .test-instr0 .test-instr1 qemu_mode/qemu-2.3.0.tar.bz2 afl-qemu-trace rm -rf out_dir qemu_mode/qemu-2.3.0 $(MAKE) -C llvm_mode clean @@ -116,6 +116,7 @@ install: all mkdir -p -m 755 $${DESTDIR}$(BIN_PATH) $${DESTDIR}$(HELPER_PATH) $${DESTDIR}$(DOC_PATH) $${DESTDIR}$(MISC_PATH) rm -f $${DESTDIR}$(BIN_PATH)/afl-plot.sh install -m 755 $(PROGS) $(SH_PROGS) $${DESTDIR}$(BIN_PATH) + rm -f $${DESTDIR}$(BIN_PATH)/afl-as if [ -f afl-qemu-trace ]; then install -m 755 afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi if [ -f afl-clang-fast -a -f afl-llvm-pass.so -a -f afl-llvm-rt.o ]; then set -e; install -m 755 afl-clang-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang-fast++; install -m 755 afl-llvm-pass.so afl-llvm-rt.o $${DESTDIR}$(HELPER_PATH); fi set -e; for i in afl-g++ afl-clang afl-clang++; do ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/$$i; done diff --git a/afl-fuzz.c b/afl-fuzz.c index 0daa2677..8c05558a 100644 --- a/afl-fuzz.c +++ b/afl-fuzz.c @@ -643,6 +643,8 @@ static void add_to_queue(u8* fname, u32 len, u8 passed_det) { queued_paths++; pending_not_fuzzed++; + cycles_wo_finds = 0; + if (!(queued_paths % 100)) { q_prev100->next_100 = q; diff --git a/docs/ChangeLog b/docs/ChangeLog index 14bef0b5..7a835cc7 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -16,6 +16,17 @@ Not sure if you should upgrade? The lowest currently recommended version is 1.92b. If you're stuck on an earlier release, it's strongly advisable to get on with the times. +-------------- +Version 2.01b: +-------------- + + - Made an improvement to cycle counter color coding, based on feedback + from Shai Sarfaty. + + - Added a mention of aflize to sister_projects.txt. + + - Fixed an installation issue with afl-as, as spotted by ilovezfs. + -------------- Version 2.00b: -------------- diff --git a/docs/sister_projects.txt b/docs/sister_projects.txt index 90d70a76..6d272c2f 100644 --- a/docs/sister_projects.txt +++ b/docs/sister_projects.txt @@ -157,6 +157,13 @@ RecidiVM (Jakub Wilk) http://jwilk.net/software/recidivm +aflize (Jacek Wielemborek) +-------------------------- + + Automatically build AFL-enabled versions of Debian packages. + + https://github.com/d33tah/aflize + ------------------------------- Narrow-purpose or experimental: -------------------------------