diff options
Diffstat (limited to '')
| -rw-r--r-- | agent/ChangeLog | 7 | ||||
| -rw-r--r-- | agent/command-ssh.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 3c52e1f2c..26355794f 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,10 @@ +2011-11-28 Werner Koch <wk@g10code.com> + + * command-ssh.c (card_key_available): Change wording of no key + diagnostic. + (ssh_handler_request_identities): Do not call card_key_available + if the scdaemon is disabled. + 2011-09-12 Ben Kibbey <bjk@luxsci.net> * genkey.c (agent_ask_new_passphrase): Allow for an empty passphrase diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 7b4d47924..54e56eac0 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -1710,7 +1710,7 @@ card_key_available (ctrl_t ctrl, gcry_sexp_t *r_pk, char **cardsn) } if (err) { - log_error (_("error getting default authentication keyID of card: %s\n"), + log_error (_("no authentication key for ssh on card: %s\n"), gpg_strerror (err)); xfree (serialno); return err; @@ -1924,7 +1924,8 @@ ssh_handler_request_identities (ctrl_t ctrl, reader - this should be allowed even without being listed in sshcontrol. */ - if (!card_key_available (ctrl, &key_public, &cardsn)) + if (!opt.disable_scdaemon + && !card_key_available (ctrl, &key_public, &cardsn)) { err = ssh_send_key_public (key_blobs, key_public, cardsn); gcry_sexp_release (key_public); |