Minor fixups

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20765)

diff --git a/include/internal/quic_fc.h b/include/internal/quic_fc.h
index 78398c724275e1e3c47e7af00b0afe5d33bf9613..4e07c57395fcdc1b069102bc8e8be8b23cddb703 100644 (file)
--- 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
index 1e6f35482a050100ee789d7822a6b6444b372306..6e062089f060dda863783d3645484da61c2a0046 100644 (file)
--- 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
index 3fb80824de2b0f26c7ede911b0307efb2ea8d650..ad3b1ed15d4460587e5e81143d5b8a817302063f 100644 (file)
--- 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
index 1b15c1d16e2268d5a07c8919f1c321e8ac8c8ecd..78b3ffe1d86de40ec185d090a2cf7d8b720b839e 100644 (file)
--- 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))