yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8605 from valeriosetti/issue8600

Browse source 
Quit using enrollment alg in for ECDSA in PK
This commit is contained in:
Manuel Pégourié-Gonnard 2023-12-12 16:53:15 +00:00 committed by GitHub
commit ea6b3c030d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
library/pk_wrap.c
View file

@ -955,37 +955,34 @@ static int pk_ecdsa_sig_asn1_from_psa(unsigned char *sig, size_t *sig_len,
return 0; return 0;
} }
/* Common helper for ECDSA sign using PSA functions. */ /* Common helper for ECDSA sign using PSA functions.
* Instead of extracting key's properties in order to check which kind of ECDSA
* signature it supports, we try both deterministic and non-deterministic.
*/
static int ecdsa_sign_psa(mbedtls_svc_key_id_t key_id, mbedtls_md_type_t md_alg, static int ecdsa_sign_psa(mbedtls_svc_key_id_t key_id, mbedtls_md_type_t md_alg,
const unsigned char *hash, size_t hash_len, const unsigned char *hash, size_t hash_len,
unsigned char *sig, size_t sig_size, size_t *sig_len) unsigned char *sig, size_t sig_size, size_t *sig_len)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
psa_status_t status; psa_status_t status;
psa_algorithm_t psa_sig_md;
psa_key_attributes_t key_attr = PSA_KEY_ATTRIBUTES_INIT;
psa_algorithm_t alg, alg2;
status = psa_get_key_attributes(key_id, &key_attr); status = psa_sign_hash(key_id,
if (status != PSA_SUCCESS) { PSA_ALG_DETERMINISTIC_ECDSA(mbedtls_md_psa_alg_from_type(md_alg)),
hash, hash_len, sig, sig_size, sig_len);
if (status == PSA_SUCCESS) {
goto done;
} else if (status != PSA_ERROR_NOT_PERMITTED) {
return PSA_PK_ECDSA_TO_MBEDTLS_ERR(status); return PSA_PK_ECDSA_TO_MBEDTLS_ERR(status);
} }
alg = psa_get_key_algorithm(&key_attr);
alg2 = psa_get_key_enrollment_algorithm(&key_attr);
psa_reset_key_attributes(&key_attr);
if (PSA_ALG_IS_DETERMINISTIC_ECDSA(alg) || PSA_ALG_IS_DETERMINISTIC_ECDSA(alg2)) { status = psa_sign_hash(key_id,
psa_sig_md = PSA_ALG_DETERMINISTIC_ECDSA(mbedtls_md_psa_alg_from_type(md_alg)); PSA_ALG_ECDSA(mbedtls_md_psa_alg_from_type(md_alg)),
} else { hash, hash_len, sig, sig_size, sig_len);
psa_sig_md = PSA_ALG_ECDSA(mbedtls_md_psa_alg_from_type(md_alg));
}
status = psa_sign_hash(key_id, psa_sig_md, hash, hash_len,
sig, sig_size, sig_len);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
return PSA_PK_ECDSA_TO_MBEDTLS_ERR(status); return PSA_PK_ECDSA_TO_MBEDTLS_ERR(status);
} }
done:
ret = pk_ecdsa_sig_asn1_from_psa(sig, sig_len, sig_size); ret = pk_ecdsa_sig_asn1_from_psa(sig, sig_len, sig_size);
return ret; return ret;