Changeset 92b5f4d in mod_gnutls

Timestamp:

May 16, 2018, 2:35:28 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

eced11a

Parents:

babdb29

Message:

Use the OCSP cache for responses

File:

• src/gnutls_ocsp.c (modified) (9 diffs)

src/gnutls_ocsp.c

@@ -631 +631 @@
         ap_get_module_config(s->module_config, &gnutls_module);
 
-    if (sc->cache == NULL)
+    if (sc->ocsp_cache == NULL)
     {
         /* OCSP caching requires a cache. */
@@ -723 +723 @@
     }
 
-    int r = mgs_cache_store(sc->cache, s, sc->ocsp->fingerprint, resp, expiry);
+    int r = mgs_cache_store(sc->ocsp_cache, s,
+                            sc->ocsp->fingerprint, resp, expiry);
     /* destroy pool, and original copy of the OCSP response with it */
     apr_pool_destroy(tmp);
@@ -763 +764 @@
     apr_time_t expiry = apr_time_now() + timeout;
 
-    int r = mgs_cache_store(sc->cache, s, sc->ocsp->fingerprint, dummy, expiry);
+    int r = mgs_cache_store(sc->ocsp_cache, s,
+                            sc->ocsp->fingerprint, dummy, expiry);
     if (r != 0)
         ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, s,
@@ -778 +780 @@
     mgs_srvconf_rec *sc = ctxt->sc;
 
-    if (!sc->ocsp_staple || sc->cache == NULL)
+    if (!sc->ocsp_staple || sc->ocsp_cache == NULL)
     {
         /* OCSP must be enabled and caching requires a cache. */
@@ -784 +786 @@
     }
 
-    *ocsp_response = mgs_cache_fetch(ctxt->sc->cache,
+    *ocsp_response = mgs_cache_fetch(ctxt->sc->ocsp_cache,
                                      ctxt->c->base_server,
                                      ctxt->sc->ocsp->fingerprint,
@@ -822 +824 @@
          * moment there's no good way to integrate that with the
          * Apache Mutex directive. */
-        *ocsp_response = mgs_cache_fetch(ctxt->sc->cache,
+        *ocsp_response = mgs_cache_fetch(ctxt->sc->ocsp_cache,
                                          ctxt->c->base_server,
                                          ctxt->sc->ocsp->fingerprint,
@@ -853 +855 @@
 
     /* retry reading from cache */
-    *ocsp_response = mgs_cache_fetch(ctxt->sc->cache,
+    *ocsp_response = mgs_cache_fetch(ctxt->sc->ocsp_cache,
                                      ctxt->c->base_server,
                                      ctxt->sc->ocsp->fingerprint,
@@ -1060 +1062 @@
     {
         const gnutls_datum_t ocsp_response =
-            mgs_cache_fetch(sc->cache, server, sc->ocsp->fingerprint, pool);
+            mgs_cache_fetch(sc->ocsp_cache, server,
+                            sc->ocsp->fingerprint, pool);
 
         if (ocsp_response.size == 0 ||
@@ -1106 +1109 @@
     }
 
-    if (sc->cache == NULL)
+    if (sc->ocsp_cache == NULL)
     {
         ap_log_error(APLOG_MARK, APLOG_STARTUP, APR_EINVAL, server,