wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turn on TLSv1.3 downgrade protection by default

Browse source 
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6741)
This commit is contained in:
Matt Caswell 2018-07-18 16:13:14 +01:00
parent 35e742ecac
commit 9f22c52723
5 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configure
View file

@ -405,7 +405,6 @@ my @disablables = (
"tests", "tests",
"threads", "threads",
"tls", "tls",
"tls13downgrade",
"ts", "ts",
"ubsan", "ubsan",
"ui-console", "ui-console",
@ -449,7 +448,6 @@ our %disabled = ( # "what" => "comment"
"ssl3" => "default", "ssl3" => "default",
"ssl3-method" => "default", "ssl3-method" => "default",
"ubsan" => "default", "ubsan" => "default",
"tls13downgrade" => "default",
"unit-test" => "default", "unit-test" => "default",
"weak-ssl-ciphers" => "default", "weak-ssl-ciphers" => "default",
"zlib" => "default", "zlib" => "default",

10
INSTALL
View file

@ -476,16 +476,6 @@
require additional system-dependent options! See "Note on require additional system-dependent options! See "Note on
multi-threading" below. multi-threading" below.
enable-tls13downgrade
TODO(TLS1.3): Make this enabled by default and remove the
option when TLSv1.3 is out of draft
TLSv1.3 offers a downgrade protection mechanism. This is
implemented but disabled by default. It should not typically
be enabled except for testing purposes. Otherwise this could
cause problems if a pre-RFC version of OpenSSL talks to an
RFC implementation (it will erroneously be detected as a
downgrade).
no-ts no-ts
Don't build Time Stamping Authority support. Don't build Time Stamping Authority support.

4
ssl/s3_lib.c
View file

@ -4568,7 +4568,7 @@ int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, size_t len,
} else { } else {
ret = RAND_bytes(result, len); ret = RAND_bytes(result, len);
} }
#ifndef OPENSSL_NO_TLS13DOWNGRADE
if (ret > 0) { if (ret > 0) {
if (!ossl_assert(sizeof(tls11downgrade) < len) if (!ossl_assert(sizeof(tls11downgrade) < len)
|| !ossl_assert(sizeof(tls12downgrade) < len)) || !ossl_assert(sizeof(tls12downgrade) < len))
@ -4580,7 +4580,7 @@ int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, size_t len,
memcpy(result + len - sizeof(tls11downgrade), tls11downgrade, memcpy(result + len - sizeof(tls11downgrade), tls11downgrade,
sizeof(tls11downgrade)); sizeof(tls11downgrade));
} }
#endif
return ret; return ret;
} }

2
ssl/statem/statem_lib.c
View file

@ -1914,7 +1914,6 @@ int ssl_choose_client_version(SSL *s, int version, RAW_EXTENSION *extensions)
if (s->version != vent->version) if (s->version != vent->version)
continue; continue;
#ifndef OPENSSL_NO_TLS13DOWNGRADE
/* Check for downgrades */ /* Check for downgrades */
if (s->version == TLS1_2_VERSION && highver > s->version) { if (s->version == TLS1_2_VERSION && highver > s->version) {
if (memcmp(tls12downgrade, if (memcmp(tls12downgrade,
@ -1941,7 +1940,6 @@ int ssl_choose_client_version(SSL *s, int version, RAW_EXTENSION *extensions)
return 0; return 0;
} }
} }
#endif
s->method = method; s->method = method;
return 1; return 1;

4
test/recipes/70-test_tls13downgrade.t
View file

@ -26,10 +26,6 @@ plan skip_all => "$test_name needs the sock feature enabled"
plan skip_all => "$test_name needs TLS1.3 and TLS1.2 enabled" plan skip_all => "$test_name needs TLS1.3 and TLS1.2 enabled"
if disabled("tls1_3") || disabled("tls1_2"); if disabled("tls1_3") || disabled("tls1_2");
# TODO(TLS1.3): Enable this when TLSv1.3 comes out of draft
plan skip_all => "$test_name not run in pre TLSv1.3 RFC implementation"
if disabled("tls13downgrade");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(