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 30de37e5d34b8dbd5622bcd2b15d37b2b0baa726..222748c0c7c22d422dda05a4f1312bc65dda6c28 100644 (file)
--- 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 a40ec13857af4ca4adc00a26f2c0f3026404e7a3..d4e88d74772dd4672584a7e291984b31d5ae13d0 100644 (file)
--- 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;
   }
 }