mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-29 04:20:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tidy up header guards

Browse Source 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2024-10-23 16:55:20 +01:00
parent 19bc246afa
commit 08ccf6ac9b
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/include/test/psa_crypto_helpers.h
View File

@ -11,10 +11,8 @@
#include "test/helpers.h" #include "test/helpers.h"
#if ((MBEDTLS_VERSION_MAJOR < 4) \ #if (MBEDTLS_VERSION_MAJOR < 4 && defined(MBEDTLS_PSA_CRYPTO_C)) || \
&& defined(MBEDTLS_PSA_CRYPTO_C)) \ (MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
|| (MBEDTLS_VERSION_MAJOR >= 4 \
&& defined(MBEDTLS_PSA_CRYPTO_CLIENT))
#include "test/psa_helpers.h" #include "test/psa_helpers.h"
#include <psa/crypto.h> #include <psa/crypto.h>
#endif #endif
@ -43,8 +41,7 @@
mbedtls_psa_crypto_free(); \ mbedtls_psa_crypto_free(); \
} \ } \
while (0) while (0)
#elif MBEDTLS_VERSION_MAJOR >= 4 && \ #elif MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_PSA_CRYPTO_CLIENT)
defined(MBEDTLS_PSA_CRYPTO_CLIENT) /* MBEDTLS_PSA_CRYPTO_CLIENT && !MBEDTLS_PSA_CRYPTO_C */
#define PSA_INIT() PSA_ASSERT(psa_crypto_init()) #define PSA_INIT() PSA_ASSERT(psa_crypto_init())
#define PSA_DONE() mbedtls_psa_crypto_free(); #define PSA_DONE() mbedtls_psa_crypto_free();
#else /* MBEDTLS_PSA_CRYPTO_CLIENT && !MBEDTLS_PSA_CRYPTO_C */ #else /* MBEDTLS_PSA_CRYPTO_CLIENT && !MBEDTLS_PSA_CRYPTO_C */
@ -52,10 +49,8 @@
#define PSA_DONE() ((void) 0) #define PSA_DONE() ((void) 0)
#endif /* MBEDTLS_PSA_CRYPTO_C */ #endif /* MBEDTLS_PSA_CRYPTO_C */
#if ((MBEDTLS_VERSION_MAJOR < 4) \ #if (MBEDTLS_VERSION_MAJOR < 4 && defined(MBEDTLS_PSA_CRYPTO_C)) || \
&& defined(MBEDTLS_PSA_CRYPTO_C)) \ (MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
|| (MBEDTLS_VERSION_MAJOR >= 4 \
&& defined(MBEDTLS_PSA_CRYPTO_CLIENT))
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)

6
tests/src/psa_exercise_key.c
View File

@ -11,10 +11,8 @@
#include <test/macros.h> #include <test/macros.h>
#include <test/psa_exercise_key.h> #include <test/psa_exercise_key.h>
#if ((MBEDTLS_VERSION_MAJOR < 4) \ #if (MBEDTLS_VERSION_MAJOR < 4 && defined(MBEDTLS_PSA_CRYPTO_C)) || \
&& defined(MBEDTLS_PSA_CRYPTO_C)) \ (MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
|| (MBEDTLS_VERSION_MAJOR >= 4 \
&& defined(MBEDTLS_PSA_CRYPTO_CLIENT))
#include <mbedtls/asn1.h> #include <mbedtls/asn1.h>
#include <psa/crypto.h> #include <psa/crypto.h>