From a93cbba2deed209a30da1ecffa637bf5c61b7641 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 2 Aug 2023 10:18:33 -0400
Subject: [PATCH] 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 2cbbe8d4852..616a6e8b9bd 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 53c3ee05b9c..de45475dbc3 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 }
 };