Why ssl_free_dh (and #include <proto/ssl_sock.h>) suddenly (re)appear in 
haproxy.c
with this commit? This looks like a remnant of old dev.

> Le 8 juin 2017 à 19:05, William Lallemand <wlallem...@haproxy.com> a écrit :
> 
> The commit 872f9c213 ("MEDIUM: ssl: add basic support for OpenSSL crypto
> engine") broke the build without openssl support.
> 
> The ssl_free_dh() function is not defined when USE_OPENSSL is not
> defined and leads to a compilation failure.
> ---
> src/haproxy.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/haproxy.c b/src/haproxy.c
> index 60bd334b..9cbb3d5c 100644
> --- a/src/haproxy.c
> +++ b/src/haproxy.c
> @@ -2575,7 +2575,7 @@ int main(int argc, char **argv)
>                               protocol_unbind_all();
>                               mworker_wait();
>                       }
> -#ifndef OPENSSL_NO_DH
> +#if defined(USE_OPENSSL) && !defined(OPENSSL_NO_DH)
>                       ssl_free_dh();
> #endif
>                       /* should never get there */
> -- 
> 2.13.0
> 
> 


Reply via email to