diff options
author | Matt Caswell <matt@openssl.org> | 2016-10-30 08:38:52 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-11-02 13:08:21 +0000 |
commit | 84a68336581b7d25fefe693bf92b5b3751f4b5f6 (patch) | |
tree | b03fbff07ea0b0b035d8e01e2916fc67ef80aca2 /Configure | |
parent | 0ced42e050e602dc9d5fea36250ab8335f8ab156 (diff) |
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: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 ], |