From nobody Wed Aug 02 14:22:29 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 4RGDl057SLz4qcnj; Wed, 2 Aug 2023 14:24:33 +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 4RGDhQ4xtXz3tX3; Wed, 2 Aug 2023 14:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690986151; 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=Ay4zAfNq8jPu+fTGRQD5WdU3DcAMgCmP9Nkd/d7pvsE=; b=M6rWGFW9O51UxFgUUQvqFSfdgMKVb/qzQcAXyb9Q3fPa9SmgNF3ioodOpPqCD6mbxGYT+v zlH8Qv9mhjCsymyJJuG6lyGJXO3yx6Q/R0j+TjaJM2v3Ixg/rGG2ZKFfEpnQcL+T3QHhwq 9dCMbU9P2965YWHquSRWAu6W/uiixVdtrTdB/wydXlUMN2jWkv73A7D0ig2VDRPh44K2NN eotdz4WIL5gXOzEmyjUsB0ny7sdWfSSKsU6/IsJymEtIY9x0m8KKhE/UHbe5OYXUHyfuqI T+C/1DC4KkK9ntUDBoIe51AXSKsPSuk34RXZ7LKwpdnHGAbriGNxcb7hatW9+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690986151; a=rsa-sha256; cv=none; b=nvCCQCn1+RyjbC+L/FjMiv8k87CEtqOI8PO6EJrZdIcnqvkwDOC2sKWYJolMN7WP6BVdDW MVL2JLa6Jf0d52uSJVwW8bKzHrmJXSdfWIVLRmmXJzM0CSOun68MP7Jr527U2sp9A216MO KCynKL2bqI+YbDw8CXA6dy+2WXWOhR/9GGwJA/Kvsc7Ae9nlgdnkfnR39CfBFctmnozTbM +B6L61/CXSITNus3e5m9TypyN9Zr6cx3crpwbYi1gA38rHbHwGMPwTbQ/tsgVIxX+YoOho r9IKOHwvRi2Z7XhFU+E+++oHa9nOM7+x/kHEm3hKRbfxLDq7kybWFH0qAFAjlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690986151; 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=Ay4zAfNq8jPu+fTGRQD5WdU3DcAMgCmP9Nkd/d7pvsE=; b=LkMG3AKtSpjVS5Tk8wFLjrSFi6ptG8JSc2S4stcupzTaOuqhd8cIRJW0No+89nCNsaeMCL 2MDsFnpL+In4RfCdoZYYcDBjexx412GKITgmm9HKm7Rd6DRDQ3olJUNiTObaUoJ1AkAwTS Uu6r98HLdOYzOEJq6Njg0NCTtPn24aABZV3HYddCWkYGKLYv51EsF5AaXphtoh0USgM9XM Q4QhegF5MRtfX7T3FBnhw3QhmNHGHO4A1gSP8KsmIahB1F2ZH3rrZftR/AoyVBsJUu/gM7 ZHKy2nC9erypn9x1dx2d8qPilNM8jZEUtbmnT4ptX7z0U7ma0JYLKi5boSp3cw== 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 4RGDhP142CzMbY; Wed, 2 Aug 2023 14:22:29 +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 372EMTAr037522; Wed, 2 Aug 2023 14:22:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372EMTpp037521; Wed, 2 Aug 2023 14:22:29 GMT (envelope-from git) Date: Wed, 2 Aug 2023 14:22:29 GMT Message-Id: <202308021422.372EMTpp037521@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: a93cbba2deed - main - ssh: comment deprecated option handling for retired local patches 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: a93cbba2deed209a30da1ecffa637bf5c61b7641 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a93cbba2deed209a30da1ecffa637bf5c61b7641 commit a93cbba2deed209a30da1ecffa637bf5c61b7641 Author: Ed Maste AuthorDate: 2023-08-02 14:18:33 +0000 Commit: Ed Maste CommitDate: 2023-08-02 14:21:34 +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 --- 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 2cbbe8d48522..616a6e8b9bd4 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -323,12 +323,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 bffe60ead024 */ { "versionaddendum", oDeprecated }, { NULL, oBadOption } diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 53c3ee05b9cf..de45475dbc33 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 } };