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

Merge branch 'master' of taler.net:mint

Browse Source
This commit is contained in:
Sree Harsha Totakura 2015-03-09 11:32:30 +01:00
commit 5fb7b6356f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mint/taler-mint-httpd_keystate.c
View File

@ -145,7 +145,7 @@ TALER_MINT_conf_duration_provide ()
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"mint_keys.lookahead_provide not valid or not given\n"); "mint_keys.lookahead_provide not valid or not given\n");
GNUNET_abort (); GNUNET_assert (0);
} }
return rel; return rel;
} }

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

@ -318,10 +318,10 @@ create_signkey_issue_priv (struct GNUNET_TIME_Absolute start,
issue->purpose.purpose = htonl (TALER_SIGNATURE_MASTER_SIGNKEY); issue->purpose.purpose = htonl (TALER_SIGNATURE_MASTER_SIGNKEY);
issue->purpose.size = htonl (sizeof (struct TALER_MINT_SignKeyIssue) - offsetof (struct TALER_MINT_SignKeyIssue, purpose)); issue->purpose.size = htonl (sizeof (struct TALER_MINT_SignKeyIssue) - offsetof (struct TALER_MINT_SignKeyIssue, purpose));
if (GNUNET_OK != GNUNET_CRYPTO_eddsa_sign (master_priv, &issue->purpose, &issue->signature)) GNUNET_assert (GNUNET_OK ==
{ GNUNET_CRYPTO_eddsa_sign (master_priv,
GNUNET_abort (); &issue->purpose,
} &issue->signature));
} }
@ -459,13 +459,10 @@ create_denomkey_issue (struct CoinTypeParams *params,
dki->issue.purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DENOM); dki->issue.purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DENOM);
dki->issue.purpose.size = htonl (sizeof (struct TALER_MINT_DenomKeyIssuePriv) - offsetof (struct TALER_MINT_DenomKeyIssuePriv, issue.purpose)); dki->issue.purpose.size = htonl (sizeof (struct TALER_MINT_DenomKeyIssuePriv) - offsetof (struct TALER_MINT_DenomKeyIssuePriv, issue.purpose));
if (GNUNET_OK != GNUNET_assert (GNUNET_OK ==
GNUNET_CRYPTO_eddsa_sign (master_priv, GNUNET_CRYPTO_eddsa_sign (master_priv,
&dki->issue.purpose, &dki->issue.purpose,
&dki->issue.signature)) &dki->issue.signature));
{
GNUNET_abort ();
}
} }