diff options
author | Colin Watson <cjwatson@debian.org> | 2016-02-29 12:15:15 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-02-29 12:15:15 +0000 |
commit | c52a95cc4754e6630c96fe65ae0c65eb41d2c590 (patch) | |
tree | 793395934013923b7b2426382c0676edcd4be3d4 /ssh_config | |
parent | eeff4de96f5d7365750dc56912c2c62b5c28db6b (diff) | |
parent | 72b061d4ba0f909501c595d709ea76e06b01e5c9 (diff) |
Import openssh_7.2p1.orig.tar.gz
Diffstat (limited to 'ssh_config')
-rw-r--r-- | ssh_config | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssh_config b/ssh_config index 03a228fbd..90fb63f0b 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 |
@@ -34,8 +34,10 @@ | |||
34 | # IdentityFile ~/.ssh/identity | 34 | # IdentityFile ~/.ssh/identity |
35 | # IdentityFile ~/.ssh/id_rsa | 35 | # IdentityFile ~/.ssh/id_rsa |
36 | # IdentityFile ~/.ssh/id_dsa | 36 | # IdentityFile ~/.ssh/id_dsa |
37 | # IdentityFile ~/.ssh/id_ecdsa | ||
38 | # IdentityFile ~/.ssh/id_ed25519 | ||
37 | # Port 22 | 39 | # Port 22 |
38 | # Protocol 2,1 | 40 | # Protocol 2 |
39 | # Cipher 3des | 41 | # Cipher 3des |
40 | # 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 |
41 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 | 43 | # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 |