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

wire signatures: produce better warning

Browse Source 
Produce a better warning when the wire signature file is signed by a
different key than the one we're checking the signature with.
This commit is contained in:
Florian Dold 2019-06-26 23:33:15 +02:00
parent bb432724fc
commit 87649e856a
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/json/json_wire.c
View File

@ -105,12 +105,21 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s,
{ {
const char *payto_url; const char *payto_url;
struct TALER_MasterSignatureP master_sig; struct TALER_MasterSignatureP master_sig;
struct TALER_MasterPublicKeyP master_pub_from_wire;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("url", &payto_url), GNUNET_JSON_spec_string ("url", &payto_url),
GNUNET_JSON_spec_fixed_auto ("master_sig", &master_sig), GNUNET_JSON_spec_fixed_auto ("master_sig", &master_sig),
GNUNET_JSON_spec_fixed_auto ("master_pub", &master_pub_from_wire),
GNUNET_JSON_spec_end () GNUNET_JSON_spec_end ()
}; };
if (0 != 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;
}
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_JSON_parse (wire_s, GNUNET_JSON_parse (wire_s,
spec, spec,
@ -136,13 +145,18 @@ TALER_JSON_exchange_wire_signature_make (const char *payto_url,
const struct TALER_MasterPrivateKeyP *master_priv) const struct TALER_MasterPrivateKeyP *master_priv)
{ {
struct TALER_MasterSignatureP master_sig; 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, TALER_exchange_wire_signature_make (payto_url,
master_priv, master_priv,
&master_sig); &master_sig);
return json_pack ("{s:s, s:o}", return json_pack ("{s:s, s:o, s:o}",
"url", payto_url, "url", payto_url,
"master_sig", GNUNET_JSON_from_data_auto (&master_sig)); "master_sig", GNUNET_JSON_from_data_auto (&master_sig),
"master_pub", GNUNET_JSON_from_data_auto (&master_pub));
} }