diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-11-17 16:52:29 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-11-17 16:52:29 +0100 |
| commit | a1de67c3e70ac52d65794ce3ae5228c11e42e3c1 (patch) | |
| tree | c04ccc9fb78979d8f8da93efddf8513708bef198 /src/backend/taler-merchant-httpd_contract.c | |
| parent | f95cfd95547a96c2d398dc1032b2e6071185c848 (diff) | |
| parent | 965cefde1f05541ac113ad37bc798d1e8f115293 (diff) | |
| download | merchant-a1de67c3e70ac52d65794ce3ae5228c11e42e3c1.tar.gz merchant-a1de67c3e70ac52d65794ce3ae5228c11e42e3c1.tar.bz2 merchant-a1de67c3e70ac52d65794ce3ae5228c11e42e3c1.zip | |
update documentation and logic for checkout page
Diffstat (limited to 'src/backend/taler-merchant-httpd_contract.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_contract.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c index e4b556a4..c42a8b37 100644 --- a/src/backend/taler-merchant-httpd_contract.c +++ b/src/backend/taler-merchant-httpd_contract.c @@ -35,15 +35,10 @@ #include "merchant_db.h" #include "merchant.h" #include "taler_merchant_lib.h" +#include "taler-merchant-httpd.h" -extern struct MERCHANT_Mint *mints; extern struct MERCHANT_Auditor *auditors; -extern struct GNUNET_CRYPTO_EddsaPrivateKey privkey; -extern const struct MERCHANT_WIREFORMAT_Sepa *wire; -extern unsigned int nmints; extern unsigned int nauditors; -extern PGconn *db_conn; -extern long long salt; /** * Manage a contract request. In practical terms, it adds the fields 'mints', @@ -148,7 +143,7 @@ MH_handler_contract (struct TMH_RequestHandler *rh, "H_wire", TALER_json_from_data (&h_wire, sizeof (h_wire))); - GNUNET_CRYPTO_eddsa_key_get_public (&privkey, &pubkey); + GNUNET_CRYPTO_eddsa_key_get_public (privkey, &pubkey); json_object_set_new (root, "merchant_pub", TALER_json_from_data (&pubkey, sizeof (pubkey))); @@ -158,7 +153,7 @@ MH_handler_contract (struct TMH_RequestHandler *rh, GNUNET_CRYPTO_hash (contract_str, strlen (contract_str), &contract.h_contract); contract.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_CONTRACT); contract.purpose.size = htonl (sizeof (contract)); - GNUNET_CRYPTO_eddsa_sign (&privkey, &contract.purpose, &contract_sig); + GNUNET_CRYPTO_eddsa_sign (privkey, &contract.purpose, &contract_sig); return TMH_RESPONSE_reply_json_pack (connection, MHD_HTTP_OK, |