diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-02-11 18:00:20 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-02-11 18:00:20 +0100 |
| commit | 3b1e742dde4c386b38fc77147127b4bf6119d9e5 (patch) | |
| tree | 02eb79861294590a5182d2f9393dc81757204b66 /src/lib | |
| parent | 9f77398fe25bb041e58ddd4c994062493275e615 (diff) | |
-simplify: nonce no longer hashed
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/exchange_api_link.c | 15 | ||||
| -rw-r--r-- | src/lib/exchange_api_recoup.c | 19 | ||||
| -rw-r--r-- | src/lib/exchange_api_recoup_refresh.c | 21 |
3 files changed, 0 insertions, 55 deletions
diff --git a/src/lib/exchange_api_link.c b/src/lib/exchange_api_link.c index 2e3b01a63..6a904da1b 100644 --- a/src/lib/exchange_api_link.c +++ b/src/lib/exchange_api_link.c @@ -169,21 +169,6 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh, GNUNET_CRYPTO_eddsa_key_get_public (&lh->coin_priv.eddsa_priv, &old_coin_pub.eddsa_pub); - // FIXME-NEXT: this is probably the wrong 'ps'! - // However, the 'right' PS is not something the - // exchange could even give us. So probably we - // really need to change the derivation structure - // during refresh to derive the nonces differently - // and make /link possible! - /* FIXME: we cannot get the 'rms' here, and - if the TALER_coin_ev_hash() includes that 'nonce', - we are screwed on/link. */ -#if FIXME_OMIT - TALER_cs_refresh_nonce_derive ( - &ps, - coin_idx, - &pd.blinded_planchet.details.cs_blinded_planchet.nonce); -#endif TALER_coin_ev_hash (&pd.blinded_planchet, &pd.denom_pub_hash, &coin_envelope_hash); diff --git a/src/lib/exchange_api_recoup.c b/src/lib/exchange_api_recoup.c index 5ae0c55bb..a3ba18afd 100644 --- a/src/lib/exchange_api_recoup.c +++ b/src/lib/exchange_api_recoup.c @@ -329,25 +329,6 @@ TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange, &coin_sig), GNUNET_JSON_pack_data_auto ("coin_blind_key_secret", &bks)); - if (TALER_DENOMINATION_CS == denom_sig->cipher) - { - struct TALER_CsNonce nonce; - - // FIXME: add this to the spec! - /* NOTE: this is not elegant, and as per the note in TALER_coin_ev_hash() - it is not strictly clear that the nonce is needed. Best case would be - to find a way to include it more 'naturally' somehow, for example with - the variant union version of bks! */ - TALER_cs_withdraw_nonce_derive (ps, - &nonce); - GNUNET_assert ( - 0 == - json_object_set_new (recoup_obj, - "cs-nonce", - GNUNET_JSON_from_data_auto ( - &nonce))); - } - { char pub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2]; char *end; diff --git a/src/lib/exchange_api_recoup_refresh.c b/src/lib/exchange_api_recoup_refresh.c index 44b117b0a..517497067 100644 --- a/src/lib/exchange_api_recoup_refresh.c +++ b/src/lib/exchange_api_recoup_refresh.c @@ -333,27 +333,6 @@ TALER_EXCHANGE_recoup_refresh ( &coin_sig), GNUNET_JSON_pack_data_auto ("coin_blind_key_secret", &bks)); - - if (TALER_DENOMINATION_CS == denom_sig->cipher) - { - struct TALER_CsNonce nonce; - - // FIXME: add this to the spec! - /* NOTE: this is not elegant, and as per the note in TALER_coin_ev_hash() - it is not strictly clear that the nonce is needed. Best case would be - to find a way to include it more 'naturally' somehow, for example with - the variant union version of bks! */ - TALER_cs_refresh_nonce_derive (rms, - idx, - &nonce); - GNUNET_assert ( - 0 == - json_object_set_new (recoup_obj, - "cs-nonce", - GNUNET_JSON_from_data_auto ( - &nonce))); - } - { char pub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2]; char *end; |