[exim-cvs] Fix build on older OpenSSL

Inizio della pagina
Delete this message
Reply to this message
Autore: Exim Git Commits Mailing List
Data:  
To: exim-cvs
Oggetto: [exim-cvs] Fix build on older OpenSSL
Gitweb: https://git.exim.org/exim.git/commitdiff/e570d1363603ca4a58401008541408d74cd0ce40
Commit:     e570d1363603ca4a58401008541408d74cd0ce40
Parent:     fb34a7cb31f66ad7311687840214a92e3737f10b
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu May 2 18:07:53 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu May 2 18:07:53 2019 +0100


    Fix build on older OpenSSL


    Broken-by: b10c87b38c
---
 src/src/tls-openssl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 06008de..e47df7c 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -73,6 +73,7 @@ change this guard and punt the issue for a while longer. */
 #  define EXIM_HAVE_OPENSSL_KEYLOG
 #  define EXIM_HAVE_OPENSSL_CIPHER_GET_ID
 #  define EXIM_HAVE_SESSION_TICKET
+#  define EXIM_HAVE_OPESSL_TRACE
 # else
 #  define EXIM_NEED_OPENSSL_INIT
 # endif
@@ -1942,7 +1943,8 @@ level. */
 DEBUG(D_tls)
   {
   SSL_CTX_set_info_callback(ctx, (void (*)())info_callback);
-#ifndef OPENSSL_NO_SSL_TRACE    /* this needs a debug build of OpenSSL */
+#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE)
+  /* this needs a debug build of OpenSSL */
   SSL_CTX_set_msg_callback(ctx, (void (*)())SSL_trace);
 #endif
 #ifdef OPENSSL_HAVE_KEYLOG_CB