cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-23 04:26:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't change the configuration after mbedtls_ssl_setup

Browse Source 
In `mbedtls_test_ssl_endpoint_init()`, don't change the SSL configuration
object (`mbedtls_ssl_config`) after setting up an SSL context by calling
`mbedtls_ssl_setup()`. This works in practice, but is officially forbidden.

No intended behavior change. The test code calls the library slightly
differently, but this shouldn't make any difference in practice. If it does
make a difference, it fixes a bug in the test code.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2025-06-01 21:32:05 +02:00
parent 6e4d245b00
commit a6e71f95fb
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/src/test_helpers/ssl_helpers.c
View File

@ -835,24 +835,6 @@ int mbedtls_test_ssl_endpoint_init(
mbedtls_test_mock_socket_init(&(ep->socket));
/* Non-blocking callbacks without timeout */
if (options->dtls) {
mbedtls_ssl_set_bio(&(ep->ssl), &ep->dtls_context,
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,
mbedtls_test_mock_tcp_recv_nb,
NULL);
}
ret = mbedtls_ssl_config_defaults(&(ep->conf), endpoint_type,
options->dtls ?
MBEDTLS_SSL_TRANSPORT_DATAGRAM :
@ -939,14 +921,6 @@ int mbedtls_test_ssl_endpoint_init(
TEST_EQUAL(MBEDTLS_SSL_MAX_FRAG_LEN_NONE, options->mfl);
#endif /* MBEDTLS_SSL_MAX_FRAGMENT_LENGTH */
ret = mbedtls_ssl_setup(&(ep->ssl), &(ep->conf));
TEST_EQUAL(ret, 0);
if (MBEDTLS_SSL_IS_CLIENT == endpoint_type) {
ret = mbedtls_ssl_set_hostname(&(ep->ssl), "localhost");
TEST_EQUAL(ret, 0);
}
#if defined(MBEDTLS_SSL_PROTO_DTLS) && defined(MBEDTLS_SSL_SRV_C)
if (endpoint_type == MBEDTLS_SSL_IS_SERVER && options->dtls) {
mbedtls_ssl_conf_dtls_cookies(&(ep->conf), NULL, NULL, NULL);
@ -993,6 +967,35 @@ int mbedtls_test_ssl_endpoint_init(
TEST_EQUAL(mbedtls_ssl_conf_get_user_data_n(&ep->conf), user_data_n);
mbedtls_ssl_conf_set_user_data_p(&ep->conf, ep);
/* We've finished the configuration. Now set up a context. */
ret = mbedtls_ssl_setup(&(ep->ssl), &(ep->conf));
TEST_EQUAL(ret, 0);
if (MBEDTLS_SSL_IS_CLIENT == endpoint_type) {
ret = mbedtls_ssl_set_hostname(&(ep->ssl), "localhost");
TEST_EQUAL(ret, 0);
}
/* Non-blocking callbacks without timeout */
if (options->dtls) {
mbedtls_ssl_set_bio(&(ep->ssl), &ep->dtls_context,
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,
mbedtls_test_mock_tcp_recv_nb,
NULL);
}
TEST_EQUAL(mbedtls_ssl_get_user_data_n(&ep->ssl), user_data_n);
mbedtls_ssl_set_user_data_p(&ep->ssl, ep);