tests: removed tests related to zlib support

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

diff --git a/tests/mini-record-2.c b/tests/mini-record-2.c
index c4a22c1836a8aae480eef8b936e9b27846563305..f423c8dae539f25a5453f3edf73edccc35065a01 100644 (file)
--- a/tests/mini-record-2.c
+++ b/tests/mini-record-2.c
@@ -423,9 +423,6 @@ static void start(const char *prio, int ign)
 
 #define NULL_SHA1 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+NULL:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+RSA:+CURVE-ALL"
 
-#define ARCFOUR_SHA1_ZLIB "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-DEFLATE:+ANON-ECDH:+CURVE-ALL"
-
-#define AES_GCM_ZLIB "NONE:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-DEFLATE:+RSA:+CURVE-ALL"
 #define CHACHA_POLY1305 "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+CHACHA20-POLY1305:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ECDHE-RSA:+CURVE-ALL"
 
 static void ch_handler(int sig)
@@ -452,15 +449,7 @@ void doit(void)
                start(ARCFOUR_SHA1, 0);
                start(ARCFOUR_MD5, 0);
                start(CHACHA_POLY1305, 0);
-
-#ifdef HAVE_LIBZ
-               start(ARCFOUR_SHA1_ZLIB, 0);
-#endif
        }
-
-#ifdef HAVE_LIBZ
-       start(AES_GCM_ZLIB, 0);
-#endif
 }
 
 #endif                         /* _WIN32 */

diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c
index ba62449a6d00d6f10d956551a2482fc800f49f3b..e346e7e9319f19e29179e68b8529ad990e916e74 100644 (file)
--- a/tests/mini-record-failure.c
+++ b/tests/mini-record-failure.c
@@ -356,10 +356,6 @@ static void start(const char *prio, int ign)
 
 #define NULL_SHA1 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+NULL:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+RSA:+CURVE-ALL"
 
-#define ARCFOUR_SHA1_ZLIB "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-DEFLATE:+ANON-ECDH:+CURVE-ALL"
-
-#define AES_GCM_ZLIB "NONE:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-DEFLATE:+RSA:+CURVE-ALL"
-
 #define NO_ETM ":%NO_ETM"
 
 static void ch_handler(int sig)
@@ -385,16 +381,8 @@ void doit(void)
 
                start(ARCFOUR_SHA1, 0);
                start(ARCFOUR_MD5, 0);
-
-# ifdef HAVE_LIBZ
-               start(ARCFOUR_SHA1_ZLIB, 0);
-# endif
        }
 
-#ifdef HAVE_LIBZ
-       start(AES_GCM_ZLIB, 0);
-#endif
-
        start(AES_CBC NO_ETM, 1);
        start(AES_CBC_SHA256 NO_ETM, 1);
        start(AES_GCM NO_ETM, 0);
@@ -404,15 +392,7 @@ void doit(void)
 
                start(ARCFOUR_SHA1 NO_ETM, 0);
                start(ARCFOUR_MD5 NO_ETM, 0);
-
-# ifdef HAVE_LIBZ
-               start(ARCFOUR_SHA1_ZLIB NO_ETM, 0);
-# endif
        }
-
-#ifdef HAVE_LIBZ
-       start(AES_GCM_ZLIB NO_ETM, 0);
-#endif
 }
 
 #endif                         /* _WIN32 */

diff --git a/tests/mini-record-retvals.c b/tests/mini-record-retvals.c
index 1db455065e1545ed74c17ac7e979af348648237c..7a6deb68c56194be56b0dba28ef31251b6441491 100644 (file)
--- a/tests/mini-record-retvals.c
+++ b/tests/mini-record-retvals.c
@@ -430,10 +430,6 @@ static void start(const char *prio, int ign)
 
 #define NULL_SHA1 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+NULL:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+RSA:+CURVE-ALL"
 
-#define ARCFOUR_SHA1_ZLIB "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-DEFLATE:+ANON-ECDH:+CURVE-ALL"
-
-#define AES_GCM_ZLIB "NONE:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-DEFLATE:+RSA:+CURVE-ALL"
-
 static void ch_handler(int sig)
 {
        int status = 0;
@@ -455,15 +451,7 @@ void doit(void)
 
                start(ARCFOUR_SHA1, 0);
                start(ARCFOUR_MD5, 0);
-
-# ifdef HAVE_LIBZ
-               start(ARCFOUR_SHA1_ZLIB, 0);
-# endif
        }
-
-#ifdef HAVE_LIBZ
-       start(AES_GCM_ZLIB, 0);
-#endif
 }
 
 #endif                         /* _WIN32 */