more work on future /keys

1 files changed, 21 insertions, 8 deletions

diff --git a/src/exchange/taler-exchange-httpd_keys.h b/src/exchange/taler-exchange-httpd_keys.h
index 7b4d565f9..078838615 100644
--- a/src/exchange/taler-exchange-httpd_keys.h
+++ b/src/exchange/taler-exchange-httpd_keys.h
@@ -34,12 +34,6 @@
  */
 struct TEH_DenominationKey
 {
-  /**
-   * The helper to sign with this denomination key. Will be NULL if the
-   * private key is not available (this is the case after the key has expired
-   * for signing coins, if it is too early, or if the key has been revoked).
-   */
-  struct TALER_CRYPTO_DenominationHelper *dh;
 
   /**
    * Decoded denomination public key (the hash of it is in
@@ -48,9 +42,28 @@ struct TEH_DenominationKey
   struct TALER_DenominationPublicKey denom_pub;
 
   /**
-   * Signed public information about a denomination key.
+   * Hash code of the denomination public key.
+   */
+  struct GNUNET_HashCode h_denom_pub;
+
+  /**
+   * Meta data about the type of the denomination, such as fees and validity
+   * periods.
+   */
+  struct TALER_EXCHANGEDB_DenominationKeyMetaData meta;
+
+  /**
+   * The long-term offline master key's signature for this denomination.
+   * Signs over @e h_denom_pub and @e meta.
+   */
+  struct TALER_MasterSignatureP master_sig_validity;
+
+  /**
+   * The master key's signature to revoke this denomination, or all zero
+   * if the denomination has NOT yet been revoked.
    */
-  struct TALER_EXCHANGEDB_DenominationKeyInformationP issue;
+  struct TALER_MasterSignatureP master_sig_revocation;
+
 };