From: William Lallemand <wlallemand@haproxy.com>
Date: Mon, 18 May 2020 11:42:49 +0000 (+0200)
Subject: BUILD: ssl: fix build without OPENSSL_NO_ENGINE
X-Git-Tag: v2.2-dev8~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5520d6f3c7cd36d32cdc089368f56ec6063ff4a1;p=thirdparty%2Fhaproxy.git

BUILD: ssl: fix build without OPENSSL_NO_ENGINE

The CI revealed that the boringssl build is still broken because of some
ifdef misplacement.

Bug introduced by dad3105 ("REORG: ssl: move ssl configuration to
cfgparse-ssl.c").

No backport needed.

Fix issue #633.
---

diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index a3ce2995ae..374ca920b1 100644
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -121,7 +121,6 @@ static int ssl_load_global_issuers_from_path(char **args, int section_type, stru
 	return 0;
 }
 
-#ifndef OPENSSL_NO_ENGINE
 /* parse the "ssl-mode-async" keyword in global section.
  * Returns <0 on alert, >0 on warning, 0 on success.
  */
@@ -139,6 +138,7 @@ static int ssl_parse_global_ssl_async(char **args, int section_type, struct prox
 #endif
 }
 
+#ifndef OPENSSL_NO_ENGINE
 /* parse the "ssl-engine" keyword in global section.
  * Returns <0 on alert, >0 on warning, 0 on success.
  */