lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

psa: remove bits_is_sloppy parameter from mbedtls_ecc_group_from_psa()

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti
2023-12-21 14:03:51 +01:00
parent ddba51e6c9
commit d36c313b53
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/psa_crypto_ecp.c
View File

@ -41,6 +41,7 @@ psa_status_t mbedtls_psa_ecp_load_representation(
psa_status_t status;
mbedtls_ecp_keypair *ecp = NULL;
size_t curve_bytes = data_length;
size_t curve_bits_check;
int explicit_bits = (curve_bits != 0);
if (PSA_KEY_TYPE_IS_PUBLIC_KEY(type) &&
@ -84,7 +85,7 @@ psa_status_t mbedtls_psa_ecp_load_representation(
/* Load the group. */
grp_id = mbedtls_ecc_group_from_psa(PSA_KEY_TYPE_ECC_GET_FAMILY(type),
curve_bits, !explicit_bits);
curve_bits);
if (grp_id == MBEDTLS_ECP_DP_NONE) {
/* We can't distinguish between a nonsensical family/size combination
* (which would warrant PSA_ERROR_INVALID_ARGUMENT) and a
@ -96,6 +97,17 @@ psa_status_t mbedtls_psa_ecp_load_representation(
goto exit;
}
/* Get the exact number of bits which are necessary for this key. This is
* used to validate the "curve_bits" input parameter (only in case it was
* provided).
* Note: we intentionally ignore the return value of mbedtls_ecc_group_to_psa()
* because we are only interested in the curve's bit size. */
mbedtls_ecc_group_to_psa(grp_id, &curve_bits_check);
if (explicit_bits && (curve_bits_check != curve_bits)) {
status = PSA_ERROR_NOT_SUPPORTED;
goto exit;
}
status = mbedtls_to_psa_error(
mbedtls_ecp_group_load(&ecp->grp, grp_id));
if (status != PSA_SUCCESS) {
@ -285,7 +297,7 @@ psa_status_t mbedtls_psa_ecp_generate_key(
psa_ecc_family_t curve = PSA_KEY_TYPE_ECC_GET_FAMILY(
attributes->core.type);
mbedtls_ecp_group_id grp_id =
mbedtls_ecc_group_from_psa(curve, attributes->core.bits, 0);
mbedtls_ecc_group_from_psa(curve, attributes->core.bits);
const mbedtls_ecp_curve_info *curve_info =
mbedtls_ecp_curve_info_from_grp_id(grp_id);