commit 2b161c33bef53b2ac43bfbe7dffe2a8489e6d086
author Ron Eldor <Ron.Eldor@arm.com> Thu Nov 01 16:18:20 2018 +0200
committer Ron Eldor <Ron.Eldor@arm.com> Thu Nov 01 16:18:20 2018 +0200
tree a008f06e2a9961c87eb2ecf77a344cb7cca5e81f
parent 936d284f4d803de343f5fb98db86fc046bafdaff

Fix compilation issue

Fix compilation error when both `MBEDTLS_ECP_RESTARTABLE` and the
alternative definition of ECDH function are defined.

library/ecdh.c

diff --git a/library/ecdh.c b/library/ecdh.c
index 9fad8e1..b7e25dc 100644
--- a/library/ecdh.c
+++ b/library/ecdh.c
@@ -198,7 +198,7 @@
     if( ctx == NULL || ctx->grp.pbits == 0 )
         return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
 
-#if defined(MBEDTLS_ECP_RESTARTABLE)
+#if defined(MBEDTLS_ECP_RESTARTABLE) && !defined(MBEDTLS_ECDH_GEN_PUBLIC_ALT)
     if( ctx->restart_enabled )
         rs_ctx = &ctx->rs;
 #endif
@@ -293,7 +293,7 @@
     if( ctx == NULL || ctx->grp.pbits == 0 )
         return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
 
-#if defined(MBEDTLS_ECP_RESTARTABLE)
+#if defined(MBEDTLS_ECP_RESTARTABLE) && !defined(MBEDTLS_ECDH_GEN_PUBLIC_ALT)
     if( ctx->restart_enabled )
         rs_ctx = &ctx->rs;
 #endif
@@ -349,7 +349,7 @@
     if( ctx == NULL || ctx->grp.pbits == 0 )
         return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
 
-#if defined(MBEDTLS_ECP_RESTARTABLE)
+#if defined(MBEDTLS_ECP_RESTARTABLE) && !defined(MBEDTLS_ECDH_GEN_PUBLIC_ALT)
     if( ctx->restart_enabled )
         rs_ctx = &ctx->rs;
 #endif