diff --git a/projects/bls-signatures/Dockerfile b/projects/bls-signatures/Dockerfile index 1cbe4090d777..4da15975da35 100644 --- a/projects/bls-signatures/Dockerfile +++ b/projects/bls-signatures/Dockerfile @@ -16,7 +16,7 @@ FROM gcr.io/oss-fuzz-base/base-builder-rust RUN apt-get update && apt-get install -y make autoconf automake libtool wget python lzip libgmp-dev -RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz +RUN git clone --depth 1 https://github.com/MozillaSecurity/cryptofuzz RUN git clone --depth 1 https://github.com/supranational/blst RUN git clone --depth 1 https://github.com/herumi/mcl.git RUN git clone --depth 1 https://github.com/randombit/botan.git diff --git a/projects/circl/Dockerfile b/projects/circl/Dockerfile index 1eb76e40fc8f..d4e9b7937dda 100644 --- a/projects/circl/Dockerfile +++ b/projects/circl/Dockerfile @@ -17,7 +17,7 @@ FROM gcr.io/oss-fuzz-base/base-builder-go 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/MozillaSecurity/cryptofuzz RUN git clone --depth 1 https://github.com/randombit/botan.git RUN git clone --depth 1 https://github.com/supranational/blst.git RUN wget https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.bz2 diff --git a/projects/libressl/Dockerfile b/projects/libressl/Dockerfile index a130572c08b9..33d098eb825e 100644 --- a/projects/libressl/Dockerfile +++ b/projects/libressl/Dockerfile @@ -20,8 +20,7 @@ FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30 RUN apt-get update && apt-get install -y make cmake wget autoconf automake libtool bison flex texinfo lzip RUN git clone --depth 1 https://github.com/libressl/portable.git libressl RUN git clone --depth 1 https://github.com/libressl/fuzz.git libressl.fuzzers -RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz -RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz-corpora +RUN git clone --depth 1 https://github.com/MozillaSecurity/cryptofuzz RUN wget https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.bz2 RUN git clone --depth 1 https://github.com/randombit/botan.git RUN wget https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.lz diff --git a/projects/libressl/build.sh b/projects/libressl/build.sh index a0e206c31f09..0debd305d156 100755 --- a/projects/libressl/build.sh +++ b/projects/libressl/build.sh @@ -130,5 +130,3 @@ LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_LIBRESSL - cp $SRC/cryptofuzz/cryptofuzz $OUT/cryptofuzz # Copy dictionary cp $SRC/cryptofuzz/cryptofuzz-dict.txt $OUT/cryptofuzz.dict -# Copy seed corpus -cp $SRC/cryptofuzz-corpora/libressl_latest.zip $OUT/cryptofuzz_seed_corpus.zip diff --git a/projects/wolfssl/Dockerfile b/projects/wolfssl/Dockerfile index 6f576d9a3836..83e5f144260c 100644 --- a/projects/wolfssl/Dockerfile +++ b/projects/wolfssl/Dockerfile @@ -22,7 +22,7 @@ RUN git clone --depth 1 https://github.com/wolfSSL/wolfsm RUN git clone --depth 1 https://github.com/wolfSSL/wolfssh.git RUN git clone --depth 1 https://github.com/guidovranken/fuzzing-headers.git RUN git clone --depth 1 https://github.com/guidovranken/wolf-ssl-ssh-fuzzers -RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz +RUN git clone --depth 1 https://github.com/MozillaSecurity/cryptofuzz RUN git clone --depth 1 https://github.com/randombit/botan.git RUN git clone --depth 1 https://github.com/google/wycheproof.git RUN wget https://archives.boost.io/release/1.82.0/source/boost_1_82_0.tar.bz2 @@ -39,13 +39,6 @@ RUN gsutil cp gs://relic-backup.clusterfuzz-external.appspot.com/corpus/libFuzze RUN gsutil cp gs://cryptofuzz-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/cryptofuzz_cryptofuzz-openssl/public.zip $SRC/corpus_cryptofuzz-openssl.zip RUN gsutil cp gs://cryptofuzz-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/cryptofuzz_cryptofuzz-boringssl/public.zip $SRC/corpus_cryptofuzz-boringssl.zip RUN gsutil cp gs://cryptofuzz-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/cryptofuzz_cryptofuzz-nss/public.zip $SRC/corpus_cryptofuzz-nss.zip -RUN gsutil cp gs://bitcoin-core-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/bitcoin-core_cryptofuzz-bitcoin-cryptography-w2-p2/public.zip $SRC/corpus_bitcoin-core-w2-p2.zip -RUN gsutil cp gs://bitcoin-core-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/bitcoin-core_cryptofuzz-bitcoin-cryptography-w15-p4/public.zip $SRC/corpus_bitcoin-core-w15-p4.zip -RUN gsutil cp gs://bitcoin-core-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/bitcoin-core_cryptofuzz-bitcoin-cryptography-w20-p8/public.zip $SRC/corpus_bitcoin-core-w20-p8.zip -RUN gsutil cp gs://num-bigint-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/num-bigint_cryptofuzz/public.zip $SRC/corpus_num-bigint.zip -RUN gsutil cp gs://wolfssl-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/wolfssl_cryptofuzz-sp-math-all/public.zip $SRC/corpus_wolfssl_sp-math-all.zip -RUN gsutil cp gs://wolfssl-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/wolfssl_cryptofuzz-sp-math-all-8bit/public.zip $SRC/corpus_wolfssl_sp-math-all-8bit.zip -RUN gsutil cp gs://wolfssl-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/wolfssl_cryptofuzz-sp-math/public.zip $SRC/corpus_wolfssl_sp-math.zip # Botan corpora, which require a special import procedure RUN gsutil cp gs://botan-backup.clusterfuzz-external.appspot.com/corpus/libFuzzer/botan_ecc_p256/public.zip $SRC/corpus_botan_ecc_p256.zip diff --git a/projects/wolfssl/build.sh b/projects/wolfssl/build.sh index 777d93a482e1..62a2df93994c 100755 --- a/projects/wolfssl/build.sh +++ b/projects/wolfssl/build.sh @@ -291,13 +291,6 @@ then unzip -n $SRC/corpus_cryptofuzz-openssl.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null unzip -n $SRC/corpus_cryptofuzz-boringssl.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null unzip -n $SRC/corpus_cryptofuzz-nss.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null - unzip -n $SRC/corpus_bitcoin-core-w2-p2.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null - unzip -n $SRC/corpus_bitcoin-core-w15-p4.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null - unzip -n $SRC/corpus_bitcoin-core-w20-p8.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null - unzip -n $SRC/corpus_num-bigint.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null - unzip -n $SRC/corpus_wolfssl_sp-math-all.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null - unzip -n $SRC/corpus_wolfssl_sp-math-all-8bit.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null - unzip -n $SRC/corpus_wolfssl_sp-math.zip -d $SRC/cryptofuzz_seed_corpus/ >/dev/null # Import Botan corpora mkdir $SRC/botan-p256-corpus/