zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend the noisy dgram test so that packets are also affected by noise

Browse Source 
Where multiple packets are in a single datagram we split them so that all
packets can be affected by the noise

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22157)
This commit is contained in:
Matt Caswell 2023-09-19 12:21:27 +01:00
parent 35bd8a6004
commit b1584a85d0
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/helpers/quictestlib.c
View File

@ -141,6 +141,14 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
goto err;
}
if ((flags & QTEST_FLAG_PACKET_SPLIT) != 0) {
BIO *pktsplitbio = BIO_new(bio_f_pkt_split_dgram_filter());
if (!TEST_ptr(pktsplitbio))
goto err;
cbio = BIO_push(pktsplitbio, cbio);
}
if ((flags & QTEST_FLAG_NOISE) != 0) {
BIO *noisebio = BIO_new(bio_f_noisy_dgram_filter());

2
test/helpers/quictestlib.h
View File

@ -32,6 +32,8 @@ typedef struct qtest_fault_encrypted_extensions {
#define QTEST_FLAG_FAKE_TIME (1 << 1)
/* Introduce noise in the BIO */
#define QTEST_FLAG_NOISE (1 << 2)
/* Split datagrams such that each datagram contains one packet */
#define QTEST_FLAG_PACKET_SPLIT (1 << 3)
/*
* Given an SSL_CTX for the client and filenames for the server certificate and

21
test/quicapitest.c
View File

@ -1301,7 +1301,15 @@ static int unreliable_server_read(QUIC_TSERVER *qtserv, uint64_t sid,
return 0;
}
static int test_noisy_dgram(void)
/*
* Create a connection and send data using an unreliable transport. We introduce
* random noise to drop, delay and duplicate datagrams.
* Test 0: Introduce random noise to datagrams
* Test 1: As with test 0 but also split datagrams containing multiple packets
* into individual datagrams so that individual packets can be affected
* by noise - not just a whole datagram.
*/
static int test_noisy_dgram(int idx)
{
SSL_CTX *cctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method());
SSL *clientquic = NULL, *stream[2] = { NULL, NULL };
@ -1311,12 +1319,14 @@ static int test_noisy_dgram(void)
char *msg = "Hello world!";
size_t msglen = strlen(msg), written, readbytes, i, j;
unsigned char buf[80];
int flags = QTEST_FLAG_NOISE | QTEST_FLAG_FAKE_TIME;
if (idx == 1)
flags |= QTEST_FLAG_PACKET_SPLIT;
if (!TEST_ptr(cctx)
|| !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
privkey,
QTEST_FLAG_NOISE
| QTEST_FLAG_FAKE_TIME,
privkey, flags,
&qtserv,
&clientquic, NULL)))
goto err;
@ -1470,7 +1480,7 @@ int setup_tests(void)
ADD_ALL_TESTS(test_non_io_retry, 2);
ADD_TEST(test_quic_psk);
ADD_ALL_TESTS(test_alpn, 2);
ADD_TEST(test_noisy_dgram);
ADD_ALL_TESTS(test_noisy_dgram, 2);
return 1;
err:
@ -1481,6 +1491,7 @@ int setup_tests(void)
void cleanup_tests(void)
{
bio_f_noisy_dgram_filter_free();
bio_f_pkt_split_dgram_filter_free();
OPENSSL_free(cert);
OPENSSL_free(privkey);
OSSL_PROVIDER_unload(defctxnull);