- djm@cvs.openbsd.org 2014/01/10 05:59:19

     [sshd_config]
     the /etc/ssh/ssh_host_ed25519_key is loaded by default too

diff --git a/ChangeLog b/ChangeLog
index be7d868bff19b46aa46e266ad3ce8052a44880b1..99b846e3c9523583acdc3cd88884bd54f63a5b51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 235459af0521bebe036fdc1b31898e0416741f13..e9045bc4d7d2f76db8045712f402c744425de67f 100644 (file)
--- 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