Implement cleaner logging approach.

[tlsproxy/tlsproxy.git] / src / verify.c

diff --git a/src/verify.c b/src/verify.c
index 14c7127b7c39cd01ad0b9aa0082cb1396b35f6ca..5248dd6cd243dff33609066f3da00c0c3a6bf5ce 100644 (file)
--- a/src/verify.c
+++ b/src/verify.c
@@ -111,6 +111,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
 
     /* Open stored server certificate file. */
     if (0 != server_certificate_path(&file, hostname, path, sizeof(path))) {
+        LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
         return -1;
     }
 
@@ -123,6 +124,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         if (sizeof(stored_cert) <= size) {
             LOG(LOG_WARNING, "verify_tls_connection(): '%s' too big", path);
             fclose(file);
+
+            LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
             return -1;
         }
 
@@ -133,6 +136,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         LOG(LOG_WARNING,
             "verify_tls_connection(): failed to read from '%s': %s",
             path, strerror(errno));
+
+        LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
         return -1;
     }
     fclose(file);
@@ -142,6 +147,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         LOG(LOG_ERROR,
             "verify_tls_connection(): server certificate changed!",
             path, strerror(errno));
+
+        LOG(LOG_WARNING, "server certificate:\n%s", server_cert);
         return -2;
     }
 
@@ -169,9 +176,15 @@ int server_certificate_path(FILE **file, const char *hostname,
     /* Open the stored certificate file. */
     *file = fopen(path, "rb");
     if (NULL == *file) {
-        LOG(global_passthrough_unknown ? LOG_DEBUG : LOG_WARNING,
-            "server_certificate_path(): failed to open '%s': %s",
-            path, strerror(errno));
+        if (global_passthrough_unknown) {
+            LOG(LOG_DEBUG,
+                "server_certificate_path(): failed to open '%s': %s",
+                path, strerror(errno));
+        } else {
+            LOG(LOG_WARNING,
+                "server_certificate_path(): failed to open '%s': %s",
+                path, strerror(errno));
+        }
         /* Couldn't open the file, special case. */
         return -2;
     }