From 93fa7e8dbed49ff6007f49c7ed36a87cd1df693e Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 19 Jan 2017 16:49:57 +0000 Subject: [PATCH] Re-enable test_ssl_new resumption tests for TLSv1.3 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2259) --- test/ssl-tests/protocol_version.pm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/test/ssl-tests/protocol_version.pm b/test/ssl-tests/protocol_version.pm index a41ffc4b7a..cc39c757c4 100644 --- a/test/ssl-tests/protocol_version.pm +++ b/test/ssl-tests/protocol_version.pm @@ -135,22 +135,6 @@ sub generate_resumption_tests { # Don't write the redundant "Method = TLS" into the configuration. undef $method if !$dtls; - - #TODO(TLS1.3): This is temporary code while we do not have support for - # TLS1.3 resumption. We recalculate min_tls_enabled and - # max_tls_enabled, ignoring TLS1.3 - foreach my $i (0..($#tls_protocols - 1)) { - if (!$is_tls_disabled[$i]) { - $min_tls_enabled = $i; - last; - } - } - foreach my $i (0..($#tls_protocols - 1)) { - if (!$is_tls_disabled[$i]) { - $max_tls_enabled = $i; - } - } - my @protocols = $dtls ? @dtls_protocols : @tls_protocols; my $min_enabled = $dtls ? $min_dtls_enabled : $min_tls_enabled; my $max_enabled = $dtls ? $max_dtls_enabled : $max_tls_enabled;