diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-08-23 18:14:03 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-09-16 22:39:29 +0000 |
| commit | 41567191d8c19d2b27571f9c1713fa1f9d6bd11a (patch) | |
| tree | bd5b9fe3b1d7b8840d95bacbd38027bfbdb87443 /epan/dissectors/packet-ssl-utils.h | |
| parent | 5540df7a82a4a3ef0ce0b51536dd93d296b77483 (diff) | |
TLS(1.3): Add Share Key (40) Hello extension
Bug: 12779
Change-Id: I5cbc911f2c7818558c5182d2e3ccf9235be9281b
Reviewed-on: https://code.wireshark.org/review/17301
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index eaf33f6218..929133e26b 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -650,6 +650,10 @@ typedef struct ssl_common_dissect { gint hs_ext_npn_str_len; gint hs_ext_reneg_info_len; gint hs_ext_reneg_info; + gint hs_ext_key_share_client_length; + gint hs_ext_key_share_group; + gint hs_ext_key_share_key_exchange_length; + gint hs_ext_key_share_key_exchange; gint hs_ext_server_name; gint hs_ext_server_name_len; gint hs_ext_server_name_list_len; @@ -733,6 +737,8 @@ typedef struct ssl_common_dissect { gint hs_ext_curves_point_formats; gint hs_ext_npn; gint hs_ext_reneg_info; + gint hs_ext_key_share; + gint hs_ext_key_share_ks; gint hs_ext_server_name; gint hs_ext_padding; gint hs_sig_hash_alg; @@ -846,11 +852,11 @@ 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, \ }, \ /* ett */ { \ -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, \ }, \ /* ei */ { \ EI_INIT, EI_INIT, EI_INIT, EI_INIT, EI_INIT, \ @@ -950,6 +956,26 @@ ssl_common_dissect_t name = { \ FT_BYTES, BASE_NONE, NULL, 0x0, \ NULL, HFILL } \ }, \ + { & name .hf.hs_ext_key_share_client_length, \ + { "Client Key Share Length", prefix ".handshake.extensions_key_share_client_length", \ + FT_UINT16, BASE_DEC, NULL, 0x00, \ + NULL, HFILL } \ + }, \ + { & name .hf.hs_ext_key_share_group, \ + { "Group", prefix ".handshake.extensions_key_share_group", \ + FT_UINT16, BASE_DEC, VALS(ssl_extension_curves), 0x00, \ + NULL, HFILL } \ + }, \ + { & name .hf.hs_ext_key_share_key_exchange_length, \ + { "Key Exchange Length", prefix ".handshake.extensions_key_share_key_exchange_length", \ + FT_UINT16, BASE_DEC, NULL, 0x00, \ + NULL, HFILL } \ + }, \ + { & name .hf.hs_ext_key_share_key_exchange, \ + { "Key Exchange", prefix ".handshake.extensions_key_share_key_exchange", \ + FT_BYTES, BASE_NONE, NULL, 0x0, \ + NULL, HFILL } \ + }, \ { & name .hf.hs_ext_server_name_list_len, \ { "Server Name list length", prefix ".handshake.extensions_server_name_list_len", \ FT_UINT16, BASE_DEC, NULL, 0x0, \ @@ -1382,6 +1408,8 @@ ssl_common_dissect_t name = { \ & name .ett.hs_ext_curves_point_formats, \ & name .ett.hs_ext_npn, \ & name .ett.hs_ext_reneg_info, \ + & name .ett.hs_ext_key_share, \ + & name .ett.hs_ext_key_share_ks, \ & name .ett.hs_ext_server_name, \ & name .ett.hs_ext_padding, \ & name .ett.hs_sig_hash_alg, \ |