Changeset 2b1b52f in mod_gnutls

Timestamp:

Jun 5, 2020, 1:51:37 PM (4 weeks ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

641d11b

Parents:

cb1d852

Message:

Actually use the computed socache key in socache_delete_session()

We rely on the socache expiration rather than GnuTLS deleting cache
entries, so this function was likely never called, but if it was it
would have failed because it used the raw session ID provided by
GnuTLS rather than the derived key mod_gnutls uses for store and
fetch.

File:

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

src/gnutls_cache.c

@@ -282 +282 @@
 static int socache_delete_session(void *baton, gnutls_datum_t key)
 {
-    gnutls_datum_t tmpkey;
+    gnutls_datum_t dbmkey;
     mgs_handle_t *ctxt = baton;
 
-    if (mgs_session_id2dbm(ctxt->c, key.data, key.size, &tmpkey) < 0)
+    if (mgs_session_id2dbm(ctxt->c, key.data, key.size, &dbmkey) < 0)
         return -1;
 
@@ -292 +292 @@
     apr_status_t rv = ctxt->sc->cache->prov->remove(ctxt->sc->cache->socache,
                                                     ctxt->c->base_server,
-                                                    key.data, key.size,
+                                                    dbmkey.data, dbmkey.size,
                                                     ctxt->c->pool);
     if (ctxt->sc->cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)