cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-03 10:34:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix mbedtls/psa status code mismatch

Browse Source 
Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemyslaw Stekiel 2021-12-02 09:15:20 +01:00
parent 871a336028
commit dc8d7d9211
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/psa_crypto.c
View File

@ -4865,8 +4865,9 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
mbedtls_mpi N; mbedtls_mpi N;
mbedtls_mpi k; mbedtls_mpi k;
mbedtls_mpi diff_N_2; mbedtls_mpi diff_N_2;
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; /* ret variable is used by MBEDTLS_MPI_CHK macro */
psa_status_t status; int ret = 0;
psa_status_t status = PSA_SUCCESS;
mbedtls_mpi_init( &k ); mbedtls_mpi_init( &k );
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &N );
@ -4879,18 +4880,15 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
if( grp_id == MBEDTLS_ECP_DP_NONE ) if( grp_id == MBEDTLS_ECP_DP_NONE )
{ {
ret = PSA_ERROR_INVALID_ARGUMENT; status = PSA_ERROR_INVALID_ARGUMENT;
goto cleanup; goto cleanup;
} }
mbedtls_ecp_group ecp_group; mbedtls_ecp_group ecp_group;
mbedtls_ecp_group_init( &ecp_group ); mbedtls_ecp_group_init( &ecp_group );
if( ( status = mbedtls_ecp_group_load( &ecp_group, grp_id ) ) != 0 ) if( ( status = mbedtls_to_psa_error( mbedtls_ecp_group_load( &ecp_group, grp_id ) ) ) != 0 )
{
ret = status;
goto cleanup; goto cleanup;
}
/* N is the boundary of the private key domain. */ /* N is the boundary of the private key domain. */
MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &N, &ecp_group.N ) ); MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &N, &ecp_group.N ) );
@ -4902,15 +4900,12 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
*data = mbedtls_calloc( 1, m_bytes ); *data = mbedtls_calloc( 1, m_bytes );
if( *data == NULL ) if( *data == NULL )
{ {
ret = PSA_ERROR_INSUFFICIENT_MEMORY; status = PSA_ERROR_INSUFFICIENT_MEMORY;
goto cleanup; goto cleanup;
} }
/* 1. Draw a byte string of length ceiling(m/8) bytes. */ /* 1. Draw a byte string of length ceiling(m/8) bytes. */
if ( ( status = psa_key_derivation_output_bytes( operation, *data, m_bytes ) ) != 0 ) if ( ( status = psa_key_derivation_output_bytes( operation, *data, m_bytes ) ) != 0 )
{
ret = status;
goto cleanup; goto cleanup;
}
/* 2. If m is not a multiple of 8 */ /* 2. If m is not a multiple of 8 */
if (m % 8) if (m % 8)
@ -4941,17 +4936,17 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
/* 5. Output k + 1 as the private key. */ /* 5. Output k + 1 as the private key. */
MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &k, &k, 1)); MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &k, &k, 1));
MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &k, *data, m_bytes) ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &k, *data, m_bytes) );
ret = 0;
cleanup: cleanup:
if (ret) { if( ret )
status = mbedtls_to_psa_error( ret );
if (status) {
mbedtls_free( *data ); mbedtls_free( *data );
*data = NULL; *data = NULL;
} }
mbedtls_mpi_free( &k ); mbedtls_mpi_free( &k );
mbedtls_mpi_free( &N ); mbedtls_mpi_free( &N );
mbedtls_mpi_free( &diff_N_2 ); mbedtls_mpi_free( &diff_N_2 );
return( ret ); return( status );
} }
#endif #endif