diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-01-22 10:41:58 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-01-22 10:41:58 +0100 |
| commit | bb64f19a947568a56f719d609fa5915f703a32fb (patch) | |
| tree | 38af53107ac5896a46cfce5de8dc65e73b2ab0e0 /lib/ssl/test | |
| parent | e6432a0c60a488c7750fcdab3a4f2821c0f35ec8 (diff) | |
| parent | 22236da53c12d11eee7c103e3484aaa5ea8030b5 (diff) | |
| download | otp-bb64f19a947568a56f719d609fa5915f703a32fb.tar.gz otp-bb64f19a947568a56f719d609fa5915f703a32fb.tar.bz2 otp-bb64f19a947568a56f719d609fa5915f703a32fb.zip | |
Merge branch 'ingela/ssl/remove-3des-from-default/OTP-14768'
* ingela/ssl/remove-3des-from-default/OTP-14768:
ssl: Remove 3DES cipher suites from default
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index dc602910a1..9bbd767a4e 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -2451,14 +2451,15 @@ rc4_ecdsa_cipher_suites(Config) when is_list(Config) -> des_rsa_cipher_suites()-> [{doc, "Test the des_rsa ciphersuites"}]. des_rsa_cipher_suites(Config) when is_list(Config) -> - Ciphers = ssl_test_lib:des_suites(Config), + NVersion = tls_record:highest_protocol_version([]), + Ciphers = [S || {rsa,_,_} = S <- ssl_test_lib:des_suites(NVersion)], run_suites(Ciphers, Config, des_rsa). %------------------------------------------------------------------- des_ecdh_rsa_cipher_suites()-> [{doc, "Test ECDH rsa signed ciphersuites"}]. des_ecdh_rsa_cipher_suites(Config) when is_list(Config) -> NVersion = ssl_test_lib:protocol_version(Config, tuple), - Ciphers = ssl_test_lib:des_suites(NVersion), + Ciphers = [S || {dhe_rsa,_,_} = S <- ssl_test_lib:des_suites(NVersion)], run_suites(Ciphers, Config, des_dhe_rsa). %%-------------------------------------------------------------------- |