From bcc2560333982f990b01b6ce537f7d88aa3c5c3f Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Mon, 8 Feb 2021 16:55:06 +0500 Subject: [PATCH] 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 --- src/ssl_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ int ssl_sock_prepare_ctx(struct bind_conf *bind_conf, struct ssl_bind_conf *ssl_ #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 -- 1.7.10.4