diff options
Diffstat (limited to 'src/exchange')
| -rw-r--r-- | src/exchange/taler-exchange-httpd.c | 8 | ||||
| -rw-r--r-- | src/exchange/test_taler_exchange_httpd.conf | 38 | ||||
| -rw-r--r-- | src/exchange/test_taler_exchange_unix.conf | 40 |
3 files changed, 43 insertions, 43 deletions
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index c357813b..5150b32c 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -517,8 +517,8 @@ proceed_with_handler (struct TEH_RequestContext *rc, sizeof (emsg), "Got %u/%u segments for %s request ('%s')", (NULL == args[i - 1]) - ? i - 1 - : i + ((NULL != fin) ? 1 : 0), + ? i - 1 + : i + ((NULL != fin) ? 1 : 0), rh->nargs, rh->url, url); @@ -1950,8 +1950,8 @@ run (void *cls, MHD_OPTION_CONNECTION_TIMEOUT, connection_timeout, (0 == allow_address_reuse) - ? MHD_OPTION_END - : MHD_OPTION_LISTENING_ADDRESS_REUSE, + ? MHD_OPTION_END + : MHD_OPTION_LISTENING_ADDRESS_REUSE, (unsigned int) allow_address_reuse, MHD_OPTION_END); if (NULL == mhd) diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf index 25938679..9bd4851f 100644 --- a/src/exchange/test_taler_exchange_httpd.conf +++ b/src/exchange/test_taler_exchange_httpd.conf @@ -70,7 +70,7 @@ PASSWORD = x WIRE_GATEWAY_URL = "http://localhost:8082/3/" # Coins for the tests. -[coin_eur_ct_1] +[coin_eur_ct_1_rsa] value = EUR:0.01 duration_withdraw = 7 days duration_spend = 2 years @@ -82,20 +82,19 @@ fee_refund = EUR:0.01 CIPHER = RSA rsa_keysize = 1024 -[coin_eur_ct_10] -value = EUR:0.10 +[coin_eur_ct_1_cs] +value = EUR:0.01 duration_withdraw = 7 days duration_spend = 2 years duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.03 +fee_withdraw = EUR:0.00 +fee_deposit = EUR:0.00 +fee_refresh = EUR:0.01 fee_refund = EUR:0.01 -CIPHER = RSA -rsa_keysize = 1024 +CIPHER = CS -[coin_eur_1] -value = EUR:1 +[coin_eur_ct_10_rsa] +value = EUR:0.10 duration_withdraw = 7 days duration_spend = 2 years duration_legal = 3 years @@ -106,19 +105,19 @@ fee_refund = EUR:0.01 CIPHER = RSA rsa_keysize = 1024 -[coin_eur_ct_2] -value = EUR:0.01 +[coin_eur_ct_10_cs] +value = EUR:0.10 duration_withdraw = 7 days duration_spend = 2 years duration_legal = 3 years -fee_withdraw = EUR:0.00 -fee_deposit = EUR:0.00 -fee_refresh = EUR:0.01 +fee_withdraw = EUR:0.01 +fee_deposit = EUR:0.01 +fee_refresh = EUR:0.03 fee_refund = EUR:0.01 CIPHER = CS -[coin_eur_ct_11] -value = EUR:0.10 +[coin_eur_1_rsa] +value = EUR:1 duration_withdraw = 7 days duration_spend = 2 years duration_legal = 3 years @@ -126,9 +125,10 @@ fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.03 fee_refund = EUR:0.01 -CIPHER = CS +CIPHER = RSA +rsa_keysize = 1024 -[coin_eur_2] +[coin_eur_1_cs] value = EUR:1 duration_withdraw = 7 days duration_spend = 2 years diff --git a/src/exchange/test_taler_exchange_unix.conf b/src/exchange/test_taler_exchange_unix.conf index 24e1a0fa..e96bfba3 100644 --- a/src/exchange/test_taler_exchange_unix.conf +++ b/src/exchange/test_taler_exchange_unix.conf @@ -70,7 +70,7 @@ TALER_BANK_AUTH_METHOD = NONE # Coins for the tests. -[coin_eur_ct_1] +[coin_eur_ct_1_rsa] value = EUR:0.01 duration_withdraw = 7 days duration_spend = 2 years @@ -82,20 +82,19 @@ fee_refund = EUR:0.01 CIPHER = RSA rsa_keysize = 1024 -[coin_eur_ct_10] -value = EUR:0.10 +[coin_eur_ct_1_cs] +value = EUR:0.01 duration_withdraw = 7 days duration_spend = 2 years duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.03 +fee_withdraw = EUR:0.00 +fee_deposit = EUR:0.00 +fee_refresh = EUR:0.01 fee_refund = EUR:0.01 -CIPHER = RSA -rsa_keysize = 1024 +CIPHER = CS -[coin_eur_1] -value = EUR:1 +[coin_eur_ct_10_rsa] +value = EUR:0.10 duration_withdraw = 7 days duration_spend = 2 years duration_legal = 3 years @@ -106,19 +105,19 @@ fee_refund = EUR:0.01 CIPHER = RSA rsa_keysize = 1024 -[coin_eur_ct_2] -value = EUR:0.01 +[coin_eur_ct_10_cs] +value = EUR:0.10 duration_withdraw = 7 days duration_spend = 2 years duration_legal = 3 years -fee_withdraw = EUR:0.00 -fee_deposit = EUR:0.00 -fee_refresh = EUR:0.01 +fee_withdraw = EUR:0.01 +fee_deposit = EUR:0.01 +fee_refresh = EUR:0.03 fee_refund = EUR:0.01 CIPHER = CS -[coin_eur_ct_11] -value = EUR:0.10 +[coin_eur_1_rsa] +value = EUR:1 duration_withdraw = 7 days duration_spend = 2 years duration_legal = 3 years @@ -126,9 +125,10 @@ fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.03 fee_refund = EUR:0.01 -CIPHER = CS +CIPHER = RSA +rsa_keysize = 1024 -[coin_eur_2] +[coin_eur_1_cs] value = EUR:1 duration_withdraw = 7 days duration_spend = 2 years @@ -137,4 +137,4 @@ fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.03 fee_refund = EUR:0.01 -CIPHER = CS
\ No newline at end of file +CIPHER = CS |