Merge branch 'lars/orber/ssl-options/OTP-9773'

* lars/orber/ssl-options/OTP-9773:
  [orber] Change the option handling for ssl

10 files changed, 2119 insertions, 1617 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().
     
diff --git a/lib/orber/src/orber_env.erl b/lib/orber/src/orber_env.erl
index d80edb4ee0..8fb3908710 100644
--- a/lib/orber/src/orber_env.erl
+++ b/lib/orber/src/orber_env.erl
@@ -20,7 +20,7 @@
 %%
 %%-----------------------------------------------------------------
 %% File: orber_env.erl
-%% 
+%%
 %% Description:
 %%    Handling environment parameters for Orber.
 %%
@@ -49,20 +49,22 @@
 	 iiop_max_in_connections/0, iiop_backlog/0, objectkeys_gc_time/0,
 	 get_ORBInitRef/0, get_ORBDefaultInitRef/0, get_interceptors/0,
 	 get_local_interceptors/0, get_cached_interceptors/0,
-	 set_interceptors/1, is_lightweight/0, get_lightweight_nodes/0, secure/0, 
+	 set_interceptors/1, is_lightweight/0, get_lightweight_nodes/0, secure/0,
 	 iiop_ssl_backlog/0, iiop_ssl_port/0, nat_iiop_ssl_port/0, nat_iiop_ssl_port/1,
+	 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,
-	 ssl_server_cacertfile/0, ssl_client_cacertfile/0, 
+	 ssl_server_cacertfile/0, ssl_client_cacertfile/0,
 	 set_ssl_client_cacertfile/1, ssl_client_password/0,
 	 ssl_server_password/0, ssl_client_keyfile/0, ssl_server_keyfile/0,
 	 ssl_client_ciphers/0, ssl_server_ciphers/0, ssl_client_cachetimeout/0,
-	 ssl_server_cachetimeout/0, get_flags/0, typechecking/0,  
+	 ssl_server_cachetimeout/0,
+	 get_flags/0, typechecking/0,
 	 exclude_codeset_ctx/0, exclude_codeset_component/0, partial_security/0,
 	 use_CSIv2/0, use_FT/0, ip_version/0, light_ifr/0, bidir_context/0,
 	 get_debug_level/0, getaddrstr/2, addr2str/1, iiop_packet_size/0,
-	 iiop_ssl_ip_address_local/0, ip_address_local/0, iiop_in_keepalive/0, 
+	 iiop_ssl_ip_address_local/0, ip_address_local/0, iiop_in_keepalive/0,
 	 iiop_out_keepalive/0, iiop_ssl_in_keepalive/0, iiop_ssl_out_keepalive/0,
 	 iiop_ssl_accept_timeout/0, ssl_generation/0]).
 
@@ -87,38 +89,39 @@
 	[flags, iiop_port, nat_iiop_port, iiop_out_ports, domain, ip_address,
 	 nat_ip_address, giop_version, iiop_timeout, iiop_connection_timeout,
 	 iiop_setup_connection_timeout, iiop_in_connection_timeout, iiop_acl,
-	 iiop_max_fragments, iiop_max_in_requests, iiop_max_in_connections, 
+	 iiop_max_fragments, iiop_max_in_requests, iiop_max_in_connections,
 	 iiop_backlog, objectkeys_gc_time, orbInitRef, orbDefaultInitRef,
 	 interceptors, local_interceptors, lightweight, ip_address_local,
-	 secure, iiop_ssl_ip_address_local, iiop_ssl_backlog, 
-	 iiop_ssl_port, nat_iiop_ssl_port, ssl_server_certfile, 
-	 ssl_client_certfile, ssl_server_verify, ssl_client_verify, ssl_server_depth, 
-	 ssl_client_depth, ssl_server_cacertfile, ssl_client_cacertfile, 
-	 ssl_client_password, ssl_server_password, ssl_client_keyfile, 
-	 ssl_server_keyfile, ssl_client_ciphers, ssl_server_ciphers, 
+	 secure, iiop_ssl_ip_address_local, iiop_ssl_backlog,
+	 iiop_ssl_port, nat_iiop_ssl_port, ssl_server_certfile,
+	 ssl_client_certfile, ssl_server_verify, ssl_client_verify, ssl_server_depth,
+	 ssl_client_depth, ssl_server_cacertfile, ssl_client_cacertfile,
+	 ssl_client_password, ssl_server_password, ssl_client_keyfile,
+	 ssl_server_keyfile, ssl_client_ciphers, ssl_server_ciphers,
 	 ssl_client_cachetimeout, ssl_server_cachetimeout, orber_debug_level,
 	 iiop_packet_size, iiop_in_keepalive, iiop_out_keepalive,
-	 iiop_ssl_in_keepalive, iiop_ssl_out_keepalive, iiop_ssl_accept_timeout]).
+	 iiop_ssl_in_keepalive, iiop_ssl_out_keepalive, iiop_ssl_accept_timeout,
+	 ssl_server_opts, ssl_client_opts]).
 
 %% The 'flags' parameter must be first in the list.
 %-define(ENV_KEYS,
-%	[{flags, ?ORB_ENV_INIT_FLAGS}, {iiop_port, 4001}, nat_iiop_port, 
-%	 {iiop_out_ports, 0}, {domain, "ORBER"}, ip_address, nat_ip_address, 
-%	 {giop_version, {1, 1}}, {iiop_timeout, infinity}, 
-%	 {iiop_connection_timeout, infinity}, {iiop_setup_connection_timeout, infinity}, 
+%	[{flags, ?ORB_ENV_INIT_FLAGS}, {iiop_port, 4001}, nat_iiop_port,
+%	 {iiop_out_ports, 0}, {domain, "ORBER"}, ip_address, nat_ip_address,
+%	 {giop_version, {1, 1}}, {iiop_timeout, infinity},
+%	 {iiop_connection_timeout, infinity}, {iiop_setup_connection_timeout, infinity},
 %	 {iiop_in_connection_timeout, infinity}, {iiop_acl, []},
-%	 {iiop_max_fragments, infinity}, {iiop_max_in_requests, infinity}, 
-%	 {iiop_max_in_connections, infinity}, {iiop_backlog, 5}, 
-%	 {objectkeys_gc_time, infinity}, 
+%	 {iiop_max_fragments, infinity}, {iiop_max_in_requests, infinity},
+%	 {iiop_max_in_connections, infinity}, {iiop_backlog, 5},
+%	 {objectkeys_gc_time, infinity},
 %	 {orbInitRef, undefined}, {orbDefaultInitRef, undefined},
 %	 {interceptors, false}, {local_interceptors, false}, {lightweight, false},
-%	 {secure, no}, {iiop_ssl_backlog, 5}, {iiop_ssl_port, 4002}, 
+%	 {secure, no}, {iiop_ssl_backlog, 5}, {iiop_ssl_port, 4002},
 %	 nat_iiop_ssl_port, {ssl_server_certfile, []}, {ssl_client_certfile, []},
-%	 {ssl_server_verify, 0}, {ssl_client_verify, 0}, {ssl_server_depth, 1}, 
-%	 {ssl_client_depth, 1}, {ssl_server_cacertfile, []}, 
+%	 {ssl_server_verify, 0}, {ssl_client_verify, 0}, {ssl_server_depth, 1},
+%	 {ssl_client_depth, 1}, {ssl_server_cacertfile, []},
 %	 {ssl_client_cacertfile, []}, {ssl_client_password, []},
-%	 {ssl_server_password, []}, {ssl_client_keyfile, []}, 
-%	 {ssl_server_keyfile, []}, {ssl_client_ciphers, []}, 
+%	 {ssl_server_password, []}, {ssl_client_keyfile, []},
+%	 {ssl_server_keyfile, []}, {ssl_client_ciphers, []},
 %	 {ssl_server_ciphers, []}, {ssl_client_cachetimeout, infinity},
 %	 {ssl_server_cachetimeout, infinity}, {orber_debug_level, 0}]).
 
@@ -129,33 +132,33 @@
 
 %%-----------------------------------------------------------------
 %% External functions
-%%-----------------------------------------------------------------    
 %%-----------------------------------------------------------------
-%% function : 
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%%-----------------------------------------------------------------
+%% function :
+%% Arguments:
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 start(Opts) ->
     gen_server:start_link({local, orber_env}, ?MODULE, Opts, []).
 
 %%-----------------------------------------------------------------
 %% function : get_keys
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%% Arguments:
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 get_keys() ->
     ?ENV_KEYS.
 
 %%-----------------------------------------------------------------
 %% function : get_env
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%% Arguments:
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 get_env(Key) when is_atom(Key) ->
     case catch ets:lookup(?ENV_DB, Key) of
@@ -164,13 +167,13 @@ get_env(Key) when is_atom(Key) ->
 	_ ->
 	    undefined
     end.
- 
+
 %%-----------------------------------------------------------------
 %% function : get_env
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%% Arguments:
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 set_env(Key, Value) when is_atom(Key) ->
     case catch ets:insert(?ENV_DB, #parameters{key = Key, value = Value}) of
@@ -179,20 +182,20 @@ set_env(Key, Value) when is_atom(Key) ->
 	_ ->
 	    undefined
     end.
- 
+
 
 %%-----------------------------------------------------------------
 %% function : info
 %% Arguments: IoDervice - info_msg | string | io | {io, Dev}
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 info() ->
     info(info_msg).
 
 info(IoDevice) ->
-    Info = 
+    Info =
 	case orber_tb:is_running() of
 	    true ->
 		Info1 = create_main_info(),
@@ -211,7 +214,7 @@ info(IoDevice) ->
 	string ->
 	    Info;
 	io ->
-	    io:format("~s", [Info]); 
+	    io:format("~s", [Info]);
 	{io, Dev} ->
 	    io:format(Dev, "~s", [Info]);
 	_ ->
@@ -220,14 +223,14 @@ info(IoDevice) ->
 
 create_main_info() ->
     {Major, Minor} = giop_version(),
-    [io_lib:format("======= Orber Execution Environment ======~n"		   
+    [io_lib:format("======= Orber Execution Environment ======~n"
 		   "Orber version.................: ~s~n"
 		   "Orber domain..................: ~s~n"
 		   "IIOP port number..............: ~p~n"
 		   "IIOP NAT port number..........: ~p~n"
 		   "Interface(s)..................: ~p~n"
 		   "Interface(s) NAT..............: ~p~n"
-		   "Local Interface (default).....: ~p~n"		   
+		   "Local Interface (default).....: ~p~n"
 		   "Nodes in domain...............: ~p~n"
 		   "GIOP version (default)........: ~p.~p~n"
 		   "IIOP out timeout..............: ~p msec~n"
@@ -254,18 +257,18 @@ create_main_info() ->
 		   "Debug Level...................: ~p~n"
 		   "orbInitRef....................: ~p~n"
 		   "orbDefaultInitRef.............: ~p~n",
-		   [?ORBVSN, domain(), iiop_port(), nat_iiop_port(), host(), 
+		   [?ORBVSN, domain(), iiop_port(), nat_iiop_port(), host(),
 		    nat_host(), ip_address_local(),
 		    orber:orber_nodes(), Major, Minor,
-		    iiop_timeout(), iiop_connection_timeout(), 
+		    iiop_timeout(), iiop_connection_timeout(),
 		    iiop_setup_connection_timeout(), iiop_out_ports(),
 		    iiop_out_ports_attempts(), iiop_out_ports_random(),
-		    orber:iiop_connections(out), orber:iiop_connections_pending(), 
-		    iiop_out_keepalive(), orber:iiop_connections(in), 
-		    iiop_in_connection_timeout(), iiop_in_keepalive(), 
-		    iiop_max_fragments(), iiop_max_in_requests(), 
+		    orber:iiop_connections(out), orber:iiop_connections_pending(),
+		    iiop_out_keepalive(), orber:iiop_connections(in),
+		    iiop_in_connection_timeout(), iiop_in_keepalive(),
+		    iiop_max_fragments(), iiop_max_in_requests(),
 		    iiop_max_in_connections(), iiop_backlog(), iiop_acl(),
-		    iiop_packet_size(), objectkeys_gc_time(), get_interceptors(), 
+		    iiop_packet_size(), objectkeys_gc_time(), get_interceptors(),
 		    get_local_interceptors(), get_debug_level(), get_ORBInitRef(),
 		    get_ORBDefaultInitRef()])].
 
@@ -277,7 +280,7 @@ create_flag_info(Info) ->
 	    FlagData = check_flags(?ORB_ENV_FLAGS, Flags, []),
 	    [Info, "System Flags Set..............: \n", FlagData, "\n"]
     end.
-  
+
 check_flags([], _, Acc) ->
     Acc;
 check_flags([{Flag, Txt}|T], Flags, Acc) when ?ORB_FLAG_TEST(Flags, Flag) ->
@@ -289,7 +292,7 @@ check_flags([_|T], Flags, Acc) ->
 create_security_info(no, Info) ->
     lists:flatten([Info, "=========================================\n"]);
 create_security_info(ssl, Info) ->
-    lists:flatten([Info, 
+    lists:flatten([Info,
 		   io_lib:format("ORB security..................: ssl~n"
 				 "SSL generation................: ~p~n"
 				 "SSL IIOP in keepalive.........: ~p~n"
@@ -316,26 +319,26 @@ create_security_info(ssl, Info) ->
 				 "SSL client ciphers............: ~p~n"
 				 "SSL client cachetimeout.......: ~p~n"
 				 "=========================================~n",
-				 [ssl_generation(), iiop_ssl_port(), 
+				 [ssl_generation(), iiop_ssl_port(),
 				  iiop_ssl_in_keepalive(), iiop_ssl_out_keepalive(),
-				  nat_iiop_ssl_port(), iiop_ssl_accept_timeout(), 
+				  nat_iiop_ssl_port(), iiop_ssl_accept_timeout(),
 				  iiop_ssl_backlog(), iiop_ssl_ip_address_local(),
 				  ssl_server_certfile(), ssl_server_verify(),
-				  ssl_server_depth(), ssl_server_cacertfile(), 
-				  ssl_server_keyfile(), ssl_server_password(), 
+				  ssl_server_depth(), ssl_server_cacertfile(),
+				  ssl_server_keyfile(), ssl_server_password(),
 				  ssl_server_ciphers(), ssl_server_cachetimeout(),
-				  ssl_client_certfile(), ssl_client_verify(), 
-				  ssl_client_depth(), ssl_client_cacertfile(), 
+				  ssl_client_certfile(), ssl_client_verify(),
+				  ssl_client_depth(), ssl_client_cacertfile(),
 				  ssl_client_keyfile(), ssl_client_password(),
 				  ssl_client_ciphers(), ssl_client_cachetimeout()])]).
 
 
 %%-----------------------------------------------------------------
 %% function : iiop_acl
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%% Arguments:
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 iiop_acl() ->
     case application:get_env(orber, iiop_acl) of
@@ -352,7 +355,7 @@ iiop_packet_size() ->
 	_ ->
 	    infinity
     end.
-  
+
 
 iiop_port() ->
     case application:get_env(orber, iiop_port) of
@@ -368,7 +371,7 @@ nat_iiop_port() ->
 	    Port;
 	{ok, {local, Default, _NATList}} ->
 	    Default;
-	_ -> 
+	_ ->
 	    iiop_port()
     end.
 
@@ -378,7 +381,7 @@ nat_iiop_port(LocalPort) ->
 	    Port;
 	{ok, {local, Default, NATList}} ->
 	    orber_tb:keysearch(LocalPort, NATList, Default);
-	_ -> 
+	_ ->
 	    iiop_port()
     end.
 
@@ -407,9 +410,9 @@ iiop_out_ports_attempts() ->
 	_ ->
 	    1
     end.
-   
 
-domain() -> 
+
+domain() ->
     case application:get_env(orber, domain) of
 	{ok, Domain} when is_list(Domain) ->
 	    Domain;
@@ -449,7 +452,7 @@ nat_host([Host]) ->
 	{ok,{multiple, [I|_] = IList}} when is_list(I) ->
 	    IList;
 	{ok,{local, Default, NATList}} ->
-	    [orber_tb:keysearch(Host, NATList, Default)]; 
+	    [orber_tb:keysearch(Host, NATList, Default)];
 	_ ->
 	    host()
     end.
@@ -462,7 +465,7 @@ host() ->
 	{ok,{multiple, [I|_] = IList}} when is_list(I) ->
 	    IList;
 	%% IPv4. For IPv6 we only accept a string, but we must support this format
-	%% for IPv4 
+	%% for IPv4
 	{ok, {A1, A2, A3, A4}} when is_integer(A1+A2+A3+A4) ->
 	    [integer_to_list(A1) ++ "." ++ integer_to_list(A2) ++ "." ++ integer_to_list(A3)
 	     ++ "." ++ integer_to_list(A4)];
@@ -489,7 +492,7 @@ ip_address_local() ->
 	_ ->
 	    []
     end.
- 
+
 
 ip_address() ->
     ip_address(ip_version()).
@@ -526,7 +529,7 @@ addr2str({A1, A2, A3, A4, A5, A6, A7, A8}) ->
 	int16_to_hex(A3) ++ ":" ++ int16_to_hex(A4) ++ ":" ++
 	int16_to_hex(A5) ++ ":" ++ int16_to_hex(A6) ++ ":" ++
 	int16_to_hex(A7) ++ ":" ++ int16_to_hex(A8).
-    
+
 
 int16_to_hex(0) ->
     [$0];
@@ -613,7 +616,7 @@ iiop_max_fragments() ->
 	_ ->
 	    infinity
     end.
-    
+
 iiop_max_in_requests() ->
     case application:get_env(orber, iiop_max_in_requests) of
 	{ok, Max} when is_integer(Max) andalso Max > 0 ->
@@ -653,7 +656,7 @@ iiop_out_keepalive() ->
 	_ ->
 	    false
     end.
- 
+
 
 
 get_flags() ->
@@ -706,9 +709,9 @@ bidir_context() ->
 	?ORB_FLAG_TEST(Flags, ?ORB_ENV_USE_BI_DIR_IIOP) ->
 	    [#'IOP_ServiceContext'
 	     {context_id=?IOP_BI_DIR_IIOP,
-	      context_data = 
-	      #'IIOP_BiDirIIOPServiceContext'{listen_points = 
-					      [#'IIOP_ListenPoint'{host=host(), 
+	      context_data =
+	      #'IIOP_BiDirIIOPServiceContext'{listen_points =
+					      [#'IIOP_ListenPoint'{host=host(),
 								   port=iiop_port()}]}}];
 	true ->
 	    []
@@ -819,7 +822,7 @@ get_lightweight_nodes() ->
 	_ ->
 	    false
     end.
-   
+
 
 %%-----------------------------------------------------------------
 %% Security access operations (SSL)
@@ -838,8 +841,8 @@ ssl_generation() ->
 	    V;
 	_ ->
 	    2
-    end.	 
- 
+    end.
+
 iiop_ssl_ip_address_local() ->
     case application:get_env(orber, iiop_ssl_ip_address_local) of
 	{ok,I} when is_list(I) ->
@@ -876,10 +879,10 @@ iiop_ssl_accept_timeout() ->
     case application:get_env(orber, iiop_ssl_accept_timeout) of
 	{ok, N} when is_integer(N) ->
 	    N * 1000;
-	_  -> 
+	_  ->
 	    infinity
     end.
- 
+
 iiop_ssl_port() ->
     case application:get_env(orber, secure) of
 	{ok, ssl} ->
@@ -923,6 +926,52 @@ nat_iiop_ssl_port(LocalPort) ->
 	    -1
     end.
 
+ssl_server_opts() ->
+    case application:get_env(orber, ssl_server_opts) of
+	{ok, V1}  when is_list(V1) ->
+	    V1;
+	_ ->
+	    []
+    end.
+
+ssl_client_opts() ->
+    case application:get_env(orber, ssl_client_opts) of
+	{ok, V1}  when is_list(V1) ->
+	    V1;
+	_ ->
+	    []
+    end.
+
+check_ssl_opts(Value) ->
+    check_ssl_opts(Value, []).
+check_ssl_opts([], []) ->
+    ok;
+check_ssl_opts([], Acc) ->
+    {error, Acc};
+check_ssl_opts([{active, _} |T], Acc) ->
+    check_ssl_opts(T, [active |Acc]);
+check_ssl_opts([{packet, _} |T], Acc) ->
+    check_ssl_opts(T, [packet |Acc]);
+check_ssl_opts([{mode, _} |T], Acc) ->
+    check_ssl_opts(T, [mode |Acc]);
+check_ssl_opts([list |T], Acc) ->
+    check_ssl_opts(T, [list |Acc]);
+check_ssl_opts([binary |T], Acc) ->
+    check_ssl_opts(T, [binary |Acc]);
+check_ssl_opts([_ |T], Acc) ->
+    check_ssl_opts(T, Acc).
+
+set_ssl_client_opts(Value) when is_list(Value) ->
+    case check_ssl_opts(Value) of
+	ok ->
+	    ok;
+	{error, List} ->
+	    exit(lists:flatten(
+		   io_lib:format("TCP options ~p is not allowed in set_ssl_client_opts()",
+				 [List])))
+    end,
+    put(ssl_client_opts, Value), ok.
+
 ssl_server_certfile() ->
     case application:get_env(orber, ssl_server_certfile) of
 	{ok, V1}  when is_list(V1) ->
@@ -932,7 +981,7 @@ ssl_server_certfile() ->
 	_ ->
 	    []
     end.
-    
+
 ssl_client_certfile() ->
     case get(ssl_client_certfile) of
 	undefined ->
@@ -950,7 +999,7 @@ ssl_client_certfile() ->
 
 set_ssl_client_certfile(Value) when is_list(Value) ->
     put(ssl_client_certfile, Value).
-    
+
 ssl_server_verify() ->
     Verify = case application:get_env(orber, ssl_server_verify) of
 	{ok, V} when is_integer(V) ->
@@ -964,7 +1013,7 @@ ssl_server_verify() ->
 	true ->
 	   0
     end.
-    
+
 ssl_client_verify() ->
     Verify = case get(ssl_client_verify) of
 		 undefined ->
@@ -986,7 +1035,7 @@ ssl_client_verify() ->
 
 set_ssl_client_verify(Value) when is_integer(Value) andalso Value =< 2 andalso Value >= 0 ->
     put(ssl_client_verify, Value), ok.
-    
+
 ssl_server_depth() ->
     case application:get_env(orber, ssl_server_depth) of
 	{ok, V1} when is_integer(V1) ->
@@ -994,7 +1043,7 @@ ssl_server_depth() ->
 	_ ->
 	    1
     end.
-    
+
 ssl_client_depth() ->
     case get(ssl_client_depth) of
 	undefined ->
@@ -1010,7 +1059,7 @@ ssl_client_depth() ->
 
 set_ssl_client_depth(Value) when is_integer(Value) ->
     put(ssl_client_depth, Value), ok.
-    
+
 
 
 ssl_server_cacertfile() ->
@@ -1022,7 +1071,7 @@ ssl_server_cacertfile() ->
 	_ ->
 	    []
     end.
-    
+
 ssl_client_cacertfile() ->
     case get(ssl_client_cacertfile) of
 	undefined ->
@@ -1040,7 +1089,7 @@ ssl_client_cacertfile() ->
 
 set_ssl_client_cacertfile(Value) when is_list(Value) ->
     put(ssl_client_cacertfile, Value), ok.
-    
+
 
 ssl_client_password() ->
     case application:get_env(orber, ssl_client_password) of
@@ -1108,10 +1157,10 @@ ssl_server_cachetimeout() ->
 
 %%-----------------------------------------------------------------
 %% function : configure
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%% Arguments:
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 configure(Key, Value) when is_atom(Key) ->
     configure(Key, Value, check);
@@ -1125,10 +1174,10 @@ configure_override(Key, _) ->
 
 %%-----------------------------------------------------------------
 %% function : multi_configure
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%% Arguments:
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 multi_configure(KeyValueList) when is_list(KeyValueList) ->
     case orber_tb:is_loaded() of
@@ -1144,7 +1193,7 @@ multi_configure(KeyValueList) when is_list(KeyValueList) ->
 	    end
     end;
 multi_configure(KeyValueList) ->
-    ?EFORMAT("Given configuration parameters not a Key-Value-pair list: ~p", 
+    ?EFORMAT("Given configuration parameters not a Key-Value-pair list: ~p",
 	     [KeyValueList]).
 
 multi_configure_helper([], _) ->
@@ -1237,7 +1286,7 @@ configure(iiop_port, Value, Status) when is_integer(Value) ->
 %% Set the NAT listen port
 configure(nat_iiop_port, Value, Status) when is_integer(Value) andalso Value > 0 ->
     do_safe_configure(nat_iiop_port, Value, Status);
-configure(nat_iiop_port, {local, Value1, Value2}, Status) when is_integer(Value1) andalso 
+configure(nat_iiop_port, {local, Value1, Value2}, Status) when is_integer(Value1) andalso
 							       Value1 > 0 andalso
 							       is_list(Value2) ->
     do_safe_configure(nat_iiop_port, {local, Value1, Value2}, Status);
@@ -1312,12 +1361,20 @@ configure(iiop_ssl_backlog, Value, Status) when is_integer(Value) andalso Value
     do_safe_configure(iiop_ssl_backlog, Value, Status);
 configure(nat_iiop_ssl_port, Value, Status) when is_integer(Value) andalso Value > 0 ->
     do_safe_configure(nat_iiop_ssl_port, Value, Status);
-configure(nat_iiop_ssl_port, {local, Value1, Value2}, Status) when is_integer(Value1) andalso 
+configure(nat_iiop_ssl_port, {local, Value1, Value2}, Status) when is_integer(Value1) andalso
 								   Value1 > 0 andalso
 								   is_list(Value2) ->
     do_safe_configure(nat_iiop_ssl_port, {local, Value1, Value2}, Status);
 configure(iiop_ssl_port, Value, Status) when is_integer(Value) ->
     do_safe_configure(iiop_ssl_port, Value, Status);
+
+%% New SSL options
+configure(ssl_server_opts, Value, Status) when is_list(Value) ->
+    do_safe_configure(ssl_server_opts, Value, Status);
+configure(ssl_client_opts, Value, Status) when is_list(Value) ->
+    do_safe_configure(ssl_client_opts, Value, Status);
+
+%% Old SSL options
 configure(ssl_server_certfile, Value, Status) when is_list(Value) ->
     do_safe_configure(ssl_server_certfile, Value, Status);
 configure(ssl_server_certfile, Value, Status) when is_atom(Value) ->
@@ -1434,9 +1491,9 @@ code_change(_OldVsn, State, _Extra) ->
 
 %%-----------------------------------------------------------------
 %% function : env
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
+%% Arguments:
+%% Returns  :
+%% Exception:
 %% Effect   : Used when Key always exists (Default Value)
 %%-----------------------------------------------------------------
 env(Key) ->
@@ -1445,10 +1502,10 @@ env(Key) ->
 
 %%-----------------------------------------------------------------
 %% function : init_env
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
+%% Arguments:
+%% Returns  :
+%% Exception:
+%% Effect   :
 %%-----------------------------------------------------------------
 init_env() ->
     application:load(orber),
diff --git a/lib/orber/src/orber_iiop_net.erl b/lib/orber/src/orber_iiop_net.erl
index 58eba9f039..5620b5d94f 100644
--- a/lib/orber/src/orber_iiop_net.erl
+++ b/lib/orber/src/orber_iiop_net.erl
@@ -161,31 +161,51 @@ terminate(_Reason, _State) ->
 %%-----------------------------------------------------------------
 get_options(normal, _Options) ->
     [];
-get_options(ssl, Options) ->
-    Verify = orber_tb:keysearch(ssl_server_verify, Options, 
-				orber_env:ssl_server_verify()),
-    Depth = orber_tb:keysearch(ssl_server_depth, Options, 
-			       orber_env:ssl_server_depth()),
-    Cert = orber_tb:keysearch(ssl_server_certfile, Options, 
-			      orber_env:ssl_server_certfile()),
-    CaCert = orber_tb:keysearch(ssl_server_cacertfile, Options, 
-				orber_env:ssl_server_cacertfile()),
-    Pwd = orber_tb:keysearch(ssl_server_password, Options, 
-			     orber_env:ssl_server_password()),
-    Key = orber_tb:keysearch(ssl_server_keyfile, Options, 
-			       orber_env:ssl_server_keyfile()),
-    Ciphers = orber_tb:keysearch(ssl_server_ciphers, Options, 
-				 orber_env:ssl_server_ciphers()),
-    Timeout = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
-				 orber_env:ssl_server_cachetimeout()),
-    [{verify, Verify},
-     {depth, Depth} |
-     ssl_server_extra_options([{certfile, Cert},
-			       {cacertfile, CaCert},
-			       {password, Pwd},
-			       {keyfile, Key},
-			       {ciphers, Ciphers},
-			       {cachetimeout, Timeout}], [])].
+get_options(ssl, Options) ->    
+    SSLOpts = 
+	case orber_tb:keysearch(ssl_server_opts, Options,
+				orber_env:ssl_server_opts()) of
+	    [] ->
+		Verify = orber_tb:keysearch(ssl_server_verify, Options, 
+					    orber_env:ssl_server_verify()),
+		Depth = orber_tb:keysearch(ssl_server_depth, Options, 
+					   orber_env:ssl_server_depth()),
+		Cert = orber_tb:keysearch(ssl_server_certfile, Options, 
+					  orber_env:ssl_server_certfile()),
+		CaCert = orber_tb:keysearch(ssl_server_cacertfile, Options, 
+					    orber_env:ssl_server_cacertfile()),
+		Pwd = orber_tb:keysearch(ssl_server_password, Options, 
+					 orber_env:ssl_server_password()),
+		Key = orber_tb:keysearch(ssl_server_keyfile, Options, 
+					 orber_env:ssl_server_keyfile()),
+		Ciphers = orber_tb:keysearch(ssl_server_ciphers, Options, 
+					     orber_env:ssl_server_ciphers()),
+		Timeout = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
+					     orber_env:ssl_server_cachetimeout()),
+		KeepAlive = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
+					       orber_env:iiop_ssl_in_keepalive()),
+		[{verify, Verify},
+		 {depth, Depth},
+		 {certfile, Cert},
+		 {cacertfile, CaCert},
+		 {password, Pwd},
+		 {keyfile, Key},
+		 {ciphers, Ciphers},
+		 {cachetimeout, Timeout},
+		 {keepalive, KeepAlive}];
+	    Opts ->	
+		case orber_tb:check_illegal_tcp_options(Opts) of
+		    ok -> 
+			check_old_ssl_server_options(Options),
+			Opts;
+		    {error, IllegalOpts} ->
+			error_logger:error_report([{application, orber},
+						   "TCP options not allowed to set on a connection", 
+						   IllegalOpts]),
+			error("Illegal TCP option")
+		end
+	end,
+    ssl_server_extra_options(SSLOpts, []).
 
 %%-----------------------------------------------------------------
 %% Func: parse_options/2
@@ -266,23 +286,28 @@ handle_call({add, IP, Type, Port, AllOptions}, _From, State) ->
     Family = orber_env:ip_version(),
     case inet:getaddr(IP, Family) of
 	{ok, IPTuple} ->
-	    Options = [{ip, IPTuple}|get_options(Type, AllOptions)],
-	    Ref = make_ref(),
-	    ProxyOptions = filter_options(AllOptions, []),
-	    case orber_socket:listen(Type, Port, Options, false) of
-		{ok, Listen, NewPort} ->
-		    {ok, Pid} = orber_iiop_socketsup:start_accept(Type, Listen, Ref,
-								  ProxyOptions),
-		    link(Pid),
-		    ets:insert(?CONNECTION_DB, #listen{pid = Pid, 
-						       socket = Listen, 
-						       port = NewPort, 
-						       type = Type, ref = Ref,
-						       options = Options,
-						       proxy_options = ProxyOptions}),
-		    {reply, {ok, Ref}, State};
-		Error ->
-		    {reply, Error, State}
+	    try [{ip, IPTuple} |get_options(Type, AllOptions)] of
+		Options ->
+     	            Ref = make_ref(),
+		    ProxyOptions = filter_options(AllOptions, []),
+	            case orber_socket:listen(Type, Port, Options, false) of
+		        {ok, Listen, NewPort} ->
+		            {ok, Pid} = orber_iiop_socketsup:start_accept(Type, Listen, Ref,
+		       					                  ProxyOptions),
+		            link(Pid),
+		            ets:insert(?CONNECTION_DB, #listen{pid = Pid, 
+						               socket = Listen, 
+						               port = NewPort, 
+						               type = Type, ref = Ref,
+						               options = Options,
+						               proxy_options = ProxyOptions}),
+		            {reply, {ok, Ref}, State};
+	          	Error ->
+		            {reply, Error, State}
+	            end
+            catch
+		error:Reason ->
+		    {reply, {error, Reason}, State}
 	    end;
 	Other ->
 	    {reply, Other, State}
@@ -461,3 +486,31 @@ update_counter(#state{max_connections = infinity} = State, _) ->
 update_counter(State, Value) ->
     State#state{counter = State#state.counter + Value}.
 
+
+check_old_ssl_server_options(Options) ->
+    try
+	0 = orber_tb:keysearch(ssl_server_verify, Options, 
+			       orber_env:ssl_server_verify()),
+    	1 = orber_tb:keysearch(ssl_server_depth, Options, 
+			       orber_env:ssl_server_depth()),
+     	[] = orber_tb:keysearch(ssl_server_certfile, Options, 
+				orber_env:ssl_server_certfile()),
+	[] = orber_tb:keysearch(ssl_server_cacertfile, Options, 
+				orber_env:ssl_server_cacertfile()),
+	[] = orber_tb:keysearch(ssl_server_password, Options, 
+				orber_env:ssl_server_password()),
+	[] = orber_tb:keysearch(ssl_server_keyfile, Options, 
+				orber_env:ssl_server_keyfile()),
+	[] = orber_tb:keysearch(ssl_server_ciphers, Options, 
+				orber_env:ssl_server_ciphers()),
+	infinity = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
+				      orber_env:ssl_server_cachetimeout()),
+	false = orber_tb:keysearch(iiop_ssl_in_keepalive, Options, 
+				   orber_env:iiop_ssl_in_keepalive())
+    catch
+	_:_ ->
+					      io:format("hej\n",[]),
+	    error_logger:warning_report([{application, orber},
+			 "Ignoring deprecated ssl server options used together with the ssl_server_opts"])
+    end.
+   
diff --git a/lib/orber/src/orber_iiop_pm.erl b/lib/orber/src/orber_iiop_pm.erl
index bf36b353bc..d86de36939 100644
--- a/lib/orber/src/orber_iiop_pm.erl
+++ b/lib/orber/src/orber_iiop_pm.erl
@@ -108,44 +108,82 @@ connect(Host, Port, SocketType, Timeout, Chars, Wchars, Ctx)
     end.
 
 get_ssl_socket_options([]) ->
-    [{verify, orber:ssl_client_verify()},
-     {depth, orber:ssl_client_depth()} |
-     ssl_client_extra_options([{certfile, orber:ssl_client_certfile()},
-			       {cacertfile, orber:ssl_client_cacertfile()},
-			       {password, orber:ssl_client_password()},
-			       {keyfile, orber:ssl_client_keyfile()},
-			       {ciphers, orber:ssl_client_ciphers()},
-			       {cachetimeout, orber:ssl_client_cachetimeout()}], [])];
+    SSLOpts = 
+	case orber_env:ssl_client_opts() of
+	    [] ->
+		[{verify, orber_env:ssl_client_verify()},
+		 {depth, orber_env:ssl_client_depth()},
+		 {certfile, orber_env:ssl_client_certfile()},
+		 {cacertfile, orber_env:ssl_client_cacertfile()},
+		 {password, orber_env:ssl_client_password()},
+		 {keyfile, orber_env:ssl_client_keyfile()},
+		 {ciphers, orber_env:ssl_client_ciphers()},
+		 {cachetimeout, orber_env:ssl_client_cachetimeout()},
+		 {keepalive, orber_env:iiop_ssl_out_keepalive()}];
+	    Opts ->
+		case orber_tb:check_illegal_tcp_options(Opts) of
+		    ok -> 
+			check_old_ssl_client_options([]),
+			Opts;
+		    {error, IllegalOpts} ->
+			error_logger:error_report([{application, orber},
+						   "TCP options not allowed to set on a connection", 
+						   IllegalOpts]),
+			error("Illegal TCP option")
+		end
+	end,
+    ssl_client_extra_options(SSLOpts, []);
 get_ssl_socket_options([#'IOP_ServiceContext'
 			{context_id=?ORBER_GENERIC_CTX_ID, 
 			 context_data = {configuration, Options}}|_]) ->
-    Verify = orber_tb:keysearch(ssl_client_verify, Options, 
-				orber_env:ssl_client_verify()),
-    Depth = orber_tb:keysearch(ssl_client_depth, Options, 
-			       orber_env:ssl_client_depth()),
-    Cert = orber_tb:keysearch(ssl_client_certfile, Options, 
-			      orber_env:ssl_client_certfile()),
-    CaCert = orber_tb:keysearch(ssl_client_cacertfile, Options, 
-				orber_env:ssl_client_cacertfile()),
-    Pwd = orber_tb:keysearch(ssl_client_password, Options, 
-			     orber_env:ssl_client_password()),
-    Key = orber_tb:keysearch(ssl_client_keyfile, Options, 
-			     orber_env:ssl_client_keyfile()),
-    Ciphers = orber_tb:keysearch(ssl_client_ciphers, Options, 
-				 orber_env:ssl_client_ciphers()),
-    Timeout = orber_tb:keysearch(ssl_client_cachetimeout, Options, 
-				 orber_env:ssl_client_cachetimeout()),
-    [{verify, Verify},
-     {depth, Depth} |
-     ssl_client_extra_options([{certfile, Cert},
-			       {cacertfile, CaCert},
-			       {password, Pwd},
-			       {keyfile, Key},
-			       {ciphers, Ciphers},
-			       {cachetimeout, Timeout}], [])];
+    SSLOpts = 
+	case orber_tb:keysearch(ssl_client_opts, Options,
+				orber_env:ssl_client_opts()) of
+	    [] ->
+		Verify = orber_tb:keysearch(ssl_client_verify, Options, 
+					    orber_env:ssl_client_verify()),
+		Depth = orber_tb:keysearch(ssl_client_depth, Options, 
+					   orber_env:ssl_client_depth()),
+		Cert = orber_tb:keysearch(ssl_client_certfile, Options, 
+					  orber_env:ssl_client_certfile()),
+		CaCert = orber_tb:keysearch(ssl_client_cacertfile, Options, 
+					    orber_env:ssl_client_cacertfile()),
+		Pwd = orber_tb:keysearch(ssl_client_password, Options, 
+					 orber_env:ssl_client_password()),
+		Key = orber_tb:keysearch(ssl_client_keyfile, Options, 
+					 orber_env:ssl_client_keyfile()),
+		Ciphers = orber_tb:keysearch(ssl_client_ciphers, Options, 
+					     orber_env:ssl_client_ciphers()),
+		Timeout = orber_tb:keysearch(ssl_client_cachetimeout, Options, 
+					     orber_env:ssl_client_cachetimeout()),
+		KeepAlive = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
+					       orber_env:iiop_ssl_out_keepalive()),
+		[{verify, Verify},
+		 {depth, Depth},
+		 {certfile, Cert},
+		 {cacertfile, CaCert},
+		 {password, Pwd},
+		 {keyfile, Key},
+		 {ciphers, Ciphers},
+		 {cachetimeout, Timeout},
+		 {keepalive, KeepAlive}];
+	    Opts ->	
+		case orber_tb:check_illegal_tcp_options(Opts) of
+		    ok -> 
+			check_old_ssl_client_options(Options),
+			Opts;
+		    {error, IllegalOpts} ->
+			error_logger:error_report([{application, orber},
+						   "TCP options not allowed to set on a connection", 
+						   IllegalOpts]),
+			error("Illegal TCP option")
+		end
+	end,
+    ssl_client_extra_options(SSLOpts, []);
 get_ssl_socket_options([_|T]) ->
     get_ssl_socket_options(T).
 
+
 ssl_client_extra_options([], Acc) ->
     Acc;
 ssl_client_extra_options([{_Type, []}|T], Acc) ->
@@ -814,6 +852,36 @@ init_interceptors(Host, Port, {SHost, SPort}) ->
             %% Either 'false' or {Type, PIs}.
 	    Other
     end.
+
+
+check_old_ssl_client_options(Options) ->
+    try
+	0 = orber_tb:keysearch(ssl_client_verify, Options, 
+			       orber_env:ssl_client_verify()),
+    	1 = orber_tb:keysearch(ssl_client_depth, Options, 
+			       orber_env:ssl_client_depth()),
+     	[] = orber_tb:keysearch(ssl_client_certfile, Options, 
+				orber_env:ssl_client_certfile()),
+	[] = orber_tb:keysearch(ssl_client_cacertfile, Options, 
+				orber_env:ssl_client_cacertfile()),
+	[] = orber_tb:keysearch(ssl_client_password, Options, 
+				orber_env:ssl_client_password()),
+	[] = orber_tb:keysearch(ssl_client_keyfile, Options, 
+				orber_env:ssl_client_keyfile()),
+	[] = orber_tb:keysearch(ssl_client_ciphers, Options, 
+				orber_env:ssl_client_ciphers()),
+	infinity = orber_tb:keysearch(ssl_client_cachetimeout, Options, 
+				      orber_env:ssl_client_cachetimeout()),
+	false = orber_tb:keysearch(iiop_ssl_out_keepalive, Options, 
+				   orber_env:iiop_ssl_out_keepalive())
+
+    catch
+	_:_ ->
+	    error_logger:warning_report([{application, orber},
+			 "Ignoring deprecated ssl client options used together with the ssl_client_opts"])
+    end.
+   
+
     
 
 %%-----------------------------------------------------------------
diff --git a/lib/orber/src/orber_socket.erl b/lib/orber/src/orber_socket.erl
index ec2cf8f42a..07a0e09ccc 100644
--- a/lib/orber/src/orber_socket.erl
+++ b/lib/orber/src/orber_socket.erl
@@ -14,8 +14,7 @@
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%%
-%% %CopyrightEnd%
+%%%% %CopyrightEnd%
 %%
 %%
 %%-----------------------------------------------------------------
@@ -37,7 +36,7 @@
 %%-----------------------------------------------------------------
 -export([start/0, connect/4, listen/3, listen/4, accept/2, accept/3, write/3,
 	 controlling_process/3, close/2, peername/2, sockname/2, 
-	 peerdata/2, peercert/2, sockdata/2, setopts/3, 
+	 peerdata/2, peercert/2, sockdata/2, setopts/3,
 	 clear/2, shutdown/3, post_accept/2, post_accept/3]).
 
 %%-----------------------------------------------------------------
@@ -75,8 +74,6 @@ connect(Type, Host, Port, Options) ->
 	case Type of
 	    normal ->
 		[{keepalive, orber_env:iiop_out_keepalive()}|Options1];
-	    _ when Generation > 2 ->
-		[{keepalive, orber_env:iiop_ssl_out_keepalive()}|Options1];
 	    _ ->
 		Options1
 	end,
@@ -251,8 +248,7 @@ listen(ssl, Port, Options, Exception) ->
 	       end,
     Options4 = if
 		   Generation > 2 ->
-		       [{reuseaddr, true}, 
-			{keepalive, orber_env:iiop_ssl_in_keepalive()}|Options3];
+		       [{reuseaddr, true} |Options3];
 		   true ->
 		       Options3
 	       end,
@@ -362,8 +358,8 @@ peercert(ssl, Socket) ->
     ssl:peercert(Socket);
 peercert(Type, _Socket) ->
     orber:dbg("[~p] orber_socket:peercert(~p);~n"
-	      "Only available for SSL sockets.", 
-	      [?LINE, Type], ?DEBUG_LEVEL),
+ 	      "Only available for SSL sockets.",
+ 	      [?LINE, Type], ?DEBUG_LEVEL),
     {error, ebadsocket}.
 
 %%-----------------------------------------------------------------
diff --git a/lib/orber/src/orber_tb.erl b/lib/orber/src/orber_tb.erl
index e6d5ee4400..cce95f7237 100644
--- a/lib/orber/src/orber_tb.erl
+++ b/lib/orber/src/orber_tb.erl
@@ -39,7 +39,8 @@
 -compile({no_auto_import,[error/2]}).
 -export([wait_for_tables/1, wait_for_tables/2, wait_for_tables/3,
 	 is_loaded/0, is_loaded/1, is_running/0, is_running/1, 
-	 info/2, error/2, unique/1, keysearch/2, keysearch/3]).
+	 info/2, error/2, unique/1, keysearch/2, keysearch/3,
+	check_illegal_tcp_options/1]).
 
 %%----------------------------------------------------------------------
 %% Internal exports
@@ -179,6 +180,38 @@ error(Format, Args) ->
 				 Args).
 
 
+
+
+
+%%----------------------------------------------------------------------
+%% function : check_illegal_tcp_options/1
+%% Arguments: 
+%% Returns  : 
+%% Exception: 
+%% Effect   : 
+%%----------------------------------------------------------------------
+check_illegal_tcp_options(Options) ->
+    check_illegal_tcp_options(Options, []).
+
+check_illegal_tcp_options([],[]) ->
+    ok;
+check_illegal_tcp_options([],IllegalOpts) ->
+    {error, IllegalOpts};
+check_illegal_tcp_options([{active, V} |T], IllegalOpts) ->
+    check_illegal_tcp_options(T,[{active, V} |IllegalOpts]);
+check_illegal_tcp_options([{packet, V} |T], IllegalOpts) ->
+    check_illegal_tcp_options(T,[{packet, V} |IllegalOpts]);
+check_illegal_tcp_options([{mode, V} |T], IllegalOpts) ->
+    check_illegal_tcp_options(T,[{mode, V} |IllegalOpts]);
+check_illegal_tcp_options([list |T], IllegalOpts) ->
+    check_illegal_tcp_options(T,[list |IllegalOpts]);
+check_illegal_tcp_options([binary |T], IllegalOpts) ->
+    check_illegal_tcp_options(T,[binary |IllegalOpts]);
+check_illegal_tcp_options([{reuseaddr, V} |T], IllegalOpts) ->
+    check_illegal_tcp_options(T,[{reuseaddr, V} |IllegalOpts]);
+check_illegal_tcp_options([H|T], IllegalOpts) ->
+    check_illegal_tcp_options(T, IllegalOpts).
+
 %%----------------------------------------------------------------------
 %% Internal functions
 %%----------------------------------------------------------------------
diff --git a/lib/orber/test/csiv2_SUITE.erl b/lib/orber/test/csiv2_SUITE.erl
index 406a8ea693..60ffa1eb09 100644
--- a/lib/orber/test/csiv2_SUITE.erl
+++ b/lib/orber/test/csiv2_SUITE.erl
@@ -70,46 +70,46 @@
 	 profiles =
 	 [#'IOP_TaggedProfile'
 	  {tag = ?TAG_INTERNET_IOP,
-	   profile_data = 
+	   profile_data =
 	   #'IIOP_ProfileBody_1_1'{
 	     iiop_version = #'IIOP_Version'{major = 1,
 					    minor = 2},
 	     host =  "127.0.0.1",
 	     port = 0,
 	     object_key = [0,86,66,1,0,0,0,24,47,70,77,65,95,67,73,82,80,77,65,78,95,80,79,65,95,83,69,67,85,82,69,0,0,0,0,4,0,0,4,186,0,0,2,10,81,218,65,185],
-	     components = 
+	     components =
 	     [#'IOP_TaggedComponent'{tag = ?TAG_SSL_SEC_TRANS,
 				     component_data = #'SSLIOP_SSL'{
 				       target_supports = 102,
 				       target_requires = 66,
 				       port = 49934}},
 	      #'IOP_TaggedComponent'{tag = ?TAG_CSI_SEC_MECH_LIST,
-				     component_data = 
+				     component_data =
 	      #'CSIIOP_CompoundSecMechList'{stateful = true,
-					    mechanism_list = 
+					    mechanism_list =
 					    [#'CSIIOP_CompoundSecMech'
 					     {target_requires = 66,
 					      transport_mech = #'IOP_TaggedComponent'{
 						tag = ?TAG_TLS_SEC_TRANS,
-						component_data = 
+						component_data =
 						#'CSIIOP_TLS_SEC_TRANS'{
 						  target_supports = 102,
 						  target_requires = 66,
-						  addresses = 
+						  addresses =
 						  [#'CSIIOP_TransportAddress'
 						   {host_name = "127.0.0.1",
 						    port = 49934}]}},
-					      as_context_mech = 
+					      as_context_mech =
 					      #'CSIIOP_AS_ContextSec'{
 						target_supports = 0,
 						target_requires = 0,
 						client_authentication_mech = [],
 						target_name = []},
-					      sas_context_mech = 
+					      sas_context_mech =
 					      #'CSIIOP_SAS_ContextSec'{
 						target_supports = 1024,
 						target_requires = 0,
-						privilege_authorities = 
+						privilege_authorities =
 						[#'CSIIOP_ServiceConfiguration'
 						 {syntax = 1447174401,
 						  name = "Borland"}],
@@ -124,7 +124,7 @@
 						supported_identity_types = 15}}]}},
 	      #'IOP_TaggedComponent'
 	      {tag = ?TAG_CODE_SETS,
-	       component_data = 
+	       component_data =
 	       #'CONV_FRAME_CodeSetComponentInfo'{'ForCharData' =
 						  #'CONV_FRAME_CodeSetComponent'{
 						    native_code_set = 65537,
@@ -151,15 +151,15 @@
 
 -ifdef(false).
 %% PKIX1Explicit88
--define(AlgorithmIdentifier, 
+-define(AlgorithmIdentifier,
 	#'AlgorithmIdentifier'{algorithm = ?OID,
 			       parameters = ?ANY}).
 
 -define(Validity, #'Validity'{notBefore = {utcTime, "19820102070533.8"},
 			      notAfter = {generalTime, "19820102070533.8"}}).
 
--define(SubjectPublicKeyInfo, 
-	#'SubjectPublicKeyInfo'{algorithm = ?AlgorithmIdentifier, 
+-define(SubjectPublicKeyInfo,
+	#'SubjectPublicKeyInfo'{algorithm = ?AlgorithmIdentifier,
 				subjectPublicKey = ?BIT_STR}).
 
 -define(AttributeTypeAndValue,
@@ -178,26 +178,26 @@
 
 -define(UniqueIdentifier, ?BIT_STR).
 
--define(Extension, #'Extension'{extnID = ?OID, 
-				critical = ?BOOLEAN, 
+-define(Extension, #'Extension'{extnID = ?OID,
+				critical = ?BOOLEAN,
 				extnValue = ?OCTET_STR}).
 
 -define(Extensions, [?Extension]).
 
 -define(TBSCertificate,
-	#'TBSCertificate'{version = ?Version, 
-			  serialNumber = ?CertificateSerialNumber, 
-			  signature = ?AlgorithmIdentifier, 
-			  issuer = ?Name, 
-			  validity = ?Validity, 
-			  subject = ?Name, 
-			  subjectPublicKeyInfo = ?SubjectPublicKeyInfo, 
-			  issuerUniqueID = ?UniqueIdentifier, 
-			  subjectUniqueID = ?UniqueIdentifier, 
+	#'TBSCertificate'{version = ?Version,
+			  serialNumber = ?CertificateSerialNumber,
+			  signature = ?AlgorithmIdentifier,
+			  issuer = ?Name,
+			  validity = ?Validity,
+			  subject = ?Name,
+			  subjectPublicKeyInfo = ?SubjectPublicKeyInfo,
+			  issuerUniqueID = ?UniqueIdentifier,
+			  subjectUniqueID = ?UniqueIdentifier,
 			  extensions = ?Extensions}).
 
--define(Certificate, #'Certificate'{tbsCertificate = ?TBSCertificate, 
-				    signatureAlgorithm = ?AlgorithmIdentifier, 
+-define(Certificate, #'Certificate'{tbsCertificate = ?TBSCertificate,
+				    signatureAlgorithm = ?AlgorithmIdentifier,
 				    signature = ?BIT_STR}).
 
 %% PKIX1Implicit88
@@ -206,66 +206,66 @@
 
 -define(GeneralNames, [?GeneralName]).
 
-%% PKIXAttributeCertificate	
--define(AttCertValidityPeriod, 
-	#'AttCertValidityPeriod'{notBeforeTime = "19820102070533.8", 
+%% PKIXAttributeCertificate
+-define(AttCertValidityPeriod,
+	#'AttCertValidityPeriod'{notBeforeTime = "19820102070533.8",
 				 notAfterTime = "19820102070533.8"}).
 
 
--define(Attribute, #'Attribute'{type = ?OID, 
+-define(Attribute, #'Attribute'{type = ?OID,
 				values = []}).
 
 -define(Attributes, [?Attribute]).
 
--define(IssuerSerial, #'IssuerSerial'{issuer = ?GeneralNames, 
-				      serial = ?CertificateSerialNumber, 
+-define(IssuerSerial, #'IssuerSerial'{issuer = ?GeneralNames,
+				      serial = ?CertificateSerialNumber,
 				      issuerUID = ?UniqueIdentifier}).
 
 -define(DigestedObjectType, publicKey). %% Enum
 
--define(ObjectDigestInfo, 
-	#'ObjectDigestInfo'{digestedObjectType = ?DigestedObjectType, 
-			    otherObjectTypeID = ?OID, 
-			    digestAlgorithm = ?AlgorithmIdentifier, 
+-define(ObjectDigestInfo,
+	#'ObjectDigestInfo'{digestedObjectType = ?DigestedObjectType,
+			    otherObjectTypeID = ?OID,
+			    digestAlgorithm = ?AlgorithmIdentifier,
 			    objectDigest = ?BIT_STR}).
 
--define(V2Form, #'V2Form'{issuerName = ?GeneralNames, 
-			  baseCertificateID = ?IssuerSerial, 
+-define(V2Form, #'V2Form'{issuerName = ?GeneralNames,
+			  baseCertificateID = ?IssuerSerial,
 			  objectDigestInfo = ?ObjectDigestInfo}).
 
 -define(AttCertVersion, v2).
 
--define(Holder, #'Holder'{baseCertificateID = ?IssuerSerial, 
-			  entityName = ?GeneralNames, 
+-define(Holder, #'Holder'{baseCertificateID = ?IssuerSerial,
+			  entityName = ?GeneralNames,
 			  objectDigestInfo = ?ObjectDigestInfo}).
 
 -define(AttCertIssuer, {v2Form, ?V2Form}).
 
 -define(AttributeCertificateInfo,
-	#'AttributeCertificateInfo'{version = ?AttCertVersion, 
-				    holder = ?Holder, 
-				    issuer = ?AttCertIssuer, 
-				    signature = ?AlgorithmIdentifier, 
-				    serialNumber = ?CertificateSerialNumber, 
+	#'AttributeCertificateInfo'{version = ?AttCertVersion,
+				    holder = ?Holder,
+				    issuer = ?AttCertIssuer,
+				    signature = ?AlgorithmIdentifier,
+				    serialNumber = ?CertificateSerialNumber,
 				    attrCertValidityPeriod = ?AttCertValidityPeriod,
-				    attributes = ?Attributes, 
-				    issuerUniqueID = ?UniqueIdentifier, 
+				    attributes = ?Attributes,
+				    issuerUniqueID = ?UniqueIdentifier,
 				    extensions = ?Extensions}).
 
--define(AttributeCertificate, 
-	#'AttributeCertificate'{acinfo = ?AttributeCertificateInfo, 
-				signatureAlgorithm = ?AlgorithmIdentifier, 
+-define(AttributeCertificate,
+	#'AttributeCertificate'{acinfo = ?AttributeCertificateInfo,
+				signatureAlgorithm = ?AlgorithmIdentifier,
 				signatureValue = ?BIT_STR}).
 
 
 %% OrberCSIv2
--define(AttributeCertChain, 
-	#'AttributeCertChain'{attributeCert = ?AttributeCertificate, 
+-define(AttributeCertChain,
+	#'AttributeCertChain'{attributeCert = ?AttributeCertificate,
 			      certificateChain = ?CertificateChain}).
 
 -define(CertificateChain, [?Certificate]).
 
--define(VerifyingCertChain, [?Certificate]).	
+-define(VerifyingCertChain, [?Certificate]).
 
 -endif.
 
@@ -314,15 +314,15 @@
 
 %%-----------------------------------------------------------------
 %% Func: all/1
-%% Args: 
-%% Returns: 
+%% Args:
+%% Returns:
 %%-----------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     cases().
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
@@ -335,7 +335,7 @@ end_per_group(_GroupName, Config) ->
 %% NOTE - the fragment test cases must bu first since we explicitly set a request
 %% id. Otherwise, the request-id counter would be increased and we cannot know
 %% what it is.
-cases() -> 
+cases() ->
     [ssl_server_peercert_api, ssl_client_peercert_api].
 
 %%-----------------------------------------------------------------
@@ -361,14 +361,20 @@ end_per_testcase(_Case, Config) ->
     ok.
 
 init_per_suite(Config) ->
-    case orber_test_lib:ssl_version() of
-	no_ssl ->
-	    {skip,"SSL is not installed!"};
-	_ ->
-	    Config
+    try crypto:start() of
+        ok ->
+	    case orber_test_lib:ssl_version() of
+		no_ssl ->
+		    {skip, "SSL is not installed!"};
+		_ ->
+		    Config
+	    end
+	catch _:_ ->
+	    {skip, "Crypto did not start"}
     end.
 
 end_per_suite(Config) ->
+    application:stop(crypto),
     Config.
 
 %%-----------------------------------------------------------------
@@ -385,272 +391,272 @@ end_per_suite(Config) ->
 code_CertificateChain_api(doc) -> ["Code CertificateChain"];
 code_CertificateChain_api(suite) -> [];
 code_CertificateChain_api(_Config) ->
-    {ok, Enc} =	
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('CertificateChain', ?CertificateChain)),
-    ?match({ok, [#'Certificate'{}]}, 
+    ?match({ok, [#'Certificate'{}]},
 	   'OrberCSIv2':decode('CertificateChain', list_to_binary(Enc))),
     ok.
 
 code_AttributeCertChain_api(doc) -> ["Code AttributeCertChain"];
 code_AttributeCertChain_api(suite) -> [];
 code_AttributeCertChain_api(_Config) ->
-     {ok, Enc} = 
-	?match({ok, _}, 
+     {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('AttributeCertChain', ?AttributeCertChain)),
-    ?match({ok, #'AttributeCertChain'{}}, 
-	   'OrberCSIv2':decode('AttributeCertChain', list_to_binary(Enc))),   
+    ?match({ok, #'AttributeCertChain'{}},
+	   'OrberCSIv2':decode('AttributeCertChain', list_to_binary(Enc))),
     ok.
 
 code_VerifyingCertChain_api(doc) -> ["Code VerifyingCertChain"];
 code_VerifyingCertChain_api(suite) -> [];
 code_VerifyingCertChain_api(_Config) ->
-     {ok, Enc} = 
-	?match({ok, _}, 
+     {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('VerifyingCertChain', ?VerifyingCertChain)),
-    ?match({ok, [#'Certificate'{}]}, 
-	   'OrberCSIv2':decode('VerifyingCertChain', list_to_binary(Enc))),       
+    ?match({ok, [#'Certificate'{}]},
+	   'OrberCSIv2':decode('VerifyingCertChain', list_to_binary(Enc))),
     ok.
 
 %% PKIXAttributeCertificate
 code_AttributeCertificate_api(doc) -> ["Code AttributeCertificate"];
 code_AttributeCertificate_api(suite) -> [];
 code_AttributeCertificate_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('AttributeCertificate', ?AttributeCertificate)),
-    ?match({ok, #'AttributeCertificate'{}}, 
-	   'OrberCSIv2':decode('AttributeCertificate', list_to_binary(Enc))),   
+    ?match({ok, #'AttributeCertificate'{}},
+	   'OrberCSIv2':decode('AttributeCertificate', list_to_binary(Enc))),
     ok.
 
 code_AttributeCertificateInfo_api(doc) -> ["Code AttributeCertificateInfo"];
 code_AttributeCertificateInfo_api(suite) -> [];
 code_AttributeCertificateInfo_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('AttributeCertificateInfo', ?AttributeCertificateInfo)),
-    ?match({ok, #'AttributeCertificateInfo'{}}, 
-	   'OrberCSIv2':decode('AttributeCertificateInfo', list_to_binary(Enc))),   
+    ?match({ok, #'AttributeCertificateInfo'{}},
+	   'OrberCSIv2':decode('AttributeCertificateInfo', list_to_binary(Enc))),
     ok.
 
 code_AttCertVersion_api(doc) -> ["Code AttCertVersion"];
 code_AttCertVersion_api(suite) -> [];
 code_AttCertVersion_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('AttCertVersion', ?AttCertVersion)),
-    ?match({ok, ?AttCertVersion}, 
-	   'OrberCSIv2':decode('AttCertVersion', list_to_binary(Enc))),   
+    ?match({ok, ?AttCertVersion},
+	   'OrberCSIv2':decode('AttCertVersion', list_to_binary(Enc))),
     ok.
 
 code_Holder_api(doc) -> ["Code Holder"];
 code_Holder_api(suite) -> [];
 code_Holder_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('Holder', ?Holder)),
-    ?match({ok, #'Holder'{}}, 
-	   'OrberCSIv2':decode('Holder', list_to_binary(Enc))),   
+    ?match({ok, #'Holder'{}},
+	   'OrberCSIv2':decode('Holder', list_to_binary(Enc))),
     ok.
 
 code_AttCertIssuer_api(doc) -> ["Code AttCertIssuer"];
 code_AttCertIssuer_api(suite) -> [];
 code_AttCertIssuer_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('AttCertIssuer', ?AttCertIssuer)),
-    ?match({ok, {v2Form, _}}, 
-	   'OrberCSIv2':decode('AttCertIssuer', list_to_binary(Enc))),   
+    ?match({ok, {v2Form, _}},
+	   'OrberCSIv2':decode('AttCertIssuer', list_to_binary(Enc))),
     ok.
 
 code_AttCertValidityPeriod_api(doc) -> ["Code AttCertValidityPeriod"];
 code_AttCertValidityPeriod_api(suite) -> [];
 code_AttCertValidityPeriod_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('AttCertValidityPeriod', ?AttCertValidityPeriod)),
-    ?match({ok, #'AttCertValidityPeriod'{}}, 
-	   'OrberCSIv2':decode('AttCertValidityPeriod', list_to_binary(Enc))),   
+    ?match({ok, #'AttCertValidityPeriod'{}},
+	   'OrberCSIv2':decode('AttCertValidityPeriod', list_to_binary(Enc))),
     ok.
 
 code_V2Form_api(doc) -> ["Code V2Form"];
 code_V2Form_api(suite) -> [];
 code_V2Form_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('V2Form', ?V2Form)),
-    ?match({ok, #'V2Form'{}}, 
-	   'OrberCSIv2':decode('V2Form', list_to_binary(Enc))),   
+    ?match({ok, #'V2Form'{}},
+	   'OrberCSIv2':decode('V2Form', list_to_binary(Enc))),
     ok.
 
 code_IssuerSerial_api(doc) -> ["Code IssuerSerial"];
 code_IssuerSerial_api(suite) -> [];
 code_IssuerSerial_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('IssuerSerial', ?IssuerSerial)),
-    ?match({ok, #'IssuerSerial'{}}, 
-	   'OrberCSIv2':decode('IssuerSerial', list_to_binary(Enc))),   
+    ?match({ok, #'IssuerSerial'{}},
+	   'OrberCSIv2':decode('IssuerSerial', list_to_binary(Enc))),
     ok.
 
 code_ObjectDigestInfo_api(doc) -> ["Code ObjectDigestInfo"];
 code_ObjectDigestInfo_api(suite) -> [];
 code_ObjectDigestInfo_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('ObjectDigestInfo', ?ObjectDigestInfo)),
-    ?match({ok, #'ObjectDigestInfo'{}}, 
-	   'OrberCSIv2':decode('ObjectDigestInfo', list_to_binary(Enc))),   
+    ?match({ok, #'ObjectDigestInfo'{}},
+	   'OrberCSIv2':decode('ObjectDigestInfo', list_to_binary(Enc))),
     ok.
 
 %% PKIX1Explicit88
 code_Certificate_api(doc) -> ["Code Certificate"];
 code_Certificate_api(suite) -> [];
 code_Certificate_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('Certificate', ?Certificate)),
-    ?match({ok, #'Certificate'{}}, 
-	   'OrberCSIv2':decode('Certificate', list_to_binary(Enc))),   
+    ?match({ok, #'Certificate'{}},
+	   'OrberCSIv2':decode('Certificate', list_to_binary(Enc))),
     ok.
 
 code_TBSCertificate_api(doc) -> ["Code TBSCertificate"];
 code_TBSCertificate_api(suite) -> [];
 code_TBSCertificate_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('TBSCertificate', ?TBSCertificate)),
-    ?match({ok, #'TBSCertificate'{}}, 
-	   'OrberCSIv2':decode('TBSCertificate', list_to_binary(Enc))),   
+    ?match({ok, #'TBSCertificate'{}},
+	   'OrberCSIv2':decode('TBSCertificate', list_to_binary(Enc))),
     ok.
 
 code_CertificateSerialNumber_api(doc) -> ["Code CertificateSerialNumber"];
 code_CertificateSerialNumber_api(suite) -> [];
 code_CertificateSerialNumber_api(_Config) ->
-    {ok, Enc} = 
-	?match({ok, _}, 
+    {ok, Enc} =
+	?match({ok, _},
 	       'OrberCSIv2':encode('CertificateSerialNumber', ?CertificateSerialNumber)),
-    ?match({ok, ?CertificateSerialNumber}, 
-	   'OrberCSIv2':decode('CertificateSerialNumber', list_to_binary(Enc))),   
+    ?match({ok, ?CertificateSerialNumber},
+	   'OrberCSIv2':decode('CertificateSerialNumber', list_to_binary(Enc))),
     ok.
 
 code_Version_api(doc) -> ["Code Version"];
 code_Version_api(suite) -> [];
 code_Version_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('Version', ?Version)),
-    ?match({ok, ?Version}, 'OrberCSIv2':decode('Version', list_to_binary(Enc))),   
+    ?match({ok, ?Version}, 'OrberCSIv2':decode('Version', list_to_binary(Enc))),
     ok.
 
 code_AlgorithmIdentifier_api(doc) -> ["Code AlgorithmIdentifier"];
 code_AlgorithmIdentifier_api(suite) -> [];
 code_AlgorithmIdentifier_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('AlgorithmIdentifier', ?AlgorithmIdentifier)),
-    ?match({ok, #'AlgorithmIdentifier'{}}, 
-	   'OrberCSIv2':decode('AlgorithmIdentifier', list_to_binary(Enc))),   
+    ?match({ok, #'AlgorithmIdentifier'{}},
+	   'OrberCSIv2':decode('AlgorithmIdentifier', list_to_binary(Enc))),
     ok.
 
 code_Name_api(doc) -> ["Code Name"];
 code_Name_api(suite) -> [];
 code_Name_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('Name', ?Name)),
-    ?match({ok, {rdnSequence,_}}, 
-	   'OrberCSIv2':decode('Name', list_to_binary(Enc))),   
+    ?match({ok, {rdnSequence,_}},
+	   'OrberCSIv2':decode('Name', list_to_binary(Enc))),
     ok.
 
 code_RDNSequence_api(doc) -> ["Code RDNSequence"];
 code_RDNSequence_api(suite) -> [];
 code_RDNSequence_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('RDNSequence', ?RDNSequence)),
-    ?match({ok, [[#'AttributeTypeAndValue'{}]]}, 
-	   'OrberCSIv2':decode('RDNSequence', list_to_binary(Enc))),   
+    ?match({ok, [[#'AttributeTypeAndValue'{}]]},
+	   'OrberCSIv2':decode('RDNSequence', list_to_binary(Enc))),
     ok.
 
 code_RelativeDistinguishedName_api(doc) -> ["Code RelativeDistinguishedName"];
 code_RelativeDistinguishedName_api(suite) -> [];
 code_RelativeDistinguishedName_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('RelativeDistinguishedName', ?RelativeDistinguishedName)),
-    ?match({ok, [#'AttributeTypeAndValue'{}]}, 
-	   'OrberCSIv2':decode('RelativeDistinguishedName', list_to_binary(Enc))),   
+    ?match({ok, [#'AttributeTypeAndValue'{}]},
+	   'OrberCSIv2':decode('RelativeDistinguishedName', list_to_binary(Enc))),
     ok.
 
 code_AttributeTypeAndValue_api(doc) -> ["Code AttributeTypeAndValue"];
 code_AttributeTypeAndValue_api(suite) -> [];
 code_AttributeTypeAndValue_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('AttributeTypeAndValue', ?AttributeTypeAndValue)),
-    ?match({ok, #'AttributeTypeAndValue'{}}, 
-	   'OrberCSIv2':decode('AttributeTypeAndValue', list_to_binary(Enc))),   
+    ?match({ok, #'AttributeTypeAndValue'{}},
+	   'OrberCSIv2':decode('AttributeTypeAndValue', list_to_binary(Enc))),
     ok.
 
 code_Attribute_api(doc) -> ["Code Attribute"];
 code_Attribute_api(suite) -> [];
 code_Attribute_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('Attribute', ?Attribute)),
-    ?match({ok, #'Attribute'{}}, 
-	   'OrberCSIv2':decode('Attribute', list_to_binary(Enc))),   
+    ?match({ok, #'Attribute'{}},
+	   'OrberCSIv2':decode('Attribute', list_to_binary(Enc))),
     ok.
 
 code_Validity_api(doc) -> ["Code Validity"];
 code_Validity_api(suite) -> [];
 code_Validity_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('Validity', ?Validity)),
-    ?match({ok, #'Validity'{}}, 
-	   'OrberCSIv2':decode('Validity', list_to_binary(Enc))),   
+    ?match({ok, #'Validity'{}},
+	   'OrberCSIv2':decode('Validity', list_to_binary(Enc))),
     ok.
 
 code_SubjectPublicKeyInfo_api(doc) -> ["Code SubjectPublicKeyInfo"];
 code_SubjectPublicKeyInfo_api(suite) -> [];
 code_SubjectPublicKeyInfo_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('SubjectPublicKeyInfo', ?SubjectPublicKeyInfo)),
-    ?match({ok, #'SubjectPublicKeyInfo'{}}, 
-	   'OrberCSIv2':decode('SubjectPublicKeyInfo', list_to_binary(Enc))),   
+    ?match({ok, #'SubjectPublicKeyInfo'{}},
+	   'OrberCSIv2':decode('SubjectPublicKeyInfo', list_to_binary(Enc))),
     ok.
 
 code_UniqueIdentifier_api(doc) -> ["Code UniqueIdentifier"];
 code_UniqueIdentifier_api(suite) -> [];
 code_UniqueIdentifier_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('UniqueIdentifier', ?UniqueIdentifier)),
-    ?match({ok, _}, 'OrberCSIv2':decode('UniqueIdentifier', list_to_binary(Enc))),   
+    ?match({ok, _}, 'OrberCSIv2':decode('UniqueIdentifier', list_to_binary(Enc))),
     ok.
 
 code_Extensions_api(doc) -> ["Code Extensions"];
 code_Extensions_api(suite) -> [];
 code_Extensions_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('Extensions', ?Extensions)),
-    ?match({ok, [#'Extension'{}]}, 
-	   'OrberCSIv2':decode('Extensions', list_to_binary(Enc))),   
+    ?match({ok, [#'Extension'{}]},
+	   'OrberCSIv2':decode('Extensions', list_to_binary(Enc))),
     ok.
 
 code_Extension_api(doc) -> ["Code Extension"];
 code_Extension_api(suite) -> [];
 code_Extension_api(_Config) ->
-    {ok, Enc} = 
+    {ok, Enc} =
 	?match({ok, _}, 'OrberCSIv2':encode('Extension', ?Extension)),
-    ?match({ok, #'Extension'{}}, 
-	   'OrberCSIv2':decode('Extension', list_to_binary(Enc))),   
+    ?match({ok, #'Extension'{}},
+	   'OrberCSIv2':decode('Extension', list_to_binary(Enc))),
     ok.
 
 %% OpenSSL generated x509 Certificate
 code_OpenSSL509_api(doc) -> ["Code OpenSSL generated x509 Certificate"];
 code_OpenSSL509_api(suite) -> [];
 code_OpenSSL509_api(_Config) ->
-    {ok, Cert} = 
-	?match({ok, #'Certificate'{}}, 
+    {ok, Cert} =
+	?match({ok, #'Certificate'{}},
 	       'OrberCSIv2':decode('Certificate', ?X509DER)),
-    AttrCertChain = #'AttributeCertChain'{attributeCert = ?AttributeCertificate, 
+    AttrCertChain = #'AttributeCertChain'{attributeCert = ?AttributeCertificate,
 					  certificateChain = [Cert]},
-    {ok, EAttrCertChain} = 
+    {ok, EAttrCertChain} =
 	?match({ok, _}, 'OrberCSIv2':encode('AttributeCertChain', AttrCertChain)),
-    ?match({ok, #'AttributeCertChain'{}}, 
+    ?match({ok, #'AttributeCertChain'{}},
 	   'OrberCSIv2':decode('AttributeCertChain', list_to_binary(EAttrCertChain))),
     ok.
 
@@ -663,65 +669,65 @@ ssl_server_peercert_api(doc) -> ["Test ssl:peercert (server side)"];
 ssl_server_peercert_api(suite) -> [];
 ssl_server_peercert_api(_Config) ->
     case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    Options = orber_test_lib:get_options(iiop_ssl, server, 
-						 2, [{iiop_ssl_port, 0}]),
-	    {ok, ServerNode, ServerHost} = 
-		?match({ok,_,_}, orber_test_lib:js_node(Options)),
-	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-	    SSLOptions = orber_test_lib:get_options(ssl, client),
- 	    {ok, Socket} = 
-		?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)),
-	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-%% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-%% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
-%	    ?match({ok, #'Certificate'{}}, 
-%		   'OrberCSIv2':decode('Certificate', PeerCert)),
-	    destroy_fake_ORB(ssl, Socket),
-	    ok
+	vxworks ->
+ 	    {skipped, "No SSL-support for VxWorks."};
+	_ ->
+ 	    Options = orber_test_lib:get_options(iiop_ssl, server,
+ 						 2, [{iiop_ssl_port, 0}]),
+ 	    {ok, ServerNode, ServerHost} =
+ 		?match({ok,_,_}, orber_test_lib:js_node(Options)),
+ 	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
+ 	    SSLOptions = orber_test_lib:get_options(ssl, client),
+  	    {ok, Socket} =
+ 		?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)),
+ 	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
+	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
+	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
+						%	    ?match({ok, #'Certificate'{}},
+						%		   'OrberCSIv2':decode('Certificate', PeerCert)),
+ 	    destroy_fake_ORB(ssl, Socket),
+ 	    ok
     end.
 
 ssl_client_peercert_api(doc) -> ["Test ssl:peercert (client side)"];
 ssl_client_peercert_api(suite) -> [];
 ssl_client_peercert_api(_Config) ->
     case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    Options = orber_test_lib:get_options(iiop_ssl, client, 
-						 2, [{iiop_ssl_port, 0}]),
-	    {ok, ClientNode, _ClientHost} = 
-		?match({ok,_,_}, orber_test_lib:js_node(Options)),
-	    crypto:start(),
-	    ssl:start(),
-	    SSLOptions = orber_test_lib:get_options(ssl, server),
-	    {ok, LSock} = ?match({ok, _}, ssl:listen(0, SSLOptions)),
-	    {ok, {_Address, LPort}} = ?match({ok, {_, _}}, ssl:sockname(LSock)),
-	    IOR = ?match({'IOP_IOR',_,_}, 
-			 iop_ior:create_external({1, 2}, "IDL:FAKE:1.0", 
-						 "localhost", 6004, "FAKE", 
-						 [#'IOP_TaggedComponent'
-						  {tag=?TAG_SSL_SEC_TRANS, 
-						   component_data=#'SSLIOP_SSL'
-						   {target_supports = 2, 
-						    target_requires = 2, 
-						    port = LPort}}])),
-	    spawn(orber_test_lib, remote_apply, 
-		  [ClientNode, corba_object, non_existent, [IOR]]),
-	    {ok, Socket} = ?match({ok, _}, ssl:transport_accept(LSock)),
-	    ?match(ok, ssl:ssl_accept(Socket)),
-	    
-	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-%% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-%% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
-%	    ?match({ok, #'Certificate'{}}, 
-%		   'OrberCSIv2':decode('Certificate', PeerCert)),
-	    ssl:close(Socket),
-	    ssl:close(LSock),
-	    ssl:stop(),
-	    ok
+	vxworks ->
+ 	    {skipped, "No SSL-support for VxWorks."};
+	_ ->
+ 	    Options = orber_test_lib:get_options(iiop_ssl, client,
+ 						 2, [{iiop_ssl_port, 0}]),
+ 	    {ok, ClientNode, _ClientHost} =
+ 		?match({ok,_,_}, orber_test_lib:js_node(Options)),
+ 	    crypto:start(),
+ 	    ssl:start(),
+ 	    SSLOptions = orber_test_lib:get_options(ssl, server),
+ 	    {ok, LSock} = ?match({ok, _}, ssl:listen(0, SSLOptions)),
+ 	    {ok, {_Address, LPort}} = ?match({ok, {_, _}}, ssl:sockname(LSock)),
+ 	    IOR = ?match({'IOP_IOR',_,_},
+ 			 iop_ior:create_external({1, 2}, "IDL:FAKE:1.0",
+ 						 "localhost", 6004, "FAKE",
+ 						 [#'IOP_TaggedComponent'
+ 						  {tag=?TAG_SSL_SEC_TRANS,
+ 						   component_data=#'SSLIOP_SSL'
+ 						   {target_supports = 2,
+ 						    target_requires = 2,
+ 						    port = LPort}}])),
+ 	    spawn(orber_test_lib, remote_apply,
+ 		  [ClientNode, corba_object, non_existent, [IOR]]),
+ 	    {ok, Socket} = ?match({ok, _}, ssl:transport_accept(LSock)),
+ 	    ?match(ok, ssl:ssl_accept(Socket)),
+
+ 	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
+	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
+	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
+						%	    ?match({ok, #'Certificate'{}},
+						%		   'OrberCSIv2':decode('Certificate', PeerCert)),
+ 	    ssl:close(Socket),
+ 	    ssl:close(LSock),
+ 	    ssl:stop(),
+ 	    ok
     end.
 
 %%-----------------------------------------------------------------
@@ -730,105 +736,105 @@ ssl_client_peercert_api(_Config) ->
 -ifdef(false).
 %% Not used yet.
 context_test(Obj) ->
-    IDToken1 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAbsent, 
+    IDToken1 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAbsent,
 				    value = true},
-    IDToken2 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAnonymous, 
+    IDToken2 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAnonymous,
 				    value = false},
-    IDToken3 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTPrincipalName, 
+    IDToken3 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTPrincipalName,
 				    value = [0,255]},
-    IDToken4 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTX509CertChain, 
+    IDToken4 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTX509CertChain,
 				    value = [1,255]},
-    IDToken5 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTDistinguishedName, 
+    IDToken5 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTDistinguishedName,
 				    value = [2,255]},
-    IDToken6 = #'CSI_IdentityToken'{label = ?ULONGMAX, 
+    IDToken6 = #'CSI_IdentityToken'{label = ?ULONGMAX,
 				    value = [3,255]},
 
     MTEstablishContext1 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken1, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken1,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext2 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken2, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken2,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext3 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken3, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken3,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext4 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken4, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken4,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext5 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken5, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken5,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext6 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken6, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken6,
 				       client_authentication_token = [1, 255]}},
     MTCompleteEstablishContext = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTCompleteEstablishContext, 
-       value = #'CSI_CompleteEstablishContext'{client_context_id = ?ULONGLONGMAX, 
+      {label = ?CSI_MsgType_MTCompleteEstablishContext,
+       value = #'CSI_CompleteEstablishContext'{client_context_id = ?ULONGLONGMAX,
 					       context_stateful = false,
 					       final_context_token = [1, 255]}},
     MTContextError = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTContextError, 
+      {label = ?CSI_MsgType_MTContextError,
        value = #'CSI_ContextError'{client_context_id = ?ULONGLONGMAX,
-				   major_status = 1, 
-				   minor_status = 2, 
+				   major_status = 1,
+				   minor_status = 2,
 				   error_token = [2,255]}},
     MTMessageInContext = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTMessageInContext, 
-       value = #'CSI_MessageInContext'{client_context_id = ?ULONGLONGMAX, 
+      {label = ?CSI_MsgType_MTMessageInContext,
+       value = #'CSI_MessageInContext'{client_context_id = ?ULONGLONGMAX,
 				       discard_context = true}},
-    Ctx = [#'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+    Ctx = [#'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext1},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext2},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext3},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext4},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext5},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext6},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTCompleteEstablishContext},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTContextError},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTMessageInContext}],
     ?line ?match(ok, orber_test_server:testing_iiop_context(Obj, [{context, Ctx}])).
 
@@ -836,7 +842,7 @@ context_test(Obj) ->
 fake_server_ORB(Type, Port, Options) ->
     start_ssl(Type),
     {ok, ListenSocket, NewPort} =
-	orber_socket:listen(Type, Port, 
+	orber_socket:listen(Type, Port,
 			    [{active, false}|Options]),
     Socket = orber_socket:accept(Type, ListenSocket),
     orber_socket:post_accept(Type, Socket),
@@ -846,7 +852,7 @@ fake_server_ORB(Type, Port, Options) ->
 
 fake_server_ORB(Type, Port, Options, Action, Data) ->
     start_ssl(Type),
-    {ok, ListenSocket, _NewPort} = 
+    {ok, ListenSocket, _NewPort} =
 	orber_socket:listen(Type, Port, [{active, false}|Options]),
     Socket = orber_socket:accept(Type, ListenSocket),
     orber_socket:post_accept(Type, Socket),
@@ -885,13 +891,13 @@ fake_client_ORB(Type, Host, Port, Options, Action, Data) ->
 do_client_action(Type, Socket, fragments, FragList) ->
     ok = send_data(Type, Socket, FragList),
     {ok, Bytes} = gen_tcp:recv(Socket, 0),
-    {#reply_header{request_id = ?REQUEST_ID, reply_status = no_exception}, ok, [Par]} = 
+    {#reply_header{request_id = ?REQUEST_ID, reply_status = no_exception}, ok, [Par]} =
 	cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
     Par;
 do_client_action(Type, Socket, fragments_max, FragList) ->
     ok = send_data(Type, Socket, FragList),
     {ok, Bytes} = gen_tcp:recv(Socket, 0),
-    {#reply_header{request_id = ?REQUEST_ID, reply_status = system_exception}, Exc, []} = 
+    {#reply_header{request_id = ?REQUEST_ID, reply_status = system_exception}, Exc, []} =
 	cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
     Exc;
 do_client_action(Type, Socket, message_error, Data) ->
@@ -916,4 +922,4 @@ send_data(_Type, _Socket, []) ->
 send_data(Type, Socket, [H|T]) ->
     orber_socket:write(Type, Socket, H),
     send_data(Type, Socket, T).
-    
+
diff --git a/lib/orber/test/multi_ORB_SUITE.erl b/lib/orber/test/multi_ORB_SUITE.erl
index b9453663c3..3c1ffd59d3 100644
--- a/lib/orber/test/multi_ORB_SUITE.erl
+++ b/lib/orber/test/multi_ORB_SUITE.erl
@@ -50,30 +50,33 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
 	 init_per_suite/1, end_per_suite/1, basic_PI_api/1, multi_orber_api/1,
-	 init_per_testcase/2, end_per_testcase/2, multi_pseudo_orber_api/1, 
-	 light_orber_api/1, light_orber2_api/1, 
+	 init_per_testcase/2, end_per_testcase/2, multi_pseudo_orber_api/1,
+	 light_orber_api/1, light_orber2_api/1,
 	 ssl_1_multi_orber_api/1, ssl_2_multi_orber_api/1, ssl_reconfigure_api/1,
 	 iiop_timeout_api/1, iiop_timeout_added_api/1, setup_connection_timeout_api/1,
 	 setup_multi_connection_timeout_api/1, setup_multi_connection_timeout_random_api/1,
 	 setup_multi_connection_timeout_attempts_api/1,
-	 fragments_server_api/1, fragments_max_server_api/1, 
+	 fragments_server_api/1, fragments_max_server_api/1,
 	 fragments_max_server_added_api/1, fragments_client_api/1,
 	 light_ifr_api/1, max_requests_api/1, max_requests_added_api/1,
-	 max_connections_api/1, max_packet_size_exceeded_api/1, 
+	 max_connections_api/1, max_packet_size_exceeded_api/1,
 	 max_packet_size_ok_api/1, proxy_interface_api/1, proxy_interface_ipv6_api/1,
 	 multiple_accept_api/1, implicit_context_api/1,
-	 pseudo_implicit_context_api/1, pseudo_two_implicit_context_api/1, 
+	 pseudo_implicit_context_api/1, pseudo_two_implicit_context_api/1,
 	 oneway_implicit_context_api/1, implicit_context_roundtrip_api/1,
 	 oneway_pseudo_implicit_context_api/1, flags_added_api/1,
-	 oneway_pseudo_two_implicit_context_api/1, 
+	 oneway_pseudo_two_implicit_context_api/1,
 	 local_interface_api/1, local_interface_ctx_override_api/1,
 	 local_interface_acl_override_api/1, bad_giop_header_api/1,
 	 bad_fragment_id_client_api/1, bad_id_cancel_request_api/1,
 	 close_connections_api/1, close_connections_local_interface_api/1,
-	 close_connections_local_interface_ctx_override_api/1, ssl_reconfigure_generation_3_api/1,
+	 close_connections_local_interface_ctx_override_api/1,
 	 ssl_1_multi_orber_generation_3_api/1, ssl_2_multi_orber_generation_3_api/1,
+	 ssl_reconfigure_generation_3_api/1,
+	 ssl_1_multi_orber_generation_3_api_old/1, ssl_2_multi_orber_generation_3_api_old/1,
+	 ssl_reconfigure_generation_3_api_old/1,
 	 close_connections_alt_iiop_addr_api/1, close_connections_multiple_profiles_api/1]).
 
 
@@ -84,15 +87,15 @@
 
 %%-----------------------------------------------------------------
 %% Func: all/1
-%% Args: 
-%% Returns: 
+%% Args:
+%% Returns:
 %%-----------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     cases().
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
@@ -105,7 +108,7 @@ end_per_group(_GroupName, Config) ->
 %% NOTE - the fragment test cases must be first since we explicitly set a request
 %% id. Otherwise, the request-id counter would be increased and we cannot know
 %% what it is.
-cases() -> 
+cases() ->
     [fragments_server_api, fragments_max_server_api,
      fragments_max_server_added_api, fragments_client_api,
      flags_added_api, bad_fragment_id_client_api,
@@ -134,21 +137,28 @@ cases() ->
      setup_multi_connection_timeout_attempts_api,
      setup_multi_connection_timeout_random_api,
      ssl_1_multi_orber_api,
+     ssl_1_multi_orber_generation_3_api_old,
      ssl_1_multi_orber_generation_3_api,
      ssl_2_multi_orber_api,
+     ssl_2_multi_orber_generation_3_api_old,
      ssl_2_multi_orber_generation_3_api,
-     ssl_reconfigure_generation_3_api, ssl_reconfigure_api].
+     ssl_reconfigure_api,
+     ssl_reconfigure_generation_3_api_old,
+     ssl_reconfigure_generation_3_api].
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
-init_per_testcase(TC,Config) 
+init_per_testcase(TC,Config)
   when TC =:= ssl_1_multi_orber_api;
        TC =:= ssl_2_multi_orber_api;
        TC =:= ssl_reconfigure_api ->
     init_ssl(Config);
-init_per_testcase(TC,Config) 
-  when TC =:= ssl_1_multi_orber_generation_3_api; 
+init_per_testcase(TC,Config)
+  when TC =:= ssl_1_multi_orber_generation_3_api_old;
+       TC =:= ssl_2_multi_orber_generation_3_api_old;
+       TC =:= ssl_reconfigure_generation_3_api_old;
+       TC =:= ssl_1_multi_orber_generation_3_api;
        TC =:= ssl_2_multi_orber_generation_3_api;
        TC =:= ssl_reconfigure_generation_3_api ->
     init_ssl_3(Config);
@@ -156,21 +166,31 @@ init_per_testcase(_Case, Config) ->
     init_all(Config).
 
 init_ssl(Config) ->
-    case orber_test_lib:ssl_version() of
-	no_ssl ->
-	    {skip,"SSL is not installed!"};
-	_ ->
-	    init_all(Config)
+    case  ?config(crypto_started, Config) of
+	true ->
+	    case orber_test_lib:ssl_version() of
+		no_ssl ->
+		    {skip, "SSL is not installed!"};
+		_ ->
+		    init_all(Config)
+	    end;
+	false ->
+	    {skip, "Crypto did not start"}
     end.
 
 init_ssl_3(Config) ->
-    case orber_test_lib:ssl_version() of
-	3 ->
-	    init_all(Config);
-	2 ->
-	    {skip,"Could not find the correct SSL version!"};
-	no_ssl ->
-	    {skip,"SSL is not installed!"}
+    case  ?config(crypto_started, Config) of
+	true ->
+	    case orber_test_lib:ssl_version() of
+		3 ->
+		    init_all(Config);
+		2 ->
+		    {skip, "Could not find the correct SSL version!"};
+		no_ssl ->
+		    {skip, "SSL is not installed!"}
+	    end;
+	false ->
+	    {skip, "Crypto did not start"}
     end.
 
 init_all(Config) ->
@@ -194,12 +214,18 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) ->
     if
 	is_list(Config) ->
-	    Config;
+            try crypto:start() of
+                ok ->
+		    [{crypto_started, true} | Config]
+            catch _:_ ->
+	       [{crypto_started, false} | Config]
+            end;
 	true ->
 	    exit("Config not a list")
     end.
 
 end_per_suite(Config) ->
+    application:stop(crypto),    
     Config.
 
 %%-----------------------------------------------------------------
@@ -211,238 +237,238 @@ implicit_context_api(suite) -> [];
 implicit_context_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-    
+
     Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([])),
-    ?match(ok, 
+    ?match(ok,
 	   orber_test_server:
-	   relay_call(Relay, 
+	   relay_call(Relay,
 		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-					       context_data = {interface, 
+			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+					       context_data = {interface,
 							       Loopback}}]}],
 		      IOR)),
-    
+
     ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_], 
+    Conns = ?match([_,_],
 		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
     ?match(true, lists:keymember(Loopback, 1, Conns)),
     ok.
 
-implicit_context_roundtrip_api(doc) -> 
+implicit_context_roundtrip_api(doc) ->
     ["IIOP Implicit Contex roundtrip tests"];
 implicit_context_roundtrip_api(suite) -> [];
 implicit_context_roundtrip_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     Relay = ?match(#'IOP_IOR'{},
 		   corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-    
+
     IOR = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [])),
-    ?match(ok, 
+    ?match(ok,
 	   orber_test_server:
-	   relay_call(Relay, 
+	   relay_call(Relay,
 		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-					       context_data = {interface, 
+			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+					       context_data = {interface,
 							       Loopback}}]}],
 		      IOR)),
     ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_], 
+    Conns = ?match([_,_],
 		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
     ?match(true, lists:keymember(Loopback, 1, Conns)),
     ok.
-    
 
-    
+
+
 oneway_implicit_context_api(doc) -> ["IIOP Implicit Contex oneway tests"];
 oneway_implicit_context_api(suite) -> [];
 oneway_implicit_context_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-    
+
     Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([])),
-    ?match(ok, 
+    ?match(ok,
 	   orber_test_server:
-	   relay_cast(Relay, 
+	   relay_cast(Relay,
 		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-					       context_data = {interface, 
+			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+					       context_data = {interface,
 							       Loopback}}]}],
 		      IOR)),
 
-    %% We must wait for a few seconds for the client to be able to set up the 
+    %% We must wait for a few seconds for the client to be able to set up the
     %% connection (since it's a oneway operation).
     timer:sleep(5000),
     ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_], 
+    Conns = ?match([_,_],
 		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
     ?match(true, lists:keymember(Loopback, 1, Conns)),
     ok.
 
-    
+
 pseudo_implicit_context_api(doc) -> ["IIOP Implicit Contex tests (via pseudo object)"];
 pseudo_implicit_context_api(suite) -> [];
 pseudo_implicit_context_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-    
+
     Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{pseudo,true}])),
-    ?match(ok, 
+    ?match(ok,
 	   orber_test_server:
-	   relay_call(Relay, 
+	   relay_call(Relay,
 		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-					       context_data = {interface, 
+			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+					       context_data = {interface,
 							       Loopback}}]}],
 		      IOR)),
     ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_], 
+    Conns = ?match([_,_],
 		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
     ?match(true, lists:keymember(Loopback, 1, Conns)),
     ok.
-    
-pseudo_two_implicit_context_api(doc) -> 
+
+pseudo_two_implicit_context_api(doc) ->
     ["IIOP two Implicit Contex tests (via pseudo object)"];
 pseudo_two_implicit_context_api(suite) -> [];
 pseudo_two_implicit_context_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-    
+
     Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{pseudo,true}])),
-    put(oe_server_in_context, 
-	[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
+    put(oe_server_in_context,
+	[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
 			       context_data = {interface,
 					       IP}}]),
-    ?match(ok, 
+    ?match(ok,
 	   orber_test_server:
-	   relay_call(Relay, 
+	   relay_call(Relay,
 		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-					       context_data = {interface, 
+			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+					       context_data = {interface,
 							       Loopback}}]}],
 		      IOR)),
     ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_], 
+    Conns = ?match([_,_],
 		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
     ?match(true, lists:keymember(Loopback, 1, Conns)),
     ok.
-    
+
 oneway_pseudo_implicit_context_api(doc) -> ["IIOP Implicit Contex tests (via pseudo object oneway)"];
 oneway_pseudo_implicit_context_api(suite) -> [];
 oneway_pseudo_implicit_context_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-    
+
     Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{pseudo,true}])),
-    ?match(ok, 
+    ?match(ok,
 	   orber_test_server:
-	   relay_cast(Relay, 
+	   relay_cast(Relay,
 		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-					       context_data = {interface, 
+			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+					       context_data = {interface,
 							       Loopback}}]}],
 		      IOR)),
     ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_], 
+    Conns = ?match([_,_],
 		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
     ?match(true, lists:keymember(Loopback, 1, Conns)),
     ok.
-    
-oneway_pseudo_two_implicit_context_api(doc) -> 
+
+oneway_pseudo_two_implicit_context_api(doc) ->
     ["IIOP two Implicit Contex tests (via pseudo object oneway)"];
 oneway_pseudo_two_implicit_context_api(suite) -> [];
 oneway_pseudo_two_implicit_context_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-    
+
     Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{pseudo,true}])),
     %% Add incoming implicit context which must be removed.
-    put(oe_server_in_context, 
-	[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
+    put(oe_server_in_context,
+	[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
 			       context_data = {interface,
 					       IP}}]),
-    ?match(ok, 
+    ?match(ok,
 	   orber_test_server:
-	   relay_cast(Relay, 
+	   relay_cast(Relay,
 		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-					       context_data = {interface, 
+			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+					       context_data = {interface,
 							       Loopback}}]}],
 		      IOR)),
     ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_], 
+    Conns = ?match([_,_],
 		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
     ?match(true, lists:keymember(Loopback, 1, Conns)),
     ok.
-    
+
 
 
 multiple_accept_api(doc) -> ["IIOP Multiple Accept tests"];
@@ -450,7 +476,7 @@ multiple_accept_api(suite) -> [];
 multiple_accept_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
@@ -461,84 +487,84 @@ multiple_accept_api(_Config) ->
 
     IOR1 = ?match(#'IOP_IOR'{},
 		  corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR1)),
     ?match([_], orber:iiop_connections(out)),
 
     {ok, Ref1} = ?match({ok, _},
-			orber_test_lib:remote_apply(ServerNode, orber, 
-						    add_listen_interface, 
+			orber_test_lib:remote_apply(ServerNode, orber,
+						    add_listen_interface,
 						    [Loopback, normal])),
 
     IOR2 = ?match(#'IOP_IOR'{},
 		  corba:string_to_object("corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR2)),
     ?match([_,_], orber:iiop_connections(out)),
 
     {ok, Ref2} = ?match({ok, _},
-			orber_test_lib:remote_apply(ServerNode, orber, 
-						    add_listen_interface, 
+			orber_test_lib:remote_apply(ServerNode, orber,
+						    add_listen_interface,
 						    [Loopback, normal, 9543])),
     ?match({error, eaddrinuse},
-	   orber_test_lib:remote_apply(ServerNode, orber, 
-				       add_listen_interface, 
+	   orber_test_lib:remote_apply(ServerNode, orber,
+				       add_listen_interface,
 				       [Loopback, normal, 9543])),
 
     IOR3 = ?match(#'IOP_IOR'{},
 		  corba:string_to_object("corbaloc::1.2@"++Loopback++":9543/NameService")),
-    ?match({'external', {Loopback, 9543, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {Loopback, 9543, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR3)),
     ?match([_,_,_], orber:iiop_connections(out)),
 
-    ?match(ok, 
-	   orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match(ok,
+	   orber_test_lib:remote_apply(ServerNode, orber,
 				       remove_listen_interface, [Ref1])),
     %% Wait a few seconds to be sure that the connections really has been removed.
     timer:sleep(4000),
     ?match([_,_], orber:iiop_connections(out)),
-    
-    ?match(ok, 
-	   orber_test_lib:remote_apply(ServerNode, orber, 
+
+    ?match(ok,
+	   orber_test_lib:remote_apply(ServerNode, orber,
 				       remove_listen_interface, [Ref2])),
     %% Wait a few seconds to be sure that the connections really has been removed.
     timer:sleep(4000),
     ?match([_], orber:iiop_connections(out)),
-    
+
     ?match({'EXCEPTION',_},
 	   corba:string_to_object("corbaloc::1.2@"++Loopback++":9543/NameService")),
     ?match({'EXCEPTION',_},
 	   corba:string_to_object("corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-   
+
     IOR4 = ?match(#'IOP_IOR'{},
 		  corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR4)),
 
     ok.
 
 
-proxy_interface_api(doc) -> ["IIOP Proxy Interface tests", 
+proxy_interface_api(doc) -> ["IIOP Proxy Interface tests",
 			     "This case test if the server ORB use the correct",
 			     "interface when exporting IOR:s"];
 proxy_interface_api(suite) -> [];
 proxy_interface_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR1 = ?match(#'IOP_IOR'{},
 		  corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR1)),
     IOR2 = ?match(#'IOP_IOR'{},
 		  corba:string_to_object("corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR2)),
     ok.
 
-proxy_interface_ipv6_api(doc) -> ["IIOP Proxy Interface tests", 
+proxy_interface_ipv6_api(doc) -> ["IIOP Proxy Interface tests",
 				  "This case test if the server ORB use the correct",
 				  "IPv6 interface when exporting IOR:s"];
 proxy_interface_ipv6_api(suite) -> [];
@@ -550,103 +576,103 @@ proxy_interface_ipv6_api(_Config) ->
 	    Reason
     end.
 
-proxy_interface_ipv6_api2() ->		    
+proxy_interface_ipv6_api2() ->
     Loopback = orber_test_lib:get_loopback_interface(inet6),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor
 							  ?ORB_ENV_LOCAL_INTERFACE)}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
 
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_IPV6}])),
-    
+
     IP = orber_test_lib:remote_apply(ClientNode, orber_test_lib, get_host, []),
 
     IOR1 = ?match(#'IOP_IOR'{},
-		  orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
+		  orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
 					      ["corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   orber_test_lib:remote_apply(ClientNode, iop_ior, get_key, [IOR1])),
     IOR2 = ?match(#'IOP_IOR'{},
-		  orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
+		  orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
 					      ["corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   orber_test_lib:remote_apply(ClientNode, iop_ior, get_key, [IOR2])),
     ok.
 
-local_interface_api(doc) -> ["IIOP Local Interface tests", 
+local_interface_api(doc) -> ["IIOP Local Interface tests",
 			     "This case test if the server ORB use the correct",
 			     "local interface when connecting to another ORB"];
 local_interface_api(suite) -> [];
 local_interface_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, Loopback}])),
     Port = orber:iiop_port(),
     ?match(#'IOP_IOR'{},
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
+	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
 				       ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService"])),
-    [{Loopback, RemotePort}] = 
+    [{Loopback, RemotePort}] =
 	?match([{Loopback,_RemotePort}], orber:iiop_connections(in)),
 
-    ?match([{IP, Port}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match([{IP, Port}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
 				       iiop_connections, [out])),
     ?match([{IP, Port}], orber:find_sockname_by_peername(Loopback,RemotePort)),
     ?match([{Loopback, RemotePort}], orber:find_peername_by_sockname(IP, Port)),
 
-    ?match([{Loopback, RemotePort}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
-				       find_sockname_by_peername, 
+    ?match([{Loopback, RemotePort}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
+				       find_sockname_by_peername,
 				       [IP, Port])),
-    ?match([{IP, Port}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
-				       find_peername_by_sockname, 
+    ?match([{IP, Port}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
+				       find_peername_by_sockname,
 				       [Loopback,RemotePort])),
 
 
     ok.
 
-local_interface_ctx_override_api(doc) -> 
-    ["IIOP Local Interface tests", 
+local_interface_ctx_override_api(doc) ->
+    ["IIOP Local Interface tests",
      "This case test if the server ORB use the correct",
      "local interface when connecting to another ORB"];
 local_interface_ctx_override_api(suite) -> [];
 local_interface_ctx_override_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, IP}])),
     Port = orber:iiop_port(),
     ?match(#'IOP_IOR'{},
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
+	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
 				       ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
 					[#'IOP_ServiceContext'
-					 {context_id=?ORBER_GENERIC_CTX_ID, 
+					 {context_id=?ORBER_GENERIC_CTX_ID,
 					  context_data = {interface, Loopback}}]])),
-    [{Loopback, RemotePort}] = 
+    [{Loopback, RemotePort}] =
 	?match([{Loopback,_RemotePort}], orber:iiop_connections(in)),
 
-    ?match([{IP, Port, Loopback}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match([{IP, Port, Loopback}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
 				       iiop_connections, [out])),
     ?match([{IP, Port}], orber:find_sockname_by_peername(Loopback,RemotePort)),
     ?match([{Loopback, RemotePort}], orber:find_peername_by_sockname(IP, Port)),
 
-    ?match([{Loopback, RemotePort}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
-				       find_sockname_by_peername, 
+    ?match([{Loopback, RemotePort}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
+				       find_sockname_by_peername,
 				       [IP, Port])),
-    ?match([{IP, Port}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
-				       find_peername_by_sockname, 
+    ?match([{IP, Port}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
+				       find_peername_by_sockname,
 				       [Loopback,RemotePort])),
 
     ok.
 
-local_interface_acl_override_api(doc) -> 
-    ["IIOP Local Interface tests", 
+local_interface_acl_override_api(doc) ->
+    ["IIOP Local Interface tests",
      "This case test if the server ORB use the correct",
      "local interface when connecting to another ORB"];
 local_interface_acl_override_api(suite) -> [];
@@ -654,74 +680,74 @@ local_interface_acl_override_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
     ACL = [{tcp_out, IP ++ "/18", [Loopback]}],
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, IP},
 						 {iiop_acl, ACL},
 						 {flags, ?ORB_ENV_USE_ACL_OUTGOING}])),
     Port = orber:iiop_port(),
     ?match(#'IOP_IOR'{},
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
+	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
 				       ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
 					[#'IOP_ServiceContext'
-					 {context_id=?ORBER_GENERIC_CTX_ID, 
+					 {context_id=?ORBER_GENERIC_CTX_ID,
 					  context_data = {interface, IP}}]])),
     ?match([{Loopback,_RemotePort}], orber:iiop_connections(in)),
     ?match(#'IOP_IOR'{},
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
+	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
 				       ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService"])),
 
-    [{Loopback, RemotePort}] = 
+    [{Loopback, RemotePort}] =
 	?match([{Loopback,_RemotePort}], orber:iiop_connections(in)),
-    ?match([{IP, Port, IP}], orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match([{IP, Port, IP}], orber_test_lib:remote_apply(ClientNode, orber,
 							 iiop_connections, [out])),
     ?match([{IP, Port}], orber:find_sockname_by_peername(Loopback,RemotePort)),
     ?match([{Loopback, RemotePort}], orber:find_peername_by_sockname(IP, Port)),
 
-    ?match([{Loopback, RemotePort}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
-				       find_sockname_by_peername, 
+    ?match([{Loopback, RemotePort}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
+				       find_sockname_by_peername,
 				       [IP, Port])),
-    ?match([{IP, Port}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
-				       find_peername_by_sockname, 
+    ?match([{IP, Port}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
+				       find_peername_by_sockname,
 				       [Loopback,RemotePort])),
 
     ok.
 
 
-iiop_timeout_api(doc) -> ["IIOP TIMEOUT API tests", 
+iiop_timeout_api(doc) -> ["IIOP TIMEOUT API tests",
 			 "This case test if timeout configuration behaves correctly"];
 iiop_timeout_api(suite) -> [];
 iiop_timeout_api(_Config) ->
-    
+
     %% Install two secure orber.
-    {ok, ClientNode, ClientHost} = 
+    {ok, ClientNode, ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{iiop_timeout, 6},
 						 {iiop_connection_timeout, 3},
 						 {iiop_in_connection_timeout, 3}])),
     ClientPort = orber_test_lib:remote_apply(ClientNode, orber, iiop_port, []),
-    
-    {ok, ServerNode, ServerHost} = 
+
+    {ok, ServerNode, ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{iiop_timeout, 6},
 						 {iiop_connection_timeout, 3},
 						 {iiop_in_connection_timeout, 12}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [timeout])),
 
-    %% Tell client_orb to interoperate with server_orb. 
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
+    %% Tell client_orb to interoperate with server_orb.
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
 					   lookup,
 					   [ServerHost, ServerPort])),
     %% Interop worked fine, perform delay tests.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
 					   timeouts,
 					   [ServerHost, ServerPort, 6000])),
-    
+
     %% Create a connection to the "client_orb", which will now act as server.
-    ?match({'IOP_IOR',_,_}, 
+    ?match({'IOP_IOR',_,_},
 	   corba:string_to_object("corbaloc::1.2@"++ClientHost++":"++integer_to_list(ClientPort)++"/NameService")),
     %% Check that the connection is established.
     ?match([{_, ClientPort}], orber:iiop_connections(out)),
@@ -729,13 +755,13 @@ iiop_timeout_api(_Config) ->
     %% have been closed.
     timer:sleep(8000),
     ?match([], orber:iiop_connections(out)),
-    
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   uninstall_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   uninstall_test_data,
 					   [timeout])),
     ok.
 
-iiop_timeout_added_api(doc) -> ["IIOP TIMEOUT API tests", 
+iiop_timeout_added_api(doc) -> ["IIOP TIMEOUT API tests",
 			 "This case test if timeout configuration behaves correctly"];
 iiop_timeout_added_api(suite) -> [];
 iiop_timeout_added_api(_Config) ->
@@ -743,18 +769,18 @@ iiop_timeout_added_api(_Config) ->
     {ok, Node, _Host} = ?match({ok,_,_}, orber_test_lib:js_node([])),
     Port = 1 + orber_test_lib:remote_apply(Node, orber, iiop_port, []),
     ?match({ok, _},
-	   orber_test_lib:remote_apply(Node, orber, 
-				       add_listen_interface, 
-				       [IP, normal, 
+	   orber_test_lib:remote_apply(Node, orber,
+				       add_listen_interface,
+				       [IP, normal,
 					[{iiop_in_connection_timeout, 3},
 					 {flags, ?ORB_ENV_LOCAL_INTERFACE},
 					 {iiop_port, Port}]])),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   install_test_data,
 					   [timeout])),
 
-    ?match({'IOP_IOR',_,_}, 
+    ?match({'IOP_IOR',_,_},
 	   corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService")),
     %% Check that the connection is established.
     ?match([{_, Port}], orber:iiop_connections(out)),
@@ -762,9 +788,9 @@ iiop_timeout_added_api(_Config) ->
     %% have been closed.
     timer:sleep(8000),
     ?match([], orber:iiop_connections(out)),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   uninstall_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   uninstall_test_data,
 					   [timeout])),
     ok.
 
@@ -772,27 +798,27 @@ iiop_timeout_added_api(_Config) ->
 %%  API tests for ORB to ORB using pseudo call/cast, no security
 %%-----------------------------------------------------------------
 
-multi_pseudo_orber_api(doc) -> 
-    ["MULTI ORB PSEUDO API tests", 
+multi_pseudo_orber_api(doc) ->
+    ["MULTI ORB PSEUDO API tests",
      "This case test if data encode/decode (IIOP) for pseudo objects",
      "produce the correct result, i.e., the test_server echos",
      "the input parameter or an exception is raised (MARSHAL)."];
 multi_pseudo_orber_api(suite) -> [];
 multi_pseudo_orber_api(_Config) ->
     %% --- Create a slave-node ---
-    {ok, Node, Host} = 
-	?match({ok,_,_}, orber_test_lib:js_node()),    
+    {ok, Node, Host} =
+	?match({ok,_,_}, orber_test_lib:js_node()),
     Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   install_test_data,
 					   [pseudo])),
-    
+
     NSR = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
 		 corba:string_to_object("corbaloc::1.1@"++Host++":"++
 					integer_to_list(Port)++"/NameService")),
-    Obj = 
-	?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+    Obj =
+	?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 	       'CosNaming_NamingContext':resolve(NSR, lname:new(["mamba"]))),
     orber_test_lib:corba_object_tests(Obj, NSR),
 
@@ -809,11 +835,11 @@ multi_pseudo_orber_api(_Config) ->
     orber_test_lib:test_coding(Obj),
 
     %% Test if exit is handled properly.
-    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}}, 
+    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}},
 	   orber_test_server:stop_brutal(Obj)),
 
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   uninstall_test_data,
 					   [pseudo])),
     ok.
 
@@ -821,77 +847,77 @@ multi_pseudo_orber_api(_Config) ->
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB with local flags definition set.
 %%-----------------------------------------------------------------
-flags_added_api(doc) -> 
+flags_added_api(doc) ->
     ["MULTI ORB PSEUDO with local flags definition set"];
 flags_added_api(suite) -> [];
 flags_added_api(_Config) ->
     %% --- Create a slave-node ---
     IP = orber_test_lib:get_host(),
-    {ok, Node, _Host} = 
-	?match({ok,_,_}, orber_test_lib:js_node([])),    
+    {ok, Node, _Host} =
+	?match({ok,_,_}, orber_test_lib:js_node([])),
     Port = 1 + orber_test_lib:remote_apply(Node, orber, iiop_port, []),
     ?match({ok, _},
-	   orber_test_lib:remote_apply(Node, orber, 
-				       add_listen_interface, 
-				       [IP, normal, 
+	   orber_test_lib:remote_apply(Node, orber,
+				       add_listen_interface,
+				       [IP, normal,
 					[{flags, (?ORB_ENV_LOCAL_INTERFACE bor
 						  ?ORB_ENV_EXCLUDE_CODESET_COMPONENT)},
 					 {iiop_port, Port}]])),
 
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-						 install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+						 install_test_data,
 						 [pseudo])),
     Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		       corba:string_to_object("corbaname::1.1@"++IP++":"++
 					      integer_to_list(Port)++"/NameService#mamba")),
-    ?match({'external', {IP, Port, _ObjectKey, _Counter, 
-			 #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, 
-					      profile_data= 
-					      #'IIOP_ProfileBody_1_1'{components=[]}}, 
-			 _NewHD}}, 
+    ?match({'external', {IP, Port, _ObjectKey, _Counter,
+			 #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
+					      profile_data=
+					      #'IIOP_ProfileBody_1_1'{components=[]}},
+			 _NewHD}},
 	   iop_ior:get_key(Obj)),
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-						 uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+						 uninstall_test_data,
 						 [pseudo])),
 
     ok.
 
 
-					 
+
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB with limited concurrent requests
 %%-----------------------------------------------------------------
-max_requests_api(doc) -> 
+max_requests_api(doc) ->
     ["MULTI ORB PSEUDO with limited concurrent requests tests"];
 max_requests_api(suite) -> [];
 max_requests_api(_Config) ->
     %% --- Create a slave-node ---
-    {ok, Node, Host} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_max_in_requests, 1}])),    
+    {ok, Node, Host} =
+	?match({ok,_,_}, orber_test_lib:js_node([{iiop_max_in_requests, 1}])),
     Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
     max_requests(Node, Host, Port).
 
-max_requests_added_api(doc) -> 
+max_requests_added_api(doc) ->
     ["MULTI ORB PSEUDO with limited concurrent requests tests"];
 max_requests_added_api(suite) -> [];
 max_requests_added_api(_Config) ->
     %% --- Create a slave-node ---
     [IP] = ?match([_], orber:host()),
-    {ok, Node, _Host} = 
-	?match({ok,_,_}, orber_test_lib:js_node([])),    
+    {ok, Node, _Host} =
+	?match({ok,_,_}, orber_test_lib:js_node([])),
     Port = 1 + orber_test_lib:remote_apply(Node, orber, iiop_port, []),
     ?match({ok, _},
-	   orber_test_lib:remote_apply(Node, orber, 
-				       add_listen_interface, 
-				       [IP, normal, 
+	   orber_test_lib:remote_apply(Node, orber,
+				       add_listen_interface,
+				       [IP, normal,
 					[{iiop_max_in_requests, 1},
 					 {flags, ?ORB_ENV_LOCAL_INTERFACE},
 					 {iiop_port, Port}]])),
     max_requests(Node, IP, Port).
 
-max_requests(Node, Host, Port) ->    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-						 install_test_data, 
+max_requests(Node, Host, Port) ->
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+						 install_test_data,
 						 [pseudo])),
     Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		       corba:string_to_object("corbaname::1.1@"++Host++":"++
@@ -899,7 +925,7 @@ max_requests(Node, Host, Port) ->
 
     %% Can we even contact the object?
     ?match(ok, orber_test_server:print(Obj)),
-    
+
     %% Invoke one blocking call followed by several invokations.
     spawn(orber_test_server, pseudo_call_delay, [Obj, 15000]),
     %% Wait for a second to be sure that the previous request has been sent
@@ -912,8 +938,8 @@ max_requests(Node, Host, Port) ->
     %% allow one request at a time to the target ORB.
     ?match(true, (MegaSecsB + (Before+8)*1000000) < (MegaSecsA + After*1000000)),
 
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-						 uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+						 uninstall_test_data,
 						 [pseudo])),
 
     ok.
@@ -921,17 +947,17 @@ max_requests(Node, Host, Port) ->
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB with limited concurrent connections
 %%-----------------------------------------------------------------
-max_connections_api(doc) -> 
+max_connections_api(doc) ->
     ["MULTI ORB PSEUDO with limited concurrent connections tests"];
 max_connections_api(suite) -> [];
 max_connections_api(_Config) ->
     %% --- Create a slave-node ---
-    {ok, ServerNode, ServerHost} = 
+    {ok, ServerNode, ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{iiop_backlog, 0},
 						 {iiop_max_in_connections, 2}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-						 install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+						 install_test_data,
 						 [nameservice])),
 
     %% Claim connection 1 & 2
@@ -939,26 +965,26 @@ max_connections_api(_Config) ->
 		       corba:string_to_object("corbaname::1.2@"++ServerHost++":"++
 					      integer_to_list(ServerPort)++"/NameService#mamba")),
     %% Claim backlog
-    {ok, ClientNode, _ClientHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node()),    
+    {ok, ClientNode, _ClientHost} =
+	?match({ok,_,_}, orber_test_lib:js_node()),
 
     spawn(ClientNode, orber_test_server, print, [Obj]),
     timer:sleep(5000),
     ?match([_], orber_test_lib:remote_apply(ClientNode, orber,
 						  iiop_connections, [])),
-    
+
     %% Try to connect. Should fail. Due to the behavior of different TCP stacks, backlog 1
     %% might not be the precise value. Hence, we also need to define the iiop_timeout. Otherwise
     %% this test case will fail. For the same reason we must GC this connection.
-    {ok, ClientNodeII, _ClientHostII} = 
+    {ok, ClientNodeII, _ClientHostII} =
 	?match({ok,_,_}, orber_test_lib:js_node([{iiop_setup_connection_timeout, 5},
 						 {iiop_timeout, 5},
 						 {iiop_connection_timeout, 8}])),
 
-    ?match({'EXCEPTION', _}, 
-	   orber_test_lib:remote_apply(ClientNodeII, orber_test_server, 
+    ?match({'EXCEPTION', _},
+	   orber_test_lib:remote_apply(ClientNodeII, orber_test_server,
 				       testing_iiop_string, [Obj, "Fail"])),
-    
+
     %% Remove 2 connections. We need to wait a moment so that both sides has detected it.
     timer:sleep(5000),
     ?match([_,_], orber:iiop_connections()),
@@ -968,23 +994,23 @@ max_connections_api(_Config) ->
     ?match(ok, orber_iiop_pm:close_connection([{Host, Port}])),
     timer:sleep(5000),
     ?match([], orber:iiop_connections()),
-    
+
     ?match([_], orber_test_lib:remote_apply(ClientNode, orber,
 					    iiop_connections, [])),
 
     ?match([], orber_test_lib:remote_apply(ClientNodeII, orber,
 					   iiop_connections, [])),
 
-    ?match({ok, "OK"}, 
-	   orber_test_lib:remote_apply(ClientNodeII, orber_test_server, 
+    ?match({ok, "OK"},
+	   orber_test_lib:remote_apply(ClientNodeII, orber_test_server,
 				       testing_iiop_string, [Obj, "OK"])),
-    
+
     timer:sleep(4000),
     ?match([_], orber_test_lib:remote_apply(ClientNodeII, orber,
 					    iiop_connections, [])),
 
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-						 uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+						 uninstall_test_data,
 						 [pseudo])),
 
     ok.
@@ -993,18 +1019,18 @@ max_connections_api(_Config) ->
 %%-----------------------------------------------------------------
 %%  API tests for terminating connection by using an IOR.
 %%-----------------------------------------------------------------
-close_connections_api(doc) -> 
+close_connections_api(doc) ->
     ["Close outgoing connection "];
 close_connections_api(suite) -> [];
 close_connections_api(_Config) ->
     %% --- Create a slave-node ---
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IP = orber_test_lib:get_host(),
@@ -1028,108 +1054,108 @@ close_connections_api(_Config) ->
     ok.
 
 
-close_connections_local_interface_api(doc) -> 
-    ["IIOP Local Interface disconnect tests", 
+close_connections_local_interface_api(doc) ->
+    ["IIOP Local Interface disconnect tests",
      "This case test if the server ORB use the correct",
      "local interface when connecting to another ORB"];
 close_connections_local_interface_api(suite) -> [];
 close_connections_local_interface_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, Loopback}])),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{ip_address, IP}])),
     Port = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR = ?match(#'IOP_IOR'{},
-		 orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
+		 orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
 					     ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService"])),
 
     %% Check that the connnection is up and running using the default interface
-    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber,
 								 iiop_connections, [in])),
-    ?match([{IP, Port}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match([{IP, Port}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
 				       iiop_connections, [out])),
     %% Try to close the connection
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber,
 					   close_connection, [IOR])),
     %% Wait a moment so that both sides has detected it.
     timer:sleep(5000),
     %% Now the connection shall be gone.
-    ?match([], orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match([], orber_test_lib:remote_apply(ClientNode, orber,
 					   iiop_connections, [out])),
-    ?match([], orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match([], orber_test_lib:remote_apply(ServerNode, orber,
 					   iiop_connections, [in])),
 
     ok.
 
-close_connections_local_interface_ctx_override_api(doc) -> 
-    ["IIOP Local Interface disconnect tests", 
+close_connections_local_interface_ctx_override_api(doc) ->
+    ["IIOP Local Interface disconnect tests",
      "This case test if the server ORB use the correct",
      "local interface when connecting to another ORB"];
 close_connections_local_interface_ctx_override_api(suite) -> [];
 close_connections_local_interface_ctx_override_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, IP},
 						 {ip_address, IP}])),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{ip_address, IP}])),
     Port = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR = ?match(#'IOP_IOR'{},
-		 orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
+		 orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
 					     ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
 					      [#'IOP_ServiceContext'
-					       {context_id=?ORBER_GENERIC_CTX_ID, 
+					       {context_id=?ORBER_GENERIC_CTX_ID,
 						context_data = {interface, Loopback}}]])),
 
     timer:sleep(2000),
     %% Check that the connnection is up and running using the default interface
-    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber,
 								 iiop_connections, [in])),
-    
-    ?match([{IP, Port, Loopback}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
+
+    ?match([{IP, Port, Loopback}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
 				       iiop_connections, [out])),
     %% Try to close not supplying the interface.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber,
 					   close_connection, [IOR])),
-    
+
     timer:sleep(2000),
     %% The connection shall still be up and running
-    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber,
 								 iiop_connections, [in])),
-    ?match([{IP, Port, Loopback}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match([{IP, Port, Loopback}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
 				       iiop_connections, [out])),
     %% Try to close not supplying the interface.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber,
 					   close_connection, [IOR, IP])),
 
-    timer:sleep(2000),    
+    timer:sleep(2000),
     %% The connection shall still be up and running
-    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber,
 								 iiop_connections, [in])),
-    ?match([{IP, Port, Loopback}], 
-	   orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match([{IP, Port, Loopback}],
+	   orber_test_lib:remote_apply(ClientNode, orber,
 				       iiop_connections, [out])),
-    
+
     %% Try to close supplying the correct interface.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber,
 					   close_connection, [IOR, Loopback])),
     %% Wait a moment so that both sides has detected it.
     timer:sleep(5000),
     %% Now the connection shall be gone.
-    ?match([], orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match([], orber_test_lib:remote_apply(ServerNode, orber,
 					   iiop_connections, [in])),
-    ?match([], orber_test_lib:remote_apply(ClientNode, orber, 
+    ?match([], orber_test_lib:remote_apply(ClientNode, orber,
 					   iiop_connections, [out])),
     ok.
 
-close_connections_alt_iiop_addr_api(doc) -> 
-    ["IIOP alternate address disconnect tests", 
+close_connections_alt_iiop_addr_api(doc) ->
+    ["IIOP alternate address disconnect tests",
      "This case test if the server ORB use the correct",
      "local interface when connecting to another ORB"];
 close_connections_alt_iiop_addr_api(suite) -> [];
@@ -1137,12 +1163,12 @@ close_connections_alt_iiop_addr_api(_Config) ->
     %% --- Create a slave-node ---
     Loopback = orber_test_lib:get_loopback_interface(),
     IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{giop_version, {1, 2}},
 						 {ip_address, {multiple, [IP, Loopback]}}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [{nameservice, Loopback, ServerPort}])),
     %% Create two connections
     Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
@@ -1151,25 +1177,25 @@ close_connections_alt_iiop_addr_api(_Config) ->
     ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 	   corba:string_to_object("corbaname::1.2@"++Loopback++":"++
 				  integer_to_list(ServerPort)++"/NameService#mamba")),
-    timer:sleep(2000),    
+    timer:sleep(2000),
     %% The connection shall still be up and running
     ?match([{_,_}, {_,_}], orber:iiop_connections(out)),
     ?match([{_,_}, {_,_}],
-	   orber_test_lib:remote_apply(ServerNode, orber, 
+	   orber_test_lib:remote_apply(ServerNode, orber,
 				       iiop_connections, [in])),
-    
+
     %% Try to close the connection
     ?match(ok, orber:close_connection(Obj)),
     %% Wait a moment so that both sides has detected it.
     timer:sleep(5000),
     %% Now the connections shall be gone.
     ?match([], orber:iiop_connections(out)),
-    ?match([], orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match([], orber_test_lib:remote_apply(ServerNode, orber,
 					   iiop_connections, [in])),
     ok.
 
-close_connections_multiple_profiles_api(doc) -> 
-    ["IIOP alternate address disconnect tests", 
+close_connections_multiple_profiles_api(doc) ->
+    ["IIOP alternate address disconnect tests",
      "This case test if the server ORB use the correct",
      "local interface when connecting to another ORB"];
 close_connections_multiple_profiles_api(suite) -> [];
@@ -1177,11 +1203,11 @@ close_connections_multiple_profiles_api(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
     %% --- Create a slave-node ---
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address, 
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_}, orber_test_lib:js_node([{ip_address,
 						  {multiple, [Loopback, IP]}}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
 					   install_test_data, [nameservice])),
     %% Create two connections
     Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
@@ -1193,23 +1219,23 @@ close_connections_multiple_profiles_api(_Config) ->
     %% The connection shall still be up and running
     ?match([{_,_}, {_,_}], orber:iiop_connections(out)),
     ?match([{_,_}, {_,_}],
-	   orber_test_lib:remote_apply(ServerNode, orber, 
+	   orber_test_lib:remote_apply(ServerNode, orber,
 				       iiop_connections, [in])),
-    
+
     %% Try to close the connection
     ?match(ok, orber:close_connection(Obj)),
     %% Wait a moment so that both sides has detected it.
     timer:sleep(5000),
     %% Now the connections shall be gone.
     ?match([], orber:iiop_connections(out)),
-    ?match([], orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match([], orber_test_lib:remote_apply(ServerNode, orber,
 					   iiop_connections, [in])),
     ok.
 
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB with iiop_packet_size set
 %%-----------------------------------------------------------------
-max_packet_size_exceeded_api(doc) -> 
+max_packet_size_exceeded_api(doc) ->
     ["Exceed the maximum request size"];
 max_packet_size_exceeded_api(suite) -> [];
 max_packet_size_exceeded_api(_Config) ->
@@ -1219,11 +1245,11 @@ max_packet_size_exceeded_api(_Config) ->
 	{ok, LS} ->
 	    (catch gen_tcp:close(LS)),
 	    %% --- Create a slave-node ---
-	    {ok, ServerNode, ServerHost} = 
+	    {ok, ServerNode, ServerHost} =
 		?match({ok,_,_}, orber_test_lib:js_node([{iiop_packet_size, 1}])),
 	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber,
 						     iiop_port, []),
-	    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
+	    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}},
 		   corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
 	    ok
     end.
@@ -1231,7 +1257,7 @@ max_packet_size_exceeded_api(_Config) ->
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB with iiop_packet_size set
 %%-----------------------------------------------------------------
-max_packet_size_ok_api(doc) -> 
+max_packet_size_ok_api(doc) ->
     ["Not exceed the maximum request size"];
 max_packet_size_ok_api(suite) -> [];
 max_packet_size_ok_api(_Config) ->
@@ -1241,7 +1267,7 @@ max_packet_size_ok_api(_Config) ->
 	{ok, LS} ->
 	    (catch gen_tcp:close(LS)),
 	    %% --- Create a slave-node ---
-	    {ok, ServerNode, ServerHost} = 
+	    {ok, ServerNode, ServerHost} =
 		?match({ok,_,_}, orber_test_lib:js_node([{iiop_packet_size, 5000}])),
 	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber,
 						     iiop_port, []),
@@ -1251,7 +1277,7 @@ max_packet_size_ok_api(_Config) ->
     end.
 
 
- 
+
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB, no security
 %%-----------------------------------------------------------------
@@ -1259,49 +1285,49 @@ max_packet_size_ok_api(_Config) ->
 light_ifr_api(doc) -> ["LIGHT IFR ORB API tests"];
 light_ifr_api(suite) -> [];
 light_ifr_api(_Config) ->
-    
-    {ok, ClientNode, _ClientHost} = 
+
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, 128}])),
 
     ?match([_,_,_,_], orber_test_lib:remote_apply(ClientNode, orber, get_tables, [])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
-                                                 install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
+                                                 install_test_data,
                                                  [nameservice])),
 
 
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, 128}])),    
+    {ok, ServerNode, ServerHost} =
+	?match({ok,_,_}, orber_test_lib:js_node([{flags, 128}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     ?match([_,_,_,_], orber_test_lib:remote_apply(ServerNode, orber, get_tables, [])),
 
-    Obj = ?match({'IOP_IOR',_,_}, 
+    Obj = ?match({'IOP_IOR',_,_},
 		 corba:string_to_object("corbaname::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
     ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, test_coding, [Obj])),
 
     ?match(0, orber_test_lib:remote_apply(ClientNode, orber_diagnostics, missing_modules, [])),
 
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
 					   [#orber_light_ifr{id = "FakeId1",
-							     module=non_existing, 
+							     module=non_existing,
 							     type=?IFR_StructDef}])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
 					   [#orber_light_ifr{id = "FakeId2",
-							     module=non_existing, 
+							     module=non_existing,
 							     type=?IFR_UnionDef}])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
 					   [#orber_light_ifr{id = "FakeId3",
-							     module=non_existing, 
+							     module=non_existing,
 							     type=?IFR_ExceptionDef}])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
 					   [#orber_light_ifr{id = "FakeId4",
-							     module=non_existing, 
+							     module=non_existing,
 							     type=?IFR_InterfaceDef}])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
 					   [#orber_light_ifr{id = "FakeId5",
-							     module=orber_test_lib, 
+							     module=orber_test_lib,
 							     type=?IFR_InterfaceDef}])),
     ?match(5, orber_test_lib:remote_apply(ClientNode, orber_diagnostics, missing_modules, [])),
 
@@ -1316,14 +1342,14 @@ light_ifr_api(_Config) ->
 							 absolute_name="::Module::NonExisting"})),
     ?match(ok, mnesia:dirty_write(#ir_InterfaceDef{ir_Internal_ID = "FakedIId5",
 							 absolute_name="::orber::test::lib"})),
-    
+
     ?match(5, orber_diagnostics:missing_modules()),
 
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-						 uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+						 uninstall_test_data,
 						 [nameservice])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
-						 uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
+						 uninstall_test_data,
 						 [nameservice])),
     ok.
 
@@ -1331,23 +1357,23 @@ light_ifr_api(_Config) ->
 %%  API tests for ORB to ORB, no security
 %%-----------------------------------------------------------------
 
-light_orber_api(doc) -> ["LIGHT ORB API tests", 
+light_orber_api(doc) -> ["LIGHT ORB API tests",
 			 "This case test if a light Orber can communicate correctly",
 			 "with an fully installed Orber."];
 light_orber_api(suite) -> [];
 light_orber_api(_Config) ->
     %% --- Create a slave-node ---
     LocalHost = net_adm:localhost(),
-    {ok, Node, _Host} = 
+    {ok, Node, _Host} =
 	?match({ok,_,_}, orber_test_lib:js_node([{lightweight, ["iiop://"++LocalHost++":"++integer_to_list(orber:iiop_port())]}],
 						lightweight)),
     ?match(ok, orber:info(io)),
     ?match([_], orber_test_lib:remote_apply(Node, orber_env, get_lightweight_nodes,[])),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-						 install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+						 install_test_data,
 						 [light])),
-    
+
     Obj1=(catch orber_test_server:oe_create(state,[{pseudo,true}])),
     ?match({_,pseudo,orber_test_server_impl, _,_, _}, Obj1),
     Obj2=(catch orber_test_server:oe_create(state,[])),
@@ -1357,11 +1383,11 @@ light_orber_api(_Config) ->
     'CosNaming_NamingContext':bind(NS, lname:new(["mamba"]), Obj1),
     'CosNaming_NamingContext':bind(NS, lname:new(["viper"]), Obj2),
 
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
 					   light_tests,
 					   [LocalHost,
 					    orber:iiop_port(), "viper"])),
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
 					   light_tests,
 					   [LocalHost,
 					    orber:iiop_port(), "mamba"])),
@@ -1370,17 +1396,17 @@ light_orber_api(_Config) ->
 
     catch corba:dispose(Obj1),
     catch corba:dispose(Obj2),
-    catch 'CosNaming_NamingContext':destroy(NS),    
+    catch 'CosNaming_NamingContext':destroy(NS),
 
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-						 uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+						 uninstall_test_data,
 						 [light])),
     ok.
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB, no security
 %%-----------------------------------------------------------------
 
-light_orber2_api(doc) -> ["LIGHT ORB API tests", 
+light_orber2_api(doc) -> ["LIGHT ORB API tests",
 			 "This case test if a light Orber can communicate correctly",
 			 "with an fully installed Orber. This case test if we can",
 			 "start as lightweight without first setting the environment",
@@ -1389,16 +1415,16 @@ light_orber2_api(suite) -> [];
 light_orber2_api(_Config) ->
     %% --- Create a slave-node ---
     LocalHost = net_adm:localhost(),
-    {ok, Node, _Host} = 
-	?match({ok,_,_}, orber_test_lib:js_node([], 
+    {ok, Node, _Host} =
+	?match({ok,_,_}, orber_test_lib:js_node([],
 						{lightweight, ["iiop://"++LocalHost++":"++integer_to_list(orber:iiop_port())]})),
     ?match(ok, orber:info(io)),
     ?match([_], orber_test_lib:remote_apply(Node, orber_env, get_lightweight_nodes,[])),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   install_test_data,
 					   [light])),
-    
+
     Obj1=(catch orber_test_server:oe_create(state,[{pseudo,true}])),
     ?match({_,pseudo,orber_test_server_impl, _,_, _}, Obj1),
     Obj2=(catch orber_test_server:oe_create(state,[])),
@@ -1407,12 +1433,12 @@ light_orber2_api(_Config) ->
     NS  = corba:resolve_initial_references("NameService"),
     'CosNaming_NamingContext':bind(NS, lname:new(["mamba"]), Obj1),
     'CosNaming_NamingContext':bind(NS, lname:new(["viper"]), Obj2),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
 					   light_tests,
 					   [LocalHost,
 					    orber:iiop_port(), "viper"])),
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
 					   light_tests,
 					   [LocalHost,
 					    orber:iiop_port(), "mamba"])),
@@ -1421,10 +1447,10 @@ light_orber2_api(_Config) ->
 
     catch corba:dispose(Obj1),
     catch corba:dispose(Obj2),
-    catch 'CosNaming_NamingContext':destroy(NS),    
+    catch 'CosNaming_NamingContext':destroy(NS),
 
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   uninstall_test_data,
 					   [light])),
     ok.
 
@@ -1432,13 +1458,13 @@ light_orber2_api(_Config) ->
 %%  API tests for ORB to ORB, no security
 %%-----------------------------------------------------------------
 
-multi_orber_api(doc) -> ["MULTI ORB API tests", 
+multi_orber_api(doc) -> ["MULTI ORB API tests",
 			 "This case test if data encode/decode (IIOP)",
 			 "produce the correct result, i.e., the test_server echos",
 			 "the input parameter or an exception is raised (MARSHAL)."];
 multi_orber_api(suite) -> [];
 multi_orber_api(_Config) ->
-    
+
     NewICObj1 = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([])),
     NewICObj2 = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{regname, {local, newic2}}])),
     NewICObj3 = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{regname, {global, newic3}}])),
@@ -1448,34 +1474,34 @@ multi_orber_api(_Config) ->
     catch corba:dispose(NewICObj1),
     catch corba:dispose(NewICObj2),
     catch corba:dispose(NewICObj3),
-    
+
     %% --- Create a slave-node ---
-    {ok, Node, Host} = 
-	?match({ok,_,_}, orber_test_lib:js_node()),    
+    {ok, Node, Host} =
+	?match({ok,_,_}, orber_test_lib:js_node()),
     Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
-    
+
     NSR = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
 		 corba:string_to_object("corbaloc::1.2@"++Host++":"++
 					integer_to_list(Port)++"/NameService")),
-    
+
     ?match({'EXCEPTION',{'CosNaming_NamingContext_NotFound',_,_,_}},
 	   'CosNaming_NamingContext':resolve(NSR, lname:new(["not_exist"]))),
 
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		 'CosNaming_NamingContext':resolve(NSR, lname:new(["mamba"]))),
     ?match(ok, orber_test_server:print(Obj)),
 
-    Obj12B = ?match({'IOP_IOR',_,_}, 
+    Obj12B = ?match({'IOP_IOR',_,_},
 		    corba:string_to_object("corbaloc::1.2@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-    
-    Obj11B = ?match({'IOP_IOR',_,_}, 
+
+    Obj11B = ?match({'IOP_IOR',_,_},
 		    corba:string_to_object("corbaloc::1.1@"++Host++":"++integer_to_list(Port)++"/Mamba")),
 
-    Obj10B = ?match({'IOP_IOR',_,_}, 
+    Obj10B = ?match({'IOP_IOR',_,_},
 		    corba:string_to_object("corbaloc::1.0@"++Host++":"++integer_to_list(Port)++"/Mamba")),
 
     context_test(Obj12B),
@@ -1484,7 +1510,7 @@ multi_orber_api(_Config) ->
     ?match(ok, orber_test_server:print(Obj12B)),
     ?match(ok, orber_test_server:print(Obj11B)),
     ?match(ok, orber_test_server:print(Obj10B)),
-    ?match({'EXCEPTION',{'CosNaming_NamingContextExt_InvalidAddress',_}}, 
+    ?match({'EXCEPTION',{'CosNaming_NamingContextExt_InvalidAddress',_}},
 	   corba:string_to_object("corbaloc::1.0@"++Host++":"++integer_to_list(Port)++"/Wrong")),
 
     ?match(ok, orber_test_lib:corba_object_tests(Obj12B, NSR)),
@@ -1493,22 +1519,22 @@ multi_orber_api(_Config) ->
 
     %%--- Testing code and decode arguments ---
     orber_test_lib:test_coding(Obj),
-    
-    ?match({'EXCEPTION',#'BAD_CONTEXT'{}}, 
+
+    ?match({'EXCEPTION',#'BAD_CONTEXT'{}},
 	   orber_test_server:
-	   print(Obj12B, 
+	   print(Obj12B,
 		 [{context,
-		   [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-					  context_data = {interface, 
+		   [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+					  context_data = {interface,
 							  {127,0,0,1}}}]}])),
-    
-    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}}, 
+
+    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}},
 	   orber_test_server:stop_brutal(Obj12B)),
-    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}}, 
+    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}},
 		 orber_test_server:print(Obj12B)),
 
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   uninstall_test_data,
 					   [nameservice])),
     ok.
 
@@ -1516,9 +1542,9 @@ multi_orber_api(_Config) ->
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB, no security, using basic interceptors
 %%-----------------------------------------------------------------
-basic_PI_api(doc) -> ["MULTI ORB API tests", 
+basic_PI_api(doc) -> ["MULTI ORB API tests",
 		      "This case test if data encode/decode (IIOP)",
-		      "produce the correct result when using basic interceptors,", 
+		      "produce the correct result when using basic interceptors,",
 		      "i.e., the test_server echos",
 		      "the input parameter or an exception is raised (MARSHAL)."];
 basic_PI_api(suite) -> [];
@@ -1526,21 +1552,21 @@ basic_PI_api(_Config) ->
     %% Change configuration to use Basic Interceptors.
     orber:configure_override(interceptors, {native, [orber_test_lib]}),
     %% --- Create a slave-node ---
-    {ok, Node, Host} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{interceptors, {native, [orber_test_lib]}}])),    
+    {ok, Node, Host} =
+	?match({ok,_,_}, orber_test_lib:js_node([{interceptors, {native, [orber_test_lib]}}])),
     Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
-    
-    Obj12 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+
+    Obj12 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		   corba:string_to_object("corbaname::1.2@"++Host++":"++integer_to_list(Port)++"/NameService#mamba")),
-    
-    Obj11 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+
+    Obj11 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		   corba:string_to_object("corbaname::1.1@"++Host++":"++integer_to_list(Port)++"/NameService#mamba")),
-    
-    Obj10 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+
+    Obj10 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		   corba:string_to_object("corbaname::1.0@"++Host++":"++integer_to_list(Port)++"/NameService#mamba")),
 
     ?match(ok, corba:print_object(Obj12)),
@@ -1552,13 +1578,13 @@ basic_PI_api(_Config) ->
     ?match(ok, orber_test_server:print(Obj10)),
 
 
-    Obj12B = ?match({'IOP_IOR',_,_}, 
+    Obj12B = ?match({'IOP_IOR',_,_},
 		    corba:string_to_object("corbaloc::1.2@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-    
-    Obj11B = ?match({'IOP_IOR',_,_}, 
+
+    Obj11B = ?match({'IOP_IOR',_,_},
 		    corba:string_to_object("corbaloc::1.1@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-    
-    Obj10B = ?match({'IOP_IOR',_,_}, 
+
+    Obj10B = ?match({'IOP_IOR',_,_},
 		    corba:string_to_object("corbaloc::1.0@"++Host++":"++integer_to_list(Port)++"/Mamba")),
 
     ?match(ok, corba:print_object(Obj12B, info_msg)),
@@ -1568,7 +1594,7 @@ basic_PI_api(_Config) ->
     ?match(ok, orber_test_server:print(Obj12B)),
     ?match(ok, orber_test_server:print(Obj11B)),
     ?match(ok, orber_test_server:print(Obj10B)),
-    ?match({'EXCEPTION',{'CosNaming_NamingContextExt_InvalidAddress',_}}, 
+    ?match({'EXCEPTION',{'CosNaming_NamingContextExt_InvalidAddress',_}},
 		 corba:string_to_object("corbaloc::1.0@"++Host++":"++integer_to_list(Port)++"/Wrong")),
 
     ?match(ok, orber_test_lib:alternate_iiop_address(Host, Port)),
@@ -1583,8 +1609,8 @@ basic_PI_api(_Config) ->
 
     application:set_env(orber, interceptors, false),
 
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   uninstall_test_data,
 					   [nameservice])),
     ok.
 
@@ -1593,62 +1619,95 @@ basic_PI_api(_Config) ->
 %%  API tests for ORB to ORB, ssl security depth 1
 %%-----------------------------------------------------------------
 
-ssl_1_multi_orber_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)", 
+ssl_1_multi_orber_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
 			       "This case set up two secure orbs and test if they can",
 			     "communicate. The case also test to access one of the",
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_1_multi_orber_api(suite) -> [];
 ssl_1_multi_orber_api(_Config) ->
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
 					       1, [{iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
 					       1, [{iiop_ssl_port, 0}]),
     ssl_suite(ServerOptions, ClientOptions).
-    
-ssl_1_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)", 
+
+
+ssl_1_multi_orber_generation_3_api_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
+			       "This case set up two secure orbs and test if they can",
+			     "communicate. The case also test to access one of the",
+			     "secure orbs which must raise a NO_PERMISSION exception."];
+ssl_1_multi_orber_generation_3_api_old(suite) -> [];
+ssl_1_multi_orber_generation_3_api_old(_Config) ->
+
+    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
+					       1, [{ssl_generation, 3},
+						   {iiop_ssl_port, 0}]),
+    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
+					       1, [{ssl_generation, 3},
+						   {iiop_ssl_port, 0}]),
+    ssl_suite(ServerOptions, ClientOptions).
+
+
+ssl_1_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
 			       "This case set up two secure orbs and test if they can",
 			     "communicate. The case also test to access one of the",
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_1_multi_orber_generation_3_api(suite) -> [];
 ssl_1_multi_orber_generation_3_api(_Config) ->
-   
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
 					       1, [{ssl_generation, 3},
 						   {iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
 					       1, [{ssl_generation, 3},
 						   {iiop_ssl_port, 0}]),
     ssl_suite(ServerOptions, ClientOptions).
-    
 
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB, ssl security depth 2
 %%-----------------------------------------------------------------
 
-ssl_2_multi_orber_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)", 
+ssl_2_multi_orber_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
 			     "This case set up two secure orbs and test if they can",
 			     "communicate. The case also test to access one of the",
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_2_multi_orber_api(suite) -> [];
-ssl_2_multi_orber_api(_Config) -> 
-    
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+ssl_2_multi_orber_api(_Config) ->
+
+    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
 					       2, [{iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
 					       2, [{iiop_ssl_port, 0}]),
     ssl_suite(ServerOptions, ClientOptions).
 
-ssl_2_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)", 
+
+ssl_2_multi_orber_generation_3_api_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
+			     "This case set up two secure orbs and test if they can",
+			     "communicate. The case also test to access one of the",
+			     "secure orbs which must raise a NO_PERMISSION exception."];
+ssl_2_multi_orber_generation_3_api_old(suite) -> [];
+ssl_2_multi_orber_generation_3_api_old(_Config) ->
+
+    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
+					       2, [{ssl_generation, 3},
+						   {iiop_ssl_port, 0}]),
+    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
+					       2, [{ssl_generation, 3},
+						   {iiop_ssl_port, 0}]),
+    ssl_suite(ServerOptions, ClientOptions).
+
+
+ssl_2_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
 			     "This case set up two secure orbs and test if they can",
 			     "communicate. The case also test to access one of the",
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_2_multi_orber_generation_3_api(suite) -> [];
-ssl_2_multi_orber_generation_3_api(_Config) -> 
-    
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+ssl_2_multi_orber_generation_3_api(_Config) ->
+
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
 					       2, [{ssl_generation, 3},
 						   {iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
 					       2, [{ssl_generation, 3},
 						   {iiop_ssl_port, 0}]),
     ssl_suite(ServerOptions, ClientOptions).
@@ -1656,77 +1715,135 @@ ssl_2_multi_orber_generation_3_api(_Config) ->
 %%  API tests for ORB to ORB, ssl security depth 2
 %%-----------------------------------------------------------------
 
-ssl_reconfigure_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)", 
+ssl_reconfigure_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
 			     "This case set up two secure orbs and test if they can",
 			     "communicate. The case also test to access one of the",
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_reconfigure_api(suite) -> [];
-ssl_reconfigure_api(_Config) -> 
-    ssl_reconfigure([]).
+ssl_reconfigure_api(_Config) ->
+    ssl_reconfigure_old([]).
+
 
-ssl_reconfigure_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)", 
+ssl_reconfigure_generation_3_api_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
+			     "This case set up two secure orbs and test if they can",
+			     "communicate. The case also test to access one of the",
+			     "secure orbs which must raise a NO_PERMISSION exception."];
+ssl_reconfigure_generation_3_api_old(suite) -> [];
+ssl_reconfigure_generation_3_api_old(_Config) ->
+    ssl_reconfigure_old([{ssl_generation, 3}]).
+
+ssl_reconfigure_old(ExtraSSLOptions) ->
+
+    IP = orber_test_lib:get_host(),
+    Loopback = orber_test_lib:get_loopback_interface(),
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_},
+	       orber_test_lib:js_node([{iiop_port, 0},
+				       {flags, ?ORB_ENV_LOCAL_INTERFACE},
+				       {ip_address, IP}|ExtraSSLOptions])),
+    orber_test_lib:remote_apply(ServerNode, ssl, start, []),
+    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
+					   [ssl])),
+    ?match({ok, _},
+	   orber_test_lib:remote_apply(ServerNode, orber,
+				       add_listen_interface,
+				       [Loopback, normal, [{iiop_port, 5648},
+							   {iiop_ssl_port, 5649},
+							   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]])),
+    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
+					       2, [{flags, ?ORB_ENV_LOCAL_INTERFACE},
+						   {iiop_port, 5648},
+						   {iiop_ssl_port, 5649},
+						   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]),
+    ?match({ok, _},
+	   orber_test_lib:remote_apply(ServerNode, orber,
+				       add_listen_interface,
+				       [Loopback, ssl, ServerOptions])),
+
+    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
+					       2, [{iiop_ssl_port, 0}|ExtraSSLOptions]),
+    {ok, ClientNode, _ClientHost} =
+	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
+
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
+					   install_test_data,
+					   [ssl])),
+    orber_test_lib:remote_apply(ClientNode, ssl, start, []),
+    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
+    Obj = ?match(#'IOP_IOR'{},
+		 orber_test_lib:remote_apply(ClientNode, corba,
+					     string_to_object, ["corbaname:iiop:1.1@"++Loopback++":5648/NameService#mamba",
+								[{context, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
+												  context_data = {configuration, ClientOptions}}]}]])),
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_server,
+					   print, [Obj])).
+
+
+ssl_reconfigure_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
 			     "This case set up two secure orbs and test if they can",
 			     "communicate. The case also test to access one of the",
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_reconfigure_generation_3_api(suite) -> [];
-ssl_reconfigure_generation_3_api(_Config) -> 
+ssl_reconfigure_generation_3_api(_Config) ->
     ssl_reconfigure([{ssl_generation, 3}]).
 
+
 ssl_reconfigure(ExtraSSLOptions) ->
 
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, 
-	       orber_test_lib:js_node([{iiop_port, 0}, 
-				       {flags, ?ORB_ENV_LOCAL_INTERFACE}, 
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_},
+	       orber_test_lib:js_node([{iiop_port, 0},
+				       {flags, ?ORB_ENV_LOCAL_INTERFACE},
 				       {ip_address, IP}|ExtraSSLOptions])),
     orber_test_lib:remote_apply(ServerNode, ssl, start, []),
     orber_test_lib:remote_apply(ServerNode, crypto, start, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [ssl])),
-    ?match({ok, _}, 
-	   orber_test_lib:remote_apply(ServerNode, orber, 
-				       add_listen_interface, 
+    ?match({ok, _},
+	   orber_test_lib:remote_apply(ServerNode, orber,
+				       add_listen_interface,
 				       [Loopback, normal, [{iiop_port, 5648},
 							   {iiop_ssl_port, 5649},
 							   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]])),
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
-					       2, [{flags, ?ORB_ENV_LOCAL_INTERFACE}, 
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
+					       2, [{flags, ?ORB_ENV_LOCAL_INTERFACE},
 						   {iiop_port, 5648},
 						   {iiop_ssl_port, 5649},
 						   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]),
-    ?match({ok, _}, 
-	   orber_test_lib:remote_apply(ServerNode, orber, 
-				       add_listen_interface, 
+    ?match({ok, _},
+	   orber_test_lib:remote_apply(ServerNode, orber,
+				       add_listen_interface,
 				       [Loopback, ssl, ServerOptions])),
 
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
 					       2, [{iiop_ssl_port, 0}|ExtraSSLOptions]),
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
 
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
+					   install_test_data,
 					   [ssl])),
     orber_test_lib:remote_apply(ClientNode, ssl, start, []),
     orber_test_lib:remote_apply(ServerNode, crypto, start, []),
-    Obj = ?match(#'IOP_IOR'{}, 
+    Obj = ?match(#'IOP_IOR'{},
 		 orber_test_lib:remote_apply(ClientNode, corba,
 					     string_to_object, ["corbaname:iiop:1.1@"++Loopback++":5648/NameService#mamba",
-								[{context, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
+								[{context, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
 												  context_data = {configuration, ClientOptions}}]}]])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_server, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_server,
 					   print, [Obj])).
 
 
-
 %%-----------------------------------------------------------------
 %%  API tests for Orber to Java ORB, no security
 %%-----------------------------------------------------------------
 
-%orber_java_api(doc) -> ["ERLANG-ORB <-> JAVA-ORB API tests", 
+%orber_java_api(doc) -> ["ERLANG-ORB <-> JAVA-ORB API tests",
 %			"This case test if data encode/decode (IIOP)",
 %			"produce the correct result, i.e., the test_server echos",
 %			"the input parameter or an exception is raised (MARSHAL)."];
@@ -1739,38 +1856,38 @@ ssl_reconfigure(ExtraSSLOptions) ->
 %% Arguments: Config
 %%            Depth
 %% Returns  : ok
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 
 ssl_suite(ServerOptions, ClientOptions) ->
 
-    {ok, ServerNode, ServerHost} = 
+    {ok, ServerNode, ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
 
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-    
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [ssl])),
     %% Tell the client to interoperate with the server. The purpose of this
     %% operation is to look up, using NameService, an object reference and
     %% use it to contact the object.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
 					   lookup,
 					   [ServerHost, ServerPort])),
-    
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
+
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
 					   alternate_ssl_iiop_address,
 					   [ServerHost, ServerPort, SSLServerPort])),
-    
+
     %% 'This' node is not secure. Contact the server. Must refuse connection.
     NSR = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
 		       corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++
 					      integer_to_list(ServerPort)++"/NameService")),
-    
+
     %% Should be 'NO_PERMISSION'??
     ?match({'EXCEPTION',{'COMM_FAILURE',_,_,_}},
 		 'CosNaming_NamingContext':resolve(NSR, lname:new(["not_exist"]))),
@@ -1780,8 +1897,8 @@ ssl_suite(ServerOptions, ClientOptions) ->
 		 'CosNaming_NamingContext':resolve(NSR, lname:new(["mamba"]))),
 
     %% Uninstall.
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   uninstall_test_data,
 					   [ssl])),
     ok.
 
@@ -1793,7 +1910,7 @@ setup_connection_timeout_api(suite) -> [];
 setup_connection_timeout_api(_Config) ->
     ?match(ok, application:set_env(orber, iiop_backlog, 0)),
     %% Wait to be sure that the configuration has kicked in.
-    timer:sleep(2000),    
+    timer:sleep(2000),
     {ok, Ref, Port} = create_fake_server_ORB(normal, 0, [], listen, []),
     ?match(ok, orber:configure(iiop_setup_connection_timeout, 5)),
     ?match(ok, orber:info(io)),
@@ -1813,7 +1930,7 @@ setup_connection_timeout_api(_Config) ->
 %%-----------------------------------------------------------------
 %%  iiop_setup_connection_timeout API tests for ORB to ORB.
 %%-----------------------------------------------------------------
-setup_multi_connection_timeout_api(doc) -> 
+setup_multi_connection_timeout_api(doc) ->
     ["iiop_multi_setup_connection_timeout API tests for ORB to ORB."];
 setup_multi_connection_timeout_api(suite) -> [];
 setup_multi_connection_timeout_api(_Config) ->
@@ -1838,7 +1955,7 @@ setup_multi_connection_timeout_api(_Config) ->
     ?match(ok, application:set_env(orber, iiop_out_ports, undefined)),
     ok.
 
-setup_multi_connection_timeout_attempts_api(doc) -> 
+setup_multi_connection_timeout_attempts_api(doc) ->
     ["iiop_multi_setup_connection_timeout API tests for ORB to ORB."];
 setup_multi_connection_timeout_attempts_api(suite) -> [];
 setup_multi_connection_timeout_attempts_api(_Config) ->
@@ -1864,7 +1981,7 @@ setup_multi_connection_timeout_attempts_api(_Config) ->
     ?match(ok, application:set_env(orber, iiop_out_ports, undefined)),
     ok.
 
-setup_multi_connection_timeout_random_api(doc) -> 
+setup_multi_connection_timeout_random_api(doc) ->
     ["iiop_multi_setup_connection_timeout API tests for ORB to ORB."];
 setup_multi_connection_timeout_random_api(suite) -> [];
 setup_multi_connection_timeout_random_api(_Config) ->
@@ -1899,17 +2016,17 @@ bad_giop_header_api(_Config) ->
     orber:configure_override(interceptors, {native,[orber_iiop_tracer]}),
     orber:configure(orber_debug_level, 10),
     ?match(ok, orber:info(io)),
-    {ok, ServerNode, ServerHost} = 
+    {ok, ServerNode, ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node()),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     Req = <<"GIOP",1,2,0,100,0,0,0,5,0,0,0,10,50>> ,
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [], 
+    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
 				     message_error, [Req])),
-    
+
     application:set_env(orber, interceptors, false),
     orber:configure(orber_debug_level, 0),
     ok.
-    
+
 
 %%-----------------------------------------------------------------
 %%  Fragmented IIOP tests (Server-side).
@@ -1927,34 +2044,34 @@ fragments_server_api(doc) -> ["fragments API tests for server-side ORB."];
 fragments_server_api(suite) -> [];
 fragments_server_api(_Config) ->
     %% --- Create a slave-node ---
-    {ok, Node, Host} = 
-	?match({ok,_,_}, orber_test_lib:js_node()),    
+    {ok, Node, Host} =
+	?match({ok,_,_}, orber_test_lib:js_node()),
     Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-    
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib, 
-					   install_test_data, 
+
+    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
-    
+
     NSR = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
 		 corba:string_to_object("corbaloc::1.2@"++Host++":"++
 					integer_to_list(Port)++"/NameService")),
-    
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+
+    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		 'CosNaming_NamingContext':resolve(NSR, lname:new(["mamba"]))),
 
     Any = #any{typecode = {tk_string,0},
 	       value = "123"},
-    Target = #'GIOP_TargetAddress'{label = ?GIOP_KeyAddr, 
+    Target = #'GIOP_TargetAddress'{label = ?GIOP_KeyAddr,
 				   value = iop_ior:get_objkey(Obj)},
-    %% Fix a request header. 
+    %% Fix a request header.
     {Hdr, Body, HdrLen, _What, _Flags} =
 	cdr_encode:enc_request_split(
-	  #giop_env{version = {1,2}, objkey = Target, 
+	  #giop_env{version = {1,2}, objkey = Target,
 		    request_id = ?REQUEST_ID,
-		    response_expected = true, 
-		    op = testing_iiop_any, 
-		    parameters = [49], ctx = [], 
-		    tc = {tk_void,[tk_char],[]}, 
+		    response_expected = true,
+		    op = testing_iiop_any,
+		    parameters = [49], ctx = [],
+		    tc = {tk_void,[tk_char],[]},
 		    host = [orber_test_lib:get_host()],
 		    iiop_port = orber:iiop_port(),
 		    iiop_ssl_port = orber:iiop_ssl_port(),
@@ -1969,11 +2086,11 @@ fragments_server_api(_Config) ->
 		<<AligmnetData:Aligned/binary,49>> = Body,
 		list_to_binary([AligmnetData, <<0,0,0,18,0,0,0,0,0,0,0,4,49>> ])
 	end,
-    
+
     MessSize = HdrLen+size(NewBody),
     ReqFrag = list_to_binary([ <<"GIOP",1:8,2:8,2:8,0:8,
 			       MessSize:32/big-unsigned-integer>> , Hdr |NewBody]),
-    ?match(Any, fake_client_ORB(normal, Host, Port, [], fragments, 
+    ?match(Any, fake_client_ORB(normal, Host, Port, [], fragments,
 				[ReqFrag, ?FRAG_2, ?FRAG_3, ?FRAG_4])),
 
     ok.
@@ -1986,9 +2103,9 @@ fragments_max_server_api(suite) -> [];
 fragments_max_server_api(_Config) ->
     %% --- Create a slave-node ---
     IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{iiop_max_fragments, 2},
-						 {ip_address, IP}])),    
+						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     fragments_max_server(ServerNode, IP, ServerPort).
 
@@ -1997,37 +2114,37 @@ fragments_max_server_added_api(suite) -> [];
 fragments_max_server_added_api(_Config) ->
     %% --- Create a slave-node ---
     IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([])),    
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_}, orber_test_lib:js_node([])),
     ServerPort = 1 + orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     ?match({ok, _},
-	   orber_test_lib:remote_apply(ServerNode, orber, 
-				       add_listen_interface, 
-				       [IP, normal, 
+	   orber_test_lib:remote_apply(ServerNode, orber,
+				       add_listen_interface,
+				       [IP, normal,
 					[{iiop_max_fragments, 2},
 					 {flags, ?ORB_ENV_LOCAL_INTERFACE},
 					 {iiop_port, ServerPort}]])),
     fragments_max_server(ServerNode, IP, ServerPort).
 
 fragments_max_server(ServerNode, ServerHost, ServerPort) ->
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [nameservice])),
     Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		 corba:string_to_object("corbaname::1.2@"++ServerHost++":"++
 					integer_to_list(ServerPort)++"/NameService#mamba")),
-    Target = #'GIOP_TargetAddress'{label = ?GIOP_KeyAddr, 
+    Target = #'GIOP_TargetAddress'{label = ?GIOP_KeyAddr,
 				   value = iop_ior:get_objkey(Obj)},
-    %% Fix a request header. 
+    %% Fix a request header.
     {Hdr, Body, HdrLen, _What, _Flags} =
 	cdr_encode:enc_request_split(
-	  #giop_env{version = {1,2}, 
-		    objkey = Target, 
-		    request_id = ?REQUEST_ID, 
-		    response_expected = true, 
-		    op = testing_iiop_any, 
-		    parameters = [49], ctx = [], 
-		    tc = {tk_void,[tk_char],[]}, 
+	  #giop_env{version = {1,2},
+		    objkey = Target,
+		    request_id = ?REQUEST_ID,
+		    response_expected = true,
+		    op = testing_iiop_any,
+		    parameters = [49], ctx = [],
+		    tc = {tk_void,[tk_char],[]},
 		    host = [orber_test_lib:get_host()],
 		    iiop_port = orber:iiop_port(),
 		    iiop_ssl_port = orber:iiop_ssl_port(),
@@ -2046,8 +2163,8 @@ fragments_max_server(ServerNode, ServerHost, ServerPort) ->
     MessSize = HdrLen+size(NewBody),
     ReqFrag = list_to_binary([ <<"GIOP",1:8,2:8,2:8,0:8,
 			       MessSize:32/big-unsigned-integer>> , Hdr |NewBody]),
-    ?match(#'IMP_LIMIT'{}, 
-	   fake_client_ORB(normal, ServerHost, ServerPort, [], fragments_max, 
+    ?match(#'IMP_LIMIT'{},
+	   fake_client_ORB(normal, ServerHost, ServerPort, [], fragments_max,
 			   [ReqFrag, ?FRAG_2, ?FRAG_3, ?FRAG_4])),
 
     ok.
@@ -2063,11 +2180,11 @@ fragments_client_api(_Config) ->
     application:set_env(orber, interceptors, {native,[orber_iiop_tracer]}),
     orber:configure(orber_debug_level, 10),
     orber:info(),
-    IOR = ?match({'IOP_IOR',_,_}, 
-		       iop_ior:create_external({1, 2}, "IDL:FAKE:1.0", 
+    IOR = ?match({'IOP_IOR',_,_},
+		       iop_ior:create_external({1, 2}, "IDL:FAKE:1.0",
 					       "localhost", 6004, "FAKE", [])),
-    spawn(?MODULE, create_fake_server_ORB, [normal, 6004, [], fragments, 
-					    [?REPLY_FRAG_1, ?FRAG_2, 
+    spawn(?MODULE, create_fake_server_ORB, [normal, 6004, [], fragments,
+					    [?REPLY_FRAG_1, ?FRAG_2,
 					     ?FRAG_3, ?FRAG_4]]),
     ?match({ok, Any}, orber_test_server:testing_iiop_any(IOR, Any)),
     application:set_env(orber, interceptors, false),
@@ -2083,16 +2200,16 @@ bad_fragment_id_client_api(_Config) ->
     application:set_env(orber, interceptors, {native,[orber_iiop_tracer]}),
     orber:configure(orber_debug_level, 10),
     orber:info(),
-    {ok, ServerNode, ServerHost} = 
+    {ok, ServerNode, ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node()),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     Req = <<71,73,79,80,1,2,2,7,0,0,0,5,0,0,0,100,50>> ,
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [], 
+    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
 			       message_error, [Req])),
-    
+
     application:set_env(orber, interceptors, false),
     orber:configure(orber_debug_level, 0),
-    
+
     ok.
 
 %%-----------------------------------------------------------------
@@ -2100,22 +2217,22 @@ bad_fragment_id_client_api(_Config) ->
 %%-----------------------------------------------------------------
 bad_id_cancel_request_api(doc) -> ["Description", "more description"];
 bad_id_cancel_request_api(suite) -> [];
-bad_id_cancel_request_api(Config) when is_list(Config) ->   
-    Req10 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 0}, 
+bad_id_cancel_request_api(Config) when is_list(Config) ->
+    Req10 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 0},
 						    request_id = 556}),
-    Req11 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 1}, 
+    Req11 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 1},
 						    request_id = 556}),
-    Req12 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 2}, 
+    Req12 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 2},
 						    request_id = 556}),
-    {ok, ServerNode, ServerHost} = 
+    {ok, ServerNode, ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node()),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [], 
-			       message_error, [Req10])),    
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [], 
-			       message_error, [Req11])),    
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [], 
-			       message_error, [Req12])),    
+    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
+			       message_error, [Req10])),
+    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
+			       message_error, [Req11])),
+    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
+			       message_error, [Req12])),
     ok.
 
 %%-----------------------------------------------------------------
@@ -2131,141 +2248,141 @@ pseudo_calls(0, _) ->
 pseudo_calls(Times, Obj) ->
     orber_test_server:pseudo_call(Obj),
     New = Times - 1,
-    pseudo_calls(New, Obj). 
+    pseudo_calls(New, Obj).
 pseudo_casts(0, _) ->
     ok;
 pseudo_casts(Times, Obj) ->
     orber_test_server:pseudo_cast(Obj),
     New = Times - 1,
-    pseudo_casts(New, Obj). 
+    pseudo_casts(New, Obj).
 
 context_test(Obj) ->
-    CodeSetCtx = #'CONV_FRAME_CodeSetContext'{char_data =  65537, 
+    CodeSetCtx = #'CONV_FRAME_CodeSetContext'{char_data =  65537,
 					      wchar_data = 65801},
     FTGrp = #'FT_FTGroupVersionServiceContext'{object_group_ref_version = ?ULONGMAX},
-    FTReq = #'FT_FTRequestServiceContext'{client_id = "ClientId", 
-					  retention_id = ?LONGMAX, 
+    FTReq = #'FT_FTRequestServiceContext'{client_id = "ClientId",
+					  retention_id = ?LONGMAX,
 					  expiration_time = ?ULONGLONGMAX},
 
-    IDToken1 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAbsent, 
+    IDToken1 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAbsent,
 				    value = true},
-    IDToken2 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAnonymous, 
+    IDToken2 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAnonymous,
 				    value = false},
-    IDToken3 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTPrincipalName, 
+    IDToken3 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTPrincipalName,
 				    value = [0,255]},
-    IDToken4 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTX509CertChain, 
+    IDToken4 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTX509CertChain,
 				    value = [1,255]},
-    IDToken5 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTDistinguishedName, 
+    IDToken5 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTDistinguishedName,
 				    value = [2,255]},
-    IDToken6 = #'CSI_IdentityToken'{label = ?ULONGMAX, 
+    IDToken6 = #'CSI_IdentityToken'{label = ?ULONGMAX,
 				    value = [3,255]},
 
     MTEstablishContext1 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken1, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken1,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext2 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken2, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken2,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext3 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken3, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken3,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext4 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken4, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken4,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext5 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken5, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken5,
 				       client_authentication_token = [1, 255]}},
     MTEstablishContext6 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext, 
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX, 
-				       authorization_token = 
+      {label = ?CSI_MsgType_MTEstablishContext,
+       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
+				       authorization_token =
 				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX, 
-					 the_element = [0,255]}], 
-				       identity_token = IDToken6, 
+					{the_type = ?ULONGMAX,
+					 the_element = [0,255]}],
+				       identity_token = IDToken6,
 				       client_authentication_token = [1, 255]}},
     MTCompleteEstablishContext = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTCompleteEstablishContext, 
-       value = #'CSI_CompleteEstablishContext'{client_context_id = ?ULONGLONGMAX, 
+      {label = ?CSI_MsgType_MTCompleteEstablishContext,
+       value = #'CSI_CompleteEstablishContext'{client_context_id = ?ULONGLONGMAX,
 					       context_stateful = false,
 					       final_context_token = [1, 255]}},
     MTContextError = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTContextError, 
+      {label = ?CSI_MsgType_MTContextError,
        value = #'CSI_ContextError'{client_context_id = ?ULONGLONGMAX,
-				   major_status = 1, 
-				   minor_status = 2, 
+				   major_status = 1,
+				   minor_status = 2,
 				   error_token = [2,255]}},
     MTMessageInContext = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTMessageInContext, 
-       value = #'CSI_MessageInContext'{client_context_id = ?ULONGLONGMAX, 
+      {label = ?CSI_MsgType_MTMessageInContext,
+       value = #'CSI_MessageInContext'{client_context_id = ?ULONGLONGMAX,
 				       discard_context = true}},
-    Ctx = [#'IOP_ServiceContext'{context_id=?IOP_CodeSets, 
+    Ctx = [#'IOP_ServiceContext'{context_id=?IOP_CodeSets,
 				 context_data = CodeSetCtx},
-	   #'IOP_ServiceContext'{context_id=?IOP_FT_GROUP_VERSION, 
+	   #'IOP_ServiceContext'{context_id=?IOP_FT_GROUP_VERSION,
 				 context_data = FTGrp},
-	   #'IOP_ServiceContext'{context_id=?IOP_FT_REQUEST, 
+	   #'IOP_ServiceContext'{context_id=?IOP_FT_REQUEST,
 				 context_data = FTReq},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext1},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext2},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext3},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext4},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext5},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTEstablishContext6},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTCompleteEstablishContext},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTContextError},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService, 
+	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
 				 context_data = MTMessageInContext},
-	   #'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
+	   #'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
 				 context_data = {any_kind_of_data, {127,0,0,1}, 4001}}],
     ?match(ok, orber_test_server:testing_iiop_context(Obj, [{context, Ctx}])).
 
 
 create_fake_server_ORB(Type, Port, Options, listen, _Data) ->
     {ok, _ListenSocket, NewPort} =
-	orber_socket:listen(Type, Port, 
+	orber_socket:listen(Type, Port,
 			    [{backlog, 0}, {active, false}|Options]),
     Socket = orber_socket:connect(Type, 'localhost', NewPort, [{active, false}|Options]),
     {ok, {Type, Socket}, NewPort};
 create_fake_server_ORB(Type, Port, Options, Action, Data) ->
-    {ok, ListenSocket, _NewPort} = 
+    {ok, ListenSocket, _NewPort} =
 	orber_socket:listen(Type, Port, [{active, false}|Options]),
     Socket = orber_socket:accept(Type, ListenSocket),
     do_server_action(Type, Socket, Action, Data),
@@ -2299,14 +2416,14 @@ do_client_action(Type, Socket, fragments, FragList) ->
     ok = send_data(Type, Socket, FragList),
     timer:sleep(3000),
     {ok, Bytes} = gen_tcp:recv(Socket, 0),
-    {#reply_header{request_id = ?REQUEST_ID, reply_status = no_exception}, ok, [Par]} = 
+    {#reply_header{request_id = ?REQUEST_ID, reply_status = no_exception}, ok, [Par]} =
 	cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
     Par;
 do_client_action(Type, Socket, fragments_max, FragList) ->
     ok = send_data(Type, Socket, FragList),
     timer:sleep(3000),
     {ok, Bytes} = gen_tcp:recv(Socket, 0),
-    {#reply_header{request_id = ?REQUEST_ID, reply_status = system_exception}, Exc, []} = 
+    {#reply_header{request_id = ?REQUEST_ID, reply_status = system_exception}, Exc, []} =
 	cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
     Exc;
 do_client_action(Type, Socket, message_error, Data) ->
@@ -2323,4 +2440,4 @@ send_data(_Type, _Socket, []) ->
 send_data(Type, Socket, [H|T]) ->
     orber_socket:write(Type, Socket, H),
     send_data(Type, Socket, T).
-    
+
diff --git a/lib/orber/test/orber_nat_SUITE.erl b/lib/orber/test/orber_nat_SUITE.erl
index 625f168520..ee31b162c2 100644
--- a/lib/orber/test/orber_nat_SUITE.erl
+++ b/lib/orber/test/orber_nat_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
+%%
 %% Copyright Ericsson AB 2006-2011. All Rights Reserved.
-%% 
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %%
@@ -50,14 +50,15 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
 	 init_per_suite/1, end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 nat_ip_address/1, nat_ip_address_multiple/1,
 	 nat_ip_address_local/1, nat_ip_address_local_local/1,
 	 nat_iiop_port/1, nat_iiop_port_local/1,
-	 nat_iiop_port_local_local/1, nat_iiop_ssl_port/1,
-	 nat_iiop_ssl_port_local/1]).
+	 nat_iiop_port_local_local/1,
+	 nat_iiop_ssl_port_old/1, nat_iiop_ssl_port_local_old/1,
+	 nat_iiop_ssl_port/1, nat_iiop_ssl_port_local/1]).
 
 
 %%-----------------------------------------------------------------
@@ -66,15 +67,15 @@
 
 %%-----------------------------------------------------------------
 %% Func: all/1
-%% Args: 
-%% Returns: 
+%% Args:
+%% Returns:
 %%-----------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     cases().
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
@@ -84,25 +85,38 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-cases() -> 
-    [nat_ip_address, nat_ip_address_multiple,
-     nat_ip_address_local, nat_iiop_port,
-     nat_iiop_port_local, nat_ip_address_local_local,
-     nat_iiop_port_local_local, nat_iiop_ssl_port,
+cases() ->
+    [nat_ip_address,
+     nat_ip_address_multiple,
+     nat_ip_address_local,
+     nat_iiop_port,
+     nat_iiop_port_local,
+     nat_ip_address_local_local,
+     nat_iiop_port_local_local,
+     nat_iiop_ssl_port_old,
+     nat_iiop_ssl_port_local_old,
+     nat_iiop_ssl_port,
      nat_iiop_ssl_port_local].
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
-init_per_testcase(TC, Config) 
+init_per_testcase(TC, Config)
  when TC =:= nat_iiop_ssl_port;
-      TC =:= nat_iiop_ssl_port_local ->
-    case orber_test_lib:ssl_version() of
-	no_ssl ->
-	    {skip,"SSL not installed!"};
-	_ ->
-	    init_per_testcase(dummy_tc, Config)
-    end;
+      TC =:= nat_iiop_ssl_port_local;
+      TC =:= nat_iiop_ssl_port_old;
+      TC =:= nat_iiop_ssl_port_local_old ->
+      case  ?config(crypto_started, Config) of
+	  true ->
+	      case orber_test_lib:ssl_version() of
+		  no_ssl ->
+		      {skip,"SSL not installed!"};
+		  _ ->
+		      init_per_testcase(dummy_tc, Config)
+	      end;
+	  false ->
+	      {skip, "Crypto did not start"}
+      end;
 init_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
@@ -125,12 +139,18 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) ->
     if
 	is_list(Config) ->
-	    Config;
+            try crypto:start() of
+                ok ->
+		    [{crypto_started, true} | Config]
+            catch _:_ ->
+	       [{crypto_started, false} | Config]
+            end;
 	true ->
 	    exit("Config not a list")
     end.
 
 end_per_suite(Config) ->
+    application:stop(crypto),    
     Config.
 
 %%-----------------------------------------------------------------
@@ -143,13 +163,13 @@ nat_ip_address(suite) -> [];
 nat_ip_address(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
 						 {nat_ip_address, Loopback}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR)),
     ok.
 
@@ -158,14 +178,14 @@ nat_ip_address_multiple(doc) -> ["This case test if the server ORB use the corre
 nat_ip_address_multiple(suite) -> [];
 nat_ip_address_multiple(_Config) ->
     IP = orber_test_lib:get_host(),
-   
-    {ok, ServerNode, _ServerHost} = 
+
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
 						 {nat_ip_address, {multiple, ["10.0.0.1"]}}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR)),
     ok.
 
@@ -174,13 +194,13 @@ nat_ip_address_local(doc) -> ["This case test if the server ORB use the correct"
 nat_ip_address_local(suite) -> [];
 nat_ip_address_local(_Config) ->
     IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
 						 {nat_ip_address, {local, "10.0.0.1", [{IP, "127.0.0.1"}]}}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR)),
     ok.
 
@@ -190,19 +210,19 @@ nat_ip_address_local_local(suite) -> [];
 nat_ip_address_local_local(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, 
-						  (?ORB_ENV_LOCAL_INTERFACE bor 
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_}, orber_test_lib:js_node([{flags,
+						  (?ORB_ENV_LOCAL_INTERFACE bor
 						   ?ORB_ENV_ENABLE_NAT)},
 						 {nat_ip_address, {local, "10.0.0.1", [{IP, "10.0.0.2"}]}}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR1 = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {"10.0.0.2", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {"10.0.0.2", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR1)),
     IOR2 = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR2)),
     ok.
 
@@ -211,13 +231,13 @@ nat_iiop_port(doc) -> ["This case test if the server ORB use the correct",
 nat_iiop_port(suite) -> [];
 nat_iiop_port(_Config) ->
     IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
 						 {nat_iiop_port, 42}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {_IP, 42, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {_IP, 42, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR)),
     ok.
 
@@ -226,13 +246,13 @@ nat_iiop_port_local(doc) -> ["This case test if the server ORB use the correct",
 nat_iiop_port_local(suite) -> [];
 nat_iiop_port_local(_Config) ->
     IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
 						 {nat_iiop_port, {local, 42, [{4001, 43}]}}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     IOR = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {_IP, 42, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {_IP, 42, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR)),
     ok.
 
@@ -242,27 +262,27 @@ nat_iiop_port_local_local(suite) -> [];
 nat_iiop_port_local_local(_Config) ->
     IP = orber_test_lib:get_host(),
     Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, 
-						  (?ORB_ENV_LOCAL_INTERFACE bor 
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_}, orber_test_lib:js_node([{flags,
+						  (?ORB_ENV_LOCAL_INTERFACE bor
 						   ?ORB_ENV_ENABLE_NAT)},
 						 {ip_address, IP}])),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     orber_test_lib:remote_apply(ServerNode, orber_env, configure_override, [nat_iiop_port, {local, 42, [{ServerPort, 43}]}]),
     IOR1 = ?match(#'IOP_IOR'{},
 		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {IP, 43, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {IP, 43, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR1)),
     {ok, Ref} = ?match({ok, _},
-			orber_test_lib:remote_apply(ServerNode, orber, 
-						    add_listen_interface, 
+			orber_test_lib:remote_apply(ServerNode, orber,
+						    add_listen_interface,
 						    [Loopback, normal, 10088])),
     IOR2 = ?match(#'IOP_IOR'{},
 		  corba:string_to_object("corbaloc::1.2@"++Loopback++":10088/NameService")),
-    ?match({'external', {IP, 42, _ObjectKey, _Counter, _TP, _NewHD}}, 
+    ?match({'external', {IP, 42, _ObjectKey, _Counter, _TP, _NewHD}},
 	   iop_ior:get_key(IOR2)),
-    ?match(ok, 
-	   orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match(ok,
+	   orber_test_lib:remote_apply(ServerNode, orber,
 				       remove_listen_interface, [Ref])),
     ok.
 
@@ -271,103 +291,204 @@ nat_iiop_port_local_local(_Config) ->
 %%  API tests for ORB to ORB, ssl security depth 1
 %%-----------------------------------------------------------------
 
-nat_iiop_ssl_port(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)", 
+nat_iiop_ssl_port_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
+			   "Make sure NAT works for SSL"];
+nat_iiop_ssl_port_old(suite) -> [];
+nat_iiop_ssl_port_old(_Config) ->
+
+    IP = orber_test_lib:get_host(),
+    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
+					       1, [{iiop_ssl_port, 0},
+						   {flags, ?ORB_ENV_ENABLE_NAT},
+						   {ip_address, IP}]),
+    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
+					       1, [{iiop_ssl_port, 0}]),
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
+    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
+    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
+    NATSSLServerPort = SSLServerPort+1,
+    {ok, Ref} = ?match({ok, _},
+		       orber_test_lib:remote_apply(ServerNode, orber,
+						   add_listen_interface,
+						   [IP, ssl, NATSSLServerPort])),
+    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override,
+				[nat_iiop_ssl_port,
+				 {local, NATSSLServerPort, [{4001, 43}]}]),
+
+    {ok, ClientNode, _ClientHost} =
+	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
+					   [ssl])),
+
+    IOR1 = ?match(#'IOP_IOR'{},
+		  orber_test_lib:remote_apply(ClientNode, corba,
+					      string_to_object,
+					      ["corbaname::1.2@"++IP++":"++
+						   integer_to_list(ServerPort)++"/NameService#mamba"])),
+
+    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP,
+			 #host_data{protocol = ssl,
+				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}},
+	   iop_ior:get_key(IOR1)),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   uninstall_test_data,
+					   [ssl])),
+    ?match(ok,
+	   orber_test_lib:remote_apply(ServerNode, orber,
+				       remove_listen_interface, [Ref])),
+    ok.
+
+nat_iiop_ssl_port_local_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
+				 "Make sure NAT works for SSL"];
+nat_iiop_ssl_port_local_old(suite) -> [];
+nat_iiop_ssl_port_local_old(_Config) ->
+
+    IP = orber_test_lib:get_host(),
+    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
+					       1, [{iiop_ssl_port, 0},
+						   {flags,
+						    (?ORB_ENV_LOCAL_INTERFACE bor
+							 ?ORB_ENV_ENABLE_NAT)},
+						   {ip_address, IP}]),
+    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
+					       1, [{iiop_ssl_port, 0}]),
+    {ok, ServerNode, _ServerHost} =
+	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
+    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
+    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
+    NATSSLServerPort = SSLServerPort+1,
+    {ok, Ref} = ?match({ok, _},
+		       orber_test_lib:remote_apply(ServerNode, orber,
+						   add_listen_interface,
+						   [IP, ssl, NATSSLServerPort])),
+    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override,
+				[nat_iiop_ssl_port,
+				 {local, NATSSLServerPort, [{NATSSLServerPort, NATSSLServerPort}]}]),
+
+    {ok, ClientNode, _ClientHost} =
+	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
+					   [ssl])),
+
+    IOR1 = ?match(#'IOP_IOR'{},
+		  orber_test_lib:remote_apply(ClientNode, corba,
+					      string_to_object,
+					      ["corbaname::1.2@"++IP++":"++
+						   integer_to_list(ServerPort)++"/NameService#mamba"])),
+
+    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP,
+			 #host_data{protocol = ssl,
+				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}},
+	   iop_ior:get_key(IOR1)),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   uninstall_test_data,
+					   [ssl])),
+    ?match(ok,
+	   orber_test_lib:remote_apply(ServerNode, orber,
+				       remove_listen_interface, [Ref])),
+    ok.
+
+
+nat_iiop_ssl_port(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
 			   "Make sure NAT works for SSL"];
 nat_iiop_ssl_port(suite) -> [];
 nat_iiop_ssl_port(_Config) ->
 
     IP = orber_test_lib:get_host(),
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
 					       1, [{iiop_ssl_port, 0},
 						   {flags, ?ORB_ENV_ENABLE_NAT},
 						   {ip_address, IP}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
 					       1, [{iiop_ssl_port, 0}]),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
     NATSSLServerPort = SSLServerPort+1,
     {ok, Ref} = ?match({ok, _},
-		       orber_test_lib:remote_apply(ServerNode, orber, 
-						   add_listen_interface, 
+		       orber_test_lib:remote_apply(ServerNode, orber,
+						   add_listen_interface,
 						   [IP, ssl, NATSSLServerPort])),
-    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override, 
-				[nat_iiop_ssl_port, 
+    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override,
+				[nat_iiop_ssl_port,
 				 {local, NATSSLServerPort, [{4001, 43}]}]),
 
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [ssl])),
 
-    IOR1 = ?match(#'IOP_IOR'{}, 
-		  orber_test_lib:remote_apply(ClientNode, corba, 
+    IOR1 = ?match(#'IOP_IOR'{},
+		  orber_test_lib:remote_apply(ClientNode, corba,
 					      string_to_object,
 					      ["corbaname::1.2@"++IP++":"++
 						   integer_to_list(ServerPort)++"/NameService#mamba"])),
 
-    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP, 
-			 #host_data{protocol = ssl, 
-				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}}, 
+    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP,
+			 #host_data{protocol = ssl,
+				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}},
 	   iop_ior:get_key(IOR1)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   uninstall_test_data,
 					   [ssl])),
-    ?match(ok, 
-	   orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match(ok,
+	   orber_test_lib:remote_apply(ServerNode, orber,
 				       remove_listen_interface, [Ref])),
     ok.
 
-nat_iiop_ssl_port_local(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)", 
+nat_iiop_ssl_port_local(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
 				 "Make sure NAT works for SSL"];
 nat_iiop_ssl_port_local(suite) -> [];
 nat_iiop_ssl_port_local(_Config) ->
 
     IP = orber_test_lib:get_host(),
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
 					       1, [{iiop_ssl_port, 0},
-						   {flags, 
-						    (?ORB_ENV_LOCAL_INTERFACE bor 
+						   {flags,
+						    (?ORB_ENV_LOCAL_INTERFACE bor
 							 ?ORB_ENV_ENABLE_NAT)},
 						   {ip_address, IP}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
 					       1, [{iiop_ssl_port, 0}]),
-    {ok, ServerNode, _ServerHost} = 
+    {ok, ServerNode, _ServerHost} =
 	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
     ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
     SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
     NATSSLServerPort = SSLServerPort+1,
     {ok, Ref} = ?match({ok, _},
-		       orber_test_lib:remote_apply(ServerNode, orber, 
-						   add_listen_interface, 
+		       orber_test_lib:remote_apply(ServerNode, orber,
+						   add_listen_interface,
 						   [IP, ssl, NATSSLServerPort])),
-    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override, 
-				[nat_iiop_ssl_port, 
+    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override,
+				[nat_iiop_ssl_port,
 				 {local, NATSSLServerPort, [{NATSSLServerPort, NATSSLServerPort}]}]),
 
-    {ok, ClientNode, _ClientHost} = 
+    {ok, ClientNode, _ClientHost} =
 	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   install_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   install_test_data,
 					   [ssl])),
 
-    IOR1 = ?match(#'IOP_IOR'{}, 
-		  orber_test_lib:remote_apply(ClientNode, corba, 
+    IOR1 = ?match(#'IOP_IOR'{},
+		  orber_test_lib:remote_apply(ClientNode, corba,
 					      string_to_object,
 					      ["corbaname::1.2@"++IP++":"++
 						   integer_to_list(ServerPort)++"/NameService#mamba"])),
 
-    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP, 
-			 #host_data{protocol = ssl, 
-				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}}, 
+    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP,
+			 #host_data{protocol = ssl,
+				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}},
 	   iop_ior:get_key(IOR1)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-					   uninstall_test_data, 
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
+					   uninstall_test_data,
 					   [ssl])),
-    ?match(ok, 
-	   orber_test_lib:remote_apply(ServerNode, orber, 
+    ?match(ok,
+	   orber_test_lib:remote_apply(ServerNode, orber,
 				       remove_listen_interface, [Ref])),
     ok.
 
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index 903ab1d771..3119bcf281 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -41,28 +41,31 @@
 	       end
        end()).
 
--export([js_node/2, 
+-export([js_node/2,
 	 js_node/1,
 	 js_node/0,
-	 slave_sup/0, 
-	 remote_apply/4, 
+	 slave_sup/0,
+	 remote_apply/4,
 	 install_test_data/1,
 	 light_tests/3,
-	 uninstall_test_data/1, 
-	 destroy_node/2, 
+	 uninstall_test_data/1,
+	 destroy_node/2,
 	 lookup/2,
 	 alternate_iiop_address/2,
 	 create_alternate_iiop_address/2,
 	 alternate_ssl_iiop_address/3,
 	 create_alternate_ssl_iiop_address/3,
-	 test_coding/1, 
-	 test_coding/2, 
-	 corba_object_tests/2, 
+	 test_coding/1,
+	 test_coding/2,
+	 corba_object_tests/2,
 	 timeouts/3,
 	 precond/3,
 	 postcond/4,
 	 oe_get_interface/0,
 	 create_components_IOR/1,
+	 get_options_old/2,
+	 get_options_old/3,
+	 get_options_old/4,
 	 get_options/2,
 	 get_options/3,
 	 get_options/4,
@@ -89,13 +92,13 @@
 
 %%------------------------------------------------------------
 %% function : ssl_version
-%% Arguments: 
+%% Arguments:
 %% Returns  : integer()
-%% Effect   : 
-%%            
+%% Effect   :
+%%
 %%------------------------------------------------------------
 ssl_version() ->
-    try 
+    try
 	ssl:module_info(),
 	case catch erlang:system_info(otp_release) of
 	    Version when is_list(Version) ->
@@ -114,10 +117,10 @@ ssl_version() ->
 
 %%------------------------------------------------------------
 %% function : version_ok
-%% Arguments: 
+%% Arguments:
 %% Returns  : true | {skipped, Reason}
-%% Effect   : 
-%%            
+%% Effect   :
+%%
 %%------------------------------------------------------------
 version_ok() ->
     {ok, Hostname} = inet:gethostname(),
@@ -151,8 +154,8 @@ version_ok() ->
 %% function : get_host
 %% Arguments: Family - inet | inet6
 %% Returns  : string()
-%% Effect   : 
-%%            
+%% Effect   :
+%%
 %%------------------------------------------------------------
 get_host() ->
     get_host(inet).
@@ -172,13 +175,13 @@ get_host(Family) ->
 	    [IP] = ?match([_], orber:host()),
 	    IP
     end.
-  
+
 %%------------------------------------------------------------
 %% function : get_loopback_interface
 %% Arguments: Family - inet | inet6
 %% Returns  : string()
-%% Effect   : 
-%%            
+%% Effect   :
+%%
 %%------------------------------------------------------------
 get_loopback_interface() ->
     get_loopback_interface(inet).
@@ -193,12 +196,12 @@ get_loopback_interface(Family) ->
 		_ when Family == inet ->
 		    "127.0.0.1";
 		_ ->
-		    "0:0:0:0:0:FFFF:7F00:0001" 
+		    "0:0:0:0:0:FFFF:7F00:0001"
 	    end;
 	_ when Family == inet ->
 	    "127.0.0.1";
 	_ ->
-	    "0:0:0:0:0:FFFF:7F00:0001" 
+	    "0:0:0:0:0:FFFF:7F00:0001"
     end.
 
 %%------------------------------------------------------------
@@ -220,7 +223,7 @@ js_node(InitOptions, StartOptions) when is_list(InitOptions) ->
     {A,B,C} = erlang:now(),
     [_, Host] = string:tokens(atom_to_list(node()), [$@]),
     _NewInitOptions = check_options(InitOptions),
-    js_node_helper(Host, 0, lists:concat([A,'_',B,'_',C]), 
+    js_node_helper(Host, 0, lists:concat([A,'_',B,'_',C]),
 		   InitOptions, 10, StartOptions).
 
 js_node_helper(Host, Port, Name, Options, Retries, StartOptions) ->
@@ -234,8 +237,8 @@ js_node_helper(Host, Port, Name, Options, Retries, StartOptions) ->
 		    ok = rpc:call(NewNode, file, set_cwd, [Cwd]),
 		    true = rpc:call(NewNode, code, set_path, [Path]),
 		    rpc:call(NewNode, application, load, [orber]),
-		    ok = rpc:call(NewNode, corba, orb_init, 
-				  [[{iiop_port, Port}, 
+		    ok = rpc:call(NewNode, corba, orb_init,
+				  [[{iiop_port, Port},
 				    {orber_debug_level, 10}|Options]]),
 		    start_orber(StartOptions, NewNode),
 		    spawn_link(NewNode, ?MODULE, slave_sup, []),
@@ -247,8 +250,8 @@ js_node_helper(Host, Port, Name, Options, Retries, StartOptions) ->
 	    end;
         {error, Reason} when Retries == 0 ->
             {error, Reason};
-        {error, Reason} ->          
-            io:format("Could not start slavenode ~p:~p due to: ~p~n", 
+        {error, Reason} ->
+            io:format("Could not start slavenode ~p:~p due to: ~p~n",
                       [Host, Port, Reason]),
             timer:sleep(500),
 	    js_node_helper(Host, Port, Name, Options, Retries-1, StartOptions)
@@ -285,7 +288,7 @@ starter(Host, Name, Args) ->
 slave_sup() ->
     process_flag(trap_exit, true),
     receive
-        {'EXIT', _, _} -> 
+        {'EXIT', _, _} ->
             case os:type() of
                 vxworks ->
                     erlang:halt();
@@ -309,68 +312,106 @@ start_orber(lightweight, Node) ->
 start_orber(_, Node) ->
     ok = rpc:call(Node, orber, jump_start, []).
 
-
 %%-----------------------------------------------------------------
 %% Type    - ssl | iiop_ssl
 %% Role    - 'server' | 'client'
 %% Options - [{Key, Value}]
 %%-----------------------------------------------------------------
-get_options(Type, Role) -> 
-    get_options(Type, Role, 2, []).
+get_options_old(Type, Role) ->
+    get_options_old(Type, Role, 2, []).
 
-get_options(ssl, Role, Level) -> 
-    get_options(ssl, Role, Level, []).
+get_options_old(ssl, Role, Level) ->
+    get_options_old(ssl, Role, Level, []).
 
-get_options(ssl, Role, 2, Options) -> 
+get_options_old(ssl, Role, 2, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
     [{depth, 2},
      {verify, 2},
      {keyfile, filename:join([Dir, Role, "key.pem"])},
-     {cacertfile, filename:join([Dir, Role, "cacerts.pem"])}, 
-     {certfile, filename:join([Dir, Role, "cert.pem"])}|Options];
-get_options(iiop_ssl, _Role, 2, Options) ->
+     {cacertfile, filename:join([Dir, Role, "cacerts.pem"])},
+     {certfile, filename:join([Dir, Role, "cert.pem"])} |Options];
+get_options_old(iiop_ssl, _Role, 2, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
     [{ssl_server_depth, 2},
      {ssl_server_verify, 2},
      {ssl_server_certfile, filename:join([Dir, "server", "cert.pem"])},
-     {ssl_server_cacertfile, filename:join([Dir, "server", "cacerts.pem"])}, 
+     {ssl_server_cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
      {ssl_server_keyfile, filename:join([Dir, "server", "key.pem"])},
      {ssl_client_depth, 2},
      {ssl_client_verify, 2},
      {ssl_client_certfile, filename:join([Dir, "client", "cert.pem"])},
-     {ssl_client_cacertfile, filename:join([Dir, "client", "cacerts.pem"])}, 
+     {ssl_client_cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
      {ssl_client_keyfile, filename:join([Dir, "client", "key.pem"])},
-     {secure, ssl}|Options];
-get_options(iiop_ssl, _Role, 1, Options) ->
+     {secure, ssl} |Options];
+get_options_old(iiop_ssl, _Role, 1, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
     [{ssl_server_depth, 1},
      {ssl_server_verify, 0},
      {ssl_server_certfile, filename:join([Dir, "server", "cert.pem"])},
-     {ssl_server_cacertfile, filename:join([Dir, "server", "cacerts.pem"])}, 
+     {ssl_server_cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
      {ssl_server_keyfile, filename:join([Dir, "server", "key.pem"])},
      {ssl_client_depth, 1},
      {ssl_client_verify, 0},
      {ssl_client_certfile, filename:join([Dir, "client", "cert.pem"])},
-     {ssl_client_cacertfile, filename:join([Dir, "client", "cacerts.pem"])}, 
+     {ssl_client_cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
      {ssl_client_keyfile, filename:join([Dir, "client", "key.pem"])},
-     {secure, ssl}|Options].
+     {secure, ssl} |Options].
 
+get_options(Type, Role) ->
+    get_options(Type, Role, 2, []).
+
+get_options(ssl, Role, Level) ->
+    get_options(ssl, Role, Level, []).
+
+get_options(ssl, Role, 2, Options) ->
+    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
+    [{depth, 2},
+     {verify, 2},
+     {keyfile, filename:join([Dir, Role, "key.pem"])},
+     {cacertfile, filename:join([Dir, Role, "cacerts.pem"])},
+     {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},
+			{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},
+			{verify, 2},
+			{certfile, filename:join([Dir, "client", "cert.pem"])},
+			{cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
+			{keyfile, filename:join([Dir, "client", "key.pem"])}]},
+     {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},
+			{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},
+			{verify, 0},
+			{certfile, filename:join([Dir, "client", "cert.pem"])},
+			{cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
+			{keyfile, filename:join([Dir, "client", "key.pem"])}]},
+     {secure, ssl} |Options].
 
 create_paths() ->
     Path = filename:dirname(code:which(?MODULE)),
     " -pa " ++ Path ++ " -pa " ++
-        filename:join(Path, "idl_output") ++ 
+        filename:join(Path, "idl_output") ++
 	" -pa " ++
-        filename:join(Path, "all_SUITE_data") ++ 
-        " -pa " ++ 
+        filename:join(Path, "all_SUITE_data") ++
+        " -pa " ++
         filename:dirname(code:which(orber)).
 
 %%------------------------------------------------------------
 %% function : destroy_node
 %% Arguments: Node - which node to destroy.
 %%            Type - normal | ssl
-%% Returns  : 
-%% Effect   : 
+%% Returns  :
+%% Effect   :
 %%------------------------------------------------------------
 
 destroy_node(Node, Type) ->
@@ -384,13 +425,13 @@ stopper(Node, _Type) ->
             slave:stop(Node)
     end.
 
-  
+
 %%------------------------------------------------------------
 %% function : remote_apply
 %% Arguments: N - Node, M - Module,
 %%            F - Function, A - Arguments (list)
-%% Returns  : 
-%% Effect   : 
+%% Returns  :
+%% Effect   :
 %%------------------------------------------------------------
 remote_apply(N, M,F,A) ->
     case rpc:call(N, M, F, A) of
@@ -411,7 +452,7 @@ remote_apply(N, M,F,A) ->
 
 install_test_data(nameservice) ->
     oe_orber_test_server:oe_register(),
-    Mamba = orber_test_server:oe_create([], [{regname, {local, mamba}}]), 
+    Mamba = orber_test_server:oe_create([], [{regname, {local, mamba}}]),
     true = corba:add_initial_service("Mamba", Mamba),
     NS = corba:resolve_initial_references("NameService"),
     NC1 = lname_component:set_id(lname_component:create(), "mamba"),
@@ -420,7 +461,7 @@ install_test_data(nameservice) ->
 
 install_test_data({nameservice, AltAddr, AltPort}) ->
     oe_orber_test_server:oe_register(),
-    Obj = orber_test_server:oe_create([], [{regname, {local, mamba}}]), 
+    Obj = orber_test_server:oe_create([], [{regname, {local, mamba}}]),
     Mamba = corba:add_alternate_iiop_address(Obj, AltAddr, AltPort),
     true = corba:add_initial_service("Mamba", Mamba),
     NS = corba:resolve_initial_references("NameService"),
@@ -430,8 +471,8 @@ install_test_data({nameservice, AltAddr, AltPort}) ->
 
 install_test_data(timeout) ->
     oe_orber_test_server:oe_register(),
-    Mamba = orber_test_server:oe_create([], {local, mamba}), 
-    Viper = orber_test_timeout_server:oe_create([], {local, viper}), 
+    Mamba = orber_test_server:oe_create([], {local, mamba}),
+    Viper = orber_test_timeout_server:oe_create([], {local, viper}),
     NS = corba:resolve_initial_references("NameService"),
     NC1 = lname_component:set_id(lname_component:create(), "mamba"),
     N1 = lname:insert_component(lname:create(), 1, NC1),
@@ -450,7 +491,7 @@ install_test_data(pseudo) ->
 
 install_test_data(ssl) ->
     oe_orber_test_server:oe_register(),
-    Mamba = orber_test_server:oe_create([], [{regname, {local, mamba}}]), 
+    Mamba = orber_test_server:oe_create([], [{regname, {local, mamba}}]),
     NS = corba:resolve_initial_references("NameService"),
     NC1 = lname_component:set_id(lname_component:create(), "mamba"),
     N = lname:insert_component(lname:create(), 1, NC1),
@@ -458,7 +499,7 @@ install_test_data(ssl) ->
 
 install_test_data(ssl_simple) ->
     oe_orber_test_server:oe_register();
-    
+
 install_test_data(light) ->
     %% Nothing to do at the moment but we might in the future
     ok;
@@ -479,7 +520,7 @@ uninstall_test_data(pseudo) ->
     NC1 = lname_component:set_id(lname_component:create(), "mamba"),
     N = lname:insert_component(lname:create(), 1, NC1),
     _Obj = (catch 'CosNaming_NamingContext':resolve(NS, N)),
-    catch 'CosNaming_NamingContext':destroy(NS),    
+    catch 'CosNaming_NamingContext':destroy(NS),
     oe_orber_test_server:oe_unregister();
 
 uninstall_test_data(timeout) ->
@@ -493,7 +534,7 @@ uninstall_test_data(timeout) ->
     Viper = (catch 'CosNaming_NamingContext':resolve(NS, N2)),
     catch corba:dispose(Mamba),
     catch corba:dispose(Viper),
-    catch 'CosNaming_NamingContext':destroy(NS),    
+    catch 'CosNaming_NamingContext':destroy(NS),
     oe_orber_test_server:oe_unregister();
 
 uninstall_test_data(nameservice) ->
@@ -503,7 +544,7 @@ uninstall_test_data(nameservice) ->
     N = lname:insert_component(lname:create(), 1, NC1),
     Obj = (catch 'CosNaming_NamingContext':resolve(NS, N)),
     catch corba:dispose(Obj),
-    catch 'CosNaming_NamingContext':destroy(NS),    
+    catch 'CosNaming_NamingContext':destroy(NS),
     oe_orber_test_server:oe_unregister();
 
 uninstall_test_data(ssl) ->
@@ -512,7 +553,7 @@ uninstall_test_data(ssl) ->
     N = lname:insert_component(lname:create(), 1, NC1),
     Obj = (catch 'CosNaming_NamingContext':resolve(NS, N)),
     catch corba:dispose(Obj),
-    catch 'CosNaming_NamingContext':destroy(NS),    
+    catch 'CosNaming_NamingContext':destroy(NS),
     oe_orber_test_server:oe_unregister();
 
 uninstall_test_data(ssl_simple) ->
@@ -530,27 +571,27 @@ uninstall_test_data(_) ->
 %% Arguments: TestServerObj a orber_test_server ref
 %%            OtherObj - any other Orber object.
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 
 corba_object_tests(TestServerObj, OtherObj) ->
-    ?match(false,  
+    ?match(false,
 	   corba_object:is_a(TestServerObj, "IDL:orber_parent/inherrit:1.0")),
-    ?match(true,  
+    ?match(true,
 	   corba_object:is_a(TestServerObj, "IDL:omg.org/orber_parent/inherrit:1.0")),
-    ?match(true,  
+    ?match(true,
 	   corba_object:is_a(TestServerObj, "IDL:omg.org/orber_test/server:1.0")),
-    ?match(false,  
+    ?match(false,
 	   corba_object:is_a(TestServerObj, "IDL:orber_test/server:1.0")),
-    ?match(false, 
+    ?match(false,
 	   corba_object:is_a(TestServerObj, "IDL:omg.org/orber_parent/inherrit:1.1")),
-    ?match(false, 
+    ?match(false,
 	   corba_object:is_a(TestServerObj, "NotValidIFRID")),
-    ?match(false, 
+    ?match(false,
 	   corba_object:is_nil(TestServerObj)),
-    ?match(false, 
+    ?match(false,
 	   corba_object:is_equivalent(OtherObj,TestServerObj)),
-    ?match(true,  
+    ?match(true,
 	   corba_object:is_equivalent(TestServerObj,TestServerObj)),
     ?match(false, corba_object:non_existent(TestServerObj)),
     ?match(false, corba_object:not_existent(TestServerObj)),
@@ -562,32 +603,32 @@ corba_object_tests(TestServerObj, OtherObj) ->
 %% function : lookup
 %% Arguments: Port - which port the other orb uses.
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 
 lookup(Host, Port) ->
     Key = Host++":"++integer_to_list(Port),
-    NSR = corba:resolve_initial_references_remote("NameService", 
+    NSR = corba:resolve_initial_references_remote("NameService",
 						  ["iiop://"++Key]),
 
     NC1 = lname_component:set_id(lname_component:create(), "not_exist"),
     N1 =  lname:insert_component(lname:create(), 1, NC1),
     ?match({'EXCEPTION',{'CosNaming_NamingContext_NotFound',_,_,_}},
 	   'CosNaming_NamingContext':resolve(NSR, N1)),
-    
+
     NC2 = lname_component:set_id(lname_component:create(), "mamba"),
     N2  = lname:insert_component(lname:create(), 1, NC2),
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		 'CosNaming_NamingContext':resolve(NSR, N2)),
     orber_test_server:print(Obj),
-    Obj2 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+    Obj2 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		  corba:string_to_object("corbaname:iiop:1.1@"++Key++"/NameService#mamba")),
-    
+
     orber_test_server:print(Obj2),
 
-    NSR2 = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_}, 
+    NSR2 = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
 		  corba:string_to_object("corbaloc:iiop:1.1@"++Key++"/NameService")),
-    Obj3 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+    Obj3 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		  'CosNaming_NamingContext':resolve(NSR2, N2)),
     orber_test_server:print(Obj3).
 
@@ -595,11 +636,11 @@ lookup(Host, Port) ->
 %% function : alternate_iiop_address
 %% Arguments: Port - which port the other orb uses.
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 alternate_iiop_address(Host, Port) ->
     IOR = create_alternate_iiop_address(Host, Port),
-    
+
     ?match(false, corba_object:non_existent(IOR)),
     ?match({'object_forward',_}, corba:locate(IOR)),
     ?match({'object_forward',_}, corba:locate(IOR, 10000)),
@@ -609,145 +650,145 @@ alternate_iiop_address(Host, Port) ->
 %% function : create_alternate_iiop_address
 %% Arguments: Port - which port the other orb uses.
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 create_alternate_iiop_address(Host, Port) ->
-    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE, 
+    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE,
 				 component_data = ?ORBER_ORB_TYPE_1},
-	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS,
 				 component_data = ?DEFAULT_CODESETS},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
 				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host, 
+				   'HostID' = Host,
 				   'Port' = Port}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
 				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host, 
+				   'HostID' = Host,
 				   'Port' = 8000}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
 				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host, 
+				   'HostID' = Host,
 				   'Port' = 8000}}],
     #'IOP_IOR'{type_id=TypeID,
-	       profiles=P1} = _IORA = iop_ior:create({1,2}, 
+	       profiles=P1} = _IORA = iop_ior:create({1,2},
 						     "IDL:omg.org/CosNaming/NamingContextExt:1.0",
-						     [Host], 8000, -1, 
+						     [Host], 8000, -1,
 						     "NameService", MC, 0, 0),
-    #'IOP_IOR'{profiles=P2} = _IORB = iop_ior:create({1,1}, 
+    #'IOP_IOR'{profiles=P2} = _IORB = iop_ior:create({1,1},
 						     "IDL:omg.org/CosNaming/NamingContextExt:1.0",
 						     [Host], 8000, -1,
 						     "NameService", [], 0, 0),
     #'IOP_IOR'{type_id=TypeID, profiles=P2++P1}.
-    
+
 
 %%------------------------------------------------------------
 %% function : create_components_IOR
-%% Arguments: 
+%% Arguments:
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 create_components_IOR(Version) ->
-    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE, 
+    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE,
 				 component_data = ?ORBER_ORB_TYPE_1},
-	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS,
 				 component_data = ?DEFAULT_CODESETS},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
 				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = "127.0.0.1", 
+				   'HostID' = "127.0.0.1",
 				   'Port' = 4001}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_SSL_SEC_TRANS, 
-				 component_data = #'SSLIOP_SSL'{target_supports = 0, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_SSL_SEC_TRANS,
+				 component_data = #'SSLIOP_SSL'{target_supports = 0,
 								target_requires = 1,
 								port = 2}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_FT_GROUP, 
-				 component_data = 
+	  #'IOP_TaggedComponent'{tag = ?TAG_FT_GROUP,
+				 component_data =
 				 #'FT_TagFTGroupTaggedComponent'
-				 {version = #'GIOP_Version'{major = 1, 
-							    minor = 2}, 
-				  ft_domain_id = "FT_FTDomainId",		
+				 {version = #'GIOP_Version'{major = 1,
+							    minor = 2},
+				  ft_domain_id = "FT_FTDomainId",
 				  object_group_id = ?ULONGLONGMAX,
 				  object_group_ref_version = ?LONGMAX}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_FT_PRIMARY, 
-				 component_data = 
+	  #'IOP_TaggedComponent'{tag = ?TAG_FT_PRIMARY,
+				 component_data =
 				 #'FT_TagFTPrimaryTaggedComponent'{primary = true}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_FT_HEARTBEAT_ENABLED, 
-				 component_data = 
+	  #'IOP_TaggedComponent'{tag = ?TAG_FT_HEARTBEAT_ENABLED,
+				 component_data =
 				 #'FT_TagFTHeartbeatEnabledTaggedComponent'{heartbeat_enabled = true}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_CSI_SEC_MECH_LIST, 
-				 component_data = 
+	  #'IOP_TaggedComponent'{tag = ?TAG_CSI_SEC_MECH_LIST,
+				 component_data =
 				 #'CSIIOP_CompoundSecMechList'
 				 {stateful = false,
-				  mechanism_list = 
+				  mechanism_list =
 				  [#'CSIIOP_CompoundSecMech'
-				   {target_requires = 6, 
-				    transport_mech = 
+				   {target_requires = 6,
+				    transport_mech =
 				    #'IOP_TaggedComponent'
 				    {tag=?TAG_TLS_SEC_TRANS,
 				     component_data=#'CSIIOP_TLS_SEC_TRANS'
-				    {target_supports = 7, 
-				     target_requires = 8, 
-				     addresses = 
-				     [#'CSIIOP_TransportAddress'{host_name = "127.0.0.1", 
+				    {target_supports = 7,
+				     target_requires = 8,
+				     addresses =
+				     [#'CSIIOP_TransportAddress'{host_name = "127.0.0.1",
 								 port = 6001}]}},
-				    as_context_mech = 
+				    as_context_mech =
 				    #'CSIIOP_AS_ContextSec'
 				    {target_supports = 9, target_requires = 10,
-				     client_authentication_mech = [1, 255], 
-				     target_name = [2,255]}, 
-				    sas_context_mech = 
+				     client_authentication_mech = [1, 255],
+				     target_name = [2,255]},
+				    sas_context_mech =
 				    #'CSIIOP_SAS_ContextSec'
 				    {target_supports = 11, target_requires = 12,
-				     privilege_authorities = 
+				     privilege_authorities =
 				     [#'CSIIOP_ServiceConfiguration'
-				      {syntax = ?ULONGMAX, 
-				       name = [3,255]}], 
+				      {syntax = ?ULONGMAX,
+				       name = [3,255]}],
 				     supported_naming_mechanisms = [[4,255],[5,255]],
 				     supported_identity_types = ?ULONGMAX}},
 				   #'CSIIOP_CompoundSecMech'
-				   {target_requires = 6, 
-				    transport_mech = 
+				   {target_requires = 6,
+				    transport_mech =
 				    #'IOP_TaggedComponent'
 				    {tag=?TAG_NULL_TAG,
 				     component_data=[]},
-				    as_context_mech = 
+				    as_context_mech =
 				    #'CSIIOP_AS_ContextSec'
 				    {target_supports = 9, target_requires = 10,
-				     client_authentication_mech = [1, 255], 
-				     target_name = [2,255]}, 
-				    sas_context_mech = 
+				     client_authentication_mech = [1, 255],
+				     target_name = [2,255]},
+				    sas_context_mech =
 				    #'CSIIOP_SAS_ContextSec'
 				    {target_supports = 11, target_requires = 12,
-				     privilege_authorities = 
+				     privilege_authorities =
 				     [#'CSIIOP_ServiceConfiguration'
-				      {syntax = ?ULONGMAX, 
-				       name = [3,255]}], 
+				      {syntax = ?ULONGMAX,
+				       name = [3,255]}],
 				     supported_naming_mechanisms = [[4,255],[5,255]],
 				     supported_identity_types = ?ULONGMAX}},
 				   #'CSIIOP_CompoundSecMech'
-				   {target_requires = 6, 
-				    transport_mech = 
+				   {target_requires = 6,
+				    transport_mech =
 				    #'IOP_TaggedComponent'
 				    {tag=?TAG_SECIOP_SEC_TRANS,
 				     component_data=#'CSIIOP_SECIOP_SEC_TRANS'
-				    {target_supports = 7, 
-				     target_requires = 8, 
+				    {target_supports = 7,
+				     target_requires = 8,
 				     mech_oid = [0,255],
 				     target_name = [0,255],
-				     addresses = 
-				     [#'CSIIOP_TransportAddress'{host_name = "127.0.0.1", 
+				     addresses =
+				     [#'CSIIOP_TransportAddress'{host_name = "127.0.0.1",
 								 port = 6001}]}},
-				    as_context_mech = 
+				    as_context_mech =
 				    #'CSIIOP_AS_ContextSec'
 				    {target_supports = 9, target_requires = 10,
-				     client_authentication_mech = [1, 255], 
-				     target_name = [2,255]}, 
-				    sas_context_mech = 
+				     client_authentication_mech = [1, 255],
+				     target_name = [2,255]},
+				    sas_context_mech =
 				    #'CSIIOP_SAS_ContextSec'
 				    {target_supports = 11, target_requires = 12,
-				     privilege_authorities = 
+				     privilege_authorities =
 				     [#'CSIIOP_ServiceConfiguration'
-				      {syntax = ?ULONGMAX, 
-				       name = [3,255]}], 
+				      {syntax = ?ULONGMAX,
+				       name = [3,255]}],
 				     supported_naming_mechanisms = [[4,255],[5,255]],
 				     supported_identity_types = ?ULONGMAX}}]}}],
     iop_ior:create(Version, "IDL:omg.org/CosNaming/NamingContextExt:1.0",
@@ -759,11 +800,11 @@ create_components_IOR(Version) ->
 %% function : alternate_ssl_iiop_address
 %% Arguments: Port - which port the other orb uses.
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 alternate_ssl_iiop_address(Host, Port, SSLPort) ->
     IOR = create_alternate_ssl_iiop_address(Host, Port, SSLPort),
-    
+
     ?match(false, corba_object:non_existent(IOR)),
     ?match({'object_forward',_}, corba:locate(IOR)),
     ?match({'object_forward',_}, corba:locate(IOR, 10000)),
@@ -774,37 +815,37 @@ alternate_ssl_iiop_address(Host, Port, SSLPort) ->
 %% function : create_alternate_ssl_iiop_address
 %% Arguments: Port - which port the other orb uses.
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 create_alternate_ssl_iiop_address(Host, Port, SSLPort) ->
-    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE, 
+    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE,
 				 component_data = ?ORBER_ORB_TYPE_1},
-	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS,
 				 component_data = ?DEFAULT_CODESETS},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
 				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host, 
+				   'HostID' = Host,
 				   'Port' = Port}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
 				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host, 
+				   'HostID' = Host,
 				   'Port' = 8000}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS, 
+	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
 				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host, 
+				   'HostID' = Host,
 				   'Port' = 8000}},
-	  #'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-				 component_data=#'SSLIOP_SSL'{target_supports = 2, 
-							      target_requires = 2, 
+	  #'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS,
+				 component_data=#'SSLIOP_SSL'{target_supports = 2,
+							      target_requires = 2,
 							      port = SSLPort}}],
     #'IOP_IOR'{type_id=TypeID,
-	       profiles=P1} = _IORA = iop_ior:create_external({1,2}, 
+	       profiles=P1} = _IORA = iop_ior:create_external({1,2},
 							      "IDL:omg.org/CosNaming/NamingContextExt:1.0",
-							      Host, 8000, 
+							      Host, 8000,
 							      "NameService", MC),
-    #'IOP_IOR'{profiles=P2} = _IORB = iop_ior:create_external({1,1}, 
+    #'IOP_IOR'{profiles=P2} = _IORB = iop_ior:create_external({1,1},
 							      "IDL:omg.org/CosNaming/NamingContextExt:1.0",
-							      Host, 8000, 
+							      Host, 8000,
 							      "NameService", []),
     #'IOP_IOR'{type_id=TypeID, profiles=P2++P1}.
 
@@ -813,11 +854,11 @@ create_alternate_ssl_iiop_address(Host, Port, SSLPort) ->
 %% function : timeouts
 %% Arguments: Port - which port the other orb uses.
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 
 timeouts(Host, Port, ReqT) ->
-    NSR = corba:resolve_initial_references_remote("NameService", 
+    NSR = corba:resolve_initial_references_remote("NameService",
             ["iiop://"++Host++":"++integer_to_list(Port)]),
     NC1 = lname_component:set_id(lname_component:create(), "mamba"),
     N1 = lname:insert_component(lname:create(), 1, NC1),
@@ -827,21 +868,21 @@ timeouts(Host, Port, ReqT) ->
     Viper = 'CosNaming_NamingContext':resolve(NSR, N2),
 
     ?match({'EXCEPTION',{'TIMEOUT',_,_,_}},
-	   orber_test_timeout_server:twoway_function(Viper, ReqT, ReqT*2)), 
-    ?match(ok, orber_test_timeout_server:oneway_function(Viper, ReqT*2)), 
+	   orber_test_timeout_server:twoway_function(Viper, ReqT, ReqT*2)),
+    ?match(ok, orber_test_timeout_server:oneway_function(Viper, ReqT*2)),
 
     ?match({'EXCEPTION',{'TIMEOUT',_,_,_}},
-		 orber_test_server:testing_iiop_twoway_delay(Mamba, ReqT)), 
+		 orber_test_server:testing_iiop_twoway_delay(Mamba, ReqT)),
     ?match(ok, orber_test_server:testing_iiop_oneway_delay(Mamba, ReqT)),
-    
+
     %% Since the objects are stalled we must wait until they are available again
     %% to be able to run any more tests and get the correct results.
     timer:sleep(ReqT*4),
-    
-    ?match(ok, orber_test_timeout_server:twoway_function(Viper, ReqT*2, ReqT)), 
-    ?match(ok, orber_test_timeout_server:oneway_function(Viper, ReqT*2)), 
-    
-    ?match(ok, orber_test_server:testing_iiop_twoway_delay(Mamba, 0)), 
+
+    ?match(ok, orber_test_timeout_server:twoway_function(Viper, ReqT*2, ReqT)),
+    ?match(ok, orber_test_timeout_server:oneway_function(Viper, ReqT*2)),
+
+    ?match(ok, orber_test_server:testing_iiop_twoway_delay(Mamba, 0)),
     ?match(ok, orber_test_server:testing_iiop_oneway_delay(Mamba, 0)),
 
     timer:sleep(ReqT*4),
@@ -852,11 +893,11 @@ timeouts(Host, Port, ReqT) ->
 %% Arguments: Host - which node to contact.
 %%            Port - which port the other orb uses.
 %% Returns  : term()
-%% Effect   : 
+%% Effect   :
 %%------------------------------------------------------------
 
 light_tests(Host, Port, ObjName) ->
-    NSR = corba:resolve_initial_references_remote("NameService", 
+    NSR = corba:resolve_initial_references_remote("NameService",
             ["iiop://"++Host++":"++integer_to_list(Port)]),
     NC1 = lname_component:set_id(lname_component:create(), "not_exist"),
     N1 =  lname:insert_component(lname:create(), 1, NC1),
@@ -867,7 +908,7 @@ light_tests(Host, Port, ObjName) ->
 	   'CosNaming_NamingContext':resolve(NSR, N1)),
     NC2 = lname_component:set_id(lname_component:create(), ObjName),
     N2  = lname:insert_component(lname:create(), 1, NC2),
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_}, 
+    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
 		 'CosNaming_NamingContext':resolve(NSR, N2)),
     Nodes = orber:get_lightweight_nodes(),
     io:format("Light Nodes: ~p~n", [Nodes]),
@@ -889,165 +930,165 @@ test_coding(Obj) ->
 test_coding(Obj, Local) ->
     %%--- Testing code and decode arguments ---
     ?match({ok, 1.5}, orber_test_server:testing_iiop_float(Obj, 1.5)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_float(Obj, atom)),
 
     ?match({ok,1.0}, orber_test_server:testing_iiop_double(Obj, 1.0)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_double(Obj, "wrong")),
-    
+
     ?match({ok,0}, orber_test_server:testing_iiop_short(Obj, 0)),
     ?match({ok,?SHORTMAX}, orber_test_server:testing_iiop_short(Obj, ?SHORTMAX)),
     ?match({ok,?SHORTMIN}, orber_test_server:testing_iiop_short(Obj, ?SHORTMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_short(Obj, atomic)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_short(Obj, ?SHORTMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_short(Obj, ?SHORTMIN-1)),
-    
+
     ?match({ok,0}, orber_test_server:testing_iiop_ushort(Obj, 0)),
     ?match({ok,?USHORTMAX}, orber_test_server:testing_iiop_ushort(Obj, ?USHORTMAX)),
     ?match({ok,?USHORTMIN}, orber_test_server:testing_iiop_ushort(Obj, ?USHORTMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_ushort(Obj, ?USHORTMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_ushort(Obj, ?USHORTMIN-1)),
-    
+
     ?match({ok,0}, orber_test_server:testing_iiop_long(Obj, 0)),
     ?match({ok,?LONGMAX}, orber_test_server:testing_iiop_long(Obj, ?LONGMAX)),
     ?match({ok,?LONGMIN}, orber_test_server:testing_iiop_long(Obj, ?LONGMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_long(Obj, "wrong")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_long(Obj, ?LONGMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_long(Obj, ?LONGMIN-1)),
-    
+
     ?match({ok,0}, orber_test_server:testing_iiop_longlong(Obj, 0)),
     ?match({ok,?LONGLONGMAX}, orber_test_server:testing_iiop_longlong(Obj, ?LONGLONGMAX)),
     ?match({ok,?LONGLONGMIN}, orber_test_server:testing_iiop_longlong(Obj, ?LONGLONGMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_longlong(Obj, "wrong")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_longlong(Obj, ?LONGLONGMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_longlong(Obj, ?LONGLONGMIN-1)),
-    
+
     ?match({ok,0}, orber_test_server:testing_iiop_ulong(Obj, 0)),
     ?match({ok,?ULONGMAX}, orber_test_server:testing_iiop_ulong(Obj, ?ULONGMAX)),
     ?match({ok,?ULONGMIN}, orber_test_server:testing_iiop_ulong(Obj, ?ULONGMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 		 orber_test_server:testing_iiop_ulong(Obj, ?ULONGMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 		 orber_test_server:testing_iiop_ulong(Obj, ?ULONGMIN-1)),
-    
+
     ?match({ok,0}, orber_test_server:testing_iiop_ulonglong(Obj, 0)),
     ?match({ok,?ULONGLONGMAX}, orber_test_server:testing_iiop_ulonglong(Obj, ?ULONGLONGMAX)),
     ?match({ok,?ULONGLONGMIN}, orber_test_server:testing_iiop_ulonglong(Obj, ?ULONGLONGMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_ulonglong(Obj, ?ULONGLONGMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_ulonglong(Obj, ?ULONGLONGMIN-1)),
-    
+
     ?match({ok,98}, orber_test_server:testing_iiop_char(Obj, 98)),
     ?match({ok,$b}, orber_test_server:testing_iiop_char(Obj, $b)),
 
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_char(Obj, atomic)),
 
     ?match({ok,65535}, orber_test_server:testing_iiop_wchar(Obj, 65535)),
     ?match({ok,$b}, orber_test_server:testing_iiop_wchar(Obj, $b)),
 
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_wchar(Obj, atomic)),
-    
+
     ?match({ok,true}, orber_test_server:testing_iiop_bool(Obj, true)),
     ?match({ok,false}, orber_test_server:testing_iiop_bool(Obj, false)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_bool(Obj, atom)),
-    
+
     ?match({ok,1}, orber_test_server:testing_iiop_octet(Obj, 1)),
 % No real guards for this case.
-%    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+%    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 %	   orber_test_server:testing_iiop_octet(Obj, 1.5)),
     IOR12 = create_components_IOR({1,2}),
     ?match({ok,Obj}, orber_test_server:testing_iiop_obj(Obj, Obj)),
     ?match({ok,IOR12}, orber_test_server:testing_iiop_obj(Obj, IOR12)),
     PObj = orber_test_server:oe_create([], [{pseudo,true}]),
     ?match({ok, _}, orber_test_server:testing_iiop_obj(Obj, PObj)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_obj(Obj, "no_object")),
     ?match({ok,"string"}, orber_test_server:testing_iiop_string(Obj, "string")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_string(Obj, "ToLongString")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_string(Obj, atomic)),
 
     ?match({ok,[65535]}, orber_test_server:testing_iiop_wstring(Obj, [65535])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_wstring(Obj, "ToLongWstring")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_wstring(Obj, atomic)),
 
-    ?match({ok, one}, 
+    ?match({ok, one},
 		 orber_test_server:testing_iiop_enum(Obj, one)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_enum(Obj, three)),
-    ?match({ok,[1,2,3]}, 
+    ?match({ok,[1,2,3]},
 		 orber_test_server:testing_iiop_seq(Obj, [1,2,3])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_seq(Obj, [1,2,3,4])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_seq(Obj, false)),
 
 
-    ?match({ok,[#orber_test_server_struc{a=1, b=2}]}, 
-		 orber_test_server:testing_iiop_struc_seq(Obj, 
+    ?match({ok,[#orber_test_server_struc{a=1, b=2}]},
+		 orber_test_server:testing_iiop_struc_seq(Obj,
 					  [#orber_test_server_struc{a=1, b=2}])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_struc_seq(Obj, false)),
 
-    ?match({ok,[#orber_test_server_uni{label=1, value=66}]}, 
-		 orber_test_server:testing_iiop_uni_seq(Obj, 
+    ?match({ok,[#orber_test_server_uni{label=1, value=66}]},
+		 orber_test_server:testing_iiop_uni_seq(Obj,
 					  [#orber_test_server_uni{label=1, value=66}])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_uni_seq(Obj, false)),
 
-    ?match({ok,{"one", "two"}}, 
+    ?match({ok,{"one", "two"}},
 		 orber_test_server:testing_iiop_array(Obj, {"one", "two"})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_array(Obj, {"one", "two", "three"})),
-    ?match({ok,#orber_test_server_struc{a=1, b=2}}, 
-		 orber_test_server:testing_iiop_struct(Obj, 
+    ?match({ok,#orber_test_server_struc{a=1, b=2}},
+		 orber_test_server:testing_iiop_struct(Obj,
                                          #orber_test_server_struc{a=1, b=2})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_struct(Obj, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_struct(Obj,
                                          #orber_test_server_struc{a="WRONG", b=2})),
-    ?match({ok,#orber_test_server_uni{label=1, value=66}}, 
-	   orber_test_server:testing_iiop_union(Obj, 
+    ?match({ok,#orber_test_server_uni{label=1, value=66}},
+	   orber_test_server:testing_iiop_union(Obj,
                                            #orber_test_server_uni{label=1, value=66})),
 
-    ?match({ok,#orber_test_server_uni_d{label=1, value=66}}, 
-	   orber_test_server:testing_iiop_union_d(Obj, 
+    ?match({ok,#orber_test_server_uni_d{label=1, value=66}},
+	   orber_test_server:testing_iiop_union_d(Obj,
                                            #orber_test_server_uni_d{label=1, value=66})),
 
-    ?match({ok,#orber_test_server_uni_d{label=2, value=true}}, 
-	   orber_test_server:testing_iiop_union_d(Obj, 
+    ?match({ok,#orber_test_server_uni_d{label=2, value=true}},
+	   orber_test_server:testing_iiop_union_d(Obj,
                                            #orber_test_server_uni_d{label=2, value=true})),
 
     ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_union_d(Obj, 
+	   orber_test_server:testing_iiop_union_d(Obj,
                                            #orber_test_server_uni_d{label=2, value=66})),
 
     case Local of
 	true ->
-	    ?match({ok,#orber_test_server_uni{label=2, value=66}}, 
-		   orber_test_server:testing_iiop_union(Obj, 
+	    ?match({ok,#orber_test_server_uni{label=2, value=66}},
+		   orber_test_server:testing_iiop_union(Obj,
 							#orber_test_server_uni{label=2, value=66}));
 	false ->
-	    ?match({ok,#orber_test_server_uni{label=2, value=undefined}}, 
-		   orber_test_server:testing_iiop_union(Obj, 
+	    ?match({ok,#orber_test_server_uni{label=2, value=undefined}},
+		   orber_test_server:testing_iiop_union(Obj,
 							#orber_test_server_uni{label=2, value=66}))
     end,
 
@@ -1058,258 +1099,258 @@ test_coding(Obj, Local) ->
     C4 = orber_test_server:fixed52negconst1(),
     C5 = orber_test_server:fixed52negconst2(),
     C6 = orber_test_server:fixed52negconst3(),
-    
+
     ?match({ok,C1}, orber_test_server:testing_iiop_fixed(Obj, C1)),
     ?match({ok,C2}, orber_test_server:testing_iiop_fixed(Obj, C2)),
     ?match({ok,C3}, orber_test_server:testing_iiop_fixed(Obj, C3)),
     ?match({ok,C4}, orber_test_server:testing_iiop_fixed(Obj, C4)),
     ?match({ok,C5}, orber_test_server:testing_iiop_fixed(Obj, C5)),
     ?match({ok,C6}, orber_test_server:testing_iiop_fixed(Obj, C6)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-		 orber_test_server:testing_iiop_fixed(Obj, #fixed{digits = 5, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+		 orber_test_server:testing_iiop_fixed(Obj, #fixed{digits = 5,
 								  scale = 2,
 								  value = 123450})),
 
     ?match(ok, orber_test_server:testing_iiop_void(Obj)),
 
-    ?match({'EXCEPTION',{'BAD_QOS',_,_,_}}, 
+    ?match({'EXCEPTION',{'BAD_QOS',_,_,_}},
 	   orber_test_server:pseudo_call_raise_exc(Obj, 1)),
-    ?match({'EXCEPTION',{'BAD_QOS',_,_,_}}, 
+    ?match({'EXCEPTION',{'BAD_QOS',_,_,_}},
 	   orber_test_server:pseudo_call_raise_exc(Obj, 2)),
-    ?match({'EXCEPTION',{'orber_test_server_UserDefinedException',_}}, 
+    ?match({'EXCEPTION',{'orber_test_server_UserDefinedException',_}},
 		 orber_test_server:raise_local_exception(Obj)),
     ?match({'EXCEPTION',{'orber_test_server_ComplexUserDefinedException',_,
-			       [#orber_test_server_struc{a=1, b=2}]}}, 
+			       [#orber_test_server_struc{a=1, b=2}]}},
 		 orber_test_server:raise_complex_local_exception(Obj)),
     %% Test all TypeCodes
-    ?match({ok, #any{typecode = tk_long, value = 1}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long, 
+    ?match({ok, #any{typecode = tk_long, value = 1}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
 							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
 							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_float, value = 1.5}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_float, 
+    ?match({ok, #any{typecode = tk_float, value = 1.5}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_float,
 							      value = 1.5})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
 							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_double}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_double, 
+    ?match({ok, #any{typecode = tk_double}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_double,
 							      value = 1.0})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_double, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_double,
 							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_short, value = -1}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_short, 
+    ?match({ok, #any{typecode = tk_short, value = -1}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_short,
 							      value = -1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_short, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_short,
 							value = atomic})),
-    ?match({ok, #any{typecode = tk_ushort, value = 1}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ushort, 
+    ?match({ok, #any{typecode = tk_ushort, value = 1}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ushort,
 							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ushort, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ushort,
 							value = -1})),
-    ?match({ok, #any{typecode = tk_long, value = 1}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long, 
+    ?match({ok, #any{typecode = tk_long, value = 1}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
 							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
 							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_longlong, value = 1}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_longlong, 
+    ?match({ok, #any{typecode = tk_longlong, value = 1}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_longlong,
 							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_longlong, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_longlong,
 							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_ulong, value = 1}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong, 
+    ?match({ok, #any{typecode = tk_ulong, value = 1}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong,
 							      value = 1})),
-    ?match({ok, #any{typecode = tk_ulong, value = 4294967295}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong, 
+    ?match({ok, #any{typecode = tk_ulong, value = 4294967295}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong,
 							      value = 4294967295})),
     ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong, 
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong,
 							      value = 4294967296})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong,
 							value = -1})),
-    ?match({ok, #any{typecode = tk_ulonglong, value = 1}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulonglong, 
+    ?match({ok, #any{typecode = tk_ulonglong, value = 1}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulonglong,
 							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulonglong, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulonglong,
 							value = -1})),
-    ?match({ok, #any{typecode = tk_char, value = 98}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char, 
+    ?match({ok, #any{typecode = tk_char, value = 98}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char,
 							      value = 98})),
-    ?match({ok, #any{typecode = tk_char, value = $b}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char, 
+    ?match({ok, #any{typecode = tk_char, value = $b}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char,
 							      value = $b})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char,
 							value = atomic})),
-    ?match({ok, #any{typecode = tk_wchar, value = 65535}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar, 
+    ?match({ok, #any{typecode = tk_wchar, value = 65535}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar,
 							      value = 65535})),
-    ?match({ok, #any{typecode = tk_wchar, value = $b}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar, 
+    ?match({ok, #any{typecode = tk_wchar, value = $b}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar,
 							      value = $b})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar,
 							value = atomic})),
-    ?match({ok, #any{typecode = tk_boolean, value = true}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean, 
+    ?match({ok, #any{typecode = tk_boolean, value = true}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean,
 							      value = true})),
-    ?match({ok, #any{typecode = tk_boolean, value = false}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean, 
+    ?match({ok, #any{typecode = tk_boolean, value = false}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean,
 							      value = false})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean,
 							value = 1})),
-    ?match({ok, #any{typecode = tk_octet, value = 1}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_octet, 
+    ?match({ok, #any{typecode = tk_octet, value = 1}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_octet,
 							      value = 1})),
-    ?match({ok, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"}, value = Obj}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"}, 
+    ?match({ok, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"}, value = Obj}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"},
 							      value = Obj})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"},
 							value = "No Object"})),
-    ?match({ok, #any{typecode = {tk_string, 6}, value = "string"}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_string, 6}, 
+    ?match({ok, #any{typecode = {tk_string, 6}, value = "string"}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_string, 6},
 							      value = "string"})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_string, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_string,
 							value = atomic})),
-    ?match({ok, #any{typecode = {tk_wstring, 1}, value = [65535]}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_wstring, 1}, 
+    ?match({ok, #any{typecode = {tk_wstring, 1}, value = [65535]}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_wstring, 1},
 							      value = [65535]})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_wstring, 1}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_wstring, 1},
 							value = atomic})),
-    ?match({ok, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]}, 
-			   value = two}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]}, 
+    ?match({ok, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]},
+			   value = two}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]},
 							      value = two})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]},
 							      value = three})),
 
 
-    ?match({ok, #any{typecode = {tk_sequence, tk_long, 3}, 
-			   value = [1,2,3]}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_sequence, tk_long, 3}, 
+    ?match({ok, #any{typecode = {tk_sequence, tk_long, 3},
+			   value = [1,2,3]}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_sequence, tk_long, 3},
 							      value = [1,2,3]})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_sequence, tk_long, 3}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_sequence, tk_long, 3},
 							value = false})),
 
 
 
-    ?match({ok, #any{typecode = {tk_array,{tk_string,0},2}, 
-			   value = {"one", "two"}}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2}, 
+    ?match({ok, #any{typecode = {tk_array,{tk_string,0},2},
+			   value = {"one", "two"}}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2},
 							      value = {"one", "two"}})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2},
 							value = {"one", "two", "three"}})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
+	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2},
 							value = {1, 2}})),
     ?match({ok, #any{typecode = {tk_struct,"IDL:omg.org/orber_test/server/struc:1.0",
 				       "struc",
-				       [{"a",tk_long},{"b",tk_short}]}, 
-			   value = #orber_test_server_struc{a=1, b=2}}}, 
+				       [{"a",tk_long},{"b",tk_short}]},
+			   value = #orber_test_server_struc{a=1, b=2}}},
 		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_struct,"IDL:omg.org/orber_test/server/struc:1.0",
 									  "struc",
 									  [{"a",tk_long},{"b",tk_short}]},
 							      value = #orber_test_server_struc{a=1, b=2}})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_struct,"IDL:omg.org/orber_test/server/struc:1.0",
 								    "struc",
-								    [{"a",tk_long},{"b",tk_short}]}, 
+								    [{"a",tk_long},{"b",tk_short}]},
 							value = #orber_test_server_struc{a=1, b="string"}})),
-    ?match({ok, #any{typecode = 
+    ?match({ok, #any{typecode =
 			   {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-			    "uni", tk_long, -1, [{1,"a",tk_long}]}, 
-			   value = #orber_test_server_uni{label=1, value=66}}}, 
+			    "uni", tk_long, -1, [{1,"a",tk_long}]},
+			   value = #orber_test_server_uni{label=1, value=66}}},
 		 orber_test_server:
-		 testing_iiop_any(Obj, 
-				  #any{typecode = 
+		 testing_iiop_any(Obj,
+				  #any{typecode =
 				       {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-					"uni", tk_long,	-1, [{1,"a",tk_long}]}, 
+					"uni", tk_long,	-1, [{1,"a",tk_long}]},
 				       value = #orber_test_server_uni{label=1, value=66}})),
     case Local of
 	true ->
-	    ?match({ok, #any{typecode = 
+	    ?match({ok, #any{typecode =
 				   {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-				    "uni", tk_long, -1, [{1,"a",tk_long}]}, 
-				   value = #orber_test_server_uni{label=2, value=66}}}, 
+				    "uni", tk_long, -1, [{1,"a",tk_long}]},
+				   value = #orber_test_server_uni{label=2, value=66}}},
 			 orber_test_server:
 			 testing_iiop_any(Obj,
-					  #any{typecode = 
+					  #any{typecode =
 					       {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-						"uni", tk_long,	-1, [{1,"a",tk_long}]}, 
+						"uni", tk_long,	-1, [{1,"a",tk_long}]},
 					       value = #orber_test_server_uni{label=2, value=66}}));
 	false ->
-	    ?match({ok, #any{typecode = 
+	    ?match({ok, #any{typecode =
 				   {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-				    "uni", tk_long, -1, [{1,"a",tk_long}]}, 
-				   value = #orber_test_server_uni{label=2, value=undefined}}}, 
+				    "uni", tk_long, -1, [{1,"a",tk_long}]},
+				   value = #orber_test_server_uni{label=2, value=undefined}}},
 			 orber_test_server:
 			 testing_iiop_any(Obj,
-					  #any{typecode = 
+					  #any{typecode =
 					       {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-						"uni", tk_long,	-1, [{1,"a",tk_long}]}, 
+						"uni", tk_long,	-1, [{1,"a",tk_long}]},
 					       value = #orber_test_server_uni{label=2, value=66}}))
     end,
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
 	   orber_test_server:
-		 testing_iiop_any(Obj, 
-				  #any{typecode = 
+		 testing_iiop_any(Obj,
+				  #any{typecode =
 				       {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-					"uni", tk_long, -1, [{1,"a",tk_long}]}, 
+					"uni", tk_long, -1, [{1,"a",tk_long}]},
 				       value = #orber_test_server_uni{label=1, value="string"}})),
 
-    ?match({ok, #any{typecode = {tk_fixed,5,2}, 
-			   value = #fixed{digits = 5, scale = 2, value = 12345}}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,5,2}, 
-							      value = #fixed{digits = 5, 
-									     scale = 2, 
+    ?match({ok, #any{typecode = {tk_fixed,5,2},
+			   value = #fixed{digits = 5, scale = 2, value = 12345}}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,5,2},
+							      value = #fixed{digits = 5,
+									     scale = 2,
 									     value = 12345}})),
-    ?match({ok, #any{typecode = {tk_fixed,10,2}, 
-			   value = #fixed{digits = 10, scale = 2, value = 1234567890}}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,10,2}, 
-							      value = #fixed{digits = 10, 
-									     scale = 2, 
+    ?match({ok, #any{typecode = {tk_fixed,10,2},
+			   value = #fixed{digits = 10, scale = 2, value = 1234567890}}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,10,2},
+							      value = #fixed{digits = 10,
+									     scale = 2,
 									     value = 1234567890}})),
-    ?match({ok, #any{typecode = {tk_fixed,6,2}, 
-			   value = #fixed{digits = 6, scale = 2, value = 300000}}}, 
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,6,2}, 
-							      value = #fixed{digits = 6, 
-									     scale = 2, 
+    ?match({ok, #any{typecode = {tk_fixed,6,2},
+			   value = #fixed{digits = 6, scale = 2, value = 300000}}},
+		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,6,2},
+							      value = #fixed{digits = 6,
+									     scale = 2,
 									     value = 300000}})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
+    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
           orber_test_server:
 		 testing_iiop_server_marshal(Obj, "string")),
-    
+
     RecS = #orber_test_server_rec_struct{chain = [#orber_test_server_rec_struct{chain = []}]},
     ?match(RecS, orber_test_server:testing_iiop_rec_struct(Obj, RecS)),
-    
-    RecU = #orber_test_server_rec_union{label = 'RecursiveType', 
+
+    RecU = #orber_test_server_rec_union{label = 'RecursiveType',
 					value = [#orber_test_server_rec_union{label = 'RecursiveType',
 									      value = []}]},
     ?match(RecU, orber_test_server:testing_iiop_rec_union(Obj, RecU)),
 
 %%     RecA1 = #any{typecode = unsupported, value = RecS},
 %%     RecA2 = #any{typecode = unsupported, value = RecU},
-%%     ?match(RecA1, 
-%% 	   orber_test_server:testing_iiop_rec_any(Obj, RecA1)),    
-%%     ?match(RecA2, 
-%% 	   orber_test_server:testing_iiop_rec_any(Obj, RecA2)),    
+%%     ?match(RecA1,
+%% 	   orber_test_server:testing_iiop_rec_any(Obj, RecA1)),
+%%     ?match(RecA2,
+%% 	   orber_test_server:testing_iiop_rec_any(Obj, RecA2)),
 
     ok.
 
@@ -1332,14 +1373,14 @@ Result    : ~p
     ok.
 
 %%--------------- Testing Missing Module ---------------------
-oe_get_interface() ->  
+oe_get_interface() ->
     non_existing_module:tc(foo).
 
 %%--------------- INTERCEPTOR FUNCTIONS ----------------------
 %%------------------------------------------------------------
 %% function : new_in_connection
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 new_in_connection(Arg, CHost, Port) ->
     Host = node(),
@@ -1353,14 +1394,14 @@ To Host   : ~p
 To Port   : ~p
 Peers     : ~p
 Arg       : ~p
-==========================================~n", 
+==========================================~n",
 			  [Host, CHost, Port, SHost, SPort, Peers, Arg]),
     {Host}.
 
 %%------------------------------------------------------------
 %% function : new_out_connection
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 new_out_connection(Arg, SHost, Port) ->
     Host = node(),
@@ -1369,73 +1410,73 @@ Node      : ~p
 To Host   : ~p
 To Port   : ~p
 Arg       : ~p
-==========================================~n", 
+==========================================~n",
 			  [Host, SHost, Port, Arg]),
     {Host}.
 
 %%------------------------------------------------------------
 %% function : closed_in_connection
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 closed_in_connection(Arg) ->
     error_logger:info_msg("=============== closed_in_connection =====
 Node      : ~p
 Connection: ~p
-==========================================~n", 
+==========================================~n",
 			  [node(), Arg]),
     Arg.
 
 %%------------------------------------------------------------
 %% function : closed_out_connection
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 closed_out_connection(Arg) ->
     error_logger:info_msg("=============== closed_out_connection ====
 Node      : ~p
 Connection: ~p
-==========================================~n", 
+==========================================~n",
 			  [node(), Arg]),
     Arg.
 
 %%------------------------------------------------------------
 %% function : in_request_encoded
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
-in_request_encoded(Ref, _ObjKey, Ctx, Op, 
+in_request_encoded(Ref, _ObjKey, Ctx, Op,
 	   <<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8,T/binary>>, _Args) ->
     error_logger:info_msg("=============== in_request_encoded =======
 Connection: ~p
 Operation : ~p
 Body      : ~p
 Context   : ~p
-==========================================~n", 
+==========================================~n",
 			  [Ref, Op, T, Ctx]),
     {T, "NewArgs"}.
 
 %%------------------------------------------------------------
 %% function : in_reply_encoded
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 in_reply_encoded(Ref, _ObjKey, Ctx, Op,
-	 <<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8,T/binary>>, 
+	 <<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8,T/binary>>,
 	 _Args) ->
     error_logger:info_msg("============== in_reply_encoded ==========
 Connection: ~p
 Operation : ~p
 Body      : ~p
 Context   : ~p
-==========================================~n", 
+==========================================~n",
 			  [Ref, Op, T, Ctx]),
     {T, "NewArgs"}.
 
 %%------------------------------------------------------------
 %% function : out_reply_encoded
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 out_reply_encoded(Ref, _ObjKey, Ctx, Op, List, _Args) ->
     error_logger:info_msg("============== out_reply_encoded =========
@@ -1443,14 +1484,14 @@ Connection: ~p
 Operation : ~p
 Body      : ~p
 Context   : ~p
-==========================================~n", 
+==========================================~n",
 			  [Ref, Op, List, Ctx]),
     {list_to_binary([<<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8>>|List]), "NewArgs"}.
 
 %%------------------------------------------------------------
 %% function : out_request_encoded
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 out_request_encoded(Ref, _ObjKey, Ctx, Op, List, _Args) ->
     error_logger:info_msg("============== out_request_encoded =======
@@ -1458,14 +1499,14 @@ Connection: ~p
 Operation : ~p
 Body      : ~p
 Context   : ~p
-==========================================~n", 
+==========================================~n",
 			  [Ref, Op, List, Ctx]),
     {list_to_binary([<<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8>>|List]), "NewArgs"}.
 
 %%------------------------------------------------------------
 %% function : in_request
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 in_request(Ref, _ObjKey, Ctx, Op, Params, _Args) ->
     error_logger:info_msg("=============== in_request ===============
@@ -1473,14 +1514,14 @@ Connection: ~p
 Operation : ~p
 Parameters: ~p
 Context   : ~p
-==========================================~n", 
+==========================================~n",
 			  [Ref, Op, Params, Ctx]),
     {Params, "NewArgs"}.
 
 %%------------------------------------------------------------
 %% function : in_reply
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 in_reply(Ref, _ObjKey, Ctx, Op, Reply, _Args) ->
     error_logger:info_msg("=============== in_reply =================
@@ -1488,14 +1529,14 @@ Connection: ~p
 Operation : ~p
 Reply     : ~p
 Context   : ~p
-==========================================~n", 
+==========================================~n",
 			  [Ref, Op, Reply, Ctx]),
     {Reply, "NewArgs"}.
 
 %%------------------------------------------------------------
 %% function : postinvoke
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 out_reply(Ref, _ObjKey, Ctx, Op, Reply, _Args) ->
     error_logger:info_msg("=============== out_reply ================
@@ -1503,14 +1544,14 @@ Connection: ~p
 Operation : ~p
 Reply     : ~p
 Context   : ~p
-==========================================~n", 
+==========================================~n",
 			  [Ref, Op, Reply, Ctx]),
     {Reply, "NewArgs"}.
 
 %%------------------------------------------------------------
 %% function : postinvoke
-%% Arguments: 
-%% Returns  : 
+%% Arguments:
+%% Returns  :
 %%------------------------------------------------------------
 out_request(Ref, _ObjKey, Ctx, Op, Params, _Args) ->
     error_logger:info_msg("=============== out_request ==============
@@ -1518,7 +1559,7 @@ Connection: ~p
 Operation : ~p
 Parameters: ~p
 Context   : ~p
-==========================================~n", 
+==========================================~n",
 			  [Ref, Op, Params, Ctx]),
     {Params, "NewArgs"}.