Commit e984b535 authored by Matt Caswell's avatar Matt Caswell
Browse files

Update the TLSv1.3 version indicator for draft-19 



This change will mean we will lose interoperability with draft-18
implementations.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2895)
parent 7baabf45

include/openssl/tls1.h

+3 −3
Original line number Diff line number Diff line
@@ -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

util/TLSProxy/Record.pm

+8 −8
Original line number Diff line number Diff line
@@ -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 = (