summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--imap/src/osdep/unix/ssl_unix.c8
-rw-r--r--pith/pine.hlp2
2 files changed, 9 insertions, 1 deletions
diff --git a/imap/src/osdep/unix/ssl_unix.c b/imap/src/osdep/unix/ssl_unix.c
index 9498eb0e..4c4d6ef8 100644
--- a/imap/src/osdep/unix/ssl_unix.c
+++ b/imap/src/osdep/unix/ssl_unix.c
@@ -36,6 +36,14 @@
#ifdef OPENSSL_1_1_0
#include <rsa.h>
#include <bn.h>
+#ifdef TLSv1_1_client_method
+#undef TLSv1_1_client_method
+#endif /* TLSv1_1_client_method */
+#ifdef TLSv1_2_client_method
+#undef TLSv1_2_client_method
+#endif /* TLSv1_2_client_method */
+#define TLSv1_1_client_method TLS_client_method
+#define TLSv1_2_client_method TLS_client_method
#endif /* OPENSSL_1_1_0 */
#undef STRING
#undef crypt
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 0fa01415..6fb5e1bb 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 240 2017-12-09 16:20:34
+Alpine Commit 242 2018-01-07 20:51:03
============= h_news =================
<HTML>
<HEAD>