From: Mark Andrews <marka@isc.org>
Date: Wed, 30 Aug 2017 07:11:20 +0000 (+1000)
Subject: 4692.   [bug]           Fix build failures with libressl introduced in 4676.
X-Git-Tag: v9.12.0a1~80
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c26370fc697ea390f3b3856d07c616e304336e00;p=thirdparty%2Fbind9.git

4692.   [bug]           Fix build failures with libressl introduced in 4676.
                        [RT #45879]
---

diff --git a/CHANGES b/CHANGES
index ff1982dc76f..b52f3a06ac6 100644
--- 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 734ebc0b130..c8cfad364cc 100644
--- 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);