From b4a012929da8a3119caefa82fe25d673fefab2de Mon Sep 17 00:00:00 2001 From: Mateusz Starzyk Date: Thu, 27 May 2021 14:49:25 +0200 Subject: [PATCH] Add test/helpers include to test drivers. Remove config.h include. "test/helpers.h" defines MBEDTLS_ALLOW_PRIVATE_ACCESS. Drivers can include that header instead of defining the MBEDTLS_ALLOW_PRIVATE_ACCESS themselves. "test/helpers.h" includes config header as well. Remove obsolete config includes from src/drivers. Signed-off-by: Mateusz Starzyk --- tests/src/drivers/hash.c | 8 +------- tests/src/drivers/platform_builtin_keys.c | 2 +- tests/src/drivers/test_driver_aead.c | 8 -------- tests/src/drivers/test_driver_cipher.c | 8 -------- tests/src/drivers/test_driver_key_management.c | 8 +------- tests/src/drivers/test_driver_mac.c | 8 +------- tests/src/drivers/test_driver_signature.c | 8 -------- tests/src/drivers/test_driver_size.c | 8 +------- 8 files changed, 5 insertions(+), 53 deletions(-) diff --git a/tests/src/drivers/hash.c b/tests/src/drivers/hash.c index a9c475a825..b1880f778e 100644 --- a/tests/src/drivers/hash.c +++ b/tests/src/drivers/hash.c @@ -17,13 +17,7 @@ * limitations under the License. */ -#define MBEDTLS_ALLOW_PRIVATE_ACCESS - -#if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" -#else -#include MBEDTLS_CONFIG_FILE -#endif +#include #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(PSA_CRYPTO_DRIVER_TEST) #include "psa_crypto_hash.h" diff --git a/tests/src/drivers/platform_builtin_keys.c b/tests/src/drivers/platform_builtin_keys.c index a3c5796da0..da5865d869 100644 --- a/tests/src/drivers/platform_builtin_keys.c +++ b/tests/src/drivers/platform_builtin_keys.c @@ -20,7 +20,7 @@ * limitations under the License. */ -#define MBEDTLS_ALLOW_PRIVATE_ACCESS +#include #include #include diff --git a/tests/src/drivers/test_driver_aead.c b/tests/src/drivers/test_driver_aead.c index c247bab08d..ce9ce37795 100644 --- a/tests/src/drivers/test_driver_aead.c +++ b/tests/src/drivers/test_driver_aead.c @@ -17,14 +17,6 @@ * limitations under the License. */ -#define MBEDTLS_ALLOW_PRIVATE_ACCESS - -#if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" -#else -#include MBEDTLS_CONFIG_FILE -#endif - #include #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(PSA_CRYPTO_DRIVER_TEST) diff --git a/tests/src/drivers/test_driver_cipher.c b/tests/src/drivers/test_driver_cipher.c index 51c1abc1a4..9c95cc8f8c 100644 --- a/tests/src/drivers/test_driver_cipher.c +++ b/tests/src/drivers/test_driver_cipher.c @@ -18,14 +18,6 @@ * limitations under the License. */ -#define MBEDTLS_ALLOW_PRIVATE_ACCESS - -#if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" -#else -#include MBEDTLS_CONFIG_FILE -#endif - #include #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(PSA_CRYPTO_DRIVER_TEST) diff --git a/tests/src/drivers/test_driver_key_management.c b/tests/src/drivers/test_driver_key_management.c index b1096cb6fb..afa1fc261e 100644 --- a/tests/src/drivers/test_driver_key_management.c +++ b/tests/src/drivers/test_driver_key_management.c @@ -18,13 +18,7 @@ * limitations under the License. */ -#define MBEDTLS_ALLOW_PRIVATE_ACCESS - -#if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" -#else -#include MBEDTLS_CONFIG_FILE -#endif +#include #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(PSA_CRYPTO_DRIVER_TEST) #include "psa/crypto.h" diff --git a/tests/src/drivers/test_driver_mac.c b/tests/src/drivers/test_driver_mac.c index 439943cca6..3b766dcb53 100644 --- a/tests/src/drivers/test_driver_mac.c +++ b/tests/src/drivers/test_driver_mac.c @@ -17,13 +17,7 @@ * limitations under the License. */ -#define MBEDTLS_ALLOW_PRIVATE_ACCESS - -#if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" -#else -#include MBEDTLS_CONFIG_FILE -#endif +#include #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(PSA_CRYPTO_DRIVER_TEST) #include "psa_crypto_mac.h" diff --git a/tests/src/drivers/test_driver_signature.c b/tests/src/drivers/test_driver_signature.c index e486704152..2d58756aa5 100644 --- a/tests/src/drivers/test_driver_signature.c +++ b/tests/src/drivers/test_driver_signature.c @@ -19,14 +19,6 @@ * limitations under the License. */ -#define MBEDTLS_ALLOW_PRIVATE_ACCESS - -#if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" -#else -#include MBEDTLS_CONFIG_FILE -#endif - #include #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(PSA_CRYPTO_DRIVER_TEST) diff --git a/tests/src/drivers/test_driver_size.c b/tests/src/drivers/test_driver_size.c index af899c6898..033cf32de0 100644 --- a/tests/src/drivers/test_driver_size.c +++ b/tests/src/drivers/test_driver_size.c @@ -18,13 +18,7 @@ * limitations under the License. */ -#define MBEDTLS_ALLOW_PRIVATE_ACCESS - -#if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" -#else -#include MBEDTLS_CONFIG_FILE -#endif +#include #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(PSA_CRYPTO_DRIVER_TEST)