Changeset e809fb3 in mod_gnutls for src/gnutls_cache.c

Timestamp:

Jun 9, 2016, 7:52:23 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, upstream

Children:

aa68232

Parents:

3e22b82

Message:

Use generic cache functions for OCSP response caching

With this, OCSP stapling works with all supported cache types.

File:

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

src/gnutls_cache.c

@@ -240 +240 @@
 }
 
-int mc_cache_store_generic(server_rec *s, gnutls_datum_t key,
-                           gnutls_datum_t data, apr_time_t expiry)
+static int mc_cache_store_generic(server_rec *s, gnutls_datum_t key,
+                                  gnutls_datum_t data, apr_time_t expiry)
 {
     apr_uint32_t timeout = apr_time_sec(expiry - apr_time_now());
@@ -307 +307 @@
 }
 
-gnutls_datum_t mc_cache_fetch_generic(mgs_handle_t *ctxt, gnutls_datum_t key)
+static gnutls_datum_t mc_cache_fetch_generic(mgs_handle_t *ctxt,
+                                             gnutls_datum_t key)
 {
     gnutls_datum_t data = {NULL, 0};
@@ -434 +435 @@
 }
 
-gnutls_datum_t dbm_cache_fetch(mgs_handle_t *ctxt, gnutls_datum_t key)
+static gnutls_datum_t dbm_cache_fetch(mgs_handle_t *ctxt, gnutls_datum_t key)
 {
     gnutls_datum_t data = {NULL, 0};
@@ -512 +513 @@
 }
 
-int dbm_cache_store(server_rec *s, gnutls_datum_t key,
-                    gnutls_datum_t data, apr_time_t expiry)
+static int dbm_cache_store(server_rec *s, gnutls_datum_t key,
+                           gnutls_datum_t data, apr_time_t expiry)
 {
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
@@ -696 +697 @@
     }
 
-    if (sc->cache_type == mgs_cache_dbm
-            || sc->cache_type == mgs_cache_gdbm) {
+    sc->cache = apr_palloc(p, sizeof(struct mgs_cache));
+    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm)
+    {
+        sc->cache->store = dbm_cache_store;
+        sc->cache->fetch = dbm_cache_fetch;
         return dbm_cache_post_config(p, s, sc);
     }
+#if HAVE_APR_MEMCACHE
+    else if (sc->cache_type == mgs_cache_memcache)
+    {
+        sc->cache->store = mc_cache_store_generic;
+        sc->cache->fetch = mc_cache_fetch_generic;
+    }
+#endif
 
     return APR_SUCCESS;