openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

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)
This commit is contained in:
Hugo Landau 2023-12-08 07:51:16 +00:00
parent 22739cc3ac
commit b71046b4a4
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/man3/ERR_set_mark.pod
View File

@ -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

7
ssl/quic/quic_channel.c
View File

@ -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,

2
ssl/quic/quic_port.c
View File

@ -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;

4
ssl/quic/quic_record_rx.c
View File

@ -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];