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

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

View File

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

View File

@ -41,21 +41,27 @@ TALER_TESTING_cleanup_files (const char *config_name)
}
int
TALER_TESTING_cleanup_files_cfg (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg)
/**
* Remove @a option directory from @a section in @a 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;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
"exchange",
"KEYDIR",
section,
option,
&dir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"exchange",
"KEYDIR");
section,
option);
return GNUNET_SYSERR;
}
if (GNUNET_YES ==
@ -64,23 +70,24 @@ TALER_TESTING_cleanup_files_cfg (void *cls,
GNUNET_break (GNUNET_OK ==
GNUNET_DISK_directory_remove (dir));
GNUNET_free (dir);
return GNUNET_OK;
}
int
TALER_TESTING_cleanup_files_cfg (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
"exchange",
"REVOCATION_DIR",
&dir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"exchange",
"REVOCATION_DIR");
remove_dir (cfg,
"taler-exchange-secmod-eddsa",
"KEY_DIR"))
return GNUNET_SYSERR;
if (GNUNET_OK !=
remove_dir (cfg,
"taler-exchange-secmod-rsa",
"KEY_DIR"))
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;
}