security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-12 22:11:29 +02:00
Code Activity

Improve ssh card key diagnostic message.

Browse Source 
* 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.
This commit is contained in:
Werner Koch 2011-11-28 10:39:36 +01:00
parent a4ff2f4fdf
commit 2024a0055c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/ChangeLog
View File

@ -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-10-13 Marcus Brinkmann <marcus@g10code.com> 2011-10-13 Marcus Brinkmann <marcus@g10code.com>
* gpg-agent.c (start_connection_thread) * gpg-agent.c (start_connection_thread)

5
agent/command-ssh.c
View File

@ -1710,7 +1710,7 @@ card_key_available (ctrl_t ctrl, gcry_sexp_t *r_pk, char **cardsn)
} }
if (err) 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)); gpg_strerror (err));
xfree (serialno); xfree (serialno);
return err; return err;
@ -1924,7 +1924,8 @@ ssh_handler_request_identities (ctrl_t ctrl,
reader - this should be allowed even without being listed in reader - this should be allowed even without being listed in
sshcontrol. */ 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); err = ssh_send_key_public (key_blobs, key_public, cardsn);
gcry_sexp_release (key_public); gcry_sexp_release (key_public);