Merge branch 'ia/ssl/test-maintenance'

* ia/ssl/test-maintenance:
  Removed compiler warnings
  Work around bug in openss-1.0.0e
  Use ERL_FLAGS in plain_verify_options test
  Adjustment to work with hipe
  Avoid openssl processes surviving after test case has finished
  Add better error message
  Skip ssl_dist_SUITE if cover run, as the test server node can not communicate with the ssl nodes with erlang distribution
  Fine tuning of test suites

5 files changed, 131 insertions, 89 deletions

diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 42dc44c39b..d9cb8002ed 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -2592,7 +2592,7 @@ client_renegotiate(Config) when is_list(Config) ->
 				   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
  
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
 					{from, self()}, 
 					{mfa, {?MODULE, 
@@ -3038,7 +3038,8 @@ tcp_delivery_workaround(Server, ServerMsg, Client, ClientMsg) ->
 		{Client, ClientMsg} ->
 		    ok;
 		{Client, {error,closed}} ->
-		    test_server:format("client got close");
+		    test_server:format("client got close"),
+		    ok;
 		Unexpected ->
 		    test_server:fail(Unexpected) 
 	    end;
@@ -3588,14 +3589,13 @@ hibernate(Config) ->
 					{from, self()},
 					{mfa, {?MODULE, send_recv_result_active, []}},
 					{options, [{hibernate_after, 1000}|ClientOpts]}]),
-
-    { current_function, { _M, _F, _A } } =
+    {current_function, _} =
         process_info(Pid, current_function),
 
     timer:sleep(1100),
 
-    { current_function, { erlang, hibernate, 3} } =
-        process_info(Pid, current_function),
+    {current_function, {erlang, hibernate, 3}} =
+	process_info(Pid, current_function),
 
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
diff --git a/lib/ssl/test/ssl_cipher_SUITE.erl b/lib/ssl/test/ssl_cipher_SUITE.erl
index 87478e13bc..99bc21e820 100644
--- a/lib/ssl/test/ssl_cipher_SUITE.erl
+++ b/lib/ssl/test/ssl_cipher_SUITE.erl
@@ -134,7 +134,7 @@ aes_decipher_good(Config) when is_list(Config) ->
     Version = {3,3},
     Content = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56,72,69,76,76,79,10>>,
     Mac = <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>,
-    {Content, Mac, CipherState1} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
+    {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
     ok.
 
 %%--------------------------------------------------------------------
@@ -155,7 +155,7 @@ aes_decipher_fail(Config) when is_list(Config) ->
 		 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122,
 		 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>,
     Version = {3,3},
-    {Content, Mac, CipherState1} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
+    {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
     32 = byte_size(Content),
     32 = byte_size(Mac),
     ok.
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 23e9268f9b..8fe55ee7a4 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -54,9 +54,14 @@ end_per_group(_GroupName, Config) ->
 init_per_suite(Config0) ->
     try crypto:start() of
 	ok ->
-	    Config = add_ssl_opts_config(Config0),
-	    setup_certs(Config),
-	    Config
+	    case test_server:is_cover() of
+		false ->
+		    Config = add_ssl_opts_config(Config0),
+		    setup_certs(Config),
+		    Config;
+		true ->
+		    {skip, "Can not be covered"}
+	    end
     catch _:_ ->
 	    {skip, "Crypto did not start"}
     end.
@@ -65,11 +70,31 @@ end_per_suite(Config) ->
     application:stop(crypto),
     Config.
 
+init_per_testcase(plain_verify_options = Case, Config) when is_list(Config) ->
+    SslFlags = setup_dist_opts([{many_verify_opts, true} | Config]),
+    Flags = case os:getenv("ERL_FLAGS") of
+		false ->
+		    os:putenv("ERL_FLAGS", SslFlags),
+		    "";
+		OldFlags ->
+		    os:putenv("ERL_FLAGS", OldFlags ++ "" ++ SslFlags),
+		    OldFlags
+    end,
+    common_init(Case, [{old_flags, Flags} | Config]);
+
 init_per_testcase(Case, Config) when is_list(Config) ->
+    common_init(Case, Config).
+
+common_init(Case, Config) ->
     Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMETRAP_SECS)),
     [{watchdog, Dog},{testcase, Case}|Config].
 
-end_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(Case, Config) when is_list(Config) ->
+    Flags = proplists:get_value(old_flags, Config),
+    os:putenv("ERL_FLAGS", Flags),
+    common_end(Case, Config).
+
+common_end(_, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
@@ -205,9 +230,9 @@ plain_verify_options(Config) when is_list(Config) ->
 	"server_reuse_sessions true client_reuse_sessions true  "
 	"server_hibernate_after 500 client_hibernate_after 500",
 
-    NH1 = start_ssl_node([{additional_dist_opts, DistOpts}, {many_verify_opts, true} | Config]),
+    NH1 = start_ssl_node([{additional_dist_opts, DistOpts} | Config]),
     Node1 = NH1#node_handle.nodename,
-    NH2 = start_ssl_node([{additional_dist_opts, DistOpts}, {many_verify_opts, true} | Config]),
+    NH2 = start_ssl_node([{additional_dist_opts, DistOpts} | Config]),
     Node2 = NH2#node_handle.nodename,
 
     pong = apply_on_ssl_node(NH1, fun () -> net_adm:ping(Node2) end),
@@ -467,8 +492,10 @@ cnct2tstsrvr([Host, Port]) when is_list(Host), is_list(Port) ->
 				ets:insert(test_server_info,
 					   {test_server_handler, self()}),
 				ssl_node_con_loop(Socket);
-			    _Error ->
-				halt("Failed to connect to test server")
+			    Error ->
+				halt("Failed to connect to test server " ++
+					 lists:flatten(io_lib:format("Host:~p ~n Port:~p~n Error:~p~n",
+								     [Host, Port, Error])))
 			end
 		end),
     spawn(fun () ->
@@ -476,9 +503,8 @@ cnct2tstsrvr([Host, Port]) when is_list(Host), is_list(Port) ->
 		  receive
 		      {'DOWN', Mon, process, ConnHandler, Reason} ->
 			  receive after 1000 -> ok end,
-			  halt("test server connection handler terminated: "
-			       ++
-			       lists:flatten(io_lib:format("~p", [Reason])))
+			  halt("test server connection handler terminated: " ++
+				   lists:flatten(io_lib:format("~p", [Reason])))
 		  end
 	  end).
 
@@ -613,19 +639,34 @@ setup_dist_opts(Config) ->
 			   ++ "-ssl_dist_opt server_certfile " ++ SKC ++ " "
 			   ++ "-ssl_dist_opt client_certfile " ++ CKC ++ " ";
 		   true ->
-		       "-proto_dist inet_tls "
-			   ++ "-ssl_dist_opt server_certfile " ++ SC ++ " "
-			   ++ "-ssl_dist_opt server_keyfile " ++ SK ++ " "
-			   ++ "-ssl_dist_opt server_cacertfile " ++ SCA ++ " "
-			   ++ "-ssl_dist_opt server_verify verify_peer "
-			   ++ "-ssl_dist_opt server_fail_if_no_peer_cert true "
-			   ++ "-ssl_dist_opt server_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA "
-			   ++ "-ssl_dist_opt server_dhfile " ++ Dhfile ++ " "
-			   ++ "-ssl_dist_opt client_certfile " ++ CC ++ " "
-			   ++ "-ssl_dist_opt client_keyfile " ++ CK ++ " "
-			   ++ "-ssl_dist_opt client_cacertfile " ++ CCA ++ " "
-			   ++ "-ssl_dist_opt client_verify verify_peer "
-			   ++ "-ssl_dist_opt client_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA "
+		       case os:type() of
+			   {win32, _} ->
+			       "-proto_dist inet_tls "
+				   ++ "-ssl_dist_opt server_certfile " ++ SKC ++ " "
+				   ++ "-ssl_dist_opt server_cacertfile " ++ SCA ++ " "
+				   ++ "-ssl_dist_opt server_verify verify_peer "
+				   ++ "-ssl_dist_opt server_fail_if_no_peer_cert true "
+				   ++ "-ssl_dist_opt server_ciphers DHE-RSA-AES256-SHA\:DHE-RSA-AES128-SHA "
+				   ++ "-ssl_dist_opt server_dhfile " ++ Dhfile ++ " "
+				   ++ "-ssl_dist_opt client_certfile " ++ CKC ++ " "
+				   ++ "-ssl_dist_opt client_cacertfile " ++ CCA ++ " "
+				   ++ "-ssl_dist_opt client_verify verify_peer "
+				   ++ "-ssl_dist_opt client_ciphers DHE-RSA-AES256-SHA\:DHE-RSA-AES128-SHA ";
+			   _ ->
+			       "-proto_dist inet_tls "
+				   ++ "-ssl_dist_opt server_certfile " ++ SC ++ " "
+				   ++ "-ssl_dist_opt server_keyfile " ++ SK ++ " "
+				   ++ "-ssl_dist_opt server_cacertfile " ++ SCA ++ " "
+				   ++ "-ssl_dist_opt server_verify verify_peer "
+				   ++ "-ssl_dist_opt server_fail_if_no_peer_cert true "
+				   ++ "-ssl_dist_opt server_ciphers DHE-RSA-AES256-SHA\:DHE-RSA-AES128-SHA "
+				   ++ "-ssl_dist_opt server_dhfile " ++ Dhfile ++ " "
+				   ++ "-ssl_dist_opt client_certfile " ++ CC ++ " "
+				   ++ "-ssl_dist_opt client_keyfile " ++ CK ++ " "
+				   ++ "-ssl_dist_opt client_cacertfile " ++ CCA ++ " "
+				   ++ "-ssl_dist_opt client_verify verify_peer "
+				   ++ "-ssl_dist_opt client_ciphers DHE-RSA-AES256-SHA\:DHE-RSA-AES128-SHA "
+		       end
 	       end,
     MoreOpts = proplists:get_value(additional_dist_opts, Config, []),
     DistOpts ++ MoreOpts.
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
index 5ea45018e6..8cdfdec2ce 100644
--- a/lib/ssl/test/ssl_session_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -229,7 +229,7 @@ session_cleanup(Config)when is_list(Config) ->
 
     check_timer(DelayTimer),
 
-    test_server:sleep(?SLEEP),  %% Make sure clean has had to run
+    test_server:sleep(?SLEEP),  %% Make sure clean has had time to run
 
     undefined = ssl_session_cache:lookup(Cache, {{Hostname, Port}, Id}),
     undefined = ssl_session_cache:lookup(Cache, {Port, Id}),
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 8ccbb3ffa1..f37baeb9de 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -171,7 +171,8 @@ all() ->
      tls1_erlang_server_openssl_client_client_cert,
      tls1_erlang_server_erlang_client_client_cert,
      ciphers_rsa_signed_certs, ciphers_dsa_signed_certs,
-     erlang_client_bad_openssl_server, expired_session,
+     erlang_client_bad_openssl_server,
+     expired_session,
      ssl2_erlang_server_openssl_client].
 
 groups() -> 
@@ -225,7 +226,6 @@ erlang_client_openssl_server(Config) when is_list(Config) ->
   
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
-
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
@@ -259,9 +259,9 @@ erlang_server_openssl_client(Config) when is_list(Config) ->
     port_command(OpenSslPort, Data),
     
     ssl_test_lib:check_result(Server, ok),
-    
-    ssl_test_lib:close(Server),
 
+    %% Clean close down!   Server needs to be closed first !!
+    ssl_test_lib:close(Server),
     close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
@@ -309,7 +309,6 @@ tls1_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
    
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
-
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
@@ -349,8 +348,8 @@ tls1_erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok),
     
+    %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
-
     close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
@@ -398,7 +397,6 @@ ssl3_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
    
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
-
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
@@ -438,8 +436,8 @@ ssl3_erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok),
     
+    %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
-
     close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
@@ -478,8 +476,8 @@ erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok),
     
+    %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
-
     close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
@@ -528,7 +526,6 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
    
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
-
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
@@ -577,7 +574,6 @@ erlang_client_openssl_server_no_wrap_sequence_number(Config) when is_list(Config
 
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
-
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
@@ -618,8 +614,8 @@ erlang_server_openssl_client_no_wrap_sequence_number(Config) when is_list(Config
     
     ssl_test_lib:check_result(Server, ok),
     
+    %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
-
     close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
@@ -666,7 +662,6 @@ erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
 
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
-
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
@@ -677,6 +672,7 @@ ssl3_erlang_client_openssl_server(doc) ->
 ssl3_erlang_client_openssl_server(suite) ->
     [];
 ssl3_erlang_client_openssl_server(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
 
@@ -703,11 +699,11 @@ ssl3_erlang_client_openssl_server(Config) when is_list(Config) ->
 					{options, 
 					 [{versions, [sslv3]} | ClientOpts]}]),
     ssl_test_lib:check_result(Client, ok),
-    
-    ssl_test_lib:close(Client),
-    %% Clean close down!
+
+    %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
-    test_server:sleep(?SLEEP),
+    ssl_test_lib:close(Client),
+    process_flag(trap_exit, false),
     ok.
 
 %%--------------------------------------------------------------------
@@ -717,6 +713,7 @@ ssl3_erlang_server_openssl_client(doc) ->
 ssl3_erlang_server_openssl_client(suite) ->
     [];
 ssl3_erlang_server_openssl_client(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     
     {_, ServerNode, _} = ssl_test_lib:run_where(Config),
@@ -737,10 +734,10 @@ ssl3_erlang_server_openssl_client(Config) when is_list(Config) ->
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
     ssl_test_lib:check_result(Server, ok),
-    
-    close_port(OpenSslPort), %% openssl server first
+    %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
-    test_server:sleep(?SLEEP),
+    close_port(OpenSslPort),
+    process_flag(trap_exit, false),
     ok.
 
 %%--------------------------------------------------------------------
@@ -782,7 +779,7 @@ ssl3_erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Client, ok),
   
-    %% Clean close down!
+    %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort), 
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
@@ -827,9 +824,9 @@ ssl3_erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok),
     
-    close_port(OpenSslPort), %% openssl server first
+    %% Clean close down!   Server needs to be closed first !!
+    close_port(OpenSslPort),
     ssl_test_lib:close(Server),
-    %% Clean close down!
     process_flag(trap_exit, false),
     ok.
 
@@ -910,10 +907,10 @@ tls1_erlang_client_openssl_server(Config) when is_list(Config) ->
 					 [{versions, [tlsv1]} | ClientOpts]}]),
     
     ssl_test_lib:check_result(Client, ok),
-    
-    ssl_test_lib:close(Client),
-    %% Clean close down!
+
+    %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
+    ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
 
@@ -946,9 +943,9 @@ tls1_erlang_server_openssl_client(Config) when is_list(Config) ->
      
     ssl_test_lib:check_result(Server, ok),
     
-    %% Clean close down!
-    close_port(OpenSslPort),
+    %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
+    close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
 
@@ -992,7 +989,7 @@ tls1_erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Client, ok),
   
-    %% Clean close down!
+    %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
@@ -1037,9 +1034,9 @@ tls1_erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok),
     
-    %% Clean close down!
-    close_port(OpenSslPort),
+    %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
+    close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
 
@@ -1074,9 +1071,7 @@ tls1_erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
 					 [{versions, [tlsv1]} | ClientOpts]}]),
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
-    
     ssl_test_lib:close(Server),
-    %% Clean close down!
     process_flag(trap_exit, false),
     ok.
 %%--------------------------------------------------------------------
@@ -1139,7 +1134,7 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
    
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "",
 
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -1174,8 +1169,8 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
     
     Result = ssl_test_lib:wait_for_result(Client, ok),    
 
+    %% Clean close down!   Server needs to be closed first !!
     close_port(OpenSslPort),
-    %% Clean close down!
     ssl_test_lib:close(Client),
     
     Return = case Result of
@@ -1187,6 +1182,12 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
     process_flag(trap_exit, false),
     Return.
 
+
+version_flag(tlsv1) ->
+    " -tls1 ";
+version_flag(sslv3) ->
+    " -ssl3 ".
+
 %%--------------------------------------------------------------------
 erlang_client_bad_openssl_server(doc) ->
     [""];
@@ -1202,26 +1203,26 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
+
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
-	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "", 
-    
+ 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "",
+
     test_server:format("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
-
+    
     wait_for_openssl_server(),
     
     Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, server_sent_garbage, []}},
-					{options, 
-					 [{versions, [tlsv1]} | ClientOpts]}]),
+					 {host, Hostname},
+					 {from, self()}, 
+ 					{mfa, {?MODULE, server_sent_garbage, []}},
+					 {options,
+					  [{versions, [tlsv1]} | ClientOpts]}]),
     
     %% Send garbage
     port_command(OpensslPort, ?OPENSSL_GARBAGE),
-    
+
     test_server:sleep(?SLEEP),
 
     Client0 ! server_sent_garbage,
@@ -1231,17 +1232,16 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
     ssl_test_lib:close(Client0),
     
     %% Make sure openssl does not hang and leave zombie process
-    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					 {host, Hostname},
-					 {from, self()}, 
-					 {mfa, {ssl_test_lib, no_result_msg, []}},
-					 {options, 
-					  [{versions, [tlsv1]} | ClientOpts]}]),
-    
-    ssl_test_lib:close(Client1),
-    
-    %% Clean close down!
+    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+ 					 {host, Hostname},
+ 					 {from, self()},
+ 					 {mfa, {ssl_test_lib, no_result_msg, []}},
+ 					 {options,
+ 					  [{versions, [tlsv1]} | ClientOpts]}]),
+
+    %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
+    ssl_test_lib:close(Client1),
     process_flag(trap_exit, false),
     ok.
 
@@ -1300,6 +1300,7 @@ expired_session(Config) when is_list(Config) ->
 				   {mfa, {ssl_test_lib, no_result, []}},
 				   {from, self()},  {options, ClientOpts}]),  
 
+    %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
     ssl_test_lib:close(Client2),
     process_flag(trap_exit, false).
@@ -1332,8 +1333,8 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, {error,"protocol version"}),
     
+    %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
-
     close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.