From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Fri, 30 Oct 2020 21:10:02 +0000 (+0500)
Subject: BUILD: ssl: use SSL_CTRL_GET_RAW_CIPHERLIST instead of OpenSSL versions
X-Git-Tag: v2.3.0~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9dfee43f3f7ac4e17b99435dd0db8b37e7490e8;p=thirdparty%2Fhaproxy.git

BUILD: ssl: use SSL_CTRL_GET_RAW_CIPHERLIST instead of OpenSSL versions

let us use SSL_CTRL_GET_RAW_CIPHERLIST for feature detection instead
of versions

[wla: SSL_CTRL_GET_RAW_CIPHERLIST was introduced by OpenSSL commit
94a209 along with SSL_CIPHER_find. It was removed in boringSSL.]
Signed-off-by: William Lallemand <wlallemand@haproxy.org>
---

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index fe45ce9f9a..46f5450b64 100644
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -1249,7 +1249,7 @@ static int smp_fetch_ssl_x_keylog(const struct arg *args, struct sample *smp, co
 static int
 smp_fetch_ssl_fc_cl_str(const struct arg *args, struct sample *smp, const char *kw, void *private)
 {
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL)
+#if defined(OPENSSL_IS_BORINGSSL) || defined(SSL_CTRL_GET_RAW_CIPHERLIST)
 	struct buffer *data;
 	int i;