summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/include/taler_mintdb_plugin.h6
-rw-r--r--src/include/taler_signatures.h2
-rw-r--r--src/mint-lib/mint_api_refresh.c4
-rw-r--r--src/mint/taler-mint-httpd_db.c6
-rw-r--r--src/mint/taler-mint-httpd_db.h2
-rw-r--r--src/mint/taler-mint-httpd_refresh.c12
-rw-r--r--src/mint/taler-mint-httpd_responses.c2
-rw-r--r--src/mintdb/plugin_mintdb_postgres.c6
8 files changed, 20 insertions, 20 deletions
diff --git a/src/include/taler_mintdb_plugin.h b/src/include/taler_mintdb_plugin.h
index ba83c814a..c5b9828d7 100644
--- a/src/include/taler_mintdb_plugin.h
+++ b/src/include/taler_mintdb_plugin.h
@@ -539,7 +539,7 @@ struct TALER_MINTDB_MeltCommitment
/**
* 2D-Array of #TALER_CNC_KAPPA and @e new_oldcoins links.
*/
- struct TALER_MINTDB_RefreshCommitLinkP *commit_links[TALER_CNC_KAPPA];
+ struct TALER_RefreshCommitLinkP *commit_links[TALER_CNC_KAPPA];
};
@@ -1002,7 +1002,7 @@ struct TALER_MINTDB_Plugin
const struct GNUNET_HashCode *session_hash,
uint16_t cnc_index,
uint16_t num_links,
- const struct TALER_MINTDB_RefreshCommitLinkP *commit_links);
+ const struct TALER_RefreshCommitLinkP *commit_links);
/**
* Obtain the commited (encrypted) refresh link data
@@ -1024,7 +1024,7 @@ struct TALER_MINTDB_Plugin
const struct GNUNET_HashCode *session_hash,
uint16_t cnc_index,
uint16_t num_links,
- struct TALER_MINTDB_RefreshCommitLinkP *links);
+ struct TALER_RefreshCommitLinkP *links);
/**
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 0b05bacef..c5348eb5d 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -657,7 +657,7 @@ struct TALER_MintKeyValidityPS
* Part of the construction of the refresh session's hash and
* thus of what is signed there.
*/
-struct TALER_MINTDB_RefreshCommitLinkP
+struct TALER_RefreshCommitLinkP
{
/**
* Transfer public key, used to decrypt the @e shared_secret_enc
diff --git a/src/mint-lib/mint_api_refresh.c b/src/mint-lib/mint_api_refresh.c
index 796eb23fb..66e8ea83b 100644
--- a/src/mint-lib/mint_api_refresh.c
+++ b/src/mint-lib/mint_api_refresh.c
@@ -990,7 +990,7 @@ TALER_MINT_refresh_prepare (unsigned int num_melts,
{
for (j = 0; j < num_melts; j++)
{
- struct TALER_MINTDB_RefreshCommitLinkP rcl;
+ struct TALER_RefreshCommitLinkP rcl;
struct TALER_TransferSecretP trans_sec;
GNUNET_CRYPTO_ecdhe_key_get_public (&md.melted_coins[j].transfer_priv[i].ecdhe_priv,
@@ -1003,7 +1003,7 @@ TALER_MINT_refresh_prepare (unsigned int num_melts,
&rcl.shared_secret_enc);
GNUNET_CRYPTO_hash_context_read (hash_context,
&rcl,
- sizeof (struct TALER_MINTDB_RefreshCommitLinkP));
+ sizeof (struct TALER_RefreshCommitLinkP));
}
}
diff --git a/src/mint/taler-mint-httpd_db.c b/src/mint/taler-mint-httpd_db.c
index 4e91e7e76..e24102ead 100644
--- a/src/mint/taler-mint-httpd_db.c
+++ b/src/mint/taler-mint-httpd_db.c
@@ -623,7 +623,7 @@ TMH_DB_execute_refresh_melt (struct MHD_Connection *connection,
unsigned int coin_count,
const struct TMH_DB_MeltDetails *coin_melt_details,
struct TALER_MINTDB_RefreshCommitCoin *const* commit_coin,
- struct TALER_MINTDB_RefreshCommitLinkP *const* commit_link)
+ struct TALER_RefreshCommitLinkP *const* commit_link)
{
struct TMH_KS_StateHandle *key_state;
struct TALER_MINTDB_RefreshSession refresh_session;
@@ -839,11 +839,11 @@ check_commitment (struct MHD_Connection *connection,
unsigned int j;
struct TALER_LinkSecretP last_shared_secret;
int secret_initialized = GNUNET_NO;
- struct TALER_MINTDB_RefreshCommitLinkP *commit_links;
+ struct TALER_RefreshCommitLinkP *commit_links;
struct TALER_MINTDB_RefreshCommitCoin *commit_coins;
commit_links = GNUNET_malloc (num_oldcoins *
- sizeof (struct TALER_MINTDB_RefreshCommitLinkP));
+ sizeof (struct TALER_RefreshCommitLinkP));
if (GNUNET_OK !=
TMH_plugin->get_refresh_commit_links (TMH_plugin->cls,
session,
diff --git a/src/mint/taler-mint-httpd_db.h b/src/mint/taler-mint-httpd_db.h
index 8a171153a..c2f9a3101 100644
--- a/src/mint/taler-mint-httpd_db.h
+++ b/src/mint/taler-mint-httpd_db.h
@@ -130,7 +130,7 @@ TMH_DB_execute_refresh_melt (struct MHD_Connection *connection,
unsigned int coin_count,
const struct TMH_DB_MeltDetails *coin_melt_details,
struct TALER_MINTDB_RefreshCommitCoin *const* commit_coin,
- struct TALER_MINTDB_RefreshCommitLinkP *const* commit_link);
+ struct TALER_RefreshCommitLinkP *const* commit_link);
/**
diff --git a/src/mint/taler-mint-httpd_refresh.c b/src/mint/taler-mint-httpd_refresh.c
index 7bcaa7996..954d8daf7 100644
--- a/src/mint/taler-mint-httpd_refresh.c
+++ b/src/mint/taler-mint-httpd_refresh.c
@@ -57,7 +57,7 @@ handle_refresh_melt_binary (struct MHD_Connection *connection,
const struct TMH_DB_MeltDetails *coin_melt_details,
const struct GNUNET_HashCode *session_hash,
struct TALER_MINTDB_RefreshCommitCoin *const* commit_coin,
- struct TALER_MINTDB_RefreshCommitLinkP *const* commit_link)
+ struct TALER_RefreshCommitLinkP *const* commit_link)
{
unsigned int i;
struct TMH_KS_StateHandle *key_state;
@@ -324,7 +324,7 @@ free_commit_coins (struct TALER_MINTDB_RefreshCommitCoin **commit_coin,
* @param num_old_coins size of 2nd dimension
*/
static void
-free_commit_links (struct TALER_MINTDB_RefreshCommitLinkP **commit_link,
+free_commit_links (struct TALER_RefreshCommitLinkP **commit_link,
unsigned int kappa,
unsigned int num_old_coins)
{
@@ -378,7 +378,7 @@ handle_refresh_melt_json (struct MHD_Connection *connection,
struct GNUNET_HashCode session_hash;
struct GNUNET_HashContext *hash_context;
struct TALER_MINTDB_RefreshCommitCoin *commit_coin[TALER_CNC_KAPPA];
- struct TALER_MINTDB_RefreshCommitLinkP *commit_link[TALER_CNC_KAPPA];
+ struct TALER_RefreshCommitLinkP *commit_link[TALER_CNC_KAPPA];
/* For the signature check, we hash most of the inputs together
(except for the signatures on the coins). */
@@ -532,10 +532,10 @@ handle_refresh_melt_json (struct MHD_Connection *connection,
for (i = 0; i < TALER_CNC_KAPPA; i++)
{
commit_link[i] = GNUNET_malloc (num_oldcoins *
- sizeof (struct TALER_MINTDB_RefreshCommitLinkP));
+ sizeof (struct TALER_RefreshCommitLinkP));
for (j = 0; j < num_oldcoins; j++)
{
- struct TALER_MINTDB_RefreshCommitLinkP *rcl = &commit_link[i][j];
+ struct TALER_RefreshCommitLinkP *rcl = &commit_link[i][j];
res = TMH_PARSE_navigate_json (connection,
transfer_pubs,
@@ -582,7 +582,7 @@ handle_refresh_melt_json (struct MHD_Connection *connection,
GNUNET_CRYPTO_hash_context_read (hash_context,
rcl,
- sizeof (struct TALER_MINTDB_RefreshCommitLinkP));
+ sizeof (struct TALER_RefreshCommitLinkP));
}
}
diff --git a/src/mint/taler-mint-httpd_responses.c b/src/mint/taler-mint-httpd_responses.c
index 0e2f90709..9a6813f1d 100644
--- a/src/mint/taler-mint-httpd_responses.c
+++ b/src/mint/taler-mint-httpd_responses.c
@@ -900,7 +900,7 @@ TMH_RESPONSE_reply_refresh_reveal_missmatch (struct MHD_Connection *connection,
info_link_k = json_array ();
for (i=0;i<mc->num_newcoins;i++)
{
- const struct TALER_MINTDB_RefreshCommitLinkP *cl;
+ const struct TALER_RefreshCommitLinkP *cl;
json_t *cl_json;
cl = &mc->commit_links[k][i];
diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c
index 57455fcce..658d8dd90 100644
--- a/src/mintdb/plugin_mintdb_postgres.c
+++ b/src/mintdb/plugin_mintdb_postgres.c
@@ -2640,7 +2640,7 @@ postgres_insert_refresh_commit_links (void *cls,
const struct GNUNET_HashCode *session_hash,
uint16_t cnc_index,
uint16_t num_links,
- const struct TALER_MINTDB_RefreshCommitLinkP *links)
+ const struct TALER_RefreshCommitLinkP *links)
{
// FIXME: check logic! links is array!
struct TALER_PQ_QueryParam params[] = {
@@ -2693,7 +2693,7 @@ postgres_get_refresh_commit_links (void *cls,
const struct GNUNET_HashCode *session_hash,
uint16_t cnc_index,
uint16_t num_links,
- struct TALER_MINTDB_RefreshCommitLinkP *links)
+ struct TALER_RefreshCommitLinkP *links)
{
// FIXME: check logic: was written for a single link!
struct TALER_PQ_QueryParam params[] = {
@@ -2801,7 +2801,7 @@ postgres_get_melt_commitment (void *cls,
goto cleanup;
mc->commit_links[cnc_index]
= GNUNET_malloc (mc->num_oldcoins *
- sizeof (struct TALER_MINTDB_RefreshCommitLinkP));
+ sizeof (struct TALER_RefreshCommitLinkP));
if (GNUNET_OK !=
postgres_get_refresh_commit_links (cls,
session,
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 19:50:21 +0000