Ticket #911: 0001-Add-tls_cipher_list_for_each-helper-function.patch

src/openvpn/ssl.c

@@ -1887 +1887 @@
     }
 }
 
-bool
-tls_item_in_cipher_list(const char *item, const char *list)
+
+/**
+ * Function prototype to use with tls_cipher_list_for_each.
+ *
+ * @param ciphername    The current cipher name.
+ * @param ctx           The function context.
+ *
+ * @return true stops iterating.
+ */
+typedef bool (*foreach_func)(const char *ciphername, void *ctx);
+
+/**
+ * Call func for each item in colon-separated list.
+ */
+static void
+tls_cipher_list_for_each(const char *list, foreach_func func, void *func_ctx)
 {
     char *tmp_ciphers = string_alloc(list, NULL);
     char *tmp_ciphers_orig = tmp_ciphers;
@@ -1896 +1910 @@
     const char *token = strtok(tmp_ciphers, ":");
     while (token)
     {
-        if (0 == strcmp(token, item))
+        if (func(token, func_ctx))
         {
             break;
         }
         token = strtok(NULL, ":");
     }
     free(tmp_ciphers_orig);
+}
+
+struct cipher_equal_ctx {
+    const char *match;
+    bool found;
+};
+static bool cipher_equal(const char *ciphername, void *vctx)
+{
+    struct cipher_equal_ctx *ctx = vctx;
+    ctx->found = 0 == strcmp(ciphername, ctx->match);
+    return ctx->found;
+}
+
+bool
+tls_item_in_cipher_list(const char *item, const char *list)
+{
+    struct cipher_equal_ctx ctx = (struct cipher_equal_ctx) {
+        .match = item,
+        .found = false,
+    };
+
+    tls_cipher_list_for_each(list, cipher_equal, &ctx);
 
-    return token != NULL;
+    return ctx.found;
 }
 
 void