mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-06 13:26:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC CHANNEL: Fix idle timeout computation bug

Browse Source 
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)
This commit is contained in:
Hugo Landau 2024-01-22 14:00:05 +00:00
parent 69616017a6
commit 693d9afef4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ssl/quic/quic_channel.c
View File

@ -1135,6 +1135,16 @@ static void do_update(QUIC_STREAM *s, void *arg)
ossl_quic_stream_map_update_state(&ch->qsm, s); ossl_quic_stream_map_update_state(&ch->qsm, s);
} }
static uint64_t min_u64_ignore_0(uint64_t a, uint64_t b)
{
if (a == 0)
return b;
if (b == 0)
return a;
return a < b ? a : b;
}
static int ch_on_transport_params(const unsigned char *params, static int ch_on_transport_params(const unsigned char *params,
size_t params_len, size_t params_len,
void *arg) void *arg)
@ -1426,8 +1436,9 @@ static int ch_on_transport_params(const unsigned char *params,
ch->max_idle_timeout_remote_req = v; ch->max_idle_timeout_remote_req = v;
if (v > 0 && v < ch->max_idle_timeout) ch->max_idle_timeout = min_u64_ignore_0(ch->max_idle_timeout_local_req,
ch->max_idle_timeout = v; ch->max_idle_timeout_remote_req);
ch_update_idle(ch); ch_update_idle(ch);
got_max_idle_timeout = 1; got_max_idle_timeout = 1;