summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsobrado@openbsd.org <sobrado@openbsd.org>2016-02-20 23:06:23 +0000
committerDamien Miller <djm@mindrot.org>2016-02-23 12:44:19 +1100
commit09d87d79741beb85768b5e788d7dfdf4bc3543dc (patch)
treeb735af8ec2ecfee3b31ab8893971eaf2f6dab721
parent9262e07826ba5eebf8423f7ac9e47ec488c47869 (diff)
upstream commit
set ssh(1) protocol version to 2 only. ok djm@ Upstream-ID: e168daf9d27d7e392e3c9923826bd8e87b2b3a10
-rw-r--r--ssh_config4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh_config b/ssh_config
index a7518239e..90fb63f0b 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
1# $OpenBSD: ssh_config,v 1.29 2016/02/20 23:02:39 sobrado Exp $ 1# $OpenBSD: ssh_config,v 1.30 2016/02/20 23:06:23 sobrado 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# IdentityFile ~/.ssh/id_ecdsa 37# IdentityFile ~/.ssh/id_ecdsa
38# IdentityFile ~/.ssh/id_ed25519 38# IdentityFile ~/.ssh/id_ed25519
39# Port 22 39# Port 22
40# Protocol 2,1 40# Protocol 2
41# Cipher 3des 41# Cipher 3des
42# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc 42# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
43# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 43# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160