diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2017-05-03 10:01:44 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:05 +1000 |
commit | 1a1b24f8229bf7a21f89df21987433283265527a (patch) | |
tree | d981044fb5767d37aec7ed49c34d93909d125537 /ssh_config | |
parent | 2b6f799e9b230cf13a7eefc05ecead7d8569d6b5 (diff) |
upstream commit
more protocol 1 bits removed; ok djm
Upstream-ID: b5b977eaf756915acb56aef3604a650e27f7c2b9
Diffstat (limited to 'ssh_config')
-rw-r--r-- | ssh_config | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ssh_config b/ssh_config index b986d52ce..515513c3b 100644 --- a/ssh_config +++ b/ssh_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: ssh_config,v 1.31 2017/04/30 23:18:22 djm Exp $ | 1 | # $OpenBSD: ssh_config,v 1.32 2017/05/03 10:01:44 jmc 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 |
@@ -29,14 +29,12 @@ | |||
29 | # AddressFamily any | 29 | # AddressFamily any |
30 | # ConnectTimeout 0 | 30 | # ConnectTimeout 0 |
31 | # StrictHostKeyChecking ask | 31 | # StrictHostKeyChecking ask |
32 | # IdentityFile ~/.ssh/identity | ||
33 | # IdentityFile ~/.ssh/id_rsa | 32 | # IdentityFile ~/.ssh/id_rsa |
34 | # IdentityFile ~/.ssh/id_dsa | 33 | # IdentityFile ~/.ssh/id_dsa |
35 | # IdentityFile ~/.ssh/id_ecdsa | 34 | # IdentityFile ~/.ssh/id_ecdsa |
36 | # IdentityFile ~/.ssh/id_ed25519 | 35 | # IdentityFile ~/.ssh/id_ed25519 |
37 | # Port 22 | 36 | # Port 22 |
38 | # Protocol 2 | 37 | # Protocol 2 |
39 | # Cipher 3des | ||
40 | # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc | 38 | # 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 | 39 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 |
42 | # EscapeChar ~ | 40 | # EscapeChar ~ |