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

wq

Browse Source 
Merge branch 'master' of git+ssh://taler.net/var/git/mint
This commit is contained in:
Christian Grothoff 2015-06-18 16:38:47 +02:00
commit 37bf816873
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mint-tools/taler-mint-keyup.c
View File

@ -555,9 +555,9 @@ mint_keys_update_signkeys ()
&signkey_issue); &signkey_issue);
nwrite = GNUNET_DISK_fn_write (skf, nwrite = GNUNET_DISK_fn_write (skf,
&signkey_issue, &signkey_issue,
sizeof (struct TALER_MintSigningKeyValidityPS), sizeof (struct TALER_MINTDB_PrivateSigningKeyInformationP),
GNUNET_DISK_PERM_USER_WRITE | GNUNET_DISK_PERM_USER_READ); GNUNET_DISK_PERM_USER_WRITE | GNUNET_DISK_PERM_USER_READ);
if (nwrite != sizeof (struct TALER_MintSigningKeyValidityPS)) if (sizeof (struct TALER_MINTDB_PrivateSigningKeyInformationP) != nwrite)
{ {
fprintf (stderr, fprintf (stderr,
"Failed to write to file `%s': %s\n", "Failed to write to file `%s': %s\n",

11
src/mintdb/mintdb_keyio.c
View File

@ -44,9 +44,8 @@ struct SignkeysIterateContext
/** /**
* Function called on each file in the directory with * Function called on each file in the directory with our signing
* our signing keys. Parses the file and calls the * keys. Parses the file and calls the iterator from @a cls.
* iterator from @a cls.
* *
* @param cls the `struct SignkeysIterateContext *` * @param cls the `struct SignkeysIterateContext *`
* @param filename name of the file to parse * @param filename name of the file to parse
@ -68,8 +67,10 @@ signkeys_iterate_dir_iter (void *cls,
if (nread != sizeof (struct TALER_MINTDB_PrivateSigningKeyInformationP)) if (nread != sizeof (struct TALER_MINTDB_PrivateSigningKeyInformationP))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Invalid signkey file `%s': wrong size\n", "Invalid signkey file `%s': wrong size (%d, expected %u)\n",
filename); filename,
(int) nread,
sizeof (struct TALER_MINTDB_PrivateSigningKeyInformationP));
return GNUNET_OK; return GNUNET_OK;
} }
return skc->it (skc->it_cls, return skc->it (skc->it_cls,