aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_basic_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-02 15:19:01 +0200
committerIngela Anderton Andin <[email protected]>2016-05-02 15:19:01 +0200
commit4c8eef579cfe23642c05f6aad0febee4b0d1d6f2 (patch)
tree4acdfeadebde5e88d8ecbf30a8b53b85ea12a622 /lib/ssl/test/ssl_basic_SUITE.erl
parent41d5dacc152e7f4f4f3edf44c39d0c61d5dd48d4 (diff)
parentd7d47fa17c7a61a44fc06ffad34b327ef5d0b9f9 (diff)
downloadotp-4c8eef579cfe23642c05f6aad0febee4b0d1d6f2.tar.gz
otp-4c8eef579cfe23642c05f6aad0febee4b0d1d6f2.tar.bz2
otp-4c8eef579cfe23642c05f6aad0febee4b0d1d6f2.zip
Merge branch 'ingela/ssl/cipher_suites'
* ingela/ssl/cipher_suites: ssl: Correct cipher suites conversion
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 0c3c7aa39b..3fea38078f 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -88,7 +88,8 @@ basic_tests() ->
connect_dist,
clear_pem_cache,
defaults,
- fallback
+ fallback,
+ cipher_format
].
options_tests() ->
@@ -764,6 +765,14 @@ fallback(Config) when is_list(Config) ->
Client, {error,{tls_alert,"inappropriate fallback"}}).
%%--------------------------------------------------------------------
+cipher_format() ->
+ [{doc, "Test that cipher conversion from tuples to binarys works"}].
+cipher_format(Config) when is_list(Config) ->
+ {ok, Socket} = ssl:listen(0, [{ciphers, ssl:cipher_suites()}]),
+ ssl:close(Socket).
+
+%%--------------------------------------------------------------------
+
peername() ->
[{doc,"Test API function peername/1"}].