diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2023-08-03 00:58:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-10 09:18:54 +0100 |
commit | 8cd7786bcad03b03f4aab8492f8ba135ffa53d6d (patch) | |
tree | df0d3350e7cd17671d83f2ff54655c3f86a99ada /meta | |
parent | 71370b5ecd81e9c1cd569380d7a889dc156c8e51 (diff) | |
download | poky-8cd7786bcad03b03f4aab8492f8ba135ffa53d6d.tar.gz |
openssh: sync with upstream's default
This change sync the contents of this file with upstream's
ssh_config except for the locally added line
'Include /etc/ssh/ssh_config.d/*.conf'.
More specifically the ForwardXXX options are disabled by default,
this sync with what ssh_config(5) says about these two items.
In addition, the RSAAuthentication items are removed as they are v1 protocol.
See the contents of Changelog file in openssh project as below:
"""
commit bfe19197a92b7916f64a121fbd3c179abf15e218
Author: Darren Tucker <dtucker@dtucker.net>
Date: Fri Jul 2 15:43:28 2021 +1000
Remove now-unused SSHv1 enums.
sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options
and are no longer used.
"""
(From OE-Core rev: 01174262c6cb8f6d7b9dbe5292d0f93f72a15691)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/ssh_config | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/ssh_config b/meta/recipes-connectivity/openssh/openssh/ssh_config index ca70f37375..cb2774a163 100644 --- a/meta/recipes-connectivity/openssh/openssh/ssh_config +++ b/meta/recipes-connectivity/openssh/openssh/ssh_config | |||
@@ -19,11 +19,9 @@ | |||
19 | 19 | ||
20 | Include /etc/ssh/ssh_config.d/*.conf | 20 | Include /etc/ssh/ssh_config.d/*.conf |
21 | 21 | ||
22 | Host * | 22 | # Host * |
23 | ForwardAgent yes | 23 | # ForwardAgent no |
24 | ForwardX11 yes | 24 | # ForwardX11 no |
25 | # RhostsRSAAuthentication no | ||
26 | # RSAAuthentication yes | ||
27 | # PasswordAuthentication yes | 25 | # PasswordAuthentication yes |
28 | # HostbasedAuthentication no | 26 | # HostbasedAuthentication no |
29 | # GSSAPIAuthentication no | 27 | # GSSAPIAuthentication no |