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

simplify

Browse Source
This commit is contained in:
Christian Grothoff 2015-03-17 12:27:26 +01:00
parent 2018a6b713
commit 93d1fe6e68
1 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/mint/taler-mint-keyup.c
View File

@ -800,48 +800,6 @@ mint_keys_update_denomkeys ()
} }
/**
*
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
static int
mint_keys_update ()
{
int ret;
struct GNUNET_TIME_Relative lookahead_sign;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg,
"mint_keys",
"lookahead_sign",
&lookahead_sign))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"mint_keys",
"lookahead_sign");
return GNUNET_SYSERR;
}
if (0 == lookahead_sign.rel_value_us)
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"mint_keys",
"lookahead_sign",
_("must not be zero"));
return GNUNET_SYSERR;
}
ROUND_TO_SECS (lookahead_sign,
rel_value_us);
lookahead_sign_stamp = GNUNET_TIME_absolute_add (now,
lookahead_sign);
ret = mint_keys_update_signkeys ();
if (GNUNET_OK != ret)
return GNUNET_SYSERR;
return mint_keys_update_denomkeys ();
}
/** /**
* The main function of the keyup tool * The main function of the keyup tool
* *
@ -850,7 +808,8 @@ mint_keys_update ()
* @return 0 ok, 1 on error * @return 0 ok, 1 on error
*/ */
int int
main (int argc, char *const *argv) main (int argc,
char *const *argv)
{ {
static const struct GNUNET_GETOPT_CommandLineOption options[] = { static const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_HELP ("gnunet-mint-keyup OPTIONS"), GNUNET_GETOPT_OPTION_HELP ("gnunet-mint-keyup OPTIONS"),
@ -865,6 +824,7 @@ main (int argc, char *const *argv)
&GNUNET_GETOPT_set_string, &pretend_time_str}, &GNUNET_GETOPT_set_string, &pretend_time_str},
GNUNET_GETOPT_OPTION_END GNUNET_GETOPT_OPTION_END
}; };
struct GNUNET_TIME_Relative lookahead_sign;
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
GNUNET_log_setup ("taler-mint-keyup", GNUNET_log_setup ("taler-mint-keyup",
@ -878,10 +838,9 @@ main (int argc, char *const *argv)
if (NULL == mintdir) if (NULL == mintdir)
{ {
fprintf (stderr, fprintf (stderr,
"mint directory not given\n"); "Mint directory not given\n");
return 1; return 1;
} }
if (NULL != pretend_time_str) if (NULL != pretend_time_str)
{ {
if (GNUNET_OK != if (GNUNET_OK !=
@ -889,7 +848,8 @@ main (int argc, char *const *argv)
&now)) &now))
{ {
fprintf (stderr, fprintf (stderr,
"timestamp invalid\n"); "timestamp `%s' invalid\n",
pretend_time_str);
return 1; return 1;
} }
} }
@ -906,11 +866,10 @@ main (int argc, char *const *argv)
"Failed to load mint configuration\n"); "Failed to load mint configuration\n");
return 1; return 1;
} }
if (NULL == masterkeyfile) if (NULL == masterkeyfile)
{ {
fprintf (stderr, fprintf (stderr,
"master key file not given\n"); "Master key file not given\n");
return 1; return 1;
} }
master_priv = GNUNET_CRYPTO_eddsa_key_create_from_file (masterkeyfile); master_priv = GNUNET_CRYPTO_eddsa_key_create_from_file (masterkeyfile);
@ -926,7 +885,7 @@ main (int argc, char *const *argv)
GNUNET_CRYPTO_eddsa_key_get_public (master_priv, GNUNET_CRYPTO_eddsa_key_get_public (master_priv,
master_pub); master_pub);
// check if key from file matches the one from the configuration /* check if key from file matches the one from the configuration */
{ {
struct GNUNET_CRYPTO_EddsaPublicKey master_pub_from_cfg; struct GNUNET_CRYPTO_EddsaPublicKey master_pub_from_cfg;
@ -955,7 +914,36 @@ main (int argc, char *const *argv)
} }
} }
if (GNUNET_OK != mint_keys_update ()) if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg,
"mint_keys",
"lookahead_sign",
&lookahead_sign))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"mint_keys",
"lookahead_sign");
return GNUNET_SYSERR;
}
if (0 == lookahead_sign.rel_value_us)
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"mint_keys",
"lookahead_sign",
_("must not be zero"));
return GNUNET_SYSERR;
}
ROUND_TO_SECS (lookahead_sign,
rel_value_us);
lookahead_sign_stamp = GNUNET_TIME_absolute_add (now,
lookahead_sign);
/* finally, do actual work */
if (GNUNET_OK != mint_keys_update_signkeys ())
return 1;
if (GNUNET_OK != mint_keys_update_denomkeys ())
return 1; return 1;
return 0; return 0;
} }