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

identifying where key_io still needs to be adapted

Browse Source
This commit is contained in:
Christian Grothoff 2015-03-15 18:08:04 +01:00
parent af79e61f4d
commit 126cd5b3ff
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/taler_signatures.h
View File

@ -356,16 +356,14 @@ struct TALER_MINT_DenomKeyIssue
struct GNUNET_TIME_AbsoluteNBO start; struct GNUNET_TIME_AbsoluteNBO start;
struct GNUNET_TIME_AbsoluteNBO expire_withdraw; struct GNUNET_TIME_AbsoluteNBO expire_withdraw;
struct GNUNET_TIME_AbsoluteNBO expire_spend; struct GNUNET_TIME_AbsoluteNBO expire_spend;
// FIXME: does not work like this:
struct GNUNET_CRYPTO_rsa_PublicKey * denom_pub;
struct TALER_AmountNBO value; struct TALER_AmountNBO value;
struct TALER_AmountNBO fee_withdraw; struct TALER_AmountNBO fee_withdraw;
struct TALER_AmountNBO fee_deposit; struct TALER_AmountNBO fee_deposit;
struct TALER_AmountNBO fee_refresh; struct TALER_AmountNBO fee_refresh;
// FIXME: does not work like this:
struct GNUNET_CRYPTO_rsa_PublicKey *denom_pub;
}; };
GNUNET_NETWORK_STRUCT_END GNUNET_NETWORK_STRUCT_END
#endif #endif

5
src/mint/key_io.c
View File

@ -71,7 +71,7 @@ signkeys_iterate_dir_iter (void *cls,
if (nread != sizeof (struct TALER_MINT_SignKeyIssuePriv)) if (nread != sizeof (struct TALER_MINT_SignKeyIssuePriv))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Invalid signkey file: `%s'\n", "Invalid signkey file `%s': wrong size\n",
filename); filename);
return GNUNET_OK; return GNUNET_OK;
} }
@ -137,6 +137,8 @@ TALER_MINT_read_denom_key (const char *filename,
offset = sizeof (struct TALER_MINT_DenomKeyIssuePriv) offset = sizeof (struct TALER_MINT_DenomKeyIssuePriv)
- offsetof (struct TALER_MINT_DenomKeyIssuePriv, - offsetof (struct TALER_MINT_DenomKeyIssuePriv,
issue.signature); issue.signature);
/* FIXME: this is very wrong, does not support variable-size
encoding of RSA keys (private or public!) */
if (GNUNET_OK != GNUNET_DISK_file_size (filename, if (GNUNET_OK != GNUNET_DISK_file_size (filename,
&size, &size,
GNUNET_YES, GNUNET_YES,
@ -319,7 +321,6 @@ TALER_MINT_denomkeys_iterate (const char *mint_base_dir,
void *it_cls) void *it_cls)
{ {
char *dir; char *dir;
size_t len;
struct DenomkeysIterateContext dic; struct DenomkeysIterateContext dic;
int ret; int ret;

4
src/mint/key_io.h
View File

@ -39,6 +39,8 @@
#define DIR_DENOMKEYS "denomkeys" #define DIR_DENOMKEYS "denomkeys"
GNUNET_NETWORK_STRUCT_BEGIN
/** /**
* On disk format used for a mint signing key. Signing keys are used * On disk format used for a mint signing key. Signing keys are used
* by the mint to affirm its messages, but not to create coins. * by the mint to affirm its messages, but not to create coins.
@ -58,6 +60,8 @@ struct TALER_MINT_SignKeyIssuePriv
struct TALER_MINT_SignKeyIssue issue; struct TALER_MINT_SignKeyIssue issue;
}; };
GNUNET_NETWORK_STRUCT_END
/** /**
* All information about a denomination key (which is used to * All information about a denomination key (which is used to