nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 19:42:48 -05:00
Code Issues Projects Releases Wiki Activity

r6437 broke the case where Pageant is running but contains no SSH-2 keys

Browse Source 
that the SSH-2 server is happy with. Fixed, and since I'm here, fix
`pubkeyfile-and-pageant' as well (for SSH-1 and SSH-2).
Also, in SSH-2, we now reexamine "methods that can continue" for every
Pageant key offer, which is technically more correct although it seems
unlikely that it was causing any real problems.
(It's not entirely pretty, but neither was the old code. We could probably
do with some sort of abstraction for public/private keys to avoid carting
lots of fiddly bits of data around.)

[originally from svn r6459]
[r6437 == 8719f92c14]
[this svn revision also touched putty-wishlist]
This commit is contained in:
Jacob Nevins
2005-11-13 16:06:41 +00:00
parent 59dca370bb
commit de945281fc
3 changed files with 252 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/config.but
View File

@ -2393,6 +2393,11 @@ This key must be in PuTTY's native format (\c{*.\i{PPK}}). If you have a
private key in another format that you want to use with PuTTY, see
\k{puttygen-conversions}.
If a key file is specified here, and \i{Pageant} is running (see
\k{pageant}), PuTTY will first try asking Pageant to authenticate with
that key, and ignore any other keys Pageant may have. If that fails,
PuTTY will ask for a passphrase as normal.
\H{config-ssh-tty} The TTY panel
The TTY panel lets you configure the remote pseudo-terminal.

21
doc/errors.but
View File

@ -79,16 +79,23 @@ puts up this warning only for \ii{single-DES} and \i{Arcfour} encryption.
See \k{config-ssh-encryption} for more information on this message.
\H{errors-toomanyauth} \q{Server sent disconnect message type 2
(SSH_DISCONNECT_PROTOCOL_ERROR): "Too many authentication failures for root"}
(protocol error): "Too many authentication failures for root"}
This message is produced by an \i{OpenSSH} (or \i{Sun SSH}) server if it
receives more failed authentication attempts than it is willing to
tolerate. This can easily happen if you are using Pageant and have a
large number of keys loaded into it. This can be worked around on the
server by disabling public-key authentication or (for Sun SSH only) by
increasing \c{MaxAuthTries} in \c{sshd_config}. Neither of these is a
really satisfactory solution, and we hope to provide a better one in a
future version of PuTTY.
tolerate.
This can easily happen if you are using Pageant and have a
large number of keys loaded into it, since these servers count each
offer of a public key as an authentication attempt. This can be worked
around by specifying the key that's required for the authentication in
the PuTTY configuration (see \k{config-ssh-privkey}; PuTTY will ignore
any other keys Pageant may have, but will ask Pageant to do the
authentication, so that you don't have to type your passphrase.
On the server, this can be worked around by disabling public-key
authentication or (for Sun SSH only) by increasing \c{MaxAuthTries} in
\c{sshd_config}.
\H{errors-memory} \q{\ii{Out of memory}}