nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Document that -i etc now accept public key files.

Browse Source 
(This was added in 4204a53.)
This commit is contained in:
Jacob Nevins 2016-03-19 20:24:51 +00:00
parent 91653a10c6
commit 2aa8d81c2d
6 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/config.but
View File

@ -2729,11 +2729,15 @@ private key in another format that you want to use with PuTTY, see
\k{puttygen-conversions}.
You can use the authentication agent \i{Pageant} so that you do not
need to explicitly configure a key here; see \k{pageant}. If a file
is specified here with Pageant running, 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.
need to explicitly configure a key here; see \k{pageant}.
If a private key file is specified here with Pageant running, 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. You can also specify a \e{public} key file
in this case (in RFC 4716 or OpenSSH format), as that's sufficient to
identify the key to Pageant, but of course if Pageant isn't present
PuTTY can't fall back to using this file itself.
\H{config-ssh-auth-gssapi} The \i{GSSAPI} panel

10
doc/man-pl.but
View File

@ -137,9 +137,15 @@ tunnel all their connections. Only works in SSH.
\dd Enable SSH compression.
\dt \cw{-i} \e{path}
\dt \cw{-i} \e{keyfile}
\dd Private key file for user authentication.
\dd Private key file for user authentication. For SSH-2 keys, this key
file must be in PuTTY's PPK format, not OpenSSH's format or anyone
else's.
\lcont{ If you are using an authentication agent, you can also specify
a \e{public} key here (in RFC 4716 or OpenSSH format), to identify
which of the agent's keys to use. }
\dt \cw{\-hostkey} \e{key}

10
doc/man-pscp.but
View File

@ -91,9 +91,15 @@ commands such as \q{\c{w}}).
\dd Enable SSH compression.
\dt \cw{-i} \e{path}
\dt \cw{-i} \e{keyfile}
\dd Private key file for user authentication.
\dd Private key file for user authentication. For SSH-2 keys, this key
file must be in PuTTY's PPK format, not OpenSSH's format or anyone
else's.
\lcont{ If you are using an authentication agent, you can also specify
a \e{public} key here (in RFC 4716 or OpenSSH format), to identify
which of the agent's keys to use. }
\dt \cw{\-hostkey} \e{key}

10
doc/man-psft.but
View File

@ -79,9 +79,15 @@ commands such as \q{\c{w}}).
\dd Enable SSH compression.
\dt \cw{-i} \e{path}
\dt \cw{-i} \e{keyfile}
\dd Private key file for user authentication.
\dd Private key file for user authentication. For SSH-2 keys, this key
file must be in PuTTY's PPK format, not OpenSSH's format or anyone
else's.
\lcont{ If you are using an authentication agent, you can also specify
a \e{public} key here (in RFC 4716 or OpenSSH format), to identify
which of the agent's keys to use. }
\dt \cw{\-hostkey} \e{key}

10
doc/man-putt.but
View File

@ -232,9 +232,13 @@ pseudo-terminal at the server end.
\dt \cw{\-i} \e{keyfile}
\dd Specify a private key file to use for user authentication. For SSH-2
keys, this key file must be in PuTTY's format, not OpenSSH's or
anyone else's.
\dd Private key file for user authentication. For SSH-2 keys, this key
file must be in PuTTY's PPK format, not OpenSSH's format or anyone
else's.
\lcont{ If you are using an authentication agent, you can also specify
a \e{public} key here (in RFC 4716 or OpenSSH format), to identify
which of the agent's keys to use. }
\dt \cw{\-hostkey} \e{key}

4
doc/using.but
View File

@ -894,6 +894,10 @@ The \c{-i} option allows you to specify the name of a private key
file in \c{*.\i{PPK}} format which PuTTY will use to authenticate with the
server. This option is only meaningful if you are using SSH.
If you are using Pageant, you can also specify a \e{public} key file
(in RFC 4716 or OpenSSH format) to identify a specific key file to use.
(This won't work if you're not running Pageant, of course.)
For general information on \i{public-key authentication}, see
\k{pubkey}.