exchange

commit 26410a72c20632765d22ee10bbf51934c74d15af
parent 65ac35a72ca0dd5349ed88b522740d20725b3dca
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  1 Jan 2021 15:48:43 +0100

fix #6666, bump protocol version to 9

Diffstat:
M
src/auditor/taler-auditor-httpd_deposit-confirmation.c
 | 
1
-
M
src/exchange/taler-exchange-httpd_keys.c
 | 
2
+-
M
src/include/taler_signatures.h
 | 
6
------
M
src/util/offline_signatures.c
 | 
3
---

4 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c
@@ -70,7 +70,6 @@ verify_and_execute_deposit_confirmation (
   struct TALER_ExchangeSigningKeyValidityPS skv = {
     .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY),
     .purpose.size = htonl (sizeof (struct TALER_ExchangeSigningKeyValidityPS)),
-    .master_public_key = es->master_public_key,
     .start = GNUNET_TIME_absolute_hton (es->ep_start),
     .expire = GNUNET_TIME_absolute_hton (es->ep_expire),
     .end = GNUNET_TIME_absolute_hton (es->ep_end),
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
@@ -43,7 +43,7 @@
  * #TALER_PROTOCOL_CURRENT and #TALER_PROTOCOL_AGE in
  * exchange_api_handle.c!
  */
-#define EXCHANGE_PROTOCOL_VERSION "8:0:0"
+#define EXCHANGE_PROTOCOL_VERSION "9:0:0"
 
 
 /**
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
@@ -754,12 +754,6 @@ struct TALER_ExchangeSigningKeyValidityPS
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
-   * Master public key of the exchange corresponding to @e signature.
-   * This is the long-term offline master key of the exchange.
-   */
-  struct TALER_MasterPublicKeyP master_public_key;
-
-  /**
    * When does this signing key begin to be valid?
    */
   struct GNUNET_TIME_AbsoluteNBO start;
diff --git a/src/util/offline_signatures.c b/src/util/offline_signatures.c
@@ -213,8 +213,6 @@ TALER_exchange_offline_signkey_validity_sign (
     .signkey_pub = *exchange_pub
   };
 
-  GNUNET_CRYPTO_eddsa_key_get_public (&master_priv->eddsa_priv,
-                                      &skv.master_public_key.eddsa_pub);
   GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
                             &skv,
                             &master_sig->eddsa_signature);
@@ -234,7 +232,6 @@ TALER_exchange_offline_signkey_validity_verify (
     .purpose.purpose = htonl (
       TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY),
     .purpose.size = htonl (sizeof (skv)),
-    .master_public_key = *master_pub,
     .start = GNUNET_TIME_absolute_hton (start_sign),
     .expire = GNUNET_TIME_absolute_hton (end_sign),
     .end = GNUNET_TIME_absolute_hton (end_legal),