security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

agent: Add oTkdaemonProgram.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-03-13 14:14:48 +09:00
parent d0855b1204
commit 5d515d7059
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/gpg-agent.c
View File

@ -104,6 +104,7 @@ enum cmd_and_opt_values
oLCmessages,
oXauthority,
oScdaemonProgram,
oTkdaemonProgram,
oTpm2daemonProgram,
oDefCacheTTL,
oDefCacheTTLSSH,
@ -209,6 +210,8 @@ static gpgrt_opt_t opts[] = {
/* */ N_("do not use the SCdaemon") ),
ARGPARSE_s_s (oScdaemonProgram, "scdaemon-program",
/* */ N_("|PGM|use PGM as the SCdaemon program") ),
ARGPARSE_s_s (oTkdaemonProgram, "tkdaemon-program",
/* */ N_("|PGM|use PGM as the TKdaemon program") ),
ARGPARSE_s_s (oTpm2daemonProgram, "tpm2daemon-program",
/* */ N_("|PGM|use PGM as the tpm2daemon program") ),
ARGPARSE_s_n (oDisableCheckOwnSocket, "disable-check-own-socket", "@"),
@ -946,6 +949,9 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
case oScdaemonProgram:
opt.daemon_program[DAEMON_SCD] = pargs->r.ret_str;
break;
case oTkdaemonProgram:
opt.daemon_program[DAEMON_TKD] = pargs->r.ret_str;
break;
case oDisableScdaemon: opt.disable_daemon[DAEMON_SCD] = 1; break;
case oDisableCheckOwnSocket: disable_check_own_socket = 1; break;

3
tkd/pkcs11.c
View File

@ -976,7 +976,6 @@ do_pksign (struct key *key, int hash_algo,
return err;
}
#define ENVNAME "PKCS11_MODULE"
gpg_error_t
token_slotlist (ctrl_t ctrl, assuan_context_t ctx)
@ -1152,7 +1151,7 @@ token_readkey (ctrl_t ctrl, assuan_context_t ctx, const char *keygrip)
unsigned long r;
(void)ctrl;
(void)ctx;
r = find_key (ck, keygrip, &k);
if (r)
return gpg_error (GPG_ERR_NO_SECKEY);