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

1 files changed, 11 insertions, 11 deletions

diff --git a/tests/priorities.c b/tests/priorities.c
index b1c0ae55eb..ecd13f7e7b 100644
--- 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);
 }