also validate merchant IBANs before signing

1 files changed, 11 insertions, 6 deletions

diff --git a/src/json/json_wire.c b/src/json/json_wire.c
index 8fd99ab6d..f05808194 100644
--- a/src/json/json_wire.c
+++ b/src/json/json_wire.c
@@ -414,6 +414,11 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
+  if (GNUNET_SYSERR == validate_payto (payto_uri))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
   TALER_merchant_wire_signature_hash (payto_uri,
                                       salt,
                                       hc);
@@ -430,9 +435,9 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
  * @return #GNUNET_OK if signature is valid
  */
 int
-TALER_JSON_exchange_wire_signature_check (const json_t *wire_s,
-                                          const struct
-                                          TALER_MasterPublicKeyP *master_pub)
+TALER_JSON_exchange_wire_signature_check (
+  const json_t *wire_s,
+  const struct TALER_MasterPublicKeyP *master_pub)
 {
   const char *payto_uri;
   struct TALER_MasterSignatureP master_sig;
@@ -471,9 +476,9 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s,
  * @return NULL if @a payto_uri is malformed
  */
 json_t *
-TALER_JSON_exchange_wire_signature_make (const char *payto_uri,
-                                         const struct
-                                         TALER_MasterPrivateKeyP *master_priv)
+TALER_JSON_exchange_wire_signature_make (
+  const char *payto_uri,
+  const struct TALER_MasterPrivateKeyP *master_priv)
 {
   struct TALER_MasterSignatureP master_sig;