diff options
| author | Todd Short <tshort@akamai.com> | 2016-03-12 09:14:05 -0500 |
|---|---|---|
| committer | Todd Short <tshort@akamai.com> | 2016-03-20 21:09:32 -0400 |
| commit | 0351baae36afe1182237e0bd88ec9d13f5c97f32 (patch) | |
| tree | e0eb86c7f9558a24e5a7f6cdc7a3c5aac29cea1e /test | |
| parent | 89ff989d01314a6104e5063edfce316c8325f339 (diff) | |
Fix ALPN - more fixes
* Clear proposed, along with selected, before looking at ClientHello
* Add test case for above
* Clear NPN seen after selecting ALPN on server
* Minor documentation updates
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_ssl.t | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t index ba57695b22..da32fac6c7 100644 --- a/test/recipes/80-test_ssl.t +++ b/test/recipes/80-test_ssl.t @@ -627,10 +627,10 @@ sub testssl { subtest 'ALPN tests' => sub { ###################################################################### - plan tests => 12; + plan tests => 13; SKIP: { - skip "TLSv1.0 is not supported by this OpenSSL build", 12 + skip "TLSv1.0 is not supported by this OpenSSL build", 13 if $no_tls1; ok(run(test([@ssltest, "-bio_pair", "-tls1", "-alpn_client", "foo"]))); @@ -658,6 +658,10 @@ sub testssl { "-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"]))); } }; |