diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-04-23 12:31:35 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-04-23 12:31:35 +0200 |
| commit | 0c5af0c28f23f75f93e253aeccb00c5ad20c116e (patch) | |
| tree | fae9826018c36f1011007d029b728c290c50485c /main/openssl/ssl/tls1.h | |
| parent | c69ba1780496c260a1b4498596bae428e0df232d (diff) | |
Update OpenSSL to 1.0.1g
Diffstat (limited to 'main/openssl/ssl/tls1.h')
| -rw-r--r-- | main/openssl/ssl/tls1.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/main/openssl/ssl/tls1.h b/main/openssl/ssl/tls1.h index 6f031a44..6283c6a7 100644 --- a/main/openssl/ssl/tls1.h +++ b/main/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 draft-ietf-tls-applayerprotoneg-00 */ #define TLSEXT_TYPE_application_layer_protocol_negotiation 16 @@ -254,10 +260,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 */ |