From nobody Tue Aug 8 16:43:05 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 4RKzWs6Ljrz4pp2j; Tue, 8 Aug 2023 16:43:05 +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 4RKzWs5ZnGz4GhF; Tue, 8 Aug 2023 16:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691512985; 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=rktFtQy1Htk/Mmg9CuzXWTSpsdr2eiue+6FWgSA6CEs=; b=bNy3EHrlVPMO/MAu5o7iY0EBQoITy/n47f55vB4ToRpageZz30s1re1osIr0hT2pKJUpR8 zes6cHSaCROV4UqQimgyBZ9pZc+V6KC7FiG75zvMHAf8sfAWqhU2ZcCRMhWrh0r4AED/8B qfdqlOucpVuzCDD9/BO6lnUkCzeiDCZLcX9krkEKfj7wayl7HMW11Q7RQdvXkLhjHLl3LN pW2AOQjU7h4JPj7lamZal7yAjYr4y8ZlnTWBafXVf7ahHEaUAMzPc6nLv5D6JbbtYL60MU rJHOWjjFVuNkbwRPNAVigLTCVw7FXrChzx/LbnBmQy2+BILYamOTRzxug0UJ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691512985; 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=rktFtQy1Htk/Mmg9CuzXWTSpsdr2eiue+6FWgSA6CEs=; b=D04DIOUoG3dUnHzk7Zmlnf3qqLx5V3R5ycnJkLh7TtM1SPnbFfEbtDjB9FfUXovURU0dVS F+GA8OGSRoB33PoKqBQpkrEqIdB24zXt6V0PkfJoUjQadj876kIlhEF0/Vdir5rEHeQ/j/ KseqR7wr4sm9o80pyq8XmPeV17Vykl8FwWtNFR941WL7kXB2cgG8gYB+hQVVzSLmdGnJeY d/phforZ4eywwSFBsH6KKo2N6TRgUpuAsDpbx2SEbJIPoT0MmR5FtNrdGLcBdJ/dHQrZCj O4TCKmANl073QKVRM4QtjZaOJ3sm/SWayr/VVzyNB+pQweeg4/UD+vwOLbL9Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691512985; a=rsa-sha256; cv=none; b=eIjUxbsTtzUmv1z1QE0pPmZimiFvW3x3gyT93wQgmP19MM39/FTznJGOkwhr61u5Xg5ItT aCTL0dEOAEAPkEIlSrD7imHU6t/1E8YGeG+r9PGA0Wtu4Nc2PyfUYirQgqRnS6KqhLHVpm P2cDPBpgBNh6zHYeTMe7d0RWJfnukZXMTxXkjpOnUtU6eF8BLYl8Eu2xLH2h/ReUDxZkGs tn38apMCy1E2T1nmW/xgc3+YLlo/7RMWSc3tDOx+IBHcs5zs1nm9tWyesznSKvcW9MVlCF 4ziY8tF5vCAG9F7/7/WYh7/wXofra+c3XtbkAF8kVM5jUDgtBadzOD6+6UUpOw== 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 4RKzWs4LwTzh8R; Tue, 8 Aug 2023 16:43:05 +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 378Gh54k056661; Tue, 8 Aug 2023 16:43:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378Gh5iS056660; Tue, 8 Aug 2023 16:43:05 GMT (envelope-from git) Date: Tue, 8 Aug 2023 16:43:05 GMT Message-Id: <202308081643.378Gh5iS056660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: edd0014a6e34 - stable/13 - ssh: comment deprecated option handling for retired local patches 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: edd0014a6e3447a628c7167daa9f0c9b9beda9d8 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=edd0014a6e3447a628c7167daa9f0c9b9beda9d8 commit edd0014a6e3447a628c7167daa9f0c9b9beda9d8 Author: Ed Maste AuthorDate: 2023-08-02 14:18:33 +0000 Commit: Ed Maste CommitDate: 2023-08-08 16:42:01 +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) --- 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 8c1328da5dfa..318729263ee6 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -325,12 +325,14 @@ 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 main in bffe60ead024 */ { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 5e6b496dd3af..840aa09b2fd8 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -707,10 +707,13 @@ static struct { { "unusedconnectiontimeout", sUnusedConnectionTimeout, 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 } };