From 1630603ef10f9ce661b222585e32ab241d918343 Mon Sep 17 00:00:00 2001 From: Waleed Elmelegy Date: Mon, 25 Nov 2024 16:50:06 +0000 Subject: [PATCH] Change internal iop generate key error variable to int Change internal iop generate key error variable to int instead of psa_status_t since the error variable get passed to mbedtls_to_psa_error() when being returned Signed-off-by: Waleed Elmelegy --- tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c | 4 ++-- tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c index 6ce1cfb157..b43923e90e 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c @@ -600,7 +600,7 @@ psa_status_t mbedtls_psa_ecp_generate_key_iop_setup( mbedtls_psa_generate_key_iop_t *operation, const psa_key_attributes_t *attributes) { - psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; + int status = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; mbedtls_ecp_keypair_init(&operation->ecp); @@ -624,7 +624,7 @@ psa_status_t mbedtls_psa_ecp_generate_key_iop_complete( size_t *key_len) { *key_len = 0; - psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; + int status = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; *key_len = PSA_BITS_TO_BYTES(operation->ecp.grp.nbits); diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h index a2efcb71fc..f3ff32328b 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h @@ -236,7 +236,6 @@ psa_status_t mbedtls_psa_ecp_generate_key_iop_abort( * \retval #PSA_ERROR_CORRUPTION_DETECTED \emptydescription * \retval #PSA_ERROR_INSUFFICIENT_ENTROPY \emptydescription */ - psa_status_t mbedtls_psa_ecdsa_sign_hash( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size,