diff options
| author | Erlang/OTP <[email protected]> | 2016-05-03 10:10:54 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-05-03 10:10:54 +0200 |
| commit | 49d86a43c207f4825f7242f34a7cc8d3584993a7 (patch) | |
| tree | e07c3cd02b9bf8181e9ad4d1c0deade2dff71376 /lib/ssl/test | |
| parent | f8ff2711258e4b30f9a984dfc27fd66cffe26b5f (diff) | |
| parent | 7a3abea5ed893338e5691f87a782a0320e5ce270 (diff) | |
| download | otp-49d86a43c207f4825f7242f34a7cc8d3584993a7.tar.gz otp-49d86a43c207f4825f7242f34a7cc8d3584993a7.tar.bz2 otp-49d86a43c207f4825f7242f34a7cc8d3584993a7.zip | |
Merge branch 'ingela/ssl/maint/algo-fixes/OTP-13525' into maint-18
* ingela/ssl/maint/algo-fixes/OTP-13525:
ssl: Correct guard expression
ssl: Correct cipher suites conversion
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 11 |
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 585975c64c..89cdd40b4c 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() -> @@ -762,6 +763,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"}]. |