fix format string issue in taler-wire, complete work on #5536 revocation file issue (shift location of revocation file and change content to include denom hash)

This commit is contained in:
Christian Grothoff 2019-03-03 00:35:21 +01:00
parent 4dea098f54
commit c3b9ebc1ef
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
5 changed files with 13 additions and 7 deletions

View File

@ -1,4 +1,5 @@
Sree Harsha Totakura <sreeharsha@totakura.in> Sree Harsha Totakura <sreeharsha@totakura.in>
Florian Dold Florian Dold <dold@taler.net>
Christian Grothoff <christian@grothoff.org> Marcello Stanisci <stanisci@taler.net>
Christian Grothoff <grothoff@taler.net>
Benedikt Mueller Benedikt Mueller

View File

@ -150,7 +150,8 @@ confirmation_cb (void *cls,
"The wire transfer didn't execute correctly.\n"); "The wire transfer didn't execute correctly.\n");
GNUNET_assert (NULL != emsg); GNUNET_assert (NULL != emsg);
fprintf (stderr, fprintf (stderr,
emsg); "%s",
emsg);
GNUNET_SCHEDULER_shutdown (); GNUNET_SCHEDULER_shutdown ();
return; return;
} }

View File

@ -1,6 +1,6 @@
/* /*
This file is part of TALER This file is part of TALER
Copyright (C) 2014, 2015, 2016, 2017 Inria & GNUnet e.V. Copyright (C) 2014--2019 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it under the TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software terms of the GNU General Public License as published by the Free Software

View File

@ -1,6 +1,6 @@
/* /*
This file is part of TALER This file is part of TALER
Copyright (C) 2014-2017 Inria & GNUnet e.V. Copyright (C) 2014-2019 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it under the TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software terms of the GNU General Public License as published by the Free Software
@ -386,7 +386,7 @@ revocations_iterate_cb (void *cls,
struct TALER_MasterDenominationKeyRevocationPS rm; struct TALER_MasterDenominationKeyRevocationPS rm;
/* Check if revocation is valid... */ /* Check if revocation is valid... */
if (sizeof (rm) != if (sizeof (rf) !=
GNUNET_DISK_fn_read (filename, GNUNET_DISK_fn_read (filename,
&rf, &rf,
sizeof (rf))) sizeof (rf)))
@ -443,6 +443,10 @@ TALER_EXCHANGEDB_revocations_iterate (const char *revocation_dir,
.master_pub = master_pub .master_pub = master_pub
}; };
if (GNUNET_OK !=
GNUNET_DISK_directory_create (revocation_dir))
return 0; /* directory doesn't exist and we couldn't even create it,
clearly means there are no revocations there */
return GNUNET_DISK_directory_scan (revocation_dir, return GNUNET_DISK_directory_scan (revocation_dir,
&revocations_iterate_cb, &revocations_iterate_cb,
&ric); &ric);

View File

@ -1,6 +1,6 @@
/* /*
This file is part of TALER This file is part of TALER
Copyright (C) 2015 GNUnet e.V. Copyright (C) 2015 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it under the TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software terms of the GNU General Public License as published by the Free Software