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

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 }
 };