ssh: skip test suites if no crypto lib is installed

13 files changed, 115 insertions, 76 deletions

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 3e89791b60..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,34 +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"
-	   "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)].
+    ?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 3d38bc1a66..e0640caf08 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -82,7 +82,7 @@ sock() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    Config.
+    ?CHECK_CRYPTO(Config).
 
 end_per_suite(Config) ->
     Config.
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),