lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-20 12:07:51 +03:00
Code

Enable testing of asm under Memsan

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-07-28 16:17:57 +01:00
parent fa5a4bbb02
commit 08691679b5
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
library/constant_time_impl.h
View File

@ -37,15 +37,7 @@
#include "mbedtls/bignum.h" #include "mbedtls/bignum.h"
#endif #endif
#include "../tests/include/test/constant_flow.h"
/* Disable asm under Memsan because it confuses Memsan and generates false errors */
#if defined(MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN)
#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 */ /* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */
#if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && (!defined(__ARMCC_VERSION) || \ #if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && (!defined(__ARMCC_VERSION) || \
@ -79,7 +71,19 @@ extern volatile mbedtls_ct_uint_t mbedtls_ct_zero;
static inline mbedtls_ct_uint_t mbedtls_ct_compiler_opaque(mbedtls_ct_uint_t x) static inline mbedtls_ct_uint_t mbedtls_ct_compiler_opaque(mbedtls_ct_uint_t x)
{ {
#if defined(MBEDTLS_CT_ASM) #if defined(MBEDTLS_CT_ASM)
/* Prevent false positives from Memsan - otherwise it will report the asm as
* accessing secret data. */
TEST_CF_PUBLIC(&x, sizeof(x));
asm volatile ("" : [x] "+r" (x) :); asm volatile ("" : [x] "+r" (x) :);
/* Mark the return value as secret. This is needed so that code of the form:
*
* if (mbedtls_ct_compiler_opaque(secret)) { ... }
*
* will fail const-flow tests.
*/
TEST_CF_SECRET(&x, sizeof(x));
return x; return x;
#else #else
return x ^ mbedtls_ct_zero; return x ^ mbedtls_ct_zero;