From nobody Tue Aug 8 16:49:14 2023
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 4RKzfz19kcz4pp4C;
Tue, 8 Aug 2023 16:49:15 +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 4RKzfy6pTvz4H9q;
Tue, 8 Aug 2023 16:49:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1691513355;
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=hgu/uWiUovotnd4aqatVMDBpp3nsQL+YK+xj5ir/7Wg=;
b=gi1OChInL4D/GCJClkVIQv8YGzty3D24VzTpXowk8f+kmS8pkheGseAffvz08japyGPQtF
WZVNTQ2xjP7/gs1y3Ddaba/CZ3+kV6pnbV1dwopGTjc4t6TiI/aBILufz9p4u5Ntm8gnsa
arFyU2hbVA7YiQILBlayphNBGnKRuGKPCUE8p8UbmtSsN5sjI2bKwrKsm05MQOaJpjBIPe
udMTCbnDyCPq2KapF4c2AZgbqGBnrE+0RZvqY7REeoftaBbY58fTKF+5kW00PdZH9ks5iL
n1SAVJY1FMhLxj6ysx/CMGc6WYTp8QfBT0ModBpxc7lpDBZ77QIwu0DIXXONXw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1691513355;
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=hgu/uWiUovotnd4aqatVMDBpp3nsQL+YK+xj5ir/7Wg=;
b=LBkrcF9ypQNnw4CpOp8rB1h2kUeVkHaM8IN2QoPNwyGmBbozv+/zOLi8mnFoBvzh1JThZx
n9dfAGbBj3caSEEeOeOjOsawsNWxEM+UN6QrsedhEqK9fi01CbnFsCSe1Yr3q/YjDvs6m3
u24rb/Q5pm5TRx/xJp3BjBJ7COTlG90WbY7ZmWvEVi+eURkIBivQvoJr+LuQ88kI9Abvpk
NXIyBQUnTUN0qVBjcWzAv7FPGZ4h1uJbJoWxD+FqBWoqZ0pIc4PqWiKcOOO2JLR6lGKbVK
ULZZBZO3/obiTWPngvKfgEMf168J/1XziguRFLM3Z8QwXelEqCY69msCVLdNZg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691513355; a=rsa-sha256; cv=none;
b=WP1zKxnVVVJneVCN6GaoW6EUMWyCTAhzkL8p3veMoVbsMSyNJoYNr4TWAn0TB2MaGgjq/o
Ljv2QOW8ukB4g5035vNz7vq4meNrtx2X6G3loLuW5yLWcV2Atkce7XBOGcmhTLqycBtUhH
fLdxVN9KKWE6qlHnmL6fD4z+UBs5O63/zFNLr/zoYstL3fnaBjxtH3AyCPYfNKWE67yCn4
ipJR8Kd1phvRXBSfD4n323eoAcG1ojgNZijDypYxHXjs6jRSvNjJaqSW2+xSpkYWh5E15d
nvOb9oIJ+u5Z9xh5CEdm0Hx+5oZaIzmVQtfUeuDGGFLF6pWCDTCfcySnFdwCxw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
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 4RKzfy5ZBQzhR1;
Tue, 8 Aug 2023 16:49:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378GnEew057658;
Tue, 8 Aug 2023 16:49:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378GnETm057657;
Tue, 8 Aug 2023 16:49:14 GMT
(envelope-from git)
Date: Tue, 8 Aug 2023 16:49:14 GMT
Message-Id: <202308081649.378GnETm057657@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: c734abca9540 - stable/12 - ssh: comment deprecated option handling for retired local patches
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: c734abca9540fc8af5c790e9d05fc0dcb77d78eb
Auto-Submitted: auto-generated
The branch stable/12 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=c734abca9540fc8af5c790e9d05fc0dcb77d78eb
commit c734abca9540fc8af5c790e9d05fc0dcb77d78eb
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-08-02 14:18:33 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-08-08 16:48:45 +0000
ssh: comment deprecated option handling for retired local patches
Older versions of FreeBSD included the HPN patch set and provided
client-side VersionAddendum. Both of these changes have been retired
but we've retained the option parsing for backwards compatibility to
avoid breaking upgrades. Add comment references to the relevant
commits.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit a93cbba2deed209a30da1ecffa637bf5c61b7641)
(cherry picked from commit edd0014a6e3447a628c7167daa9f0c9b9beda9d8)
---
crypto/openssh/readconf.c | 2 ++
crypto/openssh/servconf.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 2bb38ff70a19..798a170c4604 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -325,12 +325,14 @@ static struct {
{ "knownhostscommand", oKnownHostsCommand },
{ "requiredrsasize", oRequiredRSASize },
+ /* HPN patch - retired in 60c59fad8806 */
{ "hpndisabled", oDeprecated },
{ "hpnbuffersize", oDeprecated },
{ "tcprcvbufpoll", oDeprecated },
{ "tcprcvbuf", oDeprecated },
{ "noneenabled", oUnsupported },
{ "noneswitch", oUnsupported },
+ /* Client VersionAddendum - retired in main in bffe60ead024 */
{ "versionaddendum", oVersionAddendum },
{ NULL, oBadOption }
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index 1dd313005089..2b0dd936bc78 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -695,10 +695,13 @@ static struct {
{ "requiredrsasize", sRequiredRSASize, SSHCFG_ALL },
{ "useblacklist", sUseBlacklist, SSHCFG_GLOBAL },
{ "useblocklist", sUseBlacklist, SSHCFG_GLOBAL }, /* alias */
+
+ /* HPN patch - retired in 60c59fad8806 */
{ "noneenabled", sUnsupported, SSHCFG_ALL },
{ "hpndisabled", sDeprecated, SSHCFG_ALL },
{ "hpnbuffersize", sDeprecated, SSHCFG_ALL },
{ "tcprcvbufpoll", sDeprecated, SSHCFG_ALL },
+
{ NULL, sBadOption, 0 }
};