root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

QUIC CHANNEL: Minor cleanups and bug fix 

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-30 08:01:58 +00:00
parent d50e750e13
commit e28f512f04
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssl/quic/quic_channel.c
View File

@ -525,7 +525,7 @@ static int ch_on_handshake_yield_secret(uint32_t enc_level, int direction,
* data. * data.
*/ */
for (i = QUIC_ENC_LEVEL_INITIAL; i < enc_level; ++i) for (i = QUIC_ENC_LEVEL_INITIAL; i < enc_level; ++i)
if (!crypto_ensure_empty(ch->crypto_recv[i])) { if (!crypto_ensure_empty(ch->crypto_recv[ossl_quic_enc_level_to_pn_space(i)])) {
/* Protocol violation (RFC 9001 s. 4.1.3) */ /* Protocol violation (RFC 9001 s. 4.1.3) */
ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_PROTOCOL_VIOLATION, ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_PROTOCOL_VIOLATION,
OSSL_QUIC_FRAME_TYPE_CRYPTO, OSSL_QUIC_FRAME_TYPE_CRYPTO,
@ -549,7 +549,7 @@ static int ch_on_handshake_complete(void *arg)
{ {
QUIC_CHANNEL *ch = arg; QUIC_CHANNEL *ch = arg;
if (ch->handshake_complete) if (!ossl_assert(!ch->handshake_complete))
return 0; /* this should not happen twice */ return 0; /* this should not happen twice */
if (!ossl_assert(ch->tx_enc_level == QUIC_ENC_LEVEL_1RTT)) if (!ossl_assert(ch->tx_enc_level == QUIC_ENC_LEVEL_1RTT))
@ -1422,11 +1422,9 @@ static int ch_retry(QUIC_CHANNEL *ch,
* Now we retry. We will release the Retry packet immediately, so copy * Now we retry. We will release the Retry packet immediately, so copy
* the token. * the token.
*/ */
if ((buf = OPENSSL_malloc(retry_token_len)) == NULL) if ((buf = OPENSSL_memdup(retry_token, retry_token_len)) == NULL)
return 0; return 0;
memcpy(buf, retry_token, retry_token_len);
ossl_quic_tx_packetiser_set_initial_token(ch->txp, buf, retry_token_len, ossl_quic_tx_packetiser_set_initial_token(ch->txp, buf, retry_token_len,
free_token, NULL); free_token, NULL);