diff options
| author | Werner Koch <[email protected]> | 2015-04-14 16:41:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-04-14 16:41:05 +0000 |
| commit | 2180845959839705200e3172dbafc94b70b9007f (patch) | |
| tree | 0eb486b7b07af489c51efb72b54bde991cadbc4e /agent/cvt-openpgp.c | |
| parent | scd: better handling of extended APDU. (diff) | |
| download | gnupg-2180845959839705200e3172dbafc94b70b9007f.tar.gz gnupg-2180845959839705200e3172dbafc94b70b9007f.zip | |
agent: Send the new SETKEYINFO command to the Pinentry.
* agent/call-pinentry.c (agent_askpin): Add args keyinfo and
cache_mode. Change all callers to pass (NULL,0) for them. Send
SETKEYINFO command.
* agent/findkey.c (unprotect): Pass the keygrip and the cache_mode for
the new args.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | agent/cvt-openpgp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c index b00f032e7..562179b26 100644 --- a/agent/cvt-openpgp.c +++ b/agent/cvt-openpgp.c @@ -961,7 +961,7 @@ convert_from_openpgp_main (ctrl_t ctrl, gcry_sexp_t s_pgp, err = try_do_unprotect_cb (pi); } if (gpg_err_code (err) == GPG_ERR_BAD_PASSPHRASE && !from_native) - err = agent_askpin (ctrl, prompt, NULL, NULL, pi); + err = agent_askpin (ctrl, prompt, NULL, NULL, pi, NULL, 0); skeyidx = pi_arg.skeyidx; if (!err && r_passphrase && is_protected) { |