ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-04 05:34:37 +08:00
Code Issues Releases Wiki Activity

Add missing ifdefs

Browse Source 
Make sure that the error translating functions
are only defined when they're used.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
This commit is contained in:
Andrzej Kurek 2023-05-30 09:21:20 -04:00
parent 0064484a70
commit 1c7a99856f
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/constant_time.c
View File

@ -46,7 +46,9 @@
#endif #endif
#include <string.h> #include <string.h>
#if defined(MBEDTLS_USE_PSA_CRYPTO)
#if defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_SSL_SOME_SUITES_USE_MAC)
#include "psa/crypto.h"
/* Define a local translating function to save code size by not using too many /* Define a local translating function to save code size by not using too many
* arguments in each translating place. */ * arguments in each translating place. */
static int local_err_translation(psa_status_t status) static int local_err_translation(psa_status_t status)

2
library/ssl_tls12_client.c
View File

@ -33,6 +33,7 @@
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
#include "mbedtls/psa_util.h" #include "mbedtls/psa_util.h"
#include "psa/crypto.h" #include "psa/crypto.h"
#if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
/* Define a local translating function to save code size by not using too many /* Define a local translating function to save code size by not using too many
* arguments in each translating place. */ * arguments in each translating place. */
static int local_err_translation(psa_status_t status) static int local_err_translation(psa_status_t status)
@ -42,6 +43,7 @@ static int local_err_translation(psa_status_t status)
psa_generic_status_to_mbedtls); psa_generic_status_to_mbedtls);
} }
#define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status) #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
#endif /* MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
#include <string.h> #include <string.h>

3
library/ssl_tls12_server.c
View File

@ -36,6 +36,8 @@
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
/* Define a local translating function to save code size by not using too many /* Define a local translating function to save code size by not using too many
* arguments in each translating place. */ * arguments in each translating place. */
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_ECDH_ENABLED) || \
defined(MBEDTLS_KEY_EXCHANGE_SOME_ECDHE_ENABLED)
static int local_err_translation(psa_status_t status) static int local_err_translation(psa_status_t status)
{ {
return psa_status_to_mbedtls(status, psa_to_ssl_errors, return psa_status_to_mbedtls(status, psa_to_ssl_errors,
@ -44,6 +46,7 @@ static int local_err_translation(psa_status_t status)
} }
#define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status) #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
#endif #endif
#endif
#if defined(MBEDTLS_ECP_C) #if defined(MBEDTLS_ECP_C)
#include "mbedtls/ecp.h" #include "mbedtls/ecp.h"