4692. [bug] Fix build failures with libressl introduced in 4676.

                        [RT #45879]

diff --git a/CHANGES b/CHANGES
index ff1982dc76f5800ede0e8c37b185afb6bcfa7917..b52f3a06ac662ba3c9a26a5bee072bc60745d7bb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4692.  [bug]           Fix build failures with libressl introduced in 4676.
+                       [RT #45879]
+
 4691.  [func]          Add -4/-6 command line options to nsupdate and rndc.
                        [RT #45632]
 

diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 734ebc0b130c78fc7814cbedd2a527127d9a32b8..c8cfad364cc91df3e13adb194b847888ad49c6ec 100644 (file)
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -116,7 +116,7 @@ lock_callback(int mode, int type, const char *file, int line) {
 }
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10000000L
+#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(LIBRESSL_VERSION_NUMBER)
 static unsigned long
 id_callback(void) {
        return ((unsigned long)isc_thread_self());
@@ -213,7 +213,7 @@ dst__openssl_init(const char *engine) {
        if (result != ISC_R_SUCCESS)
                goto cleanup_mutexalloc;
        CRYPTO_set_locking_callback(lock_callback);
-# if OPENSSL_VERSION_NUMBER >= 0x10000000L
+# if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10100000L
        CRYPTO_THREADID_set_callback(_set_thread_id);
 # else
        CRYPTO_set_id_callback(id_callback);