ssh: Use cipher=none and mac=none in benchmarks again

1 files changed, 19 insertions, 4 deletions

diff --git a/lib/ssh/test/ssh_bench_SUITE.erl b/lib/ssh/test/ssh_bench_SUITE.erl
index 2c0cd8fc8e..cd0fe23f4a 100644
--- a/lib/ssh/test/ssh_bench_SUITE.erl
+++ b/lib/ssh/test/ssh_bench_SUITE.erl
@@ -57,12 +57,15 @@ init_per_suite(Config) ->
         ok ->
             DataSize = 1000000,
             SystemDir = proplists:get_value(data_dir, Config),
-            Algs = insert_none(ssh:default_algorithms()),
+%%%            Algs = insert_none(ssh:default_algorithms()),
+            Algs = ssh:default_algorithms(),
             {_ServerPid, _Host, Port} =
                 ssh_test_lib:daemon([{system_dir, SystemDir},
                                      {user_passwords, [{?UID,?PWD}]},
                                      {failfun, fun ssh_test_lib:failfun/2},
                                      {preferred_algorithms, Algs},
+                                     {modify_algorithms,[{prepend,[{cipher,[none]},
+                                                                   {mac,[none]}]}]},
                                      {max_random_length_padding, 0},
                                      {subsystems, [{"/dev/null", {ssh_bench_dev_null,[DataSize]}}]}
                                     ]),
@@ -175,11 +178,23 @@ gen_data(DataSz) ->
 %%              {suite, ?MODULE},
 %%              {name, mk_name(["Transfer 1M bytes ",Cipher,"/",Mac," [µs]"])}]);
 connect_measure(Port, Cipher, Mac, Data, Options) ->
+    AlgOpt = case {Cipher,Mac} of
+                 {none,none} ->
+                     [{modify_algorithms,[{prepend, [{cipher,[Cipher]},
+                                                     {mac,[Mac]}]}]}];
+                 {none,_} ->
+                     [{modify_algorithms,[{prepend, [{cipher,[Cipher]}]}]},
+                      {preferred_algorithms, [{mac,[Mac]}]}];
+                 {_,none} ->
+                     [{modify_algorithms,[{prepend, [{mac,[Mac]}]}]},
+                      {preferred_algorithms, [{cipher,[Cipher]}]}];
+                 _ ->
+                     [{preferred_algorithms, [{cipher,[Cipher]},
+                                              {mac,[Mac]}]}]
+             end,
     Times =
         [begin
-             {ok,C} = ssh:connect("localhost", Port, [{preferred_algorithms, [{cipher,[Cipher]},
-                                                                              {mac,[Mac]}]}
-                                                      |Options]),
+             {ok,C} = ssh:connect("localhost", Port, AlgOpt ++ Options),
              {ok,Ch} = ssh_connection:session_channel(C, 10000),
              success = ssh_connection:subsystem(C, Ch, "/dev/null", 10000),
              {Time,ok} = timer:tc(?MODULE, send_wait_acc, [C, Ch, Data]),