From nobody Fri Aug 4 17:31:12 2023 X-Original-To: dev-commits-src-main@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 4RHXnD3BBDz4TvTN; Fri, 4 Aug 2023 17:31:12 +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 4RHXnD2JZtz4FNt; Fri, 4 Aug 2023 17:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691170272; 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=LPdB6CEjs8KtksclDNfT/niKls4tYmueOOB/2FuI6UY=; b=Sk+8TGjPBaGfZQPrWK5bSy51GWP4DJeuolOmP5G0rdfqMeTrLLzXop/kAiRFBgvgW7gll5 QKl/p/a8ovohO3HCgBMA1Xq2rGPybN8ysMwCx4YWM+yyNhlXEP+kZndm8pot2+Dr+Mfpk3 MqBwNPXIdLPJjss1K1RqnXTm+Lh0lxZ2WNLLgsBJUaQvGbCqHeJ7BUBNVqOoghK4TRDdhb DYRl24TkKOf22XnqVW9YNeNcn6amDy9WSQbqBYt/1iQ6Q1q3Csq9+j4UJCBST1O4xrO0RH z+YQsbnsqD2eTFJZthUedXcbCJdMA0nWazxYB53A5umAJq8fSAeElIxJgLNSCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691170272; 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=LPdB6CEjs8KtksclDNfT/niKls4tYmueOOB/2FuI6UY=; b=JMG3AEHD5gUnNzpsUqvHlKzTTtEv2SXWsGfyQhdSnJLxOD++nQAyPb9VYRo9OewuWOH/5w P1DQAS5B2FTJc2T2BbltmiJYXwhCY2Fl8cCGfeUiB11pQwMXjurlvGN+GwMwuNU/lNJUUc KFEZOBchkHGPYuRPA4TJxOSaWbO680FDj8JiNCIHAlrl1XijTxT0eRrRHtqc6udt2emCEN 1tzOJ/iI4MBpLBCVOCI5nM3ULa1aNJhfTYTWljsJwdOC5JcH5F15LvCIQBMaKcN+XT47zQ U5VpAbwm7FFrAaXKqrO8K8f9d+BKj/0cG/HKpRpmkTzN2Yh6OsfMSPJercp8dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691170272; a=rsa-sha256; cv=none; b=X5nigXWWZpFdlG+hv9QUTIzKCXJ+9dZwlVmeMABgq7BnkaSCf+OFtAUIjJO/NaqMETs5Dl fTCiGmaCOcaCIKQZ4e8cH4aq/oYdlPnrFZ0HpSqlwuQXYWcdhYONK08+w3onVkflLy0lmq myh285kdRJRpMkPI4vh/IVk9S1rYvXd3Qaz2eNbKYjLaPG51udL7pjNQ0V5HPglS65rj2q 3mVjVIYVNYgyZde+WLbklf+p+Ry6m7hZBiGFuxsIw997rbw9jbKS383tiFXl8iUruBEqSy A4BkJLKw16Xa+hF6NX53yRMjMMix3TWaaoVGQHS3yT0mlvrunuBYW/Af9RWQSw== 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 4RHXnD143tz19rF; Fri, 4 Aug 2023 17:31:12 +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 374HVCMD039890; Fri, 4 Aug 2023 17:31:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374HVCxU039889; Fri, 4 Aug 2023 17:31:12 GMT (envelope-from git) Date: Fri, 4 Aug 2023 17:31:12 GMT Message-Id: <202308041731.374HVCxU039889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 348bea10b6f2 - main - openssh: retire HPN option handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 348bea10b6f2b86f757011652ea798ccb3f696c1 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=348bea10b6f2b86f757011652ea798ccb3f696c1 commit 348bea10b6f2b86f757011652ea798ccb3f696c1 Author: Ed Maste AuthorDate: 2023-08-02 14:37:12 +0000 Commit: Ed Maste CommitDate: 2023-08-04 17:29:04 +0000 openssh: retire HPN option handling The HPN patch set was removed from base system SSH in January 2016, in commit 60c59fad8806. We retained the option parsing (using OpenSSH's support for deprecated options) to avoid breaking existing installations upon upgrade, but sufficient time has now passed that we can remove this special case. Approved by: des Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41291 --- crypto/openssh/FREEBSD-upgrade | 6 ++---- crypto/openssh/readconf.c | 7 ------- crypto/openssh/servconf.c | 6 ------ 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 905b65ec4e3d..8d3f3a14f823 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -182,10 +182,8 @@ 11) Retired patches - We no longer have HPN patches (adaptive buffer size for increased - throughput on high-BxD links) or client-side VersionAddendum, but we - recognize and ignore the configuration options to avoid breaking - existing configurations. + We no longer have client-side VersionAddendum, but we recognize and ignore + the configuration options to avoid breaking existing configurations. 12) PrintLastLog bugfix diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 616a6e8b9bd4..3798c2507717 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -323,13 +323,6 @@ static struct { { "requiredrsasize", oRequiredRSASize }, { "enableescapecommandline", oEnableEscapeCommandline }, - /* HPN patch - retired in 60c59fad8806 */ - { "hpndisabled", oDeprecated }, - { "hpnbuffersize", oDeprecated }, - { "tcprcvbufpoll", oDeprecated }, - { "tcprcvbuf", oDeprecated }, - { "noneenabled", oUnsupported }, - { "noneswitch", oUnsupported }, /* Client VersionAddendum - retired in bffe60ead024 */ { "versionaddendum", oDeprecated }, diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index de45475dbc33..2f9632992751 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -708,12 +708,6 @@ static struct { { "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 } };