From: Pierre Ossman <ossman@cendio.se>
Date: Tue, 28 Oct 2014 15:59:58 +0000 (+0100)
Subject: Remove verbose TLS logging
X-Git-Tag: v1.3.90~18^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=800a35ccdd4025d4005206cb67154d010744cd0b;p=tigervnc.git

Remove verbose TLS logging

We don't even log this much for RFB protocol stuff, and it makes
it very annoying to run with full debugging on.
---

diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx
index 30de37e5..222748c0 100644
--- a/common/rfb/CSecurityTLS.cxx
+++ b/common/rfb/CSecurityTLS.cxx
@@ -67,12 +67,6 @@ StringParameter CSecurityTLS::X509CA("X509CA", "X509 CA certificate", "", ConfVi
 StringParameter CSecurityTLS::X509CRL("X509CRL", "X509 CRL file", "", ConfViewer);
 
 static LogWriter vlog("TLS");
-static LogWriter vlog_raw("RawTLS");
-
-static void debug_log(int level, const char* str)
-{
-  vlog_raw.debug("[%d]: %s", level, str);
-}
 
 void CSecurityTLS::initGlobal()
 {
@@ -80,13 +74,6 @@ void CSecurityTLS::initGlobal()
 
   if (!globalInitDone) {
     gnutls_global_init();
-
-    /* 100 means debug log */
-    if (vlog_raw.getLevel() >= 100) {
-      gnutls_global_set_log_level(10);
-      gnutls_global_set_log_function(debug_log);
-    }
-
     globalInitDone = true;
   }
 }
diff --git a/common/rfb/SSecurityTLS.cxx b/common/rfb/SSecurityTLS.cxx
index a40ec138..d4e88d74 100644
--- a/common/rfb/SSecurityTLS.cxx
+++ b/common/rfb/SSecurityTLS.cxx
@@ -45,12 +45,6 @@ StringParameter SSecurityTLS::X509_KeyFile
 ("X509Key", "Path to the key of the X509 certificate in PEM format", "", ConfServer);
 
 static LogWriter vlog("TLS");
-static LogWriter vlog_raw("RawTLS");
-
-static void debug_log(int level, const char* str)
-{
-  vlog.debug("[%d]: %s", level, str);
-}
 
 void SSecurityTLS::initGlobal()
 {
@@ -59,13 +53,6 @@ void SSecurityTLS::initGlobal()
   if (!globalInitDone) {
     if (gnutls_global_init() != GNUTLS_E_SUCCESS)
       throw AuthFailureException("gnutls_global_init failed");
-
-    /* 100 means debug log */
-    if (vlog_raw.getLevel() >= 100) {
-      gnutls_global_set_log_level(10);
-      gnutls_global_set_log_function(debug_log);
-    }
-
     globalInitDone = true;
   }
 }