Merge branch 'maint'

* maint:
  ssh: dynamic check of supported algos in ssh_to_openssh_SUITE
  ssh: delete now obsolete test case group 'hardening_tests'

3 files changed, 23 insertions, 4 deletions

diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 24d8a4e53c..400edb4d2c 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -123,8 +123,6 @@ end_per_suite(_Config) ->
     ssh:stop(),
     crypto:stop().
 %%--------------------------------------------------------------------
-init_per_group(hardening_tests, Config) ->
-    init_per_group(dsa_key, Config);
 init_per_group(dsa_key, Config) ->
     DataDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config),
@@ -229,8 +227,6 @@ init_per_group(dir_options, Config) ->
 init_per_group(_, Config) ->
     Config.
 
-end_per_group(hardening_tests, Config) ->
-    end_per_group(dsa_key, Config);
 end_per_group(dsa_key, Config) ->
     PrivDir = ?config(priv_dir, Config),
     ssh_test_lib:clean_dsa(PrivDir),
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 2e63ec086b..5816b708f2 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -459,6 +459,14 @@ openssh_sanity_check(Config) ->
 	    {skip, Str}
     end.
 
+openssh_supports(ClientOrServer, Tag, Alg) when ClientOrServer == sshc ;
+						ClientOrServer == sshd ->
+    SSH_algos = ssh_test_lib:default_algorithms(ClientOrServer),
+    L = proplists:get_value(Tag, SSH_algos, []),
+    lists:member(Alg, L) orelse 
+	lists:member(Alg, proplists:get_value(client2server, L, [])) orelse
+	lists:member(Alg, proplists:get_value(server2client, L, [])).
+
 %%--------------------------------------------------------------------
 %% Check if we have a "newer" ssh client that supports these test cases
 
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index b5b997cb53..168b8a695a 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -94,6 +94,21 @@ end_per_group(erlang_server, Config) ->
 end_per_group(_, Config) ->
     Config.
 
+
+init_per_testcase(erlang_server_openssh_client_pulic_key_dsa, Config) ->
+    case ssh_test_lib:openssh_supports(sshc, public_key, 'ssh-dss') of
+	true ->
+	    init_per_testcase('__default__',Config);
+	false ->
+	    {skip,"openssh client does not support DSA"}
+    end;
+init_per_testcase(erlang_client_openssh_server_publickey_dsa, Config) ->
+    case ssh_test_lib:openssh_supports(sshd, public_key, 'ssh-dss') of
+	true ->
+	    init_per_testcase('__default__',Config);
+	false ->
+	    {skip,"openssh client does not support DSA"}
+    end;
 init_per_testcase(_TestCase, Config) ->
     ssh:start(),
     Config.