diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-04 10:35:57 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-04 10:35:57 +0200 |
| commit | 3a7e0e88fa8b787df328e32fac7566f67fda9c54 (patch) | |
| tree | 06bb713e77c1adcfbc021887903cc04251235f18 /lib/ssl/test | |
| parent | 0e6516b55dfdb750a7d27cbb5d45e76f2c2e755b (diff) | |
| parent | 6fd795f56297141507e06254a495a06f40c88521 (diff) | |
| download | otp-3a7e0e88fa8b787df328e32fac7566f67fda9c54.tar.gz otp-3a7e0e88fa8b787df328e32fac7566f67fda9c54.tar.bz2 otp-3a7e0e88fa8b787df328e32fac7566f67fda9c54.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 804fb1c9c0..0875a460b2 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -883,14 +883,16 @@ psk_suites() -> ssl_cipher:filter_suites(Suites). psk_anon_suites() -> - [{psk, rc4_128, sha}, - {psk, '3des_ede_cbc', sha}, - {psk, aes_128_cbc, sha}, - {psk, aes_256_cbc, sha}, - {dhe_psk, rc4_128, sha}, - {dhe_psk, '3des_ede_cbc', sha}, - {dhe_psk, aes_128_cbc, sha}, - {dhe_psk, aes_256_cbc, sha}]. + Suites = + [{psk, rc4_128, sha}, + {psk, '3des_ede_cbc', sha}, + {psk, aes_128_cbc, sha}, + {psk, aes_256_cbc, sha}, + {dhe_psk, rc4_128, sha}, + {dhe_psk, '3des_ede_cbc', sha}, + {dhe_psk, aes_128_cbc, sha}, + {dhe_psk, aes_256_cbc, sha}], + ssl_cipher:filter_suites(Suites). srp_suites() -> Suites = @@ -903,9 +905,11 @@ srp_suites() -> ssl_cipher:filter_suites(Suites). srp_anon_suites() -> - [{srp_anon, '3des_ede_cbc', sha}, - {srp_anon, aes_128_cbc, sha}, - {srp_anon, aes_256_cbc, sha}]. + Suites = + [{srp_anon, '3des_ede_cbc', sha}, + {srp_anon, aes_128_cbc, sha}, + {srp_anon, aes_256_cbc, sha}], + ssl_cipher:filter_suites(Suites). srp_dss_suites() -> Suites = |