diff options
| author | Jose Luis Duran <jlduran@FreeBSD.org> | 2025-10-11 09:15:20 -0700 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2025-10-11 10:29:47 -0700 |
| commit | 28bb20eaf642aa9d6f517f61d16aeb4694e716df (patch) | |
| tree | ac9620f74716ed2317476b89d6186a79d9c78aef /security/openssh-portable/files/extra-patch-hpn | |
| parent | devel/pyenv: Update to 2.6.10 (diff) | |
security/openssh-portable: Sync blocklist with base, include by default.
The patch is included by default in base as well. It remains
off by default though.
Added glue for HPN patch to apply.
Reviewed By: bdrewery
Differential Revision: https://reviews.freebsd.org/D52880
PR: 280203
Diffstat (limited to 'security/openssh-portable/files/extra-patch-hpn')
| -rw-r--r-- | security/openssh-portable/files/extra-patch-hpn | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/openssh-portable/files/extra-patch-hpn b/security/openssh-portable/files/extra-patch-hpn index 412cc576fb7c..a4df93cc2186 100644 --- a/security/openssh-portable/files/extra-patch-hpn +++ b/security/openssh-portable/files/extra-patch-hpn @@ -1233,17 +1233,17 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o /* * Create a new session and process group since the 4.4BSD * setlogin() affects the entire process group. We don't ---- work.clean/openssh-9.8p1/sshd-session.c.orig 2024-07-01 13:54:25.745441000 -0700 -+++ work/openssh-9.8p1/sshd-session.c 2024-07-01 13:54:57.335695000 -0700 -@@ -1305,7 +1305,7 @@ main(int ac, char **av) - alarm(options.login_grace_time); +--- work/openssh/sshd-session.c.orig 2025-10-11 10:19:18.935826000 -0700 ++++ work/openssh/sshd-session.c 2025-10-11 10:20:11.460279000 -0700 +@@ -1281,7 +1281,7 @@ main(int ac, char **av) + } if ((r = kex_exchange_identification(ssh, -1, -- options.version_addendum)) != 0) -+ options.version_addendum, options.hpn_disabled)) != 0) +- options.version_addendum)) != 0) { ++ options.version_addendum, options.hpn_disabled)) != 0) { + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "Banner exchange"); sshpkt_fatal(ssh, r, "banner exchange"); - - ssh_packet_set_nonblocking(ssh); + } --- work.clean/openssh-6.8p1/sshd_config 2015-04-01 22:07:18.248858000 -0500 +++ work/openssh-6.8p1/sshd_config 2015-04-01 22:16:49.932279000 -0500 @@ -111,6 +111,20 @@ AuthorizedKeysFile .ssh/authorized_keys |