diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-07-04 20:16:14 +0200 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-07-19 14:17:48 +0200 |
commit | ce2cdac2787da32bcde210c7d6acdcbe41b1cd40 (patch) | |
tree | aa513a318f435fd51c82df0f83aa09219d55e1cc /test/recipes | |
parent | 02f730b34706150f8f40715d647cce3be5baf2ab (diff) | |
download | openssl-ce2cdac2787da32bcde210c7d6acdcbe41b1cd40.tar.gz |
SSL test framework: port NPN and ALPN tests
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/recipes')
-rw-r--r-- | test/recipes/80-test_ssl_new.t | 4 | ||||
-rw-r--r-- | test/recipes/80-test_ssl_old.t | 54 |
2 files changed, 7 insertions, 51 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 258164fcfa..56afb6463c 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -36,6 +36,7 @@ my $is_default_dtls = (!disabled("dtls1") && !disabled("dtls1_2")); my $no_tls = alldisabled(available_protocols("tls")); my $no_dtls = alldisabled(available_protocols("dtls")); +my $no_npn = disabled("nextprotoneg"); my %conf_dependent_tests = ( "02-protocol-version.conf" => !$is_default_tls, @@ -46,6 +47,7 @@ my %conf_dependent_tests = ( # Default is $no_tls but some tests have different skip conditions. my %skip = ( "05-dtls-protocol-version.conf" => $no_dtls, + "08-npn.conf" => $no_tls || $no_npn, ); foreach my $conf (@conf_files) { @@ -58,7 +60,7 @@ foreach my $conf (@conf_files) { # We hard-code the number of tests to double-check that the globbing above # finds all files as expected. -plan tests => 7; # = scalar @conf_srcs +plan tests => 9; # = scalar @conf_srcs sub test_conf { plan tests => 3; diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t index becfbae890..5228112e16 100644 --- a/test/recipes/80-test_ssl_old.t +++ b/test/recipes/80-test_ssl_old.t @@ -79,7 +79,7 @@ my $client_sess="client.ss"; # new format in ssl_test.c and add recipes to 80-test_ssl_new.t instead. plan tests => 1 # For testss - + 12 # For the first testssl + + 11 # For the first testssl ; subtest 'test_ss' => sub { @@ -529,19 +529,14 @@ sub testssl { subtest 'Next Protocol Negotiation Tests' => sub { ###################################################################### - plan tests => 7; + plan tests => 2; SKIP: { - skip "TLSv1.0 is not supported by this OpenSSL build", 7 + skip "TLSv1.0 is not supported by this OpenSSL build", 2 if $no_tls1; - skip "Next Protocol Negotiation is not supported by this OpenSSL build", 7 + skip "Next Protocol Negotiation is not supported by this OpenSSL build", 2 if disabled("nextprotoneg"); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_client"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_server"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_server_reject"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_client", "-npn_server_reject"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_client", "-npn_server"]))); ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_client", "-npn_server", "-num", "2"]))); ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_client", "-npn_server", "-num", "2", "-reuse"]))); } @@ -579,47 +574,6 @@ sub testssl { } }; - subtest 'ALPN tests' => sub { - ###################################################################### - - plan tests => 13; - - SKIP: { - skip "TLSv1.0 is not supported by this OpenSSL build", 13 - if $no_tls1; - - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_server", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "foo", "-alpn_server", "foo", "-alpn_expected", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "foo,bar", "-alpn_server", "foo", "-alpn_expected", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "bar,foo", "-alpn_server", "foo", "-alpn_expected", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "bar,foo", "-alpn_server", "foo,bar", "-alpn_expected", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "bar,foo", "-alpn_server", "bar,foo", "-alpn_expected", "bar"]))); - ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "foo,bar", "-alpn_server", "bar,foo", "-alpn_expected", "bar"]))); - - is(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "foo", "-alpn_server", "bar"])), 0, - "Testing ALPN with protocol mismatch, expecting failure"); - is(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "baz", "-alpn_server", "bar,foo"])), 0, - "Testing ALPN with protocol mismatch, expecting failure"); - - # ALPN + SNI - ok(run(test([@ssltest, "-bio_pair", - "-alpn_client", "foo,bar", "-sn_client", "alice", - "-alpn_server1", "foo,123", "-sn_server1", "alice", - "-alpn_server2", "bar,456", "-sn_server2", "bob", - "-alpn_expected", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", - "-alpn_client", "foo,bar", "-sn_client", "bob", - "-alpn_server1", "foo,123", "-sn_server1", "alice", - "-alpn_server2", "bar,456", "-sn_server2", "bob", - "-alpn_expected", "bar"]))); - ok(run(test([@ssltest, "-bio_pair", - "-alpn_client", "foo,bar", "-sn_client", "bob", - "-alpn_server2", "bar,456", "-sn_server2", "bob", - "-alpn_expected", "bar"]))); - } - }; - subtest 'SRP tests' => sub { plan tests => 4; |