From 745719dbc1482734ab3ca7a20541ee8a12ecb69c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 5 Aug 2016 16:08:19 +0200 Subject: first half of changing refresh protocol to derive all key data from DH --- src/exchange/taler-exchange-httpd_responses.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'src/exchange/taler-exchange-httpd_responses.c') diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c index bbcdbe35f..b39b68a44 100644 --- a/src/exchange/taler-exchange-httpd_responses.c +++ b/src/exchange/taler-exchange-httpd_responses.c @@ -1028,7 +1028,7 @@ TMH_RESPONSE_reply_refresh_reveal_missmatch (struct MHD_Connection *connection, { json_t *info_commit_k; json_t *info_link_k; - const struct TALER_RefreshCommitLinkP *cl; + const struct TALER_TransferPublicKeyP *transfer_pub; info_commit_k = json_array (); for (i=0;inum_newcoins;i++) @@ -1042,13 +1042,6 @@ TMH_RESPONSE_reply_refresh_reveal_missmatch (struct MHD_Connection *connection, "coin_ev", GNUNET_JSON_from_data (cc->coin_ev, cc->coin_ev_size)); - json_object_set_new (cc_json, - "coin_priv_enc", - GNUNET_JSON_from_data_auto (cc->refresh_link.coin_priv_enc)); - json_object_set_new (cc_json, - "blinding_key_enc", - GNUNET_JSON_from_data_auto (&cc->refresh_link.blinding_key_enc)); - GNUNET_assert (0 == json_array_append_new (info_commit_k, cc_json)); @@ -1058,13 +1051,10 @@ TMH_RESPONSE_reply_refresh_reveal_missmatch (struct MHD_Connection *connection, info_commit_k)); info_link_k = json_object (); - cl = &mc->commit_links[k]; + transfer_pub = &mc->transfer_pubs[k]; json_object_set_new (info_link_k, "transfer_pub", - GNUNET_JSON_from_data_auto (&cl->transfer_pub)); - json_object_set_new (info_link_k, - "shared_secret_enc", - GNUNET_JSON_from_data_auto (&cl->shared_secret_enc)); + GNUNET_JSON_from_data_auto (transfer_pub)); GNUNET_assert (0 == json_array_append_new (info_links, info_link_k)); @@ -1113,9 +1103,6 @@ TMH_RESPONSE_reply_refresh_link_success (struct MHD_Connection *connection, json_t *obj; obj = json_object (); - json_object_set_new (obj, - "link_enc", - GNUNET_JSON_from_data_auto (&pos->link_data_enc)); json_object_set_new (obj, "denom_pub", GNUNET_JSON_from_rsa_public_key (pos->denom_pub.rsa_public_key)); @@ -1133,9 +1120,6 @@ TMH_RESPONSE_reply_refresh_link_success (struct MHD_Connection *connection, json_object_set_new (root, "transfer_pub", GNUNET_JSON_from_data_auto (&sessions[i].transfer_pub)); - json_object_set_new (root, - "secret_enc", - GNUNET_JSON_from_data_auto (&sessions[i].shared_secret_enc)); GNUNET_assert (0 == json_array_append_new (mlist, root)); -- cgit v1.2.3