aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ssl-utils.h
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2017-03-17 14:55:32 +0100
committerMichael Mann <mmann78@netscape.net>2017-03-18 23:20:38 +0000
commit870a8c49ecf3142170f071ece576b4f9f66eeaf2 (patch)
treea0da6c3210cc7a2c368565a7e88afce57e92e7c6 /epan/dissectors/packet-ssl-utils.h
parent2337b7bd20e6db80797384a03a83a45c4b58a580 (diff)
TLS13: update pre_shared_key references to draft -19
Also rename the fields for consistency. Change-Id: I49f4c9b1d308264e7849df92e1b1ac4a93a94766 Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/20590 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: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
-rw-r--r--epan/dissectors/packet-ssl-utils.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 9e5b242ad1..fb9df9d115 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -769,7 +769,7 @@ 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_modes_length;
gint hs_ext_psk_ke_mode;
gint hs_certificate_request_context_length;
gint hs_certificate_request_context;
@@ -1583,13 +1583,13 @@ ssl_common_dissect_t name = { \
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", \
+ { & name .hf.hs_ext_psk_ke_modes_length, \
+ { "PSK Key Exchange Modes Length", prefix ".extension.psk_ke_modes_length", \
FT_UINT8, BASE_DEC, NULL, 0x0, \
NULL, HFILL } \
}, \
{ & name .hf.hs_ext_psk_ke_mode, \
- { "PSK Key Exchange Mode", prefix ".handshake.psk_ke_mode", \
+ { "PSK Key Exchange Mode", prefix ".extension.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 } \
}, \