gnutls-cli-debug: reorganized output

diff --git a/src/cli-debug.c b/src/cli-debug.c
index 0ed0168c27ffcff3219724afca4bd968f49f8f43..cf03b8cb7ade9f3d0b4669088e558f2902b43699 100644 (file)
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -95,36 +95,28 @@ static const TLS_TEST tls_tests[] = {
        /* The following tests will disable TLS 1.x if the server is
         * buggy */
        {"whether we need to disable TLS 1.2", test_tls_disable2, "no",
-        "yes",
-        "dunno"},
+        "yes", "dunno"},
        {"whether we need to disable TLS 1.1", test_tls_disable1, "no",
-        "yes",
-        "dunno"},
+        "yes", "dunno"},
        {"whether we need to disable TLS 1.0", test_tls_disable0, "no",
-        "yes",
-        "dunno"},
-       {"for Safe renegotiation (RFC5746) support", test_safe_renegotiation, "yes",
-        "no",
-        "dunno"},
+        "yes", "dunno"},
+       {"for HTTPS server name", test_server, NULL, "failed", "not checked", 1},
+       {"whether Hello Extensions are accepted",
+        test_hello_extension, "yes", "no", "dunno"},
+       {"for safe renegotiation (RFC5746) support", test_safe_renegotiation, "yes",
+        "no", "dunno"},
        {"for Safe renegotiation support (SCSV)",
         test_safe_renegotiation_scsv,
         "yes", "no", "dunno"},
-       {"encrypt-then-MAC (RFC7366) support", test_etm, "yes", "no", "dunno"},
-       {"ext master secret (draft-ietf-tls-session-hash) support", test_ext_master_secret, "yes", "no", "dunno"},
-       {"for HTTPS server name", test_server, NULL, "failed",
-        "not checked", 1},
+       {"for encrypt-then-MAC (RFC7366) support", test_etm, "yes", "no", "dunno"},
+       {"for ext master secret (draft-ietf-tls-session-hash) support", test_ext_master_secret, "yes", "no", "dunno"},
+       {"for heartbeat (RFC6520) support", test_heartbeat_extension, "yes", "no", "dunno"},
        {"for version rollback bug in RSA PMS", test_rsa_pms, "no", "yes",
         "dunno"},
        {"for version rollback bug in Client Hello", test_version_rollback,
         "no", "yes", "dunno"},
-
-
        {"whether the server ignores the RSA PMS version",
         test_rsa_pms_version_check, "yes", "no", "dunno"},
-       {"whether Hello Extensions are accepted",
-        test_hello_extension, "yes", "no", "dunno"},
-       {"whether the HeartBeat Extension is accepted",
-        test_heartbeat_extension, "yes", "no", "dunno"},
        {"whether small records (512 bytes) are accepted",
         test_small_records, "yes", "no", "dunno"},
        {"whether cipher suites not in SSL 3.0 spec are accepted",