diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/afl-forkserver.c | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/Makefile b/Makefile index 455facf2..5b29906a 100644 --- a/Makefile +++ b/Makefile @@ -213,7 +213,7 @@ clean: $(MAKE) -C qemu_mode/libcompcov clean %.8: % - @echo .TH $* 8 `date --iso-8601` "afl++" > $@ + @echo .TH $* 8 `date -I` "afl++" > $@ @echo .SH NAME >> $@ @echo .B $* >> $@ @echo >> $@ @@ -253,8 +253,8 @@ endif set -e; ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/afl-g++ 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 $(MAN_PATH) - install -m0644 -D *.8 $(MAN_PATH) + mkdir -m 0755 -p ${DESTDIR}$(MAN_PATH) + install -m0644 -D *.8 ${DESTDIR}$(MAN_PATH) install -m 755 afl-as $${DESTDIR}$(HELPER_PATH) ln -sf afl-as $${DESTDIR}$(HELPER_PATH)/as diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c index f2f3c0f0..64b8430d 100644 --- a/src/afl-forkserver.c +++ b/src/afl-forkserver.c @@ -40,12 +40,18 @@ #include <sys/wait.h> #include <sys/resource.h> +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#define HAVE_ARC4RANDOM 1 +#endif /* __APPLE__ || __FreeBSD__ || __OpenBSD__ */ + /* a program that includes afl-forkserver needs to define these */ extern u8 uses_asan; extern u8 *trace_bits; extern s32 forksrv_pid, child_pid, fsrv_ctl_fd, fsrv_st_fd; -extern s32 out_fd, out_dir_fd, dev_urandom_fd, - dev_null_fd; /* initialize these with -1 */ +extern s32 out_fd, out_dir_fd, dev_null_fd; /* initialize these with -1 */ +#ifndef HAVE_ARC4RANDOM +extern s32 dev_random_fd; +#endif extern u32 exec_tmout; extern u64 mem_limit; extern u8 * out_file, *target_path, *doc_path; @@ -232,7 +238,9 @@ void init_forkserver(char **argv) { close(out_dir_fd); close(dev_null_fd); +#ifndef HAVE_ARC4RANDOM close(dev_urandom_fd); +#endif close(plot_file == NULL ? -1 : fileno(plot_file)); /* This should improve performance a bit, since it stops the linker from |