diff options
| author | Steven Valdez <svaldez@google.com> | 2016-09-15 23:27:05 +0300 |
|---|---|---|
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2016-09-27 23:12:22 +0300 |
| commit | fdd10998e1db111d43dedcd8662ecd5f6287c4ab (patch) | |
| tree | 85cdba85e7dea0405ee85f9fe91b26edf9894a36 /include/openssl | |
| parent | 2fb2ffb660ff9258188b501bf6eadf3a45bea375 (diff) | |
Moving TLS 1.3 version negotiation into extension.
Change-Id: I73f9fd64b46f26978b897409d817b34ec9d93afd
Reviewed-on: https://boringssl-review.googlesource.com/11080
Reviewed-by: Steven Valdez <svaldez@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Diffstat (limited to 'include/openssl')
| -rw-r--r-- | include/openssl/ssl.h | 2 | ||||
| -rw-r--r-- | include/openssl/tls1.h | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 3cf4e03b..b0242be1 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -562,7 +562,7 @@ OPENSSL_EXPORT int DTLSv1_handle_timeout(SSL *ssl); #define DTLS1_VERSION 0xfeff #define DTLS1_2_VERSION 0xfefd -#define TLS1_3_DRAFT_VERSION 14 +#define TLS1_3_DRAFT_VERSION 0x7f0e /* SSL_CTX_set_min_proto_version sets the minimum protocol version for |ctx| to * |version|. If |version| is zero, the default minimum version is used. It diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 3c97d26a..eca5decd 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -209,16 +209,9 @@ extern "C" { #define TLSEXT_TYPE_key_share 40 #define TLSEXT_TYPE_pre_shared_key 41 #define TLSEXT_TYPE_early_data 42 +#define TLSEXT_TYPE_supported_versions 43 #define TLSEXT_TYPE_cookie 44 -/* TLSEXT_TYPE_draft_version is the extension used to advertise the TLS 1.3 - * draft implemented. - * - * See - * https://github.com/tlswg/tls13-spec/wiki/Implementations#version-negotiation - */ -#define TLSEXT_TYPE_draft_version 0xff02 - /* ExtensionType value from RFC5746 */ #define TLSEXT_TYPE_renegotiate 0xff01 |