diff options
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 30f8f60156..21797bee08 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -115,14 +115,14 @@ special_init(ssl2_erlang_server_openssl_client, Config) -> check_sane_openssl_sslv2(Config); special_init(TestCase, Config) - when TestCase == erlang_client_openssl_server_npn_negotiation; - TestCase == erlang_server_openssl_client_npn_negotiation; - TestCase == erlang_server_openssl_client_npn_negotiation_and_renegotiate; - TestCase == erlang_client_openssl_server_npn_negotiation_and_renegotiate; - TestCase == erlang_server_openssl_client_npn_negotiate_only_on_server; - TestCase == erlang_server_openssl_client_npn_negotiate_only_on_client; - TestCase == erlang_client_openssl_server_npn_negotiate_only_on_client; - TestCase == erlang_client_openssl_server_npn_negotiate_only_on_server -> + when TestCase == erlang_client_openssl_server_npn; + TestCase == erlang_server_openssl_client_npn; + TestCase == erlang_server_openssl_client_npn_renegotiate; + TestCase == erlang_client_openssl_server_npn_renegotiate; + TestCase == erlang_server_openssl_client_npn_only_server; + TestCase == erlang_server_openssl_client_npn_only_client; + TestCase == erlang_client_openssl_server_npn_only_client; + TestCase == erlang_client_openssl_server_npn_only_server -> check_openssl_npn_support(Config); special_init(_, Config) -> @@ -190,8 +190,8 @@ all_versions_tests() -> erlang_server_openssl_client_dsa_cert, erlang_server_openssl_client_reuse_session, erlang_client_openssl_server_renegotiate, - erlang_client_openssl_server_no_wrap_sequence_number, - erlang_server_openssl_client_no_wrap_sequence_number, + erlang_client_openssl_server_nowrap_seqnum, + erlang_server_openssl_client_nowrap_seqnum, erlang_client_openssl_server_no_server_ca_cert, erlang_client_openssl_server_client_cert, erlang_server_openssl_client_client_cert, @@ -202,14 +202,14 @@ all_versions_tests() -> ssl2_erlang_server_openssl_client]. npn_tests() -> - [erlang_client_openssl_server_npn_negotiation, - erlang_server_openssl_client_npn_negotiation, - erlang_server_openssl_client_npn_negotiation_and_renegotiate, - erlang_client_openssl_server_npn_negotiation_and_renegotiate, - erlang_server_openssl_client_npn_negotiate_only_on_client, - erlang_server_openssl_client_npn_negotiate_only_on_server, - erlang_client_openssl_server_npn_negotiate_only_on_client, - erlang_client_openssl_server_npn_negotiate_only_on_server]. + [erlang_client_openssl_server_npn, + erlang_server_openssl_client_npn, + erlang_server_openssl_client_npn_renegotiate, + erlang_client_openssl_server_npn_renegotiate, + erlang_server_openssl_client_npn_only_client, + erlang_server_openssl_client_npn_only_server, + erlang_client_openssl_server_npn_only_client, + erlang_client_openssl_server_npn_only_server]. init_per_group(GroupName, Config) -> case ssl_test_lib:is_tls_version(GroupName) of @@ -565,14 +565,14 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) -> %%-------------------------------------------------------------------- -erlang_client_openssl_server_no_wrap_sequence_number(doc) -> +erlang_client_openssl_server_nowrap_seqnum(doc) -> ["Test that erlang client will renegotiate session when", "max sequence number celing is about to be reached. Although" "in the testcase we use the test option renegotiate_at" " to lower treashold substantially."]; -erlang_client_openssl_server_no_wrap_sequence_number(suite) -> +erlang_client_openssl_server_nowrap_seqnum(suite) -> []; -erlang_client_openssl_server_no_wrap_sequence_number(Config) when is_list(Config) -> +erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) -> process_flag(trap_exit, true), ServerOpts = ?config(server_opts, Config), ClientOpts = ?config(client_opts, Config), @@ -611,15 +611,15 @@ erlang_client_openssl_server_no_wrap_sequence_number(Config) when is_list(Config process_flag(trap_exit, false), ok. %%-------------------------------------------------------------------- -erlang_server_openssl_client_no_wrap_sequence_number(doc) -> +erlang_server_openssl_client_nowrap_seqnum(doc) -> ["Test that erlang client will renegotiate session when", "max sequence number celing is about to be reached. Although" "in the testcase we use the test option renegotiate_at" " to lower treashold substantially."]; -erlang_server_openssl_client_no_wrap_sequence_number(suite) -> +erlang_server_openssl_client_nowrap_seqnum(suite) -> []; -erlang_server_openssl_client_no_wrap_sequence_number(Config) when is_list(Config) -> +erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) -> process_flag(trap_exit, true), ServerOpts = ?config(server_opts, Config), @@ -1090,11 +1090,11 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) -> ok. %%-------------------------------------------------------------------- -erlang_client_openssl_server_npn_negotiation(doc) -> +erlang_client_openssl_server_npn(doc) -> ["Test erlang client with openssl server doing npn negotiation"]; -erlang_client_openssl_server_npn_negotiation(suite) -> +erlang_client_openssl_server_npn(suite) -> []; -erlang_client_openssl_server_npn_negotiation(Config) when is_list(Config) -> +erlang_client_openssl_server_npn(Config) when is_list(Config) -> Data = "From openssl to erlang", start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, fun(Client, OpensslPort) -> port_command(OpensslPort, Data), @@ -1106,11 +1106,11 @@ erlang_client_openssl_server_npn_negotiation(Config) when is_list(Config) -> %%-------------------------------------------------------------------- -erlang_client_openssl_server_npn_negotiation_and_renegotiate(doc) -> +erlang_client_openssl_server_npn_renegotiate(doc) -> ["Test erlang client with openssl server doing npn negotiation and renegotiate"]; -erlang_client_openssl_server_npn_negotiation_and_renegotiate(suite) -> +erlang_client_openssl_server_npn_renegotiate(suite) -> []; -erlang_client_openssl_server_npn_negotiation_and_renegotiate(Config) when is_list(Config) -> +erlang_client_openssl_server_npn_renegotiate(Config) when is_list(Config) -> Data = "From openssl to erlang", start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, fun(Client, OpensslPort) -> port_command(OpensslPort, ?OPENSSL_RENEGOTIATE), @@ -1124,11 +1124,11 @@ erlang_client_openssl_server_npn_negotiation_and_renegotiate(Config) when is_lis %%-------------------------------------------------------------------------- -erlang_server_openssl_client_npn_negotiation(doc) -> +erlang_server_openssl_client_npn(doc) -> ["Test erlang server with openssl client and npn negotiation"]; -erlang_server_openssl_client_npn_negotiation(suite) -> +erlang_server_openssl_client_npn(suite) -> []; -erlang_server_openssl_client_npn_negotiation(Config) when is_list(Config) -> +erlang_server_openssl_client_npn(Config) when is_list(Config) -> Data = "From openssl to erlang", start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, fun(Server, OpensslPort) -> @@ -1139,11 +1139,11 @@ erlang_server_openssl_client_npn_negotiation(Config) when is_list(Config) -> %%-------------------------------------------------------------------------- -erlang_server_openssl_client_npn_negotiation_and_renegotiate(doc) -> +erlang_server_openssl_client_npn_renegotiate(doc) -> ["Test erlang server with openssl client and npn negotiation with renegotiation"]; -erlang_server_openssl_client_npn_negotiation_and_renegotiate(suite) -> +erlang_server_openssl_client_npn_renegotiate(suite) -> []; -erlang_server_openssl_client_npn_negotiation_and_renegotiate(Config) when is_list(Config) -> +erlang_server_openssl_client_npn_renegotiate(Config) when is_list(Config) -> Data = "From openssl to erlang", start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, fun(Server, OpensslPort) -> port_command(OpensslPort, ?OPENSSL_RENEGOTIATE), @@ -1154,7 +1154,7 @@ erlang_server_openssl_client_npn_negotiation_and_renegotiate(Config) when is_lis ok. %%-------------------------------------------------------------------------- -erlang_client_openssl_server_npn_negotiate_only_on_server(Config) when is_list(Config) -> +erlang_client_openssl_server_npn_only_server(Config) when is_list(Config) -> Data = "From openssl to erlang", start_erlang_client_and_openssl_server_with_opts(Config, [], "-nextprotoneg spdy/2", Data, fun(Server, OpensslPort) -> port_command(OpensslPort, Data), @@ -1164,7 +1164,7 @@ erlang_client_openssl_server_npn_negotiate_only_on_server(Config) when is_list(C %%-------------------------------------------------------------------------- -erlang_client_openssl_server_npn_negotiate_only_on_client(Config) when is_list(Config) -> +erlang_client_openssl_server_npn_only_client(Config) when is_list(Config) -> Data = "From openssl to erlang", start_erlang_client_and_openssl_server_with_opts(Config, [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}}], "", Data, fun(Server, OpensslPort) -> port_command(OpensslPort, Data), @@ -1173,7 +1173,7 @@ erlang_client_openssl_server_npn_negotiate_only_on_client(Config) when is_list(C ok. %%-------------------------------------------------------------------------- -erlang_server_openssl_client_npn_negotiate_only_on_server(Config) when is_list(Config) -> +erlang_server_openssl_client_npn_only_server(Config) when is_list(Config) -> Data = "From openssl to erlang", start_erlang_server_and_openssl_client_with_opts(Config, [{next_protocols_advertised, [<<"spdy/2">>]}], "", Data, fun(Server, OpensslPort) -> port_command(OpensslPort, Data), @@ -1181,7 +1181,7 @@ erlang_server_openssl_client_npn_negotiate_only_on_server(Config) when is_list(C end), ok. -erlang_server_openssl_client_npn_negotiate_only_on_client(Config) when is_list(Config) -> +erlang_server_openssl_client_npn_only_client(Config) when is_list(Config) -> Data = "From openssl to erlang", start_erlang_server_and_openssl_client_with_opts(Config, [], "-nextprotoneg spdy/2", Data, fun(Server, OpensslPort) -> port_command(OpensslPort, Data), |