diff options
author | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
---|---|---|
committer | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
commit | a67786078bb3617ea8d4d308b21781fd0a1c2258 (patch) | |
tree | 67d476fe3e096001997f6de77d1db92bcd643bbb /src/exchange/taler-exchange-httpd_recoup.c | |
parent | 8674f32aec8113ced6b2c2be625728b31158fff8 (diff) | |
download | exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.tar.gz exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.tar.bz2 exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.zip |
resolves merge conflicts
Diffstat (limited to 'src/exchange/taler-exchange-httpd_recoup.c')
-rw-r--r-- | src/exchange/taler-exchange-httpd_recoup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/exchange/taler-exchange-httpd_recoup.c b/src/exchange/taler-exchange-httpd_recoup.c index 1978b58d0..416eaf69d 100644 --- a/src/exchange/taler-exchange-httpd_recoup.c +++ b/src/exchange/taler-exchange-httpd_recoup.c @@ -243,9 +243,6 @@ verify_and_execute_recoup ( } { - //FIXME: - void *coin_ev; - size_t coin_ev_size; struct TALER_CoinPubHash c_hash; struct TALER_BlindedPlanchet blinded_planchet; @@ -254,7 +251,7 @@ verify_and_execute_recoup ( coin_bks, NULL, /* FIXME-Oec: TALER_AgeHash * */ &coin->coin_pub, - NULL, /* in RSA Case not needed*/ + NULL, /* FIXME: handle CS */ &c_hash, &blinded_planchet)) { |