[balsa] Avoid warnings with recent openssl-1.1.x



commit 5ef72f86f0de4396efcf520670e983327ce0d2c0
Author: Pawel Salek <pawsa0 gmail com>
Date:   Wed Dec 28 17:55:31 2016 +0100

    Avoid warnings with recent openssl-1.1.x

 ChangeLog                |    4 ++++
 libbalsa/imap/imap-tls.c |    5 +++++
 2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d984a54..8b894a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-28  Pawel Salek <pawsa0 gmail com>
+
+       * libbalsa/imap/imap-tls.c: avoid warnings with openssl-1.1.x
+
 2016-12-20  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Get notifications about GtkPaned's position to save the new
diff --git a/libbalsa/imap/imap-tls.c b/libbalsa/imap/imap-tls.c
index 421aa81..7579401 100644
--- a/libbalsa/imap/imap-tls.c
+++ b/libbalsa/imap/imap-tls.c
@@ -62,6 +62,8 @@
 static SSL_CTX *global_ssl_context = NULL;
 static GMutex global_tls_lock;
 
+  /* Setting callbacks is not required any more with 1.1.0-pre4 and newer */
+#if OPENSSL_VERSION_NUMBER < 0x010100040L
 /* OpenSSL static locks */
 static GMutex *mutexes = NULL;
 
@@ -153,6 +155,9 @@ imaptls_thread_cleanup(void)
   return 1;
 }
 #endif /* DO_PROPER_OPENSSL_CLEANUP */
+#else
+static int imaptls_thread_setup() { return 0; }
+#endif /* OPENSSL_VERSION_NUMBER < OPENSSL_VER(1,1,0,0,4) */
 
 SSL*
 imap_create_ssl(void)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]