diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-01-09 18:18:59 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-01-09 18:18:59 +0100 |
| commit | 0430d6fb031d1713a39a996068387c3ab2c36c2d (patch) | |
| tree | df1e2813dde318f8af2c92fc2367c3956cd58f28 /src/mint/taler-mint-httpd_withdraw.c | |
| parent | f5e49d926ad1dddcfc87b5fb6671a1934aef7b3c (diff) | |
moving structs relevant for signatures into taler_signatures.h, splitting of private keys that are not in messages; moving test_hash_context to GNUnet
Diffstat (limited to 'src/mint/taler-mint-httpd_withdraw.c')
| -rw-r--r-- | src/mint/taler-mint-httpd_withdraw.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mint/taler-mint-httpd_withdraw.c b/src/mint/taler-mint-httpd_withdraw.c index 0fd418540..22024e80e 100644 --- a/src/mint/taler-mint-httpd_withdraw.c +++ b/src/mint/taler-mint-httpd_withdraw.c @@ -28,7 +28,6 @@ #include <pthread.h> #include "mint.h" #include "mint_db.h" -#include "taler_types.h" #include "taler_signatures.h" #include "taler_rsa.h" #include "taler_json_lib.h" @@ -79,7 +78,7 @@ static void sign_reserve (struct Reserve *reserve, struct MintKeyState *key_state) { - reserve->status_sign_pub = key_state->current_sign_key_issue.signkey_pub; + reserve->status_sign_pub = key_state->current_sign_key_issue.issue.signkey_pub; reserve->status_sig_purpose.purpose = htonl (TALER_SIGNATURE_RESERVE_STATUS); reserve->status_sig_purpose.size = htonl (sizeof (struct Reserve) - offsetof (struct Reserve, status_sig_purpose)); @@ -151,7 +150,7 @@ TALER_MINT_handler_withdraw_status (struct RequestHandler *rh, return MHD_NO; } key_state = TALER_MINT_key_state_acquire (); - if (0 != memcmp (&key_state->current_sign_key_issue.signkey_pub, + if (0 != memcmp (&key_state->current_sign_key_issue.issue.signkey_pub, &reserve.status_sign_pub, sizeof (struct GNUNET_CRYPTO_EddsaPublicKey))) { @@ -230,7 +229,7 @@ TALER_MINT_handler_withdraw_sign (struct RequestHandler *rh, struct Reserve reserve; struct MintKeyState *key_state; struct CollectableBlindcoin collectable; - struct TALER_MINT_DenomKeyIssue *dki; + struct TALER_MINT_DenomKeyIssuePriv *dki; struct TALER_RSA_Signature ev_sig; struct TALER_Amount amount_required; @@ -342,16 +341,16 @@ TALER_MINT_handler_withdraw_sign (struct RequestHandler *rh, key_state = TALER_MINT_key_state_acquire (); dki = TALER_MINT_get_denom_key (key_state, - &wsrd.denomination_pub); + &wsrd.denomination_pub); TALER_MINT_key_state_release (key_state); if (NULL == dki) return request_send_json_pack (connection, MHD_HTTP_NOT_FOUND, "{s:s}", "error", "Denomination not found"); - amount_required = TALER_amount_ntoh (dki->value); + amount_required = TALER_amount_ntoh (dki->issue.value); amount_required = TALER_amount_add (amount_required, - TALER_amount_ntoh (dki->fee_withdraw)); + TALER_amount_ntoh (dki->issue.fee_withdraw)); if (0 < TALER_amount_cmp (amount_required, TALER_amount_ntoh (reserve.balance))) |