taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'ar14' of ssh://git.kesim.org/taler/exchange into ar14

Browse Source
This commit is contained in:
Özgür Kesim 2022-02-02 14:58:26 +01:00
commit 096834aa28
Signed by: oec
GPG Key ID: 3D76A56D79EDD9D7
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/exchange_api_common.c
View File

@ -588,19 +588,24 @@ TALER_EXCHANGE_verify_coin_history (
}
}
if (GNUNET_OK !=
TALER_wallet_melt_verify (&amount,
&fee,
&rc,
h_denom_pub,
TALER_AgeCommitmentHash_isNullOrZero (
&h_age_commitment) ?
NULL : &h_age_commitment,
coin_pub,
&sig))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
const struct TALER_AgeCommitmentHash *ahc = &h_age_commitment;
if (TALER_AgeCommitmentHash_isNullOrZero (ahc))
ahc = NULL;
if (GNUNET_OK !=
TALER_wallet_melt_verify (&amount,
&fee,
&rc,
h_denom_pub,
ahc,
coin_pub,
&sig))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
}
add = GNUNET_YES;
}

2
src/lib/exchange_api_refreshes_reveal.c
View File

@ -361,7 +361,7 @@ TALER_EXCHANGE_refreshes_reveal (
if (GNUNET_OK !=
TALER_planchet_prepare (&md->fresh_pks[i],
&md->fresh_coins[noreveal_index][i],
NULL, /* FIXME-oec: struct TALER_AgeCommitmentHash * */
NULL, /* FIXME-oec */
&c_hash,
&pd))
{

24
src/util/crypto.c
View File

@ -88,12 +88,18 @@ TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info,
GNUNET_memcmp (&d_hash,
&coin_public_info->denom_pub_hash));
#endif
// FIXME-Oec: replace with function that
// also hashes the age vector if we have
// one!
GNUNET_CRYPTO_hash (&coin_public_info->coin_pub,
sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
&c_hash.hash);
{
const struct TALER_AgeCommitmentHash *pahc =
&coin_public_info->age_commitment_hash;
if (TALER_AgeCommitmentHash_isNullOrZero (pahc))
pahc = NULL;
TALER_coin_pub_hash (&coin_public_info->coin_pub,
pahc,
&c_hash);
}
if (GNUNET_OK !=
TALER_denom_pub_verify (denom_pub,
&coin_public_info->denom_sig,
@ -330,7 +336,7 @@ TALER_coin_pub_hash (const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct TALER_AgeCommitmentHash *ach,
struct TALER_CoinPubHash *coin_h)
{
if (NULL == ach)
if (TALER_AgeCommitmentHash_isNullOrZero (ach))
{
/* No age commitment was set */
GNUNET_CRYPTO_hash (&coin_pub->eddsa_pub,
@ -395,7 +401,7 @@ TALER_age_restriction_derive (
const uint32_t seed,
const struct TALER_AgeCommitment *derived)
{
/* TODO */
/* TODO oec */
}
@ -406,7 +412,7 @@ TALER_age_restriction_commit (
const uint32_t seed,
struct TALER_AgeCommitment *commitment)
{
/* TODO */
/* TODO oec */
}