diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-10 11:35:27 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-18 17:16:26 +0200 |
| commit | f0eed56f7346a1146c4acb12bf28ef392a383f33 (patch) | |
| tree | 1c657a20b2cab5bd71c6c5b87cc9a02e13c55a4d /lib/ssl/test/ssl_test_lib.erl | |
| parent | abb11dec132a4667f5ebb95c79a0b7ff5cda72e1 (diff) | |
| download | otp-f0eed56f7346a1146c4acb12bf28ef392a383f33.tar.gz otp-f0eed56f7346a1146c4acb12bf28ef392a383f33.tar.bz2 otp-f0eed56f7346a1146c4acb12bf28ef392a383f33.zip | |
ssl: Correct RSP/PSK and ALPN handling
Extention handling need some fixes to work
correctly for ALPN and SSL-3.0 only client/servers
do not support extensions
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index bf2c0e7edf..49e7b50b1b 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -703,11 +703,7 @@ make_dsa_cert(Config) -> [{server_dsa_opts, ServerConf}, {server_dsa_verify_opts, [{verify, verify_peer} | ServerConf]}, - {client_dsa_opts, ClientConf}, - {server_srp_dsa, [{user_lookup_fun, {fun user_lookup/3, undefined}}, - {ciphers, srp_dss_suites()} | ServerConf]}, - {client_srp_dsa, [{srp_identity, {"Test-User", "secret"}} - | ClientConf]} + {client_dsa_opts, ClientConf} | Config]; false -> Config @@ -2216,8 +2212,8 @@ filter_suites(Ciphers0, AtomVersion) -> ++ ssl_cipher:anonymous_suites(Version) ++ ssl_cipher:psk_suites(Version) ++ ssl_cipher:psk_suites_anon(Version) - ++ ssl_cipher:srp_suites() - ++ ssl_cipher:srp_suites_anon() + ++ ssl_cipher:srp_suites(Version) + ++ ssl_cipher:srp_suites_anon(Version) ++ ssl_cipher:rc4_suites(Version), Supported1 = ssl_cipher:filter_suites(Supported0), Supported2 = [ssl_cipher_format:suite_bin_to_map(S) || S <- Supported1], |