commit 5d05b47844c935e34eb7a07185113093b2fc115c
author David Horstmann <david.horstmann@arm.com> Wed Dec 20 11:26:40 2023 +0000
committer David Horstmann <david.horstmann@arm.com> Wed Dec 20 14:49:41 2023 +0000
tree a814b7f1a64b698b377788ef090526d9977bf510
parent dda52ae1c6521f6079a7edfda1f49c5acaaabc8a

Only poison memory when buffer copying is enabled

Make sure that we don't enable memory poisoning when
MBEDTLS_PSA_COPY_CALLER_BUFFERS is disabled.

Signed-off-by: David Horstmann <david.horstmann@arm.com>

tests/include/test/psa_crypto_helpers.h

diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h
index 55f24e0..18d46d8 100644
--- a/tests/include/test/psa_crypto_helpers.h
+++ b/tests/include/test/psa_crypto_helpers.h
@@ -21,7 +21,8 @@
 #include "mbedtls/psa_util.h"
 #endif
 
-#if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \
+    && defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)
 #include "test/psa_memory_poisoning_wrappers.h"
 #endif
 

tests/src/helpers.c

diff --git a/tests/src/helpers.c b/tests/src/helpers.c
index 27a7a7a..fd7b548 100644
--- a/tests/src/helpers.c
+++ b/tests/src/helpers.c
@@ -51,6 +51,7 @@
     int ret = 0;
 
 #if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \
+    && defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) \
     && defined(MBEDTLS_TEST_MEMORY_CAN_POISON)
     mbedtls_poison_test_hooks_setup();
 #endif
@@ -76,6 +77,7 @@
 void mbedtls_test_platform_teardown(void)
 {
 #if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \
+    && defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) \
     &&  defined(MBEDTLS_TEST_MEMORY_CAN_POISON)
     mbedtls_poison_test_hooks_teardown();
 #endif