From f51488b95d46d0c6643c5163ba231524df738bcf Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Fri, 16 Aug 2024 07:46:06 +0200 Subject: [PATCH] psa: fix some macro definition Signed-off-by: Valerio Setti --- include/psa/crypto_sizes.h | 4 ++-- library/psa_crypto_core.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/psa/crypto_sizes.h b/include/psa/crypto_sizes.h index 892bfa3e7f..87b8c39fa6 100644 --- a/include/psa/crypto_sizes.h +++ b/include/psa/crypto_sizes.h @@ -1039,8 +1039,8 @@ #endif #define PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE \ - (PSA_EXPORT_KEY_PAIR_MAX_SIZE > PSA_EXPORT_PUBLIC_KEY_MAX_SIZE) ? \ - PSA_EXPORT_KEY_PAIR_MAX_SIZE : PSA_EXPORT_PUBLIC_KEY_MAX_SIZE + ((PSA_EXPORT_KEY_PAIR_MAX_SIZE > PSA_EXPORT_PUBLIC_KEY_MAX_SIZE) ? \ + PSA_EXPORT_KEY_PAIR_MAX_SIZE : PSA_EXPORT_PUBLIC_KEY_MAX_SIZE) /** Sufficient output buffer size for psa_raw_key_agreement(). * diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h index 7832001d8c..6dd00730ce 100644 --- a/library/psa_crypto_core.h +++ b/library/psa_crypto_core.h @@ -60,8 +60,8 @@ typedef enum { * PSA_CIPHER_MAX_KEY_LENGTH. */ #if !defined(MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE) #define MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE \ - (PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE > PSA_CIPHER_MAX_KEY_LENGTH) ? \ - PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE : PSA_CIPHER_MAX_KEY_LENGTH + ((PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE > PSA_CIPHER_MAX_KEY_LENGTH) ? \ + PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE : PSA_CIPHER_MAX_KEY_LENGTH) #endif /* !MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE*/ /** The data structure representing a key slot, containing key material