aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/src/orber.erl
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2011-12-05 15:02:51 +0100
committerLars Thorsen <[email protected]>2011-12-05 15:02:51 +0100
commit348a15766cdec257d27adbddeb55926ca52e2fd9 (patch)
tree31713ad933f3b810ddc21e07c71754a3834f946e /lib/orber/src/orber.erl
parent27e3d767e0dd10ab4360559cfeead6977feddda6 (diff)
parent8ad9f2bee9ca779988aa5634906751b30b07156e (diff)
downloadotp-348a15766cdec257d27adbddeb55926ca52e2fd9.tar.gz
otp-348a15766cdec257d27adbddeb55926ca52e2fd9.tar.bz2
otp-348a15766cdec257d27adbddeb55926ca52e2fd9.zip
Merge branch 'lars/orber/ssl-options/OTP-9773'
* lars/orber/ssl-options/OTP-9773: [orber] Change the option handling for ssl
Diffstat (limited to 'lib/orber/src/orber.erl')
-rw-r--r--lib/orber/src/orber.erl10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/orber/src/orber.erl b/lib/orber/src/orber.erl
index 386c07d227..4e43d42638 100644
--- a/lib/orber/src/orber.erl
+++ b/lib/orber/src/orber.erl
@@ -36,6 +36,7 @@
-export([start/0, start/1, stop/0, install/1, install/2, orber_nodes/0, iiop_port/0,
domain/0, iiop_ssl_port/0, iiop_out_ports/0, iiop_out_ports_random/0,
iiop_out_ports_attempts/0,
+ ssl_server_opts/0, ssl_client_opts/0, set_ssl_client_opts/1,
ssl_server_certfile/0, ssl_client_certfile/0, set_ssl_client_certfile/1,
ssl_server_verify/0, ssl_client_verify/0, set_ssl_client_verify/1,
ssl_server_depth/0, ssl_client_depth/0, set_ssl_client_depth/1,
@@ -524,6 +525,15 @@ iiop_ssl_port() ->
nat_iiop_ssl_port() ->
orber_env:nat_iiop_ssl_port().
+ssl_server_opts() ->
+ orber_env:ssl_server_opts().
+
+ssl_client_opts() ->
+ orber_env:ssl_client_opts().
+
+set_ssl_client_opts(Value) ->
+ orber_env:set_ssl_client_opts(Value).
+
ssl_server_certfile() ->
orber_env:ssl_server_certfile().