From 7de0928fd10c99edeb315a326967fb60c2bb52e3 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 14 Dec 2023 14:27:50 +0000 Subject: [PATCH] Move wrapper include to psa_crypto_helpers.h This makes memory poisoning wrappers available to (almost) all tests. Signed-off-by: David Horstmann --- tests/include/test/psa_crypto_helpers.h | 3 +++ tests/suites/test_suite_psa_crypto.function | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h index 04b90b9231..935e071819 100644 --- a/tests/include/test/psa_crypto_helpers.h +++ b/tests/include/test/psa_crypto_helpers.h @@ -16,6 +16,9 @@ #include #endif +#if defined(MBEDTLS_TEST_HOOKS) +#include "test/psa_memory_poisoning_wrappers.h" +#endif #if defined(MBEDTLS_PSA_CRYPTO_C) /** Initialize the PSA Crypto subsystem. */ diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function index a024c1ee48..1962f7b33e 100644 --- a/tests/suites/test_suite_psa_crypto.function +++ b/tests/suites/test_suite_psa_crypto.function @@ -25,10 +25,6 @@ #define TEST_DRIVER_LOCATION 0x7fffff #endif -#if defined(MBEDTLS_TEST_HOOKS) -#include "test/psa_memory_poisoning_wrappers.h" -#endif - /* If this comes up, it's a bug in the test code or in the test data. */ #define UNUSED 0xdeadbeef