mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-22 00:40:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disentangle 3.6/4.0 *_PSA_INIT/DONE variants

Browse Source 
Since PSA is always on in 4.x, *_PSA_INIT() and *_PSA_DONE() can be
simply aliased to PSA_INIT() and PSA_DONE() until such a time as we
remove them.

Simplify the login of these PSA_INIT/DONE variants by aliasing them in
4.x and keeping the more complex 3.6 logic entirely separate.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2024-10-25 15:00:55 +01:00
parent c46f8fb92f
commit fd38fdf501
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -323,6 +323,21 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT || MBEDTLS_PSA_CRYPTO_C */ #endif /* MBEDTLS_PSA_CRYPTO_CLIENT || MBEDTLS_PSA_CRYPTO_C */
#if MBEDTLS_VERSION_MAJOR >= 4
/* Legacy PSA_INIT() / PSA_DONE() variants from 3.6 */
#define USE_PSA_INIT() PSA_INIT()
#define USE_PSA_DONE() PSA_DONE()
#define MD_PSA_INIT() PSA_INIT()
#define MD_PSA_DONE() PSA_DONE()
#define BLOCK_CIPHER_PSA_INIT() PSA_INIT()
#define BLOCK_CIPHER_PSA_DONE() PSA_DONE()
#define MD_OR_USE_PSA_INIT() PSA_INIT()
#define MD_OR_USE_PSA_DONE() PSA_DONE()
#define AES_PSA_INIT() PSA_INIT()
#define AES_PSA_DONE() PSA_DONE()
#else /* MBEDTLS_VERSION_MAJOR < 4 */
/** \def USE_PSA_INIT /** \def USE_PSA_INIT
* *
* Call this macro to initialize the PSA subsystem if #MBEDTLS_USE_PSA_CRYPTO * Call this macro to initialize the PSA subsystem if #MBEDTLS_USE_PSA_CRYPTO
@ -340,11 +355,10 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
* This is like #PSA_DONE except it does nothing under the same conditions as * This is like #PSA_DONE except it does nothing under the same conditions as
* #USE_PSA_INIT. * #USE_PSA_INIT.
*/ */
#if defined(MBEDTLS_USE_PSA_CRYPTO) \ #if defined(MBEDTLS_USE_PSA_CRYPTO)
|| (MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_SSL_PROTO_TLS1_3))
#define USE_PSA_INIT() PSA_INIT() #define USE_PSA_INIT() PSA_INIT()
#define USE_PSA_DONE() PSA_DONE() #define USE_PSA_DONE() PSA_DONE()
#elif (MBEDTLS_VERSION_MAJOR < 4 && defined(MBEDTLS_SSL_PROTO_TLS1_3)) #elif defined(MBEDTLS_SSL_PROTO_TLS1_3)
/* TLS 1.3 must work without having called psa_crypto_init(), for backward /* TLS 1.3 must work without having called psa_crypto_init(), for backward
* compatibility with Mbed TLS <= 3.5 when connecting with a peer that * compatibility with Mbed TLS <= 3.5 when connecting with a peer that
* supports both TLS 1.2 and TLS 1.3. See mbedtls_ssl_tls13_crypto_init() * supports both TLS 1.2 and TLS 1.3. See mbedtls_ssl_tls13_crypto_init()
@ -424,13 +438,12 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
* This is like #PSA_DONE except it does nothing under the same conditions as * This is like #PSA_DONE except it does nothing under the same conditions as
* #MD_OR_USE_PSA_INIT. * #MD_OR_USE_PSA_INIT.
*/ */
#if defined(MBEDTLS_MD_SOME_PSA) || \ #if defined(MBEDTLS_MD_SOME_PSA)
defined(MBEDTLS_USE_PSA_CRYPTO) || defined(MBEDTLS_SSL_PROTO_TLS1_3)
#define MD_OR_USE_PSA_INIT() PSA_INIT() #define MD_OR_USE_PSA_INIT() PSA_INIT()
#define MD_OR_USE_PSA_DONE() PSA_DONE() #define MD_OR_USE_PSA_DONE() PSA_DONE()
#else #else
#define MD_OR_USE_PSA_INIT() ((void) 0) #define MD_OR_USE_PSA_INIT() USE_PSA_INIT()
#define MD_OR_USE_PSA_DONE() ((void) 0) #define MD_OR_USE_PSA_DONE() USE_PSA_DONE()
#endif #endif
/** \def AES_PSA_INIT /** \def AES_PSA_INIT
@ -456,6 +469,8 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
#define AES_PSA_DONE() ((void) 0) #define AES_PSA_DONE() ((void) 0)
#endif /* MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO */ #endif /* MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO */
#endif /* MBEDTLS_VERSION_MAJOR >= 4 */
#if !defined(MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG) && \ #if !defined(MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG) && \
defined(MBEDTLS_CTR_DRBG_C) && \ defined(MBEDTLS_CTR_DRBG_C) && \
defined(MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO) defined(MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO)