Paths

Table of Contentst

Differential D58083

OpenSSH 10.4p1 FreeBSD diff against upstream
ClosedPublic
Actions

Authored by emaste on Tue, Jul 7, 1:42 PM.

Tags

None

Referenced Files

	F162739230: D58083.id.diff
	Thu, Jul 16, 9:06 AM

	F162720075: D58083.id181607.diff
	Thu, Jul 16, 3:32 AM

	F162720044: D58083.id181447.diff
	Thu, Jul 16, 3:31 AM

	Unknown Object (File)
	Tue, Jul 14, 1:30 PM

	Unknown Object (File)
	Tue, Jul 14, 1:22 PM

	Unknown Object (File)
	Tue, Jul 14, 12:56 PM

	Unknown Object (File)
	Mon, Jul 13, 6:24 PM

	Unknown Object (File)
	Mon, Jul 13, 6:16 PM

View All 15 Files

Subscribers

Details

Reviewers

bdrewery
jlduran

Commits

rGbb5c77e9d281: OpenSSH: Update to 10.4p1

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

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

emaste created this revision.Tue, Jul 7, 1:42 PM

Herald added a subscriber: ziaee. · View Herald TranscriptTue, Jul 7, 1:42 PM

emaste requested review of this revision.Tue, Jul 7, 1:42 PM

emaste added inline comments.Tue, Jul 7, 1:57 PM

servconf.h
396	Will remove blank line
sshd_config.5
2070	This appears to have been lost

emaste added subscribers: jlduran, bdrewery.Tue, Jul 7, 1:58 PM

bdrewery added a reviewer: bdrewery.Tue, Jul 7, 3:03 PM

jlduran added inline comments.Tue, Jul 7, 3:41 PM

servconf.h
264–265
sshd_config.5
2070	I see that part was moved to servconf.h, under `SSHD_CONFIG_ENTRIES_ALIASES`.

jlduran added inline comments.Tue, Jul 7, 4:16 PM

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 added inline comments.Thu, Jul 9, 2:41 PM

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

jlduran added inline comments.Thu, Jul 9, 3:10 PM

servconf.c
253	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.

emaste mentioned this in D58128: openssh: diff of 10.4p1 update against main.Thu, Jul 9, 4:32 PM

Closed by commit rGbb5c77e9d281: OpenSSH: Update to 10.4p1 (authored by emaste). · Explain WhySun, Jul 12, 9:05 PM

This revision was automatically updated to reflect the committed changes.

emaste added a commit: rGbb5c77e9d281: OpenSSH: Update to 10.4p1.

Herald added subscribers: jonathan, imp. · View Herald TranscriptSun, Jul 12, 9:05 PM

Revision Contents
Changeset List

Path

Size

12 lines

3 lines

9 lines

61 lines

14 lines

openbsd-compat/

libressl-api-compat.c

8 lines

4 lines

regress/

unittests/

sshkey/

3 lines

14 lines

25 lines

46 lines

4 lines

30 lines

6 lines

20 lines

2 lines

9 lines

5 lines

13 lines

14 lines

91 lines

20 lines

46 lines

7 lines

2 lines

Diff 181607

INSTALL

Loading...

auth-pam.c

Loading...

auth.c

Loading...

configure.ac

Loading...

monitor.c

Loading...

openbsd-compat/libressl-api-compat.c

Loading...

pathnames.h

Loading...

regress/unittests/sshkey/test_sshkey.c

Loading...

servconf.h

Loading...

servconf.c

Loading...

session.c

Loading...

ssh-agent.1

Loading...

ssh-agent.c

Loading...

ssh-gss.h

Loading...

ssh.c

Loading...

ssh_config.5

Loading...

sshconnect.c

Loading...

sshd-auth.c

Loading...

sshd-session.c

Loading...

sshd.8

Loading...

sshd.c

Loading...

sshd_config

Loading...

sshd_config.5

Loading...

umac128.c

Loading...

version.h

Loading...