Merge branch 'maint'

3 files changed, 25 insertions, 20 deletions

diff --git a/lib/ssh/test/ssh_bench_SUITE.erl b/lib/ssh/test/ssh_bench_SUITE.erl
index cd0fe23f4a..b6c6147646 100644
--- a/lib/ssh/test/ssh_bench_SUITE.erl
+++ b/lib/ssh/test/ssh_bench_SUITE.erl
@@ -57,7 +57,6 @@ init_per_suite(Config) ->
         ok ->
             DataSize = 1000000,
             SystemDir = proplists:get_value(data_dir, Config),
-%%%            Algs = insert_none(ssh:default_algorithms()),
             Algs = ssh:default_algorithms(),
             {_ServerPid, _Host, Port} =
                 ssh_test_lib:daemon([{system_dir, SystemDir},
@@ -65,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]',
+                                                                        '[email protected]']}
+                                                              ]}
+                                                        ]},
                                      {max_random_length_padding, 0},
                                      {subsystems, [{"/dev/null", {ssh_bench_dev_null,[DataSize]}}]}
                                     ]),
@@ -178,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]',
+                       '[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
@@ -220,16 +235,6 @@ send_wait_acc(C, Ch, Data) ->
 %%% 
 
 %%%----------------------------------------------------------------
-insert_none(L) ->
-    lists:foldl(fun insert_none/2, [], L).
-
-insert_none({T,L}, Acc) when T==cipher ;
-                             T==mac    ->
-    [{T, [{T1,L1++[none]} || {T1,L1} <- L]} | Acc];
-insert_none(_, Acc) ->
-    Acc.
-
-%%%----------------------------------------------------------------
 mk_name(Name) -> [char(C) || C <- lists:concat(Name)].
 
 char($-) -> $_;
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index 7da921adb2..74f802cf57 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -884,9 +884,9 @@ chk_pref_algs(Config,
 
 filter_supported(K, Algs) -> Algs -- (Algs--supported(K)).
 
-supported(K) -> proplists:get_value(
-                  server2client,
-                  ssh_transport:supported_algorithms(cipher)).
+supported(_K) -> proplists:get_value(
+                   server2client,
+                   ssh_transport:supported_algorithms(cipher)).
 
 to_lists(L) -> lists:map(fun erlang:atom_to_list/1, L).
     
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 4d6aa93d4e..75d5b5e296 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -332,7 +332,7 @@ erlang_client_openssh_server_publickey_dsa(Config) ->
     erlang_client_openssh_server_publickey_X(Config, 'ssh-dss').
 
 
-erlang_client_openssh_server_publickey_X(Config, Alg) ->
+erlang_client_openssh_server_publickey_X(_Config, Alg) ->
     ConnectionRef =
         ssh_test_lib:connect(?SSH_DEFAULT_PORT,
                              [{pref_public_key_algs, [Alg]},