lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-01 10:06:53 +03:00
Code Activity

ssl_helpers.c: add mbedtls_test_ssl prefix for *_exchange_data

Browse Source 
Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang
2023-03-16 12:15:49 +08:00
parent d02c3175e6
commit 74df2012a2
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/include/test/ssl_helpers.h
View File

@ -498,10 +498,11 @@ int mbedtls_test_ssl_populate_session(mbedtls_ssl_session *session,
* *
* \retval 0 on success, otherwise error code. * \retval 0 on success, otherwise error code.
*/ */
int mbedtls_exchange_data(mbedtls_ssl_context *ssl_1, int mbedtls_test_ssl_exchange_data(
int msg_len_1, const int expected_fragments_1, mbedtls_ssl_context *ssl_1,
mbedtls_ssl_context *ssl_2, int msg_len_1, const int expected_fragments_1,
int msg_len_2, const int expected_fragments_2); mbedtls_ssl_context *ssl_2,
int msg_len_2, const int expected_fragments_2);
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) && \ #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) && \
defined(MBEDTLS_CERTS_C) && \ defined(MBEDTLS_CERTS_C) && \

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

@ -821,7 +821,7 @@ int mbedtls_ssl_write_fragment(mbedtls_ssl_context *ssl,
/* Used for DTLS and the message size larger than MFL. In that case /* Used for DTLS and the message size larger than MFL. In that case
* the message can not be fragmented and the library should return * the message can not be fragmented and the library should return
* MBEDTLS_ERR_SSL_BAD_INPUT_DATA error. This error must be returned * MBEDTLS_ERR_SSL_BAD_INPUT_DATA error. This error must be returned
* to prevent a dead loop inside mbedtls_exchange_data(). */ * to prevent a dead loop inside mbedtls_test_ssl_exchange_data(). */
return ret; return ret;
} else if (expected_fragments == 1) { } else if (expected_fragments == 1) {
/* Used for TLS/DTLS and the message size lower than MFL */ /* Used for TLS/DTLS and the message size lower than MFL */
@ -1279,10 +1279,11 @@ int mbedtls_test_ssl_populate_session(mbedtls_ssl_session *session,
return 0; return 0;
} }
int mbedtls_exchange_data(mbedtls_ssl_context *ssl_1, int mbedtls_test_ssl_exchange_data(
int msg_len_1, const int expected_fragments_1, mbedtls_ssl_context *ssl_1,
mbedtls_ssl_context *ssl_2, int msg_len_1, const int expected_fragments_1,
int msg_len_2, const int expected_fragments_2) mbedtls_ssl_context *ssl_2,
int msg_len_2, const int expected_fragments_2)
{ {
unsigned char *msg_buf_1 = malloc(msg_len_1); unsigned char *msg_buf_1 = malloc(msg_len_1);
unsigned char *msg_buf_2 = malloc(msg_len_2); unsigned char *msg_buf_2 = malloc(msg_len_2);
@ -1397,8 +1398,8 @@ exit:
static int exchange_data(mbedtls_ssl_context *ssl_1, static int exchange_data(mbedtls_ssl_context *ssl_1,
mbedtls_ssl_context *ssl_2) mbedtls_ssl_context *ssl_2)
{ {
return mbedtls_exchange_data(ssl_1, 256, 1, return mbedtls_test_ssl_exchange_data(ssl_1, 256, 1,
ssl_2, 256, 1); ssl_2, 256, 1);
} }
#endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED && MBEDTLS_CERTS_C && #endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED && MBEDTLS_CERTS_C &&
MBEDTLS_ENTROPY_C && MBEDTLS_CTR_DRBG_C && MBEDTLS_ENTROPY_C && MBEDTLS_CTR_DRBG_C &&
@ -1622,10 +1623,11 @@ void mbedtls_test_ssl_perform_handshake(
if (options->cli_msg_len != 0 || options->srv_msg_len != 0) { if (options->cli_msg_len != 0 || options->srv_msg_len != 0) {
/* Start data exchanging test */ /* Start data exchanging test */
TEST_ASSERT(mbedtls_exchange_data(&(client.ssl), options->cli_msg_len, TEST_ASSERT(mbedtls_test_ssl_exchange_data(
options->expected_cli_fragments, &(client.ssl), options->cli_msg_len,
&(server.ssl), options->srv_msg_len, options->expected_cli_fragments,
options->expected_srv_fragments) &(server.ssl), options->srv_msg_len,
options->expected_srv_fragments)
== 0); == 0);
} }
#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION) #if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
@ -1680,12 +1682,10 @@ void mbedtls_test_ssl_perform_handshake(
#endif #endif
/* Retest writing/reading */ /* Retest writing/reading */
if (options->cli_msg_len != 0 || options->srv_msg_len != 0) { if (options->cli_msg_len != 0 || options->srv_msg_len != 0) {
TEST_ASSERT(mbedtls_exchange_data( TEST_ASSERT(mbedtls_test_ssl_exchange_data(
&(client.ssl), &(client.ssl), options->cli_msg_len,
options->cli_msg_len,
options->expected_cli_fragments, options->expected_cli_fragments,
&(server.ssl), &(server.ssl), options->srv_msg_len,
options->srv_msg_len,
options->expected_srv_fragments) options->expected_srv_fragments)
== 0); == 0);
} }