projects
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb34a7c
)
Fix build on older OpenSSL
author
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 2 May 2019 17:07:53 +0000
(18:07 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 2 May 2019 17:07:53 +0000
(18:07 +0100)
Broken-by: b10c87b38c
src/src/tls-openssl.c
patch
|
blob
|
blame
|
history
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index 06008deccceb03aa48583b7227fba4c89582ed05..e47df7cb29f3f739eac6982fa2b5f408c3a2b23b 100644
(file)
--- 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_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
# else
# define EXIM_NEED_OPENSSL_INIT
# endif
@@
-1942,7
+1943,8
@@
level. */
DEBUG(D_tls)
{
SSL_CTX_set_info_callback(ctx, (void (*)())info_callback);
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
SSL_CTX_set_msg_callback(ctx, (void (*)())SSL_trace);
#endif
#ifdef OPENSSL_HAVE_KEYLOG_CB