summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2009-02-17 01:28:33 +0000
committerDamien Miller <djm@cvs.openbsd.org>2009-02-17 01:28:33 +0000
commitbfbbbc0d861d151d2f9cc204a5cab9705ea5924b (patch)
tree69deae36a556b4ae4c4f718aba33965091991086
parente183a6513f0ac55e6525a30cd38c4f9d0bc2241e (diff)
sync with revised default ciphers; pointed out by dkrause@
-rw-r--r--usr.bin/ssh/ssh_config4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh_config b/usr.bin/ssh/ssh_config
index ef5a73f7d29..f28d5958347 100644
--- a/usr.bin/ssh/ssh_config
+++ b/usr.bin/ssh/ssh_config
@@ -1,4 +1,4 @@
-# $OpenBSD: ssh_config,v 1.24 2008/07/25 06:56:35 grunk 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
@@ -37,7 +37,7 @@
# 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