From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Sat, 27 Nov 2021 21:07:15 +0000 (+0000)
Subject: Fix build for OpenSSL 3.0.0 .  Bug 2810
X-Git-Tag: exim-4.96-RC0~124
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/ff7829398d74e67f1c1f40339a772fd76708e5ac

Fix build for OpenSSL 3.0.0 .  Bug 2810
---

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 830978e04..512f5412e 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -232,10 +232,14 @@ static exim_openssl_option exim_openssl_options[] = {
   { US"no_tlsv1", SSL_OP_NO_TLSv1 },
 #endif
 #ifdef SSL_OP_NO_TLSv1_1
-# if SSL_OP_NO_TLSv1_1 == 0x00000400L
+# if OPENSSL_VERSION_NUMBER < 0x30000000L
+#  if SSL_OP_NO_TLSv1_1 == 0x00000400L
   /* Error in chosen value in 1.0.1a; see first item in CHANGES for 1.0.1b */
-#  warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
-# else
+#   warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
+#   define NO_SSL_OP_NO_TLSv1_1
+#  endif
+# endif
+# ifndef NO_SSL_OP_NO_TLSv1_1
   { US"no_tlsv1_1", SSL_OP_NO_TLSv1_1 },
 # endif
 #endif