From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 29 Mar 2015 08:54:11 +0000 (+0200)
Subject: test-ciphers.js: improved ciphersuite checks
X-Git-Tag: gnutls_3_4_0~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6a65ac4ed70ec7d057e433d5301ea727d9d48a9;p=thirdparty%2Fgnutls.git

test-ciphers.js: improved ciphersuite checks
---

diff --git a/tests/suite/ciphersuite/test-ciphers.js b/tests/suite/ciphersuite/test-ciphers.js
index c5bff1f35d..bd09ee1bac 100644
--- a/tests/suite/ciphersuite/test-ciphers.js
+++ b/tests/suite/ciphersuite/test-ciphers.js
@@ -27,14 +27,14 @@ include('./registry-ciphers.js');
     var cipher = cs.cipher.replace("3DES-CBC", "3DES-EDE-CBC");
     var kx = cs.kx.replace("ANON-DH", "DH-ANON").replace("ANON-ECDH", "ECDH-ANON").replace("SRP", "SRP-SHA");
 
-    if (cs.mac == "AEAD" && cipher.indexOf("GCM") == -1) {
-      if (kx + "-" + cipher != cs.gnutlsname) {
+    if (cs.mac == "AEAD") {
+      if (kx + "-" + cipher != cs.gnutlsname && kx + "-" + cipher + "-SHA256" != cs.gnutlsname && kx + "-" + cipher + "-SHA384" != cs.gnutlsname) {
         console.log("Broken AEAD ciphersuite: ", kx + "-" + cipher, " ", cs.gnutlsname);
         process.exit(1);
       }
     } else {
       if (kx + "-" + cipher + "-" + mac != cs.gnutlsname) {
-        console.log("Broken ciphersuite: ", kx + "-" + cipher + "-" + mac, " ", cs.gnutlsname);
+        console.log("Broken ciphersuite name: ", kx + "-" + cipher + "-" + mac, " ", cs.gnutlsname);
         process.exit(1);
       }
     }