diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2009-02-24 18:49:27 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2009-02-24 18:49:27 +0000 |
| commit | 9ab1052dcdca9be06dcec8abc37103a70e358e73 (patch) | |
| tree | e584c257bb55edd49609ecf2750698017a03411e /ssh_config | |
| parent | 23371b1d95849b7f55a33cad9ba00f81e822c5a1 (diff) | |
Vendor import of OpenSSH 5.2p1vendor/openssh/5.2p1
Notes
svn path=/vendor-crypto/openssh/dist/; revision=189006
svn path=/vendor-crypto/openssh/5.2p1/; revision=189007; tag=vendor/openssh/5.2p1
Diffstat (limited to 'ssh_config')
| -rw-r--r-- | ssh_config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh_config b/ssh_config index 8cb0698a8d89..f28d59583477 100644 --- a/ssh_config +++ b/ssh_config @@ -1,4 +1,4 @@ -# $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $ +# $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for @@ -37,9 +37,10 @@ # Port 22 # Protocol 2,1 # Cipher 3des -# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc +# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 # EscapeChar ~ # Tunnel no # TunnelDevice any:any # PermitLocalCommand no +# VisualHostKey no |