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

REVOCATION_DIR is long obsolete, KEYDIR was renamed to KEY_DIR and is in another section

Browse Source
This commit is contained in:
Christian Grothoff 2021-07-30 17:31:18 +02:00
parent cbb905a9aa
commit af9830453e
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/auditor/generate-auditor-basedb.conf
View File

@ -1,6 +1,4 @@
[exchange] [exchange]
KEYDIR = ${TALER_DATA_HOME}/exchange/live-keys/
REVOCATION_DIR = ${TALER_DATA_HOME}/exchange/revocations/
MAX_KEYS_CACHING = forever MAX_KEYS_CACHING = forever
DB = postgres DB = postgres
MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv

51
src/testing/testing_api_helpers_exchange.c
View File

@ -41,21 +41,27 @@ TALER_TESTING_cleanup_files (const char *config_name)
} }
int /**
TALER_TESTING_cleanup_files_cfg (void *cls, * Remove @a option directory from @a section in @a cfg.
const struct GNUNET_CONFIGURATION_Handle *cfg) *
* @return #GNUNET_OK on success
*/
static enum GNUNET_GenericReturnValue
remove_dir (const struct GNUNET_CONFIGURATION_Handle *cfg,
const char *section,
const char *option)
{ {
char *dir; char *dir;
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg, GNUNET_CONFIGURATION_get_value_filename (cfg,
"exchange", section,
"KEYDIR", option,
&dir)) &dir))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"exchange", section,
"KEYDIR"); option);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_YES == if (GNUNET_YES ==
@ -64,23 +70,24 @@ TALER_TESTING_cleanup_files_cfg (void *cls,
GNUNET_break (GNUNET_OK == GNUNET_break (GNUNET_OK ==
GNUNET_DISK_directory_remove (dir)); GNUNET_DISK_directory_remove (dir));
GNUNET_free (dir); GNUNET_free (dir);
return GNUNET_OK;
}
int
TALER_TESTING_cleanup_files_cfg (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg, remove_dir (cfg,
"exchange", "taler-exchange-secmod-eddsa",
"REVOCATION_DIR", "KEY_DIR"))
&dir)) return GNUNET_SYSERR;
{ if (GNUNET_OK !=
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, remove_dir (cfg,
"exchange", "taler-exchange-secmod-rsa",
"REVOCATION_DIR"); "KEY_DIR"))
return GNUNET_SYSERR; return GNUNET_SYSERR;
}
if (GNUNET_YES ==
GNUNET_DISK_directory_test (dir,
GNUNET_NO))
GNUNET_break (GNUNET_OK ==
GNUNET_DISK_directory_remove (dir));
GNUNET_free (dir);
return GNUNET_OK; return GNUNET_OK;
} }