resolves merge conflicts

1 files changed, 6 insertions, 12 deletions

diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
index eba8efbda..95ec55b25 100644
--- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
@@ -510,23 +510,17 @@ resolve_refreshes_reveal_denominations (struct MHD_Connection *connection,
   for (unsigned int i = 0; i<rctx->num_fresh_coins; i++)
   {
     enum TALER_ErrorCode ec = TALER_EC_NONE;
-    //FIXME:
+    struct TEH_SignDetails sign_details;
 
+    // FIXME: implement cipher handling
+    sign_details.cipher = TALER_DENOMINATION_RSA;
+    sign_details.details.rsa_message.msg = rcds[i].coin_ev;
+    sign_details.details.rsa_message.msg_size = rcds[i].coin_ev_size;
     rrcs[i].coin_sig
       = TEH_keys_denomination_sign (
           &rrcs[i].h_denom_pub,
-          rcds[i].coin_ev,
-          rcds[i].coin_ev_size,
+          &sign_details,
           &ec);
-    struct TEH_SignDetails sign_details;
-
-    // FIXME: implement cipher handling
-    sign_details.cipher = TALER_DENOMINATION_RSA;
-    sign_details.details.rsa_message.msg = rctx->rcds[i].coin_ev;
-    sign_details.details.rsa_message.msg_size = rctx->rcds[i].coin_ev_size;
-    rctx->ev_sigs[i] = TEH_keys_denomination_sign (&dk_h[i],
-                                                   &sign_details,
-                                                   &ec);
     if (TALER_EC_NONE != ec)
     {
       GNUNET_break (0);