1 commit 94eb6858efecc1b4f02d8a6bd35e149f55c814c8
2 Author: Damien Miller <djm@mindrot.org>
3 Date: Wed Apr 6 10:47:48 2022 +1000
5 update version numbers for release
7 commit 8e4a8eadf4fe74e65e6492f34250f8cf7d67e8da
8 Author: djm@openbsd.org <djm@openbsd.org>
9 Date: Mon Apr 4 22:45:25 2022 +0000
13 OpenBSD-Commit-ID: 0dfb461188f4513ec024c1534da8c1ce14c20b64
15 commit a9f23ea2e3227f406880c2634d066f6f50fa5eaa
16 Author: naddy@openbsd.org <naddy@openbsd.org>
17 Date: Thu Mar 31 17:58:44 2022 +0000
19 upstream: ssh: document sntrup761x25519-sha512@openssh.com as
23 OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171
25 commit 9ec2713d122af79d66ebb9c1d6d9ae8621a8945f
26 Author: naddy@openbsd.org <naddy@openbsd.org>
27 Date: Thu Mar 31 17:27:27 2022 +0000
29 upstream: man pages: add missing commas between subordinate and
33 jmc@ dislikes a comma before "then" in a conditional, so leave those
38 OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3
40 commit 3741df98ffaaff92b474ee70d8ef276b5882f85a
41 Author: Darren Tucker <dtucker@dtucker.net>
42 Date: Mon Apr 4 23:52:11 2022 +1000
44 Disable security key on fbsd6 test host.
46 commit 32c12236f27ae83bfe6d2983b67c9bc67a83a417
47 Author: Darren Tucker <dtucker@dtucker.net>
48 Date: Mon Apr 4 15:16:51 2022 +1000
50 Specify TEST_SHELL=bash on AIX.
52 The system shells cause the agent-restrict test to fail due to some
53 quoting so explicitly specify bash until we can get configure to
54 autmatically work around that.
56 commit 90452c8b69d065b7c7c285ff78b81418a75bcd76
57 Author: Darren Tucker <dtucker@dtucker.net>
58 Date: Fri Apr 1 23:38:44 2022 +1100
60 Only return events from ppoll that were requested.
62 If the underlying system's select() returns bits that were not in the
63 request set, our ppoll() implementation can return revents for events
64 not requested, which can apparently cause a hang. Only return revents
65 for activity in the requested event set. bz#3416, analysis and fix by
66 yaroslav.kuzmin at vmssoftware com, ok djm@
68 commit 6c49eb5fabc56f4865164ed818aa5112d09c31a8
69 Author: Darren Tucker <dtucker@dtucker.net>
70 Date: Fri Apr 1 23:21:40 2022 +1100
72 Only run regression tests on slow VMs.
74 commit f67e47903977b42cb6abcd5565a61bd7293e4dc3
75 Author: Darren Tucker <dtucker@dtucker.net>
76 Date: Fri Apr 1 23:21:06 2022 +1100
78 Increase test timeout to allow slow VMs to finish
80 commit 02488c1b54065ddc4f25835dbd2618b2a2fe21f5
81 Author: Darren Tucker <dtucker@dtucker.net>
82 Date: Fri Apr 1 16:27:38 2022 +1100
84 Use bash or ksh if available for SH in Makefile.
86 commit 34c7018c316af4773e432066de28d0ef9d0888cd
87 Author: Darren Tucker <dtucker@dtucker.net>
88 Date: Fri Apr 1 14:56:54 2022 +1100
90 Set Makefile SHELL as determined by configure.
92 This should improve compatibility for users with non-POSIX shells. If
93 using Makefile.in directly (eg make -f Makefile.in distprep) then SHELL
94 will need to be specified on the command line (along with MANFMT in that
95 particular case). ok djm@
97 commit 5b054d76402faab38c48377efd112426469553a0
98 Author: Darren Tucker <dtucker@dtucker.net>
99 Date: Fri Apr 1 13:16:47 2022 +1100
101 Skip slow tests on (very) slow test targets.
103 commit b275818065b31a865142c48c2acf6a7c1655c542
104 Author: Damien Miller <djm@mindrot.org>
105 Date: Thu Mar 31 14:11:36 2022 +1100
109 commit 3fa539c3ffaabd6211995512d33e29150f88c5c5
110 Author: djm@openbsd.org <djm@openbsd.org>
111 Date: Thu Mar 31 03:07:03 2022 +0000
113 upstream: add a sftp client "cp" command that supports server-side
115 copying of files. Useful for this task and for testing the copy-data
116 extension. Patch from Mike Frysinger; ok dtucker@
118 OpenBSD-Commit-ID: 1bb1b950af0d49f0d5425b1f267e197aa1b57444
120 commit 7988bfc4b701c4b3fe9b36c8561a3d1c5d4c9a74
121 Author: djm@openbsd.org <djm@openbsd.org>
122 Date: Thu Mar 31 03:05:49 2022 +0000
124 upstream: add support for the "corp-data" protocol extension to
126 allow server-side copies to be performed without having to go via the client.
127 Patch by Mike Frysinger, ok dtucker@
129 OpenBSD-Commit-ID: 00aa510940fedd66dab1843b58682de4eb7156d5
131 commit 32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba
132 Author: djm@openbsd.org <djm@openbsd.org>
133 Date: Wed Mar 30 21:13:23 2022 +0000
135 upstream: select post-quantum KEX
137 sntrup761x25519-sha512@openssh.com as the default; ok markus@
139 OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9
141 commit d6556de1db0822c76ba2745cf5c097d9472adf7c
142 Author: djm@openbsd.org <djm@openbsd.org>
143 Date: Wed Mar 30 21:10:25 2022 +0000
145 upstream: fix poll() spin when a channel's output fd closes without
147 data in the channel buffer. Introduce more exact packing of channel fds into
148 the pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@
150 OpenBSD-Commit-ID: 06740737849c9047785622ad5d472cb6a3907d10
152 commit 8a74a96d25ca4d32fbf298f6c0ac5a148501777d
153 Author: djm@openbsd.org <djm@openbsd.org>
154 Date: Wed Mar 30 04:33:09 2022 +0000
156 upstream: ssh is almost out of getopt() characters; note the
158 remaining remaining available ones in a comment
160 OpenBSD-Commit-ID: 48d38cef59d6bc8e84c6c066f6d601875d3253fd
162 commit 6d4fc51adb9d8a42f67b5474f02f877422379de6
163 Author: djm@openbsd.org <djm@openbsd.org>
164 Date: Wed Mar 30 04:27:51 2022 +0000
166 upstream: avoid NULL deref via ssh-keygen -Y find-principals.
168 bz3409, reported by Mateusz Adamowski
170 OpenBSD-Commit-ID: a3b2c02438052ee858e0ee18e5a288586b5df2c5
172 commit e937514920335b92b543fd9be79cd6481d1eb0b6
173 Author: Darren Tucker <dtucker@dtucker.net>
174 Date: Mon Mar 28 17:51:03 2022 +1100
176 Add AIX 5.1 test target.
178 commit 4bbe815ba974b4fd89cc3fc3e3ef1be847a0befe
179 Author: Darren Tucker <dtucker@dtucker.net>
180 Date: Sat Mar 26 22:01:31 2022 +1100
182 Drop leading "v" from release version identifier.
184 It's present in the git tags but not in the release tarball names.
185 Also drop extra "/" from URL path.
187 commit f5cdd3b3c275dffaebfca91df782dca29975e9ac
188 Author: Darren Tucker <dtucker@dtucker.net>
189 Date: Sat Mar 26 16:28:04 2022 +1100
191 Use tarballs when testing LibreSSL releases.
193 This means they'll still work when the combination of -portable and
194 openbsd github repos no longer match.
196 commit 24dc37d198f35a7cf71bf4d5384363c7ef4209d4
197 Author: Darren Tucker <dtucker@dtucker.net>
198 Date: Sat Mar 26 15:02:45 2022 +1100
200 Remove now-unused passwd variable.
202 commit 5b467ceef2c356f0a77f5e8ab4eb0fac367e4d24
203 Author: Darren Tucker <dtucker@dtucker.net>
204 Date: Sat Mar 26 13:15:44 2022 +1100
208 commit 2923d026e55998133c0f6e5186dca2a3c0fa5ff5
209 Author: Darren Tucker <dtucker@dtucker.net>
210 Date: Sat Mar 26 12:49:50 2022 +1100
212 Factor out platform-specific locked account check.
214 Also fixes an incorrect free on platforms with both libiaf and shadow
215 passwords (probably only Unixware). Prompted by github PR#284,
216 originally from @c3h2_ctf and stoeckmann@.
218 commit d23efe4b12886ffe416be10bc0a7da6ca8aa72d1
219 Author: Darren Tucker <dtucker@dtucker.net>
220 Date: Sat Mar 26 08:13:46 2022 +1100
222 Add OpenWRT mips and mipsel test targets.
224 commit 16ea8b85838dd7a4dbeba4e51ac4f43fd68b1e5b
225 Author: djm@openbsd.org <djm@openbsd.org>
226 Date: Sun Mar 20 08:52:17 2022 +0000
228 upstream: don't leak argument list; bz3404, reported by Balu
232 OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6
234 commit a72bde294fe0518c9a44ba63864093a1ef2425e3
235 Author: djm@openbsd.org <djm@openbsd.org>
236 Date: Sun Mar 20 08:51:21 2022 +0000
238 upstream: make addargs() and replacearg() a little more robust and
240 improve error reporting
242 make freeargs(NULL) a noop like the other free functions
244 ok dtucker as part of bz3403
246 OpenBSD-Commit-ID: 15f86da83176978b4d1d288caa24c766dfa2983d
248 commit 731087d2619fa7f01e675b23f57af10d745e8af2
249 Author: djm@openbsd.org <djm@openbsd.org>
250 Date: Fri Mar 18 04:04:11 2022 +0000
252 upstream: don't try to resolve ListenAddress directives in the sshd
254 re-exec path - we're never going to use the result and if the operation fails
255 then it can prevent connections from being accepted. Reported by Aaron
256 Poffenberger; with / ok dtucker@
258 OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60
260 commit 1c83c082128694ddd11ac05fdf31d70312ff1763
261 Author: djm@openbsd.org <djm@openbsd.org>
262 Date: Fri Mar 18 02:50:21 2022 +0000
264 upstream: remove blank line
266 OpenBSD-Commit-ID: d5e0182965b2fbfb03ad5f256d1a1ce5706bcddf
268 commit 807be68684da7a1fe969c399ddce2fafb7997dcb
269 Author: djm@openbsd.org <djm@openbsd.org>
270 Date: Fri Mar 18 02:32:22 2022 +0000
272 upstream: helpful comment
274 OpenBSD-Commit-ID: e3315a45cb04e7feeb614d76ec80a9fe4ca0e8c7
276 commit a0b5816f8f1f645acdf74f7bc11b34455ec30bac
277 Author: djm@openbsd.org <djm@openbsd.org>
278 Date: Fri Mar 18 02:31:25 2022 +0000
280 upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV
282 will ensue. Patch from Mateusz Adamowski via GHPR#307
284 OpenBSD-Commit-ID: 99e8ec38f9feb38bce6de240335be34aedeba5fd
286 commit 5a252d54a63be30d5ba4be76210942d754a531c0
287 Author: djm@openbsd.org <djm@openbsd.org>
288 Date: Tue Mar 15 05:27:37 2022 +0000
290 upstream: improve DEBUG_CHANNEL_POLL debugging message
292 OpenBSD-Commit-ID: 2275eb7bc4707d019b1a0194b9c92c0b78da848f
294 commit ce324cf58ba2840e31afeb996935800780c8fa4b
295 Author: cheloha@openbsd.org <cheloha@openbsd.org>
296 Date: Sun Mar 13 23:27:54 2022 +0000
298 upstream: ssh: xstrdup(): use memcpy(3)
300 Copying the given string into the buffer with strlcpy(3) confers no
301 benefit in this context because we have already determined the
302 string's length with strlen(3) in order to allocate that buffer.
304 Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2
308 OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a
310 commit 2893c5e764557f48f9d6a929e224ed49c59545db
311 Author: Darren Tucker <dtucker@dtucker.net>
312 Date: Fri Mar 11 18:43:58 2022 +1100
314 Resync fmt_scaled. with OpenBSD.
316 Fixes underflow reported in bz#3401.
318 commit 5ae31a0fdd27855af29f48ff027491629fff5979
319 Author: Darren Tucker <dtucker@dtucker.net>
320 Date: Wed Mar 9 09:41:56 2022 +1100
322 Provide killpg implementation.
324 Based on github PR#301 for Tandem NonStop.
326 commit c41c84b439f4cd74d4fe44298a4b4037ddd7d2ae
327 Author: Darren Tucker <dtucker@dtucker.net>
328 Date: Wed Mar 9 09:29:30 2022 +1100
330 Check for missing ftruncate prototype.
332 From github PR#301 in conjunction with rsbeckerca.
334 commit 8cf5275452a950869cb90eeac7d220b01f77b12e
335 Author: Darren Tucker <dtucker@dtucker.net>
336 Date: Tue Mar 8 20:04:06 2022 +1100
338 Default to not using sandbox when cross compiling.
340 On most systems poll(2) does not work when the number of FDs is reduced
341 with setrlimit, so assume it doesn't when cross compiling and we can't
342 run the test. bz#3398.
344 commit 379b30120da53d7c84aa8299c26b18c51c2a0dac
345 Author: djm@openbsd.org <djm@openbsd.org>
346 Date: Tue Mar 1 01:59:19 2022 +0000
348 upstream: pack pollfd array before server_accept_loop() ppoll()
350 call, and terminate sshd if ppoll() returns errno==EINVAL
352 avoids spin in ppoll when MaxStartups > RLIMIT_NOFILE, reported by
357 OpenBSD-Commit-ID: dbab1c24993ac977ec24d83283b8b7528f7c2c15
359 commit eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd
360 Author: naddy@openbsd.org <naddy@openbsd.org>
361 Date: Sun Feb 27 01:33:59 2022 +0000
363 upstream: include rejected signature algorithm in error message and
365 not the (useless) key type; ok djm@
367 OpenBSD-Commit-ID: d0c0f552a4d9161203e07e95d58a76eb602a76ff
369 commit f2f3269423618a83157e18902385e720f9776007
370 Author: dtucker@openbsd.org <dtucker@openbsd.org>
371 Date: Fri Feb 25 09:46:24 2022 +0000
373 upstream: Remove the char * casts from arguments to do_lstat,
375 do_readdir and do_stat paths since the underlying functions now take a const
376 char *. Patch from vapier at gentoo.org.
378 OpenBSD-Commit-ID: 9e4d964dbfb0ed683a2a2900711b88e7f1c0297b
380 commit 4a66dac052c5ff5047161853f36904607649e4f9
381 Author: djm@openbsd.org <djm@openbsd.org>
382 Date: Fri Feb 25 02:09:27 2022 +0000
384 upstream: save an unneccessary alloc/free, based on patch from
386 Martin Vahlensieck; ok dtucker@
388 OpenBSD-Commit-ID: 90ffbf1f837e509742f2c31a1fbf2c0fd376fd5f
390 commit 6f117cb151efe138ac57bdd8e26165f350328f5f
391 Author: Darren Tucker <dtucker@dtucker.net>
392 Date: Tue Mar 1 09:02:06 2022 +1100
394 Remove unused ivbits argument from chacha_keysetup
396 commit 15974235dd528aeab0ec67fb92a0a1d733f62be2
397 Author: Darren Tucker <dtucker@dtucker.net>
398 Date: Tue Mar 1 09:00:20 2022 +1100
400 Add OPENBSD ORIGINAL marker.
402 commit f2ff669347d320532e7c1b63cdf5c62f46e73150
403 Author: Darren Tucker <dtucker@dtucker.net>
404 Date: Mon Feb 28 22:21:36 2022 +1100
406 No unused param warnings for clang-12 and gcc-11.
408 These have too many false positives in -Werror tests on the github CI
409 since we often provide empty stub functions for functionality not needed
410 for particular configurations.
412 commit 96558ecd87adac62efa9a2b5479f686ab86b0be1
413 Author: Darren Tucker <dtucker@dtucker.net>
414 Date: Sat Feb 26 14:10:41 2022 +1100
416 Add debian-i386 test target.
418 commit 284b6e5394652d519e31782e3b3cdfd7b21d1a81
419 Author: Darren Tucker <dtucker@dtucker.net>
420 Date: Sat Feb 26 14:06:14 2022 +1100
422 Allow ppoll_time64 in seccomp sandbox.
424 Should fix sandbox violations on (some? at least i386 and armhf) 32bit
425 Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at
426 debian.org via bz#3396.
428 commit 0132056efabc5edb85c3c7105d2fb6dee41843c6
429 Author: Darren Tucker <dtucker@dtucker.net>
430 Date: Fri Feb 25 19:47:48 2022 +1100
432 Improve handling of _getshort and _getlong.
434 If the system native ones are exactly as required then use them,
435 otherwise use the local versions mapped to another name to prevent
438 commit 8e206e0dd6b9f757b07979e48f53ad5bf9b7b52b
439 Author: Darren Tucker <dtucker@dtucker.net>
440 Date: Fri Feb 25 15:14:22 2022 +1100
442 Constify utimes in compat library to match specs.
444 Patch from vapier at chromium.org.
446 commit 1b2920e3b63db2eddebeec7330ffe8b723055573
447 Author: Darren Tucker <dtucker@dtucker.net>
448 Date: Fri Feb 25 13:50:56 2022 +1100
450 ANSIfy getshort and getlong.
452 These functions appear to have come from OpenBSD's lib/libc/net/res_comp.c
453 which made this change in 2005.
455 commit 54a86f4f6e1c43a2ca2be23ef799ab8910d4af70
456 Author: Darren Tucker <dtucker@dtucker.net>
457 Date: Fri Feb 25 13:23:04 2022 +1100
459 Use PICFLAG instead of hard coding -fPIC.
461 commit 3016ba47035ac3561aabd48e2be70167fe157d6a
462 Author: Darren Tucker <dtucker@dtucker.net>
463 Date: Fri Feb 25 11:37:11 2022 +1100
465 Add tests for latest releases of {Libre,Open}SSL.
467 commit f107467179428a0e3ea9e4aa9738ac12ff02822d
468 Author: Colin Watson <cjwatson@debian.org>
469 Date: Thu Feb 24 16:04:18 2022 +0000
471 Improve detection of -fzero-call-used-regs=all support
473 GCC doesn't tell us whether this option is supported unless it runs into
474 the situation where it would need to emit corresponding code.
476 commit 3383b2cac0e9275bc93c4b4760e6e048f537e1d6
477 Author: djm@openbsd.org <djm@openbsd.org>
478 Date: Wed Feb 23 21:21:49 2022 +0000
480 upstream: free(3) wants stdlib.h
482 OpenBSD-Commit-ID: 227a8c70a95b4428c49e46863c9ef4bd318a3b8a
484 commit a4537e79ab4ac6db4493c5158744b9ebde5efcb0
485 Author: djm@openbsd.org <djm@openbsd.org>
486 Date: Wed Feb 23 21:21:16 2022 +0000
488 upstream: put back the scp manpage changes for SFTP mode too
490 OpenBSD-Commit-ID: 05dc53921f927e1b5e5694e1f3aa314549f2e768
492 commit 449bcb8403adfb9724805d02a51aea76046de185
493 Author: deraadt@openbsd.org <deraadt@openbsd.org>
494 Date: Wed Feb 23 19:01:00 2022 +0000
496 upstream: and we go back to testing sftp-scp after the 8.9
500 OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c
502 commit 166456cedad3962b83b848b1e9caf80794831f0f
503 Author: Damien Miller <djm@mindrot.org>
504 Date: Wed Feb 23 22:31:11 2022 +1100
508 commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4
509 Author: djm@openbsd.org <djm@openbsd.org>
510 Date: Wed Feb 23 11:18:13 2022 +0000
512 upstream: avoid integer overflow of auth attempts (harmless, caught
516 OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86
518 commit 6e0258c64c901753df695e06498b26f9f4812ea6
519 Author: djm@openbsd.org <djm@openbsd.org>
520 Date: Wed Feb 23 11:17:10 2022 +0000
522 upstream: randomise the password used in fakepw
524 OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947
526 commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9
527 Author: djm@openbsd.org <djm@openbsd.org>
528 Date: Wed Feb 23 11:15:57 2022 +0000
530 upstream: use asprintf to construct .rhosts paths
532 OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b
534 commit c07e154fbdc7285e9ec54e78d8a31f7325d43537
535 Author: djm@openbsd.org <djm@openbsd.org>
536 Date: Wed Feb 23 11:07:09 2022 +0000
538 upstream: openssh-8.9
540 OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e
542 commit bc16667b4a1c3cad7029304853c143a32ae04bd4
543 Author: Darren Tucker <dtucker@dtucker.net>
544 Date: Tue Feb 22 15:29:22 2022 +1100
546 Extend select+rlimit sanbox test to include poll.
548 POSIX specifies that poll() shall fail if "nfds argument is greater
549 than {OPEN_MAX}". The setrlimit sandbox sets this to effectively zero
550 so this causes poll() to fail in the preauth privsep process.
552 This is likely the underlying cause for the previously observed similar
553 behaviour of select() on plaforms where it is implement in userspace on
556 commit 6520c488de95366be031d49287ed243620399e23
557 Author: Darren Tucker <dtucker@dtucker.net>
558 Date: Tue Feb 22 13:08:59 2022 +1100
560 Add Alpine Linux test VM.
562 commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb
563 Author: Darren Tucker <dtucker@dtucker.net>
564 Date: Tue Feb 22 12:27:07 2022 +1100
566 Include sys/param.h if present.
568 Needed for howmany() on MUSL systems such as Alpine.
570 commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c
571 Author: Darren Tucker <dtucker@dtucker.net>
572 Date: Tue Feb 22 12:25:52 2022 +1100
574 Only include sys/poll.h if we don't have poll.h.
576 Prevents warnings on MUSL based systems such as Alpine.
578 commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5
579 Author: Damien Miller <djm@mindrot.org>
580 Date: Tue Feb 22 11:14:51 2022 +1100
582 disable agent-restrict test on minix3
584 Minix seems to have a platform-wide limit on the number of
585 select(2) syscalls that can be concurrently issued. This test
586 seems to exceed this limit.
590 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114
591 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31
593 commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a
594 Author: Darren Tucker <dtucker@dtucker.net>
595 Date: Mon Feb 21 21:27:20 2022 +1100
597 Skip agent-getpeereid when running as root.
599 commit fbd772570a25436a33924d91c164d2b24021f010
600 Author: dtucker@openbsd.org <dtucker@openbsd.org>
601 Date: Sun Feb 20 03:47:26 2022 +0000
603 upstream: Aproximate realpath on the expected output by deduping
605 leading slashes. Fixes test failure when user's home dir is / which is
606 possible in some portable configurations.
608 OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63
610 commit 336685d223a59f893faeedf0a562e053fd84058e
611 Author: Darren Tucker <dtucker@dtucker.net>
612 Date: Sun Feb 20 13:30:52 2022 +1100
614 Really move DSA to end of list.
616 In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to
617 the end of the list instead of DSA. Spotted by andrew at fyfe.gb.net.
619 commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3
620 Author: Darren Tucker <dtucker@dtucker.net>
621 Date: Fri Feb 18 12:12:21 2022 +1100
623 Add test configs for MUSL C library.
625 commit f7fc6a43f1173e8b2c38770bf6cee485a562d03b
626 Author: Damien Miller <djm@mindrot.org>
627 Date: Thu Feb 17 22:54:19 2022 +1100
629 minix needs BROKEN_POLL too; chokes on /dev/null
631 commit 667fec5d4fe4406745750a32f69b5d2e1a75e94b
632 Author: djm@openbsd.org <djm@openbsd.org>
633 Date: Thu Feb 17 10:58:27 2022 +0000
635 upstream: check for EINTR/EAGAIN failures in the rfd fast-path; caught
637 by dtucker's minix3 vm :) ok dtucker@
639 OpenBSD-Commit-ID: 2e2c895a3e82ef347aa6694394a76a438be91361
641 commit 41417dbda9fb55a0af49a8236e3ef9d50d862644
642 Author: Darren Tucker <dtucker@dtucker.net>
643 Date: Thu Feb 17 22:05:29 2022 +1100
645 Comment hurd test, the VM is currently broken.
647 commit b2aee35a1f0dc798339b3fcf96136da71b7e3f6d
648 Author: Damien Miller <djm@mindrot.org>
649 Date: Thu Feb 17 21:15:16 2022 +1100
651 find sk-dummy.so when build_dir != src_dir
653 spotted by Corinna Vinschen; feedback & ok dtucker@
655 commit 62a2d4e50b2e89f2ef04576931895d5139a5d037
656 Author: Damien Miller <djm@mindrot.org>
657 Date: Wed Feb 16 16:26:17 2022 +1100
659 update versions in preparation for 8.9 release
661 commit dd6d3dded721ac653ea73c017325e5bfeeec837f
662 Author: djm@openbsd.org <djm@openbsd.org>
663 Date: Tue Feb 15 05:13:36 2022 +0000
665 upstream: document the unbound/host-bound options to
667 PubkeyAuthentication; spotted by HARUYAMA Seigo
669 OpenBSD-Commit-ID: 298f681b66a9ecd498f0700082c7a6c46e948981
671 commit df93529dd727fdf2fb290700cd4f1adb0c3c084b
672 Author: Darren Tucker <dtucker@dtucker.net>
673 Date: Mon Feb 14 14:19:40 2022 +1100
675 Test if sshd accidentally acquires controlling tty
677 When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour
678 in the STREAMS code before activating the workaround. ok djm@
680 commit 766176cfdbfd7ec38bb6118dde6e4daa0df34888
681 Author: Darren Tucker <dtucker@dtucker.net>
682 Date: Sat Feb 12 10:24:56 2022 +1100
684 Add cygwin-release test config.
686 This tests the flags used to build the cygwin release binaries.
688 commit b30698662b862f5397116d23688aac0764e0886e
689 Author: Darren Tucker <dtucker@dtucker.net>
690 Date: Fri Feb 11 21:00:35 2022 +1100
692 Move SSHD_ACQUIRES_CTTY workaround into compat.
694 On some (most? all?) SysV based systems with STREAMS based ptys,
695 sshd could acquire a controlling terminal during pty setup when
696 it pushed the "ptem" module, due to what is probably a bug in
697 the STREAMS driver that's old enough to vote. Because it was the
698 privileged sshd's controlling terminal, it was not available for
699 the user's session, which ended up without one. This is known to
700 affect at least Solaris <=10, derivatives such as OpenIndiana and
701 several other SysV systems. See bz#245 for the backstory.
703 In the we past worked around that by not calling setsid in the
704 privileged sshd child, which meant it was not a session or process
705 group leader. This solved controlling terminal problem because sshd
706 was not eligble to acquire one, but had other side effects such as
707 not cleaning up helper subprocesses in the SIGALRM handler since it
708 was not PG leader. Recent cleanups in the signal handler uncovered
709 this, resulting in the LoginGraceTime timer not cleaning up privsep
710 unprivileged processes.
712 This change moves the workaround into the STREAMS pty allocation code,
713 by allocating a sacrificial pty to act as sshd's controlling terminal
714 before allocating user ptys, so those are still available for users'
718 - this will waste a pty per ssh connection on affected platforms.
721 - it makes the process group behaviour consistent between platforms.
723 - it puts the workaround nearest the code that actually causes the
724 problem and competely out of the mainline code.
726 - the workaround is only activated if you use the STREAMS code. If,
727 say, Solaris 11 has the bug but also a working openpty() it doesn't
728 matter that we defined SSHD_ACQUIRES_CTTY.
730 - the workaround is only activated when the fist pty is allocated,
731 ie in the post-auth privsep monitor. This means there's no risk
732 of fd leaks to the unprivileged processes, and there's no effect on
733 sessions that do not allocate a pty.
735 Based on analysis and work by djm@, ok djm@
737 commit cd00b48cf10f3565936a418c1e6d7e48b5c36140
738 Author: Darren Tucker <dtucker@dtucker.net>
739 Date: Fri Feb 11 20:09:32 2022 +1100
741 Simplify handling of --with-ssl-dir.
745 commit ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0
746 Author: Darren Tucker <dtucker@dtucker.net>
747 Date: Fri Feb 11 13:39:29 2022 +1100
749 Stop testing OpenBSD HEAD on 6.9 and 7.0.
751 HEAD is not guaranteed to work on previous stable branches, and at the
752 moment is broken due to libfido API changes.
754 commit 50b9e4a4514697ffb9592200e722de6b427cb9ff
755 Author: dtucker@openbsd.org <dtucker@openbsd.org>
756 Date: Fri Feb 11 00:43:56 2022 +0000
758 upstream: Always initialize delim before passing to hpdelim2 which
760 might not set it. Found by the Valgrind tests on github, ok deraadt@
762 OpenBSD-Commit-ID: c830c0db185ca43beff3f41c19943c724b4f636d
764 commit 6ee53064f476cf163acd5521da45b11b7c57321b
765 Author: Darren Tucker <dtucker@dtucker.net>
766 Date: Fri Feb 11 10:03:06 2022 +1100
768 Fix helper include path and remove excess code.
770 Looks like test_hpdelim.c was imported twice into the same file.
771 Spotted by kevin.brott at gmail com and chris at cataclysmal org.
773 commit 9fa63a19f68bc87452d3cf5c577cafad2921b7a4
774 Author: Darren Tucker <dtucker@dtucker.net>
775 Date: Thu Feb 10 23:27:02 2022 +1100
777 Put poll.h inside ifdef.
779 commit 3ac00dfeb54b252c15dcbf1971582e9e3b946de6
780 Author: Darren Tucker <dtucker@dtucker.net>
781 Date: Thu Feb 10 22:17:31 2022 +1100
783 We now support POLLPRI so actually define it.
785 commit 25bd659cc72268f2858c5415740c442ee950049f
786 Author: dtucker@openbsd.org <dtucker@openbsd.org>
787 Date: Sun Feb 6 22:58:33 2022 +0000
789 upstream: Add test for empty hostname with port.
791 OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3
793 commit a29af853cff41c0635f0378c00fe91bf9c91dea4
794 Author: dtucker@openbsd.org <dtucker@openbsd.org>
795 Date: Fri Feb 4 07:53:44 2022 +0000
797 upstream: Add unit tests for hpdelim.
799 OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018
801 commit 9699151b039ecc5fad9ac6c6c02e9afdbd26f15f
802 Author: djm@openbsd.org <djm@openbsd.org>
803 Date: Thu Feb 10 04:12:38 2022 +0000
805 upstream: revert for imminent OpenSSH release, which wil ship with
810 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl;
811 > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
812 > protocol for copying. Let's get back to testing the SFTP protocol.
814 This will be put back once the OpenSSH release is done.
816 OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768
818 commit 45279abceb37c3cbfac8ba36dde8b2c8cdd63d32
819 Author: dtucker@openbsd.org <dtucker@openbsd.org>
820 Date: Tue Feb 8 08:59:12 2022 +0000
822 upstream: Switch hpdelim interface to accept only ":" as delimiter.
824 Historicallly, hpdelim accepted ":" or "/" as a port delimiter between
825 hosts (or addresses) and ports. These days most of the uses for "/"
826 are no longer accepted, so there are several places where it checks the
827 delimiter to disallow it. Make hpdelim accept only ":" and use hpdelim2
828 in the other cases. ok djm@
830 OpenBSD-Commit-ID: 7e6420bd1be87590b6840973f5ad5305804e3102
832 commit a1bcbf04a7c2d81944141db7ecd0ba292d175a66
833 Author: pedro martelletto <pedro@yubico.com>
834 Date: Mon Feb 7 09:09:59 2022 +0100
836 fix typos in previous
838 commit 56192518e329b39f063487bc2dc4d796f791eca0
839 Author: Damien Miller <djm@mindrot.org>
840 Date: Mon Feb 7 12:53:47 2022 +1100
842 compat code for fido_assert_set_clientdata()
844 commit d6b5aa08fdcf9b527f8b8f932432941d5b76b7ab
845 Author: djm@openbsd.org <djm@openbsd.org>
846 Date: Mon Feb 7 01:25:12 2022 +0000
848 upstream: use libfido2 1.8.0+ fido_assert_set_clientdata() instead
850 of manually hashing data outselves. Saves a fair bit of code and makes life
851 easier for some -portable platforms.
853 OpenBSD-Commit-ID: 351dfaaa5ab1ee928c0e623041fca28078cff0e0
855 commit 86cc93fd3c26b2e0c7663c6394995fb04ebfbf3b
856 Author: jsg@openbsd.org <jsg@openbsd.org>
857 Date: Sun Feb 6 00:29:03 2022 +0000
859 upstream: remove please from manual pages ok jmc@ sthen@ millert@
861 OpenBSD-Commit-ID: 6543acb00f4f38a23472538e1685c013ca1a99aa
863 commit ad16a84e64a8cf1c69c63de3fb9008320a37009c
864 Author: dtucker@openbsd.org <dtucker@openbsd.org>
865 Date: Fri Feb 4 02:49:17 2022 +0000
867 upstream: Since they are deprecated, move DSA to the end of the
869 default list of public keys so that they will be tried last. From github
870 PR#295 from "ProBackup-nl", ok djm@
872 OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0
874 commit 253de42753de85dde266e061b6fec12ca6589f7d
875 Author: Damien Miller <djm@mindrot.org>
876 Date: Wed Feb 2 16:52:07 2022 +1100
878 portable-specific string array constification
882 commit dfdcc2220cf359c492d5d34eb723370e8bd8a19e
883 Author: djm@openbsd.org <djm@openbsd.org>
884 Date: Tue Feb 1 23:37:15 2022 +0000
886 upstream: test 'ssh-keygen -Y find-principals' with wildcard
888 principals; from Fabian Stelzer
890 OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40
892 commit 968e508967ef42480cebad8cf3172465883baa77
893 Author: dtucker@openbsd.org <dtucker@openbsd.org>
894 Date: Fri Jan 21 02:54:41 2022 +0000
896 upstream: Enable all supported ciphers and macs in the server
898 before trying to benchmark them. Increase the data file size to get more
901 OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6
903 commit 15b7199a1fd37eff4c695e09d573f3db9f4274b7
904 Author: djm@openbsd.org <djm@openbsd.org>
905 Date: Tue Feb 1 23:34:47 2022 +0000
907 upstream: allow 'ssh-keygen -Y find-principals' to match wildcard
909 principals in allowed_signers files; from Fabian Stelzer
911 OpenBSD-Commit-ID: 1e970b9c025b80717dddff5018fe5e6f470c5098
913 commit 541667fe6dc26d7881e55f0bb3a4baa6f3171645
914 Author: djm@openbsd.org <djm@openbsd.org>
915 Date: Tue Feb 1 23:32:51 2022 +0000
917 upstream: mark const string array contents const too, i.e. static
919 const char *array => static const char * const array from Mike Frysinger
921 OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1
923 commit 8cfa73f8a2bde4c98773f33f974c650bdb40dd3c
924 Author: djm@openbsd.org <djm@openbsd.org>
925 Date: Tue Feb 1 23:11:11 2022 +0000
927 upstream: better match legacy scp behaviour: show un-expanded paths
929 in error messages. Spotted by and ok tb@
931 OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7
933 commit 4e62c13ab419b4b224c8bc6a761e91fcf048012d
934 Author: dtucker@openbsd.org <dtucker@openbsd.org>
935 Date: Tue Feb 1 07:57:32 2022 +0000
937 upstream: Remove explicit kill of privsep preauth child's PID in
939 SIGALRM handler. It's no longer needed since the child will get terminated by
940 the SIGTERM to the process group that cleans up any auth helpers, it
941 simplifies the signal handler and removes the risk of a race when updating
942 the PID. Based on analysis by HerrSpace in github PR#289, ok djm@
944 OpenBSD-Commit-ID: 2be1ffa28b4051ad9e33bb4371e2ec8a31d6d663
946 commit 2a7ccd2ec4022917b745af7186f514f365b7ebe9
947 Author: guenther@openbsd.org <guenther@openbsd.org>
948 Date: Fri Jan 28 06:18:42 2022 +0000
950 upstream: When it's the possessive of 'it', it's spelled "its",
952 without the apostrophe.
954 OpenBSD-Commit-ID: fb6ab9c65bd31de831da1eb4631ddac018c5fae7
956 commit 8a0848cdd3b25c049332cd56034186b7853ae754
957 Author: Alex James <theracermaster@gmail.com>
958 Date: Sun Jan 30 16:13:36 2022 -0600
960 sandbox-seccomp-filter: allow gettid
962 Some allocators (such as Scudo) use gettid while tracing allocations [1].
963 Allow gettid in preauth to prevent sshd from crashing with Scudo.
965 [1]: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.0/compiler-rt/lib/gwp_asan/common.cpp#L46
967 commit b30d32159dc3c7052f4bfdf36357996c905af739
968 Author: djm@openbsd.org <djm@openbsd.org>
969 Date: Sat Jan 22 00:49:34 2022 +0000
971 upstream: add a ssh_packet_process_read() function that reads from
973 a fd directly into the transport input buffer.
975 Use this in the client and server mainloops to avoid unnecessary
976 copying. It also lets us use a more greedy read size without penalty.
978 Yields a 2-3% performance gain on cipher-speed.sh (in a fairly
979 unscientific test tbf)
981 feedback dtucker@ ok markus@
983 OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632
985 commit a1a8efeaaa9cccb15cdc0a2bd7c347a149a3a7e3
986 Author: djm@openbsd.org <djm@openbsd.org>
987 Date: Sat Jan 22 00:45:31 2022 +0000
989 upstream: Use sshbuf_read() to read directly into the channel input
991 buffer rather than into a stack buffer that needs to be copied again;
992 Improves performance by about 1% on cipher-speed.sh feedback dtucker@ ok
995 OpenBSD-Commit-ID: bf5e6e3c821ac3546dc8241d8a94e70d47716572
997 commit 29a76994e21623a1f84d68ebb9dc5a3c909fa3a7
998 Author: Damien Miller <djm@mindrot.org>
999 Date: Tue Jan 25 11:52:34 2022 +1100
1003 commit 754e0d5c7712296a7a3a83ace863812604c7bc4f
1004 Author: djm@openbsd.org <djm@openbsd.org>
1005 Date: Sat Jan 22 00:43:43 2022 +0000
1007 upstream: Add a sshbuf_read() that attempts to read(2) directly in
1009 to a sshbuf; ok markus@
1011 OpenBSD-Commit-ID: 2d8f249040a4279f3bc23c018947384de8d4a45b
1013 commit c7964fb9829d9ae2ece8b51a76e4a02e8449338d
1014 Author: djm@openbsd.org <djm@openbsd.org>
1015 Date: Fri Jan 21 07:04:19 2022 +0000
1017 upstream: add a helper for writing an error message to the
1019 stderr_buf and setting quit_pending; no functional change but saves a bunch
1022 OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d
1024 commit d23b4f7fdb1bd87e2cd7a9ae7c198ae99d347916
1025 Author: djm@openbsd.org <djm@openbsd.org>
1026 Date: Fri Jan 21 06:58:06 2022 +0000
1028 upstream: correct comment and use local variable instead of long
1030 indirection; spotted by dtucker@
1032 OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965
1034 commit d069b020a02b6e3935080204ee44d233e8158ebb
1035 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1036 Date: Fri Jan 21 00:53:40 2022 +0000
1038 upstream: When poll(2) returns -1, for some error conditions
1040 pfd[].revents is not cleared. There are subtle errors in various programs.
1041 In this particular case, the program should error out. ok djm millert
1043 OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c
1045 commit e204b34337a965feb439826157c191919fd9ecf8
1046 Author: Damien Miller <djm@mindrot.org>
1047 Date: Sat Jan 22 11:38:21 2022 +1100
1049 restore tty force-read hack
1051 This portable-specific hack fixes a hang on exit for ttyful sessions
1052 on Linux and some SysVish Unix variants. It was accidentally disabled
1053 in commit 5c79952dfe1a (a precursor to the mainloop poll(2) conversion).
1055 Spotted by John in bz3383
1057 commit 68085066b6bad43643b43f5957fcc5fd34782ccd
1058 Author: Corinna Vinschen <vinschen@redhat.com>
1059 Date: Fri Jan 21 03:22:56 2022 +1100
1061 Fix signedness bug in Cygwin code
1063 The Cygwin-specific pattern match code has a bug. It checks
1064 the size_t value returned by mbstowcs for being < 0. The right
1065 thing to do is to check against (size_t) -1. Fix that.
1067 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
1069 commit 2e5cfed513e84444483baf1d8b31c40072b05103
1070 Author: Darren Tucker <dtucker@dtucker.net>
1071 Date: Thu Jan 20 13:26:27 2022 +1100
1073 Improve compatibility of early exit trap handling.
1075 Dash (as used by the github runners) has some differences in its trap
1077 - it doesn't have -p (which is fine, that's not in posix).
1078 - it doesn't work in a subshell (which turns out to be in compliance
1079 with posix, which means bash isn't).
1080 - it doesn't work in a pipeline, ie "trap|cat" produces no output.
1082 commit 3fe6800b6027add478e648934cbb29d684e51943
1083 Author: Darren Tucker <dtucker@dtucker.net>
1084 Date: Thu Jan 20 00:49:57 2022 +1100
1086 Move more tests out of valgrind-1 runner.
1088 commit 20da6ed136dd76e6a0b229ca3036ef9c7c7ef798
1089 Author: Darren Tucker <dtucker@dtucker.net>
1090 Date: Wed Jan 19 15:37:39 2022 +1100
1092 Invoke EXIT handler early when using Valgrind.
1094 When using Valgrind, we need to wait for all invoked programs to
1095 complete before checking their valgrind logs. Some tests, notably
1096 agent-restrict, set an EXIT trap handler to clean up things like
1097 ssh-agent, but those do not get invoked until test-exec.sh exits.
1098 This causes the Valgrind wait to deadlock, so if present invoke
1099 the EXIT handler before checking the Valgrind logs.
1101 commit ad2e0580c87b0714cf166bca9d926a95ddeee1c8
1102 Author: Darren Tucker <dtucker@dtucker.net>
1103 Date: Tue Jan 18 12:55:21 2022 +1100
1105 Remove line leftover from upstream sync.
1107 commit d1051c0f11a6b749027e26bbeb61b07df4b67e15
1108 Author: djm@openbsd.org <djm@openbsd.org>
1109 Date: Mon Jan 17 22:56:04 2022 +0000
1111 upstream: when decompressing zlib compressed packets, use
1113 Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually
1114 specified as a valid mode for inflate(). There should be no practical change
1115 in behaviour as the compression side ensures a flush that should make all
1116 data available to the receiver in all cases.
1118 repoted by lamm AT ibm.com via bz3372; ok markus
1120 OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b
1122 commit d5981b1883746b1ae178a46229c26b53af99e37a
1123 Author: djm@openbsd.org <djm@openbsd.org>
1124 Date: Mon Jan 17 21:41:04 2022 +0000
1126 upstream: make most of the sftp errors more idiomatic, following
1128 the general form of "[local/remote] operation path: error message"; ok markus
1130 OpenBSD-Commit-ID: 61364cd5f3a9fecaf8d63b4c38a42c0c91f8b571
1132 commit ac7c9ec894ed0825d04ef69c55babb49bab1d32e
1133 Author: djm@openbsd.org <djm@openbsd.org>
1134 Date: Mon Jan 17 21:39:51 2022 +0000
1136 upstream: when transferring multiple files in SFTP mode, create the
1138 destination directory if it doesn't already exist to match olde-scp(1)
1139 behaviour. noticed by deraadt@ ok markus@
1141 OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407
1143 commit 39d17e189f8e72c34c722579d8d4e701fa5132da
1144 Author: djm@openbsd.org <djm@openbsd.org>
1145 Date: Fri Jan 14 03:43:48 2022 +0000
1147 upstream: allow pin-required FIDO keys to be added to ssh-agent(1).
1149 ssh-askpass will be used to request the PIN at authentication time.
1151 From Pedro Martelletto, ok djm
1153 OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950
1155 commit 52423f64e13db2bdc31a51b32e999cb1bfcf1263
1156 Author: djm@openbsd.org <djm@openbsd.org>
1157 Date: Fri Jan 14 03:35:10 2022 +0000
1159 upstream: ssh-sk: free a resident key's user id
1161 From Pedro Martelletto; ok dtucker & me
1163 OpenBSD-Commit-ID: 47be40d602b7a6458c4c71114df9b53d149fc2e9
1165 commit 014e2f147a2788bfb3cc58d1b170dcf2bf2ee493
1166 Author: djm@openbsd.org <djm@openbsd.org>
1167 Date: Fri Jan 14 03:34:00 2022 +0000
1169 upstream: sshsk_load_resident: don't preallocate resp
1171 resp is allocated by client_converse(), at which point we lose
1172 the original pointer.
1174 From Pedro Martelletto; ok dtucker & me
1176 OpenBSD-Commit-ID: 1f1b5ea3282017d6584dfed4f8370dc1db1f44b1
1178 commit c88265f207dfe0e8bdbaf9f0eda63ed6b33781cf
1179 Author: djm@openbsd.org <djm@openbsd.org>
1180 Date: Fri Jan 14 03:32:52 2022 +0000
1182 upstream: sshsk_sign: trim call to sshkey_fingerprint()
1184 the resulting fingerprint doesn't appear to be used for anything,
1185 and we end up leaking it.
1187 from Pedro Martelletto; ok dtucker & me
1189 OpenBSD-Commit-ID: 5625cf6c68f082bc2cbbd348e69a3ed731d2f9b7
1191 commit 1cd1b2eac39661b849d5a4b4b56363e22bb5f61e
1192 Author: djm@openbsd.org <djm@openbsd.org>
1193 Date: Fri Jan 14 03:31:52 2022 +0000
1195 upstream: use status error message to communicate ~user expansion
1197 failures; provides better experience for scp in sftp mode, where ~user paths
1198 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
1201 (forgot to include this file in previous commit)
1203 OpenBSD-Commit-ID: d37cc4c8c861ce48cd6ea9899e96aaac3476847b
1205 commit a1d42a6ce0398da3833bedf374ef2571af7fea50
1206 Author: Damien Miller <djm@mindrot.org>
1207 Date: Fri Jan 14 13:49:32 2022 +1100
1209 fix edge case in poll(2) wrapper
1211 Correct handling of select(2) exceptfds. These should only be consulted
1212 for POLLPRI flagged pfds and not unconditionally converted to POLLERR.
1214 with and ok dtucker@
1216 commit 976b9588b4b5babcaceec4767a241c11a67a5ccb
1217 Author: Darren Tucker <dtucker@dtucker.net>
1218 Date: Fri Jan 14 13:46:35 2022 +1100
1220 Wrap OpenSSL includes in unit tests in ifdef.
1222 Fixes unit test on systems that do not have OpenSSL headers installed.
1224 commit c171879374b2e8b07157503f5639ed0bce59ce89
1225 Author: Darren Tucker <dtucker@dtucker.net>
1226 Date: Thu Jan 13 15:53:33 2022 +1100
1228 Remove sort wrapper.
1230 agent-restrict now takes care of this itself.
1232 commit 9cc2654403f1a686bb26c07a6ac790edf334cef5
1233 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1234 Date: Thu Jan 13 04:53:16 2022 +0000
1236 upstream: Set LC_ALL in both local and remote shells so that sorted
1238 output matches regardless of what the user's shell sets it to. ok djm@
1240 OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f
1242 commit 7a75f748cb2dd2f771bf70ea72698aa027996ab1
1243 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1244 Date: Thu Jan 13 04:22:10 2022 +0000
1246 upstream: Avoid %'s in commands (not used in OpenBSD, but used in
1248 -portable's Valgrind test) being interpretted as printf format strings.
1250 OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043
1252 commit 6c435bd4994d71442192001483a1cdb846e5ffcd
1253 Author: Darren Tucker <dtucker@dtucker.net>
1254 Date: Wed Jan 12 16:58:13 2022 +1100
1256 Stop on first test failure to minimize logs.
1258 commit 4bc2ba6095620a4484b708ece12842afd8c7685b
1259 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1260 Date: Wed Jan 12 07:18:37 2022 +0000
1262 upstream: Use egrep when searching for an anchored string.
1264 OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4
1266 commit 6bf2efa2679da1e8e60731f41677b2081dedae2c
1267 Author: Darren Tucker <dtucker@dtucker.net>
1268 Date: Wed Jan 12 18:25:06 2022 +1100
1270 Add "rev" command replacement if needed.
1272 commit 72bcd7993dadaf967bb3d8564ee31cbf38132b5d
1273 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1274 Date: Wed Jan 12 03:30:32 2022 +0000
1276 upstream: Don't log NULL hostname in restricted agent code,
1278 printf("%s", NULL) is not safe on all platforms. with & ok djm
1280 OpenBSD-Commit-ID: faf10cdae4adde00cdd668cd1f6e05d0a0e32a02
1282 commit acabefe3f8fb58c867c99fed9bbf84dfa1771727
1283 Author: djm@openbsd.org <djm@openbsd.org>
1284 Date: Tue Jan 11 22:33:16 2022 +0000
1286 upstream: remove hardcoded domain and use window.location.host, so this
1290 OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92
1292 commit 96da0946e44f34adc0397eb7caa6ec35a3e79891
1293 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1294 Date: Tue Jan 11 02:56:19 2022 +0000
1296 upstream: "void" functions should not return anything. From Tim Rice
1300 OpenBSD-Commit-ID: ce6616304f4c9881b46413e616b226c306830e2a
1302 commit a882a09722c9f086c9edb65d0c4022fd965ec1ed
1303 Author: djm@openbsd.org <djm@openbsd.org>
1304 Date: Tue Jan 11 01:26:47 2022 +0000
1306 upstream: suppress "Connection to xxx closed" messages at LogLevel >=
1308 error bz3378; ok dtucker@
1310 OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c
1312 commit 61a1a6af22e17fc94999a5d1294f27346e6c4668
1313 Author: Damien Miller <djm@mindrot.org>
1314 Date: Wed Jan 12 08:57:49 2022 +1100
1316 OS X poll(2) is broken; use compat replacement
1318 Darwin's poll(2) implementation is broken. For character-special
1319 devices like /dev/null, it returns POLLNVAL when polled with
1322 Apparently this is Apple bug 3710161, which is AFAIK not public,
1323 but a websearch will find other OSS projects rediscovering it
1324 periodically since it was first identified in 2005 (!!)
1326 commit 613a6545fc5a9542753b503cbe5906538a640b60
1327 Author: Darren Tucker <dtucker@dtucker.net>
1328 Date: Tue Jan 11 20:56:01 2022 +1100
1330 libhardended_malloc.so moved into out dir.
1332 commit 61761340be5e11046556623f8f5412b236cefa95
1333 Author: Tim Rice <tim@multitalents.net>
1334 Date: Mon Jan 10 11:07:04 2022 -0800
1336 Make USL compilers happy
1337 UX:acomp: ERROR: "sftp-server.c", line 567: void function cannot return value
1339 commit 3ef403f351e80a59b6f7e9d43cb82c181855483c
1340 Author: Darren Tucker <dtucker@dtucker.net>
1341 Date: Mon Jan 10 21:07:38 2022 +1100
1343 Add wrapper for "sort" to set LC_ALL=C.
1345 Found by djm, this should make sorts stable and reduce test flakiness.
1347 commit bd69e29f5716090181dbe0b8272eb7eab1a383bb
1348 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1349 Date: Sat Jan 8 07:55:26 2022 +0000
1351 upstream: Remove errant "set -x" left over from debugging.
1353 OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc
1355 commit 1a7c88e26fd673813dc5f61c4ac278564845e004
1356 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1357 Date: Sat Jan 8 07:01:13 2022 +0000
1359 upstream: Enable all supported hostkey algorithms (but no others).
1361 Allows hostbased test to pass when built without OpenSSL.
1363 OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562
1365 commit 12b457c2a42ff271e7967d9bedd068cebb048db9
1366 Author: djm@openbsd.org <djm@openbsd.org>
1367 Date: Sat Jan 8 07:37:32 2022 +0000
1369 upstream: use status error message to communicate ~user expansion
1371 failures; provides better experience for scp in sftp mode, where ~user paths
1372 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
1375 OpenBSD-Commit-ID: fc610ce00ca0cdc2ecdabbd49ce7cb82033f905f
1377 commit 63670d4e9030bcee490d5a9cce561373ac5b3b23
1378 Author: djm@openbsd.org <djm@openbsd.org>
1379 Date: Sat Jan 8 07:36:11 2022 +0000
1381 upstream: fix some corner-case bugs in scp sftp-mode handling of
1383 ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus
1385 OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222
1387 commit e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0
1388 Author: djm@openbsd.org <djm@openbsd.org>
1389 Date: Sat Jan 8 07:34:57 2022 +0000
1391 upstream: more idiomatic error messages; spotted by jsg & deraadt
1395 OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8
1397 commit 9acddcd5918c623f7ebf454520ffe946a8f15e90
1398 Author: djm@openbsd.org <djm@openbsd.org>
1399 Date: Sat Jan 8 07:33:54 2022 +0000
1401 upstream: add a variant of send_status() that allows overriding the
1403 default, generic error message. feedback/ok markus & jsg
1405 OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f
1407 commit 961411337719d4cd78f1ab33e4ac549f3fa22f50
1408 Author: djm@openbsd.org <djm@openbsd.org>
1409 Date: Sat Jan 8 07:32:45 2022 +0000
1411 upstream: refactor tilde_expand_filename() and make it handle ~user
1413 paths with no trailing slash; feedback/ok markus and jsg
1415 OpenBSD-Commit-ID: a2ab365598a902f0f14ba6a4f8fb2d07a9b5d51d
1417 commit dc38236ab6827dec575064cac65c8e7035768773
1418 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1419 Date: Thu Jan 6 22:14:25 2022 +0000
1421 upstream: Don't explicitly set HostbasedAuthentication in
1423 sshd_config. It defaults to "no", and not explicitly setting it allows us to
1424 enable it for the (optional) hostbased test.
1426 OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c
1428 commit e12d912ddf1c873cb72e5de9a197afbe0b6622d2
1429 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1430 Date: Thu Jan 6 21:46:56 2022 +0000
1432 upstream: Add test for hostbased auth. It requires some external
1434 setup (see comments at the top) and thus is disabled unless
1435 TEST_SSH_HOSTBASED_AUTH and SUDO are set.
1437 OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a
1439 commit a48533a8da6a0f4f05ecd055dc8048047e53569e
1440 Author: Damien Miller <djm@mindrot.org>
1441 Date: Fri Jan 7 09:24:26 2022 +1100
1445 commit d9dbb5d9a0326e252d3c7bc13beb9c2434f59409
1446 Author: djm@openbsd.org <djm@openbsd.org>
1447 Date: Thu Jan 6 22:06:51 2022 +0000
1449 upstream: allow hostbased auth to select RSA keys when only
1451 RSA/SHA2 are configured (this is the default case); ok markus@
1453 OpenBSD-Commit-ID: 411c18c7bde40c60cc6dfb7017968577b4d4a827
1455 commit fdb1d58d0d3888b042e5a500f6ce524486aaf782
1456 Author: djm@openbsd.org <djm@openbsd.org>
1457 Date: Thu Jan 6 22:05:42 2022 +0000
1459 upstream: add a helper function to match a key type to a list of
1461 signature algorithms. RSA keys can make signatures with multiple algorithms,
1462 so some special handling is required. ok markus@
1464 OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff
1466 commit 11e8c4309a5086a45fbbbc87d0af5323c6152914
1467 Author: djm@openbsd.org <djm@openbsd.org>
1468 Date: Thu Jan 6 22:04:20 2022 +0000
1470 upstream: log some details on hostkeys that ssh loads for
1472 hostbased authn ok markus@
1474 OpenBSD-Commit-ID: da17061fa1f0e58cb31b88478a40643e18233e38
1476 commit c6706f661739514a34125aa3136532a958929510
1477 Author: djm@openbsd.org <djm@openbsd.org>
1478 Date: Thu Jan 6 22:03:59 2022 +0000
1480 upstream: log signature algorithm during verification by monitor;
1484 OpenBSD-Commit-ID: 02b92bb42c4d4bf05a051702a56eb915151d9ecc
1486 commit 8832402bd500d1661ccc80a476fd563335ef6cdc
1487 Author: djm@openbsd.org <djm@openbsd.org>
1488 Date: Thu Jan 6 22:02:52 2022 +0000
1490 upstream: piece of UpdateHostkeys client strictification: when
1492 updating known_hosts with new keys, ignore NULL keys (forgot to include in
1495 OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08
1497 commit c2d9ced1da0276961d86690b3bd7ebdaca7fdbf7
1498 Author: djm@openbsd.org <djm@openbsd.org>
1499 Date: Thu Jan 6 22:01:14 2022 +0000
1501 upstream: include rejected signature algorithm in error message
1503 and not the (useless) key type; ok markus
1505 OpenBSD-Commit-ID: 4180b5ec7ab347b43f84e00b1972515296dab023
1507 commit 7aa7b096cf2bafe2777085abdeed5ce00581f641
1508 Author: djm@openbsd.org <djm@openbsd.org>
1509 Date: Thu Jan 6 22:00:18 2022 +0000
1511 upstream: make ssh-keysign use the requested signature algorithm
1513 and not the default for the keytype. Part of unbreaking hostbased auth for
1514 RSA/SHA2 keys. ok markus@
1516 OpenBSD-Commit-ID: b5639a14462948970da3a8020dc06f9a80ecccdc
1518 commit 291721bc7c840d113a49518f3fca70e86248b8e8
1519 Author: djm@openbsd.org <djm@openbsd.org>
1520 Date: Thu Jan 6 21:57:28 2022 +0000
1522 upstream: stricter UpdateHostkey signature verification logic on
1524 the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when
1525 RSA/SHA1 was explicitly negotiated during initial KEX; bz3375
1529 OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29
1531 commit 0fa33683223c76289470a954404047bc762be84c
1532 Author: djm@openbsd.org <djm@openbsd.org>
1533 Date: Thu Jan 6 21:55:23 2022 +0000
1535 upstream: Fix signature algorithm selection logic for
1537 UpdateHostkeys on the server side. The previous code tried to prefer RSA/SHA2
1538 for hostkey proofs of RSA keys, but missed some cases. This will use RSA/SHA2
1539 signatures for RSA keys if the client proposed these algorithms in initial
1542 Mostly by Dmitry Belyavskiy with some tweaks by me.
1546 OpenBSD-Commit-ID: c17ba0c3236340d2c6a248158ebed042ac6a8029
1548 commit 17877bc81db3846e6e7d4cfb124d966bb9c9296b
1549 Author: djm@openbsd.org <djm@openbsd.org>
1550 Date: Thu Jan 6 21:48:38 2022 +0000
1552 upstream: convert ssh, sshd mainloops from select() to poll();
1554 feedback & ok deraadt@ and markus@ has been in snaps for a few months
1556 OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c
1558 commit 5c79952dfe1aa36105c93b3f383ce9be04dee384
1559 Author: djm@openbsd.org <djm@openbsd.org>
1560 Date: Thu Jan 6 21:46:23 2022 +0000
1562 upstream: prepare for conversion of ssh, sshd mainloop from
1564 select() to poll() by moving FD_SET construction out of channel handlers into
1565 separate functions. ok markus
1567 OpenBSD-Commit-ID: 937fbf2a4de12b19fb9d5168424e206124807027
1569 commit 24c5187edfef4651a625b7d5d692c8c7e794f71f
1570 Author: djm@openbsd.org <djm@openbsd.org>
1571 Date: Wed Jan 5 21:54:37 2022 +0000
1573 upstream: add a comment so I don't make this mistake again
1575 OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e
1577 commit 7369900441929058263a17f56aa67e05ff7ec628
1578 Author: djm@openbsd.org <djm@openbsd.org>
1579 Date: Wed Jan 5 21:50:00 2022 +0000
1581 upstream: fix cut-and-pasto in error message
1583 OpenBSD-Commit-ID: 4cc5c619e4b456cd2e9bb760d17e3a9c84659198
1585 commit 294c11b1c7d56d3fb61e329603a782315ed70c62
1586 Author: djm@openbsd.org <djm@openbsd.org>
1587 Date: Wed Jan 5 08:25:05 2022 +0000
1589 upstream: select all RSA hostkey algorithms for UpdateHostkeys tests,
1593 OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8
1595 commit 2ea1108c30e3edb6f872dfc1e6da10b041ddf2c0
1596 Author: djm@openbsd.org <djm@openbsd.org>
1597 Date: Wed Jan 5 04:56:15 2022 +0000
1599 upstream: regress test both sshsig message hash algorithms, possible
1601 now because the algorithm is controllable via the CLI
1603 OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f
1605 commit 2327c306b5d4a2b7e71178e5a4d139af9902c2b0
1606 Author: djm@openbsd.org <djm@openbsd.org>
1607 Date: Wed Jan 5 04:50:11 2022 +0000
1609 upstream: allow selection of hash at sshsig signing time; code
1611 already supported either sha512 (default) or sha256, but plumbing wasn't
1612 there mostly by Linus Nordberg
1614 OpenBSD-Commit-ID: 1b536404b9da74a84b3a1c8d0b05fd564cdc96cd
1616 commit 56e941d0a00d6d8bae88317717d5e1b7395c9529
1617 Author: djm@openbsd.org <djm@openbsd.org>
1618 Date: Wed Jan 5 04:27:54 2022 +0000
1620 upstream: add missing -O option to usage() for ssh-keygen -Y sign;
1624 OpenBSD-Commit-ID: 4e78feb4aa830727ab76bb2e3d940440ae1d7af0
1626 commit 141a14ec9b0924709c98df2dd8013bde5d8d12c7
1627 Author: djm@openbsd.org <djm@openbsd.org>
1628 Date: Wed Jan 5 04:27:01 2022 +0000
1630 upstream: move sig_process_opts() to before sig_sign(); no
1632 functional code change
1634 OpenBSD-Commit-ID: da02d61f5464f72b4e8b299f83e93c3b657932f9
1636 commit 37a14249ec993599a9051731e4fb0ac5e976aec1
1637 Author: djm@openbsd.org <djm@openbsd.org>
1638 Date: Wed Jan 5 04:10:39 2022 +0000
1640 upstream: regression test for find-principals NULL deref; from Fabian
1644 OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5
1646 commit eb1f042142fdaba93f6c9560cf6c91ae25f6884a
1647 Author: djm@openbsd.org <djm@openbsd.org>
1648 Date: Wed Jan 5 04:02:42 2022 +0000
1650 upstream: NULL deref when using find-principals when matching an
1652 allowed_signers line that contains a namespace restriction, but no
1653 restriction specified on the command-line; report and fix from Fabian Stelzer
1655 OpenBSD-Commit-ID: 4a201b86afb668c908d1a559c6af456a61f4b145
1657 commit 8f3b18030579f395eca2181da31a5f945af12a59
1658 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1659 Date: Tue Jan 4 08:38:53 2022 +0000
1661 upstream: Log command invocation while debugging.
1663 This will aid in manually reproducing failing commands.
1665 OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a
1667 commit bbf285164df535f0d38c36237f007551bbdae27f
1668 Author: Darren Tucker <dtucker@dtucker.net>
1669 Date: Sun Dec 26 10:31:15 2021 +1100
1671 Always save config.h as build artifact.
1673 Should allow better comparison between failing and succeeding test
1676 commit 03bd4ed0db699687c5cd83405d26f81d2dc28d22
1677 Author: Darren Tucker <dtucker@dtucker.net>
1678 Date: Sat Dec 25 16:42:51 2021 +1100
1680 Add OpenBSD 7.0 target. Retire 6.8.
1682 commit c45a752f0de611afd87755c2887c8a24816d08ee
1683 Author: jsg@openbsd.org <jsg@openbsd.org>
1684 Date: Sat Jan 1 05:55:06 2022 +0000
1688 OpenBSD-Commit-ID: c63e43087a64d0727af13409c708938e05147b62
1690 commit c672f83a89a756564db0d3af9934ba0e1cf8fa3e
1691 Author: djm@openbsd.org <djm@openbsd.org>
1692 Date: Tue Jan 4 07:20:33 2022 +0000
1694 upstream: unbreak test: was picking up system ssh-add instead of the
1696 one supposedly being tested. Spotted by dtucker and using his VM zoo (which
1697 includes some systems old enough to lack ed25519 key support)
1699 OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5
1701 commit a23698c3082ffe661abed14b020eac9b0c25eb9f
1702 Author: djm@openbsd.org <djm@openbsd.org>
1703 Date: Sat Jan 1 04:18:06 2022 +0000
1705 upstream: fix memleak in process_extension(); oss-fuzz issue #42719
1707 OpenBSD-Commit-ID: d8d49f840162fb7b8949e3a5adb8107444b6de1e
1709 commit cb885178f36b83d0f14cfe9f345d2068103feed0
1710 Author: jsg@openbsd.org <jsg@openbsd.org>
1711 Date: Sat Jan 1 01:55:30 2022 +0000
1713 upstream: spelling ok dtucker@
1715 OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19
1717 commit 6b977f8080a32c5b3cbb9edb634b9d5789fb79be
1718 Author: djm@openbsd.org <djm@openbsd.org>
1719 Date: Sun Dec 26 23:34:41 2021 +0000
1721 upstream: split method list search functionality from
1723 authmethod_lookup() into a separate authmethod_byname(), for cases where we
1724 don't need to check whether a method is enabled, etc.
1726 use this to fix the "none" authentication method regression reported
1727 by Nam Nguyen via bugs@
1731 OpenBSD-Commit-ID: 8cd188dc3a83aa8abe5b7693e762975cd8ea8a17
1733 commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07
1734 Author: jmc@openbsd.org <jmc@openbsd.org>
1735 Date: Wed Dec 22 06:56:41 2021 +0000
1737 upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;
1741 OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965
1743 commit 1c9853a68b2319f2e5f929179735e8fbb9988a67
1744 Author: Darren Tucker <dtucker@dtucker.net>
1745 Date: Wed Dec 22 19:33:10 2021 +1100
1747 Use SHA.*_HMAC_BLOCK_SIZE if needed.
1749 If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH
1750 but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter.
1751 Should fix --without-openssl build on Solaris.
1753 commit 715c892f0a5295b391ae92c26ef4d6a86ea96e8e
1754 Author: Damien Miller <djm@mindrot.org>
1755 Date: Wed Dec 22 09:02:50 2021 +1100
1757 remove sys/param.h in -portable, after upstream
1759 commit 7a7c69d8b4022b1e5c0afb169c416af8ce70f3e8
1760 Author: Damien Miller <djm@mindrot.org>
1761 Date: Mon Dec 20 13:05:20 2021 +1100
1763 add agent-restrict.sh file, missed in last commit
1765 commit f539136ca51a4976644db5d0be8158cc1914c72a
1766 Author: djm@openbsd.org <djm@openbsd.org>
1767 Date: Sun Dec 19 22:20:12 2021 +0000
1769 upstream: regression test for destination restrictions in ssh-agent
1771 OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d
1773 commit 6e4980eb8ef94c04874a79dd380c3f568e8416d6
1774 Author: anton@openbsd.org <anton@openbsd.org>
1775 Date: Sat Dec 18 06:53:59 2021 +0000
1777 upstream: Make use of ntests variable, pointed out by clang 13.
1779 OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72
1781 commit 3eead8158393b697f663ec4301e3c7b6f24580b1
1782 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1783 Date: Tue Dec 14 21:25:27 2021 +0000
1785 upstream: sys/param.h cleanup, mostly using MINIMUM() and
1787 <limits.h> ok dtucker
1789 OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0
1791 commit 266678e19eb0e86fdf865b431b6e172e7a95bf48
1792 Author: djm@openbsd.org <djm@openbsd.org>
1793 Date: Sun Dec 19 22:15:42 2021 +0000
1795 upstream: document host-bound publickey authentication
1797 OpenBSD-Commit-ID: ea6ed91779a81f06d961e30ecc49316b3d71961b
1799 commit 3d00024b3b156aa9bbd05d105f1deb9cb088f6f7
1800 Author: djm@openbsd.org <djm@openbsd.org>
1801 Date: Sun Dec 19 22:15:21 2021 +0000
1803 upstream: document agent protocol extensions
1805 OpenBSD-Commit-ID: 09e8bb391bbaf24c409b75a4af44e0cac65405a7
1807 commit c385abf76511451bcba78568167b1cd9e90587d5
1808 Author: djm@openbsd.org <djm@openbsd.org>
1809 Date: Sun Dec 19 22:14:47 2021 +0000
1811 upstream: PubkeyAuthentication=yes|no|unbound|host-bound
1813 Allow control over which pubkey methods are used. Added out of
1814 concern that some hardware devices may have difficulty signing
1815 the longer pubkey authentication challenges. This provides a
1816 way for them to disable the extension. It's also handy for
1819 feedback / ok markus@
1821 OpenBSD-Commit-ID: ee52580db95c355cf6d563ba89974c210e603b1a
1823 commit 34b1e9cc7654f41cd4c5b1cc290b999dcf6579bb
1824 Author: djm@openbsd.org <djm@openbsd.org>
1825 Date: Sun Dec 19 22:14:12 2021 +0000
1827 upstream: document destination-constrained keys
1829 feedback / ok markus@
1831 OpenBSD-Commit-ID: cd8c526c77268f6d91c06adbee66b014d22d672e
1833 commit a6d7677c4abcfba268053e5867f2acabe3aa371b
1834 Author: djm@openbsd.org <djm@openbsd.org>
1835 Date: Sun Dec 19 22:13:55 2021 +0000
1837 upstream: Use hostkey parsed from hostbound userauth request
1839 Require host-bound userauth requests for forwarded SSH connections.
1841 The hostkey parsed from the host-bound userauth request is now checked
1842 against the most recently bound session ID / hostkey on the agent socket
1843 and the signature refused if they do not match.
1847 OpenBSD-Commit-ID: d69877c9a3bd8d1189a5dbdeceefa432044dae02
1849 commit baaff0ff4357cc5a079621ba6e2d7e247b765061
1850 Author: djm@openbsd.org <djm@openbsd.org>
1851 Date: Sun Dec 19 22:13:33 2021 +0000
1853 upstream: agent support for parsing hostkey-bound signatures
1855 Allow parse_userauth_request() to work with blobs from
1856 publickey-hostbound-v00@openssh.com userauth attempts.
1858 Extract hostkey from these blobs.
1862 OpenBSD-Commit-ID: 81c064255634c1109477dc65c3e983581d336df8
1864 commit 3e16365a79cdeb2d758cf1da6051b1c5266ceed7
1865 Author: djm@openbsd.org <djm@openbsd.org>
1866 Date: Sun Dec 19 22:13:12 2021 +0000
1868 upstream: EXT_INFO negotiation of hostbound pubkey auth
1870 the EXT_INFO packet gets a new publickey-hostbound@openssh.com to
1871 advertise the hostbound public key method.
1873 Client side support to parse this feature flag and set the kex->flags
1874 indicator if the expected version is offered (currently "0").
1878 OpenBSD-Commit-ID: 4cdb2ca5017ec1ed7a9d33bda95c1d6a97b583b0
1880 commit 94ae0c6f0e35903b695e033bf4beacea1d376bb1
1881 Author: djm@openbsd.org <djm@openbsd.org>
1882 Date: Sun Dec 19 22:12:54 2021 +0000
1884 upstream: client side of host-bound pubkey authentication
1886 Add kex->flags member to enable the publickey-hostbound-v00@openssh.com
1887 authentication method.
1889 Use the new hostbound method in client if the kex->flags flag was set,
1890 and include the inital KEX hostkey in the userauth request.
1892 Note: nothing in kex.c actually sets the new flag yet
1896 OpenBSD-Commit-ID: 5a6fce8c6c8a77a80ee1526dc467d91036a5910d
1898 commit 288fd0218dbfdcb05d9fbd1885904bed9b6d42e6
1899 Author: djm@openbsd.org <djm@openbsd.org>
1900 Date: Sun Dec 19 22:12:30 2021 +0000
1902 upstream: sshd side of hostbound public key auth
1904 This is identical to the standard "publickey" method, but it also includes
1905 the initial server hostkey in the message signed by the client.
1907 feedback / ok markus@
1909 OpenBSD-Commit-ID: 7ea01bb7238a560c1bfb426fda0c10a8aac07862
1911 commit dbb339f015c33d63484261d140c84ad875a9e548
1912 Author: djm@openbsd.org <djm@openbsd.org>
1913 Date: Sun Dec 19 22:12:07 2021 +0000
1915 upstream: prepare for multiple names for authmethods
1917 allow authentication methods to have one additional name beyond their
1920 allow lookup by this synonym
1922 Use primary name for authentication decisions, e.g. for
1923 PermitRootLogin=publickey
1925 Pass actual invoked name to the authmethods, so they can tell whether they
1926 were requested via the their primary name or synonym.
1930 OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559
1932 commit 39f00dcf44915f20684160f0a88d3ef8a3278351
1933 Author: djm@openbsd.org <djm@openbsd.org>
1934 Date: Sun Dec 19 22:11:39 2021 +0000
1936 upstream: ssh-agent side of destination constraints
1938 Gives ssh-agent the ability to parse restrict-destination-v00@openssh.com
1939 constraints and to apply them to keys.
1941 Check constraints against the hostkeys recorded for a SocketEntry when
1942 attempting a signature, adding, listing or deleting keys. Note that
1943 the "delete all keys" request will remove constrained keys regardless of
1946 feedback Jann Horn & markus@
1949 OpenBSD-Commit-ID: 84a7fb81106c2d609a6ac17469436df16d196319
1951 commit ce943912df812c573a33d00bf9e5435b7fcca3f7
1952 Author: djm@openbsd.org <djm@openbsd.org>
1953 Date: Sun Dec 19 22:11:06 2021 +0000
1955 upstream: ssh-add side of destination constraints
1957 Have ssh-add accept a list of "destination constraints" that allow
1958 restricting where keys may be used in conjunction with a ssh-agent/ssh
1959 that supports session ID/hostkey binding.
1961 Constraints are specified as either "[user@]host-pattern" or
1962 "host-pattern>[user@]host-pattern".
1964 The first form permits a key to be used to authenticate as the
1965 specified user to the specified host.
1967 The second form permits a key that has previously been permitted
1968 for use at a host to be available via a forwarded agent to an
1971 For example, constraining a key with "user1@host_a" and
1972 "host_a>host_b". Would permit authentication as "user1" at
1973 "host_a", and allow the key to be available on an agent forwarded
1974 to "host_a" only for authentication to "host_b". The key would not
1975 be visible on agent forwarded to other hosts or usable for
1976 authentication there.
1978 Internally, destination constraints use host keys to identify hosts.
1979 The host patterns are used to obtain lists of host keys for that
1980 destination that are communicated to the agent. The user/hostkeys are
1981 encoded using a new restrict-destination-v00@openssh.com key
1984 host keys are looked up in the default client user/system known_hosts
1985 files. It is possible to override this set on the command-line.
1987 feedback Jann Horn & markus@
1990 OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5
1992 commit 5e950d765727ee0b20fc3d2cbb0c790b21ac2425
1993 Author: djm@openbsd.org <djm@openbsd.org>
1994 Date: Sun Dec 19 22:10:24 2021 +0000
1996 upstream: ssh-add side of destination constraints
1998 Have ssh-add accept a list of "destination constraints" that allow
1999 restricting where keys may be used in conjunction with a ssh-agent/ssh
2000 that supports session ID/hostkey binding.
2002 Constraints are specified as either "[user@]host-pattern" or
2003 "host-pattern>[user@]host-pattern".
2005 The first form permits a key to be used to authenticate as the
2006 specified user to the specified host.
2008 The second form permits a key that has previously been permitted
2009 for use at a host to be available via a forwarded agent to an
2012 For example, constraining a key with "user1@host_a" and
2013 "host_a>host_b". Would permit authentication as "user1" at
2014 "host_a", and allow the key to be available on an agent forwarded
2015 to "host_a" only for authentication to "host_b". The key would not
2016 be visible on agent forwarded to other hosts or usable for
2017 authentication there.
2019 Internally, destination constraints use host keys to identify hosts.
2020 The host patterns are used to obtain lists of host keys for that
2021 destination that are communicated to the agent. The user/hostkeys are
2022 encoded using a new restrict-destination-v00@openssh.com key
2025 host keys are looked up in the default client user/system known_hosts
2026 files. It is possible to override this set on the command-line.
2028 feedback Jann Horn & markus@
2031 OpenBSD-Commit-ID: ef47fa9ec0e3c2a82e30d37ef616e245df73163e
2033 commit 4c1e3ce85e183a9d0c955c88589fed18e4d6a058
2034 Author: djm@openbsd.org <djm@openbsd.org>
2035 Date: Sun Dec 19 22:09:23 2021 +0000
2037 upstream: ssh-agent side of binding
2039 record session ID/hostkey/forwarding status for each active socket.
2041 Attempt to parse data-to-be-signed at signature request time and extract
2042 session ID from the blob if it is a pubkey userauth request.
2046 OpenBSD-Commit-ID: a80fd41e292b18b67508362129e9fed549abd318
2048 commit e9497ecf73f3c16667288bce48d4e3d7e746fea1
2049 Author: djm@openbsd.org <djm@openbsd.org>
2050 Date: Sun Dec 19 22:08:48 2021 +0000
2052 upstream: ssh client side of binding
2054 send session ID, hostkey, signature and a flag indicating whether the
2055 agent connection is being forwarded to ssh agent each time a connection
2056 is opened via a new "session-bind@openssh.com" agent extension.
2060 OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135
2062 commit b42c61d6840d16ef392ed0f365e8c000734669aa
2063 Author: djm@openbsd.org <djm@openbsd.org>
2064 Date: Sun Dec 19 22:08:06 2021 +0000
2066 upstream: Record session ID, host key and sig at intital KEX
2068 These will be used later for agent session ID / hostkey binding
2072 OpenBSD-Commit-ID: a9af29e33772b18e3e867c6fa8ab35e1694a81fe
2074 commit 26ca33d186473d58a32d812e19273ce078b6ffff
2075 Author: djm@openbsd.org <djm@openbsd.org>
2076 Date: Tue Dec 7 22:06:45 2021 +0000
2078 upstream: better error message for FIDO keys when we can't match
2082 OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650
2084 commit adb0ea006d7668190f0c42aafe3a2864d352e34a
2085 Author: Darren Tucker <dtucker@dtucker.net>
2086 Date: Wed Dec 15 10:50:33 2021 +1100
2088 Correct value for IPTOS_DSCP_LE.
2090 It needs to allow for the preceeding two ECN bits. From daisuke.higashi
2091 at gmail.com via OpenSSH bz#3373, ok claudio@, job@, djm@.
2093 commit 3dafd3fe220bd9046f11fcf5191a79ec8800819f
2094 Author: Darren Tucker <dtucker@dtucker.net>
2095 Date: Fri Dec 10 11:57:30 2021 +1100
2097 Increase timeout for test step.
2099 commit 5aefb05cd5b843e975b191d6ebb7ddf8de35c112
2100 Author: Darren Tucker <dtucker@dtucker.net>
2101 Date: Fri Dec 10 10:27:27 2021 +1100
2103 Update the list of tests that don't work on Minix.
2105 While there, remove CC (configure will now find clang) and make the test
2106 list easier to update via cut and paste.
2108 commit 1c09bb1b2e207d091cec299c49416c23d24a1b31
2109 Author: Darren Tucker <dtucker@dtucker.net>
2110 Date: Fri Dec 10 10:12:57 2021 +1100
2112 Add minix host tuple.
2114 Define SETEUID_BREAKS_SETUID for it which should make privsep work.
2116 commit a2188579032cf080213a78255373263466cb90cc
2117 Author: jsg@openbsd.org <jsg@openbsd.org>
2118 Date: Sun Dec 5 12:28:27 2021 +0000
2120 upstream: fix unintended sizeof pointer in debug path ok markus@
2122 OpenBSD-Commit-ID: b9c0481ffc0cd801e0840e342e6a282a85aac93c
2124 commit da40355234068c82f1a36196f2d18dd2d81aaafd
2125 Author: naddy@openbsd.org <naddy@openbsd.org>
2126 Date: Sat Dec 4 00:05:39 2021 +0000
2128 upstream: RSA/SHA-1 is not used by default anymore on the server
2130 OpenBSD-Commit-ID: 64abef6cfc3e53088225f6b8a1dcd86d52dc8353
2132 commit e9c71498a083a8b502aa831ea931ce294228eda0
2133 Author: djm@openbsd.org <djm@openbsd.org>
2134 Date: Thu Dec 2 23:45:36 2021 +0000
2136 upstream: hash full host:port when asked to hash output, fixes hashes
2138 for non- default ports. bz3367 ok dtucker@
2140 OpenBSD-Commit-ID: 096021cc847da7318ac408742f2d0813ebe9aa73
2142 commit b5601202145a03106012c22cb8980bcac2949f0b
2143 Author: djm@openbsd.org <djm@openbsd.org>
2144 Date: Thu Dec 2 23:23:13 2021 +0000
2146 upstream: improve the testing of credentials against inserted FIDO
2148 keys a little more: ask the token whether a particular key belongs to it in
2149 cases where the token support on-token user- verification (e.g. biometrics)
2150 rather than just assuming that it will accept it.
2152 Will reduce spurious "Confirm user presence" notifications for key
2153 handles that relate to FIDO keys that are not currently inserted in at
2156 Motivated by bz3366; by Pedro Martelletto
2158 OpenBSD-Commit-ID: ffac7f3215842397800e1ae2e20229671a55a63d
2160 commit ca709e27c41c90f4565b17282c48dca7756e083c
2161 Author: djm@openbsd.org <djm@openbsd.org>
2162 Date: Thu Dec 2 22:40:05 2021 +0000
2164 upstream: move check_sk_options() up so we can use it earlier
2166 OpenBSD-Commit-ID: 67fe98ba1c846d22035279782c4664c1865763b4
2168 commit b711bc01a7ec76bb6a285730990cbce9b8ca5773
2169 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2170 Date: Thu Dec 2 22:35:05 2021 +0000
2172 upstream: ssh-rsa is no longer in the default for
2174 PubkeyAcceptedAlgorithms.
2176 OpenBSD-Commit-ID: 34a9e1bc30966fdcc922934ae00f09f2596cd73c
2178 commit dc91ceea33cd4a9f05be953e8d8062f732db5c8a
2179 Author: djm@openbsd.org <djm@openbsd.org>
2180 Date: Thu Dec 2 02:44:44 2021 +0000
2182 upstream: don't put the tty into raw mode when SessionType=none, avoids
2184 ^c being unable to kill such a session. bz3360; ok dtucker@
2186 OpenBSD-Commit-ID: 83960c433052303b643b4c380ae2f799ac896f65
2188 commit e6e7d2654a13ba10141da7b42ea683ea4eeb1f38
2189 Author: Damien Miller <djm@mindrot.org>
2190 Date: Mon Nov 29 14:11:03 2021 +1100
2192 previous commit broke bcrypt_pbkdf()
2194 Accidentally reverted part of the conversion to use SHA512 from SUPERCOP
2195 instead of OpenBSD-style libc SHA512.
2197 commit c0459588b8d00b73e506c6095958ecfe62a4a7ba
2198 Author: Darren Tucker <dtucker@dtucker.net>
2199 Date: Mon Nov 29 14:03:19 2021 +1100
2201 Fix typo in Neils' name.
2203 commit 158bf854e2a22cf09064305f4a4e442670562685
2204 Author: Damien Miller <djm@mindrot.org>
2205 Date: Mon Nov 29 12:30:22 2021 +1100
2207 sync bcrypt-related files with OpenBSD
2209 The main change is that Niels Provos kindly agreed to rescind the
2210 BSD license advertising clause, shifting them to the 3-term BSD
2213 This was the last thing in OpenSSH that used the advertising clause.
2215 commit e8976d92a42883ff6b8991438f07df60c2c0d82d
2216 Author: Damien Miller <djm@mindrot.org>
2217 Date: Mon Nov 29 12:29:29 2021 +1100
2221 commit 8249afeec013e557fe7491a72ca3285de03e25b1
2222 Author: djm@openbsd.org <djm@openbsd.org>
2223 Date: Sun Nov 28 07:21:26 2021 +0000
2225 upstream: sshsig: return "key not found" when searching empty files
2227 rather than "internal error"
2229 OpenBSD-Commit-ID: e2ccae554c78d7a7cd33fc5d217f35be7e2507ed
2231 commit 9e3227d4dbb5ad9c9091b4c14982cab4bba87b4d
2232 Author: djm@openbsd.org <djm@openbsd.org>
2233 Date: Sun Nov 28 07:15:10 2021 +0000
2235 upstream: ssh-keygen -Y match-principals doesn't accept any -O
2237 options at present, so don't say otherwise in SYNOPSIS; spotted jmc@
2239 OpenBSD-Commit-ID: 9cc43a18f4091010741930b48b3db2f2e4f1d35c
2241 commit 56db1f4a4cf5039fc3b42e84c4b16291fdff32b1
2242 Author: djm@openbsd.org <djm@openbsd.org>
2243 Date: Sun Nov 28 07:14:29 2021 +0000
2245 upstream: fix indenting in last commit
2247 OpenBSD-Commit-ID: 8b9ba989815d0dec1fdf5427a4a4b58eb9cac4d2
2249 commit 50bea24a9a9bdebad327c76e700def3261f5694e
2250 Author: djm@openbsd.org <djm@openbsd.org>
2251 Date: Sun Nov 28 07:10:18 2021 +0000
2253 upstream: missing initialisation for oerrno
2255 OpenBSD-Commit-ID: 05d646bba238080259bec821c831a6f0b48d2a95
2257 commit 5a0f4619041d09cd29f3a08da41db5040372bdd1
2258 Author: Darren Tucker <dtucker@dtucker.net>
2259 Date: Sun Nov 28 15:31:37 2021 +1100
2261 Correct ifdef to activate poll() only if needed.
2263 commit d4035c81a71237f690edd7eda32bef7d63fd9528
2264 Author: djm@openbsd.org <djm@openbsd.org>
2265 Date: Sat Nov 27 07:23:35 2021 +0000
2267 upstream: whitespac e
2269 OpenBSD-Regress-ID: b9511d41568056bda489e13524390167889908f8
2271 commit a443491e6782ef0f5a8bb87a5536c8ee4ff233a1
2272 Author: djm@openbsd.org <djm@openbsd.org>
2273 Date: Sat Nov 27 07:20:58 2021 +0000
2275 upstream: regression test for match-principals. Mostly by Fabian
2279 OpenBSD-Regress-ID: ced0bec89af90935103438986bbbc4ad1df9cfa7
2281 commit 78230b3ec8cbabc1e7de68732dc5cbd4837c6675
2282 Author: djm@openbsd.org <djm@openbsd.org>
2283 Date: Sat Nov 27 07:14:46 2021 +0000
2285 upstream: Add ssh-keygen -Y match-principals operation to perform
2287 matching of principals names against an allowed signers file.
2289 Requested by and mostly written by Fabian Stelzer, towards a TOFU
2290 model for SSH signatures in git. Some tweaks by me.
2292 "doesn't bother me" deraadt@
2294 OpenBSD-Commit-ID: 8d1b71f5a4127bc5e10a880c8ea6053394465247
2296 commit 15db86611baaafb24c40632784dabf82e3ddb1a7
2297 Author: djm@openbsd.org <djm@openbsd.org>
2298 Date: Thu Nov 25 23:02:24 2021 +0000
2300 upstream: debug("func: ...") -> debug_f("...")
2302 OpenBSD-Commit-ID: d58494dc05c985326a895adfbe16fbd5bcc54347
2304 commit b7ffbb17e37f59249c31f1ff59d6c5d80888f689
2305 Author: Darren Tucker <dtucker@dtucker.net>
2306 Date: Fri Nov 19 18:53:46 2021 +1100
2308 Allow for fd = -1 in compat ppoll overflow check.
2310 Fixes tests on at least FreeBSD 6, possibly others.
2312 commit 04b172da5b96a51b0d55c905b423ababff9f4e0b
2313 Author: Darren Tucker <dtucker@dtucker.net>
2314 Date: Fri Nov 19 16:01:51 2021 +1100
2316 Don't auto-enable Capsicum sandbox on FreeBSD 9/10.
2318 Since we changed from select() to ppoll() tests have been failing.
2319 This seems to be because FreeBSD 10 (and presumably 9) do not allow
2320 ppoll() in the privsep process and sshd will fail with "Not permitted in
2321 capability mode". Setting CAP_EVENT on the FDs doesn't help, but weirdly,
2322 poll() works without that. Those versions are EOL so this situation is
2325 commit a823f39986e7b879f26412e64c15630e1cfa0dc5
2326 Author: djm@openbsd.org <djm@openbsd.org>
2327 Date: Thu Nov 18 03:53:48 2021 +0000
2329 upstream: regression test for ssh-keygen -Y find-principals fix; from
2331 Fabian Stelzer ok djm markus
2333 OpenBSD-Regress-ID: 34fe4088854c1a2eb4c0c51cc4676ba24096bac4
2335 commit 199c4df66c0e39dd5c3333b162af274678c0501d
2336 Author: djm@openbsd.org <djm@openbsd.org>
2337 Date: Thu Nov 18 21:32:11 2021 +0000
2339 upstream: less confusing debug message; bz#3365
2341 OpenBSD-Commit-ID: 836268d3642c2cdc84d39b98d65837f5241e4a50
2343 commit 97f9b6e61316c97a32dad94b7a37daa9b5f6b836
2344 Author: djm@openbsd.org <djm@openbsd.org>
2345 Date: Thu Nov 18 21:11:01 2021 +0000
2347 upstream: avoid xmalloc(0) for PKCS#11 keyid for ECDSA keys (we
2349 already did this for RSA keys). Avoids fatal errors for PKCS#11 libraries
2350 that return empty keyid, e.g. Microchip ATECC608B "cryptoauthlib"; bz#3364
2352 OpenBSD-Commit-ID: 054d4dc1d6a99a2e6f8eebc48207b534057c154d
2354 commit c74aa0eb73bd1edf79947d92d9c618fc3424c4a6
2355 Author: djm@openbsd.org <djm@openbsd.org>
2356 Date: Thu Nov 18 03:50:41 2021 +0000
2358 upstream: ssh-keygen -Y find-principals was verifying key validity
2360 when using ca certs but not with simple key lifetimes within the allowed
2363 Since it returns the first keys principal it finds this could
2364 result in a principal with an expired key even though a valid
2367 patch from Fabian Stelzer; feedback/ok djm markus
2369 OpenBSD-Commit-ID: b108ed0a76b813226baf683ab468dc1cc79e0905
2371 commit d902d728dfd81622454260e23bc09d5e5a9a795e
2372 Author: Darren Tucker <dtucker@dtucker.net>
2373 Date: Thu Nov 18 23:44:07 2021 +1100
2375 Correct calculation of tv_nsec in poll().
2377 commit 21dd5a9a3fb35e8299a1fbcf8d506f1f6b752b85
2378 Author: Darren Tucker <dtucker@dtucker.net>
2379 Date: Thu Nov 18 23:11:37 2021 +1100
2381 Add compat implementation of ppoll using pselect.
2383 commit b544ce1ad4afb7ee2b09f714aa63efffc73fa93a
2384 Author: Darren Tucker <dtucker@dtucker.net>
2385 Date: Thu Nov 18 23:05:34 2021 +1100
2387 Put poll.h inside ifdef HAVE_POLL_H.
2389 commit 875408270c5a7dd69ed5449e5d85bd7120c88f70
2390 Author: djm@openbsd.org <djm@openbsd.org>
2391 Date: Thu Nov 18 03:31:44 2021 +0000
2393 upstream: check for POLLHUP wherever we check for POLLIN
2395 OpenBSD-Commit-ID: 6aa6f3ec6b17c3bd9bfec672a917f003a76d93e5
2397 commit 36b5e37030d35bbaa18ba56825b1af55971d18a0
2398 Author: djm@openbsd.org <djm@openbsd.org>
2399 Date: Thu Nov 18 03:07:59 2021 +0000
2401 upstream: fd leak in sshd listen loop error path; from Gleb
2405 OpenBSD-Commit-ID: a7a2be27a690a74bf2381bc16cea38e265657412
2407 commit b99498d0c93f1edd04857b318308a66b28316bd8
2408 Author: djm@openbsd.org <djm@openbsd.org>
2409 Date: Thu Nov 18 03:07:20 2021 +0000
2411 upstream: check for POLLHUP as well as POLLIN in sshd listen loop;
2415 OpenBSD-Commit-ID: a4f1244c5a9c2b08dac4f3b1dc22e9d1dc60c587
2417 commit 1f3055d788e8cf80851eb1728b535d57eb0dba6a
2418 Author: djm@openbsd.org <djm@openbsd.org>
2419 Date: Thu Nov 18 03:06:03 2021 +0000
2421 upstream: check for POLLHUP as well as POLLIN, handle transient IO
2423 errors as well as half-close on the output side; ok deraadt millert
2425 OpenBSD-Commit-ID: de5c5b9939a37476d256328cbb96305bdecf511e
2427 commit 9778a15fa6dbdac6a95bf15865c2688b4bd6944e
2428 Author: Damien Miller <djm@mindrot.org>
2429 Date: Thu Nov 18 10:16:55 2021 +1100
2431 adjust seccomp filter for select->poll conversion
2433 Needed to add ppoll syscall but also to relax the fallback rlimit
2434 sandbox. Linux poll() fails with EINVAL if npfds > RLIMIT_NOFILE,
2435 so we have to allow a single fd in the rlimit.
2437 commit fcd8d895bbb849c64f0aed934e3303d37f696f5d
2438 Author: Damien Miller <djm@mindrot.org>
2439 Date: Thu Nov 18 10:16:44 2021 +1100
2443 commit 76292787a1e93e668f10e36b4bf59ce0ae28e156
2444 Author: Damien Miller <djm@mindrot.org>
2445 Date: Thu Nov 18 09:26:20 2021 +1100
2447 compat for timespecsub() and friends
2449 commit fd7e7de4ddb4399c7e929b44f2bbfc118eddfcf8
2450 Author: djm@openbsd.org <djm@openbsd.org>
2451 Date: Wed Nov 17 21:06:39 2021 +0000
2453 upstream: set num_listen_socks to 0 on close-all instead of -1,
2455 which interferes with the new poll()-based listen loop; spotted and debugged
2458 OpenBSD-Commit-ID: f7ab8ab124f615a2e0c45fee14c38d2f2abbabbd
2460 commit fd9343579afac30a971f06643a669733d9acb407
2461 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2462 Date: Sun Nov 14 18:47:43 2021 +0000
2464 upstream: use ppoll() instead of pselect() with djm
2466 OpenBSD-Commit-ID: 980f87c9564d5d2ad55722b7a6f44f21284cd215
2468 commit 092d29b232ef1a19609a5316ed7e4d896bb2e696
2469 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2470 Date: Sun Nov 14 06:15:36 2021 +0000
2472 upstream: match .events with .fd better
2474 OpenBSD-Commit-ID: 77eef212ca0add905949532af390164489c5984b
2476 commit 8d642c9a90fa4ed5a3effd785fb3591e14de00cd
2477 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2478 Date: Sun Nov 14 03:25:10 2021 +0000
2480 upstream: convert select() to poll() ok djm
2482 OpenBSD-Commit-ID: b53e4940ff10dd24f8d16e8db8ef1970015d7ead
2484 commit 6582a31c388968f4073af2bd8621880735c3d42b
2485 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2486 Date: Sat Nov 13 21:14:13 2021 +0000
2488 upstream: replace select() with ppoll(), including converting
2490 timeval's to timespec's to make things easier. back and forth and ok; djm
2492 OpenBSD-Commit-ID: 89d3b23c60875da919e7820f9de6213286ffbec9
2494 commit 7c025c005550c86a40200a2bcdd355d09413d61a
2495 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2496 Date: Sat Nov 13 17:26:13 2021 +0000
2498 upstream: It really looks like pledge "stdio dns" is possible
2500 earlier. Discussed with mestre
2502 OpenBSD-Commit-ID: 610873de63a593e0ac7bbbcb7a0f2894d36f4c01
2504 commit 06acb04c20ee483fe4757bd12aec870cc4bb1076
2505 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2506 Date: Fri Nov 12 05:23:49 2021 +0000
2508 upstream: aggressively pre-fill the pollfd array with fd=-1
2510 OpenBSD-Commit-ID: c2a525de8f83c1a04405bd79122c424140552a5b
2512 commit 7eec76793dec06e8f06b6cf71f9473141c69d109
2513 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2514 Date: Thu Nov 11 15:32:32 2021 +0000
2516 upstream: Convert from select() to ppoll(). Along the way, I
2518 observed that the select() code was using exceptfds incorrectly.. ok millert
2520 OpenBSD-Commit-ID: 548e05bfc31b2af02319eb3d051286d4128dec96
2522 commit e665ed2d0c24fe11d5470ce72fa1e187377d3fc4
2523 Author: Darren Tucker <dtucker@dtucker.net>
2524 Date: Fri Nov 12 22:55:27 2021 +1100
2526 Switch from LibreSSL 3.4.0 to 3.4.1.
2528 The LibreSSL 3.4.0 release has an OPENBSD_BRANCH that points to
2529 "master" and that branch no longer has the files LibreSSL expects
2530 and thus it will no longer build, breaking the test.
2532 commit 21b6b5a06c8c53c548d25e6074c5240e88e2ef34
2533 Author: djm@openbsd.org <djm@openbsd.org>
2534 Date: Wed Nov 10 06:29:25 2021 +0000
2536 upstream: add the sntrup761x25519-sha512@openssh.com hybrid
2538 ECDH/x25519 + Streamlined NTRU Prime post-quantum KEX to the default
2539 KEXAlgorithms list (after the ECDH methods but before the prime-group DH
2544 OpenBSD-Commit-ID: 22b77e27a04e497a10e22f138107579652854210
2546 commit 239da797cbf07a640d7b1ea02d3f99ace3ef792d
2547 Author: djm@openbsd.org <djm@openbsd.org>
2548 Date: Wed Nov 10 06:25:08 2021 +0000
2550 upstream: fix ssh-keysign for KEX algorithms that use SHA384/512
2552 exchange hashes; feedback/ok markus@
2554 OpenBSD-Commit-ID: 09a8fda1c081f5de1e3128df64f28b7bdadee239
2556 commit 6997a592ecb1013df0c6d7f8df3e6517827aef11
2557 Author: djm@openbsd.org <djm@openbsd.org>
2558 Date: Mon Nov 8 21:32:49 2021 +0000
2560 upstream: improve error message when trying to expand a ~user path
2562 for a user that doesn't exist; better matches what the shell does
2566 OpenBSD-Commit-ID: 1ddefa3c3a78b69ce13d1b8f67bc9f2cefd23ad6
2568 commit 10b899a15c88eb40eb5f73cd0fa84ef0966f79c9
2569 Author: Darren Tucker <dtucker@dtucker.net>
2570 Date: Wed Nov 10 12:34:25 2021 +1100
2572 Don't trust closefrom() on Linux.
2574 glibc's closefrom implementation does not work in a chroot when the kernel
2575 does not have close_range. It tries to read from /proc/self/fd and when
2576 that fails dies with an assertion of sorts. Instead, call close_range
2577 ourselves from our compat code and fall back if that fails. bz#3349,
2578 with william.wilson at canonical.com and fweimer at redhat.com.
2580 commit eb1f63195a9a38b519536a5b398d9939261ec081
2581 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2582 Date: Sat Nov 6 10:13:39 2021 +0000
2584 upstream: Plug a couple of minor mem leaks. From beldmit at
2586 gmail.com via github PR#283, ok markus@
2588 OpenBSD-Commit-ID: ec1fa7d305d46226861c3ca6fb9c9beb2ada2892
2590 commit e4f501bf1d3b53f1cc23d9521fd7c5163307b760
2591 Author: djm@openbsd.org <djm@openbsd.org>
2592 Date: Fri Nov 5 03:10:58 2021 +0000
2594 upstream: move cert_filter_principals() to earlier in the file for
2596 reuse; no code change
2598 OpenBSD-Commit-ID: 598fa9528b656b2f38bcc3cf5b6f3869a8c115cf
2600 commit 59c60f96fee321c7f38f00372826d37f289534af
2601 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2602 Date: Wed Nov 3 22:00:56 2021 +0000
2604 upstream: Many downstreams expect ssh to compile as non-C99...
2606 OpenBSD-Commit-ID: e6aa3e08bda68e5fb838fc8a49b1d2dfc38ee783
2608 commit 7a78fe63b0b28ef7231913dfefe9d08f9bc41c61
2609 Author: Darren Tucker <dtucker@dtucker.net>
2610 Date: Sat Nov 6 21:07:03 2021 +1100
2612 Skip getline() on HP-UX 10.x.
2614 HP-UX 10.x has a getline() implementation in libc that does not behave
2615 as we expect so don't use it. With correction from Thorsten Glaser and
2616 typo fix from Larkin Nickle.
2618 commit 343ae252ebb35c6ecae26b447bf1551a7666720e
2619 Author: Damien Miller <djm@mindrot.org>
2620 Date: Wed Nov 3 12:08:21 2021 +1100
2622 basic SECURITY.md (refers people to the website)
2624 commit ed45a0168638319e0a710633f6085b96b9cec656
2625 Author: djm@openbsd.org <djm@openbsd.org>
2626 Date: Tue Nov 2 22:57:27 2021 +0000
2628 upstream: crank SSH_SK_VERSION_MAJOR to match recent change in
2632 OpenBSD-Regress-ID: 113d181c7e3305e138db9b688cdb8b0a0019e552
2634 commit f3c34df860c4c1ebddacb973954e58167d9dbade
2635 Author: djm@openbsd.org <djm@openbsd.org>
2636 Date: Tue Nov 2 22:56:40 2021 +0000
2638 upstream: Better handle FIDO keys on tokens that provide user
2640 verification (UV) on the device itself, including biometric keys.
2642 Query the token during key creation to determine whether it supports
2643 on-token UV and, if so, clear the SSH_SK_USER_VERIFICATION_REQD flag
2644 in the key so that ssh(1) doesn't automatically prompty for PIN later.
2646 When making signatures with the key, query the token's capabilities
2647 again and check whether the token is able (right now) to perform user-
2648 verification without a PIN. If it is then the PIN prompt is bypassed
2649 and user verification delegated to the token. If not (e.g. the token
2650 is biometric capable, but no biometric are enrolled), then fall back
2651 to user verification via the usual PIN prompt.
2653 Work by Pedro Martelletto; ok myself and markus@
2655 NB. cranks SSH_SK_VERSION_MAJOR
2657 OpenBSD-Commit-ID: e318a8c258d9833a0b7eb0236cdb68b5143b2f27
2659 commit 0328a081f38c09d2d4d650e94461a47fb5eef536
2660 Author: djm@openbsd.org <djm@openbsd.org>
2661 Date: Fri Oct 29 03:03:06 2021 +0000
2663 upstream: sshsig: add tests for signing key validity and
2667 - adds generic find-principals tests (this command had none before)
2668 - tests certs with a timeboxed validity both with and without a
2669 restriced lifetime for the CA
2670 - test for a revoked CA cert
2674 OpenBSD-Regress-ID: 9704b2c6df5b8ccfbdf2c06c5431f5f8cad280c9
2676 commit ccd358e1e25e25c13f0825996283cbf7a1647a3b
2677 Author: djm@openbsd.org <djm@openbsd.org>
2678 Date: Fri Oct 29 02:48:19 2021 +0000
2680 upstream: avoid signedness warning; spotted in -portable
2682 OpenBSD-Regress-ID: 4cacc126086487c0ea7f3d86b42dec458cf0d0c6
2684 commit 2741f52beb11490d7033a25e56ed0496f0c78006
2685 Author: djm@openbsd.org <djm@openbsd.org>
2686 Date: Fri Oct 29 03:20:46 2021 +0000
2688 upstream: ssh-keygen: make verify-time argument parsing optional
2692 OpenBSD-Commit-ID: 1ff35e4c366a45a073663df90381be6a8ef4d370
2694 commit a1217d363b88b32cfe54c4f02c6c1cf4bdefdd23
2695 Author: Damien Miller <djm@mindrot.org>
2696 Date: Fri Oct 29 13:48:34 2021 +1100
2698 unbreak fuzz harness for recent changes
2700 commit 68e522ed8183587c9367fa3842c5b75f64f3d12b
2701 Author: Darren Tucker <dtucker@dtucker.net>
2702 Date: Fri Oct 29 13:32:24 2021 +1100
2704 Use -Wbitwise-instead-of-logical if supported.
2706 commit be28b23012aa3fa323be7ec84863cf238927c078
2707 Author: Damien Miller <djm@mindrot.org>
2708 Date: Thu Oct 28 16:24:53 2021 +1100
2710 use -Wmisleading-indentation cflag if available
2714 commit 2e6f5f24dd2f9217f4ab8b737ed428d5d5278f91
2715 Author: Damien Miller <djm@mindrot.org>
2716 Date: Thu Oct 28 16:24:44 2021 +1100
2720 commit a5ab4882348d26addc9830a44e053238dfa2cb58
2721 Author: Damien Miller <djm@mindrot.org>
2722 Date: Thu May 6 10:08:30 2021 +1000
2724 remove built-in support for md5crypt()
2726 Users of MD5-hashed password should arrange for ./configure to link
2727 against libxcrypt or similar. Though it would be better to avoid use
2728 of MD5 password hashing entirely, it's arguably worse than DEScrypt.
2730 feedback and ok dtucker@
2732 commit c5de1fffa6328b8246b87da28fa9df05813f76a3
2733 Author: djm@openbsd.org <djm@openbsd.org>
2734 Date: Thu Oct 28 02:55:30 2021 +0000
2736 upstream: increment SSH_SK_VERSION_MAJOR to match last change
2738 OpenBSD-Regress-ID: 17873814d1cbda97f49c8528d7b5ac9cadf6ddc0
2740 commit 0001d04e55802d5bd9d6dece1081a99aa4ba2828
2741 Author: djm@openbsd.org <djm@openbsd.org>
2742 Date: Thu Oct 28 02:54:18 2021 +0000
2744 upstream: When downloading resident keys from a FIDO token, pass
2746 back the user ID that was used when the key was created and append it to the
2747 filename the key is written to (if it is not the default).
2749 Avoids keys being clobbered if the user created multiple
2750 resident keys with the same application string but different
2753 feedback Pedro Martelletto; ok markus
2755 NB. increments SSH_SK_VERSION_MAJOR
2757 OpenBSD-Commit-ID: dbd658b5950f583106d945641a634bc6562dd3a3
2759 commit d4bed5445646e605c383a4374fa962e23bf9e3a3
2760 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2761 Date: Sun Oct 24 21:24:17 2021 +0000
2763 upstream: For open/openat, if the flags parameter does not contain
2765 O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant. Many developers
2766 in the past have passed mode_t (0, 044, 0644, or such), which might lead
2767 future people to copy this broken idiom, and perhaps even believe this
2768 parameter has some meaning or implication or application. Delete them all.
2769 This comes out of a conversation where tb@ noticed that a strange (but
2770 intentional) pledge behaviour is to always knock-out high-bits from mode_t on
2771 a number of system calls as a safety factor, and his bewilderment that this
2772 appeared to be happening against valid modes (at least visually), but no
2773 sorry, they are all irrelevant junk. They could all be 0xdeafbeef. ok
2776 OpenBSD-Commit-ID: 503d11633497115688c0c6952686524f01f53121
2778 commit d575cf44895104e0fcb0629920fb645207218129
2779 Author: Darren Tucker <dtucker@dtucker.net>
2780 Date: Fri Oct 22 23:27:41 2021 +1100
2782 kitchensink test target now needs krb5.
2784 commit 4ae39cada214e955bcfd3448ff28f0ed18886706
2785 Author: Darren Tucker <dtucker@dtucker.net>
2786 Date: Fri Oct 22 22:54:33 2021 +1100
2788 Test both MIT KRB5 and Heimdal.
2790 commit 22b2681d88619e5247dc53c9f112058a7e248d48
2791 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2792 Date: Fri Oct 22 10:51:57 2021 +0000
2794 upstream: Plug mem addrinfo mem leaks.
2796 Prevent mem leaks in the (unlikely) event that getaddrinfo returns
2797 no addresses. ALso, remove an unneeded NULL check in addr_ntop. From
2798 khaleesicodes via github PR#281, ok deraadt@
2800 OpenBSD-Commit-ID: e8a5afc686376637c355c5f7e122dc4b080b9c1a
2802 commit 27c8c343b610263f83ac2328735feeb881c6c92f
2803 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2804 Date: Fri Oct 22 09:22:04 2021 +0000
2806 upstream: Remove unnecessary semicolons
2808 ... in case statements. From khaleesicodes via github PR#280.
2810 OpenBSD-Commit-ID: e1e89360b65775cff83e77ce040b342015caf4ed
2812 commit e7eb73b8d1fe1008d92433ea949491ce654bfaba
2813 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2814 Date: Fri Oct 22 09:19:34 2021 +0000
2816 upstream: Fix typos in comments.
2818 From khaleesicodes via github PR#280.
2820 OpenBSD-Commit-ID: 26fdd83652c40f098bf7c685e8ebb9eb72cc45fc
2822 commit 052a9d8494175e24312daa6c132665e58c17fe6e
2823 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2824 Date: Fri Oct 15 14:46:46 2021 +0000
2826 upstream: switch scp(1) back to sftp protocol.
2828 openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
2829 protocol for copying. Let's get back to testing the SFTP protocol.
2831 OpenBSD-Commit-ID: 9eaa35d95fd547b78b0a043b3f518e135f151f30
2833 commit a07664646bf6d293f5bbd45a5de54f3c36bb85da
2834 Author: Darren Tucker <dtucker@dtucker.net>
2835 Date: Fri Oct 22 14:00:05 2021 +1100
2837 Source configs script so setup_ci can use settings
2839 commit 34df52c201c6b47e5a46b50c215e4d98a8bf6587
2840 Author: Darren Tucker <dtucker@dtucker.net>
2841 Date: Fri Oct 22 09:42:14 2021 +1100
2843 Install libedit and pam based on config flags.
2845 commit 8c626cc563e8d21d844d06f9971a9ee01de6aa2a
2846 Author: Darren Tucker <dtucker@dtucker.net>
2847 Date: Thu Oct 21 16:53:39 2021 +1100
2849 Don't use 'here string", it's not POSIX.
2851 commit 086a4b5977472aefa3de918b88efad0faf83b2b1
2852 Author: Darren Tucker <dtucker@dtucker.net>
2853 Date: Thu Oct 21 15:33:27 2021 +1100
2855 Remove -Werror from compiler package to install.
2857 commit 5a7a4687507d057f9b5e7497f3d3f82e64753c02
2858 Author: Darren Tucker <dtucker@dtucker.net>
2859 Date: Thu Oct 21 15:00:53 2021 +1100
2861 Build with -Werror on most recent gcc and clang.
2863 commit 4d2cbdb525d673acf941d48a7044fcf03125611a
2864 Author: Darren Tucker <dtucker@dtucker.net>
2865 Date: Fri Oct 15 12:59:06 2021 +1100
2867 Include string.h and stdio.h for strerror.
2869 commit fff13aaa262b7b3ec83ed21e29674cbf331780a7
2870 Author: Darren Tucker <dtucker@dtucker.net>
2871 Date: Fri Oct 15 12:43:36 2021 +1100
2873 Include error reason if trace disabling fails.
2875 commit d4b38144c02f3faa5271e5fb35df93507e06f1b4
2876 Author: Darren Tucker <dtucker@dtucker.net>
2877 Date: Tue Oct 12 22:55:51 2021 +1100
2879 Add tcmalloc test target.
2881 commit 002d65b0a30063c6e49bf8a53e709d8d5a0d45c1
2882 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2883 Date: Sat Oct 9 10:52:42 2021 +0000
2885 upstream: Document that CASignatureAlgorithms, ExposeAuthInfo and
2887 PubkeyAuthOptions can be used in a Match block. Patch from eehakkin via
2890 OpenBSD-Commit-ID: c0a63f5f52e918645967ac022b28392da4b866aa
2892 commit 40bd3709dddaae3a1b6113748bec3faa6a607531
2893 Author: Darren Tucker <dtucker@dtucker.net>
2894 Date: Thu Oct 7 15:55:49 2021 +1100
2896 Skip SK unit tests when built without security-key
2898 commit 482f73be10f10b93f818df19fcc8a912c0c371fc
2899 Author: Darren Tucker <dtucker@dtucker.net>
2900 Date: Thu Oct 7 15:55:04 2021 +1100
2902 Include relevant env vars on command line.
2904 Makes it easier to reproduce a build by cut/pasting the configure line.
2906 commit ef5916b8acd9b1d2f39fad4951dae03b00dbe390
2907 Author: Darren Tucker <dtucker@dtucker.net>
2908 Date: Thu Oct 7 14:28:02 2021 +1100
2910 Only enable sk-* key types if ENABLE_SK is defined
2912 commit 52d4232b493a9858fe616e28a8bbcc89afa2ad4d
2913 Author: Darren Tucker <dtucker@dtucker.net>
2914 Date: Wed Oct 6 18:14:37 2021 +1100
2916 Disable security key on minix3.
2918 The test doesn't work so disable.
2920 commit 7cd062c3a29669b8d7dc2a97e6575f4dcb7d35a2
2921 Author: Darren Tucker <dtucker@dtucker.net>
2922 Date: Wed Oct 6 17:45:28 2021 +1100
2924 Add USE_LIBC_SHA2 for (at least) NetBSD 9.
2926 commit 639c440f6c3c2a8216a5eb9455ef13bf4204089c
2927 Author: Darren Tucker <dtucker@dtucker.net>
2928 Date: Wed Oct 6 17:09:31 2021 +1100
2930 Define OPENSSL_NO_SHA including OpenSSL from test.
2932 We don't use SHA256 from OpenSSL in the sk-dummy module and the
2933 definitions can conflict with system sha2.h (eg on NetBSD) so define
2934 OPENSSL_NO_SHA so we don't attempt to redefine them.
2936 commit 8f4be526a338d06624f146fa26007bb9dd3a4f7b
2937 Author: Darren Tucker <dtucker@dtucker.net>
2938 Date: Wed Oct 6 15:40:58 2021 +1100
2940 Disable security key on NetBSD4 test.
2942 sk-dummy used for the security key test includes both sha2.h and OpenSSL
2943 causing the definitions conflict so disable security key support on this
2946 commit 3b353ae58aa07a1cbbeb1da3ace21fc0dcccd66a
2947 Author: Damien Miller <djm@mindrot.org>
2948 Date: Wed Oct 6 15:07:01 2021 +1100
2950 clean regress/misc/sk-dummy in cleandir target
2952 commit 57680a2ab43518c5ccbd8242c40482106cde6ac1
2953 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2954 Date: Sat Oct 2 03:17:01 2021 +0000
2956 upstream: Dynamically allocate encoded HashKnownHosts and free as
2958 appropriate. Saves 1k of static storage and prevents snprintf "possible
2959 truncation" warnings from newer compilers (although in this case it's false
2960 positive since the actual sizes are limited by the output size of the SHA1).
2963 OpenBSD-Commit-ID: e254ae723f7e3dce352c7d5abc4b6d87faf61bf4
2965 commit e3e62deb549fde215b777d95276c304f84bf00c6
2966 Author: djm@openbsd.org <djm@openbsd.org>
2967 Date: Wed Oct 6 03:35:13 2021 +0000
2969 upstream: use libc SHA256 functions; make this work when compiled
2973 OpenBSD-Regress-ID: fda0764c1097cd42f979ace29b07eb3481259890
2975 commit 12937d867019469ebce83c2ff614cdc6688fc2d8
2976 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2977 Date: Fri Oct 1 05:20:20 2021 +0000
2979 upstream: Add test for ssh hashed known_hosts handling.
2981 OpenBSD-Regress-ID: bcef3b3cd5a1ad9899327b4b2183de2541aaf9cf
2983 commit 5a37cc118f464416d08cd0291a9b1611d8de9943
2984 Author: Damien Miller <djm@mindrot.org>
2985 Date: Wed Oct 6 13:16:21 2021 +1100
2987 fix broken OPENSSL_HAS_ECC test
2991 commit 16a25414f303cd6790eb967aeb962040e32c9c7a
2992 Author: Damien Miller <djm@mindrot.org>
2993 Date: Fri Oct 1 22:40:06 2021 +1000
2995 make sk-dummy.so work without libcrypto installed
2997 commit dee22129bbc61e25b1003adfa2bc584c5406ef2d
2998 Author: Damien Miller <djm@mindrot.org>
2999 Date: Fri Oct 1 16:35:49 2021 +1000
3001 make OPENSSL_HAS_ECC checks more thorough
3005 commit 872595572b6c9a584ed754165e8b7c4c9e7e1d61
3006 Author: Damien Miller <djm@mindrot.org>
3007 Date: Fri Oct 1 16:35:05 2021 +1000
3009 fix FIDO key support for !OPENSSL_HAS_ECC case
3013 commit 489741dc68366940d369ac670b210b4834a6c272
3014 Author: Damien Miller <djm@mindrot.org>
3015 Date: Fri Oct 1 14:51:37 2021 +1000
3017 enable security key support for --without-openssl
3019 commit c978565c8589acfe4ea37ab5099d39c84158c713
3020 Author: Damien Miller <djm@mindrot.org>
3021 Date: Fri Oct 1 13:27:50 2021 +1000
3023 need stdlib.h for free(3)
3025 commit 76a398edfb51951b2d65d522d7b02c72304db300
3026 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3027 Date: Thu Sep 30 05:26:26 2021 +0000
3029 upstream: Fix up whitespace left by previous
3031 change removing privsep. No other changes.
3033 OpenBSD-Regress-ID: 87adec225d8afaee4d6a91b2b71203f52bf14b15
3035 commit ddcb53b7a7b29be65d57562302b2d5f41733e8dd
3036 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3037 Date: Thu Sep 30 05:20:08 2021 +0000
3039 upstream: Remove references to privsep.
3041 This removes several do..while loops but does not change the
3042 indentation of the now-shallower loops, which will be done in a separate
3043 whitespace-only commit to keep changes of style and substance separate.
3045 OpenBSD-Regress-ID: 4bed1a0249df7b4a87c965066ce689e79472a8f7
3047 commit ece2fbe486164860de8df3f8b943cccca3085eff
3048 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3049 Date: Thu Sep 30 04:22:50 2021 +0000
3051 upstream: Use "skip" instead of "fatal"
3053 if SUDO isn't set for the *-command tests. This means running "make tests"
3054 without SUDO set will perform all of the tests that it can instead of
3055 failing on the ones it cannot run.
3057 OpenBSD-Regress-ID: bd4dbbb02f34b2e8c890558ad4a696248def763a
3059 commit bb754b470c360e787a99fb4e88e2668198e97b41
3060 Author: djm@openbsd.org <djm@openbsd.org>
3061 Date: Fri Oct 1 04:50:36 2021 +0000
3063 upstream: unbreak FIDO sk-ed25519 key enrollment for OPENSSL=no builds;
3067 OpenBSD-Commit-ID: 6323a5241728626cbb2bf0452cf6a5bcbd7ff709
3069 commit 207648d7a6415dc915260ca75850404dbf9f0a0b
3070 Author: Darren Tucker <dtucker@dtucker.net>
3071 Date: Wed Sep 29 20:03:58 2021 +1000
3073 Include stdlib.h for arc4random_uniform prototype.
3075 commit 696aadc854582c164d5fc04933d2f3e212dc0e06
3076 Author: Darren Tucker <dtucker@dtucker.net>
3077 Date: Wed Sep 29 20:00:30 2021 +1000
3079 Look for clang after cc and gcc.
3081 commit a3c6375555026d85dbf811fab566b9f76f196144
3082 Author: Darren Tucker <dtucker@dtucker.net>
3083 Date: Wed Sep 29 19:30:59 2021 +1000
3085 Use backticks instead of $(..) for portability.
3087 Older shells (eg /bin/sh on Solaris 10) don't support $() syntax.
3089 commit 958aaa0387133d51f84fe9c8f30bca03025f2867
3090 Author: Darren Tucker <dtucker@dtucker.net>
3091 Date: Wed Sep 29 18:53:32 2021 +1000
3093 Skip file-based tests by default on Mac OS.
3095 The file-based tests need OpenSSL so skip them.
3097 commit 55c8bdf6e9afb0f9fa8e4f10c25c7f0081b48fd0
3098 Author: Darren Tucker <dtucker@dtucker.net>
3099 Date: Wed Sep 29 18:42:47 2021 +1000
3101 Build without OpenSSL on Mac OS.
3103 Modern versions don't ship enough libcrypto to build against.
3105 commit c9172193ea975415facf0afb356d87df21535f88
3106 Author: Darren Tucker <dtucker@dtucker.net>
3107 Date: Wed Sep 29 18:33:38 2021 +1000
3109 Remove TEST_SSH_ECC.
3111 Convert the only remaining user of it to runtime detection using ssh -Q.
3113 commit 5e6d28b7874b0deae95d2c68947c45212d32e599
3114 Author: Darren Tucker <dtucker@dtucker.net>
3115 Date: Wed Sep 29 17:48:09 2021 +1000
3117 Split c89 test openssl setting out.
3119 commit c4ac7f98e230e83c015678dc958b1ffe828564ad
3120 Author: Darren Tucker <dtucker@dtucker.net>
3121 Date: Wed Sep 29 17:40:50 2021 +1000
3123 Expand TEST_SHELL consistently with other vars.
3125 commit cfe5f7b0eb7621bfb0a756222de0431315c2ab8b
3126 Author: Darren Tucker <dtucker@dtucker.net>
3127 Date: Wed Sep 29 17:26:50 2021 +1000
3129 Replace `pwd` with make variable in regress cmd.
3131 commit 899be59da5fbc3372444bd0fbe74af48313bed33
3132 Author: Darren Tucker <dtucker@dtucker.net>
3133 Date: Wed Sep 29 17:14:33 2021 +1000
3135 Get BUILDDIR from autoconf.
3137 Use this to replace `pwd`s in regress test command line.
3139 commit c8d92d3d4f7d560146f2f936156ec4dac3fc5811
3140 Author: Darren Tucker <dtucker@dtucker.net>
3141 Date: Wed Sep 29 13:28:56 2021 +1000
3143 Add make clean step to tests.
3145 commit 360fb41ef8359619ab90b0d131c914494e55d3dd
3146 Author: Darren Tucker <dtucker@dtucker.net>
3147 Date: Wed Sep 29 11:36:13 2021 +1000
3149 Test all available clang and gcc versions.
3151 commit 4fb49899d7da22952d35a4bc4c9bdb2311087893
3152 Author: djm@openbsd.org <djm@openbsd.org>
3153 Date: Wed Sep 29 01:32:21 2021 +0000
3155 upstream: Test certificate hostkeys held in ssh-agent too. Would have
3157 caught regression fixed in sshd r1.575
3161 OpenBSD-Regress-ID: 1f164d7bd89f83762db823eec4ddf2d2556145ed
3163 commit ce4854e12e749a05646e5775e9deb8cfaf49a755
3164 Author: djm@openbsd.org <djm@openbsd.org>
3165 Date: Wed Sep 29 01:33:32 2021 +0000
3167 upstream: add some debug output showing how many key file/command lines
3169 were processed. Useful to see whether a file or command actually has keys
3172 OpenBSD-Commit-ID: 0bd9ff94e84e03a22df8e6c12f6074a95d27f23c
3174 commit 15abdd523501c349b703d9a27e2bb4252ad921ef
3175 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3176 Date: Tue Sep 28 11:14:50 2021 +0000
3178 upstream: Make prototype for rijndaelEncrypt match function
3180 including the bounds. Fixes error in portable where GCC>=11 takes notice of
3181 the bounds. ok deraadt@
3183 OpenBSD-Commit-ID: cdd2f05fd1549e1786a70871e513cf9e9cf099a6
3185 commit d1d29ea1d1ef1a1a54b209f062ec1dcc8399cf03
3186 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3187 Date: Tue Sep 28 11:10:05 2021 +0000
3189 upstream: Import regenerated moduli.
3191 OpenBSD-Commit-ID: 4bec5db13b736b64b06a0fca704cbecc2874c8e1
3193 commit 39f2111b1d5f00206446257377dcce58cc72369f
3194 Author: Darren Tucker <dtucker@dtucker.net>
3195 Date: Wed Sep 29 10:53:55 2021 +1000
3197 Add new compiler hardening flags.
3199 Add -fzero-call-used-regs and -ftrivial-auto-var-init to the list of
3200 compiler hardening flags that configure checks for. These are supported
3201 by clang and gcc, and make ROP gadgets less useful and mitigate
3202 stack-based infoleaks respectively. ok djm@
3204 commit bf944e3794eff5413f2df1ef37cddf96918c6bde
3205 Author: Damien Miller <djm@mindrot.org>
3206 Date: Mon Sep 27 00:03:19 2021 +1000
3208 initgroups needs grp.h
3210 commit 8c5b5655149bd76ea21026d7fe73ab387dbc3bc7
3211 Author: djm@openbsd.org <djm@openbsd.org>
3212 Date: Sun Sep 26 14:01:11 2021 +0000
3214 upstream: openssh-8.8
3216 OpenBSD-Commit-ID: 12357794602ac979eb7312a1fb190c453f492ec4
3218 commit f3cbe43e28fe71427d41cfe3a17125b972710455
3219 Author: djm@openbsd.org <djm@openbsd.org>
3220 Date: Sun Sep 26 14:01:03 2021 +0000
3222 upstream: need initgroups() before setresgid(); reported by anton@,
3226 OpenBSD-Commit-ID: 6aa003ee658b316960d94078f2a16edbc25087ce
3228 commit 8acaff41f7518be40774c626334157b1b1c5583c
3229 Author: Damien Miller <djm@mindrot.org>
3230 Date: Sun Sep 26 22:16:36 2021 +1000
3232 update version numbers for release
3234 commit d39039ddc0010baa91c70a0fa0753a2699bbf435
3235 Author: kn@openbsd.org <kn@openbsd.org>
3236 Date: Sat Sep 25 09:40:33 2021 +0000
3238 upstream: RSA/SHA-1 is not used by default anymore
3240 OK dtucker deraadt djm
3242 OpenBSD-Commit-ID: 055c51a221c3f099dd75c95362f902da1b8678c6
3244 commit 9b2ee74e3aa8c461eb5552a6ebf260449bb06f7e
3245 Author: Darren Tucker <dtucker@dtucker.net>
3246 Date: Fri Sep 24 11:08:03 2021 +1000
3248 Move the fgrep replacement to hostkey-rotate.sh.
3250 The fgrep replacement for buggy greps doesn't work in the sftp-glob test
3251 so move it to just where we know it's needed.
3253 commit f7039541570d4b66d76e6f574544db176d8d5c02
3254 Author: Darren Tucker <dtucker@dtucker.net>
3255 Date: Fri Sep 24 08:04:14 2021 +1000
3257 Replacement function for buggy fgrep.
3259 GNU (f)grep <=2.18, as shipped by FreeBSD<=12 and NetBSD<=9 will
3260 occasionally fail to find ssh host keys in the hostkey-rotate test.
3261 If we have those versions, use awk instead.
3263 commit f6a660e5bf28a01962af87568e118a2d2e79eaa0
3264 Author: David Manouchehri <david.manouchehri@riseup.net>
3265 Date: Thu Sep 23 17:03:18 2021 -0400
3267 Don't prompt for yes/no questions.
3269 commit 7ed1a3117c09f8c3f1add35aad77d3ebe1b85b4d
3270 Author: djm@openbsd.org <djm@openbsd.org>
3271 Date: Mon Sep 20 06:53:56 2021 +0000
3273 upstream: fix missing -s in SYNOPSYS and usage() as well as a
3275 capitalisation mistake; spotted by jmc@
3277 OpenBSD-Commit-ID: 0ed8ee085c7503c60578941d8b45f3a61d4c9710
3279 commit 8c07170135dde82a26886b600a8bf6fb290b633d
3280 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3281 Date: Mon Sep 20 04:02:13 2021 +0000
3283 upstream: Fix "Allocated port" debug message
3285 for unix domain sockets. From peder.stray at gmail.com via github PR#272,
3288 OpenBSD-Commit-ID: 8d5ef3fbdcdd29ebb0792b5022a4942db03f017e
3290 commit 277d3c6adfb128b4129db08e3d65195d94b55fe7
3291 Author: djm@openbsd.org <djm@openbsd.org>
3292 Date: Mon Sep 20 01:55:42 2021 +0000
3294 upstream: Switch scp back to use the old protocol by default, ahead of
3296 release. We'll wait a little longer for people to pick up sftp-server(8) that
3297 supports the extension that scp needs for ~user paths to continue working in
3298 SFTP protocol mode. Discussed with deraadt@
3300 OpenBSD-Commit-ID: f281f603a705fba317ff076e7b11bcf2df941871
3302 commit ace19b34cc15bea3482be90450c1ed0cd0dd0669
3303 Author: djm@openbsd.org <djm@openbsd.org>
3304 Date: Sat Sep 18 02:03:25 2021 +0000
3306 upstream: better error message for ~user failures when the
3308 sftp-server lacks the expand-path extension; ok deraadt@
3310 OpenBSD-Commit-ID: 9c1d965d389411f7e86f0a445158bf09b8f9e4bc
3312 commit 6b1238ba971ee722a310d95037b498ede5539c03
3313 Author: djm@openbsd.org <djm@openbsd.org>
3314 Date: Thu Sep 16 15:22:22 2021 +0000
3316 upstream: make some more scp-in-SFTP mode better match Unix idioms
3318 suggested by deraadt@
3320 OpenBSD-Commit-ID: 0f2439404ed4cf0b0be8bf49a1ee734836e1ac87
3322 commit e694f8ac4409931e67d08ac44ed251b20b10a957
3323 Author: djm@openbsd.org <djm@openbsd.org>
3324 Date: Thu Sep 16 15:11:19 2021 +0000
3326 upstream: allow log_stderr==2 to prefix log messages with argv[0]
3328 use this to make scp's SFTP mode error messages more scp-like
3330 prompted by and ok deraadt@
3332 OpenBSD-Commit-ID: 0e821dbde423fc2280e47414bdc22aaa5b4e0733
3334 commit 8a7a06ee505cb833e613f74a07392e9296286c30
3335 Author: Darren Tucker <dtucker@dtucker.net>
3336 Date: Fri Sep 17 13:03:31 2021 +1000
3338 Test against LibreSSL 3.2.6, 3.3.4, 3.4.0.
3340 commit c25c84074a47f700dd6534995b4af4b456927150
3341 Author: djm@openbsd.org <djm@openbsd.org>
3342 Date: Thu Sep 16 05:36:03 2021 +0000
3344 upstream: missing space character in ssh -G output broke the
3346 t-sshcfgparse regression test; spotted by anton@
3348 OpenBSD-Commit-ID: bcc36fae2f233caac4baa8e58482da4aa350eed0
3350 commit a4bee1934bf5e5575fea486628f4123d6a29dff8
3351 Author: djm@openbsd.org <djm@openbsd.org>
3352 Date: Wed Sep 15 06:56:01 2021 +0000
3354 upstream: allow CanonicalizePermittedCNAMEs=none in ssh_config; ok
3358 OpenBSD-Commit-ID: 668a82ba8e56d731b26ffc5703213bfe071df623
3360 commit d0fffc88c8fe90c1815c6f4097bc8cbcabc0f3dd
3361 Author: mbuhl@openbsd.org <mbuhl@openbsd.org>
3362 Date: Tue Sep 14 11:04:21 2021 +0000
3364 upstream: put back the mux_ctx memleak fix for SSH_CHANNEL_MUX_CLIENT
3368 OpenBSD-Commit-ID: 1aba1da828956cacaadb81a637338734697d9798
3370 commit 19b3d846f06697c85957ab79a63454f57f8e22d6
3371 Author: schwarze@openbsd.org <schwarze@openbsd.org>
3372 Date: Sat Sep 11 09:05:50 2021 +0000
3374 upstream: Do not ignore SIGINT while waiting for input if editline(3)
3376 is not used. Instead, in non-interactive mode, exit sftp(1), like for other
3377 serious errors. As pointed out by dtucker@, when compiled without editline(3)
3378 support in portable OpenSSH, the el == NULL branch is also used for
3379 interactive mode. In that case, discard the input line and provide a fresh
3380 prompt to the user just like in the case where editline(3) is used. OK djm@
3382 OpenBSD-Commit-ID: 7d06f4d3ebba62115527fafacf38370d09dfb393
3384 commit ba61123eef9c6356d438c90c1199a57a0d7bcb0a
3385 Author: djm@openbsd.org <djm@openbsd.org>
3386 Date: Sat Sep 11 00:40:24 2021 +0000
3388 upstream: when using SFTP protocol, continue transferring files after a
3390 transfer error occurs. This matches original scp/rcp behaviour. ok dtucker@
3392 OpenBSD-Commit-ID: dfe4558d71dd09707e9b5d6e7d2e53b793da69fa
3394 commit b0ec59a708b493c6f3940336b1a537bcb64dd2a7
3395 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3396 Date: Fri Sep 10 11:38:38 2021 +0000
3398 upstream: Document that non-interactive commands are run via the user's
3400 shell using the -c flag. ok jmc@
3402 OpenBSD-Commit-ID: 4f0d912077732eead10423afd1acf4fc0ceec477
3404 commit 66a658b5d9e009ea11f8a0ca6e69c7feb2d851ea
3405 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3406 Date: Fri Sep 10 10:26:02 2021 +0000
3408 upstream: Document behaviour of arguments following non-interactive
3410 commands. Prompted by github PR#139 from EvanTheB, feedback & ok djm@ jmc@
3412 OpenBSD-Commit-ID: fc758d1fe0471dfab4304fcad6cd4ecc3d79162a
3414 commit 1d47e28e407d1f95fdf8f799be23f48dcfa5206b
3415 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3416 Date: Fri Sep 10 07:11:11 2021 +0000
3418 upstream: Clarify which file's attributes -p preserves, and that
3420 it's specifically the file mode bits. bz#3340 from calestyo at scientia.net,
3423 OpenBSD-Commit-ID: f09e6098ed1c4be00c730873049825f8ee7cb884
3425 commit b344db7a413478e4c21e4cadba4a970ad3e6128a
3426 Author: djm@openbsd.org <djm@openbsd.org>
3427 Date: Fri Sep 10 05:46:09 2021 +0000
3429 upstream: openssh-7.4 was incorrectly listed twice; spotted by
3431 Dmitry Belyavskiy, ok dtucker@
3433 OpenBSD-Commit-ID: 4b823ae448f6e899927ce7b04225ac9e489f58ef
3435 commit 9136d6239ad7a4a293e0418a49b69e70c76d58b8
3436 Author: jmc@openbsd.org <jmc@openbsd.org>
3437 Date: Thu Sep 9 06:17:39 2021 +0000
3439 upstream: - move CAVEATS to its correct order - use the term
3441 "legacy" protocol rather than "original", as the latter made the text
3442 misleading - uppercase SCP
3446 OpenBSD-Commit-ID: 8479255746d5fa76a358ee59e7340fecf4245ff0
3448 commit 2d678c5e3bdc2f5c99f7af5122e9d054925d560d
3449 Author: David Carlier <devnexen@gmail.com>
3450 Date: Wed Sep 8 19:49:54 2021 +0100
3452 Disable tracing on FreeBSD using procctl.
3454 Placed at the start of platform_disable_tracing() to prevent declaration
3455 after code errors from strict C89 compilers (in the unlikely event that
3456 more than one method is enabled).
3458 commit 73050fa38fb36ae3326d768b574806352b97002d
3459 Author: djm@openbsd.org <djm@openbsd.org>
3460 Date: Wed Sep 8 23:31:39 2021 +0000
3462 upstream: Use the SFTP protocol by default. The original scp/rcp
3464 protocol remains available via the -O flag.
3466 Note that ~user/ prefixed paths in SFTP mode require a protocol extension
3467 that was first shipped in OpenSSH 8.7.
3469 ok deraadt, after baking in snaps for a while without incident
3471 OpenBSD-Commit-ID: 23588976e28c281ff5988da0848cb821fec9213c
3473 commit c4565e69ffa2485cff715aa842ea7a350296bfb6
3474 Author: Darren Tucker <dtucker@dtucker.net>
3475 Date: Wed Sep 8 21:09:49 2021 +1000
3477 Really fix test on OpenSSL 1.1.1 stable.
3479 commit 79f1bb5f56cef3ae9276207316345b8309248478
3480 Author: Darren Tucker <dtucker@dtucker.net>
3481 Date: Wed Sep 8 18:51:39 2021 +1000
3483 Correct OpenSSL 1.1.1 stable identifier.
3485 commit b6255593ed5ccbe5e7d3d4b26b2ad31ad4afc232
3486 Author: Darren Tucker <dtucker@dtucker.net>
3487 Date: Wed Sep 8 18:39:44 2021 +1000
3489 Increment nfds when coming from startup_pipe.
3491 If we have to increase nfds because startup_pipe[0] is above any of the
3492 descriptors passed in the fd_sets, we also need to add 1 to nfds since
3493 select takes highest FD number plus one. bz#3345 from yaroslav.kuzmin
3496 commit a3e92a6794817df6012ac8546aea19652cc91b61
3497 Author: Darren Tucker <dtucker@dtucker.net>
3498 Date: Wed Sep 8 13:45:10 2021 +1000
3500 Tests for OpenSSL 3.0.0 release & 1.1.1 branch.
3502 commit 4afe431da98ec1cf6a2933fe5658f4fd68dee9e2
3503 Author: djm@openbsd.org <djm@openbsd.org>
3504 Date: Wed Sep 8 03:23:44 2021 +0000
3506 upstream: correct my mistake in previous fix; spotted by halex
3508 OpenBSD-Commit-ID: 3cc62d92e3f70006bf02468fc146bfc36fffa183
3510 commit ca0e455b9331213ff9505a21b94c38e34faa2bba
3511 Author: djm@openbsd.org <djm@openbsd.org>
3512 Date: Tue Sep 7 06:03:51 2021 +0000
3514 upstream: avoid NULL deref in -Y find-principals. Report and fix
3516 from Carlo Marcelo Arenas Belón
3518 Content-Type: text/plain; charset=UTF-8
3519 Content-Transfer-Encoding: 8bit
3521 OpenBSD-Commit-ID: 6238486f8ecc888d6ccafcd9ad99e621bb41f1e0
3523 commit 37616807f150fb46610bbd5031c31af4857ad1e9
3524 Author: millert@openbsd.org <millert@openbsd.org>
3525 Date: Mon Sep 6 00:36:01 2021 +0000
3527 upstream: revision 1.381 neglected to remove
3529 sChallengeResponseAuthentication from the enum. Noticed by
3530 christos@zoulas.com. OK dtucker@
3532 OpenBSD-Commit-ID: b533283a4dd6d04a867da411a4c7a8fbc90e34ff
3534 commit 7acb3578cdfec0b3d34501408071f7a96c1684ea
3535 Author: Darren Tucker <dtucker@dtucker.net>
3536 Date: Sun Sep 5 20:45:42 2021 +1000
3538 Correct version_num for OpenSSL dev branch.
3540 commit 65bb01111320dfd0d25e21e1fd4d3f2b77532669
3541 Author: Darren Tucker <dtucker@dtucker.net>
3542 Date: Sun Sep 5 19:37:39 2021 +1000
3544 Test against OpenSSL 3 branch as well as dev.
3546 Now that OpenSSL development has moved to 3.1, test against the most
3547 recent version of the openssl-3.0 branch too.
3549 commit 864ed0d5e04a503b97202c776b7cf3f163f3eeaa
3550 Author: Darren Tucker <dtucker@dtucker.net>
3551 Date: Sun Sep 5 19:33:22 2021 +1000
3553 OpenSSL development is now 3.1.*
3555 commit a60209a586a928f92ab323bf23bd07f57093342e
3556 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3557 Date: Fri Sep 3 07:43:23 2021 +0000
3559 upstream: Use .Cm instead of .Dq in StrictHostKeyChecking list for
3561 consistency. Patch from scop via github PR#257, ok jmc@
3563 OpenBSD-Commit-ID: 3652a91564570779431802c31224fb4a9cf39872
3565 commit 8d1d9eb6de37331e872700e9e399a3190cca1242
3566 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3567 Date: Fri Sep 3 07:27:03 2021 +0000
3569 upstream: Mention using ssh -i for specifying the public key file
3571 in the case where the private key is loaded into ssh-agent but is not present
3572 locally. Based on patch from rafork via github PR#215, ok jmc@
3574 OpenBSD-Commit-ID: 2282e83b0ff78d2efbe705883b67240745fa5bb2
3576 commit eb4362e5e3aa7ac26138b11e44d8c191910aff64
3577 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3578 Date: Fri Sep 3 05:25:50 2021 +0000
3580 upstream: Refer to KEX "algorithms" instead of "methods" to match
3582 other references and improve consistency. Patch from scop via github PR#241,
3585 OpenBSD-Commit-ID: 840bc94ff6861b28d8603c8e8c16499bfb65e32c
3587 commit b3318946ce5725da43c4bf7eeea1b73129c47d2a
3588 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3589 Date: Fri Sep 3 05:12:25 2021 +0000
3591 upstream: Remove redundant attrib_clear in upload_dir_internal.
3593 The subsequent call to stat_to_attrib clears the struct as its first step
3594 anyway. From pmeinhardt via github PR#220, ok djm@
3596 OpenBSD-Commit-ID: f5234fc6d7425b607e179acb3383f21716f3029e
3598 commit 7cc3fe28896e653956a6a2eed0a25d551b83a029
3599 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3600 Date: Fri Sep 3 04:11:13 2021 +0000
3602 upstream: Add test for client termination status on signal.
3604 Based on patch from Alexxz via github PR#235 with some tweaks, to
3605 match patch in bz#3281.
3607 OpenBSD-Regress-ID: d87c7446fb8b5f8b45894fbbd6875df326e729e2
3609 commit 5428b0d239f6b516c81d1dd15aa9fe9e60af75d4
3610 Author: deraadt@openbsd.org <deraadt@openbsd.org>
3611 Date: Thu Sep 2 21:03:54 2021 +0000
3613 upstream: sys/param.h is not needed for any visible reason
3615 OpenBSD-Commit-ID: 8bdea2d0c75692e4c5777670ac039d4b01c1f368
3617 commit 1ff38f34b4c4545eb28106629cafa1e0496bc726
3618 Author: Shchelkunov Artem <a.shchelkunov@ideco.ru>
3619 Date: Wed Aug 11 18:07:58 2021 +0500
3621 Fix memory leak in error path.
3623 *info is allocated via xstrdup but was leaked in the PAM_AUTH_ERR path.
3626 commit cb37e2f0c0ca4fef844ed7edc5d0e3b7d0e83f6a
3627 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3628 Date: Wed Sep 1 03:16:06 2021 +0000
3630 upstream: Fix ssh-rsa fallback for old PuTTY interop tests.
3632 OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37
3634 commit 8b02ef0f28dc24cda8cbcd8b7eb02bda8f8bbe59
3635 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3636 Date: Wed Sep 1 00:50:27 2021 +0000
3638 upstream: Add a function to skip remaining tests.
3640 Many tests skip tests for various reasons but not in a consistent way and
3641 don't always clean up, so add that and switch the tests that do that over.
3643 OpenBSD-Regress-ID: 72d2ec90a3ee8849486956a808811734281af735
3645 commit d486845c07324c04240f1674ac513985bd356f66
3646 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3647 Date: Tue Aug 31 07:13:59 2021 +0000
3649 upstream: Specify path to PuTTY keys.
3651 Portable needs this and it makes no difference on OpenBSD, so resync
3652 them. (Id sync only, Portable already had this.)
3654 OpenBSD-Regress-ID: 33f6f66744455886d148527af8368811e4264162
3656 commit d22b299115e27606e846b23490746f69fdd4fb38
3657 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3658 Date: Tue Aug 31 06:13:23 2021 +0000
3660 upstream: Better compat tests with old PuTTY.
3662 When running PuTTY interop tests and using a PuTTY version older than
3663 0.76, re-enable the ssh-rsa host key algorithm (the 256 and 512 variants
3664 of RSA were added some time between 0.73 and 0.76).
3666 OpenBSD-Regress-ID: e6138d6987aa705fa1e4f216db0bb386e1ff38e1
3668 commit 87ad70d605c3e39c9b8aa275db27120d7cc09b77
3669 Author: Darren Tucker <dtucker@dtucker.net>
3670 Date: Tue Aug 31 17:04:50 2021 +1000
3672 Resync PuTTY interop tests.
3674 Resync behaviour when REGRESS_INTEROP_PUTTY is not set with OpenBSD.
3676 commit e47b82a7bf51021afac218bf59a3be121827653d
3677 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3678 Date: Tue Aug 31 01:25:27 2021 +0000
3680 upstream: Specify hostkeyalgorithms in SSHFP test.
3682 Specify host key algorithms in sshd's default set for the SSHFP test,
3683 from djm@. Make the reason for when the test is skipped a bit clearer.
3685 OpenBSD-Regress-ID: 4f923dfc761480d5411de17ea6f0b30de3e32cea
3687 commit 7db3e0a9e8477c018757b59ee955f7372c0b55fb
3688 Author: djm@openbsd.org <djm@openbsd.org>
3689 Date: Mon Aug 30 01:15:45 2021 +0000
3691 upstream: adapt to RSA/SHA1 deprectation
3693 OpenBSD-Regress-ID: 952397c39a22722880e4de9d1c50bb1a14f907bb
3695 commit 2344750250247111a6c3c6a4fe84ed583a61cc11
3696 Author: djm@openbsd.org <djm@openbsd.org>
3697 Date: Sun Aug 29 23:53:10 2021 +0000
3699 upstream: After years of forewarning, disable the RSA/SHA-1
3701 signature algorithm by default. It is feasible to create colliding SHA1
3702 hashes, so we need to deprecate its use.
3704 RSA/SHA-256/512 remains available and will be transparently selected
3705 instead of RSA/SHA1 for most SSH servers released in the last five+
3706 years. There is no need to regenerate RSA keys.
3708 The use of RSA/SHA1 can be re-enabled by adding "ssh-rsa" to the
3709 PubkeyAcceptedAlgorithms directives on the client and server.
3713 OpenBSD-Commit-ID: 189bcc4789c7254e09e23734bdd5def8354ff1d5
3715 commit 56c4455d3b54b7d481c77c82115c830b9c8ce328
3716 Author: djm@openbsd.org <djm@openbsd.org>
3717 Date: Sun Aug 29 23:44:07 2021 +0000
3719 upstream: wrap at 80 columns
3721 OpenBSD-Commit-ID: 47ca2286d6b52a9747f34da16d742879e1a37bf0
3723 commit 95401eea8503943449f712e5f3de52fc0bc612c5
3724 Author: Darren Tucker <dtucker@dtucker.net>
3725 Date: Fri Aug 20 18:14:13 2021 +1000
3727 Replace shell function with ssh-keygen -A.
3729 Prevents the init script in the SysV package from trying (and failing)
3730 to generate unsupported key types. Remove now-unused COMMENT_OUT_ECC.
3733 commit d83ec9ed995a76ed1d5c65cf10b447222ec86131
3734 Author: Darren Tucker <dtucker@dtucker.net>
3735 Date: Fri Aug 20 15:39:05 2021 +1000
3737 Remove obsolete Redhat PAM config and init script.
3739 commit e1a596186c81e65a34ce13076449712d3bf97eb4
3740 Author: Damien Miller <djm@mindrot.org>
3741 Date: Fri Aug 20 14:03:49 2021 +1000
3745 commit 5450606c8f7f7a0d70211cea78bc2dab74ab35d1
3746 Author: Damien Miller <djm@mindrot.org>
3747 Date: Fri Aug 20 13:59:43 2021 +1000
3749 update version numbers
3751 commit feee2384ab8d694c770b7750cfa76a512bdf8246
3752 Author: djm@openbsd.org <djm@openbsd.org>
3753 Date: Fri Aug 20 03:22:55 2021 +0000
3755 upstream: openssh-8.7
3757 OpenBSD-Commit-ID: 8769dff0fd76ae3193d77bf83b439adee0f300cd
3759 commit 9a2ed62173cc551b2b5f479460bb015b19499de8
3760 Author: Darren Tucker <dtucker@dtucker.net>
3761 Date: Fri Aug 20 10:48:13 2021 +1000
3763 Also check pid in pselect_notify_setup.
3767 commit deaadcb93ca15d4f38aa38fb340156077792ce87
3768 Author: Darren Tucker <dtucker@dtucker.net>
3769 Date: Fri Aug 20 08:39:33 2021 +1000
3771 Prefix pselect functions to clarify debug messages
3773 commit 10e45654cff221ca60fd35ee069df67208fcf415
3774 Author: Darren Tucker <dtucker@dtucker.net>
3775 Date: Fri Aug 20 08:30:42 2021 +1000
3777 Fix race in pselect replacement code.
3779 On the second and subsequent calls to pselect the notify_pipe was not
3780 added to the select readset, opening up a race that om G. Christensen
3781 discovered on multiprocessor Solaris <=9 systems.
3783 Also reinitialize notify_pipe if the pid changes. This will prevent a
3784 parent and child from using the same FD, although this is not an issue
3785 in the current structure it might be in future.
3787 commit 464ba22f1e38d25402e5ec79a9b8d34a32df5a3f
3788 Author: Darren Tucker <dtucker@dtucker.net>
3789 Date: Wed Aug 18 12:51:30 2021 +1000
3791 Check compiler for c99 declarations after code.
3793 The sntrup761 reference code contains c99-style declarations after code
3794 so don't try to build that if the compiler doesn't support it.
3796 commit 7d878679a4b155a359d32104ff473f789501748d
3797 Author: Darren Tucker <dtucker@dtucker.net>
3798 Date: Tue Aug 17 15:12:04 2021 +1000
3800 Remove trailing backslash on regress-unit-binaries
3802 commit b71b2508f17c68c5d9dbbe537686d81cedb9a781
3803 Author: Darren Tucker <dtucker@dtucker.net>
3804 Date: Tue Aug 17 07:59:27 2021 +1000
3806 Put stdint.h inside HAVE_STDINT_H.
3808 From Tom G. Christensen.
3810 commit 6a24567a29bd7b4ab64e1afad859ea845cbc6b8c
3811 Author: Darren Tucker <dtucker@dtucker.net>
3812 Date: Mon Aug 16 14:13:02 2021 +1000
3814 Improve github test driver script.
3816 - use a trap to always output any failed regress logs (since the script
3817 sets -e, the existing log output is never invoked).
3818 - pass LTESTS and SKIP_LTESTS when re-running with sshd options (eg.
3821 commit b467cf13705f59ed348b620722ac098fe31879b7
3822 Author: Darren Tucker <dtucker@dtucker.net>
3823 Date: Mon Aug 16 11:32:23 2021 +1000
3825 Remove deprecated ubuntu-16.04 test targets.
3827 Github has deprecated ubuntu-16.04 and it will be removed on 20
3830 commit 20e6eefcdf78394f05e453d456c1212ffaa6b6a4
3831 Author: Darren Tucker <dtucker@dtucker.net>
3832 Date: Sun Aug 15 23:25:26 2021 +1000
3834 Skip agent ptrace test on hurd.
3836 commit 7c9115bbbf958fbf85259a061c1122e2d046aabf
3837 Author: Darren Tucker <dtucker@dtucker.net>
3838 Date: Sun Aug 15 19:37:22 2021 +1000
3840 Add hurd test target.
3842 commit 7909a566f6c6a78fcd30708dc49f4e4f9bb80ce3
3843 Author: Darren Tucker <dtucker@dtucker.net>
3844 Date: Sun Aug 15 12:45:10 2021 +1000
3846 Skip scp3 tests on all dfly58 and 60 configs.
3848 commit e65198e52cb03534e8c846d1bca74c310b1526de
3849 Author: Tim Rice <tim@multitalents.net>
3850 Date: Sat Aug 14 13:08:07 2021 -0700
3852 openbsd-compat/openbsd-compat.h: put bsd-signal.h before bsd-misc.h
3853 to get sigset_t from signal.h needed for the pselect replacement.
3855 commit e50635640f79920d9375e0155cb3f4adb870eee5
3856 Author: Darren Tucker <dtucker@dtucker.net>
3857 Date: Fri Aug 13 13:21:00 2021 +1000
3859 Test OpenSSH from OpenBSD head on 6.8 and 6.9.
3861 commit e0ba38861c490c680117b7fe0a1d61a181cd00e7
3862 Author: Darren Tucker <dtucker@dtucker.net>
3863 Date: Fri Aug 13 13:00:14 2021 +1000
3865 Skip scp3 test on dragonfly 58 and 60.
3867 The tests hang, so skip until we figure them out.
3869 commit dcce2a2bcf007bf817a2fb0dce3db83fa9201e92
3870 Author: djm@openbsd.org <djm@openbsd.org>
3871 Date: Thu Aug 12 23:59:25 2021 +0000
3873 upstream: mention that CASignatureAlgorithms accepts +/- similarly to
3875 the other algorithm list directives; ok jmc bz#3335
3877 OpenBSD-Commit-ID: 0d46b53995817052c78e2dce9dbd133963b073d9
3879 commit 090a82486e5d7a8f7f16613d67e66a673a40367f
3880 Author: schwarze@openbsd.org <schwarze@openbsd.org>
3881 Date: Thu Aug 12 09:59:00 2021 +0000
3883 upstream: In the editline(3) branch of the sftp(1) event loop,
3885 handle SIGINT rather than ignoring it, such that the user can use Ctrl-C to
3886 discard the currently edited command line and get a fresh prompt, just like
3887 in ftp(1), bc(1), and in shells.
3889 It is critical to not use ssl_signal() for this particular case
3890 because that function unconditionally sets SA_RESTART, but here we
3891 need the signal to interrupt the read(2) in the el_gets(3) event loop.
3893 OK dtucker@ deraadt@
3895 OpenBSD-Commit-ID: 8025115a773f52e9bb562eaab37ea2e021cc7299
3897 commit e1371e4f58404d6411d9f95eb774b444cea06a26
3898 Author: naddy@openbsd.org <naddy@openbsd.org>
3899 Date: Wed Aug 11 14:07:54 2021 +0000
3901 upstream: scp: tweak man page and error message for -3 by default
3903 Now that the -3 option is enabled by default, flip the documentation
3904 and error message logic from "requires -3" to "blocked by -R".
3908 OpenBSD-Commit-ID: a872592118444fb3acda5267b2a8c3d4c4252020
3910 commit 49f46f6d77328a3d10a758522b670a3e8c2235e7
3911 Author: naddy@openbsd.org <naddy@openbsd.org>
3912 Date: Wed Aug 11 14:05:19 2021 +0000
3914 upstream: scp: do not spawn ssh with two -s flags for
3916 remote-to-remote copies
3918 Do not add another "-s" to the argument vector every time an SFTP
3919 connection is initiated. Instead, introduce a subsystem flag to
3920 do_cmd() and add "-s" when the flag is set.
3924 OpenBSD-Commit-ID: 25df69759f323661d31b2e1e790faa22e27966c1
3926 commit 2a2cd00783e1da45ee730b7f453408af1358ef5b
3927 Author: djm@openbsd.org <djm@openbsd.org>
3928 Date: Wed Aug 11 08:55:04 2021 +0000
3930 upstream: test -Oprint-pubkey
3932 OpenBSD-Regress-ID: 3d51afb6d1f287975fb6fddd7a2c00a3bc5094e0
3934 commit b9f4635ea5bc33ed5ebbacf332d79bae463b0f54
3935 Author: djm@openbsd.org <djm@openbsd.org>
3936 Date: Wed Aug 11 08:54:17 2021 +0000
3938 upstream: when verifying sshsig signatures, support an option
3940 (-Oprint-pubkey) to dump the full public key to stdout; based on patch from
3941 Fabian Stelzer; ok markus@
3943 OpenBSD-Commit-ID: 0598000e5b9adfb45d42afa76ff80daaa12fc3e2
3945 commit 750c1a45ba4e8ad63793d49418a0780e77947b9b
3946 Author: djm@openbsd.org <djm@openbsd.org>
3947 Date: Wed Aug 11 05:21:32 2021 +0000
3949 upstream: oops, missed one more %p
3951 OpenBSD-Commit-ID: e7e62818d1564cc5cd9086eaf7a51cbd1a9701eb
3953 commit b5aa27b69ab2e1c13ac2b5ad3f8f7d389bad7489
3954 Author: djm@openbsd.org <djm@openbsd.org>
3955 Date: Wed Aug 11 05:20:17 2021 +0000
3957 upstream: remove a bunch of %p in format strings; leftovers of
3959 debuggings past. prompted by Michael Forney, ok dtucker@
3961 OpenBSD-Commit-ID: 4853a0d6c9cecaba9ecfcc19066e52d3a8dcb2ac
3963 commit 419aa01123db5ff5dbc68b2376ef23b222862338
3964 Author: Darren Tucker <dtucker@dtucker.net>
3965 Date: Wed Aug 11 09:21:09 2021 +1000
3967 Add includes.h to compat tests.
3969 On platforms where closefrom returns void (eg glibc>=2.34) the prototype
3970 for closefrom in its compat tests would cause compile errors. Remove
3971 this and have the tests pull in the compat headers in the same way as
3972 the main code. bz#3336.
3974 commit 931f592f26239154eea3eb35a086585897b1a185
3975 Author: djm@openbsd.org <djm@openbsd.org>
3976 Date: Tue Aug 10 03:35:45 2021 +0000
3978 upstream: adapt to scp -M flag change; make scp3.sh test SFTP mode too
3980 OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0
3982 commit 391ca67fb978252c48d20c910553f803f988bd37
3983 Author: djm@openbsd.org <djm@openbsd.org>
3984 Date: Tue Aug 10 03:33:34 2021 +0000
3986 upstream: Prepare for a future where scp(1) uses the SFTP protocol by
3988 default. Replace recently added -M option to select the protocol with -O
3989 (olde) and -s (SFTP) flags, and label the -s flag with a clear warning that
3990 it will be removed in the near future (so no, don't use it in scripts!).
3992 prompted by/feedback from deraadt@
3994 OpenBSD-Commit-ID: 92ad72cc6f0023c9be9e316d8b30eb6d8d749cfc
3996 commit bfdd4b722f124a4fa9173d20dd64dd0fc69856be
3997 Author: djm@openbsd.org <djm@openbsd.org>
3998 Date: Mon Aug 9 23:56:36 2021 +0000
4000 upstream: make scp -3 the default for remote-to-remote copies. It
4002 provides a much better and more intuitive user experience and doesn't require
4003 exposing credentials to the source host.
4005 thanks naddy@ for catching the missing argument in usage()
4007 "Yes please!" - markus@
4008 "makes a lot of sense" - deraadt@
4009 "the right thing to do" - dtucker@
4011 OpenBSD-Commit-ID: d0d2af5f0965c5192ba5b2fa461c9f9b130e5dd9
4013 commit 2f7a3b51cef689ad9e93d0c6c17db5a194eb5555
4014 Author: djm@openbsd.org <djm@openbsd.org>
4015 Date: Mon Aug 9 23:49:31 2021 +0000
4017 upstream: make scp in SFTP mode try to use relative paths as much
4019 as possible. Previosuly, it would try to make relative and ~/-rooted paths
4020 absolute before requesting transfers.
4022 prompted by and much discussion deraadt@
4025 OpenBSD-Commit-ID: 46639d382ea99546a4914b545fa7b00fa1be5566
4027 commit 2ab864010e0a93c5dd95116fb5ceaf430e2fc23c
4028 Author: djm@openbsd.org <djm@openbsd.org>
4029 Date: Mon Aug 9 23:47:44 2021 +0000
4031 upstream: SFTP protocol extension to allow the server to expand
4033 ~-prefixed paths, in particular ~user ones. Allows scp in sftp mode to accept
4034 these paths, like scp in rcp mode does.
4036 prompted by and much discussion deraadt@
4039 OpenBSD-Commit-ID: 7d794def9e4de348e1e777f6030fc9bafdfff392
4041 commit 41b019ac067f1d1f7d99914d0ffee4d2a547c3d8
4042 Author: djm@openbsd.org <djm@openbsd.org>
4043 Date: Mon Aug 9 23:44:32 2021 +0000
4045 upstream: when scp is in SFTP mode, try to deal better with ~
4047 prefixed paths. ~user paths aren't supported, but ~/ paths will be accepted
4048 and prefixed with the SFTP server starting directory (more to come)
4050 prompted by and discussed with deraadt@
4053 OpenBSD-Commit-ID: 263a071f14555c045fd03132a8fb6cbd983df00d
4055 commit b4b3f3da6cdceb3fd168b5fab69d11fba73bd0ae
4056 Author: djm@openbsd.org <djm@openbsd.org>
4057 Date: Mon Aug 9 07:21:01 2021 +0000
4059 upstream: on fatal errors, make scp wait for ssh connection before
4061 exiting avoids LogLevel=verbose (or greater) messages from ssh appearing
4062 after scp has returned exited and control has returned to the shell; ok
4065 (this was originally committed as r1.223 along with unrelated stuff that
4066 I rolled back in r1.224)
4068 OpenBSD-Commit-ID: 1261fd667ad918484889ed3d7aec074f3956a74b
4070 commit 2ae7771749e0b4cecb107f9d4860bec16c3f4245
4071 Author: djm@openbsd.org <djm@openbsd.org>
4072 Date: Mon Aug 9 07:19:12 2021 +0000
4074 upstream: rever r1.223 - I accidentally committed unrelated changes
4076 OpenBSD-Commit-ID: fb73f3865b2647a27dd94db73d6589506a9625f9
4078 commit 986abe94d481a1e82a01747360bd767b96b41eda
4079 Author: djm@openbsd.org <djm@openbsd.org>
4080 Date: Mon Aug 9 07:16:09 2021 +0000
4082 upstream: show only the final path component in the progress meter;
4084 more useful with long paths (that may truncate) and better matches
4085 traditional scp behaviour; spotted by naddy@ ok deraadt@
4087 OpenBSD-Commit-ID: 26b544d0074f03ebb8a3ebce42317d8d7ee291a3
4089 commit 2b67932bb3176dee4fd447af4368789e04a82b93
4090 Author: djm@openbsd.org <djm@openbsd.org>
4091 Date: Mon Aug 9 07:13:54 2021 +0000
4093 upstream: on fatal errors, make scp wait for ssh connection before
4095 exiting avoids LogLevel=verbose (or greater) messages from ssh appearing
4096 after scp has returned exited and control has returned to the shell; ok
4099 OpenBSD-Commit-ID: ef9dab5ef5ae54a6a4c3b15d380568e94263456c
4101 commit 724eb900ace30661d45db2ba01d0f924d95ecccb
4102 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4103 Date: Sun Aug 8 08:49:09 2021 +0000
4105 upstream: xstrdup environment variable used by ForwardAgent. bz#3328
4107 from goetze at dovetail.com, ok djm@ deraadt@
4109 OpenBSD-Commit-ID: 760320dac1c3b26904284ba417a7d63fccc5e742
4111 commit 86b4cb3a884846b358305aad17a6ef53045fa41f
4112 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4113 Date: Sun Aug 8 08:27:28 2021 +0000
4115 upstream: Although it's POSIX, not all shells used in Portable support
4117 the implicit 'in "$@"' after 'for i'.
4119 OpenBSD-Regress-ID: 3c9aec6bca4868f85d2742b6ba5223fce110bdbc
4121 commit f2ccf6c9f395923695f22345e626dfd691227aaf
4122 Author: Darren Tucker <dtucker@dtucker.net>
4123 Date: Sun Aug 8 17:39:56 2021 +1000
4125 Move portable specific settings down.
4127 This brings the top hunk of the file back in sync with OpenBSD
4128 so patches to the CVS Id should apply instead of always being
4131 commit 71b0eb997e220b0fc9331635af409ad84979f2af
4132 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4133 Date: Sun Aug 8 07:27:52 2021 +0000
4135 upstream: Move setting of USER further down the startup In portable
4137 we have to change this and having it in the same hunk as the CVS Id string
4138 means applying changes fails every. single. time.
4140 OpenBSD-Regress-ID: 87cd603eb6db58c9b430bf90adacb7f90864429b
4142 commit f0aca2706c710a0da1a4be705f825a807cd15400
4143 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4144 Date: Sun Aug 8 06:38:33 2021 +0000
4146 upstream: Drop -q in ssh-log-wrapper.sh to preserve logs.
4148 scp and sftp like to add -q to the command line passed to ssh which
4149 overrides the LogLevel we set in the config files and suppresses output
4150 to the debug logs so drop any "-q" from the invoked ssh. In the one
4151 case where we actually want to use -q in the banner test, call the ssh
4152 binary directly bypassing the logging wrapper.
4154 OpenBSD-Regress-ID: e2c97d3c964bda33a751374c56f65cdb29755b75
4156 commit cf27810a649c5cfae60f8ce66eeb25caa53b13bc
4157 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4158 Date: Sat Aug 7 01:57:08 2021 +0000
4160 upstream: Fix prototype mismatch for do_cmd. ok djm@
4162 OpenBSD-Commit-ID: 1c1598bb5237a7ae0be99152f185e0071163714d
4164 commit 85de69f64665245786e28c81ab01fe18b0e2a149
4165 Author: djm@openbsd.org <djm@openbsd.org>
4166 Date: Sat Aug 7 01:55:01 2021 +0000
4168 upstream: sftp-client.c needs poll.h
4170 remove unused variable
4172 OpenBSD-Commit-ID: 233ac6c012cd23af62f237167a661db391055a16
4174 commit 397c4d72e50023af5fe3aee5cc2ad407a6eb1073
4175 Author: Darren Tucker <dtucker@dtucker.net>
4176 Date: Sat Aug 7 11:30:57 2021 +1000
4178 Include poll.h and friends for struct pollfd.
4180 commit a9e2c533195f28627f205682482d9da384c4c52e
4181 Author: djm@openbsd.org <djm@openbsd.org>
4182 Date: Sat Aug 7 00:14:17 2021 +0000
4184 upstream: do_upload() used a near-identical structure for
4186 tracking expected status replies from the server to what do_download() was
4189 Refactor it to use the same structure and factor out some common
4190 code into helper functions.
4192 OpenBSD-Commit-ID: 0c167df8ab6df4a5292c32421922b0cf379e9054
4194 commit 7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee
4195 Author: djm@openbsd.org <djm@openbsd.org>
4196 Date: Sat Aug 7 00:12:09 2021 +0000
4198 upstream: make scp(1) in SFTP mode follow symlinks like
4200 traditional scp(1) ok markus@
4202 OpenBSD-Commit-ID: 97255e55be37e8e26605e4ba1e69f9781765d231
4204 commit 133b44e500422df68c9c25c3b6de35c0263132f1
4205 Author: djm@openbsd.org <djm@openbsd.org>
4206 Date: Sat Aug 7 00:10:49 2021 +0000
4208 upstream: fix incorrect directory permissions on scp -3
4210 transfers; ok markus@
4212 OpenBSD-Commit-ID: 64b2abaa5635a2be65ee2e77688ad9bcebf576c2
4214 commit 98b59244ca10e62ff67a420856770cb700164f59
4215 Author: djm@openbsd.org <djm@openbsd.org>
4216 Date: Sat Aug 7 00:09:57 2021 +0000
4218 upstream: a bit more debugging of file attributes being
4220 sent/received over the wire
4222 OpenBSD-Commit-ID: f68c4e207b08ef95200a8b2de499d422808e089b
4224 commit c677e65365d6f460c084e41e0c4807bb8a9cf601
4225 Author: djm@openbsd.org <djm@openbsd.org>
4226 Date: Sat Aug 7 00:08:52 2021 +0000
4228 upstream: make scp(1) in SFTP mode output better match original
4230 scp(1) by suppressing "Retrieving [path]" lines that were emitted to support
4231 the interactive sftp(1) client. ok markus@
4233 OpenBSD-Commit-ID: 06be293df5f156a18f366079be2f33fa68001acc
4235 commit 48cd39b7a4e5e7c25101c6d1179f98fe544835cd
4236 Author: djm@openbsd.org <djm@openbsd.org>
4237 Date: Sat Aug 7 00:07:18 2021 +0000
4239 upstream: factor out a structure duplicated between downloading
4241 and crossloading; ok markus@
4243 OpenBSD-Commit-ID: 96eede24d520569232086a129febe342e4765d39
4245 commit 318c06bb04ee21a0cfa6b6022a201eacaa53f388
4246 Author: djm@openbsd.org <djm@openbsd.org>
4247 Date: Sat Aug 7 00:06:30 2021 +0000
4249 upstream: use sftp_client crossloading to implement scp -3
4253 OpenBSD-Commit-ID: 7db4c0086cfc12afc9cfb71d4c2fd3c7e9416ee9
4255 commit de7115b373ba0be3861c65de9b606a3e0e9d29a3
4256 Author: djm@openbsd.org <djm@openbsd.org>
4257 Date: Sat Aug 7 00:02:41 2021 +0000
4259 upstream: support for "cross"-loading files/directories, i.e.
4261 downloading from one SFTP server while simultaneously uploading to another.
4263 feedback & ok markus@
4265 OpenBSD-Commit-ID: 3982878e29d8df0fa4ddc502f5ff6126ac714235
4267 commit a50bd0367ff2063bbc70a387740a2aa6914de094
4268 Author: djm@openbsd.org <djm@openbsd.org>
4269 Date: Sat Aug 7 00:01:29 2021 +0000
4271 upstream: factor our SSH2_FXP_OPEN calls into their own function;
4273 "looks fine" markus@
4275 OpenBSD-Commit-ID: d3dea2153f08855c6d9dacc01973248944adeffb
4277 commit e3c0ba05873cf3d3f7d19d595667a251026b2d84
4278 Author: djm@openbsd.org <djm@openbsd.org>
4279 Date: Sat Aug 7 00:00:33 2021 +0000
4281 upstream: prepare for scp -3 implemented via sftp
4283 OpenBSD-Commit-ID: 194aac0dd87cb175334b71c2a30623a5ad55bb44
4285 commit 395d8fbdb094497211e1461cf0e2f80af5617e0a
4286 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4287 Date: Fri Aug 6 09:00:18 2021 +0000
4289 upstream: Make diff invocation more portable.
4291 POSIX does not require diff to have -N, so compare in both directions
4292 with just -r, which should catch missing files in either directory.
4294 OpenBSD-Regress-ID: 0e2ec8594556a6f369ed5a0a90c6806419b845f7
4296 commit d247a73ce27b460138599648d9c637c6f2b77605
4297 Author: djm@openbsd.org <djm@openbsd.org>
4298 Date: Wed Aug 4 21:28:00 2021 +0000
4300 upstream: regression test for scp -3
4302 OpenBSD-Regress-ID: b44375d125c827754a1f722ec6b6b75b634de05d
4304 commit 35c8e41a6f6d8ad76f8d1cd81ac2ea23d0d993b2
4305 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4306 Date: Fri Aug 6 05:04:42 2021 +0000
4308 upstream: Document "ProxyJump none". bz#3334.
4310 OpenBSD-Commit-ID: f78cc6f55731f2cd35c3a41d5352ac1ee419eba7
4312 commit 911ec6411821bda535d09778df7503b92f0eafab
4313 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4314 Date: Wed Aug 4 01:34:55 2021 +0000
4316 upstream: Allow for different (but POSIX compliant) behaviour of
4318 basename(3) and prevent a use-after-free in that case in the new sftp-compat
4321 POSIX allows basename(3) to either return a pointer to static storage
4322 or modify the passed string and return a pointer to that. OpenBSD does
4323 the former and works as is, but on other platforms "filename" points
4324 into "tmp" which was just freed. This makes the freeing of tmp
4325 consistent with the other variable in the loop.
4327 Pinpointed by the -portable Valgrind regress test. ok djm@ deraadt@
4329 OpenBSD-Commit-ID: 750f3c19bd4440e4210e30dd5d7367386e833374
4331 commit 6df1fecb5d3e51f3a8027a74885c3a44f6cbfcbd
4332 Author: Damien Miller <djm@mindrot.org>
4333 Date: Wed Aug 4 11:05:11 2021 +1000
4335 use openbsd-compat glob.h is required
4337 commit 9ebd1828881dfc9014a344587934a5ce7db6fa1b
4338 Author: Darren Tucker <dtucker@dtucker.net>
4339 Date: Tue Aug 3 21:03:23 2021 +1000
4341 Missing space between macro arg and punctuation.
4345 commit 0fd3f62eddc7cf54dcc9053be6f58998f3eb926a
4346 Author: Darren Tucker <dtucker@dtucker.net>
4347 Date: Tue Aug 3 21:02:33 2021 +1000
4349 Avoid lines >80 chars. From jmc@
4351 commit af5d8094d8b755e1daaf2e20ff1dc252800b4c9b
4352 Author: djm@openbsd.org <djm@openbsd.org>
4353 Date: Tue Aug 3 01:05:24 2021 +0000
4355 upstream: regression tests for scp SFTP protocol support; mostly by
4357 Jakub Jelen in GHPR#194 ok markus
4359 OpenBSD-Regress-ID: 36f1458525bcb111741ec8547eaf58b13cddc715
4361 commit e4673b7f67ae7740131a4ecea29a846593049a91
4362 Author: anton@openbsd.org <anton@openbsd.org>
4363 Date: Thu Jul 29 15:34:09 2021 +0000
4365 upstream: Treat doas with arguments as a valid SUDO variable.
4367 Allows one to specify SUDO="doas -n" which I do while running make regress.
4371 OpenBSD-Regress-ID: 4fe5814b5010dbf0885500d703bea06048d11005
4373 commit 197e29f1cca190d767c4b2b63a662f9a9e5da0b3
4374 Author: djm@openbsd.org <djm@openbsd.org>
4375 Date: Mon Aug 2 23:38:27 2021 +0000
4377 upstream: support for using the SFTP protocol for file transfers in
4379 scp, via a new "-M sftp" option. Marked as experimental for now.
4381 Some corner-cases exist, in particular there is no attempt to
4382 provide bug-compatibility with scp's weird "double shell" quoting
4385 Mostly by Jakub Jelen in GHPR#194 with some tweaks by me. ok markus@
4386 Thanks jmc@ for improving the scp.1 bits.
4388 OpenBSD-Commit-ID: 6ce4c9157ff17b650ace571c9f7793d92874051c
4390 commit dd533c7ab79d61a7796b77b64bd81b098e0d7f9f
4391 Author: jmc@openbsd.org <jmc@openbsd.org>
4392 Date: Fri Jul 30 14:28:13 2021 +0000
4394 upstream: fix a formatting error and add some Xr; from debian at
4398 removed references to rlogin etc. as no longer relevant;
4403 OpenBSD-Commit-ID: 3c431c303068d3aec5bb18573a0bd5e0cd77c5ae
4405 commit c7cd347a8823819411222c1e10a0d26747d0fd5c
4406 Author: jmc@openbsd.org <jmc@openbsd.org>
4407 Date: Fri Jul 30 14:25:01 2021 +0000
4409 upstream: fix a formatting error and mark up known_hosts
4411 consistently; issues reported by debian at helgefjell de
4415 OpenBSD-Commit-ID: a1fd8d21dc77f507685443832df0c9700481b0ce
4417 commit 4455aec2e4fc90f64ae4fc47e78ebc9c18721738
4418 Author: jmc@openbsd.org <jmc@openbsd.org>
4419 Date: Wed Jul 28 05:57:42 2021 +0000
4421 upstream: no need to talk about version 2 with the -Q option, so
4423 rewrite the text to read better;
4425 issue reported by debian at helgefjell de
4428 OpenBSD-Commit-ID: 59fe2e8219c37906740ad062e0fdaea487dbe9cf
4430 commit bec429338e9b30d2c7668060e82608286a8a4777
4431 Author: jmc@openbsd.org <jmc@openbsd.org>
4432 Date: Tue Jul 27 14:28:46 2021 +0000
4434 upstream: word fix; reported by debian at helgefjell de
4436 OpenBSD-Commit-ID: 0c6fd22142422a25343c5bd1a618f31618f41ece
4438 commit efad4deb5a1f1cf79ebefd63c6625059060bfbe1
4439 Author: jmc@openbsd.org <jmc@openbsd.org>
4440 Date: Tue Jul 27 14:14:25 2021 +0000
4442 upstream: standardise the grammar in the options list; issue
4444 reported by debian at helgefjell de
4448 OpenBSD-Commit-ID: 7ac15575045d82f4b205a42cc7d5207fe4c3f8e6
4450 commit 1e11fb24066f3fc259ee30db3dbb2a3127e05956
4451 Author: Darren Tucker <dtucker@dtucker.net>
4452 Date: Mon Aug 2 18:56:29 2021 +1000
4454 Check for RLIMIT_NOFILE before trying to use it.
4456 commit 0f494236b49fb48c1ef33669f14822ca4f3ce2f4
4457 Author: Darren Tucker <dtucker@dtucker.net>
4458 Date: Tue Jul 27 17:45:34 2021 +1000
4460 lastenv is only used in setenv.
4462 Prevents an unused variable warning on platforms that have setenv but
4465 commit a1f78e08bdb3eaa88603ba3c6e01de7c8671e28a
4466 Author: Darren Tucker <dtucker@dtucker.net>
4467 Date: Mon Jul 26 12:45:30 2021 +1000
4469 Move SUDO to "make test" command line.
4471 Environment variables don't get passed by vmrun, so move to command
4474 commit 02e624273b9c78a49a01239159b8c09b8409b1a0
4475 Author: Darren Tucker <dtucker@dtucker.net>
4476 Date: Sun Jul 25 23:26:36 2021 +1000
4478 Set SUDO for tests and cleanup.
4480 commit 460ae5d93051bab70239ad823dd784822d58baad
4481 Author: Darren Tucker <dtucker@dtucker.net>
4482 Date: Sun Jul 25 22:37:55 2021 +1000
4484 Pass OPENSSL=no to make tests too.
4486 commit b398f499c68d74ebe3298b73757cf3f36e14e0cb
4487 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4488 Date: Sun Jul 25 12:27:37 2021 +0000
4490 upstream: Skip unit and makefile-based key conversion tests when
4492 we're building with OPENSSL=no.
4494 OpenBSD-Regress-ID: 20455ed9a977c93f846059d1fcb48e29e2c8d732
4496 commit 727ce36c8c5941bde99216d27109405907caae4f
4497 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4498 Date: Sun Jul 25 12:13:03 2021 +0000
4500 upstream: Replace OPENSSL as the variable that points to the
4502 openssl binary with OPENSSL_BIN. This will allow us to use the OPENSSL
4503 variable from mk.conf or the make(1) command line indicating if we're
4504 building with our without OpenSSL, and ultimately get the regress tests
4505 working in the OPENSSL=no configuration.
4507 OpenBSD-Regress-ID: 2d788fade3264d7803e5b54cae8875963f688c4e
4509 commit 55e17101a9075f6a63af724261c5744809dcb95c
4510 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4511 Date: Sat Jul 24 02:57:28 2021 +0000
4513 upstream: Skip RFC4716 format import and export tests when built
4517 OpenBSD-Regress-ID: d2c2d5d38c1acc2b88cc99cfe00a2eb8bb39dfa4
4519 commit f5ccb5895d39cd627ad9e7b2c671d2587616100d
4520 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4521 Date: Sat Jul 24 02:51:14 2021 +0000
4523 upstream: Don't omit ssh-keygen -y from usage when built without
4525 OpenSSL. It is actually available, albeit only for ed25519 keys.
4527 OpenBSD-Commit-ID: 7a254c33d0e6a55c30c6b016a8d298d3cb7a7674
4529 commit 819d57ac23469f1f03baa8feb38ddefbada90fdc
4530 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4531 Date: Sat Jul 24 02:08:13 2021 +0000
4533 upstream: Exclude key conversion options from usage when built
4535 without OpenSSL since those are not available, similar to what we currently
4536 do with the moduli screening options. We can also use this to skip the
4537 conversion regression tests in this case.
4539 OpenBSD-Commit-ID: 3c82caa398cf99cd4518c23bba5a2fc66b16bafe
4541 commit b6673b1d2ee90b4690ee84f634efe40225423c38
4542 Author: Darren Tucker <dtucker@dtucker.net>
4543 Date: Sat Jul 24 13:02:51 2021 +1000
4545 Test OpenBSD upstream with and without OpenSSL.
4547 commit 9d38074b5453c1abbdf888e80828c278d3b886ac
4548 Author: djm@openbsd.org <djm@openbsd.org>
4549 Date: Sat Jul 24 01:54:23 2021 +0000
4551 upstream: test for first-match-wins in authorized_keys environment=
4555 OpenBSD-Regress-ID: 1517c90276fe84b5dc5821c59f88877fcc34c0e8
4557 commit 2b76f1dd19787e784711ea297ad8fc938b4484fd
4558 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4559 Date: Fri Jul 23 05:53:02 2021 +0000
4561 upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly.
4563 OpenBSD-Regress-ID: cdbe408ec3671ea9ee9b55651ee551370d2a4108
4565 commit 7d64a9fb587ba9592f027f7a2264226c713d6579
4566 Author: djm@openbsd.org <djm@openbsd.org>
4567 Date: Sat Jul 24 01:55:19 2021 +0000
4569 upstream: don't leak environment= variable when it is not the first
4573 OpenBSD-Commit-ID: 7fbdc3dfe0032deaf003fd937eeb4d434ee4efe0
4575 commit db2130e2340bf923e41c791aa9cd27b9e926042c
4576 Author: jmc@openbsd.org <jmc@openbsd.org>
4577 Date: Fri Jul 23 06:01:17 2021 +0000
4579 upstream: punctuation;
4581 OpenBSD-Commit-ID: 64be152e378c45975073ab1c07e0db7eddd15806
4583 commit 03190d10980c6fc9124e988cb2df13101f266507
4584 Author: djm@openbsd.org <djm@openbsd.org>
4585 Date: Fri Jul 23 05:56:47 2021 +0000
4587 upstream: mention in comment that read_passphrase(..., RP_ALLOW_STDIN)
4589 will try to use askpass first. bz3314
4591 convert a couple of debug() -> debug_f() while here
4593 OpenBSD-Commit-ID: c7e812aebc28fcc5db06d4710e0f73613dee545c
4595 commit 1653ece6832b2b304d46866b262d5f69880a9ec7
4596 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4597 Date: Fri Jul 23 05:07:16 2021 +0000
4599 upstream: Test conversion of ed25519 and ecdsa keys too.
4601 OpenBSD-Regress-ID: 3676d2d00e58e0d6d37f2878f108cc2b83bbe4bb
4603 commit 8b7af02dcf9d2b738787efd27da7ffda9859bed2
4604 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4605 Date: Fri Jul 23 04:56:21 2021 +0000
4607 upstream: Add test for exporting pubkey from a passphrase-protected
4611 OpenBSD-Regress-ID: da99d93e7b235fbd5b5aaa01efc411225e6ba8ac
4613 commit 441095d4a3e5048fe3c87a6c5db5bc3383d767fb
4614 Author: djm@openbsd.org <djm@openbsd.org>
4615 Date: Fri Jul 23 03:54:55 2021 +0000
4617 upstream: regression test for time-limited signature keys
4619 OpenBSD-Regress-ID: 2a6f3bd900dbee0a3c96f1ff23e032c93ab392bc
4621 commit 9e1882ef6489a7dd16b6d7794af96629cae61a53
4622 Author: djm@openbsd.org <djm@openbsd.org>
4623 Date: Fri Jul 23 05:24:02 2021 +0000
4625 upstream: note successful authentication method in final "Authenticated
4627 to ..." message and partial auth success messages (all at LogLevel=verbose)
4630 OpenBSD-Commit-ID: 06834b89ceb89f8f16c5321d368a66c08f441984
4632 commit a917e973a1b90b40ff1e950df083364b48fc6c78
4633 Author: djm@openbsd.org <djm@openbsd.org>
4634 Date: Fri Jul 23 04:04:52 2021 +0000
4636 upstream: Add a ForkAfterAuthentication ssh_config(5) counterpart
4638 to the ssh(1) -f flag. Last part of GHPR231 from Volker Diels-Grabsch. ok
4641 OpenBSD-Commit-ID: b18aeda12efdebe2093d55263c90fe4ea0bce0d3
4643 commit e0c5088f1c96a145eb6ea1dee438010da78f9ef5
4644 Author: djm@openbsd.org <djm@openbsd.org>
4645 Date: Fri Jul 23 04:00:59 2021 +0000
4647 upstream: Add a StdinNull directive to ssh_config(5) that allows
4649 the config file to do the same thing as -n does on the ssh(1) commandline.
4650 Patch from Volker Diels-Grabsch via GHPR231; ok dtucker
4652 OpenBSD-Commit-ID: 66ddf3f15c76796d4dcd22ff464aed1edd62468e
4654 commit e3957e21ffdc119d6d04c0b1686f8e2fe052f5ea
4655 Author: djm@openbsd.org <djm@openbsd.org>
4656 Date: Fri Jul 23 03:57:20 2021 +0000
4658 upstream: make authorized_keys environment="..." directives
4660 first-match-wins and more strictly limit their maximum number; prompted by
4661 OOM reported by OSS-fuzz (35470).
4663 feedback and ok dtucker@
4665 OpenBSD-Commit-ID: 01f63fc10dcd995e7aed9c378ad879161af83121
4667 commit d0bb1ce731762c55acb95817df4d5fab526c7ecd
4668 Author: djm@openbsd.org <djm@openbsd.org>
4669 Date: Fri Jul 23 03:37:52 2021 +0000
4671 upstream: Let allowed signers files used by ssh-keygen(1)
4673 signatures support key lifetimes, and allow the verification mode to specify
4674 a signature time to check at. This is intended for use by git to support
4675 signing objects using ssh keys. ok dtucker@
4677 OpenBSD-Commit-ID: 3e2c67b7dcd94f0610194d1e8e4907829a40cf31
4679 commit 44142068dc7ef783d135e91ff954e754d2ed432e
4680 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4681 Date: Mon Jul 19 08:48:33 2021 +0000
4683 upstream: Use SUDO when setting up hostkey.
4685 OpenBSD-Regress-ID: 990cf4481cab8dad62e90818a9b4b36c533851a7
4687 commit 6b67f3f1d1d187597e54a139cc7785c0acebd9a2
4688 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4689 Date: Mon Jul 19 05:08:54 2021 +0000
4691 upstream: Increase time margin for rekey tests. Should help
4693 reliability on very heavily loaded hosts.
4695 OpenBSD-Regress-ID: 4c28a0fce3ea89ebde441d7091464176e9730533
4697 commit 7953e1bfce9e76bec41c1331a29bc6cff9d416b8
4698 Author: Darren Tucker <dtucker@dtucker.net>
4699 Date: Mon Jul 19 13:47:51 2021 +1000
4701 Add sshfp-connect.sh file missed in previous.
4703 commit b75a80fa8369864916d4c93a50576155cad4df03
4704 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4705 Date: Mon Jul 19 03:13:28 2021 +0000
4707 upstream: Ensure that all returned SSHFP records for the specified host
4709 name and hostkey type match instead of only one. While there, simplify the
4710 code somewhat and add some debugging. Based on discussion in bz#3322, ok
4713 OpenBSD-Commit-ID: 0a6a0a476eb7f9dfe8fe2c05a1a395e3e9b22ee4
4715 commit 1cc1fd095393663cd72ddac927d82c6384c622ba
4716 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4717 Date: Mon Jul 19 02:21:50 2021 +0000
4719 upstream: Id sync only, -portable already has this.
4721 Put dh_set_moduli_file call inside ifdef WITH_OPENSSL. Fixes
4722 build with OPENSSL=no.
4724 OpenBSD-Commit-ID: af54abbebfb12bcde6219a44d544e18204defb15
4726 commit 33abbe2f4153f5ca5c874582f6a7cc91ae167485
4727 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4728 Date: Mon Jul 19 02:46:34 2021 +0000
4730 upstream: Add test for host key verification via SSHFP records. This
4732 requires some external setup to operate so is disabled by default (see
4733 comments in sshfp-connect.sh).
4735 OpenBSD-Regress-ID: c52c461bd1df3a803d17498917d156ef64512fd9
4737 commit f0cd000d8e3afeb0416dce1c711c3d7c28d89bdd
4738 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4739 Date: Mon Jul 19 02:29:28 2021 +0000
4741 upstream: Add ed25519 key and test SSHFP export of it. Only test
4743 RSA SSHFP export if we have RSA functionality compiled in.
4745 OpenBSD-Regress-ID: b4ff5181b8c9a5862e7f0ecdd96108622333a9af
4747 commit 0075511e27e5394faa28edca02bfbf13b9a6693e
4748 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4749 Date: Mon Jul 19 00:16:26 2021 +0000
4751 upstream: Group keygen tests together.
4753 OpenBSD-Regress-ID: 07e2d25c527bb44f03b7c329d893a1f2d6c5c40c
4755 commit 034828820c7e62652e7c48f9ee6b67fb7ba6fa26
4756 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4757 Date: Sun Jul 18 23:10:10 2021 +0000
4759 upstream: Add test for ssh-keygen printing of SSHFP records.
4761 OpenBSD-Regress-ID: fde9566b56eeb980e149bbe157a884838507c46b
4763 commit 52c3b6985ef1d5dadb4c4fe212f8b3a78ca96812
4764 Author: djm@openbsd.org <djm@openbsd.org>
4765 Date: Sat Jul 17 00:38:11 2021 +0000
4767 upstream: wrap some long lines
4769 OpenBSD-Commit-ID: 4f5186b1466656762dae37d3e569438d900c350d
4771 commit 43ec991a782791d0b3f42898cd789f99a07bfaa4
4772 Author: djm@openbsd.org <djm@openbsd.org>
4773 Date: Sat Jul 17 00:36:53 2021 +0000
4775 upstream: fix sftp on ControlPersist connections, broken by recent
4777 SessionType change; spotted by sthen@
4779 OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234
4781 commit 073f45c236550f158c9a94003e4611c07dea5279
4782 Author: djm@openbsd.org <djm@openbsd.org>
4783 Date: Fri Jul 16 09:00:23 2021 +0000
4785 upstream: Explicitly check for and start time-based rekeying in the
4787 client and server mainloops.
4789 Previously the rekey timeout could expire but rekeying would not start
4790 until a packet was sent or received. This could cause us to spin in
4791 select() on the rekey timeout if the connection was quiet.
4795 OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987
4797 commit ef7c4e52d5d840607f9ca3a302a4cbb81053eccf
4798 Author: jmc@openbsd.org <jmc@openbsd.org>
4799 Date: Wed Jul 14 06:46:38 2021 +0000
4801 upstream: reorder SessionType; ok djm
4803 OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c
4805 commit 8aa2f9aeb56506dca996d68ab90ab9c0bebd7ec3
4806 Author: Darren Tucker <dtucker@dtucker.net>
4807 Date: Wed Jul 14 11:26:50 2021 +1000
4809 Make whitespace consistent.
4811 commit 4f4297ee9b8a39f4dfd243a74c5f51f9e7a05723
4812 Author: Darren Tucker <dtucker@dtucker.net>
4813 Date: Wed Jul 14 11:26:12 2021 +1000
4815 Add ARM64 Linux self-hosted runner.
4817 commit eda8909d1b0a85b9c3804a04d03ec6738fd9dc7f
4818 Author: djm@openbsd.org <djm@openbsd.org>
4819 Date: Tue Jul 13 23:48:36 2021 +0000
4821 upstream: add a SessionType directive to ssh_config, allowing the
4823 configuration file to offer equivalent control to the -N (no session) and -s
4824 (subsystem) command-line flags.
4826 Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks;
4827 feedback and ok dtucker@
4829 OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12
4831 commit 7ae69f2628e338ba6e0eae7ee8a63bcf8fea7538
4832 Author: djm@openbsd.org <djm@openbsd.org>
4833 Date: Mon Jul 12 02:12:22 2021 +0000
4835 upstream: fix some broken tests; clean up output
4837 OpenBSD-Regress-ID: 1d5038edb511dc4ce1622344c1e724626a253566
4839 commit f5fc6a4c3404bbf65c21ca6361853b33d78aa87e
4840 Author: Darren Tucker <dtucker@dtucker.net>
4841 Date: Mon Jul 12 18:00:05 2021 +1000
4843 Add configure-time detection for SSH_TIME_T_MAX.
4845 Should fix printing cert times exceeding INT_MAX (bz#3329) on platforms
4846 were time_t is a long long. The limit used is for the signed type, so if
4847 some system has a 32bit unsigned time_t then the lower limit will still
4848 be imposed and we would need to add some way to detect this. Anyone using
4849 an unsigned 64bit can let us know when it starts being a problem.
4851 commit fd2d06ae4442820429d634c0a8bae11c8e40c174
4852 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4853 Date: Mon Jul 12 06:22:57 2021 +0000
4855 upstream: Make limit for time_t test unconditional in the
4857 format_absolute_time fix for bz#3329 that allows printing of timestamps past
4858 INT_MAX. This was incorrectly included with the previous commit. Based on
4859 discussion with djm@.
4861 OpenBSD-Commit-ID: 835936f6837c86504b07cabb596b613600cf0f6e
4863 commit 6c29b387cd64a57b0ec8ae7d2c8d02789d88fcc3
4864 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4865 Date: Mon Jul 12 06:08:57 2021 +0000
4867 upstream: Use existing format_absolute_time() function when
4869 printing cert validity instead of doing it inline. Part of bz#3329.
4871 OpenBSD-Commit-ID: a13d4e3c4f59644c23745eb02a09b2a4e717c00c
4873 commit 99981d5f8bfa383791afea03f6bce8454e96e323
4874 Author: djm@openbsd.org <djm@openbsd.org>
4875 Date: Fri Jul 9 09:55:56 2021 +0000
4877 upstream: silence redundant error message; reported by Fabian Stelzer
4879 OpenBSD-Commit-ID: 9349a703016579a60557dafd03af2fe1d44e6aa2
4881 commit e86097813419b49d5bff5c4b51d1c3a5d4d2d804
4882 Author: John Ericson <John.Ericson@Obsidian.Systems>
4883 Date: Sat Dec 26 11:40:49 2020 -0500
4885 Re-indent krb5 section after pkg-config addition.
4887 commit 32dd2daa56c294e40ff7efea482c9eac536d8cbb
4888 Author: John Ericson <John.Ericson@Obsidian.Systems>
4889 Date: Sat Dec 26 11:40:49 2020 -0500
4891 Support finding Kerberos via pkg-config
4893 This makes cross compilation easier.
4895 commit def7a72234d7e4f684d72d33a0f7229f9eee0aa4
4896 Author: Darren Tucker <dtucker@dtucker.net>
4897 Date: Fri Jul 9 14:34:06 2021 +1000
4899 Update comments about EGD to include prngd.
4901 commit b5d23150b4e3368f4983fd169d432c07afeee45a
4902 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4903 Date: Mon Jul 5 01:21:07 2021 +0000
4905 upstream: Fix a couple of whitespace things. Portable already has
4907 these so this removes two diffs between the two.
4909 OpenBSD-Commit-ID: 769f017ebafd8e741e337b3e9e89eb5ac73c9c56
4911 commit 8f57be9f279b8e905f9883066aa633c7e67b31cf
4912 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4913 Date: Mon Jul 5 01:16:46 2021 +0000
4915 upstream: Order includes as per style(9). Portable already has
4917 these so this removes a handful of diffs between the two.
4919 OpenBSD-Commit-ID: 8bd7452d809b199c19bfc49511a798f414eb4a77
4921 commit b75624f8733b3ed9e240f86cac5d4a39dae11848
4922 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4923 Date: Mon Jul 5 00:50:25 2021 +0000
4925 upstream: Remove comment referencing now-removed
4927 RhostsRSAAuthentication. ok djm@
4929 OpenBSD-Commit-ID: 3d864bfbd99a1d4429a58e301688f3be464827a9
4931 commit b67eb12f013c5441bb4f0893a97533582ad4eb13
4932 Author: djm@openbsd.org <djm@openbsd.org>
4933 Date: Mon Jul 5 00:25:42 2021 +0000
4935 upstream: allow spaces to appear in usernames for local to remote,
4937 and scp -3 remote to remote copies. with & ok dtucker bz#1164
4939 OpenBSD-Commit-ID: e9b550f3a85ffbb079b6720833da31317901d6dd
4941 commit 8c4ef0943e574f614fc7c6c7e427fd81ee64ab87
4942 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4943 Date: Fri Jul 2 07:20:44 2021 +0000
4945 upstream: Remove obsolete comments about SSHv1 auth methods. ok
4949 OpenBSD-Commit-ID: 6060f70966f362d8eb4bec3da2f6c4712fbfb98f
4951 commit 88908c9b61bcb99f16e8d398fc41e2b3b4be2003
4952 Author: Darren Tucker <dtucker@dtucker.net>
4953 Date: Sat Jul 3 23:00:19 2021 +1000
4955 Remove reference to ChallengeResponse.
4957 challenge_response_authentication was removed from the struct, keeping
4958 kbd_interactive_authentication.
4960 commit 321874416d610ad2158ce6112f094a4862c2e37f
4961 Author: Darren Tucker <dtucker@dtucker.net>
4962 Date: Sat Jul 3 20:38:09 2021 +1000
4964 Move signal.h up include order to match upstream.
4966 commit 4fa83e2d0e32c2dd758653e0359984bbf1334f32
4967 Author: Darren Tucker <dtucker@dtucker.net>
4968 Date: Sat Jul 3 20:36:06 2021 +1000
4970 Remove old OpenBSD version marker.
4972 Looks like an accidental leftover from a sync.
4974 commit 9d5e31f55d5f3899b72645bac41a932d298ad73b
4975 Author: Darren Tucker <dtucker@dtucker.net>
4976 Date: Sat Jul 3 20:34:19 2021 +1000
4978 Remove duplicate error on error path.
4980 There's an extra error() call on the listen error path, it looks like
4981 its removal was missed during an upstream sync.
4983 commit 888c459925c7478ce22ff206c9ac1fb812a40caf
4984 Author: Darren Tucker <dtucker@dtucker.net>
4985 Date: Sat Jul 3 20:32:46 2021 +1000
4987 Remove some whitespace not in upstream.
4989 Reduces diff vs OpenBSD by a small amount.
4991 commit 4d2d4d47a18d93f3e0a91a241a6fdb545bbf7dc2
4992 Author: Darren Tucker <dtucker@dtucker.net>
4993 Date: Sat Jul 3 19:27:43 2021 +1000
4995 Replace remaining references to ChallengeResponse.
4997 Portable had a few additional references to ChallengeResponse related to
4998 UsePAM, replaces these with equivalent keyboard-interactive ones.
5000 commit 53237ac789183946dac6dcb8838bc3b6b9b43be1
5001 Author: Darren Tucker <dtucker@dtucker.net>
5002 Date: Sat Jul 3 19:23:28 2021 +1000
5004 Sync remaining ChallengeResponse removal.
5006 These were omitted from commit 88868fd131.
5008 commit 2c9e4b319f7e98744b188b0f58859d431def343b
5009 Author: Darren Tucker <dtucker@dtucker.net>
5010 Date: Sat Jul 3 19:17:31 2021 +1000
5012 Disable rocky84 to figure out why agent test fails
5014 commit bfe19197a92b7916f64a121fbd3c179abf15e218
5015 Author: Darren Tucker <dtucker@dtucker.net>
5016 Date: Fri Jul 2 15:43:28 2021 +1000
5018 Remove now-unused SSHv1 enums.
5020 sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options
5021 and are no longer used.
5023 commit c73b02d92d72458a5312bd098f32ce88868fd131
5024 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5025 Date: Fri Jul 2 05:11:20 2021 +0000
5027 upstream: Remove references to ChallengeResponseAuthentication in
5029 favour of KbdInteractiveAuthentication. The former is what was in SSHv1, the
5030 latter is what is in SSHv2 (RFC4256) and they were treated as somewhat but
5031 not entirely equivalent. We retain the old name as deprecated alias so
5032 config files continue to work and a reference in the man page for people
5035 Prompted by bz#3303 which pointed out the discrepancy between the two
5036 when used with Match. Man page help & ok jmc@, with & ok djm@
5038 OpenBSD-Commit-ID: 2c1bff8e5c9852cfcdab1f3ea94dfef5a22f3b7e
5040 commit f841fc9c8c7568a3b5d84a4cc0cefacb7dbc16b9
5041 Author: Darren Tucker <dtucker@dtucker.net>
5042 Date: Fri Jul 2 15:20:32 2021 +1000
5044 Fix ifdefs around get_random_bytes_prngd.
5046 get_random_bytes_prngd() is used if either of PRNGD_PORT or PRNGD_SOCKET
5047 are defined, so adjust ifdef accordingly.
5049 commit 0767627cf66574484b9c0834500b42ea04fe528a
5050 Author: Damien Miller <djm@mindrot.org>
5051 Date: Fri Jul 2 14:30:23 2021 +1000
5053 wrap get_random_bytes_prngd() in ifdef
5055 avoid unused static function warning
5057 commit f93fdc4de158386efe1116bd44c5b3f4a7a82c25
5058 Author: Darren Tucker <dtucker@dtucker.net>
5059 Date: Mon Jun 28 13:06:37 2021 +1000
5061 Add rocky84 test target.
5063 commit d443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b
5064 Author: djm@openbsd.org <djm@openbsd.org>
5065 Date: Fri Jun 25 06:30:22 2021 +0000
5067 upstream: fix decoding of X.509 subject name; from Leif Thuresson
5069 via bz3327 ok markus@
5071 OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8
5073 commit 2a5704ec142202d387fda2d6872fd4715ab81347
5074 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5075 Date: Fri Jun 25 06:20:39 2021 +0000
5077 upstream: Use better language to refer to the user. From l1ving
5079 via github PR#250, ok jmc@
5081 OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf
5083 commit 4bdf7a04797a0ea1c431a9d54588417c29177d19
5084 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5085 Date: Fri Jun 25 03:38:17 2021 +0000
5087 upstream: Replace SIGCHLD/notify_pipe kludge with pselect.
5089 Previously sshd's SIGCHLD handler would wake up select() by writing a
5090 byte to notify_pipe. We can remove this by blocking SIGCHLD, checking
5091 for child terminations then passing the original signal mask through
5092 to pselect. This ensures that the pselect will immediately wake up if
5093 a child terminates between wait()ing on them and the pselect.
5095 In -portable, for platforms that do not have pselect the kludge is still
5096 there but is hidden behind a pselect interface.
5098 Based on other changes for bz#2158, ok djm@
5100 OpenBSD-Commit-ID: 202c85de0b3bdf1744fe53529a05404c5480d813
5102 commit c9f7bba2e6f70b7ac1f5ea190d890cb5162ce127
5103 Author: Darren Tucker <dtucker@dtucker.net>
5104 Date: Fri Jun 25 15:08:18 2021 +1000
5106 Move closefrom() to before first malloc.
5108 When built against tcmalloc, tcmalloc allocates a descriptor for its
5109 internal use, so calling closefrom() afterward causes the descriptor
5110 number to be reused resulting in a corrupted connection. Moving the
5111 closefrom a little earlier should resolve this. From kircherlike at
5112 outlook.com via bz#3321, ok djm@
5114 commit 7ebfe4e439853b88997c9cfc2ff703408a1cca92
5115 Author: Darren Tucker <dtucker@dtucker.net>
5116 Date: Fri Jun 18 20:41:45 2021 +1000
5118 Put second -lssh in link line for sftp-server.
5120 When building --without-openssl the recent port-prngd.c change adds
5121 a dependency on atomicio, but since nothing else in sftp-server uses
5122 it, the linker may not find it. Add a second -lssh similar to other
5125 commit e409d7966785cfd9f5970e66a820685c42169717
5126 Author: Darren Tucker <dtucker@dtucker.net>
5127 Date: Fri Jun 18 18:34:08 2021 +1000
5129 Try EGD/PRNGD if random device fails.
5131 When built --without-openssl, try EGD/PRGGD (if configured) as a last
5132 resort before failing.
5134 commit e43a898043faa3a965dbaa1193cc60e0b479033d
5135 Author: Darren Tucker <dtucker@dtucker.net>
5136 Date: Fri Jun 18 18:32:51 2021 +1000
5138 Split EGD/PRNGD interface into its own file.
5140 This will allow us to use it when building --without-openssl.
5142 commit acb2887a769a1b1912cfd7067f3ce04fad240260
5143 Author: Darren Tucker <dtucker@dtucker.net>
5144 Date: Thu Jun 17 21:03:19 2021 +1000
5146 Handle GIDs > 2^31 in getgrouplist.
5148 When compiled in 32bit mode, the getgrouplist implementation may fail
5149 for GIDs greater than LONG_MAX. Analysis and change from ralf.winkel
5152 commit 31fac20c941126281b527605b73bff30a8f02edd
5153 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5154 Date: Thu Jun 10 09:46:28 2021 +0000
5156 upstream: Use $SUDO when reading sshd's pidfile here too.
5158 OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409
5160 commit a3a58acffc8cc527f8fc6729486d34e4c3d27643
5161 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5162 Date: Thu Jun 10 09:43:51 2021 +0000
5164 upstream: Use $SUDO when reading sshd's pidfile in case it was
5166 created with a very restrictive umask. This resyncs with -portable.
5168 OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d
5170 commit 249ad4ae51cd3bc235e75a4846eccdf8b1416611
5171 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5172 Date: Thu Jun 10 09:37:59 2021 +0000
5174 upstream: Set umask when creating hostkeys to prevent excessive
5176 permissions warning.
5178 OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef
5180 commit 9d0892153c005cc65897e9372b01fa66fcbe2842
5181 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5182 Date: Thu Jun 10 03:45:31 2021 +0000
5184 upstream: Add regress test for SIGHUP restart
5186 while handling active and unauthenticated clients. Should catch anything
5187 similar to the pselect bug just fixed in sshd.c.
5189 OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73
5191 commit 73f6f191f44440ca3049b9d3c8e5401d10b55097
5192 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5193 Date: Thu Jun 10 03:14:14 2021 +0000
5195 upstream: Continue accept loop when pselect
5197 returns -1, eg if it was interrupted by a signal. This should prevent
5198 the hang discovered by sthen@ wherein sshd receives a SIGHUP while it has
5199 an unauthenticated child and goes on to a blocking read on a notify_pipe.
5200 feedback deraadt@, ok djm@
5202 OpenBSD-Commit-ID: 0243c1c5544fca0974dae92cd4079543a3fceaa0
5204 commit c785c0ae134a8e8b5c82b2193f64c632a98159e4
5205 Author: djm@openbsd.org <djm@openbsd.org>
5206 Date: Tue Jun 8 22:30:27 2021 +0000
5208 upstream: test that UserKnownHostsFile correctly accepts multiple
5210 arguments; would have caught readconf.c r1.356 regression
5212 OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a
5214 commit 1a6f6b08e62c78906a3032e8d9a83e721c84574e
5215 Author: djm@openbsd.org <djm@openbsd.org>
5216 Date: Tue Jun 8 22:06:12 2021 +0000
5218 upstream: fix regression in r1.356: for ssh_config options that
5220 accepted multiple string arguments, ssh was only recording the first.
5221 Reported by Lucas via bugs@
5223 OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d
5225 commit 78e30af3e2b2dd540a341cc827c6b98dd8b0a6de
5226 Author: djm@openbsd.org <djm@openbsd.org>
5227 Date: Tue Jun 8 07:40:12 2021 +0000
5229 upstream: test argv_split() optional termination on comments
5231 OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c
5233 commit a023138957ea2becf1c7f93fcc42b0aaac6f2b03
5234 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5235 Date: Tue Jun 8 07:05:27 2021 +0000
5237 upstream: Add testcases from bz#3319 for IPQoS and TunnelDevice
5239 being overridden on the command line.
5241 OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8
5243 commit 660cea10b2cdc11f13ba99c89b1bbb368a4d9ff2
5244 Author: djm@openbsd.org <djm@openbsd.org>
5245 Date: Tue Jun 8 06:52:43 2021 +0000
5247 upstream: sprinkle some "# comment" at end of configuration lines
5249 to test comment handling
5251 OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7
5253 commit acc9c32dcb6def6c7d3688bceb4c0e59bd26b411
5254 Author: djm@openbsd.org <djm@openbsd.org>
5255 Date: Tue Jun 8 06:51:47 2021 +0000
5257 upstream: more descriptive failure message
5259 OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509
5261 commit ce04dd4eae23d1c9cf7c424a702f48ee78573bc1
5262 Author: djm@openbsd.org <djm@openbsd.org>
5263 Date: Mon Jun 7 01:16:34 2021 +0000
5265 upstream: test AuthenticationMethods inside a Match block as well
5267 as in the main config section
5269 OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7
5271 commit 9018bd821fca17e26e92f7a7e51d9b24cd62f2db
5272 Author: djm@openbsd.org <djm@openbsd.org>
5273 Date: Mon Jun 7 00:00:50 2021 +0000
5275 upstream: prepare for stricter sshd_config parsing that will refuse
5277 a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent
5278 arguments. Such lines are permitted but are nonsensical noops ATM
5280 OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650
5282 commit a10f929d1ce80640129fc5b6bc1acd9bf689169e
5283 Author: djm@openbsd.org <djm@openbsd.org>
5284 Date: Tue Jun 8 07:09:42 2021 +0000
5286 upstream: switch sshd_config parsing to argv_split()
5288 similar to the previous commit, this switches sshd_config parsing to
5289 the newer tokeniser. Config parsing will be a little stricter wrt
5290 quote correctness and directives appearing without arguments.
5292 feedback and ok markus@
5294 tested in snaps for the last five or so days - thanks Theo and those who
5297 OpenBSD-Commit-ID: 9c4305631d20c2d194661504ce11e1f68b20d93e
5299 commit ea9e45c89a4822d74a9d97fef8480707d584da4d
5300 Author: djm@openbsd.org <djm@openbsd.org>
5301 Date: Tue Jun 8 07:07:15 2021 +0000
5303 upstream: Switch ssh_config parsing to use argv_split()
5305 This fixes a couple of problems with the previous tokeniser,
5308 1. strdelim() is permissive wrt accepting '=' characters. This is
5309 intended to allow it to tokenise "Option=value" but because it
5310 cannot keep state, it will incorrectly split "Opt=val=val2".
5311 2. strdelim() has rudimentry handling of quoted strings, but it
5312 is incomplete and inconsistent. E.g. it doesn't handle escaped
5313 quotes inside a quoted string.
5314 3. It has no support for stopping on a (unquoted) comment. Because
5315 of this readconf.c r1.343 added chopping of lines at '#', but
5316 this caused a regression because these characters may legitimately
5317 appear inside quoted strings.
5319 The new tokeniser is stricter is a number of cases, including #1 above
5320 but previously it was also possible for some directives to appear
5321 without arguments. AFAIK these were nonsensical in all cases, and the
5322 new tokeniser refuses to accept them.
5324 The new code handles quotes much better, permitting quoted space as
5325 well as escaped closing quotes. Finally, comment handling should be
5326 fixed - the tokeniser will terminate only on unquoted # characters.
5328 feedback & ok markus@
5330 tested in snaps for the last five or so days - thanks Theo and those who
5333 OpenBSD-Commit-ID: dc72fd12af9d5398f4d9e159d671f9269c5b14d5
5335 commit d786424986c04d1d375f231fda177c8408e05c3e
5336 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5337 Date: Tue Jun 8 07:02:46 2021 +0000
5339 upstream: Check if IPQoS or TunnelDevice are already set before
5341 overriding. Prevents values in config files from overriding values supplied
5342 on the command line. bz#3319, ok markus.
5344 OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74
5346 commit aae4b4d3585b9f944d7dbd3c9e5ba0006c55e457
5347 Author: djm@openbsd.org <djm@openbsd.org>
5348 Date: Tue Jun 8 06:54:40 2021 +0000
5350 upstream: Allow argv_split() to optionally terminate tokenisation
5352 when it encounters an unquoted comment.
5354 Add some additional utility function for working with argument
5355 vectors, since we'll be switching to using them to parse
5356 ssh/sshd_config shortly.
5358 ok markus@ as part of a larger diff; tested in snaps
5360 OpenBSD-Commit-ID: fd9c108cef2f713f24e3bc5848861d221bb3a1ac
5362 commit da9f9acaac5bab95dca642b48e0c8182b246ab69
5363 Author: Darren Tucker <dtucker@dtucker.net>
5364 Date: Mon Jun 7 19:19:23 2021 +1000
5366 Save logs on failure for upstream test
5368 commit 76883c60161e5f3808787085a27a8c37f8cc4e08
5369 Author: Darren Tucker <dtucker@dtucker.net>
5370 Date: Mon Jun 7 14:36:32 2021 +1000
5372 Add obsdsnap-i386 upstream test target.
5374 commit d45b9c63f947ec5ec314696e70281f6afddc0ac3
5375 Author: djm@openbsd.org <djm@openbsd.org>
5376 Date: Mon Jun 7 03:38:38 2021 +0000
5378 upstream: fix debug message when finding a private key to match a
5380 certificate being attempted for user authentication. Previously it would
5381 print the certificate's path, whereas it was supposed to be showing the
5382 private key's path. Patch from Alex Sherwin via GHPR247
5384 OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b
5386 commit 530739d42f6102668aecd699be0ce59815c1eceb
5387 Author: djm@openbsd.org <djm@openbsd.org>
5388 Date: Sun Jun 6 11:34:16 2021 +0000
5390 upstream: Match host certificates against host public keys, not private
5392 keys. Allows use of certificates with private keys held in a ssh-agent.
5393 Reported by Miles Zhou in bz3524; ok dtucker@
5395 OpenBSD-Commit-ID: 25f5bf70003126d19162862d9eb380bf34bac22a
5397 commit 4265215d7300901fd7097061c7517688ade82f8e
5398 Author: djm@openbsd.org <djm@openbsd.org>
5399 Date: Sun Jun 6 03:40:39 2021 +0000
5401 upstream: Client-side workaround for a bug in OpenSSH 7.4: this release
5403 allows RSA/SHA2 signatures for public key authentication but fails to
5404 advertise this correctly via SSH2_MSG_EXT_INFO. This causes clients of these
5405 server to incorrectly match PubkeyAcceptedAlgorithms and potentially refuse
5406 to offer valid keys.
5408 Reported by and based on patch from Gordon Messmer via bz3213, thanks
5409 also for additional analysis by Jakub Jelen. ok dtucker
5411 OpenBSD-Commit-ID: d6d0b7351d5d44c45f3daaa26efac65847a564f7
5413 commit bda270d7fb8522d43c21a79a4b02a052d7c64de8
5414 Author: djm@openbsd.org <djm@openbsd.org>
5415 Date: Sun Jun 6 03:17:02 2021 +0000
5417 upstream: degrade gracefully if a sftp-server offers the
5419 limits@openssh.com extension but fails when the client tries to invoke it.
5420 Reported by Hector Martin via bz3318
5422 OpenBSD-Commit-ID: bd9d1839c41811616ede4da467e25746fcd9b967
5424 commit d345d5811afdc2d6923019b653cdd93c4cc95f76
5425 Author: djm@openbsd.org <djm@openbsd.org>
5426 Date: Sun Jun 6 03:15:39 2021 +0000
5428 upstream: the limits@openssh.com extension was incorrectly marked
5430 as an operation that writes to the filesystem, which made it unavailable in
5431 sftp-server read-only mode. Spotted by Hector Martin via bz3318
5433 OpenBSD-Commit-ID: f054465230787e37516c4b57098fc7975e00f067
5435 commit 2b71010d9b43d7b8c9ec1bf010beb00d98fa765a
5436 Author: naddy@openbsd.org <naddy@openbsd.org>
5437 Date: Sat Jun 5 13:47:00 2021 +0000
5439 upstream: PROTOCOL.certkeys: update reference from IETF draft to
5443 Also fix some typos.
5446 OpenBSD-Commit-ID: 5e855b6c5a22b5b13f8ffa3897a868e40d349b44
5448 commit aa99b2d9a3e45b943196914e8d8bf086646fdb54
5449 Author: Darren Tucker <dtucker@dtucker.net>
5450 Date: Fri Jun 4 23:41:29 2021 +1000
5452 Clear notify_pipe from readset if present.
5454 Prevents leaking an implementation detail to the caller.
5456 commit 6de8dadf6b4d0627d35bca0667ca44b1d61c2c6b
5457 Author: Darren Tucker <dtucker@dtucker.net>
5458 Date: Fri Jun 4 23:24:25 2021 +1000
5462 commit c8677065070ee34c05c7582a9c2f58d8642e552d
5463 Author: Darren Tucker <dtucker@dtucker.net>
5464 Date: Fri Jun 4 18:39:48 2021 +1000
5466 Add pselect implementation for platforms without.
5468 This is basically the existing notify_pipe kludge from serverloop.c
5469 moved behind a pselect interface. It works by installing a signal
5470 handler that writes to a pipe that the select is watching, then calls
5471 the original handler.
5473 The select call in serverloop will become pselect soon, at which point the
5474 kludge will be removed from thereand will only exist in the compat layer.
5475 Original code by markus, help from djm.
5477 commit 7cd7f302d3a072748299f362f9e241d81fcecd26
5478 Author: Vincent Brillault <vincent.brillault@cern.ch>
5479 Date: Sun May 24 09:15:06 2020 +0200
5481 auth_log: dont log partial successes as failures
5483 By design, 'partial' logins are successful logins, so initially with
5484 authenticated set to 1, for which another authentication is required. As
5485 a result, authenticated is always reset to 0 when partial is set to 1.
5486 However, even if authenticated is 0, those are not failed login
5487 attempts, similarly to attempts with authctxt->postponed set to 1.
5489 commit e7606919180661edc7f698e6a1b4ef2cfb363ebf
5490 Author: djm@openbsd.org <djm@openbsd.org>
5491 Date: Fri Jun 4 06:19:07 2021 +0000
5493 upstream: The RB_GENERATE_STATIC(3) macro expands to a series of
5495 function definitions and not a statement, so there should be no semicolon
5496 following them. Patch from Michael Forney
5498 OpenBSD-Commit-ID: c975dd180580f0bdc0a4d5b7d41ab1f5e9b7bedd
5500 commit c298c4da574ab92df2f051561aeb3e106b0ec954
5501 Author: djm@openbsd.org <djm@openbsd.org>
5502 Date: Fri Jun 4 05:59:18 2021 +0000
5504 upstream: rework authorized_keys example section, removing irrelevant
5506 stuff, de-wrapping the example lines and better aligning the examples with
5507 common usage and FAQs; ok jmc
5509 OpenBSD-Commit-ID: d59f1c9281f828148e2a2e49eb9629266803b75c
5511 commit d9cb35bbec5f623589d7c58fc094817b33030f35
5512 Author: djm@openbsd.org <djm@openbsd.org>
5513 Date: Fri Jun 4 05:10:03 2021 +0000
5515 upstream: adjust SetEnv description to clarify $TERM handling
5517 OpenBSD-Commit-ID: 8b8cc0124856bc1094949d55615e5c44390bcb22
5519 commit 771f57a8626709f2ad207058efd68fbf30d31553
5520 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5521 Date: Fri Jun 4 05:09:08 2021 +0000
5523 upstream: Switch the listening select loop from select() to
5525 pselect() and mask signals while checking signal flags, umasking for pselect
5526 and restoring afterwards. Also restore signals before sighup_restart so they
5527 don't remain blocked after restart.
5529 This prevents a race where a SIGTERM or SIGHUP can arrive between
5530 checking the flag and calling select (eg if sshd is processing a
5531 new connection) resulting in sshd not shutting down until the next
5532 time it receives a new connection. bz#2158, with & ok djm@
5534 OpenBSD-Commit-ID: bf85bf880fd78e00d7478657644fcda97b9a936f
5536 commit f64f8c00d158acc1359b8a096835849b23aa2e86
5537 Author: djm@openbsd.org <djm@openbsd.org>
5538 Date: Fri Jun 4 05:02:40 2021 +0000
5540 upstream: allow ssh_config SetEnv to override $TERM, which is otherwise
5542 handled specially by the protocol. Useful in ~/.ssh/config to set TERM to
5543 something generic (e.g. "xterm" instead of "xterm-256color") for destinations
5544 that lack terminfo entries. feedback and ok dtucker@
5546 OpenBSD-Commit-ID: 38b1ef4d5bc159c7d9d589d05e3017433e2d5758
5548 commit 60107677dc0ce1e93c61f23c433ad54687fcd9f5
5549 Author: djm@openbsd.org <djm@openbsd.org>
5550 Date: Fri Jun 4 04:02:21 2021 +0000
5552 upstream: correct extension name "no-presence-required" =>
5556 document "verify-required" option
5558 OpenBSD-Commit-ID: 1879ff4062cf61d79b515e433aff0bf49a6c55c5
5560 commit ecc186e46e3e30f27539b4311366dfda502f0a08
5561 Author: Darren Tucker <dtucker@dtucker.net>
5562 Date: Wed Jun 2 13:54:11 2021 +1000
5564 Retire fbsd7 test target.
5566 It's the slowest of the selfhosted targets (since it's 32bit but has
5567 most of the crypto algos). We still have coverage for 32bit i386.
5569 commit 5de0867b822ec48b5eec9abde0f5f95d1d646546
5570 Author: Darren Tucker <dtucker@dtucker.net>
5571 Date: Wed Jun 2 11:21:40 2021 +1000
5573 Check for $OPENSSL in md5 fallback too.
5575 commit 1db69d1b6542f8419c04cee7fd523a4a11004be2
5576 Author: Darren Tucker <dtucker@dtucker.net>
5577 Date: Wed Jun 2 11:17:54 2021 +1000
5581 commit a3f2dd955f1c19cad387a139f0e719af346ca6ef
5582 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5583 Date: Wed Jun 2 00:17:45 2021 +0000
5585 upstream: Merge back shell portability changes
5587 bringing it back in sync with -portable.
5589 OpenBSD-Regress-ID: c07905ba931e66ad7d849b87b7d19648007175d1
5591 commit 9d482295c9f073e84d75af46b720a1c0f7ec2867
5592 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5593 Date: Tue Jun 1 23:56:20 2021 +0000
5595 upstream: Use a default value for $OPENSSL,
5597 allowing it to be overridden. Do the same in the PuTTY tests since it's
5598 needed there and not exported by test-exec.sh.
5600 OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16
5602 commit 07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1
5603 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5604 Date: Mon May 24 10:25:18 2021 +0000
5606 upstream: Find openssl binary via environment variable. This
5608 allows overriding if necessary (eg in -portable where we're testing against a
5609 specific version of OpenSSL).
5611 OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5
5613 commit 1a4d1da9188d7c88f646b61f0d6a3b34f47c5439
5614 Author: djm@openbsd.org <djm@openbsd.org>
5615 Date: Fri May 21 04:03:47 2021 +0000
5617 upstream: fix memleak in test
5619 OpenBSD-Regress-ID: 5e529d0982aa04666604936df43242e97a7a6f81
5621 commit 60455a5d98065a73ec9a1f303345856bbd49aecc
5622 Author: djm@openbsd.org <djm@openbsd.org>
5623 Date: Fri May 21 03:59:01 2021 +0000
5625 upstream: also check contents of remaining string
5627 OpenBSD-Regress-ID: d526fa07253f4eebbc7d6205a0ab3d491ec71a28
5629 commit 39f6cd207851d7b67ca46903bfce4a9f615b5b1c
5630 Author: djm@openbsd.org <djm@openbsd.org>
5631 Date: Fri May 21 03:48:07 2021 +0000
5633 upstream: unit test for misc.c:strdelim() that mostly servces to
5635 highlight its inconsistencies
5637 OpenBSD-Regress-ID: 8d2bf970fcc01ccc6e36a5065f89b9c7fa934195
5639 commit 7a3a1dd2c7d4461962acbcc0ebee9445ba892be0
5640 Author: Darren Tucker <dtucker@dtucker.net>
5641 Date: Thu May 27 21:23:15 2021 +1000
5643 Put minix3 config in the host-specific block.
5645 commit 59a194825f12fff8a7f75d91bf751ea17645711b
5646 Author: djm@openbsd.org <djm@openbsd.org>
5647 Date: Mon May 31 06:48:42 2021 +0000
5649 upstream: Hash challenge supplied by client during FIDO key enrollment
5651 prior to passing it to libfido2, which does expect a hash.
5653 There is no effect for users who are simply generating FIDO keys using
5654 ssh-keygen - by default we generate a random 256 bit challenge, but
5655 people building attestation workflows around our tools should now have
5656 a more consistent experience (esp. fewer failures when they fail to
5657 guess the magic 32-byte challenge length requirement).
5661 OpenBSD-Commit-ID: b8d5363a6a7ca3b23dc28f3ca69470472959f2b5
5663 commit eb68e669bc8ab968d4cca5bf1357baca7136a826
5664 Author: Darren Tucker <dtucker@dtucker.net>
5665 Date: Thu May 27 21:14:15 2021 +1000
5667 Include login_cap.h for login_getpwclass override.
5669 On minix3, login_getpwclass is __RENAME'ed to __login_getpwclass50 so
5670 without this the include overriding login_getpwclass causes a compile
5673 commit 2063af71422501b65c7a92a5e14c0e6a3799ed89
5674 Author: Darren Tucker <dtucker@dtucker.net>
5675 Date: Thu May 27 21:13:38 2021 +1000
5677 Add minix3 test target.
5679 commit 2e1efcfd9f94352ca5f4b6958af8a454f8cf48cd
5680 Author: djm@openbsd.org <djm@openbsd.org>
5681 Date: Wed May 26 01:47:24 2021 +0000
5683 upstream: fix SEGV in UpdateHostkeys debug() message, triggered
5685 when the update removed more host keys than remain present. Fix tested by
5686 reporter James Cook, via bugs@
5688 OpenBSD-Commit-ID: 44f641f6ee02bb957f0c1d150495b60cf7b869d3
5690 commit 9acd76e6e4d2b519773e7119c33cf77f09534909
5691 Author: naddy@openbsd.org <naddy@openbsd.org>
5692 Date: Sun May 23 18:22:57 2021 +0000
5694 upstream: ssh: The client configuration keyword is
5696 "hostbasedacceptedalgorithms"
5698 This fixes a mistake that slipped in when "HostbasedKeyTypes" was
5699 renamed to "HostbasedAcceptedAlgorithms".
5701 Bug report by zack@philomathiclife.com
5703 OpenBSD-Commit-ID: d745a7e8e50b2589fc56877f322ea204bc784f38
5705 commit 078a0e60c92700da4c536c93c007257828ccd05b
5706 Author: Darren Tucker <dtucker@dtucker.net>
5707 Date: Tue May 25 11:40:47 2021 +1000
5709 Rename README.md to ci-status.md.
5711 The original intent was to provide a status page for the CIs configured
5712 in that directory, but it had the side effect of replacing the top-level
5715 commit 7be4ac813662f68e89f23c50de058a49aa32f7e4
5716 Author: djm@openbsd.org <djm@openbsd.org>
5717 Date: Wed May 19 01:24:05 2021 +0000
5719 upstream: restore blocking status on stdio fds before close
5721 ssh(1) needs to set file descriptors to non-blocking mode to operate
5722 but it was not restoring the original state on exit. This could cause
5723 problems with fds shared with other programs via the shell, e.g.
5725 > $ cat > test.sh << _EOF
5728 > ssh -Fnone -oLogLevel=verbose ::1 hostname
5729 > cat /usr/share/dict/words
5733 > Authenticated to ::1 ([::1]:22).
5734 > Transferred: sent 2352, received 2928 bytes, in 0.1 seconds
5735 > Bytes per second: sent 44338.9, received 55197.4
5736 > cat: stdout: Resource temporarily unavailable
5738 This restores the blocking status for fds 0,1,2 (stdio) before ssh(1)
5739 abandons/closes them.
5741 This was reported as bz3280 and GHPR246; ok dtucker@
5743 OpenBSD-Commit-ID: 8cc67346f05aa85a598bddf2383fcfcc3aae61ce
5745 commit c4902e1a653c67fea850ec99c7537f358904c0af
5746 Author: djm@openbsd.org <djm@openbsd.org>
5747 Date: Mon May 17 11:43:16 2021 +0000
5749 upstream: fix breakage of -W forwaring introduced in 1.554; reported by
5751 naddy@ and sthen@, ok sthen@
5753 OpenBSD-Commit-ID: f72558e643a26dc4150cff6e5097b5502f6c85fd
5755 commit afea01381ad1fcea1543b133040f75f7542257e6
5756 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5757 Date: Mon May 17 07:22:45 2021 +0000
5759 upstream: Regenerate moduli.
5761 OpenBSD-Commit-ID: 83c93a2a07c584c347ac6114d6329b18ce515557
5763 commit be2866d6207b090615ff083c9ef212b603816a56
5764 Author: Damien Miller <djm@mindrot.org>
5765 Date: Mon May 17 09:40:23 2021 +1000
5767 Handle Android libc returning NULL pw->pw_passwd
5769 Reported by Luke Dashjr
5771 commit 5953c143008259d87342fb5155bd0b8835ba88e5
5772 Author: djm@openbsd.org <djm@openbsd.org>
5773 Date: Fri May 14 05:20:32 2021 +0000
5775 upstream: fix previous: test saved no_shell_flag, not the one that just
5779 OpenBSD-Commit-ID: b8deace085d9d941b2d02f810243b9c302e5355d
5781 commit 1e9fa55f4dc4b334651d569d3448aaa3841f736f
5782 Author: djm@openbsd.org <djm@openbsd.org>
5783 Date: Fri May 14 03:09:48 2021 +0000
5785 upstream: Fix ssh started with ControlPersist incorrectly executing a
5787 shell when the -N (no shell) option was specified. bz3290 reported by Richard
5788 Schwab; patch from markus@ ok me
5790 OpenBSD-Commit-ID: ea1ea4af16a95687302f7690bdbe36a6aabf87e1
5792 commit d1320c492f655d8f5baef8c93899d79dded217a5
5793 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5794 Date: Wed May 12 11:34:30 2021 +0000
5796 upstream: Clarify language about moduli. While both ends of the
5798 connection do need to use the same parameters (ie groups), the DH-GEX
5799 protocol takes care of that and both ends do not need the same contents in
5800 the moduli file, which is what the previous text suggested. ok djm@ jmc@
5802 OpenBSD-Commit-ID: f0c18cc8e79c2fbf537a432a9070ed94e96a622a
5804 commit d3cc4d650ce3e59f3e370b101778b0e8f1c02c4d
5805 Author: djm@openbsd.org <djm@openbsd.org>
5806 Date: Fri May 7 04:11:51 2021 +0000
5808 upstream: include pid in LogVerbose spam
5810 OpenBSD-Commit-ID: aacb86f96ee90c7cb84ec27452374285f89a7f00
5812 commit e3c032333be5fdbbaf2751f6f478e044922b4ec4
5813 Author: djm@openbsd.org <djm@openbsd.org>
5814 Date: Fri May 7 03:09:38 2021 +0000
5816 upstream: don't sigdie() in signal handler in privsep child process;
5818 this can end up causing sandbox violations per bz3286; ok dtucker@
5820 OpenBSD-Commit-ID: a7f40b2141dca4287920da68ede812bff7ccfdda
5822 commit a4039724a3f2abac810735fc95cf9114a3856049
5823 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5824 Date: Fri May 7 09:23:40 2021 +0000
5826 upstream: Increase ConnectionAttempts from 4 to 10 as the tests
5828 occasionally time out on heavily loaded hosts.
5830 OpenBSD-Regress-ID: 29a8cdef354fc9da471a301f7f65184770434f3a
5832 commit c0d7e36e979fa3cdb60f5dcb6ac9ad3fd018543b
5833 Author: djm@openbsd.org <djm@openbsd.org>
5834 Date: Fri May 7 02:26:55 2021 +0000
5836 upstream: dump out a usable private key string too; inspired by Tyson
5840 OpenBSD-Regress-ID: 65572d5333801cb2f650ebc778cbdc955e372058
5842 commit 24fee8973abdf1c521cd2c0047d89e86d9c3fc38
5843 Author: djm@openbsd.org <djm@openbsd.org>
5844 Date: Fri May 7 02:29:40 2021 +0000
5846 upstream: correct mistake in spec - the private key blobs are encoded
5848 verbatim and not as strings (i.e. no 4-byte length header)
5850 OpenBSD-Commit-ID: 3606b5d443d72118c5b76c4af6dd87a5d5a4f837
5852 commit f43859159cc62396ad5d080f0b1f2635a67dac02
5853 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5854 Date: Tue May 4 22:53:52 2021 +0000
5856 upstream: Don't pass NULL as a string in debugging as it does not work
5858 on some platforms in -portable. ok djm@
5860 OpenBSD-Commit-ID: 937c892c99aa3c9c272a8ed78fa7c2aba3a44fc9
5862 commit ac31aa3c6341905935e75f0539cf4a61bbe99779
5863 Author: djm@openbsd.org <djm@openbsd.org>
5864 Date: Mon May 3 00:16:45 2021 +0000
5866 upstream: more debugging for UpdateHostKeys signature failures
5868 OpenBSD-Commit-ID: 1ee95f03875e1725df15d5e4bea3e73493d57d36
5870 commit 8e32e97e788e0676ce83018a742203614df6a2b3
5871 Author: Darren Tucker <dtucker@dtucker.net>
5872 Date: Sat May 1 20:07:47 2021 +1000
5874 Add obsd69 test target.
5876 commit f06893063597c5bb9d9e93f851c4070e77d2fba9
5877 Author: djm@openbsd.org <djm@openbsd.org>
5878 Date: Fri Apr 30 04:29:53 2021 +0000
5880 upstream: a little debugging in the main mux process for status
5882 confirmation failures in multiplexed sessions
5884 OpenBSD-Commit-ID: 6e27b87c95176107597035424e1439c3232bcb49
5886 commit e65cf00da6bc31e5f54603b7feb7252dc018c033
5887 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5888 Date: Fri Apr 30 04:02:52 2021 +0000
5890 upstream: Remove now-unused skey function prototypes leftover from
5894 OpenBSD-Commit-ID: 2fc36d519fd37c6f10ce74854c628561555a94c3
5896 commit ae5f9b0d5c8126214244ee6b35aae29c21028133
5897 Author: Darren Tucker <dtucker@dtucker.net>
5898 Date: Thu Apr 29 13:01:50 2021 +1000
5900 Wrap sntrup761x25519 inside ifdef.
5902 From balu.gajjala at gmail.com via bz#3306.
5904 commit 70a8dc138a6480f85065cdb239915ad4b7f928cf
5905 Author: Darren Tucker <dtucker@dtucker.net>
5906 Date: Wed Apr 28 14:44:07 2021 +1000
5908 Add status badges for Actions-based tests.
5910 commit 40b59024cc3365815381474cdf4fe423102e391b
5911 Author: Darren Tucker <dtucker@dtucker.net>
5912 Date: Wed Apr 28 12:22:11 2021 +1000
5914 Add obsdsnap (OpenBSD snapshot) test target.
5916 commit e627067ec8ef9ae8e7a638f4dbac91d52dee3e6d
5917 Author: Darren Tucker <dtucker@dtucker.net>
5918 Date: Wed Apr 28 11:35:28 2021 +1000
5920 Add test building upstream OpenBSD source.
5922 commit 1b8108ebd12fc4ed0fb39ef94c5ba122558ac373
5923 Author: Darren Tucker <dtucker@dtucker.net>
5924 Date: Tue Apr 27 14:22:20 2021 +1000
5926 Test against OpenSSL 1.1.0h instead of 1.1.0g.
5928 1.1.0g requires a perl glob module that's not installed by default.
5930 commit 9bc20efd39ce8525be33df3ee009f5a4564224f1
5931 Author: Darren Tucker <dtucker@dtucker.net>
5932 Date: Tue Apr 27 12:37:59 2021 +1000
5934 Use the default VM type for libcrypto ver tests.
5936 commit 9f79e80dc40965c2e73164531250b83b176c1eea
5937 Author: Darren Tucker <dtucker@dtucker.net>
5938 Date: Tue Apr 27 12:24:10 2021 +1000
5940 Always build OpenSSL shared.
5942 This is the default for current versions but we need it to test against
5945 commit b3cc9fbdff2782eca79e33e02ac22450dc63bce9
5946 Author: Darren Tucker <dtucker@dtucker.net>
5947 Date: Tue Apr 27 09:18:02 2021 +1000
5949 Fix custom OpenSSL tests.
5951 Check out specified OpenSSL version. Install custom libcrypto where
5952 configure expects to find it. Remove unneeded OpenSSL config time
5953 options. Older OpenSSL versions were not make -j safe so remove it.
5955 commit 77532609874a99a19e3e2eb2d1b7fa93aef963bb
5956 Author: Darren Tucker <dtucker@dtucker.net>
5957 Date: Mon Apr 26 17:18:25 2021 +1000
5959 Export CC and CFLAGS for c89 test.
5961 commit 33f62dfbe865f4de77980ab88774bf1eb5e4e040
5962 Author: Darren Tucker <dtucker@dtucker.net>
5963 Date: Mon Apr 26 17:13:44 2021 +1000
5967 commit da9d59f526fce58e11cba49cd8eb011dc0bf5677
5968 Author: Darren Tucker <dtucker@dtucker.net>
5969 Date: Mon Apr 26 15:34:23 2021 +1000
5971 Add test against OpenSSL w/out ECC.
5973 commit 29e194a752359ebf85bf7fce100f23a0477fc4de
5974 Author: Darren Tucker <dtucker@dtucker.net>
5975 Date: Mon Apr 26 14:49:59 2021 +1000
5977 Ensure we can still build with C89.
5979 commit a38016d369d21df5d35f761f2b67e175e132ba22
5980 Author: Darren Tucker <dtucker@dtucker.net>
5981 Date: Mon Apr 26 14:29:03 2021 +1000
5983 Interop test agains PuTTY.
5985 commit 095b0307a77be8803768857cc6c0963fa52ed85b
5986 Author: Darren Tucker <dtucker@dtucker.net>
5987 Date: Mon Apr 26 14:02:03 2021 +1000
5989 Support testing against arbitary libcrytpo vers.
5991 Add tests against various LibreSSL and OpenSSL versions.
5993 commit b16082aa110fa7128ece2a9037ff420c4a285317
5994 Author: Darren Tucker <dtucker@dtucker.net>
5995 Date: Mon Apr 26 13:35:44 2021 +1000
5997 Add fbsd10 test target.
5999 commit 2c805f16b24ea37cc051c6018fcb05defab6e57a
6000 Author: Darren Tucker <dtucker@dtucker.net>
6001 Date: Sun Apr 25 14:15:02 2021 +1000
6003 Disable compiler hardening on nbsd4.
6005 The system compiler supports -fstack-protector-all, but using it will
6006 result in an internal compiler error on some files.
6008 commit 6a5d39305649da5dff1934ee54292ee0cebd579d
6009 Author: Darren Tucker <dtucker@dtucker.net>
6010 Date: Sun Apr 25 13:01:34 2021 +1000
6012 Add nbsd3, nbsd4 and nbsd9 test targets.
6014 commit d1aed05bd2e4ae70f359a394dc60a2d96b88f78c
6015 Author: Darren Tucker <dtucker@dtucker.net>
6016 Date: Sat Apr 24 22:03:46 2021 +1000
6018 Comment out nbsd2 test target for now.
6020 commit a6b4ec94e5bd5a8a18cd2c9942d829d2e5698837
6021 Author: Darren Tucker <dtucker@dtucker.net>
6022 Date: Sat Apr 24 17:52:24 2021 +1000
6024 Add OPENBSD ORIGINAL marker.
6026 commit 3737c9f66ee590255546c4b637b6d2be669a11eb
6027 Author: Darren Tucker <dtucker@dtucker.net>
6028 Date: Fri Apr 23 19:49:46 2021 +1000
6030 Replace "==" (a bashism) with "=".
6032 commit a116b6f5be17a1dd345b7d54bf8aa3779a28a0df
6033 Author: Darren Tucker <dtucker@dtucker.net>
6034 Date: Fri Apr 23 16:34:48 2021 +1000
6036 Add nbsd2 test target.
6038 commit 196bf2a9bb771f45d9b0429cee7d325962233c44
6039 Author: Darren Tucker <dtucker@dtucker.net>
6040 Date: Fri Apr 23 14:54:10 2021 +1000
6042 Add obsd68 test target.
6044 commit e3ba6574ed69e8b7af725cf5e8a9edaac04ff077
6045 Author: Darren Tucker <dtucker@dtucker.net>
6046 Date: Fri Apr 23 14:53:32 2021 +1000
6048 Remove dependency on bash.
6050 commit db1f9ab8feb838aee9f5b99c6fd3f211355dfdcf
6051 Author: Darren Tucker <dtucker@dtucker.net>
6052 Date: Fri Apr 23 14:41:13 2021 +1000
6054 Add obsd67 test target.
6056 commit c039a6bf79192fe1daa9ddcc7c87dd98e258ae7c
6057 Author: Darren Tucker <dtucker@dtucker.net>
6058 Date: Fri Apr 23 11:08:23 2021 +1000
6060 Re-add macos-11.0 test target.
6062 commit a6db3a47b56adb76870d59225ffb90a65bc4daf2
6063 Author: Darren Tucker <dtucker@dtucker.net>
6064 Date: Fri Apr 23 10:28:28 2021 +1000
6066 Add openindiana test target.
6068 commit 3fe7e73b025c07eda46d78049f1da8ed7dfc0c69
6069 Author: Darren Tucker <dtucker@dtucker.net>
6070 Date: Fri Apr 23 10:26:35 2021 +1000
6072 Test krb5 on Solaris 11 too.
6074 commit f57fbfe5eb02df1a91f1a237c4d27165afd87c13
6075 Author: Darren Tucker <dtucker@dtucker.net>
6076 Date: Thu Apr 22 22:27:26 2021 +1000
6078 Don't always set SUDO.
6080 Rely on sourcing configs to set as appropriate.
6082 commit e428f29402fb6ac140b52f8f12e06ece7bb104a0
6083 Author: Darren Tucker <dtucker@dtucker.net>
6084 Date: Thu Apr 22 22:26:08 2021 +1000
6086 Remove now-unused 2nd arg to configs.
6088 commit cb4ff640d79b3c736879582139778f016bbb2cd7
6089 Author: Darren Tucker <dtucker@dtucker.net>
6090 Date: Wed Apr 21 01:08:04 2021 +1000
6092 Add win10 test target.
6094 commit 4457837238072836b2fa3107d603aac809624983
6095 Author: Darren Tucker <dtucker@dtucker.net>
6096 Date: Tue Apr 20 23:31:29 2021 +1000
6098 Add nbsd8 test target.
6100 commit bd4fba22e14da2fa196009010aabec5a8ba9dd42
6101 Author: Darren Tucker <dtucker@dtucker.net>
6102 Date: Sat Apr 17 09:55:47 2021 +1000
6106 commit 9403d0e805c77a5741ea8c3281bbe92558c2f125
6107 Author: Darren Tucker <dtucker@dtucker.net>
6108 Date: Fri Apr 16 18:14:25 2021 +1000
6112 commit e86968280e358e62649d268d41f698d64d0dc9fa
6113 Author: Damien Miller <djm@mindrot.org>
6114 Date: Fri Apr 16 13:55:25 2021 +1000
6118 commit 2fb25ca11e8b281363a2a2a4dec4c497a1475d9a
6119 Author: Damien Miller <djm@mindrot.org>
6120 Date: Fri Apr 16 13:53:02 2021 +1000
6122 crank version in README and RPM spec files
6124 commit b2b60ebab0cb77b5bc02d364d72e13db882f33ae
6125 Author: djm@openbsd.org <djm@openbsd.org>
6126 Date: Fri Apr 16 03:42:00 2021 +0000
6128 upstream: openssh-8.6
6130 OpenBSD-Commit-ID: b5f3e133c846127ec114812248bc17eff07c3e19
6132 commit faf2b86a46c9281d237bcdec18c99e94a4eb820a
6133 Author: markus@openbsd.org <markus@openbsd.org>
6134 Date: Thu Apr 15 16:24:31 2021 +0000
6136 upstream: do not pass file/func to monitor; noted by Ilja van Sprundel;
6140 OpenBSD-Commit-ID: 85ae5c063845c410283cbdce685515dcd19479fa
6142 commit 2dc328023f60212cd29504fc05d849133ae47355
6143 Author: Damien Miller <djm@mindrot.org>
6144 Date: Wed Apr 14 11:42:55 2021 +1000
6146 sshd don't exit on transient read errors
6148 openssh-8.5 introduced a regression that would cause sshd to exit
6149 because of transient read errors on the network socket (e.g. EINTR,
6150 EAGAIN). Reported by balu.gajjala AT gmail.com via bz3297
6152 commit d5d6b7d76d171a2e6861609dcd92e714ee62ad88
6153 Author: Damien Miller <djm@mindrot.org>
6154 Date: Sat Apr 10 18:45:00 2021 +1000
6156 perform report_failed_grab() inline
6158 commit ea996ce2d023aa3c6d31125e2c3ebda1cb42db8c
6159 Author: Damien Miller <djm@mindrot.org>
6160 Date: Sat Apr 10 18:22:57 2021 +1000
6162 dedicated gnome-ssk-askpass3 source
6164 Compatibility with Wayland requires that we use the gdk_seat_grab()
6165 API for grabbing mouse/keyboard, however these API don't exist in
6168 This branches gnome-ssk-askpass2.c => gnome-ssk-askpass3.c and
6169 makes the changes to use the gdk_seat_grab() instead of grabbing
6170 mouse/focus separately via GDK.
6172 In the future, we can also use the branched file to avoid some
6173 API that has been soft-deprecated in GTK+3, e.g. gtk_widget_modify_fg
6175 commit bfa5405da05d906ffd58216eb77c4375b62d64c2
6176 Author: Darren Tucker <dtucker@dtucker.net>
6177 Date: Thu Apr 8 15:18:15 2021 +1000
6179 Ensure valgrind-out exists.
6181 Normally the regress tests would create it, but running the unit tests
6182 on their own would fail because the directory did not exist.
6184 commit 1f189181f3ea09a9b08aa866f78843fec800874f
6185 Author: Darren Tucker <dtucker@dtucker.net>
6186 Date: Thu Apr 8 15:17:19 2021 +1000
6188 Pass OBJ to unit test make invocation.
6190 At least the Valgrind unit tests uses $OBJ.
6192 commit f42b550c281d28bd19e9dd6ce65069164f3482b0
6193 Author: Darren Tucker <dtucker@dtucker.net>
6194 Date: Thu Apr 8 14:20:12 2021 +1000
6196 Add pattern for valgrind-unit.
6198 commit 19e534462710e98737478fd9c44768b50c27c4c6
6199 Author: Darren Tucker <dtucker@dtucker.net>
6200 Date: Thu Apr 8 13:31:08 2021 +1000
6202 Run unit tests under valgrind.
6204 Run a separate build for the unit tests under Valgrind. They take long
6205 enough that running in parallel with the other Valgrind tests helps.
6207 commit 80032102d05e866dc2a48a5caf760cf42c2e090e
6208 Author: Darren Tucker <dtucker@dtucker.net>
6209 Date: Thu Apr 8 13:25:57 2021 +1000
6211 ifdef out MIN and MAX.
6213 In -portable, defines.h ensures that these are defined, so redefining
6214 potentially causes a warning. We don't just delete it to make any
6215 future code syncs a little but easier. bz#3293.
6217 commit d1bd184046bc310c405f45da3614a1dc5b3e521a
6218 Author: Darren Tucker <dtucker@dtucker.net>
6219 Date: Wed Apr 7 10:23:51 2021 +1000
6221 Remove only use of warn().
6223 The warn() function is only used in one place in portable and does not
6224 exist upstream. Upgrade the only instance it's used to fail()
6225 (the privsep/sandbox+proxyconnect, from back when that was new) and
6226 remove the now-unused function.
6228 commit fea8f4b1aa85026ad5aee5ad8e1599a8d5141fe0
6229 Author: Darren Tucker <dtucker@dtucker.net>
6230 Date: Wed Apr 7 10:18:32 2021 +1000
6232 Move make_tmpdir() into portable-specific area.
6234 Reduces diff vs OpenBSD and makes it more likely diffs will apply
6237 commit 13e5fa2acffd26e754c6ee1d070d0afd035d4cb7
6238 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6239 Date: Tue Apr 6 23:57:56 2021 +0000
6241 upstream: Add TEST_SSH_ELAPSED_TIMES environment variable to print the
6243 elapsed time in seconds of each test. This depends on "date +%s" which is
6244 not specified by POSIX but is commonly implemented.
6246 OpenBSD-Regress-ID: ec3c8c19ff49b2192116a0a646ee7c9b944e8a9c
6248 commit ef4f46ab4387bb863b471bad124d46e8d911a79a
6249 Author: Darren Tucker <dtucker@dtucker.net>
6250 Date: Wed Apr 7 09:59:15 2021 +1000
6252 Move the TEST_SSH_PORT section down a bit.
6254 This groups the portable-specific changes together and makes it a
6255 little more likely that patches will apply cleanly.
6257 commit 3674e33fa70dfa1fe69b345bf576113af7b7be11
6258 Author: Darren Tucker <dtucker@dtucker.net>
6259 Date: Wed Apr 7 10:05:10 2021 +1000
6261 Further split Valgrind tests.
6263 Even split in two, the Valgrind tests take by far the longest to run,
6264 so split them four ways to further increase parallelism.
6266 commit 961af266b861e30fce1e26170ee0dbb5bf591f29
6267 Author: djm@openbsd.org <djm@openbsd.org>
6268 Date: Tue Apr 6 23:24:30 2021 +0000
6270 upstream: include "ssherr.h" not <ssherr.h>; from Balu Gajjala via
6274 OpenBSD-Commit-ID: e9535cd9966eb2e69e73d1ede1f44905c30310bd
6276 commit e7d0a285dbdd65d8df16123ad90f15e91862f959
6277 Author: Damien Miller <djm@mindrot.org>
6278 Date: Wed Apr 7 08:50:38 2021 +1000
6280 wrap struct rlimit in HAVE_GETRLIMIT too
6282 commit f283a6c2e0a9bd9369e18462acd00be56fbe5b0d
6283 Author: Damien Miller <djm@mindrot.org>
6284 Date: Wed Apr 7 08:20:35 2021 +1000
6286 wrap getrlimit call in HAVE_GETRLIMIT; bz3291
6288 commit 679bdc4a5c9244f427a7aee9c14b0a0ed086da1f
6289 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6290 Date: Tue Apr 6 09:07:33 2021 +0000
6292 upstream: Don't check return value of unsetenv(). It's part of the
6294 environment setup and not part of the actual test, and some platforms
6295 -portable runs on declare it as returning void, which prevents the test from
6298 OpenBSD-Regress-ID: 24f08543ee3cdebc404f2951f3e388cc82b844a1
6300 commit 320af2f3de6333aa123f1b088eca146a245e968a
6301 Author: jmc@openbsd.org <jmc@openbsd.org>
6302 Date: Sun Apr 4 11:36:56 2021 +0000
6304 upstream: remove stray inserts; from matthias schmidt
6306 OpenBSD-Commit-ID: 2c36ebdc54e14bbf1daad70c6a05479a073d5c63
6308 commit 801f710953b24dd2f21939171c622eac77c7484d
6309 Author: jmc@openbsd.org <jmc@openbsd.org>
6310 Date: Sun Apr 4 06:11:24 2021 +0000
6312 upstream: missing comma; from kawashima james
6314 OpenBSD-Commit-ID: 31cec6bf26c6db4ffefc8a070715ebef274e68ea
6316 commit b3ca08cb174266884d44ec710a84cd64c12414ea
6317 Author: Darren Tucker <dtucker@dtucker.net>
6318 Date: Mon Apr 5 23:46:42 2021 +1000
6320 Install libcbor with libfido2.
6322 commit f3ca8af87a4c32ada660da12ae95cf03d190c083
6323 Author: Damien Miller <djm@mindrot.org>
6324 Date: Sat Apr 3 18:21:08 2021 +1100
6326 enable authopt and misc unit tests
6328 Neither were wired into the build, both required some build
6329 adaptations for -portable
6331 commit dc1b45841fb97e3d7f655ddbcfef3839735cae5f
6332 Author: djm@openbsd.org <djm@openbsd.org>
6333 Date: Sat Apr 3 06:58:30 2021 +0000
6335 upstream: typos in comments; GHPR#180 from Vill
6337 =?UTF-8?q?e=20Skytt=C3=A4?=
6339 Content-Type: text/plain; charset=UTF-8
6340 Content-Transfer-Encoding: 8bit
6342 OpenBSD-Commit-ID: 93c732381ae0e2b680c79e67c40c1814b7ceed2c
6344 commit 53ea05e09b04fd7b6dea66b42b34d65fe61b9636
6345 Author: djm@openbsd.org <djm@openbsd.org>
6346 Date: Sat Apr 3 06:55:52 2021 +0000
6348 upstream: sync CASignatureAlgorithms lists with reality. GHPR#174 from
6352 OpenBSD-Commit-ID: f05e4ca54d7e67b90fe58fe1bdb1d2a37e0e2696
6354 commit 57ed647ee07bb883a2f2264231bcd1df6a5b9392
6355 Author: Damien Miller <djm@mindrot.org>
6356 Date: Sat Apr 3 17:47:37 2021 +1100
6358 polish whitespace for portable files
6360 commit 31d8d231eb9377df474746a822d380c5d68d7ad6
6361 Author: djm@openbsd.org <djm@openbsd.org>
6362 Date: Sat Apr 3 06:18:40 2021 +0000
6364 upstream: highly polished whitespace, mostly fixing spaces-for-tab
6366 and bad indentation on continuation lines. Prompted by GHPR#185
6368 OpenBSD-Commit-ID: e5c81f0cbdcc6144df1ce468ec1bac366d8ad6e9
6370 commit 34afde5c73b5570d6f8cce9b49993b23b77bfb86
6371 Author: djm@openbsd.org <djm@openbsd.org>
6372 Date: Sat Apr 3 05:54:14 2021 +0000
6374 upstream: whitespace (tab after space)
6376 OpenBSD-Commit-ID: 0e2b3f7674e985d3f7c27ff5028e690ba1c2efd4
6378 commit 7cd262c1c5a08cc7f4f30e3cab108ef089d0a57b
6379 Author: Darren Tucker <dtucker@dtucker.net>
6380 Date: Sat Apr 3 16:59:10 2021 +1100
6382 Save config.h and config.log on failure too.
6384 commit 460aee9298f365357e9fd26851c22e0dca51fd6a
6385 Author: djm@openbsd.org <djm@openbsd.org>
6386 Date: Sat Apr 3 05:46:41 2021 +0000
6388 upstream: fix incorrect plural; from Ville Skyt
6390 =?UTF-8?q?t=C3=A4=20via=20GHPR#181?=
6392 Content-Type: text/plain; charset=UTF-8
6393 Content-Transfer-Encoding: 8bit
6395 OpenBSD-Commit-ID: 92f31754c6296d8f403d7c293e09dc27292d22c9
6397 commit 082804c14e548cada75c81003a3c68ee098138ee
6398 Author: djm@openbsd.org <djm@openbsd.org>
6399 Date: Sat Apr 3 05:40:39 2021 +0000
6401 upstream: ensure that pkcs11_del_provider() is called before exit -
6403 some PKCS#11 providers get upset if C_Initialize is not matched with
6406 From Adithya Baglody via GHPR#234; ok markus
6408 OpenBSD-Commit-ID: f8e770e03b416ee9a58f9762e162add900f832b6
6410 commit 464ebc82aa926dd132ec75a0b064574ef375675e
6411 Author: djm@openbsd.org <djm@openbsd.org>
6412 Date: Sat Apr 3 05:28:43 2021 +0000
6414 upstream: unused variable
6416 OpenBSD-Commit-ID: 85f6a394c8e0f60d15ecddda75176f112007b205
6418 commit dc3c0be8208c488e64a8bcb7d9efad98514e0ffb
6419 Author: djm@openbsd.org <djm@openbsd.org>
6420 Date: Sat Apr 3 05:21:46 2021 +0000
6422 upstream: Fix two problems in string->argv conversion: 1) multiple
6424 backslashes were not being dequoted correctly and 2) quoted space in the
6425 middle of a string was being incorrectly split.
6427 Content-Type: text/plain; charset=UTF-8
6428 Content-Transfer-Encoding: 8bit
6430 A unit test for these cases has already been committed
6432 prompted by and based on GHPR#223 by Eero Häkkinen; ok markus@
6434 OpenBSD-Commit-ID: d7ef27abb4eeeaf6e167e9312e4abe9e89faf1e4
6436 commit f75bcbba58a08c670727ece5e3f8812125969799
6437 Author: Damien Miller <djm@mindrot.org>
6438 Date: Sat Apr 3 16:22:48 2021 +1100
6440 missing bits from 259d648e
6442 commit 4cbc4a722873d9b68cb5496304dc050d7168df78
6443 Author: djm@openbsd.org <djm@openbsd.org>
6444 Date: Wed Mar 31 21:59:26 2021 +0000
6446 upstream: cannot effectively test posix-rename extension after
6448 changes in feature advertisment.
6450 OpenBSD-Regress-ID: 5e390bf88d379162aaa81b60ed86b34cb0c54d29
6452 commit 259d648e63e82ade4fe2c2c73c8b67fe57d9d049
6453 Author: djm@openbsd.org <djm@openbsd.org>
6454 Date: Fri Mar 19 04:23:50 2021 +0000
6456 upstream: add a test for misc.c:argv_split(), currently fails
6458 OpenBSD-Regress-ID: ad6b96d6ebeb9643b698b3575bdd6f78bb144200
6460 commit 473ddfc2d6b602cb2d1d897e0e5c204de145cd9a
6461 Author: djm@openbsd.org <djm@openbsd.org>
6462 Date: Fri Mar 19 03:25:01 2021 +0000
6466 OpenBSD-Regress-ID: f6c03c0e4c58b3b9e04b161757b8c10dc8378c34
6468 commit 1339800fef8d0dfbfeabff71b34670105bcfddd2
6469 Author: djm@openbsd.org <djm@openbsd.org>
6470 Date: Wed Mar 31 22:16:34 2021 +0000
6472 upstream: Use new limits@openssh.com protocol extension to let the
6474 client select good limits based on what the server supports. Split the
6475 download and upload buffer sizes to allow them to be chosen independently.
6477 In practice (and assuming upgraded sftp/sftp-server at each end), this
6478 increases the download buffer 32->64KiB and the upload buffer
6481 Patches from Mike Frysinger; ok dtucker@
6483 OpenBSD-Commit-ID: ebd61c80d85b951b794164acc4b2f2fd8e88606c
6485 commit 6653c61202d104e59c8e741329fcc567f7bc36b8
6486 Author: djm@openbsd.org <djm@openbsd.org>
6487 Date: Wed Mar 31 21:58:07 2021 +0000
6489 upstream: do not advertise protocol extensions that have been
6491 disallowed by the command-line options (e.g. -p/-P/-R); ok dtucker@
6493 OpenBSD-Commit-ID: 3a8a76b3f5131741aca4b41bfab8d101c9926205
6495 commit 71241fc05db4bbb11bb29340b44b92e2575373d8
6496 Author: Damien Miller <djm@mindrot.org>
6497 Date: Mon Mar 29 15:14:25 2021 +1100
6499 gnome-ssh-askpass3 is a valid target here
6501 commit 8a9520836e71830f4fccca066dba73fea3d16bda
6502 Author: djm@openbsd.org <djm@openbsd.org>
6503 Date: Fri Mar 19 02:22:34 2021 +0000
6505 upstream: return non-zero exit status when killed by signal; bz#3281 ok
6509 OpenBSD-Commit-ID: 117b31cf3c807993077b596bd730c24da9e9b816
6511 commit 1269b8a686bf1254b03cd38af78167a04aa6ec88
6512 Author: djm@openbsd.org <djm@openbsd.org>
6513 Date: Fri Mar 19 02:18:28 2021 +0000
6515 upstream: increase maximum SSH2_FXP_READ to match the maximum
6517 packet size. Also handle zero-length reads that are borderline nonsensical
6518 but not explicitly banned by the spec. Based on patch from Mike Frysinger,
6519 feedback deraadt@ ok dtucker@
6521 OpenBSD-Commit-ID: 4e67d60d81bde7b84a742b4ee5a34001bdf80d9c
6523 commit 860b67604416640e8db14f365adc3f840aebcb1f
6524 Author: djm@openbsd.org <djm@openbsd.org>
6525 Date: Tue Mar 16 06:15:43 2021 +0000
6527 upstream: don't let logging clobber errno before use
6529 OpenBSD-Commit-ID: ce6cca370005c270c277c51c111bb6911e1680ec
6531 commit 5ca8a9216559349c56e09039c4335636fd85c241
6532 Author: Darren Tucker <dtucker@dtucker.net>
6533 Date: Sat Mar 13 14:40:43 2021 +1100
6535 Only call dh_set_moduli_file if using OpenSSL.
6537 Fixes link failure when configuring --without-openssl since dh.c is not
6540 commit 867a7dcf003c51d5a83f83565771a35f0d9530ac
6541 Author: Darren Tucker <dtucker@dtucker.net>
6542 Date: Sat Mar 13 13:52:53 2021 +1100
6544 Don't install moduli during tests.
6546 Now that we have TEST_SSH_MODULI_FILE pointing to the moduli in the
6547 soure directory we don't need to install the file to prevent warnings
6548 about it being missing.
6550 commit 0c054538fccf92b4a028008321d3711107bee6d5
6551 Author: Darren Tucker <dtucker@dtucker.net>
6552 Date: Sat Mar 13 13:51:26 2021 +1100
6554 Point TEST_SSH_MODULI_FILE at our own moduli.
6556 This will allow the test to run without requiring a moduli file
6557 installed at the configured default path.
6559 commit 4d48219c72ab0c71238806f057f0e9630b7dd25c
6560 Author: jsg@openbsd.org <jsg@openbsd.org>
6561 Date: Fri Mar 12 05:18:01 2021 +0000
6565 OpenBSD-Commit-ID: 478bc3db04f62f1048ed6e1765400f3ab325e60f
6567 commit 88057eb6df912abf2678ea5c846d9d9cbc92752c
6568 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6569 Date: Fri Mar 12 04:08:19 2021 +0000
6571 upstream: Add ModuliFile keyword to sshd_config to specify the
6573 location of the "moduli" file containing the groups for DH-GEX. This will
6574 allow us to run tests against arbitrary moduli files without having to
6575 install them. ok djm@
6577 OpenBSD-Commit-ID: 8df99d60b14ecaaa28f3469d01fc7f56bff49f66
6579 commit f07519a2af96109325b5a48b1af18b57601074ca
6580 Author: djm@openbsd.org <djm@openbsd.org>
6581 Date: Fri Mar 12 03:43:40 2021 +0000
6583 upstream: pwcopy() struct passwd that we're going to reuse across a
6585 bunch of library calls; bz3273 ok dtucker@
6587 OpenBSD-Commit-ID: b6eafa977b2e44607b1b121f5de855107809b762
6589 commit 69d6d4b0c8a88d3d1288415605f36e2df61a2f12
6590 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6591 Date: Wed Mar 10 06:32:27 2021 +0000
6593 upstream: Import regenerated moduli file.
6595 OpenBSD-Commit-ID: 7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b
6597 commit e5895e8ecfac65086ea6b34d0d168409a66a15e1
6598 Author: djm@openbsd.org <djm@openbsd.org>
6599 Date: Wed Mar 10 04:58:45 2021 +0000
6601 upstream: no need to reset buffer after send_msg() as that is done
6603 for us; patch from Mike Frysinger
6605 OpenBSD-Commit-ID: 565516495ff8362a38231e0f1a087b8ae66da59c
6607 commit 721948e67488767df0fa0db71ff2578ee2bb9210
6608 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6609 Date: Sat Mar 13 01:52:16 2021 +0000
6611 upstream: Add TEST_SSH_MODULI_FILE variable to allow overriding of the
6613 moduli file used during the test run.
6615 OpenBSD-Regress-ID: be10f785263120edb64fc87db0e0d6570a10220a
6617 commit 82fef71e20ffef425b932bec26f5bc46aa1ed41c
6618 Author: Darren Tucker <dtucker@dtucker.net>
6619 Date: Fri Mar 12 15:58:57 2021 +1100
6621 Allow (but return EACCES) fstatat64 in sandbox.
6623 This is apparently used in some configurations of OpenSSL when glibc
6624 has getrandom(). bz#3276, patch from Kris Karas, ok djm@
6626 commit 1cd67ee15ce3d192ab51be22bc4872a6a7a4b6d9
6627 Author: Darren Tucker <dtucker@dtucker.net>
6628 Date: Fri Mar 12 13:16:10 2021 +1100
6630 Move generic includes outside of ifdef.
6632 This ensures that the macros in log.h are defined in the case where
6633 either of --with-solaris-projects or --with-solaris-privs are used
6634 without --with-solaris-contracts. bz#3278.
6636 commit 2421a567a8862fe5102a4e7d60003ebffd1313dd
6637 Author: Darren Tucker <dtucker@dtucker.net>
6638 Date: Wed Mar 10 17:41:21 2021 +1100
6640 Import regenerated moduli file.
6642 commit e99080c05d9d48dbbdb022538533d53ae1bd567d
6643 Author: millert@openbsd.org <millert@openbsd.org>
6644 Date: Sat Mar 6 20:36:31 2021 +0000
6646 upstream: Fix PRINT macro, the suffix param to sshlog() was missing.
6648 Also remove redundant __func__ prefix from PRINT calls as the macro already
6649 adds __FILE__, __func__ and __LINE__. From Christos Zoulas. OK dtucker@
6651 OpenBSD-Commit-ID: 01fdfa9c5541151b5461d9d7d6ca186a3413d949
6653 commit 160db17fc678ceb5e3fd4a7e006cc73866f484aa
6654 Author: djm@openbsd.org <djm@openbsd.org>
6655 Date: Wed Mar 3 22:41:49 2021 +0000
6657 upstream: don't sshbuf_get_u32() into an enum; reported by goetze
6659 AT dovetail.com via bz3269
6661 OpenBSD-Commit-ID: 99a30a8f1df9bd72be54e21eee5c56a0f050921a
6663 commit cffd033817a5aa388764b6661855dcdaabab0588
6664 Author: sthen@openbsd.org <sthen@openbsd.org>
6665 Date: Wed Mar 3 21:40:16 2021 +0000
6667 upstream: typo in other_hostkeys_message() display output, ok djm
6669 OpenBSD-Commit-ID: 276f58afc97b6f5826e0be58380b737603dbf5f5
6671 commit 7fe141b96b13bd7dc67ca985e14d55b9bd8a03fd
6672 Author: djm@openbsd.org <djm@openbsd.org>
6673 Date: Wed Mar 3 08:42:52 2021 +0000
6675 upstream: needs FILE*; from Mike Frysinger
6677 OpenBSD-Commit-ID: dddb3aa9cb5792eeeaa37a1af67b5a3f25ded41d
6679 commit d2afd717e62d76bb41ab5f3ab4ce6f885c8edc98
6680 Author: Damien Miller <djm@mindrot.org>
6681 Date: Tue Mar 2 21:31:47 2021 +1100
6685 commit f0c4eddf7cf224ebcac1f07ac8afdb30c6e9fe0a
6686 Author: Damien Miller <djm@mindrot.org>
6687 Date: Tue Mar 2 21:30:14 2021 +1100
6691 commit 67a8bb7fe62a381634db4c261720092e7d514a3d
6692 Author: Damien Miller <djm@mindrot.org>
6693 Date: Tue Mar 2 21:29:54 2021 +1100
6695 update RPM spec version numbers
6697 commit 0a4b23b11b9a4e6eec332dd5c6ab2ac6f62aa164
6698 Author: djm@openbsd.org <djm@openbsd.org>
6699 Date: Tue Mar 2 01:48:18 2021 +0000
6701 upstream: openssh-8.5
6703 OpenBSD-Commit-ID: 185e85d60fe042b8f8fa1ef29d4ef637bdf397d6
6705 commit de3866383b6720ad4cad83be76fe4c8aa111a249
6706 Author: Darren Tucker <dtucker@dtucker.net>
6707 Date: Mon Mar 1 21:13:24 2021 +1100
6709 Only upload config logs if configure fails.
6711 commit 85ff2a564ce838f8690050081176c1de1fb33116
6712 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6713 Date: Sun Feb 28 22:56:30 2021 +0000
6715 upstream: Add %k to list of keywords. From
6717 =?UTF-8?q?=20Eero=20H=C3=A4kkinenvia=20bz#3267?=
6719 Content-Type: text/plain; charset=UTF-8
6720 Content-Transfer-Encoding: 8bit
6722 OpenBSD-Commit-ID: 9c87f39a048cee2a7d1c8bab951b2f716256865e
6724 commit e774bac35933e71f924f4301786e7fb5bbe1422f
6725 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6726 Date: Sun Feb 28 01:50:47 2021 +0000
6728 upstream: Do not try to reset signal handler for signal 0 in
6730 subprocess. Prevents spurious debug message. ok djm@
6732 OpenBSD-Commit-ID: 7f9785e292dcf304457566ad4637effd27ad1d46
6734 commit 351c5dbbd74ce300c4f058112f9731c867c6e225
6735 Author: djm@openbsd.org <djm@openbsd.org>
6736 Date: Sat Feb 27 23:42:37 2021 +0000
6738 upstream: fix alphabetic ordering of options; spotted by Iain Morgan
6740 OpenBSD-Commit-ID: f955fec617d74af0feb5b275831a9fee813d7ad5
6742 commit 0d1c9dbe578597f8d45d3ac7690df10d32d743e5
6743 Author: Darren Tucker <dtucker@dtucker.net>
6744 Date: Sat Feb 27 12:25:25 2021 +1100
6746 zlib is now optional.
6748 commit b7c6ee7b437d9adfd19ef49d6c0f19f13f26f9b3
6749 Author: Jeffrey H. Johnson <61629094+johnsonjh@users.noreply.github.com>
6750 Date: Sat Feb 27 01:04:58 2021 +0000
6752 Fix punctuatio and typo in README.md.
6754 Some very minor fixes, missing 's' and punctuation.
6756 commit 6248b86074804983e8f7a2058856a516dbfe2924
6757 Author: Damien Miller <djm@mindrot.org>
6758 Date: Fri Feb 26 16:45:50 2021 +1100
6760 Revert "ssh: optional bind interface if bind address specified."
6762 This reverts commit 5a878a71a3528c2626aa1d331934fd964782d41c.
6764 Apologies - I accidentally pushed this.
6766 commit 493339a940b13be6071629c3c2dd5a3b6fc17023
6767 Author: Damien Miller <djm@mindrot.org>
6768 Date: Fri Feb 26 15:45:38 2021 +1100
6770 detech BSD libc hash functions in libbsd / libmd
6772 Some Linux distributions are shipping the BSD-style hashing functions
6773 (e.g. SHA256Update) in libbsd and/or libmd. Detect this situation to
6774 avoid header/replacement clashes later. ok dtucker@
6776 commit 5a878a71a3528c2626aa1d331934fd964782d41c
6777 Author: Dmitrii Turlupov <dturlupov@factor-ts.ru>
6778 Date: Thu Feb 4 16:27:31 2021 +0300
6780 ssh: optional bind interface if bind address specified.
6782 Allows the -b and -B options to be used together.
6783 For example, when the interface is in the VRF.
6785 commit 1fe4d70df94d3bcc2b35fd57cad6b5fc4b2d7b16
6786 Author: djm@openbsd.org <djm@openbsd.org>
6787 Date: Fri Feb 26 04:18:42 2021 +0000
6789 upstream: remove this KEX fuzzer; it's awkward to use and doesn't play
6791 nice with popular fuzzing drivers like libfuzzer. AFAIK nobody has used it
6794 OpenBSD-Regress-ID: cad919522b3ce90c147c95abaf81b0492ac296c9
6796 commit 24a3a67bd7421740d08803b84bd784e764107928
6797 Author: Darren Tucker <dtucker@dtucker.net>
6798 Date: Fri Feb 26 11:49:19 2021 +1100
6800 Remove macos-11.00 PAM test target too.
6802 These are failing apparently due to some kind of infrastructure problem,
6803 making it look like every commit is busted.
6805 commit 473201783f732ca8b0ec528b56aa55fa0d8cf717
6806 Author: djm@openbsd.org <djm@openbsd.org>
6807 Date: Fri Feb 26 00:16:58 2021 +0000
6809 upstream: a bit more debugging behind #ifdef DEBUG_SK
6811 OpenBSD-Commit-ID: d9fbce14945721061cb322f0084c2165d33d1993
6813 commit fd9fa76a344118fe1ef10b9a6c9e85d39599e9a8
6814 Author: Darren Tucker <dtucker@dtucker.net>
6815 Date: Fri Feb 26 01:15:10 2021 +1100
6817 Remove macos-11.0 from the test target list.
6819 It has been consistently failing for the past few days with a github
6820 actions internal error.
6822 commit 476ac8e9d33dbf96ef97aab812b8d7089d0cdc24
6823 Author: Philip Hands <phil@hands.com>
6824 Date: Wed Feb 24 23:43:16 2021 +0100
6826 tidy the $INSTALLKEY_SH code layout a little
6828 SSH-Copy-ID-Upstream: 78178aa5017222773e4c23d9001391eeaeca8983
6830 commit 983e05ef3b81329d76d6a802b39ad0d1f637c06c
6831 Author: Jakub Jelen <jjelen@redhat.com>
6832 Date: Tue Sep 29 10:02:45 2020 +0000
6834 if unable to add a missing newline, fail
6836 SSH-Copy-ID-Upstream: 76b25e18f55499ea9edb4c4d6dc4a80bebc36d95
6838 commit 3594b3b015f6014591da88ba71bf6ff010be7411
6839 Author: Philip Hands <phil@hands.com>
6840 Date: Tue Oct 13 14:12:58 2020 +0200
6842 use $AUTH_KEY_DIR, now that we have it
6844 since that was a change made since jjelen's commit was written
6846 also, quote the variables
6848 SSH-Copy-ID-Upstream: 588cd8e5cbf95f3443d92b9ab27c5d73ceaf6616
6850 commit 333e25f7bc43cee6e36f766e39dad6f9918b318c
6851 Author: Jakub Jelen <jjelen@redhat.com>
6852 Date: Tue Sep 29 10:00:01 2020 +0000
6854 restorecon the correct directory
6856 if using different path for authorized_keys file
6858 SSH-Copy-ID-Upstream: 791a3df47b48412c726bff6f7b1d190721e65d51
6860 commit 9beeab8a37a49a9e3ffb1972fff6621ee5bd7a71
6861 Author: djm@openbsd.org <djm@openbsd.org>
6862 Date: Thu Feb 25 03:27:34 2021 +0000
6864 upstream: s/PubkeyAcceptedKeyTypes/PubkeyAcceptedAlgorithms/
6866 OpenBSD-Regress-ID: 3dbc005fa29f69dc23d97e433b6dffed6fe7cb69
6868 commit 2dd9870c16ddbd83740adeead5030d6840288c8f
6869 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6870 Date: Wed Feb 24 23:12:35 2021 +0000
6872 upstream: Rename pubkeyacceptedkeytypes to pubkeyacceptedalgorithms in
6874 test to match change to config-dump output.
6876 OpenBSD-Regress-ID: 74c9a4ad50306be873d032819d5e55c24eb74d5d
6878 commit b9225c3a1c3f5827e31d5d64a71b8e0504a25619
6879 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6880 Date: Wed Feb 24 01:18:08 2021 +0000
6882 upstream: Put obsolete aliases for hostbasedalgorithms and
6884 pubkeyacceptedalgorithms after their current names so that the config-dump
6885 mode finds and uses the current names. Spotted by Phil Pennock.
6887 OpenBSD-Commit-ID: 5dd10e93cccfaff3aaaa09060c917adff04a9b15
6889 commit 8b8b60542d6652b2c91e0ef9e9cc81bcb65e6b42
6890 Author: djm@openbsd.org <djm@openbsd.org>
6891 Date: Tue Feb 23 21:55:08 2021 +0000
6893 upstream: lots more s/key types/signature algorithms/ mostly in
6895 HostbasedAcceptedAlgorithms and HostKeyAlgorithms; prompted by Jakub Jelen
6897 OpenBSD-Commit-ID: 3f719de4385b1a89e4323b2549c66aae050129cb
6899 commit 0aeb508aaabc4818970c90831e3d21843c3c6d09
6900 Author: djm@openbsd.org <djm@openbsd.org>
6901 Date: Tue Feb 23 21:50:18 2021 +0000
6903 upstream: Correct reference to signature algorithms as keys; from
6907 OpenBSD-Commit-ID: 36f7ecee86fc811aa0f8e21e7a872eee044b4be5
6909 commit f186a020f2ba5f9c462a23293750e29ba0a746b1
6910 Author: Darren Tucker <dtucker@dtucker.net>
6911 Date: Tue Feb 23 16:05:22 2021 +1100
6913 Add a couple more test VMs.
6915 commit ffcdd3d90e74176b3bb22937ad1f65a6c1cd3f9d
6916 Author: Darren Tucker <dtucker@dtucker.net>
6917 Date: Mon Feb 22 08:09:27 2021 +1100
6919 Valgrind test: split and move up list.
6921 Since the valgrind test takes so long it approaches the limit allowed by
6922 github, move it to the head of the list so it's the first one started and
6923 split the longest tests out into a second instance that runs concurrently
6926 commit c3b1636770785cc2830dedd0f22ef7d3d3491d6d
6927 Author: djm@openbsd.org <djm@openbsd.org>
6928 Date: Tue Feb 23 00:05:31 2021 +0000
6930 upstream: warn when the user specifies a ForwardAgent path that does
6932 not exist and exit if ExitOnForwardFailure is set; bz3264
6934 OpenBSD-Commit-ID: 72f7875865e723e464c71bf8692e83110699bf26
6936 commit 5fcb0514949d61aadaf4a89cf16eb78fb47491ec
6937 Author: Darren Tucker <dtucker@dtucker.net>
6938 Date: Sat Feb 20 13:34:02 2021 +1100
6940 Disable rlimit sandbox, doesn't work with valgrind
6942 Only run regress tests, runing unit tests as well makes it run longer
6943 than allowed y github.
6945 commit bb0b9bf45396c19486080d3eb0a159f94de7e6ba
6946 Author: Darren Tucker <dtucker@dtucker.net>
6947 Date: Sat Feb 20 13:06:25 2021 +1100
6949 Upload valgrind logs on failure.
6951 commit ebb3b75e974cb241c6b9b9f5881b09c7bd32b651
6952 Author: Darren Tucker <dtucker@dtucker.net>
6953 Date: Fri Feb 19 22:18:50 2021 +1100
6955 Rename "vm" to "os" in selfhosted to match c-cpp.
6957 Should make it easier to share code or maybe merge at some point.
6959 commit 76c0be0fe0465cb2b975dbd409f8d38b55e55bcb
6960 Author: Darren Tucker <dtucker@dtucker.net>
6961 Date: Fri Feb 19 22:15:22 2021 +1100
6963 Upload regress failure logs in c-cpp too.
6965 commit 8751b6c3136f5225c40f41bbf29aa29e15795f6e
6966 Author: Darren Tucker <dtucker@dtucker.net>
6967 Date: Fri Feb 19 22:13:36 2021 +1100
6969 Comment out Solaris 64bit PAM build...
6971 until I can figure out why it's failing.
6973 commit e9f6d563c06886b277c6b9abafa99fa80726dc48
6974 Author: Darren Tucker <dtucker@dtucker.net>
6975 Date: Fri Feb 19 10:20:17 2021 +1100
6977 Actually run Valgrind tests.
6979 commit 41d232e226624f1a81c17091c36b44c9010aae62
6980 Author: Darren Tucker <dtucker@dtucker.net>
6981 Date: Fri Feb 19 10:16:56 2021 +1100
6983 Add test against Valgrind.
6985 commit e6528d91f12fba05f0ea64224091c9d0f38bdf1d
6986 Author: Darren Tucker <dtucker@dtucker.net>
6987 Date: Thu Feb 18 16:30:01 2021 +1100
6989 Add fbsd12 test target.
6991 commit 6506cb2798d98ff03a7cc06567c392a81f540680
6992 Author: Darren Tucker <dtucker@dtucker.net>
6993 Date: Thu Feb 18 15:21:13 2021 +1100
6997 commit 93c31a623973b0fad508214593aab6ca94b11dcb
6998 Author: Darren Tucker <dtucker@dtucker.net>
6999 Date: Thu Feb 18 14:54:07 2021 +1100
7001 Add DEBUG_SK to kitchensink builds.
7003 commit 65085740d3574eeb3289d592f042df62c2689bb0
7004 Author: Darren Tucker <dtucker@dtucker.net>
7005 Date: Thu Feb 18 14:53:14 2021 +1100
7007 Add bbone test target (arm32).
7009 commit 63238f5aed66148b8d6ca7bd5fb347d624200155
7010 Author: djm@openbsd.org <djm@openbsd.org>
7011 Date: Thu Feb 18 02:49:35 2021 +0000
7013 upstream: Fix the hostkeys rotation extension documentation
7015 The documentation was lacking the needed want-reply field in the initial
7018 https://github.com/openssh/openssh-portable/pull/218 by dbussink
7020 OpenBSD-Commit-ID: 051824fd78edf6d647a0b9ac011bf88e28775054
7022 commit 34c5ef6e2d06d9f0e20cb04a9aebf67a6f96609a
7023 Author: djm@openbsd.org <djm@openbsd.org>
7024 Date: Thu Feb 18 02:15:07 2021 +0000
7026 upstream: make names in function prototypes match those in
7028 definition from https://github.com/openssh/openssh-portable/pull/225 by
7031 OpenBSD-Commit-ID: 7c736307bf3f2c7cb24d6f82f244eee959485acd
7033 commit 88e3d4de31ab4f14cac658e9e0c512043b15b146
7034 Author: djm@openbsd.org <djm@openbsd.org>
7035 Date: Thu Feb 18 02:13:58 2021 +0000
7037 upstream: unbreak SK_DEBUG builds
7039 from https://github.com/openssh/openssh-portable/pull/225 by
7042 OpenBSD-Commit-ID: 28d7259ce1b04d025411464decfa2f1a097b43eb
7044 commit 788cbc5b74a53956ba9fff11e1ca506271a3597f
7045 Author: djm@openbsd.org <djm@openbsd.org>
7046 Date: Thu Feb 18 00:30:17 2021 +0000
7048 upstream: sftp-server: implement limits@openssh.com extension
7050 This is a simple extension that allows the server to clearly
7051 communicate transfer limits it is imposing so the client doesn't
7052 have to guess, or force the user to manually tune. This is
7053 particularly useful when an attempt to use too large of a value
7054 causes the server to abort the connection.
7056 Patch from Mike Frysinger; ok dtucker@
7058 OpenBSD-Commit-ID: f96293221e5aa24102d9bf30e4f4ef04d5f4fb51
7060 commit 324449a68d510720d0e4dfcc8e9e5a702fe6a48f
7061 Author: Damien Miller <djm@mindrot.org>
7062 Date: Thu Feb 18 12:06:25 2021 +1100
7064 support OpenSSL 3.x cipher IV API change
7066 OpenSSL renamed the "get current CIPHER_CTX" IV operation in 3.x.
7067 This uses the new name if available.
7069 https://github.com/openssl/openssl/issues/13411
7073 commit 845fe9811c047063d935eca89188ed55c993626b
7074 Author: Damien Miller <djm@mindrot.org>
7075 Date: Thu Feb 18 11:25:38 2021 +1100
7077 prefer login_getpwclass() to login_getclass()
7079 FreeBSD has login_getpwclass() that does some special magic for
7080 UID=0. Prefer this to login_getclass() as its easier to emulate
7081 the former with the latter.
7083 Based on FreeBSD PR 37416 via Ed Maste; ok dtucker@
7085 commit d0763c8d566119cce84d9806e419badf20444b02
7086 Author: Darren Tucker <dtucker@dtucker.net>
7087 Date: Thu Feb 18 10:45:27 2021 +1100
7089 Fixing quoting for installing moduli on target guest.
7091 commit b3afc243bc820f323a09e3218e9ec8a30a3c1933
7092 Author: Darren Tucker <dtucker@dtucker.net>
7093 Date: Thu Feb 18 10:27:16 2021 +1100
7095 Install moduli on target not host.
7097 commit f060c2bc85d59d111fa18a12eb3872ee4b9f7e97
7098 Author: Damien Miller <djm@mindrot.org>
7099 Date: Thu Feb 18 10:33:58 2021 +1100
7101 don't free string returned by login_getcapstr(3)
7103 OpenBSD and NetBSD require the caller to free strings returned
7104 bu the login_* functions, but FreeBSD requires that callers don't.
7106 Fortunately in this case, we can harmlessly leak as the process is
7107 about to exec the shell/command.
7109 From https://reviews.freebsd.org/D28617 via Ed Maste; ok dtucker@
7111 commit bc9b0c25703215501da28aa7a6539f96c0fa656f
7112 Author: Darren Tucker <dtucker@dtucker.net>
7113 Date: Thu Feb 18 10:10:00 2021 +1100
7115 Skip unit tests on sol11 to speed things up.
7117 commit 161873035c12cc22211fc73d07170ade47746bc5
7118 Author: Darren Tucker <dtucker@dtucker.net>
7119 Date: Thu Feb 18 10:09:27 2021 +1100
7121 Remove SKIP_UNIT as it needs to be a make arg.
7123 commit 1c293868e4b4e8e74e3ea15b8dff90f6b089967a
7124 Author: Darren Tucker <dtucker@dtucker.net>
7125 Date: Thu Feb 18 10:05:03 2021 +1100
7127 Always intall moduli.
7129 Allows us to run tests without falling back to a fixed modulus. Ensure that
7130 the directory exists.
7132 commit 5c8f41ad100601ec2fdcbccdfe92890c31f81bbe
7133 Author: Darren Tucker <dtucker@dtucker.net>
7134 Date: Thu Feb 18 09:59:09 2021 +1100
7136 Quote SSHD_CONFOPTS in case it contains spaces.
7138 commit 4653116c1f5384ea7006e6396d9b53c33d218975
7139 Author: Darren Tucker <dtucker@dtucker.net>
7140 Date: Thu Feb 18 09:51:18 2021 +1100
7142 Fix labels on targets (dots vs underscores).
7144 commit 4512047f57ca3c6e8cd68f0cc69be59e98b25287
7145 Author: Darren Tucker <dtucker@dtucker.net>
7146 Date: Wed Feb 17 21:47:48 2021 +1100
7148 More compact representation of config matrix.
7150 commit 0406cd09f05c2e419b113dd4c0eac8bc34ec915b
7151 Author: Darren Tucker <dtucker@dtucker.net>
7152 Date: Wed Feb 17 21:19:18 2021 +1100
7154 Skip unit tests on hosted VMs to speed things up.
7156 commit 4582612e6147d766c336198c498740242fb8f1ec
7157 Author: Darren Tucker <dtucker@dtucker.net>
7158 Date: Wed Feb 17 20:21:29 2021 +1100
7160 Merge macos and ubuntu tests.
7162 commit 09f4b84654b71099559492e9aed5e1a38bf24815
7163 Author: Darren Tucker <dtucker@dtucker.net>
7164 Date: Wed Feb 17 18:41:30 2021 +1100
7166 Convert most github hosted tests to new config structure.
7168 commit 65380ff7e054be1454e5ab4fd7bb9c66f8fcbaa9
7169 Author: Darren Tucker <dtucker@dtucker.net>
7170 Date: Wed Feb 17 18:27:36 2021 +1100
7172 Only run selfhosted tests from selfhosted repo.
7174 commit f031366535650b88248ed7dbf23033afdf466240
7175 Author: Darren Tucker <dtucker@dtucker.net>
7176 Date: Fri Jan 15 14:11:43 2021 +1100
7178 Add self-hosted runners for VMs of other platforms.
7180 Github only hosts a limited number of platforms, and the runner code
7181 is only supported on slightly wider range of platforms. To increase
7182 our test coverage beyond that, we run the runner natively on a VM host,
7183 where it runs a jobs that boot VMs of other platforms, waits for them
7184 to come up then runs the build and test by ssh'ing into the guest.
7185 This means that the minimum dependencies for the guests are quite low
7186 (basically just sshd, a compiler and make).
7188 The interface to the VM host is fairly simple (basically 3 scripts:
7189 vmstartup, vmrun and vmshutdown), but those are specific to the VM host
7190 so are not in the public repo. We also mount the working directory on the
7191 host via sshfs, so things like artifact upload by the runner also work.
7193 As part of this we are moving the per-test-target configs into a single
7194 place (.github/configs) where there will be referenced by a single short
7195 "config" key. I plan to make the github-hosted runners use this too.
7197 The self-hosted runners are run off a private repo on github since that
7198 prevents third parties from accessing them[0], and since runner quota is
7199 limited on private repos, we avoid running the tests we run on the public
7202 [0] https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories
7204 commit 64bbd7444d658ef7ee14a7ea5ccc7f5810279ee7
7205 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7206 Date: Wed Feb 17 03:59:00 2021 +0000
7208 upstream: Make sure puttygen is new enough to successfully run the
7210 PuTTY interop tests, otherwise skip them.
7212 OpenBSD-Regress-ID: 34565bb50b8aec58331ed02a5e9e0a9a929bef51
7214 commit da0a9afcc446a30ca49dd216612c41ac3cb1f2d4
7215 Author: markus@openbsd.org <markus@openbsd.org>
7216 Date: Mon Feb 15 20:43:15 2021 +0000
7218 upstream: ssh: add PermitRemoteOpen for remote dynamic forwarding
7220 with SOCKS ok djm@, dtucker@
7222 OpenBSD-Commit-ID: 64fe7b6360acc4ea56aa61b66498b5ecc0a96a7c
7224 commit b696858a7f9db72a83d02cb6edaca4b30a91b386
7225 Author: markus@openbsd.org <markus@openbsd.org>
7226 Date: Mon Feb 15 20:36:35 2021 +0000
7228 upstream: factor out opt_array_append; ok djm@
7230 OpenBSD-Commit-ID: 571bc5dd35f99c5cf9de6aaeac428b168218e74a
7232 commit ad74fc127cc45567e170e8c6dfa2cfd9767324ec
7233 Author: dlg@openbsd.org <dlg@openbsd.org>
7234 Date: Mon Feb 15 11:09:22 2021 +0000
7236 upstream: ProxyJump takes "none" to disable processing like
7242 OpenBSD-Commit-ID: 941a2399da2193356bdc30b879d6e1692f18b6d3
7244 commit 16eacdb016ccf38dd9959c78edd3a6282513aa53
7245 Author: djm@openbsd.org <djm@openbsd.org>
7246 Date: Fri Feb 12 03:49:09 2021 +0000
7248 upstream: sftp: add missing lsetstat@openssh.com documentation
7250 patch from Mike Frysinger
7252 OpenBSD-Commit-ID: 9c114db88d505864075bfe7888b7c8745549715b
7254 commit e04fd6dde16de1cdc5a4d9946397ff60d96568db
7255 Author: djm@openbsd.org <djm@openbsd.org>
7256 Date: Fri Feb 12 03:14:18 2021 +0000
7258 upstream: factor SSH_AGENT_CONSTRAIN_EXTENSION parsing into its own
7260 function and remove an unused variable; ok dtucker@
7262 OpenBSD-Commit-ID: e1a938657fbf7ef0ba5e73b30365734a0cc96559
7264 commit 1bb130ed34721d46452529d094d9bbf045607d79
7265 Author: Darren Tucker <dtucker@dtucker.net>
7266 Date: Thu Feb 11 10:18:05 2021 +1100
7268 Add __NR_futex_time64 to seccomp sandbox.
7270 This is apparently needed for (some) 32 bit platforms with glibc 2.33.
7271 Patch from nix at esperi.org.uk and jjelen at redhat.com via bz#3260.
7273 commit f88a7a431212a16e572ecabd559e632f369c363e
7274 Author: Darren Tucker <dtucker@dtucker.net>
7275 Date: Sat Feb 6 09:37:01 2021 +1100
7277 Add a hostname function for systems that don't have it.
7279 Some systems don't have a hostname command (it's not required by POSIX).
7280 The do have uname -n (which is), but as found by tim@ some others (eg
7281 UnixWare) do not report the FQDN from uname -n.
7283 commit 5e385a71ef2317856f37c91a98658eb12eb5a89c
7284 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7285 Date: Fri Feb 5 22:03:40 2021 +0000
7287 upstream: Roll back the hostname->uname change in rev 1.10. It turns
7289 out uname -n doesn't do what we need for some platforms in portable, so we'll
7290 fix the original problem (that some other platforms don't have hostname at
7291 all) by providing wrapper function to implement it.
7293 OpenBSD-Regress-ID: 827a707d6201d5a8e196a8c28aec1d2c76c52341
7295 commit b446c214279de50ed8388e54897eb1be5281c894
7296 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7297 Date: Fri Feb 5 06:01:58 2021 +0000
7299 upstream: hostname is not specified by POSIX but uname -n is, so use
7301 the latter for portability. Patch from Geert Hendrickx via github PR#208.
7303 OpenBSD-Regress-ID: d6a79c7c4d141a0d05ade4a042eb57dddbce89f3
7305 commit 1cb6ce98d658e5fbdae025a3bd65793980e3b5d9
7306 Author: David Carlier <devnexen@gmail.com>
7307 Date: Sat Nov 21 12:22:23 2020 +0000
7309 Using explicit_memset for the explicit_bzero compatibility layer.
7311 Favoriting the native implementation in this case.
7313 commit 2e0beff67def2120f4b051b1016d7fbf84823e78
7314 Author: Luca Weiss <luca@z3ntu.xyz>
7315 Date: Sun Nov 8 14:19:23 2020 +0100
7317 Deny (non-fatal) statx in preauth privsep child.
7319 commit a35d3e911e193a652bd09eed40907e3e165b0a7b
7320 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7321 Date: Fri Feb 5 02:20:23 2021 +0000
7323 upstream: Remove debug message from sigchld handler. While this
7325 works on OpenBSD it can cause problems on other platforms. From kircherlike
7326 at outlook.com via bz#3259, ok djm@
7328 OpenBSD-Commit-ID: 3e241d7ac1ee77e3de3651780b5dc47b283a7668
7330 commit 69338ab46afe9e3dfb7762ad65351d854077c998
7331 Author: djm@openbsd.org <djm@openbsd.org>
7332 Date: Tue Feb 2 22:36:59 2021 +0000
7334 upstream: whitespace
7336 OpenBSD-Commit-ID: 544bb092e03fcbecb420196cd0f70af13ea868ad
7338 commit f71219a01d8f71c4b3ed7e456337a84ddba1653e
7339 Author: djm@openbsd.org <djm@openbsd.org>
7340 Date: Tue Feb 2 22:36:46 2021 +0000
7342 upstream: fix memleaks in private key deserialisation; enforce more
7344 consistency between redundant fields in private key certificate and private
7345 key body; ok markus@
7347 OpenBSD-Commit-ID: dec344e414d47f0a7adc13aecf3760fe58101240
7349 commit 3287790e78bf5b53c4a3cafb67bb5aa03e3910f0
7350 Author: djm@openbsd.org <djm@openbsd.org>
7351 Date: Tue Feb 2 22:35:14 2021 +0000
7353 upstream: memleak on error path; ok markus@
7355 OpenBSD-Commit-ID: 2091a36d6ca3980c81891a6c4bdc544e63cb13a8
7357 commit 3dd0c64e08f1bba21d71996d635c7256c8c139d1
7358 Author: djm@openbsd.org <djm@openbsd.org>
7359 Date: Sun Jan 31 22:55:29 2021 +0000
7361 upstream: more strictly enforce KEX state-machine by banning packet
7363 types once they are received. Fixes memleak caused by duplicate
7364 SSH2_MSG_KEX_DH_GEX_REQUEST (spotted by portable OpenSSH kex_fuzz via
7369 OpenBSD-Commit-ID: 87331c715c095b587d5c88724694cdeb701c9def
7371 commit 7a92a324a2e351fabd0ba8ef9b434d3b12d54ee3
7372 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7373 Date: Sun Jan 31 10:50:10 2021 +0000
7375 upstream: Set linesize returned by getline to zero when freeing and
7377 NULLing the returned string. OpenBSD's getline handles this just fine, but
7378 some implementations used by -portable do not. ok djm@
7380 OpenBSD-Commit-ID: 4d7bd5169d3397654247db9655cc69a9908d165c
7382 commit a5dfc5bae8c16e2a7caf564758d812c7672480b5
7383 Author: Damien Miller <djm@mindrot.org>
7384 Date: Sat Jan 30 16:32:29 2021 +1100
7386 allow a fuzz case to contain more than one request
7388 loop until input buffer empty, no message consumed or 256 messages
7391 commit 0ef24ad60204022f7e33b6e9d171172c50514132
7392 Author: Damien Miller <djm@mindrot.org>
7393 Date: Sat Jan 30 16:28:23 2021 +1100
7395 expect fuzz cases to have length prefix
7397 might make life a little easier for the fuzzer, e.g. it can now
7398 produce valid (multi-request) messages by smashing two cases together.
7400 commit de613f2713d2dfcd3b03c00e5558a40997f52712
7401 Author: Damien Miller <djm@mindrot.org>
7402 Date: Sat Jan 30 12:03:30 2021 +1100
7406 commit 7e96c877bcb2fb645355a687b8cb7347987c1c58
7407 Author: Damien Miller <djm@mindrot.org>
7408 Date: Sat Jan 30 12:02:46 2021 +1100
7410 move keys out of kex_fuzz.cc into separate header
7412 add certificates and missing key types
7414 commit 76f46d75664fdaa1112739ca523ff85ee4eb52b4
7415 Author: Damien Miller <djm@mindrot.org>
7416 Date: Sat Jan 30 12:02:10 2021 +1100
7418 some fixed test data (mostly keys) for fuzzing
7420 commit 7c2e3d6de1f2edb0c8b4725b4c2b56360e032b19
7421 Author: djm@openbsd.org <djm@openbsd.org>
7422 Date: Sat Jan 30 00:56:38 2021 +0000
7424 upstream: add a SK_DUMMY_INTEGRATE define that allows the dummy
7426 security key middleware to be directly linked; useful for writing fuzzers,
7429 OpenBSD-Regress-ID: 0ebd00159b58ebd85e61d8270fc02f1e45df1544
7431 commit 1a4b92758690faa12f49079dd3b72567f909466d
7432 Author: djm@openbsd.org <djm@openbsd.org>
7433 Date: Fri Jan 29 06:29:46 2021 +0000
7435 upstream: fix the values of enum sock_type
7437 OpenBSD-Commit-ID: 18d048f4dbfbb159ff500cfc2700b8fb1407facd
7439 commit 8afaa7d7918419d3da6c0477b83db2159879cb33
7440 Author: djm@openbsd.org <djm@openbsd.org>
7441 Date: Fri Jan 29 06:28:10 2021 +0000
7443 upstream: give typedef'd struct a struct name; makes the fuzzer I'm
7445 writing a bit easier
7447 OpenBSD-Commit-ID: 1052ab521505a4d8384d67acb3974ef81b8896cb
7449 commit 1e660115f0c7c4a750cd31e468ff889f33dd8088
7450 Author: Damien Miller <djm@mindrot.org>
7451 Date: Fri Jan 29 11:09:14 2021 +1100
7453 fuzz diffie-hellman-group-exchange-sha1 kex too
7455 commit be5f0048ea2aaeddd27be7dcca23aaad345fa16c
7456 Author: Damien Miller <djm@mindrot.org>
7457 Date: Fri Jan 29 11:03:35 2021 +1100
7459 support for running kex fuzzer with null cipher
7461 commit 3d59e88c0e42182c3749b446ccd9027933c84be4
7462 Author: Darren Tucker <dtucker@dtucker.net>
7463 Date: Thu Jan 28 20:55:16 2021 +1100
7465 make with -j2 to use available CPUs.
7467 commit 66dd9ddb5d2ea8c407908c8e8468c9d6e71db05b
7468 Author: Darren Tucker <dtucker@dtucker.net>
7469 Date: Thu Jan 28 14:31:01 2021 +1100
7471 Add test against openssl head and libressl head.
7473 commit 237dbb34e24b6b7ea888d54bda4d17da0a0fd0fa
7474 Author: Darren Tucker <dtucker@dtucker.net>
7475 Date: Thu Jan 28 14:30:50 2021 +1100
7479 commit d983e1732b8135d7ee8d92290d6dce35f736ab88
7480 Author: djm@openbsd.org <djm@openbsd.org>
7481 Date: Wed Jan 27 23:49:46 2021 +0000
7483 upstream: fix leak: was double allocating kex->session_id buffer
7485 OpenBSD-Commit-ID: 3765f4cc3ae1df874dba9102a3588ba7b48b8183
7487 commit 1134a48cdcef8e7363b9f6c73ebdd24405066738
7488 Author: Damien Miller <djm@mindrot.org>
7489 Date: Thu Jan 28 08:57:31 2021 +1100
7491 correct kex name in disabled code
7493 commit 67f47f1965abafc1830a287761125c2f4790857e
7494 Author: djm@openbsd.org <djm@openbsd.org>
7495 Date: Wed Jan 27 10:15:08 2021 +0000
7497 upstream: this needs kex.h now
7499 OpenBSD-Commit-ID: c5a42166c5aa002197217421a971e48be7cb5d41
7501 commit 39be3dc209f28f9c1ebfeba42adde8963b01e1cd
7502 Author: djm@openbsd.org <djm@openbsd.org>
7503 Date: Wed Jan 27 10:05:28 2021 +0000
7505 upstream: make ssh->kex->session_id a sshbuf instead of u_char*/size_t
7507 and use that instead of global variables containing copies of it. feedback/ok
7510 OpenBSD-Commit-ID: a4b1b1ca4afd2e37cb9f64f737b30a6a7f96af68
7512 commit 4ca6a1fac328477c642329676d6469dba59019a3
7513 Author: djm@openbsd.org <djm@openbsd.org>
7514 Date: Wed Jan 27 09:26:53 2021 +0000
7516 upstream: remove global variable used to stash compat flags and use the
7518 purpose-built ssh->compat variable instead; feedback/ok markus@
7520 OpenBSD-Commit-ID: 7c4f200e112dae6bcf99f5bae1a5629288378a06
7522 commit bba229b6f3328171f5e3ae85de443002523c0452
7523 Author: Darren Tucker <dtucker@dtucker.net>
7524 Date: Wed Jan 27 12:34:07 2021 +1100
7526 Install moduli file before tests.
7528 Reduces warnings during test runs.
7530 commit 1b83185593a90a73860a503d753a95ca6d726c00
7531 Author: Darren Tucker <dtucker@dtucker.net>
7532 Date: Wed Jan 27 11:58:26 2021 +1100
7534 Run one test with -Werror to catch warnings.
7536 commit d1532d90074b212054d5fd965f833231b09982f5
7537 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7538 Date: Wed Jan 27 00:37:26 2021 +0000
7540 upstream: Logical not bitwise or. ok djm@
7542 OpenBSD-Commit-ID: d4dc855cf04951b93c45caa383e1ac9af0a3b0e5
7544 commit 507b448a2465a53ab03a88acbc71cc51b48ca6ac
7545 Author: naddy@openbsd.org <naddy@openbsd.org>
7546 Date: Tue Jan 26 15:40:17 2021 +0000
7548 upstream: move HostbasedAcceptedAlgorithms to the right place in
7552 OpenBSD-Commit-ID: d766820d33dd874d944c14b0638239adb522c7ec
7554 commit e26c980778b228bdd42b8353cc70101cf49b731b
7555 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7556 Date: Tue Jan 26 11:25:01 2021 +0000
7558 upstream: Remove unused variables leftover from refactoring. ok
7562 OpenBSD-Commit-ID: 8b3ad58bff828fcf874e54b2fc27a4cf1d9505e8
7564 commit e9f78d6b06fc323bba1890b2dc3b8423138fb35c
7565 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7566 Date: Tue Jan 26 05:32:21 2021 +0000
7568 upstream: Rename HostbasedKeyTypes (ssh) and
7570 HostbasedAcceptedKeyTypes (sshd) to HostbasedAcceptedAlgorithms, which more
7571 accurately reflects its effect. This matches a previous change to
7572 PubkeyAcceptedAlgorithms. The previous names are retained as aliases. ok
7575 OpenBSD-Commit-ID: 49451c382adc6e69d3fa0e0663eeef2daa4b199e
7577 commit 48d0d7a4dd31154c4208ec39029d60646192f978
7578 Author: Darren Tucker <dtucker@dtucker.net>
7579 Date: Tue Jan 26 14:48:07 2021 +1100
7581 Disable sntrup761 if compiler doesn't support VLAs.
7583 The sntrup761 code sourced from supercop uses variable length
7584 arrays. Although widely supported, they are not part of the ANSI
7585 C89 spec so if the compiler does not support VLAs, disable the
7586 sntrup761x25519-sha512@openssh.com KEX method by replacing the kex
7587 functions with no-op ones similar to what we do in kexecdh.c.
7589 This should allow OpenSSH to build with a plain C89 compiler again.
7590 Spotted by tim@, ok djm@.
7592 commit 37c70ea8d4f3664a88141bcdf0bf7a16bd5fd1ac
7593 Author: djm@openbsd.org <djm@openbsd.org>
7594 Date: Tue Jan 26 00:54:49 2021 +0000
7596 upstream: refactor key constraint parsing in ssh-agent
7598 Key constraints parsing code previously existed in both the "add regular
7599 key" and "add smartcard key" path. This unifies them but also introduces
7600 more consistency checking: duplicated constraints and constraints that
7601 are nonsensical for a particular situation (e.g. FIDO provider for a
7602 smartcard key) are now banned.
7606 OpenBSD-Commit-ID: 511cb1b1c021ee1d51a4c2d649b937445de7983c
7608 commit e0e8bee8024fa9e31974244d14f03d799e5c0775
7609 Author: djm@openbsd.org <djm@openbsd.org>
7610 Date: Tue Jan 26 00:53:31 2021 +0000
7612 upstream: more ssh-agent refactoring
7614 Allow confirm_key() to accept an additional reason suffix
7616 Factor publickey userauth parsing out into its own function and allow
7617 it to optionally return things it parsed out of the message to its
7622 OpenBSD-Commit-ID: 29006515617d1aa2d8b85cd2bf667e849146477e
7624 commit dfe18a295542c169ffde8533b3d7fe42088e2de7
7625 Author: djm@openbsd.org <djm@openbsd.org>
7626 Date: Tue Jan 26 00:51:30 2021 +0000
7628 upstream: make struct hostkeys public; I have no idea why I made it
7634 OpenBSD-Commit-ID: e50780b34d4bbe628d69b2405b024dd749d982f3
7636 commit 3b44f2513cae89c920e8fe927b9bc910a1c8c65a
7637 Author: djm@openbsd.org <djm@openbsd.org>
7638 Date: Tue Jan 26 00:49:30 2021 +0000
7640 upstream: move check_host_cert() from sshconnect,c to sshkey.c and
7642 refactor it to make it more generally usable and testable.
7646 OpenBSD-Commit-ID: 536f489f5ff38808c1fa711ba58d4579b636f9e4
7648 commit 1fe16fd61bb53944ec510882acc0491abd66ff76
7649 Author: djm@openbsd.org <djm@openbsd.org>
7650 Date: Tue Jan 26 00:47:47 2021 +0000
7652 upstream: use recallocarray to allocate the agent sockets table;
7654 also clear socket entries that are being marked as unused.
7656 spinkle in some debug2() spam to make it easier to watch an agent
7661 OpenBSD-Commit-ID: 74582c8e82e96afea46f6c7b6813a429cbc75922
7663 commit cb7b22ea20a01332c81c0ddcb3555ad50de9cce2
7664 Author: djm@openbsd.org <djm@openbsd.org>
7665 Date: Tue Jan 26 00:46:17 2021 +0000
7667 upstream: factor out common code in the agent client
7669 Add a ssh_request_reply_decode() function that sends a message to
7670 the agent, reads and parses a success/failure reply.
7671 Use it for all requests that only expect success/failure
7675 OpenBSD-Commit-ID: e0c1f4d5e6cfa525d62581e2b8de93be0cb85adb
7677 commit d1e578afe7cd48140ad6e92a453f9b035363fd7f
7678 Author: djm@openbsd.org <djm@openbsd.org>
7679 Date: Mon Jan 25 06:00:17 2021 +0000
7681 upstream: make ssh hostbased authentication send the signature
7683 algorithm in its SSH2_MSG_USERAUTH_REQUEST packets instead of the key type.
7684 This make HostbasedAcceptedAlgorithms do what it is supposed to - filter on
7685 signature algorithm and not key type.
7687 spotted with dtucker@ ok markus@
7689 OpenBSD-Commit-ID: 25bffe19f0326972f5728170f7da81d5f45c78c6
7691 commit 95eca1e195a3b41baa1a725c2c5af8a09d885e4b
7692 Author: Darren Tucker <dtucker@dtucker.net>
7693 Date: Sat Jan 23 18:26:05 2021 +1100
7695 ifdef new instance of sin6_scope_id
7697 Put inside HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID similar to
7698 existing instance. Should fix error on UnixWare 7.
7700 commit 6ffdcdda128045226dda7fbb3956407978028a1e
7701 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7702 Date: Mon Jan 18 11:43:34 2021 +0000
7704 upstream: Fix long->int for convtime tests here too. Spotted by
7708 OpenBSD-Regress-ID: a87094f5863312d00938afba771d25f788c849d0
7710 commit b55b7565f15327d82ad7acbddafa90b658c5f0af
7711 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7712 Date: Fri Jan 22 02:46:40 2021 +0000
7714 upstream: PubkeyAcceptedKeyTypes->PubkeyAcceptedAlgorithms
7718 OpenBSD-Commit-ID: 3b64a640f8ce8c21d9314da9df7ce2420eefde3a
7720 commit ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec
7721 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7722 Date: Fri Jan 22 02:44:58 2021 +0000
7724 upstream: Rename PubkeyAcceptedKeyTypes keyword to
7726 PubkeyAcceptedAlgorithms. While the two were originally equivalent, this
7727 actually specifies the signature algorithms that are accepted. Some key
7728 types (eg RSA) can be used by multiple algorithms (eg ssh-rsa, rsa-sha2-512)
7729 so the old name is becoming increasingly misleading. The old name is
7730 retained as an alias. Prompted by bz#3253, help & ok djm@, man page help jmc@
7732 OpenBSD-Commit-ID: 0346b2f73f54c43d4e001089759d149bfe402ca5
7734 commit a8e798feabe36d02de292bcfd274712cae1d8d17
7735 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7736 Date: Fri Jan 15 02:58:11 2021 +0000
7738 upstream: Change types in convtime() unit test to int to match change
7740 its new type. Add tests for boundary conditions and fix convtime to work up
7743 OpenBSD-Regress-ID: ba2b81e9a3257fff204b020affe85b604a44f97e
7745 commit 9bde1a420626da5007bf7ab499fa2159b9eddf72
7746 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7747 Date: Fri Jan 15 04:31:25 2021 +0000
7749 upstream: Make output buffer larger to prevent potential truncation
7751 warnings from compilers not smart enough to know the strftime calls won't
7752 ever fully fill "to" and "from". ok djm@
7754 OpenBSD-Commit-ID: 83733f1b01b82da88b9dd1769475952aff10bdd7
7756 commit 02da325f10b214219eae2bb1bc2d3bf0c2f13f9f
7757 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7758 Date: Fri Jan 15 02:58:11 2021 +0000
7760 upstream: Change types in convtime() unit test to int to match
7762 change its new type. Add tests for boundary conditions and fix convtime to
7763 work up to INT_MAX. ok djm@
7765 OpenBSD-Commit-ID: 01dc0475f1484ac2f47facdfcf9221f9472145de
7767 commit 5339ab369c225b40bc64d5ec3374f5c91b3ad609
7768 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7769 Date: Fri Jan 15 02:32:41 2021 +0000
7771 upstream: In waitfd(), when poll returns early we are subtracting
7773 the elapsed time from the timeout each loop, so we only want to measure the
7774 elapsed time the poll() in that loop, not since the start of the function.
7775 Spotted by chris.xj.zhu at gmail.com, ok djm@
7777 OpenBSD-Commit-ID: 199df060978ee9aa89b8041a3dfaf1bf7ae8dd7a
7779 commit a164862dfa863b54b7897f66e1dd75437f086c11
7780 Author: rob@openbsd.org <rob@openbsd.org>
7781 Date: Thu Jan 14 19:45:06 2021 +0000
7783 upstream: Minor grammatical correction.
7787 OpenBSD-Commit-ID: de0fad0581e212b2750751e479b79c18ff8cac02
7789 commit 8635e7df7e3a3fbb4a4f6cd5a7202883b2506087
7790 Author: Darren Tucker <dtucker@dtucker.net>
7791 Date: Wed Jan 13 18:00:57 2021 +1100
7793 Merge Mac OS X targets into a single config.
7795 commit ac112ade990585c511048ed4edaf2d9fc92b61f0
7796 Author: Darren Tucker <dtucker@dtucker.net>
7797 Date: Tue Jan 12 19:22:47 2021 +1100
7799 Add Mac OS X test targets.
7801 commit 1050109b4b2884bf50fd1b3aa084c7fd0a42ae90
7802 Author: anatasluo <luolongjuna@gmail.com>
7803 Date: Mon Jan 11 13:51:39 2021 +0000
7805 Remove duplicated declaration in fatal.c .
7807 commit 7d0f8a3369579dfe398536eb4e3da7bc15da9599
7808 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7809 Date: Mon Jan 11 04:48:22 2021 +0000
7811 upstream: Correct spelling of persourcenetblocksize in config-dump
7815 OpenBSD-Commit-ID: ecdc49e2b6bde6b6b0e52163d621831f6ac7b13d
7817 commit ba328bd7a6774f30daaf90b83f1933cc4afc866c
7818 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7819 Date: Sat Jan 9 12:31:46 2021 +0000
7821 upstream: Adjust kexfuzz to addr.c/addrmatch.c split.
7823 OpenBSD-Regress-ID: 1d8d23bb548078020be2fb52c4c643efb190f0eb
7825 commit b08ef25552443e94c0857d5e3806dd019ccc55d7
7826 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7827 Date: Sat Jan 9 12:24:30 2021 +0000
7829 upstream: Update unittests for addr.c/addrmatch.c split.
7831 OpenBSD-Regress-ID: de2b415fb7af084a91c6ef147a90482d8f771eef
7833 commit 6d30673fedec2d251f4962c526fd0451f70c4d97
7834 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7835 Date: Mon Jan 11 02:12:57 2021 +0000
7837 upstream: Change convtime() from returning long to returning int.
7839 On platforms where sizeof(int) != sizeof(long), convtime could accept values
7840 >MAX_INT which subsequently truncate when stored in an int during config
7841 parsing. bz#3250, ok djm@
7843 OpenBSD-Commit-ID: 8fc932683d6b4660d52f50911d62bd6639c5db31
7845 commit 7a57adb8b07b2ad0aead4b2e09ee18edc04d0481
7846 Author: jmc@openbsd.org <jmc@openbsd.org>
7847 Date: Sat Jan 9 12:51:12 2021 +0000
7849 upstream: add a comma to previous;
7851 OpenBSD-Commit-ID: 9139433701c0aa86a0d3a6c7afe10d1c9c2e0869
7853 commit 3a923129534b007c2e24176a8655dec74eca9c46
7854 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7855 Date: Sat Jan 9 12:10:02 2021 +0000
7857 upstream: Add PerSourceMaxStartups and PerSourceNetBlockSize
7859 options which provide more fine grained MaxStartups limits. Man page help
7860 jmc@, feedback & ok djm@
7862 OpenBSD-Commit-ID: e2f68664e3d02c0895b35aa751c48a2af622047b
7864 commit d9a2bc71693ea27461a78110005d5a2d8b0c6a50
7865 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7866 Date: Sat Jan 9 11:58:50 2021 +0000
7868 upstream: Move address handling functions out into their own file
7870 in order to reuse them for per-source maxstartups limiting. Supplement with
7871 some additional functions from djm's flowtools that we'll also need. ok djm@
7872 (as part of a larger diff).
7874 OpenBSD-Commit-ID: e3e7d9ccc6c9b82e25cfef0ec83598e8e2327cbf
7876 commit b744914fcb76d70761f1b667de95841b3fc80a56
7877 Author: Darren Tucker <dtucker@dtucker.net>
7878 Date: Sat Jan 9 00:36:05 2021 +1100
7880 Add test against Graphene hardened malloc.
7882 commit 6cb52d5bf771f6769b630fce35a8e9b8e433044f
7883 Author: djm@openbsd.org <djm@openbsd.org>
7884 Date: Fri Jan 8 04:49:13 2021 +0000
7886 upstream: make CheckHostIP default to 'no'. It doesn't provide any
7888 perceptible value and makes it much harder for hosts to change host keys,
7889 particularly ones that use IP-based load-balancing.
7893 OpenBSD-Commit-ID: 0db98413e82074f78c7d46784b1286d08aee78f0
7895 commit 309b642e1442961b5e57701f095bcd4acd2bfb5f
7896 Author: Darren Tucker <dtucker@dtucker.net>
7897 Date: Fri Jan 8 15:50:41 2021 +1100
7899 Run tests with sudo for better coverage.
7901 commit c336644351fa3c715a08b7a292e309e72792e71e
7902 Author: Darren Tucker <dtucker@dtucker.net>
7903 Date: Fri Jan 8 14:26:32 2021 +1100
7905 Add Ubuntu 16.04 and 20.04 test targets.
7907 commit 4c7af01f9dcc1606dec033e7665a042cb0d8ec52
7908 Author: djm@openbsd.org <djm@openbsd.org>
7909 Date: Fri Jan 8 02:57:24 2021 +0000
7911 upstream: If a signature operation on a FIDO key fails with a
7913 "incorrect PIN" reason and no PIN was initially requested from the user, then
7914 request a PIN and retry the operation.
7916 This smoothes over a few corner cases including FIDO devices that
7917 require PINs for all hosted credentials, biometric FIDO devices that
7918 fall back to requiring PIN when reading the biometric failed, devices
7919 that don't implement reading credProtect status for downloaded keys
7920 and probably a few more cases that I haven't though of yet.
7924 OpenBSD-Commit-ID: 176db8518933d6a5bbf81a2e3cf62447158dc878
7926 commit 64ddd0fe68c4a7acf99b78624f8af45e919cd317
7927 Author: djm@openbsd.org <djm@openbsd.org>
7928 Date: Fri Jan 8 02:44:14 2021 +0000
7930 upstream: don't try to use timespeccmp(3) directly as a qsort(3)
7932 comparison function - it returns 0/1 and not the -1/0/1 that qsort expectes.
7934 fixes sftp "ls -ltr" under some circumstances.
7936 Based on patch by Masahiro Matsuya via bz3248.
7938 OpenBSD-Commit-ID: 65b5e9f18bb0d10573868c3516de6e5170adb163
7940 commit 599df78f3008cf78af21f8977be3e1dd085f8e2e
7941 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7942 Date: Fri Jan 8 02:33:13 2021 +0000
7944 upstream: Update the sntrup761 creation script and generated code:
7946 - remove unneeded header files and typedefs and rely on crypto_api.h - add
7947 defines to map types used to the crypto_api ones instead of typedefs. This
7948 prevents typedef name collisions in -portable. - remove CRYPTO_NAMESPACE
7949 entirely instead of making it a no-op - delete unused functions and make the
7950 remaining ones that aren't exported static.
7954 OpenBSD-Commit-ID: 7b9d0cf3acd5a3c1091da8afe00c904d38cf5783
7956 commit 16448ff529affda7e2a15ee7c3200793abde0759
7957 Author: djm@openbsd.org <djm@openbsd.org>
7958 Date: Fri Jan 8 02:19:24 2021 +0000
7960 upstream: mention that DisableForwarding is valid in a sshd_config
7962 Match block reported by Fredrik Eriksson in bz3239
7964 OpenBSD-Commit-ID: 3a71c3d84b597f5e43e4b40d5232797daf0993f6
7966 commit 91bac5e95b1b0debf9b2b4f05c20dcfa96b368b9
7967 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7968 Date: Mon Jan 4 21:58:58 2021 +0000
7970 upstream: estructure sntrup761.sh to process all files in a single
7972 list, which will make it easier to reorder. Re-inline int32_MINMAX. ok
7975 OpenBSD-Commit-ID: d145c6c19b08bb93c9e14bfaa7af589d90f144c0
7977 commit 4d96a3ebab2224f17e639a15078e03be1ad3736d
7978 Author: tobhe@openbsd.org <tobhe@openbsd.org>
7979 Date: Sun Jan 3 18:05:21 2021 +0000
7981 upstream: Prevent redefinition of `crypto_int32' error with gcc3.
7983 Fixes compilation on luna88k.
7986 Found by and ok aoyama@
7988 OpenBSD-Commit-ID: f305ddfe575a26cc53431af3fde3f4aeebed9ba6
7990 commit a23954eeb930ccc8a66a2710153730769dba31b6
7991 Author: Darren Tucker <dtucker@dtucker.net>
7992 Date: Fri Jan 1 22:00:49 2021 +1100
7994 Undef int32 after sort routines.
7996 This prevents typedef'ing crypto_int32 twice, in sntrup761.c and
7997 crypto_api.h, which some compilers (at least some GCCs) don't accept.
7999 commit 148b8a661c3f93e4b6d049ee902de3d521261fbc
8000 Author: Damien Miller <djm@mindrot.org>
8001 Date: Thu Dec 31 12:47:22 2020 +1100
8003 fix: missing pieces of previous commit
8005 commit 3d999be7b987c848feda718cfcfcdc005ddf670d
8006 Author: tobhe@openbsd.org <tobhe@openbsd.org>
8007 Date: Wed Dec 30 14:13:28 2020 +0000
8009 upstream: Use int64_t for intermediate values in int32_MINMAX to
8011 prevent signed 32-bit integer overflow.
8013 Found by and ok djm@
8016 OpenBSD-Commit-ID: 4f0704768e34cf45fdd792bac4011c6971881bb3
8018 commit 5c1953bf98732da5a76c706714ac066dbfa015ac
8019 Author: Damien Miller <djm@mindrot.org>
8020 Date: Tue Dec 29 12:40:54 2020 +1100
8022 adapt KEX fuzzer to PQ kex change
8024 commit 659864fe81dbc57eeed3769c462679d83e026640
8025 Author: djm@openbsd.org <djm@openbsd.org>
8026 Date: Tue Dec 29 01:02:15 2020 +0000
8028 upstream: Adapt to replacement of
8030 sntrup4591761x25519-sha512@tinyssh.org with
8031 sntrup761x25519-sha512@openssh.com.
8033 Also test sntrup761x25519-sha512@openssh.com in unittests/kex
8035 OpenBSD-Regress-ID: cfa3506b2b077a9cac1877fb521efd2641b6030c
8037 commit 2c71cec020219d69df84055c59eba5799a1233ec
8038 Author: djm@openbsd.org <djm@openbsd.org>
8039 Date: Tue Dec 29 00:59:15 2020 +0000
8041 upstream: Update/replace the experimental post-quantim hybrid key
8043 exchange method based on Streamlined NTRU Prime (coupled with X25519).
8045 The previous sntrup4591761x25519-sha512@tinyssh.org method is
8046 replaced with sntrup761x25519-sha512@openssh.com. Per the authors,
8047 sntrup4591761 was replaced almost two years ago by sntrup761.
8049 The sntrup761 implementaion, like sntrup4591761 before it, is public
8050 domain code extracted from the SUPERCOP cryptography benchmark
8051 suite (https://bench.cr.yp.to/supercop.html).
8053 Thanks for Daniel J Bernstein for guidance on algorithm selection.
8054 Patch from Tobias Heider; feedback & ok markus@ and myself
8056 (note this both the updated method and the one that it replaced are
8057 disabled by default)
8059 OpenBSD-Commit-ID: 2bf582b772d81ee24e911bb6f4b2aecfd39338ae
8061 commit 09d070ccc3574ae0d7947d212ed53c7268ef7e1f
8062 Author: jmc@openbsd.org <jmc@openbsd.org>
8063 Date: Tue Dec 22 07:40:26 2020 +0000
8065 upstream: tweak the description of KnownHostsCommand in ssh_conf.5,
8067 and add entries for it to the -O list in scp.1 and sftp.1;
8071 OpenBSD-Commit-ID: aba31ebea03f38f8d218857f7ce16a500c3e4aff
8073 commit 931c93389a80e32272712459b1102d303844453d
8074 Author: Damien Miller <djm@mindrot.org>
8075 Date: Tue Dec 22 19:43:55 2020 +1100
8079 commit 397b1c4d393f97427283a4717e9015a2bd31b8a5
8080 Author: Damien Miller <djm@mindrot.org>
8081 Date: Tue Dec 22 19:42:37 2020 +1100
8085 commit 33fa3ac547e5349ca34681cce6727b2f933dff0a
8086 Author: Darren Tucker <dtucker@dtucker.net>
8087 Date: Tue Dec 22 19:21:26 2020 +1100
8091 commit 0f2e21c9dca89598b694932b5b05848380a23ec0
8092 Author: Darren Tucker <dtucker@dtucker.net>
8093 Date: Tue Dec 22 18:56:54 2020 +1100
8095 Include stdio.h for FILE in misc.h.
8097 Fixes build on at least OpenBSD.
8099 commit 3e9811e57b57ee66b0f70d99d7258da3153b0e8a
8100 Author: Damien Miller <djm@mindrot.org>
8101 Date: Tue Dec 22 18:31:50 2020 +1100
8103 ensure $LOGNAME is set in tests
8105 commit 3eb647cbb34d87a063aa7714256c6e56103fffda
8106 Author: djm@openbsd.org <djm@openbsd.org>
8107 Date: Tue Dec 22 06:47:24 2020 +0000
8109 upstream: more detail for failing tests
8111 OpenBSD-Regress-ID: c68c0e5a521cad7e7f68e54c54ebf86d6c10ee1d
8113 commit 2873f19570d4d8758be24dbf78332be9a779009b
8114 Author: djm@openbsd.org <djm@openbsd.org>
8115 Date: Tue Dec 22 06:03:36 2020 +0000
8117 upstream: regress test for KnownHostsCommand
8119 OpenBSD-Regress-ID: ffc77464320b6dabdcfa0a72e0df02659233a38a
8121 commit 0121aa87bab9ad2365de2d07f2832b56d5ff9871
8122 Author: tb@openbsd.org <tb@openbsd.org>
8123 Date: Tue Dec 22 03:05:31 2020 +0000
8125 upstream: Remove lines accidentally left behind in the ProxyJump
8131 OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c
8133 commit da4bf0db942b5f0278f33238b86235e5813d7a5a
8134 Author: djm@openbsd.org <djm@openbsd.org>
8135 Date: Tue Dec 22 00:15:22 2020 +0000
8137 upstream: add a ssh_config KnownHostsCommand that allows the client
8139 to obtain known_hosts data from a command in addition to the usual files.
8141 The command accepts bunch of %-expansions, including details of the
8142 connection and the offered server host key. Note that the command may
8143 be invoked up to three times per connection (see the manpage for
8148 OpenBSD-Commit-ID: 2433cff4fb323918ae968da6ff38feb99b4d33d0
8150 commit a34e14a5a0071de2036826a00197ce38c8b4ba8b
8151 Author: djm@openbsd.org <djm@openbsd.org>
8152 Date: Tue Dec 22 00:12:22 2020 +0000
8154 upstream: move subprocess() from auth.c to misc.c
8156 make privilege dropping optional but allow it via callbacks (to avoid
8157 need to link uidswap.c everywhere)
8159 add some other flags (keep environment, disable strict path safety check)
8160 that make this more useful for client-side use.
8162 feedback & ok markus@
8164 OpenBSD-Commit-ID: a80ea9fdcc156f1a18e9c166122c759fae1637bf
8166 commit 649205fe388b56acb3481a1b2461f6b5b7c6efa6
8167 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8168 Date: Mon Dec 21 22:48:41 2020 +0000
8170 upstream: Remove explicit rijndael-cbc@lysator.liu.se test since the
8174 OpenBSD-Regress-ID: aa93cddb4ecd9bc21446a79008a1a53050e64f17
8176 commit 03e93c753d7c223063ad8acaf9a30aa511e5f931
8177 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8178 Date: Mon Dec 21 11:09:32 2020 +0000
8180 upstream: Remove the pre-standardization cipher
8182 rijndael-cbc@lysator.liu.se. It is an alias for aes256-cbc which was
8183 standardized in RFC4253 (2006), has been deprecated and disabled by default
8184 since OpenSSH 7.2 (2016) and was only briefly documented in ssh.1 in 2001.
8186 This will reduce the amount of work the cipher/kex regression tests need
8187 to do by a little bit. ok markus@ djm@
8189 OpenBSD-Commit-ID: fb460acc18290a998fd70910b19c29b4e4f199ad
8191 commit a11ca015879eab941add8c6bdaaec7d41107c6f5
8192 Author: djm@openbsd.org <djm@openbsd.org>
8193 Date: Mon Dec 21 09:19:53 2020 +0000
8195 upstream: properly fix ProxyJump parsing; Thanks to tb@ for
8197 pointing out my error (parse_ssh_uri() can return -1/0/1, that I missed).
8198 Reported by Raf Czlonka via bugs@
8202 OpenBSD-Commit-ID: a2991a3794bcaf1ca2b025212cce11cdb5f6b7d6
8204 commit d97fb879724f1670bf55d9adfea7278a93c33ae2
8205 Author: djm@openbsd.org <djm@openbsd.org>
8206 Date: Mon Dec 21 01:31:06 2020 +0000
8208 upstream: adapt to API change in hostkeys_foreach()/load_hostkeys()
8210 OpenBSD-Regress-ID: dcb468514f32da49a446372453497dc6eeafdbf3
8212 commit bf7eb3c266b7fd4ddda108fcf72b860af2af6406
8213 Author: djm@openbsd.org <djm@openbsd.org>
8214 Date: Fri Oct 16 14:02:24 2020 +0000
8216 upstream: few more things needs match.c and addrmatch.c now that
8218 log.c calls match_pattern_list()
8220 OpenBSD-Regress-ID: f7c95c76b150d0aeb00a67858b9579b7d1b2db74
8222 commit 2c64f24e27a5e72a7f59e515fc4f4985355237ae
8223 Author: Darren Tucker <dtucker@dtucker.net>
8224 Date: Mon Dec 21 14:02:56 2020 +1100
8226 Pull in missing rev 1.2.
8228 commit 0f504f592d15d8047e466eb7453067a6880992a8
8229 Author: djm@openbsd.org <djm@openbsd.org>
8230 Date: Sun Dec 20 23:40:19 2020 +0000
8232 upstream: plumb ssh_conn_info through to sshconnect.c; feedback/ok
8236 OpenBSD-Commit-ID: e8d14a09cda3f1dc55df08f8a4889beff74e68b0
8238 commit 729b05f59ded35483acef90a6f88aa03eae33b29
8239 Author: djm@openbsd.org <djm@openbsd.org>
8240 Date: Sun Dec 20 23:38:00 2020 +0000
8242 upstream: allow UserKnownHostsFile=none; feedback and ok markus@
8244 OpenBSD-Commit-ID: c46d515eac94a35a1d50d5fd71c4b1ca53334b48
8246 commit b4c7cd1185c5dc0593d47eafcc1a34fda569dd1d
8247 Author: djm@openbsd.org <djm@openbsd.org>
8248 Date: Sun Dec 20 23:36:51 2020 +0000
8250 upstream: load_hostkeys()/hostkeys_foreach() variants for FILE*
8252 Add load_hostkeys_file() and hostkeys_foreach_file() that accept a
8253 FILE* argument instead of opening the file directly.
8255 Original load_hostkeys() and hostkeys_foreach() are implemented using
8256 these new interfaces.
8258 Add a u_int note field to the hostkey_entry and hostkey_foreach_line
8259 structs that is passed directly from the load_hostkeys() and
8260 hostkeys_foreach() call. This is a lightweight way to annotate results
8261 between different invocations of load_hostkeys().
8265 OpenBSD-Commit-ID: 6ff6db13ec9ee4edfa658b2c38baad0f505d8c20
8267 commit 06fbb386bed666581095cb9cbc7a900e02bfe1b7
8268 Author: tobhe@openbsd.org <tobhe@openbsd.org>
8269 Date: Sat Dec 19 22:09:21 2020 +0000
8271 upstream: Print client kem key with correct length.
8275 OpenBSD-Commit-ID: 91689e14a4fc6c270e265a32d1c8faba63a45755
8277 commit 0ebead6593e2441e4af2735bbe2cd097607cd0d3
8278 Author: djm@openbsd.org <djm@openbsd.org>
8279 Date: Thu Dec 17 23:28:50 2020 +0000
8281 upstream: fix possible error("%s", NULL) on error paths
8283 OpenBSD-Commit-ID: 0b3833c2cb985453ecca1d76803ebb8f3b736a11
8285 commit d060bc7f6e6244f001e658208f53e3e2ecbbd382
8286 Author: djm@openbsd.org <djm@openbsd.org>
8287 Date: Thu Dec 17 23:26:11 2020 +0000
8289 upstream: refactor client percent_expand() argument passing;
8291 consolidate the common arguments into a single struct and pass that around
8292 instead of using a bunch of globals. ok markus@
8294 OpenBSD-Commit-ID: 035e6d7ca9145ad504f6af5a021943f1958cd19b
8296 commit 43026da035cd266db37df1f723d5575056150744
8297 Author: djm@openbsd.org <djm@openbsd.org>
8298 Date: Thu Dec 17 23:10:27 2020 +0000
8300 upstream: prepare readconf.c for fuzzing; remove fatal calls and
8302 fix some (one-off) memory leaks; ok markus@
8304 OpenBSD-Commit-ID: 91c6aec57b0e7aae9190de188e9fe8933aad5ec5
8306 commit bef92346c4a808f33216e54d6f4948f9df2ad7c1
8307 Author: djm@openbsd.org <djm@openbsd.org>
8308 Date: Mon Dec 14 03:13:12 2020 +0000
8310 upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path
8312 OpenBSD-Commit-ID: 5c1048468813107baa872f5ee33ba51623630e01
8314 commit a5ab499bd2644b4026596fc2cb24a744fa310666
8315 Author: Damien Miller <djm@mindrot.org>
8316 Date: Fri Dec 4 14:01:27 2020 +1100
8318 basic KEX fuzzer; adapted from Markus' unittest
8320 commit 021ff33e383c77b11badd60cec5b141a3e3fa532
8321 Author: Damien Miller <djm@mindrot.org>
8322 Date: Fri Dec 4 13:57:43 2020 +1100
8324 use options that work with recent clang
8326 commit e4d1a0b40add800b6e9352b40c2223e44acc3a45
8327 Author: djm@openbsd.org <djm@openbsd.org>
8328 Date: Fri Dec 4 02:41:10 2020 +0000
8330 upstream: shuffle a few utility functions into sftp-client.c; from
8334 OpenBSD-Commit-ID: fdeb1aae1f6149b193f12cd2af158f948c514a2a
8336 commit ace12dc64f8e3a2496ca48d36b53cb3c0a090755
8337 Author: djm@openbsd.org <djm@openbsd.org>
8338 Date: Fri Dec 4 02:29:56 2020 +0000
8340 upstream: make ssh_free(NULL) a no-op
8342 OpenBSD-Commit-ID: 42cb285d94789cefe6608db89c63040ab0a80fa0
8344 commit 3b98b6e27f8a122dbfda9966b1afeb3e371cce91
8345 Author: djm@openbsd.org <djm@openbsd.org>
8346 Date: Fri Dec 4 02:29:25 2020 +0000
8348 upstream: memleak of DH public bignum; found with libfuzzer
8350 OpenBSD-Commit-ID: 0e913b542c3764b100b1571fdb0d0e5cc086fe97
8352 commit 553b90feedd7da5b90901d73005f86705456d686
8353 Author: djm@openbsd.org <djm@openbsd.org>
8354 Date: Fri Dec 4 02:27:57 2020 +0000
8356 upstream: fix minor memleak of kex->hostkey_alg on rekex
8358 OpenBSD-Commit-ID: 2c3969c74966d4ccdfeff5e5f0df0791919aef50
8360 commit ac0364b85e66eb53da2f9618f699ba6bd195ceea
8361 Author: djm@openbsd.org <djm@openbsd.org>
8362 Date: Fri Dec 4 02:27:08 2020 +0000
8364 upstream: typos: s/hex/kex/ in error messages
8366 OpenBSD-Commit-ID: 43a026c9571dd779ec148de1829cf5a6b6651905
8368 commit ee22db7c5885a1d90219202c0695bc621aa0409b
8369 Author: djm@openbsd.org <djm@openbsd.org>
8370 Date: Fri Dec 4 02:25:13 2020 +0000
8372 upstream: make program name be const
8374 OpenBSD-Commit-ID: ece25680ec637fdf20502721ccb0276691df5384
8376 commit 2bcbf679de838bb77a8bd7fa18e100df471a679c
8377 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8378 Date: Mon Nov 30 05:36:39 2020 +0000
8380 upstream: Ignore comments at the end of config lines in ssh_config,
8382 similar to what we already do for sshd_config. bz#2320, with & ok djm@
8384 OpenBSD-Commit-ID: bdbf9fc5bc72b1a14266f5f61723ed57307a6db4
8386 commit b755264e7d3cdf1de34e18df1af4efaa76a3c015
8387 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8388 Date: Sat Nov 28 12:52:32 2020 +0000
8390 upstream: Include cipher.h for declaration of cipher_by_name.
8392 OpenBSD-Commit-ID: ddfebbca03ca0e14e00bbad9d35f94b99655d032
8394 commit 022def7bd16c3426a95e25f57cb259d54468341c
8395 Author: djm@openbsd.org <djm@openbsd.org>
8396 Date: Sat Nov 28 03:27:59 2020 +0000
8398 upstream: check result of strchr() against NULL rather than
8400 searched-for characters; from zhongjubin@huawei.com
8402 OpenBSD-Commit-ID: e6f57de1d4a4d25f8db2d44e8d58d847e247a4fe
8404 commit 57bf03f0217554afb8980f6697a7a0b88658d0a9
8405 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8406 Date: Fri Nov 27 10:12:30 2020 +0000
8408 upstream: Document ssh-keygen -Z, sanity check its argument earlier and
8410 provide a better error message if it's not correct. Prompted by bz#2879, ok
8413 OpenBSD-Commit-ID: 484178a173e92230fb1803fb4f206d61f7b58005
8415 commit 33313ebc1c7135085676db62189e3520341d6b73
8416 Author: djm@openbsd.org <djm@openbsd.org>
8417 Date: Fri Nov 27 00:49:58 2020 +0000
8419 upstream: Set the specified TOS/DSCP for interactive use prior to
8421 TCP connect. The connection phase of the SSH session is time-sensitive (due
8422 to server side login grace periods) and is frequently interactive (e.g.
8423 entering passwords). The ultimate interactive/bulk TOS/DSCP will be set after
8424 authentication completes.
8428 OpenBSD-Commit-ID: f31ab10d9233363a6d2c9996007083ba43a093f1
8430 commit b2bcec13f17ce9174238a704e91d52203e916432
8431 Author: djm@openbsd.org <djm@openbsd.org>
8432 Date: Fri Nov 27 00:37:10 2020 +0000
8434 upstream: clean up passing of struct passwd from monitor to preauth
8436 privsep process. No longer copy entire struct w/ pointer addresses, but pass
8437 remaining scalar fields explicitly,
8439 Prompted by Yuichiro NAITO, feedback Thorsten Glaser; ok dtucker@
8441 OpenBSD-Commit-ID: 9925df75a56732c43f3663e70dd15ff413ab3e53
8443 commit 19af04e2231155d513e24fdc81fbec2217ae36a6
8444 Author: djm@openbsd.org <djm@openbsd.org>
8445 Date: Sun Nov 22 22:38:26 2020 +0000
8447 upstream: when loading PKCS#11 keys, include the key fingerprints
8449 and provider/slot information in debug output.
8451 OpenBSD-Commit-ID: 969a089575d0166a9a364a9901bb6a8d9b8a1431
8453 commit 9b9465ea856e15b9e9890b4ecb4110d7106e7766
8454 Author: djm@openbsd.org <djm@openbsd.org>
8455 Date: Sun Nov 22 22:37:11 2020 +0000
8457 upstream: when mentioning that the host key has changed, don't
8459 report the type because it is ambiguous as to whether it referred to the
8460 known or new host key. bz3216; ok dtucker@
8462 OpenBSD-Commit-ID: 2d5ce4a83dbcf44e340a572e361decad8aab7bad
8464 commit 637017a7dd3281d3f2df804993cc27c30dbfda47
8465 Author: Darren Tucker <dtucker@dtucker.net>
8466 Date: Wed Nov 25 17:38:46 2020 +1100
8468 Use "=" not "==" in string test.
8470 POSIX says "=" is string comparison and some shells (eg HP-UX) will
8471 complain about "==".
8473 commit 9880f3480f9768897f3b8e714d5317fb993bc5b3
8474 Author: Darren Tucker <dtucker@dtucker.net>
8475 Date: Fri Nov 20 17:16:51 2020 +1100
8477 Restore correct flags during localtime_r check.
8479 We were restoring the wrong thing CPPFLAGS (we used CFLAGS) for any
8480 platform that doesn't have localtime_r.
8482 commit 41935882f4e82de60dbd6e033eabe79e1b963518
8483 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8484 Date: Fri Nov 20 03:16:56 2020 +0000
8486 upstream: When doing an sftp recursive upload or download of a
8488 read-only directory, ensure that the directory is created with write and
8489 execute permissions in the interim so that we can actually complete the
8490 transfer, then set the directory permission as the final step. (The execute
8491 bit is only likely to be an issue with a non-POSIX server). bz#3222, ok djm@
8493 OpenBSD-Commit-ID: a82606212f2796e31f0e1af94a63355a7ad5d903
8495 commit 0f90440ca70abab947acbd77795e9f130967956c
8496 Author: Darren Tucker <dtucker@dtucker.net>
8497 Date: Fri Nov 20 13:37:54 2020 +1100
8499 Add new pselect6_time64 syscall on ARM.
8501 This is apparently needed on armhfp/armv7hl. bz#3232, patch from
8502 jjelen at redhat.com.
8504 commit 3a7c46c72b6a1f643b1fc3589cd20d8320c3d9e1
8505 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8506 Date: Fri Nov 20 02:14:16 2020 +0000
8508 upstream: Explicitly initialize all members of the
8510 find_by_key_ctx struct. Initializing a single member should be enough
8511 (the spec says the remainder should be initialized as per the static
8512 rules) but some GCCs warn on this which prevents us testing with -Werror
8513 on those. ok deraadt@ djm@
8515 OpenBSD-Commit-ID: 687126e60a27d30f02614760ef3c3ae4e8d6af28
8517 commit 076cb616b87d1ea1d292973fcd0ba38c08ea6832
8518 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8519 Date: Thu Nov 19 23:05:05 2020 +0000
8521 upstream: draft-ietf-secsh-architecture is now RFC4251.
8523 OpenBSD-Commit-ID: cb0bb58c2711fb5ed519507659be1dcf179ed403
8525 commit 85cceda21f1471548e04111aefe2c4943131c1c8
8526 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8527 Date: Tue Nov 17 11:23:58 2020 +0000
8529 upstream: Specify that the KDF function is bcrypt. Based on github
8531 PR#214 from rafork, ok markus@, mdoc correction jmc@
8533 OpenBSD-Commit-ID: d8f2853e7edbcd483f31b50da77ab80ffa18b4ef
8535 commit 5b9720f9adbd70ba5a994f407fe07a7d016d8d65
8536 Author: djm@openbsd.org <djm@openbsd.org>
8537 Date: Sun Nov 15 22:34:58 2020 +0000
8539 upstream: revert r1.341; it breaks ProxyJump; reported by sthen@
8541 OpenBSD-Commit-ID: 6ac2f945b26cb86d936eed338f77861d6da8356a
8543 commit 04088725ec9c44880c01799b588cd4ba47b3e8bc
8544 Author: djm@openbsd.org <djm@openbsd.org>
8545 Date: Fri Nov 13 07:30:44 2020 +0000
8547 upstream: scrub keyboard-interactive authentication prompts coming
8549 from the server through asmprintf() prior to display; suggested by and ok
8552 OpenBSD-Commit-ID: 31fe93367645c37fbfe4691596bf6cf1e3972a58
8554 commit 5442b491d0ee4bb82f6341ad0ee620ef3947f8c5
8555 Author: djm@openbsd.org <djm@openbsd.org>
8556 Date: Fri Nov 13 04:53:12 2020 +0000
8558 upstream: prefix keyboard interactive prompts with (user@host) to
8560 make it easier to determine which connection they are associated with in
8561 cases like scp -3, ProxyJump, etc. bz#3224 ok dtucker
8563 OpenBSD-Commit-ID: 67e6189b04b46c867662f8a6759cf3ecb5f59170
8565 commit 2992e4e7014ac1047062acfdbbf6feb156fef616
8566 Author: Darren Tucker <dtucker@dtucker.net>
8567 Date: Fri Nov 13 17:56:11 2020 +1100
8569 Remove use of TIME_WITH_SYS_TIME.
8571 It was only set by the recently removed AC_HEADER_TIME macro, replace
8572 with simple inclusions of both sys/time.h and time.h. Should prevent
8573 mis-detection of struct timespec.
8575 commit e3f27006f15abacb7e89fda3f5e9a0bd420b7e38
8576 Author: Damien Miller <djm@mindrot.org>
8577 Date: Fri Nov 13 14:20:43 2020 +1100
8579 Revert "detect Linux/X32 systems"
8581 This reverts commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885.
8583 The approach used was incorrect; discussion in bz#3085
8585 commit e51dc7fab61df36e43f3bc64b673f88d388cab91
8586 Author: Damien Miller <djm@mindrot.org>
8587 Date: Fri Nov 13 13:22:15 2020 +1100
8589 SELinux has deprecated security_context_t
8591 (it was only ever a char* anyway)
8593 commit b79add37d118276d67f3899987b9f0629c9449c3
8594 Author: Darren Tucker <dtucker@dtucker.net>
8595 Date: Fri Nov 13 13:43:30 2020 +1100
8597 Remove obsolete AC_HEADER_TIME macro.
8599 AC_HEADER_TIME is marked as obsolete in autoconf-2.70 and as far as I
8600 can tell everything we have that might be old enough to need it doesn't.
8602 commit d5d05cdb3d4efd4a618aa52caab5bec73097c163
8603 Author: djm@openbsd.org <djm@openbsd.org>
8604 Date: Thu Nov 12 22:56:00 2020 +0000
8606 upstream: when prompting the user to accept a new hostkey, display
8608 any other host names/addresses already associated with the key. E.g.
8610 > The authenticity of host 'test (10.0.0.1)' can't be established.
8611 > ECDSA key fingerprint is SHA256:milU4MODXm8iJQI18wlsbPG7Yup+34fuNNmV08qDnax.
8612 > This host key is known by the following other names/addresses:
8613 > ~/.ssh/known_hosts:1: host.example.org,10.0.0.1
8614 > ~/.ssh/known_hosts:2: [hashed name]
8615 > ~/.ssh/known_hosts:3: [hashed name]
8616 > ~/.ssh/known_hosts:4: host
8617 > ~/.ssh/known_hosts:5: [host]:2222
8618 > Are you sure you want to continue connecting (yes/no/[fingerprint])?
8620 feedback and ok markus@
8622 OpenBSD-Commit-ID: f6f58a77b49f1368b5883b3a1f776447cfcc7ef4
8624 commit 819b44e8b9af6ce18d3ec7505b9f461bf7991a1f
8625 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8626 Date: Thu Nov 12 22:38:57 2020 +0000
8628 upstream: Prevent integer overflow when ridiculously large
8630 ConnectTimeout is specified, capping the effective value (for most platforms)
8631 at 24 days. bz#3229, ok djm@
8633 OpenBSD-Commit-ID: 62d4c4b7b87d111045f8e9f28b5b532d17ac5bc0
8635 commit add926dd1bbe3c4db06e27cab8ab0f9a3d00a0c2
8636 Author: djm@openbsd.org <djm@openbsd.org>
8637 Date: Wed Nov 11 05:22:32 2020 +0000
8639 upstream: fix logic error that broke URI parsing in ProxyJump
8641 directives; ok dtucker@
8643 OpenBSD-Commit-ID: 96d48839b1704882a0e9a77898f5e14b2d222705
8645 commit 4340dd43928dfe746cb7e75fe920b63c0d909a9a
8646 Author: claudio@openbsd.org <claudio@openbsd.org>
8647 Date: Tue Nov 10 07:46:20 2020 +0000
8649 upstream: Free the previously allocated msg buffer after writing it
8653 OpenBSD-Commit-ID: 18c055870fc75e4cb9f926c86c7543e2e21d7fa4
8655 commit fcf429a4c69d30d8725612a55b37181594da8ddf
8656 Author: Darren Tucker <dtucker@dtucker.net>
8657 Date: Wed Nov 11 12:30:46 2020 +1100
8659 Prevent excessively long username going to PAM.
8661 This is a mitigation for a buffer overflow in Solaris' PAM username
8662 handling (CVE-2020-14871), and is only enabled for Sun-derived PAM
8663 implementations. This is not a problem in sshd itself, it only
8664 prevents sshd from being used as a vector to attack Solaris' PAM.
8665 It does not prevent the bug in PAM from being exploited via some other
8668 Based on github PR#212 from Mike Scott but implemented slightly
8669 differently. ok tim@ djm@
8671 commit 10dce8ff68ef615362cfcab0c0cc33ce524e7682
8672 Author: djm@openbsd.org <djm@openbsd.org>
8673 Date: Sun Nov 8 23:19:03 2020 +0000
8675 upstream: unbreak; missing NULL check
8677 OpenBSD-Commit-ID: 6613dfab488123f454d348ef496824476b8c11c0
8679 commit d5a0cd4fc430c8eda213a4010a612d4778867cd9
8680 Author: djm@openbsd.org <djm@openbsd.org>
8681 Date: Sun Nov 8 22:37:24 2020 +0000
8683 upstream: when requesting a security key touch on stderr, inform the
8685 user once the touch has been recorded; requested by claudio@ ok markus@
8687 OpenBSD-Commit-ID: 3b76ee444490e546b9ea7f879e4092ee0d256233
8689 commit 292bcb2479deb27204e3ff796539c003975a5f7a
8690 Author: Darren Tucker <dtucker@dtucker.net>
8691 Date: Mon Nov 9 00:33:35 2020 +1100
8693 Remove preprocessor directive from log macro calls.
8695 Preprocessor directives inside macro calls, such as the new log macros,
8696 are undefined behaviour and do not work with, eg old GCCs. Put the
8697 entire log call inside the ifdef for OPENSSL_HAS_NISTP521.
8699 commit 71693251b7cbb7dd89aaac18815147124732d0d3
8700 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8701 Date: Sun Nov 8 12:10:20 2020 +0000
8703 upstream: Add a comment documenting the source of the moduli group
8707 OpenBSD-Commit-ID: aec0725ce607630caaa62682624c6763b350391c
8709 commit 4d94b031ff88b015f0db57e140f481bff7ae1a91
8710 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8711 Date: Sun Nov 8 11:46:12 2020 +0000
8713 upstream: Replace WITH_OPENSSL ifdefs in log calls with a macro.
8715 The log calls are themselves now macros, and preprocessor directives inside
8716 macro arguments are undefined behaviour which some compilers (eg old GCCs)
8717 choke on. It also makes the code tidier. ok deraadt@
8719 OpenBSD-Commit-ID: cc12a9029833d222043aecd252d654965c351a69
8721 commit 6d2564b94e51184eb0b73b97d13a36ad50b4f810
8722 Author: Darren Tucker <dtucker@dtucker.net>
8723 Date: Fri Nov 6 17:11:16 2020 +1100
8725 Fix function body for variadic macro test.
8727 AC_LANG_PROGRAM puts its second argument inside main() so we don't need
8730 commit 586f9bd2f5980e12f8cf0d3c2a761fa63175da52
8731 Author: Darren Tucker <dtucker@dtucker.net>
8732 Date: Fri Nov 6 16:53:24 2020 +1100
8734 Remove AC_PROC_CC_C99 obsoleted in autoconf 2.70.
8736 Since we only use it to make sure we can handle variadic macros,
8737 explicitly check only for that. with & ok djm@
8739 commit a019e353df04de1b2ca78d91b39c393256044ad7
8740 Author: Darren Tucker <dtucker@dtucker.net>
8741 Date: Fri Nov 6 13:56:41 2020 +1100
8743 Replace AC_TRY_COMPILE obsoleted in autoconf 2.70.
8745 Replace with the equivalent AC_COMPILE_IFELSE.
8747 commit 771b7795c0ef6a2fb43b4c6c66b615c2085cb9cd
8748 Author: Darren Tucker <dtucker@dtucker.net>
8749 Date: Fri Nov 6 13:55:33 2020 +1100
8751 Move AC_PROG_CC_C99 to immediately afer AC_PROG_CC.
8753 This puts the related C version selection output in the same place.
8755 commit e5591161f21ab493c6284a85ac3c0710ad94998f
8756 Author: Darren Tucker <dtucker@dtucker.net>
8757 Date: Fri Nov 6 13:54:17 2020 +1100
8759 AC_CHECK_HEADER() is obsoleted in autoconf 2.70.
8761 Replace with the non-obsoleted AC_CHECK_HEADERS().
8763 commit 05bcd0cadf160fd4826a2284afa7cba6ec432633
8764 Author: djm@openbsd.org <djm@openbsd.org>
8765 Date: Tue Nov 3 22:53:12 2020 +0000
8767 upstream: fold consecutive '*' wildcards to mitigate combinatorial
8769 explosion of recursive searches; ok dtucker
8771 OpenBSD-Commit-ID: d18bcb39c40fb8a1ab61153db987e7d11dd3792b
8773 commit 7d680448db5858dc76307663f78d0b8d3c2b4a3d
8774 Author: djm@openbsd.org <djm@openbsd.org>
8775 Date: Fri Oct 30 01:50:07 2020 +0000
8777 upstream: print reason in fatal error message when
8779 kex_assemble_namelist() fails
8781 OpenBSD-Commit-ID: a9975ee8db6c98d6f32233d88051b2077ca63dab
8783 commit 95d1109fec7e89ad21f2a97e92bde1305d32a353
8784 Author: djm@openbsd.org <djm@openbsd.org>
8785 Date: Thu Oct 29 03:13:06 2020 +0000
8787 upstream: fix sshd_config SetEnv directive inside Match blocks; part of
8789 github PR#201 from github user manuelm
8791 OpenBSD-Commit-ID: 9772e3748abff3ad65ae8fc43d026ed569b1d2bc
8793 commit b12b835dc022ba161afe68348e05a83dfbcb1515
8794 Author: djm@openbsd.org <djm@openbsd.org>
8795 Date: Thu Oct 29 03:01:18 2020 +0000
8797 upstream: fix type of nid in type_bits_valid(); github PR#202 from
8799 github user thingsconnected
8801 OpenBSD-Commit-ID: 769d2b040dec7ab32d323daf54b854dd5dcb5485
8803 commit 1a14c13147618144d1798c36a588397ba9008fcc
8804 Author: djm@openbsd.org <djm@openbsd.org>
8805 Date: Thu Oct 29 02:52:43 2020 +0000
8807 upstream: whitespace; no code change
8809 OpenBSD-Commit-ID: efefc1c47e880887bdee8cd2127ca93177eaad79
8811 commit 815209abfdd2991fb92ad7d2e33374916cdcbcf4
8812 Author: djm@openbsd.org <djm@openbsd.org>
8813 Date: Thu Oct 29 02:47:23 2020 +0000
8815 upstream: UpdateHostkeys: fixed/better detection of host keys that
8817 exist under other names and addresses; spotted by and debugged with lots of
8820 OpenBSD-Commit-ID: 5113d7f550bbd48243db1705afbf16b63792d4b7
8822 commit a575cf44e59a65506c67bddb62a712208a7a279c
8823 Author: Duncan Eastoe <duncan.eastoe@att.com>
8824 Date: Wed Oct 21 10:11:10 2020 +0100
8826 session.c: use "denylist" terminology
8828 Follow upstream (6d755706a0059eb9e2d63517f288b75cbc3b4701) language
8829 improvements in this portable-specific code.
8831 commit 33267feaffd5d98aa56d2f0b3a99ec352effe938
8832 Author: Damien Miller <djm@mindrot.org>
8833 Date: Tue Oct 27 16:46:31 2020 +1100
8835 Remove checks for strict POSIX mkdtemp()
8837 We needed a mkdtemp() that accepted template paths that did not
8838 end in XXXXXX a long time ago for KRB4, but that code is long
8839 deprecated. We no longer need to replace mkdtemp() for strictly
8840 following POSIX. ok dtucker@
8842 commit 492d70e18bad5a8c97d05f5eddac817171e88d2c
8843 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8844 Date: Mon Oct 26 00:39:04 2020 +0000
8846 upstream: Minor man page fixes (capitalization, commas) identified by
8848 the manpage-l10n project via bz#3223. feedback deraadt@, ok jmc@
8850 OpenBSD-Commit-ID: ab83af0daf18369244a72daaec6c4a58a9eb7e2c
8852 commit eab2888cfc6cc4e2ef24bd017da9835a0f365f3f
8853 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8854 Date: Mon Oct 19 22:49:23 2020 +0000
8856 upstream: Adapt XMSS to new logging infrastructure. With markus@, ok
8860 OpenBSD-Commit-ID: 9c35ec3aa0f710e4e3325187ceff4fa3791686de
8862 commit f7bd11e4941620991f3e727cd0131b01f0311a58
8863 Author: djm@openbsd.org <djm@openbsd.org>
8864 Date: Mon Oct 19 08:07:08 2020 +0000
8866 upstream: fix SEGV on fatal() errors spotted by dtucker@
8868 OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2
8870 commit 7715a3b171049afa1feffb1d5a1245dfac36ce99
8871 Author: Darren Tucker <dtucker@dtucker.net>
8872 Date: Mon Oct 19 10:54:41 2020 +1100
8874 Use fatal_fr not fatal_r when passing r.
8876 Caught by the PAM -Werror tinderbox build.
8878 commit 816036f142ecd284c12bb3685ae316a68d2ef190
8879 Author: djm@openbsd.org <djm@openbsd.org>
8880 Date: Sun Oct 18 11:32:01 2020 +0000
8882 upstream: use the new variant log macros instead of prepending
8884 __func__ and appending ssh_err(r) manually; ok markus@
8886 OpenBSD-Commit-ID: 1f14b80bcfa85414b2a1a6ff714fb5362687ace8
8888 commit 9e2c4f64224f68fb84c49b5182e449f94b0dc985
8889 Author: djm@openbsd.org <djm@openbsd.org>
8890 Date: Sun Oct 18 11:21:59 2020 +0000
8892 upstream: variants of the log methods that append a ssherr.h string
8894 from a supplied error code; ok markus@
8896 OpenBSD-Commit-ID: aed98c4435d48d036ae6740300f6a8357b7cc0bf
8898 commit 28cb0a4b03940d1ee576eb767a81a4113bdc917e
8899 Author: djm@openbsd.org <djm@openbsd.org>
8900 Date: Sun Oct 18 11:14:27 2020 +0000
8902 upstream: remove a level of macro indirection; ok markus@
8904 OpenBSD-Commit-ID: 0c529d06e902c5d1a6b231e1bec6157f76dc67c9
8906 commit 9cac1db52e6c4961c447910fe02cd68a3b2f9460
8907 Author: djm@openbsd.org <djm@openbsd.org>
8908 Date: Sun Oct 18 11:13:45 2020 +0000
8910 upstream: add some variant log.h calls that prepend the calling
8912 function name; ok markus@
8914 OpenBSD-Commit-ID: 4be1b2e2455b271ddb7457bc195c5367644f4e48
8916 commit d55dfed34ef6ef1f028d552a90d5f3dba8dd6f7b
8917 Author: Damien Miller <djm@mindrot.org>
8918 Date: Sat Oct 17 22:55:24 2020 +1100
8922 commit 999d7cb79a3a73d92a6dfbf174c33da0d984c7a2
8923 Author: Damien Miller <djm@mindrot.org>
8924 Date: Sat Oct 17 22:47:52 2020 +1100
8926 sync regress/misc/sk-dummy/fatal.c
8928 commit 3554b4afa38b3483a3302f1be18eaa6f843bb260
8929 Author: djm@openbsd.org <djm@openbsd.org>
8930 Date: Sat Oct 17 01:28:20 2020 +0000
8932 upstream: make the log functions that exit (sshlogdie(),
8934 sshfatal(), etc) have identical signatures. Makes things a bit more
8937 OpenBSD-Commit-ID: bd0ae124733389d7c0042e135c71ee9091362eb9
8939 commit 616029a85ad7529b24bb8c4631d9607c0d6e7afe
8940 Author: jmc@openbsd.org <jmc@openbsd.org>
8941 Date: Fri Oct 16 14:34:33 2020 +0000
8943 upstream: add space between macro arg and punctuation;
8945 OpenBSD-Commit-ID: bb81e2ed5a77832fe62ab30a915ae67cda57633e
8947 commit f812a36cee5727147bc897d34ab9af068dd4561e
8948 Author: Damien Miller <djm@mindrot.org>
8949 Date: Sat Oct 17 12:03:34 2020 +1100
8951 check for and require a C99 capable compiler
8953 recent logging changes use __VA_ARGS__.
8955 commit f9ea6515202b59a1e2d5b885cafc1b12eff33016
8956 Author: Damien Miller <djm@mindrot.org>
8957 Date: Sat Oct 17 11:51:20 2020 +1100
8959 logging is now macros, remove function pointers
8961 commit 0f938f998626e8359324f803157cd7c9f8f403e2
8962 Author: Damien Miller <djm@mindrot.org>
8963 Date: Sat Oct 17 11:42:26 2020 +1100
8965 adapt sk-dummy's fatal implementation to changes
8967 commit afbd9ec9e2dbad04834ce7ce53e58740434f32a5
8968 Author: Damien Miller <djm@mindrot.org>
8969 Date: Sat Oct 17 11:33:13 2020 +1100
8971 fix netcat build problem
8973 commit 793b583d097381730adaf6f68bed3c343139a013
8974 Author: djm@openbsd.org <djm@openbsd.org>
8975 Date: Fri Oct 16 13:26:13 2020 +0000
8977 upstream: LogVerbose keyword for ssh and sshd
8979 Allows forcing maximum debug logging by file/function/line pattern-
8984 OpenBSD-Commit-ID: c294c25732d1b4fe7e345cb3e044df00531a6356
8986 commit 752250caabda3dd24635503c4cd689b32a650794
8987 Author: djm@openbsd.org <djm@openbsd.org>
8988 Date: Fri Oct 16 13:24:45 2020 +0000
8990 upstream: revised log infrastructure for OpenSSH
8992 log functions receive function, filename and line number of caller.
8993 We can use this to selectively enable logging via pattern-lists.
8997 OpenBSD-Commit-ID: 51a472610cbe37834ce6ce4a3f0e0b1ccc95a349
8999 commit acadbb3402b70f72f14d9a6930ad41be97c2f9dc
9000 Author: djm@openbsd.org <djm@openbsd.org>
9001 Date: Fri Oct 16 02:37:12 2020 +0000
9003 upstream: use do_log2 instead of function pointers to different log
9007 OpenBSD-Commit-ID: 88077b826d348c58352a6b394755520f4e484480
9009 commit 95b0bcfd1531d59e056ae8af27bb741391f26ab0
9010 Author: djm@openbsd.org <djm@openbsd.org>
9011 Date: Wed Oct 14 00:55:17 2020 +0000
9013 upstream: make UpdateHostkeys still more conservative: refuse to
9015 proceed if one of the keys offered by the server is already in known_hosts
9016 under another name. This avoid collisions between address entries for
9017 different host aliases when CheckHostIP=yes
9019 Also, do not attempt to fix known_hosts with incomplete host/ip matches
9020 when there are no new or deprecated hostkeys.
9022 OpenBSD-Commit-ID: 95c19842f7c41f9bd9c92aa6441a278c0fd0c4a3
9024 commit a336ce8c2c55547cc00e0070a18c55f30bb53fb6
9025 Author: kn@openbsd.org <kn@openbsd.org>
9026 Date: Mon Oct 12 08:36:36 2020 +0000
9028 upstream: Zap unused family parameter from ssh_connect_direct()
9030 sshconnect.c r1.241 from 2013 made it unused; found while reading code.
9034 OpenBSD-Commit-ID: 219ba6d7f9925d0b7992918612680399d86712b5
9036 commit e545d94b713effab8e6c7dfabbfb76c1d84d7498
9037 Author: Philip Hands <phil@hands.com>
9038 Date: Sun Oct 4 00:15:46 2020 +0200
9040 shift contents of long $() into filter_ids()
9042 This was prompted by the fact that posh does not deal with $()
9043 that contains comments where the comment includes an odd number
9044 of single-quotes. It seems to get befuddled into trying to find
9046 Regardless, making a function for filtering the unneeded ids
9047 seems much neater than avoiding apostrophes,
9048 so that's what I've done.
9050 SSH-Copy-ID-Upstream: 3dab3366a584427045c8a690a93282f02c09cf24
9052 commit fd360174596047b52aa1cddda74d85012a03ca4b
9053 Author: Philip Hands <phil@hands.com>
9054 Date: Sat Oct 3 23:15:16 2020 +0200
9056 combine if/elif to avoid duplication of the action
9058 SSH-Copy-ID-Upstream: 42aeb1cc53d3f7f6e78edc210fb121fda0834914
9060 commit f7c3a39b016dd77709ecbf18da8282f967b86cd7
9061 Author: Philip Hands <phil@hands.com>
9062 Date: Sat Oct 3 21:45:16 2020 +0200
9066 SSH-Copy-ID-Upstream: 5b08f840e78ac544288b3983010a1b0585e966fd
9068 commit 108676c3f26be6c873db0dd8754063699908727b
9069 Author: Philip Hands <phil@hands.com>
9070 Date: Sat Oct 3 21:10:03 2020 +0200
9072 tidy up test of $SCRATCH_DIR creation
9074 SSH-Copy-ID-Upstream: 2d8b22d96c105d87743ffe8874887b06f8989b93
9076 commit a9c9e91a82bc1a2cf801b4e3ef27a941dbd27717
9077 Author: Philip Hands <phil@hands.com>
9078 Date: Wed Sep 16 16:13:30 2020 +0200
9080 add -s flag: to install keys via SFTP
9082 This is prompted by:
9084 https://bugzilla.mindrot.org/show_bug.cgi?id=3201
9086 Thanks go to Matthias Blümel for the idea, and the helpful patch, from
9087 which this patch grew.
9089 SSH-Copy-ID-Upstream: f7c76dc64427cd20287a6868f672423b62057614
9091 commit f92424970c02b78852ff149378c7f2616ada4ccf
9092 Author: djm@openbsd.org <djm@openbsd.org>
9093 Date: Sun Oct 11 22:14:38 2020 +0000
9095 upstream: UpdateHostkeys: check for keys under other names
9097 Stop UpdateHostkeys from automatically removing deprecated keys from
9098 known_hosts files if the same keys exist under a different name or
9099 address to the host that is being connected to.
9101 This avoids UpdateHostkeys from making known_hosts inconsistent in
9102 some cases. For example, multiple host aliases sharing address-based
9103 known_hosts on different lines, or hosts that resolves to multiple
9108 OpenBSD-Commit-ID: 6444a705ba504c3c8ccddccd8d1b94aa33bd11c1
9110 commit d98f14b5328922ae3085e07007d820c4f655b57a
9111 Author: djm@openbsd.org <djm@openbsd.org>
9112 Date: Sun Oct 11 22:13:37 2020 +0000
9114 upstream: UpdateHostkeys: better CheckHostIP handling
9116 When preparing to update the known_hosts file, fully check both
9117 entries for both the host and the address (if CheckHostIP enabled)
9118 and ensure that, at the end of the operation, entries for both are
9121 Make sure this works with HashKnownHosts too, which requires maintaining
9122 a list of entry-types seen across the whole file for each key.
9126 OpenBSD-Commit-ID: 374dc263103f6b343d9671f87dbf81ffd0d6abdd
9128 commit af5941ae9b013aac12585e84c4cf494f3728982f
9129 Author: djm@openbsd.org <djm@openbsd.org>
9130 Date: Sun Oct 11 22:12:44 2020 +0000
9132 upstream: UpdateHostkeys: better detect manual host entries
9134 Disable UpdateHostkeys if the known_hosts line has more than two
9135 entries in the pattern-list. ssh(1) only writes "host" or "host,ip"
9136 lines so anything else was added by a different tool or by a human.
9140 OpenBSD-Commit-ID: e434828191fb5f3877d4887c218682825aa59820
9142 commit 6247812c76f70b2245f3c23f5074665b3d436cae
9143 Author: djm@openbsd.org <djm@openbsd.org>
9144 Date: Thu Oct 8 01:15:16 2020 +0000
9146 upstream: don't misdetect comma-separated hostkey names as wildcards;
9150 OpenBSD-Commit-ID: 4b874edfec7fc324a21b130bdb42f912177739ce
9152 commit 67146c7d022a170be3cdad2f5f40259a663fb266
9153 Author: wangxp006 <wangxiaopeng7@huawei.com>
9154 Date: Thu Oct 8 17:49:59 2020 +0800
9156 fix TEST_MALLOC_OPTIONS var
9158 commit 3205eaa3f8883a34fa4559ddef6c90d1067c5cce
9159 Author: djm@openbsd.org <djm@openbsd.org>
9160 Date: Thu Oct 8 00:31:05 2020 +0000
9162 upstream: clarify conditions for UpdateHostkeys
9164 OpenBSD-Commit-ID: 9cba714cf6aeed769f998ccbe8c483077a618e27
9166 commit e8dfca9bfeff05de87160407fb3e6a5717fa3dcb
9167 Author: djm@openbsd.org <djm@openbsd.org>
9168 Date: Wed Oct 7 06:38:16 2020 +0000
9170 upstream: remove GlobalKnownHostsFile for this test after
9172 UpdateHostkeys change
9174 OpenBSD-Regress-ID: a940ad79d59343319613ba8fc46b6ef24aa3f8e1
9176 commit 4aa2717d7517cff4bc423a6cfba3a2defb055aea
9177 Author: djm@openbsd.org <djm@openbsd.org>
9178 Date: Wed Oct 7 02:26:28 2020 +0000
9180 upstream: Disable UpdateHostkeys when hostkey checking fails
9182 If host key checking fails (i.e. a wrong host key is recorded for the
9183 server) and the user elects to continue (via StrictHostKeyChecking=no),
9184 then disable UpdateHostkeys for the session.
9186 reminded by Mark D. Baushke; ok markus@
9188 OpenBSD-Commit-ID: 98b524f121f4252309dd21becd8c4cacb0c6042a
9190 commit 04c06d04475f1f673e9d9743710d194453fe3888
9191 Author: djm@openbsd.org <djm@openbsd.org>
9192 Date: Wed Oct 7 02:25:43 2020 +0000
9194 upstream: Fix UpdateHostkeys/HashKnownHosts/CheckHostIP bug
9196 When all of UpdateHostkeys, HashKnownHosts and ChechHostIP
9197 were enabled and new host keys were learned, known_hosts IP
9198 entries were not being recorded for new host keys.
9200 reported by matthieu@ ok markus@
9202 OpenBSD-Commit-ID: a654a8290bd1c930aac509e8158cf85e42e49cb7
9204 commit b70e33711291f3081702133175a41cccafc0212a
9205 Author: djm@openbsd.org <djm@openbsd.org>
9206 Date: Wed Oct 7 02:24:51 2020 +0000
9208 upstream: don't UpdateHostkeys when the hostkey is verified by the
9210 GlobalKnownHostsFile file, support only UserKnownHostsFile matches
9212 suggested by Mark D. Baushke; feedback and ok markus@
9214 OpenBSD-Commit-ID: eabb771a6add676c398d38a143a1aff5f04abbb9
9216 commit aa623142e426ca1ab9db77b06dcc9b1b70bd102b
9217 Author: djm@openbsd.org <djm@openbsd.org>
9218 Date: Wed Oct 7 02:22:23 2020 +0000
9220 upstream: revert kex->flags cert hostkey downgrade back to a plain
9222 key (commitid VtF8vozGOF8DMKVg). We now do this a simpler way that needs less
9227 OpenBSD-Commit-ID: fb92d25b216bff8c136da818ac2221efaadf18ed
9229 commit f4f14e023cafee1cd9ebe4bb0db4029e6e1fafac
9230 Author: djm@openbsd.org <djm@openbsd.org>
9231 Date: Wed Oct 7 02:20:35 2020 +0000
9233 upstream: simply disable UpdateHostkeys when a certificate
9235 successfully authenticated the host; simpler than the complicated plumbing
9236 via kex->flags we have now.
9240 OpenBSD-Commit-ID: 80e39644eed75717d563a7f177e8117a0e14f42c
9242 commit e79957e877db42c4c68fabcf6ecff2268e53acb5
9243 Author: djm@openbsd.org <djm@openbsd.org>
9244 Date: Wed Oct 7 02:18:45 2020 +0000
9246 upstream: disable UpdateHostkeys by default if VerifyHostKeyDNS is
9248 enabled; suggested by Mark D. Baushke
9250 OpenBSD-Commit-ID: 85a1b88592c81bc85df7ee7787dbbe721a0542bf
9252 commit 3d4c2016bae1a6f14b48c1150a4c79ca4c9968bd
9253 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9254 Date: Tue Oct 6 07:12:04 2020 +0000
9256 upstream: Agent protocol draft is now at rev 4. ok djm@
9258 OpenBSD-Commit-ID: 8c01ea3aae48aab45e01b7421b0fca2dad5e7837
9260 commit af889a40ffc113af9105c03d7b32131eb4372d50
9261 Author: djm@openbsd.org <djm@openbsd.org>
9262 Date: Sun Oct 4 09:45:01 2020 +0000
9264 upstream: when ordering host key algorithms in the client, consider
9266 the ECDSA key subtype; ok markus@
9268 OpenBSD-Commit-ID: 3097686f853c61ff61772ea35f8b699931392ece
9270 commit 2d39fc9f7e039351daa3d6aead1538ac29258add
9271 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9272 Date: Sun Oct 4 03:04:02 2020 +0000
9274 upstream: Allow full range of UIDs and GIDs for sftp chown and
9276 chgrp on 32bit platforms instead of being limited by LONG_MAX. bz#3206,
9277 found by booking00 at sina.cn, ok markus@
9279 OpenBSD-Commit-ID: 373b7bbf1f15ae482d39567ce30d18b51c9229b5
9281 commit 396d32f3a1a16e54df2a76b2a9b237868580dcbe
9282 Author: djm@openbsd.org <djm@openbsd.org>
9283 Date: Sat Oct 3 09:22:26 2020 +0000
9285 upstream: There are lots of place where we want to redirect stdin,
9287 stdout and/or stderr to /dev/null. Factor all these out to a single
9288 stdfd_devnull() function that allows selection of which of these to redirect.
9291 OpenBSD-Commit-ID: 3033ba5a4c47cacfd5def020d42cabc52fad3099
9293 commit 1286981d08b8429a64613215ce8bff3f6b32488a
9294 Author: djm@openbsd.org <djm@openbsd.org>
9295 Date: Sat Oct 3 08:30:47 2020 +0000
9297 upstream: enable UpdateHostkeys by default when the configuration
9299 has not overridden UserKnownHostsFile; ok markus@ "The timing is perfect"
9302 OpenBSD-Commit-ID: 62df71c9c5242da5763cb473c2a2deefbd0cef60
9304 commit 332f21537293d66508f7342dc643bc7fe45f0f69
9305 Author: djm@openbsd.org <djm@openbsd.org>
9306 Date: Sat Oct 3 08:12:59 2020 +0000
9308 upstream: disable UpdateHostkeys when a wildcard hostname pattern
9310 is encountered or when a certificate host key is in use. feedback/ok markus@
9312 OpenBSD-Commit-ID: b6e5575af7e6732322be82ec299e09051a5413bd
9314 commit 13cee44ef907824083d89cb9395adbbd552e46c1
9315 Author: djm@openbsd.org <djm@openbsd.org>
9316 Date: Sat Oct 3 08:11:28 2020 +0000
9318 upstream: record when the host key checking code downgrades a
9320 certificate host key to a plain key. This occurs when the user connects to a
9321 host with a certificate host key but no corresponding CA key configured in
9322 known_hosts; feedback and ok markus@
9324 OpenBSD-Commit-ID: 2ada81853ff9ee7824c62f440bcf4ad62030c901
9326 commit 12ae8f95e2e0c273e9e7ef930b01a028ef796a3f
9327 Author: djm@openbsd.org <djm@openbsd.org>
9328 Date: Sat Oct 3 04:15:06 2020 +0000
9330 upstream: prefer ed25519 signature algorithm variants to ECDSA; ok
9334 OpenBSD-Commit-ID: 82187926fca96d35a5b5afbc091afa84e0966e5b
9336 commit e5ed753add7aa8eed6b167e44db6240a76404db2
9337 Author: djm@openbsd.org <djm@openbsd.org>
9338 Date: Sat Oct 3 03:40:38 2020 +0000
9340 upstream: want time.h here too
9342 OpenBSD-Commit-ID: fafee8f1108c64ad8b282f9a1ed5ea830d8c58a7
9344 commit 66bd9fdf8b7762eb6a85cabbb1ae4ed955679f60
9345 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9346 Date: Sat Oct 3 02:18:33 2020 +0000
9348 upstream: split introductory paragraph, and insert ominous words about
9350 the glob issue, which cannot be fully fixed and really requires completely
9351 replacing scp with a completely different subsystem. team effort to find the
9354 OpenBSD-Commit-ID: 58e1f72d292687f63eb357183036ee242513691c
9356 commit 86cc8ce002ea10e88a4c5d622a8fdfab8a7d261f
9357 Author: Damien Miller <djm@mindrot.org>
9358 Date: Sat Oct 3 13:38:55 2020 +1000
9360 use relative rather than system include here
9362 commit 922cfac5ed5ead9f796f7d39f012dd653dc5c173
9363 Author: Damien Miller <djm@mindrot.org>
9364 Date: Sat Oct 3 13:38:41 2020 +1000
9366 add some openbsd-compat licenses we missed
9368 commit ce941c75ea9cd6c358508a5b206809846c8d9240
9369 Author: Philip Hands <phil@hands.com>
9370 Date: Sat Oct 3 00:20:07 2020 +0200
9372 un-nest $() to make ksh cheerful
9374 commit 18ea5f4b88e303677d2003b95e5cb864b439e442
9375 Author: Philip Hands <phil@hands.com>
9376 Date: Fri Oct 2 21:30:10 2020 +0200
9378 ksh doesn't grok 'local'
9380 and AFAICT it's not actually doing anything useful in the code, so let's
9381 see how things go without it.
9383 commit d9e727dcc04a52caaac87543ea1d230e9e6b5604
9384 Author: Oleg <Fallmay@users.noreply.github.com>
9385 Date: Thu Oct 1 12:09:08 2020 +0300
9387 Fix `EOF: command not found` error in ssh-copy-id
9389 commit a1a856d50c89be3206f320baa4bfb32fff4e826f
9390 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9391 Date: Wed Sep 30 09:11:39 2020 +0000
9393 upstream: Regen moduli.
9395 OpenBSD-Commit-ID: 04967f8c43e9854ac34b917bcd6f5ac96c53a693
9397 commit fa1fe3ead7069d90d3c67d62137ad66acfcc9f48
9398 Author: HARUYAMA Seigo <haruyama@unixuser.org>
9399 Date: Sun Sep 27 20:06:20 2020 +0900
9401 Restore first section title of INSTALL
9403 commit 279261e1ea8150c7c64ab5fe7cb4a4ea17acbb29
9404 Author: Damien Miller <djm@mindrot.org>
9405 Date: Sun Sep 27 17:25:01 2020 +1000
9407 update version numbers
9409 commit 58ca6ab6ff035ed12b5078e3e9c7199fe72c8587
9410 Author: djm@openbsd.org <djm@openbsd.org>
9411 Date: Sun Sep 27 07:22:05 2020 +0000
9413 upstream: openssh 8.4
9415 OpenBSD-Commit-ID: a29e5b372d2c00e297da8a35a3b87c9beb3b4a58
9417 commit 9bb8a303ce05ff13fb421de991b495930be103c3
9418 Author: Damien Miller <djm@mindrot.org>
9419 Date: Tue Sep 22 10:07:43 2020 +1000
9421 sync with upstream ssh-copy-id rev f0da1a1b7
9423 commit 0a4a5571ada76b1b012bec9cf6ad1203fc19ec8d
9424 Author: djm@openbsd.org <djm@openbsd.org>
9425 Date: Mon Sep 21 07:29:09 2020 +0000
9427 upstream: close stdin when forking after authentication too; ok markus
9429 OpenBSD-Commit-ID: 43db17e4abc3e6b4a7b033aa8cdab326a7cb6c24
9431 commit d14fe25e6c3b89f8af17e2894046164ac3b45688
9432 Author: djm@openbsd.org <djm@openbsd.org>
9433 Date: Sun Sep 20 23:31:46 2020 +0000
9435 upstream: close stdout/stderr after "ssh -f ..." forking
9439 OpenBSD-Commit-ID: e2d83cc4dea1665651a7aa924ad1ed6bcaaab3e2
9441 commit 53a33a0d745179c02108589e1722457ca8ae4372
9442 Author: Damien Miller <djm@mindrot.org>
9443 Date: Sun Sep 20 15:57:09 2020 +1000
9447 commit 107eb3eeafcd390e1fa7cc7672a05e994d14013e
9448 Author: djm@openbsd.org <djm@openbsd.org>
9449 Date: Sun Sep 20 05:47:25 2020 +0000
9451 upstream: cap channel input buffer size at 16MB; avoids high memory use
9453 when peer advertises a large window but is slow to consume the data we send
9454 (e.g. because of a slow network)
9456 reported by Pierre-Yves David
9458 fix with & ok markus@
9460 OpenBSD-Commit-ID: 1452771f5e5e768876d3bfe2544e3866d6ade216
9462 commit acfe2ac5fe033e227ad3a56624fbbe4af8b5da04
9463 Author: Damien Miller <djm@mindrot.org>
9464 Date: Fri Sep 18 22:02:53 2020 +1000
9466 libfido2 1.5.0 is recommended
9468 commit 52a03e9fca2d74eef953ddd4709250f365ca3975
9469 Author: djm@openbsd.org <djm@openbsd.org>
9470 Date: Fri Sep 18 08:16:38 2020 +0000
9472 upstream: handle multiple messages in a single read()
9474 PR#183 by Dennis Kaarsemaker; feedback and ok markus@
9476 OpenBSD-Commit-ID: 8570bb4d02d00cf70b98590716ea6a7d1cce68d1
9478 commit dc098405b2939146e17567a25b08fc6122893cdf
9479 Author: pedro martelletto <pedro@ambientworks.net>
9480 Date: Fri Sep 18 08:57:29 2020 +0200
9482 configure.ac: add missing includes
9484 when testing, make sure to include the relevant header files that
9485 declare the types of the functions used by the test:
9487 - stdio.h for printf();
9488 - stdlib.h for exit();
9489 - string.h for strcmp();
9490 - unistd.h for unlink(), _exit(), fork(), getppid(), sleep().
9492 commit b3855ff053f5078ec3d3c653cdaedefaa5fc362d
9493 Author: djm@openbsd.org <djm@openbsd.org>
9494 Date: Fri Sep 18 05:23:03 2020 +0000
9496 upstream: tweak the client hostkey preference ordering algorithm to
9498 prefer the default ordering if the user has a key that matches the
9499 best-preference default algorithm.
9501 feedback and ok markus@
9503 OpenBSD-Commit-ID: a92dd7d7520ddd95c0a16786a7519e6d0167d35f
9505 commit f93b187ab900c7d12875952cc63350fe4de8a0a8
9506 Author: Damien Miller <djm@mindrot.org>
9507 Date: Fri Sep 18 14:55:48 2020 +1000
9509 control over the colours in gnome-ssh-askpass[23]
9511 Optionally set the textarea colours via $GNOME_SSH_ASKPASS_FG_COLOR and
9512 $GNOME_SSH_ASKPASS_BG_COLOR. These accept the usual three or six digit
9515 commit 9d3d36bdb10b66abd1af42e8655502487b6ba1fa
9516 Author: Damien Miller <djm@mindrot.org>
9517 Date: Fri Sep 18 14:50:38 2020 +1000
9519 focus improvement for gnome-ssh-askpass[23]
9521 When serving a SSH_ASKPASS_PROMPT=none information dialog, ensure
9522 then <enter> doesn't immediately close the dialog. Instead, require an
9523 explicit <tab> to reach the close button, or <esc>.
9525 commit d6f507f37e6c75a899db0ef8224e72797c5563b6
9526 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9527 Date: Wed Sep 16 03:07:31 2020 +0000
9529 upstream: Remove unused buf, last user was removed when switching
9531 to the sshbuf API. Patch from Sebastian Andrzej Siewior.
9533 OpenBSD-Commit-ID: 250fa17f0cec01039cc4abd95917d9746e24c889
9535 commit c3c786c3a0973331ee0922b2c51832a3b8d7f20f
9536 Author: djm@openbsd.org <djm@openbsd.org>
9537 Date: Wed Sep 9 21:57:27 2020 +0000
9539 upstream: For the hostkey confirmation message:
9541 > Are you sure you want to continue connecting (yes/no/[fingerprint])?
9543 compare the fingerprint case sensitively; spotted Patrik Lundin
9546 OpenBSD-Commit-ID: 73097afee1b3a5929324e345ba4a4a42347409f2
9548 commit f2950baf0bafe6aa20dfe2e8d1ca4b23528df617
9549 Author: Darren Tucker <dtucker@dtucker.net>
9550 Date: Fri Sep 11 14:45:23 2020 +1000
9552 New config-build-time dependency on automake.
9554 commit 600c1c27abd496372bd0cf83d21a1c119dfdf9a5
9555 Author: Darren Tucker <dtucker@dtucker.net>
9556 Date: Sun Sep 6 21:56:36 2020 +1000
9558 Add aclocal.m4 and config.h.in~ to .gitignore.
9560 aclocal.m4 is now generated by autoreconf.
9562 commit 4bf7e1d00b1dcd3a6b3239f77465c019e61c6715
9563 Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9564 Date: Sat Sep 5 17:50:03 2020 +0200
9566 Quote the definition of OSSH_CHECK_HEADER_FOR_FIELD
9568 autoreconf complains about underquoted definition of
9569 OSSH_CHECK_HEADER_FOR_FIELD after aclocal.m4 has been and now is beeing
9572 Quote OSSH_CHECK_HEADER_FOR_FIELD as suggested.
9574 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9576 commit a2f3ae386b5f7938ed3c565ad71f30c4f7f010f1
9577 Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9578 Date: Sat Sep 5 17:50:02 2020 +0200
9580 Move the local m4 macros
9582 The `aclocal' step is skipped during `autoreconf' because aclocal.m4 is
9584 Move the current aclocal.m4 which contains local macros into the m4/
9585 folder. With this change the aclocal.m4 will be re-created during
9586 changes to the m4/ macro.
9587 This is needed so the `aclocal' can fetch m4 macros from the system if
9588 they are references in the configure script. This is a prerequisite to
9589 use PKG_CHECK_MODULES.
9591 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9593 commit 8372bff3a895b84fd78a81dc39da10928b662f5a
9594 Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9595 Date: Sat Sep 5 17:50:01 2020 +0200
9597 Remove HAVE_MMAP and BROKEN_MMAP
9599 BROKEN_MMAP is no longer defined since commit
9600 1cfd5c06efb12 ("Remove portability support for mmap")
9602 this commit also removed other HAVE_MMAP user. I didn't find anything
9603 that defines HAVE_MMAP. The check does not trigger because compression
9604 on server side is by default COMP_DELAYED (2) so it never triggers.
9606 Remove remaining HAVE_MMAP and BROKEN_MMAP bits.
9608 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
9610 commit bbf20ac8065905f9cb9aeb8f1df57fcab52ee2fb
9611 Author: djm@openbsd.org <djm@openbsd.org>
9612 Date: Wed Sep 9 03:10:21 2020 +0000
9614 upstream: adapt to SSH_SK_VERSION_MAJOR crank
9616 OpenBSD-Regress-ID: 0f3e76bdc8f9dbd9d22707c7bdd86051d5112ab8
9618 commit 9afe2a150893b20bdf9eab764978d817b9a7b783
9619 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9620 Date: Fri Aug 28 03:17:13 2020 +0000
9622 upstream: Ensure that address/mask mismatches are flagged at
9624 config-check time. ok djm@
9626 OpenBSD-Regress-ID: 8f5f4c2c0bf00e6ceae7a1755a444666de0ea5c2
9628 commit c76773524179cb654ff838dd43ba1ddb155bafaa
9629 Author: djm@openbsd.org <djm@openbsd.org>
9630 Date: Wed Sep 9 03:08:01 2020 +0000
9632 upstream: when writing an attestation blob for a FIDO key, record all
9634 the data needed to verify the attestation. Previously we were missing the
9635 "authenticator data" that is included in the signature.
9637 spotted by Ian Haken
9638 feedback Pedro Martelletto and Ian Haken; ok markus@
9640 OpenBSD-Commit-ID: 8439896e63792b2db99c6065dd9a45eabbdb7e0a
9642 commit c1c44eeecddf093a7983bd91e70b446de789b363
9643 Author: pedro martelletto <pedro@ambientworks.net>
9644 Date: Tue Sep 1 17:01:55 2020 +0200
9646 configure.ac: fix libfido2 back-compat
9648 - HAVE_FIDO_CRED_PROD -> HAVE_FIDO_CRED_PROT;
9649 - check for fido_dev_get_touch_begin(), so that
9650 HAVE_FIDO_DEV_GET_TOUCH_BEGIN gets defined.
9652 commit 785f0f315bf7ac5909e988bb1ac3e019fb5e1594
9653 Author: djm@openbsd.org <djm@openbsd.org>
9654 Date: Mon Aug 31 04:33:17 2020 +0000
9656 upstream: refuse to add verify-required (PINful) FIDO keys to
9658 ssh-agent until the agent supports them properly
9660 OpenBSD-Commit-ID: 125bd55a8df32c87c3ec33c6ebe437673a3d037e
9662 commit 39e88aeff9c7cb6862b37ad1a87a03ebbb38c233
9663 Author: djm@openbsd.org <djm@openbsd.org>
9664 Date: Mon Aug 31 00:17:41 2020 +0000
9666 upstream: Add RCS IDs to the few files that are missing them; from
9670 OpenBSD-Commit-ID: 39aa37a43d0c75ec87f1659f573d3b5867e4a3b3
9672 commit 72730249b38a676da94a1366b54a6e96e6928bcb
9673 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9674 Date: Fri Aug 28 03:15:52 2020 +0000
9676 upstream: Check that the addresses supplied to Match Address and
9678 Match LocalAddress are valid when parsing in config-test mode. This will
9679 catch address/mask mismatches before they cause problems at runtime. Found by
9680 Daniel Stocker, ok djm@
9682 OpenBSD-Commit-ID: 2d0b10c69fad5d8fda4c703e7c6804935289378b
9684 commit 2a3a9822311a565a9df48ed3b6a3c972f462bd7d
9685 Author: jmc@openbsd.org <jmc@openbsd.org>
9686 Date: Thu Aug 27 12:34:00 2020 +0000
9688 upstream: sentence fix; from pedro martelletto
9690 OpenBSD-Commit-ID: f95b84a1e94e9913173229f3787448eea2f8a575
9692 commit ce178be0d954b210c958bc2b9e998cd6a7aa73a9
9693 Author: Damien Miller <djm@mindrot.org>
9694 Date: Thu Aug 27 20:01:52 2020 +1000
9696 tweak back-compat for older libfido2
9698 commit d6f45cdde031acdf434bbb27235a1055621915f4
9699 Author: djm@openbsd.org <djm@openbsd.org>
9700 Date: Thu Aug 27 09:46:04 2020 +0000
9702 upstream: debug()-print a little info about FIDO-specific key
9704 fields via "ssh-keygen -vyf /path/key"
9706 OpenBSD-Commit-ID: cf315c4fe77db43947d111b00155165cb6b577cf
9708 commit b969072cc3d62d05cb41bc6d6f3c22c764ed932f
9709 Author: djm@openbsd.org <djm@openbsd.org>
9710 Date: Thu Aug 27 09:43:28 2020 +0000
9712 upstream: skip a bit more FIDO token selection logic when only a
9714 single token is attached.
9716 with Pedro Martelletto
9718 OpenBSD-Commit-ID: e4a324bd9814227ec1faa8cb619580e661cca9ac
9720 commit 744df42a129d7d7db26947b7561be32edac89f88
9721 Author: jmc@openbsd.org <jmc@openbsd.org>
9722 Date: Thu Aug 27 06:15:22 2020 +0000
9724 upstream: tweak previous;
9726 OpenBSD-Commit-ID: 92714b6531e244e4da401b2defaa376374e24be7
9728 commit e32479645ce649b444ba5c6e7151304306a09654
9729 Author: djm@openbsd.org <djm@openbsd.org>
9730 Date: Thu Aug 27 03:55:22 2020 +0000
9732 upstream: adapt to API changes
9734 OpenBSD-Regress-ID: 5f147990cb67094fe554333782ab268a572bb2dd
9736 commit bbcc858ded3fbc46abfa7760e40389e3ca93884c
9737 Author: Damien Miller <djm@mindrot.org>
9738 Date: Thu Aug 27 12:37:12 2020 +1000
9740 degrade semi-gracefully when libfido2 is too old
9742 commit 9cbbdc12cb6a2ab1e9ffe9974cca91d213c185c2
9743 Author: djm@openbsd.org <djm@openbsd.org>
9744 Date: Thu Aug 27 01:15:36 2020 +0000
9746 upstream: dummy firmware needs to match API version numner crank (for
9748 verify-required resident keys) even though it doesn't implement this feature
9750 OpenBSD-Regress-ID: 86579ea2891e18e822e204413d011b2ae0e59657
9752 commit c1e76c64956b424ba260fd4eec9970e5b5859039
9753 Author: djm@openbsd.org <djm@openbsd.org>
9754 Date: Thu Aug 27 02:11:09 2020 +0000
9756 upstream: remove unreachable code I forgot to delete in r1.334
9758 OpenBSD-Commit-ID: 9ed6078251a0959ee8deda443b9ae42484fd8b18
9760 commit 0caff05350bd5fc635674c9e051a0322faba5ae3
9761 Author: djm@openbsd.org <djm@openbsd.org>
9762 Date: Thu Aug 27 01:08:45 2020 +0000
9764 upstream: Request PIN ahead of time for certain FIDO actions
9766 When we know that a particular action will require a PIN, such as
9767 downloading resident keys or generating a verify-required key, request
9768 the PIN before attempting it.
9770 joint work with Pedro Martelletto; ok markus@
9772 OpenBSD-Commit-ID: 863182d38ef075bad1f7d20ca485752a05edb727
9774 commit b649b3daa6d4b8ebe1bd6de69b3db5d2c03c9af0
9775 Author: djm@openbsd.org <djm@openbsd.org>
9776 Date: Thu Aug 27 01:08:19 2020 +0000
9778 upstream: preserve verify-required for resident FIDO keys
9780 When downloading a resident, verify-required key from a FIDO token,
9781 preserve the verify-required in the private key that is written to
9782 disk. Previously we weren't doing that because of lack of support
9783 in the middleware API.
9785 from Pedro Martelletto; ok markus@ and myself
9787 OpenBSD-Commit-ID: 201c46ccdd227cddba3d64e1bdbd082afa956517
9789 commit 642e06d0df983fa2af85126cf4b23440bb2985bf
9790 Author: djm@openbsd.org <djm@openbsd.org>
9791 Date: Thu Aug 27 01:07:51 2020 +0000
9793 upstream: major rework of FIDO token selection logic
9795 When PINs are in use and multiple FIDO tokens are attached to a host, we
9796 cannot just blast requests at all attached tokens with the PIN specified
9797 as this will cause the per-token PIN failure counter to increment. If
9798 this retry counter hits the token's limit (usually 3 attempts), then the
9799 token will lock itself and render all (web and SSH) of its keys invalid.
9802 So this reworks the key selection logic for the specific case of
9803 multiple keys being attached. When multiple keys are attached and the
9804 operation requires a PIN, then the user must touch the key that they
9805 wish to use first in order to identify it.
9807 This may require multiple touches, but only if there are multiple keys
9808 attached AND (usually) the operation requires a PIN. The usual case of a
9809 single key attached should be unaffected.
9811 Work by Pedro Martelletto; ok myself and markus@
9813 OpenBSD-Commit-ID: 637d3049ced61b7a9ee796914bbc4843d999a864
9815 commit 801c9f095e6d8b7b91aefd98f5001c652ea13488
9816 Author: djm@openbsd.org <djm@openbsd.org>
9817 Date: Thu Aug 27 01:07:09 2020 +0000
9819 upstream: support for requiring user verified FIDO keys in sshd
9821 This adds a "verify-required" authorized_keys flag and a corresponding
9822 sshd_config option that tells sshd to require that FIDO keys verify the
9823 user identity before completing the signing/authentication attempt.
9824 Whether or not user verification was performed is already baked into the
9825 signature made on the FIDO token, so this is just plumbing that flag
9826 through and adding ways to require it.
9828 feedback and ok markus@
9830 OpenBSD-Commit-ID: 3a2313aae153e043d57763d766bb6d55c4e276e6
9832 commit 9b8ad93824c682ce841f53f3b5762cef4e7cc4dc
9833 Author: djm@openbsd.org <djm@openbsd.org>
9834 Date: Thu Aug 27 01:06:18 2020 +0000
9836 upstream: support for user-verified FIDO keys
9838 FIDO2 supports a notion of "user verification" where the user is
9839 required to demonstrate their identity to the token before particular
9840 operations (e.g. signing). Typically this is done by authenticating
9841 themselves using a PIN that has been set on the token.
9843 This adds support for generating and using user verified keys where
9844 the verification happens via PIN (other options might be added in the
9845 future, but none are in common use now). Practically, this adds
9846 another key generation option "verify-required" that yields a key that
9847 requires a PIN before each authentication.
9849 feedback markus@ and Pedro Martelletto; ok markus@
9851 OpenBSD-Commit-ID: 57fd461e4366f87c47502c5614ec08573e6d6a15
9853 commit 1196d7f49d4fbc90f37e550de3056561613b0960
9854 Author: cheloha@openbsd.org <cheloha@openbsd.org>
9855 Date: Wed Aug 12 01:23:45 2020 +0000
9857 upstream: ssh-keyscan(1): simplify conloop() with timercmp(3),
9859 timersub(3); ok djm@
9861 OpenBSD-Commit-ID: a102acb544f840d33ad73d40088adab4a687fa27
9863 commit d0a195c89e26766d3eb8f3e4e2a00ebc98b57795
9864 Author: djm@openbsd.org <djm@openbsd.org>
9865 Date: Tue Aug 11 09:49:57 2020 +0000
9867 upstream: let ssh_config(5)'s AddKeysToAgent keyword accept a time
9869 limit for keys in addition to its current flag options. Time-limited keys
9870 will automatically be removed from ssh-agent after their expiry time has
9873 OpenBSD-Commit-ID: 792e71cacbbc25faab5424cf80bee4a006119f94
9875 commit e9c2002891a7b8e66f4140557a982978f372e5a3
9876 Author: djm@openbsd.org <djm@openbsd.org>
9877 Date: Tue Aug 11 09:45:54 2020 +0000
9879 upstream: let the "Confirm user presence for key ..." ssh-askpass
9881 notification respect $SSH_ASKPASS_REQUIRE; ok markus@
9883 OpenBSD-Commit-ID: 7c1a616b348779bda3b9ad46bf592741f8e206c1
9885 commit eaf8672b1b52db2815a229745f4e4b08681bed6d
9886 Author: Darren Tucker <dtucker@dtucker.net>
9887 Date: Fri Aug 21 00:04:13 2020 +1000
9889 Remove check for 'ent' command.
9891 It was added in 8d1fd57a9 for measuring entropy of ssh_prng_cmds which
9892 has long since been removed and there are no other references to it.
9894 commit 05c215de8d224e094a872d97d45f37f60c06206b
9895 Author: Darren Tucker <dtucker@dtucker.net>
9896 Date: Mon Aug 17 21:34:32 2020 +1000
9898 Wrap stdint.h include in ifdef HAVE_STDINT_H.
9900 commit eaf2765efe8bc74feba85c34295d067637fc6635
9901 Author: Damien Miller <djm@mindrot.org>
9902 Date: Mon Aug 10 13:24:09 2020 +1000
9904 sync memmem.c with OpenBSD
9906 commit ed6bef77f5bb5b8f9ca2914478949e29f2f0a780
9907 Author: Darren Tucker <dtucker@dtucker.net>
9908 Date: Fri Aug 7 17:12:16 2020 +1000
9910 Always send any PAM account messages.
9912 If the PAM account stack reaturns any messages, send them to the user
9913 not just if the check succeeds. bz#2049, ok djm@
9915 commit a09e98dcae1e26f026029b7142b0e0d10130056f
9916 Author: Darren Tucker <dtucker@dtucker.net>
9917 Date: Fri Aug 7 15:37:37 2020 +1000
9919 Output test debug logs on failure.
9921 commit eb122b1eebe58b29a83a507ee814cbcf8aeded1b
9922 Author: Darren Tucker <dtucker@dtucker.net>
9923 Date: Fri Aug 7 15:11:42 2020 +1000
9925 Add ability to specify exact test target.
9927 commit c2ec7a07f8caabb4d8e00c66e7cd46bf2cd1e922
9928 Author: Darren Tucker <dtucker@dtucker.net>
9929 Date: Fri Aug 7 14:21:15 2020 +1000
9931 Document --without-openssl and --without-zlib.
9933 commit 651bb3a31949bbdc3a78b2ede95a77bce0c72984
9934 Author: Darren Tucker <dtucker@dtucker.net>
9935 Date: Fri Aug 7 14:15:11 2020 +1000
9937 Add without-openssl without-zlib test target.
9939 commit 9499f2bb01dc1032ae155999b2d7764b9491341f
9940 Author: Stefan Schindler <dns2utf8@estada.ch>
9941 Date: Wed Aug 5 19:00:52 2020 +0200
9943 Add CI with prepare script
9945 * Only use heimdal kerberos implementation
9946 * Fetch yubico/libfido2 (see: https://github.com/Yubico/libfido2)
9947 * Add one target for
9949 * each feature alone
9952 commit ea1f649046546a860f68b97ddc3015b7e44346ca
9953 Author: Damien Miller <djm@mindrot.org>
9954 Date: Wed Aug 5 08:58:57 2020 +1000
9956 support NetBSD's utmpx.ut_ss address field
9960 commit 32c63e75a70a0ed9d6887a55fcb0e4531a6ad617
9961 Author: Damien Miller <djm@mindrot.org>
9962 Date: Tue Aug 4 14:59:21 2020 +1000
9964 wrap a declaration in the same ifdefs as its use
9966 avoids warnings on NetBSD
9968 commit c9e3be9f4b41fda32a2a0138d54c7a6b563bc94d
9969 Author: Damien Miller <djm@mindrot.org>
9970 Date: Tue Aug 4 14:58:46 2020 +1000
9972 undef TAILQ_CONCAT and friends
9974 Needed for NetBSD. etc that supply these macros
9976 commit 2d8a3b7e8b0408dfeb933ac5cfd3a58f5bac49af
9977 Author: djm@openbsd.org <djm@openbsd.org>
9978 Date: Mon Aug 3 02:53:51 2020 +0000
9980 upstream: ensure that certificate extensions are lexically sorted.
9982 Previously if the user specified a custom extension then the everything would
9983 be in order except the custom ones. bz3198 ok dtucker markus
9985 OpenBSD-Commit-ID: d97deb90587b06cb227c66ffebb2d9667bf886f0
9987 commit a8732d74cb8e72f0c6366015687f1e649f60be87
9988 Author: djm@openbsd.org <djm@openbsd.org>
9989 Date: Mon Aug 3 02:43:41 2020 +0000
9991 upstream: allow -A to explicitly enable agent forwarding in scp and
9993 sftp. The default remains to not forward an agent, even when ssh_config
9994 enables it. ok jmc dtucker markus
9996 OpenBSD-Commit-ID: 36cc526aa3b0f94e4704b8d7b969dd63e8576822
9998 commit ab9105470a83ed5d8197959a1b1f367399958ba1
9999 Author: deraadt@openbsd.org <deraadt@openbsd.org>
10000 Date: Mon Aug 3 02:42:49 2020 +0000
10002 upstream: clang -Wimplicit-fallthrough does not recognise /*
10004 FALLTHROUGH */ comments, which is the style we currently use, and gives too
10005 many boring warnings. ok djm
10007 OpenBSD-Commit-ID: 07b5031e9f49f2b69ac5e85b8da4fc9e393992a0
10009 commit ced327b9fb78c94d143879ef4b2a02cbc5d38690
10010 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10011 Date: Fri Jul 31 04:19:37 2020 +0000
10013 upstream: Also compare username when checking for JumpHost loops.
10017 OpenBSD-Commit-ID: 9bbc1d138adb34c54f3c03a15a91f75dbf418782
10019 commit ae7527010c44b3376b85d036a498f136597b2099
10020 Author: Darren Tucker <dtucker@dtucker.net>
10021 Date: Fri Jul 31 15:19:04 2020 +1000
10023 Remove AC_REVISION.
10025 It hasn't been useful since we switched to git in 2014. ok djm@
10027 commit 89fc3f414be0ce4e8008332a9739a7d721269e50
10028 Author: Darren Tucker <dtucker@dtucker.net>
10029 Date: Tue Jul 28 19:40:30 2020 +1000
10031 Use argv in OSSH_CHECK_CFLAG_COMPILE test.
10033 configure.ac is not detecting -Wextra in compilers that implement the
10034 option. The problem is that -Wextra implies -Wunused-parameter, and the
10035 C excerpt used by aclocal.m4 does not use argv. Patch from pedro at
10036 ambientworks.net, ok djm@
10038 commit 62c81ef531b0cc7ff655455dd34f5f0c94f48e82
10039 Author: Darren Tucker <dtucker@dtucker.net>
10040 Date: Mon Jul 20 22:12:07 2020 +1000
10042 Skip ECDSA-SK webauthn test when built w/out ECC
10044 commit 3ec9a6d7317236a9994887d8bd5d246af403a00d
10045 Author: Damien Miller <djm@mindrot.org>
10046 Date: Mon Jul 20 13:09:25 2020 +1000
10048 Add ssh-sk-helper and manpage to RPM spec file
10050 Based on patch from Fabio Pedretti
10052 commit a2855c048b3f4b17d8787bd3f24232ec0cd79abe
10053 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10054 Date: Fri Jul 17 07:09:24 2020 +0000
10056 upstream: Add %k to the TOKENs for Match Exec for consistency with
10058 the other keywords that recently got %k.
10060 OpenBSD-Commit-ID: 1857d1c40f270cbc254fca91e66110641dddcfdb
10062 commit 69860769fa9f4529d8612ec055ae11912f7344cf
10063 Author: jmc@openbsd.org <jmc@openbsd.org>
10064 Date: Fri Jul 17 05:59:05 2020 +0000
10066 upstream: fix macro slip in previous;
10068 OpenBSD-Commit-ID: 624e47ab209450ad9ad5c69f54fa69244de5ed9a
10070 commit 40649bd0822883b684183854b16d0b8461d5697b
10071 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10072 Date: Fri Jul 17 07:10:24 2020 +0000
10074 upstream: Add test for '%k' (HostKeyAlias) TOKEN.
10076 OpenBSD-Regress-ID: 8ed1ba1a811790031aad3fcea860a34ad7910456
10078 commit 6736fe680704a3518cb4f3f8f6723b00433bd3dd
10079 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10080 Date: Fri Jul 17 03:26:58 2020 +0000
10082 upstream: Add tests for expansions on UserKnownHostsFile.
10084 OpenBSD-Regress-ID: bccf8060306c841bbcceb1392644f906a4d6ca51
10086 commit 287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f
10087 Author: djm@openbsd.org <djm@openbsd.org>
10088 Date: Fri Jul 17 03:51:32 2020 +0000
10090 upstream: log error message for process_write() write failures
10092 OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851
10094 commit 8df5774a42d2eaffe057bd7f293fc6a4b1aa411c
10095 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10096 Date: Fri Jul 17 03:43:42 2020 +0000
10098 upstream: Add a '%k' TOKEN that expands to the effective HostKey of
10100 the destination. This allows, eg, keeping host keys in individual files
10101 using "UserKnownHostsFile ~/.ssh/known_hosts.d/%k". bz#1654, ok djm@, jmc@
10104 OpenBSD-Commit-ID: 7084d723c9cc987a5c47194219efd099af5beadc
10106 commit c4f239944a4351810fd317edf408bdcd5c0102d9
10107 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10108 Date: Fri Jul 17 03:23:10 2020 +0000
10110 upstream: Add %-TOKEN, environment variable and tilde expansion to
10112 UserKnownHostsFile, allowing the file to be automagically split up in the
10113 configuration (eg bz#1654). ok djm@, man page parts jmc@
10115 OpenBSD-Commit-ID: 7e1b406caf147638bb51558836a72d6cc0bd1b18
10117 commit dbaaa01daedb423c38124a72c471982fb08a16fb
10118 Author: solene@openbsd.org <solene@openbsd.org>
10119 Date: Wed Jul 15 07:50:46 2020 +0000
10121 upstream: - Add [-a rounds] in ssh-keygen man page and usage() -
10123 Reorder parameters list in the first usage() case - Sentence rewording
10126 jmc@ noticed usage() missed -a flag too
10128 OpenBSD-Commit-ID: f06b9afe91cc96f260b929a56e9930caecbde246
10130 commit 69924a92c3af7b99a7541aa544a2334ec0fb092c
10131 Author: jmc@openbsd.org <jmc@openbsd.org>
10132 Date: Wed Jul 15 05:40:05 2020 +0000
10134 upstream: start sentence with capital letter;
10136 OpenBSD-Commit-ID: ab06581d51b2b4cc1b4aab781f7f3cfa56cad973
10138 commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885
10139 Author: Damien Miller <djm@mindrot.org>
10140 Date: Fri Jul 17 13:15:50 2020 +1000
10142 detect Linux/X32 systems
10144 This is a frankenstein monster of AMD64 instructions/calling conventions
10145 but with a 4GB address space. Allegedly deprecated but people still run
10146 into it causing weird sandbox failures, e.g. bz#3085
10148 commit 9c9ddc1391d6af8d09580a2424ab467d0a5df3c7
10149 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10150 Date: Wed Jul 15 06:43:16 2020 +0000
10152 upstream: Fix previous by calling the correct function.
10154 OpenBSD-Regress-ID: 821cdd1dff9c502cceff4518b6afcb81767cad5a
10156 commit f1a4798941b4372bfe5e46f1c0f8672fe692d9e4
10157 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10158 Date: Wed Jul 15 05:36:50 2020 +0000
10160 upstream: Update test to match recent change in match.c
10162 OpenBSD-Regress-ID: 965bda1f95f09a765050707340c73ad755f41167
10164 commit d7e71be4fd57b7c7e620d733cdf2333b27bfa924
10165 Author: Darren Tucker <dtucker@dtucker.net>
10166 Date: Wed Jul 15 15:30:43 2020 +1000
10168 Adjust portable code to match changes in 939d787d,
10170 commit fec89f32a84fd0aa1afc81deec80a460cbaf451a
10171 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10172 Date: Wed Jul 15 04:27:34 2020 +0000
10174 upstream: Add default for number of rounds (-a). ok djm@
10176 OpenBSD-Commit-ID: cb7e9aa04ace01a98e63e4bd77f34a42ab169b15
10178 commit aaa8b609a7b332be836cd9a3b782422254972777
10179 Author: djm@openbsd.org <djm@openbsd.org>
10180 Date: Tue Jul 14 23:57:01 2020 +0000
10182 upstream: allow some additional control over the use of ssh-askpass
10184 via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@
10186 OpenBSD-Commit-ID: 3a1e6cbbf6241ddc4405c4246caa2c249f149eb2
10188 commit 6368022cd4dd508671c4999a59ec5826df098530
10189 Author: deraadt@openbsd.org <deraadt@openbsd.org>
10190 Date: Tue Jul 7 02:47:21 2020 +0000
10192 upstream: correct recently broken comments
10194 OpenBSD-Commit-ID: 964d9a88f7de1d0eedd3f8070b43fb6e426351f1
10196 commit 6d755706a0059eb9e2d63517f288b75cbc3b4701
10197 Author: djm@openbsd.org <djm@openbsd.org>
10198 Date: Sun Jul 5 23:59:45 2020 +0000
10200 upstream: some language improvements; ok markus
10202 OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8
10204 commit b0c1e8384d5e136ebdf895d1434aea7dd8661a1c
10205 Author: markus@openbsd.org <markus@openbsd.org>
10206 Date: Fri Jul 3 10:12:26 2020 +0000
10208 upstream: update setproctitle after re-exec; ok djm
10210 OpenBSD-Commit-ID: bc92d122f9184ec2a9471ade754b80edd034ce8b
10212 commit cd119a5ec2bf0ed5df4daff3bd14f8f7566dafd3
10213 Author: markus@openbsd.org <markus@openbsd.org>
10214 Date: Fri Jul 3 10:11:33 2020 +0000
10216 upstream: keep ignoring HUP after fork+exec; ok djm
10218 OpenBSD-Commit-ID: 7679985a84ee5ceb09839905bb6f3ddd568749a2
10220 commit 8af4a743693ccbea3e15fc9e93edbeb610fa94f4
10221 Author: markus@openbsd.org <markus@openbsd.org>
10222 Date: Fri Jul 3 10:10:17 2020 +0000
10224 upstream: don't exit the listener on send_rexec_state errors; ok
10228 OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c
10230 commit 03da4c2b70468f04ed1c08518ea0a70e67232739
10231 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10232 Date: Wed Jul 15 04:55:47 2020 +0000
10234 upstream: Use $OBJ to find key files. Fixes test when run on an obj
10236 directory (on OpenBSD) or out of tree (in Portable).
10238 OpenBSD-Regress-ID: 938fa8ac86adaa527d64a305bd2135cfbb1c0a17
10240 commit 73f20f195ad18f1cf633eb7d8be95dc1b6111eea
10241 Author: Darren Tucker <dtucker@dtucker.net>
10242 Date: Sat Jul 4 23:11:23 2020 +1000
10244 Wrap stdint.h in ifdef HAVE_STDINT_H.
10246 commit aa6fa4bf3023fa0e5761cd8f4b2cd015d2de74dd
10247 Author: djm@openbsd.org <djm@openbsd.org>
10248 Date: Fri Jul 3 07:25:18 2020 +0000
10250 upstream: put back the mux_ctx memleak fix, but only for channels of
10252 type SSH_CHANNEL_MUX_LISTENER; Specifically SSH_CHANNEL_MUX_PROXY channels
10253 should not have this structure freed.
10255 OpenBSD-Commit-ID: f3b213ae60405f77439e2b06262f054760c9d325
10257 commit d8195914eb43b20b13381f4e5a74f9f8a14f0ded
10258 Author: djm@openbsd.org <djm@openbsd.org>
10259 Date: Fri Jul 3 07:17:35 2020 +0000
10261 upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;
10263 simply freeing it here causes other problems
10265 OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed
10267 commit 20b5fab9f773b3d3c7f06cb15b8f69a2c081ee80
10268 Author: djm@openbsd.org <djm@openbsd.org>
10269 Date: Fri Jul 3 07:02:37 2020 +0000
10271 upstream: avoid tilde_expand_filename() in expanding ~/.ssh/rc - if
10273 sshd is in chroot mode, the likely absence of a password database will cause
10274 tilde_expand_filename() to fatal; ok dtucker@
10276 OpenBSD-Commit-ID: e20aee6159e8b79190d18dba1513fc1b7c8b7ee1
10278 commit c8935081db35d73ee6355999142fa0776a2af912
10279 Author: djm@openbsd.org <djm@openbsd.org>
10280 Date: Fri Jul 3 06:46:41 2020 +0000
10282 upstream: when redirecting sshd's log output to a file, undo this
10284 redirection after the session child process is forked(); ok dtucker@
10286 OpenBSD-Commit-ID: 6df86dd653c91f5bc8ac1916e7680d9d24690865
10288 commit 183c4aaef944af3a1a909ffa01058c65bac55748
10289 Author: djm@openbsd.org <djm@openbsd.org>
10290 Date: Fri Jul 3 06:29:57 2020 +0000
10292 upstream: start ClientAliveInterval bookkeeping before first pass
10294 through select() loop; fixed theoretical case where busy sshd may ignore
10295 timeouts from client; inspired by and ok dtucker
10297 OpenBSD-Commit-ID: 96bfc4b1f86c7da313882a84755b2b47eb31957f
10299 commit 6fcfd303d67f16695198cf23d109a988e40eefb6
10300 Author: Damien Miller <djm@mindrot.org>
10301 Date: Fri Jul 3 15:28:27 2020 +1000
10303 add check for fido_cred_set_prot() to configure
10305 commit f11b23346309e4d5138e733a49321aedd6eeaa2f
10306 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10307 Date: Fri Jul 3 05:09:06 2020 +0000
10309 upstream: Only reset the serveralive check when we receive traffic from
10311 the server and ignore traffic from a port forwarding client, preventing a
10312 client from keeping a connection alive when it should be terminated. Based
10313 on a patch from jxraynor at gmail.com via openssh-unix-dev and bz#2265, ok
10316 OpenBSD-Commit-ID: a941a575a5cbc244c0ef5d7abd0422bbf02c2dcd
10318 commit adfdbf1211914b631c038f0867a447db7b519937
10319 Author: Damien Miller <djm@mindrot.org>
10320 Date: Fri Jul 3 15:15:15 2020 +1000
10322 sync sys-queue.h with OpenBSD upstream
10324 needed for TAILQ_CONCAT
10326 commit 1b90ddde49e2ff377204082b6eb130a096411dc1
10327 Author: djm@openbsd.org <djm@openbsd.org>
10328 Date: Fri Jul 3 05:08:41 2020 +0000
10330 upstream: fix memory leak of mux_ctx; patch from Sergiy Lozovsky
10332 via bz3189 ok dtucker
10334 OpenBSD-Commit-ID: db249bd4526fd42d0f4f43f72f7b8b7705253bde
10336 commit 55ef3e9cbd5b336bd0f89205716924886fcf86de
10337 Author: markus@openbsd.org <markus@openbsd.org>
10338 Date: Wed Jul 1 16:28:31 2020 +0000
10340 upstream: free kex in ssh_packet_close; ok djm semarie
10342 OpenBSD-Commit-ID: dbc181e90d3d32fd97b10d75e68e374270e070a2
10344 commit e1c401109b61f7dbc199b5099933d579e7fc5dc9
10345 Author: bket@openbsd.org <bket@openbsd.org>
10346 Date: Sat Jun 27 13:39:09 2020 +0000
10348 upstream: Replace TAILQ concatenation loops with TAILQ_CONCAT
10352 OpenBSD-Commit-ID: 454b40e09a117ddb833794358970a65b14c431ef
10354 commit 14beca57ac92d62830c42444c26ba861812dc837
10355 Author: semarie@openbsd.org <semarie@openbsd.org>
10356 Date: Fri Jun 26 11:26:01 2020 +0000
10358 upstream: backout 1.293 fix kex mem-leak in ssh_packet_close at markus
10362 the change introduced a NULL deref in sshpkt_vfatal() (uses of ssh->kex after
10363 calling ssh_packet_clear_keys())
10365 OpenBSD-Commit-ID: 9c9a6721411461b0b1c28dc00930d7251a798484
10367 commit 598c3a5e3885080ced0d7c40fde00f1d5cdbb32b
10368 Author: Damien Miller <djm@mindrot.org>
10369 Date: Fri Jun 26 16:07:12 2020 +1000
10371 document a PAM spec problem in a frustrated comment
10373 commit 976c4f86286d52a0cb2aadf4a095d379c0da752e
10374 Author: djm@openbsd.org <djm@openbsd.org>
10375 Date: Fri Jun 26 05:42:16 2020 +0000
10377 upstream: avoid spurious error message when ssh-keygen creates files
10379 outside ~/.ssh; with dtucker@
10381 OpenBSD-Commit-ID: ac0c662d44607e00ec78c266ee60752beb1c7e08
10383 commit 32b2502a9dfdfded1ccdc1fd6dc2b3fe41bfc205
10384 Author: Damien Miller <djm@mindrot.org>
10385 Date: Fri Jun 26 15:30:06 2020 +1000
10387 missing ifdef SELINUX; spotted by dtucker
10389 commit e073106f370cdd2679e41f6f55a37b491f0e82fe
10390 Author: djm@openbsd.org <djm@openbsd.org>
10391 Date: Fri Jun 26 05:12:21 2020 +0000
10393 upstream: regress test for ssh-add -d; ok dtucker@
10395 OpenBSD-Regress-ID: 3a2e044be616afc7dd4f56c100179e83b33d8abf
10397 commit c809daaa1bad6b1c305b0e0b5440360f32546c84
10398 Author: markus@openbsd.org <markus@openbsd.org>
10399 Date: Wed Jun 24 15:16:23 2020 +0000
10401 upstream: add test for mux w/-Oproxy; ok djm
10403 OpenBSD-Regress-ID: 764d5c696e2a259f1316a056e225e50023abb027
10405 commit 3d06ff4bbd3dca8054c238d2a94c0da563ef7eee
10406 Author: djm@openbsd.org <djm@openbsd.org>
10407 Date: Fri Jun 26 05:16:38 2020 +0000
10409 upstream: handle EINTR in waitfd() and timeout_connect() helpers;
10411 bz#3071; ok dtucker@
10413 OpenBSD-Commit-ID: 08fa87be50070bd8b754d9b1ebb1138d7bc9d8ee
10415 commit fe2ec0b9c19adeab0cd9f04b8152dc17f31c31e5
10416 Author: djm@openbsd.org <djm@openbsd.org>
10417 Date: Fri Jun 26 05:04:07 2020 +0000
10419 upstream: allow "ssh-add -d -" to read keys to be deleted from
10421 stdin bz#3180; ok dtucker@
10423 OpenBSD-Commit-ID: 15c7f10289511eb19fce7905c9cae8954e3857ff
10425 commit a3e0c376ffc11862fa3568b28188bd12965973e1
10426 Author: djm@openbsd.org <djm@openbsd.org>
10427 Date: Fri Jun 26 05:03:36 2020 +0000
10429 upstream: constify a few things; ok dtucker (as part of another
10433 OpenBSD-Commit-ID: 7c17fc987085994d752304bd20b1ae267a9bcdf6
10435 commit 74344c3ca42c3f53b00b025daf09ae7f6aa38076
10436 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10437 Date: Fri Jun 26 05:02:03 2020 +0000
10439 upstream: Defer creation of ~/.ssh by ssh(1) until we attempt to
10441 write to it so we don't leave an empty .ssh directory when it's not needed.
10442 Use the same function to replace the code in ssh-keygen that does the same
10443 thing. bz#3156, ok djm@
10445 OpenBSD-Commit-ID: 59c073b569be1a60f4de36f491a4339bc4ae870f
10447 commit c9e24daac6324fcbdba171392c325bf9ccc3c768
10448 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10449 Date: Fri Jun 26 04:45:11 2020 +0000
10451 upstream: Expand path to ~/.ssh/rc rather than relying on it
10453 being relative to the current directory, so that it'll still be found if the
10454 shell startup changes its directory. Since the path is potentially longer,
10455 make the cmd buffer that uses it dynamically sized. bz#3185, with & ok djm@
10457 OpenBSD-Commit-ID: 36e33ff01497af3dc8226d0c4c1526fc3a1e46bf
10459 commit 07f5f369a25e228a7357ef6c57205f191f073d99
10460 Author: markus@openbsd.org <markus@openbsd.org>
10461 Date: Wed Jun 24 15:12:09 2020 +0000
10463 upstream: fix kex mem-leak in ssh_packet_close; ok djm
10465 OpenBSD-Commit-ID: e2e9533f393620383afd0b68ef435de8d5e8abe4
10467 commit e35995088cd6691a712bfd586bae8084a3a922ba
10468 Author: markus@openbsd.org <markus@openbsd.org>
10469 Date: Wed Jun 24 15:10:38 2020 +0000
10471 upstream: fix ssh -O proxy w/mux which got broken by no longer
10473 making ssh->kex optional in packet.c revision 1.278 ok djm@
10475 OpenBSD-Commit-ID: 2b65df04a064c2c6277359921d2320c90ab7d917
10477 commit 250246fef22b87a54a63211c60a2def9be431fbd
10478 Author: markus@openbsd.org <markus@openbsd.org>
10479 Date: Wed Jun 24 15:09:53 2020 +0000
10481 upstream: support loading big sshd_config files w/o realloc; ok
10485 OpenBSD-Commit-ID: ba9238e810074ac907f0cf8cee1737ac04983171
10487 commit 89b54900ac61986760452f132bbe3fb7249cfdac
10488 Author: markus@openbsd.org <markus@openbsd.org>
10489 Date: Wed Jun 24 15:08:53 2020 +0000
10491 upstream: allow sshd_config longer than 256k; ok djm
10493 OpenBSD-Commit-ID: 83f40dd5457a64c1d3928eb4364461b22766beb3
10495 commit e3fa6249e6d9ceb57c14b04dd4c0cfab12fa7cd5
10496 Author: markus@openbsd.org <markus@openbsd.org>
10497 Date: Wed Jun 24 15:07:33 2020 +0000
10499 upstream: only call sshkey_xmss_init() once for KEY_XMSS_CERT; ok
10503 OpenBSD-Commit-ID: d0002ffb7f20f538b014d1d0735facd5a81ff096
10505 commit 37f2da069c0619f2947fb92785051d82882876d7
10506 Author: djm@openbsd.org <djm@openbsd.org>
10507 Date: Mon Jun 22 23:44:27 2020 +0000
10509 upstream: some clarifying comments
10511 OpenBSD-Commit-ID: 5268479000fd97bfa30ab819f3517139daa054a2
10513 commit b659319a5bc9e8adf3c4facc51f37b670d2a7426
10514 Author: jmc@openbsd.org <jmc@openbsd.org>
10515 Date: Mon Jun 22 06:37:38 2020 +0000
10517 upstream: updated argument name for -P in first synopsis was
10519 missed in previous;
10521 OpenBSD-Commit-ID: 8d84dc3050469884ea91e29ee06a371713f2d0b7
10523 commit 02a9222cbce7131d639984c2f6c71d1551fc3333
10524 Author: jmc@openbsd.org <jmc@openbsd.org>
10525 Date: Mon Jun 22 06:36:40 2020 +0000
10527 upstream: supply word missing in previous;
10529 OpenBSD-Commit-ID: 16a38b049f216108f66c8b699aa046063381bd23
10531 commit 5098b3b6230852a80ac6cef5d53a785c789a5a56
10532 Author: Damien Miller <djm@mindrot.org>
10533 Date: Mon Jun 22 16:54:02 2020 +1000
10535 missing files for webauthn/sshsig unit test
10537 commit 354535ff79380237924ac8fdc98f8cdf83e67da6
10538 Author: djm@openbsd.org <djm@openbsd.org>
10539 Date: Mon Jun 22 06:00:06 2020 +0000
10541 upstream: add support for verification of webauthn sshsig signature,
10543 and example HTML/JS to generate webauthn signatures in SSH formats (also used
10544 to generate the testdata/* for the test).
10546 OpenBSD-Regress-ID: dc575be5bb1796fdf4b8aaee0ef52a6671a0f6fb
10548 commit bb52e70fa5330070ec9a23069c311d9e277bbd6f
10549 Author: djm@openbsd.org <djm@openbsd.org>
10550 Date: Mon Jun 22 05:58:35 2020 +0000
10552 upstream: Add support for FIDO webauthn (verification only).
10554 webauthn is a standard for using FIDO keys in web browsers. webauthn
10555 signatures are a slightly different format to plain FIDO signatures - this
10556 support allows verification of these. Feedback and ok markus@
10558 OpenBSD-Commit-ID: ab7e3a9fb5782d99d574f408614d833379e564ad
10560 commit 64bc121097f377142f1387ffb2df7592c49935af
10561 Author: djm@openbsd.org <djm@openbsd.org>
10562 Date: Mon Jun 22 05:56:23 2020 +0000
10564 upstream: refactor ECDSA-SK verification a little ahead of adding
10566 support for FIDO webauthn signature verification support; ok markus@
10568 OpenBSD-Commit-ID: c9f478fd8e0c1bd17e511ce8694f010d8e32043e
10570 commit 12848191f8fe725af4485d3600e0842d92f8637f
10571 Author: djm@openbsd.org <djm@openbsd.org>
10572 Date: Mon Jun 22 05:54:10 2020 +0000
10574 upstream: support for RFC4648 base64url encoding; ok markus
10576 OpenBSD-Commit-ID: 0ef22c55e772dda05c112c88412c0797fec66eb4
10578 commit 473b4af43db12127137c7fc1a10928313f5a16d2
10579 Author: djm@openbsd.org <djm@openbsd.org>
10580 Date: Mon Jun 22 05:53:26 2020 +0000
10582 upstream: better terminology for permissions; feedback & ok markus@
10584 OpenBSD-Commit-ID: ff2a71803b5ea57b83cc3fa9b3be42b70e462fb9
10586 commit fc270baf264248c3ee3050b13a6c8c0919e6559f
10587 Author: djm@openbsd.org <djm@openbsd.org>
10588 Date: Mon Jun 22 05:52:05 2020 +0000
10590 upstream: better terminology for permissions; feedback & ok markus@
10592 OpenBSD-Commit-ID: ffb220b435610741dcb4de0e7fc68cbbdc876d2c
10594 commit 00531bb42f1af17ddabea59c3d9c4b0629000d27
10595 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10596 Date: Fri Jun 19 07:21:42 2020 +0000
10598 upstream: Correct synopsis and usage for the options accepted when
10600 passing a command to ssh-agent. ok jmc@
10602 OpenBSD-Commit-ID: b36f0679cb0cac0e33b361051b3406ade82ea846
10604 commit b4556c8ad7177e379f0b60305a0cd70f12180e7c
10605 Author: Darren Tucker <dtucker@dtucker.net>
10606 Date: Fri Jun 19 19:22:00 2020 +1000
10608 Add OPENBSD ORIGINAL marker to bcrypt_pbkdf.
10610 commit 1babb8bb14c423011ca34c2f563bb1c51c8fbf1d
10611 Author: Darren Tucker <dtucker@dtucker.net>
10612 Date: Fri Jun 19 19:10:47 2020 +1000
10614 Extra brackets around sizeof() in bcrypt.
10616 Prevents following warning from clang 10:
10617 bcrypt_pbkdf.c:94:40: error: expression does not compute the number of
10618 elements in this array; element type is ´uint32_tÂ[...]
10619 place parentheses around the ´sizeof(uint64_t)´ expression to
10620 silence this warning
10622 commit 9e065729592633290e5ddb6852792913b2286545
10623 Author: Darren Tucker <dtucker@dtucker.net>
10624 Date: Fri Jun 19 18:47:56 2020 +1000
10626 Add includes.h to new test.
10628 Fixes warnings eg "´bounded´ attribute directive ignor" from gcc.
10630 commit e684b1ea365e070433f282a3c1dabc3e2311ce49
10631 Author: Darren Tucker <dtucker@dtucker.net>
10632 Date: Fri Jun 19 18:38:39 2020 +1000
10634 Skip OpenSSL specific tests w/out OpenSSL.
10636 Allows unit tests to pass when configure'ed --without-openssl.
10638 commit 80610e97a76407ca982e62fd051c9be03622fe7b
10639 Author: Darren Tucker <dtucker@dtucker.net>
10640 Date: Fri Jun 19 17:15:27 2020 +1000
10642 Hook sshsig tests up to Portable Makefiles.
10644 commit 5dba1fcabacaab46693338ec829b42a1293d1f52
10645 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10646 Date: Fri Jun 19 05:07:09 2020 +0000
10648 upstream: Test that ssh-agent exits when running as as subprocess
10650 of a specified command (ie "ssh-agent command"). Would have caught bz#3181.
10652 OpenBSD-Regress-ID: 895b4765ba5153eefaea3160a7fe08ac0b6db8b3
10654 commit 68e8294f6b04f9590ea227e63d3e129398a49e27
10655 Author: djm@openbsd.org <djm@openbsd.org>
10656 Date: Fri Jun 19 04:34:21 2020 +0000
10658 upstream: run sshsig unit tests
10660 OpenBSD-Regress-ID: 706ef17e2b545b64873626e0e35553da7c06052a
10662 commit 5edfa1690e9a75048971fd8775f7c16d153779db
10663 Author: djm@openbsd.org <djm@openbsd.org>
10664 Date: Fri Jun 19 04:32:09 2020 +0000
10666 upstream: basic unit test for sshsig.[ch], including FIDO keys
10668 verification only so far
10670 OpenBSD-Regress-ID: fb1f946c8fc59206bc6a6666e577b5d5d7e45896
10672 commit e95c0a0e964827722d29b4bc00d5c0ff4afe0ed2
10673 Author: djm@openbsd.org <djm@openbsd.org>
10674 Date: Fri Jun 19 03:48:49 2020 +0000
10676 upstream: basic unit test for FIDO kep parsing
10678 OpenBSD-Regress-ID: 8089b88393dd916d7c95422b442a6fd4cfe00c82
10680 commit 7775819c6de3e9547ac57b87c7dd2bfd28cefcc5
10681 Author: djm@openbsd.org <djm@openbsd.org>
10682 Date: Thu Jun 18 23:34:19 2020 +0000
10684 upstream: check public host key matches private; ok markus@ (as
10686 part of previous diff)
10688 OpenBSD-Commit-ID: 65a4f66436028748b59fb88b264cb8c94ce2ba63
10690 commit c514f3c0522855b4d548286eaa113e209051a6d2
10691 Author: djm@openbsd.org <djm@openbsd.org>
10692 Date: Thu Jun 18 23:33:38 2020 +0000
10694 upstream: avoid spurious "Unable to load host key" message when
10696 sshd can load a private key but no public counterpart; with & ok markus@
10698 OpenBSD-Commit-ID: 0713cbdf9aa1ff8ac7b1f78b09ac911af510f81b
10700 commit 7fafaeb5da365f4a408fec355dac04a774f27193
10701 Author: djm@openbsd.org <djm@openbsd.org>
10702 Date: Fri Jun 12 05:26:37 2020 +0000
10704 upstream: correct RFC number; from HARUYAMA Seigo via GH PR191
10706 OpenBSD-Commit-ID: 8d03b6c96ca98bfbc23d3754c3c33e1fe0852e10
10708 commit 3a7f654d5bcb20df24a134b6581b0d235da4564a
10709 Author: djm@openbsd.org <djm@openbsd.org>
10710 Date: Fri Jun 5 06:18:07 2020 +0000
10712 upstream: unbreak "sshd -ddd" - close of config passing fd happened too
10716 OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0
10718 commit 3de02be39e5c0c2208d9682a3844991651620fcc
10719 Author: Andreas Schwab <schwab@suse.de>
10720 Date: Mon May 25 11:10:44 2020 +0200
10722 Add support for AUDIT_ARCH_RISCV64
10724 commit ea547eb0329c2f8da77a4ac05f6c330bd49bdaab
10725 Author: djm@openbsd.org <djm@openbsd.org>
10726 Date: Fri Jun 5 03:25:35 2020 +0000
10728 upstream: make sshbuf_putb(b, NULL) a no-op
10730 OpenBSD-Commit-ID: 976fdc99b500e347023d430df372f31c1dd128f7
10732 commit 69796297c812640415c6cea074ea61afc899cbaa
10733 Author: djm@openbsd.org <djm@openbsd.org>
10734 Date: Fri Jun 5 03:24:36 2020 +0000
10736 upstream: make sshbuf_dump() args const
10738 OpenBSD-Commit-ID: b4a5accae750875d665b862504169769bcf663bd
10740 commit 670428895739d1f79894bdb2457891c3afa60a59
10741 Author: djm@openbsd.org <djm@openbsd.org>
10742 Date: Fri Jun 5 03:24:16 2020 +0000
10744 upstream: wrap long line
10746 OpenBSD-Commit-ID: ed405a12bd27bdc9c52e169bc5ff3529b4ebbbb2
10748 commit 2f648cf222882719040906722b3593b01df4ad1a
10749 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10750 Date: Fri Jun 5 03:15:26 2020 +0000
10752 upstream: Correct historical comment: provos@ modified OpenSSH to
10754 work with SSLeay (very quickly replaced by OpenSSL) not SSL in general. ok
10755 deraadt, historical context markus@
10757 OpenBSD-Commit-ID: 7209e07a2984b50411ed8ca5a4932da5030d2b90
10759 commit 56548e4efcc3e3e8093c2eba30c75b23e561b172
10760 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10761 Date: Wed Jun 3 08:23:18 2020 +0000
10763 upstream: Import regenerated moduli file.
10765 OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54
10767 commit 8da801f585dd9c534c0cbe487a3b1648036bf2fb
10768 Author: Darren Tucker <dtucker@dtucker.net>
10769 Date: Fri Jun 5 13:20:10 2020 +1000
10771 Test fallthrough in OSSH_CHECK_CFLAG_COMPILE.
10773 clang 10's -Wimplicit-fallthrough does not understand /* FALLTHROUGH */
10774 comments and we don't use the __attribute__((fallthrough)) that it's
10775 looking for. This has the effect of turning off -Wimplicit-fallthrough
10776 where it does not currently help (particularly with -Werror). ok djm@
10778 commit 049297de975b92adcc2db77e3fb7046c0e3c695d
10779 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10780 Date: Wed Jun 3 08:23:18 2020 +0000
10782 upstream: Import regenerated moduli file.
10784 OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54
10786 commit b458423a38a3140ac022ffcffcb332609faccfe3
10787 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10788 Date: Mon Jun 1 07:11:38 2020 +0000
10790 upstream: Remove now-unused proto_spec and associated definitions.
10794 OpenBSD-Commit-ID: 2e2b18e3aa6ee22a7b69c39f2d3bd679ec35c362
10796 commit 5ad3c3a33ef038b55a14ebd31faeeec46073db2c
10797 Author: millert@openbsd.org <millert@openbsd.org>
10798 Date: Fri May 29 21:22:02 2020 +0000
10800 upstream: Fix error message on close(2) and add printf format
10802 attributes. From Christos Zoulas, OK markus@
10804 OpenBSD-Commit-ID: 41523c999a9e3561fcc7082fd38ea2e0629ee07e
10806 commit 712ac1efb687a945a89db6aa3e998c1a17b38653
10807 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10808 Date: Fri May 29 11:17:56 2020 +0000
10810 upstream: Make dollar_expand variadic and pass a real va_list to
10812 vdollar_percent_expand. Fixes build error on arm64 spotted by otto@.
10814 OpenBSD-Commit-ID: 181910d7ae489f40ad609b4cf4a20f3d068a7279
10816 commit 837ffa9699a9cba47ae7921d2876afaccc027133
10817 Author: Darren Tucker <dtucker@dtucker.net>
10818 Date: Fri May 29 20:39:00 2020 +1000
10820 Omit ToS setting if we don't have IPV6_TCLASS too.
10822 Fixes tests on old BSDs.
10824 commit f85b118d2150847cc333895296bc230e367be6b5
10825 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10826 Date: Fri May 29 09:02:44 2020 +0000
10828 upstream: Pass a NULL instead of zeroed out va_list from
10830 dollar_expand. The original intent was in case there's some platform where
10831 va_list is not a pointer equivalent, but on i386 this chokes on the memset.
10832 This unbreaks that build, but will require further consideration.
10834 OpenBSD-Commit-ID: 7b90afcd8e1137a1d863204060052aef415baaf7
10836 commit ec1d50b01c84ff667240ed525f669454c4ebc8e9
10837 Author: jmc@openbsd.org <jmc@openbsd.org>
10838 Date: Fri May 29 05:48:39 2020 +0000
10840 upstream: remove a stray .El;
10842 OpenBSD-Commit-ID: 58ddfe6f8a15fe10209db6664ecbe7896f1d167c
10844 commit 058674a62ffe33f01d871d46e624bc2a2c22d91f
10845 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10846 Date: Fri May 29 04:32:26 2020 +0000
10848 upstream: Add regression and unit tests for ${ENV} style
10850 environment variable expansion in various keywords (bz#3140). ok djm@
10852 OpenBSD-Regress-ID: 4d9ceb95d89365b7b674bc26cf064c15a5bbb197
10854 commit 0b15892fc47d6840eba1291a6be9be1a70bc8972
10855 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10856 Date: Fri May 29 01:21:35 2020 +0000
10858 upstream: Unit test for convtime. ok djm@
10860 OpenBSD-Regress-ID: cec4239efa2fc4c7062064f07a847e1cbdbcd5dd
10862 commit 188e332d1c8f9f24e5b6659e9680bf083f837df9
10863 Author: djm@openbsd.org <djm@openbsd.org>
10864 Date: Fri May 29 05:37:03 2020 +0000
10866 upstream: mention that wildcards are processed in lexical order;
10870 OpenBSD-Commit-ID: 8856f3d1612bd42e9ee606d89386cae456dd165c
10872 commit 4a1b46e6d032608b7ec00ae51c4e25b82f460b05
10873 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10874 Date: Fri May 29 04:25:40 2020 +0000
10876 upstream: Allow some keywords to expand shell-style ${ENV}
10878 environment variables on the client side. The supported keywords are
10879 CertificateFile, ControlPath, IdentityAgent and IdentityFile, plus
10880 LocalForward and RemoteForward when used for Unix domain socket paths. This
10881 would for example allow forwarding of Unix domain socket paths that change at
10882 runtime. bz#3140, ok djm@
10884 OpenBSD-Commit-ID: a4a2e801fc2d4df2fe0e58f50d9c81b03822dffa
10886 commit c9bab1d3a9e183cef3a3412f57880a0374cc8cb2
10887 Author: Damien Miller <djm@mindrot.org>
10888 Date: Fri May 29 14:49:16 2020 +1000
10892 commit 0b0d219313bf9239ca043f20b1a095db0245588f
10893 Author: sobrado <sobrado@openbsd.org>
10894 Date: Thu Sep 3 23:06:28 2015 +0000
10896 partial sync of regress/netcat.c with upstream
10898 synchronize synopsis and usage.
10900 commit 0f04c8467f589f85a523e19fd684c4f6c4ed9482
10901 Author: chl <chl@openbsd.org>
10902 Date: Sun Jul 26 19:12:28 2015 +0000
10904 partial sync of regress/netcat.c with upstream
10906 remove unused variable
10910 commit d6a81050ace2630b06c3c6dd39bb4eef5d1043f8
10911 Author: tobias <tobias@openbsd.org>
10912 Date: Thu Mar 26 21:22:50 2015 +0000
10914 partial sync of regress/netcat.c with upstream
10916 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. :)
10918 with input by and ok djm
10920 commit bf3893dddd35e16def04bf48ed2ee1ad695b8f82
10921 Author: tobias <tobias@openbsd.org>
10922 Date: Thu Mar 26 10:36:03 2015 +0000
10924 partial sync of regress/netcat.c with upstream
10926 Check for short writes in fdpass(). Clean up while at it.
10930 commit e18435fec124b4c08eb6bbbbee9693dc04f4befb
10931 Author: jca <jca@openbsd.org>
10932 Date: Sat Feb 14 22:40:22 2015 +0000
10934 partial sync of regress/netcat.c with upstream
10936 Support for nc -T on IPv6 addresses.
10940 commit 4c607244054a036ad3b2449a6cb4c15feb846a76
10941 Author: djm@openbsd.org <djm@openbsd.org>
10942 Date: Fri May 29 03:14:02 2020 +0000
10944 upstream: fix compilation on !HAVE_DLOPEN platforms; stub function
10946 was not updated to match API change. From Dale Rahn via beck@ ok markus@
10948 OpenBSD-Commit-ID: 2b8d054afe34c9ac85e417dae702ef981917b836
10950 commit 224418cf55611869a4ace1b8b07bba0dff77a9c3
10951 Author: djm@openbsd.org <djm@openbsd.org>
10952 Date: Fri May 29 03:11:54 2020 +0000
10954 upstream: fix exit status for downloading of FIDO resident keys;
10956 from Pedro Martelletto, ok markus@
10958 OpenBSD-Commit-ID: 0da77dc24a1084798eedd83c39a002a9d231faef
10960 commit 1001dd148ed7c57bccf56afb40cb77482ea343a6
10961 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10962 Date: Fri May 29 01:20:46 2020 +0000
10964 upstream: Fix multiplier in convtime when handling seconds after
10966 other units. bz#3171, spotted by ronf at timeheart.net, ok djm@.
10968 OpenBSD-Commit-ID: 95b7a848e1083974a65fbb6ccb381d438e1dd5be
10970 commit 7af1e92cd289b7eaa9a683e9a6f2fddd98f37a01
10971 Author: djm@openbsd.org <djm@openbsd.org>
10972 Date: Wed May 27 22:37:53 2020 +0000
10974 upstream: fix Include before Match in sshd_config; bz#3122 patch
10978 OpenBSD-Commit-ID: 1b0aaf135fe6732b5d326946042665dd3beba5f4
10980 commit 0a9a611619b0a1fecd0195ec86a9885f5d681c84
10981 Author: djm@openbsd.org <djm@openbsd.org>
10982 Date: Wed May 27 21:59:11 2020 +0000
10984 upstream: Do not call process_queued_listen_addrs() for every
10986 included file from sshd_config; patch from Jakub Jelen
10988 OpenBSD-Commit-ID: 0ff603d6f06a7fab4881f12503b53024799d0a49
10990 commit 16ea1fdbe736648f79a827219134331f8d9844fb
10991 Author: djm@openbsd.org <djm@openbsd.org>
10992 Date: Wed May 27 21:25:18 2020 +0000
10994 upstream: fix crash in recallocarray when deleting SendEnv
10996 variables; spotted by & ok sthen@
10998 OpenBSD-Commit-ID: b881e8e849edeec5082b5c0a87d8d7cff091a8fd
11000 commit 47adfdc07f4f8ea0064a1495500244de08d311ed
11001 Author: djm@openbsd.org <djm@openbsd.org>
11002 Date: Wed May 27 22:35:19 2020 +0000
11004 upstream: two new tests for Include in sshd_config, checking whether
11006 Port directives are processed correctly and handling of Include directives
11007 that appear before Match. Both tests currently fail. bz#3122 and bz#3169 -
11008 patch from Jakub Jelen
11010 OpenBSD-Regress-ID: 8ad5a4a385a63f0a1c59c59c763ff029b45715df
11012 commit 47faad8f794516c33864d866aa1b55d88416f94c
11013 Author: Darren Tucker <dtucker@dtucker.net>
11014 Date: Wed May 27 23:26:23 2020 +1000
11016 Document that libfido2 >= 1.4.0 is needed.
11018 commit 4be563994c0cbe9856e7dd3078909f41beae4a9c
11019 Author: djm@openbsd.org <djm@openbsd.org>
11020 Date: Tue May 26 01:59:46 2020 +0000
11022 upstream: fix memleak of signature; from Pedro Martelletto
11024 OpenBSD-Commit-ID: d0a6eb07e77c001427d738b220dd024ddc64b2bb
11026 commit 0c111eb84efba7c2a38b2cc3278901a0123161b9
11027 Author: djm@openbsd.org <djm@openbsd.org>
11028 Date: Tue May 26 01:26:58 2020 +0000
11030 upstream: Restrict ssh-agent from signing web challenges for FIDO
11034 When signing messages in ssh-agent using a FIDO key that has an
11035 application string that does not start with "ssh:", ensure that the
11036 message being signed is one of the forms expected for the SSH protocol
11037 (currently pubkey authentication and sshsig signatures).
11039 This prevents ssh-agent forwarding on a host that has FIDO keys
11040 attached granting the ability for the remote side to sign challenges
11041 for web authentication using those keys too.
11043 Note that the converse case of web browsers signing SSH challenges is
11044 already precluded because no web RP can have the "ssh:" prefix in the
11045 application string that we require.
11049 OpenBSD-Commit-ID: 9ab6012574ed0352d2f097d307f4a988222d1b19
11051 commit 9c5f64b6cb3a68b99915202d318b842c6c76cf14
11052 Author: djm@openbsd.org <djm@openbsd.org>
11053 Date: Tue May 26 01:09:05 2020 +0000
11055 upstream: improve logging for MaxStartups connection throttling:
11057 have sshd log when it starts and stops throttling and periodically while in
11058 this state. bz#3055 ok markus@
11060 OpenBSD-Commit-ID: 2e07a09a62ab45d790d3d2d714f8cc09a9ac7ab9
11062 commit 756c6f66aee83a5862a6f936a316f761532f3320
11063 Author: djm@openbsd.org <djm@openbsd.org>
11064 Date: Tue May 26 01:06:52 2020 +0000
11066 upstream: add fmt_timeframe() (from bgpd) to format a time
11068 interval in a human- friendly format. Switch copyright for this file from BSD
11069 to MIT to make it easier to add Henning's copyright for this function. ok
11072 OpenBSD-Commit-ID: 414a831c662df7e68893e5233e86f2cac081ccf9
11074 commit 2a63ce5cd6d0e782783bf721462239b03757dd49
11075 Author: djm@openbsd.org <djm@openbsd.org>
11076 Date: Mon May 18 04:29:35 2020 +0000
11078 upstream: avoid possible NULL deref; from Pedro Martelletto
11080 OpenBSD-Commit-ID: e6099c3fbb70aa67eb106e84d8b43f1fa919b721
11082 commit 4b307faf2fb0e63e51a550b37652f7f972df9676
11083 Author: markus@openbsd.org <markus@openbsd.org>
11084 Date: Fri May 15 08:34:03 2020 +0000
11086 upstream: sshd listener must not block if reexecd sshd exits
11088 in write(2) on config_s[0] if the forked child exits early before finishing
11089 recv_rexec_state (e.g. with fatal()) because config_s[1] stays open in the
11090 parent. this prevents the parent from accepting new connections. ok djm,
11093 OpenBSD-Commit-ID: 92ccfeb939ccd55bda914dc3fe84582158c4a9ef
11095 commit af8b16fb2cce880341c0ee570ceb0d84104bdcc0
11096 Author: djm@openbsd.org <djm@openbsd.org>
11097 Date: Fri May 15 03:57:33 2020 +0000
11099 upstream: fix off-by-one error that caused sftp downloads to make
11101 one more concurrent request that desired. This prevented using sftp(1) in
11102 unpipelined request/response mode, which is useful when debugging. Patch from
11103 Stephen Goetze in bz#3054
11105 OpenBSD-Commit-ID: 41b394ebe57037dbc43bdd0eef21ff0511191f28
11107 commit d7d753e2979f2d3c904b03a08d30856cd2a6e892
11108 Author: deraadt@openbsd.org <deraadt@openbsd.org>
11109 Date: Wed May 13 22:38:41 2020 +0000
11111 upstream: we are still aiming for pre-C99 ...
11113 OpenBSD-Commit-ID: a240fc9cbe60bc4e6c3d24d022eb4ab01fe1cb38
11115 commit 2ad7b7e46408dbebf2a4efc4efd75a9544197d57
11116 Author: djm@openbsd.org <djm@openbsd.org>
11117 Date: Wed May 13 10:08:02 2020 +0000
11119 upstream: Enable credProtect extension when generating a resident
11123 The FIDO 2.1 Client to Authenticator Protocol introduced a "credProtect"
11124 feature to better protect resident keys. This option allows (amone other
11125 possibilities) requiring a PIN prior to all operations that may retrieve
11128 Patch by Pedro Martelletto; ok djm and markus
11130 OpenBSD-Commit-ID: 013bc06a577dcaa66be3913b7f183eb8cad87e73
11132 commit 1e70dc3285fc9b4f6454975acb81e8702c23dd89
11133 Author: djm@openbsd.org <djm@openbsd.org>
11134 Date: Wed May 13 09:57:17 2020 +0000
11136 upstream: always call fido_init(); previous behaviour only called
11138 fido_init() when SK_DEBUG was defined. Harmless with current libfido2, but
11139 this isn't guaranteed in the future.
11141 OpenBSD-Commit-ID: c7ea20ff2bcd98dd12015d748d3672d4f01f0864
11143 commit f2d84f1b3fa68d77c99238d4c645d0266fae2a74
11144 Author: djm@openbsd.org <djm@openbsd.org>
11145 Date: Wed May 13 09:55:57 2020 +0000
11147 upstream: preserve group/world read permission on known_hosts
11149 file across runs of "ssh-keygen -Rf /path". The old behaviour was to remove
11150 all rights for group/other. bz#3146 ok dtucker@
11152 OpenBSD-Commit-ID: dc369d0e0b5dd826430c63fd5f4b269953448a8a
11154 commit 05a651400da6fbe12296c34e3d3bcf09f034fbbf
11155 Author: djm@openbsd.org <djm@openbsd.org>
11156 Date: Wed May 13 09:52:41 2020 +0000
11158 upstream: when ordering the hostkey algorithms to request from a
11160 server, prefer certificate types if the known_hosts files contain a key
11161 marked as a @cert-authority; bz#3157 ok markus@
11163 OpenBSD-Commit-ID: 8f194573e5bb7c01b69bbfaabc68f27c9fa5e0db
11165 commit 829451815ec207e14bd54ff5cf7e22046816f042
11166 Author: djm@openbsd.org <djm@openbsd.org>
11167 Date: Tue May 12 01:41:32 2020 +0000
11169 upstream: fix non-ASCII quote that snuck in; spotted by Gabriel
11173 OpenBSD-Commit-ID: 04bcde311de2325d9e45730c744c8de079b49800
11175 commit 5a442cec92c0efd6fffb4af84bf99c70af248ef3
11176 Author: djm@openbsd.org <djm@openbsd.org>
11177 Date: Mon May 11 02:11:29 2020 +0000
11179 upstream: clarify role of FIDO tokens in multi-factor
11181 authentictation; mostly from Pedro Martelletto
11183 OpenBSD-Commit-ID: fbe05685a1f99c74b1baca7130c5a03c2df7c0ac
11185 commit ecb2c02d994b3e21994f31a70ff911667c262f1f
11186 Author: djm@openbsd.org <djm@openbsd.org>
11187 Date: Fri May 8 05:13:14 2020 +0000
11189 upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@
11191 OpenBSD-Commit-ID: 832e771948fb45f2270e8b8895aac36d176ba17a
11193 commit 3ab6fccc3935e9b778ff52f9c8d40f215d58e01d
11194 Author: Damien Miller <djm@mindrot.org>
11195 Date: Thu May 14 12:22:09 2020 +1000
11197 prefer ln to cp for temporary copy of sshd
11199 I saw failures on the reexec fallback test on Darwin 19.4 where
11200 fork()ed children of a process that had it's executable removed
11201 would instantly fail. Using ln to preserve the inode avoids this.
11203 commit f700d316c6b15a9cfbe87230d2dca81a5d916279
11204 Author: Darren Tucker <dtucker@dtucker.net>
11205 Date: Wed May 13 15:24:51 2020 +1000
11207 Actually skip pty tests when needed.
11209 commit 08ce6b2210f46f795e7db747809f8e587429dfd2
11210 Author: Darren Tucker <dtucker@dtucker.net>
11211 Date: Wed May 13 13:56:45 2020 +1000
11213 Skip building sk-dummy library if no SK support.
11215 commit 102d106bc2e50347d0e545fad6ff5ce408d67247
11216 Author: Damien Miller <djm@mindrot.org>
11217 Date: Wed May 13 12:08:34 2020 +1000
11219 explicitly manage .depend and .depend.bak
11221 Bring back removal of .depend to give the file a known state before
11222 running makedepend, but manually move aside the current .depend file
11223 and restore it as .depend.bak afterwards so the stale .depend check
11226 commit 83a6dc6ba1e03b3fa39d12a8522b8b0e68dd6390
11227 Author: Damien Miller <djm@mindrot.org>
11228 Date: Wed May 13 12:03:42 2020 +1000
11232 commit 7c0bbed967abed6301a63e0267cc64144357a99a
11233 Author: Damien Miller <djm@mindrot.org>
11234 Date: Wed May 13 12:01:10 2020 +1000
11236 revert removal of .depend before makedepend
11238 Commit 83657eac4 started removing .depend before running makedepend
11239 to reset the contents of .depend to a known state. Unfortunately
11240 this broke the depend-check step as now .depend.bak would only ever
11241 be created as an empty file.
11245 commit 58ad004acdcabf3b9f40bc3aaa206b25d998db8c
11246 Author: Damien Miller <djm@mindrot.org>
11247 Date: Tue May 12 12:58:46 2020 +1000
11249 prepare for 8.3 release
11251 commit 4fa9e048c2af26beb7dc2ee9479ff3323e92a7b5
11252 Author: Darren Tucker <dtucker@dtucker.net>
11253 Date: Fri May 8 21:50:43 2020 +1000
11255 Ensure SA_SIGNAL test only signals itself.
11257 When the test's child signals its parent and it exits the result of
11258 getppid changes. On Ubuntu 20.04 this results in the ppid being that
11259 of the GDM session, causing it to exit. Analysis and testing from pedro
11260 at ambientworks.net
11262 commit dc2da29aae76e170d22f38bb36f1f5d1edd5ec2b
11263 Author: Damien Miller <djm@mindrot.org>
11264 Date: Fri May 8 13:31:53 2020 +1000
11266 sync config.guess/config.sub with latest versions
11270 commit a8265bd64c14881fc7f4fa592f46dfc66b911f17
11271 Author: djm@openbsd.org <djm@openbsd.org>
11272 Date: Wed May 6 20:58:01 2020 +0000
11274 upstream: openssh-8.3; ok deraadt@
11276 OpenBSD-Commit-ID: c8831ec88b9c750f5816aed9051031fb535d22c1
11278 commit 955854cafca88e0cdcd3d09ca1ad4ada465364a1
11279 Author: djm@openbsd.org <djm@openbsd.org>
11280 Date: Wed May 6 20:57:38 2020 +0000
11282 upstream: another case where a utimes() failure could make scp send
11284 a desynchronising error; reminded by Aymeric Vincent ok deraadt markus
11286 OpenBSD-Commit-ID: 2ea611d34d8ff6d703a7a8bf858aa5dbfbfa7381
11288 commit 59d531553fd90196946743da391f3a27cf472f4e
11289 Author: Darren Tucker <dtucker@dtucker.net>
11290 Date: Thu May 7 15:34:12 2020 +1000
11292 Check if -D_REENTRANT is needed for localtime_r.
11294 On at least HP-UX 11.11, the localtime_r declararation is behind
11295 ifdef _REENTRANT. Check for and add if needed.
11297 commit c13403e55de8cdbb9da628ed95017b1d4c0f205f
11298 Author: Darren Tucker <dtucker@dtucker.net>
11299 Date: Tue May 5 11:32:43 2020 +1000
11301 Skip security key tests if ENABLE_SK not set.
11303 commit 4da393f87cd52d788c84112ee3f2191c9bcaaf30
11304 Author: djm@openbsd.org <djm@openbsd.org>
11305 Date: Fri May 1 04:03:14 2020 +0000
11307 upstream: sure enough, some of the test data that we though were in
11309 new format were actually in the old format; fix from Michael Forney
11311 OpenBSD-Regress-ID: a41a5c43a61b0f0b1691994dbf16dfb88e8af933
11313 commit 15bfafc1db4c8792265ada9623a96f387990f732
11314 Author: djm@openbsd.org <djm@openbsd.org>
11315 Date: Fri May 1 04:00:29 2020 +0000
11317 upstream: make mktestdata.sh generate old/new format keys that we
11319 expect. This script was written before OpenSSH switched to new-format private
11320 keys by default and was never updated to the change (until now) From Michael
11323 OpenBSD-Regress-ID: 38cf354715c96852e5b71c2393fb6e7ad28b7ca7
11325 commit 7882d2eda6ad3eb82220a85294de545d20ef82db
11326 Author: djm@openbsd.org <djm@openbsd.org>
11327 Date: Fri May 1 03:58:02 2020 +0000
11329 upstream: portability fix for sed that always emil a newline even
11331 if the input does not contain one; from Michael Forney
11333 OpenBSD-Regress-ID: 9190c3ddf0d2562ccc02c4a95fce0e392196bfc7
11335 commit 8074f9499e454df0acdacea33598858a1453a357
11336 Author: djm@openbsd.org <djm@openbsd.org>
11337 Date: Fri May 1 03:36:25 2020 +0000
11339 upstream: remove obsolete RSA1 test keys; spotted by Michael Forney
11341 OpenBSD-Regress-ID: 6384ba889594e217d166908ed8253718ab0866da
11343 commit c697e46c314aa94574af0d393d80f23e0ebc9748
11344 Author: Darren Tucker <dtucker@dtucker.net>
11345 Date: Sat May 2 18:34:47 2020 +1000
11349 commit 83657eac42941f270c4b02b2c46d9a21f616ef99
11350 Author: Darren Tucker <dtucker@dtucker.net>
11351 Date: Sat May 2 18:29:40 2020 +1000
11353 Remove use of tail for 'make depend'.
11355 Not every tail supports +N and we can do with out it so just remove it.
11356 Prompted by mforney at mforney.org.
11358 commit d25d630d24c5a1c64d4e646510e79dc22d6d7b88
11359 Author: djm@openbsd.org <djm@openbsd.org>
11360 Date: Sat May 2 07:19:43 2020 +0000
11362 upstream: we have a sshkey_save_public() function to save public keys;
11364 use it and save a bunch of redundant code.
11366 Patch from loic AT venez.fr; ok markus@ djm@
11368 OpenBSD-Commit-ID: f93e030a0ebcd0fd9054ab30db501ec63454ea5f
11370 commit e9dc9863723e111ae05e353d69df857f0169544a
11371 Author: Darren Tucker <dtucker@dtucker.net>
11372 Date: Fri May 1 18:32:25 2020 +1000
11374 Use LONG_LONG_MAX and friends if available.
11376 If we don't have LLONG_{MIN,MAX} but do have LONG_LONG_{MIN,MAX}
11377 then use those instead. We do calculate these values in configure,
11378 but it turns out that at least one compiler (old HP ANSI C) can't
11379 parse "-9223372036854775808LL" without mangling it. (It can parse
11380 "-9223372036854775807LL" which is presumably why its limits.h defines
11381 LONG_LONG_MIN as the latter minus 1.)
11383 Fixes rekey test when compiled with the aforementioned compiler.
11385 commit aad87b88fc2536b1ea023213729aaf4eaabe1894
11386 Author: djm@openbsd.org <djm@openbsd.org>
11387 Date: Fri May 1 06:31:42 2020 +0000
11389 upstream: when receving a file in sink(), be careful to send at
11391 most a single error response after the file has been opened. Otherwise the
11392 source() and sink() can become desyncronised. Reported by Daniel Goujot,
11393 Georges-Axel Jaloyan, Ryan Lahfa, and David Naccache.
11395 ok deraadt@ markus@
11397 OpenBSD-Commit-ID: 6c14d233c97349cb811a8f7921ded3ae7d9e0035
11399 commit 31909696c4620c431dd55f6cd15db65c4e9b98da
11400 Author: djm@openbsd.org <djm@openbsd.org>
11401 Date: Fri May 1 06:28:52 2020 +0000
11403 upstream: expose vasnmprintf(); ok (as part of other commit) markus
11407 OpenBSD-Commit-ID: 2e80cea441c599631a870fd40307d2ade5a7f9b5
11409 commit 99ce9cefbe532ae979744c6d956b49f4b02aff82
11410 Author: djm@openbsd.org <djm@openbsd.org>
11411 Date: Fri May 1 04:23:11 2020 +0000
11413 upstream: avoid NULL dereference when attempting to convert invalid
11415 ssh.com private keys using "ssh-keygen -i"; spotted by Michael Forney
11417 OpenBSD-Commit-ID: 2e56e6d26973967d11d13f56ea67145f435bf298
11419 commit 6c6072ba8b079e6f5caa38b011a6f4570c14ed38
11420 Author: Darren Tucker <dtucker@dtucker.net>
11421 Date: Fri May 1 15:09:26 2020 +1000
11423 See if SA_RESTART signals will interrupt select().
11425 On some platforms (at least older HP-UXes such as 11.11, possibly others)
11426 setting SA_RESTART on signal handers will cause it to not interrupt
11427 select(), at least for calls that do not specify a timeout. Try to
11428 detect this and if found, don't use SA_RESTART.
11430 POSIX says "If SA_RESTART has been set for the interrupting signal, it
11431 is implementation-dependent whether select() restarts or returns with
11432 [EINTR]" so this behaviour is within spec.
11434 commit 90a0b434ed41f9c505662dba8782591818599cb3
11435 Author: Damien Miller <djm@mindrot.org>
11436 Date: Fri May 1 13:55:03 2020 +1000
11440 commit c0dfd18dd1c2107c73d18f70cd164f7ebd434b08
11441 Author: Damien Miller <djm@mindrot.org>
11442 Date: Fri May 1 13:29:16 2020 +1000
11444 wrap sha2.h inclusion in #ifdef HAVE_SHA2_H
11446 commit a01817a9f63dbcbbc6293aacc4019993a4cdc7e3
11447 Author: djm@openbsd.org <djm@openbsd.org>
11448 Date: Tue Apr 28 04:59:29 2020 +0000
11450 upstream: adapt dummy FIDO middleware to API change; ok markus@
11452 OpenBSD-Regress-ID: 8bb84ee500c2eaa5616044314dd0247709a1790f
11454 commit 261571ddf02ea38fdb5e4a97c69ee53f847ca5b7
11455 Author: jmc@openbsd.org <jmc@openbsd.org>
11456 Date: Thu Apr 30 18:28:37 2020 +0000
11458 upstream: tweak previous; ok markus
11460 OpenBSD-Commit-ID: 41895450ce2294ec44a5713134491cc31f0c09fd
11462 commit 5de21c82e1d806d3e401b5338371e354b2e0a66f
11463 Author: markus@openbsd.org <markus@openbsd.org>
11464 Date: Thu Apr 30 17:12:20 2020 +0000
11466 upstream: bring back debug() removed in rev 1.74; noted by pradeep
11470 OpenBSD-Commit-ID: 8d134d22ab25979078a3b48d058557d49c402e65
11472 commit ea14103ce9a5e13492e805f7e9277516ff5a4273
11473 Author: markus@openbsd.org <markus@openbsd.org>
11474 Date: Thu Apr 30 17:07:10 2020 +0000
11476 upstream: run the 2nd ssh with BatchMode for scp -3
11478 OpenBSD-Commit-ID: 77994fc8c7ca02d88e6d0d06d0f0fe842a935748
11480 commit 59d2de956ed29aa5565ed5e5947a7abdb27ac013
11481 Author: djm@openbsd.org <djm@openbsd.org>
11482 Date: Tue Apr 28 04:02:29 2020 +0000
11484 upstream: when signing a challenge using a FIDO toke, perform the
11486 hashing in the middleware layer rather than in ssh code. This allows
11487 middlewares that call APIs that perform the hashing implicitly (including
11488 Microsoft's AFAIK). ok markus@
11490 OpenBSD-Commit-ID: c9fc8630aba26c75d5016884932f08a5a237f37d
11492 commit c9d10dbc0ccfb1c7568bbb784f7aeb7a0b5ded12
11493 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11494 Date: Sun Apr 26 09:38:14 2020 +0000
11496 upstream: Fix comment typo. Patch from mforney at mforney.org.
11498 OpenBSD-Commit-ID: 3565f056003707a5e678e60e03f7a3efd0464a2b
11500 commit 4d2c87b4d1bde019cdd0f00552fcf97dd8b39940
11501 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11502 Date: Sat Apr 25 06:59:36 2020 +0000
11504 upstream: We've standardized on memset over bzero, replace a couple
11506 that had slipped in. ok deraadt markus djm.
11508 OpenBSD-Commit-ID: f5be055554ee93e6cc66b0053b590bef3728dbd6
11510 commit 7f23f42123d64272a7b00754afa6b0841d676691
11511 Author: Darren Tucker <dtucker@dtucker.net>
11512 Date: Fri May 1 12:21:58 2020 +1000
11514 Include sys/byteorder.h for htons and friends.
11516 These are usually in netinet/in.h but on HP-UX they are not defined if
11517 _XOPEN_SOURCE_EXTENDED is set. Only needed for netcat in the regression
11520 commit d27cba58c972d101a5de976777e518f34ac779cb
11521 Author: Darren Tucker <dtucker@dtucker.net>
11522 Date: Fri May 1 09:21:52 2020 +1000
11524 Fix conditional for openssl-based chacha20.
11526 Fixes warnings or link errors when building against older OpenSSLs.
11529 commit 20819b962dc1467cd6fad5486a7020c850efdbee
11530 Author: Darren Tucker <dtucker@dtucker.net>
11531 Date: Fri Apr 24 15:07:55 2020 +1000
11533 Error out if given RDomain if unsupported.
11535 If the config contained 'RDomain %D' on a platform that did not support
11536 it, the error would not be detected until runtime resulting in a broken
11537 sshd. Detect this earlier and error out if found. bz#3126, based on a
11538 patch from jjelen at redhat.com, tweaks and ok djm@
11540 commit 2c1690115a585c624eed2435075a93a463a894e2
11541 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11542 Date: Fri Apr 24 03:33:21 2020 +0000
11544 upstream: Fix incorrect error message for "too many known hosts files."
11546 bz#3149, patch from jjelen at redhat.com.
11548 OpenBSD-Commit-ID: e0fcb07ed5cf7fd54ce340471a747c24454235e5
11550 commit 3beb7276e7a8aedd3d4a49f9c03b97f643448c92
11551 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11552 Date: Fri Apr 24 02:19:40 2020 +0000
11554 upstream: Remove leave_non_blocking() which is now dead code
11556 because nothing sets in_non_blocking_mode any more. Patch from
11557 michaael.meeks at collabora.com, ok djm@
11559 OpenBSD-Commit-ID: c403cefe97a5a99eca816e19cc849cdf926bd09c
11561 commit 8654e3561772f0656e7663a0bd6a1a8cb6d43300
11562 Author: jmc@openbsd.org <jmc@openbsd.org>
11563 Date: Thu Apr 23 21:28:09 2020 +0000
11565 upstream: ce examples of "Ar arg Ar arg" with "Ar arg arg" and
11569 OpenBSD-Commit-ID: af0e952ea0f5e2019c2ce953ed1796eca47f0705
11571 commit 67697e4a8246dd8423e44b8785f3ee31fee72d07
11572 Author: Darren Tucker <dtucker@dtucker.net>
11573 Date: Fri Apr 24 11:10:18 2020 +1000
11577 commit d6cc76176216fe3fac16cd20d148d75cb9c50876
11578 Author: Darren Tucker <dtucker@dtucker.net>
11579 Date: Wed Apr 22 14:07:00 2020 +1000
11581 Mailing list is now closed to non-subscribers.
11583 While there, add a reference to the bugzilla. ok djm@
11585 commit cecde6a41689d0ae585ec903b190755613a6de79
11586 Author: Darren Tucker <dtucker@dtucker.net>
11587 Date: Wed Apr 22 12:09:40 2020 +1000
11589 Put the values from env vars back.
11591 This merges the values from the recently removed environment into make's
11592 command line arguments since we actually need those.
11594 commit 300c4322b92e98d3346efa0aec1c094c94d0f964
11595 Author: Darren Tucker <dtucker@dtucker.net>
11596 Date: Wed Apr 22 11:33:15 2020 +1000
11598 Pass configure's egrep through to test-exec.sh.
11600 Use it to create a wrapper function to call it from tests. Fixes the
11601 keygen-comment test on platforms with impoverished default egrep (eg
11604 commit c8d9796cfe046f00eb8b2096d2b7028d6a523a84
11605 Author: Darren Tucker <dtucker@dtucker.net>
11606 Date: Wed Apr 22 10:56:44 2020 +1000
11608 Remove unneeded env vars from t-exec invocation.
11610 commit 01d4cdcd4514e99a4b6eb9523cd832bbf008d1d7
11611 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11612 Date: Tue Apr 21 23:14:58 2020 +0000
11614 upstream: Backslash '$' at then end of string. Prevents warning on
11618 OpenBSD-Regress-ID: 5dc27ab624c09d34078fd326b10e38c1ce9c741f
11620 commit 8854724ccefc1fa16f10b37eda2e759c98148caa
11621 Author: Darren Tucker <dtucker@dtucker.net>
11622 Date: Tue Apr 21 18:27:23 2020 +1000
11626 Prevent infinite for loop since i went from ssize_t to size_t. Patch from
11627 eagleoflqj via OpenSSH github PR#178, ok djm@, feedback & ok millert@
11629 commit d00d07b6744d3b4bb7aca46c734ecd670148da23
11630 Author: djm@openbsd.org <djm@openbsd.org>
11631 Date: Mon Apr 20 04:44:47 2020 +0000
11633 upstream: regression test for printing of private key fingerprints and
11635 key comments, mostly by loic AT venez.fr (slightly tweaked for portability)
11638 OpenBSD-Regress-ID: 8dc6c4feaf4fe58b6d634cd89afac9a13fd19004
11640 commit a98d5ba31e5e7e01317352f85fa63b846a960f8c
11641 Author: djm@openbsd.org <djm@openbsd.org>
11642 Date: Mon Apr 20 04:43:57 2020 +0000
11644 upstream: fix a bug I introduced in r1.406: when printing private key
11646 fingerprint of old-format key, key comments were not being displayed. Spotted
11647 by loic AT venez.fr, ok dtucker
11649 OpenBSD-Commit-ID: 2d98e4f9eb168eea733d17e141e1ead9fe26e533
11651 commit 32f2d0aad42c15e19bd3b07496076ca891573a58
11652 Author: djm@openbsd.org <djm@openbsd.org>
11653 Date: Fri Apr 17 07:16:07 2020 +0000
11655 upstream: repair private key fingerprint printing to also print
11657 comment after regression caused by my recent pubkey loading refactor.
11658 Reported by loic AT venez.fr, ok dtucker@
11660 OpenBSD-Commit-ID: f8db49acbee6a6ccb2a4259135693b3cceedb89e
11662 commit 094dd513f4b42e6a3cebefd18d1837eb709b4d99
11663 Author: djm@openbsd.org <djm@openbsd.org>
11664 Date: Fri Apr 17 07:15:11 2020 +0000
11666 upstream: refactor out some duplicate private key loading code;
11668 based on patch from loic AT venez.fr, ok dtucker@
11670 OpenBSD-Commit-ID: 5eff2476b0d8d0614924c55e350fb7bb9c84f45e
11672 commit 4e04f46f248f1708e39b900b76c9693c820eff68
11673 Author: jmc@openbsd.org <jmc@openbsd.org>
11674 Date: Fri Apr 17 06:12:41 2020 +0000
11676 upstream: add space beteen macro arg and punctuation;
11678 OpenBSD-Commit-ID: c93a6cbb4bf9468fc4c13e64bc1fd4efee201a44
11680 commit 44ae009a0112081d0d541aeaa90088bedb6f21ce
11681 Author: djm@openbsd.org <djm@openbsd.org>
11682 Date: Fri Apr 17 04:27:03 2020 +0000
11684 upstream: auth2-pubkey r1.89 changed the order of operations to
11686 checking AuthorizedKeysFile first and falling back to AuthorizedKeysCommand
11687 if no key was found in a file. Document this order here; bz3134
11689 OpenBSD-Commit-ID: afce0872cbfcfc1d4910ad7722e50f792a1dce12
11691 commit f96f17f920f38ceea6f3c5cb0b075c46b8929fdc
11692 Author: Damien Miller <djm@mindrot.org>
11693 Date: Fri Apr 17 14:07:15 2020 +1000
11695 sys/sysctl.h is only used on OpenBSD
11697 so change the preprocessor test used to include it to check
11698 __OpenBSD__, matching the code that uses the symbols it declares.
11700 commit 54688e937a69c7aebef8a3d50cbd4c6345bab2ca
11701 Author: djm@openbsd.org <djm@openbsd.org>
11702 Date: Fri Apr 17 03:38:47 2020 +0000
11704 upstream: fix reversed test that caused IdentitiesOnly=yes to not
11706 apply to keys loaded from a PKCS11Provider; bz3141, ok dtucker@
11708 OpenBSD-Commit-ID: e3dd6424b94685671fe84c9b9dbe352fb659f677
11710 commit 267cbc87b5b6e78973ac4d3c7a6f807ed226928c
11711 Author: djm@openbsd.org <djm@openbsd.org>
11712 Date: Fri Apr 17 03:34:42 2020 +0000
11714 upstream: mention that /etc/hosts.equiv and /etc/shosts.equiv are
11716 not considered for HostbasedAuthentication when the target user is root;
11719 OpenBSD-Commit-ID: fe4c1256929e53f23af17068fbef47852f4bd752
11721 commit c90f72d29e84b4a2709078bf5546a72c29a65177
11722 Author: djm@openbsd.org <djm@openbsd.org>
11723 Date: Fri Apr 17 03:30:05 2020 +0000
11725 upstream: make IgnoreRhosts a tri-state option: "yes" ignore
11727 rhosts/shosts, "no" allow rhosts/shosts or (new) "shosts-only" to allow
11728 .shosts files but not .rhosts. ok dtucker@
11730 OpenBSD-Commit-ID: d08d6930ed06377a80cf53923c1955e9589342e9
11732 commit 321c7147079270f3a154f91b59e66219aac3d514
11733 Author: djm@openbsd.org <djm@openbsd.org>
11734 Date: Fri Apr 17 03:23:13 2020 +0000
11736 upstream: allow the IgnoreRhosts directive to appear anywhere in a
11738 sshd_config, not just before any Match blocks; bz3148, ok dtucker@
11740 OpenBSD-Commit-ID: e042467d703bce640b1f42c5d1a62bf3825736e8
11742 commit ca5403b085a735055ec7b7cdcd5b91f2662df94c
11743 Author: jmc@openbsd.org <jmc@openbsd.org>
11744 Date: Sat Apr 11 20:20:09 2020 +0000
11746 upstream: add space between macro arg and punctuation;
11748 OpenBSD-Commit-ID: e579e4d95eef13059c30931ea1f09ed8296b819c
11750 commit 8af0244d7b4a65eed2e62f9c89141c7c8e63f09d
11751 Author: Darren Tucker <dtucker@dtucker.net>
11752 Date: Wed Apr 15 10:58:02 2020 +1000
11754 Add sys/syscall.h for syscall numbers.
11756 In some architecture/libc configurations we need to explicitly include
11757 sys/syscall.h for the syscall number (__NR_xxx) definitions. bz#3085,
11758 patch from blowfist at xroutine.net.
11760 commit 3779b50ee952078018a5d9e1df20977f4355df17
11761 Author: djm@openbsd.org <djm@openbsd.org>
11762 Date: Sat Apr 11 10:16:11 2020 +0000
11764 upstream: Refactor private key parsing. Eliminates a fair bit of
11766 duplicated code and fixes oss-fuzz#20074 (NULL deref) caused by a missing key
11767 type check in the ECDSA_CERT parsing path.
11769 feedback and ok markus@
11771 OpenBSD-Commit-ID: 4711981d88afb7196d228f7baad9be1d3b20f9c9
11773 commit b6a4013647db67ec622c144a9e05dd768f1966b3
11774 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11775 Date: Fri Apr 10 00:54:03 2020 +0000
11777 upstream: Add tests for TOKEN expansion of LocalForward and
11781 OpenBSD-Regress-ID: 90fcbc60d510eb114a2b6eaf4a06ff87ecd80a89
11783 commit abc3e0a5179c13c0469a1b11fe17d832abc39999
11784 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11785 Date: Mon Apr 6 09:43:55 2020 +0000
11787 upstream: Add utf8.c for asmprintf used by krl.c
11789 OpenBSD-Regress-ID: 433708d11165afdb189fe635151d21659dd37a37
11791 commit 990687a0336098566c3a854d23cce74a31ec6fe2
11792 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11793 Date: Fri Apr 10 00:52:07 2020 +0000
11795 upstream: Add TOKEN percent expansion to LocalFoward and RemoteForward
11797 when used for Unix domain socket forwarding. Factor out the code for the
11798 config keywords that use the most common subset of TOKENS into its own
11799 function. bz#3014, ok jmc@ (man page bits) djm@
11801 OpenBSD-Commit-ID: bffc9f7e7b5cf420309a057408bef55171fd0b97
11803 commit 2b13d3934d5803703c04803ca3a93078ecb5b715
11804 Author: djm@openbsd.org <djm@openbsd.org>
11805 Date: Wed Apr 8 00:10:37 2020 +0000
11807 upstream: let sshkey_try_load_public() load public keys from the
11809 unencrypted envelope of private key files if not sidecar public key file is
11814 OpenBSD-Commit-ID: 252a0a580e10b9a6311632530d63b5ac76592040
11816 commit d01f39304eaab0352793b490a25e1ab5f59a5366
11817 Author: djm@openbsd.org <djm@openbsd.org>
11818 Date: Wed Apr 8 00:09:24 2020 +0000
11820 upstream: simplify sshkey_try_load_public()
11824 OpenBSD-Commit-ID: 05a5d46562aafcd70736c792208b1856064f40ad
11826 commit f290ab0833e44355fc006e4e67b92446c14673ef
11827 Author: djm@openbsd.org <djm@openbsd.org>
11828 Date: Wed Apr 8 00:08:46 2020 +0000
11830 upstream: add sshkey_parse_pubkey_from_private_fileblob_type()
11832 Extracts a public key from the unencrypted envelope of a new-style
11833 OpenSSH private key.
11837 OpenBSD-Commit-ID: 44d7ab446e5e8c686aee96d5897b26b3939939aa
11839 commit 8d514eea4ae089626a55e11c7bc1745c8d9683e4
11840 Author: djm@openbsd.org <djm@openbsd.org>
11841 Date: Wed Apr 8 00:07:19 2020 +0000
11843 upstream: simplify sshkey_parse_private_fileblob_type()
11845 Try new format parser for all key types first, fall back to PEM
11846 parser only for invalid format errors.
11850 OpenBSD-Commit-ID: 0173bbb3a5cface77b0679d4dca0e15eb5600b77
11852 commit 421169d0e758351b105eabfcebf42378ebf17217
11853 Author: djm@openbsd.org <djm@openbsd.org>
11854 Date: Wed Apr 8 00:05:59 2020 +0000
11856 upstream: check private key type against requested key type in
11858 new-style private decoding; ok markus@
11860 OpenBSD-Commit-ID: 04d44b3a34ce12ce5187fb6f6e441a88c8c51662
11862 commit 6aabfb6d22b36d07f584cba97f4cdc4363a829da
11863 Author: djm@openbsd.org <djm@openbsd.org>
11864 Date: Wed Apr 8 00:04:32 2020 +0000
11866 upstream: check that pubkey in private key envelope matches actual
11870 (this public key is currently unusued)
11874 OpenBSD-Commit-ID: 634a60b5e135d75f48249ccdf042f3555112049c
11876 commit c0f5b2294796451001fd328c44f0d00f1114eddf
11877 Author: djm@openbsd.org <djm@openbsd.org>
11878 Date: Wed Apr 8 00:01:52 2020 +0000
11880 upstream: refactor private key parsing a little
11882 Split out the base64 decoding and private section decryption steps in
11883 to separate functions. This will make the decryption step easier to fuzz
11884 as well as making it easier to write a "load public key from new-format
11885 private key" function.
11889 OpenBSD-Commit-ID: 7de31d80fb9062aa01901ddf040c286b64ff904e