Changeset 316bd8c in mod_gnutls

Timestamp:

Apr 21, 2005, 9:29:13 PM (18 years ago)

Author:

Paul Querna <chip@…>

Branches:

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

Children:

46b85d8

Parents:

e924ddd

Message:

• remove more debug logging.
• fix a crash by changing the certificate structure *after* starting the handshake.

Location:

src

Files:

• gnutls_cache.c (modified) (1 diff)
• gnutls_io.c (modified) (1 diff)
• mod_gnutls.c (modified) (4 diffs)

src/gnutls_cache.c

@@ -210 +210 @@
 
     if (rv != APR_SUCCESS) {
+#if MOD_GNUTLS_DEBUG
         ap_log_error(APLOG_MARK, APLOG_DEBUG, rv,
                      ctxt->c->base_server,
                      "[gnutls_cache] error fetching key '%s' ",
                      strkey);
-
+#endif
         data.size = 0;
         data.data = NULL;

src/gnutls_io.c

@@ -382 +382 @@
             goto tryagain;
         }
-
+#if USING_2_1_RECENT
+        ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, ctxt->c,
+                     "GnuTLS: Handshake Failed (%d) '%s'", ret,
+                      gnutls_strerror(ret));
+#else
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctxt->c->base_server,
                      "GnuTLS: Handshake Failed (%d) '%s'", ret,
-                      gnutls_strerror(ret));
+                     gnutls_strerror(ret));
+#endif
         ctxt->status = -1;
         gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 

src/mod_gnutls.c

@@ -295 +295 @@
 static void mod_gnutls_changed_servers(mod_gnutls_handle_t *ctxt)
 {
-    gnutls_credentials_set(ctxt->session, GNUTLS_CRD_CERTIFICATE, ctxt->sc->certs);
     gnutls_certificate_server_set_request(ctxt->session, ctxt->sc->client_verify_mode);
 }
@@ -480 +479 @@
 
     mod_gnutls_cache_session_init(ctxt);
+    
+    gnutls_credentials_set(ctxt->session, GNUTLS_CRD_CERTIFICATE, ctxt->sc->certs);
 
     gnutls_certificate_server_set_retrieve_function(sc->certs, cert_retrieve_fn);
-
+    
     mod_gnutls_changed_servers(ctxt);
     return ctxt;
@@ -839 +840 @@
     if (dc->client_verify_mode == GNUTLS_CERT_IGNORE) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
-                      "GnuTLS: Ignoring Client Certificate!");
+                      "GnuTLS: Directory set to Ignore Client Certificate!");
         return DECLINED;
     }
@@ -856 +857 @@
     }
     else if (ctxt->sc->client_verify_mode == GNUTLS_CERT_IGNORE) {
+#if MOD_GNUTLS_DEBUG
         ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
                       "GnuTLS: Peer is set to IGNORE");
+#endif
         return DECLINED;
     }