upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-12 10:30:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
[RT #45879]

(cherry picked from commit c26370fc69)
This commit is contained in:
Mark Andrews 2017-08-30 17:11:20 +10:00
parent 9fcff8403a
commit 5c19fc1740
2 changed files with 5 additions and 2 deletions
Show stats 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]
4690. [bug] Command line options -4/-6 were handled inconsistently
between tools. [RT #45632]

4
lib/dns/openssl_link.c
View file

@ -124,7 +124,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());
@ -221,7 +221,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);