misc clean ups

This commit is contained in:
Christian Grothoff 2020-12-11 23:10:32 +01:00
parent 4587a79071
commit 3743d200ad
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
11 changed files with 882 additions and 472 deletions

View File

@ -1 +1 @@
1598701185 1607688843

Binary file not shown.

View File

@ -1 +1 @@
GF1NR62VTBPAZJV85EJ5561FACGHSB7M1QEKC1DP4A5Q6EZE1NC0 7W3RY6X05KGPE78JXGGGZWQ3XKA7TW4CVBEWZQA4PRVHFZEW05WG

File diff suppressed because it is too large Load Diff

View File

@ -6,4 +6,4 @@
MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
# Where do we store the TOFU key material? # Where do we store the TOFU key material?
SECM_TOFU_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv SECM_TOFU_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/secm_tofus.priv

View File

@ -32,6 +32,7 @@
#include "taler-exchange-httpd_deposit.h" #include "taler-exchange-httpd_deposit.h"
#include "taler-exchange-httpd_deposits_get.h" #include "taler-exchange-httpd_deposits_get.h"
#include "taler-exchange-httpd_keystate.h" #include "taler-exchange-httpd_keystate.h"
#include "taler-exchange-httpd_keys.h"
#include "taler-exchange-httpd_link.h" #include "taler-exchange-httpd_link.h"
#include "taler-exchange-httpd_management.h" #include "taler-exchange-httpd_management.h"
#include "taler-exchange-httpd_melt.h" #include "taler-exchange-httpd_melt.h"
@ -672,8 +673,8 @@ handle_get_management (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return r404 (connection, "/management/*"); return r404 (connection, "/management/*");
} }
GNUNET_break (0); // not implemented return TEH_keys_management_get_handler (rh,
return MHD_NO; connection);
} }

View File

@ -2121,8 +2121,7 @@ add_future_signkey_cb (void *cls,
MHD_RESULT MHD_RESULT
TEH_keys_management_get_handler (const struct TEH_RequestHandler *rh, TEH_keys_management_get_handler (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection)
const char *const args[])
{ {
struct KeyStateHandle *ksh; struct KeyStateHandle *ksh;
json_t *reply; json_t *reply;

View File

@ -233,13 +233,11 @@ TEH_keys_get_handler (const struct TEH_RequestHandler *rh,
* *
* @param rh context of the handler * @param rh context of the handler
* @param connection the MHD connection to handle * @param connection the MHD connection to handle
* @param args array of additional options (must be empty for this function)
* @return MHD result code * @return MHD result code
*/ */
MHD_RESULT MHD_RESULT
TEH_keys_management_get_handler (const struct TEH_RequestHandler *rh, TEH_keys_management_get_handler (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection);
const char *const args[]);
/** /**

View File

@ -2165,8 +2165,8 @@ TALER_TESTING_cmd_wire_del (const char *label,
* @return the command * @return the command
*/ */
struct TALER_TESTING_Command struct TALER_TESTING_Command
TALER_TESTING_cmd_offline_sign_keys (const char *label, TALER_TESTING_cmd_exec_offline_sign_keys (const char *label,
const char *config_filename); const char *config_filename);
/** /**

View File

@ -140,6 +140,13 @@ run (void *cls,
"payto://x-taler-bank/localhost/43", "payto://x-taler-bank/localhost/43",
MHD_HTTP_NO_CONTENT, MHD_HTTP_NO_CONTENT,
false), false),
TALER_TESTING_cmd_exec_offline_sign_keys ("download-future-keys",
CONFIG_FILE),
TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
1,
5),
TALER_TESTING_cmd_sleep ("sleepy",
3000),
TALER_TESTING_cmd_end () TALER_TESTING_cmd_end ()
}; };

View File

@ -70,8 +70,9 @@ offlinesign_run (void *cls,
"taler-exchange-offline", "taler-exchange-offline",
"taler-exchange-offline", "taler-exchange-offline",
"-c", ks->config_filename, "-c", ks->config_filename,
"--online", "download",
"download sign upload", "sign",
"upload",
NULL); NULL);
if (NULL == ks->offlinesign_proc) if (NULL == ks->offlinesign_proc)
{ {