Changeset 08ba205 in mod_gnutls for src/gnutls_ocsp.c

Timestamp:

Jan 11, 2020, 12:59:30 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

1c3853a

Parents:

4e60dd8

Message:

Turn per-vhost OCSP data into an array

Size 1 for now, but it's a required step towards multi-staple.

File:

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

src/gnutls_ocsp.c

@@ -1040 +1040 @@
      * mgs_get_ocsp_response. */
     apr_global_mutex_lock(sc->ocsp_mutex);
-    apr_status_t rv = mgs_cache_ocsp_response(server, sc->ocsp, &expiry);
+    apr_status_t rv = mgs_cache_ocsp_response(server, sc->ocsp[0], &expiry);
 
     apr_interval_time_t next_interval;
@@ -1114 +1114 @@
 
         apr_status_t rv = mgs_cache_fetch(sc->ocsp_cache, server,
-                                          sc->ocsp->fingerprint,
+                                          sc->ocsp[0]->fingerprint,
                                           &ocsp_response,
                                           pool);
@@ -1123 +1123 @@
                          "Caching OCSP request failure for %s:%d.",
                          server->server_hostname, server->addrs->host_port);
-            mgs_cache_ocsp_failure(server, sc->ocsp,
+            mgs_cache_ocsp_failure(server, sc->ocsp[0],
                                    sc->ocsp_failure_timeout * 2);
         }
@@ -1148 +1148 @@
         return "No issuer (CA) certificate available, cannot enable "
             "stapling. Please add it to the GnuTLSCertificateFile.";
+
+    /* array for ocsp data, currently size 1 */
+    sc->ocsp = apr_palloc(pconf, sizeof(mgs_ocsp_data_t));
 
     mgs_ocsp_data_t ocsp = apr_palloc(pconf, sizeof(struct mgs_ocsp_data));
@@ -1182 +1185 @@
                               apr_pool_cleanup_null);
 
-    sc->ocsp = ocsp;
+    sc->ocsp[0] = ocsp;
     return NULL;
 }