diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-04-18 19:37:49 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-05-12 14:47:13 +0100 |
| commit | 571aff4bfaf0407cadba2e304b60c0364684cee5 (patch) | |
| tree | d3e6b509c04a1465f9836a9ea43ae22e89a3c6ee | |
| parent | ed835673ae5d99cac39d0bef6677597a68d1e248 (diff) | |
| download | openssl-new-571aff4bfaf0407cadba2e304b60c0364684cee5.tar.gz | |
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)
| -rw-r--r-- | include/internal/quic_fc.h | 3 | ||||
| -rw-r--r-- | ssl/quic/quic_local.h | 2 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 | ||||
| -rw-r--r-- | test/quic_multistream_test.c | 5 |
4 files changed, 4 insertions, 8 deletions
diff --git a/include/internal/quic_fc.h b/include/internal/quic_fc.h index 78398c7242..4e07c57395 100644 --- 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 1e6f35482a..6e062089f0 100644 --- 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 3fb80824de..ad3b1ed15d 100644 --- 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 1b15c1d16e..78b3ffe1d8 100644 --- 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)) |