Minor fixups

Reviewed-by: Matt Caswell <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from openssl#20765)
quictls · Jun 4, 2024 · 1506566 · 1506566
1 parent 98b0ad4
commit 1506566
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/include/internal/quic_fc.h b/include/internal/quic_fc.h
@@ -147,9 +147,6 @@ struct quic_rxfc_st {
  * and absolute maximum window sizes, respectively. Window size values are
  * expressed in bytes and determine how much credit the RXFC extends to the peer
  * to transmit more data at a time.
- *
- * If stream_count_mode is 1, this RXFC is for use tracking maximum stream count
- * enforcement. In this case conn_rxfc must be NULL.
  */
 int ossl_quic_rxfc_init(QUIC_RXFC *rxfc, QUIC_RXFC *conn_rxfc,
                         uint64_t initial_window_size,

diff --git a/ssl/quic/quic_local.h b/ssl/quic/quic_local.h
@@ -27,7 +27,7 @@
 # ifndef OPENSSL_NO_QUIC
 
 /*
- * QUIC stream SSL object (QCSO) type. This implements the API personality layer
+ * QUIC stream SSL object (QSSO) type. This implements the API personality layer
  * for QSSO objects, wrapping the QUIC-native QUIC_STREAM object and tracking
  * state required by the libssl API personality.
  */

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
@@ -7384,7 +7384,7 @@ int SSL_attach_stream(SSL *conn, SSL *stream)
 
     return ossl_quic_attach_stream(conn, stream);
 #else
-    return NULL;
+    return 0;
 #endif
 }
 

diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c
@@ -299,7 +299,6 @@ static int helper_init(struct helper *h)
 
     s_args.net_rbio = h->s_net_bio;
     s_args.net_wbio = h->s_net_bio;
-    //s_args.now_cb = ...;
 
     if (!TEST_ptr(h->s = ossl_quic_tserver_new(&s_args, certfile, keyfile)))
         goto err;
@@ -849,7 +848,7 @@ static int run_script(const struct script_op *script)
 
         case OPK_C_WRITE_FAIL:
             {
-                uint64_t bytes_written = 0;
+                size_t bytes_written = 0;
 
                 if (!TEST_ptr(c_tgt))
                     goto out;
@@ -875,7 +874,7 @@ static int run_script(const struct script_op *script)
 
         case OPK_C_READ_FAIL:
             {
-                uint64_t bytes_read = 0;
+                size_t bytes_read = 0;
                 char buf[1];
 
                 if (!TEST_ptr(c_tgt))