From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 6 Aug 2014 11:39:09 +0000 (+0200)
Subject: gnutls-cli-debug: added AES and CAMELLIA to the list of default ciphers
X-Git-Tag: gnutls_3_4_0~1136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd186af143f9df4610b7fcc4bbb3bbf83bd282b3;p=thirdparty%2Fgnutls.git

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 f6e4c16480..4cbc4e470a 100644
--- 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 f505f3219d..477871a8a0 100644
--- 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"