From ffcda5679a12cbd7f26d95915ece7fc2ce8405bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 14 Mar 2023 23:37:18 +0100 Subject: [PATCH] Make MD_PSA_INIT/DONE available to all suites MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- tests/include/test/psa_crypto_helpers.h | 12 ++++++++++++ tests/suites/test_suite_md.function | 8 -------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h index 38a60b4f15..860e071c0d 100644 --- a/tests/include/test/psa_crypto_helpers.h +++ b/tests/include/test/psa_crypto_helpers.h @@ -32,6 +32,18 @@ #include "mbedtls/psa_util.h" #endif +#if defined(MBEDTLS_MD_LIGHT) +#include "mbedtls/md.h" +#endif + +#if defined(MBEDTLS_MD_SOME_PSA) +#define MD_PSA_INIT() PSA_INIT() +#define MD_PSA_DONE() PSA_DONE() +#else /* MBEDTLS_MD_SOME_PSA */ +#define MD_PSA_INIT() ((void) 0) +#define MD_PSA_DONE() ((void) 0) +#endif /* MBEDTLS_MD_SOME_PSA */ + #if defined(MBEDTLS_PSA_CRYPTO_C) /** Initialize the PSA Crypto subsystem. */ #define PSA_INIT() PSA_ASSERT(psa_crypto_init()) diff --git a/tests/suites/test_suite_md.function b/tests/suites/test_suite_md.function index 32c9c8ca0a..4438fa1509 100644 --- a/tests/suites/test_suite_md.function +++ b/tests/suites/test_suite_md.function @@ -1,13 +1,5 @@ /* BEGIN_HEADER */ #include "mbedtls/md.h" - -#if defined(MBEDTLS_MD_SOME_PSA) -#define MD_PSA_INIT() PSA_INIT() -#define MD_PSA_DONE() PSA_DONE() -#else /* MBEDTLS_MD_SOME_PSA */ -#define MD_PSA_INIT() ((void) 0) -#define MD_PSA_DONE() ((void) 0) -#endif /* MBEDTLS_MD_SOME_PSA */ /* END_HEADER */ /* BEGIN_DEPENDENCIES