commit 6b7301c8722e9fce24f1e17e3b716d15cca618d5
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Aug 15 12:08:45 2017 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Aug 15 12:08:45 2017 +0200
tree 003d8abf0949b9596391050deeb344107cd9c7a1
parent d27d1a5a82b4b0cf63cef05698bc8918883e7868

Change restart context type.

No need to have both x509 and ecdsa, as the former contains the later.

include/mbedtls/ssl_internal.h

diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index bc38b8b..00a8db4 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -228,7 +228,7 @@
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
 #if defined(MBEDTLS_SSL__ECP_RESTARTABLE)
     int ecrs_enabled;                   /*!< Handshake supports EC restart? */
-    mbedtls_ecdsa_restart_ctx ecrs_ctx; /*!< ECDSA restart context          */
+    mbedtls_x509_crt_restart_ctx ecrs_ctx;  /*!< restart context            */
     enum {
         ssl_ecrs_init = 0,              /*!< just getting started           */
         ssl_ecrs_ske_read,              /*!< ServerKeyExchange was read     */

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index db57713..7ffeb5b 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2615,7 +2615,7 @@
 
 #if defined(MBEDTLS_SSL__ECP_RESTARTABLE)
         if( ssl->handshake->ecrs_enabled )
-            rs_ctx = &ssl->handshake->ecrs_ctx;
+            rs_ctx = &ssl->handshake->ecrs_ctx.ecdsa;
 #endif
 
         if( ( ret = mbedtls_pk_verify_restartable(
@@ -3290,7 +3290,7 @@
 
 #if defined(MBEDTLS_SSL__ECP_RESTARTABLE)
     if( ssl->handshake->ecrs_enabled )
-        rs_ctx = &ssl->handshake->ecrs_ctx;
+        rs_ctx = &ssl->handshake->ecrs_ctx.ecdsa;
 #endif
 
     if( ( ret = mbedtls_pk_sign_restartable( mbedtls_ssl_own_key( ssl ),

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 90331ef..221071b 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5473,7 +5473,7 @@
 #endif
 
 #if defined(MBEDTLS_SSL__ECP_RESTARTABLE)
-    mbedtls_ecdsa_restart_init( &handshake->ecrs_ctx );
+    mbedtls_x509_crt_restart_init( &handshake->ecrs_ctx );
 #endif
 
 #if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
@@ -7309,7 +7309,7 @@
 #endif /* MBEDTLS_X509_CRT_PARSE_C && MBEDTLS_SSL_SERVER_NAME_INDICATION */
 
 #if defined(MBEDTLS_SSL__ECP_RESTARTABLE)
-    mbedtls_ecdsa_restart_free( &handshake->ecrs_ctx );
+    mbedtls_x509_crt_restart_free( &handshake->ecrs_ctx );
 #endif
 
 #if defined(MBEDTLS_SSL_PROTO_DTLS)