Changeset 0fcba60 in mod_gnutls

Timestamp:

Dec 17, 2018, 1:05:51 PM (22 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

68b5156

Parents:

f674424

git-author:

Fiona Klute <fiona.klute@…> (12/17/18 13:02:43)

git-committer:

Fiona Klute <fiona.klute@…> (12/17/18 13:05:51)

Message:

Move compiled default priorities to gnutls_util.[hc]

Location:

src

Files:

• gnutls_hooks.c (modified) (6 diffs)
• gnutls_util.c (modified) (2 diffs)
• gnutls_util.h (modified) (2 diffs)

src/gnutls_hooks.c

@@ -58 +58 @@
 
 
-/** Default GnuTLS priority string for mod_gnutls */
-#define MGS_DEFAULT_PRIORITY "NORMAL"
-/** Compiled version of MGS_DEFAULT_PRIORITY (initialized in the
- * pre_config hook) */
-static gnutls_priority_t default_prio;
-
 
 static int mgs_cert_verify(request_rec * r, mgs_handle_t * ctxt);
@@ -88 +82 @@
 
     /* Deinit default priority setting */
-    gnutls_priority_deinit(default_prio);
+    mgs_default_priority_deinit();
     return APR_SUCCESS;
 }
@@ -143 +137 @@
 
     /* Initialize default priority setting */
-    ret = gnutls_priority_init(&default_prio, MGS_DEFAULT_PRIORITY, NULL);
+    ret = mgs_default_priority_init();
     if (ret < 0)
     {
@@ -731 +725 @@
                          s->server_hostname, s->addrs->host_port,
                          MGS_DEFAULT_PRIORITY);
-            sc->priorities = default_prio;
+            sc->priorities = mgs_get_default_prio();
         }
 
@@ -1181 +1175 @@
 
     /* Set Default Priority */
-        err = gnutls_priority_set(ctxt->session, default_prio);
+        err = gnutls_priority_set(ctxt->session, mgs_get_default_prio());
     if (err != GNUTLS_E_SUCCESS)
         ap_log_cerror(APLOG_MARK, APLOG_ERR, err, c,
@@ -2232 +2226 @@
                      s->server_hostname, s->addrs->host_port,
                      MGS_DEFAULT_PRIORITY);
-        sc->proxy_priorities = default_prio;
+        sc->proxy_priorities = mgs_get_default_prio();
     }
     else

src/gnutls_util.c

@@ -19 +19 @@
 #include <apr_strings.h>
 #include <gnutls/gnutls.h>
+
+
+
+/** Compiled version of MGS_DEFAULT_PRIORITY, must be initialized
+ * using mgs_default_priority_init() in the pre_config hook and
+ * deinitialized in the matching pool cleanup hook. */
+static gnutls_priority_t default_prio;
+
 
 
@@ -153 +161 @@
     return ctxt;
 }
+
+
+
+int mgs_default_priority_init()
+{
+    return gnutls_priority_init(&default_prio, MGS_DEFAULT_PRIORITY, NULL);
+}
+
+
+
+gnutls_priority_t mgs_get_default_prio()
+{
+    return default_prio;
+}
+
+
+
+void mgs_default_priority_deinit()
+{
+    gnutls_priority_deinit(default_prio);
+}

src/gnutls_util.h

@@ -25 +25 @@
 #ifndef __MOD_GNUTLS_UTIL_H__
 #define __MOD_GNUTLS_UTIL_H__
+
+/** Default GnuTLS priority string for mod_gnutls */
+#define MGS_DEFAULT_PRIORITY "NORMAL"
 
 /** maximum allowed length of one header line */
@@ -74 +77 @@
 mgs_handle_t *init_gnutls_ctxt(conn_rec *c);
 
+/**
+ * Initialize the global default priorities, must be called by the
+ * pre_config hook
+ *
+ * @return `GNUTLS_E_SUCCESS` or a GnuTLS error code
+ */
+int mgs_default_priority_init();
+
+/**
+ * Get the global default priorities
+ */
+gnutls_priority_t mgs_get_default_prio();
+
+/**
+ * Deinitialize the global default priorities, must be in the cleanup
+ * hook of the pre_config pool.
+ */
+void mgs_default_priority_deinit();
+
 #endif /* __MOD_GNUTLS_UTIL_H__ */