mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-11 00:40:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename curve_bytes to coordinate_bytes

Browse Source 
Also remove unneeded instance from verify operation struct.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2023-02-05 13:41:57 +00:00
parent 096abc4dc0
commit 1bc59df92c
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/psa/crypto_builtin_composites.h
View File

@ -117,7 +117,7 @@ typedef struct {
mbedtls_ecdsa_context *MBEDTLS_PRIVATE(ctx);
mbedtls_ecdsa_restart_ctx MBEDTLS_PRIVATE(restart_ctx);
size_t MBEDTLS_PRIVATE(curve_bytes);
size_t MBEDTLS_PRIVATE(coordinate_bytes);
psa_algorithm_t MBEDTLS_PRIVATE(alg);
mbedtls_md_type_t MBEDTLS_PRIVATE(md_alg);
const uint8_t *MBEDTLS_PRIVATE(hash);
@ -150,7 +150,6 @@ typedef struct {
mbedtls_ecdsa_context *MBEDTLS_PRIVATE(ctx);
mbedtls_ecdsa_restart_ctx MBEDTLS_PRIVATE(restart_ctx);
size_t MBEDTLS_PRIVATE(curve_bytes);
const uint8_t *MBEDTLS_PRIVATE(hash);
size_t MBEDTLS_PRIVATE(hash_length);

27
library/psa_crypto.c
View File

@ -3509,7 +3509,7 @@ psa_status_t mbedtls_psa_sign_hash_start(
mbedtls_ecdsa_restart_init(&operation->restart_ctx);
operation->curve_bytes = PSA_BITS_TO_BYTES(
operation->coordinate_bytes = PSA_BITS_TO_BYTES(
operation->ctx->grp.pbits);
psa_algorithm_t hash_alg = PSA_ALG_SIGN_GET_HASH(alg);
@ -3549,7 +3549,7 @@ psa_status_t mbedtls_psa_sign_hash_complete(
defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA)) && \
defined(MBEDTLS_ECP_RESTARTABLE)
if (signature_size < 2 * operation->curve_bytes) {
if (signature_size < 2 * operation->coordinate_bytes) {
return PSA_ERROR_BUFFER_TOO_SMALL;
}
@ -3595,7 +3595,8 @@ psa_status_t mbedtls_psa_sign_hash_complete(
status = mbedtls_to_psa_error(
mbedtls_mpi_write_binary(&r,
signature,
operation->curve_bytes));
operation->coordinate_bytes)
);
if (status != PSA_SUCCESS) {
return status;
@ -3604,14 +3605,15 @@ psa_status_t mbedtls_psa_sign_hash_complete(
status = mbedtls_to_psa_error(
mbedtls_mpi_write_binary(&s,
signature +
operation->curve_bytes,
operation->curve_bytes));
operation->coordinate_bytes,
operation->coordinate_bytes)
);
if (status != PSA_SUCCESS) {
return status;
}
*signature_length = operation->curve_bytes * 2;
*signature_length = operation->coordinate_bytes * 2;
return PSA_SUCCESS;
}
@ -3667,6 +3669,7 @@ psa_status_t mbedtls_psa_verify_hash_start(
const uint8_t *signature, size_t signature_length)
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
size_t coordinate_bytes = 0;
if (!PSA_KEY_TYPE_IS_ECC(attributes->core.type)) {
return PSA_ERROR_NOT_SUPPORTED;
@ -3695,11 +3698,9 @@ psa_status_t mbedtls_psa_verify_hash_start(
return status;
}
operation->curve_bytes = PSA_BITS_TO_BYTES(
operation->ctx->grp.pbits);
coordinate_bytes = PSA_BITS_TO_BYTES(operation->ctx->grp.pbits);
if (signature_length != 2 * operation->curve_bytes) {
if (signature_length != 2 * coordinate_bytes) {
return PSA_ERROR_INVALID_SIGNATURE;
}
@ -3707,7 +3708,7 @@ psa_status_t mbedtls_psa_verify_hash_start(
status = mbedtls_to_psa_error(
mbedtls_mpi_read_binary(&operation->r,
signature,
operation->curve_bytes));
coordinate_bytes));
if (status != PSA_SUCCESS) {
return status;
@ -3717,8 +3718,8 @@ psa_status_t mbedtls_psa_verify_hash_start(
status = mbedtls_to_psa_error(
mbedtls_mpi_read_binary(&operation->s,
signature +
operation->curve_bytes,
operation->curve_bytes));
coordinate_bytes,
coordinate_bytes));
if (status != PSA_SUCCESS) {
return status;