aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-10-06 14:45:43 +0200
committerHans Nilsson <[email protected]>2017-10-12 16:28:20 +0200
commit0f4d686b53a0b7937a8666c6c28addf7c884b192 (patch)
treec227c807fdb1b47f7f40258ac9488a883963491a
parentc3bd1167fdc7a1c2391bec77bcb112e7a90606f0 (diff)
downloadotp-0f4d686b53a0b7937a8666c6c28addf7c884b192.tar.gz
otp-0f4d686b53a0b7937a8666c6c28addf7c884b192.tar.bz2
otp-0f4d686b53a0b7937a8666c6c28addf7c884b192.zip
ssh: ssh_bench_SUITE disable aes_gcm
-rw-r--r--lib/ssh/test/ssh_bench_SUITE.erl26
1 files changed, 21 insertions, 5 deletions
diff --git a/lib/ssh/test/ssh_bench_SUITE.erl b/lib/ssh/test/ssh_bench_SUITE.erl
index 39cb24f52c..b6c6147646 100644
--- a/lib/ssh/test/ssh_bench_SUITE.erl
+++ b/lib/ssh/test/ssh_bench_SUITE.erl
@@ -64,7 +64,12 @@ init_per_suite(Config) ->
{failfun, fun ssh_test_lib:failfun/2},
{preferred_algorithms, Algs},
{modify_algorithms,[{prepend,[{cipher,[none]},
- {mac,[none]}]}]},
+ {mac,[none]}
+ ]},
+ {rm, [{cipher,['[email protected]',
+ ]}
+ ]},
{max_random_length_padding, 0},
{subsystems, [{"/dev/null", {ssh_bench_dev_null,[DataSize]}}]}
]),
@@ -177,19 +182,30 @@ gen_data(DataSz) ->
%% {suite, ?MODULE},
%% {name, mk_name(["Transfer 1M bytes ",Cipher,"/",Mac," [µs]"])}]);
connect_measure(Port, Cipher, Mac, Data, Options) ->
+ AES_GCM = {cipher,['[email protected]',
+
AlgOpt = case {Cipher,Mac} of
{none,none} ->
[{modify_algorithms,[{prepend, [{cipher,[Cipher]},
- {mac,[Mac]}]}]}];
+ {mac,[Mac]}]},
+ {rm,[AES_GCM]}
+ ]}];
{none,_} ->
- [{modify_algorithms,[{prepend, [{cipher,[Cipher]}]}]},
+ [{modify_algorithms,[{prepend, [{cipher,[Cipher]}]},
+ {rm,[AES_GCM]}
+ ]},
{preferred_algorithms, [{mac,[Mac]}]}];
{_,none} ->
- [{modify_algorithms,[{prepend, [{mac,[Mac]}]}]},
+ [{modify_algorithms,[{prepend, [{mac,[Mac]}]},
+ {rm,[AES_GCM]}
+ ]},
{preferred_algorithms, [{cipher,[Cipher]}]}];
_ ->
[{preferred_algorithms, [{cipher,[Cipher]},
- {mac,[Mac]}]}]
+ {mac,[Mac]}]},
+ {modify_algorithms, [{rm,[AES_GCM]}]}
+ ]
end,
Times =
[begin