From: Hugo Landau Date: Thu, 15 Feb 2024 08:55:36 +0000 (+0000) Subject: QUIC: Uniform changes for QUIC error code definitions rename X-Git-Tag: openssl-3.3.0-alpha1~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b4b9c9eb3e677de6276c94758cb554c8f560697;p=thirdparty%2Fopenssl.git QUIC: Uniform changes for QUIC error code definitions rename Reviewed-by: Matt Caswell Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/23598) --- diff --git a/ssl/quic/qlog_event_helpers.c b/ssl/quic/qlog_event_helpers.c index 662e7b123f4..2cb6b836cbf 100644 --- a/ssl/quic/qlog_event_helpers.c +++ b/ssl/quic/qlog_event_helpers.c @@ -78,37 +78,37 @@ void ossl_qlog_event_connectivity_connection_state_updated(QLOG *qlog, static const char *quic_err_to_qlog(uint64_t error_code) { switch (error_code) { - case QUIC_ERR_INTERNAL_ERROR: + case OSSL_QUIC_ERR_INTERNAL_ERROR: return "internal_error"; - case QUIC_ERR_CONNECTION_REFUSED: + case OSSL_QUIC_ERR_CONNECTION_REFUSED: return "connection_refused"; - case QUIC_ERR_FLOW_CONTROL_ERROR: + case OSSL_QUIC_ERR_FLOW_CONTROL_ERROR: return "flow_control_error"; - case QUIC_ERR_STREAM_LIMIT_ERROR: + case OSSL_QUIC_ERR_STREAM_LIMIT_ERROR: return "stream_limit_error"; - case QUIC_ERR_STREAM_STATE_ERROR: + case OSSL_QUIC_ERR_STREAM_STATE_ERROR: return "stream_state_error"; - case QUIC_ERR_FINAL_SIZE_ERROR: + case OSSL_QUIC_ERR_FINAL_SIZE_ERROR: return "final_size_error"; - case QUIC_ERR_FRAME_ENCODING_ERROR: + case OSSL_QUIC_ERR_FRAME_ENCODING_ERROR: return "frame_encoding_error"; - case QUIC_ERR_TRANSPORT_PARAMETER_ERROR: + case OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR: return "transport_parameter_error"; - case QUIC_ERR_CONNECTION_ID_LIMIT_ERROR: + case OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR: return "connection_id_limit_error"; - case QUIC_ERR_PROTOCOL_VIOLATION: + case OSSL_QUIC_ERR_PROTOCOL_VIOLATION: return "protocol_violation"; - case QUIC_ERR_INVALID_TOKEN: + case OSSL_QUIC_ERR_INVALID_TOKEN: return "invalid_token"; - case QUIC_ERR_APPLICATION_ERROR: + case OSSL_QUIC_ERR_APPLICATION_ERROR: return "application_error"; - case QUIC_ERR_CRYPTO_BUFFER_EXCEEDED: + case OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED: return "crypto_buffer_exceeded"; - case QUIC_ERR_KEY_UPDATE_ERROR: + case OSSL_QUIC_ERR_KEY_UPDATE_ERROR: return "key_update_error"; - case QUIC_ERR_AEAD_LIMIT_REACHED: + case OSSL_QUIC_ERR_AEAD_LIMIT_REACHED: return "aead_limit_reached"; - case QUIC_ERR_NO_VIABLE_PATH: + case OSSL_QUIC_ERR_NO_VIABLE_PATH: return "no_viable_path"; default: return NULL; @@ -128,8 +128,8 @@ void ossl_qlog_event_connectivity_connection_closed(QLOG *qlog, const char *m = quic_err_to_qlog(tcause->error_code); char ce[32]; - if (tcause->error_code >= QUIC_ERR_CRYPTO_ERR_BEGIN - && tcause->error_code <= QUIC_ERR_CRYPTO_ERR_END) { + if (tcause->error_code >= OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + && tcause->error_code <= OSSL_QUIC_ERR_CRYPTO_ERR_END) { BIO_snprintf(ce, sizeof(ce), "crypto_error_0x%03llx", (unsigned long long)tcause->error_code); m = ce; diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index aa0a67bd354..9bab5d005b5 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -637,7 +637,7 @@ static void ch_trigger_txku(QUIC_CHANNEL *ch) if (!ossl_quic_pn_valid(next_pn) || !ossl_qtx_trigger_key_update(ch->qtx)) { - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_INTERNAL_ERROR, 0, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0, "key update"); return; } @@ -785,7 +785,7 @@ static void rxku_detected(QUIC_PN pn, void *arg) decision = DECISION_SOLICITED_TXKU; if (decision == DECISION_PROTOCOL_VIOLATION) { - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_KEY_UPDATE_ERROR, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_KEY_UPDATE_ERROR, 0, "RX key update again too soon"); return; } @@ -833,7 +833,7 @@ static void ch_rxku_tick(QUIC_CHANNEL *ch) ch->rxku_in_progress = 0; if (!ossl_qrx_key_update_timeout(ch->qrx, /*normal=*/1)) - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_INTERNAL_ERROR, 0, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0, "RXKU cooldown internal error"); } @@ -913,7 +913,7 @@ static int ch_on_crypto_recv_record(const unsigned char **buf, if (i != QUIC_ENC_LEVEL_0RTT && !crypto_ensure_empty(ch->crypto_recv[ossl_quic_enc_level_to_pn_space(i)])) { /* 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, OSSL_QUIC_ERR_PROTOCOL_VIOLATION, OSSL_QUIC_FRAME_TYPE_CRYPTO, "crypto stream data in wrong EL"); return 0; @@ -991,7 +991,7 @@ static int ch_on_handshake_yield_secret(uint32_t enc_level, int direction, for (i = QUIC_ENC_LEVEL_INITIAL; i < enc_level; ++i) if (!crypto_ensure_empty(ch->crypto_recv[ossl_quic_enc_level_to_pn_space(i)])) { /* 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, OSSL_QUIC_ERR_PROTOCOL_VIOLATION, OSSL_QUIC_FRAME_TYPE_CRYPTO, "crypto stream data in wrong EL"); return 0; @@ -1024,7 +1024,7 @@ static int ch_on_handshake_complete(void *arg) * Was not a valid QUIC handshake if we did not get valid transport * params. */ - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_CRYPTO_MISSING_EXT, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_CRYPTO_MISSING_EXT, OSSL_QUIC_FRAME_TYPE_CRYPTO, "no transport parameters received"); return 0; @@ -1068,7 +1068,7 @@ static int ch_on_handshake_alert(void *arg, unsigned char alert_code) && ch->handshake_complete && ossl_quic_tls_is_cert_request(ch->qtls)) ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, "Post-handshake TLS " "CertificateRequest received"); @@ -1083,12 +1083,12 @@ static int ch_on_handshake_alert(void *arg, unsigned char alert_code) && ch->handshake_complete && ossl_quic_tls_has_bad_max_early_data(ch->qtls)) ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, "Bad max_early_data received"); else ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_CRYPTO_ERR_BEGIN + OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + alert_code, 0, "handshake alert"); @@ -1193,7 +1193,7 @@ static int ch_on_transport_params(const unsigned char *params, } if (!PACKET_buf_init(&pkt, params, params_len)) { - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_INTERNAL_ERROR, 0, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0, "internal error (packet buf init)"); return 0; } @@ -1683,7 +1683,7 @@ static int ch_on_transport_params(const unsigned char *params, /* If we are a server, we now generate our own transport parameters. */ if (ch->is_server && !ch_generate_transport_params(ch)) { - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_INTERNAL_ERROR, 0, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0, "internal error"); return 0; } @@ -1691,7 +1691,7 @@ static int ch_on_transport_params(const unsigned char *params, return 1; malformed: - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_TRANSPORT_PARAMETER_ERROR, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR, 0, reason); return 0; } @@ -2030,7 +2030,7 @@ static void ch_rx_check_forged_pkt_limit(QUIC_CHANNEL *ch) if (ossl_qrx_get_cur_forged_pkt_count(ch->qrx) < limit) return; - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_AEAD_LIMIT_REACHED, 0, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_AEAD_LIMIT_REACHED, 0, "forgery limit"); } @@ -2201,7 +2201,7 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only) */ if (ossl_quic_pkt_type_is_encrypted(ch->qrx_pkt->hdr->type) && ch->qrx_pkt->hdr->reserved != 0) { - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_PROTOCOL_VIOLATION, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, "packet header reserved bits"); return; } @@ -2253,7 +2253,7 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only) if (!ch_retry(ch, ch->qrx_pkt->hdr->data, ch->qrx_pkt->hdr->len - QUIC_RETRY_INTEGRITY_TAG_LEN, &ch->qrx_pkt->hdr->src_conn_id)) - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_INTERNAL_ERROR, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0, "handling retry packet"); break; @@ -2291,7 +2291,7 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only) * were used for packets with lower packet numbers MUST treat this * as a connection error of type KEY_UPDATE_ERROR. */ - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_KEY_UPDATE_ERROR, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_KEY_UPDATE_ERROR, 0, "new packet with old keys"); break; } @@ -2316,7 +2316,7 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only) * packets that lack authentication. * I.e. should we drop this packet instead of closing the connection? */ - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_PROTOCOL_VIOLATION, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, "client received initial token"); break; } @@ -2375,7 +2375,7 @@ static void ch_raise_version_neg_failure(QUIC_CHANNEL *ch) { QUIC_TERMINATE_CAUSE tcause = {0}; - tcause.error_code = QUIC_ERR_CONNECTION_REFUSED; + tcause.error_code = OSSL_QUIC_ERR_CONNECTION_REFUSED; tcause.reason = "version negotiation failure"; tcause.reason_len = strlen(tcause.reason); @@ -2475,7 +2475,7 @@ static int ch_tx(QUIC_CHANNEL *ch) * to schedule a CONNECTION_CLOSE frame will not actually cause a * packet to be transmitted for this reason. */ - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_INTERNAL_ERROR, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0, "internal error (txp generate)"); break; @@ -2675,7 +2675,7 @@ static int ch_retry(QUIC_CHANNEL *ch, * This may fail if the token we receive is too big for us to ever be * able to transmit in an outgoing Initial packet. */ - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_INVALID_TOKEN, 0, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INVALID_TOKEN, 0, "received oversize token"); OPENSSL_free(buf); return 0; @@ -2761,7 +2761,7 @@ int ossl_quic_channel_on_handshake_confirmed(QUIC_CHANNEL *ch) * Does not make sense for handshake to be confirmed before it is * completed. */ - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_PROTOCOL_VIOLATION, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_PROTOCOL_VIOLATION, OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE, "handshake cannot be confirmed " "before it is completed"); @@ -2997,7 +2997,7 @@ static int ch_enqueue_retire_conn_id(QUIC_CHANNEL *ch, uint64_t seq_num) err: ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, "internal error enqueueing retire conn id"); BUF_MEM_free(buf_mem); @@ -3017,7 +3017,7 @@ void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch, if (ch->cur_remote_dcid.id_len == 0) { /* Changing from 0 length connection id is disallowed */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, "zero length connection id in use"); @@ -3041,7 +3041,7 @@ void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch, */ if (new_remote_seq_num - new_retire_prior_to > 1) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_CONNECTION_ID_LIMIT_ERROR, + OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, "active_connection_id limit violated"); return; @@ -3064,7 +3064,7 @@ void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch, */ if (new_retire_prior_to - ch->cur_retire_prior_to > 10) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_CONNECTION_ID_LIMIT_ERROR, + OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, "retiring connection id limit violated"); @@ -3076,7 +3076,7 @@ void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch, if (!ossl_quic_srtm_add(ch->srtm, ch, new_remote_seq_num, &f->stateless_reset)) { ossl_quic_channel_raise_protocol_error( - ch, QUIC_ERR_CONNECTION_ID_LIMIT_ERROR, + ch, OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, "unable to store stateless reset token"); @@ -3134,7 +3134,7 @@ void ossl_quic_channel_on_stateless_reset(QUIC_CHANNEL *ch) { QUIC_TERMINATE_CAUSE tcause = {0}; - tcause.error_code = QUIC_ERR_NO_ERROR; + tcause.error_code = OSSL_QUIC_ERR_NO_ERROR; tcause.remote = 1; ch_start_terminating(ch, &tcause, 0); } @@ -3148,7 +3148,7 @@ void ossl_quic_channel_raise_net_error(QUIC_CHANNEL *ch) ch->net_error = 1; - tcause.error_code = QUIC_ERR_INTERNAL_ERROR; + tcause.error_code = OSSL_QUIC_ERR_INTERNAL_ERROR; tcause.reason = "network BIO I/O error"; tcause.reason_len = strlen(tcause.reason); @@ -3185,7 +3185,7 @@ void ossl_quic_channel_raise_protocol_error_loc(QUIC_CHANNEL *ch, const char *src_func) { QUIC_TERMINATE_CAUSE tcause = {0}; - int err_reason = error_code == QUIC_ERR_INTERNAL_ERROR + int err_reason = error_code == OSSL_QUIC_ERR_INTERNAL_ERROR ? ERR_R_INTERNAL_ERROR : SSL_R_QUIC_PROTOCOL_ERROR; const char *err_str = ossl_quic_err_to_string(error_code); const char *err_str_pfx = " (", *err_str_sfx = ")"; diff --git a/ssl/quic/quic_fc.c b/ssl/quic/quic_fc.c index 7e36aab09ee..709cd91132c 100644 --- a/ssl/quic/quic_fc.c +++ b/ssl/quic/quic_fc.c @@ -189,7 +189,7 @@ static int on_rx_controlled_bytes(QUIC_RXFC *rxfc, uint64_t num_bytes) if (num_bytes > credit) { ok = 0; num_bytes = credit; - rxfc->error_code = QUIC_ERR_FLOW_CONTROL_ERROR; + rxfc->error_code = OSSL_QUIC_ERR_FLOW_CONTROL_ERROR; } rxfc->swm += num_bytes; @@ -205,7 +205,7 @@ int ossl_quic_rxfc_on_rx_stream_frame(QUIC_RXFC *rxfc, uint64_t end, int is_fin) if (rxfc->is_fin && ((is_fin && rxfc->hwm != end) || end > rxfc->hwm)) { /* Stream size cannot change after the stream is finished */ - rxfc->error_code = QUIC_ERR_FINAL_SIZE_ERROR; + rxfc->error_code = OSSL_QUIC_ERR_FINAL_SIZE_ERROR; return 1; /* not a caller error */ } @@ -220,7 +220,7 @@ int ossl_quic_rxfc_on_rx_stream_frame(QUIC_RXFC *rxfc, uint64_t end, int is_fin) if (rxfc->parent != NULL) on_rx_controlled_bytes(rxfc->parent, delta); /* result ignored */ } else if (end < rxfc->hwm && is_fin) { - rxfc->error_code = QUIC_ERR_FINAL_SIZE_ERROR; + rxfc->error_code = OSSL_QUIC_ERR_FINAL_SIZE_ERROR; return 1; /* not a caller error */ } diff --git a/ssl/quic/quic_local.h b/ssl/quic/quic_local.h index a5376320d8a..ff7f4719ab6 100644 --- a/ssl/quic/quic_local.h +++ b/ssl/quic/quic_local.h @@ -250,8 +250,9 @@ int ossl_quic_conn_on_handshake_confirmed(QUIC_CONNECTION *qc); /* * To be called when a protocol violation occurs. The connection is torn down - * with the given error code, which should be a QUIC_ERR_* value. Reason string - * is optional and copied if provided. frame_type should be 0 if not applicable. + * with the given error code, which should be a OSSL_QUIC_ERR_* value. Reason + * string is optional and copied if provided. frame_type should be 0 if not + * applicable. */ void ossl_quic_conn_raise_protocol_error(QUIC_CONNECTION *qc, uint64_t error_code, diff --git a/ssl/quic/quic_rx_depack.c b/ssl/quic/quic_rx_depack.c index 97c6d6095dc..30598310635 100644 --- a/ssl/quic/quic_rx_depack.c +++ b/ssl/quic/quic_rx_depack.c @@ -48,7 +48,7 @@ static int depack_do_frame_ping(PACKET *pkt, QUIC_CHANNEL *ch, /* We ignore this frame, apart from eliciting an ACK */ if (!ossl_quic_wire_decode_frame_ping(pkt)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_PING, "decode error"); return 0; @@ -115,7 +115,7 @@ static int depack_do_frame_ack(PACKET *pkt, QUIC_CHANNEL *ch, * epoch has not incremented and ch->rxku_expected is still 1. */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_KEY_UPDATE_ERROR, + OSSL_QUIC_ERR_KEY_UPDATE_ERROR, frame_type, "acked packet which initiated a " "key update without a " @@ -132,7 +132,7 @@ static int depack_do_frame_ack(PACKET *pkt, QUIC_CHANNEL *ch, malformed: ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, frame_type, "decode error"); return 0; @@ -148,7 +148,7 @@ static int depack_do_frame_reset_stream(PACKET *pkt, if (!ossl_quic_wire_decode_frame_reset_stream(pkt, &frame_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, "decode error"); return 0; @@ -164,7 +164,7 @@ static int depack_do_frame_reset_stream(PACKET *pkt, if (!ossl_quic_stream_has_recv(stream)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_ERR_STREAM_STATE_ERROR, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, "RESET_STREAM frame for " "TX only stream"); @@ -184,7 +184,7 @@ static int depack_do_frame_reset_stream(PACKET *pkt, if (!ossl_quic_rxfc_on_rx_stream_frame(&stream->rxfc, frame_data.final_size, /*is_fin=*/1)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, "internal error (flow control)"); return 0; @@ -192,7 +192,7 @@ static int depack_do_frame_reset_stream(PACKET *pkt, /* Has a flow control error occurred? */ fce = ossl_quic_rxfc_get_error(&stream->rxfc, 0); - if (fce != QUIC_ERR_NO_ERROR) { + if (fce != OSSL_QUIC_ERR_NO_ERROR) { ossl_quic_channel_raise_protocol_error(ch, fce, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, @@ -223,7 +223,7 @@ static int depack_do_frame_stop_sending(PACKET *pkt, if (!ossl_quic_wire_decode_frame_stop_sending(pkt, &frame_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_STOP_SENDING, "decode error"); return 0; @@ -239,7 +239,7 @@ static int depack_do_frame_stop_sending(PACKET *pkt, if (!ossl_quic_stream_has_send(stream)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_ERR_STREAM_STATE_ERROR, OSSL_QUIC_FRAME_TYPE_STOP_SENDING, "STOP_SENDING frame for " "RX only stream"); @@ -272,7 +272,7 @@ static int depack_do_frame_crypto(PACKET *pkt, QUIC_CHANNEL *ch, if (!ossl_quic_wire_decode_frame_crypto(pkt, 0, &f)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_CRYPTO, "decode error"); return 0; @@ -295,14 +295,14 @@ static int depack_do_frame_crypto(PACKET *pkt, QUIC_CHANNEL *ch, if (!ossl_quic_rxfc_on_rx_stream_frame(rxfc, f.offset + f.len, /*is_fin=*/0)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, OSSL_QUIC_FRAME_TYPE_CRYPTO, "internal error (crypto RXFC)"); return 0; } - if (ossl_quic_rxfc_get_error(rxfc, 0) != QUIC_ERR_NO_ERROR) { - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_CRYPTO_BUFFER_EXCEEDED, + if (ossl_quic_rxfc_get_error(rxfc, 0) != OSSL_QUIC_ERR_NO_ERROR) { + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED, OSSL_QUIC_FRAME_TYPE_CRYPTO, "exceeded maximum crypto buffer"); return 0; @@ -311,7 +311,7 @@ static int depack_do_frame_crypto(PACKET *pkt, QUIC_CHANNEL *ch, if (!ossl_quic_rstream_queue_data(rstream, parent_pkt, f.offset, f.data, f.len, 0)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, OSSL_QUIC_FRAME_TYPE_CRYPTO, "internal error (rstream queue)"); return 0; @@ -331,7 +331,7 @@ static int depack_do_frame_new_token(PACKET *pkt, QUIC_CHANNEL *ch, if (!ossl_quic_wire_decode_frame_new_token(pkt, &token, &token_len)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, "decode error"); return 0; @@ -344,7 +344,7 @@ static int depack_do_frame_new_token(PACKET *pkt, QUIC_CHANNEL *ch, * FRAME_ENCODING_ERROR." */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, "zero-length NEW_TOKEN"); return 0; @@ -425,14 +425,14 @@ static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch, stream_ordinal + 1, /*is_fin=*/0)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, frame_type, "internal error (stream count RXFC)"); return 0; } - if (ossl_quic_rxfc_get_error(max_streams_fc, 0) != QUIC_ERR_NO_ERROR) { - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_STREAM_LIMIT_ERROR, + if (ossl_quic_rxfc_get_error(max_streams_fc, 0) != OSSL_QUIC_ERR_NO_ERROR) { + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, frame_type, "exceeded maximum allowed streams"); return 0; @@ -450,7 +450,7 @@ static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch, stream = ossl_quic_channel_new_stream_remote(ch, cur_stream_id); if (stream == NULL) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, frame_type, "internal error (stream allocation)"); return 0; @@ -472,7 +472,7 @@ static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch, * violation. */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_ERR_STREAM_STATE_ERROR, frame_type, "STREAM frame for nonexistent " "stream"); @@ -507,7 +507,7 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch, if (!ossl_quic_wire_decode_frame_stream(pkt, 0, &frame_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, frame_type, "decode error"); return 0; @@ -526,7 +526,7 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch, if (!ossl_quic_stream_has_recv(stream)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_ERR_STREAM_STATE_ERROR, frame_type, "STREAM frame for TX only " "stream"); @@ -538,7 +538,7 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch, frame_data.offset + frame_data.len, frame_data.is_fin)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, frame_type, "internal error (flow control)"); return 0; @@ -546,7 +546,7 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch, /* Has a flow control error occurred? */ fce = ossl_quic_rxfc_get_error(&stream->rxfc, 0); - if (fce != QUIC_ERR_NO_ERROR) { + if (fce != OSSL_QUIC_ERR_NO_ERROR) { ossl_quic_channel_raise_protocol_error(ch, fce, frame_type, @@ -610,7 +610,7 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch, frame_data.len, frame_data.is_fin)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, frame_type, "internal error (rstream queue)"); return 0; @@ -625,7 +625,7 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch, if (stream->recv_state == QUIC_RSTREAM_STATE_SIZE_KNOWN && !ossl_quic_rstream_available(stream->rstream, &rs_avail, &rs_fin)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, frame_type, "internal error (rstream available)"); return 0; @@ -673,7 +673,7 @@ static int depack_do_frame_max_data(PACKET *pkt, QUIC_CHANNEL *ch, if (!ossl_quic_wire_decode_frame_max_data(pkt, &max_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_MAX_DATA, "decode error"); return 0; @@ -695,7 +695,7 @@ static int depack_do_frame_max_stream_data(PACKET *pkt, if (!ossl_quic_wire_decode_frame_max_stream_data(pkt, &stream_id, &max_stream_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA, "decode error"); return 0; @@ -711,7 +711,7 @@ static int depack_do_frame_max_stream_data(PACKET *pkt, if (!ossl_quic_stream_has_send(stream)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_ERR_STREAM_STATE_ERROR, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA, "MAX_STREAM_DATA for TX only " "stream"); @@ -732,7 +732,7 @@ static int depack_do_frame_max_streams(PACKET *pkt, if (!ossl_quic_wire_decode_frame_max_streams(pkt, &max_streams)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, frame_type, "decode error"); return 0; @@ -740,7 +740,7 @@ static int depack_do_frame_max_streams(PACKET *pkt, if (max_streams > (((uint64_t)1) << 60)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, frame_type, "invalid max streams value"); return 0; @@ -763,7 +763,7 @@ static int depack_do_frame_max_streams(PACKET *pkt, break; default: ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, frame_type, "decode error"); return 0; @@ -780,7 +780,7 @@ static int depack_do_frame_data_blocked(PACKET *pkt, if (!ossl_quic_wire_decode_frame_data_blocked(pkt, &max_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED, "decode error"); return 0; @@ -801,7 +801,7 @@ static int depack_do_frame_stream_data_blocked(PACKET *pkt, if (!ossl_quic_wire_decode_frame_stream_data_blocked(pkt, &stream_id, &max_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED, "decode error"); return 0; @@ -826,7 +826,7 @@ static int depack_do_frame_stream_data_blocked(PACKET *pkt, * STREAM_STATE_ERROR." */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_STREAM_STATE_ERROR, + OSSL_QUIC_ERR_STREAM_STATE_ERROR, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED, "STREAM_DATA_BLOCKED frame for " "TX only stream"); @@ -846,7 +846,7 @@ static int depack_do_frame_streams_blocked(PACKET *pkt, if (!ossl_quic_wire_decode_frame_streams_blocked(pkt, &max_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, frame_type, "decode error"); return 0; @@ -860,7 +860,7 @@ static int depack_do_frame_streams_blocked(PACKET *pkt, * error of type STREAM_LIMIT_ERROR or FRAME_ENCODING_ERROR." */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_STREAM_LIMIT_ERROR, + OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, frame_type, "invalid stream count limit"); return 0; @@ -878,7 +878,7 @@ static int depack_do_frame_new_conn_id(PACKET *pkt, if (!ossl_quic_wire_decode_frame_new_conn_id(pkt, &frame_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, "decode error"); return 0; @@ -897,7 +897,7 @@ static int depack_do_frame_retire_conn_id(PACKET *pkt, if (!ossl_quic_wire_decode_frame_retire_conn_id(pkt, &seq_num)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, "decode error"); return 0; @@ -918,7 +918,7 @@ static int depack_do_frame_retire_conn_id(PACKET *pkt, */ if (!ch->is_server) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, "conn has zero-length CID"); return 0; @@ -943,7 +943,7 @@ static int depack_do_frame_path_challenge(PACKET *pkt, if (!ossl_quic_wire_decode_frame_path_challenge(pkt, &frame_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE, "decode error"); return 0; @@ -981,7 +981,7 @@ static int depack_do_frame_path_challenge(PACKET *pkt, err: OPENSSL_free(encoded); - ossl_quic_channel_raise_protocol_error(ch, QUIC_ERR_INTERNAL_ERROR, + ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE, "internal error"); return 0; @@ -995,7 +995,7 @@ static int depack_do_frame_path_response(PACKET *pkt, if (!ossl_quic_wire_decode_frame_path_response(pkt, &frame_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE, "decode error"); return 0; @@ -1013,7 +1013,7 @@ static int depack_do_frame_conn_close(PACKET *pkt, QUIC_CHANNEL *ch, if (!ossl_quic_wire_decode_frame_conn_close(pkt, &frame_data)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, frame_type, "decode error"); return 0; @@ -1030,7 +1030,7 @@ static int depack_do_frame_handshake_done(PACKET *pkt, if (!ossl_quic_wire_decode_frame_handshake_done(pkt)) { /* This can fail only with an internal error. */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_INTERNAL_ERROR, + OSSL_QUIC_ERR_INTERNAL_ERROR, OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE, "internal error (decode frame handshake done)"); return 0; @@ -1056,7 +1056,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, * PROTOCOL_VIOLATION. */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, "empty packet payload"); return 0; @@ -1073,7 +1073,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (!ossl_quic_wire_peek_frame_header(pkt, &frame_type, &was_minimal)) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, "malformed frame header"); return 0; @@ -1081,7 +1081,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (!was_minimal) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "non-minimal frame type encoding"); return 0; @@ -1122,7 +1122,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, /* ACK frames are valid everywhere except in 0RTT packets */ if (pkt_type == QUIC_PKT_TYPE_0RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "ACK not valid in 0-RTT"); return 0; @@ -1137,7 +1137,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "RESET_STREAM not valid in " "INITIAL/HANDSHAKE"); @@ -1151,7 +1151,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "STOP_SENDING not valid in " "INITIAL/HANDSHAKE"); @@ -1164,7 +1164,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, /* CRYPTO frames are valid everywhere except in 0RTT packets */ if (pkt_type == QUIC_PKT_TYPE_0RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "CRYPTO frame not valid in 0-RTT"); return 0; @@ -1176,7 +1176,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, /* NEW_TOKEN frames are valid in 1RTT packets */ if (pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "NEW_TOKEN valid only in 1-RTT"); return 0; @@ -1197,7 +1197,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "STREAM valid only in 0/1-RTT"); return 0; @@ -1212,7 +1212,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "MAX_DATA valid only in 0/1-RTT"); return 0; @@ -1225,7 +1225,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "MAX_STREAM_DATA valid only in 0/1-RTT"); return 0; @@ -1240,7 +1240,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "MAX_STREAMS valid only in 0/1-RTT"); return 0; @@ -1255,7 +1255,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "DATA_BLOCKED valid only in 0/1-RTT"); return 0; @@ -1268,7 +1268,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "STREAM_DATA_BLOCKED valid only in 0/1-RTT"); return 0; @@ -1283,7 +1283,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "STREAMS valid only in 0/1-RTT"); return 0; @@ -1298,7 +1298,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "NEW_CONN_ID valid only in 0/1-RTT"); } @@ -1310,7 +1310,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "RETIRE_CONN_ID valid only in 0/1-RTT"); return 0; @@ -1323,7 +1323,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "PATH_CHALLENGE valid only in 0/1-RTT"); return 0; @@ -1336,7 +1336,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, /* PATH_RESPONSE frames are valid in 1RTT packets */ if (pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "PATH_CHALLENGE valid only in 1-RTT"); return 0; @@ -1350,7 +1350,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, if (pkt_type != QUIC_PKT_TYPE_0RTT && pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "CONN_CLOSE (APP) valid only in 0/1-RTT"); return 0; @@ -1366,7 +1366,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, /* HANDSHAKE_DONE frames are valid in 1RTT packets */ if (pkt_type != QUIC_PKT_TYPE_1RTT) { ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_PROTOCOL_VIOLATION, + OSSL_QUIC_ERR_PROTOCOL_VIOLATION, frame_type, "HANDSHAKE_DONE valid only in 1-RTT"); return 0; @@ -1378,7 +1378,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, default: /* Unknown frame type */ ossl_quic_channel_raise_protocol_error(ch, - QUIC_ERR_FRAME_ENCODING_ERROR, + OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, frame_type, "Unknown frame type received"); return 0; diff --git a/ssl/quic/quic_tls.c b/ssl/quic/quic_tls.c index 25687db2fb6..e193aae5cd9 100644 --- a/ssl/quic/quic_tls.c +++ b/ssl/quic/quic_tls.c @@ -696,7 +696,7 @@ static int raise_error(QUIC_TLS *qtls, uint64_t error_code, OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC) #define RAISE_INTERNAL_ERROR(qtls) \ - RAISE_ERROR((qtls), QUIC_ERR_INTERNAL_ERROR, "internal error") + RAISE_ERROR((qtls), OSSL_QUIC_ERR_INTERNAL_ERROR, "internal error") int ossl_quic_tls_tick(QUIC_TLS *qtls) { @@ -746,7 +746,7 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls) return RAISE_INTERNAL_ERROR(qtls); } else { if (sc->ext.alpn == NULL || sc->ext.alpn_len == 0) - return RAISE_ERROR(qtls, QUIC_ERR_CRYPTO_NO_APP_PROTO, + return RAISE_ERROR(qtls, OSSL_QUIC_ERR_CRYPTO_NO_APP_PROTO, "ALPN must be configured when using QUIC"); } if (!SSL_set_min_proto_version(qtls->args.s, TLS1_3_VERSION)) @@ -816,7 +816,7 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls) /* Validate that we have ALPN */ SSL_get0_alpn_selected(qtls->args.s, &alpn, &alpnlen); if (alpn == NULL || alpnlen == 0) - return RAISE_ERROR(qtls, QUIC_ERR_CRYPTO_NO_APP_PROTO, + return RAISE_ERROR(qtls, OSSL_QUIC_ERR_CRYPTO_NO_APP_PROTO, "no application protocol negotiated"); qtls->complete = 1; diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c index 7cbb1d95782..da9fd2567dc 100644 --- a/ssl/quic/quic_txp.c +++ b/ssl/quic/quic_txp.c @@ -1882,7 +1882,7 @@ static int txp_generate_pre_token(OSSL_QUIC_TX_PACKETISER *txp, pf = &f; pf->is_app = 0; pf->frame_type = 0; - pf->error_code = QUIC_ERR_APPLICATION_ERROR; + pf->error_code = OSSL_QUIC_ERR_APPLICATION_ERROR; pf->reason = NULL; pf->reason_len = 0; } diff --git a/ssl/quic/quic_wire.c b/ssl/quic/quic_wire.c index 425e7efc2ed..cdcc2764302 100644 --- a/ssl/quic/quic_wire.c +++ b/ssl/quic/quic_wire.c @@ -1053,7 +1053,7 @@ ossl_quic_frame_type_to_string(uint64_t frame_type) const char *ossl_quic_err_to_string(uint64_t error_code) { switch (error_code) { -#define X(name) case QUIC_ERR_##name: return #name; +#define X(name) case OSSL_QUIC_ERR_##name: return #name; X(NO_ERROR) X(INTERNAL_ERROR) X(CONNECTION_REFUSED) diff --git a/test/helpers/quictestlib.c b/test/helpers/quictestlib.c index 0348729b726..403e1f4384c 100644 --- a/test/helpers/quictestlib.c +++ b/test/helpers/quictestlib.c @@ -663,12 +663,12 @@ int qtest_check_server_transport_err(QUIC_TSERVER *qtserv, uint64_t code) int qtest_check_server_protocol_err(QUIC_TSERVER *qtserv) { - return qtest_check_server_transport_err(qtserv, QUIC_ERR_PROTOCOL_VIOLATION); + return qtest_check_server_transport_err(qtserv, OSSL_QUIC_ERR_PROTOCOL_VIOLATION); } int qtest_check_server_frame_encoding_err(QUIC_TSERVER *qtserv) { - return qtest_check_server_transport_err(qtserv, QUIC_ERR_FRAME_ENCODING_ERROR); + return qtest_check_server_transport_err(qtserv, OSSL_QUIC_ERR_FRAME_ENCODING_ERROR); } void qtest_fault_free(QTEST_FAULT *fault) diff --git a/test/quic_fc_test.c b/test/quic_fc_test.c index 6b2de7fdff2..62152efb50a 100644 --- a/test/quic_fc_test.c +++ b/test/quic_fc_test.c @@ -363,8 +363,8 @@ static const struct rx_test_op rx_script_1[] = { RX_OP_STEP_TIME(250 * OSSL_TIME_MS) RX_OP_RX(0, INIT_WINDOW_SIZE * 5 + 1, 0) RX_OP_CHECK_SWM(INIT_WINDOW_SIZE * 5) - RX_OP_CHECK_ERROR(QUIC_ERR_FLOW_CONTROL_ERROR, 0) - RX_OP_CHECK_ERROR(QUIC_ERR_FLOW_CONTROL_ERROR, 1) + RX_OP_CHECK_ERROR(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0) + RX_OP_CHECK_ERROR(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1) RX_OP_CHECK_ERROR(0, 0) RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 5) /* @@ -456,15 +456,15 @@ static const struct rx_test_op rx_script_2[] = { /* Test exceeding limit at stream level. */ RX_OP_RX(0, INIT_S_WINDOW_SIZE * 2 + 1, 0) - RX_OP_CHECK_ERROR_STREAM(0, QUIC_ERR_FLOW_CONTROL_ERROR, 0) - RX_OP_CHECK_ERROR_STREAM(0, QUIC_ERR_FLOW_CONTROL_ERROR, 1) + RX_OP_CHECK_ERROR_STREAM(0, OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0) + RX_OP_CHECK_ERROR_STREAM(0, OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1) RX_OP_CHECK_ERROR_STREAM(0, 0, 0) RX_OP_CHECK_ERROR_CONN(0, 0) /* doesn't affect conn */ /* Test exceeding limit at connection level. */ RX_OP_RX(0, INIT_WINDOW_SIZE * 2, 0) - RX_OP_CHECK_ERROR_CONN(QUIC_ERR_FLOW_CONTROL_ERROR, 0) - RX_OP_CHECK_ERROR_CONN(QUIC_ERR_FLOW_CONTROL_ERROR, 1) + RX_OP_CHECK_ERROR_CONN(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0) + RX_OP_CHECK_ERROR_CONN(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1) RX_OP_CHECK_ERROR_CONN(0, 0) RX_OP_END diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c index 787cb423e99..26025fb889b 100644 --- a/test/quic_multistream_test.c +++ b/test/quic_multistream_test.c @@ -2854,7 +2854,7 @@ static const struct script_op script_21[] = { OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -2883,7 +2883,7 @@ static const struct script_op script_22[] = { OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_PROTOCOL_VIOLATION,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION,0,0) OP_END }; @@ -2936,7 +2936,7 @@ static const struct script_op script_23[] = { OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -2989,7 +2989,7 @@ static const struct script_op script_24[] = { OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -3008,7 +3008,7 @@ static const struct script_op script_25[] = { OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -3027,7 +3027,7 @@ static const struct script_op script_26[] = { OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_LIMIT_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,0,0) OP_END }; @@ -3046,7 +3046,7 @@ static const struct script_op script_27[] = { OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_LIMIT_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,0,0) OP_END }; @@ -3111,7 +3111,7 @@ static const struct script_op script_28[] = { OP_SET_INJECT_WORD (C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM) OP_S_WRITE (a, "fruit", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3138,7 +3138,7 @@ static const struct script_op script_29[] = { OP_SET_INJECT_WORD (C_UNI_ID(1) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM) OP_S_WRITE (a, "fruit", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3159,7 +3159,7 @@ static const struct script_op script_30[] = { OP_SET_INJECT_WORD (S_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STOP_SENDING) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3180,7 +3180,7 @@ static const struct script_op script_31[] = { OP_SET_INJECT_WORD (C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STOP_SENDING) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3266,7 +3266,7 @@ static const struct script_op script_32[] = { OP_SET_INJECT_WORD (C_UNI_ID(0) + 1, 1) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3287,7 +3287,7 @@ static const struct script_op script_33[] = { OP_SET_INJECT_WORD (C_BIDI_ID(0) + 1, 2) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -3308,7 +3308,7 @@ static const struct script_op script_34[] = { OP_SET_INJECT_WORD (C_BIDI_ID(0) + 1, 3) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FLOW_CONTROL_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR,0,0) OP_END }; @@ -3329,7 +3329,7 @@ static const struct script_op script_35[] = { OP_SET_INJECT_WORD (S_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3350,7 +3350,7 @@ static const struct script_op script_36[] = { OP_SET_INJECT_WORD (C_BIDI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3372,7 +3372,7 @@ static const struct script_op script_37[] = { OP_SET_INJECT_WORD (C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED) OP_S_WRITE (b, "orange", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3395,7 +3395,7 @@ static const struct script_op script_38[] = { OP_S_NEW_STREAM_UNI (b, S_UNI_ID(0)) OP_S_WRITE (b, "orange", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -3502,7 +3502,7 @@ static const struct script_op script_39[] = { OP_SET_INJECT_WORD (0, 1) OP_S_WRITE (a, "orange", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -3717,7 +3717,7 @@ static const struct script_op script_42[] = { OP_SET_INJECT_WORD (1, (((uint64_t)1) << 62) - 1) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -3738,7 +3738,7 @@ static const struct script_op script_43[] = { OP_SET_INJECT_WORD (1, 0x100000 /* 1 MiB */) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_CRYPTO_BUFFER_EXCEEDED,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED,0,0) OP_END }; @@ -3950,7 +3950,7 @@ static const struct script_op script_46[] = { OP_S_WRITE (a, "Strawberry", 10) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -3969,7 +3969,7 @@ static const struct script_op script_47[] = { OP_S_WRITE (a, "Strawberry", 10) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -3988,7 +3988,7 @@ static const struct script_op script_48[] = { OP_S_WRITE (a, "Strawberry", 10) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -4215,7 +4215,7 @@ static const struct script_op script_53[] = { OP_SET_INJECT_WORD (1, 0) OP_S_WRITE (a, "Strawberry", 10) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_CRYPTO_BUFFER_EXCEEDED,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED,0,0) OP_END }; @@ -4237,7 +4237,7 @@ static const struct script_op script_54[] = { OP_C_SET_ALPN ("ossltest") OP_C_CONNECT_WAIT_OR_FAIL() - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_CRYPTO_UNEXPECTED_MESSAGE,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_UNEXPECTED_MESSAGE,0,0) OP_END }; @@ -4257,7 +4257,7 @@ static const struct script_op script_55[] = { OP_SET_INJECT_WORD (0, 2) OP_S_WRITE (a, "orange", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -4277,7 +4277,7 @@ static const struct script_op script_56[] = { OP_SET_INJECT_WORD (0, 3) OP_S_WRITE (a, "orange", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -4391,7 +4391,7 @@ static const struct script_op script_59[] = { OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_PROTOCOL_VIOLATION,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION,0,0) OP_END }; @@ -4494,7 +4494,7 @@ static const struct script_op script_61[] = { S_BIDI_ID(OSSL_QUIC_VLINT_MAX / 4)) OP_S_WRITE (a, "fruit", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_LIMIT_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,0,0) OP_END }; @@ -4516,7 +4516,7 @@ static const struct script_op script_62[] = { C_BIDI_ID(OSSL_QUIC_VLINT_MAX / 4)) OP_S_WRITE (a, "fruit", 5) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_STATE_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0) OP_END }; @@ -4537,7 +4537,7 @@ static const struct script_op script_63[] = { OP_SET_INJECT_WORD (S_BIDI_ID(5000) + 1, 4) OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_STREAM_LIMIT_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,0,0) OP_END }; @@ -4772,7 +4772,7 @@ static const struct script_op script_68[] = { OP_S_NEW_TICKET () OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_PROTOCOL_VIOLATION, 0, 0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, 0) OP_END }; @@ -4793,7 +4793,7 @@ static const struct script_op script_69[] = { OP_S_NEW_TICKET () OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_CRYPTO_ERR_BEGIN + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + SSL_AD_UNEXPECTED_MESSAGE, 0, 0) OP_END @@ -4824,7 +4824,7 @@ static const struct script_op script_70[] = { OP_S_NEW_TICKET () OP_S_WRITE (a, "orange", 6) - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_PROTOCOL_VIOLATION, 0, 0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, 0) OP_END }; @@ -4996,7 +4996,7 @@ static const struct script_op script_75[] = { OP_C_SET_ALPN ("ossltest") OP_C_CONNECT_WAIT_OR_FAIL() - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_CONNECTION_REFUSED,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CONNECTION_REFUSED,0,0) OP_END }; @@ -5803,7 +5803,7 @@ static struct script_op dyn_frame_types_script[] = { OP_C_SET_ALPN ("ossltest") OP_C_CONNECT_WAIT_OR_FAIL() - OP_C_EXPECT_CONN_CLOSE_INFO(QUIC_ERR_FRAME_ENCODING_ERROR,0,0) + OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0) OP_END }; @@ -5813,50 +5813,50 @@ struct forbidden_frame_type { }; static const struct forbidden_frame_type forbidden_frame_types[] = { - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_VLINT_MAX, QUIC_ERR_FRAME_ENCODING_ERROR }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_VLINT_MAX, QUIC_ERR_FRAME_ENCODING_ERROR }, - { QUIC_PKT_TYPE_1RTT, OSSL_QUIC_VLINT_MAX, QUIC_ERR_FRAME_ENCODING_ERROR }, - - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STREAM, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STOP_SENDING, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_MAX_DATA, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE, QUIC_ERR_PROTOCOL_VIOLATION }, - - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STREAM, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STOP_SENDING, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_MAX_DATA, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP, QUIC_ERR_PROTOCOL_VIOLATION }, - { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE, QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_VLINT_MAX, OSSL_QUIC_ERR_FRAME_ENCODING_ERROR }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_VLINT_MAX, OSSL_QUIC_ERR_FRAME_ENCODING_ERROR }, + { QUIC_PKT_TYPE_1RTT, OSSL_QUIC_VLINT_MAX, OSSL_QUIC_ERR_FRAME_ENCODING_ERROR }, + + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STREAM, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STOP_SENDING, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_MAX_DATA, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_INITIAL, OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STREAM, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_RESET_STREAM, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STOP_SENDING, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_MAX_DATA, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_HANDSHAKE, OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, /* Client uses a zero-length CID so this is not allowed. */ - { QUIC_PKT_TYPE_1RTT, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, QUIC_ERR_PROTOCOL_VIOLATION }, + { QUIC_PKT_TYPE_1RTT, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, OSSL_QUIC_ERR_PROTOCOL_VIOLATION }, }; static ossl_unused int test_dyn_frame_types(int idx) diff --git a/test/quicapitest.c b/test/quicapitest.c index 90a418e5f15..098e1a9b396 100644 --- a/test/quicapitest.c +++ b/test/quicapitest.c @@ -2047,7 +2047,7 @@ static int test_tparam(int idx) goto err; if (!TEST_true((info.flags & SSL_CONN_CLOSE_FLAG_TRANSPORT) != 0) - || !TEST_uint64_t_eq(info.error_code, QUIC_ERR_TRANSPORT_PARAMETER_ERROR) + || !TEST_uint64_t_eq(info.error_code, OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR) || !TEST_ptr(strstr(info.reason, ctx.t->expect_fail))) { TEST_error("expected connection closure information mismatch" " during TPARAM test: flags=%llu ec=%llu reason='%s'", diff --git a/test/quicfaultstest.c b/test/quicfaultstest.c index ad200f7aced..174c4ee0c0b 100644 --- a/test/quicfaultstest.c +++ b/test/quicfaultstest.c @@ -192,10 +192,10 @@ static int test_drop_extensions(int idx) if (idx == 0) { ext = TLSEXT_TYPE_quic_transport_parameters; - err = QUIC_ERR_CRYPTO_MISSING_EXT; + err = OSSL_QUIC_ERR_CRYPTO_MISSING_EXT; } else { ext = TLSEXT_TYPE_application_layer_protocol_negotiation; - err = QUIC_ERR_CRYPTO_NO_APP_PROTO; + err = OSSL_QUIC_ERR_CRYPTO_NO_APP_PROTO; } if (!TEST_true(qtest_fault_set_hand_enc_ext_listener(fault,