From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Thu, 11 Aug 2022 14:35:46 +0000 (+0200)
Subject: lib-http: Remove ifdef-conditions based on HAVE_OPENSSL
X-Git-Tag: 2.4.0~3668
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b586cc9bc7cb42e14fc55219e5a7b1a9c422d531;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: Remove ifdef-conditions based on HAVE_OPENSSL

This macro was removed in 6b0b7141a8a50ffc99ad51b4f27c75f876e58616 but
the test-specific ifdefs weren't.
---

diff --git a/src/lib-http/test-http-client.c b/src/lib-http/test-http-client.c
index 10ba8a7b82..0c24ae16fc 100644
--- a/src/lib-http/test-http-client.c
+++ b/src/lib-http/test-http-client.c
@@ -9,9 +9,7 @@
 #include "http-client.h"
 #include "dns-lookup.h"
 #include "iostream-ssl.h"
-#ifdef HAVE_OPENSSL
 #include "iostream-openssl.h"
-#endif
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -360,9 +358,7 @@ int main(int argc, char *argv[])
 	const char *error;
 
 	lib_init();
-#ifdef HAVE_OPENSSL
 	ssl_iostream_openssl_init();
-#endif
 	ioloop = io_loop_create();
 	io_loop_set_running(ioloop);
 
@@ -465,8 +461,6 @@ int main(int argc, char *argv[])
 
 	io_loop_destroy(&ioloop);
 	ssl_iostream_context_cache_free();
-#ifdef HAVE_OPENSSL
 	ssl_iostream_openssl_deinit();
-#endif
 	lib_deinit();
 }
diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 62f0b9ec81..5427869574 100644
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -12,9 +12,7 @@
 #include "iostream-temp.h"
 #include "iostream-ssl.h"
 #include "iostream-ssl-test.h"
-#ifdef HAVE_OPENSSL
 #include "iostream-openssl.h"
-#endif
 #include "connection.h"
 #include "test-common.h"
 #include "test-subprocess.h"
@@ -2310,7 +2308,6 @@ static void test_echo_client_shared(void)
 	test_end();
 }
 
-#ifdef HAVE_OPENSSL
 static void test_echo_ssl(void)
 {
 	test_begin("http payload echo (ssl)");
@@ -2340,7 +2337,6 @@ static void test_echo_ssl(void)
 	test_run_parallel(test_client_echo);
 	test_end();
 }
-#endif
 
 static void test_echo_client_blocking(void)
 {
@@ -2390,9 +2386,7 @@ static void (*const test_functions[])(void) = {
 	test_download_client_partial,
 	test_download_client_nested_ioloop,
 	test_echo_client_shared,
-#ifdef HAVE_OPENSSL
 	test_echo_ssl,
-#endif
 	test_echo_client_blocking,
 	NULL
 };
@@ -2403,17 +2397,13 @@ static void (*const test_functions[])(void) = {
 
 static void main_init(void)
 {
-#ifdef HAVE_OPENSSL
 	ssl_iostream_openssl_init();
-#endif
 }
 
 static void main_deinit(void)
 {
 	ssl_iostream_context_cache_free();
-#ifdef HAVE_OPENSSL
 	ssl_iostream_openssl_deinit();
-#endif
 }
 
 int main(int argc, char *argv[])