mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
agent: separate out daemon handling infrastructure for reuse
* agent/call-scd.c: Factor re-usable code out to ... * agent/call-daemon.c: new. Store infos in an array to allow for other backend daemons. * agent/Makefile.am (gpg_agent_SOURCES): Add new file. * agent/agent.h: Include assuan.h. (enum daemon_type): New. (opt): Replace scdaemon_program by daemon_program array. Replace scd_local by a array d_local. Change users accordingly. -- The model I'm using for a TPM daemon is the current scdaemon. That includes start and stop handlers plus liveness checks and an assuan socket generator. To avoid massive code duplication (and save me a lot of effort), I've elected to strip this code out of call-scd.c into a generic framework which can then be reused as is by the TPM handling daemon. Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> Co-authored-by: Werner Koch <wk@gnupg.org> Modified original patch for 2.2 heavily to fit the new framework used in master (gnupg 2.3) Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
2d8f060679
commit
f541e1d95a
7 changed files with 759 additions and 583 deletions
|
@ -3257,7 +3257,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
|
|||
}
|
||||
else if (!strcmp (line, "scd_running"))
|
||||
{
|
||||
rc = agent_scd_check_running ()? 0 : gpg_error (GPG_ERR_FALSE);
|
||||
rc = agent_daemon_check_running (DAEMON_SCD)? 0:gpg_error (GPG_ERR_FALSE);
|
||||
}
|
||||
else if (!strcmp (line, "std_env_names"))
|
||||
{
|
||||
|
@ -3747,7 +3747,7 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
|
|||
clear_nonce_cache (ctrl);
|
||||
|
||||
/* Reset the SCD if needed. */
|
||||
agent_reset_scd (ctrl);
|
||||
agent_reset_daemon (ctrl);
|
||||
|
||||
/* Reset the pinentry (in case of popup messages). */
|
||||
agent_reset_query (ctrl);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue