ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-12 01:42:21 +08:00
Code Issues Releases Wiki Activity

Fix and document return of pk_ecc_set_pubkey()

Browse Source 
One of the calling site needs to distinguish between "the format is
potentially valid but not supported" vs "other errors", and it uses
MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE for that.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2023-07-27 09:19:42 +02:00
parent ff72ea9d51
commit fac9819edc
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/pkparse.c
View File

@ -238,13 +238,19 @@ static int pk_ecc_set_pubkey_from_prv(mbedtls_pk_context *pk,
* out: will have the public key set. * out: will have the public key set.
* [in] pub, pub_len: the public key as an ECPoint, * [in] pub, pub_len: the public key as an ECPoint,
* in any format supported by ECP. * in any format supported by ECP.
*
* Return:
* - 0 on success;
* - MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE if the format is potentially valid
* but not supported;
* - another error code otherwise.
*/ */
static int pk_ecc_set_pubkey_psa_ecp_fallback(mbedtls_pk_context *pk, static int pk_ecc_set_pubkey_psa_ecp_fallback(mbedtls_pk_context *pk,
const unsigned char *pub, const unsigned char *pub,
size_t pub_len) size_t pub_len)
{ {
#if !defined(MBEDTLS_PK_PARSE_EC_COMPRESSED) #if !defined(MBEDTLS_PK_PARSE_EC_COMPRESSED)
return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE; return MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
#else /* MBEDTLS_PK_PARSE_EC_COMPRESSED */ #else /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
mbedtls_ecp_keypair ecp_key; mbedtls_ecp_keypair ecp_key;
mbedtls_ecp_group_id ecp_group_id; mbedtls_ecp_group_id ecp_group_id;
@ -280,6 +286,12 @@ exit:
* [in/out] pk: in: must have its group set, see pk_ecc_set_group(). * [in/out] pk: in: must have its group set, see pk_ecc_set_group().
* out: will have the public key set. * out: will have the public key set.
* [in] pub, pub_len: the raw public key (an ECPoint). * [in] pub, pub_len: the raw public key (an ECPoint).
*
* Return:
* - 0 on success;
* - MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE if the format is potentially valid
* but not supported;
* - another error code otherwise.
*/ */
static int pk_ecc_set_pubkey(mbedtls_pk_context *pk, static int pk_ecc_set_pubkey(mbedtls_pk_context *pk,
const unsigned char *pub, size_t pub_len) const unsigned char *pub, size_t pub_len)