mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
[RT #45879]
This commit is contained in:
Mark Andrews
2017-08-30 17:11:20 +10:00
parent a5d6b4c4c8
commit c26370fc69
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -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]

4
lib/dns/openssl_link.c
View File

@@ -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);