summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-02-21 12:45:02 +1100
committerDamien Miller <djm@mindrot.org>2009-02-21 12:45:02 +1100
commite8001d4820bb9d292695bcb8c5f20c04f2f17d61 (patch)
tree5fcf14ded76a4abad529ac397d4bd114a4d5a6c0
parent9055172d0387bae9304aa284b3c08ea107d9133f (diff)
- djm@cvs.openbsd.org 2009/02/17 01:28:32
[ssh_config] sync with revised default ciphers; pointed out by dkrause@
-rw-r--r--ChangeLog8
-rw-r--r--ssh_config4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index da9e201b8..a659a62a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120090221
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2009/02/17 01:28:32
4 [ssh_config]
5 sync with revised default ciphers; pointed out by dkrause@
6
120090216 720090216
2 - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh] 8 - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]
3 [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled 9 [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled
@@ -5171,5 +5177,5 @@
5171 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5177 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5172 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5178 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5173 5179
5174$Id: ChangeLog,v 1.5197 2009/02/16 04:37:03 djm Exp $ 5180$Id: ChangeLog,v 1.5198 2009/02/21 01:45:02 djm Exp $
5175 5181
diff --git a/ssh_config b/ssh_config
index ef5a73f7d..f28d59583 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
1# $OpenBSD: ssh_config,v 1.24 2008/07/25 06:56:35 grunk Exp $ 1# $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $
2 2
3# This is the ssh client system-wide configuration file. See 3# This is the ssh client system-wide configuration file. See
4# ssh_config(5) for more information. This file provides defaults for 4# ssh_config(5) for more information. This file provides defaults for
@@ -37,7 +37,7 @@
37# Port 22 37# Port 22
38# Protocol 2,1 38# Protocol 2,1
39# Cipher 3des 39# Cipher 3des
40# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc 40# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
41# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 41# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
42# EscapeChar ~ 42# EscapeChar ~
43# Tunnel no 43# Tunnel no