merchant

commit a99aa6da2be396404c8469ef2a50509b40917e09
parent dea8b5e2e565b368dd86b75c0165778c29510d17
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Mon, 26 Sep 2016 16:31:58 +0200

Adapting /pay and /contract to new TALER_ContractPS interface

Diffstat:
M
src/backend/taler-merchant-httpd_contract.c
 | 
1
+
M
src/backend/taler-merchant-httpd_pay.c
 | 
1
+
A
src/lib/tor_merchant.priv
 | 
2
++

3 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c
@@ -259,6 +259,7 @@ MH_handler_contract (struct TMH_RequestHandler *rh,
   GNUNET_assert (GNUNET_OK ==
                  TALER_JSON_hash (jcontract,
                                   &contract.h_contract));
+  contract.merchant_pub = mi->pubkey;
   GNUNET_CRYPTO_eddsa_sign (&mi->privkey.eddsa_priv,
                             &contract.purpose,
                             &contract_sig);
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
@@ -949,6 +949,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
     TALER_amount_hton (&cp.max_fee,
                        &pc->max_fee);
     cp.h_contract = pc->h_contract;
+    cp.merchant_pub = pc->mi->pubkey;
     if (GNUNET_OK !=
         GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_CONTRACT,
                                     &cp.purpose,
diff --git a/src/lib/tor_merchant.priv b/src/lib/tor_merchant.priv
@@ -0,0 +1 @@
+=¨³‚WÁË#K®-…ËzNÌ;qr®“o<{ënNºý
+\ No newline at end of file