From 541a534c9f64c505380b936ff15ce91a8179dfa0 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Wed, 23 Oct 2019 14:11:54 +0200 Subject: [PATCH] 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") --- src/ssl_sock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 4a6454f33..151898c02 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 }, };