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

QUIC (TLS): Add stateless_reset_token parameter 

Ping-Bug: 13881
Change-Id: I0332ebae69d8b25b1ac8617742cff02744a30f2a
Reviewed-on: https://code.wireshark.org/review/23389
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexis La Goutte 2017-09-01 16:42:53 +02:00 committed by Michael Mann
parent a6ad0a0191
commit 5c4a96b58b
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-ssl-utils.c
View File

@ -1408,6 +1408,7 @@ const value_string quic_transport_parameter_id[] = {
{ SSL_HND_QUIC_TP_IDLE_TIMEOUT, "idle_timeout" },
{ SSL_HND_QUIC_TP_OMIT_CONNECTION_ID, "omit_connection_id" },
{ SSL_HND_QUIC_TP_MAX_PACKET_SIZE, "max_packet_size" },
{ SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN, "stateless_reset_token" },
{ 0, NULL }
};
@ -6347,6 +6348,7 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
* idle_timeout(3),
* truncate_connection_id(4),
* max_packet_size(5),
* stateless_reset_token(6),
* (65535)
* } TransportParameterId;
*
@ -6463,6 +6465,11 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
/*TODO display expert info about invalid value (< 1252 or >65527) ? */
offset += 2;
break;
case SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN:
proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_stateless_reset_token,
tvb, offset, 16, ENC_BIG_ENDIAN);
offset += 16;
break;
default:
offset += parameter_length;
/*TODO display expert info about unknown ? */

9
epan/dissectors/packet-ssl-utils.h
View File

@ -210,6 +210,7 @@ typedef enum {
#define SSL_HND_QUIC_TP_IDLE_TIMEOUT 3
#define SSL_HND_QUIC_TP_OMIT_CONNECTION_ID 4
#define SSL_HND_QUIC_TP_MAX_PACKET_SIZE 5
#define SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN 6
/*
* Lookup tables
*/
@ -842,6 +843,7 @@ typedef struct ssl_common_dissect {
gint hs_ext_quictp_parameter_initial_max_stream_id;
gint hs_ext_quictp_parameter_idle_timeout;
gint hs_ext_quictp_parameter_max_packet_size;
gint hs_ext_quictp_parameter_stateless_reset_token;
/* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_HF_LIST! */
} hf;
@ -1038,7 +1040,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, \
@ -1818,6 +1820,11 @@ ssl_common_dissect_t name = { \
{ "max_packet_size", prefix ".quic.parameter.max_packet_size", \
FT_UINT16, BASE_DEC, NULL, 0x00, \
"Indicates that packets larger than this limit will be dropped", HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_stateless_reset_token, \
{ "stateless_reset_token", prefix ".quic.parameter.stateless_reset_token", \
FT_BYTES, BASE_NONE, NULL, 0x00, \
"Used in verifying a stateless reset", HFILL } \
}
/* }}} */