diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-30 15:16:15 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-30 15:16:15 +0200 |
| commit | 7755c254032c28fb5ad3e7577031c2ef3d7a7858 (patch) | |
| tree | 1b14ca1eb86e1f296a5a39148c8a335838f30999 /lib/ssl/test/ssl_test_lib.erl | |
| parent | a0abdb8631d7bd7a154023950ccdcbf09c85b92d (diff) | |
| download | otp-7755c254032c28fb5ad3e7577031c2ef3d7a7858.tar.gz otp-7755c254032c28fb5ad3e7577031c2ef3d7a7858.tar.bz2 otp-7755c254032c28fb5ad3e7577031c2ef3d7a7858.zip | |
ssl: Correct anonymous suite handling
Test suite did not take TLS-version in to account. Also
some anonymous suites where included incorrectly in some TLS versions.
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 81f16030f7..cab22a60a8 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -398,7 +398,7 @@ cert_options(Config) -> {ssl_imp, new}]}, {server_opts, [{ssl_imp, new},{reuseaddr, true}, {cacertfile, ServerCaCertFile}, {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]}, - {server_anon, [{ssl_imp, new},{reuseaddr, true}, {ciphers, anonymous_suites()}]}, + %%{server_anon, [{ssl_imp, new},{reuseaddr, true}, {ciphers, anonymous_suites()}]}, {client_psk, [{ssl_imp, new},{reuseaddr, true}, {psk_identity, "Test-User"}, {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]}, @@ -908,19 +908,8 @@ string_regex_filter(Str, Search) when is_list(Str) -> string_regex_filter(_Str, _Search) -> false. -anonymous_suites() -> - Suites = - [{dh_anon, rc4_128, md5}, - {dh_anon, des_cbc, sha}, - {dh_anon, '3des_ede_cbc', sha}, - {dh_anon, aes_128_cbc, sha}, - {dh_anon, aes_256_cbc, sha}, - {dh_anon, aes_128_gcm, null, sha256}, - {dh_anon, aes_256_gcm, null, sha384}, - {ecdh_anon,rc4_128,sha}, - {ecdh_anon,'3des_ede_cbc',sha}, - {ecdh_anon,aes_128_cbc,sha}, - {ecdh_anon,aes_256_cbc,sha}], +anonymous_suites(Version) -> + Suites = ssl_cipher:anonymous_suites(Version), ssl_cipher:filter_suites(Suites). psk_suites() -> |