Improve readability by moving counter decrement

Avoid the slightly awkward rs_ctx-> i = i + 1
This commit is contained in:
Manuel Pégourié-Gonnard 2018-10-16 10:45:24 +02:00
parent a58e011ac0
commit 90f31b71a8

View file

@ -1711,9 +1711,11 @@ static int ecp_mul_comb_core( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R
MBEDTLS_MPI_CHK( ecp_randomize_jac( grp, R, f_rng, p_rng ) ); MBEDTLS_MPI_CHK( ecp_randomize_jac( grp, R, f_rng, p_rng ) );
} }
while( i-- != 0 ) while( i != 0 )
{ {
MBEDTLS_ECP_BUDGET( MBEDTLS_ECP_OPS_DBL + MBEDTLS_ECP_OPS_ADD ); MBEDTLS_ECP_BUDGET( MBEDTLS_ECP_OPS_DBL + MBEDTLS_ECP_OPS_ADD );
--i;
MBEDTLS_MPI_CHK( ecp_double_jac( grp, R, R ) ); MBEDTLS_MPI_CHK( ecp_double_jac( grp, R, R ) );
MBEDTLS_MPI_CHK( ecp_select_comb( grp, &Txi, T, T_size, x[i] ) ); MBEDTLS_MPI_CHK( ecp_select_comb( grp, &Txi, T, T_size, x[i] ) );
MBEDTLS_MPI_CHK( ecp_add_mixed( grp, R, R, &Txi ) ); MBEDTLS_MPI_CHK( ecp_add_mixed( grp, R, R, &Txi ) );
@ -1727,8 +1729,7 @@ cleanup:
if( rs_ctx != NULL && rs_ctx->rsm != NULL && if( rs_ctx != NULL && rs_ctx->rsm != NULL &&
ret == MBEDTLS_ERR_ECP_IN_PROGRESS ) ret == MBEDTLS_ERR_ECP_IN_PROGRESS )
{ {
/* was decreased before actually doing it */ rs_ctx->rsm->i = i;
rs_ctx->rsm->i = i + 1;
/* no need to save R, already pointing to rs_ctx->rsm->R */ /* no need to save R, already pointing to rs_ctx->rsm->R */
} }
#endif #endif