diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-03-15 18:08:04 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-03-15 18:08:04 +0100 |
| commit | 126cd5b3fff4a6d78400e16d121fd381c47e20af (patch) | |
| tree | 3f81d52968a59f409d4c079e2deb648cf8523a79 | |
| parent | af79e61f4deee64c9fbec443f37b8bcada8e5cd6 (diff) | |
identifying where key_io still needs to be adapted
| -rw-r--r-- | src/include/taler_signatures.h | 6 | ||||
| -rw-r--r-- | src/mint/key_io.c | 5 | ||||
| -rw-r--r-- | src/mint/key_io.h | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index b1b578236..c8e42add1 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -356,16 +356,14 @@ struct TALER_MINT_DenomKeyIssue struct GNUNET_TIME_AbsoluteNBO start; struct GNUNET_TIME_AbsoluteNBO expire_withdraw; 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 fee_withdraw; struct TALER_AmountNBO fee_deposit; struct TALER_AmountNBO fee_refresh; + // FIXME: does not work like this: + struct GNUNET_CRYPTO_rsa_PublicKey *denom_pub; }; - - GNUNET_NETWORK_STRUCT_END #endif diff --git a/src/mint/key_io.c b/src/mint/key_io.c index ad06da62d..98c4f5fff 100644 --- a/src/mint/key_io.c +++ b/src/mint/key_io.c @@ -71,7 +71,7 @@ signkeys_iterate_dir_iter (void *cls, if (nread != sizeof (struct TALER_MINT_SignKeyIssuePriv)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Invalid signkey file: `%s'\n", + "Invalid signkey file `%s': wrong size\n", filename); return GNUNET_OK; } @@ -137,6 +137,8 @@ TALER_MINT_read_denom_key (const char *filename, offset = sizeof (struct TALER_MINT_DenomKeyIssuePriv) - offsetof (struct TALER_MINT_DenomKeyIssuePriv, 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, &size, GNUNET_YES, @@ -319,7 +321,6 @@ TALER_MINT_denomkeys_iterate (const char *mint_base_dir, void *it_cls) { char *dir; - size_t len; struct DenomkeysIterateContext dic; int ret; diff --git a/src/mint/key_io.h b/src/mint/key_io.h index aa59213c3..2f3f5fead 100644 --- a/src/mint/key_io.h +++ b/src/mint/key_io.h @@ -39,6 +39,8 @@ #define DIR_DENOMKEYS "denomkeys" +GNUNET_NETWORK_STRUCT_BEGIN + /** * 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. @@ -58,6 +60,8 @@ struct TALER_MINT_SignKeyIssuePriv struct TALER_MINT_SignKeyIssue issue; }; +GNUNET_NETWORK_STRUCT_END + /** * All information about a denomination key (which is used to |