commit 9b562d5c3671354d61193c285eaf5e50d62d64e4
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Apr 25 20:32:43 2018 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Apr 26 10:00:40 2018 +0200
tree a758b73890e4f75a06c12e4331da702896ea9215
parent 2e333375708f01bed5db51a3d89613e2fdd30daf

mbedtls_ssl_handshake_free: take the SSL context as argument

Change the signature of mbedtls_ssl_handshake_free again. Now take the
whole SSL context as argument and not just the configuration and the
handshake substructure.

This is in preparation for changing the asynchronous cancel callback
to take the SSL context as an argument.

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index f5d332f..aa48b45 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5201,7 +5201,7 @@
     /*
      * Free our handshake params
      */
-    mbedtls_ssl_handshake_free( ssl->conf, ssl->handshake );
+    mbedtls_ssl_handshake_free( ssl );
     mbedtls_free( ssl->handshake );
     ssl->handshake = NULL;
 
@@ -5556,7 +5556,7 @@
     if( ssl->session_negotiate )
         mbedtls_ssl_session_free( ssl->session_negotiate );
     if( ssl->handshake )
-        mbedtls_ssl_handshake_free( ssl->conf, ssl->handshake );
+        mbedtls_ssl_handshake_free( ssl );
 
     /*
      * Either the pointers are now NULL or cleared properly and can be freed.
@@ -7426,12 +7426,12 @@
 }
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
 
-void mbedtls_ssl_handshake_free( const mbedtls_ssl_config *conf,
-                                 mbedtls_ssl_handshake_params *handshake )
+void mbedtls_ssl_handshake_free( mbedtls_ssl_context *ssl )
 {
+    mbedtls_ssl_handshake_params *handshake = ssl->handshake;
+
     if( handshake == NULL )
         return;
-    (void) conf; /* Unused in some compile-time configurations. */
 
 #if defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \
     defined(MBEDTLS_SSL_PROTO_TLS1_1)
@@ -7496,11 +7496,11 @@
 #endif /* MBEDTLS_X509_CRT_PARSE_C && MBEDTLS_SSL_SERVER_NAME_INDICATION */
 
 #if defined(MBEDTLS_SSL_ASYNC_PRIVATE)
-    if( conf->f_async_cancel != NULL &&
+    if( ssl->conf->f_async_cancel != NULL &&
         handshake->p_async_operation_ctx != NULL )
     {
-        conf->f_async_cancel( conf->p_async_connection_ctx,
-                              handshake->p_async_operation_ctx );
+        ssl->conf->f_async_cancel( ssl->conf->p_async_connection_ctx,
+                                   handshake->p_async_operation_ctx );
     }
 #endif /* MBEDTLS_SSL_ASYNC_PRIVATE */
 
@@ -7571,7 +7571,7 @@
 
     if( ssl->handshake )
     {
-        mbedtls_ssl_handshake_free( ssl->conf, ssl->handshake );
+        mbedtls_ssl_handshake_free( ssl );
         mbedtls_ssl_transform_free( ssl->transform_negotiate );
         mbedtls_ssl_session_free( ssl->session_negotiate );