eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pk_wrap: minor fixes for guards

Browse source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-06-26 13:31:18 +02:00
parent 97976e3e4c
commit 4d1daf8f8d
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
library/pk_wrap.c
View file

@ -1650,6 +1650,7 @@ static int ecdsa_opaque_can_do(mbedtls_pk_type_t type)
* using the same function. */ * using the same function. */
#define ecdsa_opaque_check_pair_wrap eckey_check_pair_wrap #define ecdsa_opaque_check_pair_wrap eckey_check_pair_wrap
#else /* MBEDTLS_PK_USE_PSA_EC_DATA */ #else /* MBEDTLS_PK_USE_PSA_EC_DATA */
#if defined(MBEDTLS_ECP_LIGHT)
static int ecdsa_opaque_check_pair_wrap(mbedtls_pk_context *pub, static int ecdsa_opaque_check_pair_wrap(mbedtls_pk_context *pub,
mbedtls_pk_context *prv, mbedtls_pk_context *prv,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
@ -1683,6 +1684,7 @@ static int ecdsa_opaque_check_pair_wrap(mbedtls_pk_context *pub,
} }
return 0; return 0;
} }
#endif /* MBEDTLS_ECP_LIGHT */
#endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
const mbedtls_pk_info_t mbedtls_ecdsa_opaque_info = { const mbedtls_pk_info_t mbedtls_ecdsa_opaque_info = {
@ -1690,8 +1692,16 @@ const mbedtls_pk_info_t mbedtls_ecdsa_opaque_info = {
.name = "Opaque", .name = "Opaque",
.get_bitlen = opaque_get_bitlen, .get_bitlen = opaque_get_bitlen,
.can_do = ecdsa_opaque_can_do, .can_do = ecdsa_opaque_can_do,
#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY)
.verify_func = ecdsa_opaque_verify_wrap, .verify_func = ecdsa_opaque_verify_wrap,
#else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
.verify_func = NULL,
#endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
#if defined(MBEDTLS_PK_CAN_ECDSA_SIGN)
.sign_func = ecdsa_opaque_sign_wrap, .sign_func = ecdsa_opaque_sign_wrap,
#else /* MBEDTLS_PK_CAN_ECDSA_SIGN */
.sign_func = NULL,
#endif /* MBEDTLS_PK_CAN_ECDSA_SIGN */
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
.verify_rs_func = NULL, .verify_rs_func = NULL,
.sign_rs_func = NULL, .sign_rs_func = NULL,
@ -1700,7 +1710,11 @@ const mbedtls_pk_info_t mbedtls_ecdsa_opaque_info = {
#endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */
.decrypt_func = NULL, .decrypt_func = NULL,
.encrypt_func = NULL, .encrypt_func = NULL,
#if defined(MBEDTLS_ECP_LIGHT)
.check_pair_func = ecdsa_opaque_check_pair_wrap, .check_pair_func = ecdsa_opaque_check_pair_wrap,
#else /* MBEDTLS_ECP_LIGHT */
.check_pair_func = NULL,
#endif /* MBEDTLS_ECP_LIGHT */
.ctx_alloc_func = NULL, .ctx_alloc_func = NULL,
.ctx_free_func = NULL, .ctx_free_func = NULL,
.debug_func = NULL, .debug_func = NULL,