From 81d6b6b576db446f2f8e5d19470e695765cb626d Mon Sep 17 00:00:00 2001 From: Elena Uziunaite Date: Wed, 3 Jul 2024 17:20:35 +0100 Subject: [PATCH] Remove the hack in library/constant_time_impl.h Signed-off-by: Elena Uziunaite --- library/constant_time_impl.h | 15 --------------- tests/scripts/components-sanitizers.sh | 1 - 2 files changed, 16 deletions(-) diff --git a/library/constant_time_impl.h b/library/constant_time_impl.h index 2a4574ba68..761d117c34 100644 --- a/library/constant_time_impl.h +++ b/library/constant_time_impl.h @@ -36,21 +36,6 @@ #pragma GCC diagnostic ignored "-Wredundant-decls" #endif -/* Disable asm under Memsan because it confuses Memsan and generates false errors. - * - * We also disable under Valgrind by default, because it's more useful - * for Valgrind to test the plain C implementation. MBEDTLS_TEST_CONSTANT_FLOW_ASM //no-check-names - * may be set to permit building asm under Valgrind. - */ -#if defined(MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN) || \ - (defined(MBEDTLS_TEST_CONSTANT_FLOW_VALGRIND) && !defined(MBEDTLS_TEST_CONSTANT_FLOW_ASM)) //no-check-names -#define MBEDTLS_CT_NO_ASM -#elif defined(__has_feature) -#if __has_feature(memory_sanitizer) -#define MBEDTLS_CT_NO_ASM -#endif -#endif - /* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */ #if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && (!defined(__ARMCC_VERSION) || \ __ARMCC_VERSION >= 6000000) && !defined(MBEDTLS_CT_NO_ASM) diff --git a/tests/scripts/components-sanitizers.sh b/tests/scripts/components-sanitizers.sh index 0b3c99f70a..7ee35d8eb6 100644 --- a/tests/scripts/components-sanitizers.sh +++ b/tests/scripts/components-sanitizers.sh @@ -95,7 +95,6 @@ component_release_test_valgrind_constant_flow () { # Test asm path in constant time module - by default, it will test the plain C # path under Valgrind or Memsan. Running only the constant_time tests is fast (<1s) msg "test: valgrind asm constant_time" - scripts/config.py --force set MBEDTLS_TEST_CONSTANT_FLOW_ASM skip_all_except_given_suite test_suite_constant_time cmake -D CMAKE_BUILD_TYPE:String=Release . make clean