From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 17 Jul 2023 19:07:59 +0000 (+0200)
Subject: QUIC fault testing TODOs are changed into regular comments
X-Git-Tag: openssl-3.2.0-alpha1~270
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40e28577dd81d1b3e775240c4815ebce5d56f868;p=thirdparty%2Fopenssl.git

QUIC fault testing TODOs are changed into regular comments

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21539)
---

diff --git a/test/helpers/quictestlib.c b/test/helpers/quictestlib.c
index 8f28dfb898..c956296330 100644
--- a/test/helpers/quictestlib.c
+++ b/test/helpers/quictestlib.c
@@ -844,7 +844,13 @@ static int pcipher_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
 
             do {
                 if (!ossl_quic_wire_decode_pkt_hdr(&pkt,
-                        0 /* TODO(QUIC): Not sure how this should be set*/, 1,
+                        /*
+                         * TODO(QUIC SERVER):
+                         * Needs to be set to the actual short header CID length
+                         * when testing the server implementation.
+                         */
+                        0,
+                        1,
                         0, &hdr, NULL))
                     goto out;
 
@@ -857,7 +863,7 @@ static int pcipher_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
                     goto out;
 
                 /*
-                 * TODO(QUIC): At the moment modifications to hdr by the callback
+                 * At the moment modifications to hdr by the callback
                  * are ignored. We might need to rewrite the QUIC header to
                  * enable tests to change this. We also don't yet have a
                  * mechanism for the callback to change the encrypted data
diff --git a/test/helpers/quictestlib.h b/test/helpers/quictestlib.h
index c4572db4cc..cfda1b29b5 100644
--- a/test/helpers/quictestlib.h
+++ b/test/helpers/quictestlib.h
@@ -140,7 +140,7 @@ int qtest_fault_set_handshake_listener(QTEST_FAULT *fault,
 int qtest_fault_resize_handshake(QTEST_FAULT *fault, size_t newlen);
 
 /*
- * TODO(QUIC): Add listeners for specific types of frame here. E.g. we might
+ * Add listeners for specific types of frame here. E.g. we might
  * expect to see an "ACK" frame listener which will be passed pre-parsed ack
  * data that can be modified as required.
  */
@@ -159,7 +159,7 @@ int qtest_fault_set_hand_enc_ext_listener(QTEST_FAULT *fault,
                                           qtest_fault_on_enc_ext_cb encextcb,
                                           void *encextcbarg);
 
-/* TODO(QUIC): Add listeners for other types of handshake message here */
+/* Add listeners for other types of handshake message here */
 
 
 /*
@@ -183,7 +183,7 @@ int qtest_fault_delete_extension(QTEST_FAULT *fault,
                                  size_t *extlen);
 
 /*
- * TODO(QUIC): Add additional helper functions for querying extensions here (e.g.
+ * Add additional helper functions for querying extensions here (e.g.
  * finding or adding them). We could also provide a "listener" API for listening
  * for specific extension types
  */