From a81aed2dae61c3f4575253ac6aaa33de6f4014d6 Mon Sep 17 00:00:00 2001 From: Przemek Stekiel Date: Tue, 1 Mar 2022 15:13:30 +0100 Subject: [PATCH] Clean up init values of psa crypto status and fix switch default case Signed-off-by: Przemek Stekiel --- library/psa_crypto.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 6435f2952..9178e23d2 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -4858,7 +4858,7 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper( mbedtls_mpi k; mbedtls_mpi diff_N_2; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; - psa_status_t status = PSA_ERROR_GENERIC_ERROR; + psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; mbedtls_mpi_init( &k ); mbedtls_mpi_init( &diff_N_2 ); @@ -4962,7 +4962,7 @@ static psa_status_t psa_generate_derived_ecc_key_montgomery_helper( ) { size_t output_length; - psa_status_t status = PSA_ERROR_GENERIC_ERROR; + psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; switch( bits ) { @@ -4999,7 +4999,7 @@ static psa_status_t psa_generate_derived_ecc_key_montgomery_helper( (*data)[55] |= 128; break; default: - /* should never happen */ + return( PSA_ERROR_CORRUPTION_DETECTED ); break; } @@ -5015,7 +5015,7 @@ static psa_status_t psa_generate_derived_key_internal( uint8_t *data = NULL; size_t bytes = PSA_BITS_TO_BYTES( bits ); size_t storage_size = bytes; - psa_status_t status; + psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR) if( PSA_KEY_TYPE_IS_PUBLIC_KEY( slot->attr.type ) )