From 12d55ec69838e33bb80cc741b3f9b088f1f2b034 Mon Sep 17 00:00:00 2001
From: Guido Vranken <guidovranken@users.noreply.github.com>
Date: Mon, 20 Mar 2023 13:00:02 +0100
Subject: [PATCH] [cryptofuzz] Fix SymCrypt MSAN issues (#9951)

---
 projects/cryptofuzz/build.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/projects/cryptofuzz/build.sh b/projects/cryptofuzz/build.sh
index 5c97887fa..9bf53e77c 100755
--- a/projects/cryptofuzz/build.sh
+++ b/projects/cryptofuzz/build.sh
@@ -238,12 +238,25 @@ make -B -j$(nproc)
 
 ## Compile SymCrypt
 cd $SRC/SymCrypt/
+
+# Disable speculative load hardening because
+# this results in MSAN false positives
+sed -i '/.*x86-speculative-load-hardening.*/d' lib/CMakeLists.txt
+sed -i '/.*x86-speculative-load-hardening.*/d' modules_linux/common/ModuleCommon.cmake
+
+
 # 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 ../
+if [[ $CFLAGS = *sanitize=memory* ]]
+then
+    cmake -DSYMCRYPT_USE_ASM=off ../
+else
+    cmake ../
+fi
+
 make symcrypt_common symcrypt_generic -j$(nproc)
 
 export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_SYMCRYPT"