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)
downloadexchange-c7b7da5a19b78c82db9dc66c5dba5984f0ace937.tar.gz
exchange-c7b7da5a19b78c82db9dc66c5dba5984f0ace937.zip
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,
372 const struct MintKeyState *key_state, 372 const struct MintKeyState *key_state,
373 const struct GNUNET_CRYPTO_EddsaPublicKey *session_pub, 373 const struct GNUNET_CRYPTO_EddsaPublicKey *session_pub,
374 unsigned int denom_pubs_count, 374 unsigned int denom_pubs_count,
375 const struct GNUNET_CRYPTO_rsa_PublicKey **denom_pubs, 375 struct GNUNET_CRYPTO_rsa_PublicKey *const*denom_pubs,
376 struct TALER_Amount *r_amount) 376 struct TALER_Amount *r_amount)
377{ 377{
378 unsigned int i; 378 unsigned int i;
@@ -551,7 +551,7 @@ int
551TALER_MINT_db_execute_refresh_melt (struct MHD_Connection *connection, 551TALER_MINT_db_execute_refresh_melt (struct MHD_Connection *connection,
552 const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub, 552 const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
553 unsigned int num_new_denoms, 553 unsigned int num_new_denoms,
554 const struct GNUNET_CRYPTO_rsa_PublicKey **denom_pubs, 554 struct GNUNET_CRYPTO_rsa_PublicKey *const*denom_pubs,
555 unsigned int coin_count, 555 unsigned int coin_count,
556 const struct TALER_CoinPublicInfo *coin_public_infos) 556 const struct TALER_CoinPublicInfo *coin_public_infos)
557{ 557{
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
93TALER_MINT_db_execute_refresh_melt (struct MHD_Connection *connection, 93TALER_MINT_db_execute_refresh_melt (struct MHD_Connection *connection,
94 const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub, 94 const struct GNUNET_CRYPTO_EddsaPublicKey *refresh_session_pub,
95 unsigned int num_new_denoms, 95 unsigned int num_new_denoms,
96 const struct GNUNET_CRYPTO_rsa_PublicKey **denom_pubs, 96 struct GNUNET_CRYPTO_rsa_PublicKey *const*denom_pubs,
97 unsigned int coin_count, 97 unsigned int coin_count,
98 const struct TALER_CoinPublicInfo *coin_public_infos); 98 const struct TALER_CoinPublicInfo *coin_public_infos);
99 99
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,
251 json_t *new_denoms; 251 json_t *new_denoms;
252 unsigned int num_new_denoms; 252 unsigned int num_new_denoms;
253 unsigned int i; 253 unsigned int i;
254 struct GNUNET_CRYPTO_rsa_PublicKey *denom_pubs; 254 struct GNUNET_CRYPTO_rsa_PublicKey **denom_pubs;
255 json_t *melt_coins; 255 json_t *melt_coins;
256 struct TALER_CoinPublicInfo *coin_public_infos; 256 struct TALER_CoinPublicInfo *coin_public_infos;
257 unsigned int coin_count; 257 unsigned int coin_count;
@@ -541,7 +541,7 @@ TALER_MINT_handler_refresh_commit (struct RequestHandler *rh,
541 sizeof (struct RefreshCommitCoin)); 541 sizeof (struct RefreshCommitCoin));
542 for (j = 0; j < num_newcoins; j++) 542 for (j = 0; j < num_newcoins; j++)
543 { 543 {
544 char *link_end; 544 char *link_enc;
545 size_t link_enc_size; 545 size_t link_enc_size;
546 546
547 res = GNUNET_MINT_parse_navigate_json (connection, root, 547 res = GNUNET_MINT_parse_navigate_json (connection, root,
@@ -583,8 +583,8 @@ TALER_MINT_handler_refresh_commit (struct RequestHandler *rh,
583 583
584 584
585 GNUNET_CRYPTO_hash_context_read (hash_context, 585 GNUNET_CRYPTO_hash_context_read (hash_context,
586 commit_coin[i][j].link_enc, 586 link_enc,
587 TALER_REFRESH_LINK_LENGTH); 587 link_enc_size);
588 } 588 }
589 } 589 }
590 590
@@ -620,7 +620,7 @@ TALER_MINT_handler_refresh_commit (struct RequestHandler *rh,
620 JNAV_INDEX, (int) i, 620 JNAV_INDEX, (int) i,
621 JNAV_INDEX, (int) j, 621 JNAV_INDEX, (int) j,
622 JNAV_RET_DATA, 622 JNAV_RET_DATA,
623 &commit_link[i][j].shared_secret, 623 &commit_link[i][j].shared_secret_enc,
624 sizeof (struct GNUNET_HashCode)); 624 sizeof (struct GNUNET_HashCode));
625 625
626 if (GNUNET_OK != res) 626 if (GNUNET_OK != res)
@@ -631,7 +631,7 @@ TALER_MINT_handler_refresh_commit (struct RequestHandler *rh,
631 } 631 }
632 632
633 GNUNET_CRYPTO_hash_context_read (hash_context, 633 GNUNET_CRYPTO_hash_context_read (hash_context,
634 &commit_link[i][j].shared_secret, 634 &commit_link[i][j].shared_secret_enc,
635 sizeof (struct GNUNET_HashCode)); 635 sizeof (struct GNUNET_HashCode));
636 } 636 }
637 } 637 }