aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-01-27 18:57:29 +0100
committerChristian Grothoff <christian@grothoff.org>2015-01-27 18:57:29 +0100
commitc7b7da5a19b78c82db9dc66c5dba5984f0ace937 (patch)
tree1a0a4d0d8d691d6a24cb0cb20dedeeda54d1afe7
parentb05a5acc3cb737f9a06fcd6939f853c132de3714 (diff)
code now fully compiles again
-rw-r--r--src/mint/taler-mint-httpd_db.c4
-rw-r--r--src/mint/taler-mint-httpd_db.h2
-rw-r--r--src/mint/taler-mint-httpd_refresh.c12
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mint/taler-mint-httpd_db.c b/src/mint/taler-mint-httpd_db.c
index ee2634ace..9ddce104d 100644
--- a/src/mint/taler-mint-httpd_db.c
+++ b/src/mint/taler-mint-httpd_db.c
@@ -372,7 +372,7 @@ refresh_accept_denoms (struct MHD_Connection *connection,
const struct MintKeyState *key_state,
const struct GNUNET_CRYPTO_EddsaPublicKey *session_pub,
unsigned int denom_pubs_count,
- const struct GNUNET_CRYPTO_rsa_PublicKey **denom_pubs,
+ struct GNUNET_CRYPTO_rsa_PublicKey *const*denom_pubs,
struct TALER_Amount *r_amount)
{
unsigned int i;
@@ -551,7 +551,7 @@ int
TALER_MINT_db_execute_refresh_melt (struct MHD_Connection *connection,
const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
unsigned int num_new_denoms,
- const struct GNUNET_CRYPTO_rsa_PublicKey **denom_pubs,
+ struct GNUNET_CRYPTO_rsa_PublicKey *const*denom_pubs,
unsigned int coin_count,
const struct TALER_CoinPublicInfo *coin_public_infos)
{
diff --git a/src/mint/taler-mint-httpd_db.h b/src/mint/taler-mint-httpd_db.h
index 3f8c13414..bcec4521b 100644
--- a/src/mint/taler-mint-httpd_db.h
+++ b/src/mint/taler-mint-httpd_db.h
@@ -93,7 +93,7 @@ int
TALER_MINT_db_execute_refresh_melt (struct MHD_Connection *connection,
const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
unsigned int num_new_denoms,
- const struct GNUNET_CRYPTO_rsa_PublicKey **denom_pubs,
+ struct GNUNET_CRYPTO_rsa_PublicKey *const*denom_pubs,
unsigned int coin_count,
const struct TALER_CoinPublicInfo *coin_public_infos);
diff --git a/src/mint/taler-mint-httpd_refresh.c b/src/mint/taler-mint-httpd_refresh.c
index 42a224f32..057414a8f 100644
--- a/src/mint/taler-mint-httpd_refresh.c
+++ b/src/mint/taler-mint-httpd_refresh.c
@@ -251,7 +251,7 @@ TALER_MINT_handler_refresh_melt (struct RequestHandler *rh,
json_t *new_denoms;
unsigned int num_new_denoms;
unsigned int i;
- struct GNUNET_CRYPTO_rsa_PublicKey *denom_pubs;
+ struct GNUNET_CRYPTO_rsa_PublicKey **denom_pubs;
json_t *melt_coins;
struct TALER_CoinPublicInfo *coin_public_infos;
unsigned int coin_count;
@@ -541,7 +541,7 @@ TALER_MINT_handler_refresh_commit (struct RequestHandler *rh,
sizeof (struct RefreshCommitCoin));
for (j = 0; j < num_newcoins; j++)
{
- char *link_end;
+ char *link_enc;
size_t link_enc_size;
res = GNUNET_MINT_parse_navigate_json (connection, root,
@@ -583,8 +583,8 @@ TALER_MINT_handler_refresh_commit (struct RequestHandler *rh,
GNUNET_CRYPTO_hash_context_read (hash_context,
- commit_coin[i][j].link_enc,
- TALER_REFRESH_LINK_LENGTH);
+ link_enc,
+ link_enc_size);
}
}
@@ -620,7 +620,7 @@ TALER_MINT_handler_refresh_commit (struct RequestHandler *rh,
JNAV_INDEX, (int) i,
JNAV_INDEX, (int) j,
JNAV_RET_DATA,
- &commit_link[i][j].shared_secret,
+ &commit_link[i][j].shared_secret_enc,
sizeof (struct GNUNET_HashCode));
if (GNUNET_OK != res)
@@ -631,7 +631,7 @@ TALER_MINT_handler_refresh_commit (struct RequestHandler *rh,
}
GNUNET_CRYPTO_hash_context_read (hash_context,
- &commit_link[i][j].shared_secret,
+ &commit_link[i][j].shared_secret_enc,
sizeof (struct GNUNET_HashCode));
}
}