Vendor import of OpenSSH 8.4p1.
AbandonedPublic
Actions

Authored by woodsb02 on Jan 23 2021, 8:46 AM.

Details

Reviewers

emaste
des

Commits

rG3bbd8dc96b44: Vendor import of OpenSSH 8.4p1

Summary

Vendor import of OpenSSH 8.4p1.

Test Plan

Confirmed process followed made zero changes
if I tried to import the current vendor release 8.0p1.
This import was from the release tarball from openssh.com.

Diff Detail

Repository

rG FreeBSD src repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 36427
Build 33316: arc lint + arc unit

Event Timeline

woodsb02 created this revision.Jan 23 2021, 8:46 AM

Herald added a subscriber: jonathan. · View Herald TranscriptJan 23 2021, 8:46 AM

woodsb02 requested review of this revision.Jan 23 2021, 8:46 AM

Harbormaster completed remote builds in B36427: Diff 82760.Jan 23 2021, 8:46 AM

Note that I do not have my src commit bit (I am a ports committer), so I am seeking approval to push this src commit upstream to the vendor/openssh branch.

The reason I raised this request was I noticed a new feature was not yet available in the FreeBSD 13 source:

sshd(8): add an Include sshd_config keyword that allows including additional configuration files via glob(3) patterns. bz2468

This was introduced in OpenSSH 8.2p1:
https://www.openssh.com/releasenotes.html

This would allow the follow to be added to /etc/ssh/sshd_config in the future:

Include /etc/ssh/sshd_config.d/*.conf

https://linuxliteracy.com/new-way-to-manage-ssh-options-in-ubuntu-20-04/

See D28564 for an update to the in-tree update instructions.

IMO we should push 8.1p1, 8.2p1, 8.3p1, 8.4p1 in order, so that we have the interim revisions in the history (even if we don't end up using them). I've staged that locally while updating the process documented in D28564, but the merge is not trivial.

Abandoning this revision, in favour of Ed’s recommendation to push 8.1p1, 8.2p1, 8.3p1, 8.4p1 in order.

emaste added a commit: rG3bbd8dc96b44: Vendor import of OpenSSH 8.4p1.Nov 19 2021, 4:07 AM

Herald added a subscriber: imp. · View Herald TranscriptNov 19 2021, 4:07 AM

Large Diff

This large diff affects 407 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

Path

Size

.depend

325 lines

.github/

run_test.sh

34 lines

setup_ci.sh

51 lines

workflows/

39 lines

7 lines

15 lines

15686 lines

76 lines

242 lines

10 lines

2 lines

9 lines

PROTOCOL.chacha20poly1305

4 lines

4 lines

100 lines

309 lines

36 lines

8 lines

9 lines

11 lines

193 lines

2 lines

10 lines

140 lines

52 lines

15 lines

8 lines

41 lines

8 lines

5 lines

4 lines

7 lines

123 lines

36 lines

12 lines

105 lines

10 lines

265 lines

6 lines

17 lines

130 lines

	cipher-chachapoly-libcrypto.c
	cipher-chachapoly.c

95 lines

13 lines

32 lines

5 lines

40 lines

5 lines

214 lines

8 lines

44 lines

106 lines

882 lines

2528 lines

1831 lines

486 lines

contrib/

cygwin/

README

4 lines

findssl.sh

gnome-ssh-askpass2.c

202 lines

redhat/

gnome-ssh-askpass.sh

openssh.spec

55 lines

solaris/

README

ssh-copy-id

158 lines

ssh-copy-id.1

4 lines

suse/

6 lines

41 lines

7 lines

8 lines

33 lines

9 lines

1 line

19 lines

4 lines

34 lines

7 lines

5 lines

68 lines

9 lines

131 lines

3 lines

28 lines

5 lines

4 lines

5 lines

121 lines

4 lines

10 lines

5 lines

	m4/

	openssh.m4
	aclocal.m4

15 lines

7 lines

6 lines

17 lines

21 lines

455 lines

904 lines

2 lines

16 lines

124 lines

10 lines

29 lines

16 lines

41 lines

135 lines

6 lines

openbsd-compat/

9 lines

4 lines

88 lines

31 lines

16 lines

17 lines

12 lines

7 lines

29 lines

2 lines

10 lines

66 lines

495 lines

9 lines

157 lines

191 lines

32 lines

12 lines

2 lines

14 lines

2 lines

2 lines

15 lines

6 lines

4 lines

regress/

3 lines

33 lines

1 line

13 lines

138 lines

334 lines

375 lines

5 lines

77 lines

9 lines

1 line

12 lines

8 lines

300 lines

155 lines

regress/

47 lines

80 lines

16 lines

4 lines

4 lines

2 lines

22 lines

6 lines

125 lines

4 lines

22 lines

33 lines

49 lines

4 lines

11 lines

12 lines

38 lines

10 lines

75 lines

8 lines

10 lines

7 lines

52 lines

12 lines

17 lines

6 lines

9 lines

57 lines

41 lines

67 lines

misc/

2 lines

fuzz-harness/

37 lines

21 lines

24 lines

37 lines

29 lines

kexfuzz/

Makefile

8 lines

kexfuzz.c

8 lines

sk-dummy/

20 lines

532 lines

26 lines

4 lines

43 lines

119 lines

principals-command.sh

13 lines

10 lines

4 lines

4 lines

10 lines

5 lines

14 lines

14 lines

188 lines

4 lines

2 lines

39 lines

196 lines

145 lines

unittests/

Makefile

4 lines

Makefile.inc

5 lines

bitmap/

tests.c

4 lines

conversion/

tests.c

4 lines

hostkeys/

Makefile

10 lines

mktestdata.sh

test_iterate.c

28 lines

kex/

Makefile

10 lines

test_kex.c

12 lines

match/

tests.c

4 lines

misc/

tests.c

161 lines

sshbuf/

Makefile

6 lines

test_sshbuf_getput_basic.c

231 lines

test_sshbuf_getput_crypto.c

3 lines

test_sshbuf_getput_fuzz.c

8 lines

test_sshbuf_misc.c

71 lines

tests.c

2 lines

sshkey/

10 lines

17 lines

85 lines

141 lines

23 lines

55 lines

testdata/

33 lines

13 lines

13 lines

1 line

1 line

1 line

1 line

1 line

14 lines

13 lines

1 line

1 line

1 line

12 lines

8 lines

1 line

1 line

1 line

1 line

1 line

9 lines

8 lines

1 line

1 line

1 line

31 lines

	sshsig/
	sshkey/

Makefile

17 lines

sshsig/

mktestdata.sh

42 lines

testdata/

12 lines

1 line

13 lines

5 lines

1 line

7 lines

13 lines

1 line

8 lines

ecdsa_sk_webauthn.pub

1 line

ecdsa_sk_webauthn.sig

13 lines

7 lines

1 line

6 lines

8 lines

1 line

7 lines

1 line

39 lines

1 line

19 lines

1 line

139 lines

692 lines

test_helper/

test_helper.h

4 lines

test_helper.c

29 lines

utf8/

tests.c

2 lines

	regress/	misc/	fuzz-harness/

	ssh-sk-null.cc
	sftp-server-main.c

56 lines

sandbox-darwin.c

2 lines

sandbox-seccomp-filter.c

58 lines

7 lines

14 lines

20 lines

161 lines

39 lines

379 lines

34 lines

103 lines

14 lines

4 lines

	sftp-realpath.c/
	openbsd-compat/


	realpath.c

13 lines

3 lines

24 lines

24 lines

66 lines

38 lines

61 lines

88 lines

98 lines

1261 lines

59 lines

64 lines

249 lines

101 lines

177 lines

282 lines

8 lines

324 lines

164 lines

20 lines

524 lines

628 lines

1687 lines

4 lines

6 lines

60 lines

4 lines

6 lines

11 lines

14 lines

4 lines

6 lines

56 lines

4 lines

267 lines

449 lines

	ssh-sk-helper.8
	ssh-pkcs11-helper.8

16 lines

363 lines

69 lines

824 lines

20 lines

7 lines

84 lines

62 lines

506 lines

55 lines

3 lines

345 lines

305 lines

sshbuf-getput-basic.c

171 lines

sshbuf-getput-crypto.c

15 lines

117 lines

150 lines

75 lines

7 lines

10 lines

108 lines

296 lines

57 lines

71 lines

328 lines

187 lines

214 lines

4 lines

6 lines

107 lines

85 lines

1304 lines

7 lines

22 lines

107 lines

1044 lines

38 lines

6 lines

8 lines

5 lines

27 lines

4 lines

5 lines

31 lines

2 lines

2 lines

2 lines

2 lines

2 lines

Vendor import of OpenSSH 8.4p1.AbandonedPublicActions

Details

Diff Detail

Event Timeline

Large Diff

Revision ContentsChangeset List

Diff 82760

.depend

.github/run_test.sh

.github/setup_ci.sh

.github/workflows/c-cpp.yml

.gitignore

.skipped-commit-ids

CREDITS

ChangeLog

INSTALL

LICENCE

Makefile.in

PROTOCOL

PROTOCOL.agent

PROTOCOL.certkeys

PROTOCOL.chacha20poly1305

PROTOCOL.mux

PROTOCOL.sshsig

PROTOCOL.u2f

README

README.dns

README.md

README.privsep

aclocal.m4

auth-bsdauth.c

auth-options.h

auth-options.c

auth-pam.c

auth-rhosts.c

auth-skey.c

auth.h

auth.c

auth2-chall.c

auth2-hostbased.c

auth2-kbdint.c

auth2-passwd.c

auth2-pubkey.c

auth2.c

authfd.h

authfd.c

authfile.h

authfile.c

canohost.c

channels.h

channels.c

cipher-chachapoly-libcrypto.c

cipher-chachapoly.h

cipher-chachapoly.c

cipher.h

cipher.c

clientloop.h

clientloop.c

compat.h

compat.c

config.h.in

config.guess

config.sub

configure

configure.ac

contrib/cygwin/README

contrib/findssl.sh

contrib/gnome-ssh-askpass2.c

contrib/redhat/gnome-ssh-askpass.sh

contrib/redhat/openssh.spec

contrib/solaris/README

contrib/ssh-copy-id

contrib/ssh-copy-id.1

contrib/suse/openssh.spec

crc32.h

crc32.c

defines.h

dh.h

dh.c

digest-libc.c

Vendor import of OpenSSH 8.4p1.
AbandonedPublic
Actions

Revision Contents
Changeset List