9.3p1.hpn17v13

3 files changed, 35 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f5db00a171b..d2cbca65cb29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openssh-hpn
 	pkgdesc = A Secure SHell server/client fork with High Performance patches included
-	pkgver = 9.2p1.hpn17v11
-	pkgrel = 2
+	pkgver = 9.3p1.hpn17v13
+	pkgrel = 1
 	url = https://www.psc.edu/index.php/hpn-ssh/
 	arch = x86_64
 	arch = i486
@@ -21,7 +21,7 @@ pkgbase = openssh-hpn
 	optdepends = x11-ssh-askpass: input passphrase in X
 	optdepends = libfido2: FIDO/U2F support
 	conflicts = openssh-hpn-git
-	source = https://github.com/rapier1/openssh-portable/archive/hpn-9_2_P1.tar.gz
+	source = https://github.com/rapier1/openssh-portable/archive/hpn-9_3_P1.tar.gz
 	source = hpn-revert-default-port-2222.patch
 	source = http://www.eworm.de/download/linux/openssh-tests-scp.patch
 	source = glibc-2.31.patch
@@ -31,8 +31,8 @@ pkgbase = openssh-hpn
 	source = sshd.service
 	source = sshd.pam
 	source = sshd.conf
-	sha512sums = f21c241532674f3ba5fb0979b459d6a72b38df50a33050e132495bb5c55deb87e0b9bbdf6b3627783aab6b30549778699f6631081afd4acde6d2a70e13ccdf4f
-	sha512sums = 6b97f9e955745ef424ecf6e37b96942f3a528f800046ec6edc040e626a07e9ac1724dabb956cd00750164329af98b2c2b41eacd4c3ba27d29ab5cece4b60bc61
+	sha512sums = 0e5258227458c5cf7993785b543c59a67d1093ddcc8429f9ff8da7c3965ca865fc35316402e3a0c22fb3ecf1f7bb9a6863e2fcb2236f30495f2427bc5dc2fb9b
+	sha512sums = 548788e48d12cbf924e6172d81878e9cab5caa82d3c91db043ae84697de9d95619a0c79bd8d1d91d2980b046615bb750e71457a590fa082d374dcd939a485bbf
 	sha512sums = 62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4
 	sha512sums = aeee097dbf46aa22f411d78a49b9db7b2451dd0351bb5f57c7b3159c7ddc29aa994cd43046c187033c474f8fb2952165536197139eb7c495db99f6697f41637d
 	sha512sums = 6438c063d8785babb33e18ee082ea96168a56a4e02099b521015dfc764d3411b97d911e0cc577cdb9ac7a572e8cf0b86a9d4fa1e3c83166055690fa3f551dc7d
@@ -41,8 +41,8 @@ pkgbase = openssh-hpn
 	sha512sums = aaa3f0e9ee686b7208ef94e373007a57e5f62020339399d6abbbeba276acedb1868d62c0401c901fd021f9287b263347b699c0d4b65f503fa57bafef5f4b8829
 	sha512sums = 298e47a21c337101974fa5237b3110aa3c7638b5fa53bd07661413236c8ed3212b431abaeffd875af6c9a72b4f8e1c8512e1e1960cbfff15bfee62b32d305fc3
 	sha512sums = 838252ca7bfa69797cba8e31340321ece06a58428b47002cb835678d8e29c6f23f6521269a2b5b17820860a56df308185bc651484db24327cc58191e5f83222a
-	b2sums = 453e17264e8301146fe2909e2365413b4dff1c26120afeb713b17c4e0827976a538acb884b5cdd75eae8609c9cc3210fe294b1aa31caeee2adf505ba9b56beeb
-	b2sums = 4b2e8334ec2176fcd778f2ca0b7794fedbbc5323bd4db5a5b73c5f446631a170b0f02456a2f1f857df4149c7b08196fbf05c0482c32dec6029cd5c751d0a659c
+	b2sums = bae344db5e67c2a5d55079ba13d6cf0a54664ed306d912b0988c07c7da6684cda32f860f14d1267ecf784c5999363a566e93e2eb062e2804c01f9f43098ae057
+	b2sums = eca67477c9002707f311618095ec1c971e7b20f52c6aac12dadb1f2c17d90fbb5d4494f650c376b54a0c20dd3914b232e6fbf4fff49eb4fbbfb04f08454e3878
 	b2sums = 1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548
 	b2sums = a6ff4e82a92e7dba08f0e6c14ad1d280ad2dbc1d5ebdc7dc70eaa1b7963ddd5d5491fdf4c83cde1bec183b335ed20edaf101ac8bdb3c0f480adc72d41251723b
 	b2sums = e6c672505b37fe915a4dd2f5a1503b8be88a124aed22cc736cccbc88573b23eba36e7702136b009c6209c1079f4520e4ee1233fa8a2bbb82f2ea1d8be388ea1f
diff --git a/PKGBUILD b/PKGBUILD
index 7a5cd3b9c260..c24db762ea86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,14 +44,14 @@ pkgname=(
   openssh-hpn
   openssh-hpn-shim
 )
-_openssh_ver=9.2p1
-_hpn_ver=hpn17v11
+_openssh_ver=9.3p1
+_hpn_ver=hpn17v13
 #_pkgver="$(sed -e 's/\./_/' -e 's/p/_P/' <<< ${_openssh_ver})_new"
 _pkgver="$(sed -e 's/\./_/' -e 's/p/_P/' <<< ${_openssh_ver})"
 git_rev="hpn-${_pkgver}"
 #git_rev="1fb7466a7a8c43e8b4ea4587ecb16d7b725a0d8e"  # 9.1p1-hpn17v7
 pkgver="${_openssh_ver}.${_hpn_ver}"
-pkgrel=2
+pkgrel=1
 pkgdesc='A Secure SHell server/client fork with High Performance patches included'
 url='https://www.psc.edu/index.php/hpn-ssh/'
 license=('custom:BSD')
@@ -80,8 +80,8 @@ source=(
 )
 
 sha512sums=(
-  'f21c241532674f3ba5fb0979b459d6a72b38df50a33050e132495bb5c55deb87e0b9bbdf6b3627783aab6b30549778699f6631081afd4acde6d2a70e13ccdf4f'
-  '6b97f9e955745ef424ecf6e37b96942f3a528f800046ec6edc040e626a07e9ac1724dabb956cd00750164329af98b2c2b41eacd4c3ba27d29ab5cece4b60bc61'
+  '0e5258227458c5cf7993785b543c59a67d1093ddcc8429f9ff8da7c3965ca865fc35316402e3a0c22fb3ecf1f7bb9a6863e2fcb2236f30495f2427bc5dc2fb9b'
+  '548788e48d12cbf924e6172d81878e9cab5caa82d3c91db043ae84697de9d95619a0c79bd8d1d91d2980b046615bb750e71457a590fa082d374dcd939a485bbf'
   '62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4'
   #'5d96a288ae925584cdcde0305c511b18e3cfaed6cae49f5fc6f062f62100d10a087144e8263380d19a14dca71c745065ddaa0062542c2e2cfa1db04811d40dc7'
   #'a9ee92fd135c47a27ac260ab40c057f0e35c118efcb281e98e235158ffd8599acede67dcce6da4c2589b2a0bd794c587af80d4ce4f85c1b9823cb9acfbbe9050'
@@ -96,8 +96,8 @@ sha512sums=(
 )
 
 b2sums=(
-  '453e17264e8301146fe2909e2365413b4dff1c26120afeb713b17c4e0827976a538acb884b5cdd75eae8609c9cc3210fe294b1aa31caeee2adf505ba9b56beeb'
-  '4b2e8334ec2176fcd778f2ca0b7794fedbbc5323bd4db5a5b73c5f446631a170b0f02456a2f1f857df4149c7b08196fbf05c0482c32dec6029cd5c751d0a659c'
+  'bae344db5e67c2a5d55079ba13d6cf0a54664ed306d912b0988c07c7da6684cda32f860f14d1267ecf784c5999363a566e93e2eb062e2804c01f9f43098ae057'
+  'eca67477c9002707f311618095ec1c971e7b20f52c6aac12dadb1f2c17d90fbb5d4494f650c376b54a0c20dd3914b232e6fbf4fff49eb4fbbfb04f08454e3878'
   '1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548'
   #'051b7c350333ce57a4a5e57ba0f693aed4491a241fd9e65cf2a861773571b44b8d4ffa06506a0c4a05399a46108ec05321e69f210637f32e25c76e683b224505'
   #'b46019363a19e2a0c397d66b6f1dc24d1c1219372b7fd699d92a9c382b24b02437b37cb12b3bba7e3ca97cfe98170ad21fff5871daf2070bc3d175fe0b31680b'
@@ -112,8 +112,8 @@ b2sums=(
 )
 
 b3sums=(
-  'bb5d806d3f072b1100ecec0643e519656d03ba2fb95377e122566ed3f93c38fe'
-  '2ccf62429dc1e4f11361a50c1419f10029388e75ccadcb19fe0a1b531de925cc'
+  '13501a5bc7a29b191d3a9906039fa6341e28e9fa0c6e482450dc0297a722a36f'
+  'de325fceb3e1f657a4b7d8032dac66e10f75e678c241085dea4b90765b3f64b2'
   'db9e75e396c8f45aacb0e14003aabdcf29b812e468a5a40b371957ffe9c7f52f'
   #'145f9d17920d7b3b1ef935e3a735171ac9783cbd94ee47eec86f3fb96a6a34c6'
   #'86f8ba9e3469c86c2ced236240d9ba9a253d82b8b6732d8592db481d984de258'
diff --git a/hpn-revert-default-port-2222.patch b/hpn-revert-default-port-2222.patch
index fe91703410ff..fa377b584238 100644
--- a/hpn-revert-default-port-2222.patch
+++ b/hpn-revert-default-port-2222.patch
@@ -1,28 +1,10 @@
-From 04c6e9a9ab483f770d7d591ff8d40fb8cf2ee5ac Mon Sep 17 00:00:00 2001
-From: zer0def <zer0def@zer0def.0>
-Date: Fri, 30 Sep 2022 07:38:41 +0200
-Subject: [PATCH] Revert default port change commits
-
-"as per MWD's suggestion I've added the ability": ca10ab6e0d9c606efdd49de6ea7275dc0304fb85.
-"Changed default port of clients to 2222 as opposed to 22.": dd59488357d1e734331a8d18d684457a6201fd10.
-
-This reverts commits:
-- ca10ab6e0d9c606efdd49de6ea7275dc0304fb85
-- dd59488357d1e734331a8d18d684457a6201fd10
----
- HPN-README | 10 ----------
- readconf.c | 22 +++-------------------
- readconf.h |  6 ++----
- ssh.c      | 32 +++-----------------------------
- ssh.h      |  1 -
- 5 files changed, 8 insertions(+), 63 deletions(-)
-
 diff --git a/HPN-README b/HPN-README
-index a54e9d9b729..45b2c008194 100644
+index d559a565c..1ed9afb77 100644
 --- a/HPN-README
 +++ b/HPN-README
-@@ -1,15 +1,5 @@
- Notes:
+@@ -5,16 +5,6 @@ Changes in LibreSSL version 3.5 and 3.6 prevent the use of the threaded AES CTR
+ In those cases HPNSSH will fallback to the serial versionof the AES CTR cipher. A warning
+ is printed to stderr. 
  
 -Automatic Port Fallback (in version 17v3)
 -The hpnssh client now uses TCP port 2222 to connect automatically as this is the
@@ -38,19 +20,19 @@ index a54e9d9b729..45b2c008194 100644
  This features allows the client to request tcp networking information from the
  TCP_INFO struct. This includes data on retransmits, round trip time, lost packets,
 diff --git a/readconf.c b/readconf.c
-index ef16765c5ec..d128128ddcd 100644
+index 5f9c04279..b85ec82c7 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -170,7 +170,7 @@ typedef enum {
+@@ -168,7 +168,7 @@ typedef enum {
+ 	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
  	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- 	oNoneEnabled, oNoneMacEnabled, oNoneSwitch,
- 	oDisableMTAES, oHPNBufferLimit,
+ 	oNoneEnabled, oNoneMacEnabled, oNoneSwitch, oHPNBufferLimit,
 -	oMetrics, oMetricsPath, oMetricsInterval, oFallback, oFallbackPort,
 +	oMetrics, oMetricsPath, oMetricsInterval,
  	oVisualHostKey,
  	oKexAlgorithms, oIPQoS, oRequestTTY, oSessionType, oStdinNull,
  	oForkAfterAuthentication, oIgnoreUnknown, oProxyUseFdpass,
-@@ -311,8 +311,6 @@ static struct {
+@@ -309,8 +309,6 @@ static struct {
  	{ "metrics", oMetrics },
  	{ "metricspath", oMetricsPath },
  	{ "metricsinterval", oMetricsInterval },
@@ -59,7 +41,7 @@ index ef16765c5ec..d128128ddcd 100644
  	{ "sessiontype", oSessionType },
  	{ "stdinnull", oStdinNull },
  	{ "forkafterauthentication", oForkAfterAuthentication },
-@@ -530,7 +528,7 @@ default_ssh_port(void)
+@@ -531,7 +529,7 @@ default_ssh_port(void)
  
  	if (port == 0) {
  		sp = getservbyname(SSH_SERVICE_NAME, "tcp");
@@ -68,7 +50,7 @@ index ef16765c5ec..d128128ddcd 100644
  	}
  	return port;
  }
-@@ -1194,15 +1192,7 @@ process_config_line_depth(Options *options, struct passwd *pw, const char *host,
+@@ -1187,15 +1185,7 @@ parse_time:
  		options->metrics = 1;
  		goto parse_string;
  
@@ -85,7 +67,7 @@ index ef16765c5ec..d128128ddcd 100644
  	 * We check to see if the command comes from the command
  	 * line or not. If it does then enable it otherwise fail.
  	 *  NONE should never be a default configuration.
-@@ -2519,8 +2509,6 @@ initialize_options(Options * options)
+@@ -2511,8 +2501,6 @@ initialize_options(Options * options)
  	options->hpn_disabled = -1;
  	options->hpn_buffer_size = -1;
  	options->hpn_buffer_limit = -1;
@@ -94,7 +76,7 @@ index ef16765c5ec..d128128ddcd 100644
  	options->tcp_rcv_buf_poll = -1;
  	options->tcp_rcv_buf = -1;
  	options->session_type = -1;
-@@ -2733,10 +2721,6 @@ fill_default_options(Options * options)
+@@ -2725,10 +2713,6 @@ fill_default_options(Options * options)
  		options->metrics_interval = 5;
  	if (options->control_master == -1)
  		options->control_master = 0;
@@ -106,31 +88,23 @@ index ef16765c5ec..d128128ddcd 100644
  		options->control_persist = 0;
  		options->control_persist_timeout = 0;
 diff --git a/readconf.h b/readconf.h
-index 85a1e62e03f..af31c8f2b1f 100644
+index 452751b36..953be98ab 100644
 --- a/readconf.h
 +++ b/readconf.h
-@@ -125,14 +125,12 @@ typedef struct {
- 	int64_t rekey_limit;
- 	int     none_switch;    /* Use none cipher */
- 	int     none_enabled;   /* Allow none to be used */
--	int     nonemac_enabled;   /* Allow none to be used */
-+	int     nonemac_enabled;   /* Allow none to be used */	
- 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+@@ -130,8 +130,6 @@ typedef struct {
          int     metrics; /* enable metrics */
          int     metrics_interval; /* time in seconds between polls */
          char   *metrics_path; /* path for the metrics files */
 -	int     fallback; /* en|disable fallback port (def: true) */
 -	int     fallback_port; /* port to fallback to (def: 22) */
--	int	rekey_interval;
-+        int	rekey_interval;
+ 	int	rekey_interval;
  
  	int	no_host_authentication_for_localhost;
- 	int	identities_only;
 diff --git a/ssh.c b/ssh.c
-index 24758239d15..e1162dc54d2 100644
+index 0543ca971..72b555097 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -1562,36 +1562,10 @@ main(int ac, char **av)
+@@ -1563,36 +1563,10 @@ main(int ac, char **av)
  		timeout_ms = options.connection_timeout * 1000;
  
  	/* Open a connection to the remote host. */
@@ -168,17 +142,8 @@ index 24758239d15..e1162dc54d2 100644
  
  	if (addrs != NULL)
  		freeaddrinfo(addrs);
-@@ -2201,7 +2175,7 @@ ssh_session2_open(struct ssh *ssh)
- 	if (options.hpn_buffer_limit)
- 		c->hpn_buffer_limit = 1;
- 
--
-+		
- 	debug3_f("channel_new: %d", c->self);
- 
- 	channel_send_open(ssh, c->self);
 diff --git a/ssh.h b/ssh.h
-index c639115452c..8aa1633a6c3 100644
+index c63911545..8aa1633a6 100644
 --- a/ssh.h
 +++ b/ssh.h
 @@ -17,7 +17,6 @@