mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-15 06:01:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC_CHANNEL: Handle deferred packet processing after yielding of secrets correctly

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19703)
This commit is contained in:
Hugo Landau 2022-11-18 17:25:25 +00:00
parent d7668ff213
commit 4e64437a5f
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ssl/quic/quic_channel.c
View File

@ -531,6 +531,7 @@ static int ch_on_handshake_yield_secret(uint32_t enc_level, int direction,
return 0;
}
ch->have_new_secret = 1;
return 1;
}
@ -1007,14 +1008,23 @@ static void ch_tick(QUIC_TICK_RESULT *res, void *arg)
}
}
/* Handle any incoming data from the network. */
ch_rx(ch);
do {
/* Handle any incoming data from the network. */
ch_rx(ch);
/*
* Allow the handshake layer to check for any new incoming data and generate
* new outgoing data.
*/
ossl_quic_dhs_tick(ch->dhs);
/*
* Allow the handshake layer to check for any new incoming data and generate
* new outgoing data.
*/
ch->have_new_secret = 0;
ossl_quic_dhs_tick(ch->dhs);
/*
* If the handshake layer gave us a new secret, we need to do RX again
* because packets that were not previously processable and were
* deferred might now be processable.
*/
} while (ch->have_new_secret);
/*
* Handle any timer events which are due to fire; namely, the loss detection

6
ssl/quic/quic_channel_local.h
View File

@ -263,6 +263,12 @@ struct quic_channel_st {
/* Are we in server mode? Never changes after instantiation. */
unsigned int is_server : 1;
/*
* Set temporarily when the handshake layer has given us a new secret. Used
* to determine if we need to check our RX queues again.
*/
unsigned int have_new_secret : 1;
};
# endif