diff options
| author | Hans Nilsson <[email protected]> | 2015-12-07 10:26:44 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-12-07 10:26:44 +0100 |
| commit | c84f85cc31ae8f13e8a44b866b90ad51f1c676c3 (patch) | |
| tree | f348f0e9bc196a0ccae2d2d0c4eb97d5ab2c2341 /lib/ssh/test/ssh_renegotiate_SUITE.erl | |
| parent | 6436c0d210b46b949f5e2de7ad328d3081eb3fa4 (diff) | |
| parent | 1d1677c2a85ebce0ada828d254c7a1122b825e0a (diff) | |
| download | otp-c84f85cc31ae8f13e8a44b866b90ad51f1c676c3.tar.gz otp-c84f85cc31ae8f13e8a44b866b90ad51f1c676c3.tar.bz2 otp-c84f85cc31ae8f13e8a44b866b90ad51f1c676c3.zip | |
Merge branch 'maint'
* maint:
ssh: tests skips if not supported crypto
ssh: ssh_auth checks support for user pubkey alg
ssh: client pub key opt implemented
ssh: client pub key testcase
ssh: client pub key documentation
Diffstat (limited to 'lib/ssh/test/ssh_renegotiate_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_renegotiate_SUITE.erl | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE.erl b/lib/ssh/test/ssh_renegotiate_SUITE.erl index 227dfcddcd..e5cfa58bad 100644 --- a/lib/ssh/test/ssh_renegotiate_SUITE.erl +++ b/lib/ssh/test/ssh_renegotiate_SUITE.erl @@ -57,9 +57,15 @@ end_per_suite(_Config) -> %%-------------------------------------------------------------------- init_per_group(aes_gcm, Config) -> - [{preferred_algorithms, [{cipher,[{client2server,['[email protected]']}, - {server2client,['[email protected]']}]}]} - | Config]; + case lists:member({client2server,['[email protected]']}, + ssh_transport:supported_algorithms(cipher)) of + true -> + [{preferred_algorithms, [{cipher,[{client2server,['[email protected]']}, + {server2client,['[email protected]']}]}]} + | Config]; + false -> + {skip, "aes_gcm not supported"} + end; init_per_group(_, Config) -> [{preferred_algorithms, ssh:default_algorithms()} | Config]. @@ -107,7 +113,9 @@ rekey_limit(Config) -> UserDir = ?config(priv_dir, Config), DataFile = filename:join(UserDir, "rekey.data"), - {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}]), + Algs = ?config(preferred_algorithms, Config), + {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}, + {preferred_algorithms,Algs}]), ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{rekey_limit, 6000}, {max_random_length_padding,0}]), @@ -151,7 +159,9 @@ renegotiate1(Config) -> UserDir = ?config(priv_dir, Config), DataFile = filename:join(UserDir, "renegotiate1.data"), - {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}]), + Algs = ?config(preferred_algorithms, Config), + {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}, + {preferred_algorithms,Algs}]), RPort = ssh_test_lib:inet_port(), {ok,RelayPid} = ssh_relay:start_link({0,0,0,0}, RPort, Host, DPort), @@ -189,7 +199,9 @@ renegotiate2(Config) -> UserDir = ?config(priv_dir, Config), DataFile = filename:join(UserDir, "renegotiate2.data"), - {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}]), + Algs = ?config(preferred_algorithms, Config), + {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}, + {preferred_algorithms,Algs}]), RPort = ssh_test_lib:inet_port(), {ok,RelayPid} = ssh_relay:start_link({0,0,0,0}, RPort, Host, DPort), |