From 59e17b5d7a57799fea1dcba8a6a7e50217ed8b6a Mon Sep 17 00:00:00 2001
From: Guido Vranken <guidovranken@users.noreply.github.com>
Date: Fri, 17 May 2024 11:11:49 +0200
Subject: [PATCH] [cryptofuzz, circl] Fix build (#11959)

---
 projects/circl/Dockerfile      |  3 ---
 projects/circl/build.sh        |  2 ++
 projects/cryptofuzz/Dockerfile |  1 -
 projects/cryptofuzz/build.sh   | 17 +++--------------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/projects/circl/Dockerfile b/projects/circl/Dockerfile
index 901877c544d3..1eb76e40fc8f 100644
--- a/projects/circl/Dockerfile
+++ b/projects/circl/Dockerfile
@@ -16,13 +16,10 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-go
 
-ENV GO111MODULE off
-
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget python
 RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz
 RUN git clone --depth 1 https://github.com/randombit/botan.git
 RUN git clone --depth 1 https://github.com/supranational/blst.git
-RUN cd $SRC/cryptofuzz/modules/circl && go get ./... || true
 RUN wget https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.bz2
 RUN wget https://storage.googleapis.com/pub/gsutil.tar.gz -O $SRC/gsutil.tar.gz
 RUN tar zxf $SRC/gsutil.tar.gz
diff --git a/projects/circl/build.sh b/projects/circl/build.sh
index 95104380c075..7fd7dbfe1129 100755
--- a/projects/circl/build.sh
+++ b/projects/circl/build.sh
@@ -84,6 +84,8 @@ cd $SRC/cryptofuzz/modules/blst/
 make -j $(nproc)
 
 cd $SRC/cryptofuzz/modules/circl/
+go mod init cryptofuzz/circl
+go mod tidy
 make -j $(nproc)
 
 cd $SRC/cryptofuzz/
diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile
index 6722aa05b01e..beb2f11e0c3a 100644
--- a/projects/cryptofuzz/Dockerfile
+++ b/projects/cryptofuzz/Dockerfile
@@ -25,7 +25,6 @@ RUN apt-get update && \
 RUN pip3 install 'pip>=20'
 
 RUN wget https://go.dev/dl/go1.20.10.linux-amd64.tar.gz
-RUN wget https://go.dev/dl/go1.21.3.linux-amd64.tar.gz
 RUN wget https://go.dev/dl/go1.22.1.linux-amd64.tar.gz
 RUN git clone --depth 1 https://github.com/golang/go go-dev
 RUN git clone --depth 1 https://github.com/golang/crypto go-crypto
diff --git a/projects/cryptofuzz/build.sh b/projects/cryptofuzz/build.sh
index 91560aded8fd..8ff690c73157 100755
--- a/projects/cryptofuzz/build.sh
+++ b/projects/cryptofuzz/build.sh
@@ -34,18 +34,7 @@ mkdir -p $GOPATH_122/src/golang.org/x/crypto/
 cp -R $SRC/go-crypto/* $GOPATH_122/src/golang.org/x/crypto/
 mkdir -p $GOPATH_122/src/golang.org/x/sys/
 cp -R $SRC/go-sys/* $GOPATH_122/src/golang.org/x/sys/
-export PATH_GO_121=$GOROOT_122/bin:$GOROOT_122/packages/bin:$PATH
-
-tar zxf $SRC/go1.21.3.linux-amd64.tar.gz
-mv go/ go-121
-export GOROOT_121=$SRC/go-bootstrap/go-121/
-export GOPATH_121=$GOROOT_121/packages/
-mkdir $GOPATH_121
-mkdir -p $GOPATH_121/src/golang.org/x/crypto/
-cp -R $SRC/go-crypto/* $GOPATH_121/src/golang.org/x/crypto/
-mkdir -p $GOPATH_121/src/golang.org/x/sys/
-cp -R $SRC/go-sys/* $GOPATH_121/src/golang.org/x/sys/
-export PATH_GO_121=$GOROOT_121/bin:$GOROOT_121/packages/bin:$PATH
+export PATH_GO_122=$GOROOT_122/bin:$GOROOT_122/packages/bin:$PATH
 
 tar zxf $SRC/go1.20.10.linux-amd64.tar.gz
 mv go/ go-120
@@ -449,9 +438,9 @@ then
     autoreconf -ivf
     if [[ $CFLAGS = *-m32* ]]
     then
-        ./configure --enable-static --disable-doc --host=i386
+        ./configure --enable-static --disable-doc --disable-jent-support --host=i386
     else
-        ./configure --enable-static --disable-doc
+        ./configure --enable-static --disable-doc --disable-jent-support
     fi
     make -j$(nproc)