summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh/openssh/ssh_config
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-06-07 11:48:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-15 17:56:25 +0100
commit958fd9e6f9bad7f071973c942707b2573183db06 (patch)
treeee357b5d3576b48a97e9c7ef0ea26af3b9a771e7 /meta/recipes-connectivity/openssh/openssh/ssh_config
parent6c13d5d8d04b83498ef522abe1c3b595005d60cd (diff)
downloadpoky-958fd9e6f9bad7f071973c942707b2573183db06.tar.gz
openssh: sync local ssh_config + sshd_config files with upstream 7.7p1
Changes are mostly related to the removal of support for SSH v.1 protocol, which was dropped from openssh sshd in 7.4p1: https://www.openssh.com/txt/release-7.4 (From OE-Core rev: b81389c50e0d191e31f71af82d86bfbb37b83acc) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/ssh_config')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/ssh_config12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/ssh_config b/meta/recipes-connectivity/openssh/openssh/ssh_config
index 9e919156d3..e0d023803e 100644
--- a/meta/recipes-connectivity/openssh/openssh/ssh_config
+++ b/meta/recipes-connectivity/openssh/openssh/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.33 2017/05/07 23:12:57 djm 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
@@ -31,14 +31,14 @@ Host *
31# AddressFamily any 31# AddressFamily any
32# ConnectTimeout 0 32# ConnectTimeout 0
33# StrictHostKeyChecking ask 33# StrictHostKeyChecking ask
34# IdentityFile ~/.ssh/identity
35# IdentityFile ~/.ssh/id_rsa 34# IdentityFile ~/.ssh/id_rsa
36# IdentityFile ~/.ssh/id_dsa 35# IdentityFile ~/.ssh/id_dsa
36# IdentityFile ~/.ssh/id_ecdsa
37# IdentityFile ~/.ssh/id_ed25519
37# Port 22 38# Port 22
38# Protocol 2,1 39# Protocol 2
39# Cipher 3des 40# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc
40# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc 41# MACs hmac-md5,hmac-sha1,umac-64@openssh.com
41# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
42# EscapeChar ~ 42# EscapeChar ~
43# Tunnel no 43# Tunnel no
44# TunnelDevice any:any 44# TunnelDevice any:any