summaryrefslogtreecommitdiffstats
path: root/ssh_config
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-06-11 06:04:42 +0200
committerDamien Miller <djm@mindrot.org>2007-06-11 06:04:42 +0200
commit4de545a6fb9450ea636a0ce813971dffe2840f25 (patch)
tree73d29ef0eba92ed134a19262ddb4cb2b1f4ec30d /ssh_config
parent - pvalchev@cvs.openbsd.org 2007/06/07 19:37:34 (diff)
downloadopenssh-4de545a6fb9450ea636a0ce813971dffe2840f25.tar.xz
openssh-4de545a6fb9450ea636a0ce813971dffe2840f25.zip
- 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@
Diffstat (limited to 'ssh_config')
-rw-r--r--ssh_config3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh_config b/ssh_config
index 177521caa..8cb0698a8 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