diff options
| -rw-r--r-- | src/exchange-lib/exchange_api_refresh.c | 2 | ||||
| -rw-r--r-- | src/exchange-lib/exchange_api_refresh_link.c | 2 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_refresh_reveal.c | 2 | ||||
| -rw-r--r-- | src/include/taler_crypto_lib.h | 6 | ||||
| -rw-r--r-- | src/util/crypto.c | 2 | ||||
| -rw-r--r-- | src/util/test_crypto.c | 4 |
6 files changed, 10 insertions, 8 deletions
diff --git a/src/exchange-lib/exchange_api_refresh.c b/src/exchange-lib/exchange_api_refresh.c index 51273160d..510b6e409 100644 --- a/src/exchange-lib/exchange_api_refresh.c +++ b/src/exchange-lib/exchange_api_refresh.c @@ -756,7 +756,7 @@ TALER_EXCHANGE_refresh_prepare (const struct TALER_CoinSpendPrivateKeyP *melt_pr struct TALER_PlanchetSecretsP); for (j=0;j<fresh_pks_len;j++) { - TALER_setup_planchet (&trans_sec[i], + TALER_planchet_setup_refresh (&trans_sec[i], j, &md.fresh_coins[i][j]); } diff --git a/src/exchange-lib/exchange_api_refresh_link.c b/src/exchange-lib/exchange_api_refresh_link.c index 2c2340eff..4cefec54f 100644 --- a/src/exchange-lib/exchange_api_refresh_link.c +++ b/src/exchange-lib/exchange_api_refresh_link.c @@ -114,7 +114,7 @@ parse_refresh_link_coin (const struct TALER_EXCHANGE_RefreshLinkHandle *rlh, TALER_link_recover_transfer_secret (trans_pub, &rlh->coin_priv, &secret); - TALER_setup_planchet (&secret, + TALER_planchet_setup_refresh (&secret, coin_num, &fc); diff --git a/src/exchange/taler-exchange-httpd_refresh_reveal.c b/src/exchange/taler-exchange-httpd_refresh_reveal.c index 57ced9bf6..a64ec1cee 100644 --- a/src/exchange/taler-exchange-httpd_refresh_reveal.c +++ b/src/exchange/taler-exchange-httpd_refresh_reveal.c @@ -177,7 +177,7 @@ check_commitment (struct MHD_Connection *connection, char *buf; size_t buf_len; - TALER_setup_planchet (&transfer_secret, + TALER_planchet_setup_refresh (&transfer_secret, j, &fc); GNUNET_CRYPTO_eddsa_key_get_public (&fc.coin_priv.eddsa_priv, diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 90f6f1407..39de34b8a 100644 --- a/src/include/taler_crypto_lib.h +++ b/src/include/taler_crypto_lib.h @@ -503,7 +503,6 @@ TALER_link_reveal_transfer_secret (const struct TALER_TransferPrivateKeyP *trans struct TALER_TransferSecretP *transfer_secret); - /** * Decrypt the shared @a secret from the information in the * @a trans_priv and @a coin_pub. @@ -517,6 +516,7 @@ TALER_link_recover_transfer_secret (const struct TALER_TransferPublicKeyP *trans const struct TALER_CoinSpendPrivateKeyP *coin_priv, struct TALER_TransferSecretP *transfer_secret); +GNUNET_NETWORK_STRUCT_BEGIN /** * Header for serializations of coin-specific information about the @@ -537,6 +537,8 @@ struct TALER_PlanchetSecretsP }; +GNUNET_NETWORK_STRUCT_END + /** * Setup information for a fresh coin, deriving the coin private key @@ -548,7 +550,7 @@ struct TALER_PlanchetSecretsP * @param[out] fc value to initialize */ void -TALER_setup_planchet (const struct TALER_TransferSecretP *secret_seed, +TALER_planchet_setup_refresh (const struct TALER_TransferSecretP *secret_seed, unsigned int coin_num_salt, struct TALER_PlanchetSecretsP *fc); diff --git a/src/util/crypto.c b/src/util/crypto.c index 527aecbf2..378b73dc4 100644 --- a/src/util/crypto.c +++ b/src/util/crypto.c @@ -178,7 +178,7 @@ TALER_link_recover_transfer_secret (const struct TALER_TransferPublicKeyP *trans * @param[out] fc value to initialize */ void -TALER_setup_planchet (const struct TALER_TransferSecretP *secret_seed, +TALER_planchet_setup_refresh (const struct TALER_TransferSecretP *secret_seed, unsigned int coin_num_salt, struct TALER_PlanchetSecretsP *fc) { diff --git a/src/util/test_crypto.c b/src/util/test_crypto.c index 76ab5fd25..953ad94df 100644 --- a/src/util/test_crypto.c +++ b/src/util/test_crypto.c @@ -70,10 +70,10 @@ test_high_level () memcmp (&secret, &secret2, sizeof (secret))); - TALER_setup_planchet (&secret, + TALER_planchet_setup_refresh (&secret, 0, &fc1); - TALER_setup_planchet (&secret, + TALER_planchet_setup_refresh (&secret, 1, &fc2); GNUNET_assert (0 != |