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

-fix recently introduced ftbfs

Browse Source
This commit is contained in:
Christian Grothoff 2015-03-15 18:49:26 +01:00
parent dc0146ea68
commit b5e69f22e9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/mint_api.c
View File

@ -332,6 +332,8 @@ parse_json_amount (json_t *amount_obj, struct TALER_Amount *amt)
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
/* FIXME: avoid useless ** for _denom_key! */
static int static int
parse_json_denomkey (struct TALER_MINT_DenomPublicKey **_denom_key, parse_json_denomkey (struct TALER_MINT_DenomPublicKey **_denom_key,
json_t *denom_key_obj, json_t *denom_key_obj,
@ -354,6 +356,7 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey **_denom_key,
struct TALER_Amount fee_deposit; struct TALER_Amount fee_deposit;
struct TALER_Amount fee_refresh; struct TALER_Amount fee_refresh;
struct TALER_MINT_DenomKeyIssue denom_key_issue; struct TALER_MINT_DenomKeyIssue denom_key_issue;
struct GNUNET_CRYPTO_rsa_PublicKey *pk;
struct GNUNET_CRYPTO_EddsaSignature sig; struct GNUNET_CRYPTO_EddsaSignature sig;
EXITIF (JSON_OBJECT != json_typeof (denom_key_obj)); EXITIF (JSON_OBJECT != json_typeof (denom_key_obj));
@ -387,10 +390,12 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey **_denom_key,
GNUNET_STRINGS_string_to_data (key_enc, strlen (key_enc), GNUNET_STRINGS_string_to_data (key_enc, strlen (key_enc),
buf, buf,
buf_size)); buf_size));
denom_key_issue.denom_pub = GNUNET_CRYPTO_rsa_public_key_decode (buf, buf_size); pk = GNUNET_CRYPTO_rsa_public_key_decode (buf, buf_size);
GNUNET_free (buf); GNUNET_free (buf);
EXITIF (NULL == denom_key_issue.denom_pub);
EXITIF (NULL == pk);
GNUNET_CRYPTO_rsa_public_key_hash (pk,
&denom_key_issue.denom_hash);
EXITIF (NULL == (obj = json_object_get (denom_key_obj, "value"))); EXITIF (NULL == (obj = json_object_get (denom_key_obj, "value")));
EXITIF (GNUNET_SYSERR == parse_json_amount (obj, &value)); EXITIF (GNUNET_SYSERR == parse_json_amount (obj, &value));
EXITIF (NULL == (obj = json_object_get (denom_key_obj, "fee_withdraw"))); EXITIF (NULL == (obj = json_object_get (denom_key_obj, "fee_withdraw")));
@ -417,7 +422,7 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey **_denom_key,
&sig, &sig,
master_key)); master_key));
denom_key = GNUNET_new (struct TALER_MINT_DenomPublicKey); denom_key = GNUNET_new (struct TALER_MINT_DenomPublicKey);
denom_key->key = denom_key_issue.denom_pub; denom_key->key = pk;
denom_key->valid_from = valid_from; denom_key->valid_from = valid_from;
denom_key->withdraw_valid_until = withdraw_valid_until; denom_key->withdraw_valid_until = withdraw_valid_until;
denom_key->deposit_valid_until = deposit_valid_until; denom_key->deposit_valid_until = deposit_valid_until;