1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00

Merge branch 'pre-0.64'

This commit is contained in:
Jacob Nevins 2015-01-18 14:50:20 +00:00
commit ced3a46c3f

View File

@ -2514,12 +2514,10 @@ The text describing a host key can be in one of the following formats:
Event Log and host key dialog boxes, i.e. sixteen 2-digit hex numbers Event Log and host key dialog boxes, i.e. sixteen 2-digit hex numbers
separated by colons. separated by colons.
\b A base64-encoded blob describing an SSH-2 public key in the \b A base64-encoded blob describing an SSH-2 public key in
standard way. This can be found in OpenSSH's one-line public key OpenSSH's one-line public key format. How you acquire a public key in
format, or by concatenating all the lines of the public key section in this format is server-dependent; on an OpenSSH server it can typically
one of PuTTY's \cw{.ppk} files. Alternatively, you can load a key into be found in a location like \c{/etc/ssh/ssh_host_rsa_key.pub}.
PuTTYgen, and paste out the OpenSSH-format public key line it
displays.
If this box contains at least one host key or fingerprint when PuTTY If this box contains at least one host key or fingerprint when PuTTY
makes an SSH connection, then PuTTY's automated host key management is makes an SSH connection, then PuTTY's automated host key management is