commit 91e20a0580b811cbb398b7a9e8d2a9fc26145858
author David Horstmann <david.horstmann@arm.com> Thu Oct 06 19:11:28 2022 +0100
committer David Horstmann <david.horstmann@arm.com> Fri Oct 07 14:08:42 2022 +0100
tree 17c748ed12e3911a1643bc548783f6afc9f4bc58
parent fc735dffd600808fb998141274c8323e98bfb79f

Refactor macro-spanning ifs in ecdh.c

Signed-off-by: David Horstmann <david.horstmann@arm.com>

library/ecdh.c

diff --git a/library/ecdh.c b/library/ecdh.c
index 35ab1b7..c9c2e06 100644
--- a/library/ecdh.c
+++ b/library/ecdh.c
@@ -71,10 +71,12 @@
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 
-    /* If multiplication is in progress, we already generated a privkey */
+    int restarting = 0;
 #if defined(MBEDTLS_ECP_RESTARTABLE)
-    if( rs_ctx == NULL || rs_ctx->rsm == NULL )
+    restarting = ( rs_ctx != NULL && rs_ctx->rsm != NULL );
 #endif
+    /* If multiplication is in progress, we already generated a privkey */
+    if( !restarting )
         MBEDTLS_MPI_CHK( mbedtls_ecp_gen_privkey( grp, d, f_rng, p_rng ) );
 
     MBEDTLS_MPI_CHK( mbedtls_ecp_mul_restartable( grp, Q, d, &grp->G,