new afl++ experiment (google#1788)

lots of cleanup and new experiment
ardier · Mar 20, 2023 · bfde026 · bfde026
1 parent 6d20876
commit bfde026
Show file tree

Hide file tree

Showing 82 changed files with 31 additions and 6,018 deletions.
diff --git a/fuzzers/aflplusplus/builder.Dockerfile b/fuzzers/aflplusplus/builder.Dockerfile
@@ -37,7 +37,7 @@ RUN apt-get update && \
 # Download afl++.
 RUN git clone -b dev https://github.com/AFLplusplus/AFLplusplus /afl && \
     cd /afl && \
-    git checkout 30483919eb65f6301dbbba7762e28a6d21972571 || \
+    git checkout d80cedcf02f56351bb08e7520ddcd76b0ff3f84e || \
     true
 
 # Build without Python support as we don't need it.

diff --git a/...s/aflplusplus_025f617d/builder.Dockerfile → fuzzers/aflplusplus_405c/builder.Dockerfile b/...s/aflplusplus_025f617d/builder.Dockerfile → fuzzers/aflplusplus_405c/builder.Dockerfile
@@ -37,7 +37,7 @@ RUN apt-get update && \
 # Download afl++.
 RUN git clone -b dev https://github.com/AFLplusplus/AFLplusplus /afl && \
     cd /afl && \
-    git checkout 025f617d6a9b0259dd4110107de093175d995dda || \
+    git checkout 05cc21e9d68bcf9ddf00ad0c8e97c0dc253a4b8e || \
     true
 
 # Build without Python support as we don't need it.

diff --git a/fuzzers/aflplusplus_025f617d/description.md → fuzzers/aflplusplus_405c/description.md b/fuzzers/aflplusplus_025f617d/description.md → fuzzers/aflplusplus_405c/description.md
diff --git a/fuzzers/aflplusplus_class/fuzzer.py → fuzzers/aflplusplus_405c/fuzzer.py b/fuzzers/aflplusplus_class/fuzzer.py → fuzzers/aflplusplus_405c/fuzzer.py
@@ -116,6 +116,7 @@ def build(*args):  # pylint: disable=too-many-branches,too-many-statements
     # Generate an extra dictionary.
     if 'dict2file' in build_modes or 'native' in build_modes:
         os.environ['AFL_LLVM_DICT2FILE'] = build_directory + '/afl++.dict'
+        os.environ['AFL_LLVM_DICT2FILE_NO_MAIN'] = '1'
     # Enable context sentitivity for LLVM mode (non LTO only)
     if 'ctx' in build_modes:
         os.environ['AFL_LLVM_CTX'] = '1'

diff --git a/...rs/aflplusplus_025f617d/runner.Dockerfile → fuzzers/aflplusplus_405c/runner.Dockerfile b/...rs/aflplusplus_025f617d/runner.Dockerfile → fuzzers/aflplusplus_405c/runner.Dockerfile
diff --git a/fuzzers/aflplusplus_base/builder.Dockerfile b/fuzzers/aflplusplus_base/builder.Dockerfile
diff --git a/fuzzers/aflplusplus_base/fuzzer.py b/fuzzers/aflplusplus_base/fuzzer.py