usually I do such a stupid mistakes on friday.
I wonder about next friday :(

new patch attached.

Ilya

пн, 8 февр. 2021 г. в 17:08, William Lallemand <wlallem...@haproxy.com>:

> On Mon, Feb 08, 2021 at 05:03:43PM +0500, Илья Шипицин wrote:
> > I've added commit message.
> >
> > Ilya
> >
>
> > From f39f9f69e29570fa43d7db5a0f08ee9395b98d50 Mon Sep 17 00:00:00 2001
> > From: Ilya Shipitsin <chipits...@gmail.com>
> > Date: Sat, 23 Jan 2021 00:50:59 +0500
> > Subject: [PATCH] BUILD: ssl: guard SSL_CTX_set_msg_callback with
> >  SSL_CTRL_SET_MSG_CALLBACK macro
> >
> > ---
> >  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 24a38e47d..2bda3d765 100644
> > --- a/src/ssl_sock.c
> > +++ b/src/ssl_sock.c
> > @@ -4224,7 +4224,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
> > --
> > 2.29.2
> >
>
> It looks like you sent the exact same patch by mistake.
>
> --
> William Lallemand
>
From 381ae2e9948d5d85f6926481c8816a0a7069a994 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipits...@gmail.com>
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
---
 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 310578503..099e7f922 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4411,7 +4411,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
-- 
2.29.2

Reply via email to