summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ssh_config3
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 48d2e97b8..5ab835b57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
11 one of its underlying hash algorithms is found to be vulnerable to a 11 one of its underlying hash algorithms is found to be vulnerable to a
12 new attack. http://www.ietf.org/rfc/rfc4418.txt 12 new attack. http://www.ietf.org/rfc/rfc4418.txt
13 in conjunction with and OK djm@ 13 in conjunction with and OK djm@
14 - pvalchev@cvs.openbsd.org 2007/06/08 04:40:40
15 [ssh_config]
16 Add a "MACs" line after "Ciphers" with the default MAC algorithms,
17 to ease people who want to tweak both (eg. for performance reasons).
18 ok deraadt@ djm@ dtucker@
19
1420070605 2020070605
15 - (dtucker) OpenBSD CVS Sync 21 - (dtucker) OpenBSD CVS Sync
16 - djm@cvs.openbsd.org 2007/05/22 10:18:52 22 - djm@cvs.openbsd.org 2007/05/22 10:18:52
@@ -2985,4 +2991,4 @@
2985 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2991 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2986 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2992 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2987 2993
2988$Id: ChangeLog,v 1.4681 2007/06/11 04:01:42 djm Exp $ 2994$Id: ChangeLog,v 1.4682 2007/06/11 04:04:42 djm Exp $
diff --git a/ssh_config b/ssh_config
index 177521caa..8cb0698a8 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
1# $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $ 1# $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev 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
@@ -38,6 +38,7 @@
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-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
41# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
41# EscapeChar ~ 42# EscapeChar ~
42# Tunnel no 43# Tunnel no
43# TunnelDevice any:any 44# TunnelDevice any:any