Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / openssl / openssl / ssl / tls1.h

diff --git a/src/third_party/openssl/openssl/ssl/tls1.h b/src/third_party/openssl/openssl/ssl/tls1.h
index 6070e13..c4f69aa 100644 (file)
--- a/src/third_party/openssl/openssl/ssl/tls1.h
+++ b/src/third_party/openssl/openssl/ssl/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
 
@@ -251,10 +257,6 @@ extern "C" {
 /* This is not an IANA defined extension number */
 #define TLSEXT_TYPE_channel_id                 30031
 
-/* See https://tools.ietf.org/html/draft-agl-tls-padding-02
- * Number not yet IANA assigned. */
-#define TLSEXT_TYPE_padding                    35655
-
 /* NameType value from RFC 3546 */
 #define TLSEXT_NAMETYPE_host_name 0
 /* status request value from RFC 3546 */