Changeset b8700b0 in mod_gnutls

Timestamp:

Jun 16, 2016, 2:32:02 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, main, master, proxy-ticket, upstream

Children:

70d014b

Parents:

02eabe7

Message:

Deinit proxy credentials on config pool cleanup

Location:

src

Files:

• gnutls_config.c (modified) (1 diff)
• gnutls_hooks.c (modified) (2 diffs)

src/gnutls_config.c

@@ -1113 +1113 @@
     sc->proxy_x509_crl_file = NULL;
     sc->proxy_priorities_str = NULL;
+    sc->proxy_x509_creds = NULL;
+    sc->anon_client_creds = NULL;
     sc->proxy_priorities = NULL;
+    sc->proxy_x509_tl = NULL;
 
     sc->ocsp_response_file = NULL;

src/gnutls_hooks.c

@@ -1823 +1823 @@
 
 
-static apr_status_t load_proxy_x509_credentials(apr_pool_t *pconf __attribute__((unused)),
+static apr_status_t cleanup_proxy_x509_credentials(void *arg)
+{
+    mgs_srvconf_rec *sc = (mgs_srvconf_rec *) arg;
+
+    if (sc->proxy_x509_creds)
+    {
+        /* This implicitly releases the associated trust list
+         * sc->proxy_x509_tl, too. */
+        gnutls_certificate_free_credentials(sc->proxy_x509_creds);
+        sc->proxy_x509_creds = NULL;
+        sc->proxy_x509_tl = NULL;
+    }
+
+    if (sc->anon_client_creds)
+    {
+        gnutls_anon_free_client_credentials(sc->anon_client_creds);
+        sc->anon_client_creds = NULL;
+    }
+
+    if (sc->proxy_priorities)
+    {
+        gnutls_priority_deinit(sc->proxy_priorities);
+        sc->proxy_priorities = NULL;
+    }
+
+    return APR_SUCCESS;
+}
+
+
+
+static apr_status_t load_proxy_x509_credentials(apr_pool_t *pconf,
                                                 apr_pool_t *ptemp,
                                                 server_rec *s)
@@ -1833 +1863 @@
         return APR_EGENERAL;
 
-    apr_status_t ret = APR_SUCCESS;
+    apr_status_t ret = APR_EINIT;
     int err = GNUTLS_E_SUCCESS;
+
+    /* Cleanup function for the GnuTLS structures allocated below */
+    apr_pool_cleanup_register(pconf, sc, cleanup_proxy_x509_credentials,
+                              apr_pool_cleanup_null);
 
     /* Function pool, gets destroyed before exit. */