Refactor macro-spanning ifs in ecp.c
Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
parent
8a7629fd0f
commit
fc735dffd6
1 changed files with 11 additions and 7 deletions
|
@ -2287,12 +2287,14 @@ cleanup:
|
||||||
mbedtls_free( T );
|
mbedtls_free( T );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* don't free R while in progress in case R == P */
|
int should_free_R = 0;
|
||||||
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
|
||||||
if( ret != MBEDTLS_ERR_ECP_IN_PROGRESS )
|
|
||||||
#endif
|
|
||||||
/* prevent caller from using invalid value */
|
/* prevent caller from using invalid value */
|
||||||
if( ret != 0 )
|
should_free_R = ( ret != 0 );
|
||||||
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
||||||
|
/* don't free R while in progress in case R == P */
|
||||||
|
should_free_R = should_free_R && ( ret != MBEDTLS_ERR_ECP_IN_PROGRESS );
|
||||||
|
#endif
|
||||||
|
if( should_free_R )
|
||||||
mbedtls_ecp_point_free( R );
|
mbedtls_ecp_point_free( R );
|
||||||
|
|
||||||
ECP_RS_LEAVE( rsm );
|
ECP_RS_LEAVE( rsm );
|
||||||
|
@ -2537,10 +2539,12 @@ static int ecp_mul_restartable_internal( mbedtls_ecp_group *grp, mbedtls_ecp_poi
|
||||||
MBEDTLS_MPI_CHK( mbedtls_internal_ecp_init( grp ) );
|
MBEDTLS_MPI_CHK( mbedtls_internal_ecp_init( grp ) );
|
||||||
#endif /* MBEDTLS_ECP_INTERNAL_ALT */
|
#endif /* MBEDTLS_ECP_INTERNAL_ALT */
|
||||||
|
|
||||||
|
int restarting = 0;
|
||||||
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
||||||
/* skip argument check when restarting */
|
restarting = ( rs_ctx != NULL && rs_ctx->rsm != NULL );
|
||||||
if( rs_ctx == NULL || rs_ctx->rsm == NULL )
|
|
||||||
#endif
|
#endif
|
||||||
|
/* skip argument check when restarting */
|
||||||
|
if( !restarting )
|
||||||
{
|
{
|
||||||
/* check_privkey is free */
|
/* check_privkey is free */
|
||||||
MBEDTLS_ECP_BUDGET( MBEDTLS_ECP_OPS_CHK );
|
MBEDTLS_ECP_BUDGET( MBEDTLS_ECP_OPS_CHK );
|
||||||
|
|
Loading…
Reference in a new issue