From 30507e11007fbacb942016b0a1167104ad2c7d49 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Sun, 7 Jan 2018 20:51:53 -0700 Subject: [PATCH] * Redefine TLSv1_1_client_method and TLSv1_2_client_method to TLS_client_methodto when compiling Alpine with OpenSSL 1.1. --- imap/src/osdep/unix/ssl_unix.c | 8 ++++++++ pith/pine.hlp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/imap/src/osdep/unix/ssl_unix.c b/imap/src/osdep/unix/ssl_unix.c index 9498eb0..4c4d6ef 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 #include +#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 0fa0141..6fb5e1b 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 ================= -- 2.11.4.GIT