[taler-merchant] branch master updated: refactor to latest libgnunetcurl

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new c79a628  refactor to latest libgnunetcurl
c79a628 is described below

commit c79a628348e87906d94401f74c702a3acebb0137
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Mar 15 22:07:57 2020 +0100

    refactor to latest libgnunetcurl
---
 src/backend/taler-merchant-httpd.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 6e87c6d..b47413c 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -167,24 +167,6 @@ struct GNUNET_SCHEDULER_Task *resume_timeout_task;
 static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 
-/**
- * Return #GNUNET_YES if given a valid correlation ID and
- * #GNUNET_NO otherwise.
- *
- * @returns #GNUNET_YES iff given a valid correlation ID
- */
-static int
-is_valid_correlation_id (const char *correlation_id)
-{
-  if (strlen (correlation_id) >= 64)
-    return GNUNET_NO;
-  for (size_t i = 0; i < strlen (correlation_id); i++)
-    if (! (isalnum (correlation_id[i]) || (correlation_id[i] == '-')))
-      return GNUNET_NO;
-  return GNUNET_YES;
-}
-
-
 /**
  * Callback that frees all the elements in the hashmap
  *
@@ -1340,7 +1322,7 @@ url_handler (void *cls,
                                                   MHD_HEADER_KIND,
                                                   "Taler-Correlation-Id");
     if ((NULL != correlation_id) &&
-        (GNUNET_YES != is_valid_correlation_id (correlation_id)))
+        (GNUNET_YES != GNUNET_CURL_is_valid_scope_id (correlation_id)))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "illegal incoming correlation ID\n");

-- 
To stop receiving notification emails like this one, please contact
address@hidden.