aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/exchange-lib/exchange_api_handle.c18
-rw-r--r--src/exchange/taler-exchange-httpd_keystate.c57
2 files changed, 54 insertions, 21 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()
};
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index ba2cf7c16..b293b94cb 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -250,6 +250,18 @@ reload_keys_denom_iter (void *cls,
GNUNET_CRYPTO_hash_context_read (ctx->hash_context,
&denom_key_hash,
sizeof (struct GNUNET_HashCode));
+
+ if (0 != memcmp (&dki->issue.properties.master,
+ &TMH_master_public_key,
+ sizeof (struct TALER_MasterPublicKeyP)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Master key in denomination key file `%s' does not match! Skipping it.\n",
+ alias);
+ return GNUNET_OK;
+ }
+
+
session = TMH_plugin->get_session (TMH_plugin->cls);
if (NULL == session)
return GNUNET_SYSERR;
@@ -345,22 +357,19 @@ static json_t *
sign_key_issue_to_json (const struct TALER_ExchangeSigningKeyValidityPS *ski)
{
return
- json_pack ("{s:o, s:o, s:o, s:o, s:o, s:o}",
+ json_pack ("{s:o, s:o, s:o, s:o, s:o}",
"stamp_start",
GNUNET_JSON_from_time_abs (GNUNET_TIME_absolute_ntoh (ski->start)),
"stamp_expire",
GNUNET_JSON_from_time_abs (GNUNET_TIME_absolute_ntoh (ski->expire)),
"stamp_end",
GNUNET_JSON_from_time_abs (GNUNET_TIME_absolute_ntoh (ski->end)),
- "master_pub",
- GNUNET_JSON_from_data (&ski->master_public_key,
- sizeof (struct TALER_MasterPublicKeyP)),
"master_sig",
GNUNET_JSON_from_data (&ski->signature,
- sizeof (struct TALER_MasterSignatureP)),
+ sizeof (struct TALER_MasterSignatureP)),
"key",
GNUNET_JSON_from_data (&ski->signkey_pub,
- sizeof (struct TALER_ExchangePublicKeyP)));
+ sizeof (struct TALER_ExchangePublicKeyP)));
}
@@ -402,6 +411,16 @@ reload_keys_sign_iter (void *cls,
return GNUNET_OK;
}
+ if (0 != memcmp (&ski->issue.master_public_key,
+ &TMH_master_public_key,
+ sizeof (struct TALER_MasterPublicKeyP)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Master key in signing key file `%s' does not match! Skipping it.\n",
+ filename);
+ return GNUNET_OK;
+ }
+
/* The signkey is valid at this time, check if it's more recent than
what we have so far! */
if ( (GNUNET_TIME_absolute_ntoh (ctx->current_sign_key_issue.issue.start).abs_value_us <
@@ -649,14 +668,25 @@ TMH_KS_acquire_ (const char *location)
"Loading keys from `%s'\n",
TMH_exchange_directory);
TALER_EXCHANGEDB_denomination_keys_iterate (TMH_exchange_directory,
- &reload_keys_denom_iter,
- key_state);
+ &reload_keys_denom_iter,
+ key_state);
TALER_EXCHANGEDB_signing_keys_iterate (TMH_exchange_directory,
- &reload_keys_sign_iter,
- key_state);
+ &reload_keys_sign_iter,
+ key_state);
TALER_EXCHANGEDB_auditor_iterate (cfg,
&reload_auditor_iter,
key_state);
+
+ if (0 != memcmp (&key_state->current_sign_key_issue.issue.master_public_key,
+ &TMH_master_public_key,
+ sizeof (struct TALER_MasterPublicKeyP)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Have no signing key. Bad configuration.\n");
+ return NULL;
+ }
+
+
ks.purpose.size = htonl (sizeof (ks));
ks.purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_KEY_SET);
ks.list_issue_date = GNUNET_TIME_absolute_hton (key_state->reload_time);
@@ -897,8 +927,11 @@ TMH_KS_loop (void)
}
/* This will re-initialize 'internal_key_state' with
an initial refcnt of 1 */
- (void) TMH_KS_acquire ();
-
+ if (NULL == TMH_KS_acquire ())
+ {
+ ret = GNUNET_SYSERR;
+ break;
+ }
read_again:
errno = 0;
res = read (reload_pipe[0],