diff options
| author | Guido Vranken <guidovranken@users.noreply.github.com> | 2021-09-20 15:16:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 09:16:45 -0400 |
| commit | c94e49ae058b9fa301220b804ffde6876a797cbf (patch) | |
| tree | bdd9bd9655e79ba375b3d998b7fc9c5c7b29be94 /projects/cryptofuzz | |
| parent | 0b35db2bb5dd3e8f21b7f69cd9c72616ab7507b1 (diff) | |
| download | oss-fuzz-c94e49ae058b9fa301220b804ffde6876a797cbf.tar.gz | |
[cryptofuzz] Temporarily disable NSS (#6485)
Diffstat (limited to 'projects/cryptofuzz')
| -rw-r--r-- | projects/cryptofuzz/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/cryptofuzz/build.sh | 76 |
2 files changed, 39 insertions, 39 deletions
diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile index d460ea251..1a1cb9ac3 100644 --- a/projects/cryptofuzz/Dockerfile +++ b/projects/cryptofuzz/Dockerfile @@ -37,7 +37,7 @@ RUN git clone --depth 1 https://github.com/randombit/botan.git RUN git clone --depth 1 https://github.com/wolfSSL/wolfssl.git RUN git clone --depth 1 -b development_2.x https://github.com/ARMmbed/mbedtls.git RUN hg clone https://hg.mozilla.org/projects/nspr -RUN hg clone https://hg.mozilla.org/projects/nss +#RUN hg clone https://hg.mozilla.org/projects/nss RUN git clone --depth 1 https://github.com/jedisct1/libsodium.git RUN git clone --depth 1 https://github.com/libtom/libtomcrypt.git #RUN git clone --depth 1 https://github.com/microsoft/SymCrypt.git diff --git a/projects/cryptofuzz/build.sh b/projects/cryptofuzz/build.sh index 04e57814f..3df921820 100755 --- a/projects/cryptofuzz/build.sh +++ b/projects/cryptofuzz/build.sh @@ -93,23 +93,23 @@ then fi # Compile NSS -if [[ $CFLAGS != *-m32* ]] -then - mkdir $SRC/nss-nspr - mv $SRC/nss $SRC/nss-nspr/ - mv $SRC/nspr $SRC/nss-nspr/ - cd $SRC/nss-nspr/ - - CXX="$CXX -stdlib=libc++" LDFLAGS="$CFLAGS" nss/build.sh --enable-fips --static --disable-tests --fuzz=oss - - export NSS_NSPR_PATH=$(realpath $SRC/nss-nspr/) - export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NSS" - export LINK_FLAGS="$LINK_FLAGS -lsqlite3" - - # Compile Cryptofuzz NSS module - cd $SRC/cryptofuzz/modules/nss - make -B -fi +#if [[ $CFLAGS != *-m32* ]] +#then +# mkdir $SRC/nss-nspr +# mv $SRC/nss $SRC/nss-nspr/ +# mv $SRC/nspr $SRC/nss-nspr/ +# cd $SRC/nss-nspr/ +# +# CXX="$CXX -stdlib=libc++" LDFLAGS="$CFLAGS" nss/build.sh --enable-fips --static --disable-tests --fuzz=oss +# +# export NSS_NSPR_PATH=$(realpath $SRC/nss-nspr/) +# export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NSS" +# export LINK_FLAGS="$LINK_FLAGS -lsqlite3" +# +# # Compile Cryptofuzz NSS module +# cd $SRC/cryptofuzz/modules/nss +# make -B +#fi # Compile Monocypher cd $SRC/Monocypher/ @@ -449,27 +449,27 @@ then make -B fi -if [[ $CFLAGS != *-m32* ]] -then - # Compile Cryptofuzz (NSS-based) - cd $SRC/cryptofuzz - LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL $INCLUDE_PATH_FLAGS" make -B -j$(nproc) - - # Generate dictionary - ./generate_dict - - # Copy fuzzer - cp $SRC/cryptofuzz/cryptofuzz $OUT/cryptofuzz-nss - # Copy dictionary - cp $SRC/cryptofuzz/cryptofuzz-dict.txt $OUT/cryptofuzz-nss.dict - # Copy seed corpus - cp $SRC/cryptofuzz-corpora/libressl_latest.zip $OUT/cryptofuzz-nss_seed_corpus.zip - - rm $SRC/cryptofuzz/modules/nss/module.a - - CXXFLAGS=${CXXFLAGS//"-DCRYPTOFUZZ_NSS"/} - LINK_FLAGS=${LINK_FLAGS//"-lsqlite3"/} -fi +#if [[ $CFLAGS != *-m32* ]] +#then +# # Compile Cryptofuzz (NSS-based) +# cd $SRC/cryptofuzz +# LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_NO_OPENSSL $INCLUDE_PATH_FLAGS" make -B -j$(nproc) +# +# # Generate dictionary +# ./generate_dict +# +# # Copy fuzzer +# cp $SRC/cryptofuzz/cryptofuzz $OUT/cryptofuzz-nss +# # Copy dictionary +# cp $SRC/cryptofuzz/cryptofuzz-dict.txt $OUT/cryptofuzz-nss.dict +# # Copy seed corpus +# cp $SRC/cryptofuzz-corpora/libressl_latest.zip $OUT/cryptofuzz-nss_seed_corpus.zip +# +# rm $SRC/cryptofuzz/modules/nss/module.a +# +# CXXFLAGS=${CXXFLAGS//"-DCRYPTOFUZZ_NSS"/} +# LINK_FLAGS=${LINK_FLAGS//"-lsqlite3"/} +#fi if [[ $CFLAGS != *sanitize=memory* ]] then |