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-05-21 09:11:12 +0200
commit8aa37e9a7a086076368b26ca9517dfe6bb86732b (patch)
tree84f1497ae151770d08cda8c99b7249b603166c53 /lib/ssl/test/ssl_test_lib.erl
parent570c1631d35d5f08c3fa7a4074fd4421eb61f871 (diff)
downloadotp-8aa37e9a7a086076368b26ca9517dfe6bb86732b.tar.gz
otp-8aa37e9a7a086076368b26ca9517dfe6bb86732b.tar.bz2
otp-8aa37e9a7a086076368b26ca9517dfe6bb86732b.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 8c27571d64..1e88ca15de 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1264,8 +1264,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)], []).