diff options
| author | Erlang/OTP <[email protected]> | 2016-05-11 17:18:11 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-05-11 17:18:11 +0200 |
| commit | 3aa1148cf76915e6ea27b9cc34e388ad85d7da4d (patch) | |
| tree | ee75f1540c6d13c742578024b576694101067e54 | |
| parent | 18fbb49321d716d4590d24512696b665e857d623 (diff) | |
| parent | a270fea02603f0e64f7c52ff2079035ae1c7f7c5 (diff) | |
| download | otp-3aa1148cf76915e6ea27b9cc34e388ad85d7da4d.tar.gz otp-3aa1148cf76915e6ea27b9cc34e388ad85d7da4d.tar.bz2 otp-3aa1148cf76915e6ea27b9cc34e388ad85d7da4d.zip | |
Merge branch 'ingela/ssl/test-cuddle' into master
* ingela/ssl/test-cuddle:
ssl: Correct test suite
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 38cc3532d8..02fdc4330f 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -386,11 +386,11 @@ cert_options(Config) -> SNIServerBCertFile = filename:join([?config(priv_dir, Config), "b.server", "cert.pem"]), SNIServerBKeyFile = filename:join([?config(priv_dir, Config), "b.server", "key.pem"]), [{client_opts, []}, - {client_verification_opts, [{cacertfile, ClientCaCertFile}, + {client_verification_opts, [{cacertfile, ServerCaCertFile}, {certfile, ClientCertFile}, {keyfile, ClientKeyFile}, {ssl_imp, new}]}, - {client_verification_opts_digital_signature_only, [{cacertfile, ClientCaCertFile}, + {client_verification_opts_digital_signature_only, [{cacertfile, ServerCaCertFile}, {certfile, ClientCertFileDigitalSignatureOnly}, {keyfile, ClientKeyFile}, {ssl_imp, new}]}, @@ -426,7 +426,7 @@ cert_options(Config) -> {user_lookup_fun, {fun user_lookup/3, undefined}}, {ciphers, srp_anon_suites()}]}, {server_verification_opts, [{ssl_imp, new},{reuseaddr, true}, - {cacertfile, ServerCaCertFile}, + {cacertfile, ClientCaCertFile}, {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]}, {client_kc_opts, [{certfile, ClientKeyCertFile}, {ssl_imp, new}]}, {server_kc_opts, [{ssl_imp, new},{reuseaddr, true}, |