diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-05-18 17:58:32 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-05-18 17:58:32 +0200 |
| commit | daff72b63f7a1c5c51abff7a970f5d90579f6619 (patch) | |
| tree | d9de6d3e9e6c725f140223f251acca9fa2cda458 /src/exchange-lib | |
| parent | 396f29ab9ed9c3f78a4cb0b5ff4d7fc9b6521f06 (diff) | |
| download | exchange-daff72b63f7a1c5c51abff7a970f5d90579f6619.tar.gz exchange-daff72b63f7a1c5c51abff7a970f5d90579f6619.tar.bz2 exchange-daff72b63f7a1c5c51abff7a970f5d90579f6619.zip | |
fix #4506: check that master key matches our master key when loading signing and denomination keys; also do not send master_pub with each signing key, that is not in the spec
Diffstat (limited to 'src/exchange-lib')
| -rw-r--r-- | src/exchange-lib/exchange_api_handle.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/exchange-lib/exchange_api_handle.c b/src/exchange-lib/exchange_api_handle.c index e5586022f..356a2fd27 100644 --- a/src/exchange-lib/exchange_api_handle.c +++ b/src/exchange-lib/exchange_api_handle.c @@ -183,15 +183,15 @@ parse_json_signkey (struct TALER_EXCHANGE_SigningPublicKey *sign_key, struct GNUNET_TIME_Absolute valid_legal; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_fixed_auto ("master_sig", - &sig), + &sig), GNUNET_JSON_spec_fixed_auto ("key", - &sign_key_issue.signkey_pub), + &sign_key_issue.signkey_pub), GNUNET_JSON_spec_absolute_time ("stamp_start", - &valid_from), + &valid_from), GNUNET_JSON_spec_absolute_time ("stamp_expire", - &valid_until), + &valid_until), GNUNET_JSON_spec_absolute_time ("stamp_end", - &valid_legal), + &valid_legal), GNUNET_JSON_spec_end() }; @@ -487,13 +487,13 @@ decode_keys_json (const json_t *resp_obj, { struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_fixed_auto ("master_public_key", - &key_data->master_pub), + &key_data->master_pub), GNUNET_JSON_spec_fixed_auto ("eddsa_sig", - &sig), + &sig), GNUNET_JSON_spec_fixed_auto ("eddsa_pub", - &pub), + &pub), GNUNET_JSON_spec_absolute_time ("list_issue_date", - &list_issue_date), + &list_issue_date), GNUNET_JSON_spec_end() }; |