Page MenuHomeFreeBSD

OpenSSH 10.4p1 FreeBSD diff against upstream
ClosedPublic

Authored by emaste on Tue, Jul 7, 1:42 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Aug 3, 12:25 AM
Unknown Object (File)
Sat, Aug 1, 1:18 PM
Unknown Object (File)
Sat, Aug 1, 7:01 AM
Unknown Object (File)
Sat, Aug 1, 4:24 AM
Unknown Object (File)
Wed, Jul 29, 9:00 AM
Unknown Object (File)
Tue, Jul 28, 5:05 PM
Unknown Object (File)
Tue, Jul 28, 3:43 PM
Unknown Object (File)
Tue, Jul 28, 5:58 AM

Details

Summary

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

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

emaste requested review of this revision.Tue, Jul 7, 1:42 PM
servconf.h
395 ↗(On Diff #181447)

Will remove blank line

sshd_config.5
2070 ↗(On Diff #181447)

This appears to have been lost

servconf.h
264 ↗(On Diff #181447)
sshd_config.5
2070 ↗(On Diff #181447)

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

servconf.c
253 ↗(On Diff #181447)

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

sshd-session.c
1379 ↗(On Diff #181447)

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

servconf.c
253 ↗(On Diff #181447)

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

servconf.c
253 ↗(On Diff #181447)

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

servconf_add_hostkey fixup reported by @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.

This revision is now accepted and ready to land.Thu, Jul 9, 3:33 PM

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.

This revision was automatically updated to reflect the committed changes.
crypto/openssh/servconf.h
239

Hi Ed, sorry, while rebasing the patch for openssh-portable, I realized that this is how it was before this change. I think it should indeed be SSHCFG_GLOBAL, I don't think it can be allowed inside a Match.

crypto/openssh/servconf.h
239

Done in D58520.