diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-05-18 16:43:27 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-05-19 14:27:46 +0000 |
| commit | 3346fc9c83719bce26cca31fc4b5d9139ab56d76 (patch) | |
| tree | d054d8251c768fa2c640dce5a0dea018aa5327e4 | |
| parent | aa607c330d06667419273cdaf8559aaa534d8b90 (diff) | |
| download | wireshark-3346fc9c83719bce26cca31fc4b5d9139ab56d76.tar.gz | |
TLS: Add Reserved Extension type from GREASE
See https://tools.ietf.org/html/draft-ietf-tls-grease
Change-Id: I305a35c50f6aa94f94f20974babb7c871393f9e7
Reviewed-on: https://code.wireshark.org/review/21706
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 16 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 16 |
2 files changed, 32 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index d61a515040..0de394fe9b 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1206,12 +1206,28 @@ const value_string tls_hello_extension_types[] = { { SSL_HND_HELLO_EXT_CERTIFICATE_AUTHORITIES, "certificate_authorities" }, /* https://tools.ietf.org/html/draft-ietf-tls-tls13-19#section-4.2.3.1 */ { SSL_HND_HELLO_EXT_OID_FILTERS, "oid_filters" }, /* https://tools.ietf.org/html/draft-ietf-tls-tls13-19#section-4.3.2.1 */ { SSL_HND_HELLO_EXT_POST_HANDSHAKE_AUTH, "post_handshake_auth" }, /* https://tools.ietf.org/html/draft-ietf-tls-tls13-20#section-4.2.5 */ + { SSL_HND_HELLO_EXT_GREASE_0A0A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_1A1A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_2A2A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ { SSL_HND_HELLO_EXT_NPN, "next_protocol_negotiation"}, /* https://tools.ietf.org/id/draft-agl-tls-nextprotoneg-03.html */ + { SSL_HND_HELLO_EXT_GREASE_3A3A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_4A4A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_5A5A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_6A6A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ { SSL_HND_HELLO_EXT_CHANNEL_ID_OLD, "channel_id_old" }, /* http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 https://twitter.com/ericlaw/status/274237352531083264 */ { SSL_HND_HELLO_EXT_CHANNEL_ID, "channel_id" }, /* http://tools.ietf.org/html/draft-balfanz-tls-channelid-01 https://code.google.com/p/chromium/codesearch#chromium/src/net/third_party/nss/ssl/sslt.h&l=209 */ { SSL_HND_HELLO_EXT_RENEGOTIATION_INFO, "renegotiation_info" }, /* RFC 5746 */ + { SSL_HND_HELLO_EXT_GREASE_7A7A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_8A8A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_9A9A, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_AAAA, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_BABA, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_CACA, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_DADA, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_EAEA, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ + { SSL_HND_HELLO_EXT_GREASE_FAFA, "Reserved (GREASE)" }, /* https://tools.ietf.org/html/draft-ietf-tls-grease */ { SSL_HND_HELLO_EXT_DRAFT_VERSION_TLS13, "Draft version of TLS 1.3" }, /* for experimentation only https://www.ietf.org/mail-archive/web/tls/current/msg20853.html */ { 0, NULL } }; diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 7dcc6732b2..871306584e 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -175,9 +175,25 @@ typedef enum { #define SSL_HND_HELLO_EXT_CERTIFICATE_AUTHORITIES 47 #define SSL_HND_HELLO_EXT_OID_FILTERS 48 #define SSL_HND_HELLO_EXT_POST_HANDSHAKE_AUTH 49 +#define SSL_HND_HELLO_EXT_GREASE_0A0A 2570 +#define SSL_HND_HELLO_EXT_GREASE_1A1A 6682 +#define SSL_HND_HELLO_EXT_GREASE_2A2A 10794 #define SSL_HND_HELLO_EXT_NPN 13172 /* 0x3374 */ +#define SSL_HND_HELLO_EXT_GREASE_3A3A 14906 +#define SSL_HND_HELLO_EXT_GREASE_4A4A 19018 +#define SSL_HND_HELLO_EXT_GREASE_5A5A 23130 +#define SSL_HND_HELLO_EXT_GREASE_6A6A 27242 #define SSL_HND_HELLO_EXT_CHANNEL_ID_OLD 30031 /* 0x754f */ #define SSL_HND_HELLO_EXT_CHANNEL_ID 30032 /* 0x7550 */ +#define SSL_HND_HELLO_EXT_GREASE_7A7A 31354 +#define SSL_HND_HELLO_EXT_GREASE_8A8A 35466 +#define SSL_HND_HELLO_EXT_GREASE_9A9A 39578 +#define SSL_HND_HELLO_EXT_GREASE_AAAA 43690 +#define SSL_HND_HELLO_EXT_GREASE_BABA 47802 +#define SSL_HND_HELLO_EXT_GREASE_CACA 51914 +#define SSL_HND_HELLO_EXT_GREASE_DADA 56026 +#define SSL_HND_HELLO_EXT_GREASE_EAEA 60138 +#define SSL_HND_HELLO_EXT_GREASE_FAFA 64250 #define SSL_HND_HELLO_EXT_RENEGOTIATION_INFO 65281 /* 0xFF01 */ #define SSL_HND_HELLO_EXT_DRAFT_VERSION_TLS13 65282 /* 0xFF02 */ |