diff options
| author | Guido Vranken <guidovranken@users.noreply.github.com> | 2021-07-23 03:16:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 18:16:37 -0700 |
| commit | 234984c0daf02b61b91fa75e85911973febd963c (patch) | |
| tree | 29dd589503064193e0f8a781ec5b303c7fc9dc02 /projects/cryptofuzz | |
| parent | 1f679f0dd29d16c66086726f4fdb3b74d17cde94 (diff) | |
| download | oss-fuzz-234984c0daf02b61b91fa75e85911973febd963c.tar.gz | |
[cryptofuzz] Fix build, disable SymCrypt (#6099)
Diffstat (limited to 'projects/cryptofuzz')
| -rw-r--r-- | projects/cryptofuzz/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/cryptofuzz/build.sh | 44 |
2 files changed, 23 insertions, 23 deletions
diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile index 3fad02d42..ff859a4d4 100644 --- a/projects/cryptofuzz/Dockerfile +++ b/projects/cryptofuzz/Dockerfile @@ -41,7 +41,7 @@ RUN hg clone https://hg.mozilla.org/projects/nspr 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 +#RUN git clone --depth 1 https://github.com/microsoft/SymCrypt.git RUN hg clone https://gmplib.org/repo/gmp/ libgmp/ RUN wget https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz RUN git clone --depth 1 https://github.com/indutny/bn.js.git diff --git a/projects/cryptofuzz/build.sh b/projects/cryptofuzz/build.sh index 9bab0b79f..eb0d256b3 100755 --- a/projects/cryptofuzz/build.sh +++ b/projects/cryptofuzz/build.sh @@ -180,7 +180,7 @@ else ./configure --enable-static --disable-tests --disable-benchmark --disable-exhaustive-tests --enable-module-recovery --enable-experimental --enable-module-schnorrsig --enable-module-ecdh fi make -export SECP256K1_INCLUDE_PATH=$(realpath include) +export SECP256K1_INCLUDE_PATH=$(realpath .) export LIBSECP256K1_A_PATH=$(realpath .libs/libsecp256k1.a) # Compile Cryptofuzz libsecp256k1 module @@ -213,27 +213,27 @@ then make -B fi -# Compile SymCrypt -cd $SRC/SymCrypt/ -if [[ $CFLAGS != *sanitize=array-bounds* ]] -then - # Unittests don't build with clang and are not needed anyway - sed -i "s/^add_subdirectory(unittest)$//g" CMakeLists.txt - - mkdir b/ - cd b/ - cmake ../ - make -j$(nproc) - - export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_SYMCRYPT" - export SYMCRYPT_INCLUDE_PATH=$(realpath ../inc/) - export LIBSYMCRYPT_COMMON_A_PATH=$(realpath lib/x86_64/Generic/libsymcrypt_common.a) - export SYMCRYPT_GENERIC_A_PATH=$(realpath lib/x86_64/Generic/symcrypt_generic.a) - - # Compile Cryptofuzz SymCrypt module - cd $SRC/cryptofuzz/modules/symcrypt - make -B -fi +## Compile SymCrypt +#cd $SRC/SymCrypt/ +#if [[ $CFLAGS != *sanitize=array-bounds* ]] +#then +# # Unittests don't build with clang and are not needed anyway +# sed -i "s/^add_subdirectory(unittest)$//g" CMakeLists.txt +# +# mkdir b/ +# cd b/ +# cmake ../ +# make -j$(nproc) +# +# export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_SYMCRYPT" +# export SYMCRYPT_INCLUDE_PATH=$(realpath ../inc/) +# export LIBSYMCRYPT_COMMON_A_PATH=$(realpath lib/x86_64/Generic/libsymcrypt_common.a) +# export SYMCRYPT_GENERIC_A_PATH=$(realpath lib/x86_64/Generic/symcrypt_generic.a) +# +# # Compile Cryptofuzz SymCrypt module +# cd $SRC/cryptofuzz/modules/symcrypt +# make -B +#fi # Compile libgmp if [[ $CFLAGS != *sanitize=memory* ]] |