diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-06-19 22:32:58 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-06-19 22:32:58 +0200 |
| commit | 5c780a7a972f4363e0b3c4521fe8c1fbb846723b (patch) | |
| tree | 51b91f99c7430c68c13c9c66a727979efde2ce02 | |
| parent | 2c1db3ea04c9628aa8c57cab1fe635321090f0d4 (diff) | |
must also decode 'expire_legal'
| -rw-r--r-- | src/mint-lib/mint_api_handle.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mint-lib/mint_api_handle.c b/src/mint-lib/mint_api_handle.c index 13a6a68e..bd7d00e6 100644 --- a/src/mint-lib/mint_api_handle.c +++ b/src/mint-lib/mint_api_handle.c @@ -399,12 +399,14 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey *denom_key, const char *deposit_valid_until_enc; const char *withdraw_valid_until_enc; const char *valid_from_enc; + const char *expire_legal_enc; const char *key_enc; char *buf; size_t buf_size; struct GNUNET_TIME_Absolute valid_from; struct GNUNET_TIME_Absolute withdraw_valid_until; struct GNUNET_TIME_Absolute deposit_valid_until; + struct GNUNET_TIME_Absolute expire_legal; struct TALER_Amount value; struct TALER_Amount fee_withdraw; struct TALER_Amount fee_deposit; @@ -425,6 +427,8 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey *denom_key, EXITIF (NULL == (withdraw_valid_until_enc = json_string_value (obj))); EXITIF (NULL == (obj = json_object_get (denom_key_obj, "stamp_start"))); EXITIF (NULL == (valid_from_enc = json_string_value (obj))); + EXITIF (NULL == (obj = json_object_get (denom_key_obj, "stamp_expire_legal"))); + EXITIF (NULL == (expire_legal_enc = json_string_value (obj))); EXITIF (NULL == (obj = json_object_get (denom_key_obj, "denom_pub"))); EXITIF (NULL == (key_enc = json_string_value (obj))); @@ -434,6 +438,8 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey *denom_key, withdraw_valid_until_enc)); EXITIF (GNUNET_SYSERR == parse_timestamp (&deposit_valid_until, deposit_valid_until_enc)); + EXITIF (GNUNET_SYSERR == parse_timestamp (&expire_legal, + expire_legal_enc)); memset (&denom_key_issue, 0, sizeof (denom_key_issue)); @@ -468,6 +474,7 @@ parse_json_denomkey (struct TALER_MINT_DenomPublicKey *denom_key, denom_key_issue.start = GNUNET_TIME_absolute_hton (valid_from); denom_key_issue.expire_withdraw = GNUNET_TIME_absolute_hton (withdraw_valid_until); denom_key_issue.expire_spend = GNUNET_TIME_absolute_hton (deposit_valid_until); + denom_key_issue.expire_legal = GNUNET_TIME_absolute_hton (expire_legal); TALER_amount_hton (&denom_key_issue.value, &value); TALER_amount_hton (&denom_key_issue.fee_withdraw, |