commit 0677e02b785f8b3e64d85c7d65690520f884b060
author Gilles Peskine <Gilles.Peskine@arm.com> Tue May 27 18:05:20 2025 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed May 28 20:23:22 2025 +0200
tree a5bc01157ad10b09ab1ea2ce99387f855f3b5a2c
parent 35a2d9b65a07b1bf4ae09e9814c7b3581cb92e2c

Move timer into the endpoint structure

No behavior change.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/src/test_helpers/ssl_helpers.c

diff --git a/tests/src/test_helpers/ssl_helpers.c b/tests/src/test_helpers/ssl_helpers.c
index f5a8412..90810c5 100644
--- a/tests/src/test_helpers/ssl_helpers.c
+++ b/tests/src/test_helpers/ssl_helpers.c
@@ -786,6 +786,11 @@
                             mbedtls_test_mock_tcp_send_msg,
                             mbedtls_test_mock_tcp_recv_msg,
                             NULL);
+#if defined(MBEDTLS_TIMING_C)
+        mbedtls_ssl_set_timer_cb(&ep->ssl, &ep->timer,
+                                 mbedtls_timing_set_delay,
+                                 mbedtls_timing_get_delay);
+#endif
     } else {
         mbedtls_ssl_set_bio(&(ep->ssl), &(ep->socket),
                             mbedtls_test_mock_tcp_send_nb,
@@ -2100,9 +2105,6 @@
 #if defined(MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED)
     const char *psk_identity = "foo";
 #endif
-#if defined(MBEDTLS_TIMING_C)
-    mbedtls_timing_delay_context timer_client, timer_server;
-#endif
 #if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
     unsigned char *context_buf = NULL;
     size_t context_buf_len;
@@ -2133,11 +2135,6 @@
                                                   options, &client_context,
                                                   &client_queue,
                                                   &server_queue), 0);
-#if defined(MBEDTLS_TIMING_C)
-        mbedtls_ssl_set_timer_cb(&client.ssl, &timer_client,
-                                 mbedtls_timing_set_delay,
-                                 mbedtls_timing_get_delay);
-#endif
     } else {
         TEST_EQUAL(mbedtls_test_ssl_endpoint_init(&client,
                                                   MBEDTLS_SSL_IS_CLIENT,
@@ -2156,11 +2153,6 @@
                                                   options, &server_context,
                                                   &server_queue,
                                                   &client_queue), 0);
-#if defined(MBEDTLS_TIMING_C)
-        mbedtls_ssl_set_timer_cb(&server.ssl, &timer_server,
-                                 mbedtls_timing_set_delay,
-                                 mbedtls_timing_get_delay);
-#endif
     } else {
         TEST_EQUAL(mbedtls_test_ssl_endpoint_init(&server,
                                                   MBEDTLS_SSL_IS_SERVER,
@@ -2323,7 +2315,7 @@
         mbedtls_ssl_set_user_data_p(&server.ssl, &server);
 
 #if defined(MBEDTLS_TIMING_C)
-        mbedtls_ssl_set_timer_cb(&server.ssl, &timer_server,
+        mbedtls_ssl_set_timer_cb(&server.ssl, &server.timer,
                                  mbedtls_timing_set_delay,
                                  mbedtls_timing_get_delay);
 #endif