diff options
| author | Sree Harsha Totakura <sreeharsha@totakura.in> | 2015-03-09 11:32:30 +0100 |
|---|---|---|
| committer | Sree Harsha Totakura <sreeharsha@totakura.in> | 2015-03-09 11:32:30 +0100 |
| commit | 5fb7b6356f620d9698158a9f26e17fb6081b6c59 (patch) | |
| tree | db99a87c33189c42d3b3ab6c7d241a313690f64f /src | |
| parent | 0b92ae7f6c1f5d970558d67d4d315d7afb4b3d4e (diff) | |
| parent | 7b0ae9c1d0a3c3165a8cef8cc12d04d207a49ce2 (diff) | |
Merge branch 'master' of taler.net:mint
Diffstat (limited to 'src')
| -rw-r--r-- | src/mint/taler-mint-httpd_keystate.c | 2 | ||||
| -rw-r--r-- | src/mint/taler-mint-keyup.c | 19 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/mint/taler-mint-httpd_keystate.c b/src/mint/taler-mint-httpd_keystate.c index bc81a549..7edae9f7 100644 --- a/src/mint/taler-mint-httpd_keystate.c +++ b/src/mint/taler-mint-httpd_keystate.c @@ -145,7 +145,7 @@ TALER_MINT_conf_duration_provide () { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "mint_keys.lookahead_provide not valid or not given\n"); - GNUNET_abort (); + GNUNET_assert (0); } return rel; } diff --git a/src/mint/taler-mint-keyup.c b/src/mint/taler-mint-keyup.c index c68740cb..c4e15347 100644 --- a/src/mint/taler-mint-keyup.c +++ b/src/mint/taler-mint-keyup.c @@ -318,10 +318,10 @@ create_signkey_issue_priv (struct GNUNET_TIME_Absolute start, issue->purpose.purpose = htonl (TALER_SIGNATURE_MASTER_SIGNKEY); 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_abort (); - } + GNUNET_assert (GNUNET_OK == + GNUNET_CRYPTO_eddsa_sign (master_priv, + &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.size = htonl (sizeof (struct TALER_MINT_DenomKeyIssuePriv) - offsetof (struct TALER_MINT_DenomKeyIssuePriv, issue.purpose)); - if (GNUNET_OK != - GNUNET_CRYPTO_eddsa_sign (master_priv, - &dki->issue.purpose, - &dki->issue.signature)) - { - GNUNET_abort (); - } + GNUNET_assert (GNUNET_OK == + GNUNET_CRYPTO_eddsa_sign (master_priv, + &dki->issue.purpose, + &dki->issue.signature)); } |