upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-29 13:54:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUILD: ssl: fix build without OPENSSL_NO_ENGINE

Browse source 
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.
This commit is contained in:
William Lallemand 2020-05-18 13:42:49 +02:00 committed by William Lallemand
parent 6112f5ccd2
commit 5520d6f3c7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cfgparse-ssl.c
View file

@ -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.
*/