From cae42e74905f1ef50edc881e4cfadad8787a498e Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Tue, 6 Dec 2011 13:06:51 +0100 Subject: [orber] Update documentation according to the new handling of SSL options --- lib/orber/doc/src/ch_install.xml | 122 ++++----------------------------------- 1 file changed, 12 insertions(+), 110 deletions(-) (limited to 'lib/orber/doc/src/ch_install.xml') diff --git a/lib/orber/doc/src/ch_install.xml b/lib/orber/doc/src/ch_install.xml index dde4bf4006..de9c0e3a9d 100644 --- a/lib/orber/doc/src/ch_install.xml +++ b/lib/orber/doc/src/ch_install.xml @@ -1,10 +1,10 @@ - +
- 19972010 + 19972011 Ericsson AB. All Rights Reserved. @@ -394,84 +394,16 @@ nodeB@hostB> orber:start(). The same as iiop_ssl_port - ssl_server_cacertfile - string() - - - - - ssl_server_certfile - string() - - - - - ssl_server_verify - 0 | 1 | 2 - - - - - ssl_server_depth - integer() - - - - - ssl_server_password - string() - - - - - ssl_server_keyfile - string() - - - - - ssl_server_ciphers - string() - - + ssl_server_options + list() + See the SSL application + for valid options. - ssl_server_cachetimeout - integer() | infinity - infinity - - - ssl_client_cacertfile - string() - - - - - ssl_client_certfile - string() - - - - - ssl_client_verify - 0 | 1 | 2 - - - - - ssl_client_depth - integer() - - - - - ssl_client_password - string() - - - - - ssl_client_keyfile - string() - - - - - ssl_client_ciphers - string() - - - - - ssl_client_cachetimeout - integer() | infinity - infinity + ssl_client_options + list() + See the SSL application + for valid options. iiop_ssl_out_keepalive @@ -698,40 +630,10 @@ nodeB@hostB> orber:start(). If set, the value must be an integer greater than zero or {local, DefaultNATPort, [{Port, NATPort}]}. See also Firewall Configuration. - ssl_server_cacertfile + ssl_server_options the file path to a server side CA certificate. - ssl_server_certfile - The path to a file containing a chain of PEM encoded certificates. - ssl_server_verify - The type of verification used by SSL during authentication of the - other peer for incoming calls. - ssl_server_depth - The SSL verification depth for outgoing calls. - ssl_server_password - The server side key string. - ssl_server_keyfile - The file path to a server side key. - ssl_server_ciphers - The server side cipher string. - ssl_server_cachetimeout - The server side cache timeout. - ssl_client_cacertfile - The file path to a client side CA certificate. - ssl_client_certfile + ssl_client_options The path to a file containing a chain of PEM encoded certificates. - ssl_client_verify - The type of verification used by SSL during authentication of the - other peer for outgoing calls. - ssl_client_depth - The SSL verification depth for incoming calls. - ssl_client_password - The client side key string. - ssl_client_keyfile - The file path to a client side key. - ssl_client_ciphers - The client side cipher string. - ssl_client_cachetimeout - The client side cache timeout. iiop_ssl_out_keepalive Enables periodic transmission on a connected socket, when no other data is being exchanged. If the other end does not respond, the -- cgit v1.2.3