1 diff --git a/configs/config-mini-tls1_1.h b/configs/config-mini-tls1_1.h
2 index e22363d..2d6d5ac 100644
3 --- a/configs/config-mini-tls1_1.h
4 +++ b/configs/config-mini-tls1_1.h
6 #define MBEDTLS_CONFIG_H
9 +#if !defined(__SANITIZE_ADDRESS__)
10 #define MBEDTLS_HAVE_ASM
12 #define MBEDTLS_HAVE_TIME
14 /* mbed TLS feature support */
15 diff --git a/configs/config-picocoin.h b/configs/config-picocoin.h
16 index 26b24a9..7fe0ee7 100644
17 --- a/configs/config-picocoin.h
18 +++ b/configs/config-picocoin.h
20 #define MBEDTLS_CONFIG_H
23 +#if !defined(__SANITIZE_ADDRESS__)
24 #define MBEDTLS_HAVE_ASM
26 #define MBEDTLS_HAVE_TIME
28 /* mbed TLS feature support */
29 diff --git a/configs/config-suite-b.h b/configs/config-suite-b.h
30 index 3c4804c..45ad8d2 100644
31 --- a/configs/config-suite-b.h
32 +++ b/configs/config-suite-b.h
34 #define MBEDTLS_CONFIG_H
37 +#if !defined(__SANITIZE_ADDRESS__)
38 #define MBEDTLS_HAVE_ASM
40 #define MBEDTLS_HAVE_TIME
42 /* mbed TLS feature support */
43 diff --git a/configs/config-thread.h b/configs/config-thread.h
44 index 3193a04..1e337c1 100644
45 --- a/configs/config-thread.h
46 +++ b/configs/config-thread.h
48 #define MBEDTLS_CONFIG_H
51 +#if !defined(__SANITIZE_ADDRESS__)
52 #define MBEDTLS_HAVE_ASM
55 /* mbed TLS feature support */
56 #define MBEDTLS_AES_ROM_TABLES
57 diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
58 index 5bef190..d0b9606 100644
59 --- a/include/mbedtls/config.h
60 +++ b/include/mbedtls/config.h
65 +#if !defined(__SANITIZE_ADDRESS__)
67 * \def MBEDTLS_HAVE_ASM
70 * Comment to disable the use of assembly code.
72 #define MBEDTLS_HAVE_ASM
76 * \def MBEDTLS_HAVE_SSE2
81 +#if !defined(__SANITIZE_ADDRESS__)
83 * \def MBEDTLS_AESNI_C
86 * This modules adds support for the AES-NI instructions on x86-64
88 #define MBEDTLS_AESNI_C
97 +#if !defined(__SANITIZE_ADDRESS__)
99 * \def MBEDTLS_PADLOCK_C
101 @@ -2012,6 +2017,7 @@
102 * This modules adds support for the VIA PadLock on x86.
104 #define MBEDTLS_PADLOCK_C
108 * \def MBEDTLS_PEM_PARSE_C