Changeset eced11a in mod_gnutls

Timestamp:

May 16, 2018, 1:19:05 PM (5 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

3358887

Parents:

92b5f4d

Message:

Remove server variable ocsp_cache_enable

There is no need to explicitly disable the OCSP cache: It will be used
if OCSP stapling is enabled, and not used otherwise.

Files:

• include/mod_gnutls.h.in (modified) (1 diff)
• src/gnutls_config.c (modified) (2 diffs)
• src/gnutls_hooks.c (modified) (2 diffs)

include/mod_gnutls.h.in

@@ -182 +182 @@
     /* Mutex to prevent parallel OCSP requests */
     apr_global_mutex_t *ocsp_mutex;
-    /* Enable OCSP cache */
-    unsigned char ocsp_cache_enable : 2;
     /* Internal OCSP cache data */
     mgs_cache_t ocsp_cache;

src/gnutls_config.c

@@ -626 +626 @@
     {
         if (enable == GNUTLS_ENABLED_FALSE)
-        {
-            /* TODO: Should this return an error like "use
-             * GnuTLSOCSPStapling off if you want to disable OCSP
-             * stapling"? */
-            sc->ocsp_cache_enable = GNUTLS_ENABLED_FALSE;
-            return NULL;
-        }
-        sc->ocsp_cache_enable = GNUTLS_ENABLED_TRUE;
+            return "\"GnuTLSOCSPCache none\" is invalid, use "
+                "\"GnuTLSOCSPStapling off\" if you want to disable "
+                "OCSP stapling.";
         cache = &sc->ocsp_cache;
     }
@@ -907 +902 @@
     sc->ocsp_response_file = NULL;
     sc->ocsp_mutex = NULL;
-    sc->ocsp_cache_enable = GNUTLS_ENABLED_UNSET;
     sc->ocsp_cache = NULL;
     sc->ocsp_cache_time = MGS_TIMEOUT_UNSET;

src/gnutls_hooks.c

@@ -635 +635 @@
         if (sc->cache_timeout == MGS_TIMEOUT_UNSET)
             sc->cache_timeout = sc_base->cache_timeout;
-        sc->ocsp_cache_enable = sc_base->ocsp_cache_enable;
         sc->ocsp_cache = sc_base->ocsp_cache;
 
@@ -787 +786 @@
     }
 
-    if (sc->ocsp_cache_enable == GNUTLS_ENABLED_TRUE)
+    if (sc->ocsp_cache != NULL)
     {
         rv = mgs_cache_child_init(p, s, sc->ocsp_cache,