Date: Mon, 6 Dec 2021 15:56:19 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 59a8905f08b8 - stable/13 - nanobsd/rescue: Catch up to 20210907 OpenSSH import Message-ID: <202112061556.1B6FuJSZ033383@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=59a8905f08b841247fe6043cdc573cdc6f74e992 commit 59a8905f08b841247fe6043cdc573cdc6f74e992 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-11-19 05:54:54 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-12-06 15:55:55 +0000 nanobsd/rescue: Catch up to 20210907 OpenSSH import Sponsored by: Netflix (cherry picked from commit 872d50a5d8fca234823385c0a134cd0da0f4477a) --- tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config | 6 +++--- tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config b/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config index e7d969abed25..d2a1db35d42e 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config +++ b/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config @@ -1,4 +1,4 @@ -# $OpenBSD: ssh_config,v 1.33 2017/05/07 23:12:57 djm Exp $ +# $OpenBSD: ssh_config,v 1.35 2020/07/17 03:43:42 dtucker Exp $ # $FreeBSD$ # This is the ssh client system-wide configuration file. See @@ -35,7 +35,6 @@ # IdentityFile ~/.ssh/id_ecdsa # IdentityFile ~/.ssh/id_ed25519 # Port 22 -# Protocol 2 # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc # MACs hmac-md5,hmac-sha1,umac-64@openssh.com # EscapeChar ~ @@ -45,5 +44,6 @@ # VisualHostKey no # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h +# UserKnownHostsFile ~/.ssh/known_hosts.d/%k # VerifyHostKeyDNS yes -# VersionAddendum FreeBSD-20200214 +# VersionAddendum FreeBSD-20210907 diff --git a/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config b/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config index 23eec590c9eb..e3020bbfcacf 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config +++ b/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $ +# $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $ # $FreeBSD$ # This is the sshd server system-wide configuration file. See @@ -62,7 +62,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitEmptyPasswords no # Change to no to disable PAM authentication -#ChallengeResponseAuthentication yes +#KbdInteractiveAuthentication yes # Kerberos options #KerberosAuthentication no @@ -76,13 +76,13 @@ AuthorizedKeysFile .ssh/authorized_keys # Set this to 'no' to disable PAM authentication, account processing, # and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and +# be allowed through the KbdInteractiveAuthentication and # PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass +# PAM authentication via KbdInteractiveAuthentication may bypass # the setting of "PermitRootLogin without-password". # If you just want the PAM account and session checks to run without # PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. +# and KbdInteractiveAuthentication to 'no'. #UsePAM yes #AllowAgentForwarding yes @@ -105,7 +105,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20200214 +#VersionAddendum FreeBSD-20210907 # no default banner path #Banner none
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112061556.1B6FuJSZ033383>