mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC QTEST_FAULT: Allow deleted TLS extension to be output

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22523)
This commit is contained in:
Hugo Landau 2023-10-26 11:37:21 +01:00 committed by Tomas Mraz
parent 05937a70a1
commit 1d8a399f7b
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/helpers/quictestlib.c
View File

@ -929,12 +929,14 @@ int qtest_fault_resize_message(QTEST_FAULT *fault, size_t newlen)
int qtest_fault_delete_extension(QTEST_FAULT *fault,
unsigned int exttype, unsigned char *ext,
size_t *extlen)
size_t *extlen,
BUF_MEM *old_ext)
{
PACKET pkt, sub, subext;
WPACKET old_ext_wpkt;
unsigned int type;
const unsigned char *start, *end;
size_t newlen;
size_t newlen, w;
size_t msglen = fault->handbuflen;
if (!PACKET_buf_init(&pkt, ext, *extlen))
@ -954,6 +956,21 @@ int qtest_fault_delete_extension(QTEST_FAULT *fault,
/* Found it */
end = PACKET_data(&sub);
if (old_ext != NULL) {
if (!WPACKET_init(&old_ext_wpkt, old_ext))
return 0;
if (!WPACKET_memcpy(&old_ext_wpkt, PACKET_data(&subext),
PACKET_remaining(&subext))
|| !WPACKET_get_total_written(&old_ext_wpkt, &w)) {
WPACKET_cleanup(&old_ext_wpkt);
return 0;
}
WPACKET_finish(&old_ext_wpkt);
old_ext->length = w;
}
/*
* If we're not the last extension we need to move the rest earlier. The
* cast below is safe because we own the underlying buffer and we're no

6
test/helpers/quictestlib.h
View File

@ -194,11 +194,13 @@ int qtest_fault_resize_message(QTEST_FAULT *fault, size_t newlen);
* Helper function to delete an extension from an extension block. |exttype| is
* the type of the extension to be deleted. |ext| points to the extension block.
* On entry |*extlen| contains the length of the extension block. It is updated
* with the new length on exit.
* with the new length on exit. If old_ext is non-NULL, the deleted extension
* is appended to the given BUF_MEM.
*/
int qtest_fault_delete_extension(QTEST_FAULT *fault,
unsigned int exttype, unsigned char *ext,
size_t *extlen);
size_t *extlen,
BUF_MEM *old_ext);
/*
* Add additional helper functions for querying extensions here (e.g.

2
test/quicfaultstest.c
View File

@ -168,7 +168,7 @@ static int drop_extensions_cb(QTEST_FAULT *fault,
int *ext = (int *)encextcbarg;
if (!qtest_fault_delete_extension(fault, *ext, ee->extensions,
&ee->extensionslen))
&ee->extensionslen, NULL))
return 0;
return 1;