From: basney <basney>
Date: Wed, 25 Feb 2009 21:39:29 +0000 (+0000)
Subject: update from OpenSSH 5.2p1
X-Git-Tag: OPENSSH_5_2P1_GSSAPI_20090401~6
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/f77cefd6c77d79591787fa2f1d9a96d0cb158cf7

update from OpenSSH 5.2p1
---

diff --git a/setup/ssh_config b/setup/ssh_config
index 873acdf..6a148a2 100644
--- a/setup/ssh_config
+++ b/setup/ssh_config
@@ -1,4 +1,4 @@
-#	$OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
+#	$OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -39,9 +39,10 @@
 #   Port 22
 #   Protocol 2,1
 #   Cipher 3des
-#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+#   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
 #   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
 #   EscapeChar ~
 #   Tunnel no
 #   TunnelDevice any:any
 #   PermitLocalCommand no
+#   VisualHostKey no