Changeset 600cf16 in mod_gnutls for src

Timestamp:

Jan 27, 2016, 1:35:28 AM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

bc539d5

Parents:

c3bee83

Message:

mgs_status_hook: Remove code for GnuTLS versions < 3

mod_gnutls requires GnuTLS 3.1.4 or newer since version 0.7, so
keeping this code around is unnecessary.

File:

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

src/gnutls_hooks.c

@@ -1675 +1675 @@
         mgs_handle_t* ctxt;
         ctxt = ap_get_module_config(r->connection->conn_config, &gnutls_module);
-        if (ctxt && ctxt->session != NULL) {
-#if GNUTLS_VERSION_MAJOR < 3
-            ap_rprintf(r, "<dt>This TLS Session:</dt><dd>%s</dd>\n",
-                gnutls_cipher_suite_get_name(gnutls_kx_get(ctxt->session),
-                gnutls_cipher_get(ctxt->session),
-                gnutls_mac_get(ctxt->session)));
-#else
+        if (ctxt && ctxt->session != NULL)
+        {
             char* z = NULL;
             z = gnutls_session_get_desc(ctxt->session);
@@ -1688 +1683 @@
                 gnutls_free(z);
             }
-#endif
         }
     }