fix #6666, bump protocol version to 9

This commit is contained in:
Christian Grothoff 2021-01-01 15:48:43 +01:00
parent 65ac35a72c
commit 26410a72c2
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 1 additions and 11 deletions

View File

@ -70,7 +70,6 @@ verify_and_execute_deposit_confirmation (
struct TALER_ExchangeSigningKeyValidityPS skv = { struct TALER_ExchangeSigningKeyValidityPS skv = {
.purpose.purpose = htonl (TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY), .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY),
.purpose.size = htonl (sizeof (struct TALER_ExchangeSigningKeyValidityPS)), .purpose.size = htonl (sizeof (struct TALER_ExchangeSigningKeyValidityPS)),
.master_public_key = es->master_public_key,
.start = GNUNET_TIME_absolute_hton (es->ep_start), .start = GNUNET_TIME_absolute_hton (es->ep_start),
.expire = GNUNET_TIME_absolute_hton (es->ep_expire), .expire = GNUNET_TIME_absolute_hton (es->ep_expire),
.end = GNUNET_TIME_absolute_hton (es->ep_end), .end = GNUNET_TIME_absolute_hton (es->ep_end),

View File

@ -43,7 +43,7 @@
* #TALER_PROTOCOL_CURRENT and #TALER_PROTOCOL_AGE in * #TALER_PROTOCOL_CURRENT and #TALER_PROTOCOL_AGE in
* exchange_api_handle.c! * exchange_api_handle.c!
*/ */
#define EXCHANGE_PROTOCOL_VERSION "8:0:0" #define EXCHANGE_PROTOCOL_VERSION "9:0:0"
/** /**

View File

@ -753,12 +753,6 @@ struct TALER_ExchangeSigningKeyValidityPS
*/ */
struct GNUNET_CRYPTO_EccSignaturePurpose purpose; 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? * When does this signing key begin to be valid?
*/ */

View File

@ -213,8 +213,6 @@ TALER_exchange_offline_signkey_validity_sign (
.signkey_pub = *exchange_pub .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, GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
&skv, &skv,
&master_sig->eddsa_signature); &master_sig->eddsa_signature);
@ -234,7 +232,6 @@ TALER_exchange_offline_signkey_validity_verify (
.purpose.purpose = htonl ( .purpose.purpose = htonl (
TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY), TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY),
.purpose.size = htonl (sizeof (skv)), .purpose.size = htonl (sizeof (skv)),
.master_public_key = *master_pub,
.start = GNUNET_TIME_absolute_hton (start_sign), .start = GNUNET_TIME_absolute_hton (start_sign),
.expire = GNUNET_TIME_absolute_hton (end_sign), .expire = GNUNET_TIME_absolute_hton (end_sign),
.end = GNUNET_TIME_absolute_hton (end_legal), .end = GNUNET_TIME_absolute_hton (end_legal),