commit 5d4fba082281c51d1972f1038f4f9fcd777d5bf7
parent 447447e584b50bbfabb9b6a43d4c083aa653828e
Author: Özgür Kesim <oec@codeblau.de>
Date: Sun, 25 Oct 2026 17:07:49 +0100
[exchange] v45: accept and reveal all commitment versions (#11862)
/melt checks the current commitment first, then the one without
transfer pubs.
Diffstat:
3 files changed, 96 insertions(+), 50 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_get-config.h b/src/exchange/taler-exchange-httpd_get-config.h
@@ -41,7 +41,7 @@
*
* Returned via both /config and /keys endpoints.
*/
-#define EXCHANGE_PROTOCOL_VERSION "42:0:8"
+#define EXCHANGE_PROTOCOL_VERSION "45:0:11"
/**
diff --git a/src/exchange/taler-exchange-httpd_post-melt.c b/src/exchange/taler-exchange-httpd_post-melt.c
@@ -932,54 +932,54 @@ static void
phase_check_coin_signature (
struct MeltContext *mc)
{
+ struct TALER_KappaHashBlindedPlanchetsP k_bps_h = {0};
+
/* We can now compute the commitment */
+ for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
+ TALER_wallet_blinded_planchets_hash (
+ mc->request.refresh.num_coins,
+ mc->request.planchets[k],
+ mc->request.denoms_h,
+ &k_bps_h.tuple[k]);
+
+ if (mc->request.refresh.is_v27_refresh)
+ {
+ mc->request.refresh.rc_version
+ = TALER_REFRESH_COMMITMENT_VERSION_LEGACY_V27;
+ TALER_refresh_get_commitment_legacy_v27 (
+ &mc->request.refresh.rc,
+ &mc->request.refresh.refresh_seed,
+ mc->request.refresh.no_blinding_seed
+ ? NULL
+ : &mc->request.refresh.blinding_seed,
+ &k_bps_h,
+ &mc->request.refresh.coin.coin_pub,
+ &mc->request.refresh.amount_with_fee);
+ }
+ else
{
- struct TALER_KappaHashBlindedPlanchetsP k_bps_h = {0};
- struct TALER_KappaTransferPublicKeys k_transfer_pubs = {0};
+ struct TALER_KappaTransferPublicKeys k_transfer_pubs = {
+ .num_transfer_pubs = mc->request.refresh.num_coins
+ };
for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
- TALER_wallet_blinded_planchets_hash (
- mc->request.refresh.num_coins,
- mc->request.planchets[k],
- mc->request.denoms_h,
- &k_bps_h.tuple[k]);
-
- if (! mc->request.refresh.is_v27_refresh)
- {
- k_transfer_pubs.num_transfer_pubs = mc->request.refresh.num_coins;
- for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
- k_transfer_pubs.batch[k] = mc->request.transfer_pubs[k];
- }
-
+ k_transfer_pubs.batch[k] = mc->request.transfer_pubs[k];
mc->request.refresh.rc_version
- = mc->request.refresh.is_v27_refresh
- ? TALER_REFRESH_COMMITMENT_VERSION_LEGACY_V27
- : TALER_REFRESH_COMMITMENT_VERSION_CURRENT;
- if (mc->request.refresh.is_v27_refresh)
- TALER_refresh_get_commitment_legacy_v27 (
- &mc->request.refresh.rc,
- &mc->request.refresh.refresh_seed,
- mc->request.refresh.no_blinding_seed
- ? NULL
- : &mc->request.refresh.blinding_seed,
- &k_bps_h,
- &mc->request.refresh.coin.coin_pub,
- &mc->request.refresh.amount_with_fee);
- else
- TALER_refresh_get_commitment (
- &mc->request.refresh.rc,
- &mc->request.refresh.refresh_seed,
- mc->request.refresh.no_blinding_seed
- ? NULL
- : &mc->request.refresh.blinding_seed,
- &k_transfer_pubs,
- &k_bps_h,
- &mc->request.refresh.coin.coin_pub,
- &mc->request.refresh.amount_with_fee);
+ = TALER_REFRESH_COMMITMENT_VERSION_CURRENT;
+ TALER_refresh_get_commitment (
+ &mc->request.refresh.rc,
+ &mc->request.refresh.refresh_seed,
+ mc->request.refresh.no_blinding_seed
+ ? NULL
+ : &mc->request.refresh.blinding_seed,
+ &k_transfer_pubs,
+ &k_bps_h,
+ &mc->request.refresh.coin.coin_pub,
+ &mc->request.refresh.amount_with_fee);
}
TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
- if (GNUNET_OK !=
+ if (GNUNET_OK ==
TALER_wallet_melt_verify (
&mc->request.refresh.amount_with_fee,
&mc->melted_coin_denom->meta.fees.refresh,
@@ -989,13 +989,44 @@ phase_check_coin_signature (
&mc->request.refresh.coin.coin_pub,
&mc->request.refresh.coin_sig))
{
- GNUNET_break_op (0);
- SET_ERROR (mc,
- MELT_ERROR_COIN_SIGNATURE_INVALID);
+ mc->phase++;
return;
}
-
- mc->phase++;
+ if (TALER_REFRESH_COMMITMENT_VERSION_CURRENT ==
+ mc->request.refresh.rc_version)
+ {
+ /* Clients from before #11862 sent the transfer public keys but did
+ not include them in the commitment. We still accept those melts,
+ until a later protocol version drops them. */
+ TALER_refresh_get_commitment_legacy_vDOLDPLUS_broken (
+ &mc->request.refresh.rc,
+ &mc->request.refresh.refresh_seed,
+ mc->request.refresh.no_blinding_seed
+ ? NULL
+ : &mc->request.refresh.blinding_seed,
+ &k_bps_h,
+ &mc->request.refresh.coin.coin_pub,
+ &mc->request.refresh.amount_with_fee);
+ TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+ if (GNUNET_OK ==
+ TALER_wallet_melt_verify (
+ &mc->request.refresh.amount_with_fee,
+ &mc->melted_coin_denom->meta.fees.refresh,
+ &mc->request.refresh.rc,
+ &mc->request.refresh.coin.denom_pub_hash,
+ &mc->request.refresh.coin.h_age_commitment,
+ &mc->request.refresh.coin.coin_pub,
+ &mc->request.refresh.coin_sig))
+ {
+ mc->request.refresh.rc_version
+ = TALER_REFRESH_COMMITMENT_VERSION_LEGACY_VDOLDPLUS_BROKEN;
+ mc->phase++;
+ return;
+ }
+ }
+ GNUNET_break_op (0);
+ SET_ERROR (mc,
+ MELT_ERROR_COIN_SIGNATURE_INVALID);
}
diff --git a/src/exchange/taler-exchange-httpd_post-reveal-melt.c b/src/exchange/taler-exchange-httpd_post-reveal-melt.c
@@ -643,8 +643,9 @@ verify_commitment (
{
struct TALER_RefreshCommitmentP rc;
- if (rf->is_v27_refresh)
+ switch (rf->rc_version)
{
+ case TALER_REFRESH_COMMITMENT_VERSION_LEGACY_V27:
TALER_refresh_get_commitment_legacy_v27 (&rc,
&rf->refresh_seed,
rf->no_blinding_seed
@@ -653,9 +654,19 @@ verify_commitment (
&kappa_planchets_h,
&rf->coin.coin_pub,
&rf->amount_with_fee);
- }
- else
- {
+ break;
+ case TALER_REFRESH_COMMITMENT_VERSION_LEGACY_VDOLDPLUS_BROKEN:
+ TALER_refresh_get_commitment_legacy_vDOLDPLUS_broken (
+ &rc,
+ &rf->refresh_seed,
+ rf->no_blinding_seed
+ ? NULL
+ : &rf->blinding_seed,
+ &kappa_planchets_h,
+ &rf->coin.coin_pub,
+ &rf->amount_with_fee);
+ break;
+ case TALER_REFRESH_COMMITMENT_VERSION_CURRENT:
TALER_refresh_get_commitment (&rc,
&rf->refresh_seed,
rf->no_blinding_seed
@@ -665,6 +676,10 @@ verify_commitment (
&kappa_planchets_h,
&rf->coin.coin_pub,
&rf->amount_with_fee);
+ break;
+ default:
+ /* get_refresh() refuses unknown versions */
+ GNUNET_assert (0);
}
if (0 != GNUNET_CRYPTO_hash_cmp (