diff options
author | Damien Miller <djm@mindrot.org> | 2009-02-21 12:45:02 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-02-21 12:45:02 +1100 |
commit | e8001d4820bb9d292695bcb8c5f20c04f2f17d61 (patch) | |
tree | 5fcf14ded76a4abad529ac397d4bd114a4d5a6c0 /ssh_config | |
parent | 9055172d0387bae9304aa284b3c08ea107d9133f (diff) |
- djm@cvs.openbsd.org 2009/02/17 01:28:32
[ssh_config]
sync with revised default ciphers; pointed out by dkrause@
Diffstat (limited to 'ssh_config')
-rw-r--r-- | ssh_config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh_config b/ssh_config index ef5a73f7d..f28d59583 100644 --- a/ssh_config +++ b/ssh_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: ssh_config,v 1.24 2008/07/25 06:56:35 grunk 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 |
@@ -37,7 +37,7 @@ | |||
37 | # Port 22 | 37 | # Port 22 |
38 | # Protocol 2,1 | 38 | # Protocol 2,1 |
39 | # Cipher 3des | 39 | # Cipher 3des |
40 | # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc | 40 | # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc |
41 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 | 41 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 |
42 | # EscapeChar ~ | 42 | # EscapeChar ~ |
43 | # Tunnel no | 43 | # Tunnel no |