commit ffcc76918488a2ea456153a68a8ec8b36e0d24ea
author David Horstmann <david.horstmann@arm.com> Fri Dec 15 18:29:54 2023 +0000
committer David Horstmann <david.horstmann@arm.com> Wed Dec 20 14:49:41 2023 +0000
tree 219b26c716a4c9c2603677f6b5ab93b0e3703bf5
parent b80e35a54a7e2e1b23e85f09ac7b9f61130e3540

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 <david.horstmann@arm.com>

tests/src/helpers.c

diff --git a/tests/src/helpers.c b/tests/src/helpers.c
index 9d9ab08..41f805e 100644
--- a/tests/src/helpers.c
+++ b/tests/src/helpers.c
@@ -50,7 +50,8 @@
 {
     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
 
@@ -74,7 +75,8 @@
 
 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
 

tests/src/psa_memory_poisoning_wrappers.c

diff --git a/tests/src/psa_memory_poisoning_wrappers.c b/tests/src/psa_memory_poisoning_wrappers.c
index c865d1f..89830a5 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 @@
     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