diff options
| author | Marcus Arendt <[email protected]> | 2014-06-04 11:49:49 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-06-04 11:49:49 +0200 |
| commit | d0893c4c5532116d5b5cb360b5ed3861fb7b25a1 (patch) | |
| tree | 005287c41f05cb092917d9bc68b38d1b22c21cbf /lib/ssl/test/ssl_test_lib.erl | |
| parent | e22e19a9dcf3e125f29ebd5ac24c3cc5c8856895 (diff) | |
| parent | f96eaf5ff2f31ea69abd3a8116463e7633ce1f95 (diff) | |
| download | otp-d0893c4c5532116d5b5cb360b5ed3861fb7b25a1.tar.gz otp-d0893c4c5532116d5b5cb360b5ed3861fb7b25a1.tar.bz2 otp-d0893c4c5532116d5b5cb360b5ed3861fb7b25a1.zip | |
Merge branch 'RoadRunnr/ssl/fix-tests' into maint
* RoadRunnr/ssl/fix-tests:
SSL: fix OpenSSL known renegotiation bug detection
SSL: in tests, filter ssl client ciphers for version compatibility
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)]. |