From nobody Thu Jan 11 18:05:53 2024 X-Original-To: dev-commits-ports-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 4T9szP4LKyz56bdW; Thu, 11 Jan 2024 18:05:53 +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 4T9szP3Zpjz57jN; Thu, 11 Jan 2024 18:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704996353; 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=V6xGAIIgCtg8oov1PufOlfoaumfwuUg1xZ8PBlaP0CQ=; b=PEW6FgwmKFcoHHoIU/+ZhShUpy2NgcTAhTchFwIPCxZOVRkjBRTT65G82Io51gQjBzCuwG ZUgS7Pt4Rxfs4Ig61kUY/A1eAWtBDUeZTtn+aLs0bSbTNJrl7LwssSYB2B2SWKsAjGBvqe bFV47xyQ44C8kH34qipR/5uQbE4mrtrkHGXiMuCI8gC1mjW6Bms4dUg2RBnvoqx0UA1hYu njO5yS7NdbpQ0xwIJT/Qgvxx89eoZS9HNio+wAldRdO4h8dT73AykB8osyU4wxrt0XcZr9 1KmcPHcHUSVGt41QdN7YNOZ99HD9J02XhfFX3mNzL0up8Jl78hZK5lHYFpSogA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704996353; 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=V6xGAIIgCtg8oov1PufOlfoaumfwuUg1xZ8PBlaP0CQ=; b=nw8DN3NCJNJVy0KP7Z4oUy9IBeh+0EBO13Er4bn8Sr6e6YP/h1UnrTHnQWIGyHG7y98oqW xadHIVhl44xDnIAL9UldMu8fetdNCNZNdiqAgeAEWSmpQUA7FaMzcCmHLcEtzmIIMrdbzr Aqk7W5CVMMU4IWT5x6tICUhYyC8/toHTIXBJ73VHk5OSgfyydP1MdA1GY27vzrsdANgS2l OfhT+lNbh+2yLlkRcxFNE9b5U/22MUnFRpWPRssjsbDXS20DXKOF+yjcMmC27wNAMVH77U B3I7SUt6697PSr192NP8FD7irAwPVaFLgspSSrob4Wy1B+aO1/d7x9oKSe7KHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704996353; a=rsa-sha256; cv=none; b=tAZdx3Q2xubGU7zE7C5QcQ1t/ROiCp0HF99jEujCAsuYHNPOkWOQHfb04XlOACvyx1Qxgs sVqtFexABXThNU9B55S0HiZ9e6C8x5SpxZpAIEjBEdA9ZrJ+M2Tm+fcV/gEm6liLB9OJqt X6JcIpCeU11QI+mJy0wYhdEBWoYzFTT5NYlTsR87ThTVYu9snpO9pPp3ToHQ+jPPRBgcca SVNMhTBuQx5TAApD6aS7r6QDEYr5Z5bwJYR/XoMpHwk0D9BOhyz/WNNzpRfaG1yZIW+kZ4 R/qthVnv2eXTZ8erR7ydI/8dDdt/6JxlB3IX88/MhRWT8FhMqLGt1FrerTgnMA== 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 4T9szP2dtzzTBn; Thu, 11 Jan 2024 18:05:53 +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 40BI5r4j084421; Thu, 11 Jan 2024 18:05:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BI5rvS084418; Thu, 11 Jan 2024 18:05:53 GMT (envelope-from git) Date: Thu, 11 Jan 2024 18:05:53 GMT Message-Id: <202401111805.40BI5rvS084418@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: b3f86656fc67 - main - security/openssh-portable: Update HPN patch. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3f86656fc67aa397f60747c85f7f7b967c3279d Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3f86656fc67aa397f60747c85f7f7b967c3279d commit b3f86656fc67aa397f60747c85f7f7b967c3279d Author: Bryan Drewery AuthorDate: 2024-01-11 18:05:02 +0000 Commit: Bryan Drewery CommitDate: 2024-01-11 18:05:39 +0000 security/openssh-portable: Update HPN patch. - Mark GSSAPI build as broken while here. --- security/openssh-portable/Makefile | 4 +-- security/openssh-portable/files/extra-patch-hpn | 44 ++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 9056e064486f..62456cfd89f5 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -101,7 +101,7 @@ PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,hpn,gsskex # Must add this patch before HPN due to conflicts .if ${PORT_OPTIONS:MKERB_GSSAPI} || ${FLAVOR:U} == gssapi -#BROKEN= KERB_GSSAPI No patch for ${DISTVERSION} yet. +BROKEN= KERB_GSSAPI No patch for ${DISTVERSION} yet. . if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER} # Needed glue for applying HPN patch without conflict EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-gss-glue @@ -127,7 +127,7 @@ CONFIGURE_LIBS+= -lblacklist # https://www.psc.edu/hpn-ssh https://github.com/rapier1/openssh-portable/tree/hpn-openssl1.1-7_7_P1 .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER} -BROKEN= HPN: Not yet updated for ${DISTVERSION} yet. +#BROKEN= HPN: Not yet updated for ${DISTVERSION} yet. PORTDOCS+= HPN-README HPN_VERSION= 14v15 HPN_DISTVERSION= 7.7p1 diff --git a/security/openssh-portable/files/extra-patch-hpn b/security/openssh-portable/files/extra-patch-hpn index 5dd34d295845..56202ba8e1b3 100644 --- a/security/openssh-portable/files/extra-patch-hpn +++ b/security/openssh-portable/files/extra-patch-hpn @@ -309,50 +309,50 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o free(cipher_list); return 0; } ---- work/openssh/clientloop.c.orig 2022-02-23 03:31:11.000000000 -0800 -+++ work/openssh/clientloop.c 2022-03-02 12:53:47.624273000 -0800 -@@ -1571,6 +1571,15 @@ client_request_x11(struct ssh *ssh, const char *reques +--- work/openssh/clientloop.c.orig 2023-12-18 06:59:50.000000000 -0800 ++++ work/openssh/clientloop.c 2024-01-08 16:27:47.806586000 -0800 +@@ -1813,6 +1813,15 @@ client_request_x11(struct ssh *ssh, const char *reques sock = x11_connect_display(ssh); if (sock < 0) return NULL; +#ifdef HPN_ENABLED + /* again is this really necessary for X11? */ + if (!options.hpn_disabled) -+ c = channel_new(ssh, "x11", ++ c = channel_new(ssh, "x11-connection", + SSH_CHANNEL_X11_OPEN, sock, sock, -1, + options.hpn_buffer_size, + CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); + else +#endif - c = channel_new(ssh, "x11", + c = channel_new(ssh, "x11-connection", SSH_CHANNEL_X11_OPEN, sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); -@@ -1606,6 +1615,14 @@ client_request_agent(struct ssh *ssh, const char *requ +@@ -1848,6 +1857,14 @@ client_request_agent(struct ssh *ssh, const char *requ else debug2_fr(r, "ssh_agent_bind_hostkey"); +#ifdef HPN_ENABLED + if (!options.hpn_disabled) -+ c = channel_new(ssh, "authentication agent connection", ++ c = channel_new(ssh, "agent-connection", + SSH_CHANNEL_OPEN, sock, sock, -1, + options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, 0, + "authentication agent connection", 1); + else +#endif - c = channel_new(ssh, "authentication agent connection", + c = channel_new(ssh, "agent-connection", SSH_CHANNEL_OPEN, sock, sock, -1, CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, -@@ -1634,6 +1651,12 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, +@@ -1876,6 +1893,12 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, } debug("Tunnel forwarding using interface %s", ifname); +#ifdef HPN_ENABLED + if (!options.hpn_disabled) -+ c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, ++ c = channel_new(ssh, "tun-connection", SSH_CHANNEL_OPENING, fd, fd, -1, + options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); + else +#endif - c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, + c = channel_new(ssh, "tun-connection", SSH_CHANNEL_OPENING, fd, fd, -1, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); c->datagram = 1; --- work/openssh/compat.c.orig 2021-04-15 20:55:25.000000000 -0700 @@ -421,9 +421,9 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o echo "" ---- work/openssh/kex.c.orig 2021-04-15 20:55:25.000000000 -0700 -+++ work/openssh/kex.c 2021-04-28 14:38:31.761909000 -0700 -@@ -960,6 +960,20 @@ kex_choose_conf(struct ssh *ssh) +--- work/openssh/kex.c.orig 2023-12-18 06:59:50.000000000 -0800 ++++ work/openssh/kex.c 2024-01-08 16:24:07.547292000 -0800 +@@ -1252,6 +1252,20 @@ kex_choose_conf(struct ssh *ssh, uint32_t seq) peer[ncomp] = NULL; goto out; } @@ -444,7 +444,7 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o debug("kex: %s cipher: %s MAC: %s compression: %s", ctos ? "client->server" : "server->client", newkeys->enc.name, -@@ -1170,7 +1184,7 @@ send_error(struct ssh *ssh, char *msg) +@@ -1462,7 +1476,7 @@ kex_exchange_identification(struct ssh *ssh, int timeo */ int kex_exchange_identification(struct ssh *ssh, int timeout_ms, @@ -452,13 +452,13 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o + const char *version_addendum, int hpn_disabled) { int remote_major, remote_minor, mismatch, oerrno = 0; - size_t len, i, n; -@@ -1187,8 +1201,13 @@ kex_exchange_identification(struct ssh *ssh, int timeo + size_t len, n; +@@ -1479,8 +1493,13 @@ kex_exchange_identification(struct ssh *ssh, int timeo sshbuf_reset(our_version); if (version_addendum != NULL && *version_addendum == '\0') version_addendum = NULL; -- if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", -+ if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s%s\r\n", +- if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s\r\n", ++ if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s%s\r\n", PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, +#ifdef HPN_ENABLED + hpn_disabled ? "" : SSH_HPN, @@ -1269,11 +1269,11 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o # Example of overriding settings on a per-user basis #Match User anoncvs # X11Forwarding no ---- version.h.orig 2023-07-18 23:31:34.000000000 -0700 -+++ version.h 2023-07-21 07:27:08.311422000 -0700 +--- work/openssh/version.h.orig 2023-12-18 06:59:50.000000000 -0800 ++++ work/openssh/version.h 2024-01-08 16:22:25.632475000 -0800 @@ -4,3 +4,4 @@ - #define SSH_PORTABLE "p2" + #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE +#define SSH_HPN "-hpn14v15" --- work/openssh/kex.h.orig 2019-07-10 17:35:36.523216000 -0700