summaryrefslogtreecommitdiff
path: root/ssh_config
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-02-29 12:15:15 +0000
committerColin Watson <cjwatson@debian.org>2016-03-08 11:51:22 +0000
commit46961f5704f8e86cea3e99253faad55aef4d8f35 (patch)
tree0dd97fa4fb649a62b4639fe2674380872b1f3e98 /ssh_config
parentc753fe267efb1b027424fa8706cf0385fc3d14c1 (diff)
parent85e40e87a75fb80a0bf893ac05a417d6c353537d (diff)
New upstream release (7.2).
Diffstat (limited to 'ssh_config')
-rw-r--r--ssh_config6
1 files changed, 4 insertions, 2 deletions
diff --git a/ssh_config b/ssh_config
index c9386aadd..5190b06b1 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
1# $OpenBSD: ssh_config,v 1.28 2013/09/16 11:35:43 sthen 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,8 +37,10 @@ Host *
37# IdentityFile ~/.ssh/identity 37# IdentityFile ~/.ssh/identity
38# IdentityFile ~/.ssh/id_rsa 38# IdentityFile ~/.ssh/id_rsa
39# IdentityFile ~/.ssh/id_dsa 39# IdentityFile ~/.ssh/id_dsa
40# IdentityFile ~/.ssh/id_ecdsa
41# IdentityFile ~/.ssh/id_ed25519
40# Port 22 42# Port 22
41# Protocol 2,1 43# Protocol 2
42# Cipher 3des 44# Cipher 3des
43# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc 45# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
44# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 46# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160