diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-11-12 17:04:14 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-12-31 07:36:57 +0000 |
| commit | 6a5fcc5a38936d940e4fa50294be0648a3ab6ea9 (patch) | |
| tree | 93f8a2c17626fddee2bde9d593155f0dca15a9b7 /epan/dissectors/packet-ssl-utils.h | |
| parent | f4b0abc7296bbb431e64e31f85b24c29196c2ae4 (diff) | |
TLS(1.3): Add PSK Key Exchanges Modes (45) hello extension
Ping-Bug: 12779
Change-Id: Ie797a437240e5530d74e3039f12a60a6f0395d0a
Reviewed-on: https://code.wireshark.org/review/18916
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 28d197a20b..c1808ed90d 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -171,6 +171,7 @@ typedef enum { #define SSL_HND_HELLO_EXT_EARLY_DATA 42 #define SSL_HND_HELLO_EXT_SUPPORTED_VERSIONS 43 #define SSL_HND_HELLO_EXT_COOKIE 44 +#define SSL_HND_HELLO_EXT_PSK_KEY_EXCHANGE_MODES 45 #define SSL_HND_HELLO_EXT_NPN 13172 /* 0x3374 */ #define SSL_HND_HELLO_EXT_CHANNEL_ID_OLD 30031 /* 0x754f */ #define SSL_HND_HELLO_EXT_CHANNEL_ID 30032 /* 0x7550 */ @@ -761,6 +762,8 @@ typedef struct ssl_common_dissect { /* TLS 1.3 */ gint hs_ext_draft_version_tls13; + gint hs_ext_psk_ke_modes_len; + gint hs_ext_psk_ke_mode; /* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_HF_LIST! */ } hf; @@ -896,7 +899,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, \ }, \ /* ett */ { \ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ @@ -1500,6 +1503,16 @@ ssl_common_dissect_t name = { \ { "Draft version of TLS 1.3", prefix ".extension.draft_version_tls13", \ FT_UINT16, BASE_DEC, NULL, 0x0, \ "Indicate the version of draft supported by client", HFILL } \ + }, \ + { & name .hf.hs_ext_psk_ke_modes_len, \ + { "PSK Key Exchange Modes Length", prefix ".handshake.psk_ke_modes_len", \ + FT_UINT8, BASE_DEC, NULL, 0x0, \ + NULL, HFILL } \ + }, \ + { & name .hf.hs_ext_psk_ke_mode, \ + { "PSK Key Exchange Mode", prefix ".handshake.psk_ke_mode", \ + FT_UINT8, BASE_DEC, VALS(tls_hello_ext_psk_ke_mode), 0x0, \ + "Key exchange modes where the client supports use of PSKs", HFILL } \ } /* }}} */ |