[taler-exchange] branch master updated: fix #6033: remove master_pub field

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 97f71c83 fix #6033: remove master_pub field
97f71c83 is described below

commit 97f71c83a70c8cf0130cadb8b0b0405e2dc059f7
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Jan 8 10:29:55 2020 +0100

    fix #6033: remove master_pub field
---
 src/json/json_wire.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/json/json_wire.c b/src/json/json_wire.c
index 63dc6dca..515cd9b6 100644
--- a/src/json/json_wire.c
+++ b/src/json/json_wire.c
@@ -106,11 +106,9 @@ TALER_JSON_exchange_wire_signature_check (const json_t 
*wire_s,
 {
   const char *payto_url;
   struct TALER_MasterSignatureP master_sig;
-  struct TALER_MasterPublicKeyP master_pub_from_wire;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_string ("url", &payto_url),
     GNUNET_JSON_spec_fixed_auto ("master_sig", &master_sig),
-    GNUNET_JSON_spec_fixed_auto ("master_pub", &master_pub_from_wire),
     GNUNET_JSON_spec_end ()
   };
 
@@ -123,13 +121,6 @@ TALER_JSON_exchange_wire_signature_check (const json_t 
*wire_s,
     return GNUNET_SYSERR;
   }
 
-  if (0 != GNUNET_memcmp (&master_pub_from_wire, master_pub))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "wire signature has an unexpected master public key\n");
-    return GNUNET_SYSERR;
-  }
-
   return TALER_exchange_wire_signature_check (payto_url,
                                               master_pub,
                                               &master_sig);
@@ -148,19 +139,13 @@ TALER_JSON_exchange_wire_signature_make (const char 
*payto_url,
                                          TALER_MasterPrivateKeyP *master_priv)
 {
   struct TALER_MasterSignatureP master_sig;
-  struct TALER_MasterPublicKeyP master_pub;
 
-  GNUNET_CRYPTO_eddsa_key_get_public (&master_priv->eddsa_priv,
-                                      &master_pub.eddsa_pub);
   TALER_exchange_wire_signature_make (payto_url,
                                       master_priv,
                                       &master_sig);
-  return json_pack ("{s:s, s:o, s:o}",
+  return json_pack ("{s:s, s:o}",
                     "url", payto_url,
-                    "master_sig", GNUNET_JSON_from_data_auto (&master_sig)
-                    /* FIXME: #5991: remove this (and s:o above!) once wallet 
is updated */
-                    ,"master_pub", GNUNET_JSON_from_data_auto (&master_pub)
-                    );
+                    "master_sig", GNUNET_JSON_from_data_auto (&master_sig));
 }
 
 

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