add the (not yet official) TLS channel_id extension that's used by Chrome

Change-Id: Ib8779b0db790a78fff8bd1970a7240bbd8f49f75
Reviewed-on: https://code.wireshark.org/review/537
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>

diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 5d8dee7a5e78d3654b2ffe01fcdac513eeb069ca..5fcab330a48a4f3b7e732253e4ddf87170cf14dc 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -1091,6 +1091,9 @@ const value_string tls_hello_extension_types[] = {
     { 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 */
+    /* http://tools.ietf.org/html/draft-balfanz-tls-channelid-00
+       https://twitter.com/ericlaw/status/274237352531083264 */
+    { SSL_HND_HELLO_EXT_CHANNEL_ID, "channel_id" },
     { 0, NULL }
 };
 

diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 74f1f1129436680c15048670477d9f7d831942b1..50195e9da17ffb60661b7f5bb54f48bd2d9a14c6 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -163,6 +163,7 @@
 #define SSL_HND_HELLO_EXT_SESSION_TICKET     0x0023
 #define SSL_HND_HELLO_EXT_RENEG_INFO         0xff01
 #define SSL_HND_HELLO_EXT_NPN                0x3374
+#define SSL_HND_HELLO_EXT_CHANNEL_ID         0x754f
 #define SSL_HND_CERT_URL_TYPE_INDIVIDUAL_CERT       1
 #define SSL_HND_CERT_URL_TYPE_PKIPATH               2
 #define SSL_HND_CERT_STATUS_TYPE_OCSP        1