aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--infra/base-images/base-builder/Dockerfile2
-rw-r--r--infra/base-images/base-builder/compile_afl4
2 files changed, 4 insertions, 2 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 475e5a7d..52e2b426 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -125,7 +125,7 @@ WORKDIR $SRC
# TODO: switch to -b stable once we can.
RUN git clone https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \
cd aflplusplus && \
- git checkout 5525f8c9ef8bb879dadd0eb942d524827d1b0362
+ git checkout 52dd5d479d411460c8cf2010a89f72e269d799ea
RUN cd $SRC && \
curl -L -O https://github.com/google/honggfuzz/archive/oss-fuzz.tar.gz && \
diff --git a/infra/base-images/base-builder/compile_afl b/infra/base-images/base-builder/compile_afl
index a9e5ae25..6a834143 100644
--- a/infra/base-images/base-builder/compile_afl
+++ b/infra/base-images/base-builder/compile_afl
@@ -37,6 +37,9 @@ export ASAN_OPTIONS="detect_leaks=0:symbolize=0:detect_odr_violation=0:abort_on_
# No complain on unknown AFL environment variables
export AFL_IGNORE_UNKNOWN_ENVS=1
+# To not use AFL++'s afl-cc compiler but clang sancov, set this to 1:
+export AFL_LLVM_MODE_WORKAROUND=0
+
# To analyze build failures and set specific AFL++ settings, set
# `export AFL_SKIP_OSSFUZZ=1`
# The 'env|grep' setup ensures we do not trigger the linter.
@@ -44,7 +47,6 @@ env | egrep -q '^AFL_SKIP_OSSFUZZ=' || {
# The variables need to be set to "1" here - or before running this script.
# AFL++ configuration options.
- export AFL_LLVM_MODE_WORKAROUND=0
export AFL_ENABLE_DICTIONARY=0
export AFL_ENABLE_CMPLOG=1
export AFL_LAF_CHANCE=5