diff options
| author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
| commit | a25ec0b132c44c9e341e08464ff830de06b81126 (patch) | |
| tree | e20842d80f9e25cb6cf09525abea63f7bf655dd7 /ssh_config | |
| parent | 1b816ea846aca3ee89e7995373ace609e9518424 (diff) | |
| parent | 70847d299887abb96f8703ca99db6d817b78960e (diff) | |
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'ssh_config')
| -rw-r--r-- | ssh_config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh_config b/ssh_config index 1257c0778..5e3cd7426 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 |
| @@ -40,6 +40,7 @@ | |||
| 40 | # Protocol 2,1 | 40 | # Protocol 2,1 |
| 41 | # Cipher 3des | 41 | # Cipher 3des |
| 42 | # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc | 42 | # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc |
| 43 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 | ||
| 43 | # EscapeChar ~ | 44 | # EscapeChar ~ |
| 44 | # Tunnel no | 45 | # Tunnel no |
| 45 | # TunnelDevice any:any | 46 | # TunnelDevice any:any |