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

lib-smtp: 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-smtp/test-smtp-client-errors.c b/src/lib-smtp/test-smtp-client-errors.c
index 82b23be620..7bdd60d4c2 100644
--- a/src/lib-smtp/test-smtp-client-errors.c
+++ b/src/lib-smtp/test-smtp-client-errors.c
@@ -11,9 +11,7 @@
 #include "ostream.h"
 #include "iostream-ssl.h"
 #include "iostream-ssl-test.h"
-#ifdef HAVE_OPENSSL
-#  include "iostream-openssl.h"
-#endif
+#include "iostream-openssl.h"
 #include "time-util.h"
 #include "sleep.h"
 #include "connection.h"
@@ -3693,9 +3691,6 @@ static void test_transaction_timeout(void)
 /*
  * Invalid SSL certificate
  */
-
-#ifdef HAVE_OPENSSL
-
 /* dns */
 
 static void
@@ -3839,8 +3834,6 @@ static void test_invalid_ssl_certificate(void)
 	test_end();
 }
 
-#endif
-
 /*
  * All tests
  */
@@ -3868,9 +3861,7 @@ static void (*const test_functions[])(void) = {
 	test_dns_lookup_failure,
 	test_authentication,
 	test_transaction_timeout,
-#ifdef HAVE_OPENSSL
 	test_invalid_ssl_certificate,
-#endif
 	NULL
 };
 
@@ -4326,17 +4317,13 @@ test_run_client_server(const struct smtp_client_settings *client_set,
 
 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[])
diff --git a/src/lib-smtp/test-smtp-payload.c b/src/lib-smtp/test-smtp-payload.c
index 0ad87733fc..68455037da 100644
--- a/src/lib-smtp/test-smtp-payload.c
+++ b/src/lib-smtp/test-smtp-payload.c
@@ -14,9 +14,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"
@@ -1025,7 +1023,6 @@ test_run_scenarios(
 
 	test_out_reason("unknown payload size", (failure == NULL), failure);
 
-#ifdef HAVE_OPENSSL
 	smtp_server_set.max_pipelined_commands = 5;
 	smtp_server_set.capabilities |= SMTP_CAPABILITY_PIPELINING;
 	test_max_pending = MAX_PARALLEL_PENDING;
@@ -1047,7 +1044,6 @@ test_run_scenarios(
 
 	test_out_reason("parallel pipelining startls",
 			(failure == NULL), failure);
-#endif
 }
 
 static void test_smtp_normal(void)
@@ -1098,17 +1094,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[])