tls-fuzzer: move SSL3 specific tests to gnutls-nocert-ssl3.json

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/tests/suite/tls-fuzzer/gnutls-nocert-ssl3.json b/tests/suite/tls-fuzzer/gnutls-nocert-ssl3.json
index a2973922553f6110a00f21920f0b25c31ffe74a4..f06bdd2c8d1bba2238cba7f7d01196cd04913f94 100644 (file)
--- a/tests/suite/tls-fuzzer/gnutls-nocert-ssl3.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert-ssl3.json
@@ -22,7 +22,15 @@
          {"name" : "test-client-compatibility.py",
           "arguments" : ["-p", "@PORT@", "18: IE 6 on XP",
                          "52: YandexBot 3.0 on unknown",
-                         "100: IE 6 on XP"]}
+                         "100: IE 6 on XP"]},
+         {"name" : "test-dhe-no-shared-secret-padding.py",
+          "arguments" : ["-p", "@PORT@", "-z",
+                         "Protocol (3, 0)",
+                         "Protocol (3, 0) in SSLv2 compatible ClientHello"]},
+         {"name" : "test-ecdhe-padded-shared-secret.py",
+          "arguments" : ["-p", "@PORT@", "-z",
+                         "Protocol (3, 0) in SSLv2 compatible ClientHello",
+                         "Protocol (3, 0)"]}
      ]
     }
 ]

diff --git a/tests/suite/tls-fuzzer/gnutls-nocert.json b/tests/suite/tls-fuzzer/gnutls-nocert.json
index 3be1928737c2d84a39dcd96dd78a81caa3049574..fb75c4f0f031d610f73ad4067ca67206c080f25b 100644 (file)
--- a/tests/suite/tls-fuzzer/gnutls-nocert.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert.json
@@ -109,10 +109,8 @@
                          "-z"]},
          {"name" : "test-dhe-no-shared-secret-padding.py",
           "arguments" : ["-p", "@PORT@",
-                         "-x", "Protocol (3, 0)",
-                         "-X", "Unexpected message from peer: Alert(fatal, protocol_version)",
-                         "-x", "Protocol (3, 0) in SSLv2 compatible ClientHello",
-                         "-X", "Unexpected message from peer: Alert(fatal, protocol_version)",
+                         "-e", "Protocol (3, 0)",
+                         "-e", "Protocol (3, 0) in SSLv2 compatible ClientHello",
                          "-z"]},
          {"name" : "test-dhe-rsa-key-exchange.py",
           "arguments" : ["-p", "@PORT@"] },
@@ -136,10 +134,8 @@
           "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-ecdhe-padded-shared-secret.py",
           "arguments" : ["-p", "@PORT@",
-                         "-x", "Protocol (3, 0) in SSLv2 compatible ClientHello",
-                         "-X", "Unexpected message from peer: Alert(fatal, protocol_version)",
-                         "-x", "Protocol (3, 0)",
-                         "-X", "Unexpected message from peer: Alert(fatal, protocol_version)",
+                         "-e", "Protocol (3, 0) in SSLv2 compatible ClientHello",
+                         "-e", "Protocol (3, 0)",
                          "-z"]},
          {"name" : "test-ecdhe-rsa-key-exchange.py",
           "arguments" : ["-p", "@PORT@"] },