From 2be496505e2e42b0f73bb10ae4d9e4ef82627f0f Mon Sep 17 00:00:00 2001
From: van Hauser <vh@thc.org>
Date: Tue, 11 Jan 2022 14:08:49 +0100
Subject: [PATCH] afl++ fixes (#7026)

* update afl++ commit id

* update afl++ commit id

* fix for afl++

* attempt fix for curl

* allow easy reproducable afl++ builds

* new commit id

* fixes

* another afl++ commit increase

* not a relevant update, but why not

* two afl++ fixes

* add debug script

* update commit id (not relevant though)

* add wget

* update afl++ commit id

* just afl++ doc updates, but maybe this results in some attention
---
 infra/base-images/base-builder/Dockerfile  | 6 ++++--
 infra/base-images/base-builder/compile_afl | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 475e5a7d1..1f6018e06 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -25,6 +25,7 @@ RUN dpkg --add-architecture i386 && \
         binutils-dev \
         build-essential \
         curl \
+        wget \
         git \
         jq \
         libc6-dev-i386 \
@@ -122,10 +123,11 @@ ENV FUZZER_LDFLAGS ""
 
 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 ef77d552e9b89852b293c300a5a9a9c617945f43 && \
+    wget --no-check-certificate -O oss.sh https://raw.githubusercontent.com/vanhauser-thc/binary_blobs/master/oss.sh && \
+    chmod 755 oss.sh
 
 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 a9e5ae250..9275fd114 100644
--- a/infra/base-images/base-builder/compile_afl
+++ b/infra/base-images/base-builder/compile_afl
@@ -59,7 +59,7 @@ env | egrep -q '^AFL_SKIP_OSSFUZZ=' || {
     export AFL_LLVM_INSTRUMENT=CLASSIC,CTX-2
     export AFL_ENABLE_CMPLOG=0
     # we increase the chance for LAF because we do not do CMPLOG with CTX
-    export AFL_LAF_CHANCE=30
+    export AFL_LAF_CHANCE=20
   }
 
   # 40% chance to create a dictionary.