diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-12-29 20:17:18 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-09 05:18:26 +0000 |
| commit | 86a5bf5abe53457dd5cfbde33b4670b6bf3efc94 (patch) | |
| tree | ac283a44bbffa36b10ac2d0b621be92f2bf793e1 /epan/dissectors/packet-ssl-utils.h | |
| parent | 45d967c803324a50852d4c4615a521e6e245a5dd (diff) | |
| download | wireshark-86a5bf5abe53457dd5cfbde33b4670b6bf3efc94.tar.gz | |
TLS(1.3): update PSK extension for draft -18
Removed ke_modes and auth_modes fields, add
identity.obfuscated_ticket_age and binders fields. (Note that binders
field is not dissected further at this moment due to the lack of a pcap
for verification.)
Ping-Bug: 12779
Change-Id: I9af7d93feb2352a494be2d5bda66d124267cf464
Reviewed-on: https://code.wireshark.org/review/19462
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
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 | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index c1808ed90d..43e408028a 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -223,7 +223,6 @@ extern const value_string ssl_extension_ec_point_formats[]; extern const value_string ssl_curve_types[]; extern const value_string tls_hello_ext_server_name_type_vs[]; extern const value_string tls_hello_ext_psk_ke_mode[]; -extern const value_string tls_hello_ext_psk_auth_mode[]; /* XXX Should we use GByteArray instead? */ typedef struct _StringInfo { @@ -680,12 +679,11 @@ typedef struct ssl_common_dissect { gint hs_ext_key_share_key_exchange; gint hs_ext_key_share_selected_group; gint hs_ext_psk_identities_length; - gint hs_ext_psk_identity_ke_modes_length; - gint hs_ext_psk_identity_ke_mode; - gint hs_ext_psk_identity_auth_modes_length; - gint hs_ext_psk_identity_auth_mode; - gint hs_ext_psk_identity_length; - gint hs_ext_psk_identity; + gint hs_ext_psk_identity_identity_length; + gint hs_ext_psk_identity_identity; + gint hs_ext_psk_identity_obfuscated_ticket_age; + gint hs_ext_psk_binders_length; + gint hs_ext_psk_binders; gint hs_ext_psk_identity_selected; gint hs_ext_early_data_obfuscated_ticket_age; gint hs_ext_supported_versions_len; @@ -899,7 +897,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, \ }, \ /* ett */ { \ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ @@ -1033,34 +1031,29 @@ ssl_common_dissect_t name = { \ FT_UINT16, BASE_DEC, NULL, 0x0, \ NULL, HFILL } \ }, \ - { & name .hf.hs_ext_psk_identity_ke_modes_length, \ - { "Key Exchange Modes length", prefix ".handshake.extensions.psk.identity.ke_modes_length", \ - FT_UINT8, BASE_DEC, NULL, 0x0, \ - NULL, HFILL } \ - }, \ - { & name .hf.hs_ext_psk_identity_ke_mode, \ - { "Key Exchange Mode", prefix ".handshake.extensions.psk.identity.ke_mode", \ - FT_UINT8, BASE_DEC, VALS(tls_hello_ext_psk_ke_mode), 0x0, \ + { & name .hf.hs_ext_psk_identity_identity_length, \ + { "Identity Length", prefix ".handshake.extensions.psk.identity.identity_length", \ + FT_UINT16, BASE_DEC, NULL, 0x0, \ NULL, HFILL } \ }, \ - { & name .hf.hs_ext_psk_identity_auth_modes_length, \ - { "Authentication Modes length", prefix ".handshake.extensions.psk.identity.auth_modes_length", \ - FT_UINT8, BASE_DEC, NULL, 0x0, \ + { & name .hf.hs_ext_psk_identity_identity, \ + { "Identity", prefix ".handshake.extensions.psk.identity.identity", \ + FT_BYTES, BASE_NONE, NULL, 0x0, \ NULL, HFILL } \ }, \ - { & name .hf.hs_ext_psk_identity_auth_mode, \ - { "Authentication Mode", prefix ".handshake.extensions.psk.identity.auth_mode", \ - FT_UINT8, BASE_DEC, VALS(tls_hello_ext_psk_auth_mode), 0x0, \ + { & name .hf.hs_ext_psk_identity_obfuscated_ticket_age, \ + { "Obfuscated Ticket Age", prefix ".handshake.extensions.psk.identity.obfuscated_ticket_age", \ + FT_UINT32, BASE_DEC, NULL, 0x0, \ NULL, HFILL } \ }, \ - { & name .hf.hs_ext_psk_identity_length, \ - { "Identity Length", prefix ".handshake.extensions.psk.identity.length", \ + { & name .hf.hs_ext_psk_binders_length, \ + { "PSK Binders length", prefix ".handshake.extensions.psk.binders_len", \ FT_UINT16, BASE_DEC, NULL, 0x0, \ NULL, HFILL } \ }, \ - { & name .hf.hs_ext_psk_identity, \ - { "Identity", prefix ".handshake.extensions.psk.identity", \ - FT_BYTES, BASE_NONE, NULL, 0x0, \ + { & name .hf.hs_ext_psk_binders, \ + { "PSK Binders", prefix ".handshake.extensions.psk.binders", \ + FT_NONE, BASE_NONE, NULL, 0x0, \ NULL, HFILL } \ }, \ { & name .hf.hs_ext_psk_identity_selected, \ |