Update the TLSv1.3 version indicator for draft-20

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3371)

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 07e735ce895e096b4fc8fab23c02d7a8ecfb6dce..aef65cdb04144f0454e742e92abd7f7aef910f11 100644 (file)
--- 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
 
 # define TLS1_3_VERSION                  0x0304
 # define TLS_MAX_VERSION                 TLS1_3_VERSION
 

-/* 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)"
+/* TODO(TLS1.3) REMOVE ME: Version indicator for draft -20 */
+# define TLS1_3_VERSION_DRAFT            0x7f14
+# define TLS1_3_VERSION_DRAFT_TXT        "TLS 1.3 (draft 20)"

 
 /* Special value for method supporting multiple versions */
 # define TLS_ANY_VERSION                 0x10000
 
 /* 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 59251193983ba8bbcbfd59dbcc85cf1729ecf546..8c6e901558f69f5e234845c2746914037959d27e 100644 (file)
--- a/util/TLSProxy/Record.pm
+++ b/util/TLSProxy/Record.pm
@@ -36,7 +36,7 @@ my %record_type = (
 
 use constant {
     VERS_TLS_1_4 => 0x0305,
 
 use constant {
     VERS_TLS_1_4 => 0x0305,

-    VERS_TLS_1_3_DRAFT => 0x7f13,
+    VERS_TLS_1_3_DRAFT => 0x7f14,

     VERS_TLS_1_3 => 0x0304,
     VERS_TLS_1_2 => 0x0303,
     VERS_TLS_1_1 => 0x0302,
     VERS_TLS_1_3 => 0x0304,
     VERS_TLS_1_2 => 0x0303,
     VERS_TLS_1_1 => 0x0302,