diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-08-22 10:08:00 +0200 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2016-09-16 22:30:29 +0000 |
commit | 7319887c3169adba91d0f3fd1b5201354e246979 (patch) | |
tree | c1a8db60fb7bfb3d6b6f22d15ed4f3ab3d756182 /epan/dissectors/packet-ssl-utils.h | |
parent | 778f7c52cc454d97e3ff560ebf7fa9694da56e98 (diff) |
TLS(1.3): Fix Server Hello
There is no session_id and compression method with TLS 1.3 Server Hello
Also no time on first bytes of random field
Bug: 12779
Change-Id: Id79221c2ad50695cf6d46cd5c9255deab99e2d2c
Reviewed-on: https://code.wireshark.org/review/17225
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
-rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index f603b28ac5..889571708a 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -695,6 +695,7 @@ typedef struct ssl_common_dissect { gint hs_dnames; gint hs_dname_len; gint hs_dname; + gint hs_random; gint hs_random_time; gint hs_random_bytes; gint hs_session_id; @@ -837,7 +838,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 \ }, \ /* ett */ { \ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ @@ -1261,13 +1262,18 @@ ssl_common_dissect_t name = { \ FT_NONE, BASE_NONE, NULL, 0x0, \ "Distinguished name of a CA that server trusts", HFILL } \ }, \ + { & name .hf.hs_random, \ + { "Random", prefix ".handshake.random", \ + FT_BYTES, BASE_NONE, NULL, 0x0, \ + "Random values used for deriving keys", HFILL } \ + }, \ { & name .hf.hs_random_time, \ { "GMT Unix Time", prefix ".handshake.random_time", \ FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, \ "Unix time field of random structure", HFILL } \ }, \ { & name .hf.hs_random_bytes, \ - { "Random Bytes", prefix ".handshake.random", \ + { "Random Bytes", prefix ".handshake.random_bytes", \ FT_BYTES, BASE_NONE, NULL, 0x0, \ "Random values used for deriving keys", HFILL } \ }, \ |