mirror of
git://git.gnupg.org/gnupg.git
synced 2024-09-06 12:46:22 +02:00
Improve ssh card key diagnostic message.
* 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:
parent
a4ff2f4fdf
commit
2024a0055c
@ -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)
|
||||||
|
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user