summaryrefslogtreecommitdiff
path: root/src/mint
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-03-28 18:18:38 +0100
committerChristian Grothoff <christian@grothoff.org>2015-03-28 18:18:38 +0100
commit576545daebd608f24cbbeec627169d5274e6ddd3 (patch)
tree57947f6d8a04134196ad77a8567f775dadb776d9 /src/mint
parentbb15fdd21532cf24772e7f57a0b997002c288911 (diff)
downloadexchange-576545daebd608f24cbbeec627169d5274e6ddd3.tar.gz
exchange-576545daebd608f24cbbeec627169d5274e6ddd3.tar.bz2
exchange-576545daebd608f24cbbeec627169d5274e6ddd3.zip
fix use of struct TALER_MintSigningKeyValidityPS
Diffstat (limited to 'src/mint')
-rw-r--r--src/mint/taler-mint-httpd_keystate.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mint/taler-mint-httpd_keystate.c b/src/mint/taler-mint-httpd_keystate.c
index 1745775bb..33407e020 100644
--- a/src/mint/taler-mint-httpd_keystate.c
+++ b/src/mint/taler-mint-httpd_keystate.c
@@ -250,17 +250,22 @@ static json_t *
sign_key_issue_to_json (const struct TALER_MintSigningKeyValidityPS *ski)
{
return
- json_pack ("{s:o, s:o, s:o, s:o}",
+ json_pack ("{s:o, s:o, s:o, s:o, s:o, s:o}",
"stamp_start",
TALER_json_from_abs (GNUNET_TIME_absolute_ntoh (ski->start)),
"stamp_expire",
TALER_json_from_abs (GNUNET_TIME_absolute_ntoh (ski->expire)),
+ "stamp_end",
+ TALER_json_from_abs (GNUNET_TIME_absolute_ntoh (ski->end)),
+ "master_pub",
+ TALER_json_from_data (&ski->master_public_key,
+ sizeof (struct TALER_MasterPublicKeyP)),
"master_sig",
TALER_json_from_data (&ski->signature,
- sizeof (struct GNUNET_CRYPTO_EddsaSignature)),
+ sizeof (struct TALER_MasterSignatureP)),
"key",
TALER_json_from_data (&ski->signkey_pub,
- sizeof (struct GNUNET_CRYPTO_EddsaPublicKey)));
+ sizeof (struct TALER_MintPublicKeyP)));
}