diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-12-08 07:51:16 +0000 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-12-21 08:12:06 +0000 |
| commit | b71046b4a4eab5239e656138faf50f9022227729 (patch) | |
| tree | 6171c14a0daa0b5316fcc043010e6f2eecb08073 | |
| parent | 22739cc3acf2412829a1b0e54d1033efe9679e60 (diff) | |
| download | openssl-b71046b4a4eab5239e656138faf50f9022227729.tar.gz | |
Minor updates
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
| -rw-r--r-- | doc/man3/ERR_set_mark.pod | 2 | ||||
| -rw-r--r-- | ssl/quic/quic_channel.c | 7 | ||||
| -rw-r--r-- | ssl/quic/quic_port.c | 2 | ||||
| -rw-r--r-- | ssl/quic/quic_record_rx.c | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/doc/man3/ERR_set_mark.pod b/doc/man3/ERR_set_mark.pod index d6d715e2f6..070a7f6e29 100644 --- a/doc/man3/ERR_set_mark.pod +++ b/doc/man3/ERR_set_mark.pod @@ -3,7 +3,7 @@ =head1 NAME ERR_set_mark, ERR_clear_last_mark, ERR_pop_to_mark, ERR_count_to_mark, ERR_pop - -set mark, clear mark and pop errors until mark +set mark, clear mark, pop errors until mark and pop last error =head1 SYNOPSIS diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index 6a87588e90..b5f019f40e 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -122,12 +122,15 @@ static int ch_init(QUIC_CHANNEL *ch) OSSL_QRX_ARGS qrx_args = {0}; QUIC_TLS_ARGS tls_args = {0}; uint32_t pn_space; - size_t rx_short_dcid_len = ossl_quic_port_get_rx_short_dcid_len(ch->port); - size_t tx_init_dcid_len = ossl_quic_port_get_tx_init_dcid_len(ch->port); + size_t rx_short_dcid_len; + size_t tx_init_dcid_len; if (ch->port == NULL || ch->lcidm == NULL || ch->srtm == NULL) goto err; + rx_short_dcid_len = ossl_quic_port_get_rx_short_dcid_len(ch->port); + tx_init_dcid_len = ossl_quic_port_get_tx_init_dcid_len(ch->port); + /* For clients, generate our initial DCID. */ if (!ch->is_server && !ossl_quic_gen_rand_conn_id(ch->port->engine->libctx, tx_init_dcid_len, diff --git a/ssl/quic/quic_port.c b/ssl/quic/quic_port.c index 3dbcd10957..b4e2deeb84 100644 --- a/ssl/quic/quic_port.c +++ b/ssl/quic/quic_port.c @@ -473,7 +473,7 @@ static int port_try_handle_stateless_reset(QUIC_PORT *port, const QUIC_URXE *e) for (i = 0;; ++i) { if (!ossl_quic_srtm_lookup(port->srtm, (QUIC_STATELESS_RESET_TOKEN *)(data + e->data_len - - sizeof(QUIC_STATELESS_RESET_TOKEN)), + - sizeof(QUIC_STATELESS_RESET_TOKEN)), i, &opaque, NULL)) break; diff --git a/ssl/quic/quic_record_rx.c b/ssl/quic/quic_record_rx.c index 393007df50..97dadd3dbe 100644 --- a/ssl/quic/quic_record_rx.c +++ b/ssl/quic/quic_record_rx.c @@ -173,11 +173,11 @@ OSSL_QRX *ossl_qrx_new(const OSSL_QRX_ARGS *args) size_t i; if (args->demux == NULL || args->max_deferred == 0) - return 0; + return NULL; qrx = OPENSSL_zalloc(sizeof(OSSL_QRX)); if (qrx == NULL) - return 0; + return NULL; for (i = 0; i < OSSL_NELEM(qrx->largest_pn); ++i) qrx->largest_pn[i] = args->init_largest_pn[i]; |