gnutls-cli-debug: removed legacy tests no longer applicable

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/src/cli-debug.c b/src/cli-debug.c
index ba545266882f548d905822fb20960bc1c19b8920..18ad1ecd395fdb691b9fcd3b76cc384502684d2f 100644 (file)
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -176,18 +176,12 @@ static const TLS_TEST tls_tests[] = {
        {"for MD5 MAC support", test_md5, "yes", "no", "dunno"},
        {"for SHA1 MAC support", test_sha, "yes", "no", "dunno"},
        {"for SHA256 MAC support", test_sha256, "yes", "no", "dunno"},
-#ifdef HAVE_LIBZ
-       {"for ZLIB compression support", test_zlib, "yes",
-        "no", "dunno"},
-#endif
        {"for max record size (RFC6066) support", test_max_record_size, "yes",
         "no", "dunno"},
 #ifdef ENABLE_OCSP
        {"for OCSP status response (RFC6066) support", test_ocsp_status, "yes",
         "no", "dunno"},
 #endif
-       {"for OpenPGP authentication (RFC6091) support", test_openpgp1,
-        "yes", "no", "dunno"},
        {NULL, NULL, NULL, NULL, NULL}
 };
 

diff --git a/src/tests.c b/src/tests.c
index 80e77bf8d3056f10b4cadcefc4919e479b4a52c3..972bf0afa25bd59397370396ae446f9747dda1d0 100644 (file)
--- a/src/tests.c
+++ b/src/tests.c
@@ -118,7 +118,6 @@ char prio_str[512] = "";
 #define BLOCK_CIPHERS "+3DES-CBC:+AES-128-CBC:+CAMELLIA-128-CBC:+AES-256-CBC:+CAMELLIA-256-CBC"
 #define ALL_COMP "+COMP-NULL"
 #define ALL_MACS "+MAC-ALL:+MD5:+SHA1"
-#define ALL_CERTTYPES "+CTYPE-X509"
 #define ALL_KX "+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+ECDHE-RSA:+ECDHE-ECDSA:+ANON-ECDH"
 #define INIT_STR "NONE:"
 char rest[128] = "%UNSAFE_RENEGOTIATION:+SIGN-ALL:+GROUP-ALL";
@@ -147,7 +146,7 @@ test_code_t test_server(gnutls_session_t session)
        buf[sizeof(buf) - 1] = 0;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":" ALL_KX ":" "%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -188,7 +187,7 @@ test_code_t test_dhe(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":+DHE-RSA:+DHE-DSS:%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -209,7 +208,7 @@ test_code_t test_rfc7919(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":+DHE-RSA:+DHE-DSS:+GROUP-ALL:%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -233,7 +232,7 @@ test_code_t test_ecdhe(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":+ECDHE-RSA:+ECDHE-ECDSA:+CURVE-ALL:%s", protocol_all_str,
                rest);
        _gnutls_priority_set_direct(session, prio_str);
@@ -259,7 +258,7 @@ test_code_t test_ecdhe_curve(gnutls_session_t session, const char *curve, unsign
        /* We always enable all the curves but set our selected as first. That is
         * because list of curves may be also used by the server to select a cert. */
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":+ECDHE-RSA:+ECDHE-ECDSA:%s:%s", protocol_all_str, curve, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -336,7 +335,7 @@ test_code_t test_safe_renegotiation(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":" ALL_KX ":%s:%%SAFE_RENEGOTIATION", rest, protocol_str);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -357,7 +356,7 @@ test_code_t test_ocsp_status(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":" ALL_KX":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -388,7 +387,7 @@ test_code_t test_ext_master_secret(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":%s:" ALL_KX, rest, protocol_str);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -413,7 +412,7 @@ test_code_t test_etm(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":%s:" ALL_KX, rest, protocol_str);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -438,7 +437,7 @@ test_code_t test_safe_renegotiation_scsv(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":+VERS-SSL3.0:"
+               ALL_CIPHERS ":" ALL_COMP ":+VERS-SSL3.0:"
                ALL_MACS ":" ALL_KX ":%%SAFE_RENEGOTIATION");
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -462,7 +461,7 @@ test_code_t test_dhe_group(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":+DHE-RSA:+DHE-DSS:%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -534,7 +533,7 @@ test_code_t test_ssl3(gnutls_session_t session)
 {
        int ret;
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":+VERS-SSL3.0:"
+               ALL_CIPHERS ":" ALL_COMP ":+VERS-SSL3.0:"
                ALL_MACS ":" ALL_KX ":%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -565,7 +564,7 @@ test_code_t test_bye(gnutls_session_t session)
 #endif
 
        sprintf(prio_str, INIT_STR
-               ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
                ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -615,7 +614,7 @@ test_code_t test_aes(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str, INIT_STR
-               "+AES-128-CBC:" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS
+               "+AES-128-CBC:" ALL_COMP ":%s:" ALL_MACS
                ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -630,8 +629,8 @@ test_code_t test_aes_gcm(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str, INIT_STR
-               "+AES-128-GCM:+AES-256-GCM:" ALL_COMP ":"
-               ALL_CERTTYPES ":%s:" ALL_MACS ":" ALL_KX ":%s",
+               "+AES-128-GCM:+AES-256-GCM:" ALL_COMP
+               ":%s:" ALL_MACS ":" ALL_KX ":%s",
                protocol_all_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -646,8 +645,8 @@ test_code_t test_aes_ccm(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str, INIT_STR
-               "+AES-128-CCM:+AES-256-CCM:" ALL_COMP ":"
-               ALL_CERTTYPES ":%s:" ALL_MACS ":" ALL_KX ":%s",
+               "+AES-128-CCM:+AES-256-CCM:" ALL_COMP
+               ":%s:" ALL_MACS ":" ALL_KX ":%s",
                protocol_all_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -662,8 +661,8 @@ test_code_t test_aes_ccm_8(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str, INIT_STR
-               "+AES-128-CCM-8:+AES-256-CCM-8:" ALL_COMP ":"
-               ALL_CERTTYPES ":%s:" ALL_MACS ":" ALL_KX ":%s",
+               "+AES-128-CCM-8:+AES-256-CCM-8:" ALL_COMP
+               ":%s:" ALL_MACS ":" ALL_KX ":%s",
                protocol_all_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -681,7 +680,7 @@ test_code_t test_camellia_cbc(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR "+CAMELLIA-128-CBC:" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR "+CAMELLIA-128-CBC:" ALL_COMP
                ":%s:" ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -700,7 +699,7 @@ test_code_t test_camellia_gcm(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR "+CAMELLIA-128-GCM:" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR "+CAMELLIA-128-GCM:" ALL_COMP
                ":%s:" ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -710,37 +709,13 @@ test_code_t test_camellia_gcm(gnutls_session_t session)
        return ret;
 }
 
-test_code_t test_openpgp1(gnutls_session_t session)
-{
-       int ret;
-
-       if (tls_ext_ok == 0)
-               return TEST_IGNORE;
-
-       sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":+CTYPE-OPENPGP:%s:"
-               ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
-       _gnutls_priority_set_direct(session, prio_str);
-
-       gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
-
-       ret = do_handshake(session);
-       if (ret == TEST_FAILED)
-               return ret;
-
-       if (gnutls_certificate_type_get(session) == GNUTLS_CRT_OPENPGP)
-               return TEST_SUCCEED;
-
-       return TEST_FAILED;
-}
-
 test_code_t test_unknown_ciphersuites(gnutls_session_t session)
 {
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":"
-               ALL_CERTTYPES ":%s:" ALL_MACS ":" ALL_KX ":%s",
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
+               ":%s:" ALL_MACS ":" ALL_KX ":%s",
                protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -758,8 +733,8 @@ test_code_t test_md5(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":"
-               ALL_CERTTYPES ":%s:+MD5:" ALL_KX ":%s", protocol_str,
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
+               ":%s:+MD5:" ALL_KX ":%s", protocol_str,
                rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -769,30 +744,13 @@ test_code_t test_md5(gnutls_session_t session)
        return ret;
 }
 
-#ifdef HAVE_LIBZ
-test_code_t test_zlib(gnutls_session_t session)
-{
-       int ret;
-
-       sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":+COMP-DEFLATE:" ALL_CERTTYPES ":%s:"
-               ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
-       _gnutls_priority_set_direct(session, prio_str);
-
-       gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
-
-       ret = do_handshake(session);
-       return ret;
-}
-#endif
-
 test_code_t test_sha(gnutls_session_t session)
 {
        int ret;
 
        sprintf(prio_str,
-               INIT_STR  ALL_CIPHERS ":" ALL_COMP ":"
-               ALL_CERTTYPES ":%s:+SHA1:" ALL_KX ":%s", protocol_str,
+               INIT_STR  ALL_CIPHERS ":" ALL_COMP
+               ":%s:+SHA1:" ALL_KX ":%s", protocol_str,
                rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -806,8 +764,8 @@ test_code_t test_sha256(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":"
-               ALL_CERTTYPES ":%s:+SHA256:" ALL_KX ":%s",
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
+               ":%s:+SHA256:" ALL_KX ":%s",
                protocol_all_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -821,7 +779,7 @@ test_code_t test_3des(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR "+3DES-CBC:" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR "+3DES-CBC:" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -838,7 +796,7 @@ test_code_t test_arcfour(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR "+ARCFOUR-128:" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR "+ARCFOUR-128:" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -855,7 +813,7 @@ test_code_t test_chacha20(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR "+CHACHA20-POLY1305:" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR "+CHACHA20-POLY1305:" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -869,7 +827,7 @@ test_code_t test_tls1(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
                ":+VERS-TLS1.0:%%SSL3_RECORD_VERSION:" ALL_MACS ":" ALL_KX ":%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -891,7 +849,7 @@ test_code_t test_tls1_nossl3(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
                ":+VERS-TLS1.0:%%LATEST_RECORD_VERSION:" ALL_MACS ":" ALL_KX ":%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -912,7 +870,7 @@ test_code_t test_record_padding(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR BLOCK_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR BLOCK_CIPHERS ":" ALL_COMP
                ":+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:-VERS-SSL3.0:" ALL_MACS ":" ALL_KX ":%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -922,7 +880,7 @@ test_code_t test_record_padding(gnutls_session_t session)
                tls1_ok = 1;
        } else {
                sprintf(prio_str,
-                       INIT_STR BLOCK_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+                       INIT_STR BLOCK_CIPHERS ":" ALL_COMP
                        ":+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:-VERS-SSL3.0:" ALL_MACS ":" ALL_KX ":%%COMPAT:%s", rest);
                _gnutls_priority_set_direct(session, prio_str);
 
@@ -942,7 +900,7 @@ test_code_t test_no_extensions(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -953,7 +911,7 @@ test_code_t test_no_extensions(gnutls_session_t session)
                tls_ext_ok = 1;
        } else {
                sprintf(prio_str,
-                       INIT_STR BLOCK_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+                       INIT_STR BLOCK_CIPHERS ":" ALL_COMP
                        ":+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:-VERS-SSL3.0:" ALL_MACS ":" ALL_KX ":%%NO_EXTENSIONS:%s", rest);
                _gnutls_priority_set_direct(session, prio_str);
 
@@ -973,7 +931,7 @@ test_code_t test_tls1_2(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
                ":+VERS-TLS1.2:" ALL_MACS ":" ALL_KX ":%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -992,7 +950,7 @@ test_code_t test_tls1_3(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
                ":+VERS-TLS1.3:" ALL_MACS ":" ALL_KX ":%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -1011,7 +969,7 @@ test_code_t test_tls1_1(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
                ":+VERS-TLS1.1:" ALL_MACS ":" ALL_KX ":%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -1032,7 +990,7 @@ test_code_t test_tls1_1_fallback(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
                ":+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0:" ALL_MACS ":"
                ALL_KX ":%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
@@ -1059,7 +1017,7 @@ test_code_t test_tls1_6_fallback(gnutls_session_t session)
        /* we remove RSA as there is a version check in the key exchange
         * message we do not properly set in this test */
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES
+               INIT_STR ALL_CIPHERS ":" ALL_COMP
                ":+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0:" ALL_MACS ":"
                ALL_KX ":-RSA:%s", rest);
        _gnutls_priority_set_direct(session, prio_str);
@@ -1085,7 +1043,7 @@ test_code_t test_tls_disable0(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -1110,7 +1068,7 @@ test_code_t test_tls_disable1(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -1132,7 +1090,7 @@ test_code_t test_tls_disable2(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -1157,7 +1115,7 @@ test_code_t test_rsa_pms(gnutls_session_t session)
         * SSL 3.0 then the handshake will fail.
         */
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":+RSA:%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -1179,7 +1137,7 @@ test_code_t test_max_record_size(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -1202,7 +1160,7 @@ test_code_t test_heartbeat_extension(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -1224,7 +1182,7 @@ test_code_t test_small_records(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -1248,7 +1206,7 @@ test_code_t test_version_rollback(gnutls_session_t session)
         * connection will fail.
         */
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -1276,7 +1234,7 @@ test_code_t test_version_oob(gnutls_session_t session)
         * and we connect using a 5.5 record version.
         */
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -1298,7 +1256,7 @@ test_code_t test_rsa_pms_version_check(gnutls_session_t session)
         * A normal server would abort this handshake.
         */
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
@@ -1315,7 +1273,7 @@ test_code_t test_anonymous(gnutls_session_t session)
        int ret;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":+ANON-DH:+ANON-ECDH:+CURVE-ALL:%s",
                protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
@@ -1340,7 +1298,7 @@ test_code_t test_session_resume2(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -1387,7 +1345,7 @@ test_code_t test_certificate(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -1420,7 +1378,7 @@ test_code_t test_chain_order(gnutls_session_t session)
        char *p, *pos;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 
@@ -1538,7 +1496,7 @@ test_code_t test_server_cas(gnutls_session_t session)
                return TEST_IGNORE;
 
        sprintf(prio_str,
-               INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:"
+               INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
                ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
        _gnutls_priority_set_direct(session, prio_str);
 

diff --git a/src/tests.h b/src/tests.h
index 4d093fc55471d504bada52480c7ac07bb9e09fa8..d1f9eb53fedd61fcd948344d02874d503ba49789 100644 (file)
--- a/src/tests.h
+++ b/src/tests.h
@@ -61,14 +61,12 @@ test_code_t test_max_record_size(gnutls_session_t state);
 test_code_t test_version_rollback(gnutls_session_t state);
 test_code_t test_anonymous(gnutls_session_t state);
 test_code_t test_unknown_ciphersuites(gnutls_session_t state);
-test_code_t test_openpgp1(gnutls_session_t state);
 test_code_t test_bye(gnutls_session_t state);
 test_code_t test_certificate(gnutls_session_t state);
 test_code_t test_server_cas(gnutls_session_t state);
 test_code_t test_session_resume2(gnutls_session_t state);
 test_code_t test_rsa_pms_version_check(gnutls_session_t session);
 test_code_t test_version_oob(gnutls_session_t session);
-test_code_t test_zlib(gnutls_session_t session);
 int _test_srp_username_callback(gnutls_session_t session,
                                char **username, char **password);