Blame SOURCES/wireshark-1.10.3-tls-ext-encrypt-then-mac.patch

dbc6ab
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
dbc6ab
index 8f85f11..a58ccfb 100644
dbc6ab
--- a/epan/dissectors/packet-ssl-utils.c
dbc6ab
+++ b/epan/dissectors/packet-ssl-utils.c
dbc6ab
@@ -1034,6 +1034,7 @@ const value_string tls_hello_extension_types[] = {
dbc6ab
     { 13, "signature_algorithms" },  /* RFC 5246 */
dbc6ab
     { 14, "use_srtp" },
dbc6ab
     { SSL_HND_HELLO_EXT_HEARTBEAT, "Heartbeat" },  /* RFC 6520 */
dbc6ab
+    { SSL_HND_HELLO_EXT_ENCRYPT_THEN_MAC_TYPE, "Encrypt then MAC" }, /* RFC 7366 */
dbc6ab
     { SSL_HND_HELLO_EXT_EXTENDED_MASTER_SECRET_TYPE, "Extended Master Secret" }, /* https://tools.ietf.org/html/draft-ietf-tls-session-hash-01 */
dbc6ab
     { 35, "SessionTicket TLS" },  /* RFC 4507 */
dbc6ab
     { SSL_HND_HELLO_EXT_NPN, "next_protocol_negotiation"}, /* http://technotes.googlecode.com/git/nextprotoneg.html */
dbc6ab
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
dbc6ab
index 5968b8e..82dc39b 100644
dbc6ab
--- a/epan/dissectors/packet-ssl-utils.h
dbc6ab
+++ b/epan/dissectors/packet-ssl-utils.h
dbc6ab
@@ -153,6 +153,7 @@
dbc6ab
 #define SSL_HND_HELLO_EXT_EC_POINT_FORMATS            0x000b
dbc6ab
 #define SSL_HND_HELLO_EXT_SIG_HASH_ALGS               0x000d
dbc6ab
 #define SSL_HND_HELLO_EXT_HEARTBEAT                   0x000f
dbc6ab
+#define SSL_HND_HELLO_EXT_ENCRYPT_THEN_MAC_TYPE       0x0016
dbc6ab
 #define SSL_HND_HELLO_EXT_EXTENDED_MASTER_SECRET_TYPE 0x0017
dbc6ab
 #define SSL_HND_HELLO_EXT_RENEG_INFO                  0xff01
dbc6ab
 #define SSL_HND_HELLO_EXT_NPN                         0x3374