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

pkparse: do not set key algorithm for Montgomery keys in pk_ecc_set_key()

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-12-06 10:07:34 +01:00
parent 3d12d65946
commit fbbafa0d2d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/pkparse.c
View File

@ -105,16 +105,21 @@ static int pk_ecc_set_key(mbedtls_pk_context *pk,
{ {
#if defined(MBEDTLS_PK_USE_PSA_EC_DATA) #if defined(MBEDTLS_PK_USE_PSA_EC_DATA)
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_key_usage_t flags;
psa_status_t status; psa_status_t status;
psa_set_key_type(&attributes, PSA_KEY_TYPE_ECC_KEY_PAIR(pk->ec_family)); psa_set_key_type(&attributes, PSA_KEY_TYPE_ECC_KEY_PAIR(pk->ec_family));
psa_set_key_algorithm(&attributes, PSA_ALG_ECDH); if (pk->ec_family == PSA_ECC_FAMILY_MONTGOMERY) {
psa_key_usage_t flags = PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_DERIVE; /* Do not set algorithm here because Montgomery keys cannot do ECDSA and
/* Montgomery allows only ECDH, others ECDSA too */ * the PK module cannot do ECDH. When the key will be used in TLS for
if (pk->ec_family != PSA_ECC_FAMILY_MONTGOMERY) { * ECDH, it will be exported and then re-imported with proper flags
flags |= PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE; * and algorithm. */
psa_set_key_enrollment_algorithm(&attributes, flags = PSA_KEY_USAGE_EXPORT;
} else {
psa_set_key_algorithm(&attributes,
MBEDTLS_PK_PSA_ALG_ECDSA_MAYBE_DET(PSA_ALG_ANY_HASH)); MBEDTLS_PK_PSA_ALG_ECDSA_MAYBE_DET(PSA_ALG_ANY_HASH));
flags = PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE |
PSA_KEY_USAGE_EXPORT;
} }
psa_set_key_usage_flags(&attributes, flags); psa_set_key_usage_flags(&attributes, flags);