Skip to content

Keep pending plaintext valid during TLS input growth #11591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aidangarske wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Keep pending plaintext valid during TLS input growth #11591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45e45eb
Test that a coalesced app data record is returned before the next
aidangarske Nov 6, 2026
859994b
Make coalesced record test fail safely
aidangarske Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions tests/api/test_ssl_rw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,58 @@ int test_wolfSSL_inject_app_data_ready(void)
return EXPECT_RESULT();
}

/* Deliver a buffered application record before reading the next record. */
int test_wolfSSL_inject_coalesced_read(void)
{
EXPECT_DECLS;
#if defined(HAVE_MANUAL_MEMIO_TESTS_DEPENDENCIES) && !defined(NO_TLS) && \
!defined(WOLFSSL_NO_TLS12)
WOLFSSL_CTX* ctx_c = NULL;
WOLFSSL_CTX* ctx_s = NULL;
WOLFSSL* ssl_c = NULL;
WOLFSSL* ssl_s = NULL;
struct test_memio_ctx test_ctx;
byte first[32];
byte second[4096];
byte received[sizeof(first)];
int firstRecordSz;

XMEMSET(first, 0x41, sizeof(first));
XMEMSET(second, 0x42, sizeof(second));
XMEMSET(&test_ctx, 0, sizeof(test_ctx));
ExpectIntEQ(test_memio_setup(&test_ctx, &ctx_c, &ctx_s, &ssl_c, &ssl_s,
wolfTLSv1_2_client_method, wolfTLSv1_2_server_method), 0);
ExpectIntEQ(test_memio_do_handshake(ssl_c, ssl_s, 10, NULL), 0);
test_memio_clear_buffer(&test_ctx, 1);

ExpectIntEQ(wolfSSL_write(ssl_s, first, sizeof(first)), sizeof(first));
ExpectIntEQ(wolfSSL_write(ssl_s, second, sizeof(second)), sizeof(second));
ExpectIntGT(test_ctx.c_len, RECORD_HEADER_SZ);
if (test_ctx.c_len <= RECORD_HEADER_SZ)
goto cleanup;
/* The record length occupies the final two header bytes. */
firstRecordSz = RECORD_HEADER_SZ +
((int)test_ctx.c_buff[RECORD_HEADER_SZ - 2] << 8) +
(int)test_ctx.c_buff[RECORD_HEADER_SZ - 1];
ExpectIntGT(test_ctx.c_len, firstRecordSz + RECORD_HEADER_SZ);
if (test_ctx.c_len <= firstRecordSz + RECORD_HEADER_SZ)
goto cleanup;
ExpectIntEQ(wolfSSL_inject(ssl_c, test_ctx.c_buff,
firstRecordSz + RECORD_HEADER_SZ), WOLFSSL_SUCCESS);
test_memio_clear_buffer(&test_ctx, 1);
ExpectIntEQ(wolfSSL_read(ssl_c, received, sizeof(received)),
sizeof(received));
ExpectBufEQ(received, first, sizeof(first));

cleanup:
wolfSSL_free(ssl_c);
wolfSSL_free(ssl_s);
wolfSSL_CTX_free(ctx_c);
wolfSSL_CTX_free(ctx_s);
#endif
return EXPECT_RESULT();
}

/* Test that application data decrypted from an injected record is returned
* before a partial record queued behind it is processed.
*
Expand Down
2 changes: 2 additions & 0 deletions tests/api/test_ssl_rw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ int test_wolfSSL_rw_bad_args(void);
int test_wolfSSL_rw_info_callback(void);
int test_wolfSSL_write_ex_partial(void);
int test_wolfSSL_inject_app_data_ready(void);
int test_wolfSSL_inject_coalesced_read(void);
int test_wolfSSL_inject_app_data_partial_record(void);
int test_wolfSSL_clear_app_data_pending(void);
int test_wolfSSL_rehandshake_app_data_pending(void);
Expand Down Expand Up @@ -62,6 +63,7 @@ int test_wolfSSL_write_dup_max_fragment(void);
TEST_DECL_GROUP("ssl_rw", test_wolfSSL_rw_info_callback), \
TEST_DECL_GROUP("ssl_rw", test_wolfSSL_write_ex_partial), \
TEST_DECL_GROUP("ssl_rw", test_wolfSSL_inject_app_data_ready), \
TEST_DECL_GROUP("ssl_rw", test_wolfSSL_inject_coalesced_read), \
TEST_DECL_GROUP("ssl_rw", \
test_wolfSSL_inject_app_data_partial_record), \
TEST_DECL_GROUP("ssl_rw", test_wolfSSL_clear_app_data_pending), \
Expand Down
Loading