From: djm <djm>
Date: Mon, 11 Jun 2007 04:04:42 +0000 (+0000)
Subject:    - pvalchev@cvs.openbsd.org 2007/06/08 04:40:40
X-Git-Tag: V_4_7_P1~58
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/c22b0835eec7ee9c8ae799abf9e5d926998f1c75

   - pvalchev@cvs.openbsd.org 2007/06/08 04:40:40
     [ssh_config]
     Add a "MACs" line after "Ciphers" with the default MAC algorithms,
     to ease people who want to tweak both (eg. for performance reasons).
     ok deraadt@ djm@ dtucker@
---

diff --git a/ChangeLog b/ChangeLog
index cee20afd..e5c5c2bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
      one of its underlying hash algorithms is found to be vulnerable to a
      new attack.  http://www.ietf.org/rfc/rfc4418.txt
      in conjunction with and OK djm@
+   - pvalchev@cvs.openbsd.org 2007/06/08 04:40:40
+     [ssh_config]
+     Add a "MACs" line after "Ciphers" with the default MAC algorithms,
+     to ease people who want to tweak both (eg. for performance reasons).
+     ok deraadt@ djm@ dtucker@
+
 20070605
  - (dtucker) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2007/05/22 10:18:52
diff --git a/ssh_config b/ssh_config
index 177521ca..8cb0698a 100644
--- a/ssh_config
+++ b/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
@@ -38,6 +38,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