diff options
| author | Marcus Arendt <[email protected]> | 2014-06-04 11:50:32 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-06-04 11:50:32 +0200 |
| commit | b0bfcd4ee5571b0d15c9539cf266f1903f25527c (patch) | |
| tree | 8172b1f8a82143eddf88b311580e818cafd34e56 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 48327e7133e92cd609b733a30fdd3125f506c52c (diff) | |
| parent | 596f214fc0275df8b19a8b36bb7b71e6affc6bd5 (diff) | |
| download | otp-b0bfcd4ee5571b0d15c9539cf266f1903f25527c.tar.gz otp-b0bfcd4ee5571b0d15c9539cf266f1903f25527c.tar.bz2 otp-b0bfcd4ee5571b0d15c9539cf266f1903f25527c.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 0875a460b2..150b5037d7 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -872,14 +872,21 @@ psk_suites() -> {psk, '3des_ede_cbc', sha}, {psk, aes_128_cbc, sha}, {psk, aes_256_cbc, sha}, + {psk, aes_128_cbc, sha256}, + {psk, aes_256_cbc, sha384}, {dhe_psk, rc4_128, sha}, {dhe_psk, '3des_ede_cbc', sha}, {dhe_psk, aes_128_cbc, sha}, {dhe_psk, aes_256_cbc, sha}, + {dhe_psk, aes_128_cbc, sha256}, + {dhe_psk, aes_256_cbc, sha384}, {rsa_psk, rc4_128, sha}, {rsa_psk, '3des_ede_cbc', sha}, {rsa_psk, aes_128_cbc, sha}, - {rsa_psk, aes_256_cbc, sha}], + {rsa_psk, aes_256_cbc, sha}, + {rsa_psk, aes_128_cbc, sha256}, + {rsa_psk, aes_256_cbc, sha384} +], ssl_cipher:filter_suites(Suites). psk_anon_suites() -> @@ -1119,3 +1126,13 @@ version_flag('tlsv1.2') -> " -tls1_2 "; version_flag(sslv3) -> " -ssl3 ". + +filter_suites(Ciphers0) -> + Version = tls_record:highest_protocol_version([]), + Supported0 = ssl_cipher:suites(Version) + ++ ssl_cipher:anonymous_suites() + ++ ssl_cipher:psk_suites(Version) + ++ ssl_cipher:srp_suites(), + Supported1 = ssl_cipher:filter_suites(Supported0), + Supported2 = [ssl:suite_definition(S) || S <- Supported1], + [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported2)]. |