verify.c: Reorder validation checks.

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

diff --git a/src/verify.c b/src/verify.c
index 34a081493e81b1a41ef044ff69dffb77d2c8ef99..b6f1ff845aab14bb7a55c8d7106d8e09f63c1804 100644 (file)
--- a/src/verify.c
+++ b/src/verify.c
@@ -55,10 +55,11 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         return -1;
     }
     /* Definitely an invalid certificate, abort. */
-    if (status & GNUTLS_CERT_EXPIRED
-            || status & GNUTLS_CERT_REVOKED
+    if (status & GNUTLS_CERT_REVOKED
+            || status & GNUTLS_CERT_INSECURE_ALGORITHM
             || status & GNUTLS_CERT_NOT_ACTIVATED
-            || status & GNUTLS_CERT_INSECURE_ALGORITHM) {
+            || status & GNUTLS_CERT_EXPIRED
+            ) {
         LOG(WARNING, "verify_tls_connection(): invalid server certificate");
         return -1;
     }
@@ -115,7 +116,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
 
     /* Open stored server certificate file. */
     if (server_certificate_file(&file, hostname, path, sizeof(path)) != 0) {
-        LOG(DEBUG, "server certificate:\n%s", server_cert);
+        LOG(DEBUG1, "server certificate:\n%s", server_cert);
         return -1;
     }
 
@@ -129,7 +130,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
             LOG(WARNING, "verify_tls_connection(): '%s' too big", path);
             fclose(file);
 
-            LOG(DEBUG, "server certificate:\n%s", server_cert);
+            LOG(DEBUG1, "server certificate:\n%s", server_cert);
             return -1;
         }
 
@@ -140,7 +141,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
                      path, strerror(errno));
         fclose(file);
 
-        LOG(DEBUG, "server certificate:\n%s", server_cert);
+        LOG(DEBUG1, "server certificate:\n%s", server_cert);
         return -1;
     }
     fclose(file);
@@ -220,8 +221,8 @@ int server_certificate_file(FILE **file, const char *hostname,
     *file = fopen(path, "rb");
     if (*file == NULL) {
         if (global_passthrough_unknown) {
-            LOG(DEBUG, "server_certificate_file(): failed to open '%s': %s",
-                       path, strerror(errno));
+            LOG(DEBUG1, "server_certificate_file(): failed to open '%s': %s",
+                        path, strerror(errno));
         } else {
             LOG(WARNING, "server_certificate_file(): failed to open '%s': %s",
                          path, strerror(errno));