diff options
author | Hans Nilsson <[email protected]> | 2015-10-21 11:58:20 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-10-21 11:58:20 +0200 |
commit | a76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (patch) | |
tree | 844828bc690713bd9a44942190236ae7f22a469d /lib/ssh/test/ssh_test_lib.erl | |
parent | 51d3c765b0a681794e364921bce32da8ee0624c0 (diff) | |
parent | eb24b259f026629372f9f8957da72f4302adb904 (diff) | |
download | otp-a76cc1d337c0bf44ecefebeccac2d08e496ba7e8.tar.gz otp-a76cc1d337c0bf44ecefebeccac2d08e496ba7e8.tar.bz2 otp-a76cc1d337c0bf44ecefebeccac2d08e496ba7e8.zip |
Merge branch 'hans/ssh/cuddle_tests' into maint
* hans/ssh/cuddle_tests:
ssh: dynamic check of supported algos in ssh_to_openssh_SUITE
ssh: delete now obsolete test case group 'hardening_tests'
Diffstat (limited to 'lib/ssh/test/ssh_test_lib.erl')
-rw-r--r-- | lib/ssh/test/ssh_test_lib.erl | 8 |
1 files changed, 8 insertions, 0 deletions
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 |