From 5c4d38639db1be6324f448991314f0276179c196 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 7 Dec 2020 11:07:24 +0100 Subject: [PATCH] psa: Extend psa_get_key_buffer_size scope When generating transparent keys, we need to be able to compute the size of the key buffer whether the key is generated by the Mbed TLS library or by an accelerator. Thus, change the RSA/ECP MBEDTLS_PSA_BUILTIN_... compilation guards with their PSA_WANT_... counterparts. Signed-off-by: Ronald Cron --- library/psa_crypto.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 67fdd5c6d4..0f7d4bdcb6 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -6013,7 +6013,7 @@ static psa_status_t psa_get_key_buffer_size( *key_buffer_size = PSA_BITS_TO_BYTES( bits ); } else -#if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR) +#if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR) if( PSA_KEY_TYPE_IS_RSA( type ) && PSA_KEY_TYPE_IS_KEY_PAIR( type ) ) { if( bits > PSA_VENDOR_RSA_MAX_KEY_BITS ) @@ -6027,15 +6027,15 @@ static psa_status_t psa_get_key_buffer_size( *key_buffer_size = PSA_KEY_EXPORT_RSA_KEY_PAIR_MAX_SIZE( bits ); } else -#endif /* defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR) */ +#endif /* defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR) */ -#if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR) +#if defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR) if( PSA_KEY_TYPE_IS_ECC( type ) && PSA_KEY_TYPE_IS_KEY_PAIR( type ) ) { *key_buffer_size = PSA_BITS_TO_BYTES( bits ); } else -#endif /* defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR) */ +#endif /* defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR) */ { return( PSA_ERROR_NOT_SUPPORTED ); }