Changeset d036f96 in mod_gnutls

Timestamp:

May 8, 2018, 3:04:41 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

babdb29

Parents:

13870b7

Message:

Add configuration directive GnuTLSOCSPCache (no-op for now)

First step to a separate cache for OCSP data.

Files:

• src/gnutls_config.c (modified) (2 diffs)
• src/mod_gnutls.c (modified) (2 diffs)
• test/tests/27_OCSP_server/apache.conf (modified) (1 diff)

src/gnutls_config.c

@@ -592 +592 @@
         return err;
 
+    unsigned char enable = GNUTLS_ENABLED_TRUE;
     /* none: disable cache */
     if (strcasecmp("none", type) == 0)
-    {
-        sc->cache_enable = GNUTLS_ENABLED_FALSE;
-        return NULL;
-    }
-
-    sc->cache_enable = GNUTLS_ENABLED_TRUE;
+        enable = GNUTLS_ENABLED_FALSE;
 
     /* Try to split socache "type:config" style configuration */
@@ -615 +611 @@
     }
 
-    return mgs_cache_inst_config(&sc->cache, parms->server,
+    mgs_cache_t *cache = NULL;
+    /* parms->directive->directive contains the directive string */
+    if (!strcasecmp(parms->directive->directive, "GnuTLSCache"))
+    {
+        if (enable == GNUTLS_ENABLED_FALSE)
+        {
+            sc->cache_enable = GNUTLS_ENABLED_FALSE;
+            return NULL;
+        }
+        sc->cache_enable = GNUTLS_ENABLED_TRUE;
+        cache = &sc->cache;
+    }
+    else if (!strcasecmp(parms->directive->directive, "GnuTLSOCSPCache"))
+    {
+        // TODO
+        return NULL;
+    }
+    else
+        return apr_psprintf(parms->temp_pool, "Internal Error: %s "
+                            "called for unknown directive %s",
+                            __func__, parms->directive->directive);
+
+    return mgs_cache_inst_config(cache, parms->server,
                                  type, arg,
                                  parms->pool, parms->temp_pool);

src/mod_gnutls.c

@@ -319 +319 @@
     NULL,
     RSRC_CONF,
-    "Cache Configuration"),
+    "Session Cache Configuration"),
     AP_INIT_FLAG("GnuTLSSessionTickets", mgs_set_tickets,
     NULL,
@@ -365 +365 @@
                  "Regularly refresh cached OCSP response independent "
                  "of TLS handshakes?"),
+    AP_INIT_TAKE12("GnuTLSOCSPCache", mgs_set_cache,
+                   NULL,
+                   RSRC_CONF,
+                  "OCSP Cache Configuration"),
     AP_INIT_FLAG("GnuTLSOCSPCheckNonce", mgs_set_ocsp_check_nonce,
                  NULL, RSRC_CONF,

test/tests/27_OCSP_server/apache.conf

@@ -1 +1 @@
 Include ${srcdir}/base_apache.conf
 GnuTLSCache ${DEFAULT_CACHE}
+GnuTLSOCSPCache shmcb
 
 <VirtualHost _default_:${TEST_PORT}>