]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: SSL: add BoringSSL guarding to "RAND_keep_random_devices_open"
authorIlya Shipitsin <chipitsine@gmail.com>
Sat, 21 Nov 2020 18:10:53 +0000 (23:10 +0500)
committerWilliam Lallemand <wlallemand@haproxy.org>
Tue, 24 Nov 2020 08:54:44 +0000 (09:54 +0100)
"RAND_keep_random_devices_open" is OpenSSL specific, does not present
in other OpenSSL variants like LibreSSL or BoringSSL. BoringSSL recently
"updated" its internal openssl version to 1.1.1, we temporarily set it
back to 1.1.0, as we are going to remove that hack, let us add proper
guarding.

src/haproxy.c

index 019cc571c9947445eb14daba7f00d807483e33c3..ae11f8dd5fc914da660b82c0459889453cde25e7 100644 (file)
@@ -783,7 +783,7 @@ void mworker_reload()
                if (fdtab)
                        deinit_pollers();
        }
-#if defined(USE_OPENSSL) && (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L)
+#if defined(USE_OPENSSL) && (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(OPENSSL_IS_BORINGSSL)
        /* close random device FDs */
        RAND_keep_random_devices_open(0);
 #endif