Commit 84a68336 authored by Matt Caswell's avatar Matt Caswell
Browse files

Update Configure to know about tls1_3 



Also we disable TLS1.3 by default (use enable-tls1_3 to re-enable). This is
because this is a WIP and will not be interoperable with any other TLS1.3
implementation.

Finally, we fix some tests that started failing when TLS1.3 was disabled by
default.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 0ced42e0

Configure

+4 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ $config{sdirs} = [ 
    ];



# Known TLS and DTLS protocols

my @tls = qw(ssl3 tls1 tls1_1 tls1_2);

my @tls = qw(ssl3 tls1 tls1_1 tls1_2 tls1_3);

my @dtls = qw(dtls1 dtls1_2);



# Explicitly known options that are possible to disable.  They can
@@ -440,6 +440,8 @@ our %disabled = ( # "what" => "comment" 
		  "ssl3"                => "default",

		  "ssl3-method"         => "default",

                  "ubsan"		=> "default",

          #TODO(TLS1.3): Temporarily disabled while this is a WIP

		  "tls1_3"              => "default",

		  "unit-test"           => "default",

		  "weak-ssl-ciphers"    => "default",

		  "zlib"                => "default",
@@ -476,7 +478,7 @@ my @disable_cascades = ( 
    sub { $disabled{rsa}

	  && ($disabled{dsa} || $disabled{dh})

	  && ($disabled{ecdsa} || $disabled{ecdh}); }

			=> [ "tls1", "tls1_1", "tls1_2",

			=> [ "tls1", "tls1_1", "tls1_2", "tls1_3",

			     "dtls1", "dtls1_2" ],



    "tls"		=> [ @tls ],

INSTALL

+6 −0
Original line number Diff line number Diff line
@@ -457,6 +457,12 @@ 
                   specific configuration, e.g. "-m32" to build x86 code on

                   an x64 system.



  enable-tls1_3

                   TODO(TLS1.3): Make this enabled by default

                   Build support for TLS1.3. Note: This is a WIP feature and

                   does not currently interoperate with other TLS1.3

                   implementations! Use with caution!!



  no-<prot>

                   Don't build support for negotiating the specified SSL/TLS

                   protocol (one of ssl, ssl3, tls, tls1, tls1_1, tls1_2, dtls,

test/recipes/80-test_ssl_new.t

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ plan tests => 18; # = scalar @conf_srcs 
# Some test results depend on the configuration of enabled protocols. We only

# verify generated sources in the default configuration.

my $is_default_tls = (disabled("ssl3") && !disabled("tls1") &&

                      !disabled("tls1_1") && !disabled("tls1_2"));

                      !disabled("tls1_1") && !disabled("tls1_2") &&

                      disabled("tls1_3"));



my $is_default_dtls = (!disabled("dtls1") && !disabled("dtls1_2"));

test/ssl-tests/02-protocol-version.conf

+172 −216

File changed.

Preview size limit exceeded, changes collapsed.

test/ssl-tests/10-resumption.conf

+201 −1237

File changed.

Preview size limit exceeded, changes collapsed.