Merge branch 'maint'

* maint:
  ssh: fix dialyzer reported error
  ssh: renegotiate test group for AES_GCM
  ssh: documentation updates
  ssh: AEAD_AES_(128|256)_GCM and aes(128|256)[email protected] crypto
  ssh: refactor packet reception

1 files changed, 20 insertions, 2 deletions

diff --git a/lib/ssh/test/ssh_renegotiate_SUITE.erl b/lib/ssh/test/ssh_renegotiate_SUITE.erl
index ef631d54bd..227dfcddcd 100644
--- a/lib/ssh/test/ssh_renegotiate_SUITE.erl
+++ b/lib/ssh/test/ssh_renegotiate_SUITE.erl
@@ -32,9 +32,15 @@
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> [rekey, rekey_limit, renegotiate1, renegotiate2].
+all() -> [{group,default_algs},
+	  {group,aes_gcm}
+	 ].
 
-groups() -> [].
+groups() -> [{default_algs, [], tests()},
+	     {aes_gcm,      [], tests()}
+	    ].
+
+tests() -> [rekey, rekey_limit, renegotiate1, renegotiate2].
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
@@ -50,6 +56,18 @@ end_per_suite(_Config) ->
     crypto:stop().
 
 %%--------------------------------------------------------------------
+init_per_group(aes_gcm, Config) ->
+    [{preferred_algorithms, [{cipher,[{client2server,['[email protected]']},
+				      {server2client,['[email protected]']}]}]}
+     | Config];
+init_per_group(_, Config) ->
+    [{preferred_algorithms, ssh:default_algorithms()} | Config].
+
+
+end_per_group(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
 init_per_testcase(_TestCase, Config) ->
     ssh:start(),
     Config.