From 4d1daf8f8d3d70f56e0f7bf4a77a84f66751f516 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Mon, 26 Jun 2023 13:31:18 +0200 Subject: [PATCH] pk_wrap: minor fixes for guards Signed-off-by: Valerio Setti --- library/pk_wrap.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/library/pk_wrap.c b/library/pk_wrap.c index dae8b4304..c0a7fbde2 100644 --- a/library/pk_wrap.c +++ b/library/pk_wrap.c @@ -1650,6 +1650,7 @@ static int ecdsa_opaque_can_do(mbedtls_pk_type_t type) * using the same function. */ #define ecdsa_opaque_check_pair_wrap eckey_check_pair_wrap #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ +#if defined(MBEDTLS_ECP_LIGHT) static int ecdsa_opaque_check_pair_wrap(mbedtls_pk_context *pub, mbedtls_pk_context *prv, 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; } +#endif /* MBEDTLS_ECP_LIGHT */ #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ const mbedtls_pk_info_t mbedtls_ecdsa_opaque_info = { @@ -1690,8 +1692,16 @@ const mbedtls_pk_info_t mbedtls_ecdsa_opaque_info = { .name = "Opaque", .get_bitlen = opaque_get_bitlen, .can_do = ecdsa_opaque_can_do, +#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) .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, +#else /* MBEDTLS_PK_CAN_ECDSA_SIGN */ + .sign_func = NULL, +#endif /* MBEDTLS_PK_CAN_ECDSA_SIGN */ #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) .verify_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 */ .decrypt_func = NULL, .encrypt_func = NULL, +#if defined(MBEDTLS_ECP_LIGHT) .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_free_func = NULL, .debug_func = NULL,