diff options
| author | Lucien Heuzeveldt <lucienclaude.heuzeveldt@students.bfh.ch> | 2021-12-31 15:24:41 +0100 |
|---|---|---|
| committer | Gian Demarmels <gian@demarmels.org> | 2022-02-04 15:33:09 +0100 |
| commit | cf4fd36cc481d3af369a059df213ef00212046d5 (patch) | |
| tree | f284f4333baf80f7282b2d2dcf371e7a29bb0f54 /src/util/crypto.c | |
| parent | 4bcbd704df54515789239962ffe6d09864c285b0 (diff) | |
| download | exchange-cf4fd36cc481d3af369a059df213ef00212046d5.tar.gz exchange-cf4fd36cc481d3af369a059df213ef00212046d5.tar.bz2 exchange-cf4fd36cc481d3af369a059df213ef00212046d5.zip | |
remove varargs in cs crypto implementation
Diffstat (limited to 'src/util/crypto.c')
| -rw-r--r-- | src/util/crypto.c | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/src/util/crypto.c b/src/util/crypto.c index 1e5033a0c..2d3099a44 100644 --- a/src/util/crypto.c +++ b/src/util/crypto.c @@ -262,6 +262,7 @@ TALER_planchet_setup_random (struct TALER_PlanchetSecretsP *ps, GNUNET_break (0); return; case TALER_DENOMINATION_RSA: + // TODO: replace with call to TALER_blinding_secret_create GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG, &ps->blinding_key.rsa_bks, sizeof (struct @@ -278,10 +279,9 @@ TALER_planchet_setup_random (struct TALER_PlanchetSecretsP *ps, enum GNUNET_GenericReturnValue TALER_planchet_prepare (const struct TALER_DenominationPublicKey *dk, - const struct TALER_PlanchetSecretsP *ps, + struct TALER_PlanchetSecretsP *ps, struct TALER_CoinPubHash *c_hash, - struct TALER_PlanchetDetail *pd, - ...) + struct TALER_PlanchetDetail *pd) { struct TALER_CoinSpendPublicKeyP coin_pub; @@ -305,14 +305,6 @@ TALER_planchet_prepare (const struct TALER_DenominationPublicKey *dk, break; case TALER_DENOMINATION_CS: { - va_list ap; - va_start (ap, pd); - struct TALER_DenominationCsPublicR *r_pub; - struct TALER_DenominationCsPublicR *blinded_r_pub; - - r_pub = va_arg (ap, struct TALER_DenominationCsPublicR *); - blinded_r_pub = va_arg (ap, struct TALER_DenominationCsPublicR *); - if (GNUNET_OK != TALER_denom_blind (dk, &ps->blinding_key, @@ -320,14 +312,12 @@ TALER_planchet_prepare (const struct TALER_DenominationPublicKey *dk, &coin_pub, c_hash, &pd->blinded_planchet, - r_pub, - blinded_r_pub)) + &ps->cs_r_pub, + &ps->cs_r_pub_blinded)) { - va_end (ap); GNUNET_break (0); return GNUNET_SYSERR; } - va_end (ap); break; } default: @@ -342,13 +332,12 @@ TALER_planchet_prepare (const struct TALER_DenominationPublicKey *dk, enum GNUNET_GenericReturnValue -TALER_planchet_to_coin ( - const struct TALER_DenominationPublicKey *dk, - const struct TALER_BlindedDenominationSignature *blind_sig, - const struct TALER_PlanchetSecretsP *ps, - const struct TALER_CoinPubHash *c_hash, - struct TALER_FreshCoin *coin, - ...) +TALER_planchet_to_coin (const struct TALER_DenominationPublicKey *dk, + const struct + TALER_BlindedDenominationSignature *blind_sig, + const struct TALER_PlanchetSecretsP *ps, + const struct TALER_CoinPubHash *c_hash, + struct TALER_FreshCoin *coin) { struct TALER_DenominationSignature sig; @@ -367,23 +356,16 @@ TALER_planchet_to_coin ( break; case TALER_DENOMINATION_CS: { - va_list ap; - va_start (ap, coin); - - struct TALER_DenominationCsPublicR *r_pub_blind; - r_pub_blind = va_arg (ap, struct TALER_DenominationCsPublicR *); if (GNUNET_OK != TALER_denom_sig_unblind (&sig, blind_sig, &ps->blinding_key, dk, - r_pub_blind)) + &ps->cs_r_pub_blinded)) { GNUNET_break_op (0); - va_end (ap); return GNUNET_SYSERR; } - va_end (ap); } break; default: |