diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index cb8de960cd..5c1c2307e7 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1200,10 +1200,10 @@ const value_string tls_hello_ext_server_name_type_vs[] = { { 0, NULL } }; -/* draft-ietf-tls-tls13-18 4.2.7 */ +/* draft-ietf-tls-tls13-19 4.2.6 */ const value_string tls_hello_ext_psk_ke_mode[] = { { 0, "PSK-only key establishment (psk_ke)" }, - { 1, "PSK key establishment with (EC)DHE key establishment (psk_dhe_ke)" }, + { 1, "PSK with (EC)DHE key establishment (psk_dhe_ke)" }, { 0, NULL } }; @@ -6295,7 +6295,7 @@ static gint ssl_dissect_hnd_hello_ext_psk_key_exchange_modes(ssl_common_dissect_t *hf, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset, guint32 offset_end) { - /* https://tools.ietf.org/html/draft-ietf-tls-tls13-18#section-4.2.7 + /* https://tools.ietf.org/html/draft-ietf-tls-tls13-19#section-4.2.6 * enum { psk_ke(0), psk_dhe_ke(1), (255) } PskKeyExchangeMode; * * struct { @@ -6306,7 +6306,7 @@ ssl_dissect_hnd_hello_ext_psk_key_exchange_modes(ssl_common_dissect_t *hf, tvbuf /* PskKeyExchangeMode ke_modes<1..255> */ if (!ssl_add_vector(hf, tvb, pinfo, tree, offset, offset_end, &ke_modes_length, - hf->hf.hs_ext_psk_ke_modes_len, 1, 255)) { + hf->hf.hs_ext_psk_ke_modes_length, 1, 255)) { return offset_end; } offset++; 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 } \ }, \ |