commit 33f41a8fa858128d5e9a1d1e1afbd4e63f24d444
author Andrzej Kurek <andrzej.kurek@arm.com> Wed Jun 08 11:47:33 2022 -0400
committer Andrzej Kurek <andrzej.kurek@arm.com> Fri Jun 17 07:37:02 2022 -0400
tree fe70205fbbcf40d62b8c1fa1dfaebe18b40f9861
parent a39170bbed1f5a69f108ea19fe3510c3643d53ab

Add the mbedtls prefix to  ssl_check_dtls_clihlo_cookie
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

include/mbedtls/ssl_internal.h

diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index f3de299..83047c5 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -1307,7 +1307,7 @@
 #endif /* MBEDTLS_SSL_PROTO_DTLS */
 
 #if defined(MBEDTLS_TEST_HOOKS)
-int ssl_check_dtls_clihlo_cookie(
+int mbedtls_ssl_check_dtls_clihlo_cookie(
                           mbedtls_ssl_context *ssl,
                           const unsigned char *cli_id, size_t cli_id_len,
                           const unsigned char *in, size_t in_len,

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 4c2abc6..dfcdc93 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -3239,10 +3239,8 @@
  *   return MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED
  * - otherwise return a specific error code
  */
-#if !defined(MBEDTLS_TEST_HOOKS)
-static
-#endif
-int ssl_check_dtls_clihlo_cookie(
+MBEDTLS_STATIC_TESTABLE
+int mbedtls_ssl_check_dtls_clihlo_cookie(
                            mbedtls_ssl_context *ssl,
                            const unsigned char *cli_id, size_t cli_id_len,
                            const unsigned char *in, size_t in_len,
@@ -3414,13 +3412,13 @@
         return( 0 );
     }
 
-    ret = ssl_check_dtls_clihlo_cookie(
+    ret = mbedtls_ssl_check_dtls_clihlo_cookie(
             ssl,
             ssl->cli_id, ssl->cli_id_len,
             ssl->in_buf, ssl->in_left,
             ssl->out_buf, MBEDTLS_SSL_OUT_CONTENT_LEN, &len );
 
-    MBEDTLS_SSL_DEBUG_RET( 2, "ssl_check_dtls_clihlo_cookie", ret );
+    MBEDTLS_SSL_DEBUG_RET( 2, "mbedtls_ssl_check_dtls_clihlo_cookie", ret );
 
     if( ret == MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED )
     {

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 4e3c2e9..7b6691b 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -4640,11 +4640,12 @@
                 0 );
 
     TEST_EQUAL( mbedtls_ssl_setup( &ssl, &conf ), 0 );
-    TEST_EQUAL( ssl_check_dtls_clihlo_cookie( &ssl, ssl.cli_id, ssl.cli_id_len,
-                                              cookie->x, cookie->len,
-                                              ssl.out_buf,
-                                              MBEDTLS_SSL_OUT_CONTENT_LEN,
-                                              &len ),
+    TEST_EQUAL( mbedtls_ssl_check_dtls_clihlo_cookie( &ssl, ssl.cli_id,
+                                                  ssl.cli_id_len,
+                                                  cookie->x, cookie->len,
+                                                  ssl.out_buf,
+                                                  MBEDTLS_SSL_OUT_CONTENT_LEN,
+                                                  &len ),
                 exp_ret );
 
     mbedtls_ssl_free( &ssl );