diff options
author | Ingela Anderton Andin <[email protected]> | 2014-01-24 09:51:30 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-01-24 09:51:30 +0100 |
commit | ff670ef98fa2d859c7fb4737ef836890fdf91d68 (patch) | |
tree | f1083dafe430e7b6c415a46a035b76b0357b8b37 /lib/ssl/test | |
parent | d64ed391174ff2aa14dadea6fa8e7c43265d7a15 (diff) | |
parent | 2fb9880e337230f80968c0f89ff8546eec4c6478 (diff) | |
download | otp-ff670ef98fa2d859c7fb4737ef836890fdf91d68.tar.gz otp-ff670ef98fa2d859c7fb4737ef836890fdf91d68.tar.bz2 otp-ff670ef98fa2d859c7fb4737ef836890fdf91d68.zip |
Merge branch 'ia/ssl/secure-renegotiate/OTP-11595' into maint
* ia/ssl/secure-renegotiate/OTP-11595:
ssl: Incorrect inputed cipherlist lead server to think that the client did not support secure renegotiation
Diffstat (limited to 'lib/ssl/test')
-rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index bc7e68a86c..1006b23a30 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -144,6 +144,7 @@ session_tests() -> renegotiate_tests() -> [client_renegotiate, server_renegotiate, + client_secure_renegotiate, client_renegotiate_reused_session, server_renegotiate_reused_session, client_no_wrap_sequence_number, @@ -1979,6 +1980,37 @@ client_renegotiate(Config) when is_list(Config) -> ssl_test_lib:close(Client). %%-------------------------------------------------------------------- +client_secure_renegotiate() -> + [{doc,"Test ssl:renegotiate/1 on client."}]. +client_secure_renegotiate(Config) when is_list(Config) -> + ServerOpts = ?config(server_opts, Config), + ClientOpts = ?config(client_opts, Config), + + {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), + + Data = "From erlang to erlang", + + Server = + ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, + {from, self()}, + {mfa, {?MODULE, erlang_ssl_receive, [Data]}}, + {options, [{secure_renegotiate, true} | ServerOpts]}]), + Port = ssl_test_lib:inet_port(Server), + + Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, + {host, Hostname}, + {from, self()}, + {mfa, {?MODULE, + renegotiate, [Data]}}, + {options, [{reuse_sessions, false}, + {secure_renegotiate, true}| ClientOpts]}]), + + ssl_test_lib:check_result(Client, ok, Server, ok), + ssl_test_lib:close(Server), + ssl_test_lib:close(Client). + + +%%-------------------------------------------------------------------- server_renegotiate() -> [{doc,"Test ssl:renegotiate/1 on server."}]. server_renegotiate(Config) when is_list(Config) -> |