From 666845322c76a7c6f5271ed8833b647ccfbde5b1 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Fri, 15 Dec 2023 18:29:54 +0000 Subject: [PATCH] Improve guards around memory poisoning setup We should not setup or teardown test hooks when we do not have MBEDTLS_PSA_CRYPTO_C. Signed-off-by: David Horstmann --- tests/src/helpers.c | 6 ++++-- tests/src/psa_memory_poisoning_wrappers.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/src/helpers.c b/tests/src/helpers.c index 53a17abda..1c58faefa 100644 --- a/tests/src/helpers.c +++ b/tests/src/helpers.c @@ -33,7 +33,8 @@ int mbedtls_test_platform_setup(void) { int ret = 0; -#if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_TEST_MEMORY_CAN_POISON) +#if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \ + && defined(MBEDTLS_TEST_MEMORY_CAN_POISON) mbedtls_poison_test_hooks_setup(); #endif @@ -57,7 +58,8 @@ int mbedtls_test_platform_setup(void) void mbedtls_test_platform_teardown(void) { -#if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_TEST_MEMORY_CAN_POISON) +#if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \ + && defined(MBEDTLS_TEST_MEMORY_CAN_POISON) mbedtls_poison_test_hooks_teardown(); #endif diff --git a/tests/src/psa_memory_poisoning_wrappers.c b/tests/src/psa_memory_poisoning_wrappers.c index c865d1f90..89830a596 100644 --- a/tests/src/psa_memory_poisoning_wrappers.c +++ b/tests/src/psa_memory_poisoning_wrappers.c @@ -8,7 +8,8 @@ #include "psa_crypto_invasive.h" -#if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_TEST_MEMORY_CAN_POISON) +#if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \ + && defined(MBEDTLS_TEST_MEMORY_CAN_POISON) void mbedtls_poison_test_hooks_setup(void) { @@ -48,4 +49,5 @@ psa_status_t wrap_psa_cipher_encrypt(mbedtls_svc_key_id_t key, return status; } -#endif /* MBEDTLS_TEST_HOOKS && MBEDTLS_TEST_MEMORY_CAN_POISON */ +#endif /* MBEDTLS_TEST_HOOKS && MBEDTLS_PSA_CRYPTO_C && + MBEDTLS_TEST_MEMORY_CAN_POISON */ \ No newline at end of file