Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build of several projects #11936

Closed
wants to merge 1 commit into from
Closed

Fix build of several projects #11936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions projects/circl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions projects/circl/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
1 change: 0 additions & 1 deletion projects/cryptofuzz/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 3 additions & 14 deletions projects/cryptofuzz/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion projects/cryptofuzz/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ architectures:
main_repo: 'https://github.com/guidovranken/cryptofuzz'

fuzzing_engines:
- afl
- honggfuzz
- libfuzzer

1 change: 0 additions & 1 deletion projects/nettle/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ architectures:
main_repo: 'https://git.lysator.liu.se/nettle/nettle'

fuzzing_engines:
- afl
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed? The nettle build is now passing, see https://oss-fuzz-build-logs.storage.googleapis.com/index.html#nettle , so afl should not be needed to be removed for that reason.

If you want to do it with the goal of un-pinning the project, I'd say it should be done in the same pull request. That is, also include the following diff:

diff --git a/projects/nettle/Dockerfile b/projects/nettle/Dockerfile
index f667134aa..ef95c688d 100644
--- a/projects/nettle/Dockerfile
+++ b/projects/nettle/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-e701b6fa-f3a0-414e-ad6e-0223e6d42ebd.txt
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y software-properties-common make autoconf build-essential wget lzip libtool python
 RUN git clone --depth 1 https://git.lysator.liu.se/nettle/nettle
 RUN git clone --depth 1 https://github.com/randombit/botan.git

- honggfuzz
- libfuzzer

Loading