mbedtls_mpi_mod_write: improve readability
Signed-off-by: Janos Follath <janos.follath@arm.com>
diff --git a/library/bignum_mod.c b/library/bignum_mod.c
index 74af509..0f2d7e2 100644
--- a/library/bignum_mod.c
+++ b/library/bignum_mod.c
@@ -230,7 +230,6 @@
mbedtls_mpi_mod_ext_rep ext_rep )
{
int ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
- int conv_ret = 0;
/* Do our best to check if r and m have been set up */
if( r->limbs == 0 || m->limbs == 0 )
@@ -240,21 +239,26 @@
if( m->int_rep == MBEDTLS_MPI_MOD_REP_MONTGOMERY )
{
- conv_ret = mbedtls_mpi_mod_raw_from_mont_rep( r->p, m );
- if( conv_ret != 0 )
+ ret = mbedtls_mpi_mod_raw_from_mont_rep( r->p, m );
+ if( ret != 0 )
goto cleanup;
}
ret = mbedtls_mpi_mod_raw_write( r->p, m, buf, buflen, ext_rep );
if( m->int_rep == MBEDTLS_MPI_MOD_REP_MONTGOMERY )
- conv_ret = mbedtls_mpi_mod_raw_to_mont_rep( r->p, m );
+ {
+ /* If this fails, the value of r is corrupted and we want to return
+ * this error (as opposed to the error code from the write above) to
+ * let the caller know. If it succeeds, we want to return the error
+ * code from write above. */
+ int conv_ret = mbedtls_mpi_mod_raw_to_mont_rep( r->p, m );
+ if( ret == 0 )
+ ret = conv_ret;
+ }
cleanup:
- if( ret == 0 )
- ret = conv_ret;
-
return ( ret );
}
/* END MERGE SLOT 7 */
