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

Also test inserting non-empty, non-handshake records

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2025-03-10 14:02:42 +01:00 committed by Manuel Pégourié-Gonnard
parent c34ea472fb
commit 5e3c0bd82b
2 changed files with 89 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tests/suites/test_suite_ssl.function
View File

@ -110,6 +110,7 @@ typedef enum {
RECOMBINE_NOMINAL, /* param: ignored */ RECOMBINE_NOMINAL, /* param: ignored */
RECOMBINE_SPLIT_FIRST, /* param: offset of split (<=0 means from end) */ RECOMBINE_SPLIT_FIRST, /* param: offset of split (<=0 means from end) */
RECOMBINE_INSERT_EMPTY, /* param: offset (<0 means from end) */ RECOMBINE_INSERT_EMPTY, /* param: offset (<0 means from end) */
RECOMBINE_INSERT_RECORD, /* param: record type */
RECOMBINE_COALESCE, /* param: min number of records */ RECOMBINE_COALESCE, /* param: min number of records */
RECOMBINE_COALESCE_SPLIT_ONCE, /* param: offset of split (<=0 means from end) */ RECOMBINE_COALESCE_SPLIT_ONCE, /* param: offset of split (<=0 means from end) */
RECOMBINE_COALESCE_SPLIT_ENDS, /* the hairiest one? param: offset, must be >0 */ RECOMBINE_COALESCE_SPLIT_ENDS, /* the hairiest one? param: offset, must be >0 */
@ -161,8 +162,9 @@ exit:
/* Insert an empty record at the given offset. If offset is negative, /* Insert an empty record at the given offset. If offset is negative,
* count from the end of the first record. */ * count from the end of the first record. */
static int recombine_insert_empty_record(mbedtls_test_ssl_buffer *buf, static int recombine_insert_record(mbedtls_test_ssl_buffer *buf,
int offset) int offset,
uint8_t inserted_record_type)
{ {
const size_t header_length = 5; const size_t header_length = 5;
TEST_LE_U(header_length, buf->content_length); TEST_LE_U(header_length, buf->content_length);
@ -175,22 +177,50 @@ static int recombine_insert_empty_record(mbedtls_test_ssl_buffer *buf,
offset = record_length + offset; offset = record_length + offset;
} }
/* Check that we have room to insert two record headers */ uint8_t inserted_content[42] = { 0 };
TEST_LE_U(buf->content_length + 2 * header_length, buf->capacity); size_t inserted_content_length = 0;
switch (inserted_record_type) {
case MBEDTLS_SSL_MSG_ALERT:
inserted_content[0] = MBEDTLS_SSL_ALERT_LEVEL_WARNING;
inserted_content[1] = MBEDTLS_SSL_ALERT_MSG_NO_RENEGOTIATION;
inserted_content_length = 2;
break;
case MBEDTLS_SSL_MSG_CHANGE_CIPHER_SPEC:
inserted_content[0] = 0x01;
inserted_content_length = 1;
break;
case MBEDTLS_SSL_MSG_APPLICATION_DATA:
inserted_content_length = sizeof(inserted_content);
break;
default:
/* Leave the content empty */
break;
}
/* Check that we have room to insert two record headers plus the new
* content. */
TEST_LE_U(buf->content_length + 2 * header_length + inserted_content_length,
buf->capacity);
/* Make room for an empty record and a record header */ /* Make room for an empty record and a record header */
size_t empty_record_start = header_length + offset; size_t inserted_record_start = header_length + offset;
size_t empty_content_start = empty_record_start + header_length; size_t inserted_content_start = inserted_record_start + header_length;
size_t tail_record_start = empty_content_start; size_t tail_record_start = inserted_content_start + inserted_content_length;
size_t tail_content_start = tail_record_start + header_length; size_t tail_content_start = tail_record_start + header_length;
memmove(buf->buffer + tail_content_start, memmove(buf->buffer + tail_content_start,
buf->buffer + tail_record_start, buf->buffer + tail_record_start,
buf->content_length - tail_record_start); buf->content_length - tail_record_start);
buf->content_length += 2 * header_length; buf->content_length += 2 * header_length;
/* Construct headers for the new records based on the existing one */ /* Construct the inserted record based on the existing one */
memcpy(buf->buffer + empty_record_start, buf->buffer, header_length); memcpy(buf->buffer + inserted_record_start, buf->buffer, header_length);
MBEDTLS_PUT_UINT16_BE(0, buf->buffer, empty_content_start - 2); buf->buffer[inserted_record_start] = inserted_record_type;
MBEDTLS_PUT_UINT16_BE(inserted_content_length,
buf->buffer, inserted_content_start - 2);
memcpy(buf->buffer + inserted_content_start,
inserted_content, inserted_content_length);
/* Construct header for the last fragment based on the existing one */
memcpy(buf->buffer + tail_record_start, buf->buffer, header_length); memcpy(buf->buffer + tail_record_start, buf->buffer, header_length);
MBEDTLS_PUT_UINT16_BE(record_length - offset, MBEDTLS_PUT_UINT16_BE(record_length - offset,
buf->buffer, tail_content_start - 2); buf->buffer, tail_content_start - 2);
@ -278,7 +308,15 @@ static int recombine_records(mbedtls_test_ssl_endpoint *server,
break; break;
case RECOMBINE_INSERT_EMPTY: case RECOMBINE_INSERT_EMPTY:
ret = recombine_insert_empty_record(buf, param); /* Insert an empty handshake record. */
ret = recombine_insert_record(buf, param, MBEDTLS_SSL_MSG_HANDSHAKE);
TEST_LE_S(0, ret);
break;
case RECOMBINE_INSERT_RECORD:
/* Insert an extra record at a position where splitting
* would be ok. */
ret = recombine_insert_record(buf, 5, param);
TEST_LE_S(0, ret); TEST_LE_S(0, ret);
break; break;

40
tests/suites/test_suite_ssl.records.data
View File

@ -91,6 +91,46 @@ Recombine server flight 1: TLS 1.3, insert empty record at 42 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_3 depends_on:MBEDTLS_SSL_PROTO_TLS1_3
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_3:RECOMBINE_INSERT_EMPTY:42:"rejecting empty record":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_INVALID_RECORD recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_3:RECOMBINE_INSERT_EMPTY:42:"rejecting empty record":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_INVALID_RECORD
Recombine server flight 1: TLS 1.2, insert ChangeCipherSpec record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_2
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_2:RECOMBINE_INSERT_RECORD:MBEDTLS_SSL_MSG_CHANGE_CIPHER_SPEC:"non-handshake message in the middle of a fragmented handshake message":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE
Recombine server flight 1: TLS 1.3, insert ChangeCipherSpec record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_3
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_3:RECOMBINE_INSERT_RECORD:MBEDTLS_SSL_MSG_CHANGE_CIPHER_SPEC:"non-handshake message in the middle of a fragmented handshake message":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE
Recombine server flight 1: TLS 1.2, insert alert record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_2
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_2:RECOMBINE_INSERT_RECORD:MBEDTLS_SSL_MSG_ALERT:"non-handshake message in the middle of a fragmented handshake message":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE
Recombine server flight 1: TLS 1.3, insert alert record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_3
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_3:RECOMBINE_INSERT_RECORD:MBEDTLS_SSL_MSG_ALERT:"non-handshake message in the middle of a fragmented handshake message":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE
Recombine server flight 1: TLS 1.2, insert data record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_2
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_2:RECOMBINE_INSERT_RECORD:MBEDTLS_SSL_MSG_APPLICATION_DATA:"non-handshake message in the middle of a fragmented handshake message":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE
Recombine server flight 1: TLS 1.3, insert data record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_3
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_3:RECOMBINE_INSERT_RECORD:MBEDTLS_SSL_MSG_APPLICATION_DATA:"non-handshake message in the middle of a fragmented handshake message":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE
Recombine server flight 1: TLS 1.2, insert CID record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_2
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_2:RECOMBINE_INSERT_RECORD:MBEDTLS_SSL_MSG_CID:"unknown record type":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_INVALID_RECORD
Recombine server flight 1: TLS 1.3, insert CID record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_3
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_3:RECOMBINE_INSERT_RECORD:MBEDTLS_SSL_MSG_CID:"unknown record type":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_INVALID_RECORD
Recombine server flight 1: TLS 1.2, insert unknown record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_2
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_2:RECOMBINE_INSERT_RECORD:255:"unknown record type 255":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_INVALID_RECORD
Recombine server flight 1: TLS 1.3, insert unknown record at 5 (bad)
depends_on:MBEDTLS_SSL_PROTO_TLS1_3
recombine_server_first_flight:MBEDTLS_SSL_VERSION_TLS1_3:RECOMBINE_INSERT_RECORD:255:"unknown record type 255":"":MBEDTLS_SSL_SERVER_HELLO:MBEDTLS_ERR_SSL_INVALID_RECORD
# Since there is a single unencrypted handshake message in the first flight # Since there is a single unencrypted handshake message in the first flight
# from the server, and the test code that recombines handshake records can only # from the server, and the test code that recombines handshake records can only
# handle plaintext records, we can't have TLS 1.3 tests with coalesced # handle plaintext records, we can't have TLS 1.3 tests with coalesced