diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sshd_config.5 | 20 |
2 files changed, 13 insertions, 10 deletions
@@ -7,6 +7,9 @@ | |||
7 | [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh.1] | 7 | [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh.1] |
8 | [ssh_config.5 sshd.8 sshd_config.5] | 8 | [ssh_config.5 sshd.8 sshd_config.5] |
9 | add missing mentions of ed25519; ok djm@ | 9 | add missing mentions of ed25519; ok djm@ |
10 | - dtucker@cvs.openbsd.org 2013/12/08 09:53:27 | ||
11 | [sshd_config.5] | ||
12 | Use a literal for the default value of KEXAlgorithms. ok deraadt jmc | ||
10 | 13 | ||
11 | 20131208 | 14 | 20131208 |
12 | - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna | 15 | - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna |
diff --git a/sshd_config.5 b/sshd_config.5 index 0ae1740bb..3b21ea6e7 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.169 2013/12/07 11:58:46 naddy Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.170 2013/12/08 09:53:27 dtucker Exp $ |
37 | .Dd $Mdocdate: December 7 2013 $ | 37 | .Dd $Mdocdate: December 8 2013 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -662,14 +662,14 @@ The default is | |||
662 | Specifies the available KEX (Key Exchange) algorithms. | 662 | Specifies the available KEX (Key Exchange) algorithms. |
663 | Multiple algorithms must be comma-separated. | 663 | Multiple algorithms must be comma-separated. |
664 | The default is | 664 | The default is |
665 | .Dq curve25519-sha256@libssh.org , | 665 | .Bd -literal -offset indent |
666 | .Dq ecdh-sha2-nistp256 , | 666 | curve25519-sha256@libssh.org, |
667 | .Dq ecdh-sha2-nistp384 , | 667 | ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, |
668 | .Dq ecdh-sha2-nistp521 , | 668 | diffie-hellman-group-exchange-sha256, |
669 | .Dq diffie-hellman-group-exchange-sha256 , | 669 | diffie-hellman-group-exchange-sha1, |
670 | .Dq diffie-hellman-group-exchange-sha1 , | 670 | diffie-hellman-group14-sha1, |
671 | .Dq diffie-hellman-group14-sha1 , | 671 | diffie-hellman-group1-sha1 |
672 | .Dq diffie-hellman-group1-sha1 . | 672 | .Ed |
673 | .It Cm KeyRegenerationInterval | 673 | .It Cm KeyRegenerationInterval |
674 | In protocol version 1, the ephemeral server key is automatically regenerated | 674 | In protocol version 1, the ephemeral server key is automatically regenerated |
675 | after this many seconds (if it has been used). | 675 | after this many seconds (if it has been used). |