Changeset babdb29 in mod_gnutls for src/gnutls_hooks.c

Timestamp:

May 16, 2018, 2:12:08 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

92b5f4d

Parents:

d036f96

Message:

Initialize and clean up the OCSP cache, following session cache patterns

File:

• src/gnutls_hooks.c (modified) (3 diffs)

src/gnutls_hooks.c

@@ -130 +130 @@
     ap_mutex_register(pconf, MGS_CACHE_MUTEX_NAME, NULL, APR_LOCK_DEFAULT, 0);
     ap_mutex_register(pconf, MGS_OCSP_MUTEX_NAME, NULL, APR_LOCK_DEFAULT, 0);
+    ap_mutex_register(pconf, MGS_OCSP_CACHE_MUTEX_NAME, NULL,
+                      APR_LOCK_DEFAULT, 0);
 
     /* Register a pool clean-up function */
@@ -633 +635 @@
         if (sc->cache_timeout == MGS_TIMEOUT_UNSET)
             sc->cache_timeout = sc_base->cache_timeout;
+        sc->ocsp_cache_enable = sc_base->ocsp_cache_enable;
+        sc->ocsp_cache = sc_base->ocsp_cache;
 
         sc->singleton_wd = sc_base->singleton_wd;
@@ -775 +779 @@
     }
 
-    if (sc->cache_enable) {
-        rv = mgs_cache_child_init(p, s, sc);
-        if (rv != APR_SUCCESS) {
+    if (sc->cache_enable == GNUTLS_ENABLED_TRUE)
+    {
+        rv = mgs_cache_child_init(p, s, sc->cache, MGS_CACHE_MUTEX_NAME);
+        if (rv != APR_SUCCESS)
             ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
-                    "GnuTLS: Failed to run Cache Init");
-        }
-    }
-
-    /* reinit OCSP mutex */
+                    "Child init for session cache failed!");
+    }
+
+    if (sc->ocsp_cache_enable == GNUTLS_ENABLED_TRUE)
+    {
+        rv = mgs_cache_child_init(p, s, sc->ocsp_cache,
+                                  MGS_OCSP_CACHE_MUTEX_NAME);
+        if (rv != APR_SUCCESS)
+            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
+                    "Child init for OCSP cache failed!");
+    }
+
+    /* reinit OCSP request mutex */
     const char *lockfile = apr_global_mutex_lockfile(sc->ocsp_mutex);
     rv = apr_global_mutex_child_init(&sc->ocsp_mutex, lockfile, p);