From 70946a7ef758f282e3f5bce92f9622beef986790 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sat, 13 Mar 2021 20:57:00 +0100
Subject: OpenSSL: permit deprecated features,

to avoid compatibility issues with new OpenSSL versions later on.
---
 NEWS     | 2 ++
 socket.c | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 12b68a1d..34991c3f 100644
--- a/NEWS
+++ b/NEWS
@@ -93,6 +93,8 @@ fetchmail-6.4.18 (not yet released):
 # ROBUSTNESS FIXES:
 * fetchmailconf: do not require fetchmail for -V. do not require Tk (Tkinter)
   for -d option. This is to fail more gracefully on incomplete installs.
+* TLS code: remove OPENSSL_NO_DEPRECATED macros to avoid portability issues
+  with OpenSSL v3.
 
 --------------------------------------------------------------------------------
 fetchmail-6.4.17 (released 2021-03-07, 29998 LoC):
diff --git a/socket.c b/socket.c
index e78ee79a..a6d2fc53 100644
--- a/socket.c
+++ b/socket.c
@@ -10,7 +10,6 @@
 
 #include "config.h"
 #include "fetchmail.h"
-#include "tls-aux.h"
 
 #include <stdio.h>
 #include <errno.h>
@@ -377,11 +376,16 @@ va_dcl {
 }
 
 #ifdef SSL_ENABLE
+#if 0
+/* this is not to be enabled in stable releases to avoid
+ * compatibility issues */
 /* OPENSSL_NO_SSL_INTERN: 
    transitional feature for OpenSSL 1.0.1 up to and excluding 1.1.0 
    to make sure we do not access internal structures! */
 #define OPENSSL_NO_SSL_INTERN 1
 #define OPENSSL_NO_DEPRECATED 23
+#endif
+#include "tls-aux.h"
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
-- 
cgit v1.2.3