Remove OpenSSL memory tracking support from the tls.c module

OPENSSL_cleanup() in OpenSSL 4 doesn't free the memory, and that is
not compatible with BIND 9's memory leak detection code. Don't use
custom allocation/deallocation functions for OpenSSL's internal memory
management in the tls.c module.

See https://github.com/openssl/openssl/pull/29721

(cherry picked from commit 4ede6edc547109af81dc5c5ec25cf3ff7991bc10)

diff --git a/lib/isc/tls.c b/lib/isc/tls.c
index 3543207ba24579cbf3fe0ca579eb5c1f33f851dd..d564998af5f68f3f77bcaf10769781fe54d87a05 100644 (file)
--- a/lib/isc/tls.c
+++ b/lib/isc/tls.c
@@ -54,9 +54,8 @@
 #define COMMON_SSL_OPTIONS \
        (SSL_OP_NO_COMPRESSION | SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)
 
-static isc_mem_t *isc__tls_mctx = NULL;
-
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
+static isc_mem_t *isc__tls_mctx = NULL;
 static isc_mutex_t *locks = NULL;
 static int nlocks;
 
@@ -77,92 +76,8 @@ isc__tls_set_thread_id(CRYPTO_THREADID *id) {
 }
 #endif
 
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x30000000L
-/*
- * This was crippled with LibreSSL, so just skip it:
- * https://cvsweb.openbsd.org/src/lib/libcrypto/Attic/mem.c
- */
-
-#if ISC_MEM_TRACKLINES
-/*
- * We use the internal isc__mem API here, so we can pass the file and line
- * arguments passed from OpenSSL >= 1.1.0 to our memory functions for better
- * tracking of the OpenSSL allocations.  Without this, we would always just see
- * isc__tls_{malloc,realloc,free} in the tracking output, but with this in place
- * we get to see the places in the OpenSSL code where the allocations happen.
- */
-
-static void *
-isc__tls_malloc_ex(size_t size, const char *file, int line) {
-       return isc__mem_allocate(isc__tls_mctx, size, 0, file,
-                                (unsigned int)line);
-}
-
-static void *
-isc__tls_realloc_ex(void *ptr, size_t size, const char *file, int line) {
-       return isc__mem_reallocate(isc__tls_mctx, ptr, size, 0, file,
-                                  (unsigned int)line);
-}
-
-static void
-isc__tls_free_ex(void *ptr, const char *file, int line) {
-       if (ptr == NULL) {
-               return;
-       }
-       if (isc__tls_mctx != NULL) {
-               isc__mem_free(isc__tls_mctx, ptr, 0, file, (unsigned int)line);
-       }
-}
-
-#else /* ISC_MEM_TRACKLINES */
-
-static void *
-isc__tls_malloc_ex(size_t size, const char *file, int line) {
-       UNUSED(file);
-       UNUSED(line);
-       return isc_mem_allocate(isc__tls_mctx, size);
-}
-
-static void *
-isc__tls_realloc_ex(void *ptr, size_t size, const char *file, int line) {
-       UNUSED(file);
-       UNUSED(line);
-       return isc_mem_reallocate(isc__tls_mctx, ptr, size);
-}
-
-static void
-isc__tls_free_ex(void *ptr, const char *file, int line) {
-       UNUSED(file);
-       UNUSED(line);
-       if (ptr == NULL) {
-               return;
-       }
-       if (isc__tls_mctx != NULL) {
-               isc__mem_free(isc__tls_mctx, ptr, 0);
-       }
-}
-
-#endif /* ISC_MEM_TRACKLINES */
-
-#endif /* !defined(LIBRESSL_VERSION_NUMBER) */
-
 void
 isc__tls_initialize(void) {
-       isc_mem_create(&isc__tls_mctx);
-       isc_mem_setname(isc__tls_mctx, "OpenSSL");
-       isc_mem_setdestroycheck(isc__tls_mctx, false);
-
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x30000000L
-       /*
-        * CRYPTO_set_mem_(_ex)_functions() returns 1 on success or 0 on
-        * failure, which means OpenSSL already allocated some memory.  There's
-        * nothing we can do about it.
-        */
-       (void)CRYPTO_set_mem_functions(isc__tls_malloc_ex, isc__tls_realloc_ex,
-                                      isc__tls_free_ex);
-#endif /* !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= \
-         0x30000000L  */
-
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
        uint64_t opts = OPENSSL_INIT_ENGINE_ALL_BUILTIN |
                        OPENSSL_INIT_LOAD_CONFIG;
@@ -176,6 +91,10 @@ isc__tls_initialize(void) {
 
        RUNTIME_CHECK(OPENSSL_init_ssl(opts, NULL) == 1);
 #else
+       isc_mem_create(&isc__tls_mctx);
+       isc_mem_setname(isc__tls_mctx, "OpenSSL");
+       isc_mem_setdestroycheck(isc__tls_mctx, false);
+
        nlocks = CRYPTO_num_locks();
        locks = isc_mem_cget(isc__tls_mctx, nlocks, sizeof(locks[0]));
        isc_mutexblock_init(locks, nlocks);
@@ -229,14 +148,18 @@ isc__tls_shutdown(void) {
                isc_mem_cput(isc__tls_mctx, locks, nlocks, sizeof(locks[0]));
                locks = NULL;
        }
-#endif
 
        isc_mem_destroy(&isc__tls_mctx);
+#endif
 }
 
 void
 isc__tls_setdestroycheck(bool check) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
        isc_mem_setdestroycheck(isc__tls_mctx, check);
+#else
+       UNUSED(check);
+#endif
 }
 
 void