From 946298425d9b2b94832eaca34f3924df0295a6ea Mon Sep 17 00:00:00 2001
From: Catena cyber <35799796+catenacyber@users.noreply.github.com>
Date: Tue, 23 Feb 2021 22:32:24 +0100
Subject: [PATCH] Fix ecc-diff-fuzzer build with right botan config (#5229)

* Fix ecc-diff-fuzzer build with right botan config

Taken from oss-fuzz botan configure line

* another try

* Fixes botan build

* compile ecc-diff-fuzzer like fixing botan
---
 projects/botan/build.sh           |  2 +-
 projects/ecc-diff-fuzzer/build.sh | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/projects/botan/build.sh b/projects/botan/build.sh
index 0a3d53426..b88e78599 100755
--- a/projects/botan/build.sh
+++ b/projects/botan/build.sh
@@ -22,7 +22,7 @@ ln -s $SRC/fuzzer_corpus .
 ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" \
                --disable-shared --disable-modules=locking_allocator \
                --unsafe-fuzzer-mode --build-fuzzers=libfuzzer \
-               --with-fuzzer-lib='FuzzingEngine'
+               --without-os-features=getrandom,getentropy --with-fuzzer-lib='FuzzingEngine'
 
 make -j$(nproc) libs
 make -j$(nproc) fuzzers
diff --git a/projects/ecc-diff-fuzzer/build.sh b/projects/ecc-diff-fuzzer/build.sh
index 2fb442187..9b951cae8 100755
--- a/projects/ecc-diff-fuzzer/build.sh
+++ b/projects/ecc-diff-fuzzer/build.sh
@@ -93,13 +93,14 @@ cd libecc
 #botan
 (
 cd botan
-#help it find libstdc++
-cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/libstdc++.so
-export LDFLAGS=$CXXFLAGS
 if [ "$ARCHITECTURE" = 'i386' ]; then
-    ./configure.py --disable-shared-library --cpu x86_32
+    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" \
+               --disable-shared --disable-modules=locking_allocator --disable-shared-library \
+               --without-os-features=getrandom,getentropy --cpu x86_32
 else
-    ./configure.py --disable-shared-library
+    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" \
+               --disable-shared --disable-modules=locking_allocator --disable-shared-library \
+               --without-os-features=getrandom,getentropy
 fi
 make -j$(nproc)
 make install