gnutls-cli-debug: added AES and CAMELLIA to the list of default ciphers

diff --git a/src/cli-debug.c b/src/cli-debug.c
index f6e4c16480c53fe92b90bec6053ee8889e362a2e..4cbc4e470a72abc730e1bcd7d56e4f8eeff03f6a 100644 (file)
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -153,13 +153,13 @@ static const TLS_TEST tls_tests[] = {
        {"ephemeral EC Diffie-Hellman group info", test_ecdhe_curve, "",
         "N/A",
         "N/A"},
-       {"for AES-GCM cipher support", test_aes_gcm, "yes", "no",
+       {"for AES-128-GCM cipher support", test_aes_gcm, "yes", "no",
         "dunno"},
-       {"for AES-CBC cipher support", test_aes, "yes", "no",
+       {"for AES-128-CBC cipher support", test_aes, "yes", "no",
         "dunno"},
-       {"for CAMELLIA-GCM cipher support", test_camellia_gcm, "yes", "no",
+       {"for CAMELLIA-128-GCM cipher support", test_camellia_gcm, "yes", "no",
         "dunno"},
-       {"for CAMELLIA-CBC cipher support", test_camellia_cbc, "yes", "no",
+       {"for CAMELLIA-128-CBC cipher support", test_camellia_cbc, "yes", "no",
         "dunno"},
        {"for 3DES-CBC cipher support", test_3des, "yes", "no", "dunno"},
        {"for ARCFOUR 128 cipher support", test_arcfour, "yes", "no",

diff --git a/src/tests.c b/src/tests.c
index f505f3219de59a9e3f2f60826a416049bf3701b1..477871a8a04cf92daf01a9efb1eecd8604337337 100644 (file)
--- a/src/tests.c
+++ b/src/tests.c
@@ -102,8 +102,8 @@ char protocol_all_str[] =
     "+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0";
 char prio_str[512] = "";
 
-#define ALL_CIPHERS "+3DES-CBC:+ARCFOUR-128:+ARCFOUR-40"
-#define BLOCK_CIPHERS "+3DES-CBC:+AES-128-CBC"
+#define ALL_CIPHERS "+AES-128-GCM:+CAMELLIA-128-GCM:+AES-128-CBC:+CAMELLIA-128-CBC:+3DES-CBC:+ARCFOUR-128:+ARCFOUR-40"
+#define BLOCK_CIPHERS "+3DES-CBC:+AES-128-CBC:+CAMELLIA-128-CBC"
 #define ALL_COMP "+COMP-NULL"
 #define ALL_MACS "+SHA1:+MD5"
 #define ALL_CERTTYPES "+CTYPE-X509"