Changeset 9418c1e in mod_gnutls

Timestamp:

Jan 11, 2020, 10:57:16 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

98b37a1

Parents:

06dcf89

Message:

mgs_cache_ocsp_failure: Require explicit struct mgs_ocsp_data

File:

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

src/gnutls_ocsp.c

@@ -779 +779 @@
  *
  * @param s the server for which an OCSP request failed
+ *
+ * @param req_data OCSP data structure for the certificate that could
+ * not be checked
+ *
  * @param timeout lifetime of the cache entry
  */
-static void mgs_cache_ocsp_failure(server_rec *s, apr_interval_time_t timeout)
+static void mgs_cache_ocsp_failure(server_rec *s,
+                                   struct mgs_ocsp_data *req_data,
+                                   apr_interval_time_t timeout)
 {
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
@@ -794 +800 @@
 
     int r = mgs_cache_store(sc->ocsp_cache, s,
-                            sc->ocsp->fingerprint, dummy, expiry);
+                            req_data->fingerprint, dummy, expiry);
     if (r != 0)
         ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, s,
@@ -889 +895 @@
         /* cache failure to rate limit retries */
         mgs_cache_ocsp_failure(ctxt->c->base_server,
+                               ctxt->sc->ocsp,
                                ctxt->sc->ocsp_failure_timeout);
         apr_global_mutex_unlock(sc->ocsp_mutex);
@@ -1117 +1124 @@
                          "Caching OCSP request failure for %s:%d.",
                          server->server_hostname, server->addrs->host_port);
-            mgs_cache_ocsp_failure(server, sc->ocsp_failure_timeout * 2);
+            mgs_cache_ocsp_failure(server, sc->ocsp,
+                                   sc->ocsp_failure_timeout * 2);
         }
     }