diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-03-04 00:02:51 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-16 22:48:24 +0000 |
| commit | b46fe7e95ae09c062ec066838f05b2c42a3b2726 (patch) | |
| tree | b142b9211307e7cc45e3825b84ffd2943346425d /epan/dissectors/packet-ssl-utils.c | |
| parent | eaa1e7fc3feb70630b7bcccc5989e73aa8023841 (diff) | |
ssl: add more TLS extensions
These extensions were added in the last time.
This just adds the basic part, wireshark is now able to translate the
number into a string. these numbers are defined here:
https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
Change-Id: I9d1f1a04318aa116930202aa0fadb59648bed78d
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/14484
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 998e91a41a..ac77c8203c 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1143,8 +1143,10 @@ const value_string tls_hello_extension_types[] = { { 18, "signed_certificate_timestamp" }, /* RFC 6962 */ { SSL_HND_HELLO_EXT_CLIENT_CERT_TYPE, "client_certificate_type" }, /* RFC 7250 */ { SSL_HND_HELLO_EXT_SERVER_CERT_TYPE, "server_certificate_type" }, /* RFC 7250 */ - { SSL_HND_HELLO_EXT_PADDING, "Padding" }, /* http://tools.ietf.org/html/draft-agl-tls-padding */ - { SSL_HND_HELLO_EXT_EXTENDED_MASTER_SECRET_TYPE, "Extended Master Secret" }, /* https://tools.ietf.org/html/draft-ietf-tls-session-hash-01 */ + { SSL_HND_HELLO_EXT_PADDING, "Padding" }, /* RFC7685 */ + { 22, "encrypt then mac" }, /* RFC7366 */ + { SSL_HND_HELLO_EXT_EXTENDED_MASTER_SECRET_TYPE, "Extended Master Secret" }, /* RFC7627 */ + { 24, "token binding" }, /* https://tools.ietf.org/html/draft-ietf-tokbind-negotiation */ { SSL_HND_HELLO_EXT_SESSION_TICKET, "SessionTicket TLS" }, /* RFC 4507 */ { SSL_HND_HELLO_EXT_NPN, "next_protocol_negotiation"}, /* http://technotes.googlecode.com/git/nextprotoneg.html */ { SSL_HND_HELLO_EXT_RENEG_INFO, "renegotiation_info" }, /* RFC 5746 */ |