Changeset 92ac36e in mod_gnutls

Timestamp:

Jun 27, 2017, 1:02:55 PM (6 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, main, master, proxy-ticket, upstream

Children:

a2b4ab6

Parents:

439005a

Message:

Remove dead code in DH parameters setup

The dh_params variable in mgs_hook_post_config was initialized to NULL
and never changed, so the "if(dh_params)" branch was never taken.

File:

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

src/gnutls_hooks.c

@@ -328 +328 @@
     int rv;
     server_rec *s;
-    gnutls_dh_params_t dh_params = NULL;
     mgs_srvconf_rec *sc;
     mgs_srvconf_rec *sc_base;
@@ -438 +437 @@
         }
 
-        /* Check if DH params have been set per host */
+        /* Set host DH params */
         if (sc->dh_params != NULL) {
             gnutls_certificate_set_dh_params(sc->certs, sc->dh_params);
             gnutls_anon_set_server_dh_params(sc->anon_creds, sc->dh_params);
-        } else if (dh_params) {
-            gnutls_certificate_set_dh_params(sc->certs, dh_params);
-            gnutls_anon_set_server_dh_params(sc->anon_creds, dh_params);
         }