2 files changed, 23 insertions, 27 deletions

diff --git a/src/mint-tools/taler-mint-keycheck.c b/src/mint-tools/taler-mint-keycheck.c
index e6fa1ea6e..c5ac86cb6 100644
--- a/src/mint-tools/taler-mint-keycheck.c
+++ b/src/mint-tools/taler-mint-keycheck.c
@@ -128,10 +128,8 @@ denomkeys_iter (void *cls,
 {
   struct GNUNET_HashCode hc;
 
-  if (ntohl (dki->issue.purpose.size) !=
-      sizeof (struct TALER_DenominationKeyValidityPS) -
-      offsetof (struct TALER_DenominationKeyValidityPS,
-                purpose))
+  if (ntohl (dki->issue.properties.purpose.size) !=
+      sizeof (struct TALER_DenominationKeyValidityPS))
   {
     fprintf (stderr,
              "Denomination key for `%s' has invalid purpose size\n",
@@ -139,10 +137,10 @@ denomkeys_iter (void *cls,
     return GNUNET_SYSERR;
   }
 
-  if ( (0 != GNUNET_TIME_absolute_ntoh (dki->issue.start).abs_value_us % 1000000) ||
-       (0 != GNUNET_TIME_absolute_ntoh (dki->issue.expire_withdraw).abs_value_us % 1000000) ||
-       (0 != GNUNET_TIME_absolute_ntoh (dki->issue.expire_legal).abs_value_us % 1000000) ||
-       (0 != GNUNET_TIME_absolute_ntoh (dki->issue.expire_spend).abs_value_us % 1000000) )
+  if ( (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.start).abs_value_us % 1000000) ||
+       (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.expire_withdraw).abs_value_us % 1000000) ||
+       (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.expire_legal).abs_value_us % 1000000) ||
+       (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.expire_spend).abs_value_us % 1000000) )
   {
     fprintf (stderr,
              "Timestamps are not multiples of a round second\n");
@@ -151,9 +149,9 @@ denomkeys_iter (void *cls,
 
   if (GNUNET_OK !=
       GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY,
-                                  &dki->issue.purpose,
+                                  &dki->issue.properties.purpose,
                                   &dki->issue.signature.eddsa_signature,
-                                  &dki->issue.master.eddsa_pub))
+                                  &dki->issue.properties.master.eddsa_pub))
   {
     fprintf (stderr,
              "Denomination key for `%s' has invalid signature\n",
@@ -163,7 +161,7 @@ denomkeys_iter (void *cls,
   GNUNET_CRYPTO_rsa_public_key_hash (dki->denom_pub.rsa_public_key,
                                      &hc);
   if (0 != memcmp (&hc,
-                   &dki->issue.denom_hash,
+                   &dki->issue.properties.denom_hash,
                    sizeof (struct GNUNET_HashCode)))
   {
     fprintf (stderr,
diff --git a/src/mint-tools/taler-mint-keyup.c b/src/mint-tools/taler-mint-keyup.c
index 7b9388573..15c2d2e7b 100644
--- a/src/mint-tools/taler-mint-keyup.c
+++ b/src/mint-tools/taler-mint-keyup.c
@@ -719,35 +719,33 @@ create_denomkey_issue (const struct CoinTypeParams *params,
   dki->denom_pub.rsa_public_key
     = GNUNET_CRYPTO_rsa_private_key_get_public (dki->denom_priv.rsa_private_key);
   GNUNET_CRYPTO_rsa_public_key_hash (dki->denom_pub.rsa_public_key,
-                                     &dki->issue.denom_hash);
-  dki->issue.master = master_public_key;
-  dki->issue.start = GNUNET_TIME_absolute_hton (params->anchor);
-  dki->issue.expire_withdraw =
+                                     &dki->issue.properties.denom_hash);
+  dki->issue.properties.master = master_public_key;
+  dki->issue.properties.start = GNUNET_TIME_absolute_hton (params->anchor);
+  dki->issue.properties.expire_withdraw =
       GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_add (params->anchor,
                                                            params->duration_withdraw));
-  dki->issue.expire_spend =
+  dki->issue.properties.expire_spend =
     GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_add (params->anchor,
                                                          params->duration_spend));
-  dki->issue.expire_legal =
+  dki->issue.properties.expire_legal =
     GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_add (params->anchor,
                                                          params->duration_legal));
-  TALER_amount_hton (&dki->issue.value,
+  TALER_amount_hton (&dki->issue.properties.value,
                      &params->value);
-  TALER_amount_hton (&dki->issue.fee_withdraw,
+  TALER_amount_hton (&dki->issue.properties.fee_withdraw,
                      &params->fee_withdraw);
-  TALER_amount_hton (&dki->issue.fee_deposit,
+  TALER_amount_hton (&dki->issue.properties.fee_deposit,
                      &params->fee_deposit);
-  TALER_amount_hton (&dki->issue.fee_refresh,
+  TALER_amount_hton (&dki->issue.properties.fee_refresh,
                      &params->fee_refresh);
-  dki->issue.purpose.purpose
+  dki->issue.properties.purpose.purpose
     = htonl (TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY);
-  dki->issue.purpose.size
-    = htonl (sizeof (struct TALER_DenominationKeyValidityPS) -
-             offsetof (struct TALER_DenominationKeyValidityPS,
-                       purpose));
+  dki->issue.properties.purpose.size
+    = htonl (sizeof (struct TALER_DenominationKeyValidityPS));
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv,
-                                           &dki->issue.purpose,
+                                           &dki->issue.properties.purpose,
                                            &dki->issue.signature.eddsa_signature));
 }