-strengthen payto validation logic

2 files changed, 13 insertions, 13 deletions

diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index ea621cea6..bc21957e8 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -523,19 +523,6 @@ TALER_JSON_exchange_wire_signature_check (
 
 
 /**
- * Validate payto:// account URL (only account information,
- * wire subject and amount are ignored).
- *
- * @param payto_uri URL to parse
- * @return #GNUNET_YES if @a payto_uri is a valid payto://iban URI
- *         #GNUNET_NO if @a payto_uri  is a payto URI of an unsupported type (but may be valid)
- *         #GNUNET_SYSERR if the account incorrect or this is not a payto://-URI at all
- */
-enum GNUNET_GenericReturnValue
-TALER_JSON_validate_payto (const char *payto_uri);
-
-
-/**
  * Create a signed wire statement for the given account.
  *
  * @param payto_uri account specification
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index ad2f46a45..33c126cbc 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -313,6 +313,7 @@ TALER_payto_get_method (const char *payto_uri);
 char *
 TALER_xtalerbank_account_from_payto (const char *payto);
 
+
 /**
  * Extract the subject value from the URI parameters.
  *
@@ -323,6 +324,18 @@ TALER_xtalerbank_account_from_payto (const char *payto);
 char *
 TALER_payto_get_subject (const char *payto_uri);
 
+
+/**
+ * Check that a payto:// URI is well-formed.
+ *
+ * @param payto_uri the URL to check
+ * @return NULL on success, otherwise an error
+ *         message to be freed by the caller!
+ */
+char *
+TALER_payto_validate (const char *payto_uri);
+
+
 /**
  * Possible values for a binary filter.
  */