From 173cae95c4d1810ee56484a8e63e0cf6f990afeb Mon Sep 17 00:00:00 2001
From: Guido Vranken <guidovranken@users.noreply.github.com>
Date: Mon, 19 Aug 2024 22:06:21 +0200
Subject: [PATCH] Compile Botan with --disable-asm in MSAN builds (#12300)

---
 projects/bearssl/build.sh    | 7 ++++++-
 projects/cryptofuzz/build.sh | 7 ++++++-
 projects/libecc/build.sh     | 7 ++++++-
 projects/wolfssl/build.sh    | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/projects/bearssl/build.sh b/projects/bearssl/build.sh
index 7fe4591fdfd3..238a2194b70c 100755
--- a/projects/bearssl/build.sh
+++ b/projects/bearssl/build.sh
@@ -57,7 +57,12 @@
     cd $SRC/botan
     if [[ $CFLAGS != *-m32* ]]
     then
-        ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+        if [[ $CFLAGS != *sanitize=memory* ]]
+        then
+            ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+        else
+            ./configure.py --disable-asm --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+        fi
     else
         ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
     fi
diff --git a/projects/cryptofuzz/build.sh b/projects/cryptofuzz/build.sh
index 8ff690c73157..4dda89e3fd63 100755
--- a/projects/cryptofuzz/build.sh
+++ b/projects/cryptofuzz/build.sh
@@ -402,7 +402,12 @@ make -B
 cd $SRC/botan
 if [[ $CFLAGS != *-m32* ]]
 then
-    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+    if [[ $CFLAGS != *sanitize=memory* ]]
+    then
+        ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+    else
+        ./configure.py --disable-asm --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+    fi
 else
     ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
 fi
diff --git a/projects/libecc/build.sh b/projects/libecc/build.sh
index dc96e85ac11b..b7b64c67c9d9 100755
--- a/projects/libecc/build.sh
+++ b/projects/libecc/build.sh
@@ -39,7 +39,12 @@ export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_LIBECC"
 cd $SRC/botan
 if [[ $CFLAGS != *-m32* ]]
 then
-    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
+    if [[ $CFLAGS != *sanitize=memory* ]]
+    then
+        ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
+    else
+        ./configure.py --disable-asm --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
+    fi
 else
     ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
 fi
diff --git a/projects/wolfssl/build.sh b/projects/wolfssl/build.sh
index a26320759ed1..777d93a482e1 100755
--- a/projects/wolfssl/build.sh
+++ b/projects/wolfssl/build.sh
@@ -40,7 +40,12 @@ then
     cd $SRC/botan
     if [[ $CFLAGS != *-m32* ]]
     then
-        ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+        if [[ $CFLAGS != *sanitize=memory* ]]
+        then
+            ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+        else
+            ./configure.py --disable-asm --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
+        fi
     else
         ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
     fi