commit 40cdaa12630a5fd0c616f7fe244541d4e0524cc7
author Hanno Becker <hanno.becker@arm.com> Wed Feb 05 10:48:27 2020 +0000
committer Hanno Becker <hanno.becker@arm.com> Wed Feb 05 10:50:51 2020 +0000
tree 4e5324f8aad67664f23c8a1bb8b4cb7c19751d4f
parent ce5f5fdcb4567a86644235062379730deeab0179

Move ssl_start_renegotiation() to public namespace

include/mbedtls/ssl_internal.h

diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index 288297e..18f9f7e 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -1093,4 +1093,6 @@
 
 void mbedtls_ssl_handshake_wrapup_free_hs_transform( mbedtls_ssl_context *ssl );
 
+int mbedtls_ssl_start_renegotiation( mbedtls_ssl_context *ssl );
+
 #endif /* ssl_internal.h */

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 206d07e..03d84e3 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -10562,7 +10562,7 @@
  * If the handshake doesn't complete due to waiting for I/O, it will continue
  * during the next calls to mbedtls_ssl_renegotiate() or mbedtls_ssl_read() respectively.
  */
-static int ssl_start_renegotiation( mbedtls_ssl_context *ssl )
+int mbedtls_ssl_start_renegotiation( mbedtls_ssl_context *ssl )
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 
@@ -10636,9 +10636,9 @@
         if( ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER )
             return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 
-        if( ( ret = ssl_start_renegotiation( ssl ) ) != 0 )
+        if( ( ret = mbedtls_ssl_start_renegotiation( ssl ) ) != 0 )
         {
-            MBEDTLS_SSL_DEBUG_RET( 1, "ssl_start_renegotiation", ret );
+            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_start_renegotiation", ret );
             return( ret );
         }
     }
@@ -10846,11 +10846,12 @@
                     ssl->renego_status = MBEDTLS_SSL_RENEGOTIATION_PENDING;
                 }
 #endif
-                ret = ssl_start_renegotiation( ssl );
+                ret = mbedtls_ssl_start_renegotiation( ssl );
                 if( ret != MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO &&
                     ret != 0 )
                 {
-                    MBEDTLS_SSL_DEBUG_RET( 1, "ssl_start_renegotiation", ret );
+                    MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_start_renegotiation",
+                                           ret );
                     return( ret );
                 }
             }