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

Move loading of public part of ECP into function

Browse source 
Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2023-02-06 15:59:09 +00:00
parent c9774411d4
commit eefe47292c
3 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/psa_crypto.c
View file

@ -3762,20 +3762,10 @@ psa_status_t mbedtls_psa_verify_hash_start(
return status;
}
/* Check whether the public part is loaded. If not, load it. */
if (mbedtls_ecp_is_zero(&operation->ctx->Q)) {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
int ret = mbedtls_psa_ecp_load_public_part(operation->ctx);
ret = mbedtls_ecp_mul(&operation->ctx->grp,
&operation->ctx->Q,
&operation->ctx->d,
&operation->ctx->grp.G,
mbedtls_psa_get_random,
MBEDTLS_PSA_RANDOM_STATE);
if (ret != 0) {
return mbedtls_to_psa_error(ret);
}
if (ret != 0) {
return mbedtls_to_psa_error(ret);
}
mbedtls_ecdsa_restart_init(&operation->restart_ctx);

23
library/psa_crypto_ecp.c
View file

@ -404,6 +404,21 @@ cleanup:
return mbedtls_to_psa_error(ret);
}
int mbedtls_psa_ecp_load_public_part(mbedtls_ecp_keypair *ecp)
{
int ret = 0;
/* Check whether the public part is loaded. If not, load it. */
if (mbedtls_ecp_is_zero(&ecp->Q)) {
ret = mbedtls_ecp_mul(&ecp->grp, &ecp->Q,
&ecp->d, &ecp->grp.G,
mbedtls_psa_get_random,
MBEDTLS_PSA_RANDOM_STATE);
}
return ret;
}
psa_status_t mbedtls_psa_ecdsa_verify_hash(
const psa_key_attributes_t *attributes,
const uint8_t *key_buffer, size_t key_buffer_size,
@ -443,12 +458,8 @@ psa_status_t mbedtls_psa_ecdsa_verify_hash(
signature + curve_bytes,
curve_bytes));
/* Check whether the public part is loaded. If not, load it. */
if (mbedtls_ecp_is_zero(&ecp->Q)) {
MBEDTLS_MPI_CHK(
mbedtls_ecp_mul(&ecp->grp, &ecp->Q, &ecp->d, &ecp->grp.G,
mbedtls_psa_get_random, MBEDTLS_PSA_RANDOM_STATE));
}
MBEDTLS_MPI_CHK(mbedtls_psa_ecp_load_public_part(ecp));
ret = mbedtls_ecdsa_verify(&ecp->grp, hash, hash_length,
&ecp->Q, &r, &s);

9
library/psa_crypto_ecp.h
View file

@ -48,6 +48,15 @@ psa_status_t mbedtls_psa_ecp_load_representation(psa_key_type_t type,
size_t data_length,
mbedtls_ecp_keypair **p_ecp);
/** Load the public part of an internal ECP, if required.
*
* \param ecp The ECP context to load the public part for.
*
* \return 0 on success, otherwise an MPI error.
*/
int mbedtls_psa_ecp_load_public_part(mbedtls_ecp_keypair *ecp);
/** Import an ECP key in binary format.
*
* \note The signature of this function is that of a PSA driver