commit 4a48becdbadb86ced74710c7df99ee9f5fdd89b6
author David Horstmann <david.horstmann@arm.com> Wed Mar 13 15:42:31 2024 +0000
committer David Horstmann <david.horstmann@arm.com> Thu Mar 14 14:47:48 2024 +0000
tree 859a42483018c3daf9c47061b5a3a776b86bad97
parent 91f7e07c635ea0a3848fe6401824ef2c981b34ef

Invert and rename config option

Replace MBEDTLS_PSA_COPY_CALLER_BUFFERS with inverse:
!MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS. This ensures that buffer
protection is enabled by default without any change to the Mbed TLS
config file.

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

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 66bba9c..667f850 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1260,14 +1260,14 @@
     make test
 }
 
-component_test_no_psa_copy_caller_buffers () {
-    msg "build: full config - MBEDTLS_PSA_COPY_CALLER_BUFFERS, cmake, gcc, ASan"
+component_test_psa_assume_exclusive_buffers () {
+    msg "build: full config + MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS, cmake, gcc, ASan"
     scripts/config.py full
-    scripts/config.py unset MBEDTLS_PSA_COPY_CALLER_BUFFERS
+    scripts/config.py set MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS
     CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
     make
 
-    msg "test: full config - MBEDTLS_PSA_COPY_CALLER_BUFFERS, cmake, gcc, ASan"
+    msg "test: full config + MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS, cmake, gcc, ASan"
     make test
 }
 

tests/src/helpers.c

diff --git a/tests/src/helpers.c b/tests/src/helpers.c
index be9155c..065d17d 100644
--- a/tests/src/helpers.c
+++ b/tests/src/helpers.c
@@ -318,7 +318,7 @@
     int ret = 0;
 
 #if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \
-    && defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) \
+    && !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) \
     && defined(MBEDTLS_TEST_MEMORY_CAN_POISON)
     mbedtls_poison_test_hooks_setup();
 #endif
@@ -348,7 +348,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_PSA_ASSUME_EXCLUSIVE_BUFFERS) \
     &&  defined(MBEDTLS_TEST_MEMORY_CAN_POISON)
     mbedtls_poison_test_hooks_teardown();
 #endif