summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2017-05-03 10:01:45 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2017-05-03 10:01:45 +0000
commit9fe8d8170afaae89766ef7fdca0231542e9f4f8e (patch)
tree9e9dea91f775f0655fe3f3c3ad0de0662a40be14 /usr.bin
parentdce3ca59e0bfb31467829ba436634072a5c09a94 (diff)
more protocol 1 bits removed; ok djm
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh_config4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh_config b/usr.bin/ssh/ssh_config
index 38c577977d5..e16174dd4d5 100644
--- a/usr.bin/ssh/ssh_config
+++ b/usr.bin/ssh/ssh_config
@@ -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
@@ -27,14 +27,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 ~