From 4ff2ec4fcbdd9678cbeba3ccc10f0b52f9d92fc2 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Fri, 15 Mar 2019 12:27:37 +0100
Subject: crypto: Sort ciphers in alphabetic order in testsuite

---
 lib/crypto/test/crypto_SUITE.erl | 119 ++++++++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 53 deletions(-)

(limited to 'lib/crypto')

diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index dfce887d87..7bbb05a50c 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -46,53 +46,67 @@ all() ->
     ].
 
 groups() ->
-    [{non_fips, [], [{group, md4},
+    [{non_fips, [], [
+                     {group, blake2b},
+                     {group, blake2s},
+                     {group, dss},
+                     {group, ecdsa},
+                     {group, ed25519},
+                     {group, ed448},
+                     {group, rsa},
+
+                     {group, md4},
                      {group, md5},
                      {group, ripemd160},
-                     {group, sha},
                      {group, sha224},
                      {group, sha256},
                      {group, sha384},
-                     {group, sha512},
                      {group, sha3_224},
                      {group, sha3_256},
                      {group, sha3_384},
                      {group, sha3_512},
-                     {group, blake2b},
-                     {group, blake2s},
-                     {group, rsa},
-                     {group, dss},
-                     {group, ecdsa},
-                     {group, ed25519},
-                     {group, ed448},
+                     {group, sha512},
+                     {group, sha},
+
                      {group, dh},
                      {group, ecdh},
                      {group, srp},
-                     {group, des_cbc},
-                     {group, des_cfb},
-                     {group, des3_cbc},
-                     {group, des3_cbf},
-		     {group, des3_cfb},
-                     {group, des_ede3},
-                     {group, blowfish_cbc},
-                     {group, blowfish_ecb},
-                     {group, blowfish_cfb64},
-                     {group, blowfish_ofb64},
-                     {group, aes_cbc128},
-                     {group, aes_cfb8},
-                     {group, aes_cfb128},
-                     {group, aes_cbc256},
-                     {group, aes_ige256},
-                     {group, rc2_cbc},
-                     {group, rc4},
-                     {group, aes_ctr},
+
+		     {group, aes_cbc},
 		     {group, aes_ccm},
 		     {group, aes_gcm},
 		     {group, chacha20_poly1305},
 		     {group, chacha20},
+		     {group, des3_cfb},
+                     {group, aes_cbc128},
+                     {group, aes_cbc256},
+                     {group, aes_cfb128},
+                     {group, aes_cfb8},
+                     {group, aes_ctr},
+                     {group, aes_ige256},
+                     {group, blowfish_cbc},
+                     {group, blowfish_cfb64},
+                     {group, blowfish_ecb},
+                     {group, blowfish_ofb64},
+                     {group, des3_cbc},
+                     {group, des3_cbf},
+                     {group, des_cbc},
+                     {group, des_cfb},
+                     {group, des_ede3},
                      {group, poly1305},
-		     {group, aes_cbc}]},
-     {fips, [], [{group, no_md4},
+                     {group, rc2_cbc},
+                     {group, rc4}
+                    ]},
+     {fips, [], [
+                 %% {group, no_blake2b},
+                 %% {group, no_blake2s},
+                 {group, dss},
+                 {group, ecdsa},
+                 {group, no_ed25519},
+                 {group, no_ed448},
+                 {group, rsa},
+
+                 {group, no_md4},
                  {group, no_md5},
                  {group, no_ripemd160},
                  {group, sha},
@@ -100,37 +114,36 @@ groups() ->
                  {group, sha256},
                  {group, sha384},
                  {group, sha512},
-                 {group, rsa},
-                 {group, dss},
-                 {group, ecdsa},
-                 {group, no_ed25519},
-                 {group, no_ed448},
+
                  {group, dh},
                  {group, ecdh},
                  {group, no_srp},
-                 {group, no_des_cbc},
-                 {group, no_des_cfb},
-                 {group, des3_cbc},
-                 {group, des3_cbf},
+
+		 {group, aes_cbc},
+		 {group, aes_ccm},
+		 {group, aes_gcm},
+		 {group, no_chacha20_poly1305},
+		 {group, no_chacha20},
 		 {group, des3_cfb},
-                 {group, des_ede3},
-                 {group, no_blowfish_cbc},
-                 {group, no_blowfish_ecb},
-                 {group, no_blowfish_cfb64},
-                 {group, no_blowfish_ofb64},
                  {group, aes_cbc128},
-                 {group, no_aes_cfb8},
-                 {group, no_aes_cfb128},
                  {group, aes_cbc256},
+                 {group, no_aes_cfb128},
+                 {group, no_aes_cfb8},
+                 {group, aes_ctr},
                  {group, no_aes_ige256},
+                 {group, no_blowfish_cbc},
+                 {group, no_blowfish_cfb64},
+                 {group, no_blowfish_ecb},
+                 {group, no_blowfish_ofb64},
+                 {group, des3_cbc},
+                 {group, des3_cbf},
+                 {group, no_des_cbc},
+                 {group, no_des_cfb},
+                 {group, des_ede3},
+		 %% {group, no_poly1305},
                  {group, no_rc2_cbc},
-                 {group, no_rc4},
-                 {group, aes_ctr},
-		 {group, aes_ccm},
-		 {group, aes_gcm},
-		 {group, no_chacha20_poly1305},
-		 {group, no_chacha20},
-		 {group, aes_cbc}]},
+                 {group, no_rc4}
+                ]},
      {md4, [], [hash]},
      {md5, [], [hash, hmac]},
      {ripemd160, [], [hash]},
-- 
cgit v1.2.3