FreeBSD base system ssh 9.0p1 diff against upstream
Needs ReviewPublic
Actions

Authored by emaste on Sep 2 2021, 3:57 PM.

Details

Summary

This is a diff of the FreeBSD base system ssh (crypto/openssh) against OpenSSH 9.0p1, for reference.

Generated via git diff -U9999 --diff-filter=M vendor/openssh/9.0p1 HEAD:crypto/openssh

Lint

Lint Skipped

Unit

Tests Skipped

emaste requested review of this revision.Sep 2 2021, 3:57 PM

A couple of trivial cleanups running in CI in https://cirrus-ci.com/build/6559331043770368

Trivial cleanups applied

kevans added inline comments.

crypto/openssh/pathnames.h
123 ↗	(On Diff #94570)	These probably should have been converted to _PATH_LOCALBASE as well for consistency if we're already patching them.

crypto/openssh/pathnames.h
123 ↗	(On Diff #94570)	Probably, although we'd have to `#include <paths.h>` in pathnames.h or in all of its consumers. Such a change won't make the update any easier (or harder), so it may be something to revisit after the update is done.

Update to 9.0p1 diff (i.e., what is in main as of today)

Generated via git diff -U9999 --diff-filter=M vendor/openssh/9.0p1 HEAD:crypto/openssh

channels.c
2604–2609	this is a fix from the V_9_0 branch upstream
sandbox-capsicum.c
73–74	I've sent this to the openssh-unix-dev mailing list
scp.1
298	I've sent this to the openssh-unix-dev mailing list

auth.c
27	Can we stop including these now?
session.c
1018	Can this be moved down to just above the setusercontext() bit? I believe it's here since setusercontext() can override TZ.
1041	Hmm, I wonder why we set TERM here. It can be overridden below.
1296	I'd think this could be upstreamed, it'd be ok even on platforms where `login_getcapstr()` returns a `char ` rather than `const char `. Maybe there are weird platforms where `stat()` and `fopen()` don't specify that the path is `const`, but I see other uses of those functions with const strings.

auth.c
27	I was planning on dropping all of them after FreeBSD 12 is past EOL, but I think we could keep ones in config files for now and drop the rest.
session.c
1296	This is a leftover from upstreaming: https://lists.mindrot.org/pipermail/openssh-unix-dev/2021-February/039129.html - Damien took the other part but not this. Even though const is better we might as well reduce diffs against upstream and drop it.

session.c
1296	I presume it's needed to avoid a compile error? Our login_getcapstr() returns a const char , OpenBSD's returns a char .
1296	... but presumably it could be declared const on OpenBSD too, now that the free() call is gone.