Skip to content

Commit 7c6ee14

Browse files
author
tj
committed
some wording fixes
1 parent 63a66c7 commit 7c6ee14

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

openssh/legacy.html

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ <h2 id=OpenBSD>
2323
to connect with an implementation that only supports legacy algorithms.
2424

2525
<p>
26-
When a SSH client connects to a server, each side offers lists of connection
26+
When an SSH client connects to a server, each side offers lists of connection
2727
parameters to the other. These are, with the corresponding
2828
<a href="https://man.openbsd.org/ssh_config.5">ssh_config</a> keyword:
2929

3030
<ul>
3131
<li><code>KexAlgorithms</code>: the key exchange methods that are used to generate
32-
<li><code>HostkeyAlgorithms</code>: the public key algorithms accepted for a SSH server to authenticate itself to a ssh client.
32+
per-connection keys
33+
<li><code>HostkeyAlgorithms</code>: the public key algorithms accepted for an SSH
34+
server to authenticate itself to an SSH client
3335
<li><code>Ciphers</code>: the ciphers to encrypt the connection
3436
<li><code>MACs</code>: the message authentication codes used to detect traffic
3537
modification
@@ -53,24 +55,24 @@ <h2 id=OpenBSD>
5355
In this case, the client and server were unable to agree on the key
5456
exchange algorithm. The server offered only a single method
5557
<code>diffie-hellman-group1-sha1</code>. OpenSSH supports this method,
56-
but does not enable it by default because is weak and within theoretical
58+
but does not enable it by default because it is weak and within theoretical
5759
range of the so-called Logjam attack.
5860

5961
<p>
6062
Several related options come into play later during user authentication.
6163
<ul>
6264
<li><code>PubkeyAcceptedKeyTypes</code> (ssh/sshd): the public key
6365
algorithms that will be attempted by the client, and accepted by the server
64-
for public-key authentication (e.g. via <code>.ssh/authorized_keys</code>).
66+
for public-key authentication (e.g. via <code>.ssh/authorized_keys</code>)
6567
<li><code>HostbasedKeyTypes</code> (ssh) and <code>HostbasedAcceptedKeyTypes</code> (sshd): the key types that will be attempted by the client, and accepted by
6668
the server for host-based authentication (.e.g. via <code>.rhosts</code> or
67-
<code>.shosts</code>).
69+
<code>.shosts</code>)
6870
</ul>
6971

7072
<p>
7173
A mismatch between the client and server during authentication will cause
7274
authentication to fail, despite it appearing to be configured. For example,
73-
a <code>ssh-dss</code> user key may be listed in
75+
an <code>ssh-dss</code> user key may be listed in
7476
<code>.ssh/authorized_keys</code> but may not pass authentication because,
7577
by default, sshd does not accept this key type.
7678
</p>
@@ -79,15 +81,15 @@ <h2 id=OpenBSD>
7981
The best resolution for these failures is to upgrade the software at
8082
the other end and/or replace the weak key types with safer modern types.
8183
OpenSSH only disables algorithms that we actively
82-
recommend against using because they are known to be weak. In
83-
some cases, this might not be immediately possible so you may need to
84+
recommend against using because they are known to be weak.
85+
This might not be immediately possible in some cases, so you may need to
8486
temporarily re-enable the weak algorithms to retain access.
8587

8688
<p>
8789
For the case of the above error message, OpenSSH can be configured to enable
8890
the <code>diffie-hellman-group1-sha1</code>
8991
key exchange algorithm (or any other that is disabled by default) using
90-
the <code>KexAlgorithms</code> option - either on the command-line:
92+
the <code>KexAlgorithms</code> option, either on the command line:
9193

9294
<pre class="cmdbox">
9395
ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 user@legacyhost

0 commit comments

Comments
 (0)