diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-03-17 14:55:32 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-18 23:20:38 +0000 |
| commit | 870a8c49ecf3142170f071ece576b4f9f66eeaf2 (patch) | |
| tree | a0da6c3210cc7a2c368565a7e88afce57e92e7c6 /epan/dissectors/packet-ssl-utils.c | |
| parent | 2337b7bd20e6db80797384a03a83a45c4b58a580 (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.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 8 |
1 files changed, 4 insertions, 4 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++; |