diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-09-14 16:55:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 09:55:07 -0500 |
| commit | 751141620bb923ad64d301418749f8a7cfd32bd3 (patch) | |
| tree | 45e16a43439f4c9ab180b0d92cbec3215cc14cd6 /projects/bitcoin-core | |
| parent | 358d9ba84b583bf7b85430f43a8f322384c7bcd1 (diff) | |
| download | oss-fuzz-751141620bb923ad64d301418749f8a7cfd32bd3.tar.gz | |
bitcoin-core: Re-enable schnorr_fun (#6430)
Diffstat (limited to 'projects/bitcoin-core')
| -rw-r--r-- | projects/bitcoin-core/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/bitcoin-core/build_cryptofuzz.sh | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/projects/bitcoin-core/Dockerfile b/projects/bitcoin-core/Dockerfile index 6a2040a32..61972719b 100644 --- a/projects/bitcoin-core/Dockerfile +++ b/projects/bitcoin-core/Dockerfile @@ -14,7 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +FROM gcr.io/oss-fuzz-base/base-builder-rust # Packages taken from: # * https://github.com/bitcoin/bitcoin/blob/master/doc/build-unix.md#dependency-build-instructions diff --git a/projects/bitcoin-core/build_cryptofuzz.sh b/projects/bitcoin-core/build_cryptofuzz.sh index 5d2f827a4..4e6d91ab4 100755 --- a/projects/bitcoin-core/build_cryptofuzz.sh +++ b/projects/bitcoin-core/build_cryptofuzz.sh @@ -133,16 +133,14 @@ make -B -j$(nproc) cd ../botan/ make -B -j$(nproc) -# schnorr_fun is currently disabled because it was causing build failures -# See: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=37524 -#cd ../schnorr_fun/ -#export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_SCHNORR_FUN" -#if [[ $CFLAGS != *-m32* ]] -#then -# make -#else -# make -f Makefile.i386 -#fi +cd ../schnorr_fun/ +export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_SCHNORR_FUN" +if [[ $CFLAGS != *-m32* ]] +then + make +else + make -f Makefile.i386 +fi cd ../../ |