frameshift

Author: vanhauser-thc

fuzzers/aflplusplus2/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 b1730d99b672b75467ff6bb380629ab90da26c56
+    git checkout 0ca5300f1565345f1f9764d53d5655974eb6503d
 
 # Build without Python support as we don't need it.
 RUN cd /afl && \

fuzzers/aflplusplus2_nosimp/builder.Dockerfile renamed to fuzzers/aflplusplus2_fs/builder.Dockerfile

@@ -35,9 +35,9 @@ RUN apt-get update && \
         libstdc++-$(gcc --version|head -n1|sed 's/\..*//'|sed 's/.* //')-dev
 
 # Download afl++.
-RUN git clone -b nosimp https://github.com/AFLplusplus/AFLplusplus /afl && \
+RUN git clone -b fs https://github.com/AFLplusplus/AFLplusplus /afl && \
     cd /afl && \
-    git checkout 8b70056509ecf400b6c47b1739a85c5972032a85
+    git checkout e78ef223ef50067f77d2f7892536ef25ebbf75c5
 
 # Build without Python support as we don't need it.
 RUN cd /afl && \

fuzzers/aflplusplus2_nosimp/description.md renamed to fuzzers/aflplusplus2_fs/description.md

@@ -270,6 +270,7 @@ def fuzz(input_corpus,
     os.environ['AFL_FAST_CAL'] = '1'
     os.environ['AFL_NO_WARN_INSTABILITY'] = '1'
     os.environ['AFL_NO_SYNC'] = '1'
+    os.environ['AFL_FRAMESHIFT_ENABLED'] = '1'
 
     if not skip:
         os.environ['AFL_DISABLE_TRIM'] = '1'