diff options
| author | Hugo Landau <hlandau@openssl.org> | 2022-12-15 07:07:12 +0000 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-01-13 13:20:22 +0000 |
| commit | 2d2fd151d4e699da269e586713e785a758f45157 (patch) | |
| tree | 3dc6470ed57ab7962eef5d073c31a4a28a367d44 /ssl | |
| parent | 81b6b43c4a56e4158ee4059fc03c10f970423506 (diff) | |
| download | openssl-new-2d2fd151d4e699da269e586713e785a758f45157.tar.gz | |
QUIC RXDP: Different error messages for stream conditions
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19703)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/quic/quic_rx_depack.c | 56 |
1 files changed, 46 insertions, 10 deletions
diff --git a/ssl/quic/quic_rx_depack.c b/ssl/quic/quic_rx_depack.c index da941dc103..e46e21bab4 100644 --- a/ssl/quic/quic_rx_depack.c +++ b/ssl/quic/quic_rx_depack.c @@ -111,11 +111,20 @@ static int depack_do_frame_reset_stream(PACKET *pkt, ackm_data->is_ack_eliciting = 1; stream = ossl_quic_stream_map_get_by_id(&ch->qsm, frame_data.stream_id); - if (stream == NULL || stream->rstream == NULL) { + if (stream == NULL) { ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_STREAM_STATE_ERROR, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, - "RESET_STREAM frame for nonexistent or " + "RESET_STREAM frame for " + "nonexistent stream"); + return 0; + } + + if (stream->rstream == NULL) { + ossl_quic_channel_raise_protocol_error(ch, + QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_FRAME_TYPE_RESET_STREAM, + "RESET_STREAM frame for " "TX only stream"); return 0; } @@ -144,11 +153,20 @@ static int depack_do_frame_stop_sending(PACKET *pkt, ackm_data->is_ack_eliciting = 1; stream = ossl_quic_stream_map_get_by_id(&ch->qsm, frame_data.stream_id); - if (stream == NULL || stream->sstream == NULL) { + if (stream == NULL) { + ossl_quic_channel_raise_protocol_error(ch, + QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_FRAME_TYPE_STOP_SENDING, + "STOP_SENDING frame for " + "nonexistent stream"); + return 0; + } + + if (stream->sstream == NULL) { ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_STREAM_STATE_ERROR, OSSL_QUIC_FRAME_TYPE_STOP_SENDING, - "STOP_SENDING frame for nonexistent or " + "STOP_SENDING frame for " "RX only stream"); return 0; } @@ -235,12 +253,21 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch, ackm_data->is_ack_eliciting = 1; stream = ossl_quic_stream_map_get_by_id(&ch->qsm, frame_data.stream_id); - if (stream == NULL || stream->rstream == NULL) { + if (stream == NULL) { ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_STREAM_STATE_ERROR, frame_type, - "STREAM frame for nonexistent or" - " TX only stream"); + "STREAM frame for nonexistent " + "stream"); + return 0; + } + + if (stream->rstream == NULL) { + ossl_quic_channel_raise_protocol_error(ch, + QUIC_ERR_STREAM_STATE_ERROR, + frame_type, + "STREAM frame for TX only " + "stream"); return 0; } @@ -323,12 +350,21 @@ static int depack_do_frame_max_stream_data(PACKET *pkt, ackm_data->is_ack_eliciting = 1; stream = ossl_quic_stream_map_get_by_id(&ch->qsm, stream_id); - if (stream == NULL || stream->sstream == NULL) { + if (stream == NULL) { + ossl_quic_channel_raise_protocol_error(ch, + QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA, + "MAX_STREAM_DATA for nonexistent " + "stream"); + return 0; + } + + if (stream->sstream == NULL) { ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_STREAM_STATE_ERROR, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA, - "MAX_STREAM_DATA for nonexistent" - " or TX only stream"); + "MAX_STREAM_DATA for TX only " + "stream"); return 0; } |