mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-10-21 14:53:42 +03:00
Move timer into the endpoint structure
No behavior change. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
@@ -194,6 +194,9 @@ typedef struct mbedtls_test_ssl_endpoint {
|
||||
mbedtls_ssl_context ssl;
|
||||
mbedtls_ssl_config conf;
|
||||
mbedtls_test_mock_socket socket;
|
||||
#if defined(MBEDTLS_TIMING_C)
|
||||
mbedtls_timing_delay_context timer;
|
||||
#endif
|
||||
|
||||
/* Objects owned by the endpoint */
|
||||
mbedtls_x509_crt *ca_chain;
|
||||
|
@@ -786,6 +786,11 @@ int mbedtls_test_ssl_endpoint_init(
|
||||
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 @@ void mbedtls_test_ssl_perform_handshake(
|
||||
#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 @@ void mbedtls_test_ssl_perform_handshake(
|
||||
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 @@ void mbedtls_test_ssl_perform_handshake(
|
||||
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 @@ void mbedtls_test_ssl_perform_handshake(
|
||||
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
|
||||
|
Reference in New Issue
Block a user