Mbed-TLS/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-08-12 14:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

mbedtls_test_ssl_endpoint_init: store user_data_n in the endpoint object

Browse Source 
This will allow splitting the configuration and setup stages of
`mbedtls_test_ssl_endpoint_init()`, while still checking that the value is
carried over from the configuration to the session context.

No behavior change.

Signed-off-by: Gilles Peskine <[email protected]>
This commit is contained in:
Gilles Peskine
2025-06-01 21:52:30 +02:00
parent a6e71f95fb
commit 00eb072846
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/include/test/ssl_helpers.h
+1
View File
@@ -194,6 +194,7 @@ typedef struct mbedtls_test_ssl_endpoint {
mbedtls_ssl_context ssl;
mbedtls_ssl_config conf;
mbedtls_test_mock_socket socket;
uintptr_t user_data_cookie; /* A unique value associated with this endpoint */
/* Objects only used by DTLS.
* They should be guarded by MBEDTLS_SSL_PROTO_DTLS, but
tests/src/test_helpers/ssl_helpers.c
+7 -7
View File
@@ -805,7 +805,6 @@ int mbedtls_test_ssl_endpoint_init(
const mbedtls_test_handshake_test_options *options)
{
int ret = -1;
uintptr_t user_data_n;
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED)
const char *psk_identity = "foo";
#endif
@@ -828,10 +827,10 @@ int mbedtls_test_ssl_endpoint_init(
TEST_EQUAL(mbedtls_ssl_get_user_data_n(&ep->ssl), 0);
(void) mbedtls_test_rnd_std_rand(NULL,
(void *) &user_data_n,
sizeof(user_data_n));
mbedtls_ssl_conf_set_user_data_n(&ep->conf, user_data_n);
mbedtls_ssl_set_user_data_n(&ep->ssl, user_data_n);
(void *) &ep->user_data_cookie,
sizeof(ep->user_data_cookie));
mbedtls_ssl_conf_set_user_data_n(&ep->conf, ep->user_data_cookie);
mbedtls_ssl_set_user_data_n(&ep->ssl, ep->user_data_cookie);
mbedtls_test_mock_socket_init(&(ep->socket));
@@ -965,7 +964,8 @@ int mbedtls_test_ssl_endpoint_init(
}
#endif
TEST_EQUAL(mbedtls_ssl_conf_get_user_data_n(&ep->conf), user_data_n);
TEST_EQUAL(mbedtls_ssl_conf_get_user_data_n(&ep->conf),
ep->user_data_cookie);
mbedtls_ssl_conf_set_user_data_p(&ep->conf, ep);
/* We've finished the configuration. Now set up a context. */
@@ -996,7 +996,7 @@ int mbedtls_test_ssl_endpoint_init(
NULL);
}
TEST_EQUAL(mbedtls_ssl_get_user_data_n(&ep->ssl), user_data_n);
TEST_EQUAL(mbedtls_ssl_get_user_data_n(&ep->ssl), ep->user_data_cookie);
mbedtls_ssl_set_user_data_p(&ep->ssl, ep);
return 0;