diff options
| author | Werner Koch <[email protected]> | 2013-07-01 16:29:21 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-07-01 18:30:56 +0000 |
| commit | fc7d033d8e62f6a289fdf7dba26af076accb5fd2 (patch) | |
| tree | c43bc1ebc5d95653577e3e6c6f47f23929c516da | |
| parent | ssh: Make the mode extension "x" portable by a call to es_fopen. (diff) | |
| download | gnupg-fc7d033d8e62f6a289fdf7dba26af076accb5fd2.tar.gz gnupg-fc7d033d8e62f6a289fdf7dba26af076accb5fd2.zip | |
ssh: Do not look for a card based ssh key if scdaemon is disabled.
* agent/command-ssh.c (ssh_handler_request_identities): Do not call
card_key_available if the scdaemon is disabled.
--
(back ported from commit id 781e9746dff21fc2721373205e63d1d09722d590)
| -rw-r--r-- | agent/command-ssh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/agent/command-ssh.c b/agent/command-ssh.c index e96d6f512..fe0980e00 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -1926,7 +1926,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); |