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/command-ssh.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 'agent/command-ssh.c')
| -rw-r--r-- | agent/command-ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/command-ssh.c b/agent/command-ssh.c index fffdb00d9..a51782772 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -3110,7 +3110,7 @@ ssh_identity_register (ctrl_t ctrl, ssh_key_type_spec_t *spec, pi2->check_cb_arg = pi->pin; next_try: - err = agent_askpin (ctrl, description, NULL, initial_errtext, pi); + err = agent_askpin (ctrl, description, NULL, initial_errtext, pi, NULL, 0); initial_errtext = NULL; if (err) goto out; @@ -3119,7 +3119,7 @@ ssh_identity_register (ctrl_t ctrl, ssh_key_type_spec_t *spec, it already did the repetition check, ask to confirm it. */ if (*pi->pin && !pi->repeat_okay) { - err = agent_askpin (ctrl, description2, NULL, NULL, pi2); + err = agent_askpin (ctrl, description2, NULL, NULL, pi2, NULL, 0); if (err == -1) { /* The re-entered one did not match and the user did not hit cancel. */ |