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

Merge branch 'master' of git.taler.net:/var/git/exchange

Browse Source
This commit is contained in:
Jeff Burdges 2016-03-21 15:19:43 +01:00
commit 2e0067d9dd
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange-lib/exchange_api_handle.c
View File

@ -260,7 +260,7 @@ parse_json_denomkey (struct TALER_EXCHANGE_DenomPublicKey *denom_key,
struct TALER_Amount fee_deposit; struct TALER_Amount fee_deposit;
struct TALER_Amount fee_refresh; struct TALER_Amount fee_refresh;
struct TALER_DenominationKeyValidityPS denom_key_issue; struct TALER_DenominationKeyValidityPS denom_key_issue;
struct GNUNET_CRYPTO_rsa_PublicKey *pk; struct GNUNET_CRYPTO_RsaPublicKey *pk;
struct GNUNET_CRYPTO_EddsaSignature sig; struct GNUNET_CRYPTO_EddsaSignature sig;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {

4
src/exchange-lib/exchange_api_refresh.c
View File

@ -1762,8 +1762,8 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshRevealHandle *rrh,
const struct FreshCoin *fc; const struct FreshCoin *fc;
struct TALER_DenominationPublicKey *pk; struct TALER_DenominationPublicKey *pk;
json_t *jsonai; json_t *jsonai;
struct GNUNET_CRYPTO_rsa_Signature *blind_sig; struct GNUNET_CRYPTO_RsaSignature *blind_sig;
struct GNUNET_CRYPTO_rsa_Signature *sig; struct GNUNET_CRYPTO_RsaSignature *sig;
struct TALER_CoinSpendPublicKeyP coin_pub; struct TALER_CoinSpendPublicKeyP coin_pub;
struct GNUNET_HashCode coin_hash; struct GNUNET_HashCode coin_hash;

4
src/exchange-lib/exchange_api_refresh_link.c
View File

@ -98,8 +98,8 @@ parse_refresh_link_coin (const struct TALER_EXCHANGE_RefreshLinkHandle *rlh,
{ {
void *link_enc; void *link_enc;
size_t link_enc_size; size_t link_enc_size;
struct GNUNET_CRYPTO_rsa_Signature *bsig; struct GNUNET_CRYPTO_RsaSignature *bsig;
struct GNUNET_CRYPTO_rsa_PublicKey *rpub; struct GNUNET_CRYPTO_RsaPublicKey *rpub;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_varsize ("link_enc", &link_enc, &link_enc_size), GNUNET_JSON_spec_varsize ("link_enc", &link_enc, &link_enc_size),
GNUNET_JSON_spec_rsa_public_key ("denom_pub", &rpub), GNUNET_JSON_spec_rsa_public_key ("denom_pub", &rpub),

4
src/exchange-lib/exchange_api_reserve.c
View File

@ -563,8 +563,8 @@ static int
reserve_withdraw_ok (struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh, reserve_withdraw_ok (struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh,
json_t *json) json_t *json)
{ {
struct GNUNET_CRYPTO_rsa_Signature *blind_sig; struct GNUNET_CRYPTO_RsaSignature *blind_sig;
struct GNUNET_CRYPTO_rsa_Signature *sig; struct GNUNET_CRYPTO_RsaSignature *sig;
struct TALER_DenominationSignature dsig; struct TALER_DenominationSignature dsig;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_rsa_signature ("ev_sig", &blind_sig), GNUNET_JSON_spec_rsa_signature ("ev_sig", &blind_sig),

6
src/exchange/taler-exchange-httpd_test.c
View File

@ -33,7 +33,7 @@
/** /**
* Private key the test module uses for signing. * Private key the test module uses for signing.
*/ */
static struct GNUNET_CRYPTO_rsa_PrivateKey *rsa_pk; static struct GNUNET_CRYPTO_RsaPrivateKey *rsa_pk;
/** /**
@ -415,7 +415,7 @@ TMH_TEST_handler_test_rsa_get (struct TMH_RequestHandler *rh,
size_t *upload_data_size) size_t *upload_data_size)
{ {
int res; int res;
struct GNUNET_CRYPTO_rsa_PublicKey *pub; struct GNUNET_CRYPTO_RsaPublicKey *pub;
if (NULL == rsa_pk) if (NULL == rsa_pk)
rsa_pk = GNUNET_CRYPTO_rsa_private_key_create (1024); rsa_pk = GNUNET_CRYPTO_rsa_private_key_create (1024);
@ -463,7 +463,7 @@ TMH_TEST_handler_test_rsa_sign (struct TMH_RequestHandler *rh,
{ {
json_t *json; json_t *json;
int res; int res;
struct GNUNET_CRYPTO_rsa_Signature *sig; struct GNUNET_CRYPTO_RsaSignature *sig;
void *in_ptr; void *in_ptr;
size_t in_ptr_size; size_t in_ptr_size;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {

2
src/exchangedb/exchangedb_keyio.c
View File

@ -128,7 +128,7 @@ TALER_EXCHANGEDB_denomination_key_read (const char *filename,
uint64_t size; uint64_t size;
size_t offset; size_t offset;
void *data; void *data;
struct GNUNET_CRYPTO_rsa_PrivateKey *priv; struct GNUNET_CRYPTO_RsaPrivateKey *priv;
if (GNUNET_OK != GNUNET_DISK_file_size (filename, if (GNUNET_OK != GNUNET_DISK_file_size (filename,
&size, &size,

4
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -3457,8 +3457,8 @@ postgres_get_link_data_list (void *cls,
for (i = 0; i < nrows; i++) for (i = 0; i < nrows; i++)
{ {
struct TALER_RefreshLinkEncrypted *link_enc; struct TALER_RefreshLinkEncrypted *link_enc;
struct GNUNET_CRYPTO_rsa_PublicKey *denom_pub; struct GNUNET_CRYPTO_RsaPublicKey *denom_pub;
struct GNUNET_CRYPTO_rsa_Signature *sig; struct GNUNET_CRYPTO_RsaSignature *sig;
void *ld_buf; void *ld_buf;
size_t ld_buf_size; size_t ld_buf_size;
struct GNUNET_PQ_ResultSpec rs[] = { struct GNUNET_PQ_ResultSpec rs[] = {

6
src/include/taler_crypto_lib.h
View File

@ -299,7 +299,7 @@ struct TALER_DenominationSignature
/** /**
* Taler uses RSA for blinding. * Taler uses RSA for blinding.
*/ */
struct GNUNET_CRYPTO_rsa_Signature *rsa_signature; struct GNUNET_CRYPTO_RsaSignature *rsa_signature;
}; };
@ -311,7 +311,7 @@ struct TALER_DenominationPublicKey
/** /**
* Taler uses RSA for signing coins. * Taler uses RSA for signing coins.
*/ */
struct GNUNET_CRYPTO_rsa_PublicKey *rsa_public_key; struct GNUNET_CRYPTO_RsaPublicKey *rsa_public_key;
}; };
@ -323,7 +323,7 @@ struct TALER_DenominationPrivateKey
/** /**
* Taler uses RSA for signing coins. * Taler uses RSA for signing coins.
*/ */
struct GNUNET_CRYPTO_rsa_PrivateKey *rsa_private_key; struct GNUNET_CRYPTO_RsaPrivateKey *rsa_private_key;
}; };