aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_test_lib.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-05-18 12:13:57 +0200
committerIngela Anderton Andin <[email protected]>2018-07-10 16:21:38 +0200
commit06a3320c2358504af2a249058472e441908b2196 (patch)
tree719d8728145d9af2925017aa2951f37ecd31728d /lib/ssl/test/ssl_test_lib.erl
parent636ff07209b9f3c48dbfa75b7ca4ede02b11caab (diff)
downloadotp-06a3320c2358504af2a249058472e441908b2196.tar.gz
otp-06a3320c2358504af2a249058472e441908b2196.tar.bz2
otp-06a3320c2358504af2a249058472e441908b2196.zip
ssl: anon test should use dh or ecdh anon keyexchange
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
-rw-r--r--lib/ssl/test/ssl_test_lib.erl12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 04ee6ef1b1..11853ef6d7 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1177,8 +1177,16 @@ string_regex_filter(Str, Search) when is_list(Str) ->
string_regex_filter(_Str, _Search) ->
false.
-anonymous_suites(Version) ->
- ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],[]).
+ecdh_dh_anonymous_suites(Version) ->
+ ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],
+ [{key_exchange,
+ fun(dh_anon) ->
+ true;
+ (ecdh_anon) ->
+ true;
+ (_) ->
+ false
+ end}]).
psk_suites(Version) ->
ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:psk_suites(Version)], []).