git: edd0014a6e34 - stable/13 - ssh: comment deprecated option handling for retired local patches

The branch stable/13 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=edd0014a6e3447a628c7167daa9f0c9b9beda9d8

commit edd0014a6e3447a628c7167daa9f0c9b9beda9d8
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: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 }
 };