From nobody Tue Mar 8 00:26:07 2022 X-Original-To: dev-commits-src-branches@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 51DE919FDCA8; Tue, 8 Mar 2022 00:26:08 +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 4KCGMh09sVz4qL8; Tue, 8 Mar 2022 00:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646699168; 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=EMqu+qdcGfYgM4LjQm1veJiSKqDbSIZcMCcC/cD0Xpc=; b=iDCH3rQybju4P+dLlg7teZIFfLI1muec4pDEEJ1a0Ci7PCfrjn+Ry/vCFkcn8ziRSw9I5v cuNJtMbmmstsL17Oz7Ey3r1tHLj9vBhSbHSrjfEqXu+PpzmSfY+1g7Uz41twd2rSfvd1ov s2d6DHiY74QpBAC9f6Aclu9GmhS70GBWwh6j8GD0Oa9ZRnrEFkYQFVFIt0HdT6mz9uTWim HfzB7xGpxBIQrEjhpoA43VG/4heUXTMvZST2U088RFZndr3VI792wIN6TTX2HLJ+vUvepF Q9R3jcRjmTPkphTKjEA8pr6GjSjYrucEdLf+ZZ463EpcW8g0sFn9lsojoXrI7A== 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 D57D512B7D; Tue, 8 Mar 2022 00:26:07 +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 2280Q7Ic075705; Tue, 8 Mar 2022 00:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2280Q7LH075704; Tue, 8 Mar 2022 00:26:07 GMT (envelope-from git) Date: Tue, 8 Mar 2022 00:26:07 GMT Message-Id: <202203080026.2280Q7LH075704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: fd7db6dedda1 - stable/13 - release: Remove references to ChallengeResponseAuthentication List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd7db6dedda12a4d2b6923b4766d5bf31fba8355 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646699168; 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=EMqu+qdcGfYgM4LjQm1veJiSKqDbSIZcMCcC/cD0Xpc=; b=EtCzWG0go/ImBT7V13winR0xbSsMGDk/+bnAO8ZF7Qjg6QIyAgJge8A6sudAty3WwmI+Gi jlfiPct87gVn4ieGsw5f5npFcu744+uwqxGICfeP3QyR6Ta2g6uXosYwxkOXvYFPUwAStL SnDXr1xmi9586nFeSn1okZjRbhKTQNqTVUwQ7eiF0oi5cskqUtuzHn/wQnPYNfNtf6eU57 vBtg+QsFwfHBNMzA4mP1vS/6/GWIF7SkGkay6a0eSmQenbcvhoCQBLXEBVI9ADkMbzqfw2 y0J54vkTCj+ZVB+jcqHEgUqbOvqRw/2lHX8rmy00YxI0elNU0eDha3LrR+r2Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646699168; a=rsa-sha256; cv=none; b=kmUeaKijT+RQFBx3rWMV98iu1w+dvKSR8gSnzajz5MAuGOmpyz/MiWlqVhCKB135otHf8K c60+q7z/PpkrCwtaliMh65oxH7GxuY8zpniFJXm9Vmwpk4bhfCGkEnGCRPVM3Y3OwNb2fS zuByBCkkdEl4QowvzuxvjAxM8HtTRyokh10CvnRyHOZA/386DpUcEwiEbJnsCQ0yokHBoz gYPoIZ3dulGP7CBw2/eDfc5vdjobW40DE93lwPiFUbAFH3ua8j+nqcvDQgwduWUe3Lhq6e qMV/cfTV48NbFwh46J4a6zbFd0NnniuIG289Oowa2BeHh5LcKRInPRQwvevwJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd7db6dedda12a4d2b6923b4766d5bf31fba8355 commit fd7db6dedda12a4d2b6923b4766d5bf31fba8355 Author: Mark Johnston AuthorDate: 2022-03-01 13:54:55 +0000 Commit: Mark Johnston CommitDate: 2022-03-08 00:25:58 +0000 release: Remove references to ChallengeResponseAuthentication This sshd_config keyword was replaced by KbdInteractiveAuthentication in openssh 8.7, though ChallengeResponseAuthentication is silently accepted as an alias. However, this means that the code in ec2.conf which modifies a commented-out line no longer does anything. Apply a minimal fix. Reviewed by: cperciva, emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit c1b656ac55eca1fc191225bd715b31ff25be9031) --- release/tools/ec2.conf | 5 ++--- release/tools/gce.conf | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index bb972c456fbc..c5eef404bf3b 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -120,10 +120,9 @@ EOF # historical "nvd" driver. echo 'hw.nvme.use_nvd="0"' >> ${DESTDIR}/boot/loader.conf - # Disable ChallengeResponseAuthentication according to EC2 - # requirements. + # Disable KbdInteractiveAuthentication according to EC2 requirements. sed -i '' -e \ - 's/^#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication no/' \ + 's/^#KbdInteractiveAuthentication yes/KbdInteractiveAuthentication no/' \ ${DESTDIR}/etc/ssh/sshd_config # Use FreeBSD Update and Portsnap mirrors hosted in AWS diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 113784a7643e..903f1e073065 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -69,7 +69,7 @@ EOF EOF cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config -ChallengeResponseAuthentication no +KbdInteractiveAuthentication no X11Forwarding no AcceptEnv LANG AllowAgentForwarding no