initialize master_pub field

This commit is contained in:
Christian Grothoff 2020-12-08 19:13:39 +01:00
parent 75b510f92f
commit 05f539c127
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 7 additions and 3 deletions

View File

@ -395,8 +395,8 @@ parse_json_signkey (struct TALER_EXCHANGE_SigningPublicKey *sign_key,
if (! check_sigs) if (! check_sigs)
return GNUNET_OK; return GNUNET_OK;
if (GNUNET_OK != if (GNUNET_OK !=
TALER_exchange_offline_signkey_validity_verify TALER_exchange_offline_signkey_validity_verify (
(&sign_key->key, &sign_key->key,
sign_key->valid_from, sign_key->valid_from,
sign_key->valid_until, sign_key->valid_until,
sign_key->valid_legal, sign_key->valid_legal,

View File

@ -13,10 +13,11 @@ pkgcfgdir = $(prefix)/share/taler/config.d/
pkgcfg_DATA = \ pkgcfg_DATA = \
paths.conf \ paths.conf \
taler-helper-crypto-eddsa.conf \
taler-helper-crypto-rsa.conf taler-helper-crypto-rsa.conf
EXTRA_DIST = \ EXTRA_DIST = \
paths.conf \ $(pkgcfg_DATA) \
taler-config.in \ taler-config.in \
test_helper_eddsa.conf \ test_helper_eddsa.conf \
test_helper_rsa.conf test_helper_rsa.conf

View File

@ -121,6 +121,8 @@ 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);
@ -140,6 +142,7 @@ 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),