Changeset 556783e in mod_gnutls for src/gnutls_cache.c

Timestamp:

Jul 24, 2019, 2:29:40 AM (9 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

e376ed8

Parents:

81018a4

Message:

Provide OCSP response via gnutls_certificate_retrieve_function3 callback

This replaces the old OCSP callback function, which is still used
internally.

File:

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

src/gnutls_cache.c

@@ -175 +175 @@
 #define SOCACHE_FETCH_BUF_SIZE (8 * 1024)
 
-gnutls_datum_t mgs_cache_fetch(mgs_cache_t cache, server_rec *server,
-                               gnutls_datum_t key, apr_pool_t *pool)
-{
-    gnutls_datum_t data = {NULL, 0};
-    data.data = gnutls_malloc(SOCACHE_FETCH_BUF_SIZE);
-    if (data.data == NULL)
-        return data;
-    data.size = SOCACHE_FETCH_BUF_SIZE;
-
+apr_status_t mgs_cache_fetch(mgs_cache_t cache, server_rec *server,
+                             gnutls_datum_t key, gnutls_datum_t *output,
+                             apr_pool_t *pool)
+{
     apr_pool_t *spool;
     apr_pool_create(&spool, pool);
@@ -191 +186 @@
     apr_status_t rv = cache->prov->retrieve(cache->socache, server,
                                             key.data, key.size,
-                                            data.data, &data.size,
+                                            output->data, &output->size,
                                             spool);
     if (cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
@@ -207 +202 @@
                          "error fetching from cache '%s:%s'",
                          cache->prov->name, cache->config);
+    }
+    else
+    {
+        ap_log_error(APLOG_MARK, APLOG_TRACE1, rv, server,
+                     "fetched %u bytes from cache '%s:%s'",
+                     output->size, cache->prov->name, cache->config);
+    }
+    apr_pool_destroy(spool);
+
+    return rv;
+}
+
+
+
+/**
+ * Fetch function for the GnuTLS session cache, see
+ * gnutls_db_set_retrieve_function().
+ *
+ * *Warning*: The `data` element of the returned `gnutls_datum_t` is
+ * allocated using `gnutls_malloc()` for compatibility with the GnuTLS
+ * session caching API, and must be released using `gnutls_free()`.
+ *
+ * @param baton mgs_handle_t for the connection, as set via
+ * gnutls_db_set_ptr()
+ *
+ * @param key object key to fetch
+ *
+ * @return the requested cache entry, or `{NULL, 0}`
+ */
+static gnutls_datum_t socache_fetch_session(void *baton, gnutls_datum_t key)
+{
+    gnutls_datum_t data = {NULL, 0};
+    gnutls_datum_t dbmkey;
+    mgs_handle_t *ctxt = baton;
+
+    if (mgs_session_id2dbm(ctxt->c, key.data, key.size, &dbmkey) < 0)
+        return data;
+
+    data.data = gnutls_malloc(SOCACHE_FETCH_BUF_SIZE);
+    if (data.data == NULL)
+        return data;
+    data.size = SOCACHE_FETCH_BUF_SIZE;
+
+    apr_status_t rv = mgs_cache_fetch(ctxt->sc->cache, ctxt->c->base_server,
+                                      dbmkey, &data, ctxt->c->pool);
+
+    if (rv != APR_SUCCESS)
+    {
         /* free unused buffer */
         gnutls_free(data.data);
@@ -214 +257 @@
     else
     {
-        ap_log_error(APLOG_MARK, APLOG_TRACE1, rv, server,
-                     "fetched %u bytes from cache '%s:%s'",
-                     data.size, cache->prov->name, cache->config);
-
         /* Realloc buffer to data.size. Data size must be less than or
          * equal to the initial buffer size, so this REALLY should not
@@ -224 +263 @@
         if (__builtin_expect(data.data == NULL, 0))
         {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, APR_ENOMEM, server,
+            ap_log_cerror(APLOG_MARK, APLOG_CRIT, APR_ENOMEM, ctxt->c,
                          "%s: Could not realloc fetch buffer to data size!",
                          __func__);
@@ -230 +269 @@
         }
     }
-    apr_pool_destroy(spool);
 
     return data;
-}
-
-
-
-/**
- * Fetch function for the GnuTLS session cache, see
- * gnutls_db_set_retrieve_function().
- *
- * *Warning*: The `data` element of the returned `gnutls_datum_t` is
- * allocated using `gnutls_malloc()` for compatibility with the GnuTLS
- * session caching API, and must be released using `gnutls_free()`.
- *
- * @param baton mgs_handle_t for the connection, as set via
- * gnutls_db_set_ptr()
- *
- * @param key object key to fetch
- *
- * @return the requested cache entry, or `{NULL, 0}`
- */
-static gnutls_datum_t socache_fetch_session(void *baton, gnutls_datum_t key)
-{
-    gnutls_datum_t data = {NULL, 0};
-    gnutls_datum_t dbmkey;
-    mgs_handle_t *ctxt = baton;
-
-    if (mgs_session_id2dbm(ctxt->c, key.data, key.size, &dbmkey) < 0)
-        return data;
-
-    return mgs_cache_fetch(ctxt->sc->cache, ctxt->c->base_server,
-                           dbmkey, ctxt->c->pool);
 }