summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorPeter Valchev <pvalchev@cvs.openbsd.org>2007-06-08 04:40:41 +0000
committerPeter Valchev <pvalchev@cvs.openbsd.org>2007-06-08 04:40:41 +0000
commit9600b0212141318444461afbb4dddeed07cd07d3 (patch)
tree25338cd82a3b202f69bfce429e566ebab8f1b358 /usr.bin/ssh
parent79ac37a6d5429e9ff3f15c912831100d5c420e1f (diff)
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@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh_config3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh_config b/usr.bin/ssh/ssh_config
index 177521caaa1..8cb0698a8d8 100644
--- a/usr.bin/ssh/ssh_config
+++ b/usr.bin/ssh/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