Changeset bac1a32 in mod_gnutls for src

Timestamp:

Sep 30, 2018, 2:10:42 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

1a3068c

Parents:

fdd3bf0

Message:

Order, log message, and style fixes

Location:

src

Files:

• gnutls_hooks.c (modified) (2 diffs)
• gnutls_io.c (modified) (1 diff)
• gnutls_ocsp.c (modified) (1 diff)

src/gnutls_hooks.c

@@ -603 +603 @@
         sc->singleton_wd = sc_base->singleton_wd;
 
-        rv = mgs_load_files(pconf, ptemp, s);
-        if (rv != 0) {
-            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
-                "GnuTLS: Loading required files failed."
-                " Shutting Down.");
-            return HTTP_NOT_FOUND;
-        }
-
         /* defaults for unset values: */
         if (sc->enabled == GNUTLS_ENABLED_UNSET)
@@ -629 +621 @@
             sc->client_verify_method = mgs_cvm_cartel;
 
-        // TODO: None of the stuff below (and neither some above)
-        // makes sense if sc->enabled == GNUTLS_ENABLED_FALSE, we
-        // should just continue to the next host. All code below could
-        // then safely assume sc->enabled == GNUTLS_ENABLED_TRUE.
+        // TODO: None of the stuff below needs to be done if
+        // sc->enabled == GNUTLS_ENABLED_FALSE, we could just continue
+        // to the next host.
+
+        /* Load certificates and stuff (includes parsing priority) */
+        rv = mgs_load_files(pconf, ptemp, s);
+        if (rv != 0) {
+            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
+                         "%s: Loading credentials failed!", __func__);
+            return HTTP_NOT_FOUND;
+        }
 
         sc->ocsp_mutex = sc_base->ocsp_mutex;

src/gnutls_io.c

@@ -3 +3 @@
  *  Copyright 2008 Nikos Mavrogiannopoulos
  *  Copyright 2011 Dash Shendy
- *  Copyright 2015-2017 Fiona Klute
+ *  Copyright 2015-2018 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

src/gnutls_ocsp.c

@@ -1179 +1179 @@
     sc->ocsp->trust = apr_palloc(pconf,
                                  sizeof(gnutls_x509_trust_list_t));
-     /* Only the direct issuer may sign the OCSP response or an OCSP
-      * signer. */
+    /* Only the direct issuer may sign the OCSP response or an OCSP
+     * signer. */
     int ret = mgs_create_ocsp_trust_list(sc->ocsp->trust,
                                          &(sc->certs_x509_crt_chain[1]),