summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/openssl/openssl/include/openssl/tls1.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/openssl/openssl/include/openssl/tls1.h')
-rw-r--r--chromium/third_party/openssl/openssl/include/openssl/tls1.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chromium/third_party/openssl/openssl/include/openssl/tls1.h b/chromium/third_party/openssl/openssl/include/openssl/tls1.h
index 0ce0193c582..55594861183 100644
--- a/chromium/third_party/openssl/openssl/include/openssl/tls1.h
+++ b/chromium/third_party/openssl/openssl/include/openssl/tls1.h
@@ -230,6 +230,12 @@ extern "C" {
/* ExtensionType value from RFC5620 */
#define TLSEXT_TYPE_heartbeat 15
+/* ExtensionType value for TLS padding extension.
+ * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
+ * http://tools.ietf.org/html/draft-agl-tls-padding-03
+ */
+#define TLSEXT_TYPE_padding 21
+
/* ExtensionType value from RFC4507 */
#define TLSEXT_TYPE_session_ticket 35
@@ -249,7 +255,7 @@ extern "C" {
#endif
/* This is not an IANA defined extension number */
-#define TLSEXT_TYPE_channel_id 30031
+#define TLSEXT_TYPE_channel_id 30032
/* NameType value from RFC 3546 */
#define TLSEXT_NAMETYPE_host_name 0