aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_test_lib.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-18 14:04:41 +0100
committerIngela Anderton Andin <[email protected]>2018-01-22 11:08:31 +0100
commit3390468cee84f50b8b553e678608efce6da145ce (patch)
tree4d2cc94c3ae4a65efff52d2bbe0fbef324a30438 /lib/ssl/test/ssl_test_lib.erl
parent0841f405cdce1392a4d8975618c4e0895eb8a6b7 (diff)
downloadotp-3390468cee84f50b8b553e678608efce6da145ce.tar.gz
otp-3390468cee84f50b8b553e678608efce6da145ce.tar.bz2
otp-3390468cee84f50b8b553e678608efce6da145ce.zip
ssl: Remove chacha ciphers form default for now
We have discovered interoperability problems, ERL-538, that we believe needs to be solved in crypto.
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
-rw-r--r--lib/ssl/test/ssl_test_lib.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index e74529b455..94d10b2f9b 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1068,6 +1068,10 @@ srp_dss_suites() ->
S <- [{srp_dss, '3des_ede_cbc', sha},
{srp_dss, aes_128_cbc, sha},
{srp_dss, aes_256_cbc, sha}]])].
+
+chacha_suites(Version) ->
+ [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:filter_suites(ssl_cipher:chacha_suites(Version))].
+
rc4_suites(Version) ->
[ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:filter_suites(ssl_cipher:rc4_suites(Version))].