diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-09-26 16:31:58 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-09-26 16:31:58 +0200 |
| commit | a99aa6da2be396404c8469ef2a50509b40917e09 (patch) | |
| tree | 50fc82df1ebdbcd68675fc52bf32a7bf5c62b6db | |
| parent | dea8b5e2e565b368dd86b75c0165778c29510d17 (diff) | |
Adapting /pay and /contract to new TALER_ContractPS interface
| -rw-r--r-- | src/backend/taler-merchant-httpd_contract.c | 1 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_pay.c | 1 | ||||
| -rw-r--r-- | src/lib/tor_merchant.priv | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c index 4dd67dd0..5522acc6 100644 --- 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 index 04f554a1..91024279 100644 --- 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 new file mode 100644 index 00000000..facd4dfa --- /dev/null +++ b/src/lib/tor_merchant.priv @@ -0,0 +1 @@ +=¨³‚ WÁË#K®-…Ëz NÌ;qr®“o<{ënNºý
\ No newline at end of file |