diff options
| author | Hans Nilsson <[email protected]> | 2019-03-05 17:25:02 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-03-05 17:25:02 +0100 |
| commit | e7ece9449c8fe386c3c01a58eb6b516b3a65d83b (patch) | |
| tree | 35b14a3534ad7c9920aec448dc082df59af628d5 | |
| parent | d18d49447d19f5b4d67ce672e18ab8be22ba8fb1 (diff) | |
| parent | 75a5b52d4c02329acf055aa94d11469768b7eb8a (diff) | |
| download | otp-e7ece9449c8fe386c3c01a58eb6b516b3a65d83b.tar.gz otp-e7ece9449c8fe386c3c01a58eb6b516b3a65d83b.tar.bz2 otp-e7ece9449c8fe386c3c01a58eb6b516b3a65d83b.zip | |
Merge branch 'hans/ssh/cuddle_tests'
* hans/ssh/cuddle_tests:
crypto: Filter test case ciphers for supported ones
| -rw-r--r-- | lib/ssh/test/ssh_protocol_SUITE.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl index 3e3e151781..b12ddfeef6 100644 --- a/lib/ssh/test/ssh_protocol_SUITE.erl +++ b/lib/ssh/test/ssh_protocol_SUITE.erl @@ -38,7 +38,11 @@ -define(EXTRA_KEX, 'diffie-hellman-group1-sha1'). -define(CIPHERS, ['aes256-ctr','aes192-ctr','aes128-ctr','aes128-cbc','3des-cbc']). --define(DEFAULT_CIPHERS, [{client2server,?CIPHERS}, {server2client,?CIPHERS}]). +-define(DEFAULT_CIPHERS, (fun() -> Ciphs = filter_supported(cipher, ?CIPHERS), + [{client2server,Ciphs}, {server2client,Ciphs}] + end)() + ). + -define(v(Key, Config), proplists:get_value(Key, Config)). -define(v(Key, Config, Default), proplists:get_value(Key, Config, Default)). |