diff options
author | Matt Caswell <matt@openssl.org> | 2017-03-08 11:48:43 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-03-16 14:20:38 +0000 |
commit | e984b535d95f354e9df5dfe95d588db0d6dc2413 (patch) | |
tree | f7cda3d3f7d4fc34474beb793e3cbb10aca99fe4 | |
parent | 7baabf45c424c135ecfafc6b3bb7ea1d225fbfda (diff) |
Update the TLSv1.3 version indicator for draft-19
This change will mean we will lose interoperability with draft-18
implementations.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2895)
-rw-r--r-- | include/openssl/tls1.h | 6 | ||||
-rw-r--r-- | util/TLSProxy/Record.pm | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index cf06f72748..8e890bf8b4 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -68,9 +68,9 @@ extern "C" { # define TLS1_3_VERSION 0x0304 # define TLS_MAX_VERSION TLS1_3_VERSION -/* TODO(TLS1.3) REMOVE ME: Version indicator for draft -18 */ -# define TLS1_3_VERSION_DRAFT 0x7f12 -# define TLS1_3_VERSION_DRAFT_TXT "TLS 1.3 (draft 18)" +/* TODO(TLS1.3) REMOVE ME: Version indicator for draft -19 */ +# define TLS1_3_VERSION_DRAFT 0x7f13 +# define TLS1_3_VERSION_DRAFT_TXT "TLS 1.3 (draft 19)" /* Special value for method supporting multiple versions */ # define TLS_ANY_VERSION 0x10000 diff --git a/util/TLSProxy/Record.pm b/util/TLSProxy/Record.pm index 202c1ec9a6..358c1ce63f 100644 --- a/util/TLSProxy/Record.pm +++ b/util/TLSProxy/Record.pm @@ -35,14 +35,14 @@ my %record_type = ( ); use constant { - VERS_TLS_1_4 => 773, - VERS_TLS_1_3_DRAFT => 32530, - VERS_TLS_1_3 => 772, - VERS_TLS_1_2 => 771, - VERS_TLS_1_1 => 770, - VERS_TLS_1_0 => 769, - VERS_SSL_3_0 => 768, - VERS_SSL_LT_3_0 => 767 + VERS_TLS_1_4 => 0x0305, + VERS_TLS_1_3_DRAFT => 0x7f13, + VERS_TLS_1_3 => 0x0304, + VERS_TLS_1_2 => 0x0303, + VERS_TLS_1_1 => 0x0302, + VERS_TLS_1_0 => 0x0301, + VERS_SSL_3_0 => 0x0300, + VERS_SSL_LT_3_0 => 0x02ff }; my %tls_version = ( |