diff options
author | Damien Miller <djm@mindrot.org> | 2014-01-12 19:20:47 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-01-12 19:20:47 +1100 |
commit | af5d4481f4c7c8c3c746e68b961bb85ef907800e (patch) | |
tree | 8ffcd0ed294ade5e24bb6180c564b47b14ea1fac | |
parent | 58cd63bc63038acddfb4051ed14e11179d8f4941 (diff) | |
download | openssh-git-af5d4481f4c7c8c3c746e68b961bb85ef907800e.tar.gz |
- djm@cvs.openbsd.org 2014/01/10 05:59:19
[sshd_config]
the /etc/ssh/ssh_host_ed25519_key is loaded by default too
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshd_config | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +20140112 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2014/01/10 05:59:19 + [sshd_config] + the /etc/ssh/ssh_host_ed25519_key is loaded by default too + 20140110 - (djm) OpenBSD CVS Sync - tedu@cvs.openbsd.org 2014/01/04 17:50:55 diff --git a/sshd_config b/sshd_config index 235459af..e9045bc4 100644 --- a/sshd_config +++ b/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.92 2013/10/29 09:48:02 djm Exp $ +# $OpenBSD: sshd_config,v 1.93 2014/01/10 05:59:19 djm Exp $ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -24,6 +24,7 @@ #HostKey /etc/ssh/ssh_host_rsa_key #HostKey /etc/ssh/ssh_host_dsa_key #HostKey /etc/ssh/ssh_host_ecdsa_key +#HostKey /etc/ssh/ssh_host_ed25519_key # Lifetime and size of ephemeral version 1 server key #KeyRegenerationInterval 1h |