diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
| commit | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch) | |
| tree | 1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /ssh_config | |
| parent | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff) | |
| parent | 54af7a4ae8d455791a631bdfaade4b64436ae16a (diff) | |
import openssh-5.2p1-gsskex-all-20090726.patch
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 5e3cd7426..93a28014b 100644 --- a/ssh_config +++ b/ssh_config | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $ | 1 | # $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm 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 |
| @@ -39,9 +39,10 @@ | |||
| 39 | # Port 22 | 39 | # Port 22 |
| 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-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc |
| 43 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 | 43 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 |
| 44 | # EscapeChar ~ | 44 | # EscapeChar ~ |
| 45 | # Tunnel no | 45 | # Tunnel no |
| 46 | # TunnelDevice any:any | 46 | # TunnelDevice any:any |
| 47 | # PermitLocalCommand no | 47 | # PermitLocalCommand no |
| 48 | # VisualHostKey no | ||