The branch master has been updated
via 2af22b7dd56e5464984aeaf9c025674deef3aada (commit)
from 1595ca029cbc1f76971843d89ed06b6ffbf17c84 (commit)
- Log -----------------------------------------------------------------
commit 2af22b7dd56e5464984aeaf9c025674deef3aada
Author: Matt Caswell <[email protected]>
Date: Mon Apr 11 13:39:45 2016 +0100
Fix the no-tls option
The no-tls option was failing in the tests. This fixes it.
Reviewed-by: Richard Levitte <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
test/recipes/80-test_ssl_old.t | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 67564e7..8138570 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -767,21 +767,24 @@ sub testssl {
subtest 'TLS session reuse' => sub {
plan tests => 12;
- ok(run(test([@ssltest, "-server_sess_out", $server_sess,
"-client_sess_out", $client_sess])));
- ok(run(test([@ssltest, "-server_sess_in", $server_sess,
"-client_sess_in", $client_sess, "-should_reuse", "1", "-should_negotiate",
"tls1.2"])));
- ok(run(test([@ssltest, "-server_max_proto", "tls1.1",
"-server_sess_in", $server_sess, "-client_sess_in", $client_sess,
"-should_reuse", "0", "-should_negotiate", "tls1.1"])));
-
- ok(run(test([@ssltest, "-server_max_proto", "tls1.1",
"-server_sess_out", $server_sess, "-client_sess_out", $client_sess])));
- ok(run(test([@ssltest, "-server_max_proto", "tls1.1",
"-server_sess_in", $server_sess, "-client_sess_in", $client_sess,
"-should_reuse", "1", "-should_negotiate", "tls1.1"])));
- ok(run(test([@ssltest, "-server_sess_in", $server_sess,
"-client_sess_in", $client_sess, "-should_reuse", "0", "-should_negotiate",
"tls1.2"])));
-
- ok(run(test([@ssltest, "-no_ticket", "-server_sess_out", $server_sess,
"-client_sess_out", $client_sess])));
- ok(run(test([@ssltest, "-no_ticket", "-server_sess_in", $server_sess,
"-client_sess_in", $client_sess, "-should_reuse", "1", "-should_negotiate",
"tls1.2"])));
- ok(run(test([@ssltest, "-no_ticket", "-server_max_proto", "tls1.1",
"-server_sess_in", $server_sess, "-client_sess_in", $client_sess,
"-should_reuse", "0", "-should_negotiate", "tls1.1"])));
-
- ok(run(test([@ssltest, "-no_ticket", "-server_max_proto", "tls1.1",
"-server_sess_out", $server_sess, "-client_sess_out", $client_sess])));
- ok(run(test([@ssltest, "-no_ticket", "-server_max_proto", "tls1.1",
"-server_sess_in", $server_sess, "-client_sess_in", $client_sess,
"-should_reuse", "1", "-should_negotiate", "tls1.1"])));
- ok(run(test([@ssltest, "-no_ticket", "-server_sess_in", $server_sess,
"-client_sess_in", $client_sess, "-should_reuse", "0", "-should_negotiate",
"tls1.2"])));
+ SKIP: {
+ skip "TLS disabled", 12 if $no_anytls;
+ ok(run(test([@ssltest, "-server_sess_out", $server_sess,
"-client_sess_out", $client_sess])));
+ ok(run(test([@ssltest, "-server_sess_in", $server_sess,
"-client_sess_in", $client_sess, "-should_reuse", "1", "-should_negotiate",
"tls1.2"])));
+ ok(run(test([@ssltest, "-server_max_proto", "tls1.1",
"-server_sess_in", $server_sess, "-client_sess_in", $client_sess,
"-should_reuse", "0", "-should_negotiate", "tls1.1"])));
+
+ ok(run(test([@ssltest, "-server_max_proto", "tls1.1",
"-server_sess_out", $server_sess, "-client_sess_out", $client_sess])));
+ ok(run(test([@ssltest, "-server_max_proto", "tls1.1",
"-server_sess_in", $server_sess, "-client_sess_in", $client_sess,
"-should_reuse", "1", "-should_negotiate", "tls1.1"])));
+ ok(run(test([@ssltest, "-server_sess_in", $server_sess,
"-client_sess_in", $client_sess, "-should_reuse", "0", "-should_negotiate",
"tls1.2"])));
+
+ ok(run(test([@ssltest, "-no_ticket", "-server_sess_out",
$server_sess, "-client_sess_out", $client_sess])));
+ ok(run(test([@ssltest, "-no_ticket", "-server_sess_in",
$server_sess, "-client_sess_in", $client_sess, "-should_reuse", "1",
"-should_negotiate", "tls1.2"])));
+ ok(run(test([@ssltest, "-no_ticket", "-server_max_proto",
"tls1.1", "-server_sess_in", $server_sess, "-client_sess_in", $client_sess,
"-should_reuse", "0", "-should_negotiate", "tls1.1"])));
+
+ ok(run(test([@ssltest, "-no_ticket", "-server_max_proto",
"tls1.1", "-server_sess_out", $server_sess, "-client_sess_out",
$client_sess])));
+ ok(run(test([@ssltest, "-no_ticket", "-server_max_proto",
"tls1.1", "-server_sess_in", $server_sess, "-client_sess_in", $client_sess,
"-should_reuse", "1", "-should_negotiate", "tls1.1"])));
+ ok(run(test([@ssltest, "-no_ticket", "-server_sess_in",
$server_sess, "-client_sess_in", $client_sess, "-should_reuse", "0",
"-should_negotiate", "tls1.2"])));
+ }
};
subtest 'DTLS session reuse' => sub {
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
