commit d2393606d517676422e481d7e43431cfd5e7ffb3
parent c3db97acbd8ac8aaec6f334814e7685a8ced6b8b
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 26 May 2016 15:11:18 +0200
fix FTBFS from recent RSA blinding API change
Diffstat:
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
@@ -288,7 +288,7 @@ struct Command
/**
* Blinding key used for the operation.
*/
- struct TALER_DenominationBlindingKey blinding_key;
+ struct TALER_DenominationBlindingKeyP blinding_key;
/**
* Withdraw handle (while operation is running).
@@ -386,7 +386,7 @@ struct Command
* Handle to a /track/deposit operation
*/
struct TALER_MERCHANT_TrackDepositOperation *tdo;
-
+
} track_deposit;
} details;
@@ -1058,8 +1058,10 @@ interpreter_run (void *cls)
}
GNUNET_CRYPTO_eddsa_key_get_public (&cmd->details.reserve_withdraw.coin_priv.eddsa_priv,
&coin_pub.eddsa_pub);
- cmd->details.reserve_withdraw.blinding_key.rsa_blinding_key
- = GNUNET_CRYPTO_rsa_blinding_key_create (GNUNET_CRYPTO_rsa_public_key_len (cmd->details.reserve_withdraw.pk->key.rsa_public_key));
+ GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+ &cmd->details.reserve_withdraw.blinding_key,
+ sizeof (cmd->details.reserve_withdraw.blinding_key));
+
cmd->details.reserve_withdraw.wsh
= TALER_EXCHANGE_reserve_withdraw (exchange,
cmd->details.reserve_withdraw.pk,
@@ -1327,11 +1329,6 @@ do_shutdown (void *cls)
GNUNET_CRYPTO_rsa_signature_free (cmd->details.reserve_withdraw.sig.rsa_signature);
cmd->details.reserve_withdraw.sig.rsa_signature = NULL;
}
- if (NULL != cmd->details.reserve_withdraw.blinding_key.rsa_blinding_key)
- {
- GNUNET_CRYPTO_rsa_blinding_key_free (cmd->details.reserve_withdraw.blinding_key.rsa_blinding_key);
- cmd->details.reserve_withdraw.blinding_key.rsa_blinding_key = NULL;
- }
break;
case OC_CONTRACT:
if (NULL != cmd->details.contract.co)