I've added commit message. Ilya
сб, 23 янв. 2021 г. в 21:46, William Lallemand <wlallem...@irq6.net>: > Hello, > > On Sat, Jan 23, 2021 at 02:06:41AM +0500, Илья Шипицин wrote: > > Hello, > > > > another ssl guard patch > > > > 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 > > > > Please add a commit message in your patches, patches with only a subject > line won't be taken. See this part of the contributing rules: > https://github.com/haproxy/haproxy/blob/master/CONTRIBUTING#L455 > > Thanks, > > -- > William Lallemand >
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