From 155fe8ed9967f56c8364fbf7ce391cb2cd70d4c7 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 5 Jun 2017 16:20:25 +0200
Subject: tests: removed tests related to zlib support

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---
 tests/mini-record-2.c       | 11 -----------
 tests/mini-record-failure.c | 20 --------------------
 tests/mini-record-retvals.c | 12 ------------
 3 files changed, 43 deletions(-)

diff --git a/tests/mini-record-2.c b/tests/mini-record-2.c
index c4a22c1836..f423c8dae5 100644
--- 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 ba62449a6d..e346e7e931 100644
--- 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 1db455065e..7a6deb68c5 100644
--- 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 */
-- 
cgit v1.2.1