From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 7 Jun 2014 13:17:44 +0000 (+0100)
Subject: Add official extension value.
X-Git-Tag: master-post-reformat~725
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c43a55407dccc6902058184d7dd0bd111fe6a61e;p=oweals%2Fopenssl.git

Add official extension value.

Encrypt then MAC now has an official extension value, see:

http://www.ietf.org/id/draft-ietf-tls-encrypt-then-mac-02.txt
---

diff --git a/ssl/tls1.h b/ssl/tls1.h
index 7a3d22a3c8..b51716a02b 100644
--- a/ssl/tls1.h
+++ b/ssl/tls1.h
@@ -243,6 +243,10 @@ extern "C" {
  * http://tools.ietf.org/html/draft-agl-tls-padding-03
  */
 #define TLSEXT_TYPE_padding	21
+/* Extension type for Encrypt-then-MAC
+ * http://www.ietf.org/id/draft-ietf-tls-encrypt-then-mac-02.txt
+ */
+#define TLSEXT_TYPE_encrypt_then_mac	22
 
 /* ExtensionType value from RFC4507 */
 #define TLSEXT_TYPE_session_ticket		35