1 commit 166456cedad3962b83b848b1e9caf80794831f0f
2 Author: Damien Miller <djm@mindrot.org>
3 Date: Wed Feb 23 22:31:11 2022 +1100
7 commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4
8 Author: djm@openbsd.org <djm@openbsd.org>
9 Date: Wed Feb 23 11:18:13 2022 +0000
11 upstream: avoid integer overflow of auth attempts (harmless, caught
15 OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86
17 commit 6e0258c64c901753df695e06498b26f9f4812ea6
18 Author: djm@openbsd.org <djm@openbsd.org>
19 Date: Wed Feb 23 11:17:10 2022 +0000
21 upstream: randomise the password used in fakepw
23 OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947
25 commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9
26 Author: djm@openbsd.org <djm@openbsd.org>
27 Date: Wed Feb 23 11:15:57 2022 +0000
29 upstream: use asprintf to construct .rhosts paths
31 OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b
33 commit c07e154fbdc7285e9ec54e78d8a31f7325d43537
34 Author: djm@openbsd.org <djm@openbsd.org>
35 Date: Wed Feb 23 11:07:09 2022 +0000
39 OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e
41 commit bc16667b4a1c3cad7029304853c143a32ae04bd4
42 Author: Darren Tucker <dtucker@dtucker.net>
43 Date: Tue Feb 22 15:29:22 2022 +1100
45 Extend select+rlimit sanbox test to include poll.
47 POSIX specifies that poll() shall fail if "nfds argument is greater
48 than {OPEN_MAX}". The setrlimit sandbox sets this to effectively zero
49 so this causes poll() to fail in the preauth privsep process.
51 This is likely the underlying cause for the previously observed similar
52 behaviour of select() on plaforms where it is implement in userspace on
55 commit 6520c488de95366be031d49287ed243620399e23
56 Author: Darren Tucker <dtucker@dtucker.net>
57 Date: Tue Feb 22 13:08:59 2022 +1100
59 Add Alpine Linux test VM.
61 commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb
62 Author: Darren Tucker <dtucker@dtucker.net>
63 Date: Tue Feb 22 12:27:07 2022 +1100
65 Include sys/param.h if present.
67 Needed for howmany() on MUSL systems such as Alpine.
69 commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c
70 Author: Darren Tucker <dtucker@dtucker.net>
71 Date: Tue Feb 22 12:25:52 2022 +1100
73 Only include sys/poll.h if we don't have poll.h.
75 Prevents warnings on MUSL based systems such as Alpine.
77 commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5
78 Author: Damien Miller <djm@mindrot.org>
79 Date: Tue Feb 22 11:14:51 2022 +1100
81 disable agent-restrict test on minix3
83 Minix seems to have a platform-wide limit on the number of
84 select(2) syscalls that can be concurrently issued. This test
85 seems to exceed this limit.
89 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114
90 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31
92 commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a
93 Author: Darren Tucker <dtucker@dtucker.net>
94 Date: Mon Feb 21 21:27:20 2022 +1100
96 Skip agent-getpeereid when running as root.
98 commit fbd772570a25436a33924d91c164d2b24021f010
99 Author: dtucker@openbsd.org <dtucker@openbsd.org>
100 Date: Sun Feb 20 03:47:26 2022 +0000
102 upstream: Aproximate realpath on the expected output by deduping
104 leading slashes. Fixes test failure when user's home dir is / which is
105 possible in some portable configurations.
107 OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63
109 commit 336685d223a59f893faeedf0a562e053fd84058e
110 Author: Darren Tucker <dtucker@dtucker.net>
111 Date: Sun Feb 20 13:30:52 2022 +1100
113 Really move DSA to end of list.
115 In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to
116 the end of the list instead of DSA. Spotted by andrew at fyfe.gb.net.
118 commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3
119 Author: Darren Tucker <dtucker@dtucker.net>
120 Date: Fri Feb 18 12:12:21 2022 +1100
122 Add test configs for MUSL C library.
124 commit f7fc6a43f1173e8b2c38770bf6cee485a562d03b
125 Author: Damien Miller <djm@mindrot.org>
126 Date: Thu Feb 17 22:54:19 2022 +1100
128 minix needs BROKEN_POLL too; chokes on /dev/null
130 commit 667fec5d4fe4406745750a32f69b5d2e1a75e94b
131 Author: djm@openbsd.org <djm@openbsd.org>
132 Date: Thu Feb 17 10:58:27 2022 +0000
134 upstream: check for EINTR/EAGAIN failures in the rfd fast-path; caught
136 by dtucker's minix3 vm :) ok dtucker@
138 OpenBSD-Commit-ID: 2e2c895a3e82ef347aa6694394a76a438be91361
140 commit 41417dbda9fb55a0af49a8236e3ef9d50d862644
141 Author: Darren Tucker <dtucker@dtucker.net>
142 Date: Thu Feb 17 22:05:29 2022 +1100
144 Comment hurd test, the VM is currently broken.
146 commit b2aee35a1f0dc798339b3fcf96136da71b7e3f6d
147 Author: Damien Miller <djm@mindrot.org>
148 Date: Thu Feb 17 21:15:16 2022 +1100
150 find sk-dummy.so when build_dir != src_dir
152 spotted by Corinna Vinschen; feedback & ok dtucker@
154 commit 62a2d4e50b2e89f2ef04576931895d5139a5d037
155 Author: Damien Miller <djm@mindrot.org>
156 Date: Wed Feb 16 16:26:17 2022 +1100
158 update versions in preparation for 8.9 release
160 commit dd6d3dded721ac653ea73c017325e5bfeeec837f
161 Author: djm@openbsd.org <djm@openbsd.org>
162 Date: Tue Feb 15 05:13:36 2022 +0000
164 upstream: document the unbound/host-bound options to
166 PubkeyAuthentication; spotted by HARUYAMA Seigo
168 OpenBSD-Commit-ID: 298f681b66a9ecd498f0700082c7a6c46e948981
170 commit df93529dd727fdf2fb290700cd4f1adb0c3c084b
171 Author: Darren Tucker <dtucker@dtucker.net>
172 Date: Mon Feb 14 14:19:40 2022 +1100
174 Test if sshd accidentally acquires controlling tty
176 When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour
177 in the STREAMS code before activating the workaround. ok djm@
179 commit 766176cfdbfd7ec38bb6118dde6e4daa0df34888
180 Author: Darren Tucker <dtucker@dtucker.net>
181 Date: Sat Feb 12 10:24:56 2022 +1100
183 Add cygwin-release test config.
185 This tests the flags used to build the cygwin release binaries.
187 commit b30698662b862f5397116d23688aac0764e0886e
188 Author: Darren Tucker <dtucker@dtucker.net>
189 Date: Fri Feb 11 21:00:35 2022 +1100
191 Move SSHD_ACQUIRES_CTTY workaround into compat.
193 On some (most? all?) SysV based systems with STREAMS based ptys,
194 sshd could acquire a controlling terminal during pty setup when
195 it pushed the "ptem" module, due to what is probably a bug in
196 the STREAMS driver that's old enough to vote. Because it was the
197 privileged sshd's controlling terminal, it was not available for
198 the user's session, which ended up without one. This is known to
199 affect at least Solaris <=10, derivatives such as OpenIndiana and
200 several other SysV systems. See bz#245 for the backstory.
202 In the we past worked around that by not calling setsid in the
203 privileged sshd child, which meant it was not a session or process
204 group leader. This solved controlling terminal problem because sshd
205 was not eligble to acquire one, but had other side effects such as
206 not cleaning up helper subprocesses in the SIGALRM handler since it
207 was not PG leader. Recent cleanups in the signal handler uncovered
208 this, resulting in the LoginGraceTime timer not cleaning up privsep
209 unprivileged processes.
211 This change moves the workaround into the STREAMS pty allocation code,
212 by allocating a sacrificial pty to act as sshd's controlling terminal
213 before allocating user ptys, so those are still available for users'
217 - this will waste a pty per ssh connection on affected platforms.
220 - it makes the process group behaviour consistent between platforms.
222 - it puts the workaround nearest the code that actually causes the
223 problem and competely out of the mainline code.
225 - the workaround is only activated if you use the STREAMS code. If,
226 say, Solaris 11 has the bug but also a working openpty() it doesn't
227 matter that we defined SSHD_ACQUIRES_CTTY.
229 - the workaround is only activated when the fist pty is allocated,
230 ie in the post-auth privsep monitor. This means there's no risk
231 of fd leaks to the unprivileged processes, and there's no effect on
232 sessions that do not allocate a pty.
234 Based on analysis and work by djm@, ok djm@
236 commit cd00b48cf10f3565936a418c1e6d7e48b5c36140
237 Author: Darren Tucker <dtucker@dtucker.net>
238 Date: Fri Feb 11 20:09:32 2022 +1100
240 Simplify handling of --with-ssl-dir.
244 commit ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0
245 Author: Darren Tucker <dtucker@dtucker.net>
246 Date: Fri Feb 11 13:39:29 2022 +1100
248 Stop testing OpenBSD HEAD on 6.9 and 7.0.
250 HEAD is not guaranteed to work on previous stable branches, and at the
251 moment is broken due to libfido API changes.
253 commit 50b9e4a4514697ffb9592200e722de6b427cb9ff
254 Author: dtucker@openbsd.org <dtucker@openbsd.org>
255 Date: Fri Feb 11 00:43:56 2022 +0000
257 upstream: Always initialize delim before passing to hpdelim2 which
259 might not set it. Found by the Valgrind tests on github, ok deraadt@
261 OpenBSD-Commit-ID: c830c0db185ca43beff3f41c19943c724b4f636d
263 commit 6ee53064f476cf163acd5521da45b11b7c57321b
264 Author: Darren Tucker <dtucker@dtucker.net>
265 Date: Fri Feb 11 10:03:06 2022 +1100
267 Fix helper include path and remove excess code.
269 Looks like test_hpdelim.c was imported twice into the same file.
270 Spotted by kevin.brott at gmail com and chris at cataclysmal org.
272 commit 9fa63a19f68bc87452d3cf5c577cafad2921b7a4
273 Author: Darren Tucker <dtucker@dtucker.net>
274 Date: Thu Feb 10 23:27:02 2022 +1100
276 Put poll.h inside ifdef.
278 commit 3ac00dfeb54b252c15dcbf1971582e9e3b946de6
279 Author: Darren Tucker <dtucker@dtucker.net>
280 Date: Thu Feb 10 22:17:31 2022 +1100
282 We now support POLLPRI so actually define it.
284 commit 25bd659cc72268f2858c5415740c442ee950049f
285 Author: dtucker@openbsd.org <dtucker@openbsd.org>
286 Date: Sun Feb 6 22:58:33 2022 +0000
288 upstream: Add test for empty hostname with port.
290 OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3
292 commit a29af853cff41c0635f0378c00fe91bf9c91dea4
293 Author: dtucker@openbsd.org <dtucker@openbsd.org>
294 Date: Fri Feb 4 07:53:44 2022 +0000
296 upstream: Add unit tests for hpdelim.
298 OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018
300 commit 9699151b039ecc5fad9ac6c6c02e9afdbd26f15f
301 Author: djm@openbsd.org <djm@openbsd.org>
302 Date: Thu Feb 10 04:12:38 2022 +0000
304 upstream: revert for imminent OpenSSH release, which wil ship with
309 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl;
310 > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
311 > protocol for copying. Let's get back to testing the SFTP protocol.
313 This will be put back once the OpenSSH release is done.
315 OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768
317 commit 45279abceb37c3cbfac8ba36dde8b2c8cdd63d32
318 Author: dtucker@openbsd.org <dtucker@openbsd.org>
319 Date: Tue Feb 8 08:59:12 2022 +0000
321 upstream: Switch hpdelim interface to accept only ":" as delimiter.
323 Historicallly, hpdelim accepted ":" or "/" as a port delimiter between
324 hosts (or addresses) and ports. These days most of the uses for "/"
325 are no longer accepted, so there are several places where it checks the
326 delimiter to disallow it. Make hpdelim accept only ":" and use hpdelim2
327 in the other cases. ok djm@
329 OpenBSD-Commit-ID: 7e6420bd1be87590b6840973f5ad5305804e3102
331 commit a1bcbf04a7c2d81944141db7ecd0ba292d175a66
332 Author: pedro martelletto <pedro@yubico.com>
333 Date: Mon Feb 7 09:09:59 2022 +0100
335 fix typos in previous
337 commit 56192518e329b39f063487bc2dc4d796f791eca0
338 Author: Damien Miller <djm@mindrot.org>
339 Date: Mon Feb 7 12:53:47 2022 +1100
341 compat code for fido_assert_set_clientdata()
343 commit d6b5aa08fdcf9b527f8b8f932432941d5b76b7ab
344 Author: djm@openbsd.org <djm@openbsd.org>
345 Date: Mon Feb 7 01:25:12 2022 +0000
347 upstream: use libfido2 1.8.0+ fido_assert_set_clientdata() instead
349 of manually hashing data outselves. Saves a fair bit of code and makes life
350 easier for some -portable platforms.
352 OpenBSD-Commit-ID: 351dfaaa5ab1ee928c0e623041fca28078cff0e0
354 commit 86cc93fd3c26b2e0c7663c6394995fb04ebfbf3b
355 Author: jsg@openbsd.org <jsg@openbsd.org>
356 Date: Sun Feb 6 00:29:03 2022 +0000
358 upstream: remove please from manual pages ok jmc@ sthen@ millert@
360 OpenBSD-Commit-ID: 6543acb00f4f38a23472538e1685c013ca1a99aa
362 commit ad16a84e64a8cf1c69c63de3fb9008320a37009c
363 Author: dtucker@openbsd.org <dtucker@openbsd.org>
364 Date: Fri Feb 4 02:49:17 2022 +0000
366 upstream: Since they are deprecated, move DSA to the end of the
368 default list of public keys so that they will be tried last. From github
369 PR#295 from "ProBackup-nl", ok djm@
371 OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0
373 commit 253de42753de85dde266e061b6fec12ca6589f7d
374 Author: Damien Miller <djm@mindrot.org>
375 Date: Wed Feb 2 16:52:07 2022 +1100
377 portable-specific string array constification
381 commit dfdcc2220cf359c492d5d34eb723370e8bd8a19e
382 Author: djm@openbsd.org <djm@openbsd.org>
383 Date: Tue Feb 1 23:37:15 2022 +0000
385 upstream: test 'ssh-keygen -Y find-principals' with wildcard
387 principals; from Fabian Stelzer
389 OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40
391 commit 968e508967ef42480cebad8cf3172465883baa77
392 Author: dtucker@openbsd.org <dtucker@openbsd.org>
393 Date: Fri Jan 21 02:54:41 2022 +0000
395 upstream: Enable all supported ciphers and macs in the server
397 before trying to benchmark them. Increase the data file size to get more
400 OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6
402 commit 15b7199a1fd37eff4c695e09d573f3db9f4274b7
403 Author: djm@openbsd.org <djm@openbsd.org>
404 Date: Tue Feb 1 23:34:47 2022 +0000
406 upstream: allow 'ssh-keygen -Y find-principals' to match wildcard
408 principals in allowed_signers files; from Fabian Stelzer
410 OpenBSD-Commit-ID: 1e970b9c025b80717dddff5018fe5e6f470c5098
412 commit 541667fe6dc26d7881e55f0bb3a4baa6f3171645
413 Author: djm@openbsd.org <djm@openbsd.org>
414 Date: Tue Feb 1 23:32:51 2022 +0000
416 upstream: mark const string array contents const too, i.e. static
418 const char *array => static const char * const array from Mike Frysinger
420 OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1
422 commit 8cfa73f8a2bde4c98773f33f974c650bdb40dd3c
423 Author: djm@openbsd.org <djm@openbsd.org>
424 Date: Tue Feb 1 23:11:11 2022 +0000
426 upstream: better match legacy scp behaviour: show un-expanded paths
428 in error messages. Spotted by and ok tb@
430 OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7
432 commit 4e62c13ab419b4b224c8bc6a761e91fcf048012d
433 Author: dtucker@openbsd.org <dtucker@openbsd.org>
434 Date: Tue Feb 1 07:57:32 2022 +0000
436 upstream: Remove explicit kill of privsep preauth child's PID in
438 SIGALRM handler. It's no longer needed since the child will get terminated by
439 the SIGTERM to the process group that cleans up any auth helpers, it
440 simplifies the signal handler and removes the risk of a race when updating
441 the PID. Based on analysis by HerrSpace in github PR#289, ok djm@
443 OpenBSD-Commit-ID: 2be1ffa28b4051ad9e33bb4371e2ec8a31d6d663
445 commit 2a7ccd2ec4022917b745af7186f514f365b7ebe9
446 Author: guenther@openbsd.org <guenther@openbsd.org>
447 Date: Fri Jan 28 06:18:42 2022 +0000
449 upstream: When it's the possessive of 'it', it's spelled "its",
451 without the apostrophe.
453 OpenBSD-Commit-ID: fb6ab9c65bd31de831da1eb4631ddac018c5fae7
455 commit 8a0848cdd3b25c049332cd56034186b7853ae754
456 Author: Alex James <theracermaster@gmail.com>
457 Date: Sun Jan 30 16:13:36 2022 -0600
459 sandbox-seccomp-filter: allow gettid
461 Some allocators (such as Scudo) use gettid while tracing allocations [1].
462 Allow gettid in preauth to prevent sshd from crashing with Scudo.
464 [1]: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.0/compiler-rt/lib/gwp_asan/common.cpp#L46
466 commit b30d32159dc3c7052f4bfdf36357996c905af739
467 Author: djm@openbsd.org <djm@openbsd.org>
468 Date: Sat Jan 22 00:49:34 2022 +0000
470 upstream: add a ssh_packet_process_read() function that reads from
472 a fd directly into the transport input buffer.
474 Use this in the client and server mainloops to avoid unnecessary
475 copying. It also lets us use a more greedy read size without penalty.
477 Yields a 2-3% performance gain on cipher-speed.sh (in a fairly
478 unscientific test tbf)
480 feedback dtucker@ ok markus@
482 OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632
484 commit a1a8efeaaa9cccb15cdc0a2bd7c347a149a3a7e3
485 Author: djm@openbsd.org <djm@openbsd.org>
486 Date: Sat Jan 22 00:45:31 2022 +0000
488 upstream: Use sshbuf_read() to read directly into the channel input
490 buffer rather than into a stack buffer that needs to be copied again;
491 Improves performance by about 1% on cipher-speed.sh feedback dtucker@ ok
494 OpenBSD-Commit-ID: bf5e6e3c821ac3546dc8241d8a94e70d47716572
496 commit 29a76994e21623a1f84d68ebb9dc5a3c909fa3a7
497 Author: Damien Miller <djm@mindrot.org>
498 Date: Tue Jan 25 11:52:34 2022 +1100
502 commit 754e0d5c7712296a7a3a83ace863812604c7bc4f
503 Author: djm@openbsd.org <djm@openbsd.org>
504 Date: Sat Jan 22 00:43:43 2022 +0000
506 upstream: Add a sshbuf_read() that attempts to read(2) directly in
508 to a sshbuf; ok markus@
510 OpenBSD-Commit-ID: 2d8f249040a4279f3bc23c018947384de8d4a45b
512 commit c7964fb9829d9ae2ece8b51a76e4a02e8449338d
513 Author: djm@openbsd.org <djm@openbsd.org>
514 Date: Fri Jan 21 07:04:19 2022 +0000
516 upstream: add a helper for writing an error message to the
518 stderr_buf and setting quit_pending; no functional change but saves a bunch
521 OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d
523 commit d23b4f7fdb1bd87e2cd7a9ae7c198ae99d347916
524 Author: djm@openbsd.org <djm@openbsd.org>
525 Date: Fri Jan 21 06:58:06 2022 +0000
527 upstream: correct comment and use local variable instead of long
529 indirection; spotted by dtucker@
531 OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965
533 commit d069b020a02b6e3935080204ee44d233e8158ebb
534 Author: deraadt@openbsd.org <deraadt@openbsd.org>
535 Date: Fri Jan 21 00:53:40 2022 +0000
537 upstream: When poll(2) returns -1, for some error conditions
539 pfd[].revents is not cleared. There are subtle errors in various programs.
540 In this particular case, the program should error out. ok djm millert
542 OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c
544 commit e204b34337a965feb439826157c191919fd9ecf8
545 Author: Damien Miller <djm@mindrot.org>
546 Date: Sat Jan 22 11:38:21 2022 +1100
548 restore tty force-read hack
550 This portable-specific hack fixes a hang on exit for ttyful sessions
551 on Linux and some SysVish Unix variants. It was accidentally disabled
552 in commit 5c79952dfe1a (a precursor to the mainloop poll(2) conversion).
554 Spotted by John in bz3383
556 commit 68085066b6bad43643b43f5957fcc5fd34782ccd
557 Author: Corinna Vinschen <vinschen@redhat.com>
558 Date: Fri Jan 21 03:22:56 2022 +1100
560 Fix signedness bug in Cygwin code
562 The Cygwin-specific pattern match code has a bug. It checks
563 the size_t value returned by mbstowcs for being < 0. The right
564 thing to do is to check against (size_t) -1. Fix that.
566 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
568 commit 2e5cfed513e84444483baf1d8b31c40072b05103
569 Author: Darren Tucker <dtucker@dtucker.net>
570 Date: Thu Jan 20 13:26:27 2022 +1100
572 Improve compatibility of early exit trap handling.
574 Dash (as used by the github runners) has some differences in its trap
576 - it doesn't have -p (which is fine, that's not in posix).
577 - it doesn't work in a subshell (which turns out to be in compliance
578 with posix, which means bash isn't).
579 - it doesn't work in a pipeline, ie "trap|cat" produces no output.
581 commit 3fe6800b6027add478e648934cbb29d684e51943
582 Author: Darren Tucker <dtucker@dtucker.net>
583 Date: Thu Jan 20 00:49:57 2022 +1100
585 Move more tests out of valgrind-1 runner.
587 commit 20da6ed136dd76e6a0b229ca3036ef9c7c7ef798
588 Author: Darren Tucker <dtucker@dtucker.net>
589 Date: Wed Jan 19 15:37:39 2022 +1100
591 Invoke EXIT handler early when using Valgrind.
593 When using Valgrind, we need to wait for all invoked programs to
594 complete before checking their valgrind logs. Some tests, notably
595 agent-restrict, set an EXIT trap handler to clean up things like
596 ssh-agent, but those do not get invoked until test-exec.sh exits.
597 This causes the Valgrind wait to deadlock, so if present invoke
598 the EXIT handler before checking the Valgrind logs.
600 commit ad2e0580c87b0714cf166bca9d926a95ddeee1c8
601 Author: Darren Tucker <dtucker@dtucker.net>
602 Date: Tue Jan 18 12:55:21 2022 +1100
604 Remove line leftover from upstream sync.
606 commit d1051c0f11a6b749027e26bbeb61b07df4b67e15
607 Author: djm@openbsd.org <djm@openbsd.org>
608 Date: Mon Jan 17 22:56:04 2022 +0000
610 upstream: when decompressing zlib compressed packets, use
612 Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually
613 specified as a valid mode for inflate(). There should be no practical change
614 in behaviour as the compression side ensures a flush that should make all
615 data available to the receiver in all cases.
617 repoted by lamm AT ibm.com via bz3372; ok markus
619 OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b
621 commit d5981b1883746b1ae178a46229c26b53af99e37a
622 Author: djm@openbsd.org <djm@openbsd.org>
623 Date: Mon Jan 17 21:41:04 2022 +0000
625 upstream: make most of the sftp errors more idiomatic, following
627 the general form of "[local/remote] operation path: error message"; ok markus
629 OpenBSD-Commit-ID: 61364cd5f3a9fecaf8d63b4c38a42c0c91f8b571
631 commit ac7c9ec894ed0825d04ef69c55babb49bab1d32e
632 Author: djm@openbsd.org <djm@openbsd.org>
633 Date: Mon Jan 17 21:39:51 2022 +0000
635 upstream: when transferring multiple files in SFTP mode, create the
637 destination directory if it doesn't already exist to match olde-scp(1)
638 behaviour. noticed by deraadt@ ok markus@
640 OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407
642 commit 39d17e189f8e72c34c722579d8d4e701fa5132da
643 Author: djm@openbsd.org <djm@openbsd.org>
644 Date: Fri Jan 14 03:43:48 2022 +0000
646 upstream: allow pin-required FIDO keys to be added to ssh-agent(1).
648 ssh-askpass will be used to request the PIN at authentication time.
650 From Pedro Martelletto, ok djm
652 OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950
654 commit 52423f64e13db2bdc31a51b32e999cb1bfcf1263
655 Author: djm@openbsd.org <djm@openbsd.org>
656 Date: Fri Jan 14 03:35:10 2022 +0000
658 upstream: ssh-sk: free a resident key's user id
660 From Pedro Martelletto; ok dtucker & me
662 OpenBSD-Commit-ID: 47be40d602b7a6458c4c71114df9b53d149fc2e9
664 commit 014e2f147a2788bfb3cc58d1b170dcf2bf2ee493
665 Author: djm@openbsd.org <djm@openbsd.org>
666 Date: Fri Jan 14 03:34:00 2022 +0000
668 upstream: sshsk_load_resident: don't preallocate resp
670 resp is allocated by client_converse(), at which point we lose
671 the original pointer.
673 From Pedro Martelletto; ok dtucker & me
675 OpenBSD-Commit-ID: 1f1b5ea3282017d6584dfed4f8370dc1db1f44b1
677 commit c88265f207dfe0e8bdbaf9f0eda63ed6b33781cf
678 Author: djm@openbsd.org <djm@openbsd.org>
679 Date: Fri Jan 14 03:32:52 2022 +0000
681 upstream: sshsk_sign: trim call to sshkey_fingerprint()
683 the resulting fingerprint doesn't appear to be used for anything,
684 and we end up leaking it.
686 from Pedro Martelletto; ok dtucker & me
688 OpenBSD-Commit-ID: 5625cf6c68f082bc2cbbd348e69a3ed731d2f9b7
690 commit 1cd1b2eac39661b849d5a4b4b56363e22bb5f61e
691 Author: djm@openbsd.org <djm@openbsd.org>
692 Date: Fri Jan 14 03:31:52 2022 +0000
694 upstream: use status error message to communicate ~user expansion
696 failures; provides better experience for scp in sftp mode, where ~user paths
697 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
700 (forgot to include this file in previous commit)
702 OpenBSD-Commit-ID: d37cc4c8c861ce48cd6ea9899e96aaac3476847b
704 commit a1d42a6ce0398da3833bedf374ef2571af7fea50
705 Author: Damien Miller <djm@mindrot.org>
706 Date: Fri Jan 14 13:49:32 2022 +1100
708 fix edge case in poll(2) wrapper
710 Correct handling of select(2) exceptfds. These should only be consulted
711 for POLLPRI flagged pfds and not unconditionally converted to POLLERR.
715 commit 976b9588b4b5babcaceec4767a241c11a67a5ccb
716 Author: Darren Tucker <dtucker@dtucker.net>
717 Date: Fri Jan 14 13:46:35 2022 +1100
719 Wrap OpenSSL includes in unit tests in ifdef.
721 Fixes unit test on systems that do not have OpenSSL headers installed.
723 commit c171879374b2e8b07157503f5639ed0bce59ce89
724 Author: Darren Tucker <dtucker@dtucker.net>
725 Date: Thu Jan 13 15:53:33 2022 +1100
729 agent-restrict now takes care of this itself.
731 commit 9cc2654403f1a686bb26c07a6ac790edf334cef5
732 Author: dtucker@openbsd.org <dtucker@openbsd.org>
733 Date: Thu Jan 13 04:53:16 2022 +0000
735 upstream: Set LC_ALL in both local and remote shells so that sorted
737 output matches regardless of what the user's shell sets it to. ok djm@
739 OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f
741 commit 7a75f748cb2dd2f771bf70ea72698aa027996ab1
742 Author: dtucker@openbsd.org <dtucker@openbsd.org>
743 Date: Thu Jan 13 04:22:10 2022 +0000
745 upstream: Avoid %'s in commands (not used in OpenBSD, but used in
747 -portable's Valgrind test) being interpretted as printf format strings.
749 OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043
751 commit 6c435bd4994d71442192001483a1cdb846e5ffcd
752 Author: Darren Tucker <dtucker@dtucker.net>
753 Date: Wed Jan 12 16:58:13 2022 +1100
755 Stop on first test failure to minimize logs.
757 commit 4bc2ba6095620a4484b708ece12842afd8c7685b
758 Author: dtucker@openbsd.org <dtucker@openbsd.org>
759 Date: Wed Jan 12 07:18:37 2022 +0000
761 upstream: Use egrep when searching for an anchored string.
763 OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4
765 commit 6bf2efa2679da1e8e60731f41677b2081dedae2c
766 Author: Darren Tucker <dtucker@dtucker.net>
767 Date: Wed Jan 12 18:25:06 2022 +1100
769 Add "rev" command replacement if needed.
771 commit 72bcd7993dadaf967bb3d8564ee31cbf38132b5d
772 Author: dtucker@openbsd.org <dtucker@openbsd.org>
773 Date: Wed Jan 12 03:30:32 2022 +0000
775 upstream: Don't log NULL hostname in restricted agent code,
777 printf("%s", NULL) is not safe on all platforms. with & ok djm
779 OpenBSD-Commit-ID: faf10cdae4adde00cdd668cd1f6e05d0a0e32a02
781 commit acabefe3f8fb58c867c99fed9bbf84dfa1771727
782 Author: djm@openbsd.org <djm@openbsd.org>
783 Date: Tue Jan 11 22:33:16 2022 +0000
785 upstream: remove hardcoded domain and use window.location.host, so this
789 OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92
791 commit 96da0946e44f34adc0397eb7caa6ec35a3e79891
792 Author: dtucker@openbsd.org <dtucker@openbsd.org>
793 Date: Tue Jan 11 02:56:19 2022 +0000
795 upstream: "void" functions should not return anything. From Tim Rice
799 OpenBSD-Commit-ID: ce6616304f4c9881b46413e616b226c306830e2a
801 commit a882a09722c9f086c9edb65d0c4022fd965ec1ed
802 Author: djm@openbsd.org <djm@openbsd.org>
803 Date: Tue Jan 11 01:26:47 2022 +0000
805 upstream: suppress "Connection to xxx closed" messages at LogLevel >=
807 error bz3378; ok dtucker@
809 OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c
811 commit 61a1a6af22e17fc94999a5d1294f27346e6c4668
812 Author: Damien Miller <djm@mindrot.org>
813 Date: Wed Jan 12 08:57:49 2022 +1100
815 OS X poll(2) is broken; use compat replacement
817 Darwin's poll(2) implementation is broken. For character-special
818 devices like /dev/null, it returns POLLNVAL when polled with
821 Apparently this is Apple bug 3710161, which is AFAIK not public,
822 but a websearch will find other OSS projects rediscovering it
823 periodically since it was first identified in 2005 (!!)
825 commit 613a6545fc5a9542753b503cbe5906538a640b60
826 Author: Darren Tucker <dtucker@dtucker.net>
827 Date: Tue Jan 11 20:56:01 2022 +1100
829 libhardended_malloc.so moved into out dir.
831 commit 61761340be5e11046556623f8f5412b236cefa95
832 Author: Tim Rice <tim@multitalents.net>
833 Date: Mon Jan 10 11:07:04 2022 -0800
835 Make USL compilers happy
836 UX:acomp: ERROR: "sftp-server.c", line 567: void function cannot return value
838 commit 3ef403f351e80a59b6f7e9d43cb82c181855483c
839 Author: Darren Tucker <dtucker@dtucker.net>
840 Date: Mon Jan 10 21:07:38 2022 +1100
842 Add wrapper for "sort" to set LC_ALL=C.
844 Found by djm, this should make sorts stable and reduce test flakiness.
846 commit bd69e29f5716090181dbe0b8272eb7eab1a383bb
847 Author: dtucker@openbsd.org <dtucker@openbsd.org>
848 Date: Sat Jan 8 07:55:26 2022 +0000
850 upstream: Remove errant "set -x" left over from debugging.
852 OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc
854 commit 1a7c88e26fd673813dc5f61c4ac278564845e004
855 Author: dtucker@openbsd.org <dtucker@openbsd.org>
856 Date: Sat Jan 8 07:01:13 2022 +0000
858 upstream: Enable all supported hostkey algorithms (but no others).
860 Allows hostbased test to pass when built without OpenSSL.
862 OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562
864 commit 12b457c2a42ff271e7967d9bedd068cebb048db9
865 Author: djm@openbsd.org <djm@openbsd.org>
866 Date: Sat Jan 8 07:37:32 2022 +0000
868 upstream: use status error message to communicate ~user expansion
870 failures; provides better experience for scp in sftp mode, where ~user paths
871 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
874 OpenBSD-Commit-ID: fc610ce00ca0cdc2ecdabbd49ce7cb82033f905f
876 commit 63670d4e9030bcee490d5a9cce561373ac5b3b23
877 Author: djm@openbsd.org <djm@openbsd.org>
878 Date: Sat Jan 8 07:36:11 2022 +0000
880 upstream: fix some corner-case bugs in scp sftp-mode handling of
882 ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus
884 OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222
886 commit e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0
887 Author: djm@openbsd.org <djm@openbsd.org>
888 Date: Sat Jan 8 07:34:57 2022 +0000
890 upstream: more idiomatic error messages; spotted by jsg & deraadt
894 OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8
896 commit 9acddcd5918c623f7ebf454520ffe946a8f15e90
897 Author: djm@openbsd.org <djm@openbsd.org>
898 Date: Sat Jan 8 07:33:54 2022 +0000
900 upstream: add a variant of send_status() that allows overriding the
902 default, generic error message. feedback/ok markus & jsg
904 OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f
906 commit 961411337719d4cd78f1ab33e4ac549f3fa22f50
907 Author: djm@openbsd.org <djm@openbsd.org>
908 Date: Sat Jan 8 07:32:45 2022 +0000
910 upstream: refactor tilde_expand_filename() and make it handle ~user
912 paths with no trailing slash; feedback/ok markus and jsg
914 OpenBSD-Commit-ID: a2ab365598a902f0f14ba6a4f8fb2d07a9b5d51d
916 commit dc38236ab6827dec575064cac65c8e7035768773
917 Author: dtucker@openbsd.org <dtucker@openbsd.org>
918 Date: Thu Jan 6 22:14:25 2022 +0000
920 upstream: Don't explicitly set HostbasedAuthentication in
922 sshd_config. It defaults to "no", and not explicitly setting it allows us to
923 enable it for the (optional) hostbased test.
925 OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c
927 commit e12d912ddf1c873cb72e5de9a197afbe0b6622d2
928 Author: dtucker@openbsd.org <dtucker@openbsd.org>
929 Date: Thu Jan 6 21:46:56 2022 +0000
931 upstream: Add test for hostbased auth. It requires some external
933 setup (see comments at the top) and thus is disabled unless
934 TEST_SSH_HOSTBASED_AUTH and SUDO are set.
936 OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a
938 commit a48533a8da6a0f4f05ecd055dc8048047e53569e
939 Author: Damien Miller <djm@mindrot.org>
940 Date: Fri Jan 7 09:24:26 2022 +1100
944 commit d9dbb5d9a0326e252d3c7bc13beb9c2434f59409
945 Author: djm@openbsd.org <djm@openbsd.org>
946 Date: Thu Jan 6 22:06:51 2022 +0000
948 upstream: allow hostbased auth to select RSA keys when only
950 RSA/SHA2 are configured (this is the default case); ok markus@
952 OpenBSD-Commit-ID: 411c18c7bde40c60cc6dfb7017968577b4d4a827
954 commit fdb1d58d0d3888b042e5a500f6ce524486aaf782
955 Author: djm@openbsd.org <djm@openbsd.org>
956 Date: Thu Jan 6 22:05:42 2022 +0000
958 upstream: add a helper function to match a key type to a list of
960 signature algorithms. RSA keys can make signatures with multiple algorithms,
961 so some special handling is required. ok markus@
963 OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff
965 commit 11e8c4309a5086a45fbbbc87d0af5323c6152914
966 Author: djm@openbsd.org <djm@openbsd.org>
967 Date: Thu Jan 6 22:04:20 2022 +0000
969 upstream: log some details on hostkeys that ssh loads for
971 hostbased authn ok markus@
973 OpenBSD-Commit-ID: da17061fa1f0e58cb31b88478a40643e18233e38
975 commit c6706f661739514a34125aa3136532a958929510
976 Author: djm@openbsd.org <djm@openbsd.org>
977 Date: Thu Jan 6 22:03:59 2022 +0000
979 upstream: log signature algorithm during verification by monitor;
983 OpenBSD-Commit-ID: 02b92bb42c4d4bf05a051702a56eb915151d9ecc
985 commit 8832402bd500d1661ccc80a476fd563335ef6cdc
986 Author: djm@openbsd.org <djm@openbsd.org>
987 Date: Thu Jan 6 22:02:52 2022 +0000
989 upstream: piece of UpdateHostkeys client strictification: when
991 updating known_hosts with new keys, ignore NULL keys (forgot to include in
994 OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08
996 commit c2d9ced1da0276961d86690b3bd7ebdaca7fdbf7
997 Author: djm@openbsd.org <djm@openbsd.org>
998 Date: Thu Jan 6 22:01:14 2022 +0000
1000 upstream: include rejected signature algorithm in error message
1002 and not the (useless) key type; ok markus
1004 OpenBSD-Commit-ID: 4180b5ec7ab347b43f84e00b1972515296dab023
1006 commit 7aa7b096cf2bafe2777085abdeed5ce00581f641
1007 Author: djm@openbsd.org <djm@openbsd.org>
1008 Date: Thu Jan 6 22:00:18 2022 +0000
1010 upstream: make ssh-keysign use the requested signature algorithm
1012 and not the default for the keytype. Part of unbreaking hostbased auth for
1013 RSA/SHA2 keys. ok markus@
1015 OpenBSD-Commit-ID: b5639a14462948970da3a8020dc06f9a80ecccdc
1017 commit 291721bc7c840d113a49518f3fca70e86248b8e8
1018 Author: djm@openbsd.org <djm@openbsd.org>
1019 Date: Thu Jan 6 21:57:28 2022 +0000
1021 upstream: stricter UpdateHostkey signature verification logic on
1023 the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when
1024 RSA/SHA1 was explicitly negotiated during initial KEX; bz3375
1028 OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29
1030 commit 0fa33683223c76289470a954404047bc762be84c
1031 Author: djm@openbsd.org <djm@openbsd.org>
1032 Date: Thu Jan 6 21:55:23 2022 +0000
1034 upstream: Fix signature algorithm selection logic for
1036 UpdateHostkeys on the server side. The previous code tried to prefer RSA/SHA2
1037 for hostkey proofs of RSA keys, but missed some cases. This will use RSA/SHA2
1038 signatures for RSA keys if the client proposed these algorithms in initial
1041 Mostly by Dmitry Belyavskiy with some tweaks by me.
1045 OpenBSD-Commit-ID: c17ba0c3236340d2c6a248158ebed042ac6a8029
1047 commit 17877bc81db3846e6e7d4cfb124d966bb9c9296b
1048 Author: djm@openbsd.org <djm@openbsd.org>
1049 Date: Thu Jan 6 21:48:38 2022 +0000
1051 upstream: convert ssh, sshd mainloops from select() to poll();
1053 feedback & ok deraadt@ and markus@ has been in snaps for a few months
1055 OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c
1057 commit 5c79952dfe1aa36105c93b3f383ce9be04dee384
1058 Author: djm@openbsd.org <djm@openbsd.org>
1059 Date: Thu Jan 6 21:46:23 2022 +0000
1061 upstream: prepare for conversion of ssh, sshd mainloop from
1063 select() to poll() by moving FD_SET construction out of channel handlers into
1064 separate functions. ok markus
1066 OpenBSD-Commit-ID: 937fbf2a4de12b19fb9d5168424e206124807027
1068 commit 24c5187edfef4651a625b7d5d692c8c7e794f71f
1069 Author: djm@openbsd.org <djm@openbsd.org>
1070 Date: Wed Jan 5 21:54:37 2022 +0000
1072 upstream: add a comment so I don't make this mistake again
1074 OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e
1076 commit 7369900441929058263a17f56aa67e05ff7ec628
1077 Author: djm@openbsd.org <djm@openbsd.org>
1078 Date: Wed Jan 5 21:50:00 2022 +0000
1080 upstream: fix cut-and-pasto in error message
1082 OpenBSD-Commit-ID: 4cc5c619e4b456cd2e9bb760d17e3a9c84659198
1084 commit 294c11b1c7d56d3fb61e329603a782315ed70c62
1085 Author: djm@openbsd.org <djm@openbsd.org>
1086 Date: Wed Jan 5 08:25:05 2022 +0000
1088 upstream: select all RSA hostkey algorithms for UpdateHostkeys tests,
1092 OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8
1094 commit 2ea1108c30e3edb6f872dfc1e6da10b041ddf2c0
1095 Author: djm@openbsd.org <djm@openbsd.org>
1096 Date: Wed Jan 5 04:56:15 2022 +0000
1098 upstream: regress test both sshsig message hash algorithms, possible
1100 now because the algorithm is controllable via the CLI
1102 OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f
1104 commit 2327c306b5d4a2b7e71178e5a4d139af9902c2b0
1105 Author: djm@openbsd.org <djm@openbsd.org>
1106 Date: Wed Jan 5 04:50:11 2022 +0000
1108 upstream: allow selection of hash at sshsig signing time; code
1110 already supported either sha512 (default) or sha256, but plumbing wasn't
1111 there mostly by Linus Nordberg
1113 OpenBSD-Commit-ID: 1b536404b9da74a84b3a1c8d0b05fd564cdc96cd
1115 commit 56e941d0a00d6d8bae88317717d5e1b7395c9529
1116 Author: djm@openbsd.org <djm@openbsd.org>
1117 Date: Wed Jan 5 04:27:54 2022 +0000
1119 upstream: add missing -O option to usage() for ssh-keygen -Y sign;
1123 OpenBSD-Commit-ID: 4e78feb4aa830727ab76bb2e3d940440ae1d7af0
1125 commit 141a14ec9b0924709c98df2dd8013bde5d8d12c7
1126 Author: djm@openbsd.org <djm@openbsd.org>
1127 Date: Wed Jan 5 04:27:01 2022 +0000
1129 upstream: move sig_process_opts() to before sig_sign(); no
1131 functional code change
1133 OpenBSD-Commit-ID: da02d61f5464f72b4e8b299f83e93c3b657932f9
1135 commit 37a14249ec993599a9051731e4fb0ac5e976aec1
1136 Author: djm@openbsd.org <djm@openbsd.org>
1137 Date: Wed Jan 5 04:10:39 2022 +0000
1139 upstream: regression test for find-principals NULL deref; from Fabian
1143 OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5
1145 commit eb1f042142fdaba93f6c9560cf6c91ae25f6884a
1146 Author: djm@openbsd.org <djm@openbsd.org>
1147 Date: Wed Jan 5 04:02:42 2022 +0000
1149 upstream: NULL deref when using find-principals when matching an
1151 allowed_signers line that contains a namespace restriction, but no
1152 restriction specified on the command-line; report and fix from Fabian Stelzer
1154 OpenBSD-Commit-ID: 4a201b86afb668c908d1a559c6af456a61f4b145
1156 commit 8f3b18030579f395eca2181da31a5f945af12a59
1157 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1158 Date: Tue Jan 4 08:38:53 2022 +0000
1160 upstream: Log command invocation while debugging.
1162 This will aid in manually reproducing failing commands.
1164 OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a
1166 commit bbf285164df535f0d38c36237f007551bbdae27f
1167 Author: Darren Tucker <dtucker@dtucker.net>
1168 Date: Sun Dec 26 10:31:15 2021 +1100
1170 Always save config.h as build artifact.
1172 Should allow better comparison between failing and succeeding test
1175 commit 03bd4ed0db699687c5cd83405d26f81d2dc28d22
1176 Author: Darren Tucker <dtucker@dtucker.net>
1177 Date: Sat Dec 25 16:42:51 2021 +1100
1179 Add OpenBSD 7.0 target. Retire 6.8.
1181 commit c45a752f0de611afd87755c2887c8a24816d08ee
1182 Author: jsg@openbsd.org <jsg@openbsd.org>
1183 Date: Sat Jan 1 05:55:06 2022 +0000
1187 OpenBSD-Commit-ID: c63e43087a64d0727af13409c708938e05147b62
1189 commit c672f83a89a756564db0d3af9934ba0e1cf8fa3e
1190 Author: djm@openbsd.org <djm@openbsd.org>
1191 Date: Tue Jan 4 07:20:33 2022 +0000
1193 upstream: unbreak test: was picking up system ssh-add instead of the
1195 one supposedly being tested. Spotted by dtucker and using his VM zoo (which
1196 includes some systems old enough to lack ed25519 key support)
1198 OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5
1200 commit a23698c3082ffe661abed14b020eac9b0c25eb9f
1201 Author: djm@openbsd.org <djm@openbsd.org>
1202 Date: Sat Jan 1 04:18:06 2022 +0000
1204 upstream: fix memleak in process_extension(); oss-fuzz issue #42719
1206 OpenBSD-Commit-ID: d8d49f840162fb7b8949e3a5adb8107444b6de1e
1208 commit cb885178f36b83d0f14cfe9f345d2068103feed0
1209 Author: jsg@openbsd.org <jsg@openbsd.org>
1210 Date: Sat Jan 1 01:55:30 2022 +0000
1212 upstream: spelling ok dtucker@
1214 OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19
1216 commit 6b977f8080a32c5b3cbb9edb634b9d5789fb79be
1217 Author: djm@openbsd.org <djm@openbsd.org>
1218 Date: Sun Dec 26 23:34:41 2021 +0000
1220 upstream: split method list search functionality from
1222 authmethod_lookup() into a separate authmethod_byname(), for cases where we
1223 don't need to check whether a method is enabled, etc.
1225 use this to fix the "none" authentication method regression reported
1226 by Nam Nguyen via bugs@
1230 OpenBSD-Commit-ID: 8cd188dc3a83aa8abe5b7693e762975cd8ea8a17
1232 commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07
1233 Author: jmc@openbsd.org <jmc@openbsd.org>
1234 Date: Wed Dec 22 06:56:41 2021 +0000
1236 upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;
1240 OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965
1242 commit 1c9853a68b2319f2e5f929179735e8fbb9988a67
1243 Author: Darren Tucker <dtucker@dtucker.net>
1244 Date: Wed Dec 22 19:33:10 2021 +1100
1246 Use SHA.*_HMAC_BLOCK_SIZE if needed.
1248 If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH
1249 but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter.
1250 Should fix --without-openssl build on Solaris.
1252 commit 715c892f0a5295b391ae92c26ef4d6a86ea96e8e
1253 Author: Damien Miller <djm@mindrot.org>
1254 Date: Wed Dec 22 09:02:50 2021 +1100
1256 remove sys/param.h in -portable, after upstream
1258 commit 7a7c69d8b4022b1e5c0afb169c416af8ce70f3e8
1259 Author: Damien Miller <djm@mindrot.org>
1260 Date: Mon Dec 20 13:05:20 2021 +1100
1262 add agent-restrict.sh file, missed in last commit
1264 commit f539136ca51a4976644db5d0be8158cc1914c72a
1265 Author: djm@openbsd.org <djm@openbsd.org>
1266 Date: Sun Dec 19 22:20:12 2021 +0000
1268 upstream: regression test for destination restrictions in ssh-agent
1270 OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d
1272 commit 6e4980eb8ef94c04874a79dd380c3f568e8416d6
1273 Author: anton@openbsd.org <anton@openbsd.org>
1274 Date: Sat Dec 18 06:53:59 2021 +0000
1276 upstream: Make use of ntests variable, pointed out by clang 13.
1278 OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72
1280 commit 3eead8158393b697f663ec4301e3c7b6f24580b1
1281 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1282 Date: Tue Dec 14 21:25:27 2021 +0000
1284 upstream: sys/param.h cleanup, mostly using MINIMUM() and
1286 <limits.h> ok dtucker
1288 OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0
1290 commit 266678e19eb0e86fdf865b431b6e172e7a95bf48
1291 Author: djm@openbsd.org <djm@openbsd.org>
1292 Date: Sun Dec 19 22:15:42 2021 +0000
1294 upstream: document host-bound publickey authentication
1296 OpenBSD-Commit-ID: ea6ed91779a81f06d961e30ecc49316b3d71961b
1298 commit 3d00024b3b156aa9bbd05d105f1deb9cb088f6f7
1299 Author: djm@openbsd.org <djm@openbsd.org>
1300 Date: Sun Dec 19 22:15:21 2021 +0000
1302 upstream: document agent protocol extensions
1304 OpenBSD-Commit-ID: 09e8bb391bbaf24c409b75a4af44e0cac65405a7
1306 commit c385abf76511451bcba78568167b1cd9e90587d5
1307 Author: djm@openbsd.org <djm@openbsd.org>
1308 Date: Sun Dec 19 22:14:47 2021 +0000
1310 upstream: PubkeyAuthentication=yes|no|unbound|host-bound
1312 Allow control over which pubkey methods are used. Added out of
1313 concern that some hardware devices may have difficulty signing
1314 the longer pubkey authentication challenges. This provides a
1315 way for them to disable the extension. It's also handy for
1318 feedback / ok markus@
1320 OpenBSD-Commit-ID: ee52580db95c355cf6d563ba89974c210e603b1a
1322 commit 34b1e9cc7654f41cd4c5b1cc290b999dcf6579bb
1323 Author: djm@openbsd.org <djm@openbsd.org>
1324 Date: Sun Dec 19 22:14:12 2021 +0000
1326 upstream: document destination-constrained keys
1328 feedback / ok markus@
1330 OpenBSD-Commit-ID: cd8c526c77268f6d91c06adbee66b014d22d672e
1332 commit a6d7677c4abcfba268053e5867f2acabe3aa371b
1333 Author: djm@openbsd.org <djm@openbsd.org>
1334 Date: Sun Dec 19 22:13:55 2021 +0000
1336 upstream: Use hostkey parsed from hostbound userauth request
1338 Require host-bound userauth requests for forwarded SSH connections.
1340 The hostkey parsed from the host-bound userauth request is now checked
1341 against the most recently bound session ID / hostkey on the agent socket
1342 and the signature refused if they do not match.
1346 OpenBSD-Commit-ID: d69877c9a3bd8d1189a5dbdeceefa432044dae02
1348 commit baaff0ff4357cc5a079621ba6e2d7e247b765061
1349 Author: djm@openbsd.org <djm@openbsd.org>
1350 Date: Sun Dec 19 22:13:33 2021 +0000
1352 upstream: agent support for parsing hostkey-bound signatures
1354 Allow parse_userauth_request() to work with blobs from
1355 publickey-hostbound-v00@openssh.com userauth attempts.
1357 Extract hostkey from these blobs.
1361 OpenBSD-Commit-ID: 81c064255634c1109477dc65c3e983581d336df8
1363 commit 3e16365a79cdeb2d758cf1da6051b1c5266ceed7
1364 Author: djm@openbsd.org <djm@openbsd.org>
1365 Date: Sun Dec 19 22:13:12 2021 +0000
1367 upstream: EXT_INFO negotiation of hostbound pubkey auth
1369 the EXT_INFO packet gets a new publickey-hostbound@openssh.com to
1370 advertise the hostbound public key method.
1372 Client side support to parse this feature flag and set the kex->flags
1373 indicator if the expected version is offered (currently "0").
1377 OpenBSD-Commit-ID: 4cdb2ca5017ec1ed7a9d33bda95c1d6a97b583b0
1379 commit 94ae0c6f0e35903b695e033bf4beacea1d376bb1
1380 Author: djm@openbsd.org <djm@openbsd.org>
1381 Date: Sun Dec 19 22:12:54 2021 +0000
1383 upstream: client side of host-bound pubkey authentication
1385 Add kex->flags member to enable the publickey-hostbound-v00@openssh.com
1386 authentication method.
1388 Use the new hostbound method in client if the kex->flags flag was set,
1389 and include the inital KEX hostkey in the userauth request.
1391 Note: nothing in kex.c actually sets the new flag yet
1395 OpenBSD-Commit-ID: 5a6fce8c6c8a77a80ee1526dc467d91036a5910d
1397 commit 288fd0218dbfdcb05d9fbd1885904bed9b6d42e6
1398 Author: djm@openbsd.org <djm@openbsd.org>
1399 Date: Sun Dec 19 22:12:30 2021 +0000
1401 upstream: sshd side of hostbound public key auth
1403 This is identical to the standard "publickey" method, but it also includes
1404 the initial server hostkey in the message signed by the client.
1406 feedback / ok markus@
1408 OpenBSD-Commit-ID: 7ea01bb7238a560c1bfb426fda0c10a8aac07862
1410 commit dbb339f015c33d63484261d140c84ad875a9e548
1411 Author: djm@openbsd.org <djm@openbsd.org>
1412 Date: Sun Dec 19 22:12:07 2021 +0000
1414 upstream: prepare for multiple names for authmethods
1416 allow authentication methods to have one additional name beyond their
1419 allow lookup by this synonym
1421 Use primary name for authentication decisions, e.g. for
1422 PermitRootLogin=publickey
1424 Pass actual invoked name to the authmethods, so they can tell whether they
1425 were requested via the their primary name or synonym.
1429 OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559
1431 commit 39f00dcf44915f20684160f0a88d3ef8a3278351
1432 Author: djm@openbsd.org <djm@openbsd.org>
1433 Date: Sun Dec 19 22:11:39 2021 +0000
1435 upstream: ssh-agent side of destination constraints
1437 Gives ssh-agent the ability to parse restrict-destination-v00@openssh.com
1438 constraints and to apply them to keys.
1440 Check constraints against the hostkeys recorded for a SocketEntry when
1441 attempting a signature, adding, listing or deleting keys. Note that
1442 the "delete all keys" request will remove constrained keys regardless of
1445 feedback Jann Horn & markus@
1448 OpenBSD-Commit-ID: 84a7fb81106c2d609a6ac17469436df16d196319
1450 commit ce943912df812c573a33d00bf9e5435b7fcca3f7
1451 Author: djm@openbsd.org <djm@openbsd.org>
1452 Date: Sun Dec 19 22:11:06 2021 +0000
1454 upstream: ssh-add side of destination constraints
1456 Have ssh-add accept a list of "destination constraints" that allow
1457 restricting where keys may be used in conjunction with a ssh-agent/ssh
1458 that supports session ID/hostkey binding.
1460 Constraints are specified as either "[user@]host-pattern" or
1461 "host-pattern>[user@]host-pattern".
1463 The first form permits a key to be used to authenticate as the
1464 specified user to the specified host.
1466 The second form permits a key that has previously been permitted
1467 for use at a host to be available via a forwarded agent to an
1470 For example, constraining a key with "user1@host_a" and
1471 "host_a>host_b". Would permit authentication as "user1" at
1472 "host_a", and allow the key to be available on an agent forwarded
1473 to "host_a" only for authentication to "host_b". The key would not
1474 be visible on agent forwarded to other hosts or usable for
1475 authentication there.
1477 Internally, destination constraints use host keys to identify hosts.
1478 The host patterns are used to obtain lists of host keys for that
1479 destination that are communicated to the agent. The user/hostkeys are
1480 encoded using a new restrict-destination-v00@openssh.com key
1483 host keys are looked up in the default client user/system known_hosts
1484 files. It is possible to override this set on the command-line.
1486 feedback Jann Horn & markus@
1489 OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5
1491 commit 5e950d765727ee0b20fc3d2cbb0c790b21ac2425
1492 Author: djm@openbsd.org <djm@openbsd.org>
1493 Date: Sun Dec 19 22:10:24 2021 +0000
1495 upstream: ssh-add side of destination constraints
1497 Have ssh-add accept a list of "destination constraints" that allow
1498 restricting where keys may be used in conjunction with a ssh-agent/ssh
1499 that supports session ID/hostkey binding.
1501 Constraints are specified as either "[user@]host-pattern" or
1502 "host-pattern>[user@]host-pattern".
1504 The first form permits a key to be used to authenticate as the
1505 specified user to the specified host.
1507 The second form permits a key that has previously been permitted
1508 for use at a host to be available via a forwarded agent to an
1511 For example, constraining a key with "user1@host_a" and
1512 "host_a>host_b". Would permit authentication as "user1" at
1513 "host_a", and allow the key to be available on an agent forwarded
1514 to "host_a" only for authentication to "host_b". The key would not
1515 be visible on agent forwarded to other hosts or usable for
1516 authentication there.
1518 Internally, destination constraints use host keys to identify hosts.
1519 The host patterns are used to obtain lists of host keys for that
1520 destination that are communicated to the agent. The user/hostkeys are
1521 encoded using a new restrict-destination-v00@openssh.com key
1524 host keys are looked up in the default client user/system known_hosts
1525 files. It is possible to override this set on the command-line.
1527 feedback Jann Horn & markus@
1530 OpenBSD-Commit-ID: ef47fa9ec0e3c2a82e30d37ef616e245df73163e
1532 commit 4c1e3ce85e183a9d0c955c88589fed18e4d6a058
1533 Author: djm@openbsd.org <djm@openbsd.org>
1534 Date: Sun Dec 19 22:09:23 2021 +0000
1536 upstream: ssh-agent side of binding
1538 record session ID/hostkey/forwarding status for each active socket.
1540 Attempt to parse data-to-be-signed at signature request time and extract
1541 session ID from the blob if it is a pubkey userauth request.
1545 OpenBSD-Commit-ID: a80fd41e292b18b67508362129e9fed549abd318
1547 commit e9497ecf73f3c16667288bce48d4e3d7e746fea1
1548 Author: djm@openbsd.org <djm@openbsd.org>
1549 Date: Sun Dec 19 22:08:48 2021 +0000
1551 upstream: ssh client side of binding
1553 send session ID, hostkey, signature and a flag indicating whether the
1554 agent connection is being forwarded to ssh agent each time a connection
1555 is opened via a new "session-bind@openssh.com" agent extension.
1559 OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135
1561 commit b42c61d6840d16ef392ed0f365e8c000734669aa
1562 Author: djm@openbsd.org <djm@openbsd.org>
1563 Date: Sun Dec 19 22:08:06 2021 +0000
1565 upstream: Record session ID, host key and sig at intital KEX
1567 These will be used later for agent session ID / hostkey binding
1571 OpenBSD-Commit-ID: a9af29e33772b18e3e867c6fa8ab35e1694a81fe
1573 commit 26ca33d186473d58a32d812e19273ce078b6ffff
1574 Author: djm@openbsd.org <djm@openbsd.org>
1575 Date: Tue Dec 7 22:06:45 2021 +0000
1577 upstream: better error message for FIDO keys when we can't match
1581 OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650
1583 commit adb0ea006d7668190f0c42aafe3a2864d352e34a
1584 Author: Darren Tucker <dtucker@dtucker.net>
1585 Date: Wed Dec 15 10:50:33 2021 +1100
1587 Correct value for IPTOS_DSCP_LE.
1589 It needs to allow for the preceeding two ECN bits. From daisuke.higashi
1590 at gmail.com via OpenSSH bz#3373, ok claudio@, job@, djm@.
1592 commit 3dafd3fe220bd9046f11fcf5191a79ec8800819f
1593 Author: Darren Tucker <dtucker@dtucker.net>
1594 Date: Fri Dec 10 11:57:30 2021 +1100
1596 Increase timeout for test step.
1598 commit 5aefb05cd5b843e975b191d6ebb7ddf8de35c112
1599 Author: Darren Tucker <dtucker@dtucker.net>
1600 Date: Fri Dec 10 10:27:27 2021 +1100
1602 Update the list of tests that don't work on Minix.
1604 While there, remove CC (configure will now find clang) and make the test
1605 list easier to update via cut and paste.
1607 commit 1c09bb1b2e207d091cec299c49416c23d24a1b31
1608 Author: Darren Tucker <dtucker@dtucker.net>
1609 Date: Fri Dec 10 10:12:57 2021 +1100
1611 Add minix host tuple.
1613 Define SETEUID_BREAKS_SETUID for it which should make privsep work.
1615 commit a2188579032cf080213a78255373263466cb90cc
1616 Author: jsg@openbsd.org <jsg@openbsd.org>
1617 Date: Sun Dec 5 12:28:27 2021 +0000
1619 upstream: fix unintended sizeof pointer in debug path ok markus@
1621 OpenBSD-Commit-ID: b9c0481ffc0cd801e0840e342e6a282a85aac93c
1623 commit da40355234068c82f1a36196f2d18dd2d81aaafd
1624 Author: naddy@openbsd.org <naddy@openbsd.org>
1625 Date: Sat Dec 4 00:05:39 2021 +0000
1627 upstream: RSA/SHA-1 is not used by default anymore on the server
1629 OpenBSD-Commit-ID: 64abef6cfc3e53088225f6b8a1dcd86d52dc8353
1631 commit e9c71498a083a8b502aa831ea931ce294228eda0
1632 Author: djm@openbsd.org <djm@openbsd.org>
1633 Date: Thu Dec 2 23:45:36 2021 +0000
1635 upstream: hash full host:port when asked to hash output, fixes hashes
1637 for non- default ports. bz3367 ok dtucker@
1639 OpenBSD-Commit-ID: 096021cc847da7318ac408742f2d0813ebe9aa73
1641 commit b5601202145a03106012c22cb8980bcac2949f0b
1642 Author: djm@openbsd.org <djm@openbsd.org>
1643 Date: Thu Dec 2 23:23:13 2021 +0000
1645 upstream: improve the testing of credentials against inserted FIDO
1647 keys a little more: ask the token whether a particular key belongs to it in
1648 cases where the token support on-token user- verification (e.g. biometrics)
1649 rather than just assuming that it will accept it.
1651 Will reduce spurious "Confirm user presence" notifications for key
1652 handles that relate to FIDO keys that are not currently inserted in at
1655 Motivated by bz3366; by Pedro Martelletto
1657 OpenBSD-Commit-ID: ffac7f3215842397800e1ae2e20229671a55a63d
1659 commit ca709e27c41c90f4565b17282c48dca7756e083c
1660 Author: djm@openbsd.org <djm@openbsd.org>
1661 Date: Thu Dec 2 22:40:05 2021 +0000
1663 upstream: move check_sk_options() up so we can use it earlier
1665 OpenBSD-Commit-ID: 67fe98ba1c846d22035279782c4664c1865763b4
1667 commit b711bc01a7ec76bb6a285730990cbce9b8ca5773
1668 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1669 Date: Thu Dec 2 22:35:05 2021 +0000
1671 upstream: ssh-rsa is no longer in the default for
1673 PubkeyAcceptedAlgorithms.
1675 OpenBSD-Commit-ID: 34a9e1bc30966fdcc922934ae00f09f2596cd73c
1677 commit dc91ceea33cd4a9f05be953e8d8062f732db5c8a
1678 Author: djm@openbsd.org <djm@openbsd.org>
1679 Date: Thu Dec 2 02:44:44 2021 +0000
1681 upstream: don't put the tty into raw mode when SessionType=none, avoids
1683 ^c being unable to kill such a session. bz3360; ok dtucker@
1685 OpenBSD-Commit-ID: 83960c433052303b643b4c380ae2f799ac896f65
1687 commit e6e7d2654a13ba10141da7b42ea683ea4eeb1f38
1688 Author: Damien Miller <djm@mindrot.org>
1689 Date: Mon Nov 29 14:11:03 2021 +1100
1691 previous commit broke bcrypt_pbkdf()
1693 Accidentally reverted part of the conversion to use SHA512 from SUPERCOP
1694 instead of OpenBSD-style libc SHA512.
1696 commit c0459588b8d00b73e506c6095958ecfe62a4a7ba
1697 Author: Darren Tucker <dtucker@dtucker.net>
1698 Date: Mon Nov 29 14:03:19 2021 +1100
1700 Fix typo in Neils' name.
1702 commit 158bf854e2a22cf09064305f4a4e442670562685
1703 Author: Damien Miller <djm@mindrot.org>
1704 Date: Mon Nov 29 12:30:22 2021 +1100
1706 sync bcrypt-related files with OpenBSD
1708 The main change is that Niels Provos kindly agreed to rescind the
1709 BSD license advertising clause, shifting them to the 3-term BSD
1712 This was the last thing in OpenSSH that used the advertising clause.
1714 commit e8976d92a42883ff6b8991438f07df60c2c0d82d
1715 Author: Damien Miller <djm@mindrot.org>
1716 Date: Mon Nov 29 12:29:29 2021 +1100
1720 commit 8249afeec013e557fe7491a72ca3285de03e25b1
1721 Author: djm@openbsd.org <djm@openbsd.org>
1722 Date: Sun Nov 28 07:21:26 2021 +0000
1724 upstream: sshsig: return "key not found" when searching empty files
1726 rather than "internal error"
1728 OpenBSD-Commit-ID: e2ccae554c78d7a7cd33fc5d217f35be7e2507ed
1730 commit 9e3227d4dbb5ad9c9091b4c14982cab4bba87b4d
1731 Author: djm@openbsd.org <djm@openbsd.org>
1732 Date: Sun Nov 28 07:15:10 2021 +0000
1734 upstream: ssh-keygen -Y match-principals doesn't accept any -O
1736 options at present, so don't say otherwise in SYNOPSIS; spotted jmc@
1738 OpenBSD-Commit-ID: 9cc43a18f4091010741930b48b3db2f2e4f1d35c
1740 commit 56db1f4a4cf5039fc3b42e84c4b16291fdff32b1
1741 Author: djm@openbsd.org <djm@openbsd.org>
1742 Date: Sun Nov 28 07:14:29 2021 +0000
1744 upstream: fix indenting in last commit
1746 OpenBSD-Commit-ID: 8b9ba989815d0dec1fdf5427a4a4b58eb9cac4d2
1748 commit 50bea24a9a9bdebad327c76e700def3261f5694e
1749 Author: djm@openbsd.org <djm@openbsd.org>
1750 Date: Sun Nov 28 07:10:18 2021 +0000
1752 upstream: missing initialisation for oerrno
1754 OpenBSD-Commit-ID: 05d646bba238080259bec821c831a6f0b48d2a95
1756 commit 5a0f4619041d09cd29f3a08da41db5040372bdd1
1757 Author: Darren Tucker <dtucker@dtucker.net>
1758 Date: Sun Nov 28 15:31:37 2021 +1100
1760 Correct ifdef to activate poll() only if needed.
1762 commit d4035c81a71237f690edd7eda32bef7d63fd9528
1763 Author: djm@openbsd.org <djm@openbsd.org>
1764 Date: Sat Nov 27 07:23:35 2021 +0000
1766 upstream: whitespac e
1768 OpenBSD-Regress-ID: b9511d41568056bda489e13524390167889908f8
1770 commit a443491e6782ef0f5a8bb87a5536c8ee4ff233a1
1771 Author: djm@openbsd.org <djm@openbsd.org>
1772 Date: Sat Nov 27 07:20:58 2021 +0000
1774 upstream: regression test for match-principals. Mostly by Fabian
1778 OpenBSD-Regress-ID: ced0bec89af90935103438986bbbc4ad1df9cfa7
1780 commit 78230b3ec8cbabc1e7de68732dc5cbd4837c6675
1781 Author: djm@openbsd.org <djm@openbsd.org>
1782 Date: Sat Nov 27 07:14:46 2021 +0000
1784 upstream: Add ssh-keygen -Y match-principals operation to perform
1786 matching of principals names against an allowed signers file.
1788 Requested by and mostly written by Fabian Stelzer, towards a TOFU
1789 model for SSH signatures in git. Some tweaks by me.
1791 "doesn't bother me" deraadt@
1793 OpenBSD-Commit-ID: 8d1b71f5a4127bc5e10a880c8ea6053394465247
1795 commit 15db86611baaafb24c40632784dabf82e3ddb1a7
1796 Author: djm@openbsd.org <djm@openbsd.org>
1797 Date: Thu Nov 25 23:02:24 2021 +0000
1799 upstream: debug("func: ...") -> debug_f("...")
1801 OpenBSD-Commit-ID: d58494dc05c985326a895adfbe16fbd5bcc54347
1803 commit b7ffbb17e37f59249c31f1ff59d6c5d80888f689
1804 Author: Darren Tucker <dtucker@dtucker.net>
1805 Date: Fri Nov 19 18:53:46 2021 +1100
1807 Allow for fd = -1 in compat ppoll overflow check.
1809 Fixes tests on at least FreeBSD 6, possibly others.
1811 commit 04b172da5b96a51b0d55c905b423ababff9f4e0b
1812 Author: Darren Tucker <dtucker@dtucker.net>
1813 Date: Fri Nov 19 16:01:51 2021 +1100
1815 Don't auto-enable Capsicum sandbox on FreeBSD 9/10.
1817 Since we changed from select() to ppoll() tests have been failing.
1818 This seems to be because FreeBSD 10 (and presumably 9) do not allow
1819 ppoll() in the privsep process and sshd will fail with "Not permitted in
1820 capability mode". Setting CAP_EVENT on the FDs doesn't help, but weirdly,
1821 poll() works without that. Those versions are EOL so this situation is
1824 commit a823f39986e7b879f26412e64c15630e1cfa0dc5
1825 Author: djm@openbsd.org <djm@openbsd.org>
1826 Date: Thu Nov 18 03:53:48 2021 +0000
1828 upstream: regression test for ssh-keygen -Y find-principals fix; from
1830 Fabian Stelzer ok djm markus
1832 OpenBSD-Regress-ID: 34fe4088854c1a2eb4c0c51cc4676ba24096bac4
1834 commit 199c4df66c0e39dd5c3333b162af274678c0501d
1835 Author: djm@openbsd.org <djm@openbsd.org>
1836 Date: Thu Nov 18 21:32:11 2021 +0000
1838 upstream: less confusing debug message; bz#3365
1840 OpenBSD-Commit-ID: 836268d3642c2cdc84d39b98d65837f5241e4a50
1842 commit 97f9b6e61316c97a32dad94b7a37daa9b5f6b836
1843 Author: djm@openbsd.org <djm@openbsd.org>
1844 Date: Thu Nov 18 21:11:01 2021 +0000
1846 upstream: avoid xmalloc(0) for PKCS#11 keyid for ECDSA keys (we
1848 already did this for RSA keys). Avoids fatal errors for PKCS#11 libraries
1849 that return empty keyid, e.g. Microchip ATECC608B "cryptoauthlib"; bz#3364
1851 OpenBSD-Commit-ID: 054d4dc1d6a99a2e6f8eebc48207b534057c154d
1853 commit c74aa0eb73bd1edf79947d92d9c618fc3424c4a6
1854 Author: djm@openbsd.org <djm@openbsd.org>
1855 Date: Thu Nov 18 03:50:41 2021 +0000
1857 upstream: ssh-keygen -Y find-principals was verifying key validity
1859 when using ca certs but not with simple key lifetimes within the allowed
1862 Since it returns the first keys principal it finds this could
1863 result in a principal with an expired key even though a valid
1866 patch from Fabian Stelzer; feedback/ok djm markus
1868 OpenBSD-Commit-ID: b108ed0a76b813226baf683ab468dc1cc79e0905
1870 commit d902d728dfd81622454260e23bc09d5e5a9a795e
1871 Author: Darren Tucker <dtucker@dtucker.net>
1872 Date: Thu Nov 18 23:44:07 2021 +1100
1874 Correct calculation of tv_nsec in poll().
1876 commit 21dd5a9a3fb35e8299a1fbcf8d506f1f6b752b85
1877 Author: Darren Tucker <dtucker@dtucker.net>
1878 Date: Thu Nov 18 23:11:37 2021 +1100
1880 Add compat implementation of ppoll using pselect.
1882 commit b544ce1ad4afb7ee2b09f714aa63efffc73fa93a
1883 Author: Darren Tucker <dtucker@dtucker.net>
1884 Date: Thu Nov 18 23:05:34 2021 +1100
1886 Put poll.h inside ifdef HAVE_POLL_H.
1888 commit 875408270c5a7dd69ed5449e5d85bd7120c88f70
1889 Author: djm@openbsd.org <djm@openbsd.org>
1890 Date: Thu Nov 18 03:31:44 2021 +0000
1892 upstream: check for POLLHUP wherever we check for POLLIN
1894 OpenBSD-Commit-ID: 6aa6f3ec6b17c3bd9bfec672a917f003a76d93e5
1896 commit 36b5e37030d35bbaa18ba56825b1af55971d18a0
1897 Author: djm@openbsd.org <djm@openbsd.org>
1898 Date: Thu Nov 18 03:07:59 2021 +0000
1900 upstream: fd leak in sshd listen loop error path; from Gleb
1904 OpenBSD-Commit-ID: a7a2be27a690a74bf2381bc16cea38e265657412
1906 commit b99498d0c93f1edd04857b318308a66b28316bd8
1907 Author: djm@openbsd.org <djm@openbsd.org>
1908 Date: Thu Nov 18 03:07:20 2021 +0000
1910 upstream: check for POLLHUP as well as POLLIN in sshd listen loop;
1914 OpenBSD-Commit-ID: a4f1244c5a9c2b08dac4f3b1dc22e9d1dc60c587
1916 commit 1f3055d788e8cf80851eb1728b535d57eb0dba6a
1917 Author: djm@openbsd.org <djm@openbsd.org>
1918 Date: Thu Nov 18 03:06:03 2021 +0000
1920 upstream: check for POLLHUP as well as POLLIN, handle transient IO
1922 errors as well as half-close on the output side; ok deraadt millert
1924 OpenBSD-Commit-ID: de5c5b9939a37476d256328cbb96305bdecf511e
1926 commit 9778a15fa6dbdac6a95bf15865c2688b4bd6944e
1927 Author: Damien Miller <djm@mindrot.org>
1928 Date: Thu Nov 18 10:16:55 2021 +1100
1930 adjust seccomp filter for select->poll conversion
1932 Needed to add ppoll syscall but also to relax the fallback rlimit
1933 sandbox. Linux poll() fails with EINVAL if npfds > RLIMIT_NOFILE,
1934 so we have to allow a single fd in the rlimit.
1936 commit fcd8d895bbb849c64f0aed934e3303d37f696f5d
1937 Author: Damien Miller <djm@mindrot.org>
1938 Date: Thu Nov 18 10:16:44 2021 +1100
1942 commit 76292787a1e93e668f10e36b4bf59ce0ae28e156
1943 Author: Damien Miller <djm@mindrot.org>
1944 Date: Thu Nov 18 09:26:20 2021 +1100
1946 compat for timespecsub() and friends
1948 commit fd7e7de4ddb4399c7e929b44f2bbfc118eddfcf8
1949 Author: djm@openbsd.org <djm@openbsd.org>
1950 Date: Wed Nov 17 21:06:39 2021 +0000
1952 upstream: set num_listen_socks to 0 on close-all instead of -1,
1954 which interferes with the new poll()-based listen loop; spotted and debugged
1957 OpenBSD-Commit-ID: f7ab8ab124f615a2e0c45fee14c38d2f2abbabbd
1959 commit fd9343579afac30a971f06643a669733d9acb407
1960 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1961 Date: Sun Nov 14 18:47:43 2021 +0000
1963 upstream: use ppoll() instead of pselect() with djm
1965 OpenBSD-Commit-ID: 980f87c9564d5d2ad55722b7a6f44f21284cd215
1967 commit 092d29b232ef1a19609a5316ed7e4d896bb2e696
1968 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1969 Date: Sun Nov 14 06:15:36 2021 +0000
1971 upstream: match .events with .fd better
1973 OpenBSD-Commit-ID: 77eef212ca0add905949532af390164489c5984b
1975 commit 8d642c9a90fa4ed5a3effd785fb3591e14de00cd
1976 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1977 Date: Sun Nov 14 03:25:10 2021 +0000
1979 upstream: convert select() to poll() ok djm
1981 OpenBSD-Commit-ID: b53e4940ff10dd24f8d16e8db8ef1970015d7ead
1983 commit 6582a31c388968f4073af2bd8621880735c3d42b
1984 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1985 Date: Sat Nov 13 21:14:13 2021 +0000
1987 upstream: replace select() with ppoll(), including converting
1989 timeval's to timespec's to make things easier. back and forth and ok; djm
1991 OpenBSD-Commit-ID: 89d3b23c60875da919e7820f9de6213286ffbec9
1993 commit 7c025c005550c86a40200a2bcdd355d09413d61a
1994 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1995 Date: Sat Nov 13 17:26:13 2021 +0000
1997 upstream: It really looks like pledge "stdio dns" is possible
1999 earlier. Discussed with mestre
2001 OpenBSD-Commit-ID: 610873de63a593e0ac7bbbcb7a0f2894d36f4c01
2003 commit 06acb04c20ee483fe4757bd12aec870cc4bb1076
2004 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2005 Date: Fri Nov 12 05:23:49 2021 +0000
2007 upstream: aggressively pre-fill the pollfd array with fd=-1
2009 OpenBSD-Commit-ID: c2a525de8f83c1a04405bd79122c424140552a5b
2011 commit 7eec76793dec06e8f06b6cf71f9473141c69d109
2012 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2013 Date: Thu Nov 11 15:32:32 2021 +0000
2015 upstream: Convert from select() to ppoll(). Along the way, I
2017 observed that the select() code was using exceptfds incorrectly.. ok millert
2019 OpenBSD-Commit-ID: 548e05bfc31b2af02319eb3d051286d4128dec96
2021 commit e665ed2d0c24fe11d5470ce72fa1e187377d3fc4
2022 Author: Darren Tucker <dtucker@dtucker.net>
2023 Date: Fri Nov 12 22:55:27 2021 +1100
2025 Switch from LibreSSL 3.4.0 to 3.4.1.
2027 The LibreSSL 3.4.0 release has an OPENBSD_BRANCH that points to
2028 "master" and that branch no longer has the files LibreSSL expects
2029 and thus it will no longer build, breaking the test.
2031 commit 21b6b5a06c8c53c548d25e6074c5240e88e2ef34
2032 Author: djm@openbsd.org <djm@openbsd.org>
2033 Date: Wed Nov 10 06:29:25 2021 +0000
2035 upstream: add the sntrup761x25519-sha512@openssh.com hybrid
2037 ECDH/x25519 + Streamlined NTRU Prime post-quantum KEX to the default
2038 KEXAlgorithms list (after the ECDH methods but before the prime-group DH
2043 OpenBSD-Commit-ID: 22b77e27a04e497a10e22f138107579652854210
2045 commit 239da797cbf07a640d7b1ea02d3f99ace3ef792d
2046 Author: djm@openbsd.org <djm@openbsd.org>
2047 Date: Wed Nov 10 06:25:08 2021 +0000
2049 upstream: fix ssh-keysign for KEX algorithms that use SHA384/512
2051 exchange hashes; feedback/ok markus@
2053 OpenBSD-Commit-ID: 09a8fda1c081f5de1e3128df64f28b7bdadee239
2055 commit 6997a592ecb1013df0c6d7f8df3e6517827aef11
2056 Author: djm@openbsd.org <djm@openbsd.org>
2057 Date: Mon Nov 8 21:32:49 2021 +0000
2059 upstream: improve error message when trying to expand a ~user path
2061 for a user that doesn't exist; better matches what the shell does
2065 OpenBSD-Commit-ID: 1ddefa3c3a78b69ce13d1b8f67bc9f2cefd23ad6
2067 commit 10b899a15c88eb40eb5f73cd0fa84ef0966f79c9
2068 Author: Darren Tucker <dtucker@dtucker.net>
2069 Date: Wed Nov 10 12:34:25 2021 +1100
2071 Don't trust closefrom() on Linux.
2073 glibc's closefrom implementation does not work in a chroot when the kernel
2074 does not have close_range. It tries to read from /proc/self/fd and when
2075 that fails dies with an assertion of sorts. Instead, call close_range
2076 ourselves from our compat code and fall back if that fails. bz#3349,
2077 with william.wilson at canonical.com and fweimer at redhat.com.
2079 commit eb1f63195a9a38b519536a5b398d9939261ec081
2080 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2081 Date: Sat Nov 6 10:13:39 2021 +0000
2083 upstream: Plug a couple of minor mem leaks. From beldmit at
2085 gmail.com via github PR#283, ok markus@
2087 OpenBSD-Commit-ID: ec1fa7d305d46226861c3ca6fb9c9beb2ada2892
2089 commit e4f501bf1d3b53f1cc23d9521fd7c5163307b760
2090 Author: djm@openbsd.org <djm@openbsd.org>
2091 Date: Fri Nov 5 03:10:58 2021 +0000
2093 upstream: move cert_filter_principals() to earlier in the file for
2095 reuse; no code change
2097 OpenBSD-Commit-ID: 598fa9528b656b2f38bcc3cf5b6f3869a8c115cf
2099 commit 59c60f96fee321c7f38f00372826d37f289534af
2100 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2101 Date: Wed Nov 3 22:00:56 2021 +0000
2103 upstream: Many downstreams expect ssh to compile as non-C99...
2105 OpenBSD-Commit-ID: e6aa3e08bda68e5fb838fc8a49b1d2dfc38ee783
2107 commit 7a78fe63b0b28ef7231913dfefe9d08f9bc41c61
2108 Author: Darren Tucker <dtucker@dtucker.net>
2109 Date: Sat Nov 6 21:07:03 2021 +1100
2111 Skip getline() on HP-UX 10.x.
2113 HP-UX 10.x has a getline() implementation in libc that does not behave
2114 as we expect so don't use it. With correction from Thorsten Glaser and
2115 typo fix from Larkin Nickle.
2117 commit 343ae252ebb35c6ecae26b447bf1551a7666720e
2118 Author: Damien Miller <djm@mindrot.org>
2119 Date: Wed Nov 3 12:08:21 2021 +1100
2121 basic SECURITY.md (refers people to the website)
2123 commit ed45a0168638319e0a710633f6085b96b9cec656
2124 Author: djm@openbsd.org <djm@openbsd.org>
2125 Date: Tue Nov 2 22:57:27 2021 +0000
2127 upstream: crank SSH_SK_VERSION_MAJOR to match recent change in
2131 OpenBSD-Regress-ID: 113d181c7e3305e138db9b688cdb8b0a0019e552
2133 commit f3c34df860c4c1ebddacb973954e58167d9dbade
2134 Author: djm@openbsd.org <djm@openbsd.org>
2135 Date: Tue Nov 2 22:56:40 2021 +0000
2137 upstream: Better handle FIDO keys on tokens that provide user
2139 verification (UV) on the device itself, including biometric keys.
2141 Query the token during key creation to determine whether it supports
2142 on-token UV and, if so, clear the SSH_SK_USER_VERIFICATION_REQD flag
2143 in the key so that ssh(1) doesn't automatically prompty for PIN later.
2145 When making signatures with the key, query the token's capabilities
2146 again and check whether the token is able (right now) to perform user-
2147 verification without a PIN. If it is then the PIN prompt is bypassed
2148 and user verification delegated to the token. If not (e.g. the token
2149 is biometric capable, but no biometric are enrolled), then fall back
2150 to user verification via the usual PIN prompt.
2152 Work by Pedro Martelletto; ok myself and markus@
2154 NB. cranks SSH_SK_VERSION_MAJOR
2156 OpenBSD-Commit-ID: e318a8c258d9833a0b7eb0236cdb68b5143b2f27
2158 commit 0328a081f38c09d2d4d650e94461a47fb5eef536
2159 Author: djm@openbsd.org <djm@openbsd.org>
2160 Date: Fri Oct 29 03:03:06 2021 +0000
2162 upstream: sshsig: add tests for signing key validity and
2166 - adds generic find-principals tests (this command had none before)
2167 - tests certs with a timeboxed validity both with and without a
2168 restriced lifetime for the CA
2169 - test for a revoked CA cert
2173 OpenBSD-Regress-ID: 9704b2c6df5b8ccfbdf2c06c5431f5f8cad280c9
2175 commit ccd358e1e25e25c13f0825996283cbf7a1647a3b
2176 Author: djm@openbsd.org <djm@openbsd.org>
2177 Date: Fri Oct 29 02:48:19 2021 +0000
2179 upstream: avoid signedness warning; spotted in -portable
2181 OpenBSD-Regress-ID: 4cacc126086487c0ea7f3d86b42dec458cf0d0c6
2183 commit 2741f52beb11490d7033a25e56ed0496f0c78006
2184 Author: djm@openbsd.org <djm@openbsd.org>
2185 Date: Fri Oct 29 03:20:46 2021 +0000
2187 upstream: ssh-keygen: make verify-time argument parsing optional
2191 OpenBSD-Commit-ID: 1ff35e4c366a45a073663df90381be6a8ef4d370
2193 commit a1217d363b88b32cfe54c4f02c6c1cf4bdefdd23
2194 Author: Damien Miller <djm@mindrot.org>
2195 Date: Fri Oct 29 13:48:34 2021 +1100
2197 unbreak fuzz harness for recent changes
2199 commit 68e522ed8183587c9367fa3842c5b75f64f3d12b
2200 Author: Darren Tucker <dtucker@dtucker.net>
2201 Date: Fri Oct 29 13:32:24 2021 +1100
2203 Use -Wbitwise-instead-of-logical if supported.
2205 commit be28b23012aa3fa323be7ec84863cf238927c078
2206 Author: Damien Miller <djm@mindrot.org>
2207 Date: Thu Oct 28 16:24:53 2021 +1100
2209 use -Wmisleading-indentation cflag if available
2213 commit 2e6f5f24dd2f9217f4ab8b737ed428d5d5278f91
2214 Author: Damien Miller <djm@mindrot.org>
2215 Date: Thu Oct 28 16:24:44 2021 +1100
2219 commit a5ab4882348d26addc9830a44e053238dfa2cb58
2220 Author: Damien Miller <djm@mindrot.org>
2221 Date: Thu May 6 10:08:30 2021 +1000
2223 remove built-in support for md5crypt()
2225 Users of MD5-hashed password should arrange for ./configure to link
2226 against libxcrypt or similar. Though it would be better to avoid use
2227 of MD5 password hashing entirely, it's arguably worse than DEScrypt.
2229 feedback and ok dtucker@
2231 commit c5de1fffa6328b8246b87da28fa9df05813f76a3
2232 Author: djm@openbsd.org <djm@openbsd.org>
2233 Date: Thu Oct 28 02:55:30 2021 +0000
2235 upstream: increment SSH_SK_VERSION_MAJOR to match last change
2237 OpenBSD-Regress-ID: 17873814d1cbda97f49c8528d7b5ac9cadf6ddc0
2239 commit 0001d04e55802d5bd9d6dece1081a99aa4ba2828
2240 Author: djm@openbsd.org <djm@openbsd.org>
2241 Date: Thu Oct 28 02:54:18 2021 +0000
2243 upstream: When downloading resident keys from a FIDO token, pass
2245 back the user ID that was used when the key was created and append it to the
2246 filename the key is written to (if it is not the default).
2248 Avoids keys being clobbered if the user created multiple
2249 resident keys with the same application string but different
2252 feedback Pedro Martelletto; ok markus
2254 NB. increments SSH_SK_VERSION_MAJOR
2256 OpenBSD-Commit-ID: dbd658b5950f583106d945641a634bc6562dd3a3
2258 commit d4bed5445646e605c383a4374fa962e23bf9e3a3
2259 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2260 Date: Sun Oct 24 21:24:17 2021 +0000
2262 upstream: For open/openat, if the flags parameter does not contain
2264 O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant. Many developers
2265 in the past have passed mode_t (0, 044, 0644, or such), which might lead
2266 future people to copy this broken idiom, and perhaps even believe this
2267 parameter has some meaning or implication or application. Delete them all.
2268 This comes out of a conversation where tb@ noticed that a strange (but
2269 intentional) pledge behaviour is to always knock-out high-bits from mode_t on
2270 a number of system calls as a safety factor, and his bewilderment that this
2271 appeared to be happening against valid modes (at least visually), but no
2272 sorry, they are all irrelevant junk. They could all be 0xdeafbeef. ok
2275 OpenBSD-Commit-ID: 503d11633497115688c0c6952686524f01f53121
2277 commit d575cf44895104e0fcb0629920fb645207218129
2278 Author: Darren Tucker <dtucker@dtucker.net>
2279 Date: Fri Oct 22 23:27:41 2021 +1100
2281 kitchensink test target now needs krb5.
2283 commit 4ae39cada214e955bcfd3448ff28f0ed18886706
2284 Author: Darren Tucker <dtucker@dtucker.net>
2285 Date: Fri Oct 22 22:54:33 2021 +1100
2287 Test both MIT KRB5 and Heimdal.
2289 commit 22b2681d88619e5247dc53c9f112058a7e248d48
2290 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2291 Date: Fri Oct 22 10:51:57 2021 +0000
2293 upstream: Plug mem addrinfo mem leaks.
2295 Prevent mem leaks in the (unlikely) event that getaddrinfo returns
2296 no addresses. ALso, remove an unneeded NULL check in addr_ntop. From
2297 khaleesicodes via github PR#281, ok deraadt@
2299 OpenBSD-Commit-ID: e8a5afc686376637c355c5f7e122dc4b080b9c1a
2301 commit 27c8c343b610263f83ac2328735feeb881c6c92f
2302 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2303 Date: Fri Oct 22 09:22:04 2021 +0000
2305 upstream: Remove unnecessary semicolons
2307 ... in case statements. From khaleesicodes via github PR#280.
2309 OpenBSD-Commit-ID: e1e89360b65775cff83e77ce040b342015caf4ed
2311 commit e7eb73b8d1fe1008d92433ea949491ce654bfaba
2312 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2313 Date: Fri Oct 22 09:19:34 2021 +0000
2315 upstream: Fix typos in comments.
2317 From khaleesicodes via github PR#280.
2319 OpenBSD-Commit-ID: 26fdd83652c40f098bf7c685e8ebb9eb72cc45fc
2321 commit 052a9d8494175e24312daa6c132665e58c17fe6e
2322 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2323 Date: Fri Oct 15 14:46:46 2021 +0000
2325 upstream: switch scp(1) back to sftp protocol.
2327 openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
2328 protocol for copying. Let's get back to testing the SFTP protocol.
2330 OpenBSD-Commit-ID: 9eaa35d95fd547b78b0a043b3f518e135f151f30
2332 commit a07664646bf6d293f5bbd45a5de54f3c36bb85da
2333 Author: Darren Tucker <dtucker@dtucker.net>
2334 Date: Fri Oct 22 14:00:05 2021 +1100
2336 Source configs script so setup_ci can use settings
2338 commit 34df52c201c6b47e5a46b50c215e4d98a8bf6587
2339 Author: Darren Tucker <dtucker@dtucker.net>
2340 Date: Fri Oct 22 09:42:14 2021 +1100
2342 Install libedit and pam based on config flags.
2344 commit 8c626cc563e8d21d844d06f9971a9ee01de6aa2a
2345 Author: Darren Tucker <dtucker@dtucker.net>
2346 Date: Thu Oct 21 16:53:39 2021 +1100
2348 Don't use 'here string", it's not POSIX.
2350 commit 086a4b5977472aefa3de918b88efad0faf83b2b1
2351 Author: Darren Tucker <dtucker@dtucker.net>
2352 Date: Thu Oct 21 15:33:27 2021 +1100
2354 Remove -Werror from compiler package to install.
2356 commit 5a7a4687507d057f9b5e7497f3d3f82e64753c02
2357 Author: Darren Tucker <dtucker@dtucker.net>
2358 Date: Thu Oct 21 15:00:53 2021 +1100
2360 Build with -Werror on most recent gcc and clang.
2362 commit 4d2cbdb525d673acf941d48a7044fcf03125611a
2363 Author: Darren Tucker <dtucker@dtucker.net>
2364 Date: Fri Oct 15 12:59:06 2021 +1100
2366 Include string.h and stdio.h for strerror.
2368 commit fff13aaa262b7b3ec83ed21e29674cbf331780a7
2369 Author: Darren Tucker <dtucker@dtucker.net>
2370 Date: Fri Oct 15 12:43:36 2021 +1100
2372 Include error reason if trace disabling fails.
2374 commit d4b38144c02f3faa5271e5fb35df93507e06f1b4
2375 Author: Darren Tucker <dtucker@dtucker.net>
2376 Date: Tue Oct 12 22:55:51 2021 +1100
2378 Add tcmalloc test target.
2380 commit 002d65b0a30063c6e49bf8a53e709d8d5a0d45c1
2381 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2382 Date: Sat Oct 9 10:52:42 2021 +0000
2384 upstream: Document that CASignatureAlgorithms, ExposeAuthInfo and
2386 PubkeyAuthOptions can be used in a Match block. Patch from eehakkin via
2389 OpenBSD-Commit-ID: c0a63f5f52e918645967ac022b28392da4b866aa
2391 commit 40bd3709dddaae3a1b6113748bec3faa6a607531
2392 Author: Darren Tucker <dtucker@dtucker.net>
2393 Date: Thu Oct 7 15:55:49 2021 +1100
2395 Skip SK unit tests when built without security-key
2397 commit 482f73be10f10b93f818df19fcc8a912c0c371fc
2398 Author: Darren Tucker <dtucker@dtucker.net>
2399 Date: Thu Oct 7 15:55:04 2021 +1100
2401 Include relevant env vars on command line.
2403 Makes it easier to reproduce a build by cut/pasting the configure line.
2405 commit ef5916b8acd9b1d2f39fad4951dae03b00dbe390
2406 Author: Darren Tucker <dtucker@dtucker.net>
2407 Date: Thu Oct 7 14:28:02 2021 +1100
2409 Only enable sk-* key types if ENABLE_SK is defined
2411 commit 52d4232b493a9858fe616e28a8bbcc89afa2ad4d
2412 Author: Darren Tucker <dtucker@dtucker.net>
2413 Date: Wed Oct 6 18:14:37 2021 +1100
2415 Disable security key on minix3.
2417 The test doesn't work so disable.
2419 commit 7cd062c3a29669b8d7dc2a97e6575f4dcb7d35a2
2420 Author: Darren Tucker <dtucker@dtucker.net>
2421 Date: Wed Oct 6 17:45:28 2021 +1100
2423 Add USE_LIBC_SHA2 for (at least) NetBSD 9.
2425 commit 639c440f6c3c2a8216a5eb9455ef13bf4204089c
2426 Author: Darren Tucker <dtucker@dtucker.net>
2427 Date: Wed Oct 6 17:09:31 2021 +1100
2429 Define OPENSSL_NO_SHA including OpenSSL from test.
2431 We don't use SHA256 from OpenSSL in the sk-dummy module and the
2432 definitions can conflict with system sha2.h (eg on NetBSD) so define
2433 OPENSSL_NO_SHA so we don't attempt to redefine them.
2435 commit 8f4be526a338d06624f146fa26007bb9dd3a4f7b
2436 Author: Darren Tucker <dtucker@dtucker.net>
2437 Date: Wed Oct 6 15:40:58 2021 +1100
2439 Disable security key on NetBSD4 test.
2441 sk-dummy used for the security key test includes both sha2.h and OpenSSL
2442 causing the definitions conflict so disable security key support on this
2445 commit 3b353ae58aa07a1cbbeb1da3ace21fc0dcccd66a
2446 Author: Damien Miller <djm@mindrot.org>
2447 Date: Wed Oct 6 15:07:01 2021 +1100
2449 clean regress/misc/sk-dummy in cleandir target
2451 commit 57680a2ab43518c5ccbd8242c40482106cde6ac1
2452 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2453 Date: Sat Oct 2 03:17:01 2021 +0000
2455 upstream: Dynamically allocate encoded HashKnownHosts and free as
2457 appropriate. Saves 1k of static storage and prevents snprintf "possible
2458 truncation" warnings from newer compilers (although in this case it's false
2459 positive since the actual sizes are limited by the output size of the SHA1).
2462 OpenBSD-Commit-ID: e254ae723f7e3dce352c7d5abc4b6d87faf61bf4
2464 commit e3e62deb549fde215b777d95276c304f84bf00c6
2465 Author: djm@openbsd.org <djm@openbsd.org>
2466 Date: Wed Oct 6 03:35:13 2021 +0000
2468 upstream: use libc SHA256 functions; make this work when compiled
2472 OpenBSD-Regress-ID: fda0764c1097cd42f979ace29b07eb3481259890
2474 commit 12937d867019469ebce83c2ff614cdc6688fc2d8
2475 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2476 Date: Fri Oct 1 05:20:20 2021 +0000
2478 upstream: Add test for ssh hashed known_hosts handling.
2480 OpenBSD-Regress-ID: bcef3b3cd5a1ad9899327b4b2183de2541aaf9cf
2482 commit 5a37cc118f464416d08cd0291a9b1611d8de9943
2483 Author: Damien Miller <djm@mindrot.org>
2484 Date: Wed Oct 6 13:16:21 2021 +1100
2486 fix broken OPENSSL_HAS_ECC test
2490 commit 16a25414f303cd6790eb967aeb962040e32c9c7a
2491 Author: Damien Miller <djm@mindrot.org>
2492 Date: Fri Oct 1 22:40:06 2021 +1000
2494 make sk-dummy.so work without libcrypto installed
2496 commit dee22129bbc61e25b1003adfa2bc584c5406ef2d
2497 Author: Damien Miller <djm@mindrot.org>
2498 Date: Fri Oct 1 16:35:49 2021 +1000
2500 make OPENSSL_HAS_ECC checks more thorough
2504 commit 872595572b6c9a584ed754165e8b7c4c9e7e1d61
2505 Author: Damien Miller <djm@mindrot.org>
2506 Date: Fri Oct 1 16:35:05 2021 +1000
2508 fix FIDO key support for !OPENSSL_HAS_ECC case
2512 commit 489741dc68366940d369ac670b210b4834a6c272
2513 Author: Damien Miller <djm@mindrot.org>
2514 Date: Fri Oct 1 14:51:37 2021 +1000
2516 enable security key support for --without-openssl
2518 commit c978565c8589acfe4ea37ab5099d39c84158c713
2519 Author: Damien Miller <djm@mindrot.org>
2520 Date: Fri Oct 1 13:27:50 2021 +1000
2522 need stdlib.h for free(3)
2524 commit 76a398edfb51951b2d65d522d7b02c72304db300
2525 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2526 Date: Thu Sep 30 05:26:26 2021 +0000
2528 upstream: Fix up whitespace left by previous
2530 change removing privsep. No other changes.
2532 OpenBSD-Regress-ID: 87adec225d8afaee4d6a91b2b71203f52bf14b15
2534 commit ddcb53b7a7b29be65d57562302b2d5f41733e8dd
2535 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2536 Date: Thu Sep 30 05:20:08 2021 +0000
2538 upstream: Remove references to privsep.
2540 This removes several do..while loops but does not change the
2541 indentation of the now-shallower loops, which will be done in a separate
2542 whitespace-only commit to keep changes of style and substance separate.
2544 OpenBSD-Regress-ID: 4bed1a0249df7b4a87c965066ce689e79472a8f7
2546 commit ece2fbe486164860de8df3f8b943cccca3085eff
2547 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2548 Date: Thu Sep 30 04:22:50 2021 +0000
2550 upstream: Use "skip" instead of "fatal"
2552 if SUDO isn't set for the *-command tests. This means running "make tests"
2553 without SUDO set will perform all of the tests that it can instead of
2554 failing on the ones it cannot run.
2556 OpenBSD-Regress-ID: bd4dbbb02f34b2e8c890558ad4a696248def763a
2558 commit bb754b470c360e787a99fb4e88e2668198e97b41
2559 Author: djm@openbsd.org <djm@openbsd.org>
2560 Date: Fri Oct 1 04:50:36 2021 +0000
2562 upstream: unbreak FIDO sk-ed25519 key enrollment for OPENSSL=no builds;
2566 OpenBSD-Commit-ID: 6323a5241728626cbb2bf0452cf6a5bcbd7ff709
2568 commit 207648d7a6415dc915260ca75850404dbf9f0a0b
2569 Author: Darren Tucker <dtucker@dtucker.net>
2570 Date: Wed Sep 29 20:03:58 2021 +1000
2572 Include stdlib.h for arc4random_uniform prototype.
2574 commit 696aadc854582c164d5fc04933d2f3e212dc0e06
2575 Author: Darren Tucker <dtucker@dtucker.net>
2576 Date: Wed Sep 29 20:00:30 2021 +1000
2578 Look for clang after cc and gcc.
2580 commit a3c6375555026d85dbf811fab566b9f76f196144
2581 Author: Darren Tucker <dtucker@dtucker.net>
2582 Date: Wed Sep 29 19:30:59 2021 +1000
2584 Use backticks instead of $(..) for portability.
2586 Older shells (eg /bin/sh on Solaris 10) don't support $() syntax.
2588 commit 958aaa0387133d51f84fe9c8f30bca03025f2867
2589 Author: Darren Tucker <dtucker@dtucker.net>
2590 Date: Wed Sep 29 18:53:32 2021 +1000
2592 Skip file-based tests by default on Mac OS.
2594 The file-based tests need OpenSSL so skip them.
2596 commit 55c8bdf6e9afb0f9fa8e4f10c25c7f0081b48fd0
2597 Author: Darren Tucker <dtucker@dtucker.net>
2598 Date: Wed Sep 29 18:42:47 2021 +1000
2600 Build without OpenSSL on Mac OS.
2602 Modern versions don't ship enough libcrypto to build against.
2604 commit c9172193ea975415facf0afb356d87df21535f88
2605 Author: Darren Tucker <dtucker@dtucker.net>
2606 Date: Wed Sep 29 18:33:38 2021 +1000
2608 Remove TEST_SSH_ECC.
2610 Convert the only remaining user of it to runtime detection using ssh -Q.
2612 commit 5e6d28b7874b0deae95d2c68947c45212d32e599
2613 Author: Darren Tucker <dtucker@dtucker.net>
2614 Date: Wed Sep 29 17:48:09 2021 +1000
2616 Split c89 test openssl setting out.
2618 commit c4ac7f98e230e83c015678dc958b1ffe828564ad
2619 Author: Darren Tucker <dtucker@dtucker.net>
2620 Date: Wed Sep 29 17:40:50 2021 +1000
2622 Expand TEST_SHELL consistently with other vars.
2624 commit cfe5f7b0eb7621bfb0a756222de0431315c2ab8b
2625 Author: Darren Tucker <dtucker@dtucker.net>
2626 Date: Wed Sep 29 17:26:50 2021 +1000
2628 Replace `pwd` with make variable in regress cmd.
2630 commit 899be59da5fbc3372444bd0fbe74af48313bed33
2631 Author: Darren Tucker <dtucker@dtucker.net>
2632 Date: Wed Sep 29 17:14:33 2021 +1000
2634 Get BUILDDIR from autoconf.
2636 Use this to replace `pwd`s in regress test command line.
2638 commit c8d92d3d4f7d560146f2f936156ec4dac3fc5811
2639 Author: Darren Tucker <dtucker@dtucker.net>
2640 Date: Wed Sep 29 13:28:56 2021 +1000
2642 Add make clean step to tests.
2644 commit 360fb41ef8359619ab90b0d131c914494e55d3dd
2645 Author: Darren Tucker <dtucker@dtucker.net>
2646 Date: Wed Sep 29 11:36:13 2021 +1000
2648 Test all available clang and gcc versions.
2650 commit 4fb49899d7da22952d35a4bc4c9bdb2311087893
2651 Author: djm@openbsd.org <djm@openbsd.org>
2652 Date: Wed Sep 29 01:32:21 2021 +0000
2654 upstream: Test certificate hostkeys held in ssh-agent too. Would have
2656 caught regression fixed in sshd r1.575
2660 OpenBSD-Regress-ID: 1f164d7bd89f83762db823eec4ddf2d2556145ed
2662 commit ce4854e12e749a05646e5775e9deb8cfaf49a755
2663 Author: djm@openbsd.org <djm@openbsd.org>
2664 Date: Wed Sep 29 01:33:32 2021 +0000
2666 upstream: add some debug output showing how many key file/command lines
2668 were processed. Useful to see whether a file or command actually has keys
2671 OpenBSD-Commit-ID: 0bd9ff94e84e03a22df8e6c12f6074a95d27f23c
2673 commit 15abdd523501c349b703d9a27e2bb4252ad921ef
2674 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2675 Date: Tue Sep 28 11:14:50 2021 +0000
2677 upstream: Make prototype for rijndaelEncrypt match function
2679 including the bounds. Fixes error in portable where GCC>=11 takes notice of
2680 the bounds. ok deraadt@
2682 OpenBSD-Commit-ID: cdd2f05fd1549e1786a70871e513cf9e9cf099a6
2684 commit d1d29ea1d1ef1a1a54b209f062ec1dcc8399cf03
2685 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2686 Date: Tue Sep 28 11:10:05 2021 +0000
2688 upstream: Import regenerated moduli.
2690 OpenBSD-Commit-ID: 4bec5db13b736b64b06a0fca704cbecc2874c8e1
2692 commit 39f2111b1d5f00206446257377dcce58cc72369f
2693 Author: Darren Tucker <dtucker@dtucker.net>
2694 Date: Wed Sep 29 10:53:55 2021 +1000
2696 Add new compiler hardening flags.
2698 Add -fzero-call-used-regs and -ftrivial-auto-var-init to the list of
2699 compiler hardening flags that configure checks for. These are supported
2700 by clang and gcc, and make ROP gadgets less useful and mitigate
2701 stack-based infoleaks respectively. ok djm@
2703 commit bf944e3794eff5413f2df1ef37cddf96918c6bde
2704 Author: Damien Miller <djm@mindrot.org>
2705 Date: Mon Sep 27 00:03:19 2021 +1000
2707 initgroups needs grp.h
2709 commit 8c5b5655149bd76ea21026d7fe73ab387dbc3bc7
2710 Author: djm@openbsd.org <djm@openbsd.org>
2711 Date: Sun Sep 26 14:01:11 2021 +0000
2713 upstream: openssh-8.8
2715 OpenBSD-Commit-ID: 12357794602ac979eb7312a1fb190c453f492ec4
2717 commit f3cbe43e28fe71427d41cfe3a17125b972710455
2718 Author: djm@openbsd.org <djm@openbsd.org>
2719 Date: Sun Sep 26 14:01:03 2021 +0000
2721 upstream: need initgroups() before setresgid(); reported by anton@,
2725 OpenBSD-Commit-ID: 6aa003ee658b316960d94078f2a16edbc25087ce
2727 commit 8acaff41f7518be40774c626334157b1b1c5583c
2728 Author: Damien Miller <djm@mindrot.org>
2729 Date: Sun Sep 26 22:16:36 2021 +1000
2731 update version numbers for release
2733 commit d39039ddc0010baa91c70a0fa0753a2699bbf435
2734 Author: kn@openbsd.org <kn@openbsd.org>
2735 Date: Sat Sep 25 09:40:33 2021 +0000
2737 upstream: RSA/SHA-1 is not used by default anymore
2739 OK dtucker deraadt djm
2741 OpenBSD-Commit-ID: 055c51a221c3f099dd75c95362f902da1b8678c6
2743 commit 9b2ee74e3aa8c461eb5552a6ebf260449bb06f7e
2744 Author: Darren Tucker <dtucker@dtucker.net>
2745 Date: Fri Sep 24 11:08:03 2021 +1000
2747 Move the fgrep replacement to hostkey-rotate.sh.
2749 The fgrep replacement for buggy greps doesn't work in the sftp-glob test
2750 so move it to just where we know it's needed.
2752 commit f7039541570d4b66d76e6f574544db176d8d5c02
2753 Author: Darren Tucker <dtucker@dtucker.net>
2754 Date: Fri Sep 24 08:04:14 2021 +1000
2756 Replacement function for buggy fgrep.
2758 GNU (f)grep <=2.18, as shipped by FreeBSD<=12 and NetBSD<=9 will
2759 occasionally fail to find ssh host keys in the hostkey-rotate test.
2760 If we have those versions, use awk instead.
2762 commit f6a660e5bf28a01962af87568e118a2d2e79eaa0
2763 Author: David Manouchehri <david.manouchehri@riseup.net>
2764 Date: Thu Sep 23 17:03:18 2021 -0400
2766 Don't prompt for yes/no questions.
2768 commit 7ed1a3117c09f8c3f1add35aad77d3ebe1b85b4d
2769 Author: djm@openbsd.org <djm@openbsd.org>
2770 Date: Mon Sep 20 06:53:56 2021 +0000
2772 upstream: fix missing -s in SYNOPSYS and usage() as well as a
2774 capitalisation mistake; spotted by jmc@
2776 OpenBSD-Commit-ID: 0ed8ee085c7503c60578941d8b45f3a61d4c9710
2778 commit 8c07170135dde82a26886b600a8bf6fb290b633d
2779 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2780 Date: Mon Sep 20 04:02:13 2021 +0000
2782 upstream: Fix "Allocated port" debug message
2784 for unix domain sockets. From peder.stray at gmail.com via github PR#272,
2787 OpenBSD-Commit-ID: 8d5ef3fbdcdd29ebb0792b5022a4942db03f017e
2789 commit 277d3c6adfb128b4129db08e3d65195d94b55fe7
2790 Author: djm@openbsd.org <djm@openbsd.org>
2791 Date: Mon Sep 20 01:55:42 2021 +0000
2793 upstream: Switch scp back to use the old protocol by default, ahead of
2795 release. We'll wait a little longer for people to pick up sftp-server(8) that
2796 supports the extension that scp needs for ~user paths to continue working in
2797 SFTP protocol mode. Discussed with deraadt@
2799 OpenBSD-Commit-ID: f281f603a705fba317ff076e7b11bcf2df941871
2801 commit ace19b34cc15bea3482be90450c1ed0cd0dd0669
2802 Author: djm@openbsd.org <djm@openbsd.org>
2803 Date: Sat Sep 18 02:03:25 2021 +0000
2805 upstream: better error message for ~user failures when the
2807 sftp-server lacks the expand-path extension; ok deraadt@
2809 OpenBSD-Commit-ID: 9c1d965d389411f7e86f0a445158bf09b8f9e4bc
2811 commit 6b1238ba971ee722a310d95037b498ede5539c03
2812 Author: djm@openbsd.org <djm@openbsd.org>
2813 Date: Thu Sep 16 15:22:22 2021 +0000
2815 upstream: make some more scp-in-SFTP mode better match Unix idioms
2817 suggested by deraadt@
2819 OpenBSD-Commit-ID: 0f2439404ed4cf0b0be8bf49a1ee734836e1ac87
2821 commit e694f8ac4409931e67d08ac44ed251b20b10a957
2822 Author: djm@openbsd.org <djm@openbsd.org>
2823 Date: Thu Sep 16 15:11:19 2021 +0000
2825 upstream: allow log_stderr==2 to prefix log messages with argv[0]
2827 use this to make scp's SFTP mode error messages more scp-like
2829 prompted by and ok deraadt@
2831 OpenBSD-Commit-ID: 0e821dbde423fc2280e47414bdc22aaa5b4e0733
2833 commit 8a7a06ee505cb833e613f74a07392e9296286c30
2834 Author: Darren Tucker <dtucker@dtucker.net>
2835 Date: Fri Sep 17 13:03:31 2021 +1000
2837 Test against LibreSSL 3.2.6, 3.3.4, 3.4.0.
2839 commit c25c84074a47f700dd6534995b4af4b456927150
2840 Author: djm@openbsd.org <djm@openbsd.org>
2841 Date: Thu Sep 16 05:36:03 2021 +0000
2843 upstream: missing space character in ssh -G output broke the
2845 t-sshcfgparse regression test; spotted by anton@
2847 OpenBSD-Commit-ID: bcc36fae2f233caac4baa8e58482da4aa350eed0
2849 commit a4bee1934bf5e5575fea486628f4123d6a29dff8
2850 Author: djm@openbsd.org <djm@openbsd.org>
2851 Date: Wed Sep 15 06:56:01 2021 +0000
2853 upstream: allow CanonicalizePermittedCNAMEs=none in ssh_config; ok
2857 OpenBSD-Commit-ID: 668a82ba8e56d731b26ffc5703213bfe071df623
2859 commit d0fffc88c8fe90c1815c6f4097bc8cbcabc0f3dd
2860 Author: mbuhl@openbsd.org <mbuhl@openbsd.org>
2861 Date: Tue Sep 14 11:04:21 2021 +0000
2863 upstream: put back the mux_ctx memleak fix for SSH_CHANNEL_MUX_CLIENT
2867 OpenBSD-Commit-ID: 1aba1da828956cacaadb81a637338734697d9798
2869 commit 19b3d846f06697c85957ab79a63454f57f8e22d6
2870 Author: schwarze@openbsd.org <schwarze@openbsd.org>
2871 Date: Sat Sep 11 09:05:50 2021 +0000
2873 upstream: Do not ignore SIGINT while waiting for input if editline(3)
2875 is not used. Instead, in non-interactive mode, exit sftp(1), like for other
2876 serious errors. As pointed out by dtucker@, when compiled without editline(3)
2877 support in portable OpenSSH, the el == NULL branch is also used for
2878 interactive mode. In that case, discard the input line and provide a fresh
2879 prompt to the user just like in the case where editline(3) is used. OK djm@
2881 OpenBSD-Commit-ID: 7d06f4d3ebba62115527fafacf38370d09dfb393
2883 commit ba61123eef9c6356d438c90c1199a57a0d7bcb0a
2884 Author: djm@openbsd.org <djm@openbsd.org>
2885 Date: Sat Sep 11 00:40:24 2021 +0000
2887 upstream: when using SFTP protocol, continue transferring files after a
2889 transfer error occurs. This matches original scp/rcp behaviour. ok dtucker@
2891 OpenBSD-Commit-ID: dfe4558d71dd09707e9b5d6e7d2e53b793da69fa
2893 commit b0ec59a708b493c6f3940336b1a537bcb64dd2a7
2894 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2895 Date: Fri Sep 10 11:38:38 2021 +0000
2897 upstream: Document that non-interactive commands are run via the user's
2899 shell using the -c flag. ok jmc@
2901 OpenBSD-Commit-ID: 4f0d912077732eead10423afd1acf4fc0ceec477
2903 commit 66a658b5d9e009ea11f8a0ca6e69c7feb2d851ea
2904 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2905 Date: Fri Sep 10 10:26:02 2021 +0000
2907 upstream: Document behaviour of arguments following non-interactive
2909 commands. Prompted by github PR#139 from EvanTheB, feedback & ok djm@ jmc@
2911 OpenBSD-Commit-ID: fc758d1fe0471dfab4304fcad6cd4ecc3d79162a
2913 commit 1d47e28e407d1f95fdf8f799be23f48dcfa5206b
2914 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2915 Date: Fri Sep 10 07:11:11 2021 +0000
2917 upstream: Clarify which file's attributes -p preserves, and that
2919 it's specifically the file mode bits. bz#3340 from calestyo at scientia.net,
2922 OpenBSD-Commit-ID: f09e6098ed1c4be00c730873049825f8ee7cb884
2924 commit b344db7a413478e4c21e4cadba4a970ad3e6128a
2925 Author: djm@openbsd.org <djm@openbsd.org>
2926 Date: Fri Sep 10 05:46:09 2021 +0000
2928 upstream: openssh-7.4 was incorrectly listed twice; spotted by
2930 Dmitry Belyavskiy, ok dtucker@
2932 OpenBSD-Commit-ID: 4b823ae448f6e899927ce7b04225ac9e489f58ef
2934 commit 9136d6239ad7a4a293e0418a49b69e70c76d58b8
2935 Author: jmc@openbsd.org <jmc@openbsd.org>
2936 Date: Thu Sep 9 06:17:39 2021 +0000
2938 upstream: - move CAVEATS to its correct order - use the term
2940 "legacy" protocol rather than "original", as the latter made the text
2941 misleading - uppercase SCP
2945 OpenBSD-Commit-ID: 8479255746d5fa76a358ee59e7340fecf4245ff0
2947 commit 2d678c5e3bdc2f5c99f7af5122e9d054925d560d
2948 Author: David Carlier <devnexen@gmail.com>
2949 Date: Wed Sep 8 19:49:54 2021 +0100
2951 Disable tracing on FreeBSD using procctl.
2953 Placed at the start of platform_disable_tracing() to prevent declaration
2954 after code errors from strict C89 compilers (in the unlikely event that
2955 more than one method is enabled).
2957 commit 73050fa38fb36ae3326d768b574806352b97002d
2958 Author: djm@openbsd.org <djm@openbsd.org>
2959 Date: Wed Sep 8 23:31:39 2021 +0000
2961 upstream: Use the SFTP protocol by default. The original scp/rcp
2963 protocol remains available via the -O flag.
2965 Note that ~user/ prefixed paths in SFTP mode require a protocol extension
2966 that was first shipped in OpenSSH 8.7.
2968 ok deraadt, after baking in snaps for a while without incident
2970 OpenBSD-Commit-ID: 23588976e28c281ff5988da0848cb821fec9213c
2972 commit c4565e69ffa2485cff715aa842ea7a350296bfb6
2973 Author: Darren Tucker <dtucker@dtucker.net>
2974 Date: Wed Sep 8 21:09:49 2021 +1000
2976 Really fix test on OpenSSL 1.1.1 stable.
2978 commit 79f1bb5f56cef3ae9276207316345b8309248478
2979 Author: Darren Tucker <dtucker@dtucker.net>
2980 Date: Wed Sep 8 18:51:39 2021 +1000
2982 Correct OpenSSL 1.1.1 stable identifier.
2984 commit b6255593ed5ccbe5e7d3d4b26b2ad31ad4afc232
2985 Author: Darren Tucker <dtucker@dtucker.net>
2986 Date: Wed Sep 8 18:39:44 2021 +1000
2988 Increment nfds when coming from startup_pipe.
2990 If we have to increase nfds because startup_pipe[0] is above any of the
2991 descriptors passed in the fd_sets, we also need to add 1 to nfds since
2992 select takes highest FD number plus one. bz#3345 from yaroslav.kuzmin
2995 commit a3e92a6794817df6012ac8546aea19652cc91b61
2996 Author: Darren Tucker <dtucker@dtucker.net>
2997 Date: Wed Sep 8 13:45:10 2021 +1000
2999 Tests for OpenSSL 3.0.0 release & 1.1.1 branch.
3001 commit 4afe431da98ec1cf6a2933fe5658f4fd68dee9e2
3002 Author: djm@openbsd.org <djm@openbsd.org>
3003 Date: Wed Sep 8 03:23:44 2021 +0000
3005 upstream: correct my mistake in previous fix; spotted by halex
3007 OpenBSD-Commit-ID: 3cc62d92e3f70006bf02468fc146bfc36fffa183
3009 commit ca0e455b9331213ff9505a21b94c38e34faa2bba
3010 Author: djm@openbsd.org <djm@openbsd.org>
3011 Date: Tue Sep 7 06:03:51 2021 +0000
3013 upstream: avoid NULL deref in -Y find-principals. Report and fix
3015 from Carlo Marcelo Arenas Belón
3017 Content-Type: text/plain; charset=UTF-8
3018 Content-Transfer-Encoding: 8bit
3020 OpenBSD-Commit-ID: 6238486f8ecc888d6ccafcd9ad99e621bb41f1e0
3022 commit 37616807f150fb46610bbd5031c31af4857ad1e9
3023 Author: millert@openbsd.org <millert@openbsd.org>
3024 Date: Mon Sep 6 00:36:01 2021 +0000
3026 upstream: revision 1.381 neglected to remove
3028 sChallengeResponseAuthentication from the enum. Noticed by
3029 christos@zoulas.com. OK dtucker@
3031 OpenBSD-Commit-ID: b533283a4dd6d04a867da411a4c7a8fbc90e34ff
3033 commit 7acb3578cdfec0b3d34501408071f7a96c1684ea
3034 Author: Darren Tucker <dtucker@dtucker.net>
3035 Date: Sun Sep 5 20:45:42 2021 +1000
3037 Correct version_num for OpenSSL dev branch.
3039 commit 65bb01111320dfd0d25e21e1fd4d3f2b77532669
3040 Author: Darren Tucker <dtucker@dtucker.net>
3041 Date: Sun Sep 5 19:37:39 2021 +1000
3043 Test against OpenSSL 3 branch as well as dev.
3045 Now that OpenSSL development has moved to 3.1, test against the most
3046 recent version of the openssl-3.0 branch too.
3048 commit 864ed0d5e04a503b97202c776b7cf3f163f3eeaa
3049 Author: Darren Tucker <dtucker@dtucker.net>
3050 Date: Sun Sep 5 19:33:22 2021 +1000
3052 OpenSSL development is now 3.1.*
3054 commit a60209a586a928f92ab323bf23bd07f57093342e
3055 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3056 Date: Fri Sep 3 07:43:23 2021 +0000
3058 upstream: Use .Cm instead of .Dq in StrictHostKeyChecking list for
3060 consistency. Patch from scop via github PR#257, ok jmc@
3062 OpenBSD-Commit-ID: 3652a91564570779431802c31224fb4a9cf39872
3064 commit 8d1d9eb6de37331e872700e9e399a3190cca1242
3065 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3066 Date: Fri Sep 3 07:27:03 2021 +0000
3068 upstream: Mention using ssh -i for specifying the public key file
3070 in the case where the private key is loaded into ssh-agent but is not present
3071 locally. Based on patch from rafork via github PR#215, ok jmc@
3073 OpenBSD-Commit-ID: 2282e83b0ff78d2efbe705883b67240745fa5bb2
3075 commit eb4362e5e3aa7ac26138b11e44d8c191910aff64
3076 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3077 Date: Fri Sep 3 05:25:50 2021 +0000
3079 upstream: Refer to KEX "algorithms" instead of "methods" to match
3081 other references and improve consistency. Patch from scop via github PR#241,
3084 OpenBSD-Commit-ID: 840bc94ff6861b28d8603c8e8c16499bfb65e32c
3086 commit b3318946ce5725da43c4bf7eeea1b73129c47d2a
3087 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3088 Date: Fri Sep 3 05:12:25 2021 +0000
3090 upstream: Remove redundant attrib_clear in upload_dir_internal.
3092 The subsequent call to stat_to_attrib clears the struct as its first step
3093 anyway. From pmeinhardt via github PR#220, ok djm@
3095 OpenBSD-Commit-ID: f5234fc6d7425b607e179acb3383f21716f3029e
3097 commit 7cc3fe28896e653956a6a2eed0a25d551b83a029
3098 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3099 Date: Fri Sep 3 04:11:13 2021 +0000
3101 upstream: Add test for client termination status on signal.
3103 Based on patch from Alexxz via github PR#235 with some tweaks, to
3104 match patch in bz#3281.
3106 OpenBSD-Regress-ID: d87c7446fb8b5f8b45894fbbd6875df326e729e2
3108 commit 5428b0d239f6b516c81d1dd15aa9fe9e60af75d4
3109 Author: deraadt@openbsd.org <deraadt@openbsd.org>
3110 Date: Thu Sep 2 21:03:54 2021 +0000
3112 upstream: sys/param.h is not needed for any visible reason
3114 OpenBSD-Commit-ID: 8bdea2d0c75692e4c5777670ac039d4b01c1f368
3116 commit 1ff38f34b4c4545eb28106629cafa1e0496bc726
3117 Author: Shchelkunov Artem <a.shchelkunov@ideco.ru>
3118 Date: Wed Aug 11 18:07:58 2021 +0500
3120 Fix memory leak in error path.
3122 *info is allocated via xstrdup but was leaked in the PAM_AUTH_ERR path.
3125 commit cb37e2f0c0ca4fef844ed7edc5d0e3b7d0e83f6a
3126 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3127 Date: Wed Sep 1 03:16:06 2021 +0000
3129 upstream: Fix ssh-rsa fallback for old PuTTY interop tests.
3131 OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37
3133 commit 8b02ef0f28dc24cda8cbcd8b7eb02bda8f8bbe59
3134 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3135 Date: Wed Sep 1 00:50:27 2021 +0000
3137 upstream: Add a function to skip remaining tests.
3139 Many tests skip tests for various reasons but not in a consistent way and
3140 don't always clean up, so add that and switch the tests that do that over.
3142 OpenBSD-Regress-ID: 72d2ec90a3ee8849486956a808811734281af735
3144 commit d486845c07324c04240f1674ac513985bd356f66
3145 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3146 Date: Tue Aug 31 07:13:59 2021 +0000
3148 upstream: Specify path to PuTTY keys.
3150 Portable needs this and it makes no difference on OpenBSD, so resync
3151 them. (Id sync only, Portable already had this.)
3153 OpenBSD-Regress-ID: 33f6f66744455886d148527af8368811e4264162
3155 commit d22b299115e27606e846b23490746f69fdd4fb38
3156 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3157 Date: Tue Aug 31 06:13:23 2021 +0000
3159 upstream: Better compat tests with old PuTTY.
3161 When running PuTTY interop tests and using a PuTTY version older than
3162 0.76, re-enable the ssh-rsa host key algorithm (the 256 and 512 variants
3163 of RSA were added some time between 0.73 and 0.76).
3165 OpenBSD-Regress-ID: e6138d6987aa705fa1e4f216db0bb386e1ff38e1
3167 commit 87ad70d605c3e39c9b8aa275db27120d7cc09b77
3168 Author: Darren Tucker <dtucker@dtucker.net>
3169 Date: Tue Aug 31 17:04:50 2021 +1000
3171 Resync PuTTY interop tests.
3173 Resync behaviour when REGRESS_INTEROP_PUTTY is not set with OpenBSD.
3175 commit e47b82a7bf51021afac218bf59a3be121827653d
3176 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3177 Date: Tue Aug 31 01:25:27 2021 +0000
3179 upstream: Specify hostkeyalgorithms in SSHFP test.
3181 Specify host key algorithms in sshd's default set for the SSHFP test,
3182 from djm@. Make the reason for when the test is skipped a bit clearer.
3184 OpenBSD-Regress-ID: 4f923dfc761480d5411de17ea6f0b30de3e32cea
3186 commit 7db3e0a9e8477c018757b59ee955f7372c0b55fb
3187 Author: djm@openbsd.org <djm@openbsd.org>
3188 Date: Mon Aug 30 01:15:45 2021 +0000
3190 upstream: adapt to RSA/SHA1 deprectation
3192 OpenBSD-Regress-ID: 952397c39a22722880e4de9d1c50bb1a14f907bb
3194 commit 2344750250247111a6c3c6a4fe84ed583a61cc11
3195 Author: djm@openbsd.org <djm@openbsd.org>
3196 Date: Sun Aug 29 23:53:10 2021 +0000
3198 upstream: After years of forewarning, disable the RSA/SHA-1
3200 signature algorithm by default. It is feasible to create colliding SHA1
3201 hashes, so we need to deprecate its use.
3203 RSA/SHA-256/512 remains available and will be transparently selected
3204 instead of RSA/SHA1 for most SSH servers released in the last five+
3205 years. There is no need to regenerate RSA keys.
3207 The use of RSA/SHA1 can be re-enabled by adding "ssh-rsa" to the
3208 PubkeyAcceptedAlgorithms directives on the client and server.
3212 OpenBSD-Commit-ID: 189bcc4789c7254e09e23734bdd5def8354ff1d5
3214 commit 56c4455d3b54b7d481c77c82115c830b9c8ce328
3215 Author: djm@openbsd.org <djm@openbsd.org>
3216 Date: Sun Aug 29 23:44:07 2021 +0000
3218 upstream: wrap at 80 columns
3220 OpenBSD-Commit-ID: 47ca2286d6b52a9747f34da16d742879e1a37bf0
3222 commit 95401eea8503943449f712e5f3de52fc0bc612c5
3223 Author: Darren Tucker <dtucker@dtucker.net>
3224 Date: Fri Aug 20 18:14:13 2021 +1000
3226 Replace shell function with ssh-keygen -A.
3228 Prevents the init script in the SysV package from trying (and failing)
3229 to generate unsupported key types. Remove now-unused COMMENT_OUT_ECC.
3232 commit d83ec9ed995a76ed1d5c65cf10b447222ec86131
3233 Author: Darren Tucker <dtucker@dtucker.net>
3234 Date: Fri Aug 20 15:39:05 2021 +1000
3236 Remove obsolete Redhat PAM config and init script.
3238 commit e1a596186c81e65a34ce13076449712d3bf97eb4
3239 Author: Damien Miller <djm@mindrot.org>
3240 Date: Fri Aug 20 14:03:49 2021 +1000
3244 commit 5450606c8f7f7a0d70211cea78bc2dab74ab35d1
3245 Author: Damien Miller <djm@mindrot.org>
3246 Date: Fri Aug 20 13:59:43 2021 +1000
3248 update version numbers
3250 commit feee2384ab8d694c770b7750cfa76a512bdf8246
3251 Author: djm@openbsd.org <djm@openbsd.org>
3252 Date: Fri Aug 20 03:22:55 2021 +0000
3254 upstream: openssh-8.7
3256 OpenBSD-Commit-ID: 8769dff0fd76ae3193d77bf83b439adee0f300cd
3258 commit 9a2ed62173cc551b2b5f479460bb015b19499de8
3259 Author: Darren Tucker <dtucker@dtucker.net>
3260 Date: Fri Aug 20 10:48:13 2021 +1000
3262 Also check pid in pselect_notify_setup.
3266 commit deaadcb93ca15d4f38aa38fb340156077792ce87
3267 Author: Darren Tucker <dtucker@dtucker.net>
3268 Date: Fri Aug 20 08:39:33 2021 +1000
3270 Prefix pselect functions to clarify debug messages
3272 commit 10e45654cff221ca60fd35ee069df67208fcf415
3273 Author: Darren Tucker <dtucker@dtucker.net>
3274 Date: Fri Aug 20 08:30:42 2021 +1000
3276 Fix race in pselect replacement code.
3278 On the second and subsequent calls to pselect the notify_pipe was not
3279 added to the select readset, opening up a race that om G. Christensen
3280 discovered on multiprocessor Solaris <=9 systems.
3282 Also reinitialize notify_pipe if the pid changes. This will prevent a
3283 parent and child from using the same FD, although this is not an issue
3284 in the current structure it might be in future.
3286 commit 464ba22f1e38d25402e5ec79a9b8d34a32df5a3f
3287 Author: Darren Tucker <dtucker@dtucker.net>
3288 Date: Wed Aug 18 12:51:30 2021 +1000
3290 Check compiler for c99 declarations after code.
3292 The sntrup761 reference code contains c99-style declarations after code
3293 so don't try to build that if the compiler doesn't support it.
3295 commit 7d878679a4b155a359d32104ff473f789501748d
3296 Author: Darren Tucker <dtucker@dtucker.net>
3297 Date: Tue Aug 17 15:12:04 2021 +1000
3299 Remove trailing backslash on regress-unit-binaries
3301 commit b71b2508f17c68c5d9dbbe537686d81cedb9a781
3302 Author: Darren Tucker <dtucker@dtucker.net>
3303 Date: Tue Aug 17 07:59:27 2021 +1000
3305 Put stdint.h inside HAVE_STDINT_H.
3307 From Tom G. Christensen.
3309 commit 6a24567a29bd7b4ab64e1afad859ea845cbc6b8c
3310 Author: Darren Tucker <dtucker@dtucker.net>
3311 Date: Mon Aug 16 14:13:02 2021 +1000
3313 Improve github test driver script.
3315 - use a trap to always output any failed regress logs (since the script
3316 sets -e, the existing log output is never invoked).
3317 - pass LTESTS and SKIP_LTESTS when re-running with sshd options (eg.
3320 commit b467cf13705f59ed348b620722ac098fe31879b7
3321 Author: Darren Tucker <dtucker@dtucker.net>
3322 Date: Mon Aug 16 11:32:23 2021 +1000
3324 Remove deprecated ubuntu-16.04 test targets.
3326 Github has deprecated ubuntu-16.04 and it will be removed on 20
3329 commit 20e6eefcdf78394f05e453d456c1212ffaa6b6a4
3330 Author: Darren Tucker <dtucker@dtucker.net>
3331 Date: Sun Aug 15 23:25:26 2021 +1000
3333 Skip agent ptrace test on hurd.
3335 commit 7c9115bbbf958fbf85259a061c1122e2d046aabf
3336 Author: Darren Tucker <dtucker@dtucker.net>
3337 Date: Sun Aug 15 19:37:22 2021 +1000
3339 Add hurd test target.
3341 commit 7909a566f6c6a78fcd30708dc49f4e4f9bb80ce3
3342 Author: Darren Tucker <dtucker@dtucker.net>
3343 Date: Sun Aug 15 12:45:10 2021 +1000
3345 Skip scp3 tests on all dfly58 and 60 configs.
3347 commit e65198e52cb03534e8c846d1bca74c310b1526de
3348 Author: Tim Rice <tim@multitalents.net>
3349 Date: Sat Aug 14 13:08:07 2021 -0700
3351 openbsd-compat/openbsd-compat.h: put bsd-signal.h before bsd-misc.h
3352 to get sigset_t from signal.h needed for the pselect replacement.
3354 commit e50635640f79920d9375e0155cb3f4adb870eee5
3355 Author: Darren Tucker <dtucker@dtucker.net>
3356 Date: Fri Aug 13 13:21:00 2021 +1000
3358 Test OpenSSH from OpenBSD head on 6.8 and 6.9.
3360 commit e0ba38861c490c680117b7fe0a1d61a181cd00e7
3361 Author: Darren Tucker <dtucker@dtucker.net>
3362 Date: Fri Aug 13 13:00:14 2021 +1000
3364 Skip scp3 test on dragonfly 58 and 60.
3366 The tests hang, so skip until we figure them out.
3368 commit dcce2a2bcf007bf817a2fb0dce3db83fa9201e92
3369 Author: djm@openbsd.org <djm@openbsd.org>
3370 Date: Thu Aug 12 23:59:25 2021 +0000
3372 upstream: mention that CASignatureAlgorithms accepts +/- similarly to
3374 the other algorithm list directives; ok jmc bz#3335
3376 OpenBSD-Commit-ID: 0d46b53995817052c78e2dce9dbd133963b073d9
3378 commit 090a82486e5d7a8f7f16613d67e66a673a40367f
3379 Author: schwarze@openbsd.org <schwarze@openbsd.org>
3380 Date: Thu Aug 12 09:59:00 2021 +0000
3382 upstream: In the editline(3) branch of the sftp(1) event loop,
3384 handle SIGINT rather than ignoring it, such that the user can use Ctrl-C to
3385 discard the currently edited command line and get a fresh prompt, just like
3386 in ftp(1), bc(1), and in shells.
3388 It is critical to not use ssl_signal() for this particular case
3389 because that function unconditionally sets SA_RESTART, but here we
3390 need the signal to interrupt the read(2) in the el_gets(3) event loop.
3392 OK dtucker@ deraadt@
3394 OpenBSD-Commit-ID: 8025115a773f52e9bb562eaab37ea2e021cc7299
3396 commit e1371e4f58404d6411d9f95eb774b444cea06a26
3397 Author: naddy@openbsd.org <naddy@openbsd.org>
3398 Date: Wed Aug 11 14:07:54 2021 +0000
3400 upstream: scp: tweak man page and error message for -3 by default
3402 Now that the -3 option is enabled by default, flip the documentation
3403 and error message logic from "requires -3" to "blocked by -R".
3407 OpenBSD-Commit-ID: a872592118444fb3acda5267b2a8c3d4c4252020
3409 commit 49f46f6d77328a3d10a758522b670a3e8c2235e7
3410 Author: naddy@openbsd.org <naddy@openbsd.org>
3411 Date: Wed Aug 11 14:05:19 2021 +0000
3413 upstream: scp: do not spawn ssh with two -s flags for
3415 remote-to-remote copies
3417 Do not add another "-s" to the argument vector every time an SFTP
3418 connection is initiated. Instead, introduce a subsystem flag to
3419 do_cmd() and add "-s" when the flag is set.
3423 OpenBSD-Commit-ID: 25df69759f323661d31b2e1e790faa22e27966c1
3425 commit 2a2cd00783e1da45ee730b7f453408af1358ef5b
3426 Author: djm@openbsd.org <djm@openbsd.org>
3427 Date: Wed Aug 11 08:55:04 2021 +0000
3429 upstream: test -Oprint-pubkey
3431 OpenBSD-Regress-ID: 3d51afb6d1f287975fb6fddd7a2c00a3bc5094e0
3433 commit b9f4635ea5bc33ed5ebbacf332d79bae463b0f54
3434 Author: djm@openbsd.org <djm@openbsd.org>
3435 Date: Wed Aug 11 08:54:17 2021 +0000
3437 upstream: when verifying sshsig signatures, support an option
3439 (-Oprint-pubkey) to dump the full public key to stdout; based on patch from
3440 Fabian Stelzer; ok markus@
3442 OpenBSD-Commit-ID: 0598000e5b9adfb45d42afa76ff80daaa12fc3e2
3444 commit 750c1a45ba4e8ad63793d49418a0780e77947b9b
3445 Author: djm@openbsd.org <djm@openbsd.org>
3446 Date: Wed Aug 11 05:21:32 2021 +0000
3448 upstream: oops, missed one more %p
3450 OpenBSD-Commit-ID: e7e62818d1564cc5cd9086eaf7a51cbd1a9701eb
3452 commit b5aa27b69ab2e1c13ac2b5ad3f8f7d389bad7489
3453 Author: djm@openbsd.org <djm@openbsd.org>
3454 Date: Wed Aug 11 05:20:17 2021 +0000
3456 upstream: remove a bunch of %p in format strings; leftovers of
3458 debuggings past. prompted by Michael Forney, ok dtucker@
3460 OpenBSD-Commit-ID: 4853a0d6c9cecaba9ecfcc19066e52d3a8dcb2ac
3462 commit 419aa01123db5ff5dbc68b2376ef23b222862338
3463 Author: Darren Tucker <dtucker@dtucker.net>
3464 Date: Wed Aug 11 09:21:09 2021 +1000
3466 Add includes.h to compat tests.
3468 On platforms where closefrom returns void (eg glibc>=2.34) the prototype
3469 for closefrom in its compat tests would cause compile errors. Remove
3470 this and have the tests pull in the compat headers in the same way as
3471 the main code. bz#3336.
3473 commit 931f592f26239154eea3eb35a086585897b1a185
3474 Author: djm@openbsd.org <djm@openbsd.org>
3475 Date: Tue Aug 10 03:35:45 2021 +0000
3477 upstream: adapt to scp -M flag change; make scp3.sh test SFTP mode too
3479 OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0
3481 commit 391ca67fb978252c48d20c910553f803f988bd37
3482 Author: djm@openbsd.org <djm@openbsd.org>
3483 Date: Tue Aug 10 03:33:34 2021 +0000
3485 upstream: Prepare for a future where scp(1) uses the SFTP protocol by
3487 default. Replace recently added -M option to select the protocol with -O
3488 (olde) and -s (SFTP) flags, and label the -s flag with a clear warning that
3489 it will be removed in the near future (so no, don't use it in scripts!).
3491 prompted by/feedback from deraadt@
3493 OpenBSD-Commit-ID: 92ad72cc6f0023c9be9e316d8b30eb6d8d749cfc
3495 commit bfdd4b722f124a4fa9173d20dd64dd0fc69856be
3496 Author: djm@openbsd.org <djm@openbsd.org>
3497 Date: Mon Aug 9 23:56:36 2021 +0000
3499 upstream: make scp -3 the default for remote-to-remote copies. It
3501 provides a much better and more intuitive user experience and doesn't require
3502 exposing credentials to the source host.
3504 thanks naddy@ for catching the missing argument in usage()
3506 "Yes please!" - markus@
3507 "makes a lot of sense" - deraadt@
3508 "the right thing to do" - dtucker@
3510 OpenBSD-Commit-ID: d0d2af5f0965c5192ba5b2fa461c9f9b130e5dd9
3512 commit 2f7a3b51cef689ad9e93d0c6c17db5a194eb5555
3513 Author: djm@openbsd.org <djm@openbsd.org>
3514 Date: Mon Aug 9 23:49:31 2021 +0000
3516 upstream: make scp in SFTP mode try to use relative paths as much
3518 as possible. Previosuly, it would try to make relative and ~/-rooted paths
3519 absolute before requesting transfers.
3521 prompted by and much discussion deraadt@
3524 OpenBSD-Commit-ID: 46639d382ea99546a4914b545fa7b00fa1be5566
3526 commit 2ab864010e0a93c5dd95116fb5ceaf430e2fc23c
3527 Author: djm@openbsd.org <djm@openbsd.org>
3528 Date: Mon Aug 9 23:47:44 2021 +0000
3530 upstream: SFTP protocol extension to allow the server to expand
3532 ~-prefixed paths, in particular ~user ones. Allows scp in sftp mode to accept
3533 these paths, like scp in rcp mode does.
3535 prompted by and much discussion deraadt@
3538 OpenBSD-Commit-ID: 7d794def9e4de348e1e777f6030fc9bafdfff392
3540 commit 41b019ac067f1d1f7d99914d0ffee4d2a547c3d8
3541 Author: djm@openbsd.org <djm@openbsd.org>
3542 Date: Mon Aug 9 23:44:32 2021 +0000
3544 upstream: when scp is in SFTP mode, try to deal better with ~
3546 prefixed paths. ~user paths aren't supported, but ~/ paths will be accepted
3547 and prefixed with the SFTP server starting directory (more to come)
3549 prompted by and discussed with deraadt@
3552 OpenBSD-Commit-ID: 263a071f14555c045fd03132a8fb6cbd983df00d
3554 commit b4b3f3da6cdceb3fd168b5fab69d11fba73bd0ae
3555 Author: djm@openbsd.org <djm@openbsd.org>
3556 Date: Mon Aug 9 07:21:01 2021 +0000
3558 upstream: on fatal errors, make scp wait for ssh connection before
3560 exiting avoids LogLevel=verbose (or greater) messages from ssh appearing
3561 after scp has returned exited and control has returned to the shell; ok
3564 (this was originally committed as r1.223 along with unrelated stuff that
3565 I rolled back in r1.224)
3567 OpenBSD-Commit-ID: 1261fd667ad918484889ed3d7aec074f3956a74b
3569 commit 2ae7771749e0b4cecb107f9d4860bec16c3f4245
3570 Author: djm@openbsd.org <djm@openbsd.org>
3571 Date: Mon Aug 9 07:19:12 2021 +0000
3573 upstream: rever r1.223 - I accidentally committed unrelated changes
3575 OpenBSD-Commit-ID: fb73f3865b2647a27dd94db73d6589506a9625f9
3577 commit 986abe94d481a1e82a01747360bd767b96b41eda
3578 Author: djm@openbsd.org <djm@openbsd.org>
3579 Date: Mon Aug 9 07:16:09 2021 +0000
3581 upstream: show only the final path component in the progress meter;
3583 more useful with long paths (that may truncate) and better matches
3584 traditional scp behaviour; spotted by naddy@ ok deraadt@
3586 OpenBSD-Commit-ID: 26b544d0074f03ebb8a3ebce42317d8d7ee291a3
3588 commit 2b67932bb3176dee4fd447af4368789e04a82b93
3589 Author: djm@openbsd.org <djm@openbsd.org>
3590 Date: Mon Aug 9 07:13:54 2021 +0000
3592 upstream: on fatal errors, make scp wait for ssh connection before
3594 exiting avoids LogLevel=verbose (or greater) messages from ssh appearing
3595 after scp has returned exited and control has returned to the shell; ok
3598 OpenBSD-Commit-ID: ef9dab5ef5ae54a6a4c3b15d380568e94263456c
3600 commit 724eb900ace30661d45db2ba01d0f924d95ecccb
3601 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3602 Date: Sun Aug 8 08:49:09 2021 +0000
3604 upstream: xstrdup environment variable used by ForwardAgent. bz#3328
3606 from goetze at dovetail.com, ok djm@ deraadt@
3608 OpenBSD-Commit-ID: 760320dac1c3b26904284ba417a7d63fccc5e742
3610 commit 86b4cb3a884846b358305aad17a6ef53045fa41f
3611 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3612 Date: Sun Aug 8 08:27:28 2021 +0000
3614 upstream: Although it's POSIX, not all shells used in Portable support
3616 the implicit 'in "$@"' after 'for i'.
3618 OpenBSD-Regress-ID: 3c9aec6bca4868f85d2742b6ba5223fce110bdbc
3620 commit f2ccf6c9f395923695f22345e626dfd691227aaf
3621 Author: Darren Tucker <dtucker@dtucker.net>
3622 Date: Sun Aug 8 17:39:56 2021 +1000
3624 Move portable specific settings down.
3626 This brings the top hunk of the file back in sync with OpenBSD
3627 so patches to the CVS Id should apply instead of always being
3630 commit 71b0eb997e220b0fc9331635af409ad84979f2af
3631 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3632 Date: Sun Aug 8 07:27:52 2021 +0000
3634 upstream: Move setting of USER further down the startup In portable
3636 we have to change this and having it in the same hunk as the CVS Id string
3637 means applying changes fails every. single. time.
3639 OpenBSD-Regress-ID: 87cd603eb6db58c9b430bf90adacb7f90864429b
3641 commit f0aca2706c710a0da1a4be705f825a807cd15400
3642 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3643 Date: Sun Aug 8 06:38:33 2021 +0000
3645 upstream: Drop -q in ssh-log-wrapper.sh to preserve logs.
3647 scp and sftp like to add -q to the command line passed to ssh which
3648 overrides the LogLevel we set in the config files and suppresses output
3649 to the debug logs so drop any "-q" from the invoked ssh. In the one
3650 case where we actually want to use -q in the banner test, call the ssh
3651 binary directly bypassing the logging wrapper.
3653 OpenBSD-Regress-ID: e2c97d3c964bda33a751374c56f65cdb29755b75
3655 commit cf27810a649c5cfae60f8ce66eeb25caa53b13bc
3656 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3657 Date: Sat Aug 7 01:57:08 2021 +0000
3659 upstream: Fix prototype mismatch for do_cmd. ok djm@
3661 OpenBSD-Commit-ID: 1c1598bb5237a7ae0be99152f185e0071163714d
3663 commit 85de69f64665245786e28c81ab01fe18b0e2a149
3664 Author: djm@openbsd.org <djm@openbsd.org>
3665 Date: Sat Aug 7 01:55:01 2021 +0000
3667 upstream: sftp-client.c needs poll.h
3669 remove unused variable
3671 OpenBSD-Commit-ID: 233ac6c012cd23af62f237167a661db391055a16
3673 commit 397c4d72e50023af5fe3aee5cc2ad407a6eb1073
3674 Author: Darren Tucker <dtucker@dtucker.net>
3675 Date: Sat Aug 7 11:30:57 2021 +1000
3677 Include poll.h and friends for struct pollfd.
3679 commit a9e2c533195f28627f205682482d9da384c4c52e
3680 Author: djm@openbsd.org <djm@openbsd.org>
3681 Date: Sat Aug 7 00:14:17 2021 +0000
3683 upstream: do_upload() used a near-identical structure for
3685 tracking expected status replies from the server to what do_download() was
3688 Refactor it to use the same structure and factor out some common
3689 code into helper functions.
3691 OpenBSD-Commit-ID: 0c167df8ab6df4a5292c32421922b0cf379e9054
3693 commit 7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee
3694 Author: djm@openbsd.org <djm@openbsd.org>
3695 Date: Sat Aug 7 00:12:09 2021 +0000
3697 upstream: make scp(1) in SFTP mode follow symlinks like
3699 traditional scp(1) ok markus@
3701 OpenBSD-Commit-ID: 97255e55be37e8e26605e4ba1e69f9781765d231
3703 commit 133b44e500422df68c9c25c3b6de35c0263132f1
3704 Author: djm@openbsd.org <djm@openbsd.org>
3705 Date: Sat Aug 7 00:10:49 2021 +0000
3707 upstream: fix incorrect directory permissions on scp -3
3709 transfers; ok markus@
3711 OpenBSD-Commit-ID: 64b2abaa5635a2be65ee2e77688ad9bcebf576c2
3713 commit 98b59244ca10e62ff67a420856770cb700164f59
3714 Author: djm@openbsd.org <djm@openbsd.org>
3715 Date: Sat Aug 7 00:09:57 2021 +0000
3717 upstream: a bit more debugging of file attributes being
3719 sent/received over the wire
3721 OpenBSD-Commit-ID: f68c4e207b08ef95200a8b2de499d422808e089b
3723 commit c677e65365d6f460c084e41e0c4807bb8a9cf601
3724 Author: djm@openbsd.org <djm@openbsd.org>
3725 Date: Sat Aug 7 00:08:52 2021 +0000
3727 upstream: make scp(1) in SFTP mode output better match original
3729 scp(1) by suppressing "Retrieving [path]" lines that were emitted to support
3730 the interactive sftp(1) client. ok markus@
3732 OpenBSD-Commit-ID: 06be293df5f156a18f366079be2f33fa68001acc
3734 commit 48cd39b7a4e5e7c25101c6d1179f98fe544835cd
3735 Author: djm@openbsd.org <djm@openbsd.org>
3736 Date: Sat Aug 7 00:07:18 2021 +0000
3738 upstream: factor out a structure duplicated between downloading
3740 and crossloading; ok markus@
3742 OpenBSD-Commit-ID: 96eede24d520569232086a129febe342e4765d39
3744 commit 318c06bb04ee21a0cfa6b6022a201eacaa53f388
3745 Author: djm@openbsd.org <djm@openbsd.org>
3746 Date: Sat Aug 7 00:06:30 2021 +0000
3748 upstream: use sftp_client crossloading to implement scp -3
3752 OpenBSD-Commit-ID: 7db4c0086cfc12afc9cfb71d4c2fd3c7e9416ee9
3754 commit de7115b373ba0be3861c65de9b606a3e0e9d29a3
3755 Author: djm@openbsd.org <djm@openbsd.org>
3756 Date: Sat Aug 7 00:02:41 2021 +0000
3758 upstream: support for "cross"-loading files/directories, i.e.
3760 downloading from one SFTP server while simultaneously uploading to another.
3762 feedback & ok markus@
3764 OpenBSD-Commit-ID: 3982878e29d8df0fa4ddc502f5ff6126ac714235
3766 commit a50bd0367ff2063bbc70a387740a2aa6914de094
3767 Author: djm@openbsd.org <djm@openbsd.org>
3768 Date: Sat Aug 7 00:01:29 2021 +0000
3770 upstream: factor our SSH2_FXP_OPEN calls into their own function;
3772 "looks fine" markus@
3774 OpenBSD-Commit-ID: d3dea2153f08855c6d9dacc01973248944adeffb
3776 commit e3c0ba05873cf3d3f7d19d595667a251026b2d84
3777 Author: djm@openbsd.org <djm@openbsd.org>
3778 Date: Sat Aug 7 00:00:33 2021 +0000
3780 upstream: prepare for scp -3 implemented via sftp
3782 OpenBSD-Commit-ID: 194aac0dd87cb175334b71c2a30623a5ad55bb44
3784 commit 395d8fbdb094497211e1461cf0e2f80af5617e0a
3785 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3786 Date: Fri Aug 6 09:00:18 2021 +0000
3788 upstream: Make diff invocation more portable.
3790 POSIX does not require diff to have -N, so compare in both directions
3791 with just -r, which should catch missing files in either directory.
3793 OpenBSD-Regress-ID: 0e2ec8594556a6f369ed5a0a90c6806419b845f7
3795 commit d247a73ce27b460138599648d9c637c6f2b77605
3796 Author: djm@openbsd.org <djm@openbsd.org>
3797 Date: Wed Aug 4 21:28:00 2021 +0000
3799 upstream: regression test for scp -3
3801 OpenBSD-Regress-ID: b44375d125c827754a1f722ec6b6b75b634de05d
3803 commit 35c8e41a6f6d8ad76f8d1cd81ac2ea23d0d993b2
3804 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3805 Date: Fri Aug 6 05:04:42 2021 +0000
3807 upstream: Document "ProxyJump none". bz#3334.
3809 OpenBSD-Commit-ID: f78cc6f55731f2cd35c3a41d5352ac1ee419eba7
3811 commit 911ec6411821bda535d09778df7503b92f0eafab
3812 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3813 Date: Wed Aug 4 01:34:55 2021 +0000
3815 upstream: Allow for different (but POSIX compliant) behaviour of
3817 basename(3) and prevent a use-after-free in that case in the new sftp-compat
3820 POSIX allows basename(3) to either return a pointer to static storage
3821 or modify the passed string and return a pointer to that. OpenBSD does
3822 the former and works as is, but on other platforms "filename" points
3823 into "tmp" which was just freed. This makes the freeing of tmp
3824 consistent with the other variable in the loop.
3826 Pinpointed by the -portable Valgrind regress test. ok djm@ deraadt@
3828 OpenBSD-Commit-ID: 750f3c19bd4440e4210e30dd5d7367386e833374
3830 commit 6df1fecb5d3e51f3a8027a74885c3a44f6cbfcbd
3831 Author: Damien Miller <djm@mindrot.org>
3832 Date: Wed Aug 4 11:05:11 2021 +1000
3834 use openbsd-compat glob.h is required
3836 commit 9ebd1828881dfc9014a344587934a5ce7db6fa1b
3837 Author: Darren Tucker <dtucker@dtucker.net>
3838 Date: Tue Aug 3 21:03:23 2021 +1000
3840 Missing space between macro arg and punctuation.
3844 commit 0fd3f62eddc7cf54dcc9053be6f58998f3eb926a
3845 Author: Darren Tucker <dtucker@dtucker.net>
3846 Date: Tue Aug 3 21:02:33 2021 +1000
3848 Avoid lines >80 chars. From jmc@
3850 commit af5d8094d8b755e1daaf2e20ff1dc252800b4c9b
3851 Author: djm@openbsd.org <djm@openbsd.org>
3852 Date: Tue Aug 3 01:05:24 2021 +0000
3854 upstream: regression tests for scp SFTP protocol support; mostly by
3856 Jakub Jelen in GHPR#194 ok markus
3858 OpenBSD-Regress-ID: 36f1458525bcb111741ec8547eaf58b13cddc715
3860 commit e4673b7f67ae7740131a4ecea29a846593049a91
3861 Author: anton@openbsd.org <anton@openbsd.org>
3862 Date: Thu Jul 29 15:34:09 2021 +0000
3864 upstream: Treat doas with arguments as a valid SUDO variable.
3866 Allows one to specify SUDO="doas -n" which I do while running make regress.
3870 OpenBSD-Regress-ID: 4fe5814b5010dbf0885500d703bea06048d11005
3872 commit 197e29f1cca190d767c4b2b63a662f9a9e5da0b3
3873 Author: djm@openbsd.org <djm@openbsd.org>
3874 Date: Mon Aug 2 23:38:27 2021 +0000
3876 upstream: support for using the SFTP protocol for file transfers in
3878 scp, via a new "-M sftp" option. Marked as experimental for now.
3880 Some corner-cases exist, in particular there is no attempt to
3881 provide bug-compatibility with scp's weird "double shell" quoting
3884 Mostly by Jakub Jelen in GHPR#194 with some tweaks by me. ok markus@
3885 Thanks jmc@ for improving the scp.1 bits.
3887 OpenBSD-Commit-ID: 6ce4c9157ff17b650ace571c9f7793d92874051c
3889 commit dd533c7ab79d61a7796b77b64bd81b098e0d7f9f
3890 Author: jmc@openbsd.org <jmc@openbsd.org>
3891 Date: Fri Jul 30 14:28:13 2021 +0000
3893 upstream: fix a formatting error and add some Xr; from debian at
3897 removed references to rlogin etc. as no longer relevant;
3902 OpenBSD-Commit-ID: 3c431c303068d3aec5bb18573a0bd5e0cd77c5ae
3904 commit c7cd347a8823819411222c1e10a0d26747d0fd5c
3905 Author: jmc@openbsd.org <jmc@openbsd.org>
3906 Date: Fri Jul 30 14:25:01 2021 +0000
3908 upstream: fix a formatting error and mark up known_hosts
3910 consistently; issues reported by debian at helgefjell de
3914 OpenBSD-Commit-ID: a1fd8d21dc77f507685443832df0c9700481b0ce
3916 commit 4455aec2e4fc90f64ae4fc47e78ebc9c18721738
3917 Author: jmc@openbsd.org <jmc@openbsd.org>
3918 Date: Wed Jul 28 05:57:42 2021 +0000
3920 upstream: no need to talk about version 2 with the -Q option, so
3922 rewrite the text to read better;
3924 issue reported by debian at helgefjell de
3927 OpenBSD-Commit-ID: 59fe2e8219c37906740ad062e0fdaea487dbe9cf
3929 commit bec429338e9b30d2c7668060e82608286a8a4777
3930 Author: jmc@openbsd.org <jmc@openbsd.org>
3931 Date: Tue Jul 27 14:28:46 2021 +0000
3933 upstream: word fix; reported by debian at helgefjell de
3935 OpenBSD-Commit-ID: 0c6fd22142422a25343c5bd1a618f31618f41ece
3937 commit efad4deb5a1f1cf79ebefd63c6625059060bfbe1
3938 Author: jmc@openbsd.org <jmc@openbsd.org>
3939 Date: Tue Jul 27 14:14:25 2021 +0000
3941 upstream: standardise the grammar in the options list; issue
3943 reported by debian at helgefjell de
3947 OpenBSD-Commit-ID: 7ac15575045d82f4b205a42cc7d5207fe4c3f8e6
3949 commit 1e11fb24066f3fc259ee30db3dbb2a3127e05956
3950 Author: Darren Tucker <dtucker@dtucker.net>
3951 Date: Mon Aug 2 18:56:29 2021 +1000
3953 Check for RLIMIT_NOFILE before trying to use it.
3955 commit 0f494236b49fb48c1ef33669f14822ca4f3ce2f4
3956 Author: Darren Tucker <dtucker@dtucker.net>
3957 Date: Tue Jul 27 17:45:34 2021 +1000
3959 lastenv is only used in setenv.
3961 Prevents an unused variable warning on platforms that have setenv but
3964 commit a1f78e08bdb3eaa88603ba3c6e01de7c8671e28a
3965 Author: Darren Tucker <dtucker@dtucker.net>
3966 Date: Mon Jul 26 12:45:30 2021 +1000
3968 Move SUDO to "make test" command line.
3970 Environment variables don't get passed by vmrun, so move to command
3973 commit 02e624273b9c78a49a01239159b8c09b8409b1a0
3974 Author: Darren Tucker <dtucker@dtucker.net>
3975 Date: Sun Jul 25 23:26:36 2021 +1000
3977 Set SUDO for tests and cleanup.
3979 commit 460ae5d93051bab70239ad823dd784822d58baad
3980 Author: Darren Tucker <dtucker@dtucker.net>
3981 Date: Sun Jul 25 22:37:55 2021 +1000
3983 Pass OPENSSL=no to make tests too.
3985 commit b398f499c68d74ebe3298b73757cf3f36e14e0cb
3986 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3987 Date: Sun Jul 25 12:27:37 2021 +0000
3989 upstream: Skip unit and makefile-based key conversion tests when
3991 we're building with OPENSSL=no.
3993 OpenBSD-Regress-ID: 20455ed9a977c93f846059d1fcb48e29e2c8d732
3995 commit 727ce36c8c5941bde99216d27109405907caae4f
3996 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3997 Date: Sun Jul 25 12:13:03 2021 +0000
3999 upstream: Replace OPENSSL as the variable that points to the
4001 openssl binary with OPENSSL_BIN. This will allow us to use the OPENSSL
4002 variable from mk.conf or the make(1) command line indicating if we're
4003 building with our without OpenSSL, and ultimately get the regress tests
4004 working in the OPENSSL=no configuration.
4006 OpenBSD-Regress-ID: 2d788fade3264d7803e5b54cae8875963f688c4e
4008 commit 55e17101a9075f6a63af724261c5744809dcb95c
4009 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4010 Date: Sat Jul 24 02:57:28 2021 +0000
4012 upstream: Skip RFC4716 format import and export tests when built
4016 OpenBSD-Regress-ID: d2c2d5d38c1acc2b88cc99cfe00a2eb8bb39dfa4
4018 commit f5ccb5895d39cd627ad9e7b2c671d2587616100d
4019 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4020 Date: Sat Jul 24 02:51:14 2021 +0000
4022 upstream: Don't omit ssh-keygen -y from usage when built without
4024 OpenSSL. It is actually available, albeit only for ed25519 keys.
4026 OpenBSD-Commit-ID: 7a254c33d0e6a55c30c6b016a8d298d3cb7a7674
4028 commit 819d57ac23469f1f03baa8feb38ddefbada90fdc
4029 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4030 Date: Sat Jul 24 02:08:13 2021 +0000
4032 upstream: Exclude key conversion options from usage when built
4034 without OpenSSL since those are not available, similar to what we currently
4035 do with the moduli screening options. We can also use this to skip the
4036 conversion regression tests in this case.
4038 OpenBSD-Commit-ID: 3c82caa398cf99cd4518c23bba5a2fc66b16bafe
4040 commit b6673b1d2ee90b4690ee84f634efe40225423c38
4041 Author: Darren Tucker <dtucker@dtucker.net>
4042 Date: Sat Jul 24 13:02:51 2021 +1000
4044 Test OpenBSD upstream with and without OpenSSL.
4046 commit 9d38074b5453c1abbdf888e80828c278d3b886ac
4047 Author: djm@openbsd.org <djm@openbsd.org>
4048 Date: Sat Jul 24 01:54:23 2021 +0000
4050 upstream: test for first-match-wins in authorized_keys environment=
4054 OpenBSD-Regress-ID: 1517c90276fe84b5dc5821c59f88877fcc34c0e8
4056 commit 2b76f1dd19787e784711ea297ad8fc938b4484fd
4057 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4058 Date: Fri Jul 23 05:53:02 2021 +0000
4060 upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly.
4062 OpenBSD-Regress-ID: cdbe408ec3671ea9ee9b55651ee551370d2a4108
4064 commit 7d64a9fb587ba9592f027f7a2264226c713d6579
4065 Author: djm@openbsd.org <djm@openbsd.org>
4066 Date: Sat Jul 24 01:55:19 2021 +0000
4068 upstream: don't leak environment= variable when it is not the first
4072 OpenBSD-Commit-ID: 7fbdc3dfe0032deaf003fd937eeb4d434ee4efe0
4074 commit db2130e2340bf923e41c791aa9cd27b9e926042c
4075 Author: jmc@openbsd.org <jmc@openbsd.org>
4076 Date: Fri Jul 23 06:01:17 2021 +0000
4078 upstream: punctuation;
4080 OpenBSD-Commit-ID: 64be152e378c45975073ab1c07e0db7eddd15806
4082 commit 03190d10980c6fc9124e988cb2df13101f266507
4083 Author: djm@openbsd.org <djm@openbsd.org>
4084 Date: Fri Jul 23 05:56:47 2021 +0000
4086 upstream: mention in comment that read_passphrase(..., RP_ALLOW_STDIN)
4088 will try to use askpass first. bz3314
4090 convert a couple of debug() -> debug_f() while here
4092 OpenBSD-Commit-ID: c7e812aebc28fcc5db06d4710e0f73613dee545c
4094 commit 1653ece6832b2b304d46866b262d5f69880a9ec7
4095 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4096 Date: Fri Jul 23 05:07:16 2021 +0000
4098 upstream: Test conversion of ed25519 and ecdsa keys too.
4100 OpenBSD-Regress-ID: 3676d2d00e58e0d6d37f2878f108cc2b83bbe4bb
4102 commit 8b7af02dcf9d2b738787efd27da7ffda9859bed2
4103 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4104 Date: Fri Jul 23 04:56:21 2021 +0000
4106 upstream: Add test for exporting pubkey from a passphrase-protected
4110 OpenBSD-Regress-ID: da99d93e7b235fbd5b5aaa01efc411225e6ba8ac
4112 commit 441095d4a3e5048fe3c87a6c5db5bc3383d767fb
4113 Author: djm@openbsd.org <djm@openbsd.org>
4114 Date: Fri Jul 23 03:54:55 2021 +0000
4116 upstream: regression test for time-limited signature keys
4118 OpenBSD-Regress-ID: 2a6f3bd900dbee0a3c96f1ff23e032c93ab392bc
4120 commit 9e1882ef6489a7dd16b6d7794af96629cae61a53
4121 Author: djm@openbsd.org <djm@openbsd.org>
4122 Date: Fri Jul 23 05:24:02 2021 +0000
4124 upstream: note successful authentication method in final "Authenticated
4126 to ..." message and partial auth success messages (all at LogLevel=verbose)
4129 OpenBSD-Commit-ID: 06834b89ceb89f8f16c5321d368a66c08f441984
4131 commit a917e973a1b90b40ff1e950df083364b48fc6c78
4132 Author: djm@openbsd.org <djm@openbsd.org>
4133 Date: Fri Jul 23 04:04:52 2021 +0000
4135 upstream: Add a ForkAfterAuthentication ssh_config(5) counterpart
4137 to the ssh(1) -f flag. Last part of GHPR231 from Volker Diels-Grabsch. ok
4140 OpenBSD-Commit-ID: b18aeda12efdebe2093d55263c90fe4ea0bce0d3
4142 commit e0c5088f1c96a145eb6ea1dee438010da78f9ef5
4143 Author: djm@openbsd.org <djm@openbsd.org>
4144 Date: Fri Jul 23 04:00:59 2021 +0000
4146 upstream: Add a StdinNull directive to ssh_config(5) that allows
4148 the config file to do the same thing as -n does on the ssh(1) commandline.
4149 Patch from Volker Diels-Grabsch via GHPR231; ok dtucker
4151 OpenBSD-Commit-ID: 66ddf3f15c76796d4dcd22ff464aed1edd62468e
4153 commit e3957e21ffdc119d6d04c0b1686f8e2fe052f5ea
4154 Author: djm@openbsd.org <djm@openbsd.org>
4155 Date: Fri Jul 23 03:57:20 2021 +0000
4157 upstream: make authorized_keys environment="..." directives
4159 first-match-wins and more strictly limit their maximum number; prompted by
4160 OOM reported by OSS-fuzz (35470).
4162 feedback and ok dtucker@
4164 OpenBSD-Commit-ID: 01f63fc10dcd995e7aed9c378ad879161af83121
4166 commit d0bb1ce731762c55acb95817df4d5fab526c7ecd
4167 Author: djm@openbsd.org <djm@openbsd.org>
4168 Date: Fri Jul 23 03:37:52 2021 +0000
4170 upstream: Let allowed signers files used by ssh-keygen(1)
4172 signatures support key lifetimes, and allow the verification mode to specify
4173 a signature time to check at. This is intended for use by git to support
4174 signing objects using ssh keys. ok dtucker@
4176 OpenBSD-Commit-ID: 3e2c67b7dcd94f0610194d1e8e4907829a40cf31
4178 commit 44142068dc7ef783d135e91ff954e754d2ed432e
4179 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4180 Date: Mon Jul 19 08:48:33 2021 +0000
4182 upstream: Use SUDO when setting up hostkey.
4184 OpenBSD-Regress-ID: 990cf4481cab8dad62e90818a9b4b36c533851a7
4186 commit 6b67f3f1d1d187597e54a139cc7785c0acebd9a2
4187 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4188 Date: Mon Jul 19 05:08:54 2021 +0000
4190 upstream: Increase time margin for rekey tests. Should help
4192 reliability on very heavily loaded hosts.
4194 OpenBSD-Regress-ID: 4c28a0fce3ea89ebde441d7091464176e9730533
4196 commit 7953e1bfce9e76bec41c1331a29bc6cff9d416b8
4197 Author: Darren Tucker <dtucker@dtucker.net>
4198 Date: Mon Jul 19 13:47:51 2021 +1000
4200 Add sshfp-connect.sh file missed in previous.
4202 commit b75a80fa8369864916d4c93a50576155cad4df03
4203 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4204 Date: Mon Jul 19 03:13:28 2021 +0000
4206 upstream: Ensure that all returned SSHFP records for the specified host
4208 name and hostkey type match instead of only one. While there, simplify the
4209 code somewhat and add some debugging. Based on discussion in bz#3322, ok
4212 OpenBSD-Commit-ID: 0a6a0a476eb7f9dfe8fe2c05a1a395e3e9b22ee4
4214 commit 1cc1fd095393663cd72ddac927d82c6384c622ba
4215 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4216 Date: Mon Jul 19 02:21:50 2021 +0000
4218 upstream: Id sync only, -portable already has this.
4220 Put dh_set_moduli_file call inside ifdef WITH_OPENSSL. Fixes
4221 build with OPENSSL=no.
4223 OpenBSD-Commit-ID: af54abbebfb12bcde6219a44d544e18204defb15
4225 commit 33abbe2f4153f5ca5c874582f6a7cc91ae167485
4226 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4227 Date: Mon Jul 19 02:46:34 2021 +0000
4229 upstream: Add test for host key verification via SSHFP records. This
4231 requires some external setup to operate so is disabled by default (see
4232 comments in sshfp-connect.sh).
4234 OpenBSD-Regress-ID: c52c461bd1df3a803d17498917d156ef64512fd9
4236 commit f0cd000d8e3afeb0416dce1c711c3d7c28d89bdd
4237 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4238 Date: Mon Jul 19 02:29:28 2021 +0000
4240 upstream: Add ed25519 key and test SSHFP export of it. Only test
4242 RSA SSHFP export if we have RSA functionality compiled in.
4244 OpenBSD-Regress-ID: b4ff5181b8c9a5862e7f0ecdd96108622333a9af
4246 commit 0075511e27e5394faa28edca02bfbf13b9a6693e
4247 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4248 Date: Mon Jul 19 00:16:26 2021 +0000
4250 upstream: Group keygen tests together.
4252 OpenBSD-Regress-ID: 07e2d25c527bb44f03b7c329d893a1f2d6c5c40c
4254 commit 034828820c7e62652e7c48f9ee6b67fb7ba6fa26
4255 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4256 Date: Sun Jul 18 23:10:10 2021 +0000
4258 upstream: Add test for ssh-keygen printing of SSHFP records.
4260 OpenBSD-Regress-ID: fde9566b56eeb980e149bbe157a884838507c46b
4262 commit 52c3b6985ef1d5dadb4c4fe212f8b3a78ca96812
4263 Author: djm@openbsd.org <djm@openbsd.org>
4264 Date: Sat Jul 17 00:38:11 2021 +0000
4266 upstream: wrap some long lines
4268 OpenBSD-Commit-ID: 4f5186b1466656762dae37d3e569438d900c350d
4270 commit 43ec991a782791d0b3f42898cd789f99a07bfaa4
4271 Author: djm@openbsd.org <djm@openbsd.org>
4272 Date: Sat Jul 17 00:36:53 2021 +0000
4274 upstream: fix sftp on ControlPersist connections, broken by recent
4276 SessionType change; spotted by sthen@
4278 OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234
4280 commit 073f45c236550f158c9a94003e4611c07dea5279
4281 Author: djm@openbsd.org <djm@openbsd.org>
4282 Date: Fri Jul 16 09:00:23 2021 +0000
4284 upstream: Explicitly check for and start time-based rekeying in the
4286 client and server mainloops.
4288 Previously the rekey timeout could expire but rekeying would not start
4289 until a packet was sent or received. This could cause us to spin in
4290 select() on the rekey timeout if the connection was quiet.
4294 OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987
4296 commit ef7c4e52d5d840607f9ca3a302a4cbb81053eccf
4297 Author: jmc@openbsd.org <jmc@openbsd.org>
4298 Date: Wed Jul 14 06:46:38 2021 +0000
4300 upstream: reorder SessionType; ok djm
4302 OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c
4304 commit 8aa2f9aeb56506dca996d68ab90ab9c0bebd7ec3
4305 Author: Darren Tucker <dtucker@dtucker.net>
4306 Date: Wed Jul 14 11:26:50 2021 +1000
4308 Make whitespace consistent.
4310 commit 4f4297ee9b8a39f4dfd243a74c5f51f9e7a05723
4311 Author: Darren Tucker <dtucker@dtucker.net>
4312 Date: Wed Jul 14 11:26:12 2021 +1000
4314 Add ARM64 Linux self-hosted runner.
4316 commit eda8909d1b0a85b9c3804a04d03ec6738fd9dc7f
4317 Author: djm@openbsd.org <djm@openbsd.org>
4318 Date: Tue Jul 13 23:48:36 2021 +0000
4320 upstream: add a SessionType directive to ssh_config, allowing the
4322 configuration file to offer equivalent control to the -N (no session) and -s
4323 (subsystem) command-line flags.
4325 Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks;
4326 feedback and ok dtucker@
4328 OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12
4330 commit 7ae69f2628e338ba6e0eae7ee8a63bcf8fea7538
4331 Author: djm@openbsd.org <djm@openbsd.org>
4332 Date: Mon Jul 12 02:12:22 2021 +0000
4334 upstream: fix some broken tests; clean up output
4336 OpenBSD-Regress-ID: 1d5038edb511dc4ce1622344c1e724626a253566
4338 commit f5fc6a4c3404bbf65c21ca6361853b33d78aa87e
4339 Author: Darren Tucker <dtucker@dtucker.net>
4340 Date: Mon Jul 12 18:00:05 2021 +1000
4342 Add configure-time detection for SSH_TIME_T_MAX.
4344 Should fix printing cert times exceeding INT_MAX (bz#3329) on platforms
4345 were time_t is a long long. The limit used is for the signed type, so if
4346 some system has a 32bit unsigned time_t then the lower limit will still
4347 be imposed and we would need to add some way to detect this. Anyone using
4348 an unsigned 64bit can let us know when it starts being a problem.
4350 commit fd2d06ae4442820429d634c0a8bae11c8e40c174
4351 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4352 Date: Mon Jul 12 06:22:57 2021 +0000
4354 upstream: Make limit for time_t test unconditional in the
4356 format_absolute_time fix for bz#3329 that allows printing of timestamps past
4357 INT_MAX. This was incorrectly included with the previous commit. Based on
4358 discussion with djm@.
4360 OpenBSD-Commit-ID: 835936f6837c86504b07cabb596b613600cf0f6e
4362 commit 6c29b387cd64a57b0ec8ae7d2c8d02789d88fcc3
4363 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4364 Date: Mon Jul 12 06:08:57 2021 +0000
4366 upstream: Use existing format_absolute_time() function when
4368 printing cert validity instead of doing it inline. Part of bz#3329.
4370 OpenBSD-Commit-ID: a13d4e3c4f59644c23745eb02a09b2a4e717c00c
4372 commit 99981d5f8bfa383791afea03f6bce8454e96e323
4373 Author: djm@openbsd.org <djm@openbsd.org>
4374 Date: Fri Jul 9 09:55:56 2021 +0000
4376 upstream: silence redundant error message; reported by Fabian Stelzer
4378 OpenBSD-Commit-ID: 9349a703016579a60557dafd03af2fe1d44e6aa2
4380 commit e86097813419b49d5bff5c4b51d1c3a5d4d2d804
4381 Author: John Ericson <John.Ericson@Obsidian.Systems>
4382 Date: Sat Dec 26 11:40:49 2020 -0500
4384 Re-indent krb5 section after pkg-config addition.
4386 commit 32dd2daa56c294e40ff7efea482c9eac536d8cbb
4387 Author: John Ericson <John.Ericson@Obsidian.Systems>
4388 Date: Sat Dec 26 11:40:49 2020 -0500
4390 Support finding Kerberos via pkg-config
4392 This makes cross compilation easier.
4394 commit def7a72234d7e4f684d72d33a0f7229f9eee0aa4
4395 Author: Darren Tucker <dtucker@dtucker.net>
4396 Date: Fri Jul 9 14:34:06 2021 +1000
4398 Update comments about EGD to include prngd.
4400 commit b5d23150b4e3368f4983fd169d432c07afeee45a
4401 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4402 Date: Mon Jul 5 01:21:07 2021 +0000
4404 upstream: Fix a couple of whitespace things. Portable already has
4406 these so this removes two diffs between the two.
4408 OpenBSD-Commit-ID: 769f017ebafd8e741e337b3e9e89eb5ac73c9c56
4410 commit 8f57be9f279b8e905f9883066aa633c7e67b31cf
4411 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4412 Date: Mon Jul 5 01:16:46 2021 +0000
4414 upstream: Order includes as per style(9). Portable already has
4416 these so this removes a handful of diffs between the two.
4418 OpenBSD-Commit-ID: 8bd7452d809b199c19bfc49511a798f414eb4a77
4420 commit b75624f8733b3ed9e240f86cac5d4a39dae11848
4421 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4422 Date: Mon Jul 5 00:50:25 2021 +0000
4424 upstream: Remove comment referencing now-removed
4426 RhostsRSAAuthentication. ok djm@
4428 OpenBSD-Commit-ID: 3d864bfbd99a1d4429a58e301688f3be464827a9
4430 commit b67eb12f013c5441bb4f0893a97533582ad4eb13
4431 Author: djm@openbsd.org <djm@openbsd.org>
4432 Date: Mon Jul 5 00:25:42 2021 +0000
4434 upstream: allow spaces to appear in usernames for local to remote,
4436 and scp -3 remote to remote copies. with & ok dtucker bz#1164
4438 OpenBSD-Commit-ID: e9b550f3a85ffbb079b6720833da31317901d6dd
4440 commit 8c4ef0943e574f614fc7c6c7e427fd81ee64ab87
4441 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4442 Date: Fri Jul 2 07:20:44 2021 +0000
4444 upstream: Remove obsolete comments about SSHv1 auth methods. ok
4448 OpenBSD-Commit-ID: 6060f70966f362d8eb4bec3da2f6c4712fbfb98f
4450 commit 88908c9b61bcb99f16e8d398fc41e2b3b4be2003
4451 Author: Darren Tucker <dtucker@dtucker.net>
4452 Date: Sat Jul 3 23:00:19 2021 +1000
4454 Remove reference to ChallengeResponse.
4456 challenge_response_authentication was removed from the struct, keeping
4457 kbd_interactive_authentication.
4459 commit 321874416d610ad2158ce6112f094a4862c2e37f
4460 Author: Darren Tucker <dtucker@dtucker.net>
4461 Date: Sat Jul 3 20:38:09 2021 +1000
4463 Move signal.h up include order to match upstream.
4465 commit 4fa83e2d0e32c2dd758653e0359984bbf1334f32
4466 Author: Darren Tucker <dtucker@dtucker.net>
4467 Date: Sat Jul 3 20:36:06 2021 +1000
4469 Remove old OpenBSD version marker.
4471 Looks like an accidental leftover from a sync.
4473 commit 9d5e31f55d5f3899b72645bac41a932d298ad73b
4474 Author: Darren Tucker <dtucker@dtucker.net>
4475 Date: Sat Jul 3 20:34:19 2021 +1000
4477 Remove duplicate error on error path.
4479 There's an extra error() call on the listen error path, it looks like
4480 its removal was missed during an upstream sync.
4482 commit 888c459925c7478ce22ff206c9ac1fb812a40caf
4483 Author: Darren Tucker <dtucker@dtucker.net>
4484 Date: Sat Jul 3 20:32:46 2021 +1000
4486 Remove some whitespace not in upstream.
4488 Reduces diff vs OpenBSD by a small amount.
4490 commit 4d2d4d47a18d93f3e0a91a241a6fdb545bbf7dc2
4491 Author: Darren Tucker <dtucker@dtucker.net>
4492 Date: Sat Jul 3 19:27:43 2021 +1000
4494 Replace remaining references to ChallengeResponse.
4496 Portable had a few additional references to ChallengeResponse related to
4497 UsePAM, replaces these with equivalent keyboard-interactive ones.
4499 commit 53237ac789183946dac6dcb8838bc3b6b9b43be1
4500 Author: Darren Tucker <dtucker@dtucker.net>
4501 Date: Sat Jul 3 19:23:28 2021 +1000
4503 Sync remaining ChallengeResponse removal.
4505 These were omitted from commit 88868fd131.
4507 commit 2c9e4b319f7e98744b188b0f58859d431def343b
4508 Author: Darren Tucker <dtucker@dtucker.net>
4509 Date: Sat Jul 3 19:17:31 2021 +1000
4511 Disable rocky84 to figure out why agent test fails
4513 commit bfe19197a92b7916f64a121fbd3c179abf15e218
4514 Author: Darren Tucker <dtucker@dtucker.net>
4515 Date: Fri Jul 2 15:43:28 2021 +1000
4517 Remove now-unused SSHv1 enums.
4519 sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options
4520 and are no longer used.
4522 commit c73b02d92d72458a5312bd098f32ce88868fd131
4523 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4524 Date: Fri Jul 2 05:11:20 2021 +0000
4526 upstream: Remove references to ChallengeResponseAuthentication in
4528 favour of KbdInteractiveAuthentication. The former is what was in SSHv1, the
4529 latter is what is in SSHv2 (RFC4256) and they were treated as somewhat but
4530 not entirely equivalent. We retain the old name as deprecated alias so
4531 config files continue to work and a reference in the man page for people
4534 Prompted by bz#3303 which pointed out the discrepancy between the two
4535 when used with Match. Man page help & ok jmc@, with & ok djm@
4537 OpenBSD-Commit-ID: 2c1bff8e5c9852cfcdab1f3ea94dfef5a22f3b7e
4539 commit f841fc9c8c7568a3b5d84a4cc0cefacb7dbc16b9
4540 Author: Darren Tucker <dtucker@dtucker.net>
4541 Date: Fri Jul 2 15:20:32 2021 +1000
4543 Fix ifdefs around get_random_bytes_prngd.
4545 get_random_bytes_prngd() is used if either of PRNGD_PORT or PRNGD_SOCKET
4546 are defined, so adjust ifdef accordingly.
4548 commit 0767627cf66574484b9c0834500b42ea04fe528a
4549 Author: Damien Miller <djm@mindrot.org>
4550 Date: Fri Jul 2 14:30:23 2021 +1000
4552 wrap get_random_bytes_prngd() in ifdef
4554 avoid unused static function warning
4556 commit f93fdc4de158386efe1116bd44c5b3f4a7a82c25
4557 Author: Darren Tucker <dtucker@dtucker.net>
4558 Date: Mon Jun 28 13:06:37 2021 +1000
4560 Add rocky84 test target.
4562 commit d443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b
4563 Author: djm@openbsd.org <djm@openbsd.org>
4564 Date: Fri Jun 25 06:30:22 2021 +0000
4566 upstream: fix decoding of X.509 subject name; from Leif Thuresson
4568 via bz3327 ok markus@
4570 OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8
4572 commit 2a5704ec142202d387fda2d6872fd4715ab81347
4573 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4574 Date: Fri Jun 25 06:20:39 2021 +0000
4576 upstream: Use better language to refer to the user. From l1ving
4578 via github PR#250, ok jmc@
4580 OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf
4582 commit 4bdf7a04797a0ea1c431a9d54588417c29177d19
4583 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4584 Date: Fri Jun 25 03:38:17 2021 +0000
4586 upstream: Replace SIGCHLD/notify_pipe kludge with pselect.
4588 Previously sshd's SIGCHLD handler would wake up select() by writing a
4589 byte to notify_pipe. We can remove this by blocking SIGCHLD, checking
4590 for child terminations then passing the original signal mask through
4591 to pselect. This ensures that the pselect will immediately wake up if
4592 a child terminates between wait()ing on them and the pselect.
4594 In -portable, for platforms that do not have pselect the kludge is still
4595 there but is hidden behind a pselect interface.
4597 Based on other changes for bz#2158, ok djm@
4599 OpenBSD-Commit-ID: 202c85de0b3bdf1744fe53529a05404c5480d813
4601 commit c9f7bba2e6f70b7ac1f5ea190d890cb5162ce127
4602 Author: Darren Tucker <dtucker@dtucker.net>
4603 Date: Fri Jun 25 15:08:18 2021 +1000
4605 Move closefrom() to before first malloc.
4607 When built against tcmalloc, tcmalloc allocates a descriptor for its
4608 internal use, so calling closefrom() afterward causes the descriptor
4609 number to be reused resulting in a corrupted connection. Moving the
4610 closefrom a little earlier should resolve this. From kircherlike at
4611 outlook.com via bz#3321, ok djm@
4613 commit 7ebfe4e439853b88997c9cfc2ff703408a1cca92
4614 Author: Darren Tucker <dtucker@dtucker.net>
4615 Date: Fri Jun 18 20:41:45 2021 +1000
4617 Put second -lssh in link line for sftp-server.
4619 When building --without-openssl the recent port-prngd.c change adds
4620 a dependency on atomicio, but since nothing else in sftp-server uses
4621 it, the linker may not find it. Add a second -lssh similar to other
4624 commit e409d7966785cfd9f5970e66a820685c42169717
4625 Author: Darren Tucker <dtucker@dtucker.net>
4626 Date: Fri Jun 18 18:34:08 2021 +1000
4628 Try EGD/PRNGD if random device fails.
4630 When built --without-openssl, try EGD/PRGGD (if configured) as a last
4631 resort before failing.
4633 commit e43a898043faa3a965dbaa1193cc60e0b479033d
4634 Author: Darren Tucker <dtucker@dtucker.net>
4635 Date: Fri Jun 18 18:32:51 2021 +1000
4637 Split EGD/PRNGD interface into its own file.
4639 This will allow us to use it when building --without-openssl.
4641 commit acb2887a769a1b1912cfd7067f3ce04fad240260
4642 Author: Darren Tucker <dtucker@dtucker.net>
4643 Date: Thu Jun 17 21:03:19 2021 +1000
4645 Handle GIDs > 2^31 in getgrouplist.
4647 When compiled in 32bit mode, the getgrouplist implementation may fail
4648 for GIDs greater than LONG_MAX. Analysis and change from ralf.winkel
4651 commit 31fac20c941126281b527605b73bff30a8f02edd
4652 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4653 Date: Thu Jun 10 09:46:28 2021 +0000
4655 upstream: Use $SUDO when reading sshd's pidfile here too.
4657 OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409
4659 commit a3a58acffc8cc527f8fc6729486d34e4c3d27643
4660 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4661 Date: Thu Jun 10 09:43:51 2021 +0000
4663 upstream: Use $SUDO when reading sshd's pidfile in case it was
4665 created with a very restrictive umask. This resyncs with -portable.
4667 OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d
4669 commit 249ad4ae51cd3bc235e75a4846eccdf8b1416611
4670 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4671 Date: Thu Jun 10 09:37:59 2021 +0000
4673 upstream: Set umask when creating hostkeys to prevent excessive
4675 permissions warning.
4677 OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef
4679 commit 9d0892153c005cc65897e9372b01fa66fcbe2842
4680 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4681 Date: Thu Jun 10 03:45:31 2021 +0000
4683 upstream: Add regress test for SIGHUP restart
4685 while handling active and unauthenticated clients. Should catch anything
4686 similar to the pselect bug just fixed in sshd.c.
4688 OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73
4690 commit 73f6f191f44440ca3049b9d3c8e5401d10b55097
4691 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4692 Date: Thu Jun 10 03:14:14 2021 +0000
4694 upstream: Continue accept loop when pselect
4696 returns -1, eg if it was interrupted by a signal. This should prevent
4697 the hang discovered by sthen@ wherein sshd receives a SIGHUP while it has
4698 an unauthenticated child and goes on to a blocking read on a notify_pipe.
4699 feedback deraadt@, ok djm@
4701 OpenBSD-Commit-ID: 0243c1c5544fca0974dae92cd4079543a3fceaa0
4703 commit c785c0ae134a8e8b5c82b2193f64c632a98159e4
4704 Author: djm@openbsd.org <djm@openbsd.org>
4705 Date: Tue Jun 8 22:30:27 2021 +0000
4707 upstream: test that UserKnownHostsFile correctly accepts multiple
4709 arguments; would have caught readconf.c r1.356 regression
4711 OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a
4713 commit 1a6f6b08e62c78906a3032e8d9a83e721c84574e
4714 Author: djm@openbsd.org <djm@openbsd.org>
4715 Date: Tue Jun 8 22:06:12 2021 +0000
4717 upstream: fix regression in r1.356: for ssh_config options that
4719 accepted multiple string arguments, ssh was only recording the first.
4720 Reported by Lucas via bugs@
4722 OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d
4724 commit 78e30af3e2b2dd540a341cc827c6b98dd8b0a6de
4725 Author: djm@openbsd.org <djm@openbsd.org>
4726 Date: Tue Jun 8 07:40:12 2021 +0000
4728 upstream: test argv_split() optional termination on comments
4730 OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c
4732 commit a023138957ea2becf1c7f93fcc42b0aaac6f2b03
4733 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4734 Date: Tue Jun 8 07:05:27 2021 +0000
4736 upstream: Add testcases from bz#3319 for IPQoS and TunnelDevice
4738 being overridden on the command line.
4740 OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8
4742 commit 660cea10b2cdc11f13ba99c89b1bbb368a4d9ff2
4743 Author: djm@openbsd.org <djm@openbsd.org>
4744 Date: Tue Jun 8 06:52:43 2021 +0000
4746 upstream: sprinkle some "# comment" at end of configuration lines
4748 to test comment handling
4750 OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7
4752 commit acc9c32dcb6def6c7d3688bceb4c0e59bd26b411
4753 Author: djm@openbsd.org <djm@openbsd.org>
4754 Date: Tue Jun 8 06:51:47 2021 +0000
4756 upstream: more descriptive failure message
4758 OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509
4760 commit ce04dd4eae23d1c9cf7c424a702f48ee78573bc1
4761 Author: djm@openbsd.org <djm@openbsd.org>
4762 Date: Mon Jun 7 01:16:34 2021 +0000
4764 upstream: test AuthenticationMethods inside a Match block as well
4766 as in the main config section
4768 OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7
4770 commit 9018bd821fca17e26e92f7a7e51d9b24cd62f2db
4771 Author: djm@openbsd.org <djm@openbsd.org>
4772 Date: Mon Jun 7 00:00:50 2021 +0000
4774 upstream: prepare for stricter sshd_config parsing that will refuse
4776 a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent
4777 arguments. Such lines are permitted but are nonsensical noops ATM
4779 OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650
4781 commit a10f929d1ce80640129fc5b6bc1acd9bf689169e
4782 Author: djm@openbsd.org <djm@openbsd.org>
4783 Date: Tue Jun 8 07:09:42 2021 +0000
4785 upstream: switch sshd_config parsing to argv_split()
4787 similar to the previous commit, this switches sshd_config parsing to
4788 the newer tokeniser. Config parsing will be a little stricter wrt
4789 quote correctness and directives appearing without arguments.
4791 feedback and ok markus@
4793 tested in snaps for the last five or so days - thanks Theo and those who
4796 OpenBSD-Commit-ID: 9c4305631d20c2d194661504ce11e1f68b20d93e
4798 commit ea9e45c89a4822d74a9d97fef8480707d584da4d
4799 Author: djm@openbsd.org <djm@openbsd.org>
4800 Date: Tue Jun 8 07:07:15 2021 +0000
4802 upstream: Switch ssh_config parsing to use argv_split()
4804 This fixes a couple of problems with the previous tokeniser,
4807 1. strdelim() is permissive wrt accepting '=' characters. This is
4808 intended to allow it to tokenise "Option=value" but because it
4809 cannot keep state, it will incorrectly split "Opt=val=val2".
4810 2. strdelim() has rudimentry handling of quoted strings, but it
4811 is incomplete and inconsistent. E.g. it doesn't handle escaped
4812 quotes inside a quoted string.
4813 3. It has no support for stopping on a (unquoted) comment. Because
4814 of this readconf.c r1.343 added chopping of lines at '#', but
4815 this caused a regression because these characters may legitimately
4816 appear inside quoted strings.
4818 The new tokeniser is stricter is a number of cases, including #1 above
4819 but previously it was also possible for some directives to appear
4820 without arguments. AFAIK these were nonsensical in all cases, and the
4821 new tokeniser refuses to accept them.
4823 The new code handles quotes much better, permitting quoted space as
4824 well as escaped closing quotes. Finally, comment handling should be
4825 fixed - the tokeniser will terminate only on unquoted # characters.
4827 feedback & ok markus@
4829 tested in snaps for the last five or so days - thanks Theo and those who
4832 OpenBSD-Commit-ID: dc72fd12af9d5398f4d9e159d671f9269c5b14d5
4834 commit d786424986c04d1d375f231fda177c8408e05c3e
4835 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4836 Date: Tue Jun 8 07:02:46 2021 +0000
4838 upstream: Check if IPQoS or TunnelDevice are already set before
4840 overriding. Prevents values in config files from overriding values supplied
4841 on the command line. bz#3319, ok markus.
4843 OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74
4845 commit aae4b4d3585b9f944d7dbd3c9e5ba0006c55e457
4846 Author: djm@openbsd.org <djm@openbsd.org>
4847 Date: Tue Jun 8 06:54:40 2021 +0000
4849 upstream: Allow argv_split() to optionally terminate tokenisation
4851 when it encounters an unquoted comment.
4853 Add some additional utility function for working with argument
4854 vectors, since we'll be switching to using them to parse
4855 ssh/sshd_config shortly.
4857 ok markus@ as part of a larger diff; tested in snaps
4859 OpenBSD-Commit-ID: fd9c108cef2f713f24e3bc5848861d221bb3a1ac
4861 commit da9f9acaac5bab95dca642b48e0c8182b246ab69
4862 Author: Darren Tucker <dtucker@dtucker.net>
4863 Date: Mon Jun 7 19:19:23 2021 +1000
4865 Save logs on failure for upstream test
4867 commit 76883c60161e5f3808787085a27a8c37f8cc4e08
4868 Author: Darren Tucker <dtucker@dtucker.net>
4869 Date: Mon Jun 7 14:36:32 2021 +1000
4871 Add obsdsnap-i386 upstream test target.
4873 commit d45b9c63f947ec5ec314696e70281f6afddc0ac3
4874 Author: djm@openbsd.org <djm@openbsd.org>
4875 Date: Mon Jun 7 03:38:38 2021 +0000
4877 upstream: fix debug message when finding a private key to match a
4879 certificate being attempted for user authentication. Previously it would
4880 print the certificate's path, whereas it was supposed to be showing the
4881 private key's path. Patch from Alex Sherwin via GHPR247
4883 OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b
4885 commit 530739d42f6102668aecd699be0ce59815c1eceb
4886 Author: djm@openbsd.org <djm@openbsd.org>
4887 Date: Sun Jun 6 11:34:16 2021 +0000
4889 upstream: Match host certificates against host public keys, not private
4891 keys. Allows use of certificates with private keys held in a ssh-agent.
4892 Reported by Miles Zhou in bz3524; ok dtucker@
4894 OpenBSD-Commit-ID: 25f5bf70003126d19162862d9eb380bf34bac22a
4896 commit 4265215d7300901fd7097061c7517688ade82f8e
4897 Author: djm@openbsd.org <djm@openbsd.org>
4898 Date: Sun Jun 6 03:40:39 2021 +0000
4900 upstream: Client-side workaround for a bug in OpenSSH 7.4: this release
4902 allows RSA/SHA2 signatures for public key authentication but fails to
4903 advertise this correctly via SSH2_MSG_EXT_INFO. This causes clients of these
4904 server to incorrectly match PubkeyAcceptedAlgorithms and potentially refuse
4905 to offer valid keys.
4907 Reported by and based on patch from Gordon Messmer via bz3213, thanks
4908 also for additional analysis by Jakub Jelen. ok dtucker
4910 OpenBSD-Commit-ID: d6d0b7351d5d44c45f3daaa26efac65847a564f7
4912 commit bda270d7fb8522d43c21a79a4b02a052d7c64de8
4913 Author: djm@openbsd.org <djm@openbsd.org>
4914 Date: Sun Jun 6 03:17:02 2021 +0000
4916 upstream: degrade gracefully if a sftp-server offers the
4918 limits@openssh.com extension but fails when the client tries to invoke it.
4919 Reported by Hector Martin via bz3318
4921 OpenBSD-Commit-ID: bd9d1839c41811616ede4da467e25746fcd9b967
4923 commit d345d5811afdc2d6923019b653cdd93c4cc95f76
4924 Author: djm@openbsd.org <djm@openbsd.org>
4925 Date: Sun Jun 6 03:15:39 2021 +0000
4927 upstream: the limits@openssh.com extension was incorrectly marked
4929 as an operation that writes to the filesystem, which made it unavailable in
4930 sftp-server read-only mode. Spotted by Hector Martin via bz3318
4932 OpenBSD-Commit-ID: f054465230787e37516c4b57098fc7975e00f067
4934 commit 2b71010d9b43d7b8c9ec1bf010beb00d98fa765a
4935 Author: naddy@openbsd.org <naddy@openbsd.org>
4936 Date: Sat Jun 5 13:47:00 2021 +0000
4938 upstream: PROTOCOL.certkeys: update reference from IETF draft to
4942 Also fix some typos.
4945 OpenBSD-Commit-ID: 5e855b6c5a22b5b13f8ffa3897a868e40d349b44
4947 commit aa99b2d9a3e45b943196914e8d8bf086646fdb54
4948 Author: Darren Tucker <dtucker@dtucker.net>
4949 Date: Fri Jun 4 23:41:29 2021 +1000
4951 Clear notify_pipe from readset if present.
4953 Prevents leaking an implementation detail to the caller.
4955 commit 6de8dadf6b4d0627d35bca0667ca44b1d61c2c6b
4956 Author: Darren Tucker <dtucker@dtucker.net>
4957 Date: Fri Jun 4 23:24:25 2021 +1000
4961 commit c8677065070ee34c05c7582a9c2f58d8642e552d
4962 Author: Darren Tucker <dtucker@dtucker.net>
4963 Date: Fri Jun 4 18:39:48 2021 +1000
4965 Add pselect implementation for platforms without.
4967 This is basically the existing notify_pipe kludge from serverloop.c
4968 moved behind a pselect interface. It works by installing a signal
4969 handler that writes to a pipe that the select is watching, then calls
4970 the original handler.
4972 The select call in serverloop will become pselect soon, at which point the
4973 kludge will be removed from thereand will only exist in the compat layer.
4974 Original code by markus, help from djm.
4976 commit 7cd7f302d3a072748299f362f9e241d81fcecd26
4977 Author: Vincent Brillault <vincent.brillault@cern.ch>
4978 Date: Sun May 24 09:15:06 2020 +0200
4980 auth_log: dont log partial successes as failures
4982 By design, 'partial' logins are successful logins, so initially with
4983 authenticated set to 1, for which another authentication is required. As
4984 a result, authenticated is always reset to 0 when partial is set to 1.
4985 However, even if authenticated is 0, those are not failed login
4986 attempts, similarly to attempts with authctxt->postponed set to 1.
4988 commit e7606919180661edc7f698e6a1b4ef2cfb363ebf
4989 Author: djm@openbsd.org <djm@openbsd.org>
4990 Date: Fri Jun 4 06:19:07 2021 +0000
4992 upstream: The RB_GENERATE_STATIC(3) macro expands to a series of
4994 function definitions and not a statement, so there should be no semicolon
4995 following them. Patch from Michael Forney
4997 OpenBSD-Commit-ID: c975dd180580f0bdc0a4d5b7d41ab1f5e9b7bedd
4999 commit c298c4da574ab92df2f051561aeb3e106b0ec954
5000 Author: djm@openbsd.org <djm@openbsd.org>
5001 Date: Fri Jun 4 05:59:18 2021 +0000
5003 upstream: rework authorized_keys example section, removing irrelevant
5005 stuff, de-wrapping the example lines and better aligning the examples with
5006 common usage and FAQs; ok jmc
5008 OpenBSD-Commit-ID: d59f1c9281f828148e2a2e49eb9629266803b75c
5010 commit d9cb35bbec5f623589d7c58fc094817b33030f35
5011 Author: djm@openbsd.org <djm@openbsd.org>
5012 Date: Fri Jun 4 05:10:03 2021 +0000
5014 upstream: adjust SetEnv description to clarify $TERM handling
5016 OpenBSD-Commit-ID: 8b8cc0124856bc1094949d55615e5c44390bcb22
5018 commit 771f57a8626709f2ad207058efd68fbf30d31553
5019 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5020 Date: Fri Jun 4 05:09:08 2021 +0000
5022 upstream: Switch the listening select loop from select() to
5024 pselect() and mask signals while checking signal flags, umasking for pselect
5025 and restoring afterwards. Also restore signals before sighup_restart so they
5026 don't remain blocked after restart.
5028 This prevents a race where a SIGTERM or SIGHUP can arrive between
5029 checking the flag and calling select (eg if sshd is processing a
5030 new connection) resulting in sshd not shutting down until the next
5031 time it receives a new connection. bz#2158, with & ok djm@
5033 OpenBSD-Commit-ID: bf85bf880fd78e00d7478657644fcda97b9a936f
5035 commit f64f8c00d158acc1359b8a096835849b23aa2e86
5036 Author: djm@openbsd.org <djm@openbsd.org>
5037 Date: Fri Jun 4 05:02:40 2021 +0000
5039 upstream: allow ssh_config SetEnv to override $TERM, which is otherwise
5041 handled specially by the protocol. Useful in ~/.ssh/config to set TERM to
5042 something generic (e.g. "xterm" instead of "xterm-256color") for destinations
5043 that lack terminfo entries. feedback and ok dtucker@
5045 OpenBSD-Commit-ID: 38b1ef4d5bc159c7d9d589d05e3017433e2d5758
5047 commit 60107677dc0ce1e93c61f23c433ad54687fcd9f5
5048 Author: djm@openbsd.org <djm@openbsd.org>
5049 Date: Fri Jun 4 04:02:21 2021 +0000
5051 upstream: correct extension name "no-presence-required" =>
5055 document "verify-required" option
5057 OpenBSD-Commit-ID: 1879ff4062cf61d79b515e433aff0bf49a6c55c5
5059 commit ecc186e46e3e30f27539b4311366dfda502f0a08
5060 Author: Darren Tucker <dtucker@dtucker.net>
5061 Date: Wed Jun 2 13:54:11 2021 +1000
5063 Retire fbsd7 test target.
5065 It's the slowest of the selfhosted targets (since it's 32bit but has
5066 most of the crypto algos). We still have coverage for 32bit i386.
5068 commit 5de0867b822ec48b5eec9abde0f5f95d1d646546
5069 Author: Darren Tucker <dtucker@dtucker.net>
5070 Date: Wed Jun 2 11:21:40 2021 +1000
5072 Check for $OPENSSL in md5 fallback too.
5074 commit 1db69d1b6542f8419c04cee7fd523a4a11004be2
5075 Author: Darren Tucker <dtucker@dtucker.net>
5076 Date: Wed Jun 2 11:17:54 2021 +1000
5080 commit a3f2dd955f1c19cad387a139f0e719af346ca6ef
5081 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5082 Date: Wed Jun 2 00:17:45 2021 +0000
5084 upstream: Merge back shell portability changes
5086 bringing it back in sync with -portable.
5088 OpenBSD-Regress-ID: c07905ba931e66ad7d849b87b7d19648007175d1
5090 commit 9d482295c9f073e84d75af46b720a1c0f7ec2867
5091 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5092 Date: Tue Jun 1 23:56:20 2021 +0000
5094 upstream: Use a default value for $OPENSSL,
5096 allowing it to be overridden. Do the same in the PuTTY tests since it's
5097 needed there and not exported by test-exec.sh.
5099 OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16
5101 commit 07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1
5102 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5103 Date: Mon May 24 10:25:18 2021 +0000
5105 upstream: Find openssl binary via environment variable. This
5107 allows overriding if necessary (eg in -portable where we're testing against a
5108 specific version of OpenSSL).
5110 OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5
5112 commit 1a4d1da9188d7c88f646b61f0d6a3b34f47c5439
5113 Author: djm@openbsd.org <djm@openbsd.org>
5114 Date: Fri May 21 04:03:47 2021 +0000
5116 upstream: fix memleak in test
5118 OpenBSD-Regress-ID: 5e529d0982aa04666604936df43242e97a7a6f81
5120 commit 60455a5d98065a73ec9a1f303345856bbd49aecc
5121 Author: djm@openbsd.org <djm@openbsd.org>
5122 Date: Fri May 21 03:59:01 2021 +0000
5124 upstream: also check contents of remaining string
5126 OpenBSD-Regress-ID: d526fa07253f4eebbc7d6205a0ab3d491ec71a28
5128 commit 39f6cd207851d7b67ca46903bfce4a9f615b5b1c
5129 Author: djm@openbsd.org <djm@openbsd.org>
5130 Date: Fri May 21 03:48:07 2021 +0000
5132 upstream: unit test for misc.c:strdelim() that mostly servces to
5134 highlight its inconsistencies
5136 OpenBSD-Regress-ID: 8d2bf970fcc01ccc6e36a5065f89b9c7fa934195
5138 commit 7a3a1dd2c7d4461962acbcc0ebee9445ba892be0
5139 Author: Darren Tucker <dtucker@dtucker.net>
5140 Date: Thu May 27 21:23:15 2021 +1000
5142 Put minix3 config in the host-specific block.
5144 commit 59a194825f12fff8a7f75d91bf751ea17645711b
5145 Author: djm@openbsd.org <djm@openbsd.org>
5146 Date: Mon May 31 06:48:42 2021 +0000
5148 upstream: Hash challenge supplied by client during FIDO key enrollment
5150 prior to passing it to libfido2, which does expect a hash.
5152 There is no effect for users who are simply generating FIDO keys using
5153 ssh-keygen - by default we generate a random 256 bit challenge, but
5154 people building attestation workflows around our tools should now have
5155 a more consistent experience (esp. fewer failures when they fail to
5156 guess the magic 32-byte challenge length requirement).
5160 OpenBSD-Commit-ID: b8d5363a6a7ca3b23dc28f3ca69470472959f2b5
5162 commit eb68e669bc8ab968d4cca5bf1357baca7136a826
5163 Author: Darren Tucker <dtucker@dtucker.net>
5164 Date: Thu May 27 21:14:15 2021 +1000
5166 Include login_cap.h for login_getpwclass override.
5168 On minix3, login_getpwclass is __RENAME'ed to __login_getpwclass50 so
5169 without this the include overriding login_getpwclass causes a compile
5172 commit 2063af71422501b65c7a92a5e14c0e6a3799ed89
5173 Author: Darren Tucker <dtucker@dtucker.net>
5174 Date: Thu May 27 21:13:38 2021 +1000
5176 Add minix3 test target.
5178 commit 2e1efcfd9f94352ca5f4b6958af8a454f8cf48cd
5179 Author: djm@openbsd.org <djm@openbsd.org>
5180 Date: Wed May 26 01:47:24 2021 +0000
5182 upstream: fix SEGV in UpdateHostkeys debug() message, triggered
5184 when the update removed more host keys than remain present. Fix tested by
5185 reporter James Cook, via bugs@
5187 OpenBSD-Commit-ID: 44f641f6ee02bb957f0c1d150495b60cf7b869d3
5189 commit 9acd76e6e4d2b519773e7119c33cf77f09534909
5190 Author: naddy@openbsd.org <naddy@openbsd.org>
5191 Date: Sun May 23 18:22:57 2021 +0000
5193 upstream: ssh: The client configuration keyword is
5195 "hostbasedacceptedalgorithms"
5197 This fixes a mistake that slipped in when "HostbasedKeyTypes" was
5198 renamed to "HostbasedAcceptedAlgorithms".
5200 Bug report by zack@philomathiclife.com
5202 OpenBSD-Commit-ID: d745a7e8e50b2589fc56877f322ea204bc784f38
5204 commit 078a0e60c92700da4c536c93c007257828ccd05b
5205 Author: Darren Tucker <dtucker@dtucker.net>
5206 Date: Tue May 25 11:40:47 2021 +1000
5208 Rename README.md to ci-status.md.
5210 The original intent was to provide a status page for the CIs configured
5211 in that directory, but it had the side effect of replacing the top-level
5214 commit 7be4ac813662f68e89f23c50de058a49aa32f7e4
5215 Author: djm@openbsd.org <djm@openbsd.org>
5216 Date: Wed May 19 01:24:05 2021 +0000
5218 upstream: restore blocking status on stdio fds before close
5220 ssh(1) needs to set file descriptors to non-blocking mode to operate
5221 but it was not restoring the original state on exit. This could cause
5222 problems with fds shared with other programs via the shell, e.g.
5224 > $ cat > test.sh << _EOF
5227 > ssh -Fnone -oLogLevel=verbose ::1 hostname
5228 > cat /usr/share/dict/words
5232 > Authenticated to ::1 ([::1]:22).
5233 > Transferred: sent 2352, received 2928 bytes, in 0.1 seconds
5234 > Bytes per second: sent 44338.9, received 55197.4
5235 > cat: stdout: Resource temporarily unavailable
5237 This restores the blocking status for fds 0,1,2 (stdio) before ssh(1)
5238 abandons/closes them.
5240 This was reported as bz3280 and GHPR246; ok dtucker@
5242 OpenBSD-Commit-ID: 8cc67346f05aa85a598bddf2383fcfcc3aae61ce
5244 commit c4902e1a653c67fea850ec99c7537f358904c0af
5245 Author: djm@openbsd.org <djm@openbsd.org>
5246 Date: Mon May 17 11:43:16 2021 +0000
5248 upstream: fix breakage of -W forwaring introduced in 1.554; reported by
5250 naddy@ and sthen@, ok sthen@
5252 OpenBSD-Commit-ID: f72558e643a26dc4150cff6e5097b5502f6c85fd
5254 commit afea01381ad1fcea1543b133040f75f7542257e6
5255 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5256 Date: Mon May 17 07:22:45 2021 +0000
5258 upstream: Regenerate moduli.
5260 OpenBSD-Commit-ID: 83c93a2a07c584c347ac6114d6329b18ce515557
5262 commit be2866d6207b090615ff083c9ef212b603816a56
5263 Author: Damien Miller <djm@mindrot.org>
5264 Date: Mon May 17 09:40:23 2021 +1000
5266 Handle Android libc returning NULL pw->pw_passwd
5268 Reported by Luke Dashjr
5270 commit 5953c143008259d87342fb5155bd0b8835ba88e5
5271 Author: djm@openbsd.org <djm@openbsd.org>
5272 Date: Fri May 14 05:20:32 2021 +0000
5274 upstream: fix previous: test saved no_shell_flag, not the one that just
5278 OpenBSD-Commit-ID: b8deace085d9d941b2d02f810243b9c302e5355d
5280 commit 1e9fa55f4dc4b334651d569d3448aaa3841f736f
5281 Author: djm@openbsd.org <djm@openbsd.org>
5282 Date: Fri May 14 03:09:48 2021 +0000
5284 upstream: Fix ssh started with ControlPersist incorrectly executing a
5286 shell when the -N (no shell) option was specified. bz3290 reported by Richard
5287 Schwab; patch from markus@ ok me
5289 OpenBSD-Commit-ID: ea1ea4af16a95687302f7690bdbe36a6aabf87e1
5291 commit d1320c492f655d8f5baef8c93899d79dded217a5
5292 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5293 Date: Wed May 12 11:34:30 2021 +0000
5295 upstream: Clarify language about moduli. While both ends of the
5297 connection do need to use the same parameters (ie groups), the DH-GEX
5298 protocol takes care of that and both ends do not need the same contents in
5299 the moduli file, which is what the previous text suggested. ok djm@ jmc@
5301 OpenBSD-Commit-ID: f0c18cc8e79c2fbf537a432a9070ed94e96a622a
5303 commit d3cc4d650ce3e59f3e370b101778b0e8f1c02c4d
5304 Author: djm@openbsd.org <djm@openbsd.org>
5305 Date: Fri May 7 04:11:51 2021 +0000
5307 upstream: include pid in LogVerbose spam
5309 OpenBSD-Commit-ID: aacb86f96ee90c7cb84ec27452374285f89a7f00
5311 commit e3c032333be5fdbbaf2751f6f478e044922b4ec4
5312 Author: djm@openbsd.org <djm@openbsd.org>
5313 Date: Fri May 7 03:09:38 2021 +0000
5315 upstream: don't sigdie() in signal handler in privsep child process;
5317 this can end up causing sandbox violations per bz3286; ok dtucker@
5319 OpenBSD-Commit-ID: a7f40b2141dca4287920da68ede812bff7ccfdda
5321 commit a4039724a3f2abac810735fc95cf9114a3856049
5322 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5323 Date: Fri May 7 09:23:40 2021 +0000
5325 upstream: Increase ConnectionAttempts from 4 to 10 as the tests
5327 occasionally time out on heavily loaded hosts.
5329 OpenBSD-Regress-ID: 29a8cdef354fc9da471a301f7f65184770434f3a
5331 commit c0d7e36e979fa3cdb60f5dcb6ac9ad3fd018543b
5332 Author: djm@openbsd.org <djm@openbsd.org>
5333 Date: Fri May 7 02:26:55 2021 +0000
5335 upstream: dump out a usable private key string too; inspired by Tyson
5339 OpenBSD-Regress-ID: 65572d5333801cb2f650ebc778cbdc955e372058
5341 commit 24fee8973abdf1c521cd2c0047d89e86d9c3fc38
5342 Author: djm@openbsd.org <djm@openbsd.org>
5343 Date: Fri May 7 02:29:40 2021 +0000
5345 upstream: correct mistake in spec - the private key blobs are encoded
5347 verbatim and not as strings (i.e. no 4-byte length header)
5349 OpenBSD-Commit-ID: 3606b5d443d72118c5b76c4af6dd87a5d5a4f837
5351 commit f43859159cc62396ad5d080f0b1f2635a67dac02
5352 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5353 Date: Tue May 4 22:53:52 2021 +0000
5355 upstream: Don't pass NULL as a string in debugging as it does not work
5357 on some platforms in -portable. ok djm@
5359 OpenBSD-Commit-ID: 937c892c99aa3c9c272a8ed78fa7c2aba3a44fc9
5361 commit ac31aa3c6341905935e75f0539cf4a61bbe99779
5362 Author: djm@openbsd.org <djm@openbsd.org>
5363 Date: Mon May 3 00:16:45 2021 +0000
5365 upstream: more debugging for UpdateHostKeys signature failures
5367 OpenBSD-Commit-ID: 1ee95f03875e1725df15d5e4bea3e73493d57d36
5369 commit 8e32e97e788e0676ce83018a742203614df6a2b3
5370 Author: Darren Tucker <dtucker@dtucker.net>
5371 Date: Sat May 1 20:07:47 2021 +1000
5373 Add obsd69 test target.
5375 commit f06893063597c5bb9d9e93f851c4070e77d2fba9
5376 Author: djm@openbsd.org <djm@openbsd.org>
5377 Date: Fri Apr 30 04:29:53 2021 +0000
5379 upstream: a little debugging in the main mux process for status
5381 confirmation failures in multiplexed sessions
5383 OpenBSD-Commit-ID: 6e27b87c95176107597035424e1439c3232bcb49
5385 commit e65cf00da6bc31e5f54603b7feb7252dc018c033
5386 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5387 Date: Fri Apr 30 04:02:52 2021 +0000
5389 upstream: Remove now-unused skey function prototypes leftover from
5393 OpenBSD-Commit-ID: 2fc36d519fd37c6f10ce74854c628561555a94c3
5395 commit ae5f9b0d5c8126214244ee6b35aae29c21028133
5396 Author: Darren Tucker <dtucker@dtucker.net>
5397 Date: Thu Apr 29 13:01:50 2021 +1000
5399 Wrap sntrup761x25519 inside ifdef.
5401 From balu.gajjala at gmail.com via bz#3306.
5403 commit 70a8dc138a6480f85065cdb239915ad4b7f928cf
5404 Author: Darren Tucker <dtucker@dtucker.net>
5405 Date: Wed Apr 28 14:44:07 2021 +1000
5407 Add status badges for Actions-based tests.
5409 commit 40b59024cc3365815381474cdf4fe423102e391b
5410 Author: Darren Tucker <dtucker@dtucker.net>
5411 Date: Wed Apr 28 12:22:11 2021 +1000
5413 Add obsdsnap (OpenBSD snapshot) test target.
5415 commit e627067ec8ef9ae8e7a638f4dbac91d52dee3e6d
5416 Author: Darren Tucker <dtucker@dtucker.net>
5417 Date: Wed Apr 28 11:35:28 2021 +1000
5419 Add test building upstream OpenBSD source.
5421 commit 1b8108ebd12fc4ed0fb39ef94c5ba122558ac373
5422 Author: Darren Tucker <dtucker@dtucker.net>
5423 Date: Tue Apr 27 14:22:20 2021 +1000
5425 Test against OpenSSL 1.1.0h instead of 1.1.0g.
5427 1.1.0g requires a perl glob module that's not installed by default.
5429 commit 9bc20efd39ce8525be33df3ee009f5a4564224f1
5430 Author: Darren Tucker <dtucker@dtucker.net>
5431 Date: Tue Apr 27 12:37:59 2021 +1000
5433 Use the default VM type for libcrypto ver tests.
5435 commit 9f79e80dc40965c2e73164531250b83b176c1eea
5436 Author: Darren Tucker <dtucker@dtucker.net>
5437 Date: Tue Apr 27 12:24:10 2021 +1000
5439 Always build OpenSSL shared.
5441 This is the default for current versions but we need it to test against
5444 commit b3cc9fbdff2782eca79e33e02ac22450dc63bce9
5445 Author: Darren Tucker <dtucker@dtucker.net>
5446 Date: Tue Apr 27 09:18:02 2021 +1000
5448 Fix custom OpenSSL tests.
5450 Check out specified OpenSSL version. Install custom libcrypto where
5451 configure expects to find it. Remove unneeded OpenSSL config time
5452 options. Older OpenSSL versions were not make -j safe so remove it.
5454 commit 77532609874a99a19e3e2eb2d1b7fa93aef963bb
5455 Author: Darren Tucker <dtucker@dtucker.net>
5456 Date: Mon Apr 26 17:18:25 2021 +1000
5458 Export CC and CFLAGS for c89 test.
5460 commit 33f62dfbe865f4de77980ab88774bf1eb5e4e040
5461 Author: Darren Tucker <dtucker@dtucker.net>
5462 Date: Mon Apr 26 17:13:44 2021 +1000
5466 commit da9d59f526fce58e11cba49cd8eb011dc0bf5677
5467 Author: Darren Tucker <dtucker@dtucker.net>
5468 Date: Mon Apr 26 15:34:23 2021 +1000
5470 Add test against OpenSSL w/out ECC.
5472 commit 29e194a752359ebf85bf7fce100f23a0477fc4de
5473 Author: Darren Tucker <dtucker@dtucker.net>
5474 Date: Mon Apr 26 14:49:59 2021 +1000
5476 Ensure we can still build with C89.
5478 commit a38016d369d21df5d35f761f2b67e175e132ba22
5479 Author: Darren Tucker <dtucker@dtucker.net>
5480 Date: Mon Apr 26 14:29:03 2021 +1000
5482 Interop test agains PuTTY.
5484 commit 095b0307a77be8803768857cc6c0963fa52ed85b
5485 Author: Darren Tucker <dtucker@dtucker.net>
5486 Date: Mon Apr 26 14:02:03 2021 +1000
5488 Support testing against arbitary libcrytpo vers.
5490 Add tests against various LibreSSL and OpenSSL versions.
5492 commit b16082aa110fa7128ece2a9037ff420c4a285317
5493 Author: Darren Tucker <dtucker@dtucker.net>
5494 Date: Mon Apr 26 13:35:44 2021 +1000
5496 Add fbsd10 test target.
5498 commit 2c805f16b24ea37cc051c6018fcb05defab6e57a
5499 Author: Darren Tucker <dtucker@dtucker.net>
5500 Date: Sun Apr 25 14:15:02 2021 +1000
5502 Disable compiler hardening on nbsd4.
5504 The system compiler supports -fstack-protector-all, but using it will
5505 result in an internal compiler error on some files.
5507 commit 6a5d39305649da5dff1934ee54292ee0cebd579d
5508 Author: Darren Tucker <dtucker@dtucker.net>
5509 Date: Sun Apr 25 13:01:34 2021 +1000
5511 Add nbsd3, nbsd4 and nbsd9 test targets.
5513 commit d1aed05bd2e4ae70f359a394dc60a2d96b88f78c
5514 Author: Darren Tucker <dtucker@dtucker.net>
5515 Date: Sat Apr 24 22:03:46 2021 +1000
5517 Comment out nbsd2 test target for now.
5519 commit a6b4ec94e5bd5a8a18cd2c9942d829d2e5698837
5520 Author: Darren Tucker <dtucker@dtucker.net>
5521 Date: Sat Apr 24 17:52:24 2021 +1000
5523 Add OPENBSD ORIGINAL marker.
5525 commit 3737c9f66ee590255546c4b637b6d2be669a11eb
5526 Author: Darren Tucker <dtucker@dtucker.net>
5527 Date: Fri Apr 23 19:49:46 2021 +1000
5529 Replace "==" (a bashism) with "=".
5531 commit a116b6f5be17a1dd345b7d54bf8aa3779a28a0df
5532 Author: Darren Tucker <dtucker@dtucker.net>
5533 Date: Fri Apr 23 16:34:48 2021 +1000
5535 Add nbsd2 test target.
5537 commit 196bf2a9bb771f45d9b0429cee7d325962233c44
5538 Author: Darren Tucker <dtucker@dtucker.net>
5539 Date: Fri Apr 23 14:54:10 2021 +1000
5541 Add obsd68 test target.
5543 commit e3ba6574ed69e8b7af725cf5e8a9edaac04ff077
5544 Author: Darren Tucker <dtucker@dtucker.net>
5545 Date: Fri Apr 23 14:53:32 2021 +1000
5547 Remove dependency on bash.
5549 commit db1f9ab8feb838aee9f5b99c6fd3f211355dfdcf
5550 Author: Darren Tucker <dtucker@dtucker.net>
5551 Date: Fri Apr 23 14:41:13 2021 +1000
5553 Add obsd67 test target.
5555 commit c039a6bf79192fe1daa9ddcc7c87dd98e258ae7c
5556 Author: Darren Tucker <dtucker@dtucker.net>
5557 Date: Fri Apr 23 11:08:23 2021 +1000
5559 Re-add macos-11.0 test target.
5561 commit a6db3a47b56adb76870d59225ffb90a65bc4daf2
5562 Author: Darren Tucker <dtucker@dtucker.net>
5563 Date: Fri Apr 23 10:28:28 2021 +1000
5565 Add openindiana test target.
5567 commit 3fe7e73b025c07eda46d78049f1da8ed7dfc0c69
5568 Author: Darren Tucker <dtucker@dtucker.net>
5569 Date: Fri Apr 23 10:26:35 2021 +1000
5571 Test krb5 on Solaris 11 too.
5573 commit f57fbfe5eb02df1a91f1a237c4d27165afd87c13
5574 Author: Darren Tucker <dtucker@dtucker.net>
5575 Date: Thu Apr 22 22:27:26 2021 +1000
5577 Don't always set SUDO.
5579 Rely on sourcing configs to set as appropriate.
5581 commit e428f29402fb6ac140b52f8f12e06ece7bb104a0
5582 Author: Darren Tucker <dtucker@dtucker.net>
5583 Date: Thu Apr 22 22:26:08 2021 +1000
5585 Remove now-unused 2nd arg to configs.
5587 commit cb4ff640d79b3c736879582139778f016bbb2cd7
5588 Author: Darren Tucker <dtucker@dtucker.net>
5589 Date: Wed Apr 21 01:08:04 2021 +1000
5591 Add win10 test target.
5593 commit 4457837238072836b2fa3107d603aac809624983
5594 Author: Darren Tucker <dtucker@dtucker.net>
5595 Date: Tue Apr 20 23:31:29 2021 +1000
5597 Add nbsd8 test target.
5599 commit bd4fba22e14da2fa196009010aabec5a8ba9dd42
5600 Author: Darren Tucker <dtucker@dtucker.net>
5601 Date: Sat Apr 17 09:55:47 2021 +1000
5605 commit 9403d0e805c77a5741ea8c3281bbe92558c2f125
5606 Author: Darren Tucker <dtucker@dtucker.net>
5607 Date: Fri Apr 16 18:14:25 2021 +1000
5611 commit e86968280e358e62649d268d41f698d64d0dc9fa
5612 Author: Damien Miller <djm@mindrot.org>
5613 Date: Fri Apr 16 13:55:25 2021 +1000
5617 commit 2fb25ca11e8b281363a2a2a4dec4c497a1475d9a
5618 Author: Damien Miller <djm@mindrot.org>
5619 Date: Fri Apr 16 13:53:02 2021 +1000
5621 crank version in README and RPM spec files
5623 commit b2b60ebab0cb77b5bc02d364d72e13db882f33ae
5624 Author: djm@openbsd.org <djm@openbsd.org>
5625 Date: Fri Apr 16 03:42:00 2021 +0000
5627 upstream: openssh-8.6
5629 OpenBSD-Commit-ID: b5f3e133c846127ec114812248bc17eff07c3e19
5631 commit faf2b86a46c9281d237bcdec18c99e94a4eb820a
5632 Author: markus@openbsd.org <markus@openbsd.org>
5633 Date: Thu Apr 15 16:24:31 2021 +0000
5635 upstream: do not pass file/func to monitor; noted by Ilja van Sprundel;
5639 OpenBSD-Commit-ID: 85ae5c063845c410283cbdce685515dcd19479fa
5641 commit 2dc328023f60212cd29504fc05d849133ae47355
5642 Author: Damien Miller <djm@mindrot.org>
5643 Date: Wed Apr 14 11:42:55 2021 +1000
5645 sshd don't exit on transient read errors
5647 openssh-8.5 introduced a regression that would cause sshd to exit
5648 because of transient read errors on the network socket (e.g. EINTR,
5649 EAGAIN). Reported by balu.gajjala AT gmail.com via bz3297
5651 commit d5d6b7d76d171a2e6861609dcd92e714ee62ad88
5652 Author: Damien Miller <djm@mindrot.org>
5653 Date: Sat Apr 10 18:45:00 2021 +1000
5655 perform report_failed_grab() inline
5657 commit ea996ce2d023aa3c6d31125e2c3ebda1cb42db8c
5658 Author: Damien Miller <djm@mindrot.org>
5659 Date: Sat Apr 10 18:22:57 2021 +1000
5661 dedicated gnome-ssk-askpass3 source
5663 Compatibility with Wayland requires that we use the gdk_seat_grab()
5664 API for grabbing mouse/keyboard, however these API don't exist in
5667 This branches gnome-ssk-askpass2.c => gnome-ssk-askpass3.c and
5668 makes the changes to use the gdk_seat_grab() instead of grabbing
5669 mouse/focus separately via GDK.
5671 In the future, we can also use the branched file to avoid some
5672 API that has been soft-deprecated in GTK+3, e.g. gtk_widget_modify_fg
5674 commit bfa5405da05d906ffd58216eb77c4375b62d64c2
5675 Author: Darren Tucker <dtucker@dtucker.net>
5676 Date: Thu Apr 8 15:18:15 2021 +1000
5678 Ensure valgrind-out exists.
5680 Normally the regress tests would create it, but running the unit tests
5681 on their own would fail because the directory did not exist.
5683 commit 1f189181f3ea09a9b08aa866f78843fec800874f
5684 Author: Darren Tucker <dtucker@dtucker.net>
5685 Date: Thu Apr 8 15:17:19 2021 +1000
5687 Pass OBJ to unit test make invocation.
5689 At least the Valgrind unit tests uses $OBJ.
5691 commit f42b550c281d28bd19e9dd6ce65069164f3482b0
5692 Author: Darren Tucker <dtucker@dtucker.net>
5693 Date: Thu Apr 8 14:20:12 2021 +1000
5695 Add pattern for valgrind-unit.
5697 commit 19e534462710e98737478fd9c44768b50c27c4c6
5698 Author: Darren Tucker <dtucker@dtucker.net>
5699 Date: Thu Apr 8 13:31:08 2021 +1000
5701 Run unit tests under valgrind.
5703 Run a separate build for the unit tests under Valgrind. They take long
5704 enough that running in parallel with the other Valgrind tests helps.
5706 commit 80032102d05e866dc2a48a5caf760cf42c2e090e
5707 Author: Darren Tucker <dtucker@dtucker.net>
5708 Date: Thu Apr 8 13:25:57 2021 +1000
5710 ifdef out MIN and MAX.
5712 In -portable, defines.h ensures that these are defined, so redefining
5713 potentially causes a warning. We don't just delete it to make any
5714 future code syncs a little but easier. bz#3293.
5716 commit d1bd184046bc310c405f45da3614a1dc5b3e521a
5717 Author: Darren Tucker <dtucker@dtucker.net>
5718 Date: Wed Apr 7 10:23:51 2021 +1000
5720 Remove only use of warn().
5722 The warn() function is only used in one place in portable and does not
5723 exist upstream. Upgrade the only instance it's used to fail()
5724 (the privsep/sandbox+proxyconnect, from back when that was new) and
5725 remove the now-unused function.
5727 commit fea8f4b1aa85026ad5aee5ad8e1599a8d5141fe0
5728 Author: Darren Tucker <dtucker@dtucker.net>
5729 Date: Wed Apr 7 10:18:32 2021 +1000
5731 Move make_tmpdir() into portable-specific area.
5733 Reduces diff vs OpenBSD and makes it more likely diffs will apply
5736 commit 13e5fa2acffd26e754c6ee1d070d0afd035d4cb7
5737 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5738 Date: Tue Apr 6 23:57:56 2021 +0000
5740 upstream: Add TEST_SSH_ELAPSED_TIMES environment variable to print the
5742 elapsed time in seconds of each test. This depends on "date +%s" which is
5743 not specified by POSIX but is commonly implemented.
5745 OpenBSD-Regress-ID: ec3c8c19ff49b2192116a0a646ee7c9b944e8a9c
5747 commit ef4f46ab4387bb863b471bad124d46e8d911a79a
5748 Author: Darren Tucker <dtucker@dtucker.net>
5749 Date: Wed Apr 7 09:59:15 2021 +1000
5751 Move the TEST_SSH_PORT section down a bit.
5753 This groups the portable-specific changes together and makes it a
5754 little more likely that patches will apply cleanly.
5756 commit 3674e33fa70dfa1fe69b345bf576113af7b7be11
5757 Author: Darren Tucker <dtucker@dtucker.net>
5758 Date: Wed Apr 7 10:05:10 2021 +1000
5760 Further split Valgrind tests.
5762 Even split in two, the Valgrind tests take by far the longest to run,
5763 so split them four ways to further increase parallelism.
5765 commit 961af266b861e30fce1e26170ee0dbb5bf591f29
5766 Author: djm@openbsd.org <djm@openbsd.org>
5767 Date: Tue Apr 6 23:24:30 2021 +0000
5769 upstream: include "ssherr.h" not <ssherr.h>; from Balu Gajjala via
5773 OpenBSD-Commit-ID: e9535cd9966eb2e69e73d1ede1f44905c30310bd
5775 commit e7d0a285dbdd65d8df16123ad90f15e91862f959
5776 Author: Damien Miller <djm@mindrot.org>
5777 Date: Wed Apr 7 08:50:38 2021 +1000
5779 wrap struct rlimit in HAVE_GETRLIMIT too
5781 commit f283a6c2e0a9bd9369e18462acd00be56fbe5b0d
5782 Author: Damien Miller <djm@mindrot.org>
5783 Date: Wed Apr 7 08:20:35 2021 +1000
5785 wrap getrlimit call in HAVE_GETRLIMIT; bz3291
5787 commit 679bdc4a5c9244f427a7aee9c14b0a0ed086da1f
5788 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5789 Date: Tue Apr 6 09:07:33 2021 +0000
5791 upstream: Don't check return value of unsetenv(). It's part of the
5793 environment setup and not part of the actual test, and some platforms
5794 -portable runs on declare it as returning void, which prevents the test from
5797 OpenBSD-Regress-ID: 24f08543ee3cdebc404f2951f3e388cc82b844a1
5799 commit 320af2f3de6333aa123f1b088eca146a245e968a
5800 Author: jmc@openbsd.org <jmc@openbsd.org>
5801 Date: Sun Apr 4 11:36:56 2021 +0000
5803 upstream: remove stray inserts; from matthias schmidt
5805 OpenBSD-Commit-ID: 2c36ebdc54e14bbf1daad70c6a05479a073d5c63
5807 commit 801f710953b24dd2f21939171c622eac77c7484d
5808 Author: jmc@openbsd.org <jmc@openbsd.org>
5809 Date: Sun Apr 4 06:11:24 2021 +0000
5811 upstream: missing comma; from kawashima james
5813 OpenBSD-Commit-ID: 31cec6bf26c6db4ffefc8a070715ebef274e68ea
5815 commit b3ca08cb174266884d44ec710a84cd64c12414ea
5816 Author: Darren Tucker <dtucker@dtucker.net>
5817 Date: Mon Apr 5 23:46:42 2021 +1000
5819 Install libcbor with libfido2.
5821 commit f3ca8af87a4c32ada660da12ae95cf03d190c083
5822 Author: Damien Miller <djm@mindrot.org>
5823 Date: Sat Apr 3 18:21:08 2021 +1100
5825 enable authopt and misc unit tests
5827 Neither were wired into the build, both required some build
5828 adaptations for -portable
5830 commit dc1b45841fb97e3d7f655ddbcfef3839735cae5f
5831 Author: djm@openbsd.org <djm@openbsd.org>
5832 Date: Sat Apr 3 06:58:30 2021 +0000
5834 upstream: typos in comments; GHPR#180 from Vill
5836 =?UTF-8?q?e=20Skytt=C3=A4?=
5838 Content-Type: text/plain; charset=UTF-8
5839 Content-Transfer-Encoding: 8bit
5841 OpenBSD-Commit-ID: 93c732381ae0e2b680c79e67c40c1814b7ceed2c
5843 commit 53ea05e09b04fd7b6dea66b42b34d65fe61b9636
5844 Author: djm@openbsd.org <djm@openbsd.org>
5845 Date: Sat Apr 3 06:55:52 2021 +0000
5847 upstream: sync CASignatureAlgorithms lists with reality. GHPR#174 from
5851 OpenBSD-Commit-ID: f05e4ca54d7e67b90fe58fe1bdb1d2a37e0e2696
5853 commit 57ed647ee07bb883a2f2264231bcd1df6a5b9392
5854 Author: Damien Miller <djm@mindrot.org>
5855 Date: Sat Apr 3 17:47:37 2021 +1100
5857 polish whitespace for portable files
5859 commit 31d8d231eb9377df474746a822d380c5d68d7ad6
5860 Author: djm@openbsd.org <djm@openbsd.org>
5861 Date: Sat Apr 3 06:18:40 2021 +0000
5863 upstream: highly polished whitespace, mostly fixing spaces-for-tab
5865 and bad indentation on continuation lines. Prompted by GHPR#185
5867 OpenBSD-Commit-ID: e5c81f0cbdcc6144df1ce468ec1bac366d8ad6e9
5869 commit 34afde5c73b5570d6f8cce9b49993b23b77bfb86
5870 Author: djm@openbsd.org <djm@openbsd.org>
5871 Date: Sat Apr 3 05:54:14 2021 +0000
5873 upstream: whitespace (tab after space)
5875 OpenBSD-Commit-ID: 0e2b3f7674e985d3f7c27ff5028e690ba1c2efd4
5877 commit 7cd262c1c5a08cc7f4f30e3cab108ef089d0a57b
5878 Author: Darren Tucker <dtucker@dtucker.net>
5879 Date: Sat Apr 3 16:59:10 2021 +1100
5881 Save config.h and config.log on failure too.
5883 commit 460aee9298f365357e9fd26851c22e0dca51fd6a
5884 Author: djm@openbsd.org <djm@openbsd.org>
5885 Date: Sat Apr 3 05:46:41 2021 +0000
5887 upstream: fix incorrect plural; from Ville Skyt
5889 =?UTF-8?q?t=C3=A4=20via=20GHPR#181?=
5891 Content-Type: text/plain; charset=UTF-8
5892 Content-Transfer-Encoding: 8bit
5894 OpenBSD-Commit-ID: 92f31754c6296d8f403d7c293e09dc27292d22c9
5896 commit 082804c14e548cada75c81003a3c68ee098138ee
5897 Author: djm@openbsd.org <djm@openbsd.org>
5898 Date: Sat Apr 3 05:40:39 2021 +0000
5900 upstream: ensure that pkcs11_del_provider() is called before exit -
5902 some PKCS#11 providers get upset if C_Initialize is not matched with
5905 From Adithya Baglody via GHPR#234; ok markus
5907 OpenBSD-Commit-ID: f8e770e03b416ee9a58f9762e162add900f832b6
5909 commit 464ebc82aa926dd132ec75a0b064574ef375675e
5910 Author: djm@openbsd.org <djm@openbsd.org>
5911 Date: Sat Apr 3 05:28:43 2021 +0000
5913 upstream: unused variable
5915 OpenBSD-Commit-ID: 85f6a394c8e0f60d15ecddda75176f112007b205
5917 commit dc3c0be8208c488e64a8bcb7d9efad98514e0ffb
5918 Author: djm@openbsd.org <djm@openbsd.org>
5919 Date: Sat Apr 3 05:21:46 2021 +0000
5921 upstream: Fix two problems in string->argv conversion: 1) multiple
5923 backslashes were not being dequoted correctly and 2) quoted space in the
5924 middle of a string was being incorrectly split.
5926 Content-Type: text/plain; charset=UTF-8
5927 Content-Transfer-Encoding: 8bit
5929 A unit test for these cases has already been committed
5931 prompted by and based on GHPR#223 by Eero Häkkinen; ok markus@
5933 OpenBSD-Commit-ID: d7ef27abb4eeeaf6e167e9312e4abe9e89faf1e4
5935 commit f75bcbba58a08c670727ece5e3f8812125969799
5936 Author: Damien Miller <djm@mindrot.org>
5937 Date: Sat Apr 3 16:22:48 2021 +1100
5939 missing bits from 259d648e
5941 commit 4cbc4a722873d9b68cb5496304dc050d7168df78
5942 Author: djm@openbsd.org <djm@openbsd.org>
5943 Date: Wed Mar 31 21:59:26 2021 +0000
5945 upstream: cannot effectively test posix-rename extension after
5947 changes in feature advertisment.
5949 OpenBSD-Regress-ID: 5e390bf88d379162aaa81b60ed86b34cb0c54d29
5951 commit 259d648e63e82ade4fe2c2c73c8b67fe57d9d049
5952 Author: djm@openbsd.org <djm@openbsd.org>
5953 Date: Fri Mar 19 04:23:50 2021 +0000
5955 upstream: add a test for misc.c:argv_split(), currently fails
5957 OpenBSD-Regress-ID: ad6b96d6ebeb9643b698b3575bdd6f78bb144200
5959 commit 473ddfc2d6b602cb2d1d897e0e5c204de145cd9a
5960 Author: djm@openbsd.org <djm@openbsd.org>
5961 Date: Fri Mar 19 03:25:01 2021 +0000
5965 OpenBSD-Regress-ID: f6c03c0e4c58b3b9e04b161757b8c10dc8378c34
5967 commit 1339800fef8d0dfbfeabff71b34670105bcfddd2
5968 Author: djm@openbsd.org <djm@openbsd.org>
5969 Date: Wed Mar 31 22:16:34 2021 +0000
5971 upstream: Use new limits@openssh.com protocol extension to let the
5973 client select good limits based on what the server supports. Split the
5974 download and upload buffer sizes to allow them to be chosen independently.
5976 In practice (and assuming upgraded sftp/sftp-server at each end), this
5977 increases the download buffer 32->64KiB and the upload buffer
5980 Patches from Mike Frysinger; ok dtucker@
5982 OpenBSD-Commit-ID: ebd61c80d85b951b794164acc4b2f2fd8e88606c
5984 commit 6653c61202d104e59c8e741329fcc567f7bc36b8
5985 Author: djm@openbsd.org <djm@openbsd.org>
5986 Date: Wed Mar 31 21:58:07 2021 +0000
5988 upstream: do not advertise protocol extensions that have been
5990 disallowed by the command-line options (e.g. -p/-P/-R); ok dtucker@
5992 OpenBSD-Commit-ID: 3a8a76b3f5131741aca4b41bfab8d101c9926205
5994 commit 71241fc05db4bbb11bb29340b44b92e2575373d8
5995 Author: Damien Miller <djm@mindrot.org>
5996 Date: Mon Mar 29 15:14:25 2021 +1100
5998 gnome-ssh-askpass3 is a valid target here
6000 commit 8a9520836e71830f4fccca066dba73fea3d16bda
6001 Author: djm@openbsd.org <djm@openbsd.org>
6002 Date: Fri Mar 19 02:22:34 2021 +0000
6004 upstream: return non-zero exit status when killed by signal; bz#3281 ok
6008 OpenBSD-Commit-ID: 117b31cf3c807993077b596bd730c24da9e9b816
6010 commit 1269b8a686bf1254b03cd38af78167a04aa6ec88
6011 Author: djm@openbsd.org <djm@openbsd.org>
6012 Date: Fri Mar 19 02:18:28 2021 +0000
6014 upstream: increase maximum SSH2_FXP_READ to match the maximum
6016 packet size. Also handle zero-length reads that are borderline nonsensical
6017 but not explicitly banned by the spec. Based on patch from Mike Frysinger,
6018 feedback deraadt@ ok dtucker@
6020 OpenBSD-Commit-ID: 4e67d60d81bde7b84a742b4ee5a34001bdf80d9c
6022 commit 860b67604416640e8db14f365adc3f840aebcb1f
6023 Author: djm@openbsd.org <djm@openbsd.org>
6024 Date: Tue Mar 16 06:15:43 2021 +0000
6026 upstream: don't let logging clobber errno before use
6028 OpenBSD-Commit-ID: ce6cca370005c270c277c51c111bb6911e1680ec
6030 commit 5ca8a9216559349c56e09039c4335636fd85c241
6031 Author: Darren Tucker <dtucker@dtucker.net>
6032 Date: Sat Mar 13 14:40:43 2021 +1100
6034 Only call dh_set_moduli_file if using OpenSSL.
6036 Fixes link failure when configuring --without-openssl since dh.c is not
6039 commit 867a7dcf003c51d5a83f83565771a35f0d9530ac
6040 Author: Darren Tucker <dtucker@dtucker.net>
6041 Date: Sat Mar 13 13:52:53 2021 +1100
6043 Don't install moduli during tests.
6045 Now that we have TEST_SSH_MODULI_FILE pointing to the moduli in the
6046 soure directory we don't need to install the file to prevent warnings
6047 about it being missing.
6049 commit 0c054538fccf92b4a028008321d3711107bee6d5
6050 Author: Darren Tucker <dtucker@dtucker.net>
6051 Date: Sat Mar 13 13:51:26 2021 +1100
6053 Point TEST_SSH_MODULI_FILE at our own moduli.
6055 This will allow the test to run without requiring a moduli file
6056 installed at the configured default path.
6058 commit 4d48219c72ab0c71238806f057f0e9630b7dd25c
6059 Author: jsg@openbsd.org <jsg@openbsd.org>
6060 Date: Fri Mar 12 05:18:01 2021 +0000
6064 OpenBSD-Commit-ID: 478bc3db04f62f1048ed6e1765400f3ab325e60f
6066 commit 88057eb6df912abf2678ea5c846d9d9cbc92752c
6067 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6068 Date: Fri Mar 12 04:08:19 2021 +0000
6070 upstream: Add ModuliFile keyword to sshd_config to specify the
6072 location of the "moduli" file containing the groups for DH-GEX. This will
6073 allow us to run tests against arbitrary moduli files without having to
6074 install them. ok djm@
6076 OpenBSD-Commit-ID: 8df99d60b14ecaaa28f3469d01fc7f56bff49f66
6078 commit f07519a2af96109325b5a48b1af18b57601074ca
6079 Author: djm@openbsd.org <djm@openbsd.org>
6080 Date: Fri Mar 12 03:43:40 2021 +0000
6082 upstream: pwcopy() struct passwd that we're going to reuse across a
6084 bunch of library calls; bz3273 ok dtucker@
6086 OpenBSD-Commit-ID: b6eafa977b2e44607b1b121f5de855107809b762
6088 commit 69d6d4b0c8a88d3d1288415605f36e2df61a2f12
6089 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6090 Date: Wed Mar 10 06:32:27 2021 +0000
6092 upstream: Import regenerated moduli file.
6094 OpenBSD-Commit-ID: 7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b
6096 commit e5895e8ecfac65086ea6b34d0d168409a66a15e1
6097 Author: djm@openbsd.org <djm@openbsd.org>
6098 Date: Wed Mar 10 04:58:45 2021 +0000
6100 upstream: no need to reset buffer after send_msg() as that is done
6102 for us; patch from Mike Frysinger
6104 OpenBSD-Commit-ID: 565516495ff8362a38231e0f1a087b8ae66da59c
6106 commit 721948e67488767df0fa0db71ff2578ee2bb9210
6107 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6108 Date: Sat Mar 13 01:52:16 2021 +0000
6110 upstream: Add TEST_SSH_MODULI_FILE variable to allow overriding of the
6112 moduli file used during the test run.
6114 OpenBSD-Regress-ID: be10f785263120edb64fc87db0e0d6570a10220a
6116 commit 82fef71e20ffef425b932bec26f5bc46aa1ed41c
6117 Author: Darren Tucker <dtucker@dtucker.net>
6118 Date: Fri Mar 12 15:58:57 2021 +1100
6120 Allow (but return EACCES) fstatat64 in sandbox.
6122 This is apparently used in some configurations of OpenSSL when glibc
6123 has getrandom(). bz#3276, patch from Kris Karas, ok djm@
6125 commit 1cd67ee15ce3d192ab51be22bc4872a6a7a4b6d9
6126 Author: Darren Tucker <dtucker@dtucker.net>
6127 Date: Fri Mar 12 13:16:10 2021 +1100
6129 Move generic includes outside of ifdef.
6131 This ensures that the macros in log.h are defined in the case where
6132 either of --with-solaris-projects or --with-solaris-privs are used
6133 without --with-solaris-contracts. bz#3278.
6135 commit 2421a567a8862fe5102a4e7d60003ebffd1313dd
6136 Author: Darren Tucker <dtucker@dtucker.net>
6137 Date: Wed Mar 10 17:41:21 2021 +1100
6139 Import regenerated moduli file.
6141 commit e99080c05d9d48dbbdb022538533d53ae1bd567d
6142 Author: millert@openbsd.org <millert@openbsd.org>
6143 Date: Sat Mar 6 20:36:31 2021 +0000
6145 upstream: Fix PRINT macro, the suffix param to sshlog() was missing.
6147 Also remove redundant __func__ prefix from PRINT calls as the macro already
6148 adds __FILE__, __func__ and __LINE__. From Christos Zoulas. OK dtucker@
6150 OpenBSD-Commit-ID: 01fdfa9c5541151b5461d9d7d6ca186a3413d949
6152 commit 160db17fc678ceb5e3fd4a7e006cc73866f484aa
6153 Author: djm@openbsd.org <djm@openbsd.org>
6154 Date: Wed Mar 3 22:41:49 2021 +0000
6156 upstream: don't sshbuf_get_u32() into an enum; reported by goetze
6158 AT dovetail.com via bz3269
6160 OpenBSD-Commit-ID: 99a30a8f1df9bd72be54e21eee5c56a0f050921a
6162 commit cffd033817a5aa388764b6661855dcdaabab0588
6163 Author: sthen@openbsd.org <sthen@openbsd.org>
6164 Date: Wed Mar 3 21:40:16 2021 +0000
6166 upstream: typo in other_hostkeys_message() display output, ok djm
6168 OpenBSD-Commit-ID: 276f58afc97b6f5826e0be58380b737603dbf5f5
6170 commit 7fe141b96b13bd7dc67ca985e14d55b9bd8a03fd
6171 Author: djm@openbsd.org <djm@openbsd.org>
6172 Date: Wed Mar 3 08:42:52 2021 +0000
6174 upstream: needs FILE*; from Mike Frysinger
6176 OpenBSD-Commit-ID: dddb3aa9cb5792eeeaa37a1af67b5a3f25ded41d
6178 commit d2afd717e62d76bb41ab5f3ab4ce6f885c8edc98
6179 Author: Damien Miller <djm@mindrot.org>
6180 Date: Tue Mar 2 21:31:47 2021 +1100
6184 commit f0c4eddf7cf224ebcac1f07ac8afdb30c6e9fe0a
6185 Author: Damien Miller <djm@mindrot.org>
6186 Date: Tue Mar 2 21:30:14 2021 +1100
6190 commit 67a8bb7fe62a381634db4c261720092e7d514a3d
6191 Author: Damien Miller <djm@mindrot.org>
6192 Date: Tue Mar 2 21:29:54 2021 +1100
6194 update RPM spec version numbers
6196 commit 0a4b23b11b9a4e6eec332dd5c6ab2ac6f62aa164
6197 Author: djm@openbsd.org <djm@openbsd.org>
6198 Date: Tue Mar 2 01:48:18 2021 +0000
6200 upstream: openssh-8.5
6202 OpenBSD-Commit-ID: 185e85d60fe042b8f8fa1ef29d4ef637bdf397d6
6204 commit de3866383b6720ad4cad83be76fe4c8aa111a249
6205 Author: Darren Tucker <dtucker@dtucker.net>
6206 Date: Mon Mar 1 21:13:24 2021 +1100
6208 Only upload config logs if configure fails.
6210 commit 85ff2a564ce838f8690050081176c1de1fb33116
6211 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6212 Date: Sun Feb 28 22:56:30 2021 +0000
6214 upstream: Add %k to list of keywords. From
6216 =?UTF-8?q?=20Eero=20H=C3=A4kkinenvia=20bz#3267?=
6218 Content-Type: text/plain; charset=UTF-8
6219 Content-Transfer-Encoding: 8bit
6221 OpenBSD-Commit-ID: 9c87f39a048cee2a7d1c8bab951b2f716256865e
6223 commit e774bac35933e71f924f4301786e7fb5bbe1422f
6224 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6225 Date: Sun Feb 28 01:50:47 2021 +0000
6227 upstream: Do not try to reset signal handler for signal 0 in
6229 subprocess. Prevents spurious debug message. ok djm@
6231 OpenBSD-Commit-ID: 7f9785e292dcf304457566ad4637effd27ad1d46
6233 commit 351c5dbbd74ce300c4f058112f9731c867c6e225
6234 Author: djm@openbsd.org <djm@openbsd.org>
6235 Date: Sat Feb 27 23:42:37 2021 +0000
6237 upstream: fix alphabetic ordering of options; spotted by Iain Morgan
6239 OpenBSD-Commit-ID: f955fec617d74af0feb5b275831a9fee813d7ad5
6241 commit 0d1c9dbe578597f8d45d3ac7690df10d32d743e5
6242 Author: Darren Tucker <dtucker@dtucker.net>
6243 Date: Sat Feb 27 12:25:25 2021 +1100
6245 zlib is now optional.
6247 commit b7c6ee7b437d9adfd19ef49d6c0f19f13f26f9b3
6248 Author: Jeffrey H. Johnson <61629094+johnsonjh@users.noreply.github.com>
6249 Date: Sat Feb 27 01:04:58 2021 +0000
6251 Fix punctuatio and typo in README.md.
6253 Some very minor fixes, missing 's' and punctuation.
6255 commit 6248b86074804983e8f7a2058856a516dbfe2924
6256 Author: Damien Miller <djm@mindrot.org>
6257 Date: Fri Feb 26 16:45:50 2021 +1100
6259 Revert "ssh: optional bind interface if bind address specified."
6261 This reverts commit 5a878a71a3528c2626aa1d331934fd964782d41c.
6263 Apologies - I accidentally pushed this.
6265 commit 493339a940b13be6071629c3c2dd5a3b6fc17023
6266 Author: Damien Miller <djm@mindrot.org>
6267 Date: Fri Feb 26 15:45:38 2021 +1100
6269 detech BSD libc hash functions in libbsd / libmd
6271 Some Linux distributions are shipping the BSD-style hashing functions
6272 (e.g. SHA256Update) in libbsd and/or libmd. Detect this situation to
6273 avoid header/replacement clashes later. ok dtucker@
6275 commit 5a878a71a3528c2626aa1d331934fd964782d41c
6276 Author: Dmitrii Turlupov <dturlupov@factor-ts.ru>
6277 Date: Thu Feb 4 16:27:31 2021 +0300
6279 ssh: optional bind interface if bind address specified.
6281 Allows the -b and -B options to be used together.
6282 For example, when the interface is in the VRF.
6284 commit 1fe4d70df94d3bcc2b35fd57cad6b5fc4b2d7b16
6285 Author: djm@openbsd.org <djm@openbsd.org>
6286 Date: Fri Feb 26 04:18:42 2021 +0000
6288 upstream: remove this KEX fuzzer; it's awkward to use and doesn't play
6290 nice with popular fuzzing drivers like libfuzzer. AFAIK nobody has used it
6293 OpenBSD-Regress-ID: cad919522b3ce90c147c95abaf81b0492ac296c9
6295 commit 24a3a67bd7421740d08803b84bd784e764107928
6296 Author: Darren Tucker <dtucker@dtucker.net>
6297 Date: Fri Feb 26 11:49:19 2021 +1100
6299 Remove macos-11.00 PAM test target too.
6301 These are failing apparently due to some kind of infrastructure problem,
6302 making it look like every commit is busted.
6304 commit 473201783f732ca8b0ec528b56aa55fa0d8cf717
6305 Author: djm@openbsd.org <djm@openbsd.org>
6306 Date: Fri Feb 26 00:16:58 2021 +0000
6308 upstream: a bit more debugging behind #ifdef DEBUG_SK
6310 OpenBSD-Commit-ID: d9fbce14945721061cb322f0084c2165d33d1993
6312 commit fd9fa76a344118fe1ef10b9a6c9e85d39599e9a8
6313 Author: Darren Tucker <dtucker@dtucker.net>
6314 Date: Fri Feb 26 01:15:10 2021 +1100
6316 Remove macos-11.0 from the test target list.
6318 It has been consistently failing for the past few days with a github
6319 actions internal error.
6321 commit 476ac8e9d33dbf96ef97aab812b8d7089d0cdc24
6322 Author: Philip Hands <phil@hands.com>
6323 Date: Wed Feb 24 23:43:16 2021 +0100
6325 tidy the $INSTALLKEY_SH code layout a little
6327 SSH-Copy-ID-Upstream: 78178aa5017222773e4c23d9001391eeaeca8983
6329 commit 983e05ef3b81329d76d6a802b39ad0d1f637c06c
6330 Author: Jakub Jelen <jjelen@redhat.com>
6331 Date: Tue Sep 29 10:02:45 2020 +0000
6333 if unable to add a missing newline, fail
6335 SSH-Copy-ID-Upstream: 76b25e18f55499ea9edb4c4d6dc4a80bebc36d95
6337 commit 3594b3b015f6014591da88ba71bf6ff010be7411
6338 Author: Philip Hands <phil@hands.com>
6339 Date: Tue Oct 13 14:12:58 2020 +0200
6341 use $AUTH_KEY_DIR, now that we have it
6343 since that was a change made since jjelen's commit was written
6345 also, quote the variables
6347 SSH-Copy-ID-Upstream: 588cd8e5cbf95f3443d92b9ab27c5d73ceaf6616
6349 commit 333e25f7bc43cee6e36f766e39dad6f9918b318c
6350 Author: Jakub Jelen <jjelen@redhat.com>
6351 Date: Tue Sep 29 10:00:01 2020 +0000
6353 restorecon the correct directory
6355 if using different path for authorized_keys file
6357 SSH-Copy-ID-Upstream: 791a3df47b48412c726bff6f7b1d190721e65d51
6359 commit 9beeab8a37a49a9e3ffb1972fff6621ee5bd7a71
6360 Author: djm@openbsd.org <djm@openbsd.org>
6361 Date: Thu Feb 25 03:27:34 2021 +0000
6363 upstream: s/PubkeyAcceptedKeyTypes/PubkeyAcceptedAlgorithms/
6365 OpenBSD-Regress-ID: 3dbc005fa29f69dc23d97e433b6dffed6fe7cb69
6367 commit 2dd9870c16ddbd83740adeead5030d6840288c8f
6368 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6369 Date: Wed Feb 24 23:12:35 2021 +0000
6371 upstream: Rename pubkeyacceptedkeytypes to pubkeyacceptedalgorithms in
6373 test to match change to config-dump output.
6375 OpenBSD-Regress-ID: 74c9a4ad50306be873d032819d5e55c24eb74d5d
6377 commit b9225c3a1c3f5827e31d5d64a71b8e0504a25619
6378 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6379 Date: Wed Feb 24 01:18:08 2021 +0000
6381 upstream: Put obsolete aliases for hostbasedalgorithms and
6383 pubkeyacceptedalgorithms after their current names so that the config-dump
6384 mode finds and uses the current names. Spotted by Phil Pennock.
6386 OpenBSD-Commit-ID: 5dd10e93cccfaff3aaaa09060c917adff04a9b15
6388 commit 8b8b60542d6652b2c91e0ef9e9cc81bcb65e6b42
6389 Author: djm@openbsd.org <djm@openbsd.org>
6390 Date: Tue Feb 23 21:55:08 2021 +0000
6392 upstream: lots more s/key types/signature algorithms/ mostly in
6394 HostbasedAcceptedAlgorithms and HostKeyAlgorithms; prompted by Jakub Jelen
6396 OpenBSD-Commit-ID: 3f719de4385b1a89e4323b2549c66aae050129cb
6398 commit 0aeb508aaabc4818970c90831e3d21843c3c6d09
6399 Author: djm@openbsd.org <djm@openbsd.org>
6400 Date: Tue Feb 23 21:50:18 2021 +0000
6402 upstream: Correct reference to signature algorithms as keys; from
6406 OpenBSD-Commit-ID: 36f7ecee86fc811aa0f8e21e7a872eee044b4be5
6408 commit f186a020f2ba5f9c462a23293750e29ba0a746b1
6409 Author: Darren Tucker <dtucker@dtucker.net>
6410 Date: Tue Feb 23 16:05:22 2021 +1100
6412 Add a couple more test VMs.
6414 commit ffcdd3d90e74176b3bb22937ad1f65a6c1cd3f9d
6415 Author: Darren Tucker <dtucker@dtucker.net>
6416 Date: Mon Feb 22 08:09:27 2021 +1100
6418 Valgrind test: split and move up list.
6420 Since the valgrind test takes so long it approaches the limit allowed by
6421 github, move it to the head of the list so it's the first one started and
6422 split the longest tests out into a second instance that runs concurrently
6425 commit c3b1636770785cc2830dedd0f22ef7d3d3491d6d
6426 Author: djm@openbsd.org <djm@openbsd.org>
6427 Date: Tue Feb 23 00:05:31 2021 +0000
6429 upstream: warn when the user specifies a ForwardAgent path that does
6431 not exist and exit if ExitOnForwardFailure is set; bz3264
6433 OpenBSD-Commit-ID: 72f7875865e723e464c71bf8692e83110699bf26
6435 commit 5fcb0514949d61aadaf4a89cf16eb78fb47491ec
6436 Author: Darren Tucker <dtucker@dtucker.net>
6437 Date: Sat Feb 20 13:34:02 2021 +1100
6439 Disable rlimit sandbox, doesn't work with valgrind
6441 Only run regress tests, runing unit tests as well makes it run longer
6442 than allowed y github.
6444 commit bb0b9bf45396c19486080d3eb0a159f94de7e6ba
6445 Author: Darren Tucker <dtucker@dtucker.net>
6446 Date: Sat Feb 20 13:06:25 2021 +1100
6448 Upload valgrind logs on failure.
6450 commit ebb3b75e974cb241c6b9b9f5881b09c7bd32b651
6451 Author: Darren Tucker <dtucker@dtucker.net>
6452 Date: Fri Feb 19 22:18:50 2021 +1100
6454 Rename "vm" to "os" in selfhosted to match c-cpp.
6456 Should make it easier to share code or maybe merge at some point.
6458 commit 76c0be0fe0465cb2b975dbd409f8d38b55e55bcb
6459 Author: Darren Tucker <dtucker@dtucker.net>
6460 Date: Fri Feb 19 22:15:22 2021 +1100
6462 Upload regress failure logs in c-cpp too.
6464 commit 8751b6c3136f5225c40f41bbf29aa29e15795f6e
6465 Author: Darren Tucker <dtucker@dtucker.net>
6466 Date: Fri Feb 19 22:13:36 2021 +1100
6468 Comment out Solaris 64bit PAM build...
6470 until I can figure out why it's failing.
6472 commit e9f6d563c06886b277c6b9abafa99fa80726dc48
6473 Author: Darren Tucker <dtucker@dtucker.net>
6474 Date: Fri Feb 19 10:20:17 2021 +1100
6476 Actually run Valgrind tests.
6478 commit 41d232e226624f1a81c17091c36b44c9010aae62
6479 Author: Darren Tucker <dtucker@dtucker.net>
6480 Date: Fri Feb 19 10:16:56 2021 +1100
6482 Add test against Valgrind.
6484 commit e6528d91f12fba05f0ea64224091c9d0f38bdf1d
6485 Author: Darren Tucker <dtucker@dtucker.net>
6486 Date: Thu Feb 18 16:30:01 2021 +1100
6488 Add fbsd12 test target.
6490 commit 6506cb2798d98ff03a7cc06567c392a81f540680
6491 Author: Darren Tucker <dtucker@dtucker.net>
6492 Date: Thu Feb 18 15:21:13 2021 +1100
6496 commit 93c31a623973b0fad508214593aab6ca94b11dcb
6497 Author: Darren Tucker <dtucker@dtucker.net>
6498 Date: Thu Feb 18 14:54:07 2021 +1100
6500 Add DEBUG_SK to kitchensink builds.
6502 commit 65085740d3574eeb3289d592f042df62c2689bb0
6503 Author: Darren Tucker <dtucker@dtucker.net>
6504 Date: Thu Feb 18 14:53:14 2021 +1100
6506 Add bbone test target (arm32).
6508 commit 63238f5aed66148b8d6ca7bd5fb347d624200155
6509 Author: djm@openbsd.org <djm@openbsd.org>
6510 Date: Thu Feb 18 02:49:35 2021 +0000
6512 upstream: Fix the hostkeys rotation extension documentation
6514 The documentation was lacking the needed want-reply field in the initial
6517 https://github.com/openssh/openssh-portable/pull/218 by dbussink
6519 OpenBSD-Commit-ID: 051824fd78edf6d647a0b9ac011bf88e28775054
6521 commit 34c5ef6e2d06d9f0e20cb04a9aebf67a6f96609a
6522 Author: djm@openbsd.org <djm@openbsd.org>
6523 Date: Thu Feb 18 02:15:07 2021 +0000
6525 upstream: make names in function prototypes match those in
6527 definition from https://github.com/openssh/openssh-portable/pull/225 by
6530 OpenBSD-Commit-ID: 7c736307bf3f2c7cb24d6f82f244eee959485acd
6532 commit 88e3d4de31ab4f14cac658e9e0c512043b15b146
6533 Author: djm@openbsd.org <djm@openbsd.org>
6534 Date: Thu Feb 18 02:13:58 2021 +0000
6536 upstream: unbreak SK_DEBUG builds
6538 from https://github.com/openssh/openssh-portable/pull/225 by
6541 OpenBSD-Commit-ID: 28d7259ce1b04d025411464decfa2f1a097b43eb
6543 commit 788cbc5b74a53956ba9fff11e1ca506271a3597f
6544 Author: djm@openbsd.org <djm@openbsd.org>
6545 Date: Thu Feb 18 00:30:17 2021 +0000
6547 upstream: sftp-server: implement limits@openssh.com extension
6549 This is a simple extension that allows the server to clearly
6550 communicate transfer limits it is imposing so the client doesn't
6551 have to guess, or force the user to manually tune. This is
6552 particularly useful when an attempt to use too large of a value
6553 causes the server to abort the connection.
6555 Patch from Mike Frysinger; ok dtucker@
6557 OpenBSD-Commit-ID: f96293221e5aa24102d9bf30e4f4ef04d5f4fb51
6559 commit 324449a68d510720d0e4dfcc8e9e5a702fe6a48f
6560 Author: Damien Miller <djm@mindrot.org>
6561 Date: Thu Feb 18 12:06:25 2021 +1100
6563 support OpenSSL 3.x cipher IV API change
6565 OpenSSL renamed the "get current CIPHER_CTX" IV operation in 3.x.
6566 This uses the new name if available.
6568 https://github.com/openssl/openssl/issues/13411
6572 commit 845fe9811c047063d935eca89188ed55c993626b
6573 Author: Damien Miller <djm@mindrot.org>
6574 Date: Thu Feb 18 11:25:38 2021 +1100
6576 prefer login_getpwclass() to login_getclass()
6578 FreeBSD has login_getpwclass() that does some special magic for
6579 UID=0. Prefer this to login_getclass() as its easier to emulate
6580 the former with the latter.
6582 Based on FreeBSD PR 37416 via Ed Maste; ok dtucker@
6584 commit d0763c8d566119cce84d9806e419badf20444b02
6585 Author: Darren Tucker <dtucker@dtucker.net>
6586 Date: Thu Feb 18 10:45:27 2021 +1100
6588 Fixing quoting for installing moduli on target guest.
6590 commit b3afc243bc820f323a09e3218e9ec8a30a3c1933
6591 Author: Darren Tucker <dtucker@dtucker.net>
6592 Date: Thu Feb 18 10:27:16 2021 +1100
6594 Install moduli on target not host.
6596 commit f060c2bc85d59d111fa18a12eb3872ee4b9f7e97
6597 Author: Damien Miller <djm@mindrot.org>
6598 Date: Thu Feb 18 10:33:58 2021 +1100
6600 don't free string returned by login_getcapstr(3)
6602 OpenBSD and NetBSD require the caller to free strings returned
6603 bu the login_* functions, but FreeBSD requires that callers don't.
6605 Fortunately in this case, we can harmlessly leak as the process is
6606 about to exec the shell/command.
6608 From https://reviews.freebsd.org/D28617 via Ed Maste; ok dtucker@
6610 commit bc9b0c25703215501da28aa7a6539f96c0fa656f
6611 Author: Darren Tucker <dtucker@dtucker.net>
6612 Date: Thu Feb 18 10:10:00 2021 +1100
6614 Skip unit tests on sol11 to speed things up.
6616 commit 161873035c12cc22211fc73d07170ade47746bc5
6617 Author: Darren Tucker <dtucker@dtucker.net>
6618 Date: Thu Feb 18 10:09:27 2021 +1100
6620 Remove SKIP_UNIT as it needs to be a make arg.
6622 commit 1c293868e4b4e8e74e3ea15b8dff90f6b089967a
6623 Author: Darren Tucker <dtucker@dtucker.net>
6624 Date: Thu Feb 18 10:05:03 2021 +1100
6626 Always intall moduli.
6628 Allows us to run tests without falling back to a fixed modulus. Ensure that
6629 the directory exists.
6631 commit 5c8f41ad100601ec2fdcbccdfe92890c31f81bbe
6632 Author: Darren Tucker <dtucker@dtucker.net>
6633 Date: Thu Feb 18 09:59:09 2021 +1100
6635 Quote SSHD_CONFOPTS in case it contains spaces.
6637 commit 4653116c1f5384ea7006e6396d9b53c33d218975
6638 Author: Darren Tucker <dtucker@dtucker.net>
6639 Date: Thu Feb 18 09:51:18 2021 +1100
6641 Fix labels on targets (dots vs underscores).
6643 commit 4512047f57ca3c6e8cd68f0cc69be59e98b25287
6644 Author: Darren Tucker <dtucker@dtucker.net>
6645 Date: Wed Feb 17 21:47:48 2021 +1100
6647 More compact representation of config matrix.
6649 commit 0406cd09f05c2e419b113dd4c0eac8bc34ec915b
6650 Author: Darren Tucker <dtucker@dtucker.net>
6651 Date: Wed Feb 17 21:19:18 2021 +1100
6653 Skip unit tests on hosted VMs to speed things up.
6655 commit 4582612e6147d766c336198c498740242fb8f1ec
6656 Author: Darren Tucker <dtucker@dtucker.net>
6657 Date: Wed Feb 17 20:21:29 2021 +1100
6659 Merge macos and ubuntu tests.
6661 commit 09f4b84654b71099559492e9aed5e1a38bf24815
6662 Author: Darren Tucker <dtucker@dtucker.net>
6663 Date: Wed Feb 17 18:41:30 2021 +1100
6665 Convert most github hosted tests to new config structure.
6667 commit 65380ff7e054be1454e5ab4fd7bb9c66f8fcbaa9
6668 Author: Darren Tucker <dtucker@dtucker.net>
6669 Date: Wed Feb 17 18:27:36 2021 +1100
6671 Only run selfhosted tests from selfhosted repo.
6673 commit f031366535650b88248ed7dbf23033afdf466240
6674 Author: Darren Tucker <dtucker@dtucker.net>
6675 Date: Fri Jan 15 14:11:43 2021 +1100
6677 Add self-hosted runners for VMs of other platforms.
6679 Github only hosts a limited number of platforms, and the runner code
6680 is only supported on slightly wider range of platforms. To increase
6681 our test coverage beyond that, we run the runner natively on a VM host,
6682 where it runs a jobs that boot VMs of other platforms, waits for them
6683 to come up then runs the build and test by ssh'ing into the guest.
6684 This means that the minimum dependencies for the guests are quite low
6685 (basically just sshd, a compiler and make).
6687 The interface to the VM host is fairly simple (basically 3 scripts:
6688 vmstartup, vmrun and vmshutdown), but those are specific to the VM host
6689 so are not in the public repo. We also mount the working directory on the
6690 host via sshfs, so things like artifact upload by the runner also work.
6692 As part of this we are moving the per-test-target configs into a single
6693 place (.github/configs) where there will be referenced by a single short
6694 "config" key. I plan to make the github-hosted runners use this too.
6696 The self-hosted runners are run off a private repo on github since that
6697 prevents third parties from accessing them[0], and since runner quota is
6698 limited on private repos, we avoid running the tests we run on the public
6701 [0] https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories
6703 commit 64bbd7444d658ef7ee14a7ea5ccc7f5810279ee7
6704 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6705 Date: Wed Feb 17 03:59:00 2021 +0000
6707 upstream: Make sure puttygen is new enough to successfully run the
6709 PuTTY interop tests, otherwise skip them.
6711 OpenBSD-Regress-ID: 34565bb50b8aec58331ed02a5e9e0a9a929bef51
6713 commit da0a9afcc446a30ca49dd216612c41ac3cb1f2d4
6714 Author: markus@openbsd.org <markus@openbsd.org>
6715 Date: Mon Feb 15 20:43:15 2021 +0000
6717 upstream: ssh: add PermitRemoteOpen for remote dynamic forwarding
6719 with SOCKS ok djm@, dtucker@
6721 OpenBSD-Commit-ID: 64fe7b6360acc4ea56aa61b66498b5ecc0a96a7c
6723 commit b696858a7f9db72a83d02cb6edaca4b30a91b386
6724 Author: markus@openbsd.org <markus@openbsd.org>
6725 Date: Mon Feb 15 20:36:35 2021 +0000
6727 upstream: factor out opt_array_append; ok djm@
6729 OpenBSD-Commit-ID: 571bc5dd35f99c5cf9de6aaeac428b168218e74a
6731 commit ad74fc127cc45567e170e8c6dfa2cfd9767324ec
6732 Author: dlg@openbsd.org <dlg@openbsd.org>
6733 Date: Mon Feb 15 11:09:22 2021 +0000
6735 upstream: ProxyJump takes "none" to disable processing like
6741 OpenBSD-Commit-ID: 941a2399da2193356bdc30b879d6e1692f18b6d3
6743 commit 16eacdb016ccf38dd9959c78edd3a6282513aa53
6744 Author: djm@openbsd.org <djm@openbsd.org>
6745 Date: Fri Feb 12 03:49:09 2021 +0000
6747 upstream: sftp: add missing lsetstat@openssh.com documentation
6749 patch from Mike Frysinger
6751 OpenBSD-Commit-ID: 9c114db88d505864075bfe7888b7c8745549715b
6753 commit e04fd6dde16de1cdc5a4d9946397ff60d96568db
6754 Author: djm@openbsd.org <djm@openbsd.org>
6755 Date: Fri Feb 12 03:14:18 2021 +0000
6757 upstream: factor SSH_AGENT_CONSTRAIN_EXTENSION parsing into its own
6759 function and remove an unused variable; ok dtucker@
6761 OpenBSD-Commit-ID: e1a938657fbf7ef0ba5e73b30365734a0cc96559
6763 commit 1bb130ed34721d46452529d094d9bbf045607d79
6764 Author: Darren Tucker <dtucker@dtucker.net>
6765 Date: Thu Feb 11 10:18:05 2021 +1100
6767 Add __NR_futex_time64 to seccomp sandbox.
6769 This is apparently needed for (some) 32 bit platforms with glibc 2.33.
6770 Patch from nix at esperi.org.uk and jjelen at redhat.com via bz#3260.
6772 commit f88a7a431212a16e572ecabd559e632f369c363e
6773 Author: Darren Tucker <dtucker@dtucker.net>
6774 Date: Sat Feb 6 09:37:01 2021 +1100
6776 Add a hostname function for systems that don't have it.
6778 Some systems don't have a hostname command (it's not required by POSIX).
6779 The do have uname -n (which is), but as found by tim@ some others (eg
6780 UnixWare) do not report the FQDN from uname -n.
6782 commit 5e385a71ef2317856f37c91a98658eb12eb5a89c
6783 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6784 Date: Fri Feb 5 22:03:40 2021 +0000
6786 upstream: Roll back the hostname->uname change in rev 1.10. It turns
6788 out uname -n doesn't do what we need for some platforms in portable, so we'll
6789 fix the original problem (that some other platforms don't have hostname at
6790 all) by providing wrapper function to implement it.
6792 OpenBSD-Regress-ID: 827a707d6201d5a8e196a8c28aec1d2c76c52341
6794 commit b446c214279de50ed8388e54897eb1be5281c894
6795 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6796 Date: Fri Feb 5 06:01:58 2021 +0000
6798 upstream: hostname is not specified by POSIX but uname -n is, so use
6800 the latter for portability. Patch from Geert Hendrickx via github PR#208.
6802 OpenBSD-Regress-ID: d6a79c7c4d141a0d05ade4a042eb57dddbce89f3
6804 commit 1cb6ce98d658e5fbdae025a3bd65793980e3b5d9
6805 Author: David Carlier <devnexen@gmail.com>
6806 Date: Sat Nov 21 12:22:23 2020 +0000
6808 Using explicit_memset for the explicit_bzero compatibility layer.
6810 Favoriting the native implementation in this case.
6812 commit 2e0beff67def2120f4b051b1016d7fbf84823e78
6813 Author: Luca Weiss <luca@z3ntu.xyz>
6814 Date: Sun Nov 8 14:19:23 2020 +0100
6816 Deny (non-fatal) statx in preauth privsep child.
6818 commit a35d3e911e193a652bd09eed40907e3e165b0a7b
6819 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6820 Date: Fri Feb 5 02:20:23 2021 +0000
6822 upstream: Remove debug message from sigchld handler. While this
6824 works on OpenBSD it can cause problems on other platforms. From kircherlike
6825 at outlook.com via bz#3259, ok djm@
6827 OpenBSD-Commit-ID: 3e241d7ac1ee77e3de3651780b5dc47b283a7668
6829 commit 69338ab46afe9e3dfb7762ad65351d854077c998
6830 Author: djm@openbsd.org <djm@openbsd.org>
6831 Date: Tue Feb 2 22:36:59 2021 +0000
6833 upstream: whitespace
6835 OpenBSD-Commit-ID: 544bb092e03fcbecb420196cd0f70af13ea868ad
6837 commit f71219a01d8f71c4b3ed7e456337a84ddba1653e
6838 Author: djm@openbsd.org <djm@openbsd.org>
6839 Date: Tue Feb 2 22:36:46 2021 +0000
6841 upstream: fix memleaks in private key deserialisation; enforce more
6843 consistency between redundant fields in private key certificate and private
6844 key body; ok markus@
6846 OpenBSD-Commit-ID: dec344e414d47f0a7adc13aecf3760fe58101240
6848 commit 3287790e78bf5b53c4a3cafb67bb5aa03e3910f0
6849 Author: djm@openbsd.org <djm@openbsd.org>
6850 Date: Tue Feb 2 22:35:14 2021 +0000
6852 upstream: memleak on error path; ok markus@
6854 OpenBSD-Commit-ID: 2091a36d6ca3980c81891a6c4bdc544e63cb13a8
6856 commit 3dd0c64e08f1bba21d71996d635c7256c8c139d1
6857 Author: djm@openbsd.org <djm@openbsd.org>
6858 Date: Sun Jan 31 22:55:29 2021 +0000
6860 upstream: more strictly enforce KEX state-machine by banning packet
6862 types once they are received. Fixes memleak caused by duplicate
6863 SSH2_MSG_KEX_DH_GEX_REQUEST (spotted by portable OpenSSH kex_fuzz via
6868 OpenBSD-Commit-ID: 87331c715c095b587d5c88724694cdeb701c9def
6870 commit 7a92a324a2e351fabd0ba8ef9b434d3b12d54ee3
6871 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6872 Date: Sun Jan 31 10:50:10 2021 +0000
6874 upstream: Set linesize returned by getline to zero when freeing and
6876 NULLing the returned string. OpenBSD's getline handles this just fine, but
6877 some implementations used by -portable do not. ok djm@
6879 OpenBSD-Commit-ID: 4d7bd5169d3397654247db9655cc69a9908d165c
6881 commit a5dfc5bae8c16e2a7caf564758d812c7672480b5
6882 Author: Damien Miller <djm@mindrot.org>
6883 Date: Sat Jan 30 16:32:29 2021 +1100
6885 allow a fuzz case to contain more than one request
6887 loop until input buffer empty, no message consumed or 256 messages
6890 commit 0ef24ad60204022f7e33b6e9d171172c50514132
6891 Author: Damien Miller <djm@mindrot.org>
6892 Date: Sat Jan 30 16:28:23 2021 +1100
6894 expect fuzz cases to have length prefix
6896 might make life a little easier for the fuzzer, e.g. it can now
6897 produce valid (multi-request) messages by smashing two cases together.
6899 commit de613f2713d2dfcd3b03c00e5558a40997f52712
6900 Author: Damien Miller <djm@mindrot.org>
6901 Date: Sat Jan 30 12:03:30 2021 +1100
6905 commit 7e96c877bcb2fb645355a687b8cb7347987c1c58
6906 Author: Damien Miller <djm@mindrot.org>
6907 Date: Sat Jan 30 12:02:46 2021 +1100
6909 move keys out of kex_fuzz.cc into separate header
6911 add certificates and missing key types
6913 commit 76f46d75664fdaa1112739ca523ff85ee4eb52b4
6914 Author: Damien Miller <djm@mindrot.org>
6915 Date: Sat Jan 30 12:02:10 2021 +1100
6917 some fixed test data (mostly keys) for fuzzing
6919 commit 7c2e3d6de1f2edb0c8b4725b4c2b56360e032b19
6920 Author: djm@openbsd.org <djm@openbsd.org>
6921 Date: Sat Jan 30 00:56:38 2021 +0000
6923 upstream: add a SK_DUMMY_INTEGRATE define that allows the dummy
6925 security key middleware to be directly linked; useful for writing fuzzers,
6928 OpenBSD-Regress-ID: 0ebd00159b58ebd85e61d8270fc02f1e45df1544
6930 commit 1a4b92758690faa12f49079dd3b72567f909466d
6931 Author: djm@openbsd.org <djm@openbsd.org>
6932 Date: Fri Jan 29 06:29:46 2021 +0000
6934 upstream: fix the values of enum sock_type
6936 OpenBSD-Commit-ID: 18d048f4dbfbb159ff500cfc2700b8fb1407facd
6938 commit 8afaa7d7918419d3da6c0477b83db2159879cb33
6939 Author: djm@openbsd.org <djm@openbsd.org>
6940 Date: Fri Jan 29 06:28:10 2021 +0000
6942 upstream: give typedef'd struct a struct name; makes the fuzzer I'm
6944 writing a bit easier
6946 OpenBSD-Commit-ID: 1052ab521505a4d8384d67acb3974ef81b8896cb
6948 commit 1e660115f0c7c4a750cd31e468ff889f33dd8088
6949 Author: Damien Miller <djm@mindrot.org>
6950 Date: Fri Jan 29 11:09:14 2021 +1100
6952 fuzz diffie-hellman-group-exchange-sha1 kex too
6954 commit be5f0048ea2aaeddd27be7dcca23aaad345fa16c
6955 Author: Damien Miller <djm@mindrot.org>
6956 Date: Fri Jan 29 11:03:35 2021 +1100
6958 support for running kex fuzzer with null cipher
6960 commit 3d59e88c0e42182c3749b446ccd9027933c84be4
6961 Author: Darren Tucker <dtucker@dtucker.net>
6962 Date: Thu Jan 28 20:55:16 2021 +1100
6964 make with -j2 to use available CPUs.
6966 commit 66dd9ddb5d2ea8c407908c8e8468c9d6e71db05b
6967 Author: Darren Tucker <dtucker@dtucker.net>
6968 Date: Thu Jan 28 14:31:01 2021 +1100
6970 Add test against openssl head and libressl head.
6972 commit 237dbb34e24b6b7ea888d54bda4d17da0a0fd0fa
6973 Author: Darren Tucker <dtucker@dtucker.net>
6974 Date: Thu Jan 28 14:30:50 2021 +1100
6978 commit d983e1732b8135d7ee8d92290d6dce35f736ab88
6979 Author: djm@openbsd.org <djm@openbsd.org>
6980 Date: Wed Jan 27 23:49:46 2021 +0000
6982 upstream: fix leak: was double allocating kex->session_id buffer
6984 OpenBSD-Commit-ID: 3765f4cc3ae1df874dba9102a3588ba7b48b8183
6986 commit 1134a48cdcef8e7363b9f6c73ebdd24405066738
6987 Author: Damien Miller <djm@mindrot.org>
6988 Date: Thu Jan 28 08:57:31 2021 +1100
6990 correct kex name in disabled code
6992 commit 67f47f1965abafc1830a287761125c2f4790857e
6993 Author: djm@openbsd.org <djm@openbsd.org>
6994 Date: Wed Jan 27 10:15:08 2021 +0000
6996 upstream: this needs kex.h now
6998 OpenBSD-Commit-ID: c5a42166c5aa002197217421a971e48be7cb5d41
7000 commit 39be3dc209f28f9c1ebfeba42adde8963b01e1cd
7001 Author: djm@openbsd.org <djm@openbsd.org>
7002 Date: Wed Jan 27 10:05:28 2021 +0000
7004 upstream: make ssh->kex->session_id a sshbuf instead of u_char*/size_t
7006 and use that instead of global variables containing copies of it. feedback/ok
7009 OpenBSD-Commit-ID: a4b1b1ca4afd2e37cb9f64f737b30a6a7f96af68
7011 commit 4ca6a1fac328477c642329676d6469dba59019a3
7012 Author: djm@openbsd.org <djm@openbsd.org>
7013 Date: Wed Jan 27 09:26:53 2021 +0000
7015 upstream: remove global variable used to stash compat flags and use the
7017 purpose-built ssh->compat variable instead; feedback/ok markus@
7019 OpenBSD-Commit-ID: 7c4f200e112dae6bcf99f5bae1a5629288378a06
7021 commit bba229b6f3328171f5e3ae85de443002523c0452
7022 Author: Darren Tucker <dtucker@dtucker.net>
7023 Date: Wed Jan 27 12:34:07 2021 +1100
7025 Install moduli file before tests.
7027 Reduces warnings during test runs.
7029 commit 1b83185593a90a73860a503d753a95ca6d726c00
7030 Author: Darren Tucker <dtucker@dtucker.net>
7031 Date: Wed Jan 27 11:58:26 2021 +1100
7033 Run one test with -Werror to catch warnings.
7035 commit d1532d90074b212054d5fd965f833231b09982f5
7036 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7037 Date: Wed Jan 27 00:37:26 2021 +0000
7039 upstream: Logical not bitwise or. ok djm@
7041 OpenBSD-Commit-ID: d4dc855cf04951b93c45caa383e1ac9af0a3b0e5
7043 commit 507b448a2465a53ab03a88acbc71cc51b48ca6ac
7044 Author: naddy@openbsd.org <naddy@openbsd.org>
7045 Date: Tue Jan 26 15:40:17 2021 +0000
7047 upstream: move HostbasedAcceptedAlgorithms to the right place in
7051 OpenBSD-Commit-ID: d766820d33dd874d944c14b0638239adb522c7ec
7053 commit e26c980778b228bdd42b8353cc70101cf49b731b
7054 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7055 Date: Tue Jan 26 11:25:01 2021 +0000
7057 upstream: Remove unused variables leftover from refactoring. ok
7061 OpenBSD-Commit-ID: 8b3ad58bff828fcf874e54b2fc27a4cf1d9505e8
7063 commit e9f78d6b06fc323bba1890b2dc3b8423138fb35c
7064 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7065 Date: Tue Jan 26 05:32:21 2021 +0000
7067 upstream: Rename HostbasedKeyTypes (ssh) and
7069 HostbasedAcceptedKeyTypes (sshd) to HostbasedAcceptedAlgorithms, which more
7070 accurately reflects its effect. This matches a previous change to
7071 PubkeyAcceptedAlgorithms. The previous names are retained as aliases. ok
7074 OpenBSD-Commit-ID: 49451c382adc6e69d3fa0e0663eeef2daa4b199e
7076 commit 48d0d7a4dd31154c4208ec39029d60646192f978
7077 Author: Darren Tucker <dtucker@dtucker.net>
7078 Date: Tue Jan 26 14:48:07 2021 +1100
7080 Disable sntrup761 if compiler doesn't support VLAs.
7082 The sntrup761 code sourced from supercop uses variable length
7083 arrays. Although widely supported, they are not part of the ANSI
7084 C89 spec so if the compiler does not support VLAs, disable the
7085 sntrup761x25519-sha512@openssh.com KEX method by replacing the kex
7086 functions with no-op ones similar to what we do in kexecdh.c.
7088 This should allow OpenSSH to build with a plain C89 compiler again.
7089 Spotted by tim@, ok djm@.
7091 commit 37c70ea8d4f3664a88141bcdf0bf7a16bd5fd1ac
7092 Author: djm@openbsd.org <djm@openbsd.org>
7093 Date: Tue Jan 26 00:54:49 2021 +0000
7095 upstream: refactor key constraint parsing in ssh-agent
7097 Key constraints parsing code previously existed in both the "add regular
7098 key" and "add smartcard key" path. This unifies them but also introduces
7099 more consistency checking: duplicated constraints and constraints that
7100 are nonsensical for a particular situation (e.g. FIDO provider for a
7101 smartcard key) are now banned.
7105 OpenBSD-Commit-ID: 511cb1b1c021ee1d51a4c2d649b937445de7983c
7107 commit e0e8bee8024fa9e31974244d14f03d799e5c0775
7108 Author: djm@openbsd.org <djm@openbsd.org>
7109 Date: Tue Jan 26 00:53:31 2021 +0000
7111 upstream: more ssh-agent refactoring
7113 Allow confirm_key() to accept an additional reason suffix
7115 Factor publickey userauth parsing out into its own function and allow
7116 it to optionally return things it parsed out of the message to its
7121 OpenBSD-Commit-ID: 29006515617d1aa2d8b85cd2bf667e849146477e
7123 commit dfe18a295542c169ffde8533b3d7fe42088e2de7
7124 Author: djm@openbsd.org <djm@openbsd.org>
7125 Date: Tue Jan 26 00:51:30 2021 +0000
7127 upstream: make struct hostkeys public; I have no idea why I made it
7133 OpenBSD-Commit-ID: e50780b34d4bbe628d69b2405b024dd749d982f3
7135 commit 3b44f2513cae89c920e8fe927b9bc910a1c8c65a
7136 Author: djm@openbsd.org <djm@openbsd.org>
7137 Date: Tue Jan 26 00:49:30 2021 +0000
7139 upstream: move check_host_cert() from sshconnect,c to sshkey.c and
7141 refactor it to make it more generally usable and testable.
7145 OpenBSD-Commit-ID: 536f489f5ff38808c1fa711ba58d4579b636f9e4
7147 commit 1fe16fd61bb53944ec510882acc0491abd66ff76
7148 Author: djm@openbsd.org <djm@openbsd.org>
7149 Date: Tue Jan 26 00:47:47 2021 +0000
7151 upstream: use recallocarray to allocate the agent sockets table;
7153 also clear socket entries that are being marked as unused.
7155 spinkle in some debug2() spam to make it easier to watch an agent
7160 OpenBSD-Commit-ID: 74582c8e82e96afea46f6c7b6813a429cbc75922
7162 commit cb7b22ea20a01332c81c0ddcb3555ad50de9cce2
7163 Author: djm@openbsd.org <djm@openbsd.org>
7164 Date: Tue Jan 26 00:46:17 2021 +0000
7166 upstream: factor out common code in the agent client
7168 Add a ssh_request_reply_decode() function that sends a message to
7169 the agent, reads and parses a success/failure reply.
7170 Use it for all requests that only expect success/failure
7174 OpenBSD-Commit-ID: e0c1f4d5e6cfa525d62581e2b8de93be0cb85adb
7176 commit d1e578afe7cd48140ad6e92a453f9b035363fd7f
7177 Author: djm@openbsd.org <djm@openbsd.org>
7178 Date: Mon Jan 25 06:00:17 2021 +0000
7180 upstream: make ssh hostbased authentication send the signature
7182 algorithm in its SSH2_MSG_USERAUTH_REQUEST packets instead of the key type.
7183 This make HostbasedAcceptedAlgorithms do what it is supposed to - filter on
7184 signature algorithm and not key type.
7186 spotted with dtucker@ ok markus@
7188 OpenBSD-Commit-ID: 25bffe19f0326972f5728170f7da81d5f45c78c6
7190 commit 95eca1e195a3b41baa1a725c2c5af8a09d885e4b
7191 Author: Darren Tucker <dtucker@dtucker.net>
7192 Date: Sat Jan 23 18:26:05 2021 +1100
7194 ifdef new instance of sin6_scope_id
7196 Put inside HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID similar to
7197 existing instance. Should fix error on UnixWare 7.
7199 commit 6ffdcdda128045226dda7fbb3956407978028a1e
7200 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7201 Date: Mon Jan 18 11:43:34 2021 +0000
7203 upstream: Fix long->int for convtime tests here too. Spotted by
7207 OpenBSD-Regress-ID: a87094f5863312d00938afba771d25f788c849d0
7209 commit b55b7565f15327d82ad7acbddafa90b658c5f0af
7210 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7211 Date: Fri Jan 22 02:46:40 2021 +0000
7213 upstream: PubkeyAcceptedKeyTypes->PubkeyAcceptedAlgorithms
7217 OpenBSD-Commit-ID: 3b64a640f8ce8c21d9314da9df7ce2420eefde3a
7219 commit ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec
7220 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7221 Date: Fri Jan 22 02:44:58 2021 +0000
7223 upstream: Rename PubkeyAcceptedKeyTypes keyword to
7225 PubkeyAcceptedAlgorithms. While the two were originally equivalent, this
7226 actually specifies the signature algorithms that are accepted. Some key
7227 types (eg RSA) can be used by multiple algorithms (eg ssh-rsa, rsa-sha2-512)
7228 so the old name is becoming increasingly misleading. The old name is
7229 retained as an alias. Prompted by bz#3253, help & ok djm@, man page help jmc@
7231 OpenBSD-Commit-ID: 0346b2f73f54c43d4e001089759d149bfe402ca5
7233 commit a8e798feabe36d02de292bcfd274712cae1d8d17
7234 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7235 Date: Fri Jan 15 02:58:11 2021 +0000
7237 upstream: Change types in convtime() unit test to int to match change
7239 its new type. Add tests for boundary conditions and fix convtime to work up
7242 OpenBSD-Regress-ID: ba2b81e9a3257fff204b020affe85b604a44f97e
7244 commit 9bde1a420626da5007bf7ab499fa2159b9eddf72
7245 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7246 Date: Fri Jan 15 04:31:25 2021 +0000
7248 upstream: Make output buffer larger to prevent potential truncation
7250 warnings from compilers not smart enough to know the strftime calls won't
7251 ever fully fill "to" and "from". ok djm@
7253 OpenBSD-Commit-ID: 83733f1b01b82da88b9dd1769475952aff10bdd7
7255 commit 02da325f10b214219eae2bb1bc2d3bf0c2f13f9f
7256 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7257 Date: Fri Jan 15 02:58:11 2021 +0000
7259 upstream: Change types in convtime() unit test to int to match
7261 change its new type. Add tests for boundary conditions and fix convtime to
7262 work up to INT_MAX. ok djm@
7264 OpenBSD-Commit-ID: 01dc0475f1484ac2f47facdfcf9221f9472145de
7266 commit 5339ab369c225b40bc64d5ec3374f5c91b3ad609
7267 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7268 Date: Fri Jan 15 02:32:41 2021 +0000
7270 upstream: In waitfd(), when poll returns early we are subtracting
7272 the elapsed time from the timeout each loop, so we only want to measure the
7273 elapsed time the poll() in that loop, not since the start of the function.
7274 Spotted by chris.xj.zhu at gmail.com, ok djm@
7276 OpenBSD-Commit-ID: 199df060978ee9aa89b8041a3dfaf1bf7ae8dd7a
7278 commit a164862dfa863b54b7897f66e1dd75437f086c11
7279 Author: rob@openbsd.org <rob@openbsd.org>
7280 Date: Thu Jan 14 19:45:06 2021 +0000
7282 upstream: Minor grammatical correction.
7286 OpenBSD-Commit-ID: de0fad0581e212b2750751e479b79c18ff8cac02
7288 commit 8635e7df7e3a3fbb4a4f6cd5a7202883b2506087
7289 Author: Darren Tucker <dtucker@dtucker.net>
7290 Date: Wed Jan 13 18:00:57 2021 +1100
7292 Merge Mac OS X targets into a single config.
7294 commit ac112ade990585c511048ed4edaf2d9fc92b61f0
7295 Author: Darren Tucker <dtucker@dtucker.net>
7296 Date: Tue Jan 12 19:22:47 2021 +1100
7298 Add Mac OS X test targets.
7300 commit 1050109b4b2884bf50fd1b3aa084c7fd0a42ae90
7301 Author: anatasluo <luolongjuna@gmail.com>
7302 Date: Mon Jan 11 13:51:39 2021 +0000
7304 Remove duplicated declaration in fatal.c .
7306 commit 7d0f8a3369579dfe398536eb4e3da7bc15da9599
7307 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7308 Date: Mon Jan 11 04:48:22 2021 +0000
7310 upstream: Correct spelling of persourcenetblocksize in config-dump
7314 OpenBSD-Commit-ID: ecdc49e2b6bde6b6b0e52163d621831f6ac7b13d
7316 commit ba328bd7a6774f30daaf90b83f1933cc4afc866c
7317 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7318 Date: Sat Jan 9 12:31:46 2021 +0000
7320 upstream: Adjust kexfuzz to addr.c/addrmatch.c split.
7322 OpenBSD-Regress-ID: 1d8d23bb548078020be2fb52c4c643efb190f0eb
7324 commit b08ef25552443e94c0857d5e3806dd019ccc55d7
7325 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7326 Date: Sat Jan 9 12:24:30 2021 +0000
7328 upstream: Update unittests for addr.c/addrmatch.c split.
7330 OpenBSD-Regress-ID: de2b415fb7af084a91c6ef147a90482d8f771eef
7332 commit 6d30673fedec2d251f4962c526fd0451f70c4d97
7333 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7334 Date: Mon Jan 11 02:12:57 2021 +0000
7336 upstream: Change convtime() from returning long to returning int.
7338 On platforms where sizeof(int) != sizeof(long), convtime could accept values
7339 >MAX_INT which subsequently truncate when stored in an int during config
7340 parsing. bz#3250, ok djm@
7342 OpenBSD-Commit-ID: 8fc932683d6b4660d52f50911d62bd6639c5db31
7344 commit 7a57adb8b07b2ad0aead4b2e09ee18edc04d0481
7345 Author: jmc@openbsd.org <jmc@openbsd.org>
7346 Date: Sat Jan 9 12:51:12 2021 +0000
7348 upstream: add a comma to previous;
7350 OpenBSD-Commit-ID: 9139433701c0aa86a0d3a6c7afe10d1c9c2e0869
7352 commit 3a923129534b007c2e24176a8655dec74eca9c46
7353 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7354 Date: Sat Jan 9 12:10:02 2021 +0000
7356 upstream: Add PerSourceMaxStartups and PerSourceNetBlockSize
7358 options which provide more fine grained MaxStartups limits. Man page help
7359 jmc@, feedback & ok djm@
7361 OpenBSD-Commit-ID: e2f68664e3d02c0895b35aa751c48a2af622047b
7363 commit d9a2bc71693ea27461a78110005d5a2d8b0c6a50
7364 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7365 Date: Sat Jan 9 11:58:50 2021 +0000
7367 upstream: Move address handling functions out into their own file
7369 in order to reuse them for per-source maxstartups limiting. Supplement with
7370 some additional functions from djm's flowtools that we'll also need. ok djm@
7371 (as part of a larger diff).
7373 OpenBSD-Commit-ID: e3e7d9ccc6c9b82e25cfef0ec83598e8e2327cbf
7375 commit b744914fcb76d70761f1b667de95841b3fc80a56
7376 Author: Darren Tucker <dtucker@dtucker.net>
7377 Date: Sat Jan 9 00:36:05 2021 +1100
7379 Add test against Graphene hardened malloc.
7381 commit 6cb52d5bf771f6769b630fce35a8e9b8e433044f
7382 Author: djm@openbsd.org <djm@openbsd.org>
7383 Date: Fri Jan 8 04:49:13 2021 +0000
7385 upstream: make CheckHostIP default to 'no'. It doesn't provide any
7387 perceptible value and makes it much harder for hosts to change host keys,
7388 particularly ones that use IP-based load-balancing.
7392 OpenBSD-Commit-ID: 0db98413e82074f78c7d46784b1286d08aee78f0
7394 commit 309b642e1442961b5e57701f095bcd4acd2bfb5f
7395 Author: Darren Tucker <dtucker@dtucker.net>
7396 Date: Fri Jan 8 15:50:41 2021 +1100
7398 Run tests with sudo for better coverage.
7400 commit c336644351fa3c715a08b7a292e309e72792e71e
7401 Author: Darren Tucker <dtucker@dtucker.net>
7402 Date: Fri Jan 8 14:26:32 2021 +1100
7404 Add Ubuntu 16.04 and 20.04 test targets.
7406 commit 4c7af01f9dcc1606dec033e7665a042cb0d8ec52
7407 Author: djm@openbsd.org <djm@openbsd.org>
7408 Date: Fri Jan 8 02:57:24 2021 +0000
7410 upstream: If a signature operation on a FIDO key fails with a
7412 "incorrect PIN" reason and no PIN was initially requested from the user, then
7413 request a PIN and retry the operation.
7415 This smoothes over a few corner cases including FIDO devices that
7416 require PINs for all hosted credentials, biometric FIDO devices that
7417 fall back to requiring PIN when reading the biometric failed, devices
7418 that don't implement reading credProtect status for downloaded keys
7419 and probably a few more cases that I haven't though of yet.
7423 OpenBSD-Commit-ID: 176db8518933d6a5bbf81a2e3cf62447158dc878
7425 commit 64ddd0fe68c4a7acf99b78624f8af45e919cd317
7426 Author: djm@openbsd.org <djm@openbsd.org>
7427 Date: Fri Jan 8 02:44:14 2021 +0000
7429 upstream: don't try to use timespeccmp(3) directly as a qsort(3)
7431 comparison function - it returns 0/1 and not the -1/0/1 that qsort expectes.
7433 fixes sftp "ls -ltr" under some circumstances.
7435 Based on patch by Masahiro Matsuya via bz3248.
7437 OpenBSD-Commit-ID: 65b5e9f18bb0d10573868c3516de6e5170adb163
7439 commit 599df78f3008cf78af21f8977be3e1dd085f8e2e
7440 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7441 Date: Fri Jan 8 02:33:13 2021 +0000
7443 upstream: Update the sntrup761 creation script and generated code:
7445 - remove unneeded header files and typedefs and rely on crypto_api.h - add
7446 defines to map types used to the crypto_api ones instead of typedefs. This
7447 prevents typedef name collisions in -portable. - remove CRYPTO_NAMESPACE
7448 entirely instead of making it a no-op - delete unused functions and make the
7449 remaining ones that aren't exported static.
7453 OpenBSD-Commit-ID: 7b9d0cf3acd5a3c1091da8afe00c904d38cf5783
7455 commit 16448ff529affda7e2a15ee7c3200793abde0759
7456 Author: djm@openbsd.org <djm@openbsd.org>
7457 Date: Fri Jan 8 02:19:24 2021 +0000
7459 upstream: mention that DisableForwarding is valid in a sshd_config
7461 Match block reported by Fredrik Eriksson in bz3239
7463 OpenBSD-Commit-ID: 3a71c3d84b597f5e43e4b40d5232797daf0993f6
7465 commit 91bac5e95b1b0debf9b2b4f05c20dcfa96b368b9
7466 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7467 Date: Mon Jan 4 21:58:58 2021 +0000
7469 upstream: estructure sntrup761.sh to process all files in a single
7471 list, which will make it easier to reorder. Re-inline int32_MINMAX. ok
7474 OpenBSD-Commit-ID: d145c6c19b08bb93c9e14bfaa7af589d90f144c0
7476 commit 4d96a3ebab2224f17e639a15078e03be1ad3736d
7477 Author: tobhe@openbsd.org <tobhe@openbsd.org>
7478 Date: Sun Jan 3 18:05:21 2021 +0000
7480 upstream: Prevent redefinition of `crypto_int32' error with gcc3.
7482 Fixes compilation on luna88k.
7485 Found by and ok aoyama@
7487 OpenBSD-Commit-ID: f305ddfe575a26cc53431af3fde3f4aeebed9ba6
7489 commit a23954eeb930ccc8a66a2710153730769dba31b6
7490 Author: Darren Tucker <dtucker@dtucker.net>
7491 Date: Fri Jan 1 22:00:49 2021 +1100
7493 Undef int32 after sort routines.
7495 This prevents typedef'ing crypto_int32 twice, in sntrup761.c and
7496 crypto_api.h, which some compilers (at least some GCCs) don't accept.
7498 commit 148b8a661c3f93e4b6d049ee902de3d521261fbc
7499 Author: Damien Miller <djm@mindrot.org>
7500 Date: Thu Dec 31 12:47:22 2020 +1100
7502 fix: missing pieces of previous commit
7504 commit 3d999be7b987c848feda718cfcfcdc005ddf670d
7505 Author: tobhe@openbsd.org <tobhe@openbsd.org>
7506 Date: Wed Dec 30 14:13:28 2020 +0000
7508 upstream: Use int64_t for intermediate values in int32_MINMAX to
7510 prevent signed 32-bit integer overflow.
7512 Found by and ok djm@
7515 OpenBSD-Commit-ID: 4f0704768e34cf45fdd792bac4011c6971881bb3
7517 commit 5c1953bf98732da5a76c706714ac066dbfa015ac
7518 Author: Damien Miller <djm@mindrot.org>
7519 Date: Tue Dec 29 12:40:54 2020 +1100
7521 adapt KEX fuzzer to PQ kex change
7523 commit 659864fe81dbc57eeed3769c462679d83e026640
7524 Author: djm@openbsd.org <djm@openbsd.org>
7525 Date: Tue Dec 29 01:02:15 2020 +0000
7527 upstream: Adapt to replacement of
7529 sntrup4591761x25519-sha512@tinyssh.org with
7530 sntrup761x25519-sha512@openssh.com.
7532 Also test sntrup761x25519-sha512@openssh.com in unittests/kex
7534 OpenBSD-Regress-ID: cfa3506b2b077a9cac1877fb521efd2641b6030c
7536 commit 2c71cec020219d69df84055c59eba5799a1233ec
7537 Author: djm@openbsd.org <djm@openbsd.org>
7538 Date: Tue Dec 29 00:59:15 2020 +0000
7540 upstream: Update/replace the experimental post-quantim hybrid key
7542 exchange method based on Streamlined NTRU Prime (coupled with X25519).
7544 The previous sntrup4591761x25519-sha512@tinyssh.org method is
7545 replaced with sntrup761x25519-sha512@openssh.com. Per the authors,
7546 sntrup4591761 was replaced almost two years ago by sntrup761.
7548 The sntrup761 implementaion, like sntrup4591761 before it, is public
7549 domain code extracted from the SUPERCOP cryptography benchmark
7550 suite (https://bench.cr.yp.to/supercop.html).
7552 Thanks for Daniel J Bernstein for guidance on algorithm selection.
7553 Patch from Tobias Heider; feedback & ok markus@ and myself
7555 (note this both the updated method and the one that it replaced are
7556 disabled by default)
7558 OpenBSD-Commit-ID: 2bf582b772d81ee24e911bb6f4b2aecfd39338ae
7560 commit 09d070ccc3574ae0d7947d212ed53c7268ef7e1f
7561 Author: jmc@openbsd.org <jmc@openbsd.org>
7562 Date: Tue Dec 22 07:40:26 2020 +0000
7564 upstream: tweak the description of KnownHostsCommand in ssh_conf.5,
7566 and add entries for it to the -O list in scp.1 and sftp.1;
7570 OpenBSD-Commit-ID: aba31ebea03f38f8d218857f7ce16a500c3e4aff
7572 commit 931c93389a80e32272712459b1102d303844453d
7573 Author: Damien Miller <djm@mindrot.org>
7574 Date: Tue Dec 22 19:43:55 2020 +1100
7578 commit 397b1c4d393f97427283a4717e9015a2bd31b8a5
7579 Author: Damien Miller <djm@mindrot.org>
7580 Date: Tue Dec 22 19:42:37 2020 +1100
7584 commit 33fa3ac547e5349ca34681cce6727b2f933dff0a
7585 Author: Darren Tucker <dtucker@dtucker.net>
7586 Date: Tue Dec 22 19:21:26 2020 +1100
7590 commit 0f2e21c9dca89598b694932b5b05848380a23ec0
7591 Author: Darren Tucker <dtucker@dtucker.net>
7592 Date: Tue Dec 22 18:56:54 2020 +1100
7594 Include stdio.h for FILE in misc.h.
7596 Fixes build on at least OpenBSD.
7598 commit 3e9811e57b57ee66b0f70d99d7258da3153b0e8a
7599 Author: Damien Miller <djm@mindrot.org>
7600 Date: Tue Dec 22 18:31:50 2020 +1100
7602 ensure $LOGNAME is set in tests
7604 commit 3eb647cbb34d87a063aa7714256c6e56103fffda
7605 Author: djm@openbsd.org <djm@openbsd.org>
7606 Date: Tue Dec 22 06:47:24 2020 +0000
7608 upstream: more detail for failing tests
7610 OpenBSD-Regress-ID: c68c0e5a521cad7e7f68e54c54ebf86d6c10ee1d
7612 commit 2873f19570d4d8758be24dbf78332be9a779009b
7613 Author: djm@openbsd.org <djm@openbsd.org>
7614 Date: Tue Dec 22 06:03:36 2020 +0000
7616 upstream: regress test for KnownHostsCommand
7618 OpenBSD-Regress-ID: ffc77464320b6dabdcfa0a72e0df02659233a38a
7620 commit 0121aa87bab9ad2365de2d07f2832b56d5ff9871
7621 Author: tb@openbsd.org <tb@openbsd.org>
7622 Date: Tue Dec 22 03:05:31 2020 +0000
7624 upstream: Remove lines accidentally left behind in the ProxyJump
7630 OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c
7632 commit da4bf0db942b5f0278f33238b86235e5813d7a5a
7633 Author: djm@openbsd.org <djm@openbsd.org>
7634 Date: Tue Dec 22 00:15:22 2020 +0000
7636 upstream: add a ssh_config KnownHostsCommand that allows the client
7638 to obtain known_hosts data from a command in addition to the usual files.
7640 The command accepts bunch of %-expansions, including details of the
7641 connection and the offered server host key. Note that the command may
7642 be invoked up to three times per connection (see the manpage for
7647 OpenBSD-Commit-ID: 2433cff4fb323918ae968da6ff38feb99b4d33d0
7649 commit a34e14a5a0071de2036826a00197ce38c8b4ba8b
7650 Author: djm@openbsd.org <djm@openbsd.org>
7651 Date: Tue Dec 22 00:12:22 2020 +0000
7653 upstream: move subprocess() from auth.c to misc.c
7655 make privilege dropping optional but allow it via callbacks (to avoid
7656 need to link uidswap.c everywhere)
7658 add some other flags (keep environment, disable strict path safety check)
7659 that make this more useful for client-side use.
7661 feedback & ok markus@
7663 OpenBSD-Commit-ID: a80ea9fdcc156f1a18e9c166122c759fae1637bf
7665 commit 649205fe388b56acb3481a1b2461f6b5b7c6efa6
7666 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7667 Date: Mon Dec 21 22:48:41 2020 +0000
7669 upstream: Remove explicit rijndael-cbc@lysator.liu.se test since the
7673 OpenBSD-Regress-ID: aa93cddb4ecd9bc21446a79008a1a53050e64f17
7675 commit 03e93c753d7c223063ad8acaf9a30aa511e5f931
7676 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7677 Date: Mon Dec 21 11:09:32 2020 +0000
7679 upstream: Remove the pre-standardization cipher
7681 rijndael-cbc@lysator.liu.se. It is an alias for aes256-cbc which was
7682 standardized in RFC4253 (2006), has been deprecated and disabled by default
7683 since OpenSSH 7.2 (2016) and was only briefly documented in ssh.1 in 2001.
7685 This will reduce the amount of work the cipher/kex regression tests need
7686 to do by a little bit. ok markus@ djm@
7688 OpenBSD-Commit-ID: fb460acc18290a998fd70910b19c29b4e4f199ad
7690 commit a11ca015879eab941add8c6bdaaec7d41107c6f5
7691 Author: djm@openbsd.org <djm@openbsd.org>
7692 Date: Mon Dec 21 09:19:53 2020 +0000
7694 upstream: properly fix ProxyJump parsing; Thanks to tb@ for
7696 pointing out my error (parse_ssh_uri() can return -1/0/1, that I missed).
7697 Reported by Raf Czlonka via bugs@
7701 OpenBSD-Commit-ID: a2991a3794bcaf1ca2b025212cce11cdb5f6b7d6
7703 commit d97fb879724f1670bf55d9adfea7278a93c33ae2
7704 Author: djm@openbsd.org <djm@openbsd.org>
7705 Date: Mon Dec 21 01:31:06 2020 +0000
7707 upstream: adapt to API change in hostkeys_foreach()/load_hostkeys()
7709 OpenBSD-Regress-ID: dcb468514f32da49a446372453497dc6eeafdbf3
7711 commit bf7eb3c266b7fd4ddda108fcf72b860af2af6406
7712 Author: djm@openbsd.org <djm@openbsd.org>
7713 Date: Fri Oct 16 14:02:24 2020 +0000
7715 upstream: few more things needs match.c and addrmatch.c now that
7717 log.c calls match_pattern_list()
7719 OpenBSD-Regress-ID: f7c95c76b150d0aeb00a67858b9579b7d1b2db74
7721 commit 2c64f24e27a5e72a7f59e515fc4f4985355237ae
7722 Author: Darren Tucker <dtucker@dtucker.net>
7723 Date: Mon Dec 21 14:02:56 2020 +1100
7725 Pull in missing rev 1.2.
7727 commit 0f504f592d15d8047e466eb7453067a6880992a8
7728 Author: djm@openbsd.org <djm@openbsd.org>
7729 Date: Sun Dec 20 23:40:19 2020 +0000
7731 upstream: plumb ssh_conn_info through to sshconnect.c; feedback/ok
7735 OpenBSD-Commit-ID: e8d14a09cda3f1dc55df08f8a4889beff74e68b0
7737 commit 729b05f59ded35483acef90a6f88aa03eae33b29
7738 Author: djm@openbsd.org <djm@openbsd.org>
7739 Date: Sun Dec 20 23:38:00 2020 +0000
7741 upstream: allow UserKnownHostsFile=none; feedback and ok markus@
7743 OpenBSD-Commit-ID: c46d515eac94a35a1d50d5fd71c4b1ca53334b48
7745 commit b4c7cd1185c5dc0593d47eafcc1a34fda569dd1d
7746 Author: djm@openbsd.org <djm@openbsd.org>
7747 Date: Sun Dec 20 23:36:51 2020 +0000
7749 upstream: load_hostkeys()/hostkeys_foreach() variants for FILE*
7751 Add load_hostkeys_file() and hostkeys_foreach_file() that accept a
7752 FILE* argument instead of opening the file directly.
7754 Original load_hostkeys() and hostkeys_foreach() are implemented using
7755 these new interfaces.
7757 Add a u_int note field to the hostkey_entry and hostkey_foreach_line
7758 structs that is passed directly from the load_hostkeys() and
7759 hostkeys_foreach() call. This is a lightweight way to annotate results
7760 between different invocations of load_hostkeys().
7764 OpenBSD-Commit-ID: 6ff6db13ec9ee4edfa658b2c38baad0f505d8c20
7766 commit 06fbb386bed666581095cb9cbc7a900e02bfe1b7
7767 Author: tobhe@openbsd.org <tobhe@openbsd.org>
7768 Date: Sat Dec 19 22:09:21 2020 +0000
7770 upstream: Print client kem key with correct length.
7774 OpenBSD-Commit-ID: 91689e14a4fc6c270e265a32d1c8faba63a45755
7776 commit 0ebead6593e2441e4af2735bbe2cd097607cd0d3
7777 Author: djm@openbsd.org <djm@openbsd.org>
7778 Date: Thu Dec 17 23:28:50 2020 +0000
7780 upstream: fix possible error("%s", NULL) on error paths
7782 OpenBSD-Commit-ID: 0b3833c2cb985453ecca1d76803ebb8f3b736a11
7784 commit d060bc7f6e6244f001e658208f53e3e2ecbbd382
7785 Author: djm@openbsd.org <djm@openbsd.org>
7786 Date: Thu Dec 17 23:26:11 2020 +0000
7788 upstream: refactor client percent_expand() argument passing;
7790 consolidate the common arguments into a single struct and pass that around
7791 instead of using a bunch of globals. ok markus@
7793 OpenBSD-Commit-ID: 035e6d7ca9145ad504f6af5a021943f1958cd19b
7795 commit 43026da035cd266db37df1f723d5575056150744
7796 Author: djm@openbsd.org <djm@openbsd.org>
7797 Date: Thu Dec 17 23:10:27 2020 +0000
7799 upstream: prepare readconf.c for fuzzing; remove fatal calls and
7801 fix some (one-off) memory leaks; ok markus@
7803 OpenBSD-Commit-ID: 91c6aec57b0e7aae9190de188e9fe8933aad5ec5
7805 commit bef92346c4a808f33216e54d6f4948f9df2ad7c1
7806 Author: djm@openbsd.org <djm@openbsd.org>
7807 Date: Mon Dec 14 03:13:12 2020 +0000
7809 upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path
7811 OpenBSD-Commit-ID: 5c1048468813107baa872f5ee33ba51623630e01
7813 commit a5ab499bd2644b4026596fc2cb24a744fa310666
7814 Author: Damien Miller <djm@mindrot.org>
7815 Date: Fri Dec 4 14:01:27 2020 +1100
7817 basic KEX fuzzer; adapted from Markus' unittest
7819 commit 021ff33e383c77b11badd60cec5b141a3e3fa532
7820 Author: Damien Miller <djm@mindrot.org>
7821 Date: Fri Dec 4 13:57:43 2020 +1100
7823 use options that work with recent clang
7825 commit e4d1a0b40add800b6e9352b40c2223e44acc3a45
7826 Author: djm@openbsd.org <djm@openbsd.org>
7827 Date: Fri Dec 4 02:41:10 2020 +0000
7829 upstream: shuffle a few utility functions into sftp-client.c; from
7833 OpenBSD-Commit-ID: fdeb1aae1f6149b193f12cd2af158f948c514a2a
7835 commit ace12dc64f8e3a2496ca48d36b53cb3c0a090755
7836 Author: djm@openbsd.org <djm@openbsd.org>
7837 Date: Fri Dec 4 02:29:56 2020 +0000
7839 upstream: make ssh_free(NULL) a no-op
7841 OpenBSD-Commit-ID: 42cb285d94789cefe6608db89c63040ab0a80fa0
7843 commit 3b98b6e27f8a122dbfda9966b1afeb3e371cce91
7844 Author: djm@openbsd.org <djm@openbsd.org>
7845 Date: Fri Dec 4 02:29:25 2020 +0000
7847 upstream: memleak of DH public bignum; found with libfuzzer
7849 OpenBSD-Commit-ID: 0e913b542c3764b100b1571fdb0d0e5cc086fe97
7851 commit 553b90feedd7da5b90901d73005f86705456d686
7852 Author: djm@openbsd.org <djm@openbsd.org>
7853 Date: Fri Dec 4 02:27:57 2020 +0000
7855 upstream: fix minor memleak of kex->hostkey_alg on rekex
7857 OpenBSD-Commit-ID: 2c3969c74966d4ccdfeff5e5f0df0791919aef50
7859 commit ac0364b85e66eb53da2f9618f699ba6bd195ceea
7860 Author: djm@openbsd.org <djm@openbsd.org>
7861 Date: Fri Dec 4 02:27:08 2020 +0000
7863 upstream: typos: s/hex/kex/ in error messages
7865 OpenBSD-Commit-ID: 43a026c9571dd779ec148de1829cf5a6b6651905
7867 commit ee22db7c5885a1d90219202c0695bc621aa0409b
7868 Author: djm@openbsd.org <djm@openbsd.org>
7869 Date: Fri Dec 4 02:25:13 2020 +0000
7871 upstream: make program name be const
7873 OpenBSD-Commit-ID: ece25680ec637fdf20502721ccb0276691df5384
7875 commit 2bcbf679de838bb77a8bd7fa18e100df471a679c
7876 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7877 Date: Mon Nov 30 05:36:39 2020 +0000
7879 upstream: Ignore comments at the end of config lines in ssh_config,
7881 similar to what we already do for sshd_config. bz#2320, with & ok djm@
7883 OpenBSD-Commit-ID: bdbf9fc5bc72b1a14266f5f61723ed57307a6db4
7885 commit b755264e7d3cdf1de34e18df1af4efaa76a3c015
7886 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7887 Date: Sat Nov 28 12:52:32 2020 +0000
7889 upstream: Include cipher.h for declaration of cipher_by_name.
7891 OpenBSD-Commit-ID: ddfebbca03ca0e14e00bbad9d35f94b99655d032
7893 commit 022def7bd16c3426a95e25f57cb259d54468341c
7894 Author: djm@openbsd.org <djm@openbsd.org>
7895 Date: Sat Nov 28 03:27:59 2020 +0000
7897 upstream: check result of strchr() against NULL rather than
7899 searched-for characters; from zhongjubin@huawei.com
7901 OpenBSD-Commit-ID: e6f57de1d4a4d25f8db2d44e8d58d847e247a4fe
7903 commit 57bf03f0217554afb8980f6697a7a0b88658d0a9
7904 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7905 Date: Fri Nov 27 10:12:30 2020 +0000
7907 upstream: Document ssh-keygen -Z, sanity check its argument earlier and
7909 provide a better error message if it's not correct. Prompted by bz#2879, ok
7912 OpenBSD-Commit-ID: 484178a173e92230fb1803fb4f206d61f7b58005
7914 commit 33313ebc1c7135085676db62189e3520341d6b73
7915 Author: djm@openbsd.org <djm@openbsd.org>
7916 Date: Fri Nov 27 00:49:58 2020 +0000
7918 upstream: Set the specified TOS/DSCP for interactive use prior to
7920 TCP connect. The connection phase of the SSH session is time-sensitive (due
7921 to server side login grace periods) and is frequently interactive (e.g.
7922 entering passwords). The ultimate interactive/bulk TOS/DSCP will be set after
7923 authentication completes.
7927 OpenBSD-Commit-ID: f31ab10d9233363a6d2c9996007083ba43a093f1
7929 commit b2bcec13f17ce9174238a704e91d52203e916432
7930 Author: djm@openbsd.org <djm@openbsd.org>
7931 Date: Fri Nov 27 00:37:10 2020 +0000
7933 upstream: clean up passing of struct passwd from monitor to preauth
7935 privsep process. No longer copy entire struct w/ pointer addresses, but pass
7936 remaining scalar fields explicitly,
7938 Prompted by Yuichiro NAITO, feedback Thorsten Glaser; ok dtucker@
7940 OpenBSD-Commit-ID: 9925df75a56732c43f3663e70dd15ff413ab3e53
7942 commit 19af04e2231155d513e24fdc81fbec2217ae36a6
7943 Author: djm@openbsd.org <djm@openbsd.org>
7944 Date: Sun Nov 22 22:38:26 2020 +0000
7946 upstream: when loading PKCS#11 keys, include the key fingerprints
7948 and provider/slot information in debug output.
7950 OpenBSD-Commit-ID: 969a089575d0166a9a364a9901bb6a8d9b8a1431
7952 commit 9b9465ea856e15b9e9890b4ecb4110d7106e7766
7953 Author: djm@openbsd.org <djm@openbsd.org>
7954 Date: Sun Nov 22 22:37:11 2020 +0000
7956 upstream: when mentioning that the host key has changed, don't
7958 report the type because it is ambiguous as to whether it referred to the
7959 known or new host key. bz3216; ok dtucker@
7961 OpenBSD-Commit-ID: 2d5ce4a83dbcf44e340a572e361decad8aab7bad
7963 commit 637017a7dd3281d3f2df804993cc27c30dbfda47
7964 Author: Darren Tucker <dtucker@dtucker.net>
7965 Date: Wed Nov 25 17:38:46 2020 +1100
7967 Use "=" not "==" in string test.
7969 POSIX says "=" is string comparison and some shells (eg HP-UX) will
7970 complain about "==".
7972 commit 9880f3480f9768897f3b8e714d5317fb993bc5b3
7973 Author: Darren Tucker <dtucker@dtucker.net>
7974 Date: Fri Nov 20 17:16:51 2020 +1100
7976 Restore correct flags during localtime_r check.
7978 We were restoring the wrong thing CPPFLAGS (we used CFLAGS) for any
7979 platform that doesn't have localtime_r.
7981 commit 41935882f4e82de60dbd6e033eabe79e1b963518
7982 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7983 Date: Fri Nov 20 03:16:56 2020 +0000
7985 upstream: When doing an sftp recursive upload or download of a
7987 read-only directory, ensure that the directory is created with write and
7988 execute permissions in the interim so that we can actually complete the
7989 transfer, then set the directory permission as the final step. (The execute
7990 bit is only likely to be an issue with a non-POSIX server). bz#3222, ok djm@
7992 OpenBSD-Commit-ID: a82606212f2796e31f0e1af94a63355a7ad5d903
7994 commit 0f90440ca70abab947acbd77795e9f130967956c
7995 Author: Darren Tucker <dtucker@dtucker.net>
7996 Date: Fri Nov 20 13:37:54 2020 +1100
7998 Add new pselect6_time64 syscall on ARM.
8000 This is apparently needed on armhfp/armv7hl. bz#3232, patch from
8001 jjelen at redhat.com.
8003 commit 3a7c46c72b6a1f643b1fc3589cd20d8320c3d9e1
8004 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8005 Date: Fri Nov 20 02:14:16 2020 +0000
8007 upstream: Explicitly initialize all members of the
8009 find_by_key_ctx struct. Initializing a single member should be enough
8010 (the spec says the remainder should be initialized as per the static
8011 rules) but some GCCs warn on this which prevents us testing with -Werror
8012 on those. ok deraadt@ djm@
8014 OpenBSD-Commit-ID: 687126e60a27d30f02614760ef3c3ae4e8d6af28
8016 commit 076cb616b87d1ea1d292973fcd0ba38c08ea6832
8017 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8018 Date: Thu Nov 19 23:05:05 2020 +0000
8020 upstream: draft-ietf-secsh-architecture is now RFC4251.
8022 OpenBSD-Commit-ID: cb0bb58c2711fb5ed519507659be1dcf179ed403
8024 commit 85cceda21f1471548e04111aefe2c4943131c1c8
8025 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8026 Date: Tue Nov 17 11:23:58 2020 +0000
8028 upstream: Specify that the KDF function is bcrypt. Based on github
8030 PR#214 from rafork, ok markus@, mdoc correction jmc@
8032 OpenBSD-Commit-ID: d8f2853e7edbcd483f31b50da77ab80ffa18b4ef
8034 commit 5b9720f9adbd70ba5a994f407fe07a7d016d8d65
8035 Author: djm@openbsd.org <djm@openbsd.org>
8036 Date: Sun Nov 15 22:34:58 2020 +0000
8038 upstream: revert r1.341; it breaks ProxyJump; reported by sthen@
8040 OpenBSD-Commit-ID: 6ac2f945b26cb86d936eed338f77861d6da8356a
8042 commit 04088725ec9c44880c01799b588cd4ba47b3e8bc
8043 Author: djm@openbsd.org <djm@openbsd.org>
8044 Date: Fri Nov 13 07:30:44 2020 +0000
8046 upstream: scrub keyboard-interactive authentication prompts coming
8048 from the server through asmprintf() prior to display; suggested by and ok
8051 OpenBSD-Commit-ID: 31fe93367645c37fbfe4691596bf6cf1e3972a58
8053 commit 5442b491d0ee4bb82f6341ad0ee620ef3947f8c5
8054 Author: djm@openbsd.org <djm@openbsd.org>
8055 Date: Fri Nov 13 04:53:12 2020 +0000
8057 upstream: prefix keyboard interactive prompts with (user@host) to
8059 make it easier to determine which connection they are associated with in
8060 cases like scp -3, ProxyJump, etc. bz#3224 ok dtucker
8062 OpenBSD-Commit-ID: 67e6189b04b46c867662f8a6759cf3ecb5f59170
8064 commit 2992e4e7014ac1047062acfdbbf6feb156fef616
8065 Author: Darren Tucker <dtucker@dtucker.net>
8066 Date: Fri Nov 13 17:56:11 2020 +1100
8068 Remove use of TIME_WITH_SYS_TIME.
8070 It was only set by the recently removed AC_HEADER_TIME macro, replace
8071 with simple inclusions of both sys/time.h and time.h. Should prevent
8072 mis-detection of struct timespec.
8074 commit e3f27006f15abacb7e89fda3f5e9a0bd420b7e38
8075 Author: Damien Miller <djm@mindrot.org>
8076 Date: Fri Nov 13 14:20:43 2020 +1100
8078 Revert "detect Linux/X32 systems"
8080 This reverts commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885.
8082 The approach used was incorrect; discussion in bz#3085
8084 commit e51dc7fab61df36e43f3bc64b673f88d388cab91
8085 Author: Damien Miller <djm@mindrot.org>
8086 Date: Fri Nov 13 13:22:15 2020 +1100
8088 SELinux has deprecated security_context_t
8090 (it was only ever a char* anyway)
8092 commit b79add37d118276d67f3899987b9f0629c9449c3
8093 Author: Darren Tucker <dtucker@dtucker.net>
8094 Date: Fri Nov 13 13:43:30 2020 +1100
8096 Remove obsolete AC_HEADER_TIME macro.
8098 AC_HEADER_TIME is marked as obsolete in autoconf-2.70 and as far as I
8099 can tell everything we have that might be old enough to need it doesn't.
8101 commit d5d05cdb3d4efd4a618aa52caab5bec73097c163
8102 Author: djm@openbsd.org <djm@openbsd.org>
8103 Date: Thu Nov 12 22:56:00 2020 +0000
8105 upstream: when prompting the user to accept a new hostkey, display
8107 any other host names/addresses already associated with the key. E.g.
8109 > The authenticity of host 'test (10.0.0.1)' can't be established.
8110 > ECDSA key fingerprint is SHA256:milU4MODXm8iJQI18wlsbPG7Yup+34fuNNmV08qDnax.
8111 > This host key is known by the following other names/addresses:
8112 > ~/.ssh/known_hosts:1: host.example.org,10.0.0.1
8113 > ~/.ssh/known_hosts:2: [hashed name]
8114 > ~/.ssh/known_hosts:3: [hashed name]
8115 > ~/.ssh/known_hosts:4: host
8116 > ~/.ssh/known_hosts:5: [host]:2222
8117 > Are you sure you want to continue connecting (yes/no/[fingerprint])?
8119 feedback and ok markus@
8121 OpenBSD-Commit-ID: f6f58a77b49f1368b5883b3a1f776447cfcc7ef4
8123 commit 819b44e8b9af6ce18d3ec7505b9f461bf7991a1f
8124 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8125 Date: Thu Nov 12 22:38:57 2020 +0000
8127 upstream: Prevent integer overflow when ridiculously large
8129 ConnectTimeout is specified, capping the effective value (for most platforms)
8130 at 24 days. bz#3229, ok djm@
8132 OpenBSD-Commit-ID: 62d4c4b7b87d111045f8e9f28b5b532d17ac5bc0
8134 commit add926dd1bbe3c4db06e27cab8ab0f9a3d00a0c2
8135 Author: djm@openbsd.org <djm@openbsd.org>
8136 Date: Wed Nov 11 05:22:32 2020 +0000
8138 upstream: fix logic error that broke URI parsing in ProxyJump
8140 directives; ok dtucker@
8142 OpenBSD-Commit-ID: 96d48839b1704882a0e9a77898f5e14b2d222705
8144 commit 4340dd43928dfe746cb7e75fe920b63c0d909a9a
8145 Author: claudio@openbsd.org <claudio@openbsd.org>
8146 Date: Tue Nov 10 07:46:20 2020 +0000
8148 upstream: Free the previously allocated msg buffer after writing it
8152 OpenBSD-Commit-ID: 18c055870fc75e4cb9f926c86c7543e2e21d7fa4
8154 commit fcf429a4c69d30d8725612a55b37181594da8ddf
8155 Author: Darren Tucker <dtucker@dtucker.net>
8156 Date: Wed Nov 11 12:30:46 2020 +1100
8158 Prevent excessively long username going to PAM.
8160 This is a mitigation for a buffer overflow in Solaris' PAM username
8161 handling (CVE-2020-14871), and is only enabled for Sun-derived PAM
8162 implementations. This is not a problem in sshd itself, it only
8163 prevents sshd from being used as a vector to attack Solaris' PAM.
8164 It does not prevent the bug in PAM from being exploited via some other
8167 Based on github PR#212 from Mike Scott but implemented slightly
8168 differently. ok tim@ djm@
8170 commit 10dce8ff68ef615362cfcab0c0cc33ce524e7682
8171 Author: djm@openbsd.org <djm@openbsd.org>
8172 Date: Sun Nov 8 23:19:03 2020 +0000
8174 upstream: unbreak; missing NULL check
8176 OpenBSD-Commit-ID: 6613dfab488123f454d348ef496824476b8c11c0
8178 commit d5a0cd4fc430c8eda213a4010a612d4778867cd9
8179 Author: djm@openbsd.org <djm@openbsd.org>
8180 Date: Sun Nov 8 22:37:24 2020 +0000
8182 upstream: when requesting a security key touch on stderr, inform the
8184 user once the touch has been recorded; requested by claudio@ ok markus@
8186 OpenBSD-Commit-ID: 3b76ee444490e546b9ea7f879e4092ee0d256233
8188 commit 292bcb2479deb27204e3ff796539c003975a5f7a
8189 Author: Darren Tucker <dtucker@dtucker.net>
8190 Date: Mon Nov 9 00:33:35 2020 +1100
8192 Remove preprocessor directive from log macro calls.
8194 Preprocessor directives inside macro calls, such as the new log macros,
8195 are undefined behaviour and do not work with, eg old GCCs. Put the
8196 entire log call inside the ifdef for OPENSSL_HAS_NISTP521.
8198 commit 71693251b7cbb7dd89aaac18815147124732d0d3
8199 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8200 Date: Sun Nov 8 12:10:20 2020 +0000
8202 upstream: Add a comment documenting the source of the moduli group
8206 OpenBSD-Commit-ID: aec0725ce607630caaa62682624c6763b350391c
8208 commit 4d94b031ff88b015f0db57e140f481bff7ae1a91
8209 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8210 Date: Sun Nov 8 11:46:12 2020 +0000
8212 upstream: Replace WITH_OPENSSL ifdefs in log calls with a macro.
8214 The log calls are themselves now macros, and preprocessor directives inside
8215 macro arguments are undefined behaviour which some compilers (eg old GCCs)
8216 choke on. It also makes the code tidier. ok deraadt@
8218 OpenBSD-Commit-ID: cc12a9029833d222043aecd252d654965c351a69
8220 commit 6d2564b94e51184eb0b73b97d13a36ad50b4f810
8221 Author: Darren Tucker <dtucker@dtucker.net>
8222 Date: Fri Nov 6 17:11:16 2020 +1100
8224 Fix function body for variadic macro test.
8226 AC_LANG_PROGRAM puts its second argument inside main() so we don't need
8229 commit 586f9bd2f5980e12f8cf0d3c2a761fa63175da52
8230 Author: Darren Tucker <dtucker@dtucker.net>
8231 Date: Fri Nov 6 16:53:24 2020 +1100
8233 Remove AC_PROC_CC_C99 obsoleted in autoconf 2.70.
8235 Since we only use it to make sure we can handle variadic macros,
8236 explicitly check only for that. with & ok djm@
8238 commit a019e353df04de1b2ca78d91b39c393256044ad7
8239 Author: Darren Tucker <dtucker@dtucker.net>
8240 Date: Fri Nov 6 13:56:41 2020 +1100
8242 Replace AC_TRY_COMPILE obsoleted in autoconf 2.70.
8244 Replace with the equivalent AC_COMPILE_IFELSE.
8246 commit 771b7795c0ef6a2fb43b4c6c66b615c2085cb9cd
8247 Author: Darren Tucker <dtucker@dtucker.net>
8248 Date: Fri Nov 6 13:55:33 2020 +1100
8250 Move AC_PROG_CC_C99 to immediately afer AC_PROG_CC.
8252 This puts the related C version selection output in the same place.
8254 commit e5591161f21ab493c6284a85ac3c0710ad94998f
8255 Author: Darren Tucker <dtucker@dtucker.net>
8256 Date: Fri Nov 6 13:54:17 2020 +1100
8258 AC_CHECK_HEADER() is obsoleted in autoconf 2.70.
8260 Replace with the non-obsoleted AC_CHECK_HEADERS().
8262 commit 05bcd0cadf160fd4826a2284afa7cba6ec432633
8263 Author: djm@openbsd.org <djm@openbsd.org>
8264 Date: Tue Nov 3 22:53:12 2020 +0000
8266 upstream: fold consecutive '*' wildcards to mitigate combinatorial
8268 explosion of recursive searches; ok dtucker
8270 OpenBSD-Commit-ID: d18bcb39c40fb8a1ab61153db987e7d11dd3792b
8272 commit 7d680448db5858dc76307663f78d0b8d3c2b4a3d
8273 Author: djm@openbsd.org <djm@openbsd.org>
8274 Date: Fri Oct 30 01:50:07 2020 +0000
8276 upstream: print reason in fatal error message when
8278 kex_assemble_namelist() fails
8280 OpenBSD-Commit-ID: a9975ee8db6c98d6f32233d88051b2077ca63dab
8282 commit 95d1109fec7e89ad21f2a97e92bde1305d32a353
8283 Author: djm@openbsd.org <djm@openbsd.org>
8284 Date: Thu Oct 29 03:13:06 2020 +0000
8286 upstream: fix sshd_config SetEnv directive inside Match blocks; part of
8288 github PR#201 from github user manuelm
8290 OpenBSD-Commit-ID: 9772e3748abff3ad65ae8fc43d026ed569b1d2bc
8292 commit b12b835dc022ba161afe68348e05a83dfbcb1515
8293 Author: djm@openbsd.org <djm@openbsd.org>
8294 Date: Thu Oct 29 03:01:18 2020 +0000
8296 upstream: fix type of nid in type_bits_valid(); github PR#202 from
8298 github user thingsconnected
8300 OpenBSD-Commit-ID: 769d2b040dec7ab32d323daf54b854dd5dcb5485
8302 commit 1a14c13147618144d1798c36a588397ba9008fcc
8303 Author: djm@openbsd.org <djm@openbsd.org>
8304 Date: Thu Oct 29 02:52:43 2020 +0000
8306 upstream: whitespace; no code change
8308 OpenBSD-Commit-ID: efefc1c47e880887bdee8cd2127ca93177eaad79
8310 commit 815209abfdd2991fb92ad7d2e33374916cdcbcf4
8311 Author: djm@openbsd.org <djm@openbsd.org>
8312 Date: Thu Oct 29 02:47:23 2020 +0000
8314 upstream: UpdateHostkeys: fixed/better detection of host keys that
8316 exist under other names and addresses; spotted by and debugged with lots of
8319 OpenBSD-Commit-ID: 5113d7f550bbd48243db1705afbf16b63792d4b7
8321 commit a575cf44e59a65506c67bddb62a712208a7a279c
8322 Author: Duncan Eastoe <duncan.eastoe@att.com>
8323 Date: Wed Oct 21 10:11:10 2020 +0100
8325 session.c: use "denylist" terminology
8327 Follow upstream (6d755706a0059eb9e2d63517f288b75cbc3b4701) language
8328 improvements in this portable-specific code.
8330 commit 33267feaffd5d98aa56d2f0b3a99ec352effe938
8331 Author: Damien Miller <djm@mindrot.org>
8332 Date: Tue Oct 27 16:46:31 2020 +1100
8334 Remove checks for strict POSIX mkdtemp()
8336 We needed a mkdtemp() that accepted template paths that did not
8337 end in XXXXXX a long time ago for KRB4, but that code is long
8338 deprecated. We no longer need to replace mkdtemp() for strictly
8339 following POSIX. ok dtucker@
8341 commit 492d70e18bad5a8c97d05f5eddac817171e88d2c
8342 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8343 Date: Mon Oct 26 00:39:04 2020 +0000
8345 upstream: Minor man page fixes (capitalization, commas) identified by
8347 the manpage-l10n project via bz#3223. feedback deraadt@, ok jmc@
8349 OpenBSD-Commit-ID: ab83af0daf18369244a72daaec6c4a58a9eb7e2c
8351 commit eab2888cfc6cc4e2ef24bd017da9835a0f365f3f
8352 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8353 Date: Mon Oct 19 22:49:23 2020 +0000
8355 upstream: Adapt XMSS to new logging infrastructure. With markus@, ok
8359 OpenBSD-Commit-ID: 9c35ec3aa0f710e4e3325187ceff4fa3791686de
8361 commit f7bd11e4941620991f3e727cd0131b01f0311a58
8362 Author: djm@openbsd.org <djm@openbsd.org>
8363 Date: Mon Oct 19 08:07:08 2020 +0000
8365 upstream: fix SEGV on fatal() errors spotted by dtucker@
8367 OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2
8369 commit 7715a3b171049afa1feffb1d5a1245dfac36ce99
8370 Author: Darren Tucker <dtucker@dtucker.net>
8371 Date: Mon Oct 19 10:54:41 2020 +1100
8373 Use fatal_fr not fatal_r when passing r.
8375 Caught by the PAM -Werror tinderbox build.
8377 commit 816036f142ecd284c12bb3685ae316a68d2ef190
8378 Author: djm@openbsd.org <djm@openbsd.org>
8379 Date: Sun Oct 18 11:32:01 2020 +0000
8381 upstream: use the new variant log macros instead of prepending
8383 __func__ and appending ssh_err(r) manually; ok markus@
8385 OpenBSD-Commit-ID: 1f14b80bcfa85414b2a1a6ff714fb5362687ace8
8387 commit 9e2c4f64224f68fb84c49b5182e449f94b0dc985
8388 Author: djm@openbsd.org <djm@openbsd.org>
8389 Date: Sun Oct 18 11:21:59 2020 +0000
8391 upstream: variants of the log methods that append a ssherr.h string
8393 from a supplied error code; ok markus@
8395 OpenBSD-Commit-ID: aed98c4435d48d036ae6740300f6a8357b7cc0bf
8397 commit 28cb0a4b03940d1ee576eb767a81a4113bdc917e
8398 Author: djm@openbsd.org <djm@openbsd.org>
8399 Date: Sun Oct 18 11:14:27 2020 +0000
8401 upstream: remove a level of macro indirection; ok markus@
8403 OpenBSD-Commit-ID: 0c529d06e902c5d1a6b231e1bec6157f76dc67c9
8405 commit 9cac1db52e6c4961c447910fe02cd68a3b2f9460
8406 Author: djm@openbsd.org <djm@openbsd.org>
8407 Date: Sun Oct 18 11:13:45 2020 +0000
8409 upstream: add some variant log.h calls that prepend the calling
8411 function name; ok markus@
8413 OpenBSD-Commit-ID: 4be1b2e2455b271ddb7457bc195c5367644f4e48
8415 commit d55dfed34ef6ef1f028d552a90d5f3dba8dd6f7b
8416 Author: Damien Miller <djm@mindrot.org>
8417 Date: Sat Oct 17 22:55:24 2020 +1100
8421 commit 999d7cb79a3a73d92a6dfbf174c33da0d984c7a2
8422 Author: Damien Miller <djm@mindrot.org>
8423 Date: Sat Oct 17 22:47:52 2020 +1100
8425 sync regress/misc/sk-dummy/fatal.c
8427 commit 3554b4afa38b3483a3302f1be18eaa6f843bb260
8428 Author: djm@openbsd.org <djm@openbsd.org>
8429 Date: Sat Oct 17 01:28:20 2020 +0000
8431 upstream: make the log functions that exit (sshlogdie(),
8433 sshfatal(), etc) have identical signatures. Makes things a bit more
8436 OpenBSD-Commit-ID: bd0ae124733389d7c0042e135c71ee9091362eb9
8438 commit 616029a85ad7529b24bb8c4631d9607c0d6e7afe
8439 Author: jmc@openbsd.org <jmc@openbsd.org>
8440 Date: Fri Oct 16 14:34:33 2020 +0000
8442 upstream: add space between macro arg and punctuation;
8444 OpenBSD-Commit-ID: bb81e2ed5a77832fe62ab30a915ae67cda57633e
8446 commit f812a36cee5727147bc897d34ab9af068dd4561e
8447 Author: Damien Miller <djm@mindrot.org>
8448 Date: Sat Oct 17 12:03:34 2020 +1100
8450 check for and require a C99 capable compiler
8452 recent logging changes use __VA_ARGS__.
8454 commit f9ea6515202b59a1e2d5b885cafc1b12eff33016
8455 Author: Damien Miller <djm@mindrot.org>
8456 Date: Sat Oct 17 11:51:20 2020 +1100
8458 logging is now macros, remove function pointers
8460 commit 0f938f998626e8359324f803157cd7c9f8f403e2
8461 Author: Damien Miller <djm@mindrot.org>
8462 Date: Sat Oct 17 11:42:26 2020 +1100
8464 adapt sk-dummy's fatal implementation to changes
8466 commit afbd9ec9e2dbad04834ce7ce53e58740434f32a5
8467 Author: Damien Miller <djm@mindrot.org>
8468 Date: Sat Oct 17 11:33:13 2020 +1100
8470 fix netcat build problem
8472 commit 793b583d097381730adaf6f68bed3c343139a013
8473 Author: djm@openbsd.org <djm@openbsd.org>
8474 Date: Fri Oct 16 13:26:13 2020 +0000
8476 upstream: LogVerbose keyword for ssh and sshd
8478 Allows forcing maximum debug logging by file/function/line pattern-
8483 OpenBSD-Commit-ID: c294c25732d1b4fe7e345cb3e044df00531a6356
8485 commit 752250caabda3dd24635503c4cd689b32a650794
8486 Author: djm@openbsd.org <djm@openbsd.org>
8487 Date: Fri Oct 16 13:24:45 2020 +0000
8489 upstream: revised log infrastructure for OpenSSH
8491 log functions receive function, filename and line number of caller.
8492 We can use this to selectively enable logging via pattern-lists.
8496 OpenBSD-Commit-ID: 51a472610cbe37834ce6ce4a3f0e0b1ccc95a349
8498 commit acadbb3402b70f72f14d9a6930ad41be97c2f9dc
8499 Author: djm@openbsd.org <djm@openbsd.org>
8500 Date: Fri Oct 16 02:37:12 2020 +0000
8502 upstream: use do_log2 instead of function pointers to different log
8506 OpenBSD-Commit-ID: 88077b826d348c58352a6b394755520f4e484480
8508 commit 95b0bcfd1531d59e056ae8af27bb741391f26ab0
8509 Author: djm@openbsd.org <djm@openbsd.org>
8510 Date: Wed Oct 14 00:55:17 2020 +0000
8512 upstream: make UpdateHostkeys still more conservative: refuse to
8514 proceed if one of the keys offered by the server is already in known_hosts
8515 under another name. This avoid collisions between address entries for
8516 different host aliases when CheckHostIP=yes
8518 Also, do not attempt to fix known_hosts with incomplete host/ip matches
8519 when there are no new or deprecated hostkeys.
8521 OpenBSD-Commit-ID: 95c19842f7c41f9bd9c92aa6441a278c0fd0c4a3
8523 commit a336ce8c2c55547cc00e0070a18c55f30bb53fb6
8524 Author: kn@openbsd.org <kn@openbsd.org>
8525 Date: Mon Oct 12 08:36:36 2020 +0000
8527 upstream: Zap unused family parameter from ssh_connect_direct()
8529 sshconnect.c r1.241 from 2013 made it unused; found while reading code.
8533 OpenBSD-Commit-ID: 219ba6d7f9925d0b7992918612680399d86712b5
8535 commit e545d94b713effab8e6c7dfabbfb76c1d84d7498
8536 Author: Philip Hands <phil@hands.com>
8537 Date: Sun Oct 4 00:15:46 2020 +0200
8539 shift contents of long $() into filter_ids()
8541 This was prompted by the fact that posh does not deal with $()
8542 that contains comments where the comment includes an odd number
8543 of single-quotes. It seems to get befuddled into trying to find
8545 Regardless, making a function for filtering the unneeded ids
8546 seems much neater than avoiding apostrophes,
8547 so that's what I've done.
8549 SSH-Copy-ID-Upstream: 3dab3366a584427045c8a690a93282f02c09cf24
8551 commit fd360174596047b52aa1cddda74d85012a03ca4b
8552 Author: Philip Hands <phil@hands.com>
8553 Date: Sat Oct 3 23:15:16 2020 +0200
8555 combine if/elif to avoid duplication of the action
8557 SSH-Copy-ID-Upstream: 42aeb1cc53d3f7f6e78edc210fb121fda0834914
8559 commit f7c3a39b016dd77709ecbf18da8282f967b86cd7
8560 Author: Philip Hands <phil@hands.com>
8561 Date: Sat Oct 3 21:45:16 2020 +0200
8565 SSH-Copy-ID-Upstream: 5b08f840e78ac544288b3983010a1b0585e966fd
8567 commit 108676c3f26be6c873db0dd8754063699908727b
8568 Author: Philip Hands <phil@hands.com>
8569 Date: Sat Oct 3 21:10:03 2020 +0200
8571 tidy up test of $SCRATCH_DIR creation
8573 SSH-Copy-ID-Upstream: 2d8b22d96c105d87743ffe8874887b06f8989b93
8575 commit a9c9e91a82bc1a2cf801b4e3ef27a941dbd27717
8576 Author: Philip Hands <phil@hands.com>
8577 Date: Wed Sep 16 16:13:30 2020 +0200
8579 add -s flag: to install keys via SFTP
8581 This is prompted by:
8583 https://bugzilla.mindrot.org/show_bug.cgi?id=3201
8585 Thanks go to Matthias Blümel for the idea, and the helpful patch, from
8586 which this patch grew.
8588 SSH-Copy-ID-Upstream: f7c76dc64427cd20287a6868f672423b62057614
8590 commit f92424970c02b78852ff149378c7f2616ada4ccf
8591 Author: djm@openbsd.org <djm@openbsd.org>
8592 Date: Sun Oct 11 22:14:38 2020 +0000
8594 upstream: UpdateHostkeys: check for keys under other names
8596 Stop UpdateHostkeys from automatically removing deprecated keys from
8597 known_hosts files if the same keys exist under a different name or
8598 address to the host that is being connected to.
8600 This avoids UpdateHostkeys from making known_hosts inconsistent in
8601 some cases. For example, multiple host aliases sharing address-based
8602 known_hosts on different lines, or hosts that resolves to multiple
8607 OpenBSD-Commit-ID: 6444a705ba504c3c8ccddccd8d1b94aa33bd11c1
8609 commit d98f14b5328922ae3085e07007d820c4f655b57a
8610 Author: djm@openbsd.org <djm@openbsd.org>
8611 Date: Sun Oct 11 22:13:37 2020 +0000
8613 upstream: UpdateHostkeys: better CheckHostIP handling
8615 When preparing to update the known_hosts file, fully check both
8616 entries for both the host and the address (if CheckHostIP enabled)
8617 and ensure that, at the end of the operation, entries for both are
8620 Make sure this works with HashKnownHosts too, which requires maintaining
8621 a list of entry-types seen across the whole file for each key.
8625 OpenBSD-Commit-ID: 374dc263103f6b343d9671f87dbf81ffd0d6abdd
8627 commit af5941ae9b013aac12585e84c4cf494f3728982f
8628 Author: djm@openbsd.org <djm@openbsd.org>
8629 Date: Sun Oct 11 22:12:44 2020 +0000
8631 upstream: UpdateHostkeys: better detect manual host entries
8633 Disable UpdateHostkeys if the known_hosts line has more than two
8634 entries in the pattern-list. ssh(1) only writes "host" or "host,ip"
8635 lines so anything else was added by a different tool or by a human.
8639 OpenBSD-Commit-ID: e434828191fb5f3877d4887c218682825aa59820
8641 commit 6247812c76f70b2245f3c23f5074665b3d436cae
8642 Author: djm@openbsd.org <djm@openbsd.org>
8643 Date: Thu Oct 8 01:15:16 2020 +0000
8645 upstream: don't misdetect comma-separated hostkey names as wildcards;
8649 OpenBSD-Commit-ID: 4b874edfec7fc324a21b130bdb42f912177739ce
8651 commit 67146c7d022a170be3cdad2f5f40259a663fb266
8652 Author: wangxp006 <wangxiaopeng7@huawei.com>
8653 Date: Thu Oct 8 17:49:59 2020 +0800
8655 fix TEST_MALLOC_OPTIONS var
8657 commit 3205eaa3f8883a34fa4559ddef6c90d1067c5cce
8658 Author: djm@openbsd.org <djm@openbsd.org>
8659 Date: Thu Oct 8 00:31:05 2020 +0000
8661 upstream: clarify conditions for UpdateHostkeys
8663 OpenBSD-Commit-ID: 9cba714cf6aeed769f998ccbe8c483077a618e27
8665 commit e8dfca9bfeff05de87160407fb3e6a5717fa3dcb
8666 Author: djm@openbsd.org <djm@openbsd.org>
8667 Date: Wed Oct 7 06:38:16 2020 +0000
8669 upstream: remove GlobalKnownHostsFile for this test after
8671 UpdateHostkeys change
8673 OpenBSD-Regress-ID: a940ad79d59343319613ba8fc46b6ef24aa3f8e1
8675 commit 4aa2717d7517cff4bc423a6cfba3a2defb055aea
8676 Author: djm@openbsd.org <djm@openbsd.org>
8677 Date: Wed Oct 7 02:26:28 2020 +0000
8679 upstream: Disable UpdateHostkeys when hostkey checking fails
8681 If host key checking fails (i.e. a wrong host key is recorded for the
8682 server) and the user elects to continue (via StrictHostKeyChecking=no),
8683 then disable UpdateHostkeys for the session.
8685 reminded by Mark D. Baushke; ok markus@
8687 OpenBSD-Commit-ID: 98b524f121f4252309dd21becd8c4cacb0c6042a
8689 commit 04c06d04475f1f673e9d9743710d194453fe3888
8690 Author: djm@openbsd.org <djm@openbsd.org>
8691 Date: Wed Oct 7 02:25:43 2020 +0000
8693 upstream: Fix UpdateHostkeys/HashKnownHosts/CheckHostIP bug
8695 When all of UpdateHostkeys, HashKnownHosts and ChechHostIP
8696 were enabled and new host keys were learned, known_hosts IP
8697 entries were not being recorded for new host keys.
8699 reported by matthieu@ ok markus@
8701 OpenBSD-Commit-ID: a654a8290bd1c930aac509e8158cf85e42e49cb7
8703 commit b70e33711291f3081702133175a41cccafc0212a
8704 Author: djm@openbsd.org <djm@openbsd.org>
8705 Date: Wed Oct 7 02:24:51 2020 +0000
8707 upstream: don't UpdateHostkeys when the hostkey is verified by the
8709 GlobalKnownHostsFile file, support only UserKnownHostsFile matches
8711 suggested by Mark D. Baushke; feedback and ok markus@
8713 OpenBSD-Commit-ID: eabb771a6add676c398d38a143a1aff5f04abbb9
8715 commit aa623142e426ca1ab9db77b06dcc9b1b70bd102b
8716 Author: djm@openbsd.org <djm@openbsd.org>
8717 Date: Wed Oct 7 02:22:23 2020 +0000
8719 upstream: revert kex->flags cert hostkey downgrade back to a plain
8721 key (commitid VtF8vozGOF8DMKVg). We now do this a simpler way that needs less
8726 OpenBSD-Commit-ID: fb92d25b216bff8c136da818ac2221efaadf18ed
8728 commit f4f14e023cafee1cd9ebe4bb0db4029e6e1fafac
8729 Author: djm@openbsd.org <djm@openbsd.org>
8730 Date: Wed Oct 7 02:20:35 2020 +0000
8732 upstream: simply disable UpdateHostkeys when a certificate
8734 successfully authenticated the host; simpler than the complicated plumbing
8735 via kex->flags we have now.
8739 OpenBSD-Commit-ID: 80e39644eed75717d563a7f177e8117a0e14f42c
8741 commit e79957e877db42c4c68fabcf6ecff2268e53acb5
8742 Author: djm@openbsd.org <djm@openbsd.org>
8743 Date: Wed Oct 7 02:18:45 2020 +0000
8745 upstream: disable UpdateHostkeys by default if VerifyHostKeyDNS is
8747 enabled; suggested by Mark D. Baushke
8749 OpenBSD-Commit-ID: 85a1b88592c81bc85df7ee7787dbbe721a0542bf
8751 commit 3d4c2016bae1a6f14b48c1150a4c79ca4c9968bd
8752 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8753 Date: Tue Oct 6 07:12:04 2020 +0000
8755 upstream: Agent protocol draft is now at rev 4. ok djm@
8757 OpenBSD-Commit-ID: 8c01ea3aae48aab45e01b7421b0fca2dad5e7837
8759 commit af889a40ffc113af9105c03d7b32131eb4372d50
8760 Author: djm@openbsd.org <djm@openbsd.org>
8761 Date: Sun Oct 4 09:45:01 2020 +0000
8763 upstream: when ordering host key algorithms in the client, consider
8765 the ECDSA key subtype; ok markus@
8767 OpenBSD-Commit-ID: 3097686f853c61ff61772ea35f8b699931392ece
8769 commit 2d39fc9f7e039351daa3d6aead1538ac29258add
8770 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8771 Date: Sun Oct 4 03:04:02 2020 +0000
8773 upstream: Allow full range of UIDs and GIDs for sftp chown and
8775 chgrp on 32bit platforms instead of being limited by LONG_MAX. bz#3206,
8776 found by booking00 at sina.cn, ok markus@
8778 OpenBSD-Commit-ID: 373b7bbf1f15ae482d39567ce30d18b51c9229b5
8780 commit 396d32f3a1a16e54df2a76b2a9b237868580dcbe
8781 Author: djm@openbsd.org <djm@openbsd.org>
8782 Date: Sat Oct 3 09:22:26 2020 +0000
8784 upstream: There are lots of place where we want to redirect stdin,
8786 stdout and/or stderr to /dev/null. Factor all these out to a single
8787 stdfd_devnull() function that allows selection of which of these to redirect.
8790 OpenBSD-Commit-ID: 3033ba5a4c47cacfd5def020d42cabc52fad3099
8792 commit 1286981d08b8429a64613215ce8bff3f6b32488a
8793 Author: djm@openbsd.org <djm@openbsd.org>
8794 Date: Sat Oct 3 08:30:47 2020 +0000
8796 upstream: enable UpdateHostkeys by default when the configuration
8798 has not overridden UserKnownHostsFile; ok markus@ "The timing is perfect"
8801 OpenBSD-Commit-ID: 62df71c9c5242da5763cb473c2a2deefbd0cef60
8803 commit 332f21537293d66508f7342dc643bc7fe45f0f69
8804 Author: djm@openbsd.org <djm@openbsd.org>
8805 Date: Sat Oct 3 08:12:59 2020 +0000
8807 upstream: disable UpdateHostkeys when a wildcard hostname pattern
8809 is encountered or when a certificate host key is in use. feedback/ok markus@
8811 OpenBSD-Commit-ID: b6e5575af7e6732322be82ec299e09051a5413bd
8813 commit 13cee44ef907824083d89cb9395adbbd552e46c1
8814 Author: djm@openbsd.org <djm@openbsd.org>
8815 Date: Sat Oct 3 08:11:28 2020 +0000
8817 upstream: record when the host key checking code downgrades a
8819 certificate host key to a plain key. This occurs when the user connects to a
8820 host with a certificate host key but no corresponding CA key configured in
8821 known_hosts; feedback and ok markus@
8823 OpenBSD-Commit-ID: 2ada81853ff9ee7824c62f440bcf4ad62030c901
8825 commit 12ae8f95e2e0c273e9e7ef930b01a028ef796a3f
8826 Author: djm@openbsd.org <djm@openbsd.org>
8827 Date: Sat Oct 3 04:15:06 2020 +0000
8829 upstream: prefer ed25519 signature algorithm variants to ECDSA; ok
8833 OpenBSD-Commit-ID: 82187926fca96d35a5b5afbc091afa84e0966e5b
8835 commit e5ed753add7aa8eed6b167e44db6240a76404db2
8836 Author: djm@openbsd.org <djm@openbsd.org>
8837 Date: Sat Oct 3 03:40:38 2020 +0000
8839 upstream: want time.h here too
8841 OpenBSD-Commit-ID: fafee8f1108c64ad8b282f9a1ed5ea830d8c58a7
8843 commit 66bd9fdf8b7762eb6a85cabbb1ae4ed955679f60
8844 Author: deraadt@openbsd.org <deraadt@openbsd.org>
8845 Date: Sat Oct 3 02:18:33 2020 +0000
8847 upstream: split introductory paragraph, and insert ominous words about
8849 the glob issue, which cannot be fully fixed and really requires completely
8850 replacing scp with a completely different subsystem. team effort to find the
8853 OpenBSD-Commit-ID: 58e1f72d292687f63eb357183036ee242513691c
8855 commit 86cc8ce002ea10e88a4c5d622a8fdfab8a7d261f
8856 Author: Damien Miller <djm@mindrot.org>
8857 Date: Sat Oct 3 13:38:55 2020 +1000
8859 use relative rather than system include here
8861 commit 922cfac5ed5ead9f796f7d39f012dd653dc5c173
8862 Author: Damien Miller <djm@mindrot.org>
8863 Date: Sat Oct 3 13:38:41 2020 +1000
8865 add some openbsd-compat licenses we missed
8867 commit ce941c75ea9cd6c358508a5b206809846c8d9240
8868 Author: Philip Hands <phil@hands.com>
8869 Date: Sat Oct 3 00:20:07 2020 +0200
8871 un-nest $() to make ksh cheerful
8873 commit 18ea5f4b88e303677d2003b95e5cb864b439e442
8874 Author: Philip Hands <phil@hands.com>
8875 Date: Fri Oct 2 21:30:10 2020 +0200
8877 ksh doesn't grok 'local'
8879 and AFAICT it's not actually doing anything useful in the code, so let's
8880 see how things go without it.
8882 commit d9e727dcc04a52caaac87543ea1d230e9e6b5604
8883 Author: Oleg <Fallmay@users.noreply.github.com>
8884 Date: Thu Oct 1 12:09:08 2020 +0300
8886 Fix `EOF: command not found` error in ssh-copy-id
8888 commit a1a856d50c89be3206f320baa4bfb32fff4e826f
8889 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8890 Date: Wed Sep 30 09:11:39 2020 +0000
8892 upstream: Regen moduli.
8894 OpenBSD-Commit-ID: 04967f8c43e9854ac34b917bcd6f5ac96c53a693
8896 commit fa1fe3ead7069d90d3c67d62137ad66acfcc9f48
8897 Author: HARUYAMA Seigo <haruyama@unixuser.org>
8898 Date: Sun Sep 27 20:06:20 2020 +0900
8900 Restore first section title of INSTALL
8902 commit 279261e1ea8150c7c64ab5fe7cb4a4ea17acbb29
8903 Author: Damien Miller <djm@mindrot.org>
8904 Date: Sun Sep 27 17:25:01 2020 +1000
8906 update version numbers
8908 commit 58ca6ab6ff035ed12b5078e3e9c7199fe72c8587
8909 Author: djm@openbsd.org <djm@openbsd.org>
8910 Date: Sun Sep 27 07:22:05 2020 +0000
8912 upstream: openssh 8.4
8914 OpenBSD-Commit-ID: a29e5b372d2c00e297da8a35a3b87c9beb3b4a58
8916 commit 9bb8a303ce05ff13fb421de991b495930be103c3
8917 Author: Damien Miller <djm@mindrot.org>
8918 Date: Tue Sep 22 10:07:43 2020 +1000
8920 sync with upstream ssh-copy-id rev f0da1a1b7
8922 commit 0a4a5571ada76b1b012bec9cf6ad1203fc19ec8d
8923 Author: djm@openbsd.org <djm@openbsd.org>
8924 Date: Mon Sep 21 07:29:09 2020 +0000
8926 upstream: close stdin when forking after authentication too; ok markus
8928 OpenBSD-Commit-ID: 43db17e4abc3e6b4a7b033aa8cdab326a7cb6c24
8930 commit d14fe25e6c3b89f8af17e2894046164ac3b45688
8931 Author: djm@openbsd.org <djm@openbsd.org>
8932 Date: Sun Sep 20 23:31:46 2020 +0000
8934 upstream: close stdout/stderr after "ssh -f ..." forking
8938 OpenBSD-Commit-ID: e2d83cc4dea1665651a7aa924ad1ed6bcaaab3e2
8940 commit 53a33a0d745179c02108589e1722457ca8ae4372
8941 Author: Damien Miller <djm@mindrot.org>
8942 Date: Sun Sep 20 15:57:09 2020 +1000
8946 commit 107eb3eeafcd390e1fa7cc7672a05e994d14013e
8947 Author: djm@openbsd.org <djm@openbsd.org>
8948 Date: Sun Sep 20 05:47:25 2020 +0000
8950 upstream: cap channel input buffer size at 16MB; avoids high memory use
8952 when peer advertises a large window but is slow to consume the data we send
8953 (e.g. because of a slow network)
8955 reported by Pierre-Yves David
8957 fix with & ok markus@
8959 OpenBSD-Commit-ID: 1452771f5e5e768876d3bfe2544e3866d6ade216
8961 commit acfe2ac5fe033e227ad3a56624fbbe4af8b5da04
8962 Author: Damien Miller <djm@mindrot.org>
8963 Date: Fri Sep 18 22:02:53 2020 +1000
8965 libfido2 1.5.0 is recommended
8967 commit 52a03e9fca2d74eef953ddd4709250f365ca3975
8968 Author: djm@openbsd.org <djm@openbsd.org>
8969 Date: Fri Sep 18 08:16:38 2020 +0000
8971 upstream: handle multiple messages in a single read()
8973 PR#183 by Dennis Kaarsemaker; feedback and ok markus@
8975 OpenBSD-Commit-ID: 8570bb4d02d00cf70b98590716ea6a7d1cce68d1
8977 commit dc098405b2939146e17567a25b08fc6122893cdf
8978 Author: pedro martelletto <pedro@ambientworks.net>
8979 Date: Fri Sep 18 08:57:29 2020 +0200
8981 configure.ac: add missing includes
8983 when testing, make sure to include the relevant header files that
8984 declare the types of the functions used by the test:
8986 - stdio.h for printf();
8987 - stdlib.h for exit();
8988 - string.h for strcmp();
8989 - unistd.h for unlink(), _exit(), fork(), getppid(), sleep().
8991 commit b3855ff053f5078ec3d3c653cdaedefaa5fc362d
8992 Author: djm@openbsd.org <djm@openbsd.org>
8993 Date: Fri Sep 18 05:23:03 2020 +0000
8995 upstream: tweak the client hostkey preference ordering algorithm to
8997 prefer the default ordering if the user has a key that matches the
8998 best-preference default algorithm.
9000 feedback and ok markus@
9002 OpenBSD-Commit-ID: a92dd7d7520ddd95c0a16786a7519e6d0167d35f
9004 commit f93b187ab900c7d12875952cc63350fe4de8a0a8
9005 Author: Damien Miller <djm@mindrot.org>
9006 Date: Fri Sep 18 14:55:48 2020 +1000
9008 control over the colours in gnome-ssh-askpass[23]
9010 Optionally set the textarea colours via $GNOME_SSH_ASKPASS_FG_COLOR and
9011 $GNOME_SSH_ASKPASS_BG_COLOR. These accept the usual three or six digit
9014 commit 9d3d36bdb10b66abd1af42e8655502487b6ba1fa
9015 Author: Damien Miller <djm@mindrot.org>
9016 Date: Fri Sep 18 14:50:38 2020 +1000
9018 focus improvement for gnome-ssh-askpass[23]
9020 When serving a SSH_ASKPASS_PROMPT=none information dialog, ensure
9021 then <enter> doesn't immediately close the dialog. Instead, require an
9022 explicit <tab> to reach the close button, or <esc>.
9024 commit d6f507f37e6c75a899db0ef8224e72797c5563b6
9025 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9026 Date: Wed Sep 16 03:07:31 2020 +0000
9028 upstream: Remove unused buf, last user was removed when switching
9030 to the sshbuf API. Patch from Sebastian Andrzej Siewior.
9032 OpenBSD-Commit-ID: 250fa17f0cec01039cc4abd95917d9746e24c889
9034 commit c3c786c3a0973331ee0922b2c51832a3b8d7f20f
9035 Author: djm@openbsd.org <djm@openbsd.org>
9036 Date: Wed Sep 9 21:57:27 2020 +0000
9038 upstream: For the hostkey confirmation message:
9040 > Are you sure you want to continue connecting (yes/no/[fingerprint])?
9042 compare the fingerprint case sensitively; spotted Patrik Lundin
9045 OpenBSD-Commit-ID: 73097afee1b3a5929324e345ba4a4a42347409f2
9047 commit f2950baf0bafe6aa20dfe2e8d1ca4b23528df617
9048 Author: Darren Tucker <dtucker@dtucker.net>
9049 Date: Fri Sep 11 14:45:23 2020 +1000
9051 New config-build-time dependency on automake.
9053 commit 600c1c27abd496372bd0cf83d21a1c119dfdf9a5
9054 Author: Darren Tucker <dtucker@dtucker.net>
9055 Date: Sun Sep 6 21:56:36 2020 +1000
9057 Add aclocal.m4 and config.h.in~ to .gitignore.
9059 aclocal.m4 is now generated by autoreconf.
9061 commit 4bf7e1d00b1dcd3a6b3239f77465c019e61c6715
9062 Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9063 Date: Sat Sep 5 17:50:03 2020 +0200
9065 Quote the definition of OSSH_CHECK_HEADER_FOR_FIELD
9067 autoreconf complains about underquoted definition of
9068 OSSH_CHECK_HEADER_FOR_FIELD after aclocal.m4 has been and now is beeing
9071 Quote OSSH_CHECK_HEADER_FOR_FIELD as suggested.
9073 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9075 commit a2f3ae386b5f7938ed3c565ad71f30c4f7f010f1
9076 Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9077 Date: Sat Sep 5 17:50:02 2020 +0200
9079 Move the local m4 macros
9081 The `aclocal' step is skipped during `autoreconf' because aclocal.m4 is
9083 Move the current aclocal.m4 which contains local macros into the m4/
9084 folder. With this change the aclocal.m4 will be re-created during
9085 changes to the m4/ macro.
9086 This is needed so the `aclocal' can fetch m4 macros from the system if
9087 they are references in the configure script. This is a prerequisite to
9088 use PKG_CHECK_MODULES.
9090 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9092 commit 8372bff3a895b84fd78a81dc39da10928b662f5a
9093 Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9094 Date: Sat Sep 5 17:50:01 2020 +0200
9096 Remove HAVE_MMAP and BROKEN_MMAP
9098 BROKEN_MMAP is no longer defined since commit
9099 1cfd5c06efb12 ("Remove portability support for mmap")
9101 this commit also removed other HAVE_MMAP user. I didn't find anything
9102 that defines HAVE_MMAP. The check does not trigger because compression
9103 on server side is by default COMP_DELAYED (2) so it never triggers.
9105 Remove remaining HAVE_MMAP and BROKEN_MMAP bits.
9107 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9109 commit bbf20ac8065905f9cb9aeb8f1df57fcab52ee2fb
9110 Author: djm@openbsd.org <djm@openbsd.org>
9111 Date: Wed Sep 9 03:10:21 2020 +0000
9113 upstream: adapt to SSH_SK_VERSION_MAJOR crank
9115 OpenBSD-Regress-ID: 0f3e76bdc8f9dbd9d22707c7bdd86051d5112ab8
9117 commit 9afe2a150893b20bdf9eab764978d817b9a7b783
9118 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9119 Date: Fri Aug 28 03:17:13 2020 +0000
9121 upstream: Ensure that address/mask mismatches are flagged at
9123 config-check time. ok djm@
9125 OpenBSD-Regress-ID: 8f5f4c2c0bf00e6ceae7a1755a444666de0ea5c2
9127 commit c76773524179cb654ff838dd43ba1ddb155bafaa
9128 Author: djm@openbsd.org <djm@openbsd.org>
9129 Date: Wed Sep 9 03:08:01 2020 +0000
9131 upstream: when writing an attestation blob for a FIDO key, record all
9133 the data needed to verify the attestation. Previously we were missing the
9134 "authenticator data" that is included in the signature.
9136 spotted by Ian Haken
9137 feedback Pedro Martelletto and Ian Haken; ok markus@
9139 OpenBSD-Commit-ID: 8439896e63792b2db99c6065dd9a45eabbdb7e0a
9141 commit c1c44eeecddf093a7983bd91e70b446de789b363
9142 Author: pedro martelletto <pedro@ambientworks.net>
9143 Date: Tue Sep 1 17:01:55 2020 +0200
9145 configure.ac: fix libfido2 back-compat
9147 - HAVE_FIDO_CRED_PROD -> HAVE_FIDO_CRED_PROT;
9148 - check for fido_dev_get_touch_begin(), so that
9149 HAVE_FIDO_DEV_GET_TOUCH_BEGIN gets defined.
9151 commit 785f0f315bf7ac5909e988bb1ac3e019fb5e1594
9152 Author: djm@openbsd.org <djm@openbsd.org>
9153 Date: Mon Aug 31 04:33:17 2020 +0000
9155 upstream: refuse to add verify-required (PINful) FIDO keys to
9157 ssh-agent until the agent supports them properly
9159 OpenBSD-Commit-ID: 125bd55a8df32c87c3ec33c6ebe437673a3d037e
9161 commit 39e88aeff9c7cb6862b37ad1a87a03ebbb38c233
9162 Author: djm@openbsd.org <djm@openbsd.org>
9163 Date: Mon Aug 31 00:17:41 2020 +0000
9165 upstream: Add RCS IDs to the few files that are missing them; from
9169 OpenBSD-Commit-ID: 39aa37a43d0c75ec87f1659f573d3b5867e4a3b3
9171 commit 72730249b38a676da94a1366b54a6e96e6928bcb
9172 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9173 Date: Fri Aug 28 03:15:52 2020 +0000
9175 upstream: Check that the addresses supplied to Match Address and
9177 Match LocalAddress are valid when parsing in config-test mode. This will
9178 catch address/mask mismatches before they cause problems at runtime. Found by
9179 Daniel Stocker, ok djm@
9181 OpenBSD-Commit-ID: 2d0b10c69fad5d8fda4c703e7c6804935289378b
9183 commit 2a3a9822311a565a9df48ed3b6a3c972f462bd7d
9184 Author: jmc@openbsd.org <jmc@openbsd.org>
9185 Date: Thu Aug 27 12:34:00 2020 +0000
9187 upstream: sentence fix; from pedro martelletto
9189 OpenBSD-Commit-ID: f95b84a1e94e9913173229f3787448eea2f8a575
9191 commit ce178be0d954b210c958bc2b9e998cd6a7aa73a9
9192 Author: Damien Miller <djm@mindrot.org>
9193 Date: Thu Aug 27 20:01:52 2020 +1000
9195 tweak back-compat for older libfido2
9197 commit d6f45cdde031acdf434bbb27235a1055621915f4
9198 Author: djm@openbsd.org <djm@openbsd.org>
9199 Date: Thu Aug 27 09:46:04 2020 +0000
9201 upstream: debug()-print a little info about FIDO-specific key
9203 fields via "ssh-keygen -vyf /path/key"
9205 OpenBSD-Commit-ID: cf315c4fe77db43947d111b00155165cb6b577cf
9207 commit b969072cc3d62d05cb41bc6d6f3c22c764ed932f
9208 Author: djm@openbsd.org <djm@openbsd.org>
9209 Date: Thu Aug 27 09:43:28 2020 +0000
9211 upstream: skip a bit more FIDO token selection logic when only a
9213 single token is attached.
9215 with Pedro Martelletto
9217 OpenBSD-Commit-ID: e4a324bd9814227ec1faa8cb619580e661cca9ac
9219 commit 744df42a129d7d7db26947b7561be32edac89f88
9220 Author: jmc@openbsd.org <jmc@openbsd.org>
9221 Date: Thu Aug 27 06:15:22 2020 +0000
9223 upstream: tweak previous;
9225 OpenBSD-Commit-ID: 92714b6531e244e4da401b2defaa376374e24be7
9227 commit e32479645ce649b444ba5c6e7151304306a09654
9228 Author: djm@openbsd.org <djm@openbsd.org>
9229 Date: Thu Aug 27 03:55:22 2020 +0000
9231 upstream: adapt to API changes
9233 OpenBSD-Regress-ID: 5f147990cb67094fe554333782ab268a572bb2dd
9235 commit bbcc858ded3fbc46abfa7760e40389e3ca93884c
9236 Author: Damien Miller <djm@mindrot.org>
9237 Date: Thu Aug 27 12:37:12 2020 +1000
9239 degrade semi-gracefully when libfido2 is too old
9241 commit 9cbbdc12cb6a2ab1e9ffe9974cca91d213c185c2
9242 Author: djm@openbsd.org <djm@openbsd.org>
9243 Date: Thu Aug 27 01:15:36 2020 +0000
9245 upstream: dummy firmware needs to match API version numner crank (for
9247 verify-required resident keys) even though it doesn't implement this feature
9249 OpenBSD-Regress-ID: 86579ea2891e18e822e204413d011b2ae0e59657
9251 commit c1e76c64956b424ba260fd4eec9970e5b5859039
9252 Author: djm@openbsd.org <djm@openbsd.org>
9253 Date: Thu Aug 27 02:11:09 2020 +0000
9255 upstream: remove unreachable code I forgot to delete in r1.334
9257 OpenBSD-Commit-ID: 9ed6078251a0959ee8deda443b9ae42484fd8b18
9259 commit 0caff05350bd5fc635674c9e051a0322faba5ae3
9260 Author: djm@openbsd.org <djm@openbsd.org>
9261 Date: Thu Aug 27 01:08:45 2020 +0000
9263 upstream: Request PIN ahead of time for certain FIDO actions
9265 When we know that a particular action will require a PIN, such as
9266 downloading resident keys or generating a verify-required key, request
9267 the PIN before attempting it.
9269 joint work with Pedro Martelletto; ok markus@
9271 OpenBSD-Commit-ID: 863182d38ef075bad1f7d20ca485752a05edb727
9273 commit b649b3daa6d4b8ebe1bd6de69b3db5d2c03c9af0
9274 Author: djm@openbsd.org <djm@openbsd.org>
9275 Date: Thu Aug 27 01:08:19 2020 +0000
9277 upstream: preserve verify-required for resident FIDO keys
9279 When downloading a resident, verify-required key from a FIDO token,
9280 preserve the verify-required in the private key that is written to
9281 disk. Previously we weren't doing that because of lack of support
9282 in the middleware API.
9284 from Pedro Martelletto; ok markus@ and myself
9286 OpenBSD-Commit-ID: 201c46ccdd227cddba3d64e1bdbd082afa956517
9288 commit 642e06d0df983fa2af85126cf4b23440bb2985bf
9289 Author: djm@openbsd.org <djm@openbsd.org>
9290 Date: Thu Aug 27 01:07:51 2020 +0000
9292 upstream: major rework of FIDO token selection logic
9294 When PINs are in use and multiple FIDO tokens are attached to a host, we
9295 cannot just blast requests at all attached tokens with the PIN specified
9296 as this will cause the per-token PIN failure counter to increment. If
9297 this retry counter hits the token's limit (usually 3 attempts), then the
9298 token will lock itself and render all (web and SSH) of its keys invalid.
9301 So this reworks the key selection logic for the specific case of
9302 multiple keys being attached. When multiple keys are attached and the
9303 operation requires a PIN, then the user must touch the key that they
9304 wish to use first in order to identify it.
9306 This may require multiple touches, but only if there are multiple keys
9307 attached AND (usually) the operation requires a PIN. The usual case of a
9308 single key attached should be unaffected.
9310 Work by Pedro Martelletto; ok myself and markus@
9312 OpenBSD-Commit-ID: 637d3049ced61b7a9ee796914bbc4843d999a864
9314 commit 801c9f095e6d8b7b91aefd98f5001c652ea13488
9315 Author: djm@openbsd.org <djm@openbsd.org>
9316 Date: Thu Aug 27 01:07:09 2020 +0000
9318 upstream: support for requiring user verified FIDO keys in sshd
9320 This adds a "verify-required" authorized_keys flag and a corresponding
9321 sshd_config option that tells sshd to require that FIDO keys verify the
9322 user identity before completing the signing/authentication attempt.
9323 Whether or not user verification was performed is already baked into the
9324 signature made on the FIDO token, so this is just plumbing that flag
9325 through and adding ways to require it.
9327 feedback and ok markus@
9329 OpenBSD-Commit-ID: 3a2313aae153e043d57763d766bb6d55c4e276e6
9331 commit 9b8ad93824c682ce841f53f3b5762cef4e7cc4dc
9332 Author: djm@openbsd.org <djm@openbsd.org>
9333 Date: Thu Aug 27 01:06:18 2020 +0000
9335 upstream: support for user-verified FIDO keys
9337 FIDO2 supports a notion of "user verification" where the user is
9338 required to demonstrate their identity to the token before particular
9339 operations (e.g. signing). Typically this is done by authenticating
9340 themselves using a PIN that has been set on the token.
9342 This adds support for generating and using user verified keys where
9343 the verification happens via PIN (other options might be added in the
9344 future, but none are in common use now). Practically, this adds
9345 another key generation option "verify-required" that yields a key that
9346 requires a PIN before each authentication.
9348 feedback markus@ and Pedro Martelletto; ok markus@
9350 OpenBSD-Commit-ID: 57fd461e4366f87c47502c5614ec08573e6d6a15
9352 commit 1196d7f49d4fbc90f37e550de3056561613b0960
9353 Author: cheloha@openbsd.org <cheloha@openbsd.org>
9354 Date: Wed Aug 12 01:23:45 2020 +0000
9356 upstream: ssh-keyscan(1): simplify conloop() with timercmp(3),
9358 timersub(3); ok djm@
9360 OpenBSD-Commit-ID: a102acb544f840d33ad73d40088adab4a687fa27
9362 commit d0a195c89e26766d3eb8f3e4e2a00ebc98b57795
9363 Author: djm@openbsd.org <djm@openbsd.org>
9364 Date: Tue Aug 11 09:49:57 2020 +0000
9366 upstream: let ssh_config(5)'s AddKeysToAgent keyword accept a time
9368 limit for keys in addition to its current flag options. Time-limited keys
9369 will automatically be removed from ssh-agent after their expiry time has
9372 OpenBSD-Commit-ID: 792e71cacbbc25faab5424cf80bee4a006119f94
9374 commit e9c2002891a7b8e66f4140557a982978f372e5a3
9375 Author: djm@openbsd.org <djm@openbsd.org>
9376 Date: Tue Aug 11 09:45:54 2020 +0000
9378 upstream: let the "Confirm user presence for key ..." ssh-askpass
9380 notification respect $SSH_ASKPASS_REQUIRE; ok markus@
9382 OpenBSD-Commit-ID: 7c1a616b348779bda3b9ad46bf592741f8e206c1
9384 commit eaf8672b1b52db2815a229745f4e4b08681bed6d
9385 Author: Darren Tucker <dtucker@dtucker.net>
9386 Date: Fri Aug 21 00:04:13 2020 +1000
9388 Remove check for 'ent' command.
9390 It was added in 8d1fd57a9 for measuring entropy of ssh_prng_cmds which
9391 has long since been removed and there are no other references to it.
9393 commit 05c215de8d224e094a872d97d45f37f60c06206b
9394 Author: Darren Tucker <dtucker@dtucker.net>
9395 Date: Mon Aug 17 21:34:32 2020 +1000
9397 Wrap stdint.h include in ifdef HAVE_STDINT_H.
9399 commit eaf2765efe8bc74feba85c34295d067637fc6635
9400 Author: Damien Miller <djm@mindrot.org>
9401 Date: Mon Aug 10 13:24:09 2020 +1000
9403 sync memmem.c with OpenBSD
9405 commit ed6bef77f5bb5b8f9ca2914478949e29f2f0a780
9406 Author: Darren Tucker <dtucker@dtucker.net>
9407 Date: Fri Aug 7 17:12:16 2020 +1000
9409 Always send any PAM account messages.
9411 If the PAM account stack reaturns any messages, send them to the user
9412 not just if the check succeeds. bz#2049, ok djm@
9414 commit a09e98dcae1e26f026029b7142b0e0d10130056f
9415 Author: Darren Tucker <dtucker@dtucker.net>
9416 Date: Fri Aug 7 15:37:37 2020 +1000
9418 Output test debug logs on failure.
9420 commit eb122b1eebe58b29a83a507ee814cbcf8aeded1b
9421 Author: Darren Tucker <dtucker@dtucker.net>
9422 Date: Fri Aug 7 15:11:42 2020 +1000
9424 Add ability to specify exact test target.
9426 commit c2ec7a07f8caabb4d8e00c66e7cd46bf2cd1e922
9427 Author: Darren Tucker <dtucker@dtucker.net>
9428 Date: Fri Aug 7 14:21:15 2020 +1000
9430 Document --without-openssl and --without-zlib.
9432 commit 651bb3a31949bbdc3a78b2ede95a77bce0c72984
9433 Author: Darren Tucker <dtucker@dtucker.net>
9434 Date: Fri Aug 7 14:15:11 2020 +1000
9436 Add without-openssl without-zlib test target.
9438 commit 9499f2bb01dc1032ae155999b2d7764b9491341f
9439 Author: Stefan Schindler <dns2utf8@estada.ch>
9440 Date: Wed Aug 5 19:00:52 2020 +0200
9442 Add CI with prepare script
9444 * Only use heimdal kerberos implementation
9445 * Fetch yubico/libfido2 (see: https://github.com/Yubico/libfido2)
9446 * Add one target for
9448 * each feature alone
9451 commit ea1f649046546a860f68b97ddc3015b7e44346ca
9452 Author: Damien Miller <djm@mindrot.org>
9453 Date: Wed Aug 5 08:58:57 2020 +1000
9455 support NetBSD's utmpx.ut_ss address field
9459 commit 32c63e75a70a0ed9d6887a55fcb0e4531a6ad617
9460 Author: Damien Miller <djm@mindrot.org>
9461 Date: Tue Aug 4 14:59:21 2020 +1000
9463 wrap a declaration in the same ifdefs as its use
9465 avoids warnings on NetBSD
9467 commit c9e3be9f4b41fda32a2a0138d54c7a6b563bc94d
9468 Author: Damien Miller <djm@mindrot.org>
9469 Date: Tue Aug 4 14:58:46 2020 +1000
9471 undef TAILQ_CONCAT and friends
9473 Needed for NetBSD. etc that supply these macros
9475 commit 2d8a3b7e8b0408dfeb933ac5cfd3a58f5bac49af
9476 Author: djm@openbsd.org <djm@openbsd.org>
9477 Date: Mon Aug 3 02:53:51 2020 +0000
9479 upstream: ensure that certificate extensions are lexically sorted.
9481 Previously if the user specified a custom extension then the everything would
9482 be in order except the custom ones. bz3198 ok dtucker markus
9484 OpenBSD-Commit-ID: d97deb90587b06cb227c66ffebb2d9667bf886f0
9486 commit a8732d74cb8e72f0c6366015687f1e649f60be87
9487 Author: djm@openbsd.org <djm@openbsd.org>
9488 Date: Mon Aug 3 02:43:41 2020 +0000
9490 upstream: allow -A to explicitly enable agent forwarding in scp and
9492 sftp. The default remains to not forward an agent, even when ssh_config
9493 enables it. ok jmc dtucker markus
9495 OpenBSD-Commit-ID: 36cc526aa3b0f94e4704b8d7b969dd63e8576822
9497 commit ab9105470a83ed5d8197959a1b1f367399958ba1
9498 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9499 Date: Mon Aug 3 02:42:49 2020 +0000
9501 upstream: clang -Wimplicit-fallthrough does not recognise /*
9503 FALLTHROUGH */ comments, which is the style we currently use, and gives too
9504 many boring warnings. ok djm
9506 OpenBSD-Commit-ID: 07b5031e9f49f2b69ac5e85b8da4fc9e393992a0
9508 commit ced327b9fb78c94d143879ef4b2a02cbc5d38690
9509 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9510 Date: Fri Jul 31 04:19:37 2020 +0000
9512 upstream: Also compare username when checking for JumpHost loops.
9516 OpenBSD-Commit-ID: 9bbc1d138adb34c54f3c03a15a91f75dbf418782
9518 commit ae7527010c44b3376b85d036a498f136597b2099
9519 Author: Darren Tucker <dtucker@dtucker.net>
9520 Date: Fri Jul 31 15:19:04 2020 +1000
9524 It hasn't been useful since we switched to git in 2014. ok djm@
9526 commit 89fc3f414be0ce4e8008332a9739a7d721269e50
9527 Author: Darren Tucker <dtucker@dtucker.net>
9528 Date: Tue Jul 28 19:40:30 2020 +1000
9530 Use argv in OSSH_CHECK_CFLAG_COMPILE test.
9532 configure.ac is not detecting -Wextra in compilers that implement the
9533 option. The problem is that -Wextra implies -Wunused-parameter, and the
9534 C excerpt used by aclocal.m4 does not use argv. Patch from pedro at
9535 ambientworks.net, ok djm@
9537 commit 62c81ef531b0cc7ff655455dd34f5f0c94f48e82
9538 Author: Darren Tucker <dtucker@dtucker.net>
9539 Date: Mon Jul 20 22:12:07 2020 +1000
9541 Skip ECDSA-SK webauthn test when built w/out ECC
9543 commit 3ec9a6d7317236a9994887d8bd5d246af403a00d
9544 Author: Damien Miller <djm@mindrot.org>
9545 Date: Mon Jul 20 13:09:25 2020 +1000
9547 Add ssh-sk-helper and manpage to RPM spec file
9549 Based on patch from Fabio Pedretti
9551 commit a2855c048b3f4b17d8787bd3f24232ec0cd79abe
9552 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9553 Date: Fri Jul 17 07:09:24 2020 +0000
9555 upstream: Add %k to the TOKENs for Match Exec for consistency with
9557 the other keywords that recently got %k.
9559 OpenBSD-Commit-ID: 1857d1c40f270cbc254fca91e66110641dddcfdb
9561 commit 69860769fa9f4529d8612ec055ae11912f7344cf
9562 Author: jmc@openbsd.org <jmc@openbsd.org>
9563 Date: Fri Jul 17 05:59:05 2020 +0000
9565 upstream: fix macro slip in previous;
9567 OpenBSD-Commit-ID: 624e47ab209450ad9ad5c69f54fa69244de5ed9a
9569 commit 40649bd0822883b684183854b16d0b8461d5697b
9570 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9571 Date: Fri Jul 17 07:10:24 2020 +0000
9573 upstream: Add test for '%k' (HostKeyAlias) TOKEN.
9575 OpenBSD-Regress-ID: 8ed1ba1a811790031aad3fcea860a34ad7910456
9577 commit 6736fe680704a3518cb4f3f8f6723b00433bd3dd
9578 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9579 Date: Fri Jul 17 03:26:58 2020 +0000
9581 upstream: Add tests for expansions on UserKnownHostsFile.
9583 OpenBSD-Regress-ID: bccf8060306c841bbcceb1392644f906a4d6ca51
9585 commit 287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f
9586 Author: djm@openbsd.org <djm@openbsd.org>
9587 Date: Fri Jul 17 03:51:32 2020 +0000
9589 upstream: log error message for process_write() write failures
9591 OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851
9593 commit 8df5774a42d2eaffe057bd7f293fc6a4b1aa411c
9594 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9595 Date: Fri Jul 17 03:43:42 2020 +0000
9597 upstream: Add a '%k' TOKEN that expands to the effective HostKey of
9599 the destination. This allows, eg, keeping host keys in individual files
9600 using "UserKnownHostsFile ~/.ssh/known_hosts.d/%k". bz#1654, ok djm@, jmc@
9603 OpenBSD-Commit-ID: 7084d723c9cc987a5c47194219efd099af5beadc
9605 commit c4f239944a4351810fd317edf408bdcd5c0102d9
9606 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9607 Date: Fri Jul 17 03:23:10 2020 +0000
9609 upstream: Add %-TOKEN, environment variable and tilde expansion to
9611 UserKnownHostsFile, allowing the file to be automagically split up in the
9612 configuration (eg bz#1654). ok djm@, man page parts jmc@
9614 OpenBSD-Commit-ID: 7e1b406caf147638bb51558836a72d6cc0bd1b18
9616 commit dbaaa01daedb423c38124a72c471982fb08a16fb
9617 Author: solene@openbsd.org <solene@openbsd.org>
9618 Date: Wed Jul 15 07:50:46 2020 +0000
9620 upstream: - Add [-a rounds] in ssh-keygen man page and usage() -
9622 Reorder parameters list in the first usage() case - Sentence rewording
9625 jmc@ noticed usage() missed -a flag too
9627 OpenBSD-Commit-ID: f06b9afe91cc96f260b929a56e9930caecbde246
9629 commit 69924a92c3af7b99a7541aa544a2334ec0fb092c
9630 Author: jmc@openbsd.org <jmc@openbsd.org>
9631 Date: Wed Jul 15 05:40:05 2020 +0000
9633 upstream: start sentence with capital letter;
9635 OpenBSD-Commit-ID: ab06581d51b2b4cc1b4aab781f7f3cfa56cad973
9637 commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885
9638 Author: Damien Miller <djm@mindrot.org>
9639 Date: Fri Jul 17 13:15:50 2020 +1000
9641 detect Linux/X32 systems
9643 This is a frankenstein monster of AMD64 instructions/calling conventions
9644 but with a 4GB address space. Allegedly deprecated but people still run
9645 into it causing weird sandbox failures, e.g. bz#3085
9647 commit 9c9ddc1391d6af8d09580a2424ab467d0a5df3c7
9648 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9649 Date: Wed Jul 15 06:43:16 2020 +0000
9651 upstream: Fix previous by calling the correct function.
9653 OpenBSD-Regress-ID: 821cdd1dff9c502cceff4518b6afcb81767cad5a
9655 commit f1a4798941b4372bfe5e46f1c0f8672fe692d9e4
9656 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9657 Date: Wed Jul 15 05:36:50 2020 +0000
9659 upstream: Update test to match recent change in match.c
9661 OpenBSD-Regress-ID: 965bda1f95f09a765050707340c73ad755f41167
9663 commit d7e71be4fd57b7c7e620d733cdf2333b27bfa924
9664 Author: Darren Tucker <dtucker@dtucker.net>
9665 Date: Wed Jul 15 15:30:43 2020 +1000
9667 Adjust portable code to match changes in 939d787d,
9669 commit fec89f32a84fd0aa1afc81deec80a460cbaf451a
9670 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9671 Date: Wed Jul 15 04:27:34 2020 +0000
9673 upstream: Add default for number of rounds (-a). ok djm@
9675 OpenBSD-Commit-ID: cb7e9aa04ace01a98e63e4bd77f34a42ab169b15
9677 commit aaa8b609a7b332be836cd9a3b782422254972777
9678 Author: djm@openbsd.org <djm@openbsd.org>
9679 Date: Tue Jul 14 23:57:01 2020 +0000
9681 upstream: allow some additional control over the use of ssh-askpass
9683 via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@
9685 OpenBSD-Commit-ID: 3a1e6cbbf6241ddc4405c4246caa2c249f149eb2
9687 commit 6368022cd4dd508671c4999a59ec5826df098530
9688 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9689 Date: Tue Jul 7 02:47:21 2020 +0000
9691 upstream: correct recently broken comments
9693 OpenBSD-Commit-ID: 964d9a88f7de1d0eedd3f8070b43fb6e426351f1
9695 commit 6d755706a0059eb9e2d63517f288b75cbc3b4701
9696 Author: djm@openbsd.org <djm@openbsd.org>
9697 Date: Sun Jul 5 23:59:45 2020 +0000
9699 upstream: some language improvements; ok markus
9701 OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8
9703 commit b0c1e8384d5e136ebdf895d1434aea7dd8661a1c
9704 Author: markus@openbsd.org <markus@openbsd.org>
9705 Date: Fri Jul 3 10:12:26 2020 +0000
9707 upstream: update setproctitle after re-exec; ok djm
9709 OpenBSD-Commit-ID: bc92d122f9184ec2a9471ade754b80edd034ce8b
9711 commit cd119a5ec2bf0ed5df4daff3bd14f8f7566dafd3
9712 Author: markus@openbsd.org <markus@openbsd.org>
9713 Date: Fri Jul 3 10:11:33 2020 +0000
9715 upstream: keep ignoring HUP after fork+exec; ok djm
9717 OpenBSD-Commit-ID: 7679985a84ee5ceb09839905bb6f3ddd568749a2
9719 commit 8af4a743693ccbea3e15fc9e93edbeb610fa94f4
9720 Author: markus@openbsd.org <markus@openbsd.org>
9721 Date: Fri Jul 3 10:10:17 2020 +0000
9723 upstream: don't exit the listener on send_rexec_state errors; ok
9727 OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c
9729 commit 03da4c2b70468f04ed1c08518ea0a70e67232739
9730 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9731 Date: Wed Jul 15 04:55:47 2020 +0000
9733 upstream: Use $OBJ to find key files. Fixes test when run on an obj
9735 directory (on OpenBSD) or out of tree (in Portable).
9737 OpenBSD-Regress-ID: 938fa8ac86adaa527d64a305bd2135cfbb1c0a17
9739 commit 73f20f195ad18f1cf633eb7d8be95dc1b6111eea
9740 Author: Darren Tucker <dtucker@dtucker.net>
9741 Date: Sat Jul 4 23:11:23 2020 +1000
9743 Wrap stdint.h in ifdef HAVE_STDINT_H.
9745 commit aa6fa4bf3023fa0e5761cd8f4b2cd015d2de74dd
9746 Author: djm@openbsd.org <djm@openbsd.org>
9747 Date: Fri Jul 3 07:25:18 2020 +0000
9749 upstream: put back the mux_ctx memleak fix, but only for channels of
9751 type SSH_CHANNEL_MUX_LISTENER; Specifically SSH_CHANNEL_MUX_PROXY channels
9752 should not have this structure freed.
9754 OpenBSD-Commit-ID: f3b213ae60405f77439e2b06262f054760c9d325
9756 commit d8195914eb43b20b13381f4e5a74f9f8a14f0ded
9757 Author: djm@openbsd.org <djm@openbsd.org>
9758 Date: Fri Jul 3 07:17:35 2020 +0000
9760 upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;
9762 simply freeing it here causes other problems
9764 OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed
9766 commit 20b5fab9f773b3d3c7f06cb15b8f69a2c081ee80
9767 Author: djm@openbsd.org <djm@openbsd.org>
9768 Date: Fri Jul 3 07:02:37 2020 +0000
9770 upstream: avoid tilde_expand_filename() in expanding ~/.ssh/rc - if
9772 sshd is in chroot mode, the likely absence of a password database will cause
9773 tilde_expand_filename() to fatal; ok dtucker@
9775 OpenBSD-Commit-ID: e20aee6159e8b79190d18dba1513fc1b7c8b7ee1
9777 commit c8935081db35d73ee6355999142fa0776a2af912
9778 Author: djm@openbsd.org <djm@openbsd.org>
9779 Date: Fri Jul 3 06:46:41 2020 +0000
9781 upstream: when redirecting sshd's log output to a file, undo this
9783 redirection after the session child process is forked(); ok dtucker@
9785 OpenBSD-Commit-ID: 6df86dd653c91f5bc8ac1916e7680d9d24690865
9787 commit 183c4aaef944af3a1a909ffa01058c65bac55748
9788 Author: djm@openbsd.org <djm@openbsd.org>
9789 Date: Fri Jul 3 06:29:57 2020 +0000
9791 upstream: start ClientAliveInterval bookkeeping before first pass
9793 through select() loop; fixed theoretical case where busy sshd may ignore
9794 timeouts from client; inspired by and ok dtucker
9796 OpenBSD-Commit-ID: 96bfc4b1f86c7da313882a84755b2b47eb31957f
9798 commit 6fcfd303d67f16695198cf23d109a988e40eefb6
9799 Author: Damien Miller <djm@mindrot.org>
9800 Date: Fri Jul 3 15:28:27 2020 +1000
9802 add check for fido_cred_set_prot() to configure
9804 commit f11b23346309e4d5138e733a49321aedd6eeaa2f
9805 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9806 Date: Fri Jul 3 05:09:06 2020 +0000
9808 upstream: Only reset the serveralive check when we receive traffic from
9810 the server and ignore traffic from a port forwarding client, preventing a
9811 client from keeping a connection alive when it should be terminated. Based
9812 on a patch from jxraynor at gmail.com via openssh-unix-dev and bz#2265, ok
9815 OpenBSD-Commit-ID: a941a575a5cbc244c0ef5d7abd0422bbf02c2dcd
9817 commit adfdbf1211914b631c038f0867a447db7b519937
9818 Author: Damien Miller <djm@mindrot.org>
9819 Date: Fri Jul 3 15:15:15 2020 +1000
9821 sync sys-queue.h with OpenBSD upstream
9823 needed for TAILQ_CONCAT
9825 commit 1b90ddde49e2ff377204082b6eb130a096411dc1
9826 Author: djm@openbsd.org <djm@openbsd.org>
9827 Date: Fri Jul 3 05:08:41 2020 +0000
9829 upstream: fix memory leak of mux_ctx; patch from Sergiy Lozovsky
9831 via bz3189 ok dtucker
9833 OpenBSD-Commit-ID: db249bd4526fd42d0f4f43f72f7b8b7705253bde
9835 commit 55ef3e9cbd5b336bd0f89205716924886fcf86de
9836 Author: markus@openbsd.org <markus@openbsd.org>
9837 Date: Wed Jul 1 16:28:31 2020 +0000
9839 upstream: free kex in ssh_packet_close; ok djm semarie
9841 OpenBSD-Commit-ID: dbc181e90d3d32fd97b10d75e68e374270e070a2
9843 commit e1c401109b61f7dbc199b5099933d579e7fc5dc9
9844 Author: bket@openbsd.org <bket@openbsd.org>
9845 Date: Sat Jun 27 13:39:09 2020 +0000
9847 upstream: Replace TAILQ concatenation loops with TAILQ_CONCAT
9851 OpenBSD-Commit-ID: 454b40e09a117ddb833794358970a65b14c431ef
9853 commit 14beca57ac92d62830c42444c26ba861812dc837
9854 Author: semarie@openbsd.org <semarie@openbsd.org>
9855 Date: Fri Jun 26 11:26:01 2020 +0000
9857 upstream: backout 1.293 fix kex mem-leak in ssh_packet_close at markus
9861 the change introduced a NULL deref in sshpkt_vfatal() (uses of ssh->kex after
9862 calling ssh_packet_clear_keys())
9864 OpenBSD-Commit-ID: 9c9a6721411461b0b1c28dc00930d7251a798484
9866 commit 598c3a5e3885080ced0d7c40fde00f1d5cdbb32b
9867 Author: Damien Miller <djm@mindrot.org>
9868 Date: Fri Jun 26 16:07:12 2020 +1000
9870 document a PAM spec problem in a frustrated comment
9872 commit 976c4f86286d52a0cb2aadf4a095d379c0da752e
9873 Author: djm@openbsd.org <djm@openbsd.org>
9874 Date: Fri Jun 26 05:42:16 2020 +0000
9876 upstream: avoid spurious error message when ssh-keygen creates files
9878 outside ~/.ssh; with dtucker@
9880 OpenBSD-Commit-ID: ac0c662d44607e00ec78c266ee60752beb1c7e08
9882 commit 32b2502a9dfdfded1ccdc1fd6dc2b3fe41bfc205
9883 Author: Damien Miller <djm@mindrot.org>
9884 Date: Fri Jun 26 15:30:06 2020 +1000
9886 missing ifdef SELINUX; spotted by dtucker
9888 commit e073106f370cdd2679e41f6f55a37b491f0e82fe
9889 Author: djm@openbsd.org <djm@openbsd.org>
9890 Date: Fri Jun 26 05:12:21 2020 +0000
9892 upstream: regress test for ssh-add -d; ok dtucker@
9894 OpenBSD-Regress-ID: 3a2e044be616afc7dd4f56c100179e83b33d8abf
9896 commit c809daaa1bad6b1c305b0e0b5440360f32546c84
9897 Author: markus@openbsd.org <markus@openbsd.org>
9898 Date: Wed Jun 24 15:16:23 2020 +0000
9900 upstream: add test for mux w/-Oproxy; ok djm
9902 OpenBSD-Regress-ID: 764d5c696e2a259f1316a056e225e50023abb027
9904 commit 3d06ff4bbd3dca8054c238d2a94c0da563ef7eee
9905 Author: djm@openbsd.org <djm@openbsd.org>
9906 Date: Fri Jun 26 05:16:38 2020 +0000
9908 upstream: handle EINTR in waitfd() and timeout_connect() helpers;
9910 bz#3071; ok dtucker@
9912 OpenBSD-Commit-ID: 08fa87be50070bd8b754d9b1ebb1138d7bc9d8ee
9914 commit fe2ec0b9c19adeab0cd9f04b8152dc17f31c31e5
9915 Author: djm@openbsd.org <djm@openbsd.org>
9916 Date: Fri Jun 26 05:04:07 2020 +0000
9918 upstream: allow "ssh-add -d -" to read keys to be deleted from
9920 stdin bz#3180; ok dtucker@
9922 OpenBSD-Commit-ID: 15c7f10289511eb19fce7905c9cae8954e3857ff
9924 commit a3e0c376ffc11862fa3568b28188bd12965973e1
9925 Author: djm@openbsd.org <djm@openbsd.org>
9926 Date: Fri Jun 26 05:03:36 2020 +0000
9928 upstream: constify a few things; ok dtucker (as part of another
9932 OpenBSD-Commit-ID: 7c17fc987085994d752304bd20b1ae267a9bcdf6
9934 commit 74344c3ca42c3f53b00b025daf09ae7f6aa38076
9935 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9936 Date: Fri Jun 26 05:02:03 2020 +0000
9938 upstream: Defer creation of ~/.ssh by ssh(1) until we attempt to
9940 write to it so we don't leave an empty .ssh directory when it's not needed.
9941 Use the same function to replace the code in ssh-keygen that does the same
9942 thing. bz#3156, ok djm@
9944 OpenBSD-Commit-ID: 59c073b569be1a60f4de36f491a4339bc4ae870f
9946 commit c9e24daac6324fcbdba171392c325bf9ccc3c768
9947 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9948 Date: Fri Jun 26 04:45:11 2020 +0000
9950 upstream: Expand path to ~/.ssh/rc rather than relying on it
9952 being relative to the current directory, so that it'll still be found if the
9953 shell startup changes its directory. Since the path is potentially longer,
9954 make the cmd buffer that uses it dynamically sized. bz#3185, with & ok djm@
9956 OpenBSD-Commit-ID: 36e33ff01497af3dc8226d0c4c1526fc3a1e46bf
9958 commit 07f5f369a25e228a7357ef6c57205f191f073d99
9959 Author: markus@openbsd.org <markus@openbsd.org>
9960 Date: Wed Jun 24 15:12:09 2020 +0000
9962 upstream: fix kex mem-leak in ssh_packet_close; ok djm
9964 OpenBSD-Commit-ID: e2e9533f393620383afd0b68ef435de8d5e8abe4
9966 commit e35995088cd6691a712bfd586bae8084a3a922ba
9967 Author: markus@openbsd.org <markus@openbsd.org>
9968 Date: Wed Jun 24 15:10:38 2020 +0000
9970 upstream: fix ssh -O proxy w/mux which got broken by no longer
9972 making ssh->kex optional in packet.c revision 1.278 ok djm@
9974 OpenBSD-Commit-ID: 2b65df04a064c2c6277359921d2320c90ab7d917
9976 commit 250246fef22b87a54a63211c60a2def9be431fbd
9977 Author: markus@openbsd.org <markus@openbsd.org>
9978 Date: Wed Jun 24 15:09:53 2020 +0000
9980 upstream: support loading big sshd_config files w/o realloc; ok
9984 OpenBSD-Commit-ID: ba9238e810074ac907f0cf8cee1737ac04983171
9986 commit 89b54900ac61986760452f132bbe3fb7249cfdac
9987 Author: markus@openbsd.org <markus@openbsd.org>
9988 Date: Wed Jun 24 15:08:53 2020 +0000
9990 upstream: allow sshd_config longer than 256k; ok djm
9992 OpenBSD-Commit-ID: 83f40dd5457a64c1d3928eb4364461b22766beb3
9994 commit e3fa6249e6d9ceb57c14b04dd4c0cfab12fa7cd5
9995 Author: markus@openbsd.org <markus@openbsd.org>
9996 Date: Wed Jun 24 15:07:33 2020 +0000
9998 upstream: only call sshkey_xmss_init() once for KEY_XMSS_CERT; ok
10002 OpenBSD-Commit-ID: d0002ffb7f20f538b014d1d0735facd5a81ff096
10004 commit 37f2da069c0619f2947fb92785051d82882876d7
10005 Author: djm@openbsd.org <djm@openbsd.org>
10006 Date: Mon Jun 22 23:44:27 2020 +0000
10008 upstream: some clarifying comments
10010 OpenBSD-Commit-ID: 5268479000fd97bfa30ab819f3517139daa054a2
10012 commit b659319a5bc9e8adf3c4facc51f37b670d2a7426
10013 Author: jmc@openbsd.org <jmc@openbsd.org>
10014 Date: Mon Jun 22 06:37:38 2020 +0000
10016 upstream: updated argument name for -P in first synopsis was
10018 missed in previous;
10020 OpenBSD-Commit-ID: 8d84dc3050469884ea91e29ee06a371713f2d0b7
10022 commit 02a9222cbce7131d639984c2f6c71d1551fc3333
10023 Author: jmc@openbsd.org <jmc@openbsd.org>
10024 Date: Mon Jun 22 06:36:40 2020 +0000
10026 upstream: supply word missing in previous;
10028 OpenBSD-Commit-ID: 16a38b049f216108f66c8b699aa046063381bd23
10030 commit 5098b3b6230852a80ac6cef5d53a785c789a5a56
10031 Author: Damien Miller <djm@mindrot.org>
10032 Date: Mon Jun 22 16:54:02 2020 +1000
10034 missing files for webauthn/sshsig unit test
10036 commit 354535ff79380237924ac8fdc98f8cdf83e67da6
10037 Author: djm@openbsd.org <djm@openbsd.org>
10038 Date: Mon Jun 22 06:00:06 2020 +0000
10040 upstream: add support for verification of webauthn sshsig signature,
10042 and example HTML/JS to generate webauthn signatures in SSH formats (also used
10043 to generate the testdata/* for the test).
10045 OpenBSD-Regress-ID: dc575be5bb1796fdf4b8aaee0ef52a6671a0f6fb
10047 commit bb52e70fa5330070ec9a23069c311d9e277bbd6f
10048 Author: djm@openbsd.org <djm@openbsd.org>
10049 Date: Mon Jun 22 05:58:35 2020 +0000
10051 upstream: Add support for FIDO webauthn (verification only).
10053 webauthn is a standard for using FIDO keys in web browsers. webauthn
10054 signatures are a slightly different format to plain FIDO signatures - this
10055 support allows verification of these. Feedback and ok markus@
10057 OpenBSD-Commit-ID: ab7e3a9fb5782d99d574f408614d833379e564ad
10059 commit 64bc121097f377142f1387ffb2df7592c49935af
10060 Author: djm@openbsd.org <djm@openbsd.org>
10061 Date: Mon Jun 22 05:56:23 2020 +0000
10063 upstream: refactor ECDSA-SK verification a little ahead of adding
10065 support for FIDO webauthn signature verification support; ok markus@
10067 OpenBSD-Commit-ID: c9f478fd8e0c1bd17e511ce8694f010d8e32043e
10069 commit 12848191f8fe725af4485d3600e0842d92f8637f
10070 Author: djm@openbsd.org <djm@openbsd.org>
10071 Date: Mon Jun 22 05:54:10 2020 +0000
10073 upstream: support for RFC4648 base64url encoding; ok markus
10075 OpenBSD-Commit-ID: 0ef22c55e772dda05c112c88412c0797fec66eb4
10077 commit 473b4af43db12127137c7fc1a10928313f5a16d2
10078 Author: djm@openbsd.org <djm@openbsd.org>
10079 Date: Mon Jun 22 05:53:26 2020 +0000
10081 upstream: better terminology for permissions; feedback & ok markus@
10083 OpenBSD-Commit-ID: ff2a71803b5ea57b83cc3fa9b3be42b70e462fb9
10085 commit fc270baf264248c3ee3050b13a6c8c0919e6559f
10086 Author: djm@openbsd.org <djm@openbsd.org>
10087 Date: Mon Jun 22 05:52:05 2020 +0000
10089 upstream: better terminology for permissions; feedback & ok markus@
10091 OpenBSD-Commit-ID: ffb220b435610741dcb4de0e7fc68cbbdc876d2c
10093 commit 00531bb42f1af17ddabea59c3d9c4b0629000d27
10094 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10095 Date: Fri Jun 19 07:21:42 2020 +0000
10097 upstream: Correct synopsis and usage for the options accepted when
10099 passing a command to ssh-agent. ok jmc@
10101 OpenBSD-Commit-ID: b36f0679cb0cac0e33b361051b3406ade82ea846
10103 commit b4556c8ad7177e379f0b60305a0cd70f12180e7c
10104 Author: Darren Tucker <dtucker@dtucker.net>
10105 Date: Fri Jun 19 19:22:00 2020 +1000
10107 Add OPENBSD ORIGINAL marker to bcrypt_pbkdf.
10109 commit 1babb8bb14c423011ca34c2f563bb1c51c8fbf1d
10110 Author: Darren Tucker <dtucker@dtucker.net>
10111 Date: Fri Jun 19 19:10:47 2020 +1000
10113 Extra brackets around sizeof() in bcrypt.
10115 Prevents following warning from clang 10:
10116 bcrypt_pbkdf.c:94:40: error: expression does not compute the number of
10117 elements in this array; element type is ´uint32_tÂ[...]
10118 place parentheses around the ´sizeof(uint64_t)´ expression to
10119 silence this warning
10121 commit 9e065729592633290e5ddb6852792913b2286545
10122 Author: Darren Tucker <dtucker@dtucker.net>
10123 Date: Fri Jun 19 18:47:56 2020 +1000
10125 Add includes.h to new test.
10127 Fixes warnings eg "´bounded´ attribute directive ignor" from gcc.
10129 commit e684b1ea365e070433f282a3c1dabc3e2311ce49
10130 Author: Darren Tucker <dtucker@dtucker.net>
10131 Date: Fri Jun 19 18:38:39 2020 +1000
10133 Skip OpenSSL specific tests w/out OpenSSL.
10135 Allows unit tests to pass when configure'ed --without-openssl.
10137 commit 80610e97a76407ca982e62fd051c9be03622fe7b
10138 Author: Darren Tucker <dtucker@dtucker.net>
10139 Date: Fri Jun 19 17:15:27 2020 +1000
10141 Hook sshsig tests up to Portable Makefiles.
10143 commit 5dba1fcabacaab46693338ec829b42a1293d1f52
10144 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10145 Date: Fri Jun 19 05:07:09 2020 +0000
10147 upstream: Test that ssh-agent exits when running as as subprocess
10149 of a specified command (ie "ssh-agent command"). Would have caught bz#3181.
10151 OpenBSD-Regress-ID: 895b4765ba5153eefaea3160a7fe08ac0b6db8b3
10153 commit 68e8294f6b04f9590ea227e63d3e129398a49e27
10154 Author: djm@openbsd.org <djm@openbsd.org>
10155 Date: Fri Jun 19 04:34:21 2020 +0000
10157 upstream: run sshsig unit tests
10159 OpenBSD-Regress-ID: 706ef17e2b545b64873626e0e35553da7c06052a
10161 commit 5edfa1690e9a75048971fd8775f7c16d153779db
10162 Author: djm@openbsd.org <djm@openbsd.org>
10163 Date: Fri Jun 19 04:32:09 2020 +0000
10165 upstream: basic unit test for sshsig.[ch], including FIDO keys
10167 verification only so far
10169 OpenBSD-Regress-ID: fb1f946c8fc59206bc6a6666e577b5d5d7e45896
10171 commit e95c0a0e964827722d29b4bc00d5c0ff4afe0ed2
10172 Author: djm@openbsd.org <djm@openbsd.org>
10173 Date: Fri Jun 19 03:48:49 2020 +0000
10175 upstream: basic unit test for FIDO kep parsing
10177 OpenBSD-Regress-ID: 8089b88393dd916d7c95422b442a6fd4cfe00c82
10179 commit 7775819c6de3e9547ac57b87c7dd2bfd28cefcc5
10180 Author: djm@openbsd.org <djm@openbsd.org>
10181 Date: Thu Jun 18 23:34:19 2020 +0000
10183 upstream: check public host key matches private; ok markus@ (as
10185 part of previous diff)
10187 OpenBSD-Commit-ID: 65a4f66436028748b59fb88b264cb8c94ce2ba63
10189 commit c514f3c0522855b4d548286eaa113e209051a6d2
10190 Author: djm@openbsd.org <djm@openbsd.org>
10191 Date: Thu Jun 18 23:33:38 2020 +0000
10193 upstream: avoid spurious "Unable to load host key" message when
10195 sshd can load a private key but no public counterpart; with & ok markus@
10197 OpenBSD-Commit-ID: 0713cbdf9aa1ff8ac7b1f78b09ac911af510f81b
10199 commit 7fafaeb5da365f4a408fec355dac04a774f27193
10200 Author: djm@openbsd.org <djm@openbsd.org>
10201 Date: Fri Jun 12 05:26:37 2020 +0000
10203 upstream: correct RFC number; from HARUYAMA Seigo via GH PR191
10205 OpenBSD-Commit-ID: 8d03b6c96ca98bfbc23d3754c3c33e1fe0852e10
10207 commit 3a7f654d5bcb20df24a134b6581b0d235da4564a
10208 Author: djm@openbsd.org <djm@openbsd.org>
10209 Date: Fri Jun 5 06:18:07 2020 +0000
10211 upstream: unbreak "sshd -ddd" - close of config passing fd happened too
10215 OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0
10217 commit 3de02be39e5c0c2208d9682a3844991651620fcc
10218 Author: Andreas Schwab <schwab@suse.de>
10219 Date: Mon May 25 11:10:44 2020 +0200
10221 Add support for AUDIT_ARCH_RISCV64
10223 commit ea547eb0329c2f8da77a4ac05f6c330bd49bdaab
10224 Author: djm@openbsd.org <djm@openbsd.org>
10225 Date: Fri Jun 5 03:25:35 2020 +0000
10227 upstream: make sshbuf_putb(b, NULL) a no-op
10229 OpenBSD-Commit-ID: 976fdc99b500e347023d430df372f31c1dd128f7
10231 commit 69796297c812640415c6cea074ea61afc899cbaa
10232 Author: djm@openbsd.org <djm@openbsd.org>
10233 Date: Fri Jun 5 03:24:36 2020 +0000
10235 upstream: make sshbuf_dump() args const
10237 OpenBSD-Commit-ID: b4a5accae750875d665b862504169769bcf663bd
10239 commit 670428895739d1f79894bdb2457891c3afa60a59
10240 Author: djm@openbsd.org <djm@openbsd.org>
10241 Date: Fri Jun 5 03:24:16 2020 +0000
10243 upstream: wrap long line
10245 OpenBSD-Commit-ID: ed405a12bd27bdc9c52e169bc5ff3529b4ebbbb2
10247 commit 2f648cf222882719040906722b3593b01df4ad1a
10248 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10249 Date: Fri Jun 5 03:15:26 2020 +0000
10251 upstream: Correct historical comment: provos@ modified OpenSSH to
10253 work with SSLeay (very quickly replaced by OpenSSL) not SSL in general. ok
10254 deraadt, historical context markus@
10256 OpenBSD-Commit-ID: 7209e07a2984b50411ed8ca5a4932da5030d2b90
10258 commit 56548e4efcc3e3e8093c2eba30c75b23e561b172
10259 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10260 Date: Wed Jun 3 08:23:18 2020 +0000
10262 upstream: Import regenerated moduli file.
10264 OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54
10266 commit 8da801f585dd9c534c0cbe487a3b1648036bf2fb
10267 Author: Darren Tucker <dtucker@dtucker.net>
10268 Date: Fri Jun 5 13:20:10 2020 +1000
10270 Test fallthrough in OSSH_CHECK_CFLAG_COMPILE.
10272 clang 10's -Wimplicit-fallthrough does not understand /* FALLTHROUGH */
10273 comments and we don't use the __attribute__((fallthrough)) that it's
10274 looking for. This has the effect of turning off -Wimplicit-fallthrough
10275 where it does not currently help (particularly with -Werror). ok djm@
10277 commit 049297de975b92adcc2db77e3fb7046c0e3c695d
10278 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10279 Date: Wed Jun 3 08:23:18 2020 +0000
10281 upstream: Import regenerated moduli file.
10283 OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54
10285 commit b458423a38a3140ac022ffcffcb332609faccfe3
10286 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10287 Date: Mon Jun 1 07:11:38 2020 +0000
10289 upstream: Remove now-unused proto_spec and associated definitions.
10293 OpenBSD-Commit-ID: 2e2b18e3aa6ee22a7b69c39f2d3bd679ec35c362
10295 commit 5ad3c3a33ef038b55a14ebd31faeeec46073db2c
10296 Author: millert@openbsd.org <millert@openbsd.org>
10297 Date: Fri May 29 21:22:02 2020 +0000
10299 upstream: Fix error message on close(2) and add printf format
10301 attributes. From Christos Zoulas, OK markus@
10303 OpenBSD-Commit-ID: 41523c999a9e3561fcc7082fd38ea2e0629ee07e
10305 commit 712ac1efb687a945a89db6aa3e998c1a17b38653
10306 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10307 Date: Fri May 29 11:17:56 2020 +0000
10309 upstream: Make dollar_expand variadic and pass a real va_list to
10311 vdollar_percent_expand. Fixes build error on arm64 spotted by otto@.
10313 OpenBSD-Commit-ID: 181910d7ae489f40ad609b4cf4a20f3d068a7279
10315 commit 837ffa9699a9cba47ae7921d2876afaccc027133
10316 Author: Darren Tucker <dtucker@dtucker.net>
10317 Date: Fri May 29 20:39:00 2020 +1000
10319 Omit ToS setting if we don't have IPV6_TCLASS too.
10321 Fixes tests on old BSDs.
10323 commit f85b118d2150847cc333895296bc230e367be6b5
10324 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10325 Date: Fri May 29 09:02:44 2020 +0000
10327 upstream: Pass a NULL instead of zeroed out va_list from
10329 dollar_expand. The original intent was in case there's some platform where
10330 va_list is not a pointer equivalent, but on i386 this chokes on the memset.
10331 This unbreaks that build, but will require further consideration.
10333 OpenBSD-Commit-ID: 7b90afcd8e1137a1d863204060052aef415baaf7
10335 commit ec1d50b01c84ff667240ed525f669454c4ebc8e9
10336 Author: jmc@openbsd.org <jmc@openbsd.org>
10337 Date: Fri May 29 05:48:39 2020 +0000
10339 upstream: remove a stray .El;
10341 OpenBSD-Commit-ID: 58ddfe6f8a15fe10209db6664ecbe7896f1d167c
10343 commit 058674a62ffe33f01d871d46e624bc2a2c22d91f
10344 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10345 Date: Fri May 29 04:32:26 2020 +0000
10347 upstream: Add regression and unit tests for ${ENV} style
10349 environment variable expansion in various keywords (bz#3140). ok djm@
10351 OpenBSD-Regress-ID: 4d9ceb95d89365b7b674bc26cf064c15a5bbb197
10353 commit 0b15892fc47d6840eba1291a6be9be1a70bc8972
10354 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10355 Date: Fri May 29 01:21:35 2020 +0000
10357 upstream: Unit test for convtime. ok djm@
10359 OpenBSD-Regress-ID: cec4239efa2fc4c7062064f07a847e1cbdbcd5dd
10361 commit 188e332d1c8f9f24e5b6659e9680bf083f837df9
10362 Author: djm@openbsd.org <djm@openbsd.org>
10363 Date: Fri May 29 05:37:03 2020 +0000
10365 upstream: mention that wildcards are processed in lexical order;
10369 OpenBSD-Commit-ID: 8856f3d1612bd42e9ee606d89386cae456dd165c
10371 commit 4a1b46e6d032608b7ec00ae51c4e25b82f460b05
10372 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10373 Date: Fri May 29 04:25:40 2020 +0000
10375 upstream: Allow some keywords to expand shell-style ${ENV}
10377 environment variables on the client side. The supported keywords are
10378 CertificateFile, ControlPath, IdentityAgent and IdentityFile, plus
10379 LocalForward and RemoteForward when used for Unix domain socket paths. This
10380 would for example allow forwarding of Unix domain socket paths that change at
10381 runtime. bz#3140, ok djm@
10383 OpenBSD-Commit-ID: a4a2e801fc2d4df2fe0e58f50d9c81b03822dffa
10385 commit c9bab1d3a9e183cef3a3412f57880a0374cc8cb2
10386 Author: Damien Miller <djm@mindrot.org>
10387 Date: Fri May 29 14:49:16 2020 +1000
10391 commit 0b0d219313bf9239ca043f20b1a095db0245588f
10392 Author: sobrado <sobrado@openbsd.org>
10393 Date: Thu Sep 3 23:06:28 2015 +0000
10395 partial sync of regress/netcat.c with upstream
10397 synchronize synopsis and usage.
10399 commit 0f04c8467f589f85a523e19fd684c4f6c4ed9482
10400 Author: chl <chl@openbsd.org>
10401 Date: Sun Jul 26 19:12:28 2015 +0000
10403 partial sync of regress/netcat.c with upstream
10405 remove unused variable
10409 commit d6a81050ace2630b06c3c6dd39bb4eef5d1043f8
10410 Author: tobias <tobias@openbsd.org>
10411 Date: Thu Mar 26 21:22:50 2015 +0000
10413 partial sync of regress/netcat.c with upstream
10415 The code in socks.c writes multiple times in a row to a socket. If the socket becomes invalid between these calls (e.g. connection closed), write will throw SIGPIPE. With this patch, SIGPIPE is ignored so we can handle write's -1 return value (errno will be EPIPE). Ultimately, it leads to program exit, too -- but with nicer error message. :)
10417 with input by and ok djm
10419 commit bf3893dddd35e16def04bf48ed2ee1ad695b8f82
10420 Author: tobias <tobias@openbsd.org>
10421 Date: Thu Mar 26 10:36:03 2015 +0000
10423 partial sync of regress/netcat.c with upstream
10425 Check for short writes in fdpass(). Clean up while at it.
10429 commit e18435fec124b4c08eb6bbbbee9693dc04f4befb
10430 Author: jca <jca@openbsd.org>
10431 Date: Sat Feb 14 22:40:22 2015 +0000
10433 partial sync of regress/netcat.c with upstream
10435 Support for nc -T on IPv6 addresses.
10439 commit 4c607244054a036ad3b2449a6cb4c15feb846a76
10440 Author: djm@openbsd.org <djm@openbsd.org>
10441 Date: Fri May 29 03:14:02 2020 +0000
10443 upstream: fix compilation on !HAVE_DLOPEN platforms; stub function
10445 was not updated to match API change. From Dale Rahn via beck@ ok markus@
10447 OpenBSD-Commit-ID: 2b8d054afe34c9ac85e417dae702ef981917b836
10449 commit 224418cf55611869a4ace1b8b07bba0dff77a9c3
10450 Author: djm@openbsd.org <djm@openbsd.org>
10451 Date: Fri May 29 03:11:54 2020 +0000
10453 upstream: fix exit status for downloading of FIDO resident keys;
10455 from Pedro Martelletto, ok markus@
10457 OpenBSD-Commit-ID: 0da77dc24a1084798eedd83c39a002a9d231faef
10459 commit 1001dd148ed7c57bccf56afb40cb77482ea343a6
10460 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10461 Date: Fri May 29 01:20:46 2020 +0000
10463 upstream: Fix multiplier in convtime when handling seconds after
10465 other units. bz#3171, spotted by ronf at timeheart.net, ok djm@.
10467 OpenBSD-Commit-ID: 95b7a848e1083974a65fbb6ccb381d438e1dd5be
10469 commit 7af1e92cd289b7eaa9a683e9a6f2fddd98f37a01
10470 Author: djm@openbsd.org <djm@openbsd.org>
10471 Date: Wed May 27 22:37:53 2020 +0000
10473 upstream: fix Include before Match in sshd_config; bz#3122 patch
10477 OpenBSD-Commit-ID: 1b0aaf135fe6732b5d326946042665dd3beba5f4
10479 commit 0a9a611619b0a1fecd0195ec86a9885f5d681c84
10480 Author: djm@openbsd.org <djm@openbsd.org>
10481 Date: Wed May 27 21:59:11 2020 +0000
10483 upstream: Do not call process_queued_listen_addrs() for every
10485 included file from sshd_config; patch from Jakub Jelen
10487 OpenBSD-Commit-ID: 0ff603d6f06a7fab4881f12503b53024799d0a49
10489 commit 16ea1fdbe736648f79a827219134331f8d9844fb
10490 Author: djm@openbsd.org <djm@openbsd.org>
10491 Date: Wed May 27 21:25:18 2020 +0000
10493 upstream: fix crash in recallocarray when deleting SendEnv
10495 variables; spotted by & ok sthen@
10497 OpenBSD-Commit-ID: b881e8e849edeec5082b5c0a87d8d7cff091a8fd
10499 commit 47adfdc07f4f8ea0064a1495500244de08d311ed
10500 Author: djm@openbsd.org <djm@openbsd.org>
10501 Date: Wed May 27 22:35:19 2020 +0000
10503 upstream: two new tests for Include in sshd_config, checking whether
10505 Port directives are processed correctly and handling of Include directives
10506 that appear before Match. Both tests currently fail. bz#3122 and bz#3169 -
10507 patch from Jakub Jelen
10509 OpenBSD-Regress-ID: 8ad5a4a385a63f0a1c59c59c763ff029b45715df
10511 commit 47faad8f794516c33864d866aa1b55d88416f94c
10512 Author: Darren Tucker <dtucker@dtucker.net>
10513 Date: Wed May 27 23:26:23 2020 +1000
10515 Document that libfido2 >= 1.4.0 is needed.
10517 commit 4be563994c0cbe9856e7dd3078909f41beae4a9c
10518 Author: djm@openbsd.org <djm@openbsd.org>
10519 Date: Tue May 26 01:59:46 2020 +0000
10521 upstream: fix memleak of signature; from Pedro Martelletto
10523 OpenBSD-Commit-ID: d0a6eb07e77c001427d738b220dd024ddc64b2bb
10525 commit 0c111eb84efba7c2a38b2cc3278901a0123161b9
10526 Author: djm@openbsd.org <djm@openbsd.org>
10527 Date: Tue May 26 01:26:58 2020 +0000
10529 upstream: Restrict ssh-agent from signing web challenges for FIDO
10533 When signing messages in ssh-agent using a FIDO key that has an
10534 application string that does not start with "ssh:", ensure that the
10535 message being signed is one of the forms expected for the SSH protocol
10536 (currently pubkey authentication and sshsig signatures).
10538 This prevents ssh-agent forwarding on a host that has FIDO keys
10539 attached granting the ability for the remote side to sign challenges
10540 for web authentication using those keys too.
10542 Note that the converse case of web browsers signing SSH challenges is
10543 already precluded because no web RP can have the "ssh:" prefix in the
10544 application string that we require.
10548 OpenBSD-Commit-ID: 9ab6012574ed0352d2f097d307f4a988222d1b19
10550 commit 9c5f64b6cb3a68b99915202d318b842c6c76cf14
10551 Author: djm@openbsd.org <djm@openbsd.org>
10552 Date: Tue May 26 01:09:05 2020 +0000
10554 upstream: improve logging for MaxStartups connection throttling:
10556 have sshd log when it starts and stops throttling and periodically while in
10557 this state. bz#3055 ok markus@
10559 OpenBSD-Commit-ID: 2e07a09a62ab45d790d3d2d714f8cc09a9ac7ab9
10561 commit 756c6f66aee83a5862a6f936a316f761532f3320
10562 Author: djm@openbsd.org <djm@openbsd.org>
10563 Date: Tue May 26 01:06:52 2020 +0000
10565 upstream: add fmt_timeframe() (from bgpd) to format a time
10567 interval in a human- friendly format. Switch copyright for this file from BSD
10568 to MIT to make it easier to add Henning's copyright for this function. ok
10571 OpenBSD-Commit-ID: 414a831c662df7e68893e5233e86f2cac081ccf9
10573 commit 2a63ce5cd6d0e782783bf721462239b03757dd49
10574 Author: djm@openbsd.org <djm@openbsd.org>
10575 Date: Mon May 18 04:29:35 2020 +0000
10577 upstream: avoid possible NULL deref; from Pedro Martelletto
10579 OpenBSD-Commit-ID: e6099c3fbb70aa67eb106e84d8b43f1fa919b721
10581 commit 4b307faf2fb0e63e51a550b37652f7f972df9676
10582 Author: markus@openbsd.org <markus@openbsd.org>
10583 Date: Fri May 15 08:34:03 2020 +0000
10585 upstream: sshd listener must not block if reexecd sshd exits
10587 in write(2) on config_s[0] if the forked child exits early before finishing
10588 recv_rexec_state (e.g. with fatal()) because config_s[1] stays open in the
10589 parent. this prevents the parent from accepting new connections. ok djm,
10592 OpenBSD-Commit-ID: 92ccfeb939ccd55bda914dc3fe84582158c4a9ef
10594 commit af8b16fb2cce880341c0ee570ceb0d84104bdcc0
10595 Author: djm@openbsd.org <djm@openbsd.org>
10596 Date: Fri May 15 03:57:33 2020 +0000
10598 upstream: fix off-by-one error that caused sftp downloads to make
10600 one more concurrent request that desired. This prevented using sftp(1) in
10601 unpipelined request/response mode, which is useful when debugging. Patch from
10602 Stephen Goetze in bz#3054
10604 OpenBSD-Commit-ID: 41b394ebe57037dbc43bdd0eef21ff0511191f28
10606 commit d7d753e2979f2d3c904b03a08d30856cd2a6e892
10607 Author: deraadt@openbsd.org <deraadt@openbsd.org>
10608 Date: Wed May 13 22:38:41 2020 +0000
10610 upstream: we are still aiming for pre-C99 ...
10612 OpenBSD-Commit-ID: a240fc9cbe60bc4e6c3d24d022eb4ab01fe1cb38
10614 commit 2ad7b7e46408dbebf2a4efc4efd75a9544197d57
10615 Author: djm@openbsd.org <djm@openbsd.org>
10616 Date: Wed May 13 10:08:02 2020 +0000
10618 upstream: Enable credProtect extension when generating a resident
10622 The FIDO 2.1 Client to Authenticator Protocol introduced a "credProtect"
10623 feature to better protect resident keys. This option allows (amone other
10624 possibilities) requiring a PIN prior to all operations that may retrieve
10627 Patch by Pedro Martelletto; ok djm and markus
10629 OpenBSD-Commit-ID: 013bc06a577dcaa66be3913b7f183eb8cad87e73
10631 commit 1e70dc3285fc9b4f6454975acb81e8702c23dd89
10632 Author: djm@openbsd.org <djm@openbsd.org>
10633 Date: Wed May 13 09:57:17 2020 +0000
10635 upstream: always call fido_init(); previous behaviour only called
10637 fido_init() when SK_DEBUG was defined. Harmless with current libfido2, but
10638 this isn't guaranteed in the future.
10640 OpenBSD-Commit-ID: c7ea20ff2bcd98dd12015d748d3672d4f01f0864
10642 commit f2d84f1b3fa68d77c99238d4c645d0266fae2a74
10643 Author: djm@openbsd.org <djm@openbsd.org>
10644 Date: Wed May 13 09:55:57 2020 +0000
10646 upstream: preserve group/world read permission on known_hosts
10648 file across runs of "ssh-keygen -Rf /path". The old behaviour was to remove
10649 all rights for group/other. bz#3146 ok dtucker@
10651 OpenBSD-Commit-ID: dc369d0e0b5dd826430c63fd5f4b269953448a8a
10653 commit 05a651400da6fbe12296c34e3d3bcf09f034fbbf
10654 Author: djm@openbsd.org <djm@openbsd.org>
10655 Date: Wed May 13 09:52:41 2020 +0000
10657 upstream: when ordering the hostkey algorithms to request from a
10659 server, prefer certificate types if the known_hosts files contain a key
10660 marked as a @cert-authority; bz#3157 ok markus@
10662 OpenBSD-Commit-ID: 8f194573e5bb7c01b69bbfaabc68f27c9fa5e0db
10664 commit 829451815ec207e14bd54ff5cf7e22046816f042
10665 Author: djm@openbsd.org <djm@openbsd.org>
10666 Date: Tue May 12 01:41:32 2020 +0000
10668 upstream: fix non-ASCII quote that snuck in; spotted by Gabriel
10672 OpenBSD-Commit-ID: 04bcde311de2325d9e45730c744c8de079b49800
10674 commit 5a442cec92c0efd6fffb4af84bf99c70af248ef3
10675 Author: djm@openbsd.org <djm@openbsd.org>
10676 Date: Mon May 11 02:11:29 2020 +0000
10678 upstream: clarify role of FIDO tokens in multi-factor
10680 authentictation; mostly from Pedro Martelletto
10682 OpenBSD-Commit-ID: fbe05685a1f99c74b1baca7130c5a03c2df7c0ac
10684 commit ecb2c02d994b3e21994f31a70ff911667c262f1f
10685 Author: djm@openbsd.org <djm@openbsd.org>
10686 Date: Fri May 8 05:13:14 2020 +0000
10688 upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@
10690 OpenBSD-Commit-ID: 832e771948fb45f2270e8b8895aac36d176ba17a
10692 commit 3ab6fccc3935e9b778ff52f9c8d40f215d58e01d
10693 Author: Damien Miller <djm@mindrot.org>
10694 Date: Thu May 14 12:22:09 2020 +1000
10696 prefer ln to cp for temporary copy of sshd
10698 I saw failures on the reexec fallback test on Darwin 19.4 where
10699 fork()ed children of a process that had it's executable removed
10700 would instantly fail. Using ln to preserve the inode avoids this.
10702 commit f700d316c6b15a9cfbe87230d2dca81a5d916279
10703 Author: Darren Tucker <dtucker@dtucker.net>
10704 Date: Wed May 13 15:24:51 2020 +1000
10706 Actually skip pty tests when needed.
10708 commit 08ce6b2210f46f795e7db747809f8e587429dfd2
10709 Author: Darren Tucker <dtucker@dtucker.net>
10710 Date: Wed May 13 13:56:45 2020 +1000
10712 Skip building sk-dummy library if no SK support.
10714 commit 102d106bc2e50347d0e545fad6ff5ce408d67247
10715 Author: Damien Miller <djm@mindrot.org>
10716 Date: Wed May 13 12:08:34 2020 +1000
10718 explicitly manage .depend and .depend.bak
10720 Bring back removal of .depend to give the file a known state before
10721 running makedepend, but manually move aside the current .depend file
10722 and restore it as .depend.bak afterwards so the stale .depend check
10725 commit 83a6dc6ba1e03b3fa39d12a8522b8b0e68dd6390
10726 Author: Damien Miller <djm@mindrot.org>
10727 Date: Wed May 13 12:03:42 2020 +1000
10731 commit 7c0bbed967abed6301a63e0267cc64144357a99a
10732 Author: Damien Miller <djm@mindrot.org>
10733 Date: Wed May 13 12:01:10 2020 +1000
10735 revert removal of .depend before makedepend
10737 Commit 83657eac4 started removing .depend before running makedepend
10738 to reset the contents of .depend to a known state. Unfortunately
10739 this broke the depend-check step as now .depend.bak would only ever
10740 be created as an empty file.
10744 commit 58ad004acdcabf3b9f40bc3aaa206b25d998db8c
10745 Author: Damien Miller <djm@mindrot.org>
10746 Date: Tue May 12 12:58:46 2020 +1000
10748 prepare for 8.3 release
10750 commit 4fa9e048c2af26beb7dc2ee9479ff3323e92a7b5
10751 Author: Darren Tucker <dtucker@dtucker.net>
10752 Date: Fri May 8 21:50:43 2020 +1000
10754 Ensure SA_SIGNAL test only signals itself.
10756 When the test's child signals its parent and it exits the result of
10757 getppid changes. On Ubuntu 20.04 this results in the ppid being that
10758 of the GDM session, causing it to exit. Analysis and testing from pedro
10759 at ambientworks.net
10761 commit dc2da29aae76e170d22f38bb36f1f5d1edd5ec2b
10762 Author: Damien Miller <djm@mindrot.org>
10763 Date: Fri May 8 13:31:53 2020 +1000
10765 sync config.guess/config.sub with latest versions
10769 commit a8265bd64c14881fc7f4fa592f46dfc66b911f17
10770 Author: djm@openbsd.org <djm@openbsd.org>
10771 Date: Wed May 6 20:58:01 2020 +0000
10773 upstream: openssh-8.3; ok deraadt@
10775 OpenBSD-Commit-ID: c8831ec88b9c750f5816aed9051031fb535d22c1
10777 commit 955854cafca88e0cdcd3d09ca1ad4ada465364a1
10778 Author: djm@openbsd.org <djm@openbsd.org>
10779 Date: Wed May 6 20:57:38 2020 +0000
10781 upstream: another case where a utimes() failure could make scp send
10783 a desynchronising error; reminded by Aymeric Vincent ok deraadt markus
10785 OpenBSD-Commit-ID: 2ea611d34d8ff6d703a7a8bf858aa5dbfbfa7381
10787 commit 59d531553fd90196946743da391f3a27cf472f4e
10788 Author: Darren Tucker <dtucker@dtucker.net>
10789 Date: Thu May 7 15:34:12 2020 +1000
10791 Check if -D_REENTRANT is needed for localtime_r.
10793 On at least HP-UX 11.11, the localtime_r declararation is behind
10794 ifdef _REENTRANT. Check for and add if needed.
10796 commit c13403e55de8cdbb9da628ed95017b1d4c0f205f
10797 Author: Darren Tucker <dtucker@dtucker.net>
10798 Date: Tue May 5 11:32:43 2020 +1000
10800 Skip security key tests if ENABLE_SK not set.
10802 commit 4da393f87cd52d788c84112ee3f2191c9bcaaf30
10803 Author: djm@openbsd.org <djm@openbsd.org>
10804 Date: Fri May 1 04:03:14 2020 +0000
10806 upstream: sure enough, some of the test data that we though were in
10808 new format were actually in the old format; fix from Michael Forney
10810 OpenBSD-Regress-ID: a41a5c43a61b0f0b1691994dbf16dfb88e8af933
10812 commit 15bfafc1db4c8792265ada9623a96f387990f732
10813 Author: djm@openbsd.org <djm@openbsd.org>
10814 Date: Fri May 1 04:00:29 2020 +0000
10816 upstream: make mktestdata.sh generate old/new format keys that we
10818 expect. This script was written before OpenSSH switched to new-format private
10819 keys by default and was never updated to the change (until now) From Michael
10822 OpenBSD-Regress-ID: 38cf354715c96852e5b71c2393fb6e7ad28b7ca7
10824 commit 7882d2eda6ad3eb82220a85294de545d20ef82db
10825 Author: djm@openbsd.org <djm@openbsd.org>
10826 Date: Fri May 1 03:58:02 2020 +0000
10828 upstream: portability fix for sed that always emil a newline even
10830 if the input does not contain one; from Michael Forney
10832 OpenBSD-Regress-ID: 9190c3ddf0d2562ccc02c4a95fce0e392196bfc7
10834 commit 8074f9499e454df0acdacea33598858a1453a357
10835 Author: djm@openbsd.org <djm@openbsd.org>
10836 Date: Fri May 1 03:36:25 2020 +0000
10838 upstream: remove obsolete RSA1 test keys; spotted by Michael Forney
10840 OpenBSD-Regress-ID: 6384ba889594e217d166908ed8253718ab0866da
10842 commit c697e46c314aa94574af0d393d80f23e0ebc9748
10843 Author: Darren Tucker <dtucker@dtucker.net>
10844 Date: Sat May 2 18:34:47 2020 +1000
10848 commit 83657eac42941f270c4b02b2c46d9a21f616ef99
10849 Author: Darren Tucker <dtucker@dtucker.net>
10850 Date: Sat May 2 18:29:40 2020 +1000
10852 Remove use of tail for 'make depend'.
10854 Not every tail supports +N and we can do with out it so just remove it.
10855 Prompted by mforney at mforney.org.
10857 commit d25d630d24c5a1c64d4e646510e79dc22d6d7b88
10858 Author: djm@openbsd.org <djm@openbsd.org>
10859 Date: Sat May 2 07:19:43 2020 +0000
10861 upstream: we have a sshkey_save_public() function to save public keys;
10863 use it and save a bunch of redundant code.
10865 Patch from loic AT venez.fr; ok markus@ djm@
10867 OpenBSD-Commit-ID: f93e030a0ebcd0fd9054ab30db501ec63454ea5f
10869 commit e9dc9863723e111ae05e353d69df857f0169544a
10870 Author: Darren Tucker <dtucker@dtucker.net>
10871 Date: Fri May 1 18:32:25 2020 +1000
10873 Use LONG_LONG_MAX and friends if available.
10875 If we don't have LLONG_{MIN,MAX} but do have LONG_LONG_{MIN,MAX}
10876 then use those instead. We do calculate these values in configure,
10877 but it turns out that at least one compiler (old HP ANSI C) can't
10878 parse "-9223372036854775808LL" without mangling it. (It can parse
10879 "-9223372036854775807LL" which is presumably why its limits.h defines
10880 LONG_LONG_MIN as the latter minus 1.)
10882 Fixes rekey test when compiled with the aforementioned compiler.
10884 commit aad87b88fc2536b1ea023213729aaf4eaabe1894
10885 Author: djm@openbsd.org <djm@openbsd.org>
10886 Date: Fri May 1 06:31:42 2020 +0000
10888 upstream: when receving a file in sink(), be careful to send at
10890 most a single error response after the file has been opened. Otherwise the
10891 source() and sink() can become desyncronised. Reported by Daniel Goujot,
10892 Georges-Axel Jaloyan, Ryan Lahfa, and David Naccache.
10894 ok deraadt@ markus@
10896 OpenBSD-Commit-ID: 6c14d233c97349cb811a8f7921ded3ae7d9e0035
10898 commit 31909696c4620c431dd55f6cd15db65c4e9b98da
10899 Author: djm@openbsd.org <djm@openbsd.org>
10900 Date: Fri May 1 06:28:52 2020 +0000
10902 upstream: expose vasnmprintf(); ok (as part of other commit) markus
10906 OpenBSD-Commit-ID: 2e80cea441c599631a870fd40307d2ade5a7f9b5
10908 commit 99ce9cefbe532ae979744c6d956b49f4b02aff82
10909 Author: djm@openbsd.org <djm@openbsd.org>
10910 Date: Fri May 1 04:23:11 2020 +0000
10912 upstream: avoid NULL dereference when attempting to convert invalid
10914 ssh.com private keys using "ssh-keygen -i"; spotted by Michael Forney
10916 OpenBSD-Commit-ID: 2e56e6d26973967d11d13f56ea67145f435bf298
10918 commit 6c6072ba8b079e6f5caa38b011a6f4570c14ed38
10919 Author: Darren Tucker <dtucker@dtucker.net>
10920 Date: Fri May 1 15:09:26 2020 +1000
10922 See if SA_RESTART signals will interrupt select().
10924 On some platforms (at least older HP-UXes such as 11.11, possibly others)
10925 setting SA_RESTART on signal handers will cause it to not interrupt
10926 select(), at least for calls that do not specify a timeout. Try to
10927 detect this and if found, don't use SA_RESTART.
10929 POSIX says "If SA_RESTART has been set for the interrupting signal, it
10930 is implementation-dependent whether select() restarts or returns with
10931 [EINTR]" so this behaviour is within spec.
10933 commit 90a0b434ed41f9c505662dba8782591818599cb3
10934 Author: Damien Miller <djm@mindrot.org>
10935 Date: Fri May 1 13:55:03 2020 +1000
10939 commit c0dfd18dd1c2107c73d18f70cd164f7ebd434b08
10940 Author: Damien Miller <djm@mindrot.org>
10941 Date: Fri May 1 13:29:16 2020 +1000
10943 wrap sha2.h inclusion in #ifdef HAVE_SHA2_H
10945 commit a01817a9f63dbcbbc6293aacc4019993a4cdc7e3
10946 Author: djm@openbsd.org <djm@openbsd.org>
10947 Date: Tue Apr 28 04:59:29 2020 +0000
10949 upstream: adapt dummy FIDO middleware to API change; ok markus@
10951 OpenBSD-Regress-ID: 8bb84ee500c2eaa5616044314dd0247709a1790f
10953 commit 261571ddf02ea38fdb5e4a97c69ee53f847ca5b7
10954 Author: jmc@openbsd.org <jmc@openbsd.org>
10955 Date: Thu Apr 30 18:28:37 2020 +0000
10957 upstream: tweak previous; ok markus
10959 OpenBSD-Commit-ID: 41895450ce2294ec44a5713134491cc31f0c09fd
10961 commit 5de21c82e1d806d3e401b5338371e354b2e0a66f
10962 Author: markus@openbsd.org <markus@openbsd.org>
10963 Date: Thu Apr 30 17:12:20 2020 +0000
10965 upstream: bring back debug() removed in rev 1.74; noted by pradeep
10969 OpenBSD-Commit-ID: 8d134d22ab25979078a3b48d058557d49c402e65
10971 commit ea14103ce9a5e13492e805f7e9277516ff5a4273
10972 Author: markus@openbsd.org <markus@openbsd.org>
10973 Date: Thu Apr 30 17:07:10 2020 +0000
10975 upstream: run the 2nd ssh with BatchMode for scp -3
10977 OpenBSD-Commit-ID: 77994fc8c7ca02d88e6d0d06d0f0fe842a935748
10979 commit 59d2de956ed29aa5565ed5e5947a7abdb27ac013
10980 Author: djm@openbsd.org <djm@openbsd.org>
10981 Date: Tue Apr 28 04:02:29 2020 +0000
10983 upstream: when signing a challenge using a FIDO toke, perform the
10985 hashing in the middleware layer rather than in ssh code. This allows
10986 middlewares that call APIs that perform the hashing implicitly (including
10987 Microsoft's AFAIK). ok markus@
10989 OpenBSD-Commit-ID: c9fc8630aba26c75d5016884932f08a5a237f37d
10991 commit c9d10dbc0ccfb1c7568bbb784f7aeb7a0b5ded12
10992 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10993 Date: Sun Apr 26 09:38:14 2020 +0000
10995 upstream: Fix comment typo. Patch from mforney at mforney.org.
10997 OpenBSD-Commit-ID: 3565f056003707a5e678e60e03f7a3efd0464a2b
10999 commit 4d2c87b4d1bde019cdd0f00552fcf97dd8b39940
11000 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11001 Date: Sat Apr 25 06:59:36 2020 +0000
11003 upstream: We've standardized on memset over bzero, replace a couple
11005 that had slipped in. ok deraadt markus djm.
11007 OpenBSD-Commit-ID: f5be055554ee93e6cc66b0053b590bef3728dbd6
11009 commit 7f23f42123d64272a7b00754afa6b0841d676691
11010 Author: Darren Tucker <dtucker@dtucker.net>
11011 Date: Fri May 1 12:21:58 2020 +1000
11013 Include sys/byteorder.h for htons and friends.
11015 These are usually in netinet/in.h but on HP-UX they are not defined if
11016 _XOPEN_SOURCE_EXTENDED is set. Only needed for netcat in the regression
11019 commit d27cba58c972d101a5de976777e518f34ac779cb
11020 Author: Darren Tucker <dtucker@dtucker.net>
11021 Date: Fri May 1 09:21:52 2020 +1000
11023 Fix conditional for openssl-based chacha20.
11025 Fixes warnings or link errors when building against older OpenSSLs.
11028 commit 20819b962dc1467cd6fad5486a7020c850efdbee
11029 Author: Darren Tucker <dtucker@dtucker.net>
11030 Date: Fri Apr 24 15:07:55 2020 +1000
11032 Error out if given RDomain if unsupported.
11034 If the config contained 'RDomain %D' on a platform that did not support
11035 it, the error would not be detected until runtime resulting in a broken
11036 sshd. Detect this earlier and error out if found. bz#3126, based on a
11037 patch from jjelen at redhat.com, tweaks and ok djm@
11039 commit 2c1690115a585c624eed2435075a93a463a894e2
11040 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11041 Date: Fri Apr 24 03:33:21 2020 +0000
11043 upstream: Fix incorrect error message for "too many known hosts files."
11045 bz#3149, patch from jjelen at redhat.com.
11047 OpenBSD-Commit-ID: e0fcb07ed5cf7fd54ce340471a747c24454235e5
11049 commit 3beb7276e7a8aedd3d4a49f9c03b97f643448c92
11050 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11051 Date: Fri Apr 24 02:19:40 2020 +0000
11053 upstream: Remove leave_non_blocking() which is now dead code
11055 because nothing sets in_non_blocking_mode any more. Patch from
11056 michaael.meeks at collabora.com, ok djm@
11058 OpenBSD-Commit-ID: c403cefe97a5a99eca816e19cc849cdf926bd09c
11060 commit 8654e3561772f0656e7663a0bd6a1a8cb6d43300
11061 Author: jmc@openbsd.org <jmc@openbsd.org>
11062 Date: Thu Apr 23 21:28:09 2020 +0000
11064 upstream: ce examples of "Ar arg Ar arg" with "Ar arg arg" and
11068 OpenBSD-Commit-ID: af0e952ea0f5e2019c2ce953ed1796eca47f0705
11070 commit 67697e4a8246dd8423e44b8785f3ee31fee72d07
11071 Author: Darren Tucker <dtucker@dtucker.net>
11072 Date: Fri Apr 24 11:10:18 2020 +1000
11076 commit d6cc76176216fe3fac16cd20d148d75cb9c50876
11077 Author: Darren Tucker <dtucker@dtucker.net>
11078 Date: Wed Apr 22 14:07:00 2020 +1000
11080 Mailing list is now closed to non-subscribers.
11082 While there, add a reference to the bugzilla. ok djm@
11084 commit cecde6a41689d0ae585ec903b190755613a6de79
11085 Author: Darren Tucker <dtucker@dtucker.net>
11086 Date: Wed Apr 22 12:09:40 2020 +1000
11088 Put the values from env vars back.
11090 This merges the values from the recently removed environment into make's
11091 command line arguments since we actually need those.
11093 commit 300c4322b92e98d3346efa0aec1c094c94d0f964
11094 Author: Darren Tucker <dtucker@dtucker.net>
11095 Date: Wed Apr 22 11:33:15 2020 +1000
11097 Pass configure's egrep through to test-exec.sh.
11099 Use it to create a wrapper function to call it from tests. Fixes the
11100 keygen-comment test on platforms with impoverished default egrep (eg
11103 commit c8d9796cfe046f00eb8b2096d2b7028d6a523a84
11104 Author: Darren Tucker <dtucker@dtucker.net>
11105 Date: Wed Apr 22 10:56:44 2020 +1000
11107 Remove unneeded env vars from t-exec invocation.
11109 commit 01d4cdcd4514e99a4b6eb9523cd832bbf008d1d7
11110 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11111 Date: Tue Apr 21 23:14:58 2020 +0000
11113 upstream: Backslash '$' at then end of string. Prevents warning on
11117 OpenBSD-Regress-ID: 5dc27ab624c09d34078fd326b10e38c1ce9c741f
11119 commit 8854724ccefc1fa16f10b37eda2e759c98148caa
11120 Author: Darren Tucker <dtucker@dtucker.net>
11121 Date: Tue Apr 21 18:27:23 2020 +1000
11125 Prevent infinite for loop since i went from ssize_t to size_t. Patch from
11126 eagleoflqj via OpenSSH github PR#178, ok djm@, feedback & ok millert@
11128 commit d00d07b6744d3b4bb7aca46c734ecd670148da23
11129 Author: djm@openbsd.org <djm@openbsd.org>
11130 Date: Mon Apr 20 04:44:47 2020 +0000
11132 upstream: regression test for printing of private key fingerprints and
11134 key comments, mostly by loic AT venez.fr (slightly tweaked for portability)
11137 OpenBSD-Regress-ID: 8dc6c4feaf4fe58b6d634cd89afac9a13fd19004
11139 commit a98d5ba31e5e7e01317352f85fa63b846a960f8c
11140 Author: djm@openbsd.org <djm@openbsd.org>
11141 Date: Mon Apr 20 04:43:57 2020 +0000
11143 upstream: fix a bug I introduced in r1.406: when printing private key
11145 fingerprint of old-format key, key comments were not being displayed. Spotted
11146 by loic AT venez.fr, ok dtucker
11148 OpenBSD-Commit-ID: 2d98e4f9eb168eea733d17e141e1ead9fe26e533
11150 commit 32f2d0aad42c15e19bd3b07496076ca891573a58
11151 Author: djm@openbsd.org <djm@openbsd.org>
11152 Date: Fri Apr 17 07:16:07 2020 +0000
11154 upstream: repair private key fingerprint printing to also print
11156 comment after regression caused by my recent pubkey loading refactor.
11157 Reported by loic AT venez.fr, ok dtucker@
11159 OpenBSD-Commit-ID: f8db49acbee6a6ccb2a4259135693b3cceedb89e
11161 commit 094dd513f4b42e6a3cebefd18d1837eb709b4d99
11162 Author: djm@openbsd.org <djm@openbsd.org>
11163 Date: Fri Apr 17 07:15:11 2020 +0000
11165 upstream: refactor out some duplicate private key loading code;
11167 based on patch from loic AT venez.fr, ok dtucker@
11169 OpenBSD-Commit-ID: 5eff2476b0d8d0614924c55e350fb7bb9c84f45e
11171 commit 4e04f46f248f1708e39b900b76c9693c820eff68
11172 Author: jmc@openbsd.org <jmc@openbsd.org>
11173 Date: Fri Apr 17 06:12:41 2020 +0000
11175 upstream: add space beteen macro arg and punctuation;
11177 OpenBSD-Commit-ID: c93a6cbb4bf9468fc4c13e64bc1fd4efee201a44
11179 commit 44ae009a0112081d0d541aeaa90088bedb6f21ce
11180 Author: djm@openbsd.org <djm@openbsd.org>
11181 Date: Fri Apr 17 04:27:03 2020 +0000
11183 upstream: auth2-pubkey r1.89 changed the order of operations to
11185 checking AuthorizedKeysFile first and falling back to AuthorizedKeysCommand
11186 if no key was found in a file. Document this order here; bz3134
11188 OpenBSD-Commit-ID: afce0872cbfcfc1d4910ad7722e50f792a1dce12
11190 commit f96f17f920f38ceea6f3c5cb0b075c46b8929fdc
11191 Author: Damien Miller <djm@mindrot.org>
11192 Date: Fri Apr 17 14:07:15 2020 +1000
11194 sys/sysctl.h is only used on OpenBSD
11196 so change the preprocessor test used to include it to check
11197 __OpenBSD__, matching the code that uses the symbols it declares.
11199 commit 54688e937a69c7aebef8a3d50cbd4c6345bab2ca
11200 Author: djm@openbsd.org <djm@openbsd.org>
11201 Date: Fri Apr 17 03:38:47 2020 +0000
11203 upstream: fix reversed test that caused IdentitiesOnly=yes to not
11205 apply to keys loaded from a PKCS11Provider; bz3141, ok dtucker@
11207 OpenBSD-Commit-ID: e3dd6424b94685671fe84c9b9dbe352fb659f677
11209 commit 267cbc87b5b6e78973ac4d3c7a6f807ed226928c
11210 Author: djm@openbsd.org <djm@openbsd.org>
11211 Date: Fri Apr 17 03:34:42 2020 +0000
11213 upstream: mention that /etc/hosts.equiv and /etc/shosts.equiv are
11215 not considered for HostbasedAuthentication when the target user is root;
11218 OpenBSD-Commit-ID: fe4c1256929e53f23af17068fbef47852f4bd752
11220 commit c90f72d29e84b4a2709078bf5546a72c29a65177
11221 Author: djm@openbsd.org <djm@openbsd.org>
11222 Date: Fri Apr 17 03:30:05 2020 +0000
11224 upstream: make IgnoreRhosts a tri-state option: "yes" ignore
11226 rhosts/shosts, "no" allow rhosts/shosts or (new) "shosts-only" to allow
11227 .shosts files but not .rhosts. ok dtucker@
11229 OpenBSD-Commit-ID: d08d6930ed06377a80cf53923c1955e9589342e9
11231 commit 321c7147079270f3a154f91b59e66219aac3d514
11232 Author: djm@openbsd.org <djm@openbsd.org>
11233 Date: Fri Apr 17 03:23:13 2020 +0000
11235 upstream: allow the IgnoreRhosts directive to appear anywhere in a
11237 sshd_config, not just before any Match blocks; bz3148, ok dtucker@
11239 OpenBSD-Commit-ID: e042467d703bce640b1f42c5d1a62bf3825736e8
11241 commit ca5403b085a735055ec7b7cdcd5b91f2662df94c
11242 Author: jmc@openbsd.org <jmc@openbsd.org>
11243 Date: Sat Apr 11 20:20:09 2020 +0000
11245 upstream: add space between macro arg and punctuation;
11247 OpenBSD-Commit-ID: e579e4d95eef13059c30931ea1f09ed8296b819c
11249 commit 8af0244d7b4a65eed2e62f9c89141c7c8e63f09d
11250 Author: Darren Tucker <dtucker@dtucker.net>
11251 Date: Wed Apr 15 10:58:02 2020 +1000
11253 Add sys/syscall.h for syscall numbers.
11255 In some architecture/libc configurations we need to explicitly include
11256 sys/syscall.h for the syscall number (__NR_xxx) definitions. bz#3085,
11257 patch from blowfist at xroutine.net.
11259 commit 3779b50ee952078018a5d9e1df20977f4355df17
11260 Author: djm@openbsd.org <djm@openbsd.org>
11261 Date: Sat Apr 11 10:16:11 2020 +0000
11263 upstream: Refactor private key parsing. Eliminates a fair bit of
11265 duplicated code and fixes oss-fuzz#20074 (NULL deref) caused by a missing key
11266 type check in the ECDSA_CERT parsing path.
11268 feedback and ok markus@
11270 OpenBSD-Commit-ID: 4711981d88afb7196d228f7baad9be1d3b20f9c9
11272 commit b6a4013647db67ec622c144a9e05dd768f1966b3
11273 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11274 Date: Fri Apr 10 00:54:03 2020 +0000
11276 upstream: Add tests for TOKEN expansion of LocalForward and
11280 OpenBSD-Regress-ID: 90fcbc60d510eb114a2b6eaf4a06ff87ecd80a89
11282 commit abc3e0a5179c13c0469a1b11fe17d832abc39999
11283 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11284 Date: Mon Apr 6 09:43:55 2020 +0000
11286 upstream: Add utf8.c for asmprintf used by krl.c
11288 OpenBSD-Regress-ID: 433708d11165afdb189fe635151d21659dd37a37
11290 commit 990687a0336098566c3a854d23cce74a31ec6fe2
11291 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11292 Date: Fri Apr 10 00:52:07 2020 +0000
11294 upstream: Add TOKEN percent expansion to LocalFoward and RemoteForward
11296 when used for Unix domain socket forwarding. Factor out the code for the
11297 config keywords that use the most common subset of TOKENS into its own
11298 function. bz#3014, ok jmc@ (man page bits) djm@
11300 OpenBSD-Commit-ID: bffc9f7e7b5cf420309a057408bef55171fd0b97
11302 commit 2b13d3934d5803703c04803ca3a93078ecb5b715
11303 Author: djm@openbsd.org <djm@openbsd.org>
11304 Date: Wed Apr 8 00:10:37 2020 +0000
11306 upstream: let sshkey_try_load_public() load public keys from the
11308 unencrypted envelope of private key files if not sidecar public key file is
11313 OpenBSD-Commit-ID: 252a0a580e10b9a6311632530d63b5ac76592040
11315 commit d01f39304eaab0352793b490a25e1ab5f59a5366
11316 Author: djm@openbsd.org <djm@openbsd.org>
11317 Date: Wed Apr 8 00:09:24 2020 +0000
11319 upstream: simplify sshkey_try_load_public()
11323 OpenBSD-Commit-ID: 05a5d46562aafcd70736c792208b1856064f40ad
11325 commit f290ab0833e44355fc006e4e67b92446c14673ef
11326 Author: djm@openbsd.org <djm@openbsd.org>
11327 Date: Wed Apr 8 00:08:46 2020 +0000
11329 upstream: add sshkey_parse_pubkey_from_private_fileblob_type()
11331 Extracts a public key from the unencrypted envelope of a new-style
11332 OpenSSH private key.
11336 OpenBSD-Commit-ID: 44d7ab446e5e8c686aee96d5897b26b3939939aa
11338 commit 8d514eea4ae089626a55e11c7bc1745c8d9683e4
11339 Author: djm@openbsd.org <djm@openbsd.org>
11340 Date: Wed Apr 8 00:07:19 2020 +0000
11342 upstream: simplify sshkey_parse_private_fileblob_type()
11344 Try new format parser for all key types first, fall back to PEM
11345 parser only for invalid format errors.
11349 OpenBSD-Commit-ID: 0173bbb3a5cface77b0679d4dca0e15eb5600b77
11351 commit 421169d0e758351b105eabfcebf42378ebf17217
11352 Author: djm@openbsd.org <djm@openbsd.org>
11353 Date: Wed Apr 8 00:05:59 2020 +0000
11355 upstream: check private key type against requested key type in
11357 new-style private decoding; ok markus@
11359 OpenBSD-Commit-ID: 04d44b3a34ce12ce5187fb6f6e441a88c8c51662
11361 commit 6aabfb6d22b36d07f584cba97f4cdc4363a829da
11362 Author: djm@openbsd.org <djm@openbsd.org>
11363 Date: Wed Apr 8 00:04:32 2020 +0000
11365 upstream: check that pubkey in private key envelope matches actual
11369 (this public key is currently unusued)
11373 OpenBSD-Commit-ID: 634a60b5e135d75f48249ccdf042f3555112049c
11375 commit c0f5b2294796451001fd328c44f0d00f1114eddf
11376 Author: djm@openbsd.org <djm@openbsd.org>
11377 Date: Wed Apr 8 00:01:52 2020 +0000
11379 upstream: refactor private key parsing a little
11381 Split out the base64 decoding and private section decryption steps in
11382 to separate functions. This will make the decryption step easier to fuzz
11383 as well as making it easier to write a "load public key from new-format
11384 private key" function.
11388 OpenBSD-Commit-ID: 7de31d80fb9062aa01901ddf040c286b64ff904e
11390 commit 8461a5b3db34ed0b5a4a18d82f64fd5ac8693ea8
11391 Author: Darren Tucker <dtucker@dtucker.net>
11392 Date: Mon Apr 6 20:54:34 2020 +1000
11394 Include openssl-compat.h before checking ifdefs.
11396 Fixes problem where unsuitable chacha20 code in libressl would be used
11399 commit 931c50c5883a9910ea1ae9a371e4e815ec56b035
11400 Author: Damien Miller <djm@mindrot.org>
11401 Date: Mon Apr 6 10:04:56 2020 +1000
11403 fix inverted test for LibreSSL version
11405 commit d1d5f728511e2338b7c994968d301d8723012264
11406 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11407 Date: Sat Apr 4 23:04:41 2020 +0000
11409 upstream: Indicate if we're using a cached key in trace output.
11411 OpenBSD-Regress-ID: 409a7b0e59d1272890fda507651c0c3d2d3c0d89
11413 commit a398251a4627367c78bc483c70c2ec973223f82c
11414 Author: Darren Tucker <dtucker@dtucker.net>
11415 Date: Sun Apr 5 08:43:57 2020 +1000
11417 Use /usr/bin/xp4g/id if necessary.
11419 Solaris' native "id" doesn't support the options we use but the one
11420 in /usr/bin/xp4g does, so use that instead.
11422 commit db0fdd48335b5b01114f78c1a73a195235910f81
11423 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11424 Date: Sat Apr 4 22:14:26 2020 +0000
11426 upstream: Some platforms don't have "hostname -s", so use cut to trim
11428 short hostname instead.
11430 OpenBSD-Regress-ID: ebcf36a6fdf287c9336b0d4f6fc9f793c05307a7
11432 commit e7e59a9cc8eb7fd5944ded28f4d7e3ae0a5fdecd
11433 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11434 Date: Fri Apr 3 07:53:10 2020 +0000
11436 upstream: Compute hash locally and re-enable %C tests.
11438 OpenBSD-Regress-ID: 94d1366e8105274858b88a1f9ad2e62801e49770
11440 commit abe2b245b3ac6c4801e99bc0f13289cd28211e22
11441 Author: Damien Miller <djm@mindrot.org>
11442 Date: Fri Apr 3 17:25:46 2020 +1100
11444 prefer libcrypto chacha20-poly1305 where possible
11446 commit bc5c5d01ad668981f9e554e62195383bc12e8528
11447 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11448 Date: Fri Apr 3 05:43:11 2020 +0000
11450 upstream: Temporarily remove tests for '%C' since the hash contains the
11452 local hostname and it doesn't work on any machine except mine... spotted by
11455 OpenBSD-Regress-ID: 2d4c3585b9fcbbff14f4a5a5fde51dbd0d690401
11457 commit 81624026989654955a657ebf2a1fe8b9994f3c87
11458 Author: djm@openbsd.org <djm@openbsd.org>
11459 Date: Fri Apr 3 06:07:57 2020 +0000
11461 upstream: r1.522 deleted one too many lines; repair
11463 OpenBSD-Commit-ID: 1af8851fd7a99e4a887b19aa8f4c41a6b3d25477
11465 commit 668cb3585ce829bd6e34d4a962c489bda1d16370
11466 Author: jmc@openbsd.org <jmc@openbsd.org>
11467 Date: Fri Apr 3 05:53:52 2020 +0000
11469 upstream: sort -N and add it to usage();
11471 OpenBSD-Commit-ID: 5b00e8db37c2b0a54c7831fed9e5f4db53ada332
11473 commit 338ccee1e7fefa47f3d128c2541e94c5270abe0c
11474 Author: djm@openbsd.org <djm@openbsd.org>
11475 Date: Fri Apr 3 05:48:57 2020 +0000
11477 upstream: avoid another compiler warning spotted in -portable
11479 OpenBSD-Commit-ID: 1d29c51ac844b287c4c8bcaf04c63c7d9ba3b8c7
11481 commit 9f8a42340bd9af86a99cf554dc39ecdf89287544
11482 Author: djm@openbsd.org <djm@openbsd.org>
11483 Date: Fri Apr 3 04:07:48 2020 +0000
11485 upstream: this needs utf8.c too
11487 OpenBSD-Regress-ID: 445040036cec714d28069a20da25553a04a28451
11489 commit 92115ea7c3a834374720c350841fc729e7d5c8b2
11490 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11491 Date: Fri Apr 3 03:14:03 2020 +0000
11493 upstream: Add percent_expand test for 'Match Exec'.
11495 OpenBSD-Regress-ID: a41c14fd6a0b54d66aa1e9eebfb9ec962b41232f
11497 commit de34a440276ae855c38deb20f926d46752c62c9d
11498 Author: djm@openbsd.org <djm@openbsd.org>
11499 Date: Fri Apr 3 04:43:24 2020 +0000
11501 upstream: fix format string (use %llu for uint64, not %lld). spotted by
11503 Darren and his tinderbox tests
11505 OpenBSD-Commit-ID: 3b4587c3d9d46a7be9bdf028704201943fba96c2
11507 commit 9cd40b829a5295cc81fbea8c7d632b2478db6274
11508 Author: djm@openbsd.org <djm@openbsd.org>
11509 Date: Fri Apr 3 04:34:15 2020 +0000
11511 upstream: Add a flag to re-enable verbose output when in batch
11513 mode; requested in bz3135; ok dtucker
11515 OpenBSD-Commit-ID: 5ad2ed0e6440562ba9c84b666a5bbddc1afe2e2b
11517 commit 6ce51a5da5d333a44e7c74c027f3571f70c39b24
11518 Author: djm@openbsd.org <djm@openbsd.org>
11519 Date: Fri Apr 3 04:32:21 2020 +0000
11521 upstream: chacha20-poly1305 AEAD using libcrypto EVP_chacha20
11523 Based on patch from Yuriy M. Kaminskiy. ok + lots of assistance along the
11526 OpenBSD-Commit-ID: 5e08754c13d31258bae6c5e318cc96219d6b10f0
11528 commit eba523f0a130f1cce829e6aecdcefa841f526a1a
11529 Author: djm@openbsd.org <djm@openbsd.org>
11530 Date: Fri Apr 3 04:27:03 2020 +0000
11532 upstream: make Chacha20-POLY1305 context struct opaque; ok tb@ as
11534 part of a larger diff at a2k20
11536 OpenBSD-Commit-ID: a4609b7263284f95c9417ef60ed7cdbb7bf52cfd
11538 commit ebd29e90129cf18fedfcfe1de86e324228669295
11539 Author: djm@openbsd.org <djm@openbsd.org>
11540 Date: Fri Apr 3 04:06:26 2020 +0000
11542 upstream: fix debug statement
11544 OpenBSD-Commit-ID: 42c6edeeda5ce88b51a20d88c93be3729ce6b916
11546 commit 7b4d8999f2e1a0cb7b065e3efa83e6edccfc7d82
11547 Author: djm@openbsd.org <djm@openbsd.org>
11548 Date: Fri Apr 3 04:03:51 2020 +0000
11550 upstream: the tunnel-forwarding vs ExitOnForwardFailure fix that I
11552 committed earlier had an off-by-one. Fix this and add some debugging that
11553 would have made it apparent sooner.
11555 OpenBSD-Commit-ID: 082f8f72b1423bd81bbdad750925b906e5ac6910
11557 commit eece243666d44ceb710d004624c5c7bdc05454bc
11558 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11559 Date: Fri Apr 3 03:12:11 2020 +0000
11561 upstream: %C expansion just added to Match Exec should include
11563 remote user not local user.
11565 OpenBSD-Commit-ID: 80f1d976938f2a55ee350c11d8b796836c8397e2
11567 commit d5318a784d016478fc8da90a38d9062c51c10432
11568 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11569 Date: Fri Apr 3 02:33:31 2020 +0000
11571 upstream: Add regression test for percent expansions where possible.
11573 OpenBSD-Regress-ID: 7283be8b2733ac1cbefea3048a23d02594485288
11575 commit 663e84bb53de2a60e56a44d538d25b8152b5c1cc
11576 Author: djm@openbsd.org <djm@openbsd.org>
11577 Date: Fri Apr 3 02:40:32 2020 +0000
11579 upstream: make failures when establishing "Tunnel" forwarding terminate
11581 the connection when ExitOnForwardFailure is enabled; bz3116; ok dtucker
11583 OpenBSD-Commit-ID: ef4b4808de0a419c17579b1081da768625c1d735
11585 commit ed833da176611a39d3376d62154eb88eb440d31c
11586 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11587 Date: Fri Apr 3 02:27:12 2020 +0000
11589 upstream: Make with config keywords support which
11591 percent_expansions more consistent. - %C is moved into its own function and
11592 added to Match Exec. - move the common (global) options into a macro. This
11593 is ugly but it's the least-ugly way I could come up with. - move
11594 IdentityAgent and ForwardAgent percent expansion to before the config dump
11595 to make it regression-testable. - document all of the above
11597 ok jmc@ for man page bits, "makes things less terrible" djm@ for the rest.
11599 OpenBSD-Commit-ID: 4b65664bd6d8ae2a9afaf1a2438ddd1b614b1d75
11601 commit 6ec7457171468da2bbd908b8cd63d298b0e049ea
11602 Author: djm@openbsd.org <djm@openbsd.org>
11603 Date: Fri Apr 3 02:26:56 2020 +0000
11605 upstream: give ssh-keygen the ability to dump the contents of a
11607 binary key revocation list: ssh-keygen -lQf /path bz#3132; ok dtucker
11609 OpenBSD-Commit-ID: b76afc4e3b74ab735dbde4e5f0cfa1f02356033b
11611 commit af628b8a6c3ef403644d83d205c80ff188c97f0c
11612 Author: djm@openbsd.org <djm@openbsd.org>
11613 Date: Fri Apr 3 02:25:21 2020 +0000
11615 upstream: add allocating variant of the safe utf8 printer; ok
11617 dtucker as part of a larger diff
11619 OpenBSD-Commit-ID: 037e2965bd50eacc2ffb49889ecae41552744fa0
11621 commit d8ac9af645f5519ac5211e9e1e4dc1ed00e9cced
11622 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11623 Date: Mon Mar 16 02:17:02 2020 +0000
11625 upstream: Cast lifetime to u_long for comparison to prevent unsigned
11627 comparison warning on 32bit arches. Spotted by deraadt, ok djm.
11629 OpenBSD-Commit-ID: 7a75b2540bff5ab4fa00b4d595db1df13bb0515a
11631 commit 0eaca933ae08b0a515edfccd5cc4a6b667034813
11632 Author: Darren Tucker <dtucker@dtucker.net>
11633 Date: Sat Mar 14 20:58:46 2020 +1100
11635 Include fido.h when checking for fido/credman.h.
11637 It's required for fido_dev_t, otherwise configure fails with
11638 when given --with-security-key-builtin.
11640 commit c7c099060f82ffe6a36d8785ecf6052e12fd92f0
11641 Author: djm@openbsd.org <djm@openbsd.org>
11642 Date: Fri Mar 13 03:18:45 2020 +0000
11644 upstream: some more speeling mistakes from
11646 OpenBSD-Regress-ID: 02471c079805471c546b7a69d9ab1d34e9a57443
11648 commit 1d89232a4aa97fe935cd60b8d24d75c2f70d56c5
11649 Author: djm@openbsd.org <djm@openbsd.org>
11650 Date: Fri Mar 13 04:16:27 2020 +0000
11652 upstream: improve error messages for some common PKCS#11 C_Login
11654 failure cases; based on patch from Jacob Hoffman-Andrews in bz3130; ok
11657 OpenBSD-Commit-ID: b8b849621b4a98e468942efd0a1c519c12ce089e
11659 commit 5becbec023f2037394987f85ed7f74b9a28699e0
11660 Author: djm@openbsd.org <djm@openbsd.org>
11661 Date: Fri Mar 13 04:01:56 2020 +0000
11663 upstream: use sshpkt_fatal() for kex_exchange_identification()
11665 errors. This ensures that the logged errors are consistent with other
11666 transport- layer errors and that the relevant IP addresses are logged. bz3129
11669 OpenBSD-Commit-ID: 2c22891f0b9e1a6cd46771cedbb26ac96ec2e6ab
11671 commit eef88418f9e5e51910af3c5b23b5606ebc17af55
11672 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11673 Date: Fri Mar 13 03:24:49 2020 +0000
11675 upstream: Don't clear alarm timers in listening sshd. Previously
11677 these timers were used for regenerating the SSH1 ephemeral host keys but
11678 those are now gone so there's no need to clear the timers either. ok
11681 OpenBSD-Commit-ID: 280d2b885e4a1ce404632e8cc38fcb17be7dafc0
11683 commit d081f017c20a3564255873ed99fd7d024cac540f
11684 Author: djm@openbsd.org <djm@openbsd.org>
11685 Date: Fri Mar 13 03:17:07 2020 +0000
11687 upstream: spelling errors in comments; no code change from
11689 OpenBSD-Commit-ID: 166ea64f6d84f7bac5636dbd38968592cb5eb924
11691 commit c084a2d040f160bc2b83f13297e3e3ca3f5dbac6
11692 Author: djm@openbsd.org <djm@openbsd.org>
11693 Date: Fri Mar 13 03:12:17 2020 +0000
11695 upstream: when downloading FIDO2 resident keys from a token, don't
11697 prompt for a PIN until the token has told us that it needs one. Avoids
11698 double-prompting on devices that implement on-device authentication (e.g. a
11699 touchscreen PIN pad on the Trezor Model T). ok dtucker@
11701 OpenBSD-Commit-ID: 38b78903dd4422d7d3204095a31692fb69130817
11703 commit 955c4cf4c6a1417c28d4e1040702c4d9bf63645b
11704 Author: Damien Miller <djm@mindrot.org>
11705 Date: Fri Mar 13 14:30:16 2020 +1100
11707 sync fnmatch.c with upstream to fix another typo
11709 commit 397f217e8640e75bb719a8e87111b4bd848fb3df
11710 Author: Damien Miller <djm@mindrot.org>
11711 Date: Fri Mar 13 14:24:23 2020 +1100
11713 another spelling error in comment
11715 commit def31bc5427579ec3f7f2ce99f2da1338fdc0c9f
11716 Author: Damien Miller <djm@mindrot.org>
11717 Date: Fri Mar 13 14:23:07 2020 +1100
11721 from https://fossies.org/linux/misc/openssh-8.2p1.tar.gz/codespell.html
11723 commit 8bdc3bb7cf4c82c3344cfcb82495a43406e87e83
11724 Author: markus@openbsd.org <markus@openbsd.org>
11725 Date: Fri Mar 6 18:29:54 2020 +0000
11727 upstream: fix relative includes in sshd_config; ok djm
11729 OpenBSD-Commit-ID: fa29b0da3c93cbc3a1d4c6bcd58af43c00ffeb5b
11731 commit e32ef97a56ae03febfe307688858badae3a70e5a
11732 Author: markus@openbsd.org <markus@openbsd.org>
11733 Date: Fri Mar 6 18:29:14 2020 +0000
11735 upstream: fix use-after-free in do_download_sk; ok djm
11737 OpenBSD-Commit-ID: 96b49623d297797d4fc069f1f09e13c8811f8863
11739 commit 5732d58020309364bf31fa125354e399361006db
11740 Author: markus@openbsd.org <markus@openbsd.org>
11741 Date: Fri Mar 6 18:28:50 2020 +0000
11743 upstream: do not leak oprincipals; ok djm
11745 OpenBSD-Commit-ID: 4691d9387eab36f8fda48f5d8009756ed13a7c4c
11747 commit 8fae395f34c2c52cdaf9919aa261d1848b4bb00b
11748 Author: markus@openbsd.org <markus@openbsd.org>
11749 Date: Fri Mar 6 18:28:27 2020 +0000
11751 upstream: initialize seconds for debug message; ok djm
11753 OpenBSD-Commit-ID: 293fbefe6d00b4812a180ba02e26170e4c855b81
11755 commit 46e5c4c8ffcd1569bcd5d04803abaa2ecf3e4cff
11756 Author: markus@openbsd.org <markus@openbsd.org>
11757 Date: Fri Mar 6 18:27:50 2020 +0000
11759 upstream: correct return code; ok djm
11761 OpenBSD-Commit-ID: 319d09e3b7f4b2bc920c67244d9ff6426b744810
11763 commit 31c39e7840893f1bfdcbe4f813b20d1d7e69ec3e
11764 Author: markus@openbsd.org <markus@openbsd.org>
11765 Date: Fri Mar 6 18:27:15 2020 +0000
11767 upstream: principalsp is optional, pubkey required; ok djm
11769 OpenBSD-Commit-ID: 2cc3ea5018c28ed97edaccd7f17d2cc796f01024
11771 commit e26a31757c5df2f58687cb9a4853d1418f39728e
11772 Author: markus@openbsd.org <markus@openbsd.org>
11773 Date: Fri Mar 6 18:26:21 2020 +0000
11775 upstream: remove unused variables in ssh-pkcs11-helper; ok djm
11777 OpenBSD-Commit-ID: 13e572846d0d1b28f1251ddd2165e9cf18135ae1
11779 commit 1b378c0d982d6ab522eda634b0e88cf1fca5e352
11780 Author: markus@openbsd.org <markus@openbsd.org>
11781 Date: Fri Mar 6 18:25:48 2020 +0000
11783 upstream: return correct error in sshsk_ed25519_sig; ok djm
11785 OpenBSD-Commit-ID: 52bf733df220303c260fee4f165ec64b4a977625
11787 commit fbff605e637b068061ab6784ff03e3874890c092
11788 Author: markus@openbsd.org <markus@openbsd.org>
11789 Date: Fri Mar 6 18:25:12 2020 +0000
11791 upstream: fix possible null-deref in check_key_not_revoked; ok
11795 OpenBSD-Commit-ID: 80855e9d7af42bb6fcc16c074ba69876bfe5e3bf
11797 commit bc30b446841fc16e50ed6e75c56ccfbd37b9f281
11798 Author: markus@openbsd.org <markus@openbsd.org>
11799 Date: Fri Mar 6 18:24:39 2020 +0000
11801 upstream: ssh_fetch_identitylist() returns the return value from
11803 ssh_request_reply() so we should also check against != 0 ok djm
11805 OpenBSD-Commit-ID: 28d0028769d03e665688c61bb5fd943e18614952
11807 commit 7b4f70ddeb59f35283d77d8d9c834ca58f8cf436
11808 Author: markus@openbsd.org <markus@openbsd.org>
11809 Date: Fri Mar 6 18:23:17 2020 +0000
11811 upstream: sshkey_cert_check_authority requires reason to be set;
11815 OpenBSD-Commit-ID: 6f7a6f19540ed5749763c2f9530c0897c94aa552
11817 commit 05efe270df1e925db0af56a806d18b5063db4b6d
11818 Author: markus@openbsd.org <markus@openbsd.org>
11819 Date: Fri Mar 6 18:21:28 2020 +0000
11821 upstream: passphrase depends on kdfname, not ciphername (possible
11823 null-deref); ok djm
11825 OpenBSD-Commit-ID: 0d39668edf5e790b5837df4926ee1141cec5471c
11827 commit 1ddf5682f3992bdacd29164891abb71a19c2cf61
11828 Author: markus@openbsd.org <markus@openbsd.org>
11829 Date: Fri Mar 6 18:20:44 2020 +0000
11831 upstream: consistently check packet_timeout_ms against 0; ok djm
11833 OpenBSD-Commit-ID: e8fb8cb2c96c980f075069302534eaf830929928
11835 commit 31f1ee54968ad84eb32375e4412e0318766b586b
11836 Author: markus@openbsd.org <markus@openbsd.org>
11837 Date: Fri Mar 6 18:20:02 2020 +0000
11839 upstream: initialize cname in case ai_canonname is NULL or too
11843 OpenBSD-Commit-ID: c27984636fdb1035d1642283664193e91aab6e37
11845 commit a6134b02b5264b2611c8beae98bb392329452bba
11846 Author: markus@openbsd.org <markus@openbsd.org>
11847 Date: Fri Mar 6 18:19:21 2020 +0000
11849 upstream: fix uninitialized pointers for forward_cancel; ok djm
11851 OpenBSD-Commit-ID: 612778e6d87ee865d0ba97d0a335f141cee1aa37
11853 commit 16d4f9961c75680aab374dee762a5baa0ad507af
11854 Author: markus@openbsd.org <markus@openbsd.org>
11855 Date: Fri Mar 6 18:16:21 2020 +0000
11857 upstream: exit on parse failures in input_service_request; ok djm
11859 OpenBSD-Commit-ID: 6a7e1bfded26051d5aa893c030229b1ee6a0d5d2
11861 commit 5f25afe5216ba7f8921e04f79aa4ca0624eca820
11862 Author: markus@openbsd.org <markus@openbsd.org>
11863 Date: Fri Mar 6 18:15:38 2020 +0000
11865 upstream: fix null-deref on calloc failure; ok djm
11867 OpenBSD-Commit-ID: a313519579b392076b7831ec022dfdefbec8724a
11869 commit ff2acca039aef16a15fce409163df404858f7aa5
11870 Author: markus@openbsd.org <markus@openbsd.org>
11871 Date: Fri Mar 6 18:15:04 2020 +0000
11873 upstream: exit if ssh_krl_revoke_key_sha256 fails; ok djm
11875 OpenBSD-Commit-ID: 0864ad4fe8bf28ab21fd1df766e0365c11bbc0dc
11877 commit 31c860a0212af2d5b6a129e3e8fcead51392ee1d
11878 Author: markus@openbsd.org <markus@openbsd.org>
11879 Date: Fri Mar 6 18:14:13 2020 +0000
11881 upstream: pkcs11_register_provider: return < 0 on error; ok djm
11883 OpenBSD-Commit-ID: cfc8321315b787e4d40da4bdb2cbabd4154b0d97
11885 commit 15be29e1e3318737b0768ca37d5b4a3fbe868ef0
11886 Author: markus@openbsd.org <markus@openbsd.org>
11887 Date: Fri Mar 6 18:13:29 2020 +0000
11889 upstream: sshsig: return correct error, fix null-deref; ok djm
11891 OpenBSD-Commit-ID: 1d1af7cd538b8b23e621cf7ab84f11e7a923edcd
11893 commit 6fb6f186cb62a6370fba476b6a03478a1e95c30d
11894 Author: markus@openbsd.org <markus@openbsd.org>
11895 Date: Fri Mar 6 18:12:55 2020 +0000
11897 upstream: vasnmprintf allocates str and returns -1; ok djm
11899 OpenBSD-Commit-ID: dae4c9e83d88471bf3b3f89e3da7a107b44df11c
11901 commit 714e1cbca17daa13f4f98978cf9e0695d4b2e0a4
11902 Author: markus@openbsd.org <markus@openbsd.org>
11903 Date: Fri Mar 6 18:11:10 2020 +0000
11905 upstream: sshpkt_fatal() does not return; ok djm
11907 OpenBSD-Commit-ID: 7dfe847e28bd78208eb227b37f29f4a2a0929929
11909 commit 9b47bd7b09d191991ad9e0506bb66b74bbc93d34
11910 Author: djm@openbsd.org <djm@openbsd.org>
11911 Date: Fri Feb 28 01:07:28 2020 +0000
11913 upstream: no-touch-required certificate option should be an
11915 extension, not a critical option.
11917 OpenBSD-Commit-ID: 626b22c5feb7be8a645e4b9a9bef89893b88600d
11919 commit dd992520bed35387fc010239abe1bdc0c2665e38
11920 Author: djm@openbsd.org <djm@openbsd.org>
11921 Date: Fri Feb 28 01:06:05 2020 +0000
11923 upstream: better error message when trying to use a FIDO key
11925 function and SecurityKeyProvider is empty
11927 OpenBSD-Commit-ID: e56602c2ee8c82f835d30e4dc8ee2e4a7896be24
11929 commit b81e66dbe0345aef4717911abcb4f589fff33a0a
11930 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11931 Date: Thu Feb 27 02:32:37 2020 +0000
11933 upstream: Drop leading space from line count that was confusing
11935 ssh-keygen's screen mode.
11937 OpenBSD-Commit-ID: 3bcae7a754db3fc5ad3cab63dd46774edb35b8ae
11939 commit d5ba1c03278eb079438bb038266d80d7477d49cb
11940 Author: jsg@openbsd.org <jsg@openbsd.org>
11941 Date: Wed Feb 26 13:40:09 2020 +0000
11943 upstream: change explicit_bzero();free() to freezero()
11945 While freezero() returns early if the pointer is NULL the tests for
11946 NULL in callers are left to avoid warnings about passing an
11947 uninitialised size argument across a function boundry.
11951 OpenBSD-Commit-ID: 2660fa334fcc7cd05ec74dd99cb036f9ade6384a
11953 commit 9e3220b585c5be19a7431ea4ff8884c137b3a81c
11954 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11955 Date: Wed Feb 26 11:46:51 2020 +0000
11957 upstream: Have sftp reject "-1" in the same way as ssh(1) and
11959 scp(1) do instead of accepting and silently ignoring it since protocol 1
11960 support has been removed. Spotted by shivakumar2696 at gmail.com, ok
11963 OpenBSD-Commit-ID: b79f95559a1c993214f4ec9ae3c34caa87e9d5de
11965 commit ade8e67bb0f07b12e5e47e7baeafbdc898de639f
11966 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11967 Date: Wed Feb 26 01:31:47 2020 +0000
11969 upstream: Remove obsolete XXX comment. ok deraadt@
11971 OpenBSD-Commit-ID: bc462cc843947feea26a2e21c750b3a7469ff01b
11973 commit 7eb903f51eba051d7f65790bab92a28970ac1ccc
11974 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11975 Date: Mon Feb 24 04:27:58 2020 +0000
11977 upstream: Fix typo. Patch from itoama at live.jp via github PR#173.
11979 OpenBSD-Commit-ID: 5cdaafab38bbdea0d07e24777d00bfe6f972568a