OpenSSH 4.7p1 updates.

diff --git a/setup/ssh_config b/setup/ssh_config
index 15376f7e6f99ac499981b29b94499c85ba5089e1..53bbf4a6edbffacd98878866d5aab20ef7020d93 100644 (file)
--- a/setup/ssh_config
+++ b/setup/ssh_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
+#      $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -40,6 +40,7 @@
 #   Protocol 2,1
 #   Cipher 3des
 #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+#   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
 #   EscapeChar ~
 #   Tunnel no
 #   TunnelDevice any:any

diff --git a/setup/sshd_config.in b/setup/sshd_config.in
index 6bc88ae60459702cf3c98fb55998287bc4d57af7..a14fefc0c629dcf4e3368fda669eb8ed8713cf61 100644 (file)
--- a/setup/sshd_config.in
+++ b/setup/sshd_config.in
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.74 2006/07/19 13:07:10 dtucker Exp $
+#      $OpenBSD: sshd_config,v 1.75 2007/03/19 01:01:29 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -11,11 +11,15 @@
 # default value.
 
 #Port 22
-Protocol 2
 #AddressFamily any
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 
+# Disable legacy (protocol version 1) support in the server for new
+# installations. In future the default will change to require explicit
+# activation of protocol 1
+Protocol 2
+
 # HostKey for protocol version 1
 #HostKey /etc/ssh/ssh_host_key
 # HostKeys for protocol version 2
@@ -112,6 +116,7 @@ X11Forwarding yes
 # override default of no subsystems
 Subsystem      sftp    /usr/libexec/sftp-server
 
+
 # the following are HPN related configuration options
 # tcp receive buffer polling. enable in autotuning kernels
 #TcpRcvBufPoll no