From: William Lallemand <wlallemand@haproxy.com>
Date: Thu, 8 Jun 2017 17:05:48 +0000 (+0200)
Subject: BUG/MEDIUM: build without openssl broken
X-Git-Tag: v1.8-dev3~302
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf4e496c9;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: build without openssl broken

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.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 60bd334b28..9cbb3d5cf6 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 */