Changeset 15245bf in mod_gnutls

Timestamp:

Jun 5, 2016, 3:42:31 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

6814e48

Parents:

1d1361f

git-author:

Thomas Klute <thomas2.klute@…> (06/04/16 21:41:33)

git-committer:

Thomas Klute <thomas2.klute@…> (06/05/16 15:42:31)

Message:

Split dbm_cache_fetch() in generic and GnuTLS session specific parts

Like with dbm_cache_store(), a new wrapper function takes care of
session key calculation. This change will make it possible to use the
generic dbm_cache_fetch() for OCSP response caching.

File:

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

src/gnutls_cache.c

@@ -375 +375 @@
 }
 
-static gnutls_datum_t dbm_cache_fetch(void *baton, gnutls_datum_t key) {
+static gnutls_datum_t dbm_cache_fetch(mgs_handle_t *ctxt, apr_datum_t key)
+{
     gnutls_datum_t data = {NULL, 0};
     apr_dbm_t *dbm;
-    apr_datum_t dbmkey;
     apr_datum_t dbmval;
-    mgs_handle_t *ctxt = baton;
     apr_status_t rv;
-
-    if (mgs_session_id2dbm(ctxt->c, key.data, key.size, &dbmkey) < 0)
-        return data;
 
     rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc),
@@ -390 +386 @@
             SSL_DBM_FILE_MODE, ctxt->c->pool);
     if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_NOTICE, rv,
-                ctxt->c->base_server,
-                "[gnutls_cache] error opening cache '%s'",
-                ctxt->sc->cache_config);
-        return data;
-    }
-
-    rv = apr_dbm_fetch(dbm, dbmkey, &dbmval);
+        ap_log_cerror(APLOG_MARK, APLOG_NOTICE, rv, ctxt->c,
+                      "error opening cache '%s'",
+                      ctxt->sc->cache_config);
+        return data;
+    }
+
+    rv = apr_dbm_fetch(dbm, key, &dbmval);
 
     if (rv != APR_SUCCESS) {
@@ -419 +414 @@
     }
 
+    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, rv, ctxt->c,
+                  "fetched %ld bytes from cache",
+                  dbmval.dsize);
+
     memcpy(data.data, dbmval.dptr + sizeof (apr_time_t), data.size);
 
@@ -425 +424 @@
 
     return data;
+}
+
+static gnutls_datum_t dbm_cache_fetch_session(void *baton,
+                                              gnutls_datum_t key)
+{
+    gnutls_datum_t data = {NULL, 0};
+    apr_datum_t dbmkey;
+    mgs_handle_t *ctxt = baton;
+
+    if (mgs_session_id2dbm(ctxt->c, key.data, key.size, &dbmkey) < 0)
+        return data;
+
+    return dbm_cache_fetch(ctxt, dbmkey);
 }
 
@@ -623 +635 @@
             || ctxt->sc->cache_type == mgs_cache_gdbm) {
         gnutls_db_set_retrieve_function(ctxt->session,
-                dbm_cache_fetch);
+                dbm_cache_fetch_session);
         gnutls_db_set_remove_function(ctxt->session,
                 dbm_cache_delete);