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 | |
parent | 2b6f799e9b230cf13a7eefc05ecead7d8569d6b5 (diff) | |
download | openssh-git-1a1b24f8229bf7a21f89df21987433283265527a.tar.gz |
upstream commit
more protocol 1 bits removed; ok djm
Upstream-ID: b5b977eaf756915acb56aef3604a650e27f7c2b9
-rw-r--r-- | ssh_config | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: ssh_config,v 1.31 2017/04/30 23:18:22 djm Exp $ +# $OpenBSD: ssh_config,v 1.32 2017/05/03 10:01:44 jmc Exp $ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for @@ -29,14 +29,12 @@ # AddressFamily any # ConnectTimeout 0 # StrictHostKeyChecking ask -# IdentityFile ~/.ssh/identity # IdentityFile ~/.ssh/id_rsa # IdentityFile ~/.ssh/id_dsa # IdentityFile ~/.ssh/id_ecdsa # IdentityFile ~/.ssh/id_ed25519 # Port 22 # Protocol 2 -# Cipher 3des # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 # EscapeChar ~ |