diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-05-07 23:12:57 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:21:00 +1000 |
commit | acaf34fd823235d549c633c0146ee03ac5956e82 (patch) | |
tree | b6e350c58134d35c9a51533349404ee1463192eb /ssh_config | |
parent | 3e371bd2124427403971db853fb2e36ce789b6fd (diff) |
upstream commit
As promised in last release announcement: remove
support for Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@
Upstream-ID: 21f8facdba3fd8da248df6417000867cec6ba222
Diffstat (limited to 'ssh_config')
-rw-r--r-- | ssh_config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh_config b/ssh_config index 515513c3b..c12f5ef52 100644 --- a/ssh_config +++ b/ssh_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: ssh_config,v 1.32 2017/05/03 10:01:44 jmc Exp $ | 1 | # $OpenBSD: ssh_config,v 1.33 2017/05/07 23:12:57 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 |
@@ -35,8 +35,8 @@ | |||
35 | # IdentityFile ~/.ssh/id_ed25519 | 35 | # IdentityFile ~/.ssh/id_ed25519 |
36 | # Port 22 | 36 | # Port 22 |
37 | # Protocol 2 | 37 | # Protocol 2 |
38 | # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc | 38 | # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc |
39 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 | 39 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com |
40 | # EscapeChar ~ | 40 | # EscapeChar ~ |
41 | # Tunnel no | 41 | # Tunnel no |
42 | # TunnelDevice any:any | 42 | # TunnelDevice any:any |