Changeset 08c48d7 in mod_gnutls

Timestamp:

Jan 2, 2019, 3:22:48 PM (3 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master

Children:

4d38cbd

Parents:

c7710cf

Message:

Extract code for turning APR array of strings into gnutls_datum_t array

Having it as a separate function will allow sharing the code between
server and client (proxy) side ALPN proposal handling.

Location:

src

Files:

• gnutls_hooks.c (modified) (1 diff)
• gnutls_util.c (modified) (1 diff)
• gnutls_util.h (modified) (1 diff)

src/gnutls_hooks.c

@@ -198 +198 @@
                   apr_array_pstrcat(ctxt->c->pool, pupgrades, ','));
     gnutls_datum_t *alpn_protos =
-        apr_palloc(ctxt->c->pool,
-                   (pupgrades->nelts + 1) * sizeof(gnutls_datum_t));
-    for (int i = 0; i < pupgrades->nelts; i++)
-    {
-        alpn_protos[i].data = (void *) APR_ARRAY_IDX(pupgrades, i, char *);
-        alpn_protos[i].size =
-            strnlen(APR_ARRAY_IDX(pupgrades, i, char *),
-                    pupgrades->elt_size);
-    }
+        mgs_str_array_to_datum_array(pupgrades,
+                                     ctxt->c->pool,
+                                     pupgrades->nelts + 1);
 
     /* Add the current (default) protocol at the end of the list */

src/gnutls_util.c

@@ -182 +182 @@
     gnutls_priority_deinit(default_prio);
 }
+
+
+
+gnutls_datum_t * mgs_str_array_to_datum_array(const apr_array_header_t *src,
+                                              apr_pool_t *pool,
+                                              const int min_elements)
+{
+    int num = min_elements > src->nelts ? min_elements : src->nelts;
+    gnutls_datum_t *dest = apr_palloc(pool, num * sizeof(gnutls_datum_t));
+    for (int i = 0; i < src->nelts; i++)
+    {
+        dest[i].data = (void *) APR_ARRAY_IDX(src, i, char *);
+        dest[i].size = strlen(APR_ARRAY_IDX(src, i, char *));
+    }
+    return dest;
+}

src/gnutls_util.h

@@ -96 +96 @@
 void mgs_default_priority_deinit();
 
+/**
+ * Create a shallow copy of an APR array of `char *` into a new array
+ * of gnutls_datum_t, filling `size` via `strlen()`. "Shallow copy"
+ * means that the strings themselves are not copied, just the pointers
+ * to them.
+ *
+ * @param src array to copy
+ * @param pool allocate memory for the new array
+ * @param min_elements allocate room for at least this many elements
+ *
+ * @return pointer to the first element of the new array
+ */
+gnutls_datum_t * mgs_str_array_to_datum_array(const apr_array_header_t *src,
+                                              apr_pool_t *pool,
+                                              const int min_elements);
+
 #endif /* __MOD_GNUTLS_UTIL_H__ */