Re-enable test_ssl_new resumption tests for TLSv1.3
authorMatt Caswell <matt@openssl.org>
Thu, 19 Jan 2017 16:49:57 +0000 (16:49 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 30 Jan 2017 10:18:22 +0000 (10:18 +0000)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)

test/ssl-tests/protocol_version.pm

index a41ffc4..cc39c75 100644 (file)
@@ -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;