taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix #6033: remove master_pub field

Browse Source
This commit is contained in:
Christian Grothoff 2020-01-08 10:29:55 +01:00
parent 713b9efb42
commit 97f71c83a7
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/json/json_wire.c
View File

@ -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));
}