diff options
| author | Marc Bevand <mbevand@google.com> | 2014-06-02 13:18:09 -0700 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-06-02 21:16:35 +0000 |
| commit | 3bf635b0cce9499fa7727967456c613b44a745cf (patch) | |
| tree | f21cfb16142417cb176eb29181cb43f71cfa5a90 | |
| parent | ea8d6da2fa48253e9412d124f5a857c3d18df647 (diff) | |
Update TLS extensions
Add better reference to IANA list of all extensions.
Add newer "channel_id" extension (0x7550) as used by current Chrome versions.
Change-Id: Ia5b2515c557fbaf42d320ede918120f83b2e02dd
Reviewed-on: https://code.wireshark.org/review/1924
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 46f7f326af..96b39f4f8a 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1078,7 +1078,7 @@ const value_string pct_error_code[] = { { 0x00, NULL } }; -/* RFC 4366 */ +/* http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#tls-extensiontype-values-1 */ const value_string tls_hello_extension_types[] = { { SSL_HND_HELLO_EXT_SERVER_NAME, "server_name" }, /* RFC 3546 */ { 1, "max_fragment_length" }, @@ -1107,6 +1107,9 @@ const value_string tls_hello_extension_types[] = { { 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_OLD, "channel_id_old" }, + /* 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_CHANNEL_ID, "channel_id" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 72b70d31c2..f64d4e0c29 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -171,7 +171,8 @@ #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_HELLO_EXT_CHANNEL_ID_OLD 0x754f +#define SSL_HND_HELLO_EXT_CHANNEL_ID 0x7550 #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 |