From nobody Tue Mar 01 14:39:51 2022 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 A260119DAA82; Tue, 1 Mar 2022 14:39:51 +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 4K7Kdz4CYsz3Fk5; Tue, 1 Mar 2022 14:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646145591; 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=xqTrcjqXoOiErRx/kfs1tPBmN1kh4l0CC4ApPXU6o/g=; b=yMdYvjFZnJSwqdlKPnAXnyNY9NxZwTU2Aa0uLBWchOL5/gEiasKq3efSIay9/PiulFxJjp fJT41ilPehmaD+MVz45DzUUg+FIrF78slcl8yXqFa8bsM4odCWfqGzBLUEZTH3HeEFleYL JnBZ4RHYYztrr6HymWkT9eMKARgSD4frPKty6E9ZzXcFXEzKaMllSLoKi3e4Uy42x8t/Ug k6bVwkUxnp7ZCFkLqVVWvP/uYokeujv+2F4XEJA9Cm75euFShkLvH16YaVvIPCEkIdLOpz /7nSujyAOR5/kNOtlIe/A6fnpsHtk7ZkZpvA6H2L4k1KSEM8lw/xMRkEeI+Iqg== 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 70B35113D0; Tue, 1 Mar 2022 14:39:51 +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 221EdpPg038403; Tue, 1 Mar 2022 14:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 221EdpoJ038402; Tue, 1 Mar 2022 14:39:51 GMT (envelope-from git) Date: Tue, 1 Mar 2022 14:39:51 GMT Message-Id: <202203011439.221EdpoJ038402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c1b656ac55ec - main - release: Remove references to ChallengeResponseAuthentication 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1b656ac55eca1fc191225bd715b31ff25be9031 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646145591; 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=xqTrcjqXoOiErRx/kfs1tPBmN1kh4l0CC4ApPXU6o/g=; b=o3V56+0JXmZJtOCISTGT6qQmP8b3JsnhWgOszjSVVj6oHbfRWyGYholJPbNyTFGMwIy60a iMDg6Enmf5iDSISvzUXqEzedUeZe07V8Rm+HgwnHr4A3woEBgWGpHzOwoe2uSfg8PlAGRa Sq2bEZPYu31LB5mY0NOATcyk4MMXPnYv6CaukgUhkkpPzxPrMc/f7rVtH51tDOLUuzHKy4 JHnWvi2qZYgTCR5QZxpLG4okPvyV0nGt7vnBh4E+kQPXLkmDoIZgiHYDNcguRPw4MVQLGR WYi8TLD65qi+DQS3yeKdcpvv0ER3LmW2cKnRBKJcfq25OIcA8LAy338LRaeXYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646145591; a=rsa-sha256; cv=none; b=YgLNz2KAfbZHS18WwbafbZrc9ydQkv39RQxQHbZYnuDfP844qibF5qCJapAs03Dbc+m9DZ Fn9tWm0/spFcpD8C475ZIn8uqGYbeAREUZYr5BLeBkM3yiDZbiim6F/wF0e5MKVTFf9CK3 Eu8EPWW7YyWFjdm3BrDu0ZKE6Cve/sEmAmKMk507QrGGwog3lm4SYnkwbbhc+I23rgQdJ/ Fs6zvxCggxsm73k5BsJCDDCi/AIT2wC0DZ974PzGdWLD5jlYkUMqvZvd+D41wbjQqCoOnE XMfI8S09vY/nAQfoAfgEVfxuQMhlpnFbpOdEUmnwQ/kaZ8hyCr654WJTu7l7bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c1b656ac55eca1fc191225bd715b31ff25be9031 commit c1b656ac55eca1fc191225bd715b31ff25be9031 Author: Mark Johnston AuthorDate: 2022-03-01 13:54:55 +0000 Commit: Mark Johnston CommitDate: 2022-03-01 13:54:55 +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 MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34400 --- 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 f0665646088b..5be4937379a0 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -122,10 +122,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 745477f0bc8e..74e7455cb9dd 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -70,7 +70,7 @@ EOF EOF cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config -ChallengeResponseAuthentication no +KbdInteractiveAuthentication no X11Forwarding no AcceptEnv LANG AllowAgentForwarding no