commit bcc2560333982f990b01b6ce537f7d88aa3c5c3f
author Ilya Shipitsin <chipitsine@gmail.com> Mon Feb 08 16:55:06 2021 +0500
committer Christopher Faulet <cfaulet@haproxy.com> Mon Feb 22 10:23:24 2021 +0100
tree 21734d7728620fa0ce918b0c57259f587d6b719d
parent 49bab753f7dbf41ff1c4ca21d24cd63f07c97630

BUILD: ssl: guard SSL_CTX_set_msg_callback with SSL_CTRL_SET_MSG_CALLBACK macro

both SSL_CTX_set_msg_callback and SSL_CTRL_SET_MSG_CALLBACK defined since
ea262260469e49149cb10b25a87dfd6ad3fbb4ba, we can safely switch to that guard
instead of OpenSSL version

(cherry picked from commit 7ff7747a1750cc416c3731cf53858011e02dd546)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/ssl_sock.c

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index f142b0b..6f98d33 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4166,7 +4166,7 @@
 #endif /* OPENSSL_NO_DH */
 
 	SSL_CTX_set_info_callback(ctx, ssl_sock_infocbk);
-#if HA_OPENSSL_VERSION_NUMBER >= 0x00907000L
+#ifdef SSL_CTRL_SET_MSG_CALLBACK
 	SSL_CTX_set_msg_callback(ctx, ssl_sock_msgcbk);
 #endif
 #ifdef HAVE_OPENSSL_KEYLOG