Added camellia-gcm into the default priority levels, and prioritized GCM over CBC...

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index b6915640942bd8bcfdcf1f53199bdffe50d1fddc..88727b3e438f2d9c5f0cb0ba12a35fa91801e832 100644 (file)
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -356,8 +356,10 @@ static const int kx_priority_secure[] = {
 static const int cipher_priority_performance[] = {
   GNUTLS_CIPHER_ARCFOUR_128,
   GNUTLS_CIPHER_AES_128_GCM,
-  GNUTLS_CIPHER_AES_128_CBC,
   GNUTLS_CIPHER_AES_256_GCM,
+  GNUTLS_CIPHER_CAMELLIA_128_GCM,
+  GNUTLS_CIPHER_CAMELLIA_256_GCM,
+  GNUTLS_CIPHER_AES_128_CBC,
   GNUTLS_CIPHER_AES_256_CBC,
   GNUTLS_CIPHER_CAMELLIA_128_CBC,
   GNUTLS_CIPHER_CAMELLIA_256_CBC,
@@ -367,8 +369,10 @@ static const int cipher_priority_performance[] = {
 
 static const int cipher_priority_normal[] = {
   GNUTLS_CIPHER_AES_128_GCM,
-  GNUTLS_CIPHER_AES_128_CBC,
   GNUTLS_CIPHER_AES_256_GCM,
+  GNUTLS_CIPHER_CAMELLIA_128_GCM,
+  GNUTLS_CIPHER_CAMELLIA_256_GCM,
+  GNUTLS_CIPHER_AES_128_CBC,
   GNUTLS_CIPHER_AES_256_CBC,
   GNUTLS_CIPHER_CAMELLIA_128_CBC,
   GNUTLS_CIPHER_CAMELLIA_256_CBC,
@@ -390,20 +394,23 @@ static const int cipher_priority_suiteb192[] = {
 
 
 static const int cipher_priority_secure128[] = {
+  GNUTLS_CIPHER_AES_128_GCM,
+  GNUTLS_CIPHER_CAMELLIA_128_GCM,
   GNUTLS_CIPHER_AES_128_CBC,
   GNUTLS_CIPHER_CAMELLIA_128_CBC,
-  GNUTLS_CIPHER_AES_128_GCM,
+  GNUTLS_CIPHER_AES_256_GCM,
+  GNUTLS_CIPHER_CAMELLIA_256_GCM,
   GNUTLS_CIPHER_AES_256_CBC,
   GNUTLS_CIPHER_CAMELLIA_256_CBC,
-  GNUTLS_CIPHER_AES_256_GCM,
   0
 };
 
 
 static const int cipher_priority_secure192[] = {
+  GNUTLS_CIPHER_AES_256_GCM,
+  GNUTLS_CIPHER_CAMELLIA_256_GCM,
   GNUTLS_CIPHER_AES_256_CBC,
   GNUTLS_CIPHER_CAMELLIA_256_CBC,
-  GNUTLS_CIPHER_AES_256_GCM,
   0
 };
 

diff --git a/tests/priorities.c b/tests/priorities.c
index b1c0ae55eb48c1ecee5ae4aee752e0d9b69cd860..ecd13f7e7b4e80fa4870b97e0f126fc6ed436c54 100644 (file)
--- a/tests/priorities.c
+++ b/tests/priorities.c
@@ -94,21 +94,21 @@ for (i=0;i<ret;i++)
 void
 doit (void)
 {
-const int normal = 55;
+const int normal = 65;
 const int null = 5;
-const int sec128 = 45;
+const int sec128 = 55;
 
-  try_prio("NORMAL", normal, 8);
-  try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 8);
-  try_prio("NORMAL:+CIPHER-ALL", normal, 8); /* all (except null) */
+  try_prio("NORMAL", normal, 10);
+  try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 10);
+  try_prio("NORMAL:+CIPHER-ALL", normal, 10); /* all (except null) */
   try_prio("NORMAL:-CIPHER-ALL:+NULL", null, 1); /* null */
-  try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal+null, 9); /* should be null + all */
+  try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal+null, 11); /* should be null + all */
   try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL:-CIPHER-ALL:+AES-128-CBC", 10, 1); /* should be null + all */
-  try_prio("PERFORMANCE", normal, 8);
-  try_prio("SECURE256", 14, 3);
-  try_prio("SECURE128", sec128, 6);
-  try_prio("SECURE128:+SECURE256", sec128, 6); /* should be the same as SECURE128 */
-  try_prio("SECURE128:+SECURE256:+NORMAL", normal, 8); /* should be the same as NORMAL */
+  try_prio("PERFORMANCE", normal, 10);
+  try_prio("SECURE256", 19, 4);
+  try_prio("SECURE128", sec128, 8);
+  try_prio("SECURE128:+SECURE256", sec128, 8); /* should be the same as SECURE128 */
+  try_prio("SECURE128:+SECURE256:+NORMAL", normal, 10); /* should be the same as NORMAL */
   try_prio("SUITEB192", 1, 1);
 }