From: William Lallemand <wlallemand@haproxy.com>
Date: Wed, 23 Oct 2019 12:11:54 +0000 (+0200)
Subject: BUG/MINOR: ssl/cli: fix build of SCTL and OCSP
X-Git-Tag: v2.1-dev3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=541a534;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl/cli: fix build of SCTL and OCSP

Fix the build issue of SCTL and OCSP for boring/libressl introduced by
44b3532 ("MINOR: ssl/cli: update ocsp/issuer/sctl file from the CLI")
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 4a6454f330..151898c02c 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -9945,8 +9945,12 @@ struct {
 	/* add a parsing callback */
 } cert_exts[CERT_TYPE_MAX] = {
 	[CERT_TYPE_PEM]    = { "",        CERT_TYPE_PEM,      &ssl_sock_load_pem_into_ckch }, /* default mode, no extensions */
+#if ((defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB && !defined OPENSSL_NO_OCSP) || defined OPENSSL_IS_BORINGSSL)
 	[CERT_TYPE_OCSP]   = { "ocsp",    CERT_TYPE_OCSP,     &ssl_sock_load_ocsp_response_from_file },
+#endif
+#if (HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
 	[CERT_TYPE_SCTL]   = { "sctl",    CERT_TYPE_SCTL,     &ssl_sock_load_sctl_from_file },
+#endif
 	[CERT_TYPE_ISSUER] = { "issuer",  CERT_TYPE_ISSUER,   &ssl_sock_load_issuer_file_into_ckch },
 };