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

Merge branch 'master' of ssh://taler.net/exchange

Browse Source
This commit is contained in:
Jeffrey Burdges 2017-05-18 14:12:03 +02:00
commit 7c4153d403
No known key found for this signature in database
GPG Key ID: ABAC7FD1CC100A74
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/exchangedb/exchangedb_auditorkeys.c
View File

@ -94,7 +94,6 @@ auditor_iter (void *cls,
const char *auditor_url; const char *auditor_url;
unsigned int dki_len; unsigned int dki_len;
size_t url_len; size_t url_len;
int ret;
if (GNUNET_OK != GNUNET_DISK_file_size (filename, if (GNUNET_OK != GNUNET_DISK_file_size (filename,
&size, &size,
@ -104,7 +103,7 @@ auditor_iter (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Skipping inaccessable auditor information file `%s'\n", "Skipping inaccessable auditor information file `%s'\n",
filename); filename);
return GNUNET_SYSERR; return GNUNET_OK;
} }
if (size < sizeof (struct AuditorFileHeaderP)) if (size < sizeof (struct AuditorFileHeaderP))
{ {
@ -121,7 +120,7 @@ auditor_iter (void *cls,
"read", "read",
filename); filename);
GNUNET_free (af); GNUNET_free (af);
return GNUNET_SYSERR; return GNUNET_OK;
} }
dki_len = ntohl (af->dki_len); dki_len = ntohl (af->dki_len);
if (0 == dki_len) if (0 == dki_len)
@ -131,7 +130,7 @@ auditor_iter (void *cls,
"No signed keys in %s\n", "No signed keys in %s\n",
filename); filename);
GNUNET_free (af); GNUNET_free (af);
return GNUNET_SYSERR; return GNUNET_OK;
} }
if ( (size - sizeof (struct AuditorFileHeaderP)) / dki_len < if ( (size - sizeof (struct AuditorFileHeaderP)) / dki_len <
(sizeof (struct TALER_DenominationKeyValidityPS) + (sizeof (struct TALER_DenominationKeyValidityPS) +
@ -142,7 +141,7 @@ auditor_iter (void *cls,
"Malformed key file %s\n", "Malformed key file %s\n",
filename); filename);
GNUNET_free (af); GNUNET_free (af);
return GNUNET_SYSERR; return GNUNET_OK;
} }
url_len = size url_len = size
- sizeof (struct AuditorFileHeaderP) - sizeof (struct AuditorFileHeaderP)
@ -159,17 +158,18 @@ auditor_iter (void *cls,
"Malformed key file %s\n", "Malformed key file %s\n",
filename); filename);
GNUNET_free (af); GNUNET_free (af);
return GNUNET_SYSERR; return GNUNET_OK;
} }
ret = aic->it (aic->it_cls, /*Ignoring return value to not interrupt the iteration*/
&af->apub, aic->it (aic->it_cls,
auditor_url, &af->apub,
&af->mpub, auditor_url,
dki_len, &af->mpub,
sigs, dki_len,
dki); sigs,
dki);
GNUNET_free (af); GNUNET_free (af);
return ret; return GNUNET_OK;
} }