diff options
| author | Werner Koch <wk@gnupg.org> | 2011-03-03 18:35:08 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-03-03 18:35:08 +0100 |
| commit | b786f0e12b93d8d61eea18c934f5731fe86402d3 (patch) | |
| tree | 2286e2a32cdc573b9cf2ac482fea66150238d0c4 /agent/gpg-agent.c | |
| parent | Print the secret keyinfo stuff with --card-status again. (diff) | |
| download | gnupg2-b786f0e12b93d8d61eea18c934f5731fe86402d3.tar.xz gnupg2-b786f0e12b93d8d61eea18c934f5731fe86402d3.zip | |
New agent option pinentry-mode.
This provides the framework and implements the ask, cancel and error.
loopback will be implemented later.
Diffstat (limited to 'agent/gpg-agent.c')
| -rw-r--r-- | agent/gpg-agent.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index e5af91ed9..c64b32feb 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -105,6 +105,7 @@ enum cmd_and_opt_values oIgnoreCacheForSigning, oAllowMarkTrusted, oAllowPresetPassphrase, + oAllowLoopbackPinentry, oKeepTTY, oKeepDISPLAY, oSSHSupport, @@ -179,6 +180,8 @@ static ARGPARSE_OPTS opts[] = { N_("allow clients to mark keys as \"trusted\"")}, { oAllowPresetPassphrase, "allow-preset-passphrase", 0, N_("allow presetting passphrase")}, + { oAllowLoopbackPinentry, "allow-loopback-pinentry", 0, + N_("allow presetting passphrase")}, { oSSHSupport, "enable-ssh-support", 0, N_("enable ssh-agent emulation") }, { oWriteEnvFile, "write-env-file", 2|8, N_("|FILE|write environment settings also to FILE")}, @@ -549,6 +552,8 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break; + case oAllowLoopbackPinentry: opt.allow_loopback_pinentry = 1; break; + default: return 0; /* not handled */ } |