From 1633e39d91308c4a1e05b581e69121857c3f8bca Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Mon, 30 Sep 2019 12:58:13 +0200 Subject: [PATCH] BUILD: ssl: fix a warning when built with openssl < 1.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit src/ssl_sock.c:2928:12: warning: ‘ssl_sock_is_ckch_valid’ defined but not used [-Wunused-function] static int ssl_sock_is_ckch_valid(struct cert_key_and_chain *ckch) This function is only used with openssl >= 1.0.2, this patch adds a condition to build the function. --- src/ssl_sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 74c6342b3e..726ffb279d 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -2925,11 +2925,12 @@ static void ssl_sock_free_cert_key_and_chain_contents(struct cert_key_and_chain /* checks if a key and cert exists in the ckch */ +#if HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL static int ssl_sock_is_ckch_valid(struct cert_key_and_chain *ckch) { return (ckch->cert != NULL && ckch->key != NULL); } - +#endif /* Loads the contents of a crt file (path) into a cert_key_and_chain * This allows us to carry the contents of the file without having to -- 2.47.3