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

Remove isc__tls_setfatalmode() function and the calls

Browse Source 
With _exit() instead of exit() in place, we don't need
isc__tls_setfatalmode() mechanism as the atexit() calls will not be
executed including OpenSSL atexit hooks.
This commit is contained in:
Ondřej Surý
2024-02-07 15:25:13 +01:00
parent 76997983fd
commit 0c18ed7ec6
11 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/isc/tls.c
View File

@@ -77,12 +77,6 @@ isc__tls_set_thread_id(CRYPTO_THREADID *id) {
}
#endif
#ifdef ISC_TEST_OPENSSL_MEMORY_LEAKS
static atomic_bool handle_fatal = false;
#else
static atomic_bool handle_fatal = true;
#endif
#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x30000000L
/*
* This was crippled with LibreSSL, so just skip it:
@@ -115,7 +109,7 @@ isc__tls_free_ex(void *ptr, const char *file, int line) {
if (ptr == NULL) {
return;
}
if (!atomic_load(&handle_fatal) || isc__tls_mctx != NULL) {
if (isc__tls_mctx != NULL) {
isc__mem_free(isc__tls_mctx, ptr, 0, file, (unsigned int)line);
}
}
@@ -143,7 +137,7 @@ isc__tls_free_ex(void *ptr, const char *file, int line) {
if (ptr == NULL) {
return;
}
if (!atomic_load(&handle_fatal) || isc__tls_mctx != NULL) {
if (isc__tls_mctx != NULL) {
isc__mem_free(isc__tls_mctx, ptr, 0);
}
}
@@ -1796,8 +1790,3 @@ isc_tlsctx_set_random_session_id_context(isc_tlsctx_t *ctx) {
RUNTIME_CHECK(
SSL_CTX_set_session_id_context(ctx, session_id_ctx, len) == 1);
}
void
isc__tls_setfatalmode(void) {
atomic_store(&handle_fatal, true);
}