]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: build without openssl broken
authorWilliam Lallemand <wlallemand@haproxy.com>
Thu, 8 Jun 2017 17:05:48 +0000 (19:05 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 8 Jun 2017 17:55:54 +0000 (19:55 +0200)
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

index 60bd334b285df7784140ac77a2ee4ab871aee1cb..9cbb3d5cf64d0c0455a995b58f1f5d2926f2da0a 100644 (file)
@@ -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 */