summaryrefslogtreecommitdiff
path: root/src/json
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-01-08 10:29:55 +0100
committerChristian Grothoff <christian@grothoff.org>2020-01-08 10:29:55 +0100
commit97f71c83a70c8cf0130cadb8b0b0405e2dc059f7 (patch)
tree2bdd1ab8f2c698bca7149be4a50e235a595cdf5d /src/json
parent713b9efb4222193419f8314375218e0496e545c7 (diff)
downloadexchange-97f71c83a70c8cf0130cadb8b0b0405e2dc059f7.tar.gz
exchange-97f71c83a70c8cf0130cadb8b0b0405e2dc059f7.tar.bz2
exchange-97f71c83a70c8cf0130cadb8b0b0405e2dc059f7.zip
fix #6033: remove master_pub field
Diffstat (limited to 'src/json')
-rw-r--r--src/json/json_wire.c19
1 files 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));
}