diff options
| author | Hans Nilsson <[email protected]> | 2015-10-21 11:58:59 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-21 11:58:59 +0200 |
| commit | d9f88cbd3c096d09cac05450e6b075b1109da1a0 (patch) | |
| tree | 555f76b02f77189ce4c8d775fbe3f64e703a2d3b /lib/ssh/test/ssh_test_lib.erl | |
| parent | 6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a (diff) | |
| parent | a76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (diff) | |
| download | otp-d9f88cbd3c096d09cac05450e6b075b1109da1a0.tar.gz otp-d9f88cbd3c096d09cac05450e6b075b1109da1a0.tar.bz2 otp-d9f88cbd3c096d09cac05450e6b075b1109da1a0.zip | |
Merge branch 'maint'
* maint:
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 |