Changeset 06dcf89 in mod_gnutls for src

Timestamp:

Jan 11, 2020, 10:53:18 AM (12 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

9418c1e

Parents:

75f2d96

Message:

mgs_cache_ocsp_response: Require explicit struct mgs_ocsp_data

File:

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

src/gnutls_ocsp.c

@@ -643 +643 @@
  * @param s server that needs a new response
  *
+ * @param req_data struct describing the certificate for which to
+ * cache a response
+ *
  * @param cache_expiry If not `NULL`, this `apr_time_t` will be set to
  * the expiration time of the cache entry. Remains unchanged on
@@ -650 +653 @@
  */
 static apr_status_t mgs_cache_ocsp_response(server_rec *s,
+                                            struct mgs_ocsp_data *req_data,
                                             apr_time_t *cache_expiry)
 {
@@ -692 +696 @@
     {
         gnutls_datum_t req;
-        int ret = mgs_create_ocsp_request(s, sc->ocsp, &req, &nonce);
+        int ret = mgs_create_ocsp_request(s, req_data, &req, &nonce);
         if (ret == GNUTLS_E_SUCCESS)
         {
@@ -708 +712 @@
         }
 
-        rv = do_ocsp_request(tmp, s, sc->ocsp->uri, &req, &resp);
+        rv = do_ocsp_request(tmp, s, req_data->uri, &req, &resp);
         gnutls_free(req.data);
         if (rv != APR_SUCCESS)
@@ -720 +724 @@
 
     apr_time_t next_update;
-    if (check_ocsp_response(s, sc->ocsp, &resp, &next_update,
+    if (check_ocsp_response(s, req_data, &resp, &next_update,
                             nonce.size ? &nonce : NULL)
         != GNUTLS_E_SUCCESS)
@@ -749 +753 @@
 
     int r = mgs_cache_store(sc->ocsp_cache, s,
-                            sc->ocsp->fingerprint, resp, expiry);
+                            req_data->fingerprint, resp, expiry);
     /* destroy pool, and original copy of the OCSP response with it */
     apr_pool_destroy(tmp);
@@ -878 +882 @@
     }
 
-    rv = mgs_cache_ocsp_response(ctxt->c->base_server, NULL);
+    rv = mgs_cache_ocsp_response(ctxt->c->base_server, sc->ocsp, NULL);
     if (rv != APR_SUCCESS)
     {
@@ -1030 +1034 @@
      * mgs_get_ocsp_response. */
     apr_global_mutex_lock(sc->ocsp_mutex);
-    apr_status_t rv = mgs_cache_ocsp_response(server, &expiry);
+    apr_status_t rv = mgs_cache_ocsp_response(server, sc->ocsp, &expiry);
 
     apr_interval_time_t next_interval;