OpenSSH 10.4p1 FreeBSD diff against upstream

[emaste]

Summary

This is a diff against upstream after merging OpenSSH 10.4p1 -- git diff --diff-filter=M vendor/openssh/10.4p1 HEAD:crypto/openssh

[emaste]

servconf.h

396

Will remove blank line

sshd_config.5

2070

This appears to have been lost

[jlduran]

servconf.h

264–265

sshd_config.5

2070

I see that part was moved to servconf.h, under SSHD_CONFIG_ENTRIES_ALIASES.

[jlduran]

servconf.c

253

And the closing } of course.
I wonder if this local change has/had a corresponding upstream attempt?

sshd-session.c

1379

This was introduced in the previous vendor import.
I may need to check if this warrants a blocklist probe as well.

[emaste]

servconf.c

253

Or move the test before derelativise_path? Or, should we be checking access(rpath, ...) perhaps?

[jlduran]

servconf.c

253

I'm inclined to think that we should be checking access(apath, ...) instead of moving the test before derelativise_path().

[emaste]

servconf_add_hostkey fixup reported by @jlduran

[jlduran]

This looks good to me.
I tried re-creating it yesterday, and arrived at the same result (assuming SSH_VERSION_FREEBSD will be bumped upon commit).
Let me know your diff after freebsd-configure.sh and freebsd-namespace.sh, as there were a few changes there as well.

[emaste]

Let me know your diff after freebsd-configure.sh and freebsd-namespace.sh, as there were a few changes there as well.

I put the diff against upstream in D58128 - please check crypto/openssh/{config.h, ssh_namespace.h, version.h} and secure/lib/libssh/Makefile there.