1 commit 8241b9c0529228b4b86d88b1a6076fb9f97e4a99
2 Author: Damien Miller <djm@mindrot.org>
3 Date: Tue Dec 19 01:59:50 2023 +1100
7 commit 2f2c65cb5f1518a9c556d3e8efa27ea0ca305c6b
8 Author: Damien Miller <djm@mindrot.org>
9 Date: Tue Dec 19 01:59:06 2023 +1100
13 commit e48cdee8e19059203b1aeeabec2350b8375fa61f
14 Author: djm@openbsd.org <djm@openbsd.org>
15 Date: Mon Dec 18 14:50:08 2023 +0000
17 upstream: regress test for agent PKCS#11-backed certificates
19 OpenBSD-Regress-ID: 38f681777cb944a8cc3bf9d0ad62959a16764df9
21 commit 2f512f862df1d5f456f82a0334c9e8cc7208a2a1
22 Author: djm@openbsd.org <djm@openbsd.org>
23 Date: Mon Dec 18 14:49:39 2023 +0000
25 upstream: regress test for constrained PKCS#11 keys
27 OpenBSD-Regress-ID: b2f26ae95d609d12257b43aef7cd7714c82618ff
29 commit cdddd66412ca5920ed4d3ebbfa6ace12dbd9b82f
30 Author: djm@openbsd.org <djm@openbsd.org>
31 Date: Mon Dec 18 14:48:44 2023 +0000
35 OpenBSD-Commit-ID: 21759837cf0e0092d9a2079f8fb562071c11016b
37 commit 6d51feab157cedf1e7ef5b3f8781ca8ff9c4ab1b
38 Author: djm@openbsd.org <djm@openbsd.org>
39 Date: Mon Dec 18 14:48:08 2023 +0000
41 upstream: ssh-agent: record failed session-bind attempts
43 Record failed attempts to session-bind a connection and refuse signing
44 operations on that connection henceforth.
46 Prevents a future situation where we add a new hostkey type that is not
47 recognised by an older ssh-agent, that consequently causes session-bind
48 to fail (this situation is only likely to arise when people mix ssh(1)
49 and ssh-agent(1) of different versions on the same host). Previously,
50 after such a failure the agent socket would be considered unbound and
51 not subject to restriction.
55 OpenBSD-Commit-ID: b0fdd023e920aa4831413f640de4c5307b53552e
57 commit 7ef3787c84b6b524501211b11a26c742f829af1a
58 Author: djm@openbsd.org <djm@openbsd.org>
59 Date: Mon Dec 18 14:47:44 2023 +0000
61 upstream: ban user/hostnames with most shell metacharacters
63 This makes ssh(1) refuse user or host names provided on the
64 commandline that contain most shell metacharacters.
66 Some programs that invoke ssh(1) using untrusted data do not filter
67 metacharacters in arguments they supply. This could create
68 interactions with user-specified ProxyCommand and other directives
69 that allow shell injection attacks to occur.
71 It's a mistake to invoke ssh(1) with arbitrary untrusted arguments,
72 but getting this stuff right can be tricky, so this should prevent
73 most obvious ways of creating risky situations. It however is not
74 and cannot be perfect: ssh(1) has no practical way of interpreting
75 what shell quoting rules are in use and how they interact with the
76 user's specified ProxyCommand.
78 To allow configurations that use strange user or hostnames to
79 continue to work, this strictness is applied only to names coming
80 from the commandline. Names specified using User or Hostname
81 directives in ssh_config(5) are not affected.
83 feedback/ok millert@ markus@ dtucker@ deraadt@
85 OpenBSD-Commit-ID: 3b487348b5964f3e77b6b4d3da4c3b439e94b2d9
87 commit 0cb50eefdd29f0fec31d0e71cc4b004a5f704e67
88 Author: djm@openbsd.org <djm@openbsd.org>
89 Date: Mon Dec 18 14:47:20 2023 +0000
91 upstream: stricter handling of channel window limits
93 This makes ssh/sshd more strict in handling non-compliant peers that
94 send more data than the advertised channel window allows. Previously
95 the additional data would be silently discarded. This change will
96 cause ssh/sshd to terminate the connection if the channel window is
97 exceeded by more than a small grace allowance.
101 OpenBSD-Commit-ID: 811e21b41831eba3dd7f67b3d409a438f20d3037
103 commit 4448a2938abc76e6bd33ba09b2ec17a216dfb491
104 Author: djm@openbsd.org <djm@openbsd.org>
105 Date: Mon Dec 18 14:46:56 2023 +0000
107 upstream: Make it possible to load certs from PKCS#11 tokens
109 Adds a protocol extension to allow grafting certificates supplied by
110 ssh-add to keys loaded from PKCS#11 tokens in the agent.
114 OpenBSD-Commit-ID: bb5433cd28ede2bc910996eb3c0b53e20f86037f
116 commit 881d9c6af9da4257c69c327c4e2f1508b2fa754b
117 Author: djm@openbsd.org <djm@openbsd.org>
118 Date: Mon Dec 18 14:46:12 2023 +0000
120 upstream: apply destination constraints to all p11 keys
122 Previously applied only to the first key returned from each token.
126 OpenBSD-Commit-ID: 36df3afb8eb94eec6b2541f063d0d164ef8b488d
128 commit a7ed931caeb68947d30af8a795f4108b6efad761
129 Author: djm@openbsd.org <djm@openbsd.org>
130 Date: Mon Dec 18 14:45:49 2023 +0000
132 upstream: add "ext-info-in-auth@openssh.com" extension
134 This adds another transport protocol extension to allow a sshd to send
135 SSH2_MSG_EXT_INFO during user authentication, after the server has
136 learned the username that is being logged in to.
138 This lets sshd to update the acceptable signature algoritms for public
139 key authentication, and allows these to be varied via sshd_config(5)
140 "Match" directives, which are evaluated after the server learns the
141 username being authenticated.
143 Full details in the PROTOCOL file
145 OpenBSD-Commit-ID: 1de7da7f2b6c32a46043d75fcd49b0cbb7db7779
147 commit 1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5
148 Author: djm@openbsd.org <djm@openbsd.org>
149 Date: Mon Dec 18 14:45:17 2023 +0000
151 upstream: implement "strict key exchange" in ssh and sshd
153 This adds a protocol extension to improve the integrity of the SSH
154 transport protocol, particular in and around the initial key exchange
157 Full details of the extension are in the PROTOCOL file.
161 OpenBSD-Commit-ID: 2a66ac962f0a630d7945fee54004ed9e9c439f14
163 commit 59d691b886c79e70b1d1c4ab744e81fd176222fd
164 Author: Damien Miller <djm@mindrot.org>
165 Date: Mon Dec 18 14:49:11 2023 +1100
167 better detection of broken -fzero-call-used-regs
169 Use OSSH_CHECK_CFLAG_LINK() for detection of these flags and extend
170 test program to exercise varargs, which seems to catch more stuff.
174 commit aa7b21708511a6d4aed3839fc9f6e82e849dd4a1
175 Author: djm@openbsd.org <djm@openbsd.org>
176 Date: Wed Dec 13 03:28:19 2023 +0000
178 upstream: when invoking KnownHostsCommand to determine the order of
180 host key algorithms to request, ensure that the hostname passed to the
181 command is decorated with the port number for ports other than 22.
183 This matches the behaviour of KnownHostsCommand when invoked to look
184 up the actual host key.
188 OpenBSD-Commit-ID: 5cfabc0b7c6c7ab473666df314f377b1f15420b1
190 commit 4086bd6652c0badccc020218a62190a7798fb72c
191 Author: markus@openbsd.org <markus@openbsd.org>
192 Date: Fri Dec 8 09:18:39 2023 +0000
194 upstream: prevent leak in sshsig_match_principals; ok djm@
196 OpenBSD-Commit-ID: 594f61ad4819ff5c72dfe99ba666a17f0e1030ae
198 commit 19d3ee2f3adf7d9a606ff015c1e153744702c4c9
199 Author: djm@openbsd.org <djm@openbsd.org>
200 Date: Wed Dec 6 21:06:48 2023 +0000
202 upstream: short circuit debug log processing early if we're not going
204 to log anything. From Kobe Housen
206 OpenBSD-Commit-ID: 2bcddd695872a1bef137cfff7823044dcded90ea
208 commit 947affad4831df015c498c00c6351ea6f13895d5
209 Author: Darren Tucker <dtucker@dtucker.net>
210 Date: Mon Nov 27 09:37:28 2023 +1100
212 Add tests for OpenSSL 3.2.0 and 3.2 stable branch.
214 commit 747dce36206675ca6b885010a835733df469351b
215 Author: Darren Tucker <dtucker@dtucker.net>
216 Date: Sat Nov 25 09:03:38 2023 +1100
218 Use non-zero arg in compiler test program.
220 Now that we're running the test program, passing zero to the test function
221 can cause divide-by-zero exceptions which might show up in logs.
223 commit 3d44a5c56585d1c351dbc006240a591b6da502b1
224 Author: dtucker@openbsd.org <dtucker@openbsd.org>
225 Date: Fri Nov 24 00:31:30 2023 +0000
227 upstream: Plug mem leak of msg when processing a quit message.
229 Coverity CID#427852, ok djm@
231 OpenBSD-Commit-ID: bf85362addbe2134c3d8c4b80f16601fbff823b7
233 commit 1d7f9b6e297877bd00973e6dc5c0642dbefc3b5f
234 Author: dtucker@openbsd.org <dtucker@openbsd.org>
235 Date: Thu Nov 23 03:37:05 2023 +0000
237 upstream: Include existing mux path in debug message.
239 OpenBSD-Commit-ID: 1c3641be10c2f4fbad2a1b088a441d072e18bf16
241 commit f29934066bd0e561a2e516b7e584fb92d2eedee0
242 Author: Darren Tucker <dtucker@dtucker.net>
243 Date: Thu Nov 23 19:41:27 2023 +1100
245 Add an Ubuntu 22.04 test VM.
247 This is the same version as Github's runners so most of the testing on
248 it is over there, but having a local VM makes debugging much easier.
250 commit a93284a780cd3972afe5f89086b75d564ba157f3
251 Author: Darren Tucker <dtucker@dtucker.net>
252 Date: Thu Nov 23 19:36:22 2023 +1100
254 Add gcc-12 -Werror test on Ubuntu 22.04.
256 Explictly specify gcc-11 on Ubuntu 22.04 (it's the system compiler).
258 commit 670f5a647e98b6fd95ad64f789f87ee3274b481b
259 Author: Darren Tucker <dtucker@dtucker.net>
260 Date: Thu Nov 23 19:34:57 2023 +1100
262 Check return value from write to prevent warning.
264 ... and since we're testing for flags with -Werror, this caused
265 configure to mis-detect compiler flags.
267 commit cea007d691cfedfa07a5b8599f97ce0511f53fc9
268 Author: Darren Tucker <dtucker@dtucker.net>
269 Date: Wed Nov 22 21:18:55 2023 +1100
271 Run compiler test program when compiling natively.
275 commit ee0d305828f13536c0a416bbf9c3e81039d9ea55
276 Author: Darren Tucker <dtucker@dtucker.net>
277 Date: Wed Nov 22 21:18:07 2023 +1100
279 Factor out compiler test program into a macro.
283 commit de304c76316b029df460673725a9104224b9959b
284 Author: Darren Tucker <dtucker@dtucker.net>
285 Date: Wed Nov 22 08:55:36 2023 +1100
287 Add fbsd14 VM to test pool.
289 commit 99a2df5e1994cdcb44ba2187b5f34d0e9190be91
290 Author: Darren Tucker <dtucker@dtucker.net>
291 Date: Tue Nov 21 16:19:29 2023 +1100
293 Expand -fzero-call-used-regs test to cover gcc 11.
295 It turns out that gcc also has some problems with -fzero-call-used-regs,
296 at least v11 on mips. Previously the test in OSSH_CHECK_CFLAG_COMPILE
297 was sufficient to catch it with "=all", but not sufficient for "=used".
298 Expand the testcase and include it in the other tests for good measure.
299 See bz#3629. ok djm@.
301 commit ff220d4010717f7bfbbc02a2400666fb9d24f250
302 Author: Darren Tucker <dtucker@dtucker.net>
303 Date: Tue Nov 21 14:04:34 2023 +1100
305 Stop using -fzero-call-used-regs=all
307 ... since it seems to be problematic with several different versions of
308 clang. Only use -fzero-call-used-regs=used which is less
309 problematic, except with Apple's clang where we don't use it at all.
312 commit 2a19e02f36b16f0f6cc915f7d1e60ead5e36303b
313 Author: Darren Tucker <dtucker@dtucker.net>
314 Date: Tue Nov 21 14:02:18 2023 +1100
316 Allow for vendor prefix on clang version numbers.
318 Correctly detects the version of OpenBSD's native clang, as well as
319 Apple's. Spotted tb@, ok djm@.
321 commit c52db0114826d73eff6cdbf205e9c1fa4f7ca6c6
322 Author: djm@openbsd.org <djm@openbsd.org>
323 Date: Mon Nov 20 02:50:00 2023 +0000
325 upstream: set errno=EAFNOSUPPORT when filtering addresses that don't
327 match AddressFamily; yields slightly better error message if no address
330 OpenBSD-Commit-ID: 29cea900ddd8b04a4d1968da5c4a893be2ebd9e6
332 commit 26f3f3bbc69196d908cad6558c8c7dc5beb8d74a
333 Author: djm@openbsd.org <djm@openbsd.org>
334 Date: Wed Nov 15 23:03:38 2023 +0000
336 upstream: when connecting via socket (the default case), filter
338 addresses by AddressFamily if one was specified. Fixes the case where, if
339 CanonicalizeHostname is enabled, ssh may ignore AddressFamily. bz5326; ok
342 OpenBSD-Commit-ID: 6c7d7751f6cd055126b2b268a7b64dcafa447439
344 commit 050c335c8da43741ed0df2570ebfbd5d1dfd0a31
345 Author: djm@openbsd.org <djm@openbsd.org>
346 Date: Wed Nov 15 22:51:49 2023 +0000
348 upstream: when deciding whether to enable keystroke timing
350 obfuscation, only consider enabling it when a channel with a tty is open.
352 Avoids turning on the obfucation when X11 forwarding only is in use,
353 which slows it right down. Reported by Roger Marsh
355 OpenBSD-Commit-ID: c292f738db410f729190f92de100c39ec931a4f1
357 commit 676377ce67807a24e08a54cd60ec832946cc6cae
358 Author: tobhe@openbsd.org <tobhe@openbsd.org>
359 Date: Mon Nov 13 09:18:19 2023 +0000
361 upstream: Make sure sftp_get_limits() only returns 0 if 'limits'
363 was initialized. This fixes a potential uninitialized use of 'limits' in
364 sftp_init() if sftp_get_limits() returned early because of an unexpected
369 OpenBSD-Commit-ID: 1c177d7c3becc1d71bc8763eecf61873a1d3884c
371 commit 64e0600f23c6dec36c3875392ac95b8a9100c2d6
372 Author: Darren Tucker <dtucker@dtucker.net>
373 Date: Mon Nov 13 20:03:31 2023 +1100
375 Test current releases of LibreSSL and OpenSSL.
377 Retire some of the older releases.
379 commit c8ed7cc545879ac15f6ce428be4b29c35598bb2a
380 Author: dtucker@openbsd.org <dtucker@openbsd.org>
381 Date: Wed Nov 1 02:08:38 2023 +0000
383 upstream: Specify ssh binary to use
385 ... instead of relying on installed one. Fixes test failures in -portable
386 when running tests prior to installation.
388 OpenBSD-Regress-ID: b6d6ba71c23209c616efc805a60d9a445d53a685
390 commit e9fc2c48121cada1b4dcc5dadea5d447fe0093c3
391 Author: Darren Tucker <dtucker@dtucker.net>
392 Date: Wed Nov 1 13:11:31 2023 +1100
394 Put long-running test targets on hipri runners.
396 Some of the selfhosted test targets take a long time to run for various
397 reasons, so label them for "libvirt-hipri" runners so that they can
398 start immediately. This should reduce the time to complete all tests.
400 commit 7ddf27668f0e21233f08c0ab2fe9ee3fdd6ab1e2
401 Author: djm@openbsd.org <djm@openbsd.org>
402 Date: Wed Nov 1 00:29:46 2023 +0000
404 upstream: add some tests of forced commands overriding Subsystem
408 OpenBSD-Regress-ID: eb48610282f6371672bdf2a8b5d2aa33cfbd322b
410 commit fb06f9b5a065dfbbef5916fc4accc03c0bf026dd
411 Author: dtucker@openbsd.org <dtucker@openbsd.org>
412 Date: Tue Oct 31 04:15:40 2023 +0000
414 upstream: Don't try to use sudo inside sshd log wrapper.
416 We still need to check if we're using sudo since we don't want to chown
417 unecessarily, as on some platforms this causes an error which pollutes
418 stderr. We also don't want to unnecessarily invoke sudo, since it's
419 running in the context of the proxycommand, on *other* platforms it
420 may not be able to authenticate, and if we're using SUDO then it should
421 already be privileged.
423 OpenBSD-Regress-ID: 70d58df7503db699de579a9479300e5f3735f4ee
425 commit fc3cc33e88c242c704781c6c48087838f1dcfa2a
426 Author: dtucker@openbsd.org <dtucker@openbsd.org>
427 Date: Tue Oct 31 02:58:45 2023 +0000
429 upstream: Only try to chmod logfile if we have sudo. If we don't have
431 sudo then we won't need to chmod.
433 OpenBSD-Regress-ID: dbad2f5ece839658ef8af3376cb1fb1cabe2e324
435 commit 3a506598fddd3f18f9095af3fe917f24cbdd32e0
436 Author: djm@openbsd.org <djm@openbsd.org>
437 Date: Mon Oct 30 23:00:25 2023 +0000
439 upstream: move PKCS#11 setup code to test-exec.sh so it can be reused
443 OpenBSD-Regress-ID: 1d29e6be40f994419795d9e660a8d07f538f0acb
445 commit f82fa227a52661c37404a6d33bbabf14fed05db0
446 Author: djm@openbsd.org <djm@openbsd.org>
447 Date: Mon Oct 30 17:32:00 2023 +0000
449 upstream: tidy and refactor PKCS#11 setup code
451 Replace the use of a perl script to delete the controlling TTY with a
452 SSH_ASKPASS script to directly load the PIN.
454 Move PKCS#11 setup code to functions in anticipation of it being used
455 elsewhere in additional tests.
459 OpenBSD-Regress-ID: 07705c31de30bab9601a95daf1ee6bef821dd262
461 commit 3cf698c6d4ffa9be1da55672a3519e2135a6366a
462 Author: Darren Tucker <dtucker@dtucker.net>
463 Date: Mon Oct 30 21:35:03 2023 +1100
465 Add obsd74 test VM and retire obsd69 and obsd70.
467 commit 3e21d58a09894acb38dc69ed615d101131f473d0
468 Author: Darren Tucker <dtucker@dtucker.net>
469 Date: Mon Oct 30 18:34:12 2023 +1100
471 Add OpenSSL 3.3.0 as a known dev version.
473 commit 917ba181c2cbdb250a443589ec732aa36fd51ffa
474 Author: Darren Tucker <dtucker@dtucker.net>
475 Date: Mon Oct 30 13:32:03 2023 +1100
477 Restore nopasswd sudo rule on Mac OS X.
479 This seems to be missing from some (but not all) github runners, so
480 restore it if it seems to be missing.
482 commit c5698abad6d4ec98ca20bcaaabaeacd5e1ec3f4f
483 Author: Darren Tucker <dtucker@dtucker.net>
484 Date: Mon Oct 30 13:26:52 2023 +1100
486 Don't exit early when setting up on Mac OS X.
488 We probably need some of the other bits in there (specifically, setting
489 the perms on the home directory) so make it less of a special snowflake.
491 commit 1d6a878ceba60b9dc14037dddc8f036070c0065f
492 Author: dtucker@openbsd.org <dtucker@openbsd.org>
493 Date: Sun Oct 29 06:22:07 2023 +0000
495 upstream: Only try to chown logfiles that exist to prevent spurious
499 OpenBSD-Regress-ID: f1b20a476734e885078c481f1324c9ea03af991e
501 commit e612376427a66f835e284f6b426d16d7c85301bc
502 Author: anton@openbsd.org <anton@openbsd.org>
503 Date: Thu Oct 26 18:52:45 2023 +0000
505 upstream: make use of bsd.regress.mk in extra and interop targets; ok
509 OpenBSD-Regress-ID: 7ea21b5f6fc4506165093b2123d88d20ff13a4f0
511 commit ea0039173957d0edcd6469b9614dcedb44dcb4f9
512 Author: dtucker@openbsd.org <dtucker@openbsd.org>
513 Date: Thu Oct 26 12:44:07 2023 +0000
515 upstream: Skip conch interop tests when not enabled instead of fatal.
517 OpenBSD-Regress-ID: b0abf81c24ac6c21f367233663228ba16fa96a46
519 commit d220b9ed5494252b26b95f05be118472bc3ab5c0
520 Author: dtucker@openbsd.org <dtucker@openbsd.org>
521 Date: Wed Oct 25 05:38:08 2023 +0000
523 upstream: Import regenerated moduli.
525 OpenBSD-Commit-ID: 95f5dd6107e8902b87dc5b005ef2b53f1ff378b8
527 commit a611e4db4009447a0151f31a44e235ca32ed4429
528 Author: anton@openbsd.org <anton@openbsd.org>
529 Date: Wed Oct 25 08:01:59 2023 +0000
531 upstream: ssh conch interop tests requires a controlling terminal;
535 OpenBSD-Regress-ID: cbf2701bc347c2f19d907f113779c666f1ecae4a
537 commit da951b5e08c167acb5d6e2eec6f146502f5d6ed8
538 Author: anton@openbsd.org <anton@openbsd.org>
539 Date: Mon Oct 23 11:30:49 2023 +0000
541 upstream: Use private key that is allowed by sshd defaults in conch
547 OpenBSD-Regress-ID: 3b7f65c8f409c328bcd4b704f60cb3d31746f045
549 commit 1ca166dbb3c0ce632b98869cd955f69320aa6fe8
550 Author: Darren Tucker <dtucker@dtucker.net>
551 Date: Fri Oct 20 20:43:00 2023 +1100
553 Install Dropbear for interop testing.
555 commit f993bb58351c5cb71e61aede63805a34a6d4daea
556 Author: Darren Tucker <dtucker@dtucker.net>
557 Date: Fri Oct 20 20:39:03 2023 +1100
559 Resync PuTTY and Conch path handling with upstream.
561 Now that configure finds these for us we can remove these -portable
564 commit ff85becd5f5f06a76efa45d30fb204a3c5e5215c
565 Author: Darren Tucker <dtucker@dtucker.net>
566 Date: Fri Oct 20 20:35:46 2023 +1100
568 Have configure find PuTTY and Conch binaries.
570 This will let us remove some -portable specific changes from
573 commit c54a50359b9cecddbf3ffcdc26efcb3cd6071ec1
574 Author: dtucker@openbsd.org <dtucker@openbsd.org>
575 Date: Fri Oct 20 07:37:07 2023 +0000
577 upstream: Allow overriding the locations of the Dropbear binaries
579 similar to what we do for the PuTTY ones.
581 OpenBSD-Regress-ID: 7de0e00518fb0c8fdc5f243b7f82f523c936049c
583 commit fbaa707d455a61d0aef8ae65e02a25bac5351e5c
584 Author: dtucker@openbsd.org <dtucker@openbsd.org>
585 Date: Fri Oct 20 06:56:45 2023 +0000
587 upstream: Add interop test with Dropbear.
589 Right now this is only dbclient not the Dropbear server since it won't
590 currently run as a ProxyCommand.
592 OpenBSD-Regress-ID: 8cb898c414fcdb252ca6328896b0687acdaee496
594 commit c2003d0dbdcdb61ca336c3f90c5c2b4a09c8e73f
595 Author: Fabio Pedretti <pedretti.fabio@gmail.com>
596 Date: Mon Oct 16 11:59:53 2023 +0200
598 Update openssl-devel dependency in RPM spec.
600 Since openssh 9.4p1, openssl >= 1.1.1 is required, so
601 build with --without-openssl elsewhere.
602 According to https://repology.org/project/openssl/versions
603 openssl 1.1.1 is available on fedora >= 29 and rhel >= 8.
604 Successfully build tested, installed and run on rhel 6
606 commit 064e09cd632721c7e6889904e07767443ee23821
607 Author: Fabio Pedretti <pedretti.fabio@gmail.com>
608 Date: Mon Oct 16 10:13:06 2023 +0200
610 Remove reference of dropped sshd.pam.old file
612 The file was removed in openssh 8.8
614 commit 62db354b696b378a164b6e478cb6b0171dcb0c3d
615 Author: dtucker@openbsd.org <dtucker@openbsd.org>
616 Date: Mon Oct 16 08:40:00 2023 +0000
618 upstream: Move declaration of "len" into the block where it's used.
620 This lets us compile Portable with -Werror with when OpenSSL doesn't have
623 OpenBSD-Commit-ID: e02e4b4af351946562a7caee905da60eff16ba29
625 commit 6eee8c972d5901d10e80634a006b4e346b2c8c19
626 Author: Damien Miller <djm@mindrot.org>
627 Date: Fri Oct 13 15:15:05 2023 +1100
629 run t-extra regress tests
631 This exposes the t-extra regress tests (including agent-pkcs11.sh) as
632 a new extra-tests target in the top level Makefile and runs them by
635 commit 637624dbbac13f2bc3c8ec5b15c9d627d07f2935
636 Author: Darren Tucker <dtucker@dtucker.net>
637 Date: Thu Oct 12 22:01:23 2023 +1100
641 While we have 2 cores available on github runners, not using it means
642 that the most recent log message is the actual failure, rather than
643 having to search back through the log for it.
645 commit 971e0cfcfd52ef1d73cf5244074c306a60006e89
646 Author: Darren Tucker <dtucker@dtucker.net>
647 Date: Thu Oct 12 16:23:05 2023 +1100
649 Correct arg order for ED255519 AC_LINK_IFELSE test.
651 commit c616e64688b2a0c1b4daad69b056099be998d121
652 Author: djm@openbsd.org <djm@openbsd.org>
653 Date: Thu Oct 12 03:51:08 2023 +0000
655 upstream: typos and extra debug trace calls
657 OpenBSD-Regress-ID: 98a2a6b9333743274359e3c0f0e65cf919a591d1
659 commit c49a3fbf10162128c67c59562348de2041188974
660 Author: djm@openbsd.org <djm@openbsd.org>
661 Date: Thu Oct 12 03:48:53 2023 +0000
663 upstream: ensure logs are owned by correct user; feedback/ok
667 OpenBSD-Regress-ID: c3297af8f07717f1d400a5d34529962f1a76b5a3
669 commit 5ec0ed79ac074c3437b25f6cba8b8cf21c8d4587
670 Author: djm@openbsd.org <djm@openbsd.org>
671 Date: Thu Oct 12 03:36:32 2023 +0000
673 upstream: 64 %-expansion keys ought to be enough for anybody; ok
675 dtucker (we just hit the previous limit in some cases)
677 OpenBSD-Commit-ID: 84070f8001ec22ff5d669f836b62f206e08c5787
679 commit f59a94e22e46db2c23eddeb871aa9e8d93ab0016
680 Author: djm@openbsd.org <djm@openbsd.org>
681 Date: Thu Oct 12 02:48:43 2023 +0000
683 upstream: don't dereference NULL pointer when hashing jumphost
685 OpenBSD-Commit-ID: 251c0263e1759a921341c7efe7f1d4c73e1c70f4
687 commit 281c79168edcc303abfd5bca983616eaa24c5f32
688 Author: Damien Miller <djm@mindrot.org>
689 Date: Thu Oct 12 13:20:01 2023 +1100
691 Solaris: prefer PRIV_XPOLICY to PRIV_LIMIT
693 If the system support PRIV_XPOLICY and one is set, then don't
694 modify PRIV_LIMIT. bz2833, patch from Ron Jordan, ok dtucker@
696 commit 98fc34df837f3a3b79d2a111b96fe8a39adcab55
697 Author: djm@openbsd.org <djm@openbsd.org>
698 Date: Thu Oct 12 02:18:18 2023 +0000
700 upstream: add %j token that expands to the configured ProxyJump
702 hostname (or the empty string if this option is not being used). bz3610, ok
705 OpenBSD-Commit-ID: ce9983f7efe6a178db90dc5c1698df025df5e339
707 commit 7f3180be8a85320b5d3221714b40c16e66881249
708 Author: djm@openbsd.org <djm@openbsd.org>
709 Date: Thu Oct 12 02:15:53 2023 +0000
711 upstream: release GSS OIDs only at end of authentication; bz2982,
715 OpenBSD-Commit-ID: 0daa41e0525ae63cae4483519ecaa37ac485d94c
717 commit a612b93de5d86e955bfb6e24278f621118eea500
718 Author: djm@openbsd.org <djm@openbsd.org>
719 Date: Thu Oct 12 02:12:53 2023 +0000
721 upstream: mask SIGINT/TERM/QUIT/HUP before checking quit_pending
723 and use ppoll() to unmask them in the mainloop. Avoids race condition between
724 signaling ssh to exit and polling. bz3531; ok dtucker
726 OpenBSD-Commit-ID: 5c14e1aabcddedb95cdf972283d9c0d5083229e7
728 commit 531b27a006116fe7aff325510aaa576f24844452
729 Author: djm@openbsd.org <djm@openbsd.org>
730 Date: Wed Oct 11 23:23:58 2023 +0000
732 upstream: sync usage() with ssh.1; spotted by kn@
734 OpenBSD-Commit-ID: 191a85639477dcb5fa1616d270d93b7c8d5c1dfd
736 commit 64f7ca881b19be754425dca60d1590d306c9d1d0
737 Author: djm@openbsd.org <djm@openbsd.org>
738 Date: Wed Oct 11 23:14:33 2023 +0000
740 upstream: ssh -Q does not make sense with other command-line options,
742 so give it its own line in the manpage
744 OpenBSD-Commit-ID: 00a747f0655c12122bbb77c2796be0013c105361
746 commit a752a6c0e1001f93696d7025f0c867f0376e2ecf
747 Author: djm@openbsd.org <djm@openbsd.org>
748 Date: Wed Oct 11 22:42:26 2023 +0000
750 upstream: add ChannelTimeout support to the client, mirroring the
752 same option in the server. ok markus@
754 OpenBSD-Commit-ID: 55630b26f390ac063980cfe7ad8c54b03284ef02
756 commit 76e91e7238cdc5662bc818e2a48d466283840d23
757 Author: djm@openbsd.org <djm@openbsd.org>
758 Date: Wed Oct 11 22:41:05 2023 +0000
760 upstream: add support for reading ED25519 private keys in PEM PKCS8
762 format; ok markus@ tb@
764 OpenBSD-Commit-ID: 01b85c91757e6b057e9b23b8a23f96415c3c7174
766 commit fc77c8e352c0f44125425c05265e3a00c183d78a
767 Author: djm@openbsd.org <djm@openbsd.org>
768 Date: Wed Oct 11 06:40:54 2023 +0000
770 upstream: mention "none" is a valid argument to IdentityFile; bz3080
772 OpenBSD-Commit-ID: 1b4fb590ef731099349a7d468b77f02b240ac926
774 commit c97520d23d1fe53d30725a2af25d2dddd6f2faff
775 Author: djm@openbsd.org <djm@openbsd.org>
776 Date: Wed Oct 11 05:42:08 2023 +0000
778 upstream: in olde rcp/scp protocol mode, when rejecting a path from the
780 server as not matching the glob that the client sent, log (at debug level)
781 the received pathname as well as the list of possible expected paths expanded
782 from the glob. bz2966
784 OpenBSD-Commit-ID: 0bd8db8a595334ca86bca8f36e23fc0395315765
786 commit 208c2b719879805983398160791d6a1ef9c2c3fc
787 Author: djm@openbsd.org <djm@openbsd.org>
788 Date: Wed Oct 11 04:46:29 2023 +0000
790 upstream: s/%.100s/%s/ in SSH- banner construction as there's no
792 reason to limit its size: the version string bring included is a compile time
793 constant going into an allocated banner string.
795 OpenBSD-Commit-ID: 0ef73304b9bf3e534c60900cd84ab699f859ebcd
797 commit 0354790826b97c41bbd171a965574e159b58d83e
798 Author: tb@openbsd.org <tb@openbsd.org>
799 Date: Tue Oct 10 06:49:54 2023 +0000
801 upstream: Garbage collect cipher_get_keyiv_len()
803 This is a compat20 leftover, unused since 2017.
807 OpenBSD-Commit-ID: 91fa5497c9dc6883064624ac27813a567883fdce
809 commit 8d29ee4115001a02641386ae394992c65ed279e0
810 Author: djm@openbsd.org <djm@openbsd.org>
811 Date: Tue Oct 10 03:57:45 2023 +0000
813 upstream: Reserve a range of "local extension" message numbers that
815 OpenSSH promises not to use (comment change only)
817 OpenBSD-Commit-ID: e61795b453d4892d2c99ce1039112c4a00250e03
819 commit 90b0d73d63a706e85f6431f05a62d2ce1b476472
820 Author: djm@openbsd.org <djm@openbsd.org>
821 Date: Fri Oct 6 03:32:15 2023 +0000
823 upstream: typo in error message
825 OpenBSD-Regress-ID: 6a8edf0dc39941298e3780b147b10c0a600b4fee
827 commit e84517f51532ec913d8fb01a8aab7307134774bb
828 Author: djm@openbsd.org <djm@openbsd.org>
829 Date: Fri Oct 6 03:25:14 2023 +0000
831 upstream: Perform the softhsm2 setup as discrete steps rather than
833 as a long shell pipeline. Makes it easier to figure out what has happened
836 OpenBSD-Regress-ID: b3f1292115fed65765d0a95414df16e27772d81c
838 commit cb54becff4d776238e0e9072943ba0872260535d
839 Author: claudio@openbsd.org <claudio@openbsd.org>
840 Date: Sun Sep 24 08:14:13 2023 +0000
842 upstream: REGRESS_FAIL_EARLY defaults to yes now. So no need to
844 overload the value here anymore. OK tb@ bluhm@
846 OpenBSD-Regress-ID: f063330f1bebbcd373100afccebc91a965b14496
848 commit f01f5137ceba65baf34ceac5a298c12ac01b1fef
849 Author: jmc@openbsd.org <jmc@openbsd.org>
850 Date: Wed Oct 4 05:42:10 2023 +0000
852 upstream: spelling fix;
854 OpenBSD-Commit-ID: 493f95121567e5ab0d9dd1150f873b5535ca0195
856 commit 80a2f64b8c1d27383cc83d182b73920d1e6a91f1
857 Author: Damien Miller <djm@mindrot.org>
858 Date: Wed Oct 4 15:34:10 2023 +1100
860 crank version numbers
862 commit f65f187b105d9b5c12fd750a211397d08c17c6d4
863 Author: djm@openbsd.org <djm@openbsd.org>
864 Date: Wed Oct 4 04:04:09 2023 +0000
866 upstream: openssh-9.5
868 OpenBSD-Commit-ID: 5e0af680480bd3b6f5560cf840ad032d48fd6b16
870 commit ffe27e54a4bb18d5d3bbd3f4cc93a41b8d94dfd2
871 Author: djm@openbsd.org <djm@openbsd.org>
872 Date: Wed Oct 4 04:03:50 2023 +0000
874 upstream: add some cautionary text about % token expansion and
876 shell metacharacters; based on report from vinci AT protonmail.ch
878 OpenBSD-Commit-ID: aa1450a54fcee2f153ef70368d90edb1e7019113
880 commit 60ec3d54fd1ebfe2dda75893fa1e870b8dffbb0d
881 Author: djm@openbsd.org <djm@openbsd.org>
882 Date: Tue Oct 3 23:56:10 2023 +0000
884 upstream: fix link to agent draft; spotted by Jann Horn
886 OpenBSD-Commit-ID: ff5bda21a83ec013db683e282256a85201d2dc4b
888 commit 12e2d4b13f6f63ce2de13cbfcc9e4d0d4b4ab231
889 Author: Damien Miller <djm@mindrot.org>
890 Date: Wed Oct 4 10:54:04 2023 +1100
892 use portable provider allowlist path in manpage
896 commit 6c2c6ffde75df95fd838039850d3dd3d84956d87
897 Author: deraadt@openbsd.org <deraadt@openbsd.org>
898 Date: Tue Sep 19 20:37:07 2023 +0000
900 upstream: typo; from Jim Spath
902 OpenBSD-Commit-ID: 2f5fba917b5d4fcf93d9e0b0756c7f63189e228e
904 commit b6b49130a0089b297245ee39e769231d7c763014
905 Author: djm@openbsd.org <djm@openbsd.org>
906 Date: Sun Sep 10 23:12:32 2023 +0000
908 upstream: rename remote_glob() -> sftp_glob() to match other API
910 OpenBSD-Commit-ID: d9dfb3708d824ec02970a84d96cf5937e0887229
912 commit 21b79af6c8d2357c822c84cef3fbdb8001ed263b
913 Author: djm@openbsd.org <djm@openbsd.org>
914 Date: Sun Sep 10 03:51:55 2023 +0000
916 upstream: typo in comment
918 OpenBSD-Commit-ID: 69285e0ce962a7c6b0ab5f17a293c60a0a360a18
920 commit 41232d25532b4d2ef6c5db62efc0cf50a79d26ca
921 Author: Darren Tucker <dtucker@dtucker.net>
922 Date: Sun Sep 10 15:45:38 2023 +1000
924 Use zero-call-used-regs=used with Apple compilers.
926 Apple's versions of clang have version numbers that do not match the
927 corresponding upstream clang versions. Unfortunately, they do still
928 have the clang-15 zero-call-used-regs=all bug, so for now use the value
929 that doesn't result in segfaults. We could allowlist future versions
930 that are known to work. bz#3584 (and probably also our github CI
933 commit 90ccc5918ea505bf156c31148b6b59a1bf5d6dc6
934 Author: djm@openbsd.org <djm@openbsd.org>
935 Date: Sun Sep 10 03:25:53 2023 +0000
937 upstream: randomise keystroke obfuscation intervals and average
939 interval rate. ok dtucker@
941 OpenBSD-Commit-ID: 05f61d051ab418fcfc4857ff306e420037502382
943 commit bd1b9e52f5fa94d87223c90905c5fdc1a7c32aa6
944 Author: djm@openbsd.org <djm@openbsd.org>
945 Date: Fri Sep 8 06:34:24 2023 +0000
947 upstream: fix sizeof(*ptr) instead sizeof(ptr) in realloc (pointer here
949 is char**, so harmless); spotted in CID 416964
951 OpenBSD-Commit-ID: c61caa4a5a667ee20bb1042098861e6c72c69002
953 commit c4f966482983e18601eec70a1563115de836616f
954 Author: djm@openbsd.org <djm@openbsd.org>
955 Date: Fri Sep 8 06:10:57 2023 +0000
957 upstream: regress test recursive remote-remote directories copies where
959 the directory contains a symlink to another directory.
961 also remove errant `set -x` that snuck in at some point
963 OpenBSD-Regress-ID: 1c94a48bdbd633ef2285954ee257725cd7bc456f
965 commit 5e1dfe5014ebc194641678303e22ab3bba15f4e5
966 Author: djm@openbsd.org <djm@openbsd.org>
967 Date: Fri Sep 8 06:10:02 2023 +0000
969 upstream: fix recursive remote-remote copies of directories that
971 contain symlinks to other directories (similar to bz3611)
973 OpenBSD-Commit-ID: 7e19d2ae09b4f941bf8eecc3955c9120171da37f
975 commit 7c0ce2bf98b303b6ad91493ee3247d96c18ba1f6
976 Author: djm@openbsd.org <djm@openbsd.org>
977 Date: Fri Sep 8 05:50:57 2023 +0000
979 upstream: regress test for recursive copies of directories containing
981 symlinks to other directories. bz3611, ok dtucker@
983 OpenBSD-Regress-ID: eaa4c29cc5cddff4e72a16bcce14aeb1ecfc94b9
985 commit 2de990142a83bf60ef694378b8598706bc654b08
986 Author: djm@openbsd.org <djm@openbsd.org>
987 Date: Fri Sep 8 05:56:13 2023 +0000
989 upstream: the sftp code was one of my first contributions to
991 OpenSSH and it shows - the function names are terrible.
993 Rename do_blah() to sftp_blah() to make them less so.
995 Completely mechanical except for sftp_stat() and sftp_lstat() which
996 change from returning a pointer to a static variable (error-prone) to
997 taking a pointer to a caller-provided receiver.
999 OpenBSD-Commit-ID: eb54d6a72d0bbba4d623e2175cf5cc4c75dc2ba4
1001 commit 249d8bd0472b53e3a2a0e138b4c030a31e83346a
1002 Author: djm@openbsd.org <djm@openbsd.org>
1003 Date: Fri Sep 8 05:50:12 2023 +0000
1005 upstream: fix scp in SFTP mode recursive upload and download of
1007 directories that contain symlinks to other directories. In scp mode, the
1008 links would be followed, but in SFTP mode they were not. bz3611, ok dtucker@
1010 OpenBSD-Commit-ID: 9760fda668eaa94a992250d7670dfbc62a45197c
1012 commit 0e1f4401c466fa4fdaea81b6dadc8dd1fc4cf0af
1013 Author: djm@openbsd.org <djm@openbsd.org>
1014 Date: Wed Sep 6 23:36:09 2023 +0000
1016 upstream: regression test for override of subsystem in match blocks
1018 OpenBSD-Regress-ID: 5f8135da3bfda71067084c048d717b0e8793e87c
1020 commit 8a1450c62035e834d8a79a5d0d1c904236f9dcfe
1021 Author: djm@openbsd.org <djm@openbsd.org>
1022 Date: Wed Sep 6 23:35:35 2023 +0000
1024 upstream: allow override of Sybsystem directives in sshd Match
1028 OpenBSD-Commit-ID: 3911d18a826a2d2fe7e4519075cf3e57af439722
1030 commit 6e52826e2a74d077147a82ead8d4fbd5b54f4e3b
1031 Author: djm@openbsd.org <djm@openbsd.org>
1032 Date: Wed Sep 6 23:26:37 2023 +0000
1034 upstream: allocate the subsystems array as necessary and remove the
1036 fixed limit of subsystems. Saves a few kb of memory in the server and makes
1037 it more like the other options.
1039 OpenBSD-Commit-ID: e683dfca6bdcbc3cc339bb6c6517c0c4736a547f
1041 commit e19069c9fac4c111d6496b19c7f7db43b4f07b4f
1042 Author: djm@openbsd.org <djm@openbsd.org>
1043 Date: Wed Sep 6 23:23:53 2023 +0000
1045 upstream: preserve quoting of Subsystem commands and arguments.
1047 This may change behaviour of exotic configurations, but the most common
1048 subsystem configuration (sftp-server) is unlikely to be affected.
1050 OpenBSD-Commit-ID: 8ffa296aeca981de5b0945242ce75aa6dee479bf
1052 commit 52dfe3c72d98503d8b7c6f64fc7e19d685636c0b
1053 Author: djm@openbsd.org <djm@openbsd.org>
1054 Date: Wed Sep 6 23:21:36 2023 +0000
1056 upstream: downgrade duplicate Subsystem directives from being a
1058 fatal error to being a debug message to match behaviour with just about all
1061 OpenBSD-Commit-ID: fc90ed2cc0c18d4eb8e33d2c5e98d25f282588ce
1063 commit 1ee0a16e07b6f0847ff463d7b5221c4bf1876e25
1064 Author: djm@openbsd.org <djm@openbsd.org>
1065 Date: Wed Sep 6 23:18:15 2023 +0000
1067 upstream: handle cr+lf (instead of just cr) in sshsig signature
1071 OpenBSD-Commit-ID: 647460a212b916540016d066568816507375fd7f
1073 commit e1c284d60a928bcdd60bc575c6f9604663502770
1074 Author: job@openbsd.org <job@openbsd.org>
1075 Date: Mon Sep 4 10:29:58 2023 +0000
1077 upstream: Generate Ed25519 keys when invoked without arguments
1079 Ed25519 public keys are very convenient due to their small size.
1080 OpenSSH has supported Ed25519 since version 6.5 (January 2014).
1082 OK djm@ markus@ sthen@ deraadt@
1084 OpenBSD-Commit-ID: f498beaad19c8cdcc357381a60df4a9c69858b3f
1086 commit 694150ad92765574ff82a18f4e86322bd3231e68
1087 Author: djm@openbsd.org <djm@openbsd.org>
1088 Date: Mon Sep 4 00:08:14 2023 +0000
1090 upstream: trigger keystroke timing obfucation only if the channels
1092 layer enqueud some data in the last poll() cycle; this avoids triggering the
1093 obfuscatior for non-channels data like ClientAlive probes and also fixes a
1094 related problem were the obfucations would be triggered on fully quiescent
1097 Based on / tested by naddy@
1099 OpenBSD-Commit-ID: d98f32dc62d7663ff4660e4556e184032a0db123
1101 commit b5fd97896b59a3a46245cf438cc8b16c795d9f74
1102 Author: djm@openbsd.org <djm@openbsd.org>
1103 Date: Mon Sep 4 00:04:02 2023 +0000
1105 upstream: avoid bogus "obfuscate_keystroke_timing: stopping ..."
1107 debug messages when keystroke timing obfuscation was never started; spotted
1110 OpenBSD-Commit-ID: 5c270d35f7d2974db5c1646e9c64188f9393be31
1112 commit ccf7d913db34e49b7a6db1b8331bd402004c840d
1113 Author: djm@openbsd.org <djm@openbsd.org>
1114 Date: Mon Sep 4 00:01:46 2023 +0000
1116 upstream: make channel_output_poll() return a flag indicating
1118 whether channel data was enqueued. Will be used to improve keystroke timing
1119 obfuscation. Problem spotted by / tested by naddy@
1121 OpenBSD-Commit-ID: f9776c7b0065ba7c3bbe50431fd3b629f44314d0
1123 commit 43254b326ac6e2131dbd750f9464dc62c14bd5a7
1124 Author: djm@openbsd.org <djm@openbsd.org>
1125 Date: Sun Sep 3 23:59:32 2023 +0000
1127 upstream: set interactive mode for ControlPersist sessions if they
1129 originally requested a tty; enables keystroke timing obfuscation for most
1130 ControlPersist sessions. Spotted by naddy@
1132 OpenBSD-Commit-ID: 72783a26254202e2f3f41a2818a19956fe49a772
1134 commit ff3eda68ceb2e2bb8f48e3faceb96076c3e85c20
1135 Author: Darren Tucker <dtucker@dtucker.net>
1136 Date: Thu Aug 31 23:02:35 2023 +1000
1138 Set LLONG_MAX for C89 test.
1140 If we don't have LLONG_MAX, configure will figure out that it can get it
1141 by setting -std=gnu99, at which point we won't be testing C89 any more.
1142 To avoid this, feed it in via CFLAGS.
1144 commit f98031773db361424d59e3301aa92aacf423d920
1145 Author: djm@openbsd.org <djm@openbsd.org>
1146 Date: Tue Aug 29 02:50:10 2023 +0000
1148 upstream: make PerSourceMaxStartups first-match-wins; ok dtucker@
1150 OpenBSD-Commit-ID: dac0c24cb709e3c595b8b4f422a0355dc5a3b4e7
1152 commit cfa66857db90cd908de131e0041a50ffc17c7df8
1153 Author: djm@openbsd.org <djm@openbsd.org>
1154 Date: Mon Aug 28 09:52:09 2023 +0000
1156 upstream: descriptive text shouldn't be under .Cm
1158 OpenBSD-Commit-ID: b1afaeb456a52bc8a58f4f9f8b2f9fa8f6bf651b
1160 commit 01dbf3d46651b7d6ddf5e45d233839bbfffaeaec
1161 Author: djm@openbsd.org <djm@openbsd.org>
1162 Date: Mon Aug 28 09:48:11 2023 +0000
1164 upstream: limit artificial login delay to a reasonable maximum (5s)
1166 and don't delay at all for the "none" authentication mechanism. Patch by
1167 Dmitry Belyavskiy in bz3602 with polish/ok dtucker@
1169 OpenBSD-Commit-ID: 85b364676dd84cf1de0e98fc2fbdcb1a844ce515
1171 commit 528da5b9d7c5da01ed7a73ff21c722e1b5326006
1172 Author: jmc@openbsd.org <jmc@openbsd.org>
1173 Date: Mon Aug 28 05:32:28 2023 +0000
1175 upstream: add spacing for punctuation when macro args;
1177 OpenBSD-Commit-ID: e80343c16ce0420b2aec98701527cf90371bd0db
1179 commit 3867361ca691d0956ef7d5fb8181cf554a91d84a
1180 Author: djm@openbsd.org <djm@openbsd.org>
1181 Date: Mon Aug 28 04:06:52 2023 +0000
1183 upstream: explicit long long type in timing calculations (doesn't
1185 matter, since the range is pre-clamped)
1187 OpenBSD-Commit-ID: f786ed902d04a5b8ecc581d068fea1a79aa772de
1189 commit 7603ba71264e7fa938325c37eca993e2fa61272f
1190 Author: djm@openbsd.org <djm@openbsd.org>
1191 Date: Mon Aug 28 03:31:16 2023 +0000
1193 upstream: Add keystroke timing obfuscation to the client.
1195 This attempts to hide inter-keystroke timings by sending interactive
1196 traffic at fixed intervals (default: every 20ms) when there is only a
1197 small amount of data being sent. It also sends fake "chaff" keystrokes
1198 for a random interval after the last real keystroke. These are
1199 controlled by a new ssh_config ObscureKeystrokeTiming keyword/
1203 OpenBSD-Commit-ID: 02231ddd4f442212820976068c34a36e3c1b15be
1205 commit dce6d80d2ed3cad2c516082682d5f6ca877ef714
1206 Author: djm@openbsd.org <djm@openbsd.org>
1207 Date: Mon Aug 28 03:28:43 2023 +0000
1209 upstream: Introduce a transport-level ping facility
1211 This adds a pair of SSH transport protocol messages SSH2_MSG_PING/PONG
1212 to implement a ping capability. These messages use numbers in the "local
1213 extensions" number space and are advertised using a "ping@openssh.com"
1214 ext-info message with a string version number of "0".
1218 OpenBSD-Commit-ID: b6b3c4cb2084c62f85a8dc67cf74954015eb547f
1220 commit d2d247938b38b928f8a6e1a47a330c5584d3a358
1221 Author: tobhe@openbsd.org <tobhe@openbsd.org>
1222 Date: Mon Aug 21 21:16:18 2023 +0000
1224 upstream: Log errors in kex_exchange_identification() with level
1226 verbose instead of error to reduce preauth log spam. All of those get logged
1227 with a more generic error message by sshpkt_fatal().
1229 feedback from sthen@
1232 OpenBSD-Commit-ID: bd47dab4695b134a44c379f0e9a39eed33047809
1234 commit 9d7193a8359639801193ad661a59d1ae4dc3d302
1235 Author: djm@openbsd.org <djm@openbsd.org>
1236 Date: Mon Aug 21 04:59:54 2023 +0000
1238 upstream: correct math for ClientAliveInterval that caused the
1240 probes to be sent less frequently than configured; from Dawid Majchrzak
1242 OpenBSD-Commit-ID: 641153e7c05117436ddfc58267aa267ca8b80038
1244 commit 3c6ab63b383b0b7630da175941e01de9db32a256
1245 Author: Darren Tucker <dtucker@dtucker.net>
1246 Date: Fri Aug 25 14:48:02 2023 +1000
1248 Include Portable version in sshd version string.
1252 commit 17fa6cd10a26e193bb6f65d21264d2fe553bcd87
1253 Author: Darren Tucker <dtucker@dtucker.net>
1254 Date: Mon Aug 21 19:47:58 2023 +1000
1256 obsd-arm64 host is real hardware...
1258 so put in the correct config location.
1260 commit 598ca75c85acaaacee5ef954251e489cc20d7be9
1261 Author: Darren Tucker <dtucker@dtucker.net>
1262 Date: Mon Aug 21 18:38:36 2023 +1000
1264 Add OpenBSD ARM64 test host.
1266 commit 1acac79bfbe207e8db639e8043524962037c8feb
1267 Author: Darren Tucker <dtucker@dtucker.net>
1268 Date: Mon Aug 21 18:05:26 2023 +1000
1270 Add test for zlib development branch.
1272 commit 84efebf352fc700e9040c8065707c63caedd36a3
1273 Author: djm@openbsd.org <djm@openbsd.org>
1274 Date: Mon Aug 21 04:36:46 2023 +0000
1276 upstream: want stdlib.h for free(3)
1278 OpenBSD-Commit-ID: 743af3c6e3ce5e6cecd051668f0327a01f44af29
1280 commit cb4ed12ffc332d1f72d054ed92655b5f1c38f621
1281 Author: Darren Tucker <dtucker@dtucker.net>
1282 Date: Sat Aug 19 07:39:08 2023 +1000
1284 Fix zlib version check for 1.3 and future version.
1288 commit 25b75e21f16bccdaa472ea1889b293c9bd51a87b
1289 Author: Darren Tucker <dtucker@dtucker.net>
1290 Date: Mon Aug 14 11:10:08 2023 +1000
1292 Add 9.4 branch to CI status page.
1294 commit 803e22eabd3ba75485eedd8b7b44d6ace79f2052
1295 Author: djm@openbsd.org <djm@openbsd.org>
1296 Date: Fri Aug 18 01:37:41 2023 +0000
1298 upstream: fix regression in OpenSSH 9.4 (mux.c r1.99) that caused
1300 multiplexed sessions to ignore SIGINT under some circumstances. Reported by /
1301 feedback naddy@, ok dtucker@
1303 OpenBSD-Commit-ID: 4d5c6c894664f50149153fd4764f21f43e7d7e5a
1305 commit e706bca324a70f68dadfd0ec69edfdd486eed23a
1306 Author: djm@openbsd.org <djm@openbsd.org>
1307 Date: Wed Aug 16 16:14:11 2023 +0000
1309 upstream: defence-in-depth MaxAuthTries check in monitor; ok markus
1311 OpenBSD-Commit-ID: 65a4225dc708e2dae71315adf93677edace46c21
1313 commit d1ab7eb90474df656d5e9935bae6df0bd000d343
1314 Author: djm@openbsd.org <djm@openbsd.org>
1315 Date: Mon Aug 14 03:37:00 2023 +0000
1317 upstream: add message number of SSH2_MSG_NEWCOMPRESS defined in RFC8308
1319 OpenBSD-Commit-ID: 6c984171c96ed67effd7b5092f3d3975d55d6028
1321 commit fa8da52934cb7dff6f660a143276bdb28bb9bbe1
1322 Author: Darren Tucker <dtucker@dtucker.net>
1323 Date: Sun Aug 13 15:01:27 2023 +1000
1325 Add obsd72 and obsd73 test targets.
1327 commit f9f18006678d2eac8b0c5a5dddf17ab7c50d1e9f
1328 Author: djm@openbsd.org <djm@openbsd.org>
1329 Date: Thu Aug 10 23:05:48 2023 +0000
1331 upstream: better debug logging of sessions' exit status
1333 OpenBSD-Commit-ID: 82237567fcd4098797cbdd17efa6ade08e1a36b0
1335 commit a8c57bcb077f0cfdffcf9f23866bf73bb93e185c
1336 Author: naddy@openbsd.org <naddy@openbsd.org>
1337 Date: Thu Aug 10 14:37:32 2023 +0000
1339 upstream: drop a wayward comma, ok jmc@
1341 OpenBSD-Commit-ID: 5c11fbb9592a29b37bbf36f66df50db9d38182c6
1343 commit e962f9b318a238db1becc53c2bf79dd3a49095b4
1344 Author: Damien Miller <djm@mindrot.org>
1345 Date: Thu Aug 10 11:10:22 2023 +1000
1349 commit 0fcb60bf83130dfa428bc4422b3a3ac20fb528af
1350 Author: Damien Miller <djm@mindrot.org>
1351 Date: Thu Aug 10 11:05:42 2023 +1000
1353 update versions in RPM specs
1355 commit d0cee4298491314f09afa1c4383a66d913150b26
1356 Author: Damien Miller <djm@mindrot.org>
1357 Date: Thu Aug 10 11:05:14 2023 +1000
1359 update version in README
1361 commit 78b4dc6684f4d35943b46b24ee645edfdb9974f5
1362 Author: djm@openbsd.org <djm@openbsd.org>
1363 Date: Thu Aug 10 01:01:07 2023 +0000
1365 upstream: openssh-9.4
1367 OpenBSD-Commit-ID: 71fc1e01a4c4ea061b252bd399cda7be757e6e35
1369 commit 58ca4f0aa8c4306ac0a629c9a85fb1efaf4ff092
1370 Author: Darren Tucker <dtucker@dtucker.net>
1371 Date: Thu Aug 10 11:30:24 2023 +1000
1373 Only include unistd.h once.
1375 commit 3961ed02dc578517a9d2535128cff5c3a5460d28
1376 Author: Damien Miller <djm@mindrot.org>
1377 Date: Thu Aug 10 09:08:49 2023 +1000
1379 wrap poll.h include in HAVE_POLL_H
1381 commit e535fbe2af893046c28adfcd787c1fdbae36a24a
1382 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1383 Date: Fri Aug 4 06:32:40 2023 +0000
1385 upstream: Apply ConnectTimeout to multiplexing local socket
1387 connections. If the multiplex socket exists but the connection times out,
1388 ssh will fall back to a direct connection the same way it would if the socket
1389 did not exist at all. ok djm@
1391 OpenBSD-Commit-ID: 2fbe1a36d4a24b98531b2d298a6557c8285dc1b4
1393 commit 9d92e7b24848fcc605945f7c2e3460c7c31832ce
1394 Author: Darren Tucker <dtucker@dtucker.net>
1395 Date: Thu Aug 3 19:35:33 2023 +1000
1397 Fix RNG seeding for OpenSSL w/out self seeding.
1399 When sshd is built with an OpenSSL that does not self-seed, it would
1400 fail in the preauth privsep process while handling a new connection.
1401 Sanity checked by djm@
1403 commit f70010d9b0b3e7e95de8aa0b961e1d74362cfb5d
1404 Author: djm@openbsd.org <djm@openbsd.org>
1405 Date: Wed Aug 2 23:04:38 2023 +0000
1407 upstream: CheckHostIP has defaulted to 'no' for a while; make the
1409 commented- out config option match. From Ed Maste
1411 OpenBSD-Commit-ID: e66e934c45a9077cb1d51fc4f8d3df4505db58d9
1413 commit c88a8788f9865d02b986d00405b9f0be65ad0b5a
1414 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1415 Date: Tue Aug 1 08:15:04 2023 +0000
1417 upstream: remove unnecessary if statement.
1419 github PR#422 from eyalasulin999, ok djm@
1421 OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55
1423 commit 77b8b865cd5a8c79a47605c0c5b2bacf4692c4d5
1424 Author: jmc@openbsd.org <jmc@openbsd.org>
1425 Date: Fri Jul 28 05:42:36 2023 +0000
1427 upstream: %C is a callable macro in mdoc(7)
1429 so, as we do for %D, escape it;
1431 OpenBSD-Commit-ID: 538cfcddbbb59dc3a8739604319491dcb8e0c0c9
1433 commit e0f91aa9c2fbfc951e9ced7e1305455fc614d3f2
1434 Author: djm@openbsd.org <djm@openbsd.org>
1435 Date: Fri Jul 28 05:33:15 2023 +0000
1437 upstream: don't need to start a command here; use ssh -N instead.
1439 Fixes failure on cygwin spotted by Darren
1441 OpenBSD-Regress-ID: ff678a8cc69160a3b862733d935ec4a383f93cfb
1443 commit f446a44f30bc680e0d026a4204844b02646c1c2d
1444 Author: djm@openbsd.org <djm@openbsd.org>
1445 Date: Wed May 17 05:52:01 2023 +0000
1447 upstream: add LTESTS_FROM variable to allow skipping of tests up to
1449 a specific point. e.g. "make LTESTS_FROM=t-sftp" will only run the sftp.sh
1450 test and subsequent ones. ok dtucker@
1452 OpenBSD-Regress-ID: 07f653de731def074b29293db946042706fcead3
1454 commit 8eb8899d612440a9b608bee7f916081d3d0b7812
1455 Author: djm@openbsd.org <djm@openbsd.org>
1456 Date: Fri May 12 06:37:42 2023 +0000
1458 upstream: test ChrootDirectory in Match block
1460 OpenBSD-Regress-ID: a6150262f39065939f025e546af2a346ffe674c1
1462 commit e43f43d3f19516222e9a143468ea0dc1b3ab67b6
1463 Author: djm@openbsd.org <djm@openbsd.org>
1464 Date: Fri May 12 06:36:27 2023 +0000
1466 upstream: better error messages
1468 OpenBSD-Regress-ID: 55e4186604e80259496d841e690ea2090981bc7a
1470 commit 6958f00acf3b9e0b3730f7287e69996bcf3ceda4
1471 Author: djm@openbsd.org <djm@openbsd.org>
1472 Date: Thu Jul 27 22:26:49 2023 +0000
1474 upstream: don't incorrectly truncate logged strings retrieved from
1476 PKCS#11 modules; based on GHPR406 by Jakub Jelen; ok markus
1478 OpenBSD-Commit-ID: 7ed1082f23a13b38c373008f856fd301d50012f9
1480 commit d1ffde6b55170cd4b9a72bfd9a3f17508e6cf714
1481 Author: djm@openbsd.org <djm@openbsd.org>
1482 Date: Thu Jul 27 22:25:17 2023 +0000
1484 upstream: make sshd_config AuthorizedPrincipalsCommand and
1486 AuthorizedKeysCommand accept the %D (routing domain) and a new %C (connection
1487 address/port 4-tuple) as expansion sequences; ok markus
1489 OpenBSD-Commit-ID: ee9a48bf1a74c4ace71b69de69cfdaa2a7388565
1491 commit 999a2886ca1844a7a74b905e5f2c8c701f9838cd
1492 Author: djm@openbsd.org <djm@openbsd.org>
1493 Date: Thu Jul 27 22:23:05 2023 +0000
1495 upstream: increase default KDF work-factor for OpenSSH format
1497 private keys from 16 to 24; { feedback ok } x { deraadt markus }
1499 OpenBSD-Commit-ID: a3afb1383f8ff0a49613d449f02395d9e8d4a9ec
1501 commit 0fa803a1dd1c7b546c166000e23a869cf6c4ec10
1502 Author: Darren Tucker <dtucker@dtucker.net>
1503 Date: Thu Jul 27 02:25:09 2023 +1000
1505 Prefer OpenSSL's SHA256 in sk-dummy.so
1507 Previously sk-dummy.so used libc's (or compat's) SHA256 since it may be
1508 built without OpenSSL. In many cases, however, including both libc's
1509 and OpenSSL's headers together caused conflicting definitions.
1511 We tried working around this (on OpenSSL <1.1 you could define
1512 OPENSSL_NO_SHA, NetBSD had USE_LIBC_SHA2, various #define hacks) with
1513 varying levels of success. Since OpenSSL >=1.1 removed OPENSSL_NO_SHA
1514 and including most OpenSSL headers would bring sha.h in, even if it
1515 wasn't used directly this was a constant hassle.
1517 Admit defeat and use OpenSSL's SHA256 unless we aren't using OpenSSL at
1520 commit 36cdb5dbf55c99c0faad06066f56a7c341258c1f
1521 Author: Darren Tucker <dtucker@dtucker.net>
1522 Date: Thu Jul 27 10:29:44 2023 +1000
1524 Retire dfly58 test VM. Add dfly64.
1526 commit 2d34205dab08ede9b0676efa57647fc49e6decbe
1527 Author: djm@openbsd.org <djm@openbsd.org>
1528 Date: Wed Jul 26 23:06:00 2023 +0000
1530 upstream: make ssh -f (fork after authentication) work properly in
1532 multiplexed cases (inc. ControlPersist). bz3589 bz3589 Based on patches by
1533 Peter Chubb; ok dtucker@
1535 OpenBSD-Commit-ID: a7a2976a54b93e6767dc846b85647e6ec26969ac
1537 commit 076aeda86a7ee9be8fd2f0181ec7b9729a6ceb37
1538 Author: naddy@openbsd.org <naddy@openbsd.org>
1539 Date: Sun Jul 23 20:04:45 2023 +0000
1541 upstream: man page typos; ok jmc@
1543 OpenBSD-Commit-ID: e6ddfef94b0eb867ad88abe07cedc8ed581c07f0
1545 commit 135e7d5fe31f700e6dfc61ce914970c5ee7175ba
1546 Author: jmc@openbsd.org <jmc@openbsd.org>
1547 Date: Thu Jul 20 05:43:39 2023 +0000
1549 upstream: tweak the allow-remote-pkcs11 text;
1551 OpenBSD-Commit-ID: bc965460a89edf76865b7279b45cf9cbdebd558a
1553 commit 5f83342b61d1f76c141de608ed2bd293990416bd
1554 Author: Darren Tucker <dtucker@dtucker.net>
1555 Date: Tue Jul 25 13:00:22 2023 +1000
1557 Handle a couple more OpenSSL no-ecc cases.
1561 commit edc2ef4e418e514c99701451fae4428ec04ce538
1562 Author: Damien Miller <djm@mindrot.org>
1563 Date: Thu Jul 20 12:53:44 2023 +1000
1567 commit 51fda734e0d3c2df256fc03e8b060c4305be6e59
1568 Author: Damien Miller <djm@mindrot.org>
1569 Date: Thu Jul 20 12:53:21 2023 +1000
1571 Bring back OPENSSL_HAS_ECC to ssh-pkcs11-client
1573 commit 099cdf59ce1e72f55d421c8445bf6321b3004755
1574 Author: djm@openbsd.org <djm@openbsd.org>
1575 Date: Wed Jul 19 14:03:45 2023 +0000
1577 upstream: Separate ssh-pkcs11-helpers for each p11 module
1579 Make ssh-pkcs11-client start an independent helper for each provider,
1580 providing better isolation between modules and reliability if a single
1583 This also implements reference counting of PKCS#11-hosted keys,
1584 allowing ssh-pkcs11-helper subprocesses to be automatically reaped
1585 when no remaining keys reference them. This fixes some bugs we have
1586 that make PKCS11 keys unusable after they have been deleted, e.g.
1587 https://bugzilla.mindrot.org/show_bug.cgi?id=3125
1591 OpenBSD-Commit-ID: 0ce188b14fe271ab0568f4500070d96c5657244e
1593 commit 29ef8a04866ca14688d5b7fed7b8b9deab851f77
1594 Author: djm@openbsd.org <djm@openbsd.org>
1595 Date: Wed Jul 19 14:02:27 2023 +0000
1597 upstream: Ensure FIDO/PKCS11 libraries contain expected symbols
1599 This checks via nlist(3) that candidate provider libraries contain one
1600 of the symbols that we will require prior to dlopen(), which can cause
1601 a number of side effects, including execution of constructors.
1603 Feedback deraadt; ok markus
1605 OpenBSD-Commit-ID: 1508a5fbd74e329e69a55b56c453c292029aefbe
1607 commit 1f2731f5d7a8f8a8385c6031667ed29072c0d92a
1608 Author: djm@openbsd.org <djm@openbsd.org>
1609 Date: Wed Jul 19 13:56:33 2023 +0000
1611 upstream: Disallow remote addition of FIDO/PKCS11 provider
1613 libraries to ssh-agent by default.
1615 The old behaviour of allowing remote clients from loading providers
1616 can be restored using `ssh-agent -O allow-remote-pkcs11`.
1618 Detection of local/remote clients requires a ssh(1) that supports
1619 the `session-bind@openssh.com` extension. Forwarding access to a
1620 ssh-agent socket using non-OpenSSH tools may circumvent this control.
1624 OpenBSD-Commit-ID: 4c2bdf79b214ae7e60cc8c39a45501344fa7bd7c
1626 commit 892506b13654301f69f9545f48213fc210e5c5cc
1627 Author: djm@openbsd.org <djm@openbsd.org>
1628 Date: Wed Jul 19 13:55:53 2023 +0000
1630 upstream: terminate process if requested to load a PKCS#11 provider
1632 that isn't a PKCS#11 provider; from / ok markus@
1634 OpenBSD-Commit-ID: 39532cf18b115881bb4cfaee32084497aadfa05c
1636 commit f3f56df8ec476b2de6cbdbdfdb77a2a61087829d
1637 Author: Damien Miller <djm@mindrot.org>
1638 Date: Wed Jul 19 12:07:18 2023 +1000
1640 agent_fuzz doesn't want stdint.h conditionalised
1642 commit 750911fd31d307a767cc86e3bfa90bbbb77b1a25
1643 Author: Damien Miller <djm@mindrot.org>
1644 Date: Tue Jul 18 15:41:12 2023 +1000
1646 conditionalise stdint.h inclusion on HAVE_STDINT_H
1648 fixes build on AIX5 at least
1650 commit ff047504fa6e008c4092f8929881816b8993bea0
1651 Author: Damien Miller <djm@mindrot.org>
1652 Date: Tue Jul 18 15:30:45 2023 +1000
1654 conditionalise match localnetwork on ifaddrs.h
1656 Fixes build breakage on platforms that lack getifaddrs()
1658 commit b87b03282e466ca2927954ce93f5dbf0bfdc68f6
1659 Author: djm@openbsd.org <djm@openbsd.org>
1660 Date: Mon Jul 17 06:16:33 2023 +0000
1662 upstream: missing match localnetwork negation check
1664 OpenBSD-Commit-ID: 9a08ed8dae27d3f38cf280f1b28d4e0ff41a737a
1666 commit 6d6e185ba29ef4274164b77eab4dc763907f8821
1667 Author: jmc@openbsd.org <jmc@openbsd.org>
1668 Date: Mon Jul 17 05:41:53 2023 +0000
1670 upstream: - add -P to usage() - sync the arg name to -J in usage()
1672 with that in ssh.1 - reformat usage() to match what "man ssh" does on 80width
1674 OpenBSD-Commit-ID: 5235dd7aa42e5bf90ae54579d519f92fc107036e
1676 commit f1a9898283a0638667b587ee4a950afd61ab51b0
1677 Author: jmc@openbsd.org <jmc@openbsd.org>
1678 Date: Mon Jul 17 05:38:10 2023 +0000
1680 upstream: -P before -p in SYNOPSIS;
1682 OpenBSD-Commit-ID: 535f5257c779e26c6a662a038d241b017f8cab7c
1684 commit eef4d7e873568e1c84c36bb4034e2c3378250a61
1685 Author: jsg@openbsd.org <jsg@openbsd.org>
1686 Date: Mon Jul 17 05:36:14 2023 +0000
1688 upstream: configuation -> configuration
1690 OpenBSD-Commit-ID: 4776ced33b780f1db0b2902faec99312f26a726b
1692 commit dc1dbe94cf6532bd546a3373ad436404f8850e5f
1693 Author: djm@openbsd.org <djm@openbsd.org>
1694 Date: Mon Jul 17 05:26:38 2023 +0000
1696 upstream: move other RCSIDs to before their respective license blocks
1700 OpenBSD-Commit-ID: ef5bf46b57726e4260a63b032b0b5ac3b4fe9cd4
1702 commit ebe11044681caff78834ca6b78311ad19c1860b8
1703 Author: djm@openbsd.org <djm@openbsd.org>
1704 Date: Mon Jul 17 05:22:30 2023 +0000
1706 upstream: Move RCSID to before license block and away from #includes,
1708 where it caused merge conflict in -portable for each commit :(
1710 OpenBSD-Commit-ID: 756ebac963df3245258b962e88150ebab9d5fc20
1712 commit 05c08e5f628de3ecf6f7ea20947735bcfa3201e0
1713 Author: djm@openbsd.org <djm@openbsd.org>
1714 Date: Mon Jul 17 05:20:15 2023 +0000
1716 upstream: return SSH_ERR_KRL_BAD_MAGIC when a KRL doesn't contain a
1718 valid magic number and not SSH_ERR_MESSAGE_INCOMPLETE; the former is needed
1719 to fall back to text revocation lists in some cases; fixes t-cert-hostkey.
1721 OpenBSD-Commit-ID: 5c670a6c0f027e99b7774ef29f18ba088549c7e1
1723 commit c6fad2c3d19b74f0bd0af1ef040fc74f3a1d9ebb
1724 Author: Damien Miller <djm@mindrot.org>
1725 Date: Mon Jul 17 14:56:14 2023 +1000
1727 avoid AF_LINK on platforms that don't define it
1729 commit 919bc3d3b712c920de1ae6be5ac6561c98886d7e
1730 Author: djm@openbsd.org <djm@openbsd.org>
1731 Date: Mon Jul 17 04:08:31 2023 +0000
1733 upstream: Add support for configuration tags to ssh(1).
1735 This adds a ssh_config(5) "Tag" directive and corresponding
1736 "Match tag" predicate that may be used to select blocks of
1737 configuration similar to the pf.conf(5) keywords of the same
1742 OpenBSD-Commit-ID: dc08358e70e702b59ac3e591827e5a96141b06a3
1744 commit 3071d85a47061c1bdaf11a0ac233b501ecba862c
1745 Author: djm@openbsd.org <djm@openbsd.org>
1746 Date: Mon Jul 17 04:04:36 2023 +0000
1748 upstream: add a "match localnetwork" predicate.
1750 This allows matching on the addresses of available network interfaces
1751 and may be used to vary the effective client configuration based on
1752 network location (e.g. to use a ProxyJump when not on a particular
1757 OpenBSD-Commit-ID: cffb6ff9a3803abfc52b5cad0aa190c5e424c139
1759 commit beec17bb311365b75a0a5941418d4b96df7d7888
1760 Author: djm@openbsd.org <djm@openbsd.org>
1761 Date: Mon Jul 17 04:01:10 2023 +0000
1763 upstream: remove vestigal support for KRL signatures
1765 When the KRL format was originally defined, it included support for
1766 signing of KRL objects. However, the code to sign KRLs and verify KRL
1767 signatues was never completed in OpenSSH.
1769 Now, some years later, we have SSHSIG support in ssh-keygen that is
1770 more general, well tested and actually works. So this removes the
1771 semi-finished KRL signing/verification support from OpenSSH and
1772 refactors the remaining code to realise the benefit - primarily, we
1773 no longer need to perform multiple parsing passes over KRL objects.
1777 OpenBSD-Commit-ID: 517437bab3d8180f695c775410c052340e038804
1779 commit 449566f64c21b4578d5c0c431badd0328adc53ed
1780 Author: djm@openbsd.org <djm@openbsd.org>
1781 Date: Mon Jul 17 03:57:21 2023 +0000
1783 upstream: Support for KRL extensions.
1785 This defines wire formats for optional KRL extensions and implements
1786 parsing of the new submessages. No actual extensions are supported at
1791 OpenBSD-Commit-ID: ae2fcde9a22a9ba7f765bd4f36b3f5901d8c3fa7
1793 commit 18ea857770e84825a3a6238bb37f54864487b59f
1794 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1795 Date: Fri Jul 14 07:44:21 2023 +0000
1797 upstream: Include stdint.h for SIZE_MAX. Fixes OPENSSL=no build.
1799 OpenBSD-Commit-ID: e7c31034a5434f2ead3579b13a7892960651e6b0
1801 commit 20b768fcd13effe0f2d3619661b6c8592c773553
1802 Author: Darren Tucker <dtucker@dtucker.net>
1803 Date: Fri Jul 14 17:07:32 2023 +1000
1805 Fix typo in declaration of nmesg.
1807 commit 4b94d09542e36ebde2eb9ad89bc68431609932de
1808 Author: Damien Miller <djm@mindrot.org>
1809 Date: Fri Jul 14 15:34:47 2023 +1000
1811 portable-specific int overflow defence-in-depth
1813 These too are unreachable, but we want the code to be safe regardless of
1814 context. Reported by Yair Mizrahi @ JFrog
1816 commit 2ee48adb9fc8692e8d6ac679dcc9f35e89ad68f0
1817 Author: djm@openbsd.org <djm@openbsd.org>
1818 Date: Fri Jul 14 05:31:44 2023 +0000
1820 upstream: add defence-in-depth checks for some unreachable integer
1822 overflows reported by Yair Mizrahi @ JFrog; feedback/ok millert@
1824 OpenBSD-Commit-ID: 52af085f4e7ef9f9d8423d8c1840a6a88bda90bd
1826 commit 4b43bc358ae6f6b19a973679246dc5172f6ac41b
1827 Author: djm@openbsd.org <djm@openbsd.org>
1828 Date: Mon Jul 10 04:51:26 2023 +0000
1830 upstream: misplaced debug message
1832 OpenBSD-Commit-ID: d0f12af0a5067a756aa707bc39a83fa6f58bf7e5
1834 commit 8c7203bcee4c4f98a22487b4631fe068b992099b
1835 Author: Damien Miller <djm@mindrot.org>
1836 Date: Wed Jul 12 11:41:19 2023 +1000
1838 replace deprecate selinux matchpathcon function
1840 This function is apparently deprecated. Documentation on what is the
1841 supposed replacement is is non-existent, so this follows the approach
1842 glibc used https://sourceware.org/git/?p=glibc.git;a=patch;h=f278835f59
1846 commit 7e8800f5d701efffa39ccb63ca1e095ea777c31a
1847 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1848 Date: Thu Jul 6 22:17:59 2023 +0000
1850 upstream: minleft and maxsign are u_int so cast appropriately. Prompted
1852 by github PR#410, ok deraadt.
1854 OpenBSD-Commit-ID: 0514cd51db3ec60239966622a0d3495b15406ddd
1856 commit 94842bfe9b09fc93189c6ed0dc9bbebc1d44a426
1857 Author: dlg@openbsd.org <dlg@openbsd.org>
1858 Date: Tue Jul 4 03:59:21 2023 +0000
1860 upstream: add support for unix domain sockets to ssh -W
1864 OpenBSD-Commit-ID: 3e6d47567b895c7c28855c7bd614e106c987a6d8
1866 commit a95fc5eed09a0238fb127b6c50e8498432b79dae
1867 Author: David Seifert <soap@gentoo.org>
1868 Date: Fri May 12 14:06:01 2023 +0200
1870 gss-serv.c: `MAXHOSTNAMELEN` -> `HOST_NAME_MAX`
1872 `MAXHOSTNAMELEN` is not defined in POSIX, which breaks on musl:
1873 https://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html
1875 Bug: https://bugs.gentoo.org/834044
1877 commit 8a6cd08850f576e7527c52a1b086cae82fab290e
1878 Author: Darren Tucker <dtucker@dtucker.net>
1879 Date: Fri Jun 23 09:49:02 2023 +1000
1881 Update runner OS version for hardenedmalloc test.
1883 Hardenedmalloc dropped support for "legacy glibc" versions in their
1884 64dad0a69 so use a newer Ubuntu version for the runner for that test.
1886 commit cfca6f17e64baed6822bb927ed9f372ce64d9c5b
1887 Author: Damien Miller <djm@mindrot.org>
1888 Date: Thu Jun 22 15:04:03 2023 +1000
1890 handle sysconf(SC_OPEN_MAX) returning > INT_MAX;
1894 commit c1c2ca1365b3f7b626683690bd2c68265f6d8ffd
1895 Author: djm@openbsd.org <djm@openbsd.org>
1896 Date: Wed Jun 21 05:10:26 2023 +0000
1898 upstream: better validate CASignatureAlgorithms in ssh_config and
1902 Previously this directive would accept certificate algorithm names, but
1903 these were unusable in practice as OpenSSH does not support CA chains.
1905 part of bz3577; ok dtucker@
1907 OpenBSD-Commit-ID: a992d410c8a78ec982701bc3f91043dbdb359912
1909 commit 4e73cd0f4ab3e5b576c56cac9732da62c8fc0565
1910 Author: djm@openbsd.org <djm@openbsd.org>
1911 Date: Wed Jun 21 05:08:32 2023 +0000
1913 upstream: make `ssh -Q CASignatureAlgorithms` only list signature
1915 algorithms that are valid for CA signing. Previous behaviour was to list all
1916 signing algorithms, including certificate algorithms (OpenSSH certificates do
1917 not support CA chains). part of bz3577; ok dtucker@
1919 OpenBSD-Commit-ID: 99c2b072dbac0f44fd1f2269e3ff6c1b5d7d3e59
1921 commit a69062f1695ac9c3c3dea29d3044c72aaa6af0ea
1922 Author: djm@openbsd.org <djm@openbsd.org>
1923 Date: Wed Jun 21 05:06:04 2023 +0000
1925 upstream: handle rlimits > INT_MAX (rlim_t is u64); ok dtucker
1929 OpenBSD-Commit-ID: 31cf59c041becc0e5ccb0a77106f812c4cd1cd74
1931 commit 8d33f2aa6bb895a7f85a47189913639086347b75
1932 Author: djm@openbsd.org <djm@openbsd.org>
1933 Date: Tue Jun 20 23:59:33 2023 +0000
1935 upstream: prepare for support for connecting to unix domain sockets
1937 using ssh -W by explicitly decoding PORT_STREAMLOCAL (a negative number) from
1938 the u32 that's passed over the multiplexing socket; previously code would
1939 just cast, which is UB.
1941 OpenBSD-Commit-ID: e5ac5f40d354096c51e8c118a5c1b2d2b7a31384
1943 commit b4ac435b4e67f8eb5932d8f59eb5b3cf7dc38df0
1944 Author: djm@openbsd.org <djm@openbsd.org>
1945 Date: Tue Jun 20 00:05:09 2023 +0000
1947 upstream: reset comment=NULL for each key in do_fingerprint();
1949 fixes "no comment" not showing on when running `ssh-keygen -l` on multiple
1950 keys where one has a comment and other following keys do not. Patch from
1951 Markus Kuhn via GHPR407, bz3580
1953 OpenBSD-Commit-ID: 3cce84456fdcd67dc6b84e369f92c6686d111d9b
1955 commit b53a809a549dcd4fbde554c6aa283e597b15ea33
1956 Author: millert@openbsd.org <millert@openbsd.org>
1957 Date: Mon Jun 5 13:24:36 2023 +0000
1959 upstream: Store timeouts as int, not u_int as they are limited to
1961 INT_MAX. Fixes sign compare warnings systems with 32-bit time_t due to type
1964 OpenBSD-Commit-ID: 48081e9ad35705c5f1705711704a4c2ff94e87b7
1966 commit 2709809fd616a0991dc18e3a58dea10fb383c3f0
1967 Author: Philip Hands <phil@hands.com>
1968 Date: Wed May 24 19:41:14 2023 +0200
1970 fixup! if -s & -p specified, mention 'sftp -P' on
1974 SSH-Copy-ID-Upstream: 32686e7c65b4fa2846e474d3315102dfa0f043b0
1976 commit 204e0bf05161b7641500d7ab266c21217412379f
1977 Author: Darren Tucker <dtucker@dtucker.net>
1978 Date: Tue Aug 3 21:25:48 2021 +1000
1980 Make ssh-copy-id(1) consistent with OpenSSH.
1982 This makes the ssh-copy-id man page more consistent with the rest of the
1984 - new sentence, new line
1988 - zap trailing whitespace
1990 Report from Debian via mindrot bz#3331, diff from jmc at openbsd.org.
1992 SSH-Copy-ID-Upstream: d8974cfb6242316460ed22a1ccc662800a50c5d3
1994 commit 9de79df66d1430d290fab670bb4b18612875e518
1995 Author: Philip Hands <phil@hands.com>
1996 Date: Wed May 24 11:45:43 2023 +0200
1998 if -s & -p specified, mention 'sftp -P' on success
2000 This was inspired by this:
2001 https://github.com/openssh/openssh-portable/pull/321
2002 but I thought that it was better to not do the sed patching.
2004 BTW the reason one can get away with using $SSH_OPTS throughout, despite
2005 the lowercase -p in there, even if sftp is in use, is that the sftp call
2006 is using the already-established ssh master connection, so the port was
2007 passed to the earlier ssh.
2009 SSH-Copy-ID-Upstream: 1c124d9bfafdbe28a00b683367ebf5750ce12eb2
2011 commit 801cda54c00e0f4e7d89345a90874c8d05dc233a
2012 Author: Philip Hands <phil@hands.com>
2013 Date: Tue May 23 23:07:11 2023 +0200
2017 SSH-Copy-ID-Upstream: e604fae1cdee35c18055d35dcec530cf12ef00ad
2019 commit 288482f53613f3e74544eb92deeb24f7c7f1f371
2020 Author: Philip Hands <phil@hands.com>
2021 Date: Tue May 23 20:52:13 2023 +0200
2023 make -x also apply to the target script
2025 SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4
2027 commit b79e7b88ed44f0e4339f0ff35c96c78a92175a8d
2028 Author: Philip Hands <phil@hands.com>
2029 Date: Tue May 23 16:46:42 2023 +0200
2031 add -t option to specify the target path
2033 Allow the default target path (.ssh/authorized_files) to be over-riden
2035 This was inspired by this MR from Panagiotis Cheilaris <philaris@cs.ntua.gr>
2037 https://gitlab.com/phil_hands/ssh-copy-id/-/merge_requests/8
2039 SSH-Copy-ID-Upstream: a942a0e076874adb6d8b2f0fb76d6c7918190fcd
2041 commit 914f4ad138714c471ba72fb6d5496b6235320edd
2042 Author: Carlos RodrÃguez Gili <carlos.rodriguez-gili@upc.edu>
2043 Date: Tue Apr 20 19:23:57 2021 +0200
2045 Fix test error for /bin/sh on Solaris 10 and older
2047 On Solaris 10 and older targets /bin/sh is not POSIX-compliant.
2048 Test -z `...` fails with error 'sh: test: argument expected'.
2049 Using quotes around backticks fixes this and doesn't break
2050 POSIX compatibility.
2052 SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065
2054 commit bd382dca316c721aed1e45edcf4c4e0f6374afb0
2055 Author: Jakub Jelen <jjelen@redhat.com>
2056 Date: Tue Mar 2 21:34:05 2021 +0000
2058 Remove outdated comment
2060 The commit b068122 removed the code dropping the trailing colon, but the comment stayed leaving the code confusing for future readers
2062 SSH-Copy-ID-Upstream: 930d39f238117cd53810240ec989d0356aa1c1f6
2064 commit bdcaf7939029433635d63aade8f9ac762aca2bbe
2065 Author: Darren Tucker <dtucker@dtucker.net>
2066 Date: Wed May 10 18:50:46 2023 +1000
2068 Special case OpenWrt instead of Dropbear.
2070 OpenWrt overrides the location of authorized_keys for root. Currently we
2071 assume that all Dropbear installations behave this way, which is not the
2072 case. Check for OpenWrt and root user before using that location instead
2073 of assuming that for all Dropbear servers. Prompted by Github PR#250.
2075 SSH-Copy-ID-Upstream: 0e1f5d443a9967483c33945793107ae3f3e4af2d
2077 commit cf84498f67abe93f813a296167b406a0db7b288e
2078 Author: Philip Hands <phil@hands.com>
2079 Date: Thu May 18 18:20:55 2023 +0200
2081 ssh-copy-id: add -x option (for debugging)
2083 This option causes the ssh-copy-id to run with set -x
2085 SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844
2087 commit b4a1efdcb88f03394c08e7f68ed4e11676830002
2088 Author: Philip Hands <phil@hands.com>
2089 Date: Thu May 18 17:14:41 2023 +0200
2091 update copyright notices
2093 SSH-Copy-ID-Upstream: c284ed33b361814ea48ff68cbd01ca525b2bf117
2095 commit fcd78e31cdd45a7e69ccfe6d8a3b1037dc1de290
2096 Author: djm@openbsd.org <djm@openbsd.org>
2097 Date: Wed May 24 23:01:06 2023 +0000
2099 upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand
2101 appears previously in configuration. Reported by John Meyers in bz3574 ok
2104 OpenBSD-Commit-ID: 1c92e4517284386703936e1d3abaa36cfacf1951
2106 commit 5ec5504f1d328d5bfa64280cd617c3efec4f78f3
2107 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2108 Date: Wed May 10 10:04:20 2023 +0000
2110 upstream: Remove unused prototypes for ssh1 RSA functions.
2112 From lengyijun via github PR#396.
2114 OpenBSD-Commit-ID: 379a5afa8b7a0f3cba0c8a9bcceb4e5e33a5c1ef
2116 commit fbf362b3891ae4b36052d1b39f37fc618b41c476
2117 Author: Darren Tucker <dtucker@dtucker.net>
2118 Date: Tue May 9 19:26:56 2023 +1000
2120 main(void) to prevent unused variable warning.
2122 commit baf854c8bb0a6d0af5c696c801e631a48dabbaba
2123 Author: Darren Tucker <dtucker@dtucker.net>
2124 Date: Tue May 9 19:25:45 2023 +1000
2126 Remove warning pragma since clang doesn't like it.
2128 commit 5fbb7a1349fbbb48ccb1b8cafff2c1854370d87d
2129 Author: Darren Tucker <dtucker@dtucker.net>
2130 Date: Tue May 9 17:13:33 2023 +1000
2132 Suppress warning for snprintf truncation test.
2134 commit 47742c513e4e045ecc985c6483fc5c8b050acda2
2135 Author: Darren Tucker <dtucker@dtucker.net>
2136 Date: Tue May 9 17:12:50 2023 +1000
2138 Update OpenSSL compat test for 3.x.
2140 commit 86ad25d455a2313126125540e61e0f9314283f88
2141 Author: Darren Tucker <dtucker@dtucker.net>
2142 Date: Mon May 8 20:23:08 2023 +1000
2144 Add macos13 PAM test target.
2146 commit 77cca2c4b13bc6e5f389565583b6202b0d1bccc2
2147 Author: Darren Tucker <dtucker@dtucker.net>
2148 Date: Mon May 8 20:14:46 2023 +1000
2150 Skip agent-peereid test on macos13.
2152 sudo -S nobody doesn't work on the github runners (probably a
2153 permission issue) so skip that test.
2155 commit b356b8e91678ea295bcf44df5248c3fbf499fdcf
2156 Author: Darren Tucker <dtucker@dtucker.net>
2157 Date: Mon May 8 20:14:28 2023 +1000
2159 Include config.guess in debug output.
2161 commit b7afd8a4ecaca8afd3179b55e9db79c0ff210237
2162 Author: Darren Tucker <dtucker@dtucker.net>
2163 Date: Mon May 8 20:12:59 2023 +1000
2165 Handle OpenSSL >=3 ABI compatibility.
2167 Beyond OpenSSL 3.0, the ABI compatibility guarantees are wider (only
2168 major must match instead of major and minor in earlier versions).
2171 commit 0e9e2663eb2c6e9c3e10d15d70418312ae67e542
2172 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2173 Date: Mon May 1 08:57:29 2023 +0000
2175 upstream: Import regenerated moduli.
2177 OpenBSD-Commit-ID: 3d5f811cfcaed8cc4a97e1db49ac61bdf118113c
2179 commit d9687f49682e1e93383fc15ab2018850b2ef38c3
2180 Author: Darren Tucker <dtucker@dtucker.net>
2181 Date: Mon May 1 11:45:14 2023 +1000
2183 Add macos-13 test target.
2185 Also flatten OS list for clarity.
2187 commit aacfd6767497b8fa6d41ecdd3f8e265d1e9ef1f6
2188 Author: djm@openbsd.org <djm@openbsd.org>
2189 Date: Sun Apr 30 22:54:22 2023 +0000
2191 upstream: adjust ftruncate() logic to handle servers that reorder
2195 sftp/scp will ftruncate the destination file after a transfer completes,
2196 to deal with the case where a longer destination file already existed.
2197 We tracked the highest contiguous block transferred to deal with this
2198 case, but our naive tracking doesn't deal with servers that reorder
2199 requests - a misfeature strictly permitted by the protocol but seldom
2202 Adjust the logic to ftruncate() at the highest absolute block received
2203 when the transfer is successful. feedback deraadt@ ok markus@
2205 prompted by https://github.com/openssh/openssh-portable/commit/9b733#commitcomment-110679778
2207 OpenBSD-Commit-ID: 4af7fac75958ad8507b4fea58706f3ff0cfddb1b
2209 commit c8eb3941758615c8284a48fff47872db926da63c
2210 Author: djm@openbsd.org <djm@openbsd.org>
2211 Date: Wed Apr 26 01:36:03 2023 +0000
2213 upstream: Check for ProxyJump=none in CanonicalizeHostname logic.
2215 Previously ssh would incorrectly refuse to canonicalise the hostname
2216 if ProxyJump was explicitly set to "none" when CanonicalizeHostname=yes
2220 OpenBSD-Commit-ID: 80a58e43c3a32f97361282f756ec8d3f37989efd
2222 commit ac383f3a5c6f529a2e8a5bc44af79a08c7da294e
2223 Author: jsg@openbsd.org <jsg@openbsd.org>
2224 Date: Wed Apr 12 14:22:04 2023 +0000
2226 upstream: remove duplicate signal.h include
2228 OpenBSD-Commit-ID: 30c0a34d74d91ddd0e6992525da70d3293392f70
2230 commit 740dafa20f3f3d325f6f5d44e990b8c8a6d3d816
2231 Author: jsg@openbsd.org <jsg@openbsd.org>
2232 Date: Wed Apr 12 08:53:54 2023 +0000
2234 upstream: fix double words ok dtucker@
2236 OpenBSD-Commit-ID: 44d3223902fbce5276422bdc8063ab72a4078489
2238 commit 6452f89577ec4f22440c31b8e19b061d1a7c4b2a
2239 Author: Darren Tucker <dtucker@dtucker.net>
2240 Date: Tue Apr 11 16:49:19 2023 +1000
2242 Test against LibreSSL 3.7.2.
2244 commit 2138f6be595ca106fe4805a1e3ab9c4d8acc697b
2245 Author: Damien Miller <djm@mindrot.org>
2246 Date: Thu Apr 6 14:33:10 2023 +1000
2248 remove unused upper-case const strings in fmtfp
2250 no float format that uses upper-case is supported nor are hex floats.
2253 commit 484c5e6168fdb22cbcd73c4ff987cf9ca47989ca
2254 Author: djm@openbsd.org <djm@openbsd.org>
2255 Date: Thu Apr 6 03:56:02 2023 +0000
2257 upstream: simplify sshsig_find_principals() similar to what happened to
2259 sshsig_check_allowed_keys() in r1.31, removing some dead code
2261 OpenBSD-Commit-ID: a493e628d4d6c08f878c276d998f4313ba61702d
2263 commit 3a7b110fbc7e096423f8f7b459deffe4c65d70f4
2264 Author: djm@openbsd.org <djm@openbsd.org>
2265 Date: Thu Apr 6 03:21:31 2023 +0000
2267 upstream: remove redundant ssh!=NULL check; we'd already
2271 OpenBSD-Commit-ID: 852bf12591ec5a9fb12dcbde9b1fd3945ad0df3c
2273 commit 2519110659a1efac6c976895a86659d1b341c91b
2274 Author: djm@openbsd.org <djm@openbsd.org>
2275 Date: Thu Apr 6 03:19:32 2023 +0000
2277 upstream: match_user() shouldn't be called with user==NULL unless
2279 host and ipaddr are also NULL
2281 OpenBSD-Commit-ID: fa3518346c21483e9e01a2e4b9436ae501daf8ea
2283 commit 3b9ceaad7ad63c1c03c2a89e148340ad3a62a482
2284 Author: djm@openbsd.org <djm@openbsd.org>
2285 Date: Thu Apr 6 03:12:32 2023 +0000
2287 upstream: don't care about glob() return value here.
2289 OpenBSD-Commit-ID: 85bb82fea90478a482e9f65a1bec0aa24227fd66
2291 commit 09d8da0849e2791b2500267cda333cd238f38754
2292 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2293 Date: Mon Apr 3 08:10:54 2023 +0000
2295 upstream: Move up null check and simplify process_escapes.
2297 Based on Coverity CID 291863 which points out we check the channel
2298 pointer for NULLness after dereferencing it. Move this to the start
2299 of the function, and while there simplify initialization of efc a bit.
2302 OpenBSD-Commit-ID: de36e5ad6fde0fe263ca134e986b9095dc59380a
2304 commit b36b162be5e6206f12b734222b7bc517c13a6bc8
2305 Author: Damien Miller <djm@mindrot.org>
2306 Date: Fri Mar 31 14:51:20 2023 +1100
2308 need va_end() after va_copy(); ok dtucker
2312 commit f703757234a5c585553e72bba279b255a272750a
2313 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2314 Date: Fri Mar 31 05:56:36 2023 +0000
2316 upstream: Explicitly ignore return from waitpid here too.
2318 OpenBSD-Commit-ID: eef2403df083c61028969fc679ee370373eacacb
2320 commit 6b73aa29035991d1448a1a76f63ac152a6bf931c
2321 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2322 Date: Fri Mar 31 04:45:08 2023 +0000
2324 upstream: Explictly ignore return codes
2326 where we don't check them.
2328 OpenBSD-Commit-ID: 1ffb03038ba1b6b72667be50cf5e5e396b5f2740
2330 commit 6f0308a3e717ebe68eeb3f95253612fab5dbf20e
2331 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2332 Date: Fri Mar 31 04:42:29 2023 +0000
2334 upstream: Return immediately from get_sock_port
2336 if sock <0 so we don't call getsockname on a negative FD. From Coverity
2339 OpenBSD-Commit-ID: de1c1130646230c2eda559831fc6bfd1b61d9618
2341 commit 1c1124dc901fca1ea2cb762044b8f1a5793a2bed
2342 Author: djm@openbsd.org <djm@openbsd.org>
2343 Date: Fri Mar 31 04:23:02 2023 +0000
2345 upstream: don't leak arg2 on parse_pubkey_algos error path; ok
2349 OpenBSD-Commit-ID: 7d0270ad3dd102412ca76add2b3760518abdef75
2351 commit 8ba2d4764bb6a4701cd447d8b52604622ffe65f4
2352 Author: djm@openbsd.org <djm@openbsd.org>
2353 Date: Fri Mar 31 04:22:27 2023 +0000
2355 upstream: clamp max number of GSSAPI mechanisms to 2048; ok dtucker
2357 OpenBSD-Commit-ID: ce66db603a913d3dd57063e330cb5494d70722c4
2359 commit 1883841fc13d0eada8743cac5d3abe142ee2efa7
2360 Author: djm@openbsd.org <djm@openbsd.org>
2361 Date: Fri Mar 31 04:21:56 2023 +0000
2363 upstream: don't print key if printing hostname failed; with/ok
2367 OpenBSD-Commit-ID: ad42971a6ee5a46feab2d79f7f656f8cf4b119f3
2369 commit c6011129cafe4c411f6ef670a4cf271314708eb8
2370 Author: djm@openbsd.org <djm@openbsd.org>
2371 Date: Fri Mar 31 04:04:15 2023 +0000
2373 upstream: remove redundant test
2375 OpenBSD-Commit-ID: 6a0b719f9b1ae9d42ad8c5b144c7962c93792f7c
2377 commit 4fb29eeafb40a2076c0dbe54e46b687c318f87aa
2378 Author: djm@openbsd.org <djm@openbsd.org>
2379 Date: Fri Mar 31 04:00:37 2023 +0000
2381 upstream: don't attempt to decode a ridiculous number of
2383 attributes; harmless because of bounds elsewhere, but better to be explicit
2385 OpenBSD-Commit-ID: 1a34f4b6896155b80327d15dc7ccf294b538a9f2
2387 commit fc437c154ef724621a4af236de9bc7e51a8381ae
2388 Author: djm@openbsd.org <djm@openbsd.org>
2389 Date: Fri Mar 31 03:22:49 2023 +0000
2391 upstream: remove unused variable; prompted by Coverity CID 291879
2393 OpenBSD-Commit-ID: 4c7d20ef776887b0ba1aabcfc1b14690e4ad0a40
2395 commit 0eb8131e4a53b33a8fc9b9ab694e6b6778b87ade
2396 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2397 Date: Fri Mar 31 00:44:29 2023 +0000
2399 upstream: Check fd against >=0 instead of >0 in error path. The
2401 dup could in theory return fd 0 although currently it doesn't in practice.
2402 From Dmitry Belyavskiy vi github PR#238.
2404 OpenBSD-Commit-ID: 4a95f3f7330394dffee5c749d52713cbf3b54846
2406 commit 7174ba6f8a431ca4257767a260fc50e204068242
2407 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2408 Date: Thu Mar 30 07:19:50 2023 +0000
2410 upstream: Ignore return value from muxclient(). It normally loops
2412 without returning, but it if returns on failure we immediately exit.
2413 Coverity CID 405050.
2415 OpenBSD-Commit-ID: ab3fde6da384ea588226037c38635a6b2e015295
2417 commit a4c1c2513e36f111eeaa1322c510067930e5e51e
2418 Author: Damien Miller <djm@mindrot.org>
2419 Date: Fri Mar 31 14:17:22 2023 +1100
2421 don't call connect() on negative socket
2425 commit 34ee842cdd981a759fe8f0d4a37521f9a1c63170
2426 Author: djm@openbsd.org <djm@openbsd.org>
2427 Date: Thu Mar 30 03:05:01 2023 +0000
2429 upstream: return SSH_ERR_KEY_NOT_FOUND if the allowed_signers file
2431 is empty, not SSH_ERR_INTERNAL_ERROR. Also remove some dead code spotted
2432 by Coverity; with/ok dtucker@
2434 OpenBSD-Commit-ID: 898a1e817cda9869554b1f586a434f67bcc3b650
2436 commit f108e77a9dc9852e72215af1bf27731c48434557
2437 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2438 Date: Thu Mar 30 00:49:37 2023 +0000
2440 upstream: Remove dead code from inside if block.
2442 The only way the if statement can be true is if both dup()s fail, and
2443 in that case the tmp2 can never be set. Coverity CID 291805, ok djm@
2445 OpenBSD-Commit-ID: c0d6089b3fb725015462040cd94e23237449f0c8
2447 commit 05b8e88ebe23db690abbfb1a91111abea09cde08
2448 Author: Darren Tucker <dtucker@dtucker.net>
2449 Date: Thu Mar 30 13:53:29 2023 +1100
2451 child_set_eng: verify both env pointer and count.
2453 If child_set env was called with a NULL env pointer and a non-zero count
2454 it would end up in a null deref, although we don't currently do this.
2455 Prompted by Coverity CID 291850, tweak & ok djm@
2457 commit 28f1b8ef9b84b8cd2f6c9889a0c60aa4a90dadfa
2458 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2459 Date: Wed Mar 29 01:07:48 2023 +0000
2461 upstream: Ignore return from sshpkt_disconnect
2463 since we set our own return value for the function. Coverity CID 291797,
2466 OpenBSD-Commit-ID: 710b57ba954c139240895e23feea41f203201f04
2468 commit c3da05d95922f5550bcc7815e799474d6a160175
2469 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2470 Date: Wed Mar 29 00:59:08 2023 +0000
2472 upstream: Plug potential mem leak in process_put.
2474 It allocates abs_dst inside a loop but only frees it on exit, so free
2475 inside the loop if necessary. Coverity CID 291837, ok djm@
2477 OpenBSD-Commit-ID: a01616503a185519b16f00dde25d34ceaf4ae1a3
2479 commit 13ae327eae598b1043e5ec30e4b170edb3c898a5
2480 Author: djm@openbsd.org <djm@openbsd.org>
2481 Date: Wed Mar 29 00:18:35 2023 +0000
2483 upstream: fix memory leak; Coverity CID 291848
2487 OpenBSD-Commit-ID: 37f80cb5d075ead5a00ad1b74175684ab1156ff8
2489 commit 9ffa76e1284c85bf459c3dcb8e995733a8967e1b
2490 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2491 Date: Tue Mar 28 07:44:32 2023 +0000
2493 upstream: Plug more mem leaks in sftp by making
2495 make_absolute_pwd_glob work in the same way as make_absolute: you
2496 pass it a dynamically allocated string and it either returns it, or
2497 frees it and allocates a new one. Patch from emaste at freebsd.org and
2498 https://reviews.freebsd.org/D37253 ok djm@
2500 OpenBSD-Commit-ID: 85f7404e9d47fd28b222fbc412678f3361d2dffc
2502 commit 82b2b8326962b1a98af279bc5bbbbbcab15b3e45
2503 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2504 Date: Tue Mar 28 06:12:38 2023 +0000
2506 upstream: Remove compat code for OpenSSL < 1.1.*
2508 since -portable no longer supports them.
2510 OpenBSD-Commit-ID: ea2893783331947cd29a67612b4e56f818f185ff
2512 commit b500afcf00ae1b6b73b2ccf171111dfbfeaef74d
2513 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2514 Date: Mon Mar 27 23:56:54 2023 +0000
2516 upstream: Remove compat code for OpenSSL 1.0.*
2518 versions now that -portable has dropped support for those versions.
2520 OpenBSD-Regress-ID: 82a8eacd87aec28e4aa19f17246ddde9d5ce7fe7
2522 commit 727560e6011efcb36d2f3ac6910444bc775abaa1
2523 Author: Darren Tucker <dtucker@dtucker.net>
2524 Date: Tue Mar 28 18:06:42 2023 +1100
2526 Prevent conflicts between Solaris SHA2 and OpenSSL.
2528 We used to prevent conflicts between native SHA2 headers and OpenSSL's
2529 by setting OPENSSL_NO_SHA but that was removed prior to OpenSSL 1.1.0
2531 commit 46db8e14b7f186d32173dcdecd5b785334429b8b
2532 Author: Darren Tucker <dtucker@dtucker.net>
2533 Date: Tue Mar 28 12:44:03 2023 +1100
2535 Remove HEADER_SHA_H from previous...
2537 since it causes more problems than it solves.
2539 commit 72bd68d37387aa5f81da928f6e82f1c88ed8f674
2540 Author: Darren Tucker <dtucker@dtucker.net>
2541 Date: Tue Mar 28 10:35:18 2023 +1100
2543 Replace OPENSSL_NO_SHA with HEADER_SHA_H.
2545 Since this test doesn't use OpenSSL's SHA2 and may cause conflicts we
2546 don't want to include it, but OPENSSL_NO_SHA was removed beginning in
2547 OpenSSL's 1.1 series.
2549 commit 99668f2e6e0deb833e46cfab56db59ff0fc28c7e
2550 Author: Darren Tucker <dtucker@dtucker.net>
2551 Date: Tue Mar 28 09:50:06 2023 +1100
2553 Configure with --target instead of deprecated form.
2555 commit f751d9306c62cd1061f966e6a7483d9bab9c379b
2556 Author: Darren Tucker <dtucker@dtucker.net>
2557 Date: Mon Mar 27 22:05:29 2023 +1100
2559 Pass rpath when building 64bit Solaris.
2561 commit a64b935cd450ee8d04c26c9cd728629cf9ca5c91
2562 Author: Darren Tucker <dtucker@dtucker.net>
2563 Date: Mon Mar 27 19:21:19 2023 +1100
2565 Explicitly disable OpenSSL on AIX test VM.
2567 commit 7ebc6f060fc2f70495a56e16d210baae6424cd96
2568 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2569 Date: Mon Mar 27 03:56:50 2023 +0000
2571 upstream: Add RevokedHostKeys to percent expansion test.
2573 OpenBSD-Regress-ID: c077fd12a38005dd53d878c5b944154dec88d2ff
2575 commit f1a17de150f8d309d0c52f9abfaebf11c51a8537
2576 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2577 Date: Mon Mar 27 03:56:11 2023 +0000
2579 upstream: Add tilde and environment variable expansion to
2581 RevokedHostKeys. bz#3552, ok djm@
2583 OpenBSD-Commit-ID: ce5d8e0219b63cded594c17d4c2958c06918ec0d
2585 commit 009eb4cb48a9708ab9174684dcbcc0f942907abe
2586 Author: djm@openbsd.org <djm@openbsd.org>
2587 Date: Mon Mar 27 03:31:05 2023 +0000
2589 upstream: fix test: getnameinfo returns a non-zero value on error, not
2591 (neccessarily) -1. From GHPR#384
2593 OpenBSD-Commit-ID: d35e2b71268f66f5543a7ea68751972b3ae22b25
2595 commit 4f0a676486700f10a4788f7e9426e94e39c1c89e
2596 Author: djm@openbsd.org <djm@openbsd.org>
2597 Date: Mon Mar 27 03:25:08 2023 +0000
2599 upstream: scp: when copying local->remote, check that source file
2601 exists before opening SFTP connection to the server. Based on GHPR#370 ok
2604 OpenBSD-Commit-ID: b4dd68e15bfe22ce4fac9960a1066a2b721e54fb
2606 commit 154d8baf631327163571760c2c524bc93c37567c
2607 Author: Darren Tucker <dtucker@dtucker.net>
2608 Date: Mon Mar 27 12:22:30 2023 +1100
2610 Also look for gdb error message from OpenIndiana.
2612 commit fbd3811ddb2b6ce2e6dba91fde7352c8978e5412
2613 Author: Darren Tucker <dtucker@dtucker.net>
2614 Date: Mon Mar 27 11:08:00 2023 +1100
2616 Explicitly disable security key test on aix51 VM.
2618 We don't know how to build the shared objects required for the security
2619 key tests so skip them.
2621 commit 4922ac3be8a996780ef3dc220411da2e27c29d9c
2622 Author: Darren Tucker <dtucker@dtucker.net>
2623 Date: Sun Mar 26 14:49:43 2023 +1100
2625 Split libcrypto and other config flags.
2627 This should allow the automatic OpenSSL version selection in the tests
2630 commit 4a948b1469f185e871160a2d70e2a0fce2858f9e
2631 Author: Darren Tucker <dtucker@dtucker.net>
2632 Date: Sun Mar 26 14:39:45 2023 +1100
2634 Specify test target if we build without OpenSSL.
2636 When we decide we can't use the versions of OpenSSL available, also
2637 restrict the tests we run to avoid the ones that need OpenSSL.
2639 commit b308c636f5b5d89eecb98be00b3d56306a005a09
2640 Author: Darren Tucker <dtucker@dtucker.net>
2641 Date: Sun Mar 26 14:22:53 2023 +1100
2643 Find suitable OpenSSL version.
2645 Check the installed OpenSSL versions for a suitable one, and if there
2646 isn't (and we don't have a specific version configured) then build
2649 commit 021ea5c2860f133f44790970968e0e73208b3a87
2650 Author: Damien Miller <djm@mindrot.org>
2651 Date: Fri Mar 24 15:02:52 2023 +1100
2653 Github testing support for BoringSSL
2655 commit 9a97cd106466a2a9bda2bfaa4c48c4f1b2cc9c1b
2656 Author: Damien Miller <djm@mindrot.org>
2657 Date: Fri Mar 24 15:34:29 2023 +1100
2659 BoringSSL doesn't support EC_POINT_point2bn()
2661 so don't invoke it in unittest
2663 commit cc5969c033a032d126ff78e5d95cf20abbede4c7
2664 Author: Damien Miller <djm@mindrot.org>
2665 Date: Fri Mar 24 15:34:05 2023 +1100
2667 another ERR_load_CRYPTO_strings() vestige
2669 commit 4974293899a068133e976f81d6693670d2b576ca
2670 Author: Damien Miller <djm@mindrot.org>
2671 Date: Fri Mar 24 15:24:05 2023 +1100
2673 don't use obsolete ERR_load_CRYPTO_strings()
2675 OpenSSL (and elsewhere in OpenSSH) uses ERR_load_crypto_strings()
2677 commit 3c527d55f906e6970d17c4cab6db90ae9e013235
2678 Author: Damien Miller <djm@mindrot.org>
2679 Date: Fri Mar 24 15:23:05 2023 +1100
2681 Allow building with BoringSSL
2683 commit b7e27cfd7f163fc16b4c5d041cc28ee488a5eeec
2684 Author: Damien Miller <djm@mindrot.org>
2685 Date: Fri Mar 24 15:21:18 2023 +1100
2687 put back SSLeay_version compat in configure test
2689 Needed to detect old versions and give good "your version is bad"
2690 messages at configure time; spotted by dtucker@
2692 commit 7280401bdd77ca54be6867a154cc01e0d72612e0
2693 Author: Damien Miller <djm@mindrot.org>
2694 Date: Fri Mar 24 13:56:25 2023 +1100
2696 remove support for old libcrypto
2698 OpenSSH now requires LibreSSL 3.1.0 or greater or
2699 OpenSSL 1.1.1 or greater
2703 commit abda22fb48302f2142233f71d27c74040288c518
2704 Author: Darren Tucker <dtucker@dtucker.net>
2705 Date: Sun Mar 19 15:36:13 2023 +1100
2707 Test latest OpenSSL 1.1, 3.0 and LibreSSL 3.7.
2709 commit 610ac1cb077cd5a1ebfc21612154bfa13d2ec825
2710 Author: Darren Tucker <dtucker@dtucker.net>
2711 Date: Thu Mar 16 21:38:04 2023 +1100
2713 Show 9.3 branch instead of 9.2.
2715 commit cb30fbdbee869f1ce11f06aa97e1cb8717a0b645
2716 Author: Damien Miller <djm@mindrot.org>
2717 Date: Thu Mar 16 08:28:19 2023 +1100
2721 commit 1dba63eb10c40b6fda9f5012ed6ae87e2d3d028e
2722 Author: Damien Miller <djm@mindrot.org>
2723 Date: Thu Mar 16 08:27:54 2023 +1100
2727 commit ba7532d0dac9aaf0ad7270664c43837fc9f64a5f
2728 Author: djm@openbsd.org <djm@openbsd.org>
2729 Date: Wed Mar 15 21:19:57 2023 +0000
2731 upstream: openssh-9.3
2733 OpenBSD-Commit-ID: 8011495f2449c1029bb316bd015eab2e00509848
2735 commit 6fd4daafb949b66bf555f3100f715a9ec64c3390
2736 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2737 Date: Tue Mar 14 07:28:47 2023 +0000
2739 upstream: Free KRL ptr in addition to its contents.
2741 From Coverity CID 291841, ok djm@
2743 OpenBSD-Commit-ID: f146ba08b1b43af4e0d7ad8c4dae3748b4fa31b6
2745 commit 1d270bd303afaf6d94e9098cbbf18e5e539e2088
2746 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2747 Date: Tue Mar 14 07:26:25 2023 +0000
2749 upstream: Check pointer for NULL before deref.
2751 None of the existing callers seem to do that, but it's worth checking.
2752 From Coverity CID 291834, ok djm@
2754 OpenBSD-Commit-ID: a0a97113f192a7cb1a2c97b932f677f573cda7a4
2756 commit d95af508e78c0cd3dce56b83853baaa59ae295cf
2757 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2758 Date: Sun Mar 12 10:40:39 2023 +0000
2760 upstream: Limit number of entries in SSH2_MSG_EXT_INFO
2762 request. This is already constrained by the maximum SSH packet size but this
2763 makes it explicit. Prompted by Coverity CID 291868, ok djm@ markus@
2765 OpenBSD-Commit-ID: aea023819aa44a2dcb9dd0fbec10561896fc3a09
2767 commit 8f287ba60d342b3e2f750e7332d2131e3ec7ecd0
2768 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2769 Date: Sun Mar 12 09:41:18 2023 +0000
2771 upstream: calloc can return NULL but xcalloc can't.
2773 From Coverity CID 291881, ok djm@
2775 OpenBSD-Commit-ID: 50204b755f66b2ec7ac3cfe379d07d85ca161d2b
2777 commit 83a56a49fd50f4acf900f934279482e4ef329715
2778 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2779 Date: Fri Mar 10 07:17:08 2023 +0000
2781 upstream: Explicitly ignore return from fcntl
2783 (... FD_CLOEXEC) here too. Coverity CID 291853.
2785 OpenBSD-Commit-ID: 99d8b3da9d0be1d07ca8dd8e98800a890349e9b5
2787 commit 0fda9d704d3bbf54a5e64ce02a6fecb11fe7f047
2788 Author: Damien Miller <djm@mindrot.org>
2789 Date: Fri Mar 10 15:59:46 2023 +1100
2791 bounds checking for getrrsetbyname() replacement;
2793 Spotted by Coverity in CID 405033; ok millert@
2795 commit 89b8df518f21677045599df0ad3e5dd0f39909b5
2796 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2797 Date: Fri Mar 10 04:06:21 2023 +0000
2799 upstream: Plug mem leak on error path. Coverity CID 405026, ok djm@.
2801 OpenBSD-Commit-ID: 8212ca05d01966fb5e72205c592b2257708a2aac
2803 commit bf4dae0ad192c3e2f03f7223834b00d88ace3d3e
2804 Author: Darren Tucker <dtucker@dtucker.net>
2805 Date: Fri Mar 10 14:46:57 2023 +1100
2807 Add prototypes for mkstemp replacements.
2809 Should prevent warnings due to our wrapper function.
2811 commit 4e04d68d6a33cdc73b831fd4b5e6124175555d3d
2812 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2813 Date: Fri Mar 10 03:01:51 2023 +0000
2815 upstream: Expliticly ignore return code from fcntl(.. FD_CLOEXEC) since
2817 there's not much we can do anyway. From Coverity CID 291857, ok djm@
2819 OpenBSD-Commit-ID: 051429dd07af8db3fec10d82cdc78d90bb051729
2821 commit d6d38fd77cbe091c59e1bb720c3a494df4990640
2822 Author: djm@openbsd.org <djm@openbsd.org>
2823 Date: Fri Mar 10 02:32:04 2023 +0000
2825 upstream: Like sshd_config, some ssh_config options are not
2827 first-match-wins. sshd_config.5 was fixed in r1.348, this is the same for
2830 OpenBSD-Commit-ID: 7be55b9351cde449b136afcc52d07aa4113b215e
2832 commit 7187d3f86bf8f2066cc9941f217d23b0cacae25e
2833 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2834 Date: Fri Mar 10 02:24:56 2023 +0000
2836 upstream: Remove no-op (int) > INT_MAX checks
2838 since they can never be true. From Coverity CID 405031, ok djm@
2840 OpenBSD-Commit-ID: 9df3783b181e056595e2bb9edf7ed41d61cf8e84
2842 commit 77adde4305542ebe3005dd456122624fe2347b01
2843 Author: Darren Tucker <dtucker@dtucker.net>
2844 Date: Fri Mar 10 13:27:29 2023 +1100
2846 Wrap mkstemp calls with umask set/restore.
2848 glibc versions 2.06 and earlier did not set a umask on files created by
2849 mkstemp created the world-writable. Wrap mkstemp to set and restore
2850 the umask. From Coverity (CIDs 291826 291886 291891), ok djm@
2852 commit 633d3dc2a1e9e2a013d019a0576a0771c8423713
2853 Author: jcs@openbsd.org <jcs@openbsd.org>
2854 Date: Thu Mar 9 21:06:24 2023 +0000
2856 upstream: modify parentheses in conditionals to make it clearer what is
2858 being assigned and what is being checked
2862 OpenBSD-Commit-ID: 19c10baa46ae559474409f75a5cb3d0eade7a9b8
2864 commit 733030840c4772f858de95d5940ec0c37663e8b0
2865 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2866 Date: Thu Mar 9 07:11:05 2023 +0000
2868 upstream: Re-split the merge of the reorder-hostkeys test.
2870 In the kex_proposal_populate_entries change I merged the the check for
2871 reordering hostkeys with the actual reordering, but kex_assemble_names
2872 mutates options.hostkeyalgorithms which renders the check ineffective.
2873 Put the check back where it was. Spotted and tested by jsg@, ok djm@
2875 OpenBSD-Commit-ID: a7469f25a738db5567395d1881e32479a7ffc9de
2877 commit 54ac4ab2b53ce9fcb66b8250dee91c070e4167ed
2878 Author: djm@openbsd.org <djm@openbsd.org>
2879 Date: Thu Mar 9 06:58:26 2023 +0000
2881 upstream: include destination constraints for smartcard keys too.
2883 Spotted by Luci Stanescu; ok deraadt@ markus@
2885 OpenBSD-Commit-ID: add879fac6903a1cb1d1e42c4309e5359c3d870f
2887 commit bfd1ad01d974a316b60622759ad17537fa2d92b4
2888 Author: Darren Tucker <dtucker@dtucker.net>
2889 Date: Thu Mar 9 18:24:54 2023 +1100
2891 Limit the number of PAM environment variables.
2893 xcalloc has its own limits, but these are specific to PAM. From
2894 Coverity CID 405198, ok djm@
2896 commit a231414970e01a35f45a295d5f93698fa1249b28
2897 Author: Darren Tucker <dtucker@dtucker.net>
2898 Date: Thu Mar 9 18:19:44 2023 +1100
2900 Limit the number of PAM environment variables.
2902 From Coverity CID 405194, tweaks and ok djm@
2904 commit 36c6c3eff5e4a669ff414b9daf85f919666e8e03
2905 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2906 Date: Wed Mar 8 06:21:32 2023 +0000
2908 upstream: Plug mem leak. Coverity CID 405196, ok djm@
2910 OpenBSD-Commit-ID: 175f09349387c292f626da68f65f334faaa085f2
2912 commit dfb9b736e1ccf9e6b03eea21cd961f4fd0634c98
2913 Author: tb@openbsd.org <tb@openbsd.org>
2914 Date: Wed Mar 8 05:33:53 2023 +0000
2916 upstream: ssh-pkcs11: synchronize error messages with errors
2918 A handful of error messages contained incorrect function names or
2919 otherwise inaccurate descriptions. Fix them to match reality.
2923 OpenBSD-Commit-ID: 165a15db52f75b31e1804b043480c36af09f3411
2925 commit 51875897b81b5c21b80c256a29597916edbde454
2926 Author: guenther@openbsd.org <guenther@openbsd.org>
2927 Date: Wed Mar 8 04:43:12 2023 +0000
2929 upstream: Delete obsolete /* ARGSUSED */ lint comments.
2933 OpenBSD-Commit-ID: 7be168a570264d59e96a7d2d22e927d45fee0e4c
2935 commit a76085bda883c2104afb33ab0334eca190927362
2936 Author: Darren Tucker <dtucker@dtucker.net>
2937 Date: Wed Mar 8 17:25:37 2023 +1100
2939 Extra brackets to prevent warning.
2941 commit 147ae57d4dfa0508109f93b78a7d8b92819e1f83
2942 Author: djm@openbsd.org <djm@openbsd.org>
2943 Date: Wed Mar 8 00:05:58 2023 +0000
2945 upstream: use RSA/SHA256 when testing usability of private key in
2947 agent; with/ok dtucker
2949 OpenBSD-Commit-ID: fe1382e2fdf23fcae631308e72342bad56066a56
2951 commit 27fd251bc906a763e70ce0f27c8abdf8bbd1e416
2952 Author: djm@openbsd.org <djm@openbsd.org>
2953 Date: Wed Mar 8 00:05:37 2023 +0000
2955 upstream: use RSA/SHA256 when testing usability of private key;
2957 based on fix in bz3546 by Dmitry Belyavskiy; with/ok dtucker
2959 OpenBSD-Commit-ID: 0ef414cc363a832f9fab92a5da0234448bce2eba
2961 commit eee9f3fc3d52ae7d2106929bb06b7f291fb0b81a
2962 Author: djm@openbsd.org <djm@openbsd.org>
2963 Date: Tue Mar 7 21:47:42 2023 +0000
2965 upstream: refactor to be more readable top to bottom. Prompted by
2967 Coverity CID 405048 which was a false-positive fd leak; ok dtucker@
2969 OpenBSD-Commit-ID: fc55ec2af622a017defb9b768bf26faefc792c00
2971 commit 42a06b29a4c99272bf690f9b3be520b08b448dc5
2972 Author: Darren Tucker <dtucker@dtucker.net>
2973 Date: Tue Mar 7 18:34:41 2023 +1100
2975 Add header changes missed in previous.
2977 commit 4710077096edff2e6926dd5b15bf586491d317db
2978 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2979 Date: Tue Mar 7 06:09:14 2023 +0000
2981 upstream: Fix mem leak in environment setup.
2983 From jjelen at redhat.com via bz#2687, ok djm@
2985 OpenBSD-Commit-ID: 9f9e4ba3cac003e6f81da3bcebd1b9ec43e7f353
2987 commit 03acc50d0ccb78fc91d1570de1cd0fdfea646028
2988 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2989 Date: Mon Mar 6 12:15:47 2023 +0000
2991 upstream: Unit test for kex_proposal_populate_entries.
2993 OpenBSD-Regress-ID: bdb211d80d572a08bf14b49fe2a58b9ff265c006
2995 commit 3f9231c2e1f374ebb08016ba00ea97b47c0ed20b
2996 Author: djm@openbsd.org <djm@openbsd.org>
2997 Date: Tue Mar 7 05:37:26 2023 +0000
2999 upstream: fix memory leak in process_read() path; Spotted by James
3001 Robinson in GHPR363; ok markus@
3003 OpenBSD-Commit-ID: cdc2d98e6478b7e7f3a36976845adae3820429d8
3005 commit c5e6e890839ec520ab9301a92cba56303749dea2
3006 Author: djm@openbsd.org <djm@openbsd.org>
3007 Date: Tue Mar 7 01:30:52 2023 +0000
3009 upstream: correct size for array argument when changing
3011 UMAC_OUTPUT_LEN Coverity CID 291845; ok dtucker@
3013 OpenBSD-Commit-ID: 2eb017d10705bb623d4418691f961c930eafaec0
3015 commit 9641753e0fd146204d57b2a4165f552a81afade4
3016 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3017 Date: Mon Mar 6 12:14:48 2023 +0000
3019 upstream: Refactor creation of KEX proposal.
3021 This adds kex_proposal_populate_entries (and corresponding free) which
3022 populates the KEX proposal array with dynamically allocated strings.
3023 This replaces the previous mix of static and dynamic that has been the
3024 source of previous leaks and bugs. Remove unused compat functions.
3027 OpenBSD-Commit-ID: f2f99da4aae2233cb18bf9c749320c5e040a9c7b
3029 commit aa59d6a489fb20973fa461d0fdb1110db412947b
3030 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3031 Date: Sun Mar 5 09:24:35 2023 +0000
3033 upstream: Fix mem and FILE leaks in moduli screening.
3035 If multiple -Ocheckpoint= options are passed, the earlier ones would
3036 be overwritten and leaked. If we use an input file that wasn't stdin,
3037 close that. From Coverity CIDs 291884 and 291894.
3039 OpenBSD-Commit-ID: a4d9d15f572926f841788912e2b282485ad09e8b
3041 commit 23b8cb41767af99a1aac24589d1882d9c8c2c205
3042 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3043 Date: Sun Mar 5 08:18:58 2023 +0000
3045 upstream: Plug mem leak in moduli checkpoint option parsing.
3047 From Coverity CID 291894.
3049 OpenBSD-Commit-ID: 9b1aba2d049741ae21c8dc4560a7e29ab17310f4
3051 commit fc7f8f2188d4a4fc8ba77eddbe863c7665666db5
3052 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3053 Date: Sun Mar 5 05:34:09 2023 +0000
3055 upstream: Remove unused compat.h includes.
3057 We've previously removed a lot of the really old compatibility code,
3058 and with it went the need to include compat.h in most of the files that
3061 OpenBSD-Commit-ID: 5af8baa194be00a3092d17598e88a5b29f7ea2b4
3063 commit 6c165c36246d8004c20e1df5cec4961a5ac422d6
3064 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3065 Date: Sat Mar 4 03:22:59 2023 +0000
3067 upstream: Use time_t for x11 timeout.
3069 Use time_t instead of u_int for remaining x11 timeout checks for 64bit
3070 time_t safety. From Coverity CIDs 405197 and 405028, ok djm@
3072 OpenBSD-Commit-ID: 356685bfa1fc3d81bd95722d3fc47101cc1a4972
3074 commit 4a3918f51bd2d968387e7aa87e33b32c78077fb4
3075 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3076 Date: Fri Mar 3 10:23:42 2023 +0000
3078 upstream: Ensure ms_remain is always initialized
3080 similar to what we do in ssh_packet_write_wait. bz#2687, from jjelen
3083 OpenBSD-Commit-ID: a50e0541cf823f8d1c72f71ccde925d3dbe6dfac
3085 commit e44846a4487d2885ac7f2610be09b1e2bf52249b
3086 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3087 Date: Fri Mar 3 09:48:51 2023 +0000
3089 upstream: Check for non-NULL before string
3091 comparison. From jjelen at redhat.com via bz#2687.
3093 OpenBSD-Commit-ID: 0d9b2e0cac88a311b5766b1aef737082583c285f
3095 commit 1842d523fae63b862ce8e60725c9b606cddb86a6
3096 Author: djm@openbsd.org <djm@openbsd.org>
3097 Date: Fri Mar 3 05:00:34 2023 +0000
3099 upstream: guard against getsockname(-1, ...) from Coverity CID
3103 OpenBSD-Commit-ID: e58d5227327917d189229b7f0b37d2780f360d5f
3105 commit 78571a5fe9847d40d7f220c92b707574ae9ec4ce
3106 Author: djm@openbsd.org <djm@openbsd.org>
3107 Date: Fri Mar 3 04:36:20 2023 +0000
3109 upstream: some options are not first-match-wins. Mention that there
3111 are exceptions at the start of the manpage and label some of them in the
3114 OpenBSD-Commit-ID: 3b74728446fa6fc8742769eeb8c3674e233e84c4
3116 commit d1c1b3272e8895a96c4f5889bd6e07a8525bd9f1
3117 Author: djm@openbsd.org <djm@openbsd.org>
3118 Date: Fri Mar 3 04:34:49 2023 +0000
3120 upstream: actually print "channeltimeout none" in config dump mode;
3122 spotted via Coverity CID 405022
3124 OpenBSD-Commit-ID: b074b52bf138b75f08264e8da15880b29c7a630f
3126 commit 8bf61e95610b48192d4e1720cc15d9004617301d
3127 Author: Darren Tucker <dtucker@dtucker.net>
3128 Date: Fri Mar 3 14:50:03 2023 +1100
3130 Add Coverity badges.
3132 commit 93291bd723959adf462b1df958106cf07a7734dd
3133 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3134 Date: Fri Mar 3 03:12:24 2023 +0000
3136 upstream: Check return values of dup2. Spotted by Coverity, ok djm@
3138 OpenBSD-Commit-ID: 19fb1b53072826d00c67df677731d2f6c1dd602b
3140 commit e37261dff33af23f37202cfce0848d36f5c1055c
3141 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3142 Date: Fri Mar 3 02:37:58 2023 +0000
3144 upstream: Use time_t for x11_refuse_time timeout. We need
3146 SSH_TIME_T_MAX for this, so move from misc.c to misc.h so it's available.
3147 Fixes a Coverity warning for 64bit time_t safety, ok djm@
3149 OpenBSD-Commit-ID: c69c4c3152cdaab953706db4ccf4d5fd682f7d8d
3151 commit 32755a98c29114b13f4c9d47454bbb265b932ad7
3152 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3153 Date: Fri Mar 3 02:34:29 2023 +0000
3155 upstream: Check return value from fctnl and warn on failure.
3157 Spotted by Coverity, ok djm@
3159 OpenBSD-Commit-ID: 2097c7db3cf657f1e3a6c5077041bacc63143cab
3161 commit 5fc60e8246c36b8255f72a937ebe9787b39648c6
3162 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3163 Date: Thu Mar 2 11:10:27 2023 +0000
3165 upstream: Remove SUDO in proxy command wrapper. Anything that needs
3167 sudo is already run by it, and it breaks if root isn't in sudoers.
3169 OpenBSD-Regress-ID: 6cf22fda32a89c16915f31a6ed9bbdbef2a3bac9
3171 commit 0d514659b23a257247491179cfbb53a6dd64e164
3172 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3173 Date: Thu Mar 2 08:24:41 2023 +0000
3175 upstream: Fix breakage on dhgex test.
3177 This was due to the sshd logs being written to the wrong log file.
3178 While there, make save_debug_logs less verbose, write the name of the
3179 tarball to regress.log and use $SUDO to remove the old symlinks (which
3180 shouldn't be needed, but won't hurt). Initial problem spotted by anton@.
3182 OpenBSD-Regress-ID: 9c44fb9cd418e6ff31165e7a6c1f9f11a6d19f5b
3184 commit 860201201d4ae655702807966901682cff30a171
3185 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3186 Date: Thu Mar 2 08:14:52 2023 +0000
3188 upstream: Quote grep and log message better.
3190 OpenBSD-Regress-ID: 3823d9063127169736aa274b1784cb28e15b64d4
3192 commit 03a03c6002525f5ad9c8fc874a5d5826a35d9858
3193 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3194 Date: Thu Mar 2 06:41:56 2023 +0000
3196 upstream: Always call fclose on checkpoints.
3198 In the case of an fprintf failure we would not call fclose which would
3199 leak the FILE pointer. While we're there, try to clean up the temp file
3200 on failure. Spotted by Coverity, ok djm@
3202 OpenBSD-Commit-ID: 73c7ccc5d4fcc235f54c6b20767a2815408525ef
3204 commit 13fe8f9785e6d90400ce548939a0b0ddc11fcb3c
3205 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3206 Date: Wed Mar 1 21:54:50 2023 +0000
3208 upstream: Remove old log symlinks
3210 before creating new ones. In -portable some platforms don't like
3211 overwriting existing symlinks.
3213 OpenBSD-Regress-ID: 7e7ddc0beb73e945e1c4c58d51c8a125b518120f
3215 commit 131fcbcaffd1e3bcf5ab766ec497b5d768955310
3216 Author: Darren Tucker <dtucker@dtucker.net>
3217 Date: Wed Mar 1 23:23:02 2023 +1100
3219 Adjust test jobs for new log directory.
3221 commit a6f4ac8a2baf77e5361cfa017d0dc250d1409bec
3222 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3223 Date: Wed Mar 1 09:29:32 2023 +0000
3225 upstream: Rework logging for the regression tests.
3227 Previously we would log to ssh.log and sshd.log, but that is insufficient
3228 for tests that have more than one concurent ssh/sshd.
3230 Instead, we'll log to separate datestamped files in a $OBJ/log/ and
3231 leave a symlink at the previous location pointing at the most recent
3232 instance with an entry in regress.log showing which files were created
3233 at each point. This should be sufficient to reconstruct what happened
3234 even for tests that use multiple instances of each program. If the test
3235 fails, tar up all of the logs for later analysis.
3237 This will let us also capture the output from some of the other tools
3238 which was previously sent to /dev/null although most of those will be
3241 OpenBSD-Regress-ID: f802aa9e7fa51d1a01225c05fb0412d015c33e24
3243 commit 8ead62ed5e86c7df597d8604f332f49cd1527b85
3244 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3245 Date: Tue Feb 28 21:31:50 2023 +0000
3247 upstream: fatal out if allocating banner string fails to avoid
3249 potential null deref later in sscanf. Spotted by Coverity, ok deraadt@
3251 OpenBSD-Commit-ID: 74e8d228ac00552e96e9e968dfcccf8dd1f46ad5
3253 commit 44ca56ba0b3f531f1d85730cc701097cd49e6868
3254 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3255 Date: Tue Feb 28 08:45:24 2023 +0000
3257 upstream: Explicitly ignore return from fchmod
3259 similar to other calls to prevent warning.
3261 OpenBSD-Commit-ID: fdc5287dcee0860b5a493186414226c655b0eb0a
3263 commit 803392933a3a6f09f834aa5f0c2aab06a3b382f4
3264 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3265 Date: Mon Feb 27 22:12:40 2023 +0000
3267 upstream: Plug mem leak on globbed ls error path.
3269 Spotted by Coverity, ok deraadt@
3271 OpenBSD-Commit-ID: de28476025db29820a9a2e56e98b964d8a02861c
3273 commit aa33b4d396abf47a2a45f982f28d054fb1dcb5c3
3274 Author: Darren Tucker <dtucker@dtucker.net>
3275 Date: Mon Feb 27 21:04:22 2023 +1100
3277 Cast time_t's in debug output to long long.
3279 Should fix Coverity warning about truncation of 64bit time_t.
3281 commit b0fd60a9de62a03189ad57d0c07f0ac51dc00e95
3282 Author: Darren Tucker <dtucker@dtucker.net>
3283 Date: Mon Feb 27 17:28:59 2023 +1100
3285 Do shadow expiry calcs using "long long".
3287 Coverity flags these as potentially not 64bit time_t safe so use
3288 long long for the calculations and debug output. ok djm@
3290 commit 01dbeb3084d714bbd001ff9d03b9de542e8cdf58
3291 Author: Damien Miller <djm@mindrot.org>
3292 Date: Mon Feb 27 17:07:52 2023 +1100
3294 avoid clash between for getopt's struct option
3296 Since we don't use getopt_long() nothing outside the getopt()
3297 implementation itself uses this structure, so move it into the
3298 source to remove it from visibility and clashes with libc's
3302 commit eb88d07c43afe407094e7d609248d85a15e148ef
3303 Author: Darren Tucker <dtucker@dtucker.net>
3304 Date: Sat Feb 25 14:45:41 2023 +1100
3306 Revert explicit chmods on private keys.
3308 This should no longer be needed on Cygwin test runners due to previous
3311 commit 52b75db61030a6c8baf66b73644380cf3f58e26a
3312 Author: Darren Tucker <dtucker@dtucker.net>
3313 Date: Sat Feb 25 14:43:28 2023 +1100
3315 Remove extended ACLs from working dirs.
3317 This should allow umask to work as expected and prevent tests from
3318 failing due to excessive permissions on private keys.
3320 commit 0c5d4c843df5605b043a758d69f9a611ef63c479
3321 Author: Darren Tucker <dtucker@dtucker.net>
3322 Date: Fri Feb 24 13:44:13 2023 +1100
3324 Explicitly set permissions on user and host keys.
3326 On cygwin, the umask might not be sufficient. Should fix tests on
3329 commit 6c9fc9d7a9f7abf82c3294d74e6d4a25735862ce
3330 Author: djm@openbsd.org <djm@openbsd.org>
3331 Date: Wed Feb 22 03:56:43 2023 +0000
3333 upstream: fix progressmeter corruption on wide displays; bz3534
3335 feedback/ok dtucker@
3337 OpenBSD-Commit-ID: f4affee067cec7c182f3e0b307d758e0472762a3
3339 commit fe0bd3cde9665d364e5eedd2c2c2e60d4cdc3786
3340 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3341 Date: Tue Feb 21 06:48:18 2023 +0000
3343 upstream: fseek to end of known_hosts before writing to it.
3345 POSIX and ANSI C require that applications call fseek or similar between
3346 read and writing to a RW file. OpenBSD doesn't enforce this, but some
3347 (System V derived) platforms need this to prevent it from writing a
3348 spurious extra byte (in this case, a newline). ok djm@ deraadt@
3350 OpenBSD-Commit-ID: 33e680dcd8110582a93a40a8491024e961f45137
3352 commit 357fb8ae14c07cd025eeed66e73de91bab569849
3353 Author: Darren Tucker <dtucker@dtucker.net>
3354 Date: Tue Feb 21 17:51:09 2023 +1100
3356 Also run unit tests on AIX VMs.
3358 In the past these tests took too long, but these days it only adds
3359 about 5 min to the run.
3361 commit 17781aaa5188ee1477f7779b280d105512e3dbed
3362 Author: Darren Tucker <dtucker@dtucker.net>
3363 Date: Tue Feb 21 17:38:55 2023 +1100
3365 Wrap stdint.h inside ifdef.
3367 commit ef798bad38505f7bf1b5fa5c0843dfc5a2b192b9
3368 Author: Mayank Sharma <mayank.fit2010@gmail.com>
3369 Date: Mon Feb 20 17:37:15 2023 +0530
3371 Add includes to ptimeout test.
3373 Fixes test failures on AIX due to type mismatches.
3375 commit ab69dda05d5268454209f529fa80f477e60d846a
3376 Author: Darren Tucker <dtucker@dtucker.net>
3377 Date: Mon Feb 20 18:24:39 2023 +1100
3379 Always use the openssl binary configure tells us.
3381 This fixes tests on platforms that do not have the openssl tool
3384 commit 2a7e3449908571af601a4c2d12ab140096442e47
3385 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3386 Date: Fri Feb 17 04:22:50 2023 +0000
3388 upstream: Remove now-unused compat bit SSH_BUG_RSASIGMD5. The code
3390 to set this was removed in OpenSSH 7.7 when support for SSH implementations
3391 dating back to before RFC standardization were removed. "burn it all" djm@
3393 OpenBSD-Commit-ID: 6330935fbe23dd00be79891505e06d1ffdac7cda
3395 commit 0833ccf2c8b7ae08b296c06f17bd53e3ab94b0b0
3396 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3397 Date: Fri Feb 17 03:06:18 2023 +0000
3399 upstream: Remove now-unused compat bit SSH_BUG_BIGENDIANAES. This
3401 was previously set for OpenSSH 2.3 (released in 2000) but this check was
3402 removed in OpenSSH 7.7 (2018). ok djm@ deraadt@
3404 OpenBSD-Commit-ID: 326426ea328707fc9e83305291ab135c87f678af
3406 commit c81c2bea6e828d52b62b448b4ffdd3c163177975
3407 Author: Damien Miller <djm@mindrot.org>
3408 Date: Fri Feb 17 10:12:40 2023 +1100
3412 commit 500f90b39db5f0014e6b0c49ff1f45c994b69293
3413 Author: Damien Miller <djm@mindrot.org>
3414 Date: Fri Feb 17 10:02:08 2023 +1100
3418 commit 68350152406339170721c15e97afdf827a5e4001
3419 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3420 Date: Thu Feb 16 10:10:00 2023 +0000
3422 upstream: Remove SSH_BUG_PASSWORDPAD compat bit
3424 since it's no longer used. ok markus@
3426 OpenBSD-Commit-ID: b92c21f56fe4b7f9a54790d6a9650725c226820b
3428 commit 537cccd804eaf65f32bdce037cc31db4e0ab0f44
3429 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3430 Date: Thu Feb 16 07:55:15 2023 +0000
3432 upstream: Remove SSH_BUG_IGNOREMSG compat flag
3434 since it's only applicable to SSH1 and thus no longer used. ok markus@
3435 "kill it with fire" djm@
3437 OpenBSD-Commit-ID: ea13318b1937795d9db4790d3ce0a6ed01584dab
3439 commit 285cf6cd4b91a0a0ce33193c358c99085af33e43
3440 Author: jmc@openbsd.org <jmc@openbsd.org>
3441 Date: Fri Feb 10 06:41:53 2023 +0000
3443 upstream: space between macro and punctuation; sort usage();
3445 OpenBSD-Commit-ID: 6141610cfca037700730e41f868d1d9124958f8c
3447 commit d39a96f70f81878c77336ed35f5c648c1804b71a
3448 Author: jmc@openbsd.org <jmc@openbsd.org>
3449 Date: Fri Feb 10 06:40:48 2023 +0000
3451 upstream: space between macro and punctuation;
3453 OpenBSD-Commit-ID: abc95e550be9e6d9a7ff64b65c104c7be21ab19e
3455 commit 16e82bf53fc34e43e3b948d43b68d5b27a7335e6
3456 Author: jmc@openbsd.org <jmc@openbsd.org>
3457 Date: Fri Feb 10 06:39:27 2023 +0000
3459 upstream: sort SYNOPSIS;
3461 OpenBSD-Commit-ID: dacd9da33277d5669a51213d880632599c890c1e
3463 commit d9685121ff6d57b8797411f3cb123884a4b96e30
3464 Author: Darren Tucker <dtucker@dtucker.net>
3465 Date: Sat Feb 11 12:32:19 2023 +1100
3467 Improve seccomp compat on older systems.
3469 Check if flags to mmap and madvise are defined before using them.
3470 Should fix problems building on older Linux systems that don't have
3471 these. bz#3537, with & ok djm@.
3473 commit 6180b0fa4f7996687678702806257e661fd5931e
3474 Author: djm@openbsd.org <djm@openbsd.org>
3475 Date: Fri Feb 10 05:06:03 2023 +0000
3477 upstream: test -Ohashalg=... and that the default output contains both
3479 specified hash algorithms; prompted by dtucker@
3481 OpenBSD-Regress-ID: 26f309208c8d8b8fa9c5f419767b85f1e9b22f51
3483 commit d651f5c9fe37e61491eee46c49ba9fa03dbc0e6a
3484 Author: djm@openbsd.org <djm@openbsd.org>
3485 Date: Fri Feb 10 04:56:30 2023 +0000
3487 upstream: let ssh-keygen and ssh-keyscan accept
3489 -Ohashalg=sha1|sha256 when outputting SSHFP fingerprints to allow algorithm
3490 selection. bz3493 ok dtucker@
3492 OpenBSD-Commit-ID: e6e07fe21318a873bd877f333e189eb963a11b3d
3494 commit 18938d11a90b74d63c20b2d3c965d5bd64786ab1
3495 Author: djm@openbsd.org <djm@openbsd.org>
3496 Date: Fri Feb 10 04:47:19 2023 +0000
3498 upstream: add a `sshd -G` option that parses and prints the
3500 effective configuration without attempting to load private keys and perform
3501 other checks. This allows usage of the option before keys have been
3504 bz3460 feedback/ok dtucker@
3506 OpenBSD-Commit-ID: 774504f629023fc25a559ab1d95401adb3a7fb29
3508 commit df7d3dbf7194db8e97730ee0425d4d9d7bdb8b10
3509 Author: djm@openbsd.org <djm@openbsd.org>
3510 Date: Fri Feb 10 04:40:28 2023 +0000
3512 upstream: make `ssh -Q CASignatureAlgorithms` work as the manpage says
3516 OpenBSD-Commit-ID: 0ddb17b3fcbd99bfb5baea4ac5e449620cbd3adc
3518 commit d3b8d4198b6595f23b5859d43dc8fc701f97429b
3519 Author: Darren Tucker <dtucker@dtucker.net>
3520 Date: Fri Feb 10 14:26:44 2023 +1100
3522 Add CentOS 7 test targets.
3524 commit 22efb01e355bba4755b730ed417f91c081445bfc
3525 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3526 Date: Thu Feb 9 09:55:33 2023 +0000
3528 upstream: Test adding terminating newline to known_hosts.
3530 OpenBSD-Regress-ID: 5fc3010ac450195b3fbdeb68e875564968800365
3532 commit caec6da1a583ed8c32c6ad3b81bbcaab46ac8b61
3533 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3534 Date: Wed Feb 8 08:06:03 2023 +0000
3536 upstream: ssh-agent doesn't actually take -v,
3538 so the recently-added ones will result in the test not cleaning up
3539 after itself. Patch from cjwatson at debian.org vi bz#3536.
3541 OpenBSD-Regress-ID: 1fc8283568f5bf2f918517c2c1e778072cf61b1a
3543 commit 3c379c9a849a635cc7f05cbe49fe473ccf469ef9
3544 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3545 Date: Thu Feb 9 09:54:11 2023 +0000
3547 upstream: Ensure that there is a terminating newline when adding a new
3549 entry to known_hosts. bz#3529, with git+openssh at limpsquid.nl, ok deraadt@
3552 OpenBSD-Commit-ID: fa8d90698da1886570512b96f051e266eac105e0
3554 commit 95b6bbd2553547260b324b39d602061c88b774bc
3555 Author: Darren Tucker <dtucker@dtucker.net>
3556 Date: Tue Feb 7 08:43:47 2023 +1100
3558 Replace 9.1 with 9.2 on CI status page.
3560 commit 195313dfe10a23c82e9d56d5fdd2f59beee1bdcf
3561 Author: Damien Miller <djm@mindrot.org>
3562 Date: Fri Feb 3 16:33:09 2023 +1100
3564 harden Linux seccomp sandbox
3566 Linux mmap(2) and madvise(2) syscalls support quite a number of funky
3567 flags that we don't expect that sshd/libc will ever need. We can
3568 exclude this kernel attack surface by filtering the mmap(2) flags
3569 and the madvise(2) advice arguments.
3571 Similarly, the sandboxed process in sshd is a single-threaded program
3572 that does not use shared memory for synchronisation or communication.
3573 Therefore, there should be no reason for the advanced priority
3574 inheritance futex(2) operations to be necessary. These can also be
3577 Motivated by Jann Horn pointing out that there have been kernel bugs
3578 in nearby Linux kernel code, e.g. CVE-2020-29368, CVE-2020-29374 and
3581 Feedback Jann Horn, ok dtucker@
3583 commit 6dfb65de949cdd0a5d198edee9a118f265924f33
3584 Author: Damien Miller <djm@mindrot.org>
3585 Date: Thu Feb 2 23:21:54 2023 +1100
3587 crank versions in RPM specs
3589 commit d07cfb11a0ca574eb68a3931d8c46fbe862a2021
3590 Author: Damien Miller <djm@mindrot.org>
3591 Date: Thu Feb 2 23:21:45 2023 +1100
3593 update version in README
3595 commit 9fe207565b4ab0fe5d1ac5bb85e39188d96fb214
3596 Author: Damien Miller <djm@mindrot.org>
3597 Date: Thu Feb 2 23:17:49 2023 +1100
3599 adapt compat_kex_proposal() test to portable
3601 commit 903c556b938fff2d7bff8da2cc460254430963c5
3602 Author: djm@openbsd.org <djm@openbsd.org>
3603 Date: Thu Feb 2 12:12:52 2023 +0000
3605 upstream: test compat_kex_proposal(); by dtucker@
3607 OpenBSD-Regress-ID: 0e404ee264db546f9fdbf53390689ab5f8d38bf2
3609 commit 405fba71962dec8409c0c962408e09049e5624b5
3610 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3611 Date: Thu Jan 19 07:53:45 2023 +0000
3613 upstream: Check if we can copy sshd or need to use sudo to do so
3615 during reexec test. Skip test if neither can work. Patch from anton@, tweaks
3618 OpenBSD-Regress-ID: 731b96ae74d02d5744e1f1a8e51d09877ffd9b6d
3620 commit b2a2a8f69fd7737ea17dc044353c514f2f962f35
3621 Author: djm@openbsd.org <djm@openbsd.org>
3622 Date: Thu Feb 2 12:10:22 2023 +0000
3624 upstream: openssh-9.2
3626 OpenBSD-Commit-ID: f7389f32413c74d6e2055f05cf65e7082de03923
3628 commit 12da7823336434a403f25c7cc0c2c6aed0737a35
3629 Author: djm@openbsd.org <djm@openbsd.org>
3630 Date: Thu Feb 2 12:10:05 2023 +0000
3632 upstream: fix double-free caused by compat_kex_proposal(); bz3522
3636 OpenBSD-Commit-ID: 2bfc37cd2d41f67dad64c17a64cf2cd3806a5c80
3638 commit 79efd95ab5ff99f4cb3a955e2d713b3f54fb807e
3639 Author: Darren Tucker <dtucker@dtucker.net>
3640 Date: Wed Feb 1 17:17:26 2023 +1100
3642 Skip connection-timeout test on minix3.
3644 Minix 3's Unix domain sockets don't seem to work the way we expect, so
3645 skip connection-timeout test on that platform. While there, group
3646 together all similarly skipped tests and explicitly comment.
3648 commit 6b508c4e039619842bcf5a16f8a6b08dd6bec44a
3649 Author: Damien Miller <djm@mindrot.org>
3650 Date: Wed Feb 1 12:12:05 2023 +1100
3652 fix libfido2 detection without pkg-config
3654 Place libfido2 before additional libraries (that it may depend upon)
3655 and not after. bz3530 from James Zhang; ok dtucker@
3657 commit 358e300fed5e6def233a2c06326e51e20ebed621
3658 Author: deraadt@openbsd.org <deraadt@openbsd.org>
3659 Date: Wed Jan 18 20:56:36 2023 +0000
3661 upstream: delete useless dependency
3663 OpenBSD-Commit-ID: e1dc11143f83082e3154d6094f9136d0dc2637ad
3665 commit a4cb9be1b021b511e281ee55c356f964487d9e82
3666 Author: deraadt@openbsd.org <deraadt@openbsd.org>
3667 Date: Wed Jan 18 20:43:15 2023 +0000
3669 upstream: Create and install sshd random relink kit.
3671 ../Makefile.inc and Makfile are concatenated for reuse, which hopefully won't
3672 be too fragile, we'll see if we need a different approach. The resulting sshd
3673 binary is tested with the new sshd -V option before installation. As the
3674 binary layout is now semi-unknown (meaning relative, fixed, and gadget
3675 offsets are not precisely known), change the filesystem permissions to 511 to
3676 prevent what I call "logged in BROP". I have ideas for improving this further
3677 but this is a first step ok djm
3679 OpenBSD-Commit-ID: 1e0a2692b7e20b126dda60bf04999d1d30d959d8
3681 commit bc7de6f91a9a0ae2f148a9d31a4027d441a51999
3682 Author: jmc@openbsd.org <jmc@openbsd.org>
3683 Date: Wed Jan 18 06:55:32 2023 +0000
3685 upstream: tweak previous; ok djm
3687 OpenBSD-Commit-ID: df71ce4180c58202dfdc1d92626cfe900b91b7c3
3689 commit a20b7e999773e6333c8aa9b0a7fa41966e63b037
3690 Author: Darren Tucker <dtucker@dtucker.net>
3691 Date: Tue Jan 31 19:35:44 2023 +1100
3693 Skip connection-timeout test under Valgrind.
3695 Valgrind slows things down so much that the timeout test fails. Skip
3696 this test until we figure out if we can make it work.
3698 commit c3ffb54b4fc5e608206037921db6ccbc2f5ab25f
3699 Author: Darren Tucker <dtucker@dtucker.net>
3700 Date: Wed Jan 25 21:58:40 2023 +1100
3702 Skip connection-timeout when missing FD passing.
3704 This tests uses multiplexing which uses file descriptor passing, so
3705 skip it if we don't have that. Fixes test failures on Cygwin.
3707 commit 35253af01d8c0ab444c8377402121816e71c71f5
3708 Author: djm@openbsd.org <djm@openbsd.org>
3709 Date: Wed Jan 18 02:00:10 2023 +0000
3711 upstream: when restoring non-blocking mode to stdio fds, restore
3713 exactly the flags that ssh started with and don't just clobber them with
3714 zero, as this could also remove the append flag from the set;
3718 OpenBSD-Commit-ID: 1336b03e881db7564a4b66014eb24c5230e9a0c0
3720 commit 7d17ea151c0b2519f023bd9cc7f141128833ac47
3721 Author: millert@openbsd.org <millert@openbsd.org>
3722 Date: Wed Jan 18 01:50:21 2023 +0000
3724 upstream: Add a -V (version) option to sshd like the ssh client
3726 has. OK markus@ deraadt@
3728 OpenBSD-Commit-ID: abe990ec3e636fb040132aab8cbbede98f0c413e
3730 commit 62360feb7f08f2a4c6fc36f3b3449309203c42c9
3731 Author: millert@openbsd.org <millert@openbsd.org>
3732 Date: Tue Jan 17 18:52:44 2023 +0000
3734 upstream: For "ssh -V" always exit 0, there is no need to check opt
3736 again. This was missed when the fallthrough in the switch case above it was
3737 removed. OK deraadt@
3739 OpenBSD-Commit-ID: 5583e5d8f6d62a8a4215cfa95a69932f344c8120
3741 commit 12492c0abf1eb415d08a897cc1d8b9e789888230
3742 Author: djm@openbsd.org <djm@openbsd.org>
3743 Date: Tue Jan 17 10:15:10 2023 +0000
3745 upstream: also check that an active session inhibits
3747 UnusedConnectionTimeout idea markus@
3749 OpenBSD-Regress-ID: 55c0fb61f3bf9e092b0a53f9041d3d2012f14003
3751 commit cef2593c33ac46a58238ff998818754eabdf64ff
3752 Author: djm@openbsd.org <djm@openbsd.org>
3753 Date: Tue Jan 17 10:02:34 2023 +0000
3755 upstream: regression test for UnusedConnectionTimeout
3757 OpenBSD-Regress-ID: 7f29001374a68e71e5e078f69e4520cf4bcca084
3759 commit aff9493a89c71d6a080419b49ac64eead9730491
3760 Author: djm@openbsd.org <djm@openbsd.org>
3761 Date: Mon Jan 16 04:11:29 2023 +0000
3763 upstream: unbreak test: cannot access shell positional parameters
3765 past $9 without wrapping the position in braces (i.e. need ${10}, etc.)
3767 OpenBSD-Regress-ID: 3750ec98d5d409ce6a93406fedde6f220d2ea2ac
3769 commit 0293c19807f83141cdf33b443154459f9ee471f6
3770 Author: djm@openbsd.org <djm@openbsd.org>
3771 Date: Tue Jan 17 09:44:48 2023 +0000
3773 upstream: Add a sshd_config UnusedConnectionTimeout option to terminate
3775 client connections that have no open channels for some length of time. This
3776 complements the recently-added ChannelTimeout option that terminates inactive
3777 channels after a timeout.
3781 OpenBSD-Commit-ID: ca983be74c0350364c11f8ba3bd692f6f24f5da9
3783 commit 8ec2e3123802d2beeca06c1644b0b647f6d36dab
3784 Author: djm@openbsd.org <djm@openbsd.org>
3785 Date: Sun Jan 15 23:35:10 2023 +0000
3787 upstream: adapt to ed25519 changes in src/usr.bin/ssh
3789 OpenBSD-Regress-ID: 4b3e7ba7ee486ae8a0b4790f8112eded2bb7dcd5
3791 commit 9fbbfeca1ce4c7ec0001c827bbf4189a3ba0964b
3792 Author: djm@openbsd.org <djm@openbsd.org>
3793 Date: Sun Jan 15 23:05:32 2023 +0000
3795 upstream: update OpenSSH's Ed25519 code to the last version of SUPERCOP
3797 (20221122) and change the import approach to the same one we use for
3798 Streamlined NTRUPrime: use a shell script to extract the bits we need from
3799 SUPERCOP, make some minor adjustments and squish them all into a single file.
3803 OpenBSD-Commit-ID: 1bc0fd624cb6af440905b8ba74ac7c03311b8e3b
3805 commit 6283f4bd83eee714d0f5fc55802eff836b06fea8
3806 Author: Darren Tucker <dtucker@dtucker.net>
3807 Date: Sat Jan 14 22:02:44 2023 +1100
3809 Allow writev is seccomp sandbox.
3811 This seems to be used by recent glibcs at least in some configurations.
3812 From bz#3512, ok djm@
3814 commit 923c3f437f439cfca238fba37e97a7041782f615
3815 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3816 Date: Sat Jan 14 10:05:54 2023 +0000
3818 upstream: Shell syntax fix. From ren mingshuai vi github PR#369.
3820 OpenBSD-Regress-ID: 6696b2eeefe128099fc3d7ea9f23252cc35156f9
3822 commit 4d87a00f704e0365e11c3c38b170c1275ec461fc
3823 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3824 Date: Sat Jan 14 09:57:08 2023 +0000
3826 upstream: Instead of skipping the all-tokens test if we don't have
3828 OpenSSL (since we use it to compute the hash), put the hash at the end and
3829 just omit it if we don't have it. Prompted by bz#3521.
3831 OpenBSD-Regress-ID: c79ecba64250ed3b6417294b6c965e6b12ca5eea
3833 commit b05406d6f93b8c8ec11ec8b27e7c76cc7a5a55fb
3834 Author: jmc@openbsd.org <jmc@openbsd.org>
3835 Date: Fri Jan 13 07:13:40 2023 +0000
3837 upstream: fix double phrase in previous;
3839 OpenBSD-Commit-ID: 671e6c8dc5e9230518b2bbfa143daaa88adc66c2
3841 commit 40564812b659c530eb1f4b62d09e85612aef3107
3842 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3843 Date: Fri Jan 13 03:16:29 2023 +0000
3845 upstream: Document "UserKnownHostsFile none". ok djm@
3847 OpenBSD-Commit-ID: f695742d39e34ecdcc3c861c3739a84648a4bce5
3849 commit d03e245e034019a37388f6f5f893ce848ab6d2e2
3850 Author: Darren Tucker <dtucker@dtucker.net>
3851 Date: Fri Jan 13 23:02:34 2023 +1100
3853 Retry package installation 3 times.
3855 When setting up the CI environment, retry package installation 3 times
3856 before going up. Should help prevent spurious failures during
3857 infrastructure issues.
3859 commit 625f6bc39840167dafb3bf5b6a3e18503ac986e8
3860 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3861 Date: Fri Jan 13 04:47:34 2023 +0000
3863 upstream: Move scp path setting to a helper function. The previous
3865 commit to add scp to the test sshd's path causes the t-envpass test to fail
3866 when the test scp is given using a fully qualified path. Put this in a
3867 helper function and only call it from the scp tests.
3869 OpenBSD-Regress-ID: 7533dc1c4265c1de716abb062957994195b36df4
3871 commit 6e6f88647042b3cde54a628545c2f5fb656a9327
3872 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3873 Date: Fri Jan 13 04:23:00 2023 +0000
3875 upstream: Add scp's path to test sshd's PATH.
3877 If the scp we're testing is fully qualified (eg it's not in the system
3878 PATH) then add its path to the under-test sshd's PATH so we can find
3879 it. Prompted by bz#3518.
3881 OpenBSD-Regress-ID: 7df4f5a0be3aa135495b7e5a6719d3cbc26cc4c0
3883 commit 8a5e99a70fcf9b022a8aa175ebf6a71f58511da3
3884 Author: Darren Tucker <dtucker@dtucker.net>
3885 Date: Fri Jan 13 15:49:48 2023 +1100
3887 Remove skipping test when scp not in path.
3889 An upcoming change renders this obsolete by adding scp's path to the
3890 test sshd's PATH, and removing this first will make the subsequent sync
3893 commit 41f36dd896c8fb8337d403fcf476762986976e9d
3894 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3895 Date: Fri Jan 13 02:58:20 2023 +0000
3897 upstream: Add a "Host" line to the output of ssh -G showing the
3899 original host arg. Inspired by patch from vincent at bernat.ch via bz#3343,
3902 OpenBSD-Commit-ID: 59c0f60a222113a44d0650cd394376e3beecc883
3904 commit f673b49f3be3eb51074fbb8a405beb6cd0f7d93e
3905 Author: djm@openbsd.org <djm@openbsd.org>
3906 Date: Fri Jan 13 02:44:02 2023 +0000
3908 upstream: avoid printf("%s", NULL) if using ssh
3910 -oUserKnownHostsFile=none and a hostkey in one of the system known hosts file
3911 changes; ok dtucker@
3913 OpenBSD-Commit-ID: 7ca87614bfc6da491315536a7f2301434a9fe614
3915 commit 93fc7c576563e3d88a1dc019dd213f65607784cc
3916 Author: djm@openbsd.org <djm@openbsd.org>
3917 Date: Wed Jan 11 05:39:38 2023 +0000
3919 upstream: clamp the minimum buffer lengths and number of inflight
3923 OpenBSD-Commit-ID: c4965f62fa0ba850940fd66ae3f60cf516bbcd56
3925 commit 48bf234322e639d279c5a28435eae50155e9b514
3926 Author: djm@openbsd.org <djm@openbsd.org>
3927 Date: Wed Jan 11 05:36:50 2023 +0000
3929 upstream: ignore bogus upload/download buffer lengths in the limits
3933 OpenBSD-Commit-ID: c5b023e0954693ba9a5376e4280c739b5db575f8
3935 commit 36b00d31833ca74cb0f7c7d8eda1bde55700f929
3936 Author: djm@openbsd.org <djm@openbsd.org>
3937 Date: Wed Jan 11 02:13:52 2023 +0000
3939 upstream: remove whitespace at EOL from code extracted from SUPERCOP
3941 OpenBSD-Commit-ID: 1ec524ff2fbb9387d731601437c82008f35a60f4
3943 commit d888de06c5e4d7dbf2f2b85f2b5bf028c570cf78
3944 Author: djm@openbsd.org <djm@openbsd.org>
3945 Date: Wed Jan 11 00:51:27 2023 +0000
3947 upstream: rewrite this test to use a multiplexed ssh session so we can
3949 control its lifecycle without risk of race conditions; fixes some of the
3950 Github integration tests for openssh-portable
3952 OpenBSD-Regress-ID: 5451cad59ba0d43ae9eeda48ec80f54405fee969
3954 commit 4bcc737a35fdd9cc4af7423d6c23dfd0c7ef4786
3955 Author: Damien Miller <djm@mindrot.org>
3956 Date: Wed Jan 11 11:45:17 2023 +1100
3958 remove buffer len workaround for NetBSD 4.x
3960 Switching to from pipes to a socketpair for communicating with the
3961 ssh process avoids the (kernel bug?) problem.
3963 commit f5154d2aac3e6a32a1b13dec23a701a087850cdc
3964 Author: Damien Miller <djm@mindrot.org>
3965 Date: Wed Jan 11 11:44:19 2023 +1100
3967 add back use of pipes in scp.c under USE_PIPES
3969 This matches sftp.c which prefers socketpair but uses pipes on
3970 some older platforms.
3972 commit eec737b59cf13841de46134967a206607000acd4
3973 Author: millert@openbsd.org <millert@openbsd.org>
3974 Date: Tue Jan 10 23:22:15 2023 +0000
3976 upstream: Switch scp from using pipes to a socketpair for
3978 communication with it's ssh sub-processes. We no longer need to reserve two
3979 descriptors to ensure that we don't end up using fd 0-2 unexpectedly, that is
3980 handled by sanitise_stdfd() in main(). Based on an original diff from djm@.
3983 OpenBSD-Commit-ID: b80c372faac462471e955ddeab9480d668a2e48d
3985 commit d213d126a4a343abd3a1eb13687d39c1891fe5c8
3986 Author: jmc@openbsd.org <jmc@openbsd.org>
3987 Date: Fri Jan 6 08:44:11 2023 +0000
3989 upstream: tweak previous; ok djm
3991 OpenBSD-Commit-ID: 229c493452766d70a78b0f02f6ff9894f9028858
3993 commit 4a5590a5ee47b7dfd49773e9fdba48ad3089fe64
3994 Author: Damien Miller <djm@mindrot.org>
3995 Date: Mon Jan 9 16:33:56 2023 +1100
3997 try to improve logging for dynamic-forward test
3999 previously the logs from the ssh used to exercise the forwarding
4000 channel would clobber the logs from the ssh actually doing the
4003 commit 715bc25dcfccf9fb2bee820155fe071d01a618db
4004 Author: Darren Tucker <dtucker@dtucker.net>
4005 Date: Sat Jan 7 23:24:50 2023 +1100
4007 Skip dynamic-forward test on minix3.
4009 This test relies on loopback addresses which minix does not have.
4010 Previously the test would not run at all since it also doesn't have
4011 netcat, but now we use our own netcat it tries and fails.
4013 commit dd1249bd5c45128a908395c61b26996a70f82205
4014 Author: Damien Miller <djm@mindrot.org>
4015 Date: Sun Jan 8 12:08:59 2023 +1100
4017 don't test IPv6 addresses if platform lacks support
4019 commit d77fc611a62f2dfee0b654c31a50a814b13310dd
4020 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4021 Date: Fri Jan 6 12:33:33 2023 +0000
4023 upstream: When OpenSSL is not available, skip parts of percent test
4025 that require it. Based on github pr#368 from ren mingshuai.
4027 OpenBSD-Regress-ID: 49a375b2cf61ccb95b52e75e2e025cd10988ebb2
4029 commit 1cd2aac312af9172f1b5cb06c2e1cd090abb83cf
4030 Author: Darren Tucker <dtucker@dtucker.net>
4031 Date: Sat Jan 7 23:01:11 2023 +1100
4033 Use our own netcat for dynamic-forward test.
4035 That way we can be surer about its behaviour rather than trying to
4036 second-guess the behaviour of various netcat implementations.
4038 commit 26cab41c05d7b0859d2a1ea5b6ed253d91848a80
4039 Author: Darren Tucker <dtucker@dtucker.net>
4040 Date: Sat Jan 7 14:30:43 2023 +1100
4042 Use autoconf to find openssl binary.
4044 It's possible to install an OpenSSL in a path not in the system's
4045 default library search path. OpenSSH can still use this (eg if you
4046 specify an rpath) but the openssl binary there may not work. If one is
4047 available on the system path just use that.
4049 commit 5532e010a0eeb6aa264396514f9aed7948471538
4050 Author: Darren Tucker <dtucker@dtucker.net>
4051 Date: Sat Jan 7 10:34:18 2023 +1100
4053 Check openssl_bin path is executable before using.
4055 commit 5d7b16cff48598d5908db970bfdc9ff9326142c8
4056 Author: Darren Tucker <dtucker@dtucker.net>
4057 Date: Fri Jan 6 23:19:07 2023 +1100
4059 Set OPENSSL_BIN from OpenSSL directory.
4061 commit 344a0e8240eaf08da5d46a5e3a9ecad6e4f64c35
4062 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4063 Date: Fri Jan 6 08:50:33 2023 +0000
4065 upstream: Save debug logs from ssh for debugging purposes.
4067 OpenBSD-Regress-ID: 109e40b06de1c006a3b8e0d8745b790b2c5870a0
4069 commit e1ef172646f7f49c80807eea90225ef5e0be55a8
4070 Author: djm@openbsd.org <djm@openbsd.org>
4071 Date: Fri Jan 6 08:07:39 2023 +0000
4073 upstream: regression test for ChannelTimeout
4075 OpenBSD-Regress-ID: 280bfbefcfa415428ad744e43f69a8dede8ad685
4077 commit 2393ea8daf25853459eb07a528d7577688847777
4078 Author: djm@openbsd.org <djm@openbsd.org>
4079 Date: Fri Jan 6 07:18:18 2023 +0000
4081 upstream: fix typo in verbose logging
4083 OpenBSD-Regress-ID: 0497cdb66e003b2f50ed77291a9104fba2e017e9
4085 commit 161a5378a3cc2e7aa3f9674cb7f4686ae6ce9586
4086 Author: djm@openbsd.org <djm@openbsd.org>
4087 Date: Fri Jan 6 02:59:50 2023 +0000
4089 upstream: unit tests for misc.c:ptimeout_* API
4091 OpenBSD-Regress-ID: 01f8fb12d08e5aaadd4bd4e71f456b6588be9a94
4093 commit 018d671d78145f03d6f07ae9d64d51321da70325
4094 Author: tb@openbsd.org <tb@openbsd.org>
4095 Date: Wed Jan 4 22:48:57 2023 +0000
4097 upstream: Copy bytes from the_banana[] rather than banana()
4099 Fixes test failure due to segfault seen on arm64 with xonly snap.
4103 OpenBSD-Regress-ID: 86e2aa4bbd1dff1bc4ebb2969c0d6474485be046
4105 commit ab6bb69e251faa8b24f81b25c72ec0120f20cad4
4106 Author: Damien Miller <djm@mindrot.org>
4107 Date: Fri Jan 6 19:13:36 2023 +1100
4109 unbreak scp on NetBSD 4.x
4111 e555d5cad5 effectively increased the default copy buffer size for SFTP
4112 transfers. This caused NetBSD 4.x to hang during the "copy local file to
4113 remote file in place" scp.sh regression test.
4115 This puts back the original 32KB copy buffer size until we can properly
4118 lots of debugging assistance from dtucker@
4120 commit 2d1ff2b9431393ad99ef496d5e3b9dd0d4f5ac8c
4121 Author: djm@openbsd.org <djm@openbsd.org>
4122 Date: Fri Jan 6 02:47:18 2023 +0000
4124 upstream: Implement channel inactivity timeouts
4126 This adds a sshd_config ChannelTimeouts directive that allows channels that
4127 have not seen traffic in a configurable interval to be automatically closed.
4128 Different timeouts may be applied to session, X11, agent and TCP forwarding
4131 Note: this only affects channels over an opened SSH connection and not
4132 the connection itself. Most clients close the connection when their channels
4133 go away, with a notable exception being ssh(1) in multiplexing mode.
4137 OpenBSD-Commit-ID: ae8bba3ed9d9f95ff2e2dc8dcadfa36b48e6c0b8
4139 commit 0e34348d0bc0b1522f75d6212a53d6d1d1367980
4140 Author: djm@openbsd.org <djm@openbsd.org>
4141 Date: Fri Jan 6 02:42:34 2023 +0000
4143 upstream: Add channel_set_xtype()
4145 This sets an "extended" channel type after channel creation (e.g.
4146 "session:subsystem:sftp") that will be used for setting channel inactivity
4151 OpenBSD-Commit-ID: 42564aa92345045b4a74300528f960416a15d4ca
4153 commit ceedf09b2977f3a756c759a6e7eb8f8e9db86a18
4154 Author: djm@openbsd.org <djm@openbsd.org>
4155 Date: Fri Jan 6 02:41:49 2023 +0000
4157 upstream: tweak channel ctype names
4159 These are now used by sshd_config:ChannelTimeouts to specify timeouts by
4160 channel type, so force them all to use a similar format without whitespace.
4164 OpenBSD-Commit-ID: 66834765bb4ae14f96d2bb981ac98a7dae361b65
4166 commit c60438158ad4b2f83d8504257aba1be7d0b0bb4b
4167 Author: djm@openbsd.org <djm@openbsd.org>
4168 Date: Fri Jan 6 02:39:59 2023 +0000
4170 upstream: Add channel_force_close()
4172 This will forcibly close an open channel by simulating read/write errors,
4173 draining the IO buffers and calling the detach function.
4175 Previously the detach function was only ever called during channel garbage
4176 collection, but there was no way to signal the user of a channel (e.g.
4177 session.c) that its channel was being closed deliberately (vs. by the
4178 usual state-machine logic). So this adds an extra "force" argument to the
4179 channel cleanup callback to indicate this condition.
4183 OpenBSD-Commit-ID: 23052707a42bdc62fda2508636e624afd466324b
4185 commit d478cdc7ad6edd4b1bcd1e86fb2f23194ff33d5a
4186 Author: djm@openbsd.org <djm@openbsd.org>
4187 Date: Fri Jan 6 02:38:23 2023 +0000
4189 upstream: replace manual poll/ppoll timeout math with ptimeout API
4191 feedback markus / ok markus dtucker
4193 OpenBSD-Commit-ID: c5ec4f2d52684cdb788cd9cbc1bcf89464014be2
4195 commit 4adf3817a24efe99b06e62630577d683c7cd8065
4196 Author: djm@openbsd.org <djm@openbsd.org>
4197 Date: Fri Jan 6 02:37:04 2023 +0000
4199 upstream: add ptimeout API for keeping track of poll/ppoll
4201 timeouts; ok dtucker markus
4203 OpenBSD-Commit-ID: 3335268ca135b3ec15a947547d7cfbb8ff929ead
4205 commit 8c7c69d32375d2f3ce9da0109c9bffc560842316
4206 Author: djm@openbsd.org <djm@openbsd.org>
4207 Date: Thu Jan 5 05:49:13 2023 +0000
4209 upstream: suppress "Connection closed" message when in quiet mode
4211 OpenBSD-Commit-ID: 8a3ab7176764da55f60bfacfeae9b82d84e3908f
4213 commit 845ceecea2ac311b0c267f9ecbd34862e1876fc6
4214 Author: djm@openbsd.org <djm@openbsd.org>
4215 Date: Mon Jan 2 07:03:57 2023 +0000
4217 upstream: regression test for PermitRemoteOpen
4219 OpenBSD-Regress-ID: 8271aafbf5c21950cd5bf966f08e585cebfe630c
4221 commit b3daa8dc582348d6ab8150bc1e571b7aa08c5388
4222 Author: djm@openbsd.org <djm@openbsd.org>
4223 Date: Mon Jan 2 07:03:30 2023 +0000
4225 upstream: fix bug in PermitRemoteOpen which caused it to ignore its
4227 first argument unless it was one of the special keywords "any" or "none".
4229 Reported by Georges Chaudy in bz3515; ok dtucker@
4231 OpenBSD-Commit-ID: c5678a39f1ff79993d5ae3cfac5746a4ae148ea5
4233 commit 0872663a7be0301bcc3d49acdbc9b740a3d972d4
4234 Author: jmc@openbsd.org <jmc@openbsd.org>
4235 Date: Mon Dec 26 19:16:03 2022 +0000
4237 upstream: spelling fixes; from paul tagliamonte amendments to his
4239 diff are noted on tech
4241 OpenBSD-Commit-ID: d776dd03d0b882ca9c83b84f6b384f6f9bd7de4a
4243 commit 797da2812a71785b34890bb6eb44767a7d09cd34
4244 Author: djm@openbsd.org <djm@openbsd.org>
4245 Date: Fri Dec 16 07:13:22 2022 +0000
4247 upstream: Mention that scp uses the SFTP protocol and remove
4249 reference to legacy flag. Spotted by, feedback and ok jmc@
4251 OpenBSD-Commit-ID: 9dfe04966f52e941966b46c7a2972147f95281b3
4253 commit 93f2ce8c050a7a2a628646c00b40b9b53fef93ef
4254 Author: djm@openbsd.org <djm@openbsd.org>
4255 Date: Fri Dec 16 06:56:47 2022 +0000
4257 upstream: Clear signal mask early in main(); sshd may have been
4259 started with one or more signals masked (sigprocmask(2) is not cleared
4260 on fork/exec) and this could interfere with various things, e.g. the
4263 Execution environments that fail to clear the signal mask before running
4264 sshd are clearly broken, but apparently they do exist.
4266 Reported by Sreedhar Balasubramanian; ok dtucker@
4268 OpenBSD-Commit-ID: 77078c0b1c53c780269fc0c416f121d05e3010ae
4270 commit 4acfaabfae41badb9d334a2ee88c5c6ad041c0d5
4271 Author: jmc@openbsd.org <jmc@openbsd.org>
4272 Date: Fri Dec 16 06:52:48 2022 +0000
4274 upstream: add -X to usage();
4276 OpenBSD-Commit-ID: 1bdc3df7de11d766587b0428318336dbffe4a9d0
4278 commit e555d5cad5afae7d5ef2bbc02ca591178fe16fed
4279 Author: djm@openbsd.org <djm@openbsd.org>
4280 Date: Fri Dec 16 03:40:03 2022 +0000
4282 upstream: add a -X option to both scp(1) and sftp(1) to allow
4284 control over some SFTP protocol knobs: the copy buffer length and
4285 the number of inflight requests, both of which are used during
4288 Previously these could be controlled in sftp(1) using the -b/-R options.
4289 This makes them available in both SFTP protocol clients using the same
4290 option character sequence.
4294 OpenBSD-Commit-ID: 27502bffc589776f5da1f31df8cb51abe9a15f1c
4296 commit 5a7a7acab2f466dc1d7467b5d05d35268c3137aa
4297 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4298 Date: Thu Dec 15 18:20:39 2022 +0000
4300 upstream: The idiomatic way of coping with signed char vs unsigned
4302 char (which did not come from stdio read functions) in the presence of
4303 ctype macros, is to always cast to (unsigned char). casting to (int)
4304 for a "macro" which is documented to take int, is weird. And sadly wrong,
4305 because of the sing extension risk.. same diff from florian
4307 OpenBSD-Commit-ID: 65b9a49a68e22ff3a0ebd593f363e9f22dd73fea
4309 commit b0b58222c7cc62efd8212c4fb65a545f58ebb22d
4310 Author: Darren Tucker <dtucker@dtucker.net>
4311 Date: Mon Dec 19 18:49:51 2022 +1100
4313 Simply handling of SSH_CONNECTION PAM env var.
4315 Prompted by bz#3508: there's no need to cache the value of
4316 sshpam_conninfo so remove the global. While there, add check of
4317 return value from pam_putenv. ok djm@
4319 commit ed8444572ae684fdb892f97bae342c6cb6456f04
4320 Author: Darren Tucker <dtucker@dtucker.net>
4321 Date: Mon Dec 19 18:42:34 2022 +1100
4323 Add tests for LibreSSL 3.7.0 and OpenSSL 1.1.1s.
4325 commit abb9a8aaddfcacbd12641f6e4f203da0fa85a287
4326 Author: Darren Tucker <dtucker@dtucker.net>
4327 Date: Sun Dec 18 21:36:25 2022 +1100
4329 Use sudo when resetting perms on directories.
4331 commit 2f5664c5908d84697cbe91302d5d5c4d83cb2121
4332 Author: Darren Tucker <dtucker@dtucker.net>
4333 Date: Sun Dec 18 21:19:33 2022 +1100
4335 Set group perms on regress dir.
4337 This ensures that the tests don't fail due to StrictMode checks.
4339 commit 137196300fc1540affadde880210f02ba6cb4abf
4340 Author: Darren Tucker <dtucker@dtucker.net>
4341 Date: Sun Dec 18 21:13:42 2022 +1100
4343 Fetch regress logs from obj dir.
4345 commit 5f93c4836527d9fda05de8944a1c7b4a205080c7
4346 Author: Darren Tucker <dtucker@dtucker.net>
4347 Date: Tue Dec 13 20:59:54 2022 +1100
4349 obsdsnap test VMs runs-on libvirt too.
4351 commit 8386886fb1ab7fda73069fb0db1dbe0e5a52f758
4352 Author: Darren Tucker <dtucker@dtucker.net>
4353 Date: Tue Dec 13 20:55:37 2022 +1100
4355 Run upstream obsdsnap tests on ephemeral runners.
4357 commit b6e01459b55ece85d7f296b2bc719d1841e1009e
4358 Author: Darren Tucker <dtucker@dtucker.net>
4359 Date: Tue Dec 13 20:48:56 2022 +1100
4361 Move obsdsnap test VMs to ephemeral runners.
4363 commit ea6fdf9a1aa71a411f7db218a986392c4fb55693
4364 Author: Damien Miller <djm@mindrot.org>
4365 Date: Fri Dec 9 18:00:21 2022 +1100
4367 use calloc for allocating arc4random structs
4371 commit 4403b62f5548e91389cb3339d26a9d0c4bb07b34
4372 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4373 Date: Fri Dec 9 00:22:29 2022 +0000
4375 upstream: Warn if no host keys for hostbased auth can be loaded.
4377 OpenBSD-Commit-ID: 2a0a13132000cf8d3593133c1b49768aa3c95977
4379 commit a6183e25e3f1842e21999fe88bc40bb99b121dc3
4380 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4381 Date: Fri Dec 9 00:17:40 2022 +0000
4383 upstream: Add server debugging for hostbased auth.
4385 auth_debug_add queues messages about the auth process which is sent to
4386 the client after successful authentication. This also sends those to
4387 the server debug log to aid in debugging. From bz#3507, ok djm@
4389 OpenBSD-Commit-ID: 46ff67518cccf9caf47e06393e2a121ee5aa258a
4391 commit b85c3581c16aaf6e83b9a797c80705a56b1f312e
4392 Author: cheloha@openbsd.org <cheloha@openbsd.org>
4393 Date: Sun Dec 4 23:50:49 2022 +0000
4395 upstream: remove '?' from getopt(3) loops
4397 userspace: remove vestigial '?' cases from top-level getopt(3) loops
4399 getopt(3) returns '?' when it encounters a flag not present in the in
4400 the optstring or if a flag is missing its option argument. We can
4401 handle this case with the "default" failure case with no loss of
4402 legibility. Hence, remove all the redundant "case '?':" lines.
4404 Prompted by dlg@. With help from dlg@ and millert@.
4406 Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2
4408 ok naddy@ millert@ dlg@
4410 OpenBSD-Commit-ID: b2f89346538ce4f5b33ab8011a23e0626a67e66e
4412 commit 9a067e8d28a2249fd73f004961e30c113ee85e5d
4413 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4414 Date: Wed Dec 7 11:45:43 2022 +0000
4416 upstream: Fix comment typo.
4418 OpenBSD-Regress-ID: 3b04faced6511bb5e74648c6a4ef4bf2c4decf03
4420 commit ce3c3e78ce45d68a82c7c8dc89895f297a67f225
4421 Author: Darren Tucker <dtucker@dtucker.net>
4422 Date: Wed Dec 7 18:58:25 2022 +1100
4424 Add SANDBOX_DEBUG to the kitchensink test build.
4426 commit bc234605fa3eb10f56bf0d74c8ecb0d91ada9d05
4427 Author: Damien Miller <djm@mindrot.org>
4428 Date: Wed Dec 7 18:38:25 2022 +1100
4430 disable SANDBOX_SECCOMP_FILTER_DEBUG
4432 It was mistakenly enabled in 2580916e4872
4434 Reported by Peter sec-openssh-com.22.fichtner AT 0sg.net
4436 commit b087c5cfa011b27992e01589314fec830266f99d
4437 Author: Rose <83477269+AtariDreams@users.noreply.github.com>
4438 Date: Tue Nov 29 15:12:54 2022 -0500
4442 Regenerate config files using latest autotools
4444 commit d63f5494978a185c7421d492b9c2f6f05bb54138
4445 Author: Darren Tucker <dtucker@dtucker.net>
4446 Date: Tue Dec 6 12:22:36 2022 +1100
4448 Fix typo in comment. Spotted by tim@
4450 commit 73dcca12115aa12ed0d123b914d473c384e52651
4451 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4452 Date: Sun Dec 4 11:03:11 2022 +0000
4454 upstream: Remove duplicate includes.
4456 Patch from AtariDreams via github PR#364.
4458 OpenBSD-Commit-ID: b9186638a05cb8b56ef7c0de521922b6723644ea
4460 commit 3cec15543010bc8d6997d896b1717a650afb7e92
4461 Author: djm@openbsd.org <djm@openbsd.org>
4462 Date: Fri Dec 2 04:40:27 2022 +0000
4464 upstream: make struct sshbuf private
4466 and remove an unused field; ok dtucker
4468 OpenBSD-Commit-ID: c7a3d77c0b8c153d463398606a8d57569186a0c3
4470 commit 5796bf8ca9535f9fa7d01829a540d2550e05c860
4471 Author: Darren Tucker <dtucker@dtucker.net>
4472 Date: Fri Dec 2 11:43:36 2022 +1100
4474 Restore ssh-agent permissions on exit.
4476 ...enough that subsequent builds can overwrite ssh-agent if necessary.
4478 commit ccf5a13868cbb4659107458cac1e017c98abcbda
4479 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4480 Date: Thu Dec 1 02:22:13 2022 +0000
4482 upstream: Clean up ssh-add and ssh-agent logs.
4484 OpenBSD-Regress-ID: 9eda8e4c3714d7f943ab2e73ed58a233bd29cd2c
4486 commit 7a8b40cf6a5eda80173140cc6750a6db8412fa87
4487 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4488 Date: Thu Dec 1 02:19:29 2022 +0000
4490 upstream: Log output of ssh-agent and ssh-add
4492 This should make debugging easier.
4494 OpenBSD-Regress-ID: 5974b02651f428d7e1079b41304c498ca7e306c8
4496 commit 4a1805d532616233dd6072e5cd273b96dd3062e6
4497 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4498 Date: Tue Nov 29 22:41:14 2022 +0000
4500 upstream: Add void to client_repledge args to fix compiler warning. ok djm@
4502 OpenBSD-Commit-ID: 7e964a641ce4a0a0a11f047953b29929d7a4b866
4504 commit 815c4704930aa449edf6e812e99d69e9ffd31f01
4505 Author: djm@openbsd.org <djm@openbsd.org>
4506 Date: Mon Nov 28 01:38:22 2022 +0000
4508 upstream: tighten pledge(2) after session establishment
4510 feedback, ok & testing in snaps deraadt@
4512 OpenBSD-Commit-ID: aecf4d49d28586dfbcc74328d9333398fef9eb58
4514 commit f7cebbbf407d772ed71403d314343766782fe540
4515 Author: djm@openbsd.org <djm@openbsd.org>
4516 Date: Mon Nov 28 01:37:36 2022 +0000
4518 upstream: New EnableEscapeCommandline ssh_config(5) option
4520 This option (default "no") controls whether the ~C escape is available.
4521 Turning it off by default means we will soon be able to use a stricter
4522 default pledge(2) in the client.
4524 feedback deraadt@ dtucker@; tested in snaps for a while
4526 OpenBSD-Commit-ID: 7e277595d60acb8263118dcb66554472257b387a
4528 commit d323f7ecf52e3d4ec1f4939bf31693e02f891dca
4529 Author: mbuhl@openbsd.org <mbuhl@openbsd.org>
4530 Date: Fri Nov 18 19:47:40 2022 +0000
4532 upstream: In channel_request_remote_forwarding the parameters for
4534 permission_set_add are leaked as they are also duplicated in the call. Found
4535 by CodeChecker. ok djm
4537 OpenBSD-Commit-ID: 4aef50fa9be7c0b138188814c8fe3dccc196f61e
4539 commit 62cc33e6eed847aafdc29e34aa69e9bd82a0ee16
4540 Author: Darren Tucker <dtucker@dtucker.net>
4541 Date: Wed Nov 30 11:23:11 2022 +1100
4543 Use -fzero-call-used-regs=used on clang 15.
4545 clang 15 seems to have a problem with -fzero-call-used-reg=all which
4546 causes spurious "incorrect signature" failures with ED25519. On those
4547 versions, use -fzero-call-used-regs=used instead. (We may add exceptions
4548 later if specific versions prove to be OK). Also move the GCC version
4551 Initial investigation by Daniel Pouzzner (douzzer at mega nu), workaround
4552 suggested by Bill Wendling (morbo at google com). bz#3475, ok djm@
4554 commit f84b9cffd52c9c5c359a54a1929f9948e803ab1d
4555 Author: Darren Tucker <dtucker@dtucker.net>
4556 Date: Mon Nov 28 21:09:28 2022 +1100
4558 Skip unit tests on slow riscv64 hardware.
4560 commit 9f2747e0bed3faca92679eae69aef10c95dc82f5
4561 Author: Darren Tucker <dtucker@dtucker.net>
4562 Date: Sun Nov 27 15:26:22 2022 +1100
4564 Rework how selfhosted tests interact with runners.
4566 Previously there was one runner per test target (mostly VMs). This had
4568 - multiple tests that ran on the same target (eg multiple build
4569 configs) were serialized on availability or that runner.
4570 - it needed manual balancing of VMs over host machines.
4572 To address this, make VMs that use ephemeral disks (ie most of them)
4573 all use a pool of runners with the "libvirt" label. This requires that
4574 we distinguish between "host" and "target" for those. Native runners
4575 and VMs with persistent disks (eg the constantly-updated snapshot ones)
4576 specify the same host and target.
4578 This should improve test throughput.
4580 commit d664ddaec87bdc7385be8ef7f1337793e1679d48
4581 Author: Darren Tucker <dtucker@dtucker.net>
4582 Date: Sun Nov 27 12:19:37 2022 +1100
4584 Run vmstartup from temp dir.
4586 This will allow us to create ephemeral disk images per-runner.
4588 commit 0fa16e952b1fc1c4cf65e3dd138b0e87003e2e45
4589 Author: Darren Tucker <dtucker@dtucker.net>
4590 Date: Sun Nov 27 12:14:00 2022 +1100
4592 Make "config" in matrix singular and pass in env.
4594 This will allow the startup scripts to adapt their behaviour based on
4595 the type and config.
4597 commit e8857043af54809187be1e8b06749db61112899f
4598 Author: Darren Tucker <dtucker@dtucker.net>
4599 Date: Sun Nov 27 11:42:22 2022 +1100
4601 Add "libvirt" label to dfly30.
4603 commit 9775473d84902dc37753686cd10ae71fbe67efda
4604 Author: Darren Tucker <dtucker@dtucker.net>
4605 Date: Sun Nov 27 09:28:20 2022 +1100
4607 Rename "os" in matrix to "target".
4609 This is in preparation to distinguish this from the host that the runner
4610 runs on in case where they are separate (eg VMs).
4612 commit 04fd00ceff39f4544ced6f5342060abe584835d0
4613 Author: Darren Tucker <dtucker@dtucker.net>
4614 Date: Sun Nov 27 09:23:04 2022 +1100
4616 Remove unused self-hosted test targets.
4618 commit c9d9fcad2a11c1cd1550a541f44091d65f0b5584
4619 Author: Darren Tucker <dtucker@dtucker.net>
4620 Date: Sun Nov 27 09:16:15 2022 +1100
4622 Remove explicit "default" test config argument.
4624 Not specifying the test config implicitly selects default args.
4626 commit 15a01cf15f396f87c6d221c5a6af98331c818962
4627 Author: Darren Tucker <dtucker@dtucker.net>
4628 Date: Wed Nov 23 13:18:54 2022 +1100
4630 Add fallback for old platforms w/out MAP_ANON.
4632 commit 6b9bbbfe8b26db6e9a30a7e08c223e85421aed98
4633 Author: Darren Tucker <dtucker@dtucker.net>
4634 Date: Wed Nov 23 13:09:11 2022 +1100
4636 If we haven't found it yet, recheck for sys/stat.h.
4638 On some very old platforms, sys/stat.h needs sys/types.h, however
4639 autoconf 2.71's AC_CHECK_INCLUDES_DEFAULT checks for them in the
4640 opposite order, which in combination with modern autoconf's
4641 "present but cannot be compiled" behaviour causes it to not be
4644 commit 8926956f22639132a9f2433fcd25224e01b900f5
4645 Author: Darren Tucker <dtucker@dtucker.net>
4646 Date: Fri Nov 11 11:25:37 2022 +1100
4648 Add dfly62 test target.
4650 commit 650de7ecd3567b5a5dbf16dd1eb598bd8c20bca8
4651 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4652 Date: Thu Nov 10 23:03:10 2022 +0000
4654 upstream: Handle dynamic remote port forwarding in escape commandline's
4656 -R processing. bz#3499, ok djm@
4658 OpenBSD-Commit-ID: 194ee4cfe7ed0e2b8ad0727f493c798a50454208
4660 commit 5372db7e7985ba2c00f20fdff8942145ca99e033
4661 Author: Darren Tucker <dtucker@dtucker.net>
4662 Date: Thu Nov 10 12:44:51 2022 +1100
4664 Remove seed passing over reexec.
4666 This was added for the benefit of platforms using ssh-rand-helper to
4667 prevent a delay on each connection as sshd reseeded itself.
4669 ssh-random-helper is long gone, and since the re-exec happens before the
4670 chroot the re-execed sshd can reseed itself normally. ok djm@
4672 commit ca98d3f8c64cfc51af81e1b01c36a919d5947ec2
4673 Author: Darren Tucker <dtucker@dtucker.net>
4674 Date: Wed Nov 9 20:59:20 2022 +1100
4676 Skip reexec test on OpenSSL 1.1.1 specifically.
4678 OpenSSL 1.1.1 has a bug in its RNG that breaks reexec fallback, so skip
4679 that test. See bz#3483 for details.
4681 commit 5ec4ebc2548e5f7f1b55b2a5cef5b67bdca8146f
4682 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4683 Date: Wed Nov 9 09:04:12 2022 +0000
4685 upstream: Fix typo in fatal error message.
4687 Patch from vapier at chromium.org.
4689 OpenBSD-Commit-ID: 8a0c164a6a25eef0eedfc30df95bfa27644e35cf
4691 commit e6abafe9a6d809422d3432b95b3f9747b0acaa71
4692 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4693 Date: Wed Nov 9 09:01:52 2022 +0000
4695 upstream: Remove errant colon and simplify format
4697 string in error messages. Patch from vapier at chromium.org.
4699 OpenBSD-Commit-ID: fc28466ebc7b74e0072331947a89bdd239c160d3
4701 commit db2027a687516f87c3fb141e87154bb3d8a7807c
4702 Author: djm@openbsd.org <djm@openbsd.org>
4703 Date: Wed Nov 9 01:37:44 2022 +0000
4705 upstream: rename client_global_hostkeys_private_confirm() to
4707 client_global_hostkeys_prove_confirm(), as it handles the
4708 "hostkeys-prove00@openssh.com" message; no functional change
4710 OpenBSD-Commit-ID: 31e09bd3cca6eed26855b88fb8beed18e9bd026d
4712 commit 1c2be7c2004cf1abcd172fee9fe3eab57cd4c426
4713 Author: djm@openbsd.org <djm@openbsd.org>
4714 Date: Wed Nov 9 00:15:59 2022 +0000
4716 upstream: typo in comment
4718 OpenBSD-Commit-ID: 39c58f41e0f32d1ff31731fa6f5bbbc3ad25084a
4720 commit cf1a9852d7fc93e4abc4168aed09529a57427cdc
4721 Author: Darren Tucker <dtucker@dtucker.net>
4722 Date: Wed Nov 9 09:23:47 2022 +1100
4724 Defer seed_rng until after closefrom call.
4726 seed_rng will initialize OpenSSL, and some engine providers (eg Intel's
4727 QAT) will open descriptors for their own use. bz#3483, patch from
4728 joel.d.schuetze at intel.com, ok djm@
4730 commit dffa64480163fbf76af7e4fb62c26bb0dd6642aa
4731 Author: Darren Tucker <dtucker@dtucker.net>
4732 Date: Wed Nov 9 08:27:47 2022 +1100
4734 Fix comment text. From emaste at freebsd.org.
4736 commit d9df5689c29823ab830ec4f54c83c6cc3c0077ad
4737 Author: Pierre Ossman <ossman@cendio.se>
4738 Date: Wed Jul 6 13:52:10 2022 +0200
4740 Avoid assuming layout of fd_set
4742 POSIX doesn't specify the internal layout of the fd_set object, so let's
4743 not assume it is just a bit mask. This increases compatibility with
4744 systems that have a different layout.
4746 The assumption is also worthless as we already refuse to use file
4747 descriptors over FD_SETSIZE anyway. Meaning that the default size of
4748 fd_set is quite sufficient.
4750 commit 419aa8a312e8d8f491933ca3d5933e602cb05aae
4751 Author: Darren Tucker <dtucker@dtucker.net>
4752 Date: Tue Nov 8 12:42:52 2022 +1100
4754 Shutdown any VM before trying to check out repo.
4756 In the case where the previous run did not clean up, the checkout will
4757 fail as it'll leave a stale mount.
4759 commit a32c07cbb78f65d8527642b96474a83b413f8108
4760 Author: Darren Tucker <dtucker@dtucker.net>
4761 Date: Tue Nov 8 11:33:25 2022 +1100
4763 Run vm startup and shutdown from runner temp dir.
4765 Should work even if the github workspace dir is on a stale sshfs mount.
4767 commit 2b40a7dfcdb8e616155b9504145aa52b271455aa
4768 Author: Darren Tucker <dtucker@dtucker.net>
4769 Date: Tue Nov 8 11:03:31 2022 +1100
4771 Add valrind-5 test here too.
4773 commit 2ea03d1f6d0a05ee2b63ed2dc0f2d54f1e4655a1
4774 Author: Darren Tucker <dtucker@dtucker.net>
4775 Date: Tue Nov 8 09:21:10 2022 +1100
4777 Update checkout and upload actions.
4779 Update actions/checkout and actions/upload-artifact to main branch for
4780 compatibility with node.js v16.
4782 commit 4e316ff0f18a118232bb9ac6512ee62773a9e8ea
4783 Author: Darren Tucker <dtucker@dtucker.net>
4784 Date: Tue Nov 8 09:17:04 2022 +1100
4786 Split out rekey test since it runs the longest.
4788 commit 21625a6424258a92a96a3bb73ae6aabc5ed8a6b4
4789 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4790 Date: Mon Nov 7 10:09:28 2022 +0000
4792 upstream: The IdentityFile option in ssh_config can also be used to
4794 specify a public key file, as documented in ssh.1 for the -i option. Document
4795 this also for IdentityFile in ssh_config.5, for documentation completeness.
4796 From laalsaas at systemli.org via portable github PR#352, ok jmc@ djm@
4798 OpenBSD-Commit-ID: 2f943be9f96e60ef81a9a4faa25b009999f9883b
4800 commit 747691604d3325ed2b62bad85b6fd8563ad32f6c
4801 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4802 Date: Mon Nov 7 10:05:38 2022 +0000
4804 upstream: Remove some set but otherwise unused variables, spotted
4806 in -portable by clang 16's -Wunused-but-set-variable. ok djm@
4808 OpenBSD-Commit-ID: 3d943ddf2369b38fbf89f5f19728e7dc1daf3982
4810 commit 1d78d25653805aefc7a8dd9d86cd7359ada3823c
4811 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4812 Date: Mon Nov 7 10:02:59 2022 +0000
4814 upstream: Check for and disallow MaxStartups values less than or
4816 equal to zero during config parsing, rather than faling later at runtime.
4819 OpenBSD-Commit-ID: d79c2b7a8601eb9be493629a91245d761154308b
4821 commit a00f59a645072e5f5a8d207af15916a7b23e2642
4822 Author: djm@openbsd.org <djm@openbsd.org>
4823 Date: Mon Nov 7 04:04:40 2022 +0000
4825 upstream: fix parsing of hex cert expiry time; was checking whether the
4827 start time began with "0x", not the expiry time.
4831 OpenBSD-Commit-ID: 6269242c3e1a130b47c92cfca4d661df15f05739
4833 commit f58acaf8c7315483f4ac87d46a1aa2142a713cd8
4834 Author: Darren Tucker <dtucker@dtucker.net>
4835 Date: Mon Nov 7 15:10:59 2022 +1100
4839 commit 162e5741020a8d996c0c12b988b118e71ed728e6
4840 Author: Darren Tucker <dtucker@dtucker.net>
4841 Date: Mon Nov 7 15:04:33 2022 +1100
4843 Branch-specific links for master status badges.
4845 commit e4b7c12ab24579312aa3ed38ce7041a439ec2d56
4846 Author: Darren Tucker <dtucker@dtucker.net>
4847 Date: Mon Nov 7 14:46:38 2022 +1100
4849 Add CIFuzz status badge.
4851 commit b496b9f831acd1e5bcd875e26e797488beef494a
4852 Author: Darren Tucker <dtucker@dtucker.net>
4853 Date: Mon Nov 7 14:45:16 2022 +1100
4855 Do not run CIFuzz on selfhosted tree.
4857 We already run it on the regular tree, no need to double up.
4859 commit 2138b1c4ddb300129a41a5104627b0d561184c7b
4860 Author: Darren Tucker <dtucker@dtucker.net>
4861 Date: Mon Nov 7 14:41:58 2022 +1100
4863 Whitespace change to trigger CIFuzz workflow.
4865 commit 4670b97ef87c7b0f21283c9b07c7191be88dda05
4866 Author: Darren Tucker <dtucker@dtucker.net>
4867 Date: Mon Nov 7 14:34:04 2022 +1100
4869 Run cifuzz workflow on the actions as regular CI.
4871 commit 79391e66ce851ace1baf3c6a35e83a23f08ec2ba
4872 Author: David Korczynski <david@adalogics.com>
4873 Date: Tue Nov 30 11:45:20 2021 +0000
4875 Add CIFuzz integration
4877 commit c1893364a0be243270014d7d34362a8101d55112
4878 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4879 Date: Mon Nov 7 02:21:22 2022 +0000
4881 upstream: Import regenerated moduli.
4883 OpenBSD-Commit-ID: b0e54ee4d703bd6929bbc624068666a7a42ecb1f
4885 commit 5c3f18fb994ef27e685b205ee2351851b80fdbd1
4886 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4887 Date: Mon Nov 7 01:53:01 2022 +0000
4889 upstream: Fix typo. From pablomh via -portable github PR#344.
4891 OpenBSD-Commit-ID: d056ee2e73691dc3ecdb44a6de68e6b88cd93827
4893 commit e1c6fcc142066417c9832e634463faa3dd5d116c
4894 Author: Darren Tucker <dtucker@dtucker.net>
4895 Date: Mon Nov 7 12:46:58 2022 +1100
4897 Link to branch-specific queries for V_9_1 status.
4899 commit 4f4a5fad6d8892c3f8ee9cd81ec7de6458210c9f
4900 Author: Darren Tucker <dtucker@dtucker.net>
4901 Date: Sun Nov 6 10:55:59 2022 +1100
4903 Use "prohibit-password" in -portable comments.
4905 "without-password" is the deprecated alias for "prohibit-password",
4906 so we should reference the latter. From emaste at freebsd.org.
4908 commit 0f7e1eba55259ec037f515000b4c4afbf446230a
4909 Author: Darren Tucker <dtucker@dtucker.net>
4910 Date: Sun Nov 6 10:50:01 2022 +1100
4912 Fix tracing disable on FreeBSD.
4914 Some versions of FreeBSD do not support using id 0 to refer to the
4915 current pid for procctl, so pass getpid() explicitly. From
4916 emaste at freebsd.org.
4918 commit 32fddb982fd61b11a2f218a115975a87ab126d43
4919 Author: Darren Tucker <dtucker@dtucker.net>
4920 Date: Mon Nov 7 10:39:01 2022 +1100
4922 Fix setres*id checks to work with clang-16.
4924 glibc has the prototypes for setresuid and setresgid behind _GNU_SOURCE,
4925 and clang 16 will error out on implicit function definitions, so add
4926 _GNU_SOURCE and the required headers to the configure checks. From
4927 sam at @gentoo.org via bz#3497.
4929 commit 12af712d116f42164bcfa56db901d06e4fa27199
4930 Author: Sam James <sam@gentoo.org>
4931 Date: Sun Nov 6 04:52:38 2022 +0000
4933 configure.ac: Fix -Wstrict-prototypes
4935 Clang 16 now warns on this and it'll be removed in C23, so let's
4936 just be future proof. It also reduces noise when doing general
4937 Clang 16 porting work (which is a big job as it is). github PR#355.
4939 Signed-off-by: Sam James <sam@gentoo.org>
4941 commit 40b0a5eb6e3edfa2886b60c09c7803353b0cc7f5
4942 Author: Sam James <sam@gentoo.org>
4943 Date: Sun Nov 6 04:47:35 2022 +0000
4945 configure.ac: Add <pty.h> include for openpty
4947 Another Clang 16ish fix (which makes -Wimplicit-function-declaration
4948 an error by default). github PR#355.
4950 See: 2efd71da49b9cfeab7987058cf5919e473ff466b
4951 See: be197635329feb839865fdc738e34e24afd1fca8
4953 commit 6b17e128879ec6cc32ca2c28b5d894b4aa72e32d
4954 Author: Rochdi Nassah <rochdinassah.1998@gmail.com>
4955 Date: Fri Oct 28 01:26:31 2022 +0100
4957 Fix broken zlib link.
4959 commit 99500df246ccb736ddbdd04160dcc82165d81a77
4960 Author: Darren Tucker <dtucker@dtucker.net>
4961 Date: Fri Nov 4 16:59:26 2022 +1100
4963 Don't run openbsd-compat tests on Cygwin.
4965 Add "compat-tests" to the default TEST_TARGET so we can override as
4966 necessary. Override TEST_TARGET for Cygwin as the tests don't currently
4969 commit 3cae9f92a31897409666aa1e6f696f779759332b
4970 Author: djm@openbsd.org <djm@openbsd.org>
4971 Date: Thu Nov 3 21:59:20 2022 +0000
4973 upstream: replace recently-added valid_domain() check for hostnames
4975 going to known_hosts with a more relaxed check for bad characters; previous
4976 commit broke address literals. Reported by/feedback from florian@
4978 OpenBSD-Commit-ID: 10b86dc6a4b206adaa0c11b58b6d5933898d43e0
4980 commit 9655217231c9056200bea7ae2dffcc9c0c3eb265
4981 Author: Darren Tucker <dtucker@dtucker.net>
4982 Date: Thu Nov 3 23:07:50 2022 +1100
4984 Rerun tests on changes to Makefile.in in any dir.
4986 commit 3500f0405a3ab16b59a26f3508c4257a3fc3bce6
4987 Author: Darren Tucker <dtucker@dtucker.net>
4988 Date: Thu Nov 3 23:04:08 2022 +1100
4990 Link libssh into compat tests.
4992 The cygwin compat code uses xmalloc, so add libssh.a so pick up that.
4994 commit ec59effcf65b8a4c85d47ff5a271123259dd0ab8
4995 Author: Darren Tucker <dtucker@dtucker.net>
4996 Date: Thu Nov 3 21:44:23 2022 +1100
4998 Fix compat regress to work with non-GNU make.
5000 commit 73550a218e7dfbbd599534cbf856309bc924f6fd
5001 Author: Darren Tucker <dtucker@dtucker.net>
5002 Date: Thu Nov 3 13:41:16 2022 +1100
5004 Increase selfhosted job timeout.
5006 The default job timeout of 360 (6h) is not enough to complete the
5007 regress tests for some of the slow VMs depending on the load on the host.
5008 Increase to 600 (10h).
5010 commit db97d8d0b90c6ce52b94b153d6f8f5f7d3b11777
5011 Author: Darren Tucker <dtucker@dtucker.net>
5012 Date: Thu Nov 3 10:00:43 2022 +1100
5014 Only run opensslver tests if built with OpenSSL.
5016 commit ba053709638dff2f6603df0c1f340352261d63ea
5017 Author: Darren Tucker <dtucker@dtucker.net>
5018 Date: Wed Nov 2 14:16:04 2022 +1100
5020 Add tests for OpenSSL 3.0.7 and LibreSSL 3.6.1.
5022 commit edd24101c7e17d1a8f6576e1aaf62233b47ad6f5
5023 Author: Darren Tucker <dtucker@dtucker.net>
5024 Date: Thu Nov 3 08:17:39 2022 +1100
5026 Run compat regress tests too.
5028 commit fe88d67e7599b0bc73f6e4524add28d743e7f977
5029 Author: Darren Tucker <dtucker@dtucker.net>
5030 Date: Thu Nov 3 08:14:05 2022 +1100
5032 Compat tests need libcrypto.
5034 This was moved to CHANNELLIBS during the libs refactor. Spotted by
5037 commit 96b519726b7944eee3c23a54eee3d5c031ba1533
5038 Author: Darren Tucker <dtucker@dtucker.net>
5039 Date: Thu Nov 3 04:24:39 2022 +1100
5041 Include time.h when defining timegm.
5043 Fixes build on some platforms eg recent AIX.
5045 commit da6038bd5cd55eb212eb2aec1fc8ae79bbf76156
5046 Author: Darren Tucker <dtucker@dtucker.net>
5047 Date: Tue Nov 1 19:10:30 2022 +1100
5049 Always use compat getentropy.
5051 Have it call native getentropy and fall back as required. Should fix
5052 issues of platforms where libc has getentropy but it is not implemented
5053 in the kernel. Based on github PR#354 from simsergey.
5055 commit 5ebe18cab6be3247b44c807ac145164010465b82
5056 Author: Darren Tucker <dtucker@dtucker.net>
5057 Date: Wed Nov 2 10:51:48 2022 +1100
5059 Check for sockaddr_in.sin_len.
5061 If found, set SOCK_HAS_LEN which is used in addr.c. Should fix keyscan
5062 tests on platforms with this (eg old NetBSD).
5064 commit a1febadf426536612c2734168d409147c392e7cf
5065 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5066 Date: Sun Oct 30 18:42:07 2022 +0000
5068 upstream: Use variable for diff options
5070 instead of unconditionally specifying "-rN". This will make life easier
5071 in -portable where not all diff's understand -N.
5073 OpenBSD-Regress-ID: 8b8a407115546be1c6d72d350b1e4f1f960d3cd3
5075 commit f6d3ed9a8a9280cbb68d6a499850cfe810e92bd0
5076 Author: Darren Tucker <dtucker@dtucker.net>
5077 Date: Mon Oct 31 05:13:02 2022 +1100
5079 OpenSSL dev branch is 302 not 320.
5081 While there, also accept 301 which it shat it was previously.
5083 commit 25c8a2bbcc10c493d27faea57c42a6bf13fa51f2
5084 Author: djm@openbsd.org <djm@openbsd.org>
5085 Date: Fri Oct 28 02:47:04 2022 +0000
5087 upstream: put sshkey_check_rsa_length() back in sshkey.c to unbreak
5091 OpenBSD-Commit-ID: 99eec58abe382ecd14b14043b195ee1babb9cf6e
5093 commit 1192588546c29ceec10775125f396555ea71850f
5094 Author: djm@openbsd.org <djm@openbsd.org>
5095 Date: Fri Oct 28 02:29:34 2022 +0000
5097 upstream: allow ssh-keyscan(1) to accept CIDR address ranges, e.g.
5099 ssh-keyscan 192.168.0.0/24
5101 If a CIDR range is passed, then it will be expanded to all possible
5102 addresses in the range including the all-0s and all-1s addresses.
5104 bz#976 feedback/ok markus@
5106 OpenBSD-Commit-ID: ce6c5211f936ac0053fd4a2ddb415277931e6c4b
5108 commit 64af4209309461c79c39eda2d13f9d77816c6398
5109 Author: Damien Miller <djm@mindrot.org>
5110 Date: Fri Oct 28 12:54:35 2022 +1100
5114 commit 27267642699342412964aa785b98afd69d952c88
5115 Author: djm@openbsd.org <djm@openbsd.org>
5116 Date: Fri Oct 28 00:44:44 2022 +0000
5118 upstream: refactor sshkey_private_deserialize
5122 OpenBSD-Commit-ID: f5ca6932fdaf840a5e8250becb38315a29b5fc9f
5124 commit 2519a7077a9332f70935e5242ba91ee670ed6b87
5125 Author: djm@openbsd.org <djm@openbsd.org>
5126 Date: Fri Oct 28 00:44:17 2022 +0000
5128 upstream: refactor sshkey_private_serialize_opt()
5132 OpenBSD-Commit-ID: 61e0fe989897901294efe7c3b6d670cefaf44cbd
5134 commit 11a768adf98371fe4e43f3b06014024c033385d5
5135 Author: djm@openbsd.org <djm@openbsd.org>
5136 Date: Fri Oct 28 00:43:30 2022 +0000
5138 upstream: refactor certify
5142 OpenBSD-Commit-ID: 35d742992e223eaca3537e6fb3d3002c08eed4f6
5144 commit 3fbc58bb249d967cc43ebdc554f6781bb73d4a58
5145 Author: djm@openbsd.org <djm@openbsd.org>
5146 Date: Fri Oct 28 00:43:08 2022 +0000
5148 upstream: refactor sshkey_sign() and sshkey_verify()
5152 OpenBSD-Commit-ID: 368e662c128c99d05cc043b1308d2b6c71a4d3cc
5154 commit a1deb6cdbbe6afaab74ecb08fcb62db5739267be
5155 Author: djm@openbsd.org <djm@openbsd.org>
5156 Date: Fri Oct 28 00:41:52 2022 +0000
5158 upstream: refactor sshkey_from_blob_internal()
5162 OpenBSD-Commit-ID: 1f46c0cbb8060ee9666a02749594ad6658c8e283
5164 commit 7d00799c935271ce89300494c5677190779f6453
5165 Author: djm@openbsd.org <djm@openbsd.org>
5166 Date: Fri Oct 28 00:41:17 2022 +0000
5168 upstream: refactor sshkey_from_private()
5172 OpenBSD-Commit-ID: e5dbe7a3545930c50f70ee75c867a1e08b382b53
5174 commit 262647c2e920492ca57f1b9320d74f4a0f6e482b
5175 Author: djm@openbsd.org <djm@openbsd.org>
5176 Date: Fri Oct 28 00:39:29 2022 +0000
5178 upstream: factor out key generation
5182 OpenBSD-Commit-ID: 5b4211bff4de8d9adb84bc72857a8c42c44e7ceb
5184 commit 401c74e7dc15eab60540653d2f94d9306a927bab
5185 Author: djm@openbsd.org <djm@openbsd.org>
5186 Date: Fri Oct 28 00:38:58 2022 +0000
5188 upstream: refactor and simplify sshkey_read()
5192 OpenBSD-Commit-ID: 0d93b7a56e31cd06a8bb0d2191d084ce254b0971
5194 commit 591fed94e66a016acf87f4b7cd416ce812f2abe8
5195 Author: djm@openbsd.org <djm@openbsd.org>
5196 Date: Fri Oct 28 00:37:24 2022 +0000
5198 upstream: factor out public key serialization
5202 OpenBSD-Commit-ID: a3570c4b97290c5662890aea7328d87f55939033
5204 commit 1e78844ae2b2dc01ba735d5ae740904c57e13685
5205 Author: djm@openbsd.org <djm@openbsd.org>
5206 Date: Fri Oct 28 00:36:31 2022 +0000
5208 upstream: factor out sshkey_equal_public()
5212 OpenBSD-Commit-ID: 1368ba114cb37732fe6ec3d89c7e6d27ea6fdc94
5214 commit 25de1c01a8b9a2c8ab9b1da22444a03e89c982de
5215 Author: djm@openbsd.org <djm@openbsd.org>
5216 Date: Fri Oct 28 00:35:40 2022 +0000
5218 upstream: begin big refactor of sshkey
5220 Move keytype data and some of the type-specific code (allocation,
5221 cleanup, etc) out into each key type's implementation. Subsequent
5222 commits will move more, with the goal of having each key-*.c file
5223 owning as much of its keytype's implementation as possible.
5225 lots of feedback + ok markus@
5227 OpenBSD-Commit-ID: 0f2b4334f73914344e9e5b3d33522d41762a57ec
5229 commit 445363433ba20b8a3e655b113858c836da46a1cb
5230 Author: djm@openbsd.org <djm@openbsd.org>
5231 Date: Mon Oct 24 22:43:36 2022 +0000
5233 upstream: Be more paranoid with host/domain names coming from the
5235 never write a name with bad characters to a known_hosts file.
5237 reported by David Leadbeater, ok deraadt@
5239 OpenBSD-Commit-ID: ba9b25fa8b5490b49398471e0c9657b0cbc7a5ad
5241 commit 7190154de2c9fe135f0cc1ad349cb2fa45152b89
5242 Author: djm@openbsd.org <djm@openbsd.org>
5243 Date: Mon Oct 24 21:52:50 2022 +0000
5245 upstream: regress test for unmatched glob characters; fails before
5247 previous commit but passes now. bz3488; prodded by dtucker@
5249 OpenBSD-Regress-ID: 0cc5cc9ea4a6fd170dc61b9212f15badaafb3bbd
5251 commit a4821a592456c3add3cd325db433110cdaaa3e5c
5252 Author: djm@openbsd.org <djm@openbsd.org>
5253 Date: Mon Oct 24 21:51:55 2022 +0000
5255 upstream: when scp(1) is using the SFTP protocol for transport (the
5257 default), better match scp/rcp's handling of globs that don't match the
5258 globbed characters but do match literally (e.g. trying to transfer
5261 Previously scp(1) in SFTP mode would not match these pathnames but
5262 legacy scp/rcp mode would.
5264 Reported by Michael Yagliyan in bz3488; ok dtucker@
5266 OpenBSD-Commit-ID: d8a3773f53015ba811fddba7473769a2fd343e11
5268 commit 18376847b8043ba967eabbe23692ef74c9a3fddc
5269 Author: jsg@openbsd.org <jsg@openbsd.org>
5270 Date: Thu Oct 13 09:09:28 2022 +0000
5272 upstream: use correct type with sizeof ok djm@
5274 OpenBSD-Commit-ID: d6c882c2e8a42ff831a5b3cbc2c961ecb2dd6143
5276 commit 4a4883664d6b4e9e4e459a8cdc16bd8d4b735de9
5277 Author: jmc@openbsd.org <jmc@openbsd.org>
5278 Date: Fri Oct 7 06:00:58 2022 +0000
5280 upstream: ssh-agent.1: - use Nm not Xr for self-ref - while here,
5287 OpenBSD-Commit-ID: 855dac4695cef22e96d69c53436496bc408ca389
5289 commit 9fd2441113fce2a83fc7470968c3b27809cc7f10
5290 Author: djm@openbsd.org <djm@openbsd.org>
5291 Date: Fri Oct 7 04:06:26 2022 +0000
5293 upstream: document "-O no-restrict-websafe"; spotted by Ross L
5297 OpenBSD-Commit-ID: fe9eaa50237693a14ebe5b5614bf32a02145fe8b
5299 commit 614252b05d70f798a0929b1cd3d213030ad4d007
5300 Author: Darren Tucker <dtucker@dtucker.net>
5301 Date: Tue Oct 18 06:29:16 2022 +1100
5303 OpenSSL dev branch now identifies as 3.2.0.
5305 commit 195e5a65fd793a738ea8451ebfdd1919db5aff3e
5306 Author: Damien Miller <djm@mindrot.org>
5307 Date: Mon Oct 17 09:41:47 2022 +1100
5309 revert c64b62338b4 and guard POLL* defines instead
5311 c64b62338b4 broke OSX builds, which do have poll.h but lack ppoll(2)
5314 commit bc2e480d99613bd59720edae244d1764636544c4
5315 Author: Damien Miller <djm@mindrot.org>
5316 Date: Fri Oct 14 14:52:22 2022 +1100
5318 undef _get{short,long} before redefining
5320 commit 5eb796a369c64f18d55a6ae9b1fa9b35eea237fb
5321 Author: Harmen Stoppels <harmenstoppels@gmail.com>
5322 Date: Thu Oct 13 16:08:46 2022 +0200
5324 Fix snprintf configure test for clang 15
5326 Clang 15 -Wimplicit-int defaults to an error in C99 mode and above.
5327 A handful of tests have "main(..." and not "int main(..." which caused
5328 the tests to produce incorrect results.
5330 commit c64b62338b46ffa08839f05f21ad69fa6234dc17
5331 Author: Damien Miller <djm@mindrot.org>
5332 Date: Mon Oct 10 12:32:43 2022 +1100
5334 skip bsd-poll.h if poll.h found; ok dtucker
5336 commit 5ee2b8ccfcf4b606f450eb0ff2305e311f68b0be
5337 Author: djm@openbsd.org <djm@openbsd.org>
5338 Date: Thu Oct 6 22:42:37 2022 +0000
5340 upstream: honour user's umask if it is more restrictive then the ssh
5342 default (022); based on patch from Alex Henrie, ok dtucker@ deraadt@
5344 OpenBSD-Commit-ID: fe1b9e15fc9a4f49fc338e848ce14d8727abe82d
5346 commit a75cffc2700cebd3e2dd9093f7f7388d2be95cb7
5347 Author: Darren Tucker <dtucker@dtucker.net>
5348 Date: Fri Oct 7 03:54:56 2022 +1100
5350 Add LibreSSL 3.6.0 to test suite.
5352 While there, bump OpenSSL to latest 1.1.1q release.
5354 commit fcc0f0c0e96a30076683fea9a7c9eedc72931742
5355 Author: Darren Tucker <dtucker@dtucker.net>
5356 Date: Thu Oct 6 21:18:16 2022 +1100
5358 Add 9.1 branch to CI status page.
5360 commit ef211eee63821d894a8bf81f22bfba9f6899d0fe
5361 Author: Darren Tucker <dtucker@dtucker.net>
5362 Date: Tue Oct 4 23:20:23 2022 +1100
5364 Test commits to all branches of portable.
5366 Only test OpenBSD upstream on commits to master since that's what it
5369 commit fe646de03cafb6593ff4e4954bca9ec4b4b753a8
5370 Author: Damien Miller <djm@mindrot.org>
5371 Date: Wed Oct 5 03:47:26 2022 +1100
5375 commit a6e1852d10c63a830196e82168dadd957aaf28ec
5376 Author: Damien Miller <djm@mindrot.org>
5377 Date: Wed Oct 5 03:40:01 2022 +1100
5379 mention libfido2 autodetection
5381 commit 7360c2c206f33d309edbaf64036c96fadf74d640
5382 Author: Damien Miller <djm@mindrot.org>
5383 Date: Wed Oct 5 03:37:36 2022 +1100
5385 remove mention of --with-security-key-builtin
5387 it is enabled by default when libfido2 is installed
5389 commit 0ffb46f2ee2ffcc4daf45ee679e484da8fcf338c
5390 Author: Damien Miller <djm@mindrot.org>
5391 Date: Tue Oct 4 01:51:42 2022 +1100
5395 commit 657e676ff696c7bb787bffb0e249ea1be3b474e1
5396 Author: Damien Miller <djm@mindrot.org>
5397 Date: Tue Oct 4 01:45:52 2022 +1100
5399 update release notes URL
5401 commit f059da2b29840c0f048448809c317ce2ae014da7
5402 Author: Damien Miller <djm@mindrot.org>
5403 Date: Tue Oct 4 01:45:41 2022 +1100
5405 crank versions in RPM spec files
5407 commit b51f3f172d87cbdb80ca4eb7b2149e56a7647557
5408 Author: djm@openbsd.org <djm@openbsd.org>
5409 Date: Mon Sep 26 22:18:40 2022 +0000
5411 upstream: openssh-9.1
5413 OpenBSD-Commit-ID: 5a467b2ee81da01a86adf1ad93b62b1728494e56
5415 commit 4cf8d0c0f3030f594a238bab21a0695735515487
5416 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5417 Date: Wed Sep 21 22:26:50 2022 +0000
5419 upstream: Fix typo. From AlexanderStohr via github PR#343.
5421 OpenBSD-Commit-ID: a134c9b4039e48803fc6a87f955b0f4a03181497
5423 commit 8179fed3264d5919899900ed8881d5f9bb57ca33
5424 Author: djm@openbsd.org <djm@openbsd.org>
5425 Date: Mon Sep 19 21:39:16 2022 +0000
5427 upstream: add RequiredRSASize to the list of keywords accepted by
5431 OpenBSD-Commit-ID: fe871408cf6f9d3699afeda876f8adbac86a035e
5433 commit 5f954929e9f173dd1e279e07d0e8b14fa845814d
5434 Author: Damien Miller <djm@mindrot.org>
5435 Date: Mon Sep 19 20:59:34 2022 +1000
5437 no need for glob.h here
5439 it also causes portability problems
5441 commit 03d94a47207d58b3db37eba4f87eb6ae5a63168a
5442 Author: Damien Miller <djm@mindrot.org>
5443 Date: Mon Sep 19 20:59:04 2022 +1000
5445 avoid Wuninitialized false positive in gcc-12ish
5447 commit 9d952529113831fb3071ab6e408d2726fd72e771
5448 Author: djm@openbsd.org <djm@openbsd.org>
5449 Date: Mon Sep 19 10:46:00 2022 +0000
5451 upstream: use users-groups-by-id@openssh.com sftp-server extension
5453 (when available) to fill in user/group names for directory listings.
5454 Implement a client-side cache of see uid/gid=>user/group names. ok markus@
5456 OpenBSD-Commit-ID: f239aeeadfa925a37ceee36ee8b256b8ccf4466e
5458 commit 8ff680368b0bccf88ae85d4c99de69387fbad7a6
5459 Author: djm@openbsd.org <djm@openbsd.org>
5460 Date: Mon Sep 19 10:43:12 2022 +0000
5462 upstream: sftp client library support for
5464 users-groups-by-id@openssh.com; ok markus@
5466 OpenBSD-Commit-ID: ddb2f33a2da6349a9a89a8b5bcb9ca7c999394de
5468 commit 488f6e1c582212c2374a4bf8cd1b703d2e70fb8b
5469 Author: djm@openbsd.org <djm@openbsd.org>
5470 Date: Mon Sep 19 10:41:58 2022 +0000
5472 upstream: extend sftp-common.c:extend ls_file() to support supplied
5474 user/group names; ok markus@
5476 OpenBSD-Commit-ID: c70c70498b1fdcf158531117e405b6245863bfb0
5478 commit 74b77f7497dba3a58315c8f308883de448078057
5479 Author: djm@openbsd.org <djm@openbsd.org>
5480 Date: Mon Sep 19 10:40:52 2022 +0000
5482 upstream: sftp-server(8): add a "users-groups-by-id@openssh.com"
5484 extension request that allows the client to obtain user/group names that
5485 correspond to a set of uids/gids.
5487 Will be used to make directory listings more useful and consistent
5492 OpenBSD-Commit-ID: 7ebabde0bcb95ef949c4840fe89e697e30df47d3
5494 commit 231a346c0c67cc7ca098360f9a554fa7d4f1eddb
5495 Author: djm@openbsd.org <djm@openbsd.org>
5496 Date: Mon Sep 19 08:49:50 2022 +0000
5498 upstream: better debugging for connect_next()
5500 OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640
5502 commit 1875042c52a3b950ae5963c9ca3774a4cc7f0380
5503 Author: djm@openbsd.org <djm@openbsd.org>
5504 Date: Sat Sep 17 10:34:29 2022 +0000
5506 upstream: Add RequiredRSASize for sshd(8); RSA keys that fall
5508 beneath this limit will be ignored for user and host-based authentication.
5510 Feedback deraadt@ ok markus@
5512 OpenBSD-Commit-ID: 187931dfc19d51873df5930a04f2d972adf1f7f1
5514 commit 54b333d12e55e6560b328c737d514ff3511f1afd
5515 Author: djm@openbsd.org <djm@openbsd.org>
5516 Date: Sat Sep 17 10:33:18 2022 +0000
5518 upstream: add a RequiredRSASize for checking RSA key length in
5520 ssh(1). User authentication keys that fall beneath this limit will be
5521 ignored. If a host presents a host key beneath this limit then the connection
5522 will be terminated (unfortunately there are no fallbacks in the protocol for
5523 host authentication).
5525 feedback deraadt, Dmitry Belyavskiy; ok markus@
5527 OpenBSD-Commit-ID: 430e339b2a79fa9ecc63f2837b06fdd88a7da13a
5529 commit 07d8771bacfefbcfb37fa8a6dc6103bcc097e0ab
5530 Author: djm@openbsd.org <djm@openbsd.org>
5531 Date: Sat Sep 17 10:30:45 2022 +0000
5533 upstream: Add a sshkey_check_rsa_length() call for checking the
5535 length of an RSA key; ok markus@
5537 OpenBSD-Commit-ID: de77cd5b11594297eda82edc594b0d32b8535134
5539 commit 3991a0cf947cf3ae0f0373bcec5a90e86a7152f5
5540 Author: djm@openbsd.org <djm@openbsd.org>
5541 Date: Sat Sep 17 10:11:29 2022 +0000
5543 upstream: actually hook up restrict_websafe; the command-line flag
5545 was never actually used. Spotted by Matthew Garrett
5547 OpenBSD-Commit-ID: 0b363518ac4c2819dbaa3dfad4028633ab9cdff1
5549 commit 30b2a7e4291fb9e357f80a237931ff008d686d3b
5550 Author: djm@openbsd.org <djm@openbsd.org>
5551 Date: Fri Sep 16 06:55:37 2022 +0000
5553 upstream: correct error value
5555 OpenBSD-Commit-ID: 780efcbad76281f11f14b2a5ff04eb6db3dfdad4
5557 commit ac1ec9545947d9f9657259f55d04cb49d3a94c8a
5558 Author: djm@openbsd.org <djm@openbsd.org>
5559 Date: Fri Sep 16 03:33:14 2022 +0000
5561 upstream: sftp: Be a bit more clever about completions
5563 There are commands (e.g. "get" or "put") that accept two
5564 arguments, a local path and a remote path. However, the way
5565 current completion is written doesn't take this distinction into
5566 account and always completes remote or local paths.
5568 By expanding CMD struct and "cmds" array this distinction can be
5569 reflected and with small adjustment to completer code the correct
5570 path can be completed.
5572 By Michal Privoznik, ok dtucker@
5574 OpenBSD-Commit-ID: 1396d921c4eb1befd531f5c4a8ab47e7a74b610b
5576 commit 590db83384f9d99fc51c84505792d26d1ef60df9
5577 Author: djm@openbsd.org <djm@openbsd.org>
5578 Date: Fri Sep 16 03:13:34 2022 +0000
5580 upstream: sftp: Don't attempt to complete arguments for
5582 non-existent commands
5584 If user entered a non-existent command (e.g. because they made a
5585 typo) there is no point in trying to complete its arguments. Skip
5586 calling complete_match() if that's the case.
5588 From Michal Privoznik
5590 OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a
5592 commit ff9809fdfd1d9a91067bb14a77d176002edb153c
5593 Author: djm@openbsd.org <djm@openbsd.org>
5594 Date: Wed Sep 14 00:14:37 2022 +0000
5596 upstream: sk_enroll: never drop SSH_SK_USER_VERIFICATION_REQD flag
5600 Now that all FIDO signing calls attempt first without PIN and then
5601 fall back to trying PIN only if that attempt fails, we can remove the
5602 hack^wtrick that removed the UV flag from the keys returned during
5607 OpenBSD-Commit-ID: 684517608c8491503bf80cd175425f0178d91d7f
5609 commit 940dc10729cb5a95b7ee82c10184e2b9621c8a1d
5610 Author: djm@openbsd.org <djm@openbsd.org>
5611 Date: Wed Sep 14 00:13:13 2022 +0000
5613 upstream: a little extra debugging
5615 OpenBSD-Commit-ID: edf1601c1d0905f6da4c713f4d9cecc7d1c0295a
5617 commit 4b5f91cb959358141181b934156513fcb8a6c1e3
5618 Author: djm@openbsd.org <djm@openbsd.org>
5619 Date: Wed Sep 14 00:02:03 2022 +0000
5621 upstream: ssh-agent: attempt FIDO key signing without PIN and use
5623 the error to determine whether a PIN is required and prompt only if
5624 necessary. from Corinna Vinschen
5626 OpenBSD-Commit-ID: dd6be6a0b7148608e834ee737c3479b3270b00dd
5628 commit 113523bf0bc33600b07ebb083572c8c346b6fdf4
5629 Author: jmc@openbsd.org <jmc@openbsd.org>
5630 Date: Sun Sep 11 06:38:11 2022 +0000
5632 upstream: .Li -> .Vt where appropriate; from josiah frentsos,
5638 OpenBSD-Commit-ID: 565046e3ce68b46c2f440a93d67c2a92726de8ed
5640 commit 86af013b56cecb5ee58ae0bd9d495cd586fc5918
5641 Author: jsg@openbsd.org <jsg@openbsd.org>
5642 Date: Sat Sep 10 08:50:53 2022 +0000
5644 upstream: fix repeated words ok miod@ jmc@
5646 OpenBSD-Commit-ID: 6765daefe26a6b648cc15cadbbe337596af709b7
5648 commit 0ba39b93b326a7d5dfab776cc9b9d326161a9b16
5649 Author: djm@openbsd.org <djm@openbsd.org>
5650 Date: Fri Sep 9 03:31:42 2022 +0000
5652 upstream: notifier_complete(NULL, ...) is a noop, so no need to test
5654 that ctx!=NULL; from Corinna Vinschen
5656 OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a
5658 commit be197635329feb839865fdc738e34e24afd1fca8
5659 Author: Sam James <sam@gentoo.org>
5660 Date: Thu Sep 8 02:49:29 2022 +0100
5662 openbsd-compat/bsd-asprintf: add <stdio.h> include for vsnprintf
5664 Fixes the following build failure with Clang 15 on musl:
5666 bsd-asprintf.c:51:8: error: call to undeclared library function 'vsnprintf' with type 'int (char *, unsigned long, const char *, struct __va_list_tag *)'; ISO C99 and laterclang -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fstack-protector-strong -fPIE -I. -I. -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DSSHDIR=\"/etc/ssh\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/lib/misc/ssh-askpass\" -D_PATH_SFTP_SERVER=\"/usr/lib/misc/sftp-server\" -D_PATH_SSH_KEY_SIGN=\"/usr/lib/misc/ssh-keysign\" -D_PATH_SSH_PKCS11_HELPER=\"/usr/lib/misc/ssh-pkcs11-helper\" -D_PATH_SSH_SK_HELPER=\"/usr/lib/misc/ssh-sk-helper\" -D_PATH_SSH_PIDDIR=\"/run\" -D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c cipher-aes.c -o cipher-aes.o
5668 implicit function declarations [-Wimplicit-function-declaration]
5669 ret = vsnprintf(string, INIT_SZ, fmt, ap2);
5671 bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf'
5675 commit 6cb6f660bb35f77a0456dd2581ddf39c29398a5e
5676 Author: Darren Tucker <dtucker@dtucker.net>
5677 Date: Fri Sep 2 16:43:27 2022 +1000
5679 Remove DEF_WEAK, it's already in defines.h.
5681 commit ce39e7d8b70c4726defde5d3bc4cb7d40d131153
5682 Author: Darren Tucker <dtucker@dtucker.net>
5683 Date: Fri Sep 2 14:28:14 2022 +1000
5685 Resync arc4random with OpenBSD.
5687 This brings us up to current, including djm's random-reseeding change,
5688 as prompted by logan at cyberstorm.mu in bz#3467. It brings the
5689 platform-specific hooks from LibreSSL Portable, simplified to match our
5692 commit beaddde26f30e2195b8aa4f3193970e140e17305
5693 Author: Darren Tucker <dtucker@dtucker.net>
5694 Date: Fri Sep 2 14:20:04 2022 +1000
5696 Move OPENBSD ORIGINAL marker.
5698 Putting this after the copyright statement (which doesn't change)
5699 instead of before the version identifier (which does) prevents merge
5700 conflicts when resyncing changes.
5702 commit c83e467ead67a8cb48ef4bec8085d6fb880a2ff4
5703 Author: Darren Tucker <dtucker@dtucker.net>
5704 Date: Fri Sep 2 14:17:28 2022 +1000
5706 Remove arc4random_uniform from arc4random.c
5708 This was previously moved into its own file (matching OpenBSD) which
5709 prematurely committed in commit 73541f2.
5711 commit 5f45c2395c60865e59fa44152ff1d003a128c5bc
5712 Author: djm@openbsd.org <djm@openbsd.org>
5713 Date: Fri Sep 2 04:20:02 2022 +0000
5715 upstream: sk-usbhid: fix key_lookup() on tokens with built-in UV
5717 explicitly test whether the token performs built-in UV (e.g. biometric
5718 tokens) and enable UV in that case. From Pedro Martelletto via GHPR#388
5720 OpenBSD-Commit-ID: 007eb7e387d27cf3029ab06b88224e03eca62ccd
5722 commit 03277a4aa49b80af541a3e691f264c0c0d8f9cec
5723 Author: Darren Tucker <dtucker@dtucker.net>
5724 Date: Wed Aug 31 20:26:30 2022 +1000
5726 Move sftp from valgrind-2 to 3 to rebalance.
5728 commit fcf5365da69c516817321ba89c3a91df98d098df
5729 Author: djm@openbsd.org <djm@openbsd.org>
5730 Date: Wed Aug 31 02:56:40 2022 +0000
5732 upstream: whitespace
5734 OpenBSD-Commit-ID: c2bcbf93610d3d62ed206cdf9bf9ff98c6aaf232
5736 commit e60136a3d7a223dd8e84ba8a6895bc3142360993
5737 Author: Damien Miller <djm@mindrot.org>
5738 Date: Mon Aug 29 13:27:45 2022 +1000
5742 commit 2b02dcb505288c462d1b5dd1ac04e603d01340eb
5743 Author: Damien Miller <djm@mindrot.org>
5744 Date: Mon Aug 29 13:23:43 2022 +1000
5746 cross-sign allowed_signers with PGP key
5748 Provides continuity of trust from legacy PGP release key to
5749 the SSHSIG signing keys that we will use henceforth for git
5752 commit 51b345f177ae981b8755f6bdf8358b1cc5e83d67
5753 Author: Darren Tucker <dtucker@dtucker.net>
5754 Date: Sat Aug 27 21:49:27 2022 +1000
5756 Add libcrypt-devel to cygwin-release deps.
5758 Based on feedback from vinschen at redhat.com.
5760 commit 9f81736cf16dd8dda1c8942f1973a5f80b8cd78c
5761 Author: Darren Tucker <dtucker@dtucker.net>
5762 Date: Sat Aug 27 09:37:40 2022 +1000
5764 Add Windows 2022 test targets.
5766 commit 85e1a69243f12be8520438ad6a3cfdc0b7fcbb2d
5767 Author: Darren Tucker <dtucker@dtucker.net>
5768 Date: Fri Aug 26 16:26:06 2022 +1000
5770 Add cygwin-release test target.
5772 This also moves the cygwin package install from the workflow file to
5773 setup_ci.sh so that we can install different sets of Cygwin packages
5774 for different test configs.
5776 commit 92382dbe8bf9ea1225b16858f9b9b208c15c7e8d
5777 Author: djm@openbsd.org <djm@openbsd.org>
5778 Date: Fri Aug 26 08:16:27 2022 +0000
5780 upstream: whitespace
5782 OpenBSD-Commit-ID: a5d015efbfd228dc598ffdef612d2da3a579e5d8
5784 commit 70a5de0a50e84d7250eb4e4537f765599f64c4af
5785 Author: djm@openbsd.org <djm@openbsd.org>
5786 Date: Fri Aug 26 08:12:56 2022 +0000
5788 upstream: whitespace
5790 OpenBSD-Commit-ID: d297e4387935d4aef091c5e9432578c2e513f538
5792 commit 3a683a19fd116ea15ebf8aa13d02646cceb302a9
5793 Author: Damien Miller <djm@mindrot.org>
5794 Date: Fri Aug 26 14:23:55 2022 +1000
5796 initial list of allowed signers
5798 commit 6851f4b8c3fc1b3e1114c56106e4dc31369c8513
5799 Author: Darren Tucker <dtucker@dtucker.net>
5800 Date: Fri Aug 19 17:22:18 2022 +1000
5802 Install Cygwin packages based on OS not config.
5804 commit f96480906893ed93665df8cdf9065865c51c1475
5805 Author: djm@openbsd.org <djm@openbsd.org>
5806 Date: Fri Aug 19 06:07:47 2022 +0000
5808 upstream: attemp FIDO key signing without PIN and use the error
5810 code returned to fall back only if necessary. Avoids PIN prompts for FIDO
5811 tokens that don't require them; part of GHPR#302
5813 OpenBSD-Commit-ID: 4f752aaf9f2e7c28bcaaf3d4f8fc290131bd038e
5815 commit 5453333b5d28e313284cb9aae82899704103f98d
5816 Author: djm@openbsd.org <djm@openbsd.org>
5817 Date: Fri Aug 19 05:53:28 2022 +0000
5819 upstream: remove incorrect check that can break enrolling a
5821 resident key (introduced in r1.40)
5823 OpenBSD-Commit-ID: 4cab364d518470e29e624af3d3f9ffa9c92b6f01
5825 commit ff89b1bed80721295555bd083b173247a9c0484e
5826 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5827 Date: Fri Aug 19 04:02:46 2022 +0000
5829 upstream: Strictly enforce the maximum allowed SSH2 banner size in
5831 ssh-keyscan and prevent a one-byte buffer overflow. Patch from Qualys, ok
5834 OpenBSD-Commit-ID: 6ae664f9f4db6e8a0589425f74cd0bbf3aeef4e4
5836 commit 1b470b9036639cef4f32fb303bb35ea0b711178d
5837 Author: Darren Tucker <dtucker@dtucker.net>
5838 Date: Fri Aug 19 15:18:09 2022 +1000
5840 Fix cygwin conditional steps.
5842 commit fd6ee741ab16714b7035d60aca924123ba28135a
5843 Author: Darren Tucker <dtucker@dtucker.net>
5844 Date: Fri Aug 19 15:12:57 2022 +1000
5846 Add a bit more debug output.
5848 commit a9305c4c739f4d91a3d3a92c0b6d4949404a36c5
5849 Author: Darren Tucker <dtucker@dtucker.net>
5850 Date: Fri Aug 12 15:08:47 2022 +1000
5852 Add Cygwin (on windows-2019) test target.
5854 In addition to installing the requisite Cygwin packages, we also need to
5855 explicitly invoke "sh" for steps that run other scripts since the runner
5856 environment doesn't understand #! paths.
5858 commit 5062ad48814b06162511c4f5924a33d97b6b2566
5859 Author: djm@openbsd.org <djm@openbsd.org>
5860 Date: Fri Aug 19 03:06:30 2022 +0000
5862 upstream: double free() in error path; from Eusgor via GHPR333
5864 OpenBSD-Commit-ID: 39f35e16ba878c8d02b4d01d8826d9b321be26d4
5866 commit 5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e
5867 Author: Darren Tucker <dtucker@dtucker.net>
5868 Date: Thu Aug 18 21:36:39 2022 +1000
5870 Check for perms to run agent-getpeereid test.
5872 Ubuntu 22.04 defaults to private home dirs which prevents "nobody"
5873 running ssh-add during the agent-getpeereid test. Check for this and
5874 add the necessary permissions.
5876 commit cd06a76b7ccc706e2bb4f1cc4aa9e9796a28a812
5877 Author: Damien Miller <djm@mindrot.org>
5878 Date: Wed Aug 17 16:04:16 2022 +1000
5880 on Cygwin, prefer WinHello FIDO device
5882 If no FIDO device was explictly specified, then prefer the
5883 windows://hello FIDO device. An exception to this is when
5884 probing resident FIDO keys, in which case hardware FIDO
5885 devices are preferred.
5887 commit 47f72f534ac5cc2cd3027675a3df7b00a8f77575
5888 Author: djm@openbsd.org <djm@openbsd.org>
5889 Date: Wed Aug 17 06:01:57 2022 +0000
5891 upstream: add an extra flag to sk_probe() to indicate whether we're
5893 probing for a FIDO resident key or not. Unused here, but will make like
5896 OpenBSD-Commit-ID: 432c8ff70e270378df9dbceb9bdeaa5b43b5a832
5898 commit edb0bcb3c79b16031dc87a8e57aecc3c4a3414f0
5899 Author: jmc@openbsd.org <jmc@openbsd.org>
5900 Date: Tue Aug 16 20:24:08 2022 +0000
5902 upstream: use .Cm for "sign"; from josiah frentsos
5904 OpenBSD-Commit-ID: 7f80a53d54857ac6ae49ea6ad93c5bd12231d1e4
5906 commit cccb011e130cbbac538b1689d10e4a067298df8b
5907 Author: Corinna Vinschen <vinschen@redhat.com>
5908 Date: Thu Aug 11 20:19:35 2022 +0200
5910 Revert "check_sk_options: add temporary WinHello workaround"
5912 Cygwin now comes with libfido2 1.11.0, so this workaround
5913 isn't required anymore.
5915 This reverts commit 242c044ab111a37aad3b0775727c36a4c5f0102c.
5917 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
5919 commit 9468cd7cf9d989dfa2ac20e2a0268ba6e93bfa5a
5920 Author: Corinna Vinschen <vinschen@redhat.com>
5921 Date: Thu Aug 11 20:18:17 2022 +0200
5923 fido_dev_is_winhello: return 0, not "false"
5925 "false" is not used anywhere in OpenSSH, so return 0 like
5928 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
5930 commit 730a80609472ee0451c99482d75c9c41f3ebc42d
5931 Author: djm@openbsd.org <djm@openbsd.org>
5932 Date: Fri Aug 12 05:20:28 2022 +0000
5934 upstream: sftp-server: support home-directory request
5936 Add support to the sftp-server for the home-directory extension defined
5937 in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the
5938 existing expand-path@openssh.com, but uses a more official protocol name,
5939 and so is a bit more likely to be implemented by non-OpenSSH clients.
5941 From Mike Frysinger, ok dtucker@
5943 OpenBSD-Commit-ID: bfc580d05cc0c817831ae7ecbac4a481c23566ab
5945 commit 5e820bf79ce3ce99ef7e98b0ab642b0a0a4f396c
5946 Author: Darren Tucker <dtucker@dtucker.net>
5947 Date: Fri Aug 12 14:56:55 2022 +1000
5949 Replace deprecated ubuntu-18.04 runners with 22.04
5951 commit 87b0d9c1b789d3ff958ec45df2ac912e24461bae
5952 Author: Darren Tucker <dtucker@dtucker.net>
5953 Date: Thu Aug 11 22:48:23 2022 +1000
5955 Add a timegm implementation from Heimdal via Samba.
5957 Fixes build on (at least Solaris 10).
5959 commit d0c4fa58594577994921b593f10037c5282597ca
5960 Author: Darren Tucker <dtucker@dtucker.net>
5961 Date: Thu Aug 11 14:23:58 2022 +1000
5963 Rerun tests if any .github config file changes.
5965 commit 113fe6c77ab43769fc61e953d07cb619fd7ea54b
5966 Author: Darren Tucker <dtucker@dtucker.net>
5967 Date: Thu Aug 11 13:33:51 2022 +1000
5969 Skip hostbased during Valgrind tests.
5971 Valgrind doesn't let ssh exec ssh-keysign (because it's setuid) so skip
5972 it during the Valgrind based tests.
5974 See https://bugs.kde.org/show_bug.cgi?id=119404 for a discussion of this
5975 (ironically there the problematic binary was ssh(1) back when it could
5978 commit b98a42afb69d60891eb0488935990df6ee571c4d
5979 Author: djm@openbsd.org <djm@openbsd.org>
5980 Date: Thu Aug 11 01:57:50 2022 +0000
5982 upstream: add some tests for parse_absolute_time(), including cases
5984 where it is forced to the UTC timezone. bz3468 ok dtucker
5986 OpenBSD-Regress-ID: ea07ca31c2f3847a38df028ca632763ae44e8759
5988 commit ec1ddb72a146fd66d18df9cd423517453a5d8044
5989 Author: djm@openbsd.org <djm@openbsd.org>
5990 Date: Thu Aug 11 01:56:51 2022 +0000
5992 upstream: allow certificate validity intervals, sshsig verification
5994 times and authorized_keys expiry-time options to accept dates in the UTC time
5995 zone in addition to the default of interpreting them in the system time zone.
5996 YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if
5997 suffixed with a 'Z' character.
5999 Also allow certificate validity intervals to be specified in raw
6000 seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This
6001 is intended for use by regress tests and other tools that call
6002 ssh-keygen as part of a CA workflow.
6006 OpenBSD-Commit-ID: 454db1cdffa9fa346aea5211223a2ce0588dfe13
6008 commit 4df246ec75751da7eb925e1880498300d8bda187
6009 Author: Darren Tucker <dtucker@dtucker.net>
6010 Date: Thu Aug 11 10:23:55 2022 +1000
6012 Fix conditional for running hostbased tests.
6014 commit 2580916e48721802220c61ce9e0df1297c00bc07
6015 Author: Damien Miller <djm@mindrot.org>
6016 Date: Thu Aug 11 08:58:28 2022 +1000
6018 fix SANDBOX_SECCOMP_FILTER_DEBUG
6020 commit fdbd5bf507fc271ff813714fab8a72ff2c6cb5ca
6021 Author: Darren Tucker <dtucker@dtucker.net>
6022 Date: Wed Aug 10 17:35:52 2022 +1000
6024 Test hostbased auth on github runners.
6026 commit 7e2f51940ba48a1c0fae1107801ea643fa83c971
6027 Author: Darren Tucker <dtucker@dtucker.net>
6028 Date: Wed Aug 10 17:25:24 2022 +1000
6030 Rename our getentropy to prevent possible loops.
6032 Since arc4random seeds from getentropy, and we use OpenSSL for that
6033 if enabled, there's the possibility that if we build on a system that
6034 does not have getentropy then run on a system that does have it, then
6035 OpenSSL could end up calling our getentropy and getting stuck in a loop.
6036 Pointed out by deraadt@, ok djm@
6038 commit 7a01f61be8d0aca0e975e7417f26371495fe7674
6039 Author: Darren Tucker <dtucker@dtucker.net>
6040 Date: Mon Aug 8 12:17:04 2022 +1000
6042 Actually put HAVE_STDINT_H around the stdint.h.
6044 commit 73541f29f0b50480da6c20dceb7a7191bd8ea7d3
6045 Author: Darren Tucker <dtucker@dtucker.net>
6046 Date: Mon Aug 8 10:30:34 2022 +1000
6048 Give unused param a name.
6050 Fixes builds on platforms that do have fido2 but don't have
6051 fido_dev_is_winhello.
6053 commit 2a108c0ea960381bd9b14ee0d84e818a23df4482
6054 Author: djm@openbsd.org <djm@openbsd.org>
6055 Date: Fri Aug 5 05:01:40 2022 +0000
6057 upstream: don't prompt for FIDO passphrase before attempting to enroll
6059 the credential, just let the enroll operating fail and we'll attempt to get a
6060 PIN anyway. Might avoid some unneccessary PIN prompts.
6062 Part of GHPR#302 from Corinna Vinschen; ok dtucker@
6064 OpenBSD-Commit-ID: bd5342ffc353ee37d39617906867c305564d1ce2
6066 commit 2886975c0ad9244e60dc5e4be34fde3aa573a4b5
6067 Author: Corinna Vinschen <vinschen@redhat.com>
6068 Date: Fri Feb 11 14:33:41 2022 +0100
6070 sk_sign: set FIDO2 uv attribute explicitely for WinHello
6072 WinHello via libfido2 performs user verification by default.
6073 However, if we stick to that, there's no way to differentiate
6074 between keys created with or without "-O verify-required".
6075 Set FIDO2 uv attribute explicitely to FIDO_OPT_FALSE, then check
6076 if user verification has been requested.
6078 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
6080 commit 242c044ab111a37aad3b0775727c36a4c5f0102c
6081 Author: Corinna Vinschen <vinschen@redhat.com>
6082 Date: Tue Feb 15 11:28:08 2022 +0100
6084 check_sk_options: add temporary WinHello workaround
6086 Up to libfido 1.10.0, WinHello advertises "clientPin" rather
6087 than "uv" capability. This is fixed in 1.11.0. For the time
6088 being, workaround it here.
6090 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
6092 commit 78774c08cc4b4997382975b0f414a86e06b6780c
6093 Author: Corinna Vinschen <vinschen@redhat.com>
6094 Date: Thu Feb 10 18:19:29 2022 +0100
6096 compat code for fido_dev_is_winhello()
6098 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
6100 commit 3d3a932a019aedfb891e0779bb4990cd5008a390
6101 Author: Darren Tucker <dtucker@dtucker.net>
6102 Date: Fri Aug 5 13:12:27 2022 +1000
6104 Factor out getrnd() and rename to getentropy().
6106 Factor out the arc4random seeding into its own file and change the
6107 interface to match getentropy. Use native getentropy if available.
6108 This will make it easier to resync OpenBSD changes to arc4random.
6109 Prompted by bz#3467, ok djm@.
6111 commit 9385d277b787403be9dfcb229cf372202496d2f3
6112 Author: Darren Tucker <dtucker@dtucker.net>
6113 Date: Thu Aug 4 18:55:48 2022 +1000
6115 Include CHANNEL and FIDO2 libs in configure output
6117 commit 141535b904b6fba01724444f38193a8599201f82
6118 Author: djm@openbsd.org <djm@openbsd.org>
6119 Date: Mon Aug 1 11:09:26 2022 +0000
6121 upstream: avoid double-free in error path introduced in r1.70; report
6123 and fix based on GHPR#332 by v-rzh ok dtucker@
6125 OpenBSD-Commit-ID: 3d21aa127b1f37cfc5bdc21461db369a663a951f
6127 commit dba7099ffcba3ca07b3946f017ba6a4c3158d9b1
6128 Author: Darren Tucker <dtucker@dtucker.net>
6129 Date: Wed Jul 27 18:40:12 2022 +1000
6131 Remove deprecated MacOS 10.15 runners.
6133 commit 722a56439aa5972c830e4a9a724cf52aff4a950a
6134 Author: Darren Tucker <dtucker@dtucker.net>
6135 Date: Wed Jul 27 18:31:14 2022 +1000
6137 Move stale-configure check as early as possible.
6139 We added a check in Makefile to catch the case where configure needs to
6140 be rebuilt, however this did not happen until a build was attempted in
6141 which case all of the work done by configure was wasted. Move this check
6142 to the start of configure to catch it as early as possible. ok djm@
6144 commit 099d6b56288b421ba38531d26dc1bd6bb685e311
6145 Author: Darren Tucker <dtucker@dtucker.net>
6146 Date: Fri Jul 22 10:47:19 2022 +1000
6148 Move libcrypto into CHANNELLIBS.
6150 This will result in sftp, sftp-server and scp no longer being linked
6151 against libcrypto. ok djm@
6153 commit 1bdf86725b77733bb5f17c54888b88a10b2f6538
6154 Author: Darren Tucker <dtucker@dtucker.net>
6155 Date: Fri Jul 22 10:45:47 2022 +1000
6157 Remove seed_rng calls from scp, sftp, sftp-server.
6159 These binaries don't use OpenSSL's random functions. The next step
6160 will be to stop linking them against libcrypto. ok djm@
6162 commit d73f77b8cb9b422f1ac4facee7890aa10ff2bc21
6163 Author: Darren Tucker <dtucker@dtucker.net>
6164 Date: Fri Jul 22 09:51:51 2022 +1000
6166 Group libcrypto and PRNGD checks together.
6168 They're related more than the libcrypt or libiaf checks which are
6169 currently between them. ok djm@
6171 commit f117e372b3f42f2fbdb0a578d063b2609ab58e1f
6172 Author: Darren Tucker <dtucker@dtucker.net>
6173 Date: Fri Jul 22 09:24:45 2022 +1000
6175 Do not link scp, sftp and sftp-server w/ zlib.
6177 Some of our binaries (eg sftp, sftp-server, scp) do not interact with
6178 the channels code and thus do use libraries such as zlib and libcrypto
6179 although they are linked with them. This adds a CHANNELLIBS and starts
6180 by moving zlib into it, which means the aformentioned binaries are no
6181 longer linked against zlib. ok djm@
6183 commit 800c2483e68db38bd1566ff69677124be974aceb
6184 Author: Darren Tucker <dtucker@dtucker.net>
6185 Date: Mon Jul 25 21:49:04 2022 +1000
6187 Remove workarounds for OpenSSL missing AES-CTR.
6189 We have some compatibility hacks that were added to support OpenSSL
6190 versions that do not support AES CTR mode. Since that time, however,
6191 the minimum OpenSSL version that we support has moved to 1.0.1 which
6192 *does* have CTR, so this is no longer needed. ok djm@
6194 commit b7c56b65c12f51fe0dbae798d19c8f58224a5d95
6195 Author: Darren Tucker <dtucker@dtucker.net>
6196 Date: Mon Jul 25 21:43:00 2022 +1000
6198 Remove workarounds for OpenSSL missing AES-GCM.
6200 We have some compatibility hacks that were added to support OpenSSL
6201 versions that do not support AES GCM mode. Since that time, however,
6202 the minimum OpenSSL version that we support has moved to 1.0.1 which
6203 *does* have GCM, so this is no longer needed. ok djm@
6205 commit 5a4a9f7a968fbf92cc1eac519c65638e79ae9f1f
6206 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6207 Date: Mon Jul 25 07:12:45 2022 +0000
6209 upstream: Restore missing "!" in TEST_SSH_ELAPSED_TIMES test.
6211 OpenBSD-Regress-ID: 38783f9676ec348c5a792caecee9a16e354b37b0
6213 commit 0ff886be132299386cc29d87c2aa16ff68a1aa08
6214 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6215 Date: Sun Jul 24 23:29:10 2022 +0000
6217 upstream: Test TEST_SSH_ELAPSED_TIMES for empty string not
6219 executable. No-op on most platforms but should prevent warnings in -portable
6220 on systems that don't have 'date %s'.
6222 OpenBSD-Regress-ID: e39d79867b8065e33d0c5926fa1a31f85659d2a4
6224 commit f69319ad8ad1dd50f90bbcf5912e11cc8ed3e037
6225 Author: Darren Tucker <dtucker@dtucker.net>
6226 Date: Sat Jul 23 14:38:22 2022 +1000
6228 Convert "have_prog" function into "which".
6230 "which" and its behaviour is not standardized, so convert the existing
6231 have_prog function into "which" so we can rely on it being available
6232 and what its semantics are. Add a have_prog wrapper that maintains the
6235 commit ea7ecc2c3ae39fdf5c6ad97b7bc0b47a98847f43
6236 Author: Darren Tucker <dtucker@dtucker.net>
6237 Date: Sat Jul 23 14:36:38 2022 +1000
6239 Skip scp3 test if there's no scp on remote path.
6241 scp -3 ends up using the scp that's in the remote path and will fail if
6242 one is not available. Based on a patch from rapier at psc.edu.
6244 commit c46f6fed419167c1671e4227459e108036c760f8
6245 Author: Damien Miller <djm@mindrot.org>
6246 Date: Wed Jul 20 13:39:14 2022 +1000
6248 crank SSH_SK_VERSION_MAJOR in sk-dummy.so
6250 commit f208e3b9ffb5ee76cf9c95df7ff967adc7f51c7d
6251 Author: djm@openbsd.org <djm@openbsd.org>
6252 Date: Wed Jul 20 03:33:22 2022 +0000
6254 upstream: ssh-keygen: fix touch prompt, pin retries;
6256 part of GHPR329 from Pedro Martelletto
6258 OpenBSD-Commit-ID: 75d1005bd2ef8f29fa834c90d2684e73556fffe8
6260 commit 8638a2ce7e90c8a51d9af3143404282126c524f8
6261 Author: djm@openbsd.org <djm@openbsd.org>
6262 Date: Wed Jul 20 03:31:42 2022 +0000
6264 upstream: sk-usbhid: preserve error code returned by key_lookup()
6266 it conveys useful information, such as the supplied pin being wrong.
6268 Part of GHPR329 from Pedro Martelletto
6270 OpenBSD-Commit-ID: c0647eb9290f793add363d81378439b273756c1b
6272 commit 9ab929ca2d820520327b41929372bcb9e261534c
6273 Author: djm@openbsd.org <djm@openbsd.org>
6274 Date: Wed Jul 20 03:29:14 2022 +0000
6276 upstream: when enrolling a resident key on a security token, check
6278 if a credential with matching application and user ID strings already exists.
6279 if so, prompt the user for confirmation before overwriting the credential.
6281 patch from Pedro Martelletto via GHPR329
6283 NB. cranks SSH_SK_VERSION_MAJOR, so any third-party FIDO middleware
6284 implementations will need to adjust
6286 OpenBSD-Commit-ID: e45e9f1bf2b2f32d9850669e7a8dbd64acc5fca4
6288 commit 5bcfc788b38d5b64e4c347bdc04bd9a01bbc36da
6289 Author: djm@openbsd.org <djm@openbsd.org>
6290 Date: Wed Jul 20 03:13:04 2022 +0000
6292 upstream: pull passphrase reading and confirmation into a separate
6294 function so it can be used for FIDO2 PINs; no functional change
6296 OpenBSD-Commit-ID: bf34f76b8283cc1d3f54633e0d4f13613d87bb2f
6298 commit eb679e2959bdb15454eb94751930eb4c9110da94
6299 Author: Darren Tucker <dtucker@dtucker.net>
6300 Date: Fri Jul 15 21:31:48 2022 +1000
6302 Move vmshutdown to first step.
6304 If a previous run on a physical runner has failed to clean up, the next
6305 run will fail because it'll try to check out the code to a broken
6306 directory mount. Make cleanup the first step.
6308 commit 46b91b70ff3cb9c147e2875ef5dc609fd64c0c96
6309 Author: Darren Tucker <dtucker@dtucker.net>
6310 Date: Fri Jul 15 20:25:27 2022 +1000
6312 Rename bbone test target to ARM.
6314 commit 751d22cdeffed9fe921db78eedc32a29f9e80510
6315 Author: Darren Tucker <dtucker@dtucker.net>
6316 Date: Fri Jul 15 13:37:29 2022 +1000
6318 Add AUDIT_ARCH_PPC to supported seccomp arches.
6320 Patch from dries.deschout at dodeco.eu.
6322 commit a061792a6e8d235fc40a9b5d4c22a1762bb75a7b
6323 Author: Darren Tucker <dtucker@dtucker.net>
6324 Date: Thu Jul 14 19:20:24 2022 +1000
6326 Remove unintended changes.
6328 I inadvertently included a couple of local changes with the OpenSSL
6329 3.0.4 change. Revert, anything that should be there will be committed
6332 commit 527cb43fa1b4e55df661feabbac51b8e608b6519
6333 Author: Darren Tucker <dtucker@dtucker.net>
6334 Date: Thu Jul 14 11:22:08 2022 +1000
6336 Return ERANGE from getcwd() if buffer size is 1.
6338 If getcwd() is supplied a buffer size of exactly 1 and a path of "/", it
6339 could result in a nul byte being written out of array bounds. POSIX says
6340 it should return ERANGE if the path will not fit in the available buffer
6341 (with terminating nul). 1 byte cannot fit any possible path with its nul,
6342 so immediately return ERANGE in that case.
6344 OpenSSH never uses getcwd() with this buffer size, and all current
6345 (and even quite old) platforms that we are currently known to work
6346 on have a native getcwd() so this code is not used on those anyway.
6347 Reported by Qualys, ok djm@
6349 commit 36857fefd8849c4b0e877cfd9d1eb22f79b76650
6350 Author: Darren Tucker <dtucker@dtucker.net>
6351 Date: Thu Jul 14 10:02:35 2022 +1000
6353 Split README.platform into its own line.
6355 README.platform has general platform-specific information, having it
6356 following text about FIDO2 on the same line could imply that it only
6357 has information about FIDO2.
6359 commit 00a496c6c14f2d41f2a9365714d494dd5f3aac9f
6360 Author: Darren Tucker <dtucker@dtucker.net>
6361 Date: Thu Jul 14 09:56:01 2022 +1000
6363 Clarify README.md text.
6365 Clarify the text about the implications of building without OpenSSL, and
6366 prefix the "configure --help" example command with a "./" so it's likely
6367 to work as-is in more shells. From bz#3461.
6369 commit f40b52f21fbc52eb513279168a49d3285c65256c
6370 Author: Darren Tucker <dtucker@dtucker.net>
6371 Date: Tue Jul 12 19:48:44 2022 +1000
6373 Remove special casing of crypt().
6375 Configure goes to some lengths to pick crypt() from either libcrypt
6376 or OpenSSL's libcrypto because they can more or less featureful (eg
6377 supporting md5-style passwords).
6379 OpenSSL removed its crypt() interface in 2002:
6380 https://github.com/openssl/openssl/commit/69deec58 so these hijinks
6381 should no longer be necessary. This also only links sshd with libcrypt
6382 which is the only thing that needs it. ok djm@
6384 commit 76f4e48631d7b09fb243b47d7b393d100d3741b7
6385 Author: Darren Tucker <dtucker@dtucker.net>
6386 Date: Wed Jul 13 13:17:47 2022 +1000
6388 Only refuse to use OpenSSL 3.0.4 on x86_64.
6390 The potential RCE only impacts x86_64, so only refuse to use it if we're
6391 targetting a potentially impacted architecture. ok djm@
6393 commit e75bbc1d88491fa85e61b2cc8783d4bbd00cd131
6394 Author: Darren Tucker <dtucker@dtucker.net>
6395 Date: Tue Jul 12 14:37:15 2022 +1000
6397 Capture stderr output from configure.
6399 commit d9eaea4bea6271bcee6a2b9428f1271faf2d033b
6400 Author: Darren Tucker <dtucker@dtucker.net>
6401 Date: Tue Jul 12 12:54:49 2022 +1000
6403 Refuse to use OpenSSL 3.0.4 due to potential RCE.
6405 OpenSSL has a potential RCE in its RSA implementation (CVE-2022-2274)
6406 so refuse to use that specific version.
6408 commit fb2f3a61bf3d28fff285524535f7ffcd177c9235
6409 Author: Darren Tucker <dtucker@dtucker.net>
6410 Date: Tue Jul 12 12:54:24 2022 +1000
6412 Move unset to before we set anything.
6414 commit c483a5c0fb8e8b8915fad85c5f6113386a4341ca
6415 Author: Darren Tucker <dtucker@dtucker.net>
6416 Date: Wed Jul 6 11:52:54 2022 +1000
6418 Test against openssl-3.0.5.
6420 commit 669a56bcfe73f8b985f2bba476ba834d55253acf
6421 Author: Darren Tucker <dtucker@dtucker.net>
6422 Date: Tue Jul 5 18:35:53 2022 +1000
6424 Update sanitizer test targets:
6426 - remove clang-sanitize-memory for now. It takes so long that the test
6428 - add gcc sanitize-address and sanitize-undefined test targets.
6430 commit 48cc68b69118b3ce8d07fd4f82e00d58667d5379
6431 Author: Darren Tucker <dtucker@dtucker.net>
6432 Date: Tue Jul 5 16:23:28 2022 +1000
6434 Add GCC address sanitizer build/test.
6436 commit 55c60bdd39b82457e92efa77da8d16cfa6a49391
6437 Author: Darren Tucker <dtucker@dtucker.net>
6438 Date: Tue Jul 5 12:02:33 2022 +1000
6440 Move sanitizer logs into regress for collection.
6442 commit 35ef2b3b6ef198f8574904a45780487ec2f17858
6443 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6444 Date: Mon Jul 4 09:10:31 2022 +0000
6446 upstream: Add TEST_REGRESS_CACHE_DIR.
6448 If set, it is used to cache regress test names that have succeeded and
6449 skip those on a re-run.
6451 OpenBSD-Regress-ID: a7570dd29a58df59f2cca647c3c2ec989b49f247
6453 commit 7394ed80c4de8b228a43c8956cf2fa1b9c6b2622
6454 Author: Darren Tucker <dtucker@dtucker.net>
6455 Date: Sun Jul 3 21:46:44 2022 +1000
6457 Add clang sanitizer tests.
6459 commit bfce0e66b6017a9bfab450b9dc7d4b16f90de817
6460 Author: Darren Tucker <dtucker@dtucker.net>
6461 Date: Sun Jul 3 18:14:09 2022 +1000
6463 Skip all rlimit tests when sandboxing disabled.
6465 The rlimit tests can hang when being run with some compiler sanitizers
6466 so skip all of them if sandbox=no.
6468 commit 6208d611520f9ea94d5369f9da404b709930029d
6469 Author: Darren Tucker <dtucker@dtucker.net>
6470 Date: Sun Jul 3 17:54:49 2022 +1000
6472 Move checks for pollfd.fd and nfds_t.
6474 Move the checks for struct pollfd.fd and nfds_t to before the sandboxing
6475 checks. This groups all the sandbox checks together so we can skip them
6476 all when sandboxing is disabled.
6478 commit 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b
6479 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6480 Date: Fri Jul 1 05:08:23 2022 +0000
6482 upstream: Remove leftover line.
6484 Remove extra line leftover from merge conflict. ok djm@
6486 OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e
6488 commit 7ec81daad0e03a64e8d91c5590960c48c1a899a3
6489 Author: djm@openbsd.org <djm@openbsd.org>
6490 Date: Fri Jul 1 04:45:50 2022 +0000
6492 upstream: use consistent field names (s/char/byte)
6494 in format description
6496 OpenBSD-Commit-ID: 3de33572733ee7fcfd7db33d37db23d2280254f0
6498 commit 32e82a392d9f263485effdd606ff5862d289a4a0
6499 Author: Darren Tucker <dtucker@dtucker.net>
6500 Date: Fri Jul 1 13:55:19 2022 +1000
6502 Skip select+rlimit check if sandboxing is disabled
6504 It's not needed in that case, and the test can fail when being built
6505 with some compiler memory sanitizer flags. bz#3441
6507 commit 4be7184ebe2a2ccef175983517a35ee06766e1b4
6508 Author: djm@openbsd.org <djm@openbsd.org>
6509 Date: Fri Jul 1 03:52:57 2022 +0000
6511 upstream: bump up loglevel from debug to info when unable to open
6513 authorized keys/principals file for errno != ENOENT; bz2042 ok dtucker
6515 OpenBSD-Commit-ID: e79aa550d91ade6a80f081bda689da24c086d66b
6517 commit 6c31ba10e97b6953c4f325f526f3e846dfea647a
6518 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6519 Date: Fri Jul 1 03:39:44 2022 +0000
6521 upstream: Don't leak the strings allocated by order_hostkeyalgs()
6523 and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
6524 github PR#324 from ZoltanFridrich, ok djm@
6526 This is a roll-forward of the previous rollback now that the required
6527 changes in compat.c have been done.
6529 OpenBSD-Commit-ID: c7cd93730b3b9f53cdad3ae32462922834ef73eb
6531 commit 486c4dc3b83b4b67d663fb0fa62bc24138ec3946
6532 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6533 Date: Fri Jul 1 03:35:45 2022 +0000
6535 upstream: Always return allocated strings from the kex filtering so
6537 that we can free them later. Fix one leak in compat_kex_proposal. Based on
6538 github PR#324 from ZoltanFridrich with some simplications by me. ok djm@
6540 OpenBSD-Commit-ID: 9171616da3307612d0ede086fd511142f91246e4
6542 commit 96faa0de6c673a2ce84736eba37fc9fb723d9e5c
6543 Author: djm@openbsd.org <djm@openbsd.org>
6544 Date: Fri Jul 1 00:36:30 2022 +0000
6546 upstream: ignore SIGPIPE earlier in main(), specifically before
6548 muxclient() which performs operations that could cause one; Reported by Noam
6549 Lewis via bz3454, ok dtucker@
6551 OpenBSD-Commit-ID: 63d8e13276869eebac6d7a05d5a96307f9026e47
6553 commit 33efac790f6b09d54894ba6c3e17dfb08b6fc7e1
6554 Author: jmc@openbsd.org <jmc@openbsd.org>
6555 Date: Tue Jun 28 06:09:14 2022 +0000
6557 upstream: reflect the update to -D arg name in usage();
6559 OpenBSD-Commit-ID: abdcde4f92b1ef094ae44210ee99d3b0155aad9c
6561 commit c71a1442d02f0a3586109dfe2cb366de36dee08e
6562 Author: Darren Tucker <dtucker@dtucker.net>
6563 Date: Wed Jun 29 18:28:47 2022 +1000
6565 Update OpenSSL tests to the most recent releases.
6567 commit 2a822f29300b2de7335fbff65f0b187a0c582304
6568 Author: djm@openbsd.org <djm@openbsd.org>
6569 Date: Mon Jun 27 21:41:55 2022 +0000
6571 upstream: allow arguments to sftp -D option, e.g. sftp -D
6573 "/usr/libexec/sftp-server -el debug3"
6577 OpenBSD-Commit-ID: 5a002b9f3a7aef2731fc0ffa9c921cf15f38ecce
6579 commit 2369a2810187e08f2af5d58b343956062fb96ee8
6580 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6581 Date: Fri Jun 24 10:45:06 2022 +0000
6583 upstream: Roll back previous KEX changes as they aren't safe until
6585 compat_pkalg_proposal and friends always allocate their returned strings.
6588 OpenBSD-Commit-ID: 1c7a88a0d5033f42f88ab9bec58ef1cf72c81ad0
6590 commit 646686136c34c2dbf6a01296dfaa9ebee029386d
6591 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6592 Date: Fri Jun 24 04:37:00 2022 +0000
6594 upstream: Don't leak the strings allocated by order_hostkeyalgs()
6596 and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
6597 github PR#324 from ZoltanFridrich, ok djm@
6599 OpenBSD-Commit-ID: b2f6e5f60f2bba293b831654328a8a0035ef4a1b
6601 commit 193c6d8d905dde836b628fc07a7b9cf2d347e2a3
6602 Author: Darren Tucker <dtucker@dtucker.net>
6603 Date: Sat Jun 25 12:16:15 2022 +1000
6605 Zero out LIBFIDO2 when SK support not usable.
6607 Prevents us from trying to link them into ssh-sk-helper and failing to
6610 commit 40f5d849d25c60b4ae21261e78484d435f5cfd51
6611 Author: Darren Tucker <dtucker@dtucker.net>
6612 Date: Sat Jun 25 11:47:28 2022 +1000
6614 Disable SK support if FIDO libs not found.
6616 commit 5fd922ade1b25880fe8a8249f5c0385e413108f9
6617 Author: Damien Miller <djm@mindrot.org>
6618 Date: Fri Jun 24 14:43:54 2022 +1000
6620 fix broken case statement in previous
6622 commit f51423bdaf0008d46b6af082bcfd7a22a87375f0
6623 Author: Damien Miller <djm@mindrot.org>
6624 Date: Fri Jun 24 14:40:42 2022 +1000
6626 request 1.1x API compatibility for OpenSSL >=3.x
6628 idea/patch from Pedro Martelletto via GHPR#322; ok dtucker@
6630 commit 455cee8d6c2e4c48c5af9faead3599c49948411e
6631 Author: djm@openbsd.org <djm@openbsd.org>
6632 Date: Fri Jun 24 04:27:14 2022 +0000
6634 upstream: make it clear that RekeyLimit applies to both transmitted
6636 and received data. GHPR#328 from Jan Pazdziora
6638 OpenBSD-Commit-ID: d180a905fec9ff418a75c07bb96ea41c9308c3f9
6640 commit 17904f05802988d0bb9ed3c8d1d37411e8f459c3
6641 Author: tobhe@openbsd.org <tobhe@openbsd.org>
6642 Date: Tue Jun 21 14:52:13 2022 +0000
6644 upstream: Make sure not to fclose() the same fd twice in case of an
6650 OpenBSD-Commit-ID: e384c4e05d5521e7866b3d53ca59acd2a86eef99
6652 commit f29d6cf98c25bf044079032d22c1a57c63ab9d8e
6653 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6654 Date: Sat Jun 18 02:17:16 2022 +0000
6656 upstream: Don't attempt to fprintf a null identity comment. From
6658 Martin Vahlensieck via tech@.
6660 OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2
6662 commit ad1762173bb38716a106e8979806149fd0f2753e
6663 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6664 Date: Fri Jun 17 01:00:03 2022 +0000
6666 upstream: Log an error if pipe() fails while accepting a
6668 connection. bz#3447, from vincent-openssh at vinc17 net, ok djm@
6670 OpenBSD-Commit-ID: 9d59f19872b94900a5c79da2d57850241ac5df94
6672 commit 9c59e7486cc8691401228b43b96a3edbb06e0412
6673 Author: Damien Miller <djm@mindrot.org>
6674 Date: Fri Jun 24 14:20:43 2022 +1000
6676 automatically enable built-in FIDO support
6678 If libfido2 is found and usable, then enable the built-in
6679 security key support unless --without-security-key-builtin
6684 commit 7d25b37fb2a5ff4dadabcbdac6087a97479434f5
6685 Author: Damien Miller <djm@mindrot.org>
6686 Date: Fri Jun 24 13:46:39 2022 +1000
6688 fix possible NULL deref when built without FIDO
6690 Analysis/fix from kircher in bz3443; ok dtucker@
6692 commit f5ba85daddfc2da6a8dab6038269e02c0695be44
6693 Author: djm@openbsd.org <djm@openbsd.org>
6694 Date: Wed Jun 15 16:08:25 2022 +0000
6696 upstream: make sure that UseDNS hostname lookup happens in the monitor
6698 and not in the pledge(2)'d unprivileged process; fixes regression caused by
6699 recent refactoring spotted by henning@
6701 OpenBSD-Commit-ID: a089870b95101cd8881a2dff65b2f1627d13e88d
6703 commit acb2059febaddd71ee06c2ebf63dcf211d9ab9f2
6704 Author: djm@openbsd.org <djm@openbsd.org>
6705 Date: Fri Jun 3 04:47:21 2022 +0000
6707 upstream: move auth_openprincipals() and auth_openkeyfile() over to
6709 auth2-pubkeyfile.c too; they make more sense there.
6711 OpenBSD-Commit-ID: 9970d99f900e1117fdaab13e9e910a621b7c60ee
6713 commit 3d9b0845f34510111cc693bb99a667662ca50cd8
6714 Author: djm@openbsd.org <djm@openbsd.org>
6715 Date: Fri Jun 3 04:31:54 2022 +0000
6717 upstream: test setenv in both client and server, test first-match-wins
6721 OpenBSD-Regress-ID: 4c8804f9db38a02db480b9923317457b377fe34b
6723 commit 22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40
6724 Author: djm@openbsd.org <djm@openbsd.org>
6725 Date: Fri Jun 3 04:30:46 2022 +0000
6727 upstream: Make SetEnv directives first-match-wins in both
6729 sshd_config and sshd_config; previously if the same name was reused then the
6730 last would win (which is the opposite to how the config is supposed to work).
6732 While there, make the ssh_config parsing more like sshd_config.
6736 OpenBSD-Commit-ID: 797909c1e0262c0d00e09280459d7ab00f18273b
6738 commit 38ed6c57e9e592c08e020fa6e82b45b4e1040970
6739 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6740 Date: Fri Jun 3 04:00:15 2022 +0000
6742 upstream: Add missing *-sk types to ssh-keyscan manpage. From
6744 skazi0 via github PR#294.
6746 OpenBSD-Commit-ID: fda2c869cdb871f3c90a89fb3f985370bb5d25c0
6748 commit ea97ec98c41ec2b755dfab459347db674ff9a5de
6749 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6750 Date: Fri Jun 3 03:21:09 2022 +0000
6752 upstream: Add period at end of "not known by any other names"
6754 message. github PR#320 from jschauma, ok djm@
6756 OpenBSD-Commit-ID: bd60809803c4bfd3ebb7c5c4d918b10e275266f2
6758 commit 88e376fcd67478ad1660d94bc73ab348ac9f4527
6759 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6760 Date: Fri Jun 3 03:17:42 2022 +0000
6762 upstream: ssh-keygen -A: do not generate DSA keys by default.
6764 Based on github PR#303 from jsegitz with man page text from jmc@, ok markus@
6767 OpenBSD-Commit-ID: 5c4c57bdd7063ff03381cfb6696659dd3f9f5b9f
6769 commit 6b3fb624675082a1e5aa615d1b8479873d8b5731
6770 Author: naddy@openbsd.org <naddy@openbsd.org>
6771 Date: Tue May 31 14:05:12 2022 +0000
6773 upstream: ssh-keygen: implement "verify-required" certificate option.
6775 This was already documented when support for user-verified FIDO
6776 keys was added, but the ssh-keygen(1) code was missing.
6780 OpenBSD-Commit-ID: f660f973391b593fea4b7b25913c9a15c3eb8a06
6782 commit b7f86ffc301be105bba9a3e0618b6fab3ae379bd
6783 Author: jmc@openbsd.org <jmc@openbsd.org>
6784 Date: Sat May 28 05:57:56 2022 +0000
6786 upstream: keywords ref ssh_config.5;
6788 from caspar schutijser
6790 OpenBSD-Commit-ID: f146a19d7d5c9374c3b9c520da43b2732d7d1a4e
6792 commit dc7bc52372f2744fa39191577be5306ee57aacd4
6793 Author: Damien Miller <djm@mindrot.org>
6794 Date: Mon May 30 09:29:09 2022 +1000
6796 fix some bugs in the fuzzer
6798 commit 1781f507c113667613351c19898efaf1e311a865
6799 Author: Darren Tucker <dtucker@dtucker.net>
6800 Date: Fri May 27 18:19:48 2022 +1000
6802 Test against OpenSSL 1.1.1o and 3.0.3.
6804 commit c53906e0c59e569691b4095d3e8db79cf78fa058
6805 Author: Darren Tucker <dtucker@dtucker.net>
6806 Date: Fri May 27 18:18:31 2022 +1000
6808 Test against LibreSSL 3.5.3.
6810 commit 9b3ad432ad2f19319bcc089370e356c6315d682f
6811 Author: Damien Miller <djm@mindrot.org>
6812 Date: Fri May 27 17:00:43 2022 +1000
6814 fuzzer for authorized_keys parsing
6816 mostly redundant to authopt_fuzz, but it's sensitive code so IMO it
6817 makes sense to test this layer too
6819 commit c83d8c4d6f3ccceef84d46de107f6b71cda06359
6820 Author: djm@openbsd.org <djm@openbsd.org>
6821 Date: Fri May 27 05:02:46 2022 +0000
6823 upstream: split the low-level file handling functions out from
6827 Put them in a new auth2-pubkeyfile.c to make it easier to refer to them
6828 (e.g. in unit/fuzz tests) without having to refer to everything else
6829 pubkey auth brings in.
6833 OpenBSD-Commit-ID: 3fdca2c61ad97dc1b8d4a7346816f83dc4ce2217
6835 commit 3b0b142d2a0767d8cd838e2f3aefde8a0aaa41e1
6836 Author: djm@openbsd.org <djm@openbsd.org>
6837 Date: Fri May 27 05:01:25 2022 +0000
6839 upstream: refactor authorized_keys/principals handling
6841 remove "struct ssh *" from arguments - this was only used to pass the
6842 remote host/address. These can be passed in instead and the resulting
6843 code is less tightly coupled to ssh_api.[ch]
6847 OpenBSD-Commit-ID: 9d4373d013edc4cc4b5c21a599e1837ac31dda0d
6849 commit 2c334fd36f80cb91cc42e4b978b10aa35e0df236
6850 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6851 Date: Fri May 27 04:29:40 2022 +0000
6853 upstream: f sshpkt functions fail, then password is not cleared
6855 with freezero. Unconditionally call freezero to guarantee that password is
6858 From tobias@ and c3h2_ctf via github PR#286, ok djm@
6860 OpenBSD-Commit-ID: 6b093619c9515328e25b0f8093779c52402c89cd
6862 commit 5d3a77f4c5ae774c6796387266503f52c7cdc7c2
6863 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6864 Date: Fri May 27 04:27:49 2022 +0000
6866 upstream: Avoid kill with -1 argument. The out_ctx label can be
6868 reached before fork has been called. If this happens, then kill -1 would be
6869 called, sending SIGTERM to all processes reachable by the current process.
6871 From tobias@ and c3h2_ctf via github PR#286, ok djm@
6873 OpenBSD-Commit-ID: 6277af1207d81202f5daffdccfeeaed4c763b1a8
6875 commit 533b31cd08e4b97f455466f91c36915e2924c15a
6876 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6877 Date: Fri May 27 04:13:24 2022 +0000
6879 upstream: Note that ProxyJump also accepts the same tokens as
6881 ProxyCommand. From pallxk via github PR#305.
6883 OpenBSD-Commit-ID: 7115ac351b129205f1f1ffa6bbfd62abd76be7c5
6885 commit 9d8c80f8a304babe61ca28f2e3fb5eb6dc9c39bf
6886 Author: djm@openbsd.org <djm@openbsd.org>
6887 Date: Wed May 25 06:03:44 2022 +0000
6889 upstream: revert previous; it was broken (spotted by Theo)
6891 OpenBSD-Commit-ID: 457c79afaca2f89ec2606405c1059b98b30d8b0d
6893 commit 9e0d02ef7ce88b67643bfb1c2272c9f5f04cc680
6894 Author: djm@openbsd.org <djm@openbsd.org>
6895 Date: Wed May 25 00:31:13 2022 +0000
6897 upstream: make SSHBUF_DBG/SSHBUF_TELL (off by default and only enabled
6899 via #define) dump to stderr rather than stdout
6901 OpenBSD-Commit-ID: 10298513ee32db8390aecb0397d782d68cb14318
6903 commit 2487163630f28be28b7e2396b4bd6511b98f1d3e
6904 Author: Tim Rice <tim@multitalents.net>
6905 Date: Tue May 24 10:21:25 2022 -0700
6907 configure.ac: Add missing AC_DEFINE for caph_cache_tzdata test causing
6908 HAVE_CAPH_CACHE_TZDATA to be missing from config.h.in.
6909 Spotted by Bryan Drewery
6911 commit bedb93415b60db3dfd704a3d525e82adb14a2481
6912 Author: djm@openbsd.org <djm@openbsd.org>
6913 Date: Sun May 15 23:48:07 2022 +0000
6915 upstream: regress test for in-place transfers and clobbering larger
6917 files with smaller ones; would have caught last regression in scp(1)
6919 OpenBSD-Regress-ID: 19de4e88dd3a4f7e5c1618c9be3c32415bd93bc2
6921 commit b4f0d719c2548cb74da509fb65f384dada4ebd37
6922 Author: anton@openbsd.org <anton@openbsd.org>
6923 Date: Fri Apr 22 05:08:43 2022 +0000
6925 upstream: Only run agent-ptrace.sh if gdb is available as all
6927 architectures do not ship with gdb.
6929 OpenBSD-Regress-ID: ec53e928803e6b87f9ac142d38888ca79a45348d
6931 commit 9b73345f80255a7f3048026462f2c0c6a241eeac
6932 Author: djm@openbsd.org <djm@openbsd.org>
6933 Date: Sun May 15 23:47:21 2022 +0000
6935 upstream: fix in-place copies; r1.163 incorrectly skipped truncation in
6937 all cases, not just at the start of a transfer. This could cause overwrites
6938 of larger files to leave junk at the end. Spotted by tb@
6940 OpenBSD-Commit-ID: b189f19cd68119548c8e24e39c79f61e115bf92c
6942 commit 56a0697fe079ff3e1ba30a2d5c26b5e45f7b71f8
6943 Author: djm@openbsd.org <djm@openbsd.org>
6944 Date: Fri May 13 06:31:50 2022 +0000
6946 upstream: arrange for scp, when in sftp mode, to not ftruncate(3) files
6950 previous behavious of unconditionally truncating the destination file
6951 would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to
6952 delete all the contents of their destination.
6954 spotted by solene@ sthen@, also bz3431; ok dtucker@
6956 OpenBSD-Commit-ID: ca39fdd39e0ec1466b9666f15cbcfddea6aaa179
6958 commit fbcef70c2832712f027bccea1aa9bc4b4103da93
6959 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6960 Date: Mon May 9 08:25:27 2022 +0000
6962 upstream: Remove errant apostrophe. From haruyama at queen-ml org.
6964 OpenBSD-Commit-ID: dc6b294567cb84b384ad6ced9ca469f2bbf0bd10
6966 commit 0086a286ea6bbd11ca9b664ac3bb12b27443d6eb
6967 Author: djm@openbsd.org <djm@openbsd.org>
6968 Date: Mon May 9 03:09:53 2022 +0000
6970 upstream: Allow existing -U (use agent) flag to work with "-Y sign"
6972 operations, where it will be interpreted to require that the private keys is
6973 hosted in an agent; bz3429, suggested by Adam Szkoda; ok dtucker@
6975 OpenBSD-Commit-ID: a7bc69873b99c32c42c7628ed9ea91565ba08c2f
6977 commit cb010744cc98f651b1029bb09efa986eb54e4ccf
6978 Author: djm@openbsd.org <djm@openbsd.org>
6979 Date: Sun May 8 22:58:35 2022 +0000
6981 upstream: improve error message when 'ssh-keygen -Y sign' is unable to
6983 load a private key; bz3429, reported by Adam Szkoda ok dtucker@
6985 OpenBSD-Commit-ID: bb57b285e67bea536ef81b1055467be2fc380e74
6987 commit aa61fc82c63d309a90c22ca74fb1da6c6f4372fd
6988 Author: Tobias Heider <me@tobhe.de>
6989 Date: Mon May 9 02:00:01 2022 +0200
6991 Remove duplicate bcrypt_pbkdf.o from Makefile
6993 bcrypt_pbkdf.o is duplicated in the openbsd-compat Makefile's object
6996 commit deb506d00da8d11fb04c1e7b9b1e1cc379c1705c
6997 Author: djm@openbsd.org <djm@openbsd.org>
6998 Date: Sun May 8 22:32:36 2022 +0000
7000 upstream: When performing operations that glob(3) a remote path, ensure
7002 that the implicit working directory used to construct that path escapes
7005 This prevents glob characters from being processed in places they
7006 shouldn't, e.g. "cd /tmp/a*/", "get *.txt" should have the get operation
7007 treat the path "/tmp/a*" literally and not attempt to expand it.
7009 Reported by Lusia Kundel; ok markus@
7011 OpenBSD-Commit-ID: 4f647f58482cbad3d58b1eab7f6a1691433deeef
7013 commit f38cf74f20b5da113cfa823afd5bfb5c6ba65f3d
7014 Author: Darren Tucker <dtucker@dtucker.net>
7015 Date: Fri May 6 14:50:18 2022 +1000
7017 Also retest OpenBSD upstream on .yml changes.
7019 commit f87a132800ba3710ab130d703448a31ef1128d77
7020 Author: Darren Tucker <dtucker@dtucker.net>
7021 Date: Fri May 6 14:46:09 2022 +1000
7023 Note that, for now, we need variadic macros.
7025 commit 217b518e0f7c52c4b909e935141a55344c61e644
7026 Author: Darren Tucker <dtucker@dtucker.net>
7027 Date: Fri May 6 14:39:34 2022 +1000
7029 Add ubsan minimal testcase on OpenBSD.
7031 As suggested by djm@.
7033 commit 457dce2cfef6a48f5442591cd8b21c7e8cba13f8
7034 Author: djm@openbsd.org <djm@openbsd.org>
7035 Date: Thu May 5 01:04:14 2022 +0000
7037 upstream: sshkey_unshield_private() contains a exact duplicate of
7039 the code in private2_check_padding(). Pull private2_check_padding() up so the
7040 code can be reused. From Martin Vahlensieck, ok deraadt@
7042 OpenBSD-Commit-ID: 876884c3f0e62e8fd8d1594bab06900f971c9c85
7044 commit 0e44db4d9cb313e68a59a44d27884af66c02356e
7045 Author: djm@openbsd.org <djm@openbsd.org>
7046 Date: Thu May 5 00:56:58 2022 +0000
7048 upstream: channel_new no longer frees remote_name. So update the
7050 comment accordingly. As remote_name is not modified, it can be const as
7051 well. From Martin Vahlensieck
7053 OpenBSD-Commit-ID: e4e10dc8dc9f40c166ea5a8e991942bedc75a76a
7055 commit 37b62fd5caf19c85a48241535277cefff65adace
7056 Author: djm@openbsd.org <djm@openbsd.org>
7057 Date: Thu May 5 00:55:11 2022 +0000
7059 upstream: mux.c: mark argument as const; from Martin Vahlensieck
7061 OpenBSD-Commit-ID: 69a1a93a55986c7c2ad9f733c093b46a47184341
7063 commit f4e67c0ad259b4cf10177277a5827fa5545bac53
7064 Author: markus@openbsd.org <markus@openbsd.org>
7065 Date: Wed May 4 07:31:22 2022 +0000
7067 upstream: make sure stdout is non-blocking; ok djm@
7069 OpenBSD-Commit-ID: 64940fffbd1b882eda2d7c8c7a43c79368309c0d
7071 commit e5c036d2092c00bef395e9161dc5ce42d4be9565
7072 Author: florian@openbsd.org <florian@openbsd.org>
7073 Date: Tue May 3 07:42:27 2022 +0000
7075 upstream: Add FIDO AUTHENTICATOR section and explain a bit how FIDO
7077 works. The wording came mostly from the 8.2 OpenSSH release notes, addapted
7078 to fit the man page. Then move the -O bits into the new section as is already
7079 done for CERTIFICATES and MODULI GENERATION. Finally we can explain the
7080 trade-offs of resident keys. While here, consistently refer to the FIDO
7081 thingies as "FIDO authenticators", not "FIDO tokens".
7083 input & OK jmc, naddy
7085 OpenBSD-Commit-ID: dd98748d7644df048f78dcf793b3b63db9ab1d25
7087 commit 575771bf79bef7127be6aaccddc46031ea15529e
7088 Author: jmc@openbsd.org <jmc@openbsd.org>
7089 Date: Mon May 2 05:40:37 2022 +0000
7091 upstream: remove an obsolete rsa1 format example from an example;
7096 OpenBSD-Commit-ID: db2c89879c29bf083df996bd830abfb1e70d62bf
7098 commit 0bc6b4c8f04e292577bdb44d5dc6b630d3448087
7099 Author: djm@openbsd.org <djm@openbsd.org>
7100 Date: Sun May 1 23:20:30 2022 +0000
7102 upstream: fix some integer overflows in sieve_large() that show up when
7104 trying to generate modp groups > 16k bits. Reported via GHPR#306 by Bertram
7105 Felgenhauer, but fixed in a different way. feedback/ok tb@
7107 OpenBSD-Commit-ID: 81cbc6dd3a21c57bd6fadea10e44afe37bca558e
7109 commit a45615cb172bc827e21ec76750de39dfb30ecc05
7110 Author: djm@openbsd.org <djm@openbsd.org>
7111 Date: Fri Apr 29 04:55:07 2022 +0000
7113 upstream: be stricter in which characters will be accepted in
7115 specifying a mask length; allow only 0-9. From khaleesicodes via GHPR#278; ok
7118 OpenBSD-Commit-ID: e267746c047ea86665cdeccef795a8a56082eeb2
7120 commit 4835544d2dd31de6ffc7dba59f92093aea98155b
7121 Author: Darren Tucker <dtucker@dtucker.net>
7122 Date: Sat Apr 30 10:56:41 2022 +1000
7124 Add Mac OS X 12 test target.
7126 commit 97a6a8b8c1f2da09712d0e72d0ef800e4edd34cd
7127 Author: Darren Tucker <dtucker@dtucker.net>
7128 Date: Fri Apr 29 18:27:34 2022 +1000
7130 Only run tests when source files change.
7132 Also run tests on changes to V_9_0 branch.
7134 commit 6d0392b9ff4b50a56ac5685d1b9392e2cd432ca3
7135 Author: Darren Tucker <dtucker@dtucker.net>
7136 Date: Fri Apr 29 18:22:34 2022 +1000
7138 Remove now-empty int32_minmax.inc.
7140 commit af59463553b5ad52d3b42c4455ee3c5600158bb7
7141 Author: djm@openbsd.org <djm@openbsd.org>
7142 Date: Fri Apr 29 03:24:30 2022 +0000
7144 upstream: mention that the helpers are used by ssh(1), ssh-agent(1)
7146 and ssh-keygen(1). Previously only ssh(1) was mentioned. From Pedro
7149 OpenBSD-Commit-ID: 30f880f989d4b329589c1c404315685960a5f153
7151 commit 3e26b3a6eebcee27be177207cc0846fb844b7a56
7152 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7153 Date: Fri Apr 29 03:16:48 2022 +0000
7155 upstream: Don't leak SK device. Patch from Pedro Martelletto via
7157 github PR#316. ok djm@
7159 OpenBSD-Commit-ID: 17d11327545022e727d95fd08b213171c5a4585d
7161 commit 247082b5013f0d4fcae8f97453f2a2f01bcda811
7162 Author: djm@openbsd.org <djm@openbsd.org>
7163 Date: Fri Apr 29 03:13:32 2022 +0000
7165 upstream: fix memleak on session-bind path; from Pedro Martelletto, ok
7169 OpenBSD-Commit-ID: e85899a26ba402b4c0717b531317e8fc258f0a7e
7171 commit e05522008092ceb86a87bdd4ad7878424315db89
7172 Author: djm@openbsd.org <djm@openbsd.org>
7173 Date: Thu Apr 28 02:53:31 2022 +0000
7175 upstream: avoid printing hash algorithm twice; from lucas AT sexy.is
7177 OpenBSD-Commit-ID: 9d24671e10a84141b7c504396cabad600e47a941
7179 commit 0979e29356915261d69a9517a1e0aaade7c9fc75
7180 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7181 Date: Wed Apr 27 11:08:55 2022 +0000
7183 upstream: Add authfd path to debug output. ok markus@
7185 OpenBSD-Commit-ID: f735a17d1a6f2bee63bfc609d76ef8db8c090890
7187 commit 67b7c784769c74fd4d6b147d91e17e1ac1a8a96d
7188 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7189 Date: Tue Apr 26 07:41:44 2022 +0000
7191 upstream: Check sshauthopt_new() for NULL. bz#3425, from
7193 tessgauthier at microsoft.com. ok djm@
7195 OpenBSD-Commit-ID: af0315bc3e44aa406daa7e0ae7c2d719a974483f
7197 commit d571314d14b919fbd7c84a61f9bf2065fc0a6841
7198 Author: millert@openbsd.org <millert@openbsd.org>
7199 Date: Wed Apr 20 16:00:25 2022 +0000
7201 upstream: Remove unnecessary includes: openssl/hmac.h and
7203 openssl/evp.h. From Martin Vahlensieck.
7205 OpenBSD-Commit-ID: a6debb5fb0c8a44e43e8d5ca7cc70ad2f3ea31c3
7207 commit da8dddf8cc1f2516ff894b8183e83a7c5ba3ef80
7208 Author: millert@openbsd.org <millert@openbsd.org>
7209 Date: Wed Apr 20 15:59:18 2022 +0000
7211 upstream: Add missing includes of stdlib.h and stdint.h. We need
7213 stdlib.h for malloc(3) and stdint.h for SIZE_MAX. Unlike the other xmss
7214 files, ssh-xmss.c does not include xmss_commons.h so ssh-xmss.c must include
7215 those headers itself. From Martin Vahlensieck
7217 OpenBSD-Commit-ID: 70e28a9818cee3da1be2ef6503d4b396dd421e6b
7219 commit fe9d87a6800a7a33be08f4d5ab662a758055ced2
7220 Author: millert@openbsd.org <millert@openbsd.org>
7221 Date: Wed Apr 20 15:56:49 2022 +0000
7223 upstream: Avoid an unnecessary xstrdup in rm_env() when matching
7225 patterns. Since match_pattern() doesn't modify its arguments (they are
7226 const), there is no need to make an extra copy of the strings in
7227 options->send_env. From Martin Vahlensieck
7229 OpenBSD-Commit-ID: 2c9db31e3f4d3403b49642c64ee048b2a0a39351
7231 commit 7bf2eb958fbb551e7d61e75c176bb3200383285d
7232 Author: Darren Tucker <dtucker@dtucker.net>
7233 Date: Tue Apr 26 23:30:59 2022 +1000
7235 Add debian-riscv64 test target.
7237 commit 3913c935523902482974c4c503bcff20bd850a6a
7238 Author: Darren Tucker <dtucker@dtucker.net>
7239 Date: Mon Apr 25 17:20:06 2022 +1000
7241 Update OpenSSL and LibreSSL versions in tests.
7243 commit dcd8dca29bcdb193ff6be35b96fc55e6e30d37d9
7244 Author: Darren Tucker <dtucker@dtucker.net>
7245 Date: Sat Apr 23 20:40:28 2022 +1000
7247 Include stdlib.h for free() prototype.
7249 ... which is used inside the CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG block.
7251 commit 4cc05de568e1c3edd7834ff3bd9d8214eb34861b
7252 Author: Darren Tucker <dtucker@dtucker.net>
7253 Date: Sat Apr 23 20:17:26 2022 +1000
7255 Cache timezone data in capsicum sandbox.
7257 From emaste at freebsd.org, originally part of FreeBSD commit r339216
7258 / fc3c19a9 with autoconf bits added by me.
7260 commit c31404426d212e2964ff9e5e58e1d0fce3d83f27
7261 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7262 Date: Thu Apr 21 01:36:46 2022 +0000
7264 upstream: It looks like we can't completely avoid
7266 waiting for processes to exit so retrieve the pid via controlmaster and
7269 OpenBSD-Regress-ID: 8246f00f22b14e49d2ff1744c94897ead33d457b
7271 commit d19b21afab5c8e2f3df6bd8aee9766bdad3d8c58
7272 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7273 Date: Wed Apr 20 13:25:55 2022 +0000
7275 upstream: Use ssh -f and ControlPersist ..
7277 to start up test forwards and ssh -O stop to shut them down intead of
7278 sleep loops. This speeds up the test by an order of magnitude.
7280 OpenBSD-Regress-ID: eb3db5f805100919b092a3b2579c611fba3e83e7
7282 commit 5f76286a126721fa005de6edf3d1c7a265555f19
7283 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7284 Date: Wed Apr 20 05:24:13 2022 +0000
7286 upstream: Simplify forward-control test.
7288 Since we no longer need to support SSH1 we don't need to run shell
7289 commands on the other end of the connection and can use ssh -N instead.
7290 This also makes the test less racy.
7292 OpenBSD-Regress-ID: 32e94ce272820cc398f30b848b2b0f080d10302c
7294 commit 687bbf23572d8bdf25cbbcdf8ac583514e1ba710
7295 Author: djm@openbsd.org <djm@openbsd.org>
7296 Date: Thu Mar 31 03:07:33 2022 +0000
7298 upstream: regression test for sftp cp command
7300 OpenBSD-Regress-ID: c96bea9edde3a384b254785e7f9b2b24a81cdf82
7302 commit f1233f19a6a9fe58f52946f50df4772f5b136761
7303 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7304 Date: Wed Apr 20 01:13:47 2022 +0000
7306 upstream: Import regenerated moduli
7308 OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
7310 commit fec014785de198b9a325d1b94e324bb958c5fe7b
7311 Author: djm@openbsd.org <djm@openbsd.org>
7312 Date: Wed Apr 20 04:19:11 2022 +0000
7314 upstream: Try to continue running local I/O for channels in state
7316 OPEN during SSH transport rekeying. The most visible benefit is that it
7317 should make ~-escapes work in the client (e.g. to exit) if the connection
7318 happened to have stalled during a rekey event. Based work by and ok dtucker@
7320 OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45
7322 commit e68154b0d4f0f5085a050ea896955da1b1be6e30
7323 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7324 Date: Wed Apr 20 01:13:47 2022 +0000
7326 upstream: Import regenerated moduli
7328 OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
7330 commit 69928b106d8f0fa15b88cf3850d992ed81c44ae0
7331 Author: tj@openbsd.org <tj@openbsd.org>
7332 Date: Sat Apr 16 00:22:31 2022 +0000
7334 upstream: list the correct version number
7336 for when usage of the sftp protocol became default and fix a typo
7339 OpenBSD-Commit-ID: 24e1795ed2283fdeacf16413c2f07503bcdebb31
7341 commit 21042a05c0b304c16f655efeec97438249d2e2cc
7342 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7343 Date: Tue Apr 12 05:09:49 2022 +0000
7345 upstream: Correct path for system known hosts file in description
7347 of IgnoreUserKnownHosts. Patch from Martin Vahlensieck via tech@
7349 OpenBSD-Commit-ID: 9b7784f054fa5aa4d63cb36bd563889477127215
7351 commit 53f4aff60a7c1a08a23917bd47496f8901c471f5
7352 Author: Darren Tucker <dtucker@dtucker.net>
7353 Date: Sat Apr 16 14:33:20 2022 +1000
7355 Resync moduli.5 with upstream.
7357 1.18: remove duplicate publication year; carsten dot kunze at arcor dot de
7358 1.19: ssh-keygen's -G/-T have been replaced with -M generate/screen.
7360 commit d2b888762b9844eb0d8eb59909cdf5af5159f810
7361 Author: Darren Tucker <dtucker@dtucker.net>
7362 Date: Sat Apr 16 14:31:13 2022 +1000
7364 Retire fbsd6 test VM.
7366 It's long since out of support, relatively slow (it's i686) and the
7367 compiler has trouble with PIE.
7369 commit cd1f70009860a154b51230d367c55ea5f9a4504e
7370 Author: djm@openbsd.org <djm@openbsd.org>
7371 Date: Mon Apr 11 22:52:08 2022 +0000
7373 upstream: clear io_want/io_ready flags at start of poll() cycle;
7375 avoids plausible spin during rekeying if channel io_want flags are reused
7376 across cycles. ok markus@ deraadt@
7378 OpenBSD-Commit-ID: 91034f855b7c73cd2591657c49ac30f10322b967
7380 commit aa1920302778273f7f94c2091319aba199068ca0
7381 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7382 Date: Fri Apr 8 05:43:39 2022 +0000
7384 upstream: Note that curve25519-sha256 was later published in
7388 OpenBSD-Commit-ID: 2ac2b5d642d4cf5918eaec8653cad9a4460b2743
7390 commit 4673fa8f2be983f2f88d5afd754adb1a2a39ec9e
7391 Author: djm@openbsd.org <djm@openbsd.org>
7392 Date: Fri Apr 8 04:40:40 2022 +0000
7394 upstream: two defensive changes from Tobias Stoeckmann via GHPR287
7396 enforce stricter invarient for sshbuf_set_parent() - never allow
7397 a buffer to have a previously-set parent changed.
7399 In sshbuf_reset(), if the reallocation fails, then zero the entire
7400 buffer and not the (potentially smaller) default initial alloc size.
7402 OpenBSD-Commit-ID: 14583203aa5d50ad38d2e209ae10abaf8955e6a9
7404 commit 26eef015e2d2254375e13afaaf753b78932b1bf5
7405 Author: Damien Miller <djm@mindrot.org>
7406 Date: Mon Apr 11 16:07:09 2022 +1000
7408 Revert "update build-aux files to match autoconf-2.71"
7410 This reverts commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2.
7412 It turns out that the checked-in copies of these files are actually newer
7413 than autoconf-2.71's copies, so this was effectively a downgrade.
7414 Spotted by Bo Anderson via github
7416 commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2
7417 Author: Damien Miller <djm@mindrot.org>
7418 Date: Fri Apr 8 14:48:58 2022 +1000
7420 update build-aux files to match autoconf-2.71
7422 i.e. config.guess, config.sub and install-sh
7424 commit 94eb6858efecc1b4f02d8a6bd35e149f55c814c8
7425 Author: Damien Miller <djm@mindrot.org>
7426 Date: Wed Apr 6 10:47:48 2022 +1000
7428 update version numbers for release
7430 commit 8e4a8eadf4fe74e65e6492f34250f8cf7d67e8da
7431 Author: djm@openbsd.org <djm@openbsd.org>
7432 Date: Mon Apr 4 22:45:25 2022 +0000
7434 upstream: openssh-9.0
7436 OpenBSD-Commit-ID: 0dfb461188f4513ec024c1534da8c1ce14c20b64
7438 commit a9f23ea2e3227f406880c2634d066f6f50fa5eaa
7439 Author: naddy@openbsd.org <naddy@openbsd.org>
7440 Date: Thu Mar 31 17:58:44 2022 +0000
7442 upstream: ssh: document sntrup761x25519-sha512@openssh.com as
7446 OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171
7448 commit 9ec2713d122af79d66ebb9c1d6d9ae8621a8945f
7449 Author: naddy@openbsd.org <naddy@openbsd.org>
7450 Date: Thu Mar 31 17:27:27 2022 +0000
7452 upstream: man pages: add missing commas between subordinate and
7456 jmc@ dislikes a comma before "then" in a conditional, so leave those
7461 OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3
7463 commit 3741df98ffaaff92b474ee70d8ef276b5882f85a
7464 Author: Darren Tucker <dtucker@dtucker.net>
7465 Date: Mon Apr 4 23:52:11 2022 +1000
7467 Disable security key on fbsd6 test host.
7469 commit 32c12236f27ae83bfe6d2983b67c9bc67a83a417
7470 Author: Darren Tucker <dtucker@dtucker.net>
7471 Date: Mon Apr 4 15:16:51 2022 +1000
7473 Specify TEST_SHELL=bash on AIX.
7475 The system shells cause the agent-restrict test to fail due to some
7476 quoting so explicitly specify bash until we can get configure to
7477 autmatically work around that.
7479 commit 90452c8b69d065b7c7c285ff78b81418a75bcd76
7480 Author: Darren Tucker <dtucker@dtucker.net>
7481 Date: Fri Apr 1 23:38:44 2022 +1100
7483 Only return events from ppoll that were requested.
7485 If the underlying system's select() returns bits that were not in the
7486 request set, our ppoll() implementation can return revents for events
7487 not requested, which can apparently cause a hang. Only return revents
7488 for activity in the requested event set. bz#3416, analysis and fix by
7489 yaroslav.kuzmin at vmssoftware com, ok djm@
7491 commit 6c49eb5fabc56f4865164ed818aa5112d09c31a8
7492 Author: Darren Tucker <dtucker@dtucker.net>
7493 Date: Fri Apr 1 23:21:40 2022 +1100
7495 Only run regression tests on slow VMs.
7497 commit f67e47903977b42cb6abcd5565a61bd7293e4dc3
7498 Author: Darren Tucker <dtucker@dtucker.net>
7499 Date: Fri Apr 1 23:21:06 2022 +1100
7501 Increase test timeout to allow slow VMs to finish
7503 commit 02488c1b54065ddc4f25835dbd2618b2a2fe21f5
7504 Author: Darren Tucker <dtucker@dtucker.net>
7505 Date: Fri Apr 1 16:27:38 2022 +1100
7507 Use bash or ksh if available for SH in Makefile.
7509 commit 34c7018c316af4773e432066de28d0ef9d0888cd
7510 Author: Darren Tucker <dtucker@dtucker.net>
7511 Date: Fri Apr 1 14:56:54 2022 +1100
7513 Set Makefile SHELL as determined by configure.
7515 This should improve compatibility for users with non-POSIX shells. If
7516 using Makefile.in directly (eg make -f Makefile.in distprep) then SHELL
7517 will need to be specified on the command line (along with MANFMT in that
7518 particular case). ok djm@
7520 commit 5b054d76402faab38c48377efd112426469553a0
7521 Author: Darren Tucker <dtucker@dtucker.net>
7522 Date: Fri Apr 1 13:16:47 2022 +1100
7524 Skip slow tests on (very) slow test targets.
7526 commit b275818065b31a865142c48c2acf6a7c1655c542
7527 Author: Damien Miller <djm@mindrot.org>
7528 Date: Thu Mar 31 14:11:36 2022 +1100
7532 commit 3fa539c3ffaabd6211995512d33e29150f88c5c5
7533 Author: djm@openbsd.org <djm@openbsd.org>
7534 Date: Thu Mar 31 03:07:03 2022 +0000
7536 upstream: add a sftp client "cp" command that supports server-side
7538 copying of files. Useful for this task and for testing the copy-data
7539 extension. Patch from Mike Frysinger; ok dtucker@
7541 OpenBSD-Commit-ID: 1bb1b950af0d49f0d5425b1f267e197aa1b57444
7543 commit 7988bfc4b701c4b3fe9b36c8561a3d1c5d4c9a74
7544 Author: djm@openbsd.org <djm@openbsd.org>
7545 Date: Thu Mar 31 03:05:49 2022 +0000
7547 upstream: add support for the "corp-data" protocol extension to
7549 allow server-side copies to be performed without having to go via the client.
7550 Patch by Mike Frysinger, ok dtucker@
7552 OpenBSD-Commit-ID: 00aa510940fedd66dab1843b58682de4eb7156d5
7554 commit 32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba
7555 Author: djm@openbsd.org <djm@openbsd.org>
7556 Date: Wed Mar 30 21:13:23 2022 +0000
7558 upstream: select post-quantum KEX
7560 sntrup761x25519-sha512@openssh.com as the default; ok markus@
7562 OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9
7564 commit d6556de1db0822c76ba2745cf5c097d9472adf7c
7565 Author: djm@openbsd.org <djm@openbsd.org>
7566 Date: Wed Mar 30 21:10:25 2022 +0000
7568 upstream: fix poll() spin when a channel's output fd closes without
7570 data in the channel buffer. Introduce more exact packing of channel fds into
7571 the pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@
7573 OpenBSD-Commit-ID: 06740737849c9047785622ad5d472cb6a3907d10
7575 commit 8a74a96d25ca4d32fbf298f6c0ac5a148501777d
7576 Author: djm@openbsd.org <djm@openbsd.org>
7577 Date: Wed Mar 30 04:33:09 2022 +0000
7579 upstream: ssh is almost out of getopt() characters; note the
7581 remaining remaining available ones in a comment
7583 OpenBSD-Commit-ID: 48d38cef59d6bc8e84c6c066f6d601875d3253fd
7585 commit 6d4fc51adb9d8a42f67b5474f02f877422379de6
7586 Author: djm@openbsd.org <djm@openbsd.org>
7587 Date: Wed Mar 30 04:27:51 2022 +0000
7589 upstream: avoid NULL deref via ssh-keygen -Y find-principals.
7591 bz3409, reported by Mateusz Adamowski
7593 OpenBSD-Commit-ID: a3b2c02438052ee858e0ee18e5a288586b5df2c5
7595 commit e937514920335b92b543fd9be79cd6481d1eb0b6
7596 Author: Darren Tucker <dtucker@dtucker.net>
7597 Date: Mon Mar 28 17:51:03 2022 +1100
7599 Add AIX 5.1 test target.
7601 commit 4bbe815ba974b4fd89cc3fc3e3ef1be847a0befe
7602 Author: Darren Tucker <dtucker@dtucker.net>
7603 Date: Sat Mar 26 22:01:31 2022 +1100
7605 Drop leading "v" from release version identifier.
7607 It's present in the git tags but not in the release tarball names.
7608 Also drop extra "/" from URL path.
7610 commit f5cdd3b3c275dffaebfca91df782dca29975e9ac
7611 Author: Darren Tucker <dtucker@dtucker.net>
7612 Date: Sat Mar 26 16:28:04 2022 +1100
7614 Use tarballs when testing LibreSSL releases.
7616 This means they'll still work when the combination of -portable and
7617 openbsd github repos no longer match.
7619 commit 24dc37d198f35a7cf71bf4d5384363c7ef4209d4
7620 Author: Darren Tucker <dtucker@dtucker.net>
7621 Date: Sat Mar 26 15:02:45 2022 +1100
7623 Remove now-unused passwd variable.
7625 commit 5b467ceef2c356f0a77f5e8ab4eb0fac367e4d24
7626 Author: Darren Tucker <dtucker@dtucker.net>
7627 Date: Sat Mar 26 13:15:44 2022 +1100
7631 commit 2923d026e55998133c0f6e5186dca2a3c0fa5ff5
7632 Author: Darren Tucker <dtucker@dtucker.net>
7633 Date: Sat Mar 26 12:49:50 2022 +1100
7635 Factor out platform-specific locked account check.
7637 Also fixes an incorrect free on platforms with both libiaf and shadow
7638 passwords (probably only Unixware). Prompted by github PR#284,
7639 originally from @c3h2_ctf and stoeckmann@.
7641 commit d23efe4b12886ffe416be10bc0a7da6ca8aa72d1
7642 Author: Darren Tucker <dtucker@dtucker.net>
7643 Date: Sat Mar 26 08:13:46 2022 +1100
7645 Add OpenWRT mips and mipsel test targets.
7647 commit 16ea8b85838dd7a4dbeba4e51ac4f43fd68b1e5b
7648 Author: djm@openbsd.org <djm@openbsd.org>
7649 Date: Sun Mar 20 08:52:17 2022 +0000
7651 upstream: don't leak argument list; bz3404, reported by Balu
7655 OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6
7657 commit a72bde294fe0518c9a44ba63864093a1ef2425e3
7658 Author: djm@openbsd.org <djm@openbsd.org>
7659 Date: Sun Mar 20 08:51:21 2022 +0000
7661 upstream: make addargs() and replacearg() a little more robust and
7663 improve error reporting
7665 make freeargs(NULL) a noop like the other free functions
7667 ok dtucker as part of bz3403
7669 OpenBSD-Commit-ID: 15f86da83176978b4d1d288caa24c766dfa2983d
7671 commit 731087d2619fa7f01e675b23f57af10d745e8af2
7672 Author: djm@openbsd.org <djm@openbsd.org>
7673 Date: Fri Mar 18 04:04:11 2022 +0000
7675 upstream: don't try to resolve ListenAddress directives in the sshd
7677 re-exec path - we're never going to use the result and if the operation fails
7678 then it can prevent connections from being accepted. Reported by Aaron
7679 Poffenberger; with / ok dtucker@
7681 OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60
7683 commit 1c83c082128694ddd11ac05fdf31d70312ff1763
7684 Author: djm@openbsd.org <djm@openbsd.org>
7685 Date: Fri Mar 18 02:50:21 2022 +0000
7687 upstream: remove blank line
7689 OpenBSD-Commit-ID: d5e0182965b2fbfb03ad5f256d1a1ce5706bcddf
7691 commit 807be68684da7a1fe969c399ddce2fafb7997dcb
7692 Author: djm@openbsd.org <djm@openbsd.org>
7693 Date: Fri Mar 18 02:32:22 2022 +0000
7695 upstream: helpful comment
7697 OpenBSD-Commit-ID: e3315a45cb04e7feeb614d76ec80a9fe4ca0e8c7
7699 commit a0b5816f8f1f645acdf74f7bc11b34455ec30bac
7700 Author: djm@openbsd.org <djm@openbsd.org>
7701 Date: Fri Mar 18 02:31:25 2022 +0000
7703 upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV
7705 will ensue. Patch from Mateusz Adamowski via GHPR#307
7707 OpenBSD-Commit-ID: 99e8ec38f9feb38bce6de240335be34aedeba5fd
7709 commit 5a252d54a63be30d5ba4be76210942d754a531c0
7710 Author: djm@openbsd.org <djm@openbsd.org>
7711 Date: Tue Mar 15 05:27:37 2022 +0000
7713 upstream: improve DEBUG_CHANNEL_POLL debugging message
7715 OpenBSD-Commit-ID: 2275eb7bc4707d019b1a0194b9c92c0b78da848f
7717 commit ce324cf58ba2840e31afeb996935800780c8fa4b
7718 Author: cheloha@openbsd.org <cheloha@openbsd.org>
7719 Date: Sun Mar 13 23:27:54 2022 +0000
7721 upstream: ssh: xstrdup(): use memcpy(3)
7723 Copying the given string into the buffer with strlcpy(3) confers no
7724 benefit in this context because we have already determined the
7725 string's length with strlen(3) in order to allocate that buffer.
7727 Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2
7729 ok dtucker@ millert@
7731 OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a
7733 commit 2893c5e764557f48f9d6a929e224ed49c59545db
7734 Author: Darren Tucker <dtucker@dtucker.net>
7735 Date: Fri Mar 11 18:43:58 2022 +1100
7737 Resync fmt_scaled. with OpenBSD.
7739 Fixes underflow reported in bz#3401.
7741 commit 5ae31a0fdd27855af29f48ff027491629fff5979
7742 Author: Darren Tucker <dtucker@dtucker.net>
7743 Date: Wed Mar 9 09:41:56 2022 +1100
7745 Provide killpg implementation.
7747 Based on github PR#301 for Tandem NonStop.
7749 commit c41c84b439f4cd74d4fe44298a4b4037ddd7d2ae
7750 Author: Darren Tucker <dtucker@dtucker.net>
7751 Date: Wed Mar 9 09:29:30 2022 +1100
7753 Check for missing ftruncate prototype.
7755 From github PR#301 in conjunction with rsbeckerca.
7757 commit 8cf5275452a950869cb90eeac7d220b01f77b12e
7758 Author: Darren Tucker <dtucker@dtucker.net>
7759 Date: Tue Mar 8 20:04:06 2022 +1100
7761 Default to not using sandbox when cross compiling.
7763 On most systems poll(2) does not work when the number of FDs is reduced
7764 with setrlimit, so assume it doesn't when cross compiling and we can't
7765 run the test. bz#3398.
7767 commit 379b30120da53d7c84aa8299c26b18c51c2a0dac
7768 Author: djm@openbsd.org <djm@openbsd.org>
7769 Date: Tue Mar 1 01:59:19 2022 +0000
7771 upstream: pack pollfd array before server_accept_loop() ppoll()
7773 call, and terminate sshd if ppoll() returns errno==EINVAL
7775 avoids spin in ppoll when MaxStartups > RLIMIT_NOFILE, reported by
7780 OpenBSD-Commit-ID: dbab1c24993ac977ec24d83283b8b7528f7c2c15
7782 commit eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd
7783 Author: naddy@openbsd.org <naddy@openbsd.org>
7784 Date: Sun Feb 27 01:33:59 2022 +0000
7786 upstream: include rejected signature algorithm in error message and
7788 not the (useless) key type; ok djm@
7790 OpenBSD-Commit-ID: d0c0f552a4d9161203e07e95d58a76eb602a76ff
7792 commit f2f3269423618a83157e18902385e720f9776007
7793 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7794 Date: Fri Feb 25 09:46:24 2022 +0000
7796 upstream: Remove the char * casts from arguments to do_lstat,
7798 do_readdir and do_stat paths since the underlying functions now take a const
7799 char *. Patch from vapier at gentoo.org.
7801 OpenBSD-Commit-ID: 9e4d964dbfb0ed683a2a2900711b88e7f1c0297b
7803 commit 4a66dac052c5ff5047161853f36904607649e4f9
7804 Author: djm@openbsd.org <djm@openbsd.org>
7805 Date: Fri Feb 25 02:09:27 2022 +0000
7807 upstream: save an unneccessary alloc/free, based on patch from
7809 Martin Vahlensieck; ok dtucker@
7811 OpenBSD-Commit-ID: 90ffbf1f837e509742f2c31a1fbf2c0fd376fd5f
7813 commit 6f117cb151efe138ac57bdd8e26165f350328f5f
7814 Author: Darren Tucker <dtucker@dtucker.net>
7815 Date: Tue Mar 1 09:02:06 2022 +1100
7817 Remove unused ivbits argument from chacha_keysetup
7819 commit 15974235dd528aeab0ec67fb92a0a1d733f62be2
7820 Author: Darren Tucker <dtucker@dtucker.net>
7821 Date: Tue Mar 1 09:00:20 2022 +1100
7823 Add OPENBSD ORIGINAL marker.
7825 commit f2ff669347d320532e7c1b63cdf5c62f46e73150
7826 Author: Darren Tucker <dtucker@dtucker.net>
7827 Date: Mon Feb 28 22:21:36 2022 +1100
7829 No unused param warnings for clang-12 and gcc-11.
7831 These have too many false positives in -Werror tests on the github CI
7832 since we often provide empty stub functions for functionality not needed
7833 for particular configurations.
7835 commit 96558ecd87adac62efa9a2b5479f686ab86b0be1
7836 Author: Darren Tucker <dtucker@dtucker.net>
7837 Date: Sat Feb 26 14:10:41 2022 +1100
7839 Add debian-i386 test target.
7841 commit 284b6e5394652d519e31782e3b3cdfd7b21d1a81
7842 Author: Darren Tucker <dtucker@dtucker.net>
7843 Date: Sat Feb 26 14:06:14 2022 +1100
7845 Allow ppoll_time64 in seccomp sandbox.
7847 Should fix sandbox violations on (some? at least i386 and armhf) 32bit
7848 Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at
7849 debian.org via bz#3396.
7851 commit 0132056efabc5edb85c3c7105d2fb6dee41843c6
7852 Author: Darren Tucker <dtucker@dtucker.net>
7853 Date: Fri Feb 25 19:47:48 2022 +1100
7855 Improve handling of _getshort and _getlong.
7857 If the system native ones are exactly as required then use them,
7858 otherwise use the local versions mapped to another name to prevent
7861 commit 8e206e0dd6b9f757b07979e48f53ad5bf9b7b52b
7862 Author: Darren Tucker <dtucker@dtucker.net>
7863 Date: Fri Feb 25 15:14:22 2022 +1100
7865 Constify utimes in compat library to match specs.
7867 Patch from vapier at chromium.org.
7869 commit 1b2920e3b63db2eddebeec7330ffe8b723055573
7870 Author: Darren Tucker <dtucker@dtucker.net>
7871 Date: Fri Feb 25 13:50:56 2022 +1100
7873 ANSIfy getshort and getlong.
7875 These functions appear to have come from OpenBSD's lib/libc/net/res_comp.c
7876 which made this change in 2005.
7878 commit 54a86f4f6e1c43a2ca2be23ef799ab8910d4af70
7879 Author: Darren Tucker <dtucker@dtucker.net>
7880 Date: Fri Feb 25 13:23:04 2022 +1100
7882 Use PICFLAG instead of hard coding -fPIC.
7884 commit 3016ba47035ac3561aabd48e2be70167fe157d6a
7885 Author: Darren Tucker <dtucker@dtucker.net>
7886 Date: Fri Feb 25 11:37:11 2022 +1100
7888 Add tests for latest releases of {Libre,Open}SSL.
7890 commit f107467179428a0e3ea9e4aa9738ac12ff02822d
7891 Author: Colin Watson <cjwatson@debian.org>
7892 Date: Thu Feb 24 16:04:18 2022 +0000
7894 Improve detection of -fzero-call-used-regs=all support
7896 GCC doesn't tell us whether this option is supported unless it runs into
7897 the situation where it would need to emit corresponding code.
7899 commit 3383b2cac0e9275bc93c4b4760e6e048f537e1d6
7900 Author: djm@openbsd.org <djm@openbsd.org>
7901 Date: Wed Feb 23 21:21:49 2022 +0000
7903 upstream: free(3) wants stdlib.h
7905 OpenBSD-Commit-ID: 227a8c70a95b4428c49e46863c9ef4bd318a3b8a
7907 commit a4537e79ab4ac6db4493c5158744b9ebde5efcb0
7908 Author: djm@openbsd.org <djm@openbsd.org>
7909 Date: Wed Feb 23 21:21:16 2022 +0000
7911 upstream: put back the scp manpage changes for SFTP mode too
7913 OpenBSD-Commit-ID: 05dc53921f927e1b5e5694e1f3aa314549f2e768
7915 commit 449bcb8403adfb9724805d02a51aea76046de185
7916 Author: deraadt@openbsd.org <deraadt@openbsd.org>
7917 Date: Wed Feb 23 19:01:00 2022 +0000
7919 upstream: and we go back to testing sftp-scp after the 8.9
7923 OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c
7925 commit 166456cedad3962b83b848b1e9caf80794831f0f
7926 Author: Damien Miller <djm@mindrot.org>
7927 Date: Wed Feb 23 22:31:11 2022 +1100
7931 commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4
7932 Author: djm@openbsd.org <djm@openbsd.org>
7933 Date: Wed Feb 23 11:18:13 2022 +0000
7935 upstream: avoid integer overflow of auth attempts (harmless, caught
7939 OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86
7941 commit 6e0258c64c901753df695e06498b26f9f4812ea6
7942 Author: djm@openbsd.org <djm@openbsd.org>
7943 Date: Wed Feb 23 11:17:10 2022 +0000
7945 upstream: randomise the password used in fakepw
7947 OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947
7949 commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9
7950 Author: djm@openbsd.org <djm@openbsd.org>
7951 Date: Wed Feb 23 11:15:57 2022 +0000
7953 upstream: use asprintf to construct .rhosts paths
7955 OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b
7957 commit c07e154fbdc7285e9ec54e78d8a31f7325d43537
7958 Author: djm@openbsd.org <djm@openbsd.org>
7959 Date: Wed Feb 23 11:07:09 2022 +0000
7961 upstream: openssh-8.9
7963 OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e
7965 commit bc16667b4a1c3cad7029304853c143a32ae04bd4
7966 Author: Darren Tucker <dtucker@dtucker.net>
7967 Date: Tue Feb 22 15:29:22 2022 +1100
7969 Extend select+rlimit sanbox test to include poll.
7971 POSIX specifies that poll() shall fail if "nfds argument is greater
7972 than {OPEN_MAX}". The setrlimit sandbox sets this to effectively zero
7973 so this causes poll() to fail in the preauth privsep process.
7975 This is likely the underlying cause for the previously observed similar
7976 behaviour of select() on plaforms where it is implement in userspace on
7979 commit 6520c488de95366be031d49287ed243620399e23
7980 Author: Darren Tucker <dtucker@dtucker.net>
7981 Date: Tue Feb 22 13:08:59 2022 +1100
7983 Add Alpine Linux test VM.
7985 commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb
7986 Author: Darren Tucker <dtucker@dtucker.net>
7987 Date: Tue Feb 22 12:27:07 2022 +1100
7989 Include sys/param.h if present.
7991 Needed for howmany() on MUSL systems such as Alpine.
7993 commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c
7994 Author: Darren Tucker <dtucker@dtucker.net>
7995 Date: Tue Feb 22 12:25:52 2022 +1100
7997 Only include sys/poll.h if we don't have poll.h.
7999 Prevents warnings on MUSL based systems such as Alpine.
8001 commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5
8002 Author: Damien Miller <djm@mindrot.org>
8003 Date: Tue Feb 22 11:14:51 2022 +1100
8005 disable agent-restrict test on minix3
8007 Minix seems to have a platform-wide limit on the number of
8008 select(2) syscalls that can be concurrently issued. This test
8009 seems to exceed this limit.
8013 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114
8014 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31
8016 commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a
8017 Author: Darren Tucker <dtucker@dtucker.net>
8018 Date: Mon Feb 21 21:27:20 2022 +1100
8020 Skip agent-getpeereid when running as root.
8022 commit fbd772570a25436a33924d91c164d2b24021f010
8023 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8024 Date: Sun Feb 20 03:47:26 2022 +0000
8026 upstream: Aproximate realpath on the expected output by deduping
8028 leading slashes. Fixes test failure when user's home dir is / which is
8029 possible in some portable configurations.
8031 OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63
8033 commit 336685d223a59f893faeedf0a562e053fd84058e
8034 Author: Darren Tucker <dtucker@dtucker.net>
8035 Date: Sun Feb 20 13:30:52 2022 +1100
8037 Really move DSA to end of list.
8039 In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to
8040 the end of the list instead of DSA. Spotted by andrew at fyfe.gb.net.
8042 commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3
8043 Author: Darren Tucker <dtucker@dtucker.net>
8044 Date: Fri Feb 18 12:12:21 2022 +1100
8046 Add test configs for MUSL C library.
8048 commit f7fc6a43f1173e8b2c38770bf6cee485a562d03b
8049 Author: Damien Miller <djm@mindrot.org>
8050 Date: Thu Feb 17 22:54:19 2022 +1100
8052 minix needs BROKEN_POLL too; chokes on /dev/null
8054 commit 667fec5d4fe4406745750a32f69b5d2e1a75e94b
8055 Author: djm@openbsd.org <djm@openbsd.org>
8056 Date: Thu Feb 17 10:58:27 2022 +0000
8058 upstream: check for EINTR/EAGAIN failures in the rfd fast-path; caught
8060 by dtucker's minix3 vm :) ok dtucker@
8062 OpenBSD-Commit-ID: 2e2c895a3e82ef347aa6694394a76a438be91361
8064 commit 41417dbda9fb55a0af49a8236e3ef9d50d862644
8065 Author: Darren Tucker <dtucker@dtucker.net>
8066 Date: Thu Feb 17 22:05:29 2022 +1100
8068 Comment hurd test, the VM is currently broken.
8070 commit b2aee35a1f0dc798339b3fcf96136da71b7e3f6d
8071 Author: Damien Miller <djm@mindrot.org>
8072 Date: Thu Feb 17 21:15:16 2022 +1100
8074 find sk-dummy.so when build_dir != src_dir
8076 spotted by Corinna Vinschen; feedback & ok dtucker@
8078 commit 62a2d4e50b2e89f2ef04576931895d5139a5d037
8079 Author: Damien Miller <djm@mindrot.org>
8080 Date: Wed Feb 16 16:26:17 2022 +1100
8082 update versions in preparation for 8.9 release
8084 commit dd6d3dded721ac653ea73c017325e5bfeeec837f
8085 Author: djm@openbsd.org <djm@openbsd.org>
8086 Date: Tue Feb 15 05:13:36 2022 +0000
8088 upstream: document the unbound/host-bound options to
8090 PubkeyAuthentication; spotted by HARUYAMA Seigo
8092 OpenBSD-Commit-ID: 298f681b66a9ecd498f0700082c7a6c46e948981
8094 commit df93529dd727fdf2fb290700cd4f1adb0c3c084b
8095 Author: Darren Tucker <dtucker@dtucker.net>
8096 Date: Mon Feb 14 14:19:40 2022 +1100
8098 Test if sshd accidentally acquires controlling tty
8100 When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour
8101 in the STREAMS code before activating the workaround. ok djm@
8103 commit 766176cfdbfd7ec38bb6118dde6e4daa0df34888
8104 Author: Darren Tucker <dtucker@dtucker.net>
8105 Date: Sat Feb 12 10:24:56 2022 +1100
8107 Add cygwin-release test config.
8109 This tests the flags used to build the cygwin release binaries.
8111 commit b30698662b862f5397116d23688aac0764e0886e
8112 Author: Darren Tucker <dtucker@dtucker.net>
8113 Date: Fri Feb 11 21:00:35 2022 +1100
8115 Move SSHD_ACQUIRES_CTTY workaround into compat.
8117 On some (most? all?) SysV based systems with STREAMS based ptys,
8118 sshd could acquire a controlling terminal during pty setup when
8119 it pushed the "ptem" module, due to what is probably a bug in
8120 the STREAMS driver that's old enough to vote. Because it was the
8121 privileged sshd's controlling terminal, it was not available for
8122 the user's session, which ended up without one. This is known to
8123 affect at least Solaris <=10, derivatives such as OpenIndiana and
8124 several other SysV systems. See bz#245 for the backstory.
8126 In the we past worked around that by not calling setsid in the
8127 privileged sshd child, which meant it was not a session or process
8128 group leader. This solved controlling terminal problem because sshd
8129 was not eligble to acquire one, but had other side effects such as
8130 not cleaning up helper subprocesses in the SIGALRM handler since it
8131 was not PG leader. Recent cleanups in the signal handler uncovered
8132 this, resulting in the LoginGraceTime timer not cleaning up privsep
8133 unprivileged processes.
8135 This change moves the workaround into the STREAMS pty allocation code,
8136 by allocating a sacrificial pty to act as sshd's controlling terminal
8137 before allocating user ptys, so those are still available for users'
8141 - this will waste a pty per ssh connection on affected platforms.
8144 - it makes the process group behaviour consistent between platforms.
8146 - it puts the workaround nearest the code that actually causes the
8147 problem and competely out of the mainline code.
8149 - the workaround is only activated if you use the STREAMS code. If,
8150 say, Solaris 11 has the bug but also a working openpty() it doesn't
8151 matter that we defined SSHD_ACQUIRES_CTTY.
8153 - the workaround is only activated when the fist pty is allocated,
8154 ie in the post-auth privsep monitor. This means there's no risk
8155 of fd leaks to the unprivileged processes, and there's no effect on
8156 sessions that do not allocate a pty.
8158 Based on analysis and work by djm@, ok djm@
8160 commit cd00b48cf10f3565936a418c1e6d7e48b5c36140
8161 Author: Darren Tucker <dtucker@dtucker.net>
8162 Date: Fri Feb 11 20:09:32 2022 +1100
8164 Simplify handling of --with-ssl-dir.
8168 commit ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0
8169 Author: Darren Tucker <dtucker@dtucker.net>
8170 Date: Fri Feb 11 13:39:29 2022 +1100
8172 Stop testing OpenBSD HEAD on 6.9 and 7.0.
8174 HEAD is not guaranteed to work on previous stable branches, and at the
8175 moment is broken due to libfido API changes.
8177 commit 50b9e4a4514697ffb9592200e722de6b427cb9ff
8178 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8179 Date: Fri Feb 11 00:43:56 2022 +0000
8181 upstream: Always initialize delim before passing to hpdelim2 which
8183 might not set it. Found by the Valgrind tests on github, ok deraadt@
8185 OpenBSD-Commit-ID: c830c0db185ca43beff3f41c19943c724b4f636d
8187 commit 6ee53064f476cf163acd5521da45b11b7c57321b
8188 Author: Darren Tucker <dtucker@dtucker.net>
8189 Date: Fri Feb 11 10:03:06 2022 +1100
8191 Fix helper include path and remove excess code.
8193 Looks like test_hpdelim.c was imported twice into the same file.
8194 Spotted by kevin.brott at gmail com and chris at cataclysmal org.
8196 commit 9fa63a19f68bc87452d3cf5c577cafad2921b7a4
8197 Author: Darren Tucker <dtucker@dtucker.net>
8198 Date: Thu Feb 10 23:27:02 2022 +1100
8200 Put poll.h inside ifdef.
8202 commit 3ac00dfeb54b252c15dcbf1971582e9e3b946de6
8203 Author: Darren Tucker <dtucker@dtucker.net>
8204 Date: Thu Feb 10 22:17:31 2022 +1100
8206 We now support POLLPRI so actually define it.
8208 commit 25bd659cc72268f2858c5415740c442ee950049f
8209 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8210 Date: Sun Feb 6 22:58:33 2022 +0000
8212 upstream: Add test for empty hostname with port.
8214 OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3
8216 commit a29af853cff41c0635f0378c00fe91bf9c91dea4
8217 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8218 Date: Fri Feb 4 07:53:44 2022 +0000
8220 upstream: Add unit tests for hpdelim.
8222 OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018
8224 commit 9699151b039ecc5fad9ac6c6c02e9afdbd26f15f
8225 Author: djm@openbsd.org <djm@openbsd.org>
8226 Date: Thu Feb 10 04:12:38 2022 +0000
8228 upstream: revert for imminent OpenSSH release, which wil ship with
8233 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl;
8234 > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
8235 > protocol for copying. Let's get back to testing the SFTP protocol.
8237 This will be put back once the OpenSSH release is done.
8239 OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768
8241 commit 45279abceb37c3cbfac8ba36dde8b2c8cdd63d32
8242 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8243 Date: Tue Feb 8 08:59:12 2022 +0000
8245 upstream: Switch hpdelim interface to accept only ":" as delimiter.
8247 Historicallly, hpdelim accepted ":" or "/" as a port delimiter between
8248 hosts (or addresses) and ports. These days most of the uses for "/"
8249 are no longer accepted, so there are several places where it checks the
8250 delimiter to disallow it. Make hpdelim accept only ":" and use hpdelim2
8251 in the other cases. ok djm@
8253 OpenBSD-Commit-ID: 7e6420bd1be87590b6840973f5ad5305804e3102
8255 commit a1bcbf04a7c2d81944141db7ecd0ba292d175a66
8256 Author: pedro martelletto <pedro@yubico.com>
8257 Date: Mon Feb 7 09:09:59 2022 +0100
8259 fix typos in previous
8261 commit 56192518e329b39f063487bc2dc4d796f791eca0
8262 Author: Damien Miller <djm@mindrot.org>
8263 Date: Mon Feb 7 12:53:47 2022 +1100
8265 compat code for fido_assert_set_clientdata()
8267 commit d6b5aa08fdcf9b527f8b8f932432941d5b76b7ab
8268 Author: djm@openbsd.org <djm@openbsd.org>
8269 Date: Mon Feb 7 01:25:12 2022 +0000
8271 upstream: use libfido2 1.8.0+ fido_assert_set_clientdata() instead
8273 of manually hashing data outselves. Saves a fair bit of code and makes life
8274 easier for some -portable platforms.
8276 OpenBSD-Commit-ID: 351dfaaa5ab1ee928c0e623041fca28078cff0e0
8278 commit 86cc93fd3c26b2e0c7663c6394995fb04ebfbf3b
8279 Author: jsg@openbsd.org <jsg@openbsd.org>
8280 Date: Sun Feb 6 00:29:03 2022 +0000
8282 upstream: remove please from manual pages ok jmc@ sthen@ millert@
8284 OpenBSD-Commit-ID: 6543acb00f4f38a23472538e1685c013ca1a99aa
8286 commit ad16a84e64a8cf1c69c63de3fb9008320a37009c
8287 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8288 Date: Fri Feb 4 02:49:17 2022 +0000
8290 upstream: Since they are deprecated, move DSA to the end of the
8292 default list of public keys so that they will be tried last. From github
8293 PR#295 from "ProBackup-nl", ok djm@
8295 OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0
8297 commit 253de42753de85dde266e061b6fec12ca6589f7d
8298 Author: Damien Miller <djm@mindrot.org>
8299 Date: Wed Feb 2 16:52:07 2022 +1100
8301 portable-specific string array constification
8305 commit dfdcc2220cf359c492d5d34eb723370e8bd8a19e
8306 Author: djm@openbsd.org <djm@openbsd.org>
8307 Date: Tue Feb 1 23:37:15 2022 +0000
8309 upstream: test 'ssh-keygen -Y find-principals' with wildcard
8311 principals; from Fabian Stelzer
8313 OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40
8315 commit 968e508967ef42480cebad8cf3172465883baa77
8316 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8317 Date: Fri Jan 21 02:54:41 2022 +0000
8319 upstream: Enable all supported ciphers and macs in the server
8321 before trying to benchmark them. Increase the data file size to get more
8324 OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6
8326 commit 15b7199a1fd37eff4c695e09d573f3db9f4274b7
8327 Author: djm@openbsd.org <djm@openbsd.org>
8328 Date: Tue Feb 1 23:34:47 2022 +0000
8330 upstream: allow 'ssh-keygen -Y find-principals' to match wildcard
8332 principals in allowed_signers files; from Fabian Stelzer
8334 OpenBSD-Commit-ID: 1e970b9c025b80717dddff5018fe5e6f470c5098
8336 commit 541667fe6dc26d7881e55f0bb3a4baa6f3171645
8337 Author: djm@openbsd.org <djm@openbsd.org>
8338 Date: Tue Feb 1 23:32:51 2022 +0000
8340 upstream: mark const string array contents const too, i.e. static
8342 const char *array => static const char * const array from Mike Frysinger
8344 OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1
8346 commit 8cfa73f8a2bde4c98773f33f974c650bdb40dd3c
8347 Author: djm@openbsd.org <djm@openbsd.org>
8348 Date: Tue Feb 1 23:11:11 2022 +0000
8350 upstream: better match legacy scp behaviour: show un-expanded paths
8352 in error messages. Spotted by and ok tb@
8354 OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7
8356 commit 4e62c13ab419b4b224c8bc6a761e91fcf048012d
8357 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8358 Date: Tue Feb 1 07:57:32 2022 +0000
8360 upstream: Remove explicit kill of privsep preauth child's PID in
8362 SIGALRM handler. It's no longer needed since the child will get terminated by
8363 the SIGTERM to the process group that cleans up any auth helpers, it
8364 simplifies the signal handler and removes the risk of a race when updating
8365 the PID. Based on analysis by HerrSpace in github PR#289, ok djm@
8367 OpenBSD-Commit-ID: 2be1ffa28b4051ad9e33bb4371e2ec8a31d6d663
8369 commit 2a7ccd2ec4022917b745af7186f514f365b7ebe9
8370 Author: guenther@openbsd.org <guenther@openbsd.org>
8371 Date: Fri Jan 28 06:18:42 2022 +0000
8373 upstream: When it's the possessive of 'it', it's spelled "its",
8375 without the apostrophe.
8377 OpenBSD-Commit-ID: fb6ab9c65bd31de831da1eb4631ddac018c5fae7
8379 commit 8a0848cdd3b25c049332cd56034186b7853ae754
8380 Author: Alex James <theracermaster@gmail.com>
8381 Date: Sun Jan 30 16:13:36 2022 -0600
8383 sandbox-seccomp-filter: allow gettid
8385 Some allocators (such as Scudo) use gettid while tracing allocations [1].
8386 Allow gettid in preauth to prevent sshd from crashing with Scudo.
8388 [1]: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.0/compiler-rt/lib/gwp_asan/common.cpp#L46
8390 commit b30d32159dc3c7052f4bfdf36357996c905af739
8391 Author: djm@openbsd.org <djm@openbsd.org>
8392 Date: Sat Jan 22 00:49:34 2022 +0000
8394 upstream: add a ssh_packet_process_read() function that reads from
8396 a fd directly into the transport input buffer.
8398 Use this in the client and server mainloops to avoid unnecessary
8399 copying. It also lets us use a more greedy read size without penalty.
8401 Yields a 2-3% performance gain on cipher-speed.sh (in a fairly
8402 unscientific test tbf)
8404 feedback dtucker@ ok markus@
8406 OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632
8408 commit a1a8efeaaa9cccb15cdc0a2bd7c347a149a3a7e3
8409 Author: djm@openbsd.org <djm@openbsd.org>
8410 Date: Sat Jan 22 00:45:31 2022 +0000
8412 upstream: Use sshbuf_read() to read directly into the channel input
8414 buffer rather than into a stack buffer that needs to be copied again;
8415 Improves performance by about 1% on cipher-speed.sh feedback dtucker@ ok
8418 OpenBSD-Commit-ID: bf5e6e3c821ac3546dc8241d8a94e70d47716572
8420 commit 29a76994e21623a1f84d68ebb9dc5a3c909fa3a7
8421 Author: Damien Miller <djm@mindrot.org>
8422 Date: Tue Jan 25 11:52:34 2022 +1100
8426 commit 754e0d5c7712296a7a3a83ace863812604c7bc4f
8427 Author: djm@openbsd.org <djm@openbsd.org>
8428 Date: Sat Jan 22 00:43:43 2022 +0000
8430 upstream: Add a sshbuf_read() that attempts to read(2) directly in
8432 to a sshbuf; ok markus@
8434 OpenBSD-Commit-ID: 2d8f249040a4279f3bc23c018947384de8d4a45b
8436 commit c7964fb9829d9ae2ece8b51a76e4a02e8449338d
8437 Author: djm@openbsd.org <djm@openbsd.org>
8438 Date: Fri Jan 21 07:04:19 2022 +0000
8440 upstream: add a helper for writing an error message to the
8442 stderr_buf and setting quit_pending; no functional change but saves a bunch
8445 OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d
8447 commit d23b4f7fdb1bd87e2cd7a9ae7c198ae99d347916
8448 Author: djm@openbsd.org <djm@openbsd.org>
8449 Date: Fri Jan 21 06:58:06 2022 +0000
8451 upstream: correct comment and use local variable instead of long
8453 indirection; spotted by dtucker@
8455 OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965
8457 commit d069b020a02b6e3935080204ee44d233e8158ebb
8458 Author: deraadt@openbsd.org <deraadt@openbsd.org>
8459 Date: Fri Jan 21 00:53:40 2022 +0000
8461 upstream: When poll(2) returns -1, for some error conditions
8463 pfd[].revents is not cleared. There are subtle errors in various programs.
8464 In this particular case, the program should error out. ok djm millert
8466 OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c
8468 commit e204b34337a965feb439826157c191919fd9ecf8
8469 Author: Damien Miller <djm@mindrot.org>
8470 Date: Sat Jan 22 11:38:21 2022 +1100
8472 restore tty force-read hack
8474 This portable-specific hack fixes a hang on exit for ttyful sessions
8475 on Linux and some SysVish Unix variants. It was accidentally disabled
8476 in commit 5c79952dfe1a (a precursor to the mainloop poll(2) conversion).
8478 Spotted by John in bz3383
8480 commit 68085066b6bad43643b43f5957fcc5fd34782ccd
8481 Author: Corinna Vinschen <vinschen@redhat.com>
8482 Date: Fri Jan 21 03:22:56 2022 +1100
8484 Fix signedness bug in Cygwin code
8486 The Cygwin-specific pattern match code has a bug. It checks
8487 the size_t value returned by mbstowcs for being < 0. The right
8488 thing to do is to check against (size_t) -1. Fix that.
8490 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
8492 commit 2e5cfed513e84444483baf1d8b31c40072b05103
8493 Author: Darren Tucker <dtucker@dtucker.net>
8494 Date: Thu Jan 20 13:26:27 2022 +1100
8496 Improve compatibility of early exit trap handling.
8498 Dash (as used by the github runners) has some differences in its trap
8500 - it doesn't have -p (which is fine, that's not in posix).
8501 - it doesn't work in a subshell (which turns out to be in compliance
8502 with posix, which means bash isn't).
8503 - it doesn't work in a pipeline, ie "trap|cat" produces no output.
8505 commit 3fe6800b6027add478e648934cbb29d684e51943
8506 Author: Darren Tucker <dtucker@dtucker.net>
8507 Date: Thu Jan 20 00:49:57 2022 +1100
8509 Move more tests out of valgrind-1 runner.
8511 commit 20da6ed136dd76e6a0b229ca3036ef9c7c7ef798
8512 Author: Darren Tucker <dtucker@dtucker.net>
8513 Date: Wed Jan 19 15:37:39 2022 +1100
8515 Invoke EXIT handler early when using Valgrind.
8517 When using Valgrind, we need to wait for all invoked programs to
8518 complete before checking their valgrind logs. Some tests, notably
8519 agent-restrict, set an EXIT trap handler to clean up things like
8520 ssh-agent, but those do not get invoked until test-exec.sh exits.
8521 This causes the Valgrind wait to deadlock, so if present invoke
8522 the EXIT handler before checking the Valgrind logs.
8524 commit ad2e0580c87b0714cf166bca9d926a95ddeee1c8
8525 Author: Darren Tucker <dtucker@dtucker.net>
8526 Date: Tue Jan 18 12:55:21 2022 +1100
8528 Remove line leftover from upstream sync.
8530 commit d1051c0f11a6b749027e26bbeb61b07df4b67e15
8531 Author: djm@openbsd.org <djm@openbsd.org>
8532 Date: Mon Jan 17 22:56:04 2022 +0000
8534 upstream: when decompressing zlib compressed packets, use
8536 Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually
8537 specified as a valid mode for inflate(). There should be no practical change
8538 in behaviour as the compression side ensures a flush that should make all
8539 data available to the receiver in all cases.
8541 repoted by lamm AT ibm.com via bz3372; ok markus
8543 OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b
8545 commit d5981b1883746b1ae178a46229c26b53af99e37a
8546 Author: djm@openbsd.org <djm@openbsd.org>
8547 Date: Mon Jan 17 21:41:04 2022 +0000
8549 upstream: make most of the sftp errors more idiomatic, following
8551 the general form of "[local/remote] operation path: error message"; ok markus
8553 OpenBSD-Commit-ID: 61364cd5f3a9fecaf8d63b4c38a42c0c91f8b571
8555 commit ac7c9ec894ed0825d04ef69c55babb49bab1d32e
8556 Author: djm@openbsd.org <djm@openbsd.org>
8557 Date: Mon Jan 17 21:39:51 2022 +0000
8559 upstream: when transferring multiple files in SFTP mode, create the
8561 destination directory if it doesn't already exist to match olde-scp(1)
8562 behaviour. noticed by deraadt@ ok markus@
8564 OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407
8566 commit 39d17e189f8e72c34c722579d8d4e701fa5132da
8567 Author: djm@openbsd.org <djm@openbsd.org>
8568 Date: Fri Jan 14 03:43:48 2022 +0000
8570 upstream: allow pin-required FIDO keys to be added to ssh-agent(1).
8572 ssh-askpass will be used to request the PIN at authentication time.
8574 From Pedro Martelletto, ok djm
8576 OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950
8578 commit 52423f64e13db2bdc31a51b32e999cb1bfcf1263
8579 Author: djm@openbsd.org <djm@openbsd.org>
8580 Date: Fri Jan 14 03:35:10 2022 +0000
8582 upstream: ssh-sk: free a resident key's user id
8584 From Pedro Martelletto; ok dtucker & me
8586 OpenBSD-Commit-ID: 47be40d602b7a6458c4c71114df9b53d149fc2e9
8588 commit 014e2f147a2788bfb3cc58d1b170dcf2bf2ee493
8589 Author: djm@openbsd.org <djm@openbsd.org>
8590 Date: Fri Jan 14 03:34:00 2022 +0000
8592 upstream: sshsk_load_resident: don't preallocate resp
8594 resp is allocated by client_converse(), at which point we lose
8595 the original pointer.
8597 From Pedro Martelletto; ok dtucker & me
8599 OpenBSD-Commit-ID: 1f1b5ea3282017d6584dfed4f8370dc1db1f44b1
8601 commit c88265f207dfe0e8bdbaf9f0eda63ed6b33781cf
8602 Author: djm@openbsd.org <djm@openbsd.org>
8603 Date: Fri Jan 14 03:32:52 2022 +0000
8605 upstream: sshsk_sign: trim call to sshkey_fingerprint()
8607 the resulting fingerprint doesn't appear to be used for anything,
8608 and we end up leaking it.
8610 from Pedro Martelletto; ok dtucker & me
8612 OpenBSD-Commit-ID: 5625cf6c68f082bc2cbbd348e69a3ed731d2f9b7
8614 commit 1cd1b2eac39661b849d5a4b4b56363e22bb5f61e
8615 Author: djm@openbsd.org <djm@openbsd.org>
8616 Date: Fri Jan 14 03:31:52 2022 +0000
8618 upstream: use status error message to communicate ~user expansion
8620 failures; provides better experience for scp in sftp mode, where ~user paths
8621 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
8624 (forgot to include this file in previous commit)
8626 OpenBSD-Commit-ID: d37cc4c8c861ce48cd6ea9899e96aaac3476847b
8628 commit a1d42a6ce0398da3833bedf374ef2571af7fea50
8629 Author: Damien Miller <djm@mindrot.org>
8630 Date: Fri Jan 14 13:49:32 2022 +1100
8632 fix edge case in poll(2) wrapper
8634 Correct handling of select(2) exceptfds. These should only be consulted
8635 for POLLPRI flagged pfds and not unconditionally converted to POLLERR.
8637 with and ok dtucker@
8639 commit 976b9588b4b5babcaceec4767a241c11a67a5ccb
8640 Author: Darren Tucker <dtucker@dtucker.net>
8641 Date: Fri Jan 14 13:46:35 2022 +1100
8643 Wrap OpenSSL includes in unit tests in ifdef.
8645 Fixes unit test on systems that do not have OpenSSL headers installed.
8647 commit c171879374b2e8b07157503f5639ed0bce59ce89
8648 Author: Darren Tucker <dtucker@dtucker.net>
8649 Date: Thu Jan 13 15:53:33 2022 +1100
8651 Remove sort wrapper.
8653 agent-restrict now takes care of this itself.
8655 commit 9cc2654403f1a686bb26c07a6ac790edf334cef5
8656 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8657 Date: Thu Jan 13 04:53:16 2022 +0000
8659 upstream: Set LC_ALL in both local and remote shells so that sorted
8661 output matches regardless of what the user's shell sets it to. ok djm@
8663 OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f
8665 commit 7a75f748cb2dd2f771bf70ea72698aa027996ab1
8666 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8667 Date: Thu Jan 13 04:22:10 2022 +0000
8669 upstream: Avoid %'s in commands (not used in OpenBSD, but used in
8671 -portable's Valgrind test) being interpretted as printf format strings.
8673 OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043
8675 commit 6c435bd4994d71442192001483a1cdb846e5ffcd
8676 Author: Darren Tucker <dtucker@dtucker.net>
8677 Date: Wed Jan 12 16:58:13 2022 +1100
8679 Stop on first test failure to minimize logs.
8681 commit 4bc2ba6095620a4484b708ece12842afd8c7685b
8682 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8683 Date: Wed Jan 12 07:18:37 2022 +0000
8685 upstream: Use egrep when searching for an anchored string.
8687 OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4
8689 commit 6bf2efa2679da1e8e60731f41677b2081dedae2c
8690 Author: Darren Tucker <dtucker@dtucker.net>
8691 Date: Wed Jan 12 18:25:06 2022 +1100
8693 Add "rev" command replacement if needed.
8695 commit 72bcd7993dadaf967bb3d8564ee31cbf38132b5d
8696 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8697 Date: Wed Jan 12 03:30:32 2022 +0000
8699 upstream: Don't log NULL hostname in restricted agent code,
8701 printf("%s", NULL) is not safe on all platforms. with & ok djm
8703 OpenBSD-Commit-ID: faf10cdae4adde00cdd668cd1f6e05d0a0e32a02
8705 commit acabefe3f8fb58c867c99fed9bbf84dfa1771727
8706 Author: djm@openbsd.org <djm@openbsd.org>
8707 Date: Tue Jan 11 22:33:16 2022 +0000
8709 upstream: remove hardcoded domain and use window.location.host, so this
8713 OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92
8715 commit 96da0946e44f34adc0397eb7caa6ec35a3e79891
8716 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8717 Date: Tue Jan 11 02:56:19 2022 +0000
8719 upstream: "void" functions should not return anything. From Tim Rice
8723 OpenBSD-Commit-ID: ce6616304f4c9881b46413e616b226c306830e2a
8725 commit a882a09722c9f086c9edb65d0c4022fd965ec1ed
8726 Author: djm@openbsd.org <djm@openbsd.org>
8727 Date: Tue Jan 11 01:26:47 2022 +0000
8729 upstream: suppress "Connection to xxx closed" messages at LogLevel >=
8731 error bz3378; ok dtucker@
8733 OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c
8735 commit 61a1a6af22e17fc94999a5d1294f27346e6c4668
8736 Author: Damien Miller <djm@mindrot.org>
8737 Date: Wed Jan 12 08:57:49 2022 +1100
8739 OS X poll(2) is broken; use compat replacement
8741 Darwin's poll(2) implementation is broken. For character-special
8742 devices like /dev/null, it returns POLLNVAL when polled with
8745 Apparently this is Apple bug 3710161, which is AFAIK not public,
8746 but a websearch will find other OSS projects rediscovering it
8747 periodically since it was first identified in 2005 (!!)
8749 commit 613a6545fc5a9542753b503cbe5906538a640b60
8750 Author: Darren Tucker <dtucker@dtucker.net>
8751 Date: Tue Jan 11 20:56:01 2022 +1100
8753 libhardended_malloc.so moved into out dir.
8755 commit 61761340be5e11046556623f8f5412b236cefa95
8756 Author: Tim Rice <tim@multitalents.net>
8757 Date: Mon Jan 10 11:07:04 2022 -0800
8759 Make USL compilers happy
8760 UX:acomp: ERROR: "sftp-server.c", line 567: void function cannot return value
8762 commit 3ef403f351e80a59b6f7e9d43cb82c181855483c
8763 Author: Darren Tucker <dtucker@dtucker.net>
8764 Date: Mon Jan 10 21:07:38 2022 +1100
8766 Add wrapper for "sort" to set LC_ALL=C.
8768 Found by djm, this should make sorts stable and reduce test flakiness.
8770 commit bd69e29f5716090181dbe0b8272eb7eab1a383bb
8771 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8772 Date: Sat Jan 8 07:55:26 2022 +0000
8774 upstream: Remove errant "set -x" left over from debugging.
8776 OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc
8778 commit 1a7c88e26fd673813dc5f61c4ac278564845e004
8779 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8780 Date: Sat Jan 8 07:01:13 2022 +0000
8782 upstream: Enable all supported hostkey algorithms (but no others).
8784 Allows hostbased test to pass when built without OpenSSL.
8786 OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562
8788 commit 12b457c2a42ff271e7967d9bedd068cebb048db9
8789 Author: djm@openbsd.org <djm@openbsd.org>
8790 Date: Sat Jan 8 07:37:32 2022 +0000
8792 upstream: use status error message to communicate ~user expansion
8794 failures; provides better experience for scp in sftp mode, where ~user paths
8795 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
8798 OpenBSD-Commit-ID: fc610ce00ca0cdc2ecdabbd49ce7cb82033f905f
8800 commit 63670d4e9030bcee490d5a9cce561373ac5b3b23
8801 Author: djm@openbsd.org <djm@openbsd.org>
8802 Date: Sat Jan 8 07:36:11 2022 +0000
8804 upstream: fix some corner-case bugs in scp sftp-mode handling of
8806 ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus
8808 OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222
8810 commit e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0
8811 Author: djm@openbsd.org <djm@openbsd.org>
8812 Date: Sat Jan 8 07:34:57 2022 +0000
8814 upstream: more idiomatic error messages; spotted by jsg & deraadt
8818 OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8
8820 commit 9acddcd5918c623f7ebf454520ffe946a8f15e90
8821 Author: djm@openbsd.org <djm@openbsd.org>
8822 Date: Sat Jan 8 07:33:54 2022 +0000
8824 upstream: add a variant of send_status() that allows overriding the
8826 default, generic error message. feedback/ok markus & jsg
8828 OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f
8830 commit 961411337719d4cd78f1ab33e4ac549f3fa22f50
8831 Author: djm@openbsd.org <djm@openbsd.org>
8832 Date: Sat Jan 8 07:32:45 2022 +0000
8834 upstream: refactor tilde_expand_filename() and make it handle ~user
8836 paths with no trailing slash; feedback/ok markus and jsg
8838 OpenBSD-Commit-ID: a2ab365598a902f0f14ba6a4f8fb2d07a9b5d51d
8840 commit dc38236ab6827dec575064cac65c8e7035768773
8841 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8842 Date: Thu Jan 6 22:14:25 2022 +0000
8844 upstream: Don't explicitly set HostbasedAuthentication in
8846 sshd_config. It defaults to "no", and not explicitly setting it allows us to
8847 enable it for the (optional) hostbased test.
8849 OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c
8851 commit e12d912ddf1c873cb72e5de9a197afbe0b6622d2
8852 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8853 Date: Thu Jan 6 21:46:56 2022 +0000
8855 upstream: Add test for hostbased auth. It requires some external
8857 setup (see comments at the top) and thus is disabled unless
8858 TEST_SSH_HOSTBASED_AUTH and SUDO are set.
8860 OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a
8862 commit a48533a8da6a0f4f05ecd055dc8048047e53569e
8863 Author: Damien Miller <djm@mindrot.org>
8864 Date: Fri Jan 7 09:24:26 2022 +1100
8868 commit d9dbb5d9a0326e252d3c7bc13beb9c2434f59409
8869 Author: djm@openbsd.org <djm@openbsd.org>
8870 Date: Thu Jan 6 22:06:51 2022 +0000
8872 upstream: allow hostbased auth to select RSA keys when only
8874 RSA/SHA2 are configured (this is the default case); ok markus@
8876 OpenBSD-Commit-ID: 411c18c7bde40c60cc6dfb7017968577b4d4a827
8878 commit fdb1d58d0d3888b042e5a500f6ce524486aaf782
8879 Author: djm@openbsd.org <djm@openbsd.org>
8880 Date: Thu Jan 6 22:05:42 2022 +0000
8882 upstream: add a helper function to match a key type to a list of
8884 signature algorithms. RSA keys can make signatures with multiple algorithms,
8885 so some special handling is required. ok markus@
8887 OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff
8889 commit 11e8c4309a5086a45fbbbc87d0af5323c6152914
8890 Author: djm@openbsd.org <djm@openbsd.org>
8891 Date: Thu Jan 6 22:04:20 2022 +0000
8893 upstream: log some details on hostkeys that ssh loads for
8895 hostbased authn ok markus@
8897 OpenBSD-Commit-ID: da17061fa1f0e58cb31b88478a40643e18233e38
8899 commit c6706f661739514a34125aa3136532a958929510
8900 Author: djm@openbsd.org <djm@openbsd.org>
8901 Date: Thu Jan 6 22:03:59 2022 +0000
8903 upstream: log signature algorithm during verification by monitor;
8907 OpenBSD-Commit-ID: 02b92bb42c4d4bf05a051702a56eb915151d9ecc
8909 commit 8832402bd500d1661ccc80a476fd563335ef6cdc
8910 Author: djm@openbsd.org <djm@openbsd.org>
8911 Date: Thu Jan 6 22:02:52 2022 +0000
8913 upstream: piece of UpdateHostkeys client strictification: when
8915 updating known_hosts with new keys, ignore NULL keys (forgot to include in
8918 OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08
8920 commit c2d9ced1da0276961d86690b3bd7ebdaca7fdbf7
8921 Author: djm@openbsd.org <djm@openbsd.org>
8922 Date: Thu Jan 6 22:01:14 2022 +0000
8924 upstream: include rejected signature algorithm in error message
8926 and not the (useless) key type; ok markus
8928 OpenBSD-Commit-ID: 4180b5ec7ab347b43f84e00b1972515296dab023
8930 commit 7aa7b096cf2bafe2777085abdeed5ce00581f641
8931 Author: djm@openbsd.org <djm@openbsd.org>
8932 Date: Thu Jan 6 22:00:18 2022 +0000
8934 upstream: make ssh-keysign use the requested signature algorithm
8936 and not the default for the keytype. Part of unbreaking hostbased auth for
8937 RSA/SHA2 keys. ok markus@
8939 OpenBSD-Commit-ID: b5639a14462948970da3a8020dc06f9a80ecccdc
8941 commit 291721bc7c840d113a49518f3fca70e86248b8e8
8942 Author: djm@openbsd.org <djm@openbsd.org>
8943 Date: Thu Jan 6 21:57:28 2022 +0000
8945 upstream: stricter UpdateHostkey signature verification logic on
8947 the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when
8948 RSA/SHA1 was explicitly negotiated during initial KEX; bz3375
8952 OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29
8954 commit 0fa33683223c76289470a954404047bc762be84c
8955 Author: djm@openbsd.org <djm@openbsd.org>
8956 Date: Thu Jan 6 21:55:23 2022 +0000
8958 upstream: Fix signature algorithm selection logic for
8960 UpdateHostkeys on the server side. The previous code tried to prefer RSA/SHA2
8961 for hostkey proofs of RSA keys, but missed some cases. This will use RSA/SHA2
8962 signatures for RSA keys if the client proposed these algorithms in initial
8965 Mostly by Dmitry Belyavskiy with some tweaks by me.
8969 OpenBSD-Commit-ID: c17ba0c3236340d2c6a248158ebed042ac6a8029
8971 commit 17877bc81db3846e6e7d4cfb124d966bb9c9296b
8972 Author: djm@openbsd.org <djm@openbsd.org>
8973 Date: Thu Jan 6 21:48:38 2022 +0000
8975 upstream: convert ssh, sshd mainloops from select() to poll();
8977 feedback & ok deraadt@ and markus@ has been in snaps for a few months
8979 OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c
8981 commit 5c79952dfe1aa36105c93b3f383ce9be04dee384
8982 Author: djm@openbsd.org <djm@openbsd.org>
8983 Date: Thu Jan 6 21:46:23 2022 +0000
8985 upstream: prepare for conversion of ssh, sshd mainloop from
8987 select() to poll() by moving FD_SET construction out of channel handlers into
8988 separate functions. ok markus
8990 OpenBSD-Commit-ID: 937fbf2a4de12b19fb9d5168424e206124807027
8992 commit 24c5187edfef4651a625b7d5d692c8c7e794f71f
8993 Author: djm@openbsd.org <djm@openbsd.org>
8994 Date: Wed Jan 5 21:54:37 2022 +0000
8996 upstream: add a comment so I don't make this mistake again
8998 OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e
9000 commit 7369900441929058263a17f56aa67e05ff7ec628
9001 Author: djm@openbsd.org <djm@openbsd.org>
9002 Date: Wed Jan 5 21:50:00 2022 +0000
9004 upstream: fix cut-and-pasto in error message
9006 OpenBSD-Commit-ID: 4cc5c619e4b456cd2e9bb760d17e3a9c84659198
9008 commit 294c11b1c7d56d3fb61e329603a782315ed70c62
9009 Author: djm@openbsd.org <djm@openbsd.org>
9010 Date: Wed Jan 5 08:25:05 2022 +0000
9012 upstream: select all RSA hostkey algorithms for UpdateHostkeys tests,
9016 OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8
9018 commit 2ea1108c30e3edb6f872dfc1e6da10b041ddf2c0
9019 Author: djm@openbsd.org <djm@openbsd.org>
9020 Date: Wed Jan 5 04:56:15 2022 +0000
9022 upstream: regress test both sshsig message hash algorithms, possible
9024 now because the algorithm is controllable via the CLI
9026 OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f
9028 commit 2327c306b5d4a2b7e71178e5a4d139af9902c2b0
9029 Author: djm@openbsd.org <djm@openbsd.org>
9030 Date: Wed Jan 5 04:50:11 2022 +0000
9032 upstream: allow selection of hash at sshsig signing time; code
9034 already supported either sha512 (default) or sha256, but plumbing wasn't
9035 there mostly by Linus Nordberg
9037 OpenBSD-Commit-ID: 1b536404b9da74a84b3a1c8d0b05fd564cdc96cd
9039 commit 56e941d0a00d6d8bae88317717d5e1b7395c9529
9040 Author: djm@openbsd.org <djm@openbsd.org>
9041 Date: Wed Jan 5 04:27:54 2022 +0000
9043 upstream: add missing -O option to usage() for ssh-keygen -Y sign;
9047 OpenBSD-Commit-ID: 4e78feb4aa830727ab76bb2e3d940440ae1d7af0
9049 commit 141a14ec9b0924709c98df2dd8013bde5d8d12c7
9050 Author: djm@openbsd.org <djm@openbsd.org>
9051 Date: Wed Jan 5 04:27:01 2022 +0000
9053 upstream: move sig_process_opts() to before sig_sign(); no
9055 functional code change
9057 OpenBSD-Commit-ID: da02d61f5464f72b4e8b299f83e93c3b657932f9
9059 commit 37a14249ec993599a9051731e4fb0ac5e976aec1
9060 Author: djm@openbsd.org <djm@openbsd.org>
9061 Date: Wed Jan 5 04:10:39 2022 +0000
9063 upstream: regression test for find-principals NULL deref; from Fabian
9067 OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5
9069 commit eb1f042142fdaba93f6c9560cf6c91ae25f6884a
9070 Author: djm@openbsd.org <djm@openbsd.org>
9071 Date: Wed Jan 5 04:02:42 2022 +0000
9073 upstream: NULL deref when using find-principals when matching an
9075 allowed_signers line that contains a namespace restriction, but no
9076 restriction specified on the command-line; report and fix from Fabian Stelzer
9078 OpenBSD-Commit-ID: 4a201b86afb668c908d1a559c6af456a61f4b145
9080 commit 8f3b18030579f395eca2181da31a5f945af12a59
9081 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9082 Date: Tue Jan 4 08:38:53 2022 +0000
9084 upstream: Log command invocation while debugging.
9086 This will aid in manually reproducing failing commands.
9088 OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a
9090 commit bbf285164df535f0d38c36237f007551bbdae27f
9091 Author: Darren Tucker <dtucker@dtucker.net>
9092 Date: Sun Dec 26 10:31:15 2021 +1100
9094 Always save config.h as build artifact.
9096 Should allow better comparison between failing and succeeding test
9099 commit 03bd4ed0db699687c5cd83405d26f81d2dc28d22
9100 Author: Darren Tucker <dtucker@dtucker.net>
9101 Date: Sat Dec 25 16:42:51 2021 +1100
9103 Add OpenBSD 7.0 target. Retire 6.8.
9105 commit c45a752f0de611afd87755c2887c8a24816d08ee
9106 Author: jsg@openbsd.org <jsg@openbsd.org>
9107 Date: Sat Jan 1 05:55:06 2022 +0000
9111 OpenBSD-Commit-ID: c63e43087a64d0727af13409c708938e05147b62
9113 commit c672f83a89a756564db0d3af9934ba0e1cf8fa3e
9114 Author: djm@openbsd.org <djm@openbsd.org>
9115 Date: Tue Jan 4 07:20:33 2022 +0000
9117 upstream: unbreak test: was picking up system ssh-add instead of the
9119 one supposedly being tested. Spotted by dtucker and using his VM zoo (which
9120 includes some systems old enough to lack ed25519 key support)
9122 OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5
9124 commit a23698c3082ffe661abed14b020eac9b0c25eb9f
9125 Author: djm@openbsd.org <djm@openbsd.org>
9126 Date: Sat Jan 1 04:18:06 2022 +0000
9128 upstream: fix memleak in process_extension(); oss-fuzz issue #42719
9130 OpenBSD-Commit-ID: d8d49f840162fb7b8949e3a5adb8107444b6de1e
9132 commit cb885178f36b83d0f14cfe9f345d2068103feed0
9133 Author: jsg@openbsd.org <jsg@openbsd.org>
9134 Date: Sat Jan 1 01:55:30 2022 +0000
9136 upstream: spelling ok dtucker@
9138 OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19
9140 commit 6b977f8080a32c5b3cbb9edb634b9d5789fb79be
9141 Author: djm@openbsd.org <djm@openbsd.org>
9142 Date: Sun Dec 26 23:34:41 2021 +0000
9144 upstream: split method list search functionality from
9146 authmethod_lookup() into a separate authmethod_byname(), for cases where we
9147 don't need to check whether a method is enabled, etc.
9149 use this to fix the "none" authentication method regression reported
9150 by Nam Nguyen via bugs@
9154 OpenBSD-Commit-ID: 8cd188dc3a83aa8abe5b7693e762975cd8ea8a17
9156 commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07
9157 Author: jmc@openbsd.org <jmc@openbsd.org>
9158 Date: Wed Dec 22 06:56:41 2021 +0000
9160 upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;
9164 OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965
9166 commit 1c9853a68b2319f2e5f929179735e8fbb9988a67
9167 Author: Darren Tucker <dtucker@dtucker.net>
9168 Date: Wed Dec 22 19:33:10 2021 +1100
9170 Use SHA.*_HMAC_BLOCK_SIZE if needed.
9172 If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH
9173 but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter.
9174 Should fix --without-openssl build on Solaris.
9176 commit 715c892f0a5295b391ae92c26ef4d6a86ea96e8e
9177 Author: Damien Miller <djm@mindrot.org>
9178 Date: Wed Dec 22 09:02:50 2021 +1100
9180 remove sys/param.h in -portable, after upstream
9182 commit 7a7c69d8b4022b1e5c0afb169c416af8ce70f3e8
9183 Author: Damien Miller <djm@mindrot.org>
9184 Date: Mon Dec 20 13:05:20 2021 +1100
9186 add agent-restrict.sh file, missed in last commit
9188 commit f539136ca51a4976644db5d0be8158cc1914c72a
9189 Author: djm@openbsd.org <djm@openbsd.org>
9190 Date: Sun Dec 19 22:20:12 2021 +0000
9192 upstream: regression test for destination restrictions in ssh-agent
9194 OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d
9196 commit 6e4980eb8ef94c04874a79dd380c3f568e8416d6
9197 Author: anton@openbsd.org <anton@openbsd.org>
9198 Date: Sat Dec 18 06:53:59 2021 +0000
9200 upstream: Make use of ntests variable, pointed out by clang 13.
9202 OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72
9204 commit 3eead8158393b697f663ec4301e3c7b6f24580b1
9205 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9206 Date: Tue Dec 14 21:25:27 2021 +0000
9208 upstream: sys/param.h cleanup, mostly using MINIMUM() and
9210 <limits.h> ok dtucker
9212 OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0
9214 commit 266678e19eb0e86fdf865b431b6e172e7a95bf48
9215 Author: djm@openbsd.org <djm@openbsd.org>
9216 Date: Sun Dec 19 22:15:42 2021 +0000
9218 upstream: document host-bound publickey authentication
9220 OpenBSD-Commit-ID: ea6ed91779a81f06d961e30ecc49316b3d71961b
9222 commit 3d00024b3b156aa9bbd05d105f1deb9cb088f6f7
9223 Author: djm@openbsd.org <djm@openbsd.org>
9224 Date: Sun Dec 19 22:15:21 2021 +0000
9226 upstream: document agent protocol extensions
9228 OpenBSD-Commit-ID: 09e8bb391bbaf24c409b75a4af44e0cac65405a7
9230 commit c385abf76511451bcba78568167b1cd9e90587d5
9231 Author: djm@openbsd.org <djm@openbsd.org>
9232 Date: Sun Dec 19 22:14:47 2021 +0000
9234 upstream: PubkeyAuthentication=yes|no|unbound|host-bound
9236 Allow control over which pubkey methods are used. Added out of
9237 concern that some hardware devices may have difficulty signing
9238 the longer pubkey authentication challenges. This provides a
9239 way for them to disable the extension. It's also handy for
9242 feedback / ok markus@
9244 OpenBSD-Commit-ID: ee52580db95c355cf6d563ba89974c210e603b1a
9246 commit 34b1e9cc7654f41cd4c5b1cc290b999dcf6579bb
9247 Author: djm@openbsd.org <djm@openbsd.org>
9248 Date: Sun Dec 19 22:14:12 2021 +0000
9250 upstream: document destination-constrained keys
9252 feedback / ok markus@
9254 OpenBSD-Commit-ID: cd8c526c77268f6d91c06adbee66b014d22d672e
9256 commit a6d7677c4abcfba268053e5867f2acabe3aa371b
9257 Author: djm@openbsd.org <djm@openbsd.org>
9258 Date: Sun Dec 19 22:13:55 2021 +0000
9260 upstream: Use hostkey parsed from hostbound userauth request
9262 Require host-bound userauth requests for forwarded SSH connections.
9264 The hostkey parsed from the host-bound userauth request is now checked
9265 against the most recently bound session ID / hostkey on the agent socket
9266 and the signature refused if they do not match.
9270 OpenBSD-Commit-ID: d69877c9a3bd8d1189a5dbdeceefa432044dae02
9272 commit baaff0ff4357cc5a079621ba6e2d7e247b765061
9273 Author: djm@openbsd.org <djm@openbsd.org>
9274 Date: Sun Dec 19 22:13:33 2021 +0000
9276 upstream: agent support for parsing hostkey-bound signatures
9278 Allow parse_userauth_request() to work with blobs from
9279 publickey-hostbound-v00@openssh.com userauth attempts.
9281 Extract hostkey from these blobs.
9285 OpenBSD-Commit-ID: 81c064255634c1109477dc65c3e983581d336df8
9287 commit 3e16365a79cdeb2d758cf1da6051b1c5266ceed7
9288 Author: djm@openbsd.org <djm@openbsd.org>
9289 Date: Sun Dec 19 22:13:12 2021 +0000
9291 upstream: EXT_INFO negotiation of hostbound pubkey auth
9293 the EXT_INFO packet gets a new publickey-hostbound@openssh.com to
9294 advertise the hostbound public key method.
9296 Client side support to parse this feature flag and set the kex->flags
9297 indicator if the expected version is offered (currently "0").
9301 OpenBSD-Commit-ID: 4cdb2ca5017ec1ed7a9d33bda95c1d6a97b583b0
9303 commit 94ae0c6f0e35903b695e033bf4beacea1d376bb1
9304 Author: djm@openbsd.org <djm@openbsd.org>
9305 Date: Sun Dec 19 22:12:54 2021 +0000
9307 upstream: client side of host-bound pubkey authentication
9309 Add kex->flags member to enable the publickey-hostbound-v00@openssh.com
9310 authentication method.
9312 Use the new hostbound method in client if the kex->flags flag was set,
9313 and include the inital KEX hostkey in the userauth request.
9315 Note: nothing in kex.c actually sets the new flag yet
9319 OpenBSD-Commit-ID: 5a6fce8c6c8a77a80ee1526dc467d91036a5910d
9321 commit 288fd0218dbfdcb05d9fbd1885904bed9b6d42e6
9322 Author: djm@openbsd.org <djm@openbsd.org>
9323 Date: Sun Dec 19 22:12:30 2021 +0000
9325 upstream: sshd side of hostbound public key auth
9327 This is identical to the standard "publickey" method, but it also includes
9328 the initial server hostkey in the message signed by the client.
9330 feedback / ok markus@
9332 OpenBSD-Commit-ID: 7ea01bb7238a560c1bfb426fda0c10a8aac07862
9334 commit dbb339f015c33d63484261d140c84ad875a9e548
9335 Author: djm@openbsd.org <djm@openbsd.org>
9336 Date: Sun Dec 19 22:12:07 2021 +0000
9338 upstream: prepare for multiple names for authmethods
9340 allow authentication methods to have one additional name beyond their
9343 allow lookup by this synonym
9345 Use primary name for authentication decisions, e.g. for
9346 PermitRootLogin=publickey
9348 Pass actual invoked name to the authmethods, so they can tell whether they
9349 were requested via the their primary name or synonym.
9353 OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559
9355 commit 39f00dcf44915f20684160f0a88d3ef8a3278351
9356 Author: djm@openbsd.org <djm@openbsd.org>
9357 Date: Sun Dec 19 22:11:39 2021 +0000
9359 upstream: ssh-agent side of destination constraints
9361 Gives ssh-agent the ability to parse restrict-destination-v00@openssh.com
9362 constraints and to apply them to keys.
9364 Check constraints against the hostkeys recorded for a SocketEntry when
9365 attempting a signature, adding, listing or deleting keys. Note that
9366 the "delete all keys" request will remove constrained keys regardless of
9369 feedback Jann Horn & markus@
9372 OpenBSD-Commit-ID: 84a7fb81106c2d609a6ac17469436df16d196319
9374 commit ce943912df812c573a33d00bf9e5435b7fcca3f7
9375 Author: djm@openbsd.org <djm@openbsd.org>
9376 Date: Sun Dec 19 22:11:06 2021 +0000
9378 upstream: ssh-add side of destination constraints
9380 Have ssh-add accept a list of "destination constraints" that allow
9381 restricting where keys may be used in conjunction with a ssh-agent/ssh
9382 that supports session ID/hostkey binding.
9384 Constraints are specified as either "[user@]host-pattern" or
9385 "host-pattern>[user@]host-pattern".
9387 The first form permits a key to be used to authenticate as the
9388 specified user to the specified host.
9390 The second form permits a key that has previously been permitted
9391 for use at a host to be available via a forwarded agent to an
9394 For example, constraining a key with "user1@host_a" and
9395 "host_a>host_b". Would permit authentication as "user1" at
9396 "host_a", and allow the key to be available on an agent forwarded
9397 to "host_a" only for authentication to "host_b". The key would not
9398 be visible on agent forwarded to other hosts or usable for
9399 authentication there.
9401 Internally, destination constraints use host keys to identify hosts.
9402 The host patterns are used to obtain lists of host keys for that
9403 destination that are communicated to the agent. The user/hostkeys are
9404 encoded using a new restrict-destination-v00@openssh.com key
9407 host keys are looked up in the default client user/system known_hosts
9408 files. It is possible to override this set on the command-line.
9410 feedback Jann Horn & markus@
9413 OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5
9415 commit 5e950d765727ee0b20fc3d2cbb0c790b21ac2425
9416 Author: djm@openbsd.org <djm@openbsd.org>
9417 Date: Sun Dec 19 22:10:24 2021 +0000
9419 upstream: ssh-add side of destination constraints
9421 Have ssh-add accept a list of "destination constraints" that allow
9422 restricting where keys may be used in conjunction with a ssh-agent/ssh
9423 that supports session ID/hostkey binding.
9425 Constraints are specified as either "[user@]host-pattern" or
9426 "host-pattern>[user@]host-pattern".
9428 The first form permits a key to be used to authenticate as the
9429 specified user to the specified host.
9431 The second form permits a key that has previously been permitted
9432 for use at a host to be available via a forwarded agent to an
9435 For example, constraining a key with "user1@host_a" and
9436 "host_a>host_b". Would permit authentication as "user1" at
9437 "host_a", and allow the key to be available on an agent forwarded
9438 to "host_a" only for authentication to "host_b". The key would not
9439 be visible on agent forwarded to other hosts or usable for
9440 authentication there.
9442 Internally, destination constraints use host keys to identify hosts.
9443 The host patterns are used to obtain lists of host keys for that
9444 destination that are communicated to the agent. The user/hostkeys are
9445 encoded using a new restrict-destination-v00@openssh.com key
9448 host keys are looked up in the default client user/system known_hosts
9449 files. It is possible to override this set on the command-line.
9451 feedback Jann Horn & markus@
9454 OpenBSD-Commit-ID: ef47fa9ec0e3c2a82e30d37ef616e245df73163e
9456 commit 4c1e3ce85e183a9d0c955c88589fed18e4d6a058
9457 Author: djm@openbsd.org <djm@openbsd.org>
9458 Date: Sun Dec 19 22:09:23 2021 +0000
9460 upstream: ssh-agent side of binding
9462 record session ID/hostkey/forwarding status for each active socket.
9464 Attempt to parse data-to-be-signed at signature request time and extract
9465 session ID from the blob if it is a pubkey userauth request.
9469 OpenBSD-Commit-ID: a80fd41e292b18b67508362129e9fed549abd318
9471 commit e9497ecf73f3c16667288bce48d4e3d7e746fea1
9472 Author: djm@openbsd.org <djm@openbsd.org>
9473 Date: Sun Dec 19 22:08:48 2021 +0000
9475 upstream: ssh client side of binding
9477 send session ID, hostkey, signature and a flag indicating whether the
9478 agent connection is being forwarded to ssh agent each time a connection
9479 is opened via a new "session-bind@openssh.com" agent extension.
9483 OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135
9485 commit b42c61d6840d16ef392ed0f365e8c000734669aa
9486 Author: djm@openbsd.org <djm@openbsd.org>
9487 Date: Sun Dec 19 22:08:06 2021 +0000
9489 upstream: Record session ID, host key and sig at intital KEX
9491 These will be used later for agent session ID / hostkey binding
9495 OpenBSD-Commit-ID: a9af29e33772b18e3e867c6fa8ab35e1694a81fe
9497 commit 26ca33d186473d58a32d812e19273ce078b6ffff
9498 Author: djm@openbsd.org <djm@openbsd.org>
9499 Date: Tue Dec 7 22:06:45 2021 +0000
9501 upstream: better error message for FIDO keys when we can't match
9505 OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650