Changeset 46de753 in mod_gnutls for src

Timestamp:

Dec 8, 2013, 12:55:08 PM (6 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

ba7d1c5

Parents:

ac32bb5

Message:

fix build against GnuTLS 2.12.x

File:

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

src/gnutls_hooks.c

@@ -1531 +1531 @@
     if (sc->enabled != GNUTLS_ENABLED_FALSE) {
         mgs_handle_t* ctxt;
-        char* z = NULL;
         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
+            char* z = NULL;
             z = gnutls_session_get_desc(ctxt->session);
             if (z) {
@@ -1539 +1545 @@
                 gnutls_free(z);
             }
+#endif
         }
     }