- deraadt@cvs.openbsd.org 2001/02/24 10:37:26

     [sshd_config]
     ssh2 rsa key before dsa key

diff --git a/ChangeLog b/ChangeLog
index 986cfa24316a61f8eb94db0444ef1e17cf98f8aa..d7b55b088d61b6d6af25e05e1c30e11fed692b0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
    - deraadt@cvs.openbsd.org 2001/02/24 10:37:55
      [readconf.c]
      look for id_rsa by default, before id_dsa
+   - deraadt@cvs.openbsd.org 2001/02/24 10:37:26
+     [sshd_config]
+     ssh2 rsa key before dsa key
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4241,4 +4244,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.865 2001/03/05 06:03:03 mouring Exp $
+$Id: ChangeLog,v 1.866 2001/03/05 06:05:35 mouring Exp $

diff --git a/sshd_config b/sshd_config
index 40522d75e4dc53a63e40cca36a4d857fbb6a25d3..0e29700785816596947b4f1819a40e0a950537f5 100644 (file)
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.33 2001/02/22 18:09:06 deraadt Exp $
+#      $OpenBSD: sshd_config,v 1.34 2001/02/24 10:37:26 deraadt Exp $
 
 # This is the sshd server system-wide configuration file.  See sshd(8)
 # for more information.
@@ -8,8 +8,8 @@ Port 22
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 HostKey /etc/ssh_host_key
-HostKey /etc/ssh_host_dsa_key
 HostKey /etc/ssh_host_rsa_key
+HostKey /etc/ssh_host_dsa_key
 ServerKeyBits 768
 LoginGraceTime 600
 KeyRegenerationInterval 3600