diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-06-20 17:20:25 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-06-28 17:26:24 +0200 |
| commit | d2b23cd2b077de8507c49f632e20dfcdb653a35b (patch) | |
| tree | 3a8a980e199c680d7e296468439c6f53d05fa1a0 /test/recipes | |
| parent | 2cdce3e32f0f70470d676352410557b626bc9d01 (diff) | |
| download | openssl-d2b23cd2b077de8507c49f632e20dfcdb653a35b.tar.gz | |
SSL test framework: port SNI tests
Observe that the old tests were partly ill-defined:
setting sn_server1 but not sn_server2 in ssltest_old.c does not enable
the SNI callback.
Fix this, and also explicitly test both flavours of SNI mismatch (ignore
/ fatal alert). Tests still pass.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/recipes')
| -rw-r--r-- | test/recipes/80-test_ssl_old.t | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t index 716f23b38f..becfbae890 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 - + 13 # For the first testssl + + 12 # For the first testssl ; subtest 'test_ss' => sub { @@ -579,25 +579,6 @@ sub testssl { } }; - subtest 'SNI tests' => sub { - - plan tests => 7; - - SKIP: { - skip "TLSv1.x is not supported by this OpenSSL build", 7 - if $no_tls1 && $no_tls1_1 && $no_tls1_2; - - ok(run(test([@ssltest, "-bio_pair", "-sn_client", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", "-sn_server1", "foo"]))); - ok(run(test([@ssltest, "-bio_pair", "-sn_client", "foo", "-sn_server1", "foo", "-sn_expect1"]))); - ok(run(test([@ssltest, "-bio_pair", "-sn_client", "foo", "-sn_server1", "bar", "-sn_expect1"]))); - ok(run(test([@ssltest, "-bio_pair", "-sn_client", "foo", "-sn_server1", "foo", "-sn_server2", "bar", "-sn_expect1"]))); - ok(run(test([@ssltest, "-bio_pair", "-sn_client", "bar", "-sn_server1", "foo", "-sn_server2", "bar", "-sn_expect2"]))); - # Negative test - make sure it doesn't crash, and doesn't switch contexts - ok(run(test([@ssltest, "-bio_pair", "-sn_client", "foobar", "-sn_server1", "foo", "-sn_server2", "bar", "-sn_expect1"]))); - } - }; - subtest 'ALPN tests' => sub { ###################################################################### |