osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

QUIC: update support to latest version negotiation draft (05) 

The tricky part is deciding if/when updating the decryption ciphers.
Current code works (at least) in the base scenario: V1 updates to V2
(draft-00).
This commit is contained in:
Nardi Ivan 2021-12-03 19:31:22 +01:00
parent e921b804d0
commit 968fe6ddba
3 changed files with 31 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-quic.c
View File

@ -15,7 +15,7 @@
* RFC9000 QUIC: A UDP-Based Multiplexed and Secure Transport
* RFC9001 Using TLS to Secure QUIC
* RFC8889 Version-Independent Properties of QUIC
* https://tools.ietf.org/html/draft-ietf-quic-version-negotiation-03
* https://tools.ietf.org/html/draft-ietf-quic-version-negotiation-05
* https://datatracker.ietf.org/doc/html/draft-ietf-quic-v2-00
*
* Extension:
@ -3185,6 +3185,16 @@ dissect_quic_long_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tre
/* Create new decryption context based on the Client Connection
* ID from the *very first* Client Initial packet. */
quic_create_initial_decoders(&dcid, &error, conn);
} else if (long_packet_type == QUIC_LPT_INITIAL && from_server &&
version != conn->version) {
/* Compatibile Version Negotiation: the server (probably) updated the connection version.
We need to restart the ciphers since HP depends on version.
If/when updating the ciphers is a bit tricky during Compatible Version Negotiation.
TODO: do we really need to restart all the initial ciphers?
*/
conn->version = version;
quic_ciphers_reset(ciphers);
quic_create_initial_decoders(&conn->client_dcid_initial, &error, conn);
} else if (long_packet_type == QUIC_LPT_0RTT) {
early_data_secret_len = tls13_get_quic_secret(pinfo, FALSE, TLS_SECRET_0RTT_APP, DIGEST_MIN_SIZE, DIGEST_MAX_SIZE, early_data_secret);
if (early_data_secret_len == 0) {

40
epan/dissectors/packet-tls-utils.c
View File

@ -7857,42 +7857,14 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
offset += parameter_length;
break;
case SSL_HND_QUIC_TP_VERSION_NEGOTIATION:
if (hnd_type == SSL_HND_CLIENT_HELLO) {
case SSL_HND_QUIC_TP_VERSION_NEGOTIATION:
quic_proto_tree_add_version(tvb, parameter_tree,
hf->hf.hs_ext_quictp_parameter_chosen_version, offset);
offset += 4;
for (i = 4; i < parameter_length; i += 4) {
quic_proto_tree_add_version(tvb, parameter_tree,
hf->hf.hs_ext_quictp_parameter_currently_attempted_version, offset);
hf->hf.hs_ext_quictp_parameter_other_version, offset);
offset += 4;
quic_proto_tree_add_version(tvb, parameter_tree,
hf->hf.hs_ext_quictp_parameter_previously_attempted_version, offset);
offset += 4;
proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_received_negotiation_version_count,
tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
offset += len;
for (i = 0; i < value; i++) {
quic_proto_tree_add_version(tvb, parameter_tree,
hf->hf.hs_ext_quictp_parameter_received_negotiation_version, offset);
offset += 4;
}
proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_compatible_version_count,
tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
offset += len;
for (i = 0; i < value; i++) {
quic_proto_tree_add_version(tvb, parameter_tree,
hf->hf.hs_ext_quictp_parameter_compatible_version, offset);
offset += 4;
}
} else {
quic_proto_tree_add_version(tvb, parameter_tree,
hf->hf.hs_ext_quictp_parameter_negotiated_version, offset);
offset += 4;
proto_tree_add_item_ret_varint(parameter_tree, hf->hf.hs_ext_quictp_parameter_supported_version_count,
tvb, offset, -1, ENC_VARINT_QUIC, &value, &len);
offset += len;
for (i = 0; i < value; i++) {
quic_proto_tree_add_version(tvb, parameter_tree,
hf->hf.hs_ext_quictp_parameter_supported_version, offset);
offset += 4;
}
}
break;
case SSL_HND_QUIC_TP_FACEBOOK_PARTIAL_RELIABILITY:

70
epan/dissectors/packet-tls-utils.h
View File

@ -184,7 +184,6 @@ typedef enum {
#define SSL_HND_QUIC_TP_GREASE_QUIC_BIT 0x2ab2 /* https://tools.ietf.org/html/draft-thomson-quic-bit-grease-00 */
#define SSL_HND_QUIC_TP_ENABLE_TIME_STAMP 0x7157 /* https://tools.ietf.org/html/draft-huitema-quic-ts-02 */
#define SSL_HND_QUIC_TP_ENABLE_TIME_STAMP_V2 0x7158 /* https://tools.ietf.org/html/draft-huitema-quic-ts-03 */
#define SSL_HND_QUIC_TP_VERSION_NEGOTIATION 0x73DB /* https://tools.ietf.org/html/draft-ietf-quic-version-negotiation-03 */
#define SSL_HND_QUIC_TP_MIN_ACK_DELAY 0xde1a /* https://tools.ietf.org/html/draft-iyengar-quic-delayed-ack-00 */
/* https://quiche.googlesource.com/quiche/+/refs/heads/master/quic/core/crypto/transport_parameters.cc */
#define SSL_HND_QUIC_TP_GOOGLE_USER_AGENT 0x3129
@ -196,6 +195,7 @@ typedef enum {
#define SSL_HND_QUIC_TP_GOOGLE_CONNECTION_OPTIONS 0x3128
/* https://github.com/facebookincubator/mvfst/blob/master/quic/QuicConstants.h */
#define SSL_HND_QUIC_TP_FACEBOOK_PARTIAL_RELIABILITY 0xFF00
#define SSL_HND_QUIC_TP_VERSION_NEGOTIATION 0xFF73DB /* https://tools.ietf.org/html/draft-ietf-quic-version-negotiation-05 */
/*
* Lookup tables
*/
@ -1025,15 +1025,6 @@ typedef struct ssl_common_dissect {
gint hs_ext_quictp_parameter_max_datagram_frame_size;
gint hs_ext_quictp_parameter_loss_bits;
gint hs_ext_quictp_parameter_enable_time_stamp_v2;
gint hs_ext_quictp_parameter_currently_attempted_version;
gint hs_ext_quictp_parameter_previously_attempted_version;
gint hs_ext_quictp_parameter_received_negotiation_version_count;
gint hs_ext_quictp_parameter_received_negotiation_version;
gint hs_ext_quictp_parameter_compatible_version_count;
gint hs_ext_quictp_parameter_compatible_version;
gint hs_ext_quictp_parameter_negotiated_version;
gint hs_ext_quictp_parameter_supported_version_count;
gint hs_ext_quictp_parameter_supported_version;
gint hs_ext_quictp_parameter_min_ack_delay;
gint hs_ext_quictp_parameter_google_user_agent_id;
gint hs_ext_quictp_parameter_google_key_update_not_yet_supported;
@ -1046,6 +1037,8 @@ typedef struct ssl_common_dissect {
gint hs_ext_quictp_parameter_google_supported_versions_length;
gint hs_ext_quictp_parameter_google_supported_version;
gint hs_ext_quictp_parameter_facebook_partial_reliability;
gint hs_ext_quictp_parameter_chosen_version;
gint hs_ext_quictp_parameter_other_version;
gint esni_suite;
gint esni_record_digest_length;
@ -1286,7 +1279,7 @@ ssl_common_dissect_t name = { \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 \
-1, -1, -1, -1, -1, -1 \
}, \
/* ett */ { \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
@ -2317,51 +2310,6 @@ ssl_common_dissect_t name = { \
FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(quic_enable_time_stamp_v2_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_currently_attempted_version, \
{ "Currently Attempted Version", prefix ".quic.parameter.vn.currently_attempted_version", \
FT_UINT32, BASE_RANGE_STRING | BASE_HEX, RVALS(quic_version_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_previously_attempted_version, \
{ "Previously Attempted Version", prefix ".quic.parameter.vn.previously_attempted_version", \
FT_UINT32, BASE_RANGE_STRING | BASE_HEX, RVALS(quic_version_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_received_negotiation_version_count, \
{ "Received Negotiation Version Count", prefix ".quic.parameter.vn.received_negotiation_version_count", \
FT_UINT64, BASE_DEC, NULL, 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_received_negotiation_version, \
{ "Received Negotiation Version", prefix ".quic.parameter.vn.received_negotiation_version", \
FT_UINT32, BASE_RANGE_STRING | BASE_HEX, RVALS(quic_version_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_compatible_version_count, \
{ "Compatible Version Count", prefix ".quic.parameter.vn.compatible_version_count", \
FT_UINT64, BASE_DEC, NULL, 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_compatible_version, \
{ "Compatible Version", prefix ".quic.parameter.vn.compatible_version", \
FT_UINT32, BASE_RANGE_STRING | BASE_HEX, RVALS(quic_version_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_negotiated_version, \
{ "Negotiated Version", prefix ".quic.parameter.vn.negotiated_version", \
FT_UINT32, BASE_RANGE_STRING | BASE_HEX, RVALS(quic_version_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_supported_version_count, \
{ "Supported Version Count", prefix ".quic.parameter.vn.supported_version_count", \
FT_UINT64, BASE_DEC, NULL, 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_supported_version, \
{ "Supported Version", prefix ".quic.parameter.vn.supported_version", \
FT_UINT32, BASE_RANGE_STRING | BASE_HEX, RVALS(quic_version_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_min_ack_delay, \
{ "min_ack_delay", prefix ".quic.parameter.min_ack_delay", \
FT_UINT64, BASE_DEC, NULL, 0x00, \
@ -2422,6 +2370,16 @@ ssl_common_dissect_t name = { \
FT_UINT64, BASE_DEC, NULL, 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_chosen_version, \
{ "Chosen Version", prefix ".quic.parameter.vn.chosen_version", \
FT_UINT32, BASE_RANGE_STRING | BASE_HEX, RVALS(quic_version_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_other_version, \
{ "Other Version", prefix ".quic.parameter.vn.other_version", \
FT_UINT32, BASE_RANGE_STRING | BASE_HEX, RVALS(quic_version_vals), 0x00, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_connection_id_length, \
{ "Connection ID length", prefix ".connection_id_length", \
FT_UINT8, BASE_DEC, NULL, 0x00, \