security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

agent: Stop scdaemon after reload when disable_scdaemon.

Browse Source 
* agent/call-scd.c (agent_card_killscd): New.
* agent/gpg-agent.c (agent_sighup_action): Call agent_card_killscd.

--

GnuPG-bug-id: 4326
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-05-23 10:15:18 +09:00
parent 265e6d6706
commit 7158a5696d
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/agent.h
View File

@ -618,6 +618,7 @@ int agent_card_scd (ctrl_t ctrl, const char *cmdline,
void agent_card_free_keyinfo (struct card_key_info_s *l); void agent_card_free_keyinfo (struct card_key_info_s *l);
gpg_error_t agent_card_keyinfo (ctrl_t ctrl, const char *keygrip, gpg_error_t agent_card_keyinfo (ctrl_t ctrl, const char *keygrip,
struct card_key_info_s **result); struct card_key_info_s **result);
void agent_card_killscd (void);
/*-- learncard.c --*/ /*-- learncard.c --*/

9
agent/call-scd.c
View File

@ -1515,3 +1515,12 @@ agent_card_scd (ctrl_t ctrl, const char *cmdline,
return unlock_scd (ctrl, 0); return unlock_scd (ctrl, 0);
} }
void
agent_card_killscd (void)
{
if (primary_scd_ctx == NULL)
return;
assuan_transact (primary_scd_ctx, "KILLSCD",
NULL, NULL, NULL, NULL, NULL, NULL);
}

3
agent/gpg-agent.c
View File

@ -2441,6 +2441,9 @@ agent_sighup_action (void)
"pinentry" binary that one can be used in case the "pinentry" binary that one can be used in case the
"pinentry-basic" fallback was in use. */ "pinentry-basic" fallback was in use. */
gnupg_module_name_flush_some (); gnupg_module_name_flush_some ();
if (opt.disable_scdaemon)
agent_card_killscd ();
} }