diff options
author | Christian Grothoff <christian@grothoff.org> | 2022-02-20 21:51:41 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2022-02-20 21:51:46 +0100 |
commit | 19624fd776f28812354f7e2b50b26e984ff077ab (patch) | |
tree | 625d0019650cb88d42bbf7f5ac0c1ef51fabac70 /src/util/test_helper_cs.c | |
parent | dbc5adba7f22fb9568be29479ac9cf19463d471f (diff) | |
download | exchange-19624fd776f28812354f7e2b50b26e984ff077ab.tar.xz |
-ensure different HKDF is used in melt vs. withdraw
Diffstat (limited to 'src/util/test_helper_cs.c')
-rw-r--r-- | src/util/test_helper_cs.c | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/src/util/test_helper_cs.c b/src/util/test_helper_cs.c index b6b72e2e1..c2708353d 100644 --- a/src/util/test_helper_cs.c +++ b/src/util/test_helper_cs.c @@ -289,7 +289,7 @@ test_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh) "Requesting R derivation with key %s\n", GNUNET_h2s (&keys[i].h_cs.hash)); alg_values.cipher = TALER_DENOMINATION_CS; - ec = TALER_CRYPTO_helper_cs_r_derive ( + ec = TALER_CRYPTO_helper_cs_r_derive_withdraw ( dh, &keys[i].h_cs, &pd.blinded_planchet.details.cs_blinded_planchet.nonce, @@ -381,10 +381,10 @@ test_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh) GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, &nonce, sizeof (nonce)); - ec = TALER_CRYPTO_helper_cs_r_derive (dh, - &rnd, - &nonce, - &crp); + ec = TALER_CRYPTO_helper_cs_r_derive_withdraw (dh, + &rnd, + &nonce, + &crp); if (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN != ec) { GNUNET_break (0); @@ -431,12 +431,13 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh) &pd.blinded_planchet.details. cs_blinded_planchet.nonce); alg_values.cipher = TALER_DENOMINATION_CS; - ec = TALER_CRYPTO_helper_cs_r_derive (dh, - &keys[i].h_cs, - &pd.blinded_planchet. - details. - cs_blinded_planchet.nonce, - &alg_values.details.cs_values); + ec = TALER_CRYPTO_helper_cs_r_derive_withdraw ( + dh, + &keys[i].h_cs, + &pd.blinded_planchet. + details. + cs_blinded_planchet.nonce, + &alg_values.details.cs_values); if (TALER_EC_NONE != ec) continue; TALER_planchet_setup_coin_priv (&ps, @@ -457,11 +458,12 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Requesting signature with key %s\n", GNUNET_h2s (&keys[i].h_cs.hash)); - ec = TALER_CRYPTO_helper_cs_sign (dh, - &keys[i].h_cs, - &pd.blinded_planchet.details. - cs_blinded_planchet, - &ds); + ec = TALER_CRYPTO_helper_cs_sign_withdraw ( + dh, + &keys[i].h_cs, + &pd.blinded_planchet.details. + cs_blinded_planchet, + &ds); } switch (ec) { @@ -556,11 +558,11 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh) &c_hash, &pd)); - ec = TALER_CRYPTO_helper_cs_sign (dh, - &rnd, - &pd.blinded_planchet.details. - cs_blinded_planchet, - &ds); + ec = TALER_CRYPTO_helper_cs_sign_withdraw ( + dh, + &rnd, + &pd.blinded_planchet.details.cs_blinded_planchet, + &ds); if (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN != ec) { if (TALER_EC_NONE == ec) @@ -622,12 +624,13 @@ perf_signing (struct TALER_CRYPTO_CsDenominationHelper *dh, &pd.blinded_planchet.details. cs_blinded_planchet.nonce); alg_values.cipher = TALER_DENOMINATION_CS; - ec = TALER_CRYPTO_helper_cs_r_derive (dh, - &keys[i].h_cs, - &pd.blinded_planchet. - details. - cs_blinded_planchet.nonce, - &alg_values.details.cs_values); + ec = TALER_CRYPTO_helper_cs_r_derive_melt ( + dh, + &keys[i].h_cs, + &pd.blinded_planchet. + details. + cs_blinded_planchet.nonce, + &alg_values.details.cs_values); if (TALER_EC_NONE != ec) continue; TALER_planchet_setup_coin_priv (&ps, @@ -650,11 +653,12 @@ perf_signing (struct TALER_CRYPTO_CsDenominationHelper *dh, struct GNUNET_TIME_Absolute start = GNUNET_TIME_absolute_get (); struct GNUNET_TIME_Relative delay; - ec = TALER_CRYPTO_helper_cs_sign (dh, - &keys[i].h_cs, - &pd.blinded_planchet.details. - cs_blinded_planchet, - &ds); + ec = TALER_CRYPTO_helper_cs_sign_melt ( + dh, + &keys[i].h_cs, + &pd.blinded_planchet.details. + cs_blinded_planchet, + &ds); if (TALER_EC_NONE != ec) break; delay = GNUNET_TIME_absolute_get_duration (start); |