diff options
| author | Lars Thorsen <[email protected]> | 2011-12-06 13:06:51 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2011-12-07 15:11:12 +0100 |
| commit | cae42e74905f1ef50edc881e4cfadad8787a498e (patch) | |
| tree | b604db92ccf3ea2cdc1fd8fe6dbff23bc478d2cf /lib/orber/test | |
| parent | f7241e210c333b088210a138c0880aa93d1f7780 (diff) | |
| download | otp-cae42e74905f1ef50edc881e4cfadad8787a498e.tar.gz otp-cae42e74905f1ef50edc881e4cfadad8787a498e.tar.bz2 otp-cae42e74905f1ef50edc881e4cfadad8787a498e.zip | |
[orber] Update documentation according to the new handling of SSL options
Diffstat (limited to 'lib/orber/test')
| -rw-r--r-- | lib/orber/test/Makefile | 1 | ||||
| -rw-r--r-- | lib/orber/test/orber_test_lib.erl | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/orber/test/Makefile b/lib/orber/test/Makefile index 996d0d1874..d4be009af3 100644 --- a/lib/orber/test/Makefile +++ b/lib/orber/test/Makefile @@ -176,6 +176,7 @@ clean: rm -f idl_output/* rm -f $(TARGET_FILES) rm -f errs core *~ + rm IDL-GENERATED docs: diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl index 3119bcf281..0ddde49cd6 100644 --- a/lib/orber/test/orber_test_lib.erl +++ b/lib/orber/test/orber_test_lib.erl @@ -372,12 +372,12 @@ get_options(ssl, Role, 2, Options) -> {certfile, filename:join([Dir, Role, "cert.pem"])} |Options]; get_options(iiop_ssl, _Role, 2, Options) -> Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]), - [{ssl_server_opts, [{depth, 2}, + [{ssl_server_options, [{depth, 2}, {verify, 2}, {certfile, filename:join([Dir, "server", "cert.pem"])}, {cacertfile, filename:join([Dir, "server", "cacerts.pem"])}, {keyfile, filename:join([Dir, "server", "key.pem"])}]}, - {ssl_client_opts, [{depth, 2}, + {ssl_client_options, [{depth, 2}, {verify, 2}, {certfile, filename:join([Dir, "client", "cert.pem"])}, {cacertfile, filename:join([Dir, "client", "cacerts.pem"])}, @@ -385,12 +385,12 @@ get_options(iiop_ssl, _Role, 2, Options) -> {secure, ssl} |Options]; get_options(iiop_ssl, _Role, 1, Options) -> Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]), - [{ssl_server_opts, [{depth, 1}, + [{ssl_server_options, [{depth, 1}, {verify, 0}, {certfile, filename:join([Dir, "server", "cert.pem"])}, {cacertfile, filename:join([Dir, "server", "cacerts.pem"])}, {keyfile, filename:join([Dir, "server", "key.pem"])}]}, - {ssl_client_opts, [{depth, 1}, + {ssl_client_options, [{depth, 1}, {verify, 0}, {certfile, filename:join([Dir, "client", "cert.pem"])}, {cacertfile, filename:join([Dir, "client", "cacerts.pem"])}, |