mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-03 01:13:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid nested #ifs in body of pk_get_ecpubkey()

Browse Source 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2023-07-26 10:53:25 +02:00
parent 116175c5d7
commit e82fcd9c9e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/pkparse.c
View File

@ -675,7 +675,7 @@ static int pk_parse_key_rfc8410_der(mbedtls_pk_context *pk,
} }
#endif /* MBEDTLS_PK_HAVE_RFC8410_CURVES */ #endif /* MBEDTLS_PK_HAVE_RFC8410_CURVES */
#if defined(MBEDTLS_PK_USE_PSA_EC_DATA) && defined(MBEDTLS_PK_PARSE_EC_COMPRESSED) #if defined(MBEDTLS_PK_USE_PSA_EC_DATA)
/* /*
* Create a temporary ecp_keypair for converting an EC point in compressed * Create a temporary ecp_keypair for converting an EC point in compressed
* format to an uncompressed one * format to an uncompressed one
@ -685,6 +685,7 @@ static int pk_convert_compressed_ec(mbedtls_pk_context *pk,
size_t *out_buf_len, unsigned char *out_buf, size_t *out_buf_len, unsigned char *out_buf,
size_t out_buf_size) size_t out_buf_size)
{ {
#if defined(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;
int ret; int ret;
@ -708,8 +709,11 @@ static int pk_convert_compressed_ec(mbedtls_pk_context *pk,
exit: exit:
mbedtls_ecp_keypair_free(&ecp_key); mbedtls_ecp_keypair_free(&ecp_key);
return ret; return ret;
#else /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE;
#endif /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
} }
#endif /* MBEDTLS_PK_USE_PSA_EC_DATA && MBEDTLS_PK_PARSE_EC_COMPRESSED */ #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
/* /*
* EC public key is an EC point * EC public key is an EC point
@ -732,20 +736,15 @@ static int pk_get_ecpubkey(unsigned char **p, const unsigned char *end,
return MBEDTLS_ERR_PK_BAD_INPUT_DATA; return MBEDTLS_ERR_PK_BAD_INPUT_DATA;
} }
/* Compressed point format are not supported yet by PSA crypto. As a
* consequence ecp functions are used to "convert" the point to
* uncompressed format */
if ((**p == 0x02) || (**p == 0x03)) { if ((**p == 0x02) || (**p == 0x03)) {
#if defined(MBEDTLS_PK_PARSE_EC_COMPRESSED) /* Compressed format, not supported by PSA Crypto.
* Try converting using functions from ECP_LIGHT. */
ret = pk_convert_compressed_ec(pk, *p, len, ret = pk_convert_compressed_ec(pk, *p, len,
&(pk->pub_raw_len), pk->pub_raw, &(pk->pub_raw_len), pk->pub_raw,
PSA_EXPORT_PUBLIC_KEY_MAX_SIZE); PSA_EXPORT_PUBLIC_KEY_MAX_SIZE);
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }
#else /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE;
#endif /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
} else { } else {
/* Uncompressed format */ /* Uncompressed format */
if ((size_t) (end - *p) > MBEDTLS_PK_MAX_EC_PUBKEY_RAW_LEN) { if ((size_t) (end - *p) > MBEDTLS_PK_MAX_EC_PUBKEY_RAW_LEN) {