diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-03-04 10:52:44 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-04 10:52:44 +0100 |
| commit | 477824259524f918ad94d36fb0d3b746e4b12111 (patch) | |
| tree | f3332642219137d663f7d713996a4ddf4322688a /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | cbf9cc25d05d8d3c87678fd8c6f437abbc9eb6b2 (diff) | |
| parent | 9358afed5afdf9da8a19e325e32c1be4b723c705 (diff) | |
| download | otp-477824259524f918ad94d36fb0d3b746e4b12111.tar.gz otp-477824259524f918ad94d36fb0d3b746e4b12111.tar.bz2 otp-477824259524f918ad94d36fb0d3b746e4b12111.zip | |
Merge branch 'ia/ssl/proplist-input-check/OTP-11760'
* ia/ssl/proplist-input-check/OTP-11760:
ssl: Add input sanity check
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 523760aba6..64a93440c7 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -96,6 +96,7 @@ basic_tests() -> options_tests() -> [der_input, misc_ssl_options, + ssl_options_not_proplist, socket_options, invalid_inet_get_option, invalid_inet_get_option_not_list, @@ -990,7 +991,7 @@ misc_ssl_options(Config) when is_list(Config) -> ServerOpts = ?config(server_opts, Config), {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), - %% Chek that ssl options not tested elsewhere are filtered away e.i. not passed to inet. + %% Check that ssl options not tested elsewhere are filtered away e.i. not passed to inet. TestOpts = [{depth, 1}, {key, undefined}, {password, []}, @@ -1018,6 +1019,17 @@ misc_ssl_options(Config) when is_list(Config) -> ssl_test_lib:close(Client). %%-------------------------------------------------------------------- +ssl_options_not_proplist() -> + [{doc,"Test what happens if an option is not a key value tuple"}]. + +ssl_options_not_proplist(Config) when is_list(Config) -> + BadOption = {client_preferred_next_protocols, + client, [<<"spdy/3">>,<<"http/1.1">>], <<"http/1.1">>}, + {option_not_a_key_value_tuple, BadOption} = + ssl:connect("twitter.com", 443, [binary, {active, false}, + BadOption]). + +%%-------------------------------------------------------------------- versions() -> [{doc,"Test API function versions/0"}]. |