From nobody Mon Dec 06 15:55:12 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 08B6A18C3E04; Mon, 6 Dec 2021 15:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J77L90LTQz4Zqr; Mon, 6 Dec 2021 15:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7EF6F691F; Mon, 6 Dec 2021 15:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B6FtCZt032638; Mon, 6 Dec 2021 15:55:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6FtCI1032637; Mon, 6 Dec 2021 15:55:12 GMT (envelope-from git) Date: Mon, 6 Dec 2021 15:55:12 GMT Message-Id: <202112061555.1B6FtCI1032637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: dac3ef8c402f - stable/12 - nanobsd/rescue: Catch up to 20210907 OpenSSH import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: dac3ef8c402f26e1e412a8a83dff1f3625f36110 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638806113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QqJr9ObkHh28PQ+B+romgK/Daziizm0b8CxixFtSm70=; b=f+mk4MR2OJjc44BDAut9P5fl0AiLWq9JH84nDlznPx6zH8gY+Z5Jfnm45aYAVrq54Kytjj uTUHy+6TxcToikUMMCznrS/IlwVS2t0zWnvpSsgbh4TG52s+3QL2TgweTR4uWarXOWv1OM 7oj0QoXnHF/ow1lHwuktP0ox2apCJgNnT6pjjTyEe4P/nSrcdN8jLEiuIbGjaPwP5b/Hl6 +E/EIl9dSLx2wDXK5TuwCJF0vX6cYHEkTfK4+kS4wc31yN5fEAJV4LezUuARJAeDlZumow gXeEybEfPpMc0NsSl1GXTVAiYh1aqb4foXetAk8CDGNAWWMlTQcABVFh05gX1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638806113; a=rsa-sha256; cv=none; b=GLdYspl+gd/hVSlfTeHyyee0YurjDoC5ALN91ADsolbhOt5WYfgk1iGKR1Xk5kOGWFZ9pN PpVUmGSqvEdGHX2SULRbF7lkUgbgV8Q+PJ90pnkflhbkNX0OfIZQOmTnMYM/znpvtPIGw3 pJAB2hKlkAMCwcVkAE3fOVtOL6mi2svL9vweNTsU+oztx/T3lZE9rb0EbWLh3tNkpPPzHE paEllGQmoLhiIBwOh5QFj8zDOdDy4Vk6MnTiMiTTHLaucPqbKYxCq6HsIb56FxDGQ87vQD UXm0/hc3kDRbUxw2vp1Tk/6voHoR+p8uPtmM7BjyVN0Ncqc+AyIoST12ft6kNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dac3ef8c402f26e1e412a8a83dff1f3625f36110 commit dac3ef8c402f26e1e412a8a83dff1f3625f36110 Author: Warner Losh AuthorDate: 2021-11-19 05:54:54 +0000 Commit: Warner Losh CommitDate: 2021-12-06 15:54:09 +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