upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 18:22:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

2214. [bug] Deregister OpenSSL lock callback when cleaning

Browse source 
up.  Reorder OpenSSL cleanup so that RAND_cleanup()
                        is called before the locks are destroyed. [RT #17098]
This commit is contained in:
Mark Andrews 2007-08-27 03:04:17 +00:00
parent 16f5a913ce
commit 634a4da584
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
2214. [bug] Deregister OpenSSL lock callback when cleaning
up. Reorder OpenSSL cleanup so that RAND_cleanup()
is called before the locks are destroyed. [RT #17098]
2213. [bug] SIG0 diagnostic failure messages were looking at the
wrong status code. [RT #17101]

12
lib/dns/openssl_link.c
View file

@ -31,7 +31,7 @@
/*
* Principal Author: Brian Wellington
* $Id: openssl_link.c,v 1.14 2007/06/19 23:47:16 tbox Exp $
* $Id: openssl_link.c,v 1.15 2007/08/27 03:03:41 marka Exp $
*/
#ifdef OPENSSL
@ -197,6 +197,7 @@ dst__openssl_init() {
mem_free(rm);
#endif
cleanup_mutexinit:
CRYPTO_set_locking_callback(NULL);
DESTROYMUTEXBLOCK(locks, nlocks);
cleanup_mutexalloc:
mem_free(locks);
@ -240,16 +241,17 @@ dst__openssl_destroy() {
}
#endif
#endif
if (locks != NULL) {
DESTROYMUTEXBLOCK(locks, nlocks);
mem_free(locks);
}
if (rm != NULL) {
#if OPENSSL_VERSION_NUMBER >= 0x00907000L
RAND_cleanup();
#endif
mem_free(rm);
}
if (locks != NULL) {
CRYPTO_set_locking_callback(NULL);
DESTROYMUTEXBLOCK(locks, nlocks);
mem_free(locks);
}
}
isc_result_t