]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: ssl: use SSL_CTRL_GET_RAW_CIPHERLIST instead of OpenSSL versions
authorIlya Shipitsin <chipitsine@gmail.com>
Fri, 30 Oct 2020 21:10:02 +0000 (02:10 +0500)
committerWilliam Lallemand <wlallemand@haproxy.org>
Tue, 3 Nov 2020 08:24:43 +0000 (09:24 +0100)
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>
src/ssl_sample.c

index fe45ce9f9adff2a89bdcd237480b121dc1767856..46f5450b649d303fde92a4cea256408aec6860a7 100644 (file)
@@ -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;