Fix ecc-diff-fuzzer build (#4581)

* Fix ecc-diff-fuzzer build

by using a more recent npm version

* Remove useless symlink in ecc-diff-fuzzer

* Remove old libgcrypt
This commit is contained in:
Catena cyber 2020-10-30 19:48:14 +01:00 committed by GitHub
parent 37102494f8
commit 9f3ede2499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View File

@ -15,8 +15,12 @@
################################################################################
FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make cmake bzip2 autoconf automake gettext libtool python nodejs npm
RUN apt-get update && apt-get install -y make cmake bzip2 autoconf automake gettext libtool python curl
RUN rustup target add i686-unknown-linux-gnu
#use different package sources for recent npm
RUN curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh
RUN bash nodesource_setup.sh
RUN apt install -y nodejs
RUN npm install -g browserify
RUN npm install elliptic
RUN git clone --depth 1 https://github.com/horhof/quickjs quickjs

View File

@ -122,9 +122,6 @@ cp quickjs*.h /usr/local/include/
cp libquickjs.a /usr/local/lib/
)
ln -s /usr/bin/nodejs /usr/bin/node
mv /usr/lib/x86_64-linux-gnu/libcrypto.a /usr/lib/x86_64-linux-gnu/libcrypto_old.a
mv /usr/lib/x86_64-linux-gnu/libcrypto.so /usr/lib/x86_64-linux-gnu/libcrypto_old.so
#build fuzz target
cd ecfuzzer
if [ "$ARCHITECTURE" = 'i386' ]; then
@ -151,5 +148,3 @@ fi
cmake -DDISABLE_CRYPTOPP=ON -DDISABLE_JS=ON ..
make -j$(nproc)
cp ecfuzzer $OUT/fuzz_ec_noblocker
mv /usr/lib/x86_64-linux-gnu/libcrypto_old.a /usr/lib/x86_64-linux-gnu/libcrypto.a
mv /usr/lib/x86_64-linux-gnu/libcrypto_old.so /usr/lib/x86_64-linux-gnu/libcrypto.so