Merge branch 'hans/ssh/update_tests/OTP-13573'

14 files changed, 252 insertions, 121 deletions

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index ed9e7aacaa..0f68130a05 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -24,6 +24,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("ssh/src/ssh_transport.hrl").
+-include("ssh_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -70,32 +71,39 @@ two_way_tags() -> [cipher,mac,compression].
     
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    ct:log("~n"
-	   "Environment:~n============~n"
-	   "os:getenv(\"HOME\") = ~p~n"
-	   "init:get_argument(home) = ~p~n~n~n"
-	   "OS ssh:~n=======~n~p~n~n~n"
-	   "Erl ssh:~n========~n~p~n~n~n"
-	   "Installed ssh client:~n=====================~n~p~n~n~n"
-	   "Installed ssh server:~n=====================~n~p~n~n~n"
-	   "Misc values:~n============~n"
-	   " -- Default dh group exchange parameters ({min,def,max}): ~p~n"
-	   " -- dh_default_groups: ~p~n"
-	   " -- Max num algorithms: ~p~n"
-	  ,[os:getenv("HOME"),
-	    init:get_argument(home),
-	    os:cmd("ssh -V"),
-	    ssh:default_algorithms(),
-	    ssh_test_lib:default_algorithms(sshc),
-	    ssh_test_lib:default_algorithms(sshd),
-	    {?DEFAULT_DH_GROUP_MIN,?DEFAULT_DH_GROUP_NBITS,?DEFAULT_DH_GROUP_MAX},
-	    public_key:dh_gex_group_sizes(),
-	    ?MAX_NUM_ALGORITHMS
-	    ]),
-    ct:log("all() ->~n    ~p.~n~ngroups()->~n    ~p.~n",[all(),groups()]),
-    ssh:start(),
-    [{std_simple_sftp_size,25000} % Sftp transferred data size
-     | setup_pubkey(Config)].
+    ?CHECK_CRYPTO(
+       begin
+	   ct:log("~n"
+		  "Environment:~n============~n"
+		  "os:getenv(\"HOME\") = ~p~n"
+		  "init:get_argument(home) = ~p~n~n~n"
+		  "OS ssh:~n=======~n~p~n~n~n"
+		  "Erl ssh:~n========~n~p~n~n~n"
+		  "crypto:info_lib():~n========~n~p~n~n~n"
+		  "Installed ssh client:~n=====================~n~p~n~n~n"
+		  "Installed ssh server:~n=====================~n~p~n~n~n"
+		  "Misc values:~n============~n"
+		  " -- Default dh group exchange parameters ({min,def,max}): ~p~n"
+		  " -- dh_default_groups: ~p~n"
+		  " -- Max num algorithms: ~p~n"
+		 ,[os:getenv("HOME"),
+		   init:get_argument(home),
+		   os:cmd("ssh -V"),
+		   ssh:default_algorithms(),
+		   crypto:info_lib(),
+		   ssh_test_lib:default_algorithms(sshc),
+		   ssh_test_lib:default_algorithms(sshd),
+		   {?DEFAULT_DH_GROUP_MIN,?DEFAULT_DH_GROUP_NBITS,?DEFAULT_DH_GROUP_MAX},
+		   public_key:dh_gex_group_sizes(),
+		   ?MAX_NUM_ALGORITHMS
+		  ]),
+	   ct:log("all() ->~n    ~p.~n~ngroups()->~n    ~p.~n",[all(),groups()]),
+	   ssh:start(),
+	   [{std_simple_sftp_size,25000} % Sftp transferred data size
+	    | setup_pubkey(Config)]
+       end
+      ).
+
 
 end_per_suite(_Config) ->
     ssh:stop().
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 4991816850..733414e23a 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -25,6 +25,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/include/file.hrl").
+-include("ssh_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
 %%-compile(export_all).
@@ -130,7 +131,7 @@ basic_tests() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    Config.
+    ?CHECK_CRYPTO(Config).
 
 end_per_suite(_Config) ->
     ssh:stop().
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index a52633a269..bcf3b01824 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -43,6 +43,7 @@ suite() ->
 all() ->
     [
      {group, openssh},
+     small_interrupted_send,
      interrupted_send,
      start_shell,
      start_shell_exec,
@@ -81,7 +82,7 @@ sock() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    Config.
+    ?CHECK_CRYPTO(Config).
 
 end_per_suite(Config) ->
     Config.
@@ -124,7 +125,7 @@ simple_exec(Config) when is_list(Config) ->
     do_simple_exec(ConnectionRef).
 
 
-simple_exec_sock(Config) ->
+simple_exec_sock(_Config) ->
     {ok, Sock} = gen_tcp:connect("localhost", ?SSH_DEFAULT_PORT, [{active,false}]),
     {ok, ConnectionRef} = ssh:connect(Sock, [{silently_accept_hosts, true},
 					     {user_interaction, false}]),
@@ -361,44 +362,96 @@ ptty_alloc_pixel(Config) when is_list(Config) ->
     ssh:close(ConnectionRef).
 
 %%--------------------------------------------------------------------
+small_interrupted_send(Config) -> 
+    K = 1024,
+    M = K*K,
+    do_interrupted_send(Config, 10*M, 4*K).
 interrupted_send(Config) ->
+    M = 1024*1024,
+    do_interrupted_send(Config, 10*M, 4*M).
+
+do_interrupted_send(Config, SendSize, EchoSize) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
     file:make_dir(UserDir),
     SysDir = proplists:get_value(data_dir, Config),
+    EchoSS_spec = {ssh_echo_server, [EchoSize,[{dbg,true}]]},
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
 					     {user_dir, UserDir},
 					     {password, "morot"},
-					     {subsystems, [{"echo_n", {ssh_echo_server, [4000000]}}]}]),
-
+					     {subsystems, [{"echo_n",EchoSS_spec}]}]),
+    
+    ct:log("connect", []),
     ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 						      {user, "foo"},
 						      {password, "morot"},
 						      {user_interaction, false},
 						      {user_dir, UserDir}]),
-
-    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
-
-    success = ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity),
-
-    %% build 10MB binary
-    Data = << <<X:32>> || X <- lists:seq(1,2500000)>>,
-
-    %% expect remote end to send us 4MB back
-    <<ExpectedData:4000000/binary, _/binary>> = Data,
-
-    %% pre-adjust receive window so the other end doesn't block
-    ssh_connection:adjust_window(ConnectionRef, ChannelId, size(ExpectedData) + 1),
-
-    case ssh_connection:send(ConnectionRef, ChannelId, Data, 10000) of
-	{error, closed} ->
-	    ok;
-	Msg ->
-	    ct:fail({expected,{error,closed}, got, Msg})
-    end,
-    receive_data(ExpectedData, ConnectionRef, ChannelId),
-    ssh:close(ConnectionRef),
-    ssh:stop_daemon(Pid).
+    ct:log("connected", []),
+
+    %% build big binary
+    Data = << <<X:32>> || X <- lists:seq(1,SendSize div 4)>>,
+
+    %% expect remote end to send us EchoSize back
+    <<ExpectedData:EchoSize/binary, _/binary>> = Data,
+
+    %% Spawn listener. Otherwise we could get a deadlock due to filled buffers
+    Parent = self(),
+    ResultPid = spawn(
+		  fun() ->
+			  ct:log("open channel",[]),
+			  {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
+			  ct:log("start subsystem", []),
+			  case ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity) of
+			      success ->
+				  Parent ! {self(), channelId, ChannelId},
+				  
+				  Result = 
+				      try collect_data(ConnectionRef, ChannelId)
+				      of
+					  ExpectedData -> 
+					      ok;
+					  _ ->
+					      {fail,"unexpected result"}
+				      catch
+					  Class:Exception ->
+					      {fail, io_lib:format("Exception ~p:~p",[Class,Exception])}
+				      end,
+				  Parent ! {self(), Result};
+			      Other ->
+				  Parent ! {self(), channelId, error, Other}
+			  end
+		  end),
+    
+    receive
+	{ResultPid, channelId, ChannelId} ->
+	    %% pre-adjust receive window so the other end doesn't block
+	    ct:log("adjust window", []),
+	    ssh_connection:adjust_window(ConnectionRef, ChannelId, size(ExpectedData) + 1),
+
+	    ct:log("going to send ~p bytes", [size(Data)]),
+	    case ssh_connection:send(ConnectionRef, ChannelId, Data, 30000) of
+		{error, closed} ->
+		    ct:log("{error,closed} - That's what we expect :)", []),
+		    ok;
+		Msg ->
+		    ct:log("Got ~p - that's bad, very bad indeed",[Msg]),
+		    ct:fail({expected,{error,closed}, got, Msg})
+	    end,
+	    ct:log("going to check the result (if it is available)", []),
+	    receive
+		{ResultPid, Result} ->
+		    ct:log("Got result: ~p", [Result]),
+		    ssh:close(ConnectionRef),
+		    ssh:stop_daemon(Pid),
+		    Result
+	    end;
+
+	{ResultPid, channelId, error, Other} ->
+	    ssh:close(ConnectionRef),
+	    ssh:stop_daemon(Pid),
+	    {fail, io_lib:format("ssh_connection:subsystem: ~p",[Other])}
+    end.
 
 %%--------------------------------------------------------------------
 start_shell() ->
@@ -549,10 +602,10 @@ start_shell_sock_daemon_exec(Config) ->
     
     spawn_link(fun() ->
 		       {ok,Ss} = gen_tcp:connect("localhost", Port, [{active,false}]),
-		       {ok, Pid} = ssh:daemon(Ss, [{system_dir, SysDir},
-						   {user_dir, UserDir},
-						   {password, "morot"},
-						   {exec, fun ssh_exec/1}])
+		       {ok, _Pid} = ssh:daemon(Ss, [{system_dir, SysDir},
+						    {user_dir, UserDir},
+						    {password, "morot"},
+						    {exec, fun ssh_exec/1}])
 	       end),
     {ok,Sc} = gen_tcp:accept(Sl),
     {ok,ConnectionRef} = ssh:connect(Sc, [{silently_accept_hosts, true},
@@ -856,20 +909,36 @@ big_cat_rx(ConnectionRef, ChannelId, Acc) ->
 	    timeout
     end.
 
-receive_data(ExpectedData, ConnectionRef, ChannelId) ->
-    ExpectedData = collect_data(ConnectionRef, ChannelId).
-
 collect_data(ConnectionRef, ChannelId) ->
-    collect_data(ConnectionRef, ChannelId, []).
+    ct:log("Listener ~p running! ConnectionRef=~p, ChannelId=~p",[self(),ConnectionRef,ChannelId]),
+    collect_data(ConnectionRef, ChannelId, [], 0).
 
-collect_data(ConnectionRef, ChannelId, Acc) ->
+collect_data(ConnectionRef, ChannelId, Acc, Sum) ->
+    TO = 5000,
     receive
-	{ssh_cm, ConnectionRef, {data, ChannelId, 0, Data}} ->
-	    collect_data(ConnectionRef, ChannelId, [Data | Acc]);
+	{ssh_cm, ConnectionRef, {data, ChannelId, 0, Data}} when is_binary(Data) ->
+	    ct:log("collect_data: received ~p bytes. total ~p bytes",[size(Data),Sum+size(Data)]),
+	    collect_data(ConnectionRef, ChannelId, [Data | Acc], Sum+size(Data));
 	{ssh_cm, ConnectionRef, {eof, ChannelId}} ->
-	    iolist_to_binary(lists:reverse(Acc))
-    after 5000 ->
-	    timeout
+	    try
+		iolist_to_binary(lists:reverse(Acc))
+	    of
+		Bin ->
+		    ct:log("collect_data: received eof.~nGot in total ~p bytes",[size(Bin)]),
+		    Bin
+	    catch 
+		C:E ->
+		    ct:log("collect_data: received eof.~nAcc is strange...~nException=~p:~p~nAcc=~p",
+			   [C,E,Acc]),
+		    {error,{C,E}}
+	    end;
+	Msg ->
+	    ct:log("collect_data: ***** unexpected message *****~n~p",[Msg]),
+	    collect_data(ConnectionRef, ChannelId, Acc, Sum)
+
+    after TO ->
+	    ct:log("collect_data: ----- Nothing received for ~p seconds -----~n",[]),
+	    collect_data(ConnectionRef, ChannelId, Acc, Sum)
     end.
 
 %%%-------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_echo_server.erl b/lib/ssh/test/ssh_echo_server.erl
index ed9bbe1b67..5387d21efd 100644
--- a/lib/ssh/test/ssh_echo_server.erl
+++ b/lib/ssh/test/ssh_echo_server.erl
@@ -26,15 +26,29 @@
 -record(state, {
 	  n,
 	  id,
-	  cm
+	  cm,
+	  dbg = false
 	 }).
 -export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
 
+-define(DBG(State,Fmt,Args),
+	case State#state.dbg of
+	    true -> ct:log("~p:~p ~p  "++Fmt, [?MODULE,?LINE,self()|Args]);
+	    false -> ok
+	end).
+
+
 init([N]) ->
-    ct:pal("Echo server: ~p",[self()]),
-    {ok, #state{n = N}}.
+    {ok, #state{n = N}};
+init([N,Opts]) ->
+    State = #state{n = N,
+		   dbg = proplists:get_value(dbg,Opts,false)
+		  },
+    ?DBG(State, "init([~p])",[N]),
+    {ok, State}.
 
 handle_msg({ssh_channel_up, ChannelId, ConnectionManager}, State) ->
+    ?DBG(State, "ssh_channel_up Cid=~p ConnMngr=~p",[ChannelId,ConnectionManager]),
     {ok, State#state{id = ChannelId,
 		     cm = ConnectionManager}}.
 
@@ -42,32 +56,39 @@ handle_ssh_msg({ssh_cm, CM, {data, ChannelId, 0, Data}}, #state{n = N} = State)
     M = N - size(Data),
     case M > 0 of
 	true ->
+	    ?DBG(State, "ssh_cm data Cid=~p size(Data)=~p M=~p",[ChannelId,size(Data),M]),
 	    ssh_connection:send(CM, ChannelId, Data),
 	    {ok, State#state{n = M}};
 	false ->
 	    <<SendData:N/binary, _/binary>> = Data,
+	    ?DBG(State, "ssh_cm data Cid=~p size(Data)=~p M=~p size(SendData)=~p~nSend eof",[ChannelId,size(Data),M,size(SendData)]),
 	    ssh_connection:send(CM, ChannelId, SendData),
 	    ssh_connection:send_eof(CM, ChannelId),
 	    {stop, ChannelId, State}
     end;
 handle_ssh_msg({ssh_cm, _ConnectionManager,
 		{data, _ChannelId, 1, Data}}, State) ->
+    ?DBG(State, "stderr: ~p",[Data]),
     error_logger:format(standard_error, " ~p~n", [binary_to_list(Data)]),
     {ok, State};
 
 handle_ssh_msg({ssh_cm, _ConnectionManager, {eof, _ChannelId}}, State) ->
+    ?DBG(State, "{eof ~p}",[_ChannelId]),
     {ok, State};
 
-handle_ssh_msg({ssh_cm, _, {signal, _, _}}, State) ->
+handle_ssh_msg({ssh_cm, _, _Sig={signal, _, _}}, State) ->
     %% Ignore signals according to RFC 4254 section 6.9.
+    ?DBG(State, "~p",[_Sig]),
     {ok, State};
 
-handle_ssh_msg({ssh_cm, _, {exit_signal, ChannelId, _, _Error, _}},
-	       State) ->
+handle_ssh_msg({ssh_cm, _, _Sig={exit_signal, ChannelId, _, _Error, _}}, State) ->
+    ?DBG(State, "~p",[_Sig]),
     {stop, ChannelId,  State};
 
-handle_ssh_msg({ssh_cm, _, {exit_status, ChannelId, _Status}}, State) ->
+handle_ssh_msg({ssh_cm, _, _Sig={exit_status, ChannelId, _Status}}, State) ->
+    ?DBG(State, "~p",[_Sig]),
     {stop, ChannelId, State}.
 
 terminate(_Reason, _State) ->
+    ?DBG(_State, "terminate ~p",[_Reason]),
     ok.
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index d1e3d6cb0e..61883c0647 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -27,7 +27,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
-
+-include("ssh_test_lib.hrl").
 
 %%% Test cases
 -export([connectfun_disconnectfun_client/1, 
@@ -126,7 +126,7 @@ groups() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    Config.
+    ?CHECK_CRYPTO(Config).
 
 end_per_suite(_Config) ->
     ssh:stop().
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index 41faf951e1..4fac1f718a 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -26,6 +26,7 @@
 -include_lib("ssh/src/ssh.hrl").		% ?UINT32, ?BYTE, #ssh{} ...
 -include_lib("ssh/src/ssh_transport.hrl").
 -include_lib("ssh/src/ssh_auth.hrl").
+-include("ssh_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -87,7 +88,7 @@ groups() ->
 
 
 init_per_suite(Config) ->
-    start_std_daemon( setup_dirs( start_apps(Config))).
+    ?CHECK_CRYPTO(start_std_daemon( setup_dirs( start_apps(Config)))).
     
 end_per_suite(Config) ->
     stop_apps(Config).
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE.erl b/lib/ssh/test/ssh_renegotiate_SUITE.erl
index 300816276a..b10ec3707f 100644
--- a/lib/ssh/test/ssh_renegotiate_SUITE.erl
+++ b/lib/ssh/test/ssh_renegotiate_SUITE.erl
@@ -21,6 +21,7 @@
 -module(ssh_renegotiate_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
+-include("ssh_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -45,7 +46,7 @@ tests() -> [rekey, rekey_limit, renegotiate1, renegotiate2].
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    Config.
+    ?CHECK_CRYPTO(Config).
 
 end_per_suite(_Config) ->
     ssh:stop().
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index 19cf6d446e..19ad81e7da 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -26,7 +26,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
-
+-include("ssh_test_lib.hrl").
 						% Default timetrap timeout
 -define(default_timeout, ?t:minutes(1)).
 
@@ -45,10 +45,13 @@ all() ->
 
 
 init_per_suite(Config) ->
-    ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
-	   [file:native_name_encoding(),io:getopts()]),
-    ssh:start(),
-    Config.
+    ?CHECK_CRYPTO(
+       begin
+	   ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
+		  [file:native_name_encoding(),io:getopts()]),
+	   ssh:start(),
+	   Config
+       end).
 
 end_per_suite(_onfig) ->
     ssh:stop().
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 4a69fd36b3..52a26110c4 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -28,6 +28,7 @@
 -include_lib("kernel/include/file.hrl").
 -include("ssh_xfer.hrl").
 -include("ssh.hrl").
+-include("ssh_test_lib.hrl").
 
 -define(USER, "Alladin").
 -define(PASSWD, "Sesame").
@@ -72,14 +73,17 @@ groups() ->
 %%--------------------------------------------------------------------
 
 init_per_suite(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),	    
-    PrivDir = proplists:get_value(priv_dir, Config),
-    ssh_test_lib:setup_dsa(DataDir, PrivDir),
-    %% to make sure we don't use public-key-auth
-    %% this should be tested by other test suites
-    UserDir = filename:join(proplists:get_value(priv_dir, Config), nopubkey), 
-    file:make_dir(UserDir),  
-    Config.
+    ?CHECK_CRYPTO(
+       begin
+	   DataDir = proplists:get_value(data_dir, Config),	    
+	   PrivDir = proplists:get_value(priv_dir, Config),
+	   ssh_test_lib:setup_dsa(DataDir, PrivDir),
+	   %% to make sure we don't use public-key-auth
+	   %% this should be tested by other test suites
+	   UserDir = filename:join(proplists:get_value(priv_dir, Config), nopubkey), 
+	   file:make_dir(UserDir),  
+	   Config
+       end).
 
 end_per_suite(Config) ->
     SysDir = proplists:get_value(priv_dir, Config),
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 75b5090c2b..56a33d6349 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -26,6 +26,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
+-include("ssh_test_lib.hrl").
 
 -define(USER, "Alladin").
 -define(PASSWD, "Sesame").
@@ -53,17 +54,20 @@ groups() ->
 %%--------------------------------------------------------------------
 
 init_per_suite(Config) ->
-    catch ssh:stop(),
-    DataDir = proplists:get_value(data_dir, Config),
-    PrivDir = proplists:get_value(priv_dir, Config),
-    FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
-    c:c(FileAlt),
-    FileName = filename:join(DataDir, "test.txt"),
-    {ok, FileInfo} = file:read_file_info(FileName),
-    ok = file:write_file_info(FileName,
-			      FileInfo#file_info{mode = 8#400}),
-    ssh_test_lib:setup_dsa(DataDir, PrivDir),
-    Config.
+    ?CHECK_CRYPTO(
+       begin
+	   catch ssh:stop(),
+	   DataDir = proplists:get_value(data_dir, Config),
+	   PrivDir = proplists:get_value(priv_dir, Config),
+	   FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
+	   c:c(FileAlt),
+	   FileName = filename:join(DataDir, "test.txt"),
+	   {ok, FileInfo} = file:read_file_info(FileName),
+	   ok = file:write_file_info(FileName,
+				     FileInfo#file_info{mode = 8#400}),
+	   ssh_test_lib:setup_dsa(DataDir, PrivDir),
+	   Config
+       end).
 
 end_per_suite(Config) -> 
     UserDir = filename:join(proplists:get_value(priv_dir, Config), nopubkey),
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index 574564f6e9..ff53e1c4c6 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -53,11 +53,14 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_suite(Config) ->
-    Port = ssh_test_lib:inet_port(node()),
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
-    [{userdir, UserDir},{port, Port}, {host, "localhost"}, {host_ip, any} | Config].
+    ?CHECK_CRYPTO(
+       begin
+	   Port = ssh_test_lib:inet_port(node()),
+	   PrivDir = proplists:get_value(priv_dir, Config),
+	   UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+	   file:make_dir(UserDir),
+	   [{userdir, UserDir},{port, Port}, {host, "localhost"}, {host_ip, any} | Config]
+       end).
 
 end_per_suite(_) ->
     ok.
diff --git a/lib/ssh/test/ssh_test_lib.hrl b/lib/ssh/test/ssh_test_lib.hrl
index 7cb7edeaa8..54c93b7e87 100644
--- a/lib/ssh/test/ssh_test_lib.hrl
+++ b/lib/ssh/test/ssh_test_lib.hrl
@@ -1,4 +1,14 @@
 %%-------------------------------------------------------------------------
+%% Check for usable crypt 
+%%-------------------------------------------------------------------------
+-define(CHECK_CRYPTO(Available),
+	try crypto:start() 
+	of _ -> Available
+	catch _:_ -> {skip, "Can't start crypto"}
+	end
+       ).
+
+%%-------------------------------------------------------------------------
 %% Help macro
 %%-------------------------------------------------------------------------
 -define(wait_match(Pattern, FunctionCall, Bind, Timeout, Ntries),
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index f96a2cc62b..a914938c41 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -22,6 +22,7 @@
 -module(ssh_to_openssh_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
+-include("ssh_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -62,12 +63,14 @@ groups() ->
     ].
 
 init_per_suite(Config) ->
-    case gen_tcp:connect("localhost", 22, []) of
-	{error,econnrefused} ->
-	    {skip,"No openssh deamon"};
-	_ ->
-	    ssh_test_lib:openssh_sanity_check(Config)
-    end.
+    ?CHECK_CRYPTO(
+       case gen_tcp:connect("localhost", 22, []) of
+	   {error,econnrefused} ->
+	       {skip,"No openssh deamon"};
+	   _ ->
+	       ssh_test_lib:openssh_sanity_check(Config)
+       end
+      ).
 
 end_per_suite(_Config) ->
     ok.
diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl
index 9d9b2b78fb..b5b27c369a 100644
--- a/lib/ssh/test/ssh_upgrade_SUITE.erl
+++ b/lib/ssh/test/ssh_upgrade_SUITE.erl
@@ -23,6 +23,7 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
+-include("ssh_test_lib.hrl").
 
 -record(state, {
 	  config,
@@ -48,13 +49,15 @@ all() ->
     ].
 
 init_per_suite(Config0) ->
-    case ct_release_test:init(Config0) of
-	{skip, Reason} ->
-	    {skip, Reason};
-	Config ->
-	    ssh:start(),
-	    Config
-    end.
+    ?CHECK_CRYPTO(
+       case ct_release_test:init(Config0) of
+	   {skip, Reason} ->
+	       {skip, Reason};
+	   Config ->
+	       ssh:start(),
+	       Config
+       end
+      ).
 
 end_per_suite(Config) ->
     ct_release_test:cleanup(Config),