1 commit 0ffb46f2ee2ffcc4daf45ee679e484da8fcf338c
2 Author: Damien Miller <djm@mindrot.org>
3 Date: Tue Oct 4 01:51:42 2022 +1100
7 commit 657e676ff696c7bb787bffb0e249ea1be3b474e1
8 Author: Damien Miller <djm@mindrot.org>
9 Date: Tue Oct 4 01:45:52 2022 +1100
11 update release notes URL
13 commit f059da2b29840c0f048448809c317ce2ae014da7
14 Author: Damien Miller <djm@mindrot.org>
15 Date: Tue Oct 4 01:45:41 2022 +1100
17 crank versions in RPM spec files
19 commit b51f3f172d87cbdb80ca4eb7b2149e56a7647557
20 Author: djm@openbsd.org <djm@openbsd.org>
21 Date: Mon Sep 26 22:18:40 2022 +0000
25 OpenBSD-Commit-ID: 5a467b2ee81da01a86adf1ad93b62b1728494e56
27 commit 4cf8d0c0f3030f594a238bab21a0695735515487
28 Author: dtucker@openbsd.org <dtucker@openbsd.org>
29 Date: Wed Sep 21 22:26:50 2022 +0000
31 upstream: Fix typo. From AlexanderStohr via github PR#343.
33 OpenBSD-Commit-ID: a134c9b4039e48803fc6a87f955b0f4a03181497
35 commit 8179fed3264d5919899900ed8881d5f9bb57ca33
36 Author: djm@openbsd.org <djm@openbsd.org>
37 Date: Mon Sep 19 21:39:16 2022 +0000
39 upstream: add RequiredRSASize to the list of keywords accepted by
43 OpenBSD-Commit-ID: fe871408cf6f9d3699afeda876f8adbac86a035e
45 commit 5f954929e9f173dd1e279e07d0e8b14fa845814d
46 Author: Damien Miller <djm@mindrot.org>
47 Date: Mon Sep 19 20:59:34 2022 +1000
49 no need for glob.h here
51 it also causes portability problems
53 commit 03d94a47207d58b3db37eba4f87eb6ae5a63168a
54 Author: Damien Miller <djm@mindrot.org>
55 Date: Mon Sep 19 20:59:04 2022 +1000
57 avoid Wuninitialized false positive in gcc-12ish
59 commit 9d952529113831fb3071ab6e408d2726fd72e771
60 Author: djm@openbsd.org <djm@openbsd.org>
61 Date: Mon Sep 19 10:46:00 2022 +0000
63 upstream: use users-groups-by-id@openssh.com sftp-server extension
65 (when available) to fill in user/group names for directory listings.
66 Implement a client-side cache of see uid/gid=>user/group names. ok markus@
68 OpenBSD-Commit-ID: f239aeeadfa925a37ceee36ee8b256b8ccf4466e
70 commit 8ff680368b0bccf88ae85d4c99de69387fbad7a6
71 Author: djm@openbsd.org <djm@openbsd.org>
72 Date: Mon Sep 19 10:43:12 2022 +0000
74 upstream: sftp client library support for
76 users-groups-by-id@openssh.com; ok markus@
78 OpenBSD-Commit-ID: ddb2f33a2da6349a9a89a8b5bcb9ca7c999394de
80 commit 488f6e1c582212c2374a4bf8cd1b703d2e70fb8b
81 Author: djm@openbsd.org <djm@openbsd.org>
82 Date: Mon Sep 19 10:41:58 2022 +0000
84 upstream: extend sftp-common.c:extend ls_file() to support supplied
86 user/group names; ok markus@
88 OpenBSD-Commit-ID: c70c70498b1fdcf158531117e405b6245863bfb0
90 commit 74b77f7497dba3a58315c8f308883de448078057
91 Author: djm@openbsd.org <djm@openbsd.org>
92 Date: Mon Sep 19 10:40:52 2022 +0000
94 upstream: sftp-server(8): add a "users-groups-by-id@openssh.com"
96 extension request that allows the client to obtain user/group names that
97 correspond to a set of uids/gids.
99 Will be used to make directory listings more useful and consistent
104 OpenBSD-Commit-ID: 7ebabde0bcb95ef949c4840fe89e697e30df47d3
106 commit 231a346c0c67cc7ca098360f9a554fa7d4f1eddb
107 Author: djm@openbsd.org <djm@openbsd.org>
108 Date: Mon Sep 19 08:49:50 2022 +0000
110 upstream: better debugging for connect_next()
112 OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640
114 commit 1875042c52a3b950ae5963c9ca3774a4cc7f0380
115 Author: djm@openbsd.org <djm@openbsd.org>
116 Date: Sat Sep 17 10:34:29 2022 +0000
118 upstream: Add RequiredRSASize for sshd(8); RSA keys that fall
120 beneath this limit will be ignored for user and host-based authentication.
122 Feedback deraadt@ ok markus@
124 OpenBSD-Commit-ID: 187931dfc19d51873df5930a04f2d972adf1f7f1
126 commit 54b333d12e55e6560b328c737d514ff3511f1afd
127 Author: djm@openbsd.org <djm@openbsd.org>
128 Date: Sat Sep 17 10:33:18 2022 +0000
130 upstream: add a RequiredRSASize for checking RSA key length in
132 ssh(1). User authentication keys that fall beneath this limit will be
133 ignored. If a host presents a host key beneath this limit then the connection
134 will be terminated (unfortunately there are no fallbacks in the protocol for
135 host authentication).
137 feedback deraadt, Dmitry Belyavskiy; ok markus@
139 OpenBSD-Commit-ID: 430e339b2a79fa9ecc63f2837b06fdd88a7da13a
141 commit 07d8771bacfefbcfb37fa8a6dc6103bcc097e0ab
142 Author: djm@openbsd.org <djm@openbsd.org>
143 Date: Sat Sep 17 10:30:45 2022 +0000
145 upstream: Add a sshkey_check_rsa_length() call for checking the
147 length of an RSA key; ok markus@
149 OpenBSD-Commit-ID: de77cd5b11594297eda82edc594b0d32b8535134
151 commit 3991a0cf947cf3ae0f0373bcec5a90e86a7152f5
152 Author: djm@openbsd.org <djm@openbsd.org>
153 Date: Sat Sep 17 10:11:29 2022 +0000
155 upstream: actually hook up restrict_websafe; the command-line flag
157 was never actually used. Spotted by Matthew Garrett
159 OpenBSD-Commit-ID: 0b363518ac4c2819dbaa3dfad4028633ab9cdff1
161 commit 30b2a7e4291fb9e357f80a237931ff008d686d3b
162 Author: djm@openbsd.org <djm@openbsd.org>
163 Date: Fri Sep 16 06:55:37 2022 +0000
165 upstream: correct error value
167 OpenBSD-Commit-ID: 780efcbad76281f11f14b2a5ff04eb6db3dfdad4
169 commit ac1ec9545947d9f9657259f55d04cb49d3a94c8a
170 Author: djm@openbsd.org <djm@openbsd.org>
171 Date: Fri Sep 16 03:33:14 2022 +0000
173 upstream: sftp: Be a bit more clever about completions
175 There are commands (e.g. "get" or "put") that accept two
176 arguments, a local path and a remote path. However, the way
177 current completion is written doesn't take this distinction into
178 account and always completes remote or local paths.
180 By expanding CMD struct and "cmds" array this distinction can be
181 reflected and with small adjustment to completer code the correct
182 path can be completed.
184 By Michal Privoznik, ok dtucker@
186 OpenBSD-Commit-ID: 1396d921c4eb1befd531f5c4a8ab47e7a74b610b
188 commit 590db83384f9d99fc51c84505792d26d1ef60df9
189 Author: djm@openbsd.org <djm@openbsd.org>
190 Date: Fri Sep 16 03:13:34 2022 +0000
192 upstream: sftp: Don't attempt to complete arguments for
194 non-existent commands
196 If user entered a non-existent command (e.g. because they made a
197 typo) there is no point in trying to complete its arguments. Skip
198 calling complete_match() if that's the case.
200 From Michal Privoznik
202 OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a
204 commit ff9809fdfd1d9a91067bb14a77d176002edb153c
205 Author: djm@openbsd.org <djm@openbsd.org>
206 Date: Wed Sep 14 00:14:37 2022 +0000
208 upstream: sk_enroll: never drop SSH_SK_USER_VERIFICATION_REQD flag
212 Now that all FIDO signing calls attempt first without PIN and then
213 fall back to trying PIN only if that attempt fails, we can remove the
214 hack^wtrick that removed the UV flag from the keys returned during
219 OpenBSD-Commit-ID: 684517608c8491503bf80cd175425f0178d91d7f
221 commit 940dc10729cb5a95b7ee82c10184e2b9621c8a1d
222 Author: djm@openbsd.org <djm@openbsd.org>
223 Date: Wed Sep 14 00:13:13 2022 +0000
225 upstream: a little extra debugging
227 OpenBSD-Commit-ID: edf1601c1d0905f6da4c713f4d9cecc7d1c0295a
229 commit 4b5f91cb959358141181b934156513fcb8a6c1e3
230 Author: djm@openbsd.org <djm@openbsd.org>
231 Date: Wed Sep 14 00:02:03 2022 +0000
233 upstream: ssh-agent: attempt FIDO key signing without PIN and use
235 the error to determine whether a PIN is required and prompt only if
236 necessary. from Corinna Vinschen
238 OpenBSD-Commit-ID: dd6be6a0b7148608e834ee737c3479b3270b00dd
240 commit 113523bf0bc33600b07ebb083572c8c346b6fdf4
241 Author: jmc@openbsd.org <jmc@openbsd.org>
242 Date: Sun Sep 11 06:38:11 2022 +0000
244 upstream: .Li -> .Vt where appropriate; from josiah frentsos,
250 OpenBSD-Commit-ID: 565046e3ce68b46c2f440a93d67c2a92726de8ed
252 commit 86af013b56cecb5ee58ae0bd9d495cd586fc5918
253 Author: jsg@openbsd.org <jsg@openbsd.org>
254 Date: Sat Sep 10 08:50:53 2022 +0000
256 upstream: fix repeated words ok miod@ jmc@
258 OpenBSD-Commit-ID: 6765daefe26a6b648cc15cadbbe337596af709b7
260 commit 0ba39b93b326a7d5dfab776cc9b9d326161a9b16
261 Author: djm@openbsd.org <djm@openbsd.org>
262 Date: Fri Sep 9 03:31:42 2022 +0000
264 upstream: notifier_complete(NULL, ...) is a noop, so no need to test
266 that ctx!=NULL; from Corinna Vinschen
268 OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a
270 commit be197635329feb839865fdc738e34e24afd1fca8
271 Author: Sam James <sam@gentoo.org>
272 Date: Thu Sep 8 02:49:29 2022 +0100
274 openbsd-compat/bsd-asprintf: add <stdio.h> include for vsnprintf
276 Fixes the following build failure with Clang 15 on musl:
278 bsd-asprintf.c:51:8: error: call to undeclared library function 'vsnprintf' with type 'int (char *, unsigned long, const char *, struct __va_list_tag *)'; ISO C99 and laterclang -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fstack-protector-strong -fPIE -I. -I. -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DSSHDIR=\"/etc/ssh\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/lib/misc/ssh-askpass\" -D_PATH_SFTP_SERVER=\"/usr/lib/misc/sftp-server\" -D_PATH_SSH_KEY_SIGN=\"/usr/lib/misc/ssh-keysign\" -D_PATH_SSH_PKCS11_HELPER=\"/usr/lib/misc/ssh-pkcs11-helper\" -D_PATH_SSH_SK_HELPER=\"/usr/lib/misc/ssh-sk-helper\" -D_PATH_SSH_PIDDIR=\"/run\" -D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c cipher-aes.c -o cipher-aes.o
280 implicit function declarations [-Wimplicit-function-declaration]
281 ret = vsnprintf(string, INIT_SZ, fmt, ap2);
283 bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf'
287 commit 6cb6f660bb35f77a0456dd2581ddf39c29398a5e
288 Author: Darren Tucker <dtucker@dtucker.net>
289 Date: Fri Sep 2 16:43:27 2022 +1000
291 Remove DEF_WEAK, it's already in defines.h.
293 commit ce39e7d8b70c4726defde5d3bc4cb7d40d131153
294 Author: Darren Tucker <dtucker@dtucker.net>
295 Date: Fri Sep 2 14:28:14 2022 +1000
297 Resync arc4random with OpenBSD.
299 This brings us up to current, including djm's random-reseeding change,
300 as prompted by logan at cyberstorm.mu in bz#3467. It brings the
301 platform-specific hooks from LibreSSL Portable, simplified to match our
304 commit beaddde26f30e2195b8aa4f3193970e140e17305
305 Author: Darren Tucker <dtucker@dtucker.net>
306 Date: Fri Sep 2 14:20:04 2022 +1000
308 Move OPENBSD ORIGINAL marker.
310 Putting this after the copyright statement (which doesn't change)
311 instead of before the version identifier (which does) prevents merge
312 conflicts when resyncing changes.
314 commit c83e467ead67a8cb48ef4bec8085d6fb880a2ff4
315 Author: Darren Tucker <dtucker@dtucker.net>
316 Date: Fri Sep 2 14:17:28 2022 +1000
318 Remove arc4random_uniform from arc4random.c
320 This was previously moved into its own file (matching OpenBSD) which
321 prematurely committed in commit 73541f2.
323 commit 5f45c2395c60865e59fa44152ff1d003a128c5bc
324 Author: djm@openbsd.org <djm@openbsd.org>
325 Date: Fri Sep 2 04:20:02 2022 +0000
327 upstream: sk-usbhid: fix key_lookup() on tokens with built-in UV
329 explicitly test whether the token performs built-in UV (e.g. biometric
330 tokens) and enable UV in that case. From Pedro Martelletto via GHPR#388
332 OpenBSD-Commit-ID: 007eb7e387d27cf3029ab06b88224e03eca62ccd
334 commit 03277a4aa49b80af541a3e691f264c0c0d8f9cec
335 Author: Darren Tucker <dtucker@dtucker.net>
336 Date: Wed Aug 31 20:26:30 2022 +1000
338 Move sftp from valgrind-2 to 3 to rebalance.
340 commit fcf5365da69c516817321ba89c3a91df98d098df
341 Author: djm@openbsd.org <djm@openbsd.org>
342 Date: Wed Aug 31 02:56:40 2022 +0000
346 OpenBSD-Commit-ID: c2bcbf93610d3d62ed206cdf9bf9ff98c6aaf232
348 commit e60136a3d7a223dd8e84ba8a6895bc3142360993
349 Author: Damien Miller <djm@mindrot.org>
350 Date: Mon Aug 29 13:27:45 2022 +1000
354 commit 2b02dcb505288c462d1b5dd1ac04e603d01340eb
355 Author: Damien Miller <djm@mindrot.org>
356 Date: Mon Aug 29 13:23:43 2022 +1000
358 cross-sign allowed_signers with PGP key
360 Provides continuity of trust from legacy PGP release key to
361 the SSHSIG signing keys that we will use henceforth for git
364 commit 51b345f177ae981b8755f6bdf8358b1cc5e83d67
365 Author: Darren Tucker <dtucker@dtucker.net>
366 Date: Sat Aug 27 21:49:27 2022 +1000
368 Add libcrypt-devel to cygwin-release deps.
370 Based on feedback from vinschen at redhat.com.
372 commit 9f81736cf16dd8dda1c8942f1973a5f80b8cd78c
373 Author: Darren Tucker <dtucker@dtucker.net>
374 Date: Sat Aug 27 09:37:40 2022 +1000
376 Add Windows 2022 test targets.
378 commit 85e1a69243f12be8520438ad6a3cfdc0b7fcbb2d
379 Author: Darren Tucker <dtucker@dtucker.net>
380 Date: Fri Aug 26 16:26:06 2022 +1000
382 Add cygwin-release test target.
384 This also moves the cygwin package install from the workflow file to
385 setup_ci.sh so that we can install different sets of Cygwin packages
386 for different test configs.
388 commit 92382dbe8bf9ea1225b16858f9b9b208c15c7e8d
389 Author: djm@openbsd.org <djm@openbsd.org>
390 Date: Fri Aug 26 08:16:27 2022 +0000
394 OpenBSD-Commit-ID: a5d015efbfd228dc598ffdef612d2da3a579e5d8
396 commit 70a5de0a50e84d7250eb4e4537f765599f64c4af
397 Author: djm@openbsd.org <djm@openbsd.org>
398 Date: Fri Aug 26 08:12:56 2022 +0000
402 OpenBSD-Commit-ID: d297e4387935d4aef091c5e9432578c2e513f538
404 commit 3a683a19fd116ea15ebf8aa13d02646cceb302a9
405 Author: Damien Miller <djm@mindrot.org>
406 Date: Fri Aug 26 14:23:55 2022 +1000
408 initial list of allowed signers
410 commit 6851f4b8c3fc1b3e1114c56106e4dc31369c8513
411 Author: Darren Tucker <dtucker@dtucker.net>
412 Date: Fri Aug 19 17:22:18 2022 +1000
414 Install Cygwin packages based on OS not config.
416 commit f96480906893ed93665df8cdf9065865c51c1475
417 Author: djm@openbsd.org <djm@openbsd.org>
418 Date: Fri Aug 19 06:07:47 2022 +0000
420 upstream: attemp FIDO key signing without PIN and use the error
422 code returned to fall back only if necessary. Avoids PIN prompts for FIDO
423 tokens that don't require them; part of GHPR#302
425 OpenBSD-Commit-ID: 4f752aaf9f2e7c28bcaaf3d4f8fc290131bd038e
427 commit 5453333b5d28e313284cb9aae82899704103f98d
428 Author: djm@openbsd.org <djm@openbsd.org>
429 Date: Fri Aug 19 05:53:28 2022 +0000
431 upstream: remove incorrect check that can break enrolling a
433 resident key (introduced in r1.40)
435 OpenBSD-Commit-ID: 4cab364d518470e29e624af3d3f9ffa9c92b6f01
437 commit ff89b1bed80721295555bd083b173247a9c0484e
438 Author: dtucker@openbsd.org <dtucker@openbsd.org>
439 Date: Fri Aug 19 04:02:46 2022 +0000
441 upstream: Strictly enforce the maximum allowed SSH2 banner size in
443 ssh-keyscan and prevent a one-byte buffer overflow. Patch from Qualys, ok
446 OpenBSD-Commit-ID: 6ae664f9f4db6e8a0589425f74cd0bbf3aeef4e4
448 commit 1b470b9036639cef4f32fb303bb35ea0b711178d
449 Author: Darren Tucker <dtucker@dtucker.net>
450 Date: Fri Aug 19 15:18:09 2022 +1000
452 Fix cygwin conditional steps.
454 commit fd6ee741ab16714b7035d60aca924123ba28135a
455 Author: Darren Tucker <dtucker@dtucker.net>
456 Date: Fri Aug 19 15:12:57 2022 +1000
458 Add a bit more debug output.
460 commit a9305c4c739f4d91a3d3a92c0b6d4949404a36c5
461 Author: Darren Tucker <dtucker@dtucker.net>
462 Date: Fri Aug 12 15:08:47 2022 +1000
464 Add Cygwin (on windows-2019) test target.
466 In addition to installing the requisite Cygwin packages, we also need to
467 explicitly invoke "sh" for steps that run other scripts since the runner
468 environment doesn't understand #! paths.
470 commit 5062ad48814b06162511c4f5924a33d97b6b2566
471 Author: djm@openbsd.org <djm@openbsd.org>
472 Date: Fri Aug 19 03:06:30 2022 +0000
474 upstream: double free() in error path; from Eusgor via GHPR333
476 OpenBSD-Commit-ID: 39f35e16ba878c8d02b4d01d8826d9b321be26d4
478 commit 5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e
479 Author: Darren Tucker <dtucker@dtucker.net>
480 Date: Thu Aug 18 21:36:39 2022 +1000
482 Check for perms to run agent-getpeereid test.
484 Ubuntu 22.04 defaults to private home dirs which prevents "nobody"
485 running ssh-add during the agent-getpeereid test. Check for this and
486 add the necessary permissions.
488 commit cd06a76b7ccc706e2bb4f1cc4aa9e9796a28a812
489 Author: Damien Miller <djm@mindrot.org>
490 Date: Wed Aug 17 16:04:16 2022 +1000
492 on Cygwin, prefer WinHello FIDO device
494 If no FIDO device was explictly specified, then prefer the
495 windows://hello FIDO device. An exception to this is when
496 probing resident FIDO keys, in which case hardware FIDO
497 devices are preferred.
499 commit 47f72f534ac5cc2cd3027675a3df7b00a8f77575
500 Author: djm@openbsd.org <djm@openbsd.org>
501 Date: Wed Aug 17 06:01:57 2022 +0000
503 upstream: add an extra flag to sk_probe() to indicate whether we're
505 probing for a FIDO resident key or not. Unused here, but will make like
508 OpenBSD-Commit-ID: 432c8ff70e270378df9dbceb9bdeaa5b43b5a832
510 commit edb0bcb3c79b16031dc87a8e57aecc3c4a3414f0
511 Author: jmc@openbsd.org <jmc@openbsd.org>
512 Date: Tue Aug 16 20:24:08 2022 +0000
514 upstream: use .Cm for "sign"; from josiah frentsos
516 OpenBSD-Commit-ID: 7f80a53d54857ac6ae49ea6ad93c5bd12231d1e4
518 commit cccb011e130cbbac538b1689d10e4a067298df8b
519 Author: Corinna Vinschen <vinschen@redhat.com>
520 Date: Thu Aug 11 20:19:35 2022 +0200
522 Revert "check_sk_options: add temporary WinHello workaround"
524 Cygwin now comes with libfido2 1.11.0, so this workaround
525 isn't required anymore.
527 This reverts commit 242c044ab111a37aad3b0775727c36a4c5f0102c.
529 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
531 commit 9468cd7cf9d989dfa2ac20e2a0268ba6e93bfa5a
532 Author: Corinna Vinschen <vinschen@redhat.com>
533 Date: Thu Aug 11 20:18:17 2022 +0200
535 fido_dev_is_winhello: return 0, not "false"
537 "false" is not used anywhere in OpenSSH, so return 0 like
540 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
542 commit 730a80609472ee0451c99482d75c9c41f3ebc42d
543 Author: djm@openbsd.org <djm@openbsd.org>
544 Date: Fri Aug 12 05:20:28 2022 +0000
546 upstream: sftp-server: support home-directory request
548 Add support to the sftp-server for the home-directory extension defined
549 in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the
550 existing expand-path@openssh.com, but uses a more official protocol name,
551 and so is a bit more likely to be implemented by non-OpenSSH clients.
553 From Mike Frysinger, ok dtucker@
555 OpenBSD-Commit-ID: bfc580d05cc0c817831ae7ecbac4a481c23566ab
557 commit 5e820bf79ce3ce99ef7e98b0ab642b0a0a4f396c
558 Author: Darren Tucker <dtucker@dtucker.net>
559 Date: Fri Aug 12 14:56:55 2022 +1000
561 Replace deprecated ubuntu-18.04 runners with 22.04
563 commit 87b0d9c1b789d3ff958ec45df2ac912e24461bae
564 Author: Darren Tucker <dtucker@dtucker.net>
565 Date: Thu Aug 11 22:48:23 2022 +1000
567 Add a timegm implementation from Heimdal via Samba.
569 Fixes build on (at least Solaris 10).
571 commit d0c4fa58594577994921b593f10037c5282597ca
572 Author: Darren Tucker <dtucker@dtucker.net>
573 Date: Thu Aug 11 14:23:58 2022 +1000
575 Rerun tests if any .github config file changes.
577 commit 113fe6c77ab43769fc61e953d07cb619fd7ea54b
578 Author: Darren Tucker <dtucker@dtucker.net>
579 Date: Thu Aug 11 13:33:51 2022 +1000
581 Skip hostbased during Valgrind tests.
583 Valgrind doesn't let ssh exec ssh-keysign (because it's setuid) so skip
584 it during the Valgrind based tests.
586 See https://bugs.kde.org/show_bug.cgi?id=119404 for a discussion of this
587 (ironically there the problematic binary was ssh(1) back when it could
590 commit b98a42afb69d60891eb0488935990df6ee571c4d
591 Author: djm@openbsd.org <djm@openbsd.org>
592 Date: Thu Aug 11 01:57:50 2022 +0000
594 upstream: add some tests for parse_absolute_time(), including cases
596 where it is forced to the UTC timezone. bz3468 ok dtucker
598 OpenBSD-Regress-ID: ea07ca31c2f3847a38df028ca632763ae44e8759
600 commit ec1ddb72a146fd66d18df9cd423517453a5d8044
601 Author: djm@openbsd.org <djm@openbsd.org>
602 Date: Thu Aug 11 01:56:51 2022 +0000
604 upstream: allow certificate validity intervals, sshsig verification
606 times and authorized_keys expiry-time options to accept dates in the UTC time
607 zone in addition to the default of interpreting them in the system time zone.
608 YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if
609 suffixed with a 'Z' character.
611 Also allow certificate validity intervals to be specified in raw
612 seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This
613 is intended for use by regress tests and other tools that call
614 ssh-keygen as part of a CA workflow.
618 OpenBSD-Commit-ID: 454db1cdffa9fa346aea5211223a2ce0588dfe13
620 commit 4df246ec75751da7eb925e1880498300d8bda187
621 Author: Darren Tucker <dtucker@dtucker.net>
622 Date: Thu Aug 11 10:23:55 2022 +1000
624 Fix conditional for running hostbased tests.
626 commit 2580916e48721802220c61ce9e0df1297c00bc07
627 Author: Damien Miller <djm@mindrot.org>
628 Date: Thu Aug 11 08:58:28 2022 +1000
630 fix SANDBOX_SECCOMP_FILTER_DEBUG
632 commit fdbd5bf507fc271ff813714fab8a72ff2c6cb5ca
633 Author: Darren Tucker <dtucker@dtucker.net>
634 Date: Wed Aug 10 17:35:52 2022 +1000
636 Test hostbased auth on github runners.
638 commit 7e2f51940ba48a1c0fae1107801ea643fa83c971
639 Author: Darren Tucker <dtucker@dtucker.net>
640 Date: Wed Aug 10 17:25:24 2022 +1000
642 Rename our getentropy to prevent possible loops.
644 Since arc4random seeds from getentropy, and we use OpenSSL for that
645 if enabled, there's the possibility that if we build on a system that
646 does not have getentropy then run on a system that does have it, then
647 OpenSSL could end up calling our getentropy and getting stuck in a loop.
648 Pointed out by deraadt@, ok djm@
650 commit 7a01f61be8d0aca0e975e7417f26371495fe7674
651 Author: Darren Tucker <dtucker@dtucker.net>
652 Date: Mon Aug 8 12:17:04 2022 +1000
654 Actually put HAVE_STDINT_H around the stdint.h.
656 commit 73541f29f0b50480da6c20dceb7a7191bd8ea7d3
657 Author: Darren Tucker <dtucker@dtucker.net>
658 Date: Mon Aug 8 10:30:34 2022 +1000
660 Give unused param a name.
662 Fixes builds on platforms that do have fido2 but don't have
663 fido_dev_is_winhello.
665 commit 2a108c0ea960381bd9b14ee0d84e818a23df4482
666 Author: djm@openbsd.org <djm@openbsd.org>
667 Date: Fri Aug 5 05:01:40 2022 +0000
669 upstream: don't prompt for FIDO passphrase before attempting to enroll
671 the credential, just let the enroll operating fail and we'll attempt to get a
672 PIN anyway. Might avoid some unneccessary PIN prompts.
674 Part of GHPR#302 from Corinna Vinschen; ok dtucker@
676 OpenBSD-Commit-ID: bd5342ffc353ee37d39617906867c305564d1ce2
678 commit 2886975c0ad9244e60dc5e4be34fde3aa573a4b5
679 Author: Corinna Vinschen <vinschen@redhat.com>
680 Date: Fri Feb 11 14:33:41 2022 +0100
682 sk_sign: set FIDO2 uv attribute explicitely for WinHello
684 WinHello via libfido2 performs user verification by default.
685 However, if we stick to that, there's no way to differentiate
686 between keys created with or without "-O verify-required".
687 Set FIDO2 uv attribute explicitely to FIDO_OPT_FALSE, then check
688 if user verification has been requested.
690 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
692 commit 242c044ab111a37aad3b0775727c36a4c5f0102c
693 Author: Corinna Vinschen <vinschen@redhat.com>
694 Date: Tue Feb 15 11:28:08 2022 +0100
696 check_sk_options: add temporary WinHello workaround
698 Up to libfido 1.10.0, WinHello advertises "clientPin" rather
699 than "uv" capability. This is fixed in 1.11.0. For the time
700 being, workaround it here.
702 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
704 commit 78774c08cc4b4997382975b0f414a86e06b6780c
705 Author: Corinna Vinschen <vinschen@redhat.com>
706 Date: Thu Feb 10 18:19:29 2022 +0100
708 compat code for fido_dev_is_winhello()
710 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
712 commit 3d3a932a019aedfb891e0779bb4990cd5008a390
713 Author: Darren Tucker <dtucker@dtucker.net>
714 Date: Fri Aug 5 13:12:27 2022 +1000
716 Factor out getrnd() and rename to getentropy().
718 Factor out the arc4random seeding into its own file and change the
719 interface to match getentropy. Use native getentropy if available.
720 This will make it easier to resync OpenBSD changes to arc4random.
721 Prompted by bz#3467, ok djm@.
723 commit 9385d277b787403be9dfcb229cf372202496d2f3
724 Author: Darren Tucker <dtucker@dtucker.net>
725 Date: Thu Aug 4 18:55:48 2022 +1000
727 Include CHANNEL and FIDO2 libs in configure output
729 commit 141535b904b6fba01724444f38193a8599201f82
730 Author: djm@openbsd.org <djm@openbsd.org>
731 Date: Mon Aug 1 11:09:26 2022 +0000
733 upstream: avoid double-free in error path introduced in r1.70; report
735 and fix based on GHPR#332 by v-rzh ok dtucker@
737 OpenBSD-Commit-ID: 3d21aa127b1f37cfc5bdc21461db369a663a951f
739 commit dba7099ffcba3ca07b3946f017ba6a4c3158d9b1
740 Author: Darren Tucker <dtucker@dtucker.net>
741 Date: Wed Jul 27 18:40:12 2022 +1000
743 Remove deprecated MacOS 10.15 runners.
745 commit 722a56439aa5972c830e4a9a724cf52aff4a950a
746 Author: Darren Tucker <dtucker@dtucker.net>
747 Date: Wed Jul 27 18:31:14 2022 +1000
749 Move stale-configure check as early as possible.
751 We added a check in Makefile to catch the case where configure needs to
752 be rebuilt, however this did not happen until a build was attempted in
753 which case all of the work done by configure was wasted. Move this check
754 to the start of configure to catch it as early as possible. ok djm@
756 commit 099d6b56288b421ba38531d26dc1bd6bb685e311
757 Author: Darren Tucker <dtucker@dtucker.net>
758 Date: Fri Jul 22 10:47:19 2022 +1000
760 Move libcrypto into CHANNELLIBS.
762 This will result in sftp, sftp-server and scp no longer being linked
763 against libcrypto. ok djm@
765 commit 1bdf86725b77733bb5f17c54888b88a10b2f6538
766 Author: Darren Tucker <dtucker@dtucker.net>
767 Date: Fri Jul 22 10:45:47 2022 +1000
769 Remove seed_rng calls from scp, sftp, sftp-server.
771 These binaries don't use OpenSSL's random functions. The next step
772 will be to stop linking them against libcrypto. ok djm@
774 commit d73f77b8cb9b422f1ac4facee7890aa10ff2bc21
775 Author: Darren Tucker <dtucker@dtucker.net>
776 Date: Fri Jul 22 09:51:51 2022 +1000
778 Group libcrypto and PRNGD checks together.
780 They're related more than the libcrypt or libiaf checks which are
781 currently between them. ok djm@
783 commit f117e372b3f42f2fbdb0a578d063b2609ab58e1f
784 Author: Darren Tucker <dtucker@dtucker.net>
785 Date: Fri Jul 22 09:24:45 2022 +1000
787 Do not link scp, sftp and sftp-server w/ zlib.
789 Some of our binaries (eg sftp, sftp-server, scp) do not interact with
790 the channels code and thus do use libraries such as zlib and libcrypto
791 although they are linked with them. This adds a CHANNELLIBS and starts
792 by moving zlib into it, which means the aformentioned binaries are no
793 longer linked against zlib. ok djm@
795 commit 800c2483e68db38bd1566ff69677124be974aceb
796 Author: Darren Tucker <dtucker@dtucker.net>
797 Date: Mon Jul 25 21:49:04 2022 +1000
799 Remove workarounds for OpenSSL missing AES-CTR.
801 We have some compatibility hacks that were added to support OpenSSL
802 versions that do not support AES CTR mode. Since that time, however,
803 the minimum OpenSSL version that we support has moved to 1.0.1 which
804 *does* have CTR, so this is no longer needed. ok djm@
806 commit b7c56b65c12f51fe0dbae798d19c8f58224a5d95
807 Author: Darren Tucker <dtucker@dtucker.net>
808 Date: Mon Jul 25 21:43:00 2022 +1000
810 Remove workarounds for OpenSSL missing AES-GCM.
812 We have some compatibility hacks that were added to support OpenSSL
813 versions that do not support AES GCM mode. Since that time, however,
814 the minimum OpenSSL version that we support has moved to 1.0.1 which
815 *does* have GCM, so this is no longer needed. ok djm@
817 commit 5a4a9f7a968fbf92cc1eac519c65638e79ae9f1f
818 Author: dtucker@openbsd.org <dtucker@openbsd.org>
819 Date: Mon Jul 25 07:12:45 2022 +0000
821 upstream: Restore missing "!" in TEST_SSH_ELAPSED_TIMES test.
823 OpenBSD-Regress-ID: 38783f9676ec348c5a792caecee9a16e354b37b0
825 commit 0ff886be132299386cc29d87c2aa16ff68a1aa08
826 Author: dtucker@openbsd.org <dtucker@openbsd.org>
827 Date: Sun Jul 24 23:29:10 2022 +0000
829 upstream: Test TEST_SSH_ELAPSED_TIMES for empty string not
831 executable. No-op on most platforms but should prevent warnings in -portable
832 on systems that don't have 'date %s'.
834 OpenBSD-Regress-ID: e39d79867b8065e33d0c5926fa1a31f85659d2a4
836 commit f69319ad8ad1dd50f90bbcf5912e11cc8ed3e037
837 Author: Darren Tucker <dtucker@dtucker.net>
838 Date: Sat Jul 23 14:38:22 2022 +1000
840 Convert "have_prog" function into "which".
842 "which" and its behaviour is not standardized, so convert the existing
843 have_prog function into "which" so we can rely on it being available
844 and what its semantics are. Add a have_prog wrapper that maintains the
847 commit ea7ecc2c3ae39fdf5c6ad97b7bc0b47a98847f43
848 Author: Darren Tucker <dtucker@dtucker.net>
849 Date: Sat Jul 23 14:36:38 2022 +1000
851 Skip scp3 test if there's no scp on remote path.
853 scp -3 ends up using the scp that's in the remote path and will fail if
854 one is not available. Based on a patch from rapier at psc.edu.
856 commit c46f6fed419167c1671e4227459e108036c760f8
857 Author: Damien Miller <djm@mindrot.org>
858 Date: Wed Jul 20 13:39:14 2022 +1000
860 crank SSH_SK_VERSION_MAJOR in sk-dummy.so
862 commit f208e3b9ffb5ee76cf9c95df7ff967adc7f51c7d
863 Author: djm@openbsd.org <djm@openbsd.org>
864 Date: Wed Jul 20 03:33:22 2022 +0000
866 upstream: ssh-keygen: fix touch prompt, pin retries;
868 part of GHPR329 from Pedro Martelletto
870 OpenBSD-Commit-ID: 75d1005bd2ef8f29fa834c90d2684e73556fffe8
872 commit 8638a2ce7e90c8a51d9af3143404282126c524f8
873 Author: djm@openbsd.org <djm@openbsd.org>
874 Date: Wed Jul 20 03:31:42 2022 +0000
876 upstream: sk-usbhid: preserve error code returned by key_lookup()
878 it conveys useful information, such as the supplied pin being wrong.
880 Part of GHPR329 from Pedro Martelletto
882 OpenBSD-Commit-ID: c0647eb9290f793add363d81378439b273756c1b
884 commit 9ab929ca2d820520327b41929372bcb9e261534c
885 Author: djm@openbsd.org <djm@openbsd.org>
886 Date: Wed Jul 20 03:29:14 2022 +0000
888 upstream: when enrolling a resident key on a security token, check
890 if a credential with matching application and user ID strings already exists.
891 if so, prompt the user for confirmation before overwriting the credential.
893 patch from Pedro Martelletto via GHPR329
895 NB. cranks SSH_SK_VERSION_MAJOR, so any third-party FIDO middleware
896 implementations will need to adjust
898 OpenBSD-Commit-ID: e45e9f1bf2b2f32d9850669e7a8dbd64acc5fca4
900 commit 5bcfc788b38d5b64e4c347bdc04bd9a01bbc36da
901 Author: djm@openbsd.org <djm@openbsd.org>
902 Date: Wed Jul 20 03:13:04 2022 +0000
904 upstream: pull passphrase reading and confirmation into a separate
906 function so it can be used for FIDO2 PINs; no functional change
908 OpenBSD-Commit-ID: bf34f76b8283cc1d3f54633e0d4f13613d87bb2f
910 commit eb679e2959bdb15454eb94751930eb4c9110da94
911 Author: Darren Tucker <dtucker@dtucker.net>
912 Date: Fri Jul 15 21:31:48 2022 +1000
914 Move vmshutdown to first step.
916 If a previous run on a physical runner has failed to clean up, the next
917 run will fail because it'll try to check out the code to a broken
918 directory mount. Make cleanup the first step.
920 commit 46b91b70ff3cb9c147e2875ef5dc609fd64c0c96
921 Author: Darren Tucker <dtucker@dtucker.net>
922 Date: Fri Jul 15 20:25:27 2022 +1000
924 Rename bbone test target to ARM.
926 commit 751d22cdeffed9fe921db78eedc32a29f9e80510
927 Author: Darren Tucker <dtucker@dtucker.net>
928 Date: Fri Jul 15 13:37:29 2022 +1000
930 Add AUDIT_ARCH_PPC to supported seccomp arches.
932 Patch from dries.deschout at dodeco.eu.
934 commit a061792a6e8d235fc40a9b5d4c22a1762bb75a7b
935 Author: Darren Tucker <dtucker@dtucker.net>
936 Date: Thu Jul 14 19:20:24 2022 +1000
938 Remove unintended changes.
940 I inadvertently included a couple of local changes with the OpenSSL
941 3.0.4 change. Revert, anything that should be there will be committed
944 commit 527cb43fa1b4e55df661feabbac51b8e608b6519
945 Author: Darren Tucker <dtucker@dtucker.net>
946 Date: Thu Jul 14 11:22:08 2022 +1000
948 Return ERANGE from getcwd() if buffer size is 1.
950 If getcwd() is supplied a buffer size of exactly 1 and a path of "/", it
951 could result in a nul byte being written out of array bounds. POSIX says
952 it should return ERANGE if the path will not fit in the available buffer
953 (with terminating nul). 1 byte cannot fit any possible path with its nul,
954 so immediately return ERANGE in that case.
956 OpenSSH never uses getcwd() with this buffer size, and all current
957 (and even quite old) platforms that we are currently known to work
958 on have a native getcwd() so this code is not used on those anyway.
959 Reported by Qualys, ok djm@
961 commit 36857fefd8849c4b0e877cfd9d1eb22f79b76650
962 Author: Darren Tucker <dtucker@dtucker.net>
963 Date: Thu Jul 14 10:02:35 2022 +1000
965 Split README.platform into its own line.
967 README.platform has general platform-specific information, having it
968 following text about FIDO2 on the same line could imply that it only
969 has information about FIDO2.
971 commit 00a496c6c14f2d41f2a9365714d494dd5f3aac9f
972 Author: Darren Tucker <dtucker@dtucker.net>
973 Date: Thu Jul 14 09:56:01 2022 +1000
975 Clarify README.md text.
977 Clarify the text about the implications of building without OpenSSL, and
978 prefix the "configure --help" example command with a "./" so it's likely
979 to work as-is in more shells. From bz#3461.
981 commit f40b52f21fbc52eb513279168a49d3285c65256c
982 Author: Darren Tucker <dtucker@dtucker.net>
983 Date: Tue Jul 12 19:48:44 2022 +1000
985 Remove special casing of crypt().
987 Configure goes to some lengths to pick crypt() from either libcrypt
988 or OpenSSL's libcrypto because they can more or less featureful (eg
989 supporting md5-style passwords).
991 OpenSSL removed its crypt() interface in 2002:
992 https://github.com/openssl/openssl/commit/69deec58 so these hijinks
993 should no longer be necessary. This also only links sshd with libcrypt
994 which is the only thing that needs it. ok djm@
996 commit 76f4e48631d7b09fb243b47d7b393d100d3741b7
997 Author: Darren Tucker <dtucker@dtucker.net>
998 Date: Wed Jul 13 13:17:47 2022 +1000
1000 Only refuse to use OpenSSL 3.0.4 on x86_64.
1002 The potential RCE only impacts x86_64, so only refuse to use it if we're
1003 targetting a potentially impacted architecture. ok djm@
1005 commit e75bbc1d88491fa85e61b2cc8783d4bbd00cd131
1006 Author: Darren Tucker <dtucker@dtucker.net>
1007 Date: Tue Jul 12 14:37:15 2022 +1000
1009 Capture stderr output from configure.
1011 commit d9eaea4bea6271bcee6a2b9428f1271faf2d033b
1012 Author: Darren Tucker <dtucker@dtucker.net>
1013 Date: Tue Jul 12 12:54:49 2022 +1000
1015 Refuse to use OpenSSL 3.0.4 due to potential RCE.
1017 OpenSSL has a potential RCE in its RSA implementation (CVE-2022-2274)
1018 so refuse to use that specific version.
1020 commit fb2f3a61bf3d28fff285524535f7ffcd177c9235
1021 Author: Darren Tucker <dtucker@dtucker.net>
1022 Date: Tue Jul 12 12:54:24 2022 +1000
1024 Move unset to before we set anything.
1026 commit c483a5c0fb8e8b8915fad85c5f6113386a4341ca
1027 Author: Darren Tucker <dtucker@dtucker.net>
1028 Date: Wed Jul 6 11:52:54 2022 +1000
1030 Test against openssl-3.0.5.
1032 commit 669a56bcfe73f8b985f2bba476ba834d55253acf
1033 Author: Darren Tucker <dtucker@dtucker.net>
1034 Date: Tue Jul 5 18:35:53 2022 +1000
1036 Update sanitizer test targets:
1038 - remove clang-sanitize-memory for now. It takes so long that the test
1040 - add gcc sanitize-address and sanitize-undefined test targets.
1042 commit 48cc68b69118b3ce8d07fd4f82e00d58667d5379
1043 Author: Darren Tucker <dtucker@dtucker.net>
1044 Date: Tue Jul 5 16:23:28 2022 +1000
1046 Add GCC address sanitizer build/test.
1048 commit 55c60bdd39b82457e92efa77da8d16cfa6a49391
1049 Author: Darren Tucker <dtucker@dtucker.net>
1050 Date: Tue Jul 5 12:02:33 2022 +1000
1052 Move sanitizer logs into regress for collection.
1054 commit 35ef2b3b6ef198f8574904a45780487ec2f17858
1055 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1056 Date: Mon Jul 4 09:10:31 2022 +0000
1058 upstream: Add TEST_REGRESS_CACHE_DIR.
1060 If set, it is used to cache regress test names that have succeeded and
1061 skip those on a re-run.
1063 OpenBSD-Regress-ID: a7570dd29a58df59f2cca647c3c2ec989b49f247
1065 commit 7394ed80c4de8b228a43c8956cf2fa1b9c6b2622
1066 Author: Darren Tucker <dtucker@dtucker.net>
1067 Date: Sun Jul 3 21:46:44 2022 +1000
1069 Add clang sanitizer tests.
1071 commit bfce0e66b6017a9bfab450b9dc7d4b16f90de817
1072 Author: Darren Tucker <dtucker@dtucker.net>
1073 Date: Sun Jul 3 18:14:09 2022 +1000
1075 Skip all rlimit tests when sandboxing disabled.
1077 The rlimit tests can hang when being run with some compiler sanitizers
1078 so skip all of them if sandbox=no.
1080 commit 6208d611520f9ea94d5369f9da404b709930029d
1081 Author: Darren Tucker <dtucker@dtucker.net>
1082 Date: Sun Jul 3 17:54:49 2022 +1000
1084 Move checks for pollfd.fd and nfds_t.
1086 Move the checks for struct pollfd.fd and nfds_t to before the sandboxing
1087 checks. This groups all the sandbox checks together so we can skip them
1088 all when sandboxing is disabled.
1090 commit 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b
1091 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1092 Date: Fri Jul 1 05:08:23 2022 +0000
1094 upstream: Remove leftover line.
1096 Remove extra line leftover from merge conflict. ok djm@
1098 OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e
1100 commit 7ec81daad0e03a64e8d91c5590960c48c1a899a3
1101 Author: djm@openbsd.org <djm@openbsd.org>
1102 Date: Fri Jul 1 04:45:50 2022 +0000
1104 upstream: use consistent field names (s/char/byte)
1106 in format description
1108 OpenBSD-Commit-ID: 3de33572733ee7fcfd7db33d37db23d2280254f0
1110 commit 32e82a392d9f263485effdd606ff5862d289a4a0
1111 Author: Darren Tucker <dtucker@dtucker.net>
1112 Date: Fri Jul 1 13:55:19 2022 +1000
1114 Skip select+rlimit check if sandboxing is disabled
1116 It's not needed in that case, and the test can fail when being built
1117 with some compiler memory sanitizer flags. bz#3441
1119 commit 4be7184ebe2a2ccef175983517a35ee06766e1b4
1120 Author: djm@openbsd.org <djm@openbsd.org>
1121 Date: Fri Jul 1 03:52:57 2022 +0000
1123 upstream: bump up loglevel from debug to info when unable to open
1125 authorized keys/principals file for errno != ENOENT; bz2042 ok dtucker
1127 OpenBSD-Commit-ID: e79aa550d91ade6a80f081bda689da24c086d66b
1129 commit 6c31ba10e97b6953c4f325f526f3e846dfea647a
1130 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1131 Date: Fri Jul 1 03:39:44 2022 +0000
1133 upstream: Don't leak the strings allocated by order_hostkeyalgs()
1135 and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
1136 github PR#324 from ZoltanFridrich, ok djm@
1138 This is a roll-forward of the previous rollback now that the required
1139 changes in compat.c have been done.
1141 OpenBSD-Commit-ID: c7cd93730b3b9f53cdad3ae32462922834ef73eb
1143 commit 486c4dc3b83b4b67d663fb0fa62bc24138ec3946
1144 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1145 Date: Fri Jul 1 03:35:45 2022 +0000
1147 upstream: Always return allocated strings from the kex filtering so
1149 that we can free them later. Fix one leak in compat_kex_proposal. Based on
1150 github PR#324 from ZoltanFridrich with some simplications by me. ok djm@
1152 OpenBSD-Commit-ID: 9171616da3307612d0ede086fd511142f91246e4
1154 commit 96faa0de6c673a2ce84736eba37fc9fb723d9e5c
1155 Author: djm@openbsd.org <djm@openbsd.org>
1156 Date: Fri Jul 1 00:36:30 2022 +0000
1158 upstream: ignore SIGPIPE earlier in main(), specifically before
1160 muxclient() which performs operations that could cause one; Reported by Noam
1161 Lewis via bz3454, ok dtucker@
1163 OpenBSD-Commit-ID: 63d8e13276869eebac6d7a05d5a96307f9026e47
1165 commit 33efac790f6b09d54894ba6c3e17dfb08b6fc7e1
1166 Author: jmc@openbsd.org <jmc@openbsd.org>
1167 Date: Tue Jun 28 06:09:14 2022 +0000
1169 upstream: reflect the update to -D arg name in usage();
1171 OpenBSD-Commit-ID: abdcde4f92b1ef094ae44210ee99d3b0155aad9c
1173 commit c71a1442d02f0a3586109dfe2cb366de36dee08e
1174 Author: Darren Tucker <dtucker@dtucker.net>
1175 Date: Wed Jun 29 18:28:47 2022 +1000
1177 Update OpenSSL tests to the most recent releases.
1179 commit 2a822f29300b2de7335fbff65f0b187a0c582304
1180 Author: djm@openbsd.org <djm@openbsd.org>
1181 Date: Mon Jun 27 21:41:55 2022 +0000
1183 upstream: allow arguments to sftp -D option, e.g. sftp -D
1185 "/usr/libexec/sftp-server -el debug3"
1189 OpenBSD-Commit-ID: 5a002b9f3a7aef2731fc0ffa9c921cf15f38ecce
1191 commit 2369a2810187e08f2af5d58b343956062fb96ee8
1192 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1193 Date: Fri Jun 24 10:45:06 2022 +0000
1195 upstream: Roll back previous KEX changes as they aren't safe until
1197 compat_pkalg_proposal and friends always allocate their returned strings.
1200 OpenBSD-Commit-ID: 1c7a88a0d5033f42f88ab9bec58ef1cf72c81ad0
1202 commit 646686136c34c2dbf6a01296dfaa9ebee029386d
1203 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1204 Date: Fri Jun 24 04:37:00 2022 +0000
1206 upstream: Don't leak the strings allocated by order_hostkeyalgs()
1208 and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
1209 github PR#324 from ZoltanFridrich, ok djm@
1211 OpenBSD-Commit-ID: b2f6e5f60f2bba293b831654328a8a0035ef4a1b
1213 commit 193c6d8d905dde836b628fc07a7b9cf2d347e2a3
1214 Author: Darren Tucker <dtucker@dtucker.net>
1215 Date: Sat Jun 25 12:16:15 2022 +1000
1217 Zero out LIBFIDO2 when SK support not usable.
1219 Prevents us from trying to link them into ssh-sk-helper and failing to
1222 commit 40f5d849d25c60b4ae21261e78484d435f5cfd51
1223 Author: Darren Tucker <dtucker@dtucker.net>
1224 Date: Sat Jun 25 11:47:28 2022 +1000
1226 Disable SK support if FIDO libs not found.
1228 commit 5fd922ade1b25880fe8a8249f5c0385e413108f9
1229 Author: Damien Miller <djm@mindrot.org>
1230 Date: Fri Jun 24 14:43:54 2022 +1000
1232 fix broken case statement in previous
1234 commit f51423bdaf0008d46b6af082bcfd7a22a87375f0
1235 Author: Damien Miller <djm@mindrot.org>
1236 Date: Fri Jun 24 14:40:42 2022 +1000
1238 request 1.1x API compatibility for OpenSSL >=3.x
1240 idea/patch from Pedro Martelletto via GHPR#322; ok dtucker@
1242 commit 455cee8d6c2e4c48c5af9faead3599c49948411e
1243 Author: djm@openbsd.org <djm@openbsd.org>
1244 Date: Fri Jun 24 04:27:14 2022 +0000
1246 upstream: make it clear that RekeyLimit applies to both transmitted
1248 and received data. GHPR#328 from Jan Pazdziora
1250 OpenBSD-Commit-ID: d180a905fec9ff418a75c07bb96ea41c9308c3f9
1252 commit 17904f05802988d0bb9ed3c8d1d37411e8f459c3
1253 Author: tobhe@openbsd.org <tobhe@openbsd.org>
1254 Date: Tue Jun 21 14:52:13 2022 +0000
1256 upstream: Make sure not to fclose() the same fd twice in case of an
1262 OpenBSD-Commit-ID: e384c4e05d5521e7866b3d53ca59acd2a86eef99
1264 commit f29d6cf98c25bf044079032d22c1a57c63ab9d8e
1265 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1266 Date: Sat Jun 18 02:17:16 2022 +0000
1268 upstream: Don't attempt to fprintf a null identity comment. From
1270 Martin Vahlensieck via tech@.
1272 OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2
1274 commit ad1762173bb38716a106e8979806149fd0f2753e
1275 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1276 Date: Fri Jun 17 01:00:03 2022 +0000
1278 upstream: Log an error if pipe() fails while accepting a
1280 connection. bz#3447, from vincent-openssh at vinc17 net, ok djm@
1282 OpenBSD-Commit-ID: 9d59f19872b94900a5c79da2d57850241ac5df94
1284 commit 9c59e7486cc8691401228b43b96a3edbb06e0412
1285 Author: Damien Miller <djm@mindrot.org>
1286 Date: Fri Jun 24 14:20:43 2022 +1000
1288 automatically enable built-in FIDO support
1290 If libfido2 is found and usable, then enable the built-in
1291 security key support unless --without-security-key-builtin
1296 commit 7d25b37fb2a5ff4dadabcbdac6087a97479434f5
1297 Author: Damien Miller <djm@mindrot.org>
1298 Date: Fri Jun 24 13:46:39 2022 +1000
1300 fix possible NULL deref when built without FIDO
1302 Analysis/fix from kircher in bz3443; ok dtucker@
1304 commit f5ba85daddfc2da6a8dab6038269e02c0695be44
1305 Author: djm@openbsd.org <djm@openbsd.org>
1306 Date: Wed Jun 15 16:08:25 2022 +0000
1308 upstream: make sure that UseDNS hostname lookup happens in the monitor
1310 and not in the pledge(2)'d unprivileged process; fixes regression caused by
1311 recent refactoring spotted by henning@
1313 OpenBSD-Commit-ID: a089870b95101cd8881a2dff65b2f1627d13e88d
1315 commit acb2059febaddd71ee06c2ebf63dcf211d9ab9f2
1316 Author: djm@openbsd.org <djm@openbsd.org>
1317 Date: Fri Jun 3 04:47:21 2022 +0000
1319 upstream: move auth_openprincipals() and auth_openkeyfile() over to
1321 auth2-pubkeyfile.c too; they make more sense there.
1323 OpenBSD-Commit-ID: 9970d99f900e1117fdaab13e9e910a621b7c60ee
1325 commit 3d9b0845f34510111cc693bb99a667662ca50cd8
1326 Author: djm@openbsd.org <djm@openbsd.org>
1327 Date: Fri Jun 3 04:31:54 2022 +0000
1329 upstream: test setenv in both client and server, test first-match-wins
1333 OpenBSD-Regress-ID: 4c8804f9db38a02db480b9923317457b377fe34b
1335 commit 22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40
1336 Author: djm@openbsd.org <djm@openbsd.org>
1337 Date: Fri Jun 3 04:30:46 2022 +0000
1339 upstream: Make SetEnv directives first-match-wins in both
1341 sshd_config and sshd_config; previously if the same name was reused then the
1342 last would win (which is the opposite to how the config is supposed to work).
1344 While there, make the ssh_config parsing more like sshd_config.
1348 OpenBSD-Commit-ID: 797909c1e0262c0d00e09280459d7ab00f18273b
1350 commit 38ed6c57e9e592c08e020fa6e82b45b4e1040970
1351 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1352 Date: Fri Jun 3 04:00:15 2022 +0000
1354 upstream: Add missing *-sk types to ssh-keyscan manpage. From
1356 skazi0 via github PR#294.
1358 OpenBSD-Commit-ID: fda2c869cdb871f3c90a89fb3f985370bb5d25c0
1360 commit ea97ec98c41ec2b755dfab459347db674ff9a5de
1361 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1362 Date: Fri Jun 3 03:21:09 2022 +0000
1364 upstream: Add period at end of "not known by any other names"
1366 message. github PR#320 from jschauma, ok djm@
1368 OpenBSD-Commit-ID: bd60809803c4bfd3ebb7c5c4d918b10e275266f2
1370 commit 88e376fcd67478ad1660d94bc73ab348ac9f4527
1371 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1372 Date: Fri Jun 3 03:17:42 2022 +0000
1374 upstream: ssh-keygen -A: do not generate DSA keys by default.
1376 Based on github PR#303 from jsegitz with man page text from jmc@, ok markus@
1379 OpenBSD-Commit-ID: 5c4c57bdd7063ff03381cfb6696659dd3f9f5b9f
1381 commit 6b3fb624675082a1e5aa615d1b8479873d8b5731
1382 Author: naddy@openbsd.org <naddy@openbsd.org>
1383 Date: Tue May 31 14:05:12 2022 +0000
1385 upstream: ssh-keygen: implement "verify-required" certificate option.
1387 This was already documented when support for user-verified FIDO
1388 keys was added, but the ssh-keygen(1) code was missing.
1392 OpenBSD-Commit-ID: f660f973391b593fea4b7b25913c9a15c3eb8a06
1394 commit b7f86ffc301be105bba9a3e0618b6fab3ae379bd
1395 Author: jmc@openbsd.org <jmc@openbsd.org>
1396 Date: Sat May 28 05:57:56 2022 +0000
1398 upstream: keywords ref ssh_config.5;
1400 from caspar schutijser
1402 OpenBSD-Commit-ID: f146a19d7d5c9374c3b9c520da43b2732d7d1a4e
1404 commit dc7bc52372f2744fa39191577be5306ee57aacd4
1405 Author: Damien Miller <djm@mindrot.org>
1406 Date: Mon May 30 09:29:09 2022 +1000
1408 fix some bugs in the fuzzer
1410 commit 1781f507c113667613351c19898efaf1e311a865
1411 Author: Darren Tucker <dtucker@dtucker.net>
1412 Date: Fri May 27 18:19:48 2022 +1000
1414 Test against OpenSSL 1.1.1o and 3.0.3.
1416 commit c53906e0c59e569691b4095d3e8db79cf78fa058
1417 Author: Darren Tucker <dtucker@dtucker.net>
1418 Date: Fri May 27 18:18:31 2022 +1000
1420 Test against LibreSSL 3.5.3.
1422 commit 9b3ad432ad2f19319bcc089370e356c6315d682f
1423 Author: Damien Miller <djm@mindrot.org>
1424 Date: Fri May 27 17:00:43 2022 +1000
1426 fuzzer for authorized_keys parsing
1428 mostly redundant to authopt_fuzz, but it's sensitive code so IMO it
1429 makes sense to test this layer too
1431 commit c83d8c4d6f3ccceef84d46de107f6b71cda06359
1432 Author: djm@openbsd.org <djm@openbsd.org>
1433 Date: Fri May 27 05:02:46 2022 +0000
1435 upstream: split the low-level file handling functions out from
1439 Put them in a new auth2-pubkeyfile.c to make it easier to refer to them
1440 (e.g. in unit/fuzz tests) without having to refer to everything else
1441 pubkey auth brings in.
1445 OpenBSD-Commit-ID: 3fdca2c61ad97dc1b8d4a7346816f83dc4ce2217
1447 commit 3b0b142d2a0767d8cd838e2f3aefde8a0aaa41e1
1448 Author: djm@openbsd.org <djm@openbsd.org>
1449 Date: Fri May 27 05:01:25 2022 +0000
1451 upstream: refactor authorized_keys/principals handling
1453 remove "struct ssh *" from arguments - this was only used to pass the
1454 remote host/address. These can be passed in instead and the resulting
1455 code is less tightly coupled to ssh_api.[ch]
1459 OpenBSD-Commit-ID: 9d4373d013edc4cc4b5c21a599e1837ac31dda0d
1461 commit 2c334fd36f80cb91cc42e4b978b10aa35e0df236
1462 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1463 Date: Fri May 27 04:29:40 2022 +0000
1465 upstream: f sshpkt functions fail, then password is not cleared
1467 with freezero. Unconditionally call freezero to guarantee that password is
1470 From tobias@ and c3h2_ctf via github PR#286, ok djm@
1472 OpenBSD-Commit-ID: 6b093619c9515328e25b0f8093779c52402c89cd
1474 commit 5d3a77f4c5ae774c6796387266503f52c7cdc7c2
1475 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1476 Date: Fri May 27 04:27:49 2022 +0000
1478 upstream: Avoid kill with -1 argument. The out_ctx label can be
1480 reached before fork has been called. If this happens, then kill -1 would be
1481 called, sending SIGTERM to all processes reachable by the current process.
1483 From tobias@ and c3h2_ctf via github PR#286, ok djm@
1485 OpenBSD-Commit-ID: 6277af1207d81202f5daffdccfeeaed4c763b1a8
1487 commit 533b31cd08e4b97f455466f91c36915e2924c15a
1488 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1489 Date: Fri May 27 04:13:24 2022 +0000
1491 upstream: Note that ProxyJump also accepts the same tokens as
1493 ProxyCommand. From pallxk via github PR#305.
1495 OpenBSD-Commit-ID: 7115ac351b129205f1f1ffa6bbfd62abd76be7c5
1497 commit 9d8c80f8a304babe61ca28f2e3fb5eb6dc9c39bf
1498 Author: djm@openbsd.org <djm@openbsd.org>
1499 Date: Wed May 25 06:03:44 2022 +0000
1501 upstream: revert previous; it was broken (spotted by Theo)
1503 OpenBSD-Commit-ID: 457c79afaca2f89ec2606405c1059b98b30d8b0d
1505 commit 9e0d02ef7ce88b67643bfb1c2272c9f5f04cc680
1506 Author: djm@openbsd.org <djm@openbsd.org>
1507 Date: Wed May 25 00:31:13 2022 +0000
1509 upstream: make SSHBUF_DBG/SSHBUF_TELL (off by default and only enabled
1511 via #define) dump to stderr rather than stdout
1513 OpenBSD-Commit-ID: 10298513ee32db8390aecb0397d782d68cb14318
1515 commit 2487163630f28be28b7e2396b4bd6511b98f1d3e
1516 Author: Tim Rice <tim@multitalents.net>
1517 Date: Tue May 24 10:21:25 2022 -0700
1519 configure.ac: Add missing AC_DEFINE for caph_cache_tzdata test causing
1520 HAVE_CAPH_CACHE_TZDATA to be missing from config.h.in.
1521 Spotted by Bryan Drewery
1523 commit bedb93415b60db3dfd704a3d525e82adb14a2481
1524 Author: djm@openbsd.org <djm@openbsd.org>
1525 Date: Sun May 15 23:48:07 2022 +0000
1527 upstream: regress test for in-place transfers and clobbering larger
1529 files with smaller ones; would have caught last regression in scp(1)
1531 OpenBSD-Regress-ID: 19de4e88dd3a4f7e5c1618c9be3c32415bd93bc2
1533 commit b4f0d719c2548cb74da509fb65f384dada4ebd37
1534 Author: anton@openbsd.org <anton@openbsd.org>
1535 Date: Fri Apr 22 05:08:43 2022 +0000
1537 upstream: Only run agent-ptrace.sh if gdb is available as all
1539 architectures do not ship with gdb.
1541 OpenBSD-Regress-ID: ec53e928803e6b87f9ac142d38888ca79a45348d
1543 commit 9b73345f80255a7f3048026462f2c0c6a241eeac
1544 Author: djm@openbsd.org <djm@openbsd.org>
1545 Date: Sun May 15 23:47:21 2022 +0000
1547 upstream: fix in-place copies; r1.163 incorrectly skipped truncation in
1549 all cases, not just at the start of a transfer. This could cause overwrites
1550 of larger files to leave junk at the end. Spotted by tb@
1552 OpenBSD-Commit-ID: b189f19cd68119548c8e24e39c79f61e115bf92c
1554 commit 56a0697fe079ff3e1ba30a2d5c26b5e45f7b71f8
1555 Author: djm@openbsd.org <djm@openbsd.org>
1556 Date: Fri May 13 06:31:50 2022 +0000
1558 upstream: arrange for scp, when in sftp mode, to not ftruncate(3) files
1562 previous behavious of unconditionally truncating the destination file
1563 would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to
1564 delete all the contents of their destination.
1566 spotted by solene@ sthen@, also bz3431; ok dtucker@
1568 OpenBSD-Commit-ID: ca39fdd39e0ec1466b9666f15cbcfddea6aaa179
1570 commit fbcef70c2832712f027bccea1aa9bc4b4103da93
1571 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1572 Date: Mon May 9 08:25:27 2022 +0000
1574 upstream: Remove errant apostrophe. From haruyama at queen-ml org.
1576 OpenBSD-Commit-ID: dc6b294567cb84b384ad6ced9ca469f2bbf0bd10
1578 commit 0086a286ea6bbd11ca9b664ac3bb12b27443d6eb
1579 Author: djm@openbsd.org <djm@openbsd.org>
1580 Date: Mon May 9 03:09:53 2022 +0000
1582 upstream: Allow existing -U (use agent) flag to work with "-Y sign"
1584 operations, where it will be interpreted to require that the private keys is
1585 hosted in an agent; bz3429, suggested by Adam Szkoda; ok dtucker@
1587 OpenBSD-Commit-ID: a7bc69873b99c32c42c7628ed9ea91565ba08c2f
1589 commit cb010744cc98f651b1029bb09efa986eb54e4ccf
1590 Author: djm@openbsd.org <djm@openbsd.org>
1591 Date: Sun May 8 22:58:35 2022 +0000
1593 upstream: improve error message when 'ssh-keygen -Y sign' is unable to
1595 load a private key; bz3429, reported by Adam Szkoda ok dtucker@
1597 OpenBSD-Commit-ID: bb57b285e67bea536ef81b1055467be2fc380e74
1599 commit aa61fc82c63d309a90c22ca74fb1da6c6f4372fd
1600 Author: Tobias Heider <me@tobhe.de>
1601 Date: Mon May 9 02:00:01 2022 +0200
1603 Remove duplicate bcrypt_pbkdf.o from Makefile
1605 bcrypt_pbkdf.o is duplicated in the openbsd-compat Makefile's object
1608 commit deb506d00da8d11fb04c1e7b9b1e1cc379c1705c
1609 Author: djm@openbsd.org <djm@openbsd.org>
1610 Date: Sun May 8 22:32:36 2022 +0000
1612 upstream: When performing operations that glob(3) a remote path, ensure
1614 that the implicit working directory used to construct that path escapes
1617 This prevents glob characters from being processed in places they
1618 shouldn't, e.g. "cd /tmp/a*/", "get *.txt" should have the get operation
1619 treat the path "/tmp/a*" literally and not attempt to expand it.
1621 Reported by Lusia Kundel; ok markus@
1623 OpenBSD-Commit-ID: 4f647f58482cbad3d58b1eab7f6a1691433deeef
1625 commit f38cf74f20b5da113cfa823afd5bfb5c6ba65f3d
1626 Author: Darren Tucker <dtucker@dtucker.net>
1627 Date: Fri May 6 14:50:18 2022 +1000
1629 Also retest OpenBSD upstream on .yml changes.
1631 commit f87a132800ba3710ab130d703448a31ef1128d77
1632 Author: Darren Tucker <dtucker@dtucker.net>
1633 Date: Fri May 6 14:46:09 2022 +1000
1635 Note that, for now, we need variadic macros.
1637 commit 217b518e0f7c52c4b909e935141a55344c61e644
1638 Author: Darren Tucker <dtucker@dtucker.net>
1639 Date: Fri May 6 14:39:34 2022 +1000
1641 Add ubsan minimal testcase on OpenBSD.
1643 As suggested by djm@.
1645 commit 457dce2cfef6a48f5442591cd8b21c7e8cba13f8
1646 Author: djm@openbsd.org <djm@openbsd.org>
1647 Date: Thu May 5 01:04:14 2022 +0000
1649 upstream: sshkey_unshield_private() contains a exact duplicate of
1651 the code in private2_check_padding(). Pull private2_check_padding() up so the
1652 code can be reused. From Martin Vahlensieck, ok deraadt@
1654 OpenBSD-Commit-ID: 876884c3f0e62e8fd8d1594bab06900f971c9c85
1656 commit 0e44db4d9cb313e68a59a44d27884af66c02356e
1657 Author: djm@openbsd.org <djm@openbsd.org>
1658 Date: Thu May 5 00:56:58 2022 +0000
1660 upstream: channel_new no longer frees remote_name. So update the
1662 comment accordingly. As remote_name is not modified, it can be const as
1663 well. From Martin Vahlensieck
1665 OpenBSD-Commit-ID: e4e10dc8dc9f40c166ea5a8e991942bedc75a76a
1667 commit 37b62fd5caf19c85a48241535277cefff65adace
1668 Author: djm@openbsd.org <djm@openbsd.org>
1669 Date: Thu May 5 00:55:11 2022 +0000
1671 upstream: mux.c: mark argument as const; from Martin Vahlensieck
1673 OpenBSD-Commit-ID: 69a1a93a55986c7c2ad9f733c093b46a47184341
1675 commit f4e67c0ad259b4cf10177277a5827fa5545bac53
1676 Author: markus@openbsd.org <markus@openbsd.org>
1677 Date: Wed May 4 07:31:22 2022 +0000
1679 upstream: make sure stdout is non-blocking; ok djm@
1681 OpenBSD-Commit-ID: 64940fffbd1b882eda2d7c8c7a43c79368309c0d
1683 commit e5c036d2092c00bef395e9161dc5ce42d4be9565
1684 Author: florian@openbsd.org <florian@openbsd.org>
1685 Date: Tue May 3 07:42:27 2022 +0000
1687 upstream: Add FIDO AUTHENTICATOR section and explain a bit how FIDO
1689 works. The wording came mostly from the 8.2 OpenSSH release notes, addapted
1690 to fit the man page. Then move the -O bits into the new section as is already
1691 done for CERTIFICATES and MODULI GENERATION. Finally we can explain the
1692 trade-offs of resident keys. While here, consistently refer to the FIDO
1693 thingies as "FIDO authenticators", not "FIDO tokens".
1695 input & OK jmc, naddy
1697 OpenBSD-Commit-ID: dd98748d7644df048f78dcf793b3b63db9ab1d25
1699 commit 575771bf79bef7127be6aaccddc46031ea15529e
1700 Author: jmc@openbsd.org <jmc@openbsd.org>
1701 Date: Mon May 2 05:40:37 2022 +0000
1703 upstream: remove an obsolete rsa1 format example from an example;
1708 OpenBSD-Commit-ID: db2c89879c29bf083df996bd830abfb1e70d62bf
1710 commit 0bc6b4c8f04e292577bdb44d5dc6b630d3448087
1711 Author: djm@openbsd.org <djm@openbsd.org>
1712 Date: Sun May 1 23:20:30 2022 +0000
1714 upstream: fix some integer overflows in sieve_large() that show up when
1716 trying to generate modp groups > 16k bits. Reported via GHPR#306 by Bertram
1717 Felgenhauer, but fixed in a different way. feedback/ok tb@
1719 OpenBSD-Commit-ID: 81cbc6dd3a21c57bd6fadea10e44afe37bca558e
1721 commit a45615cb172bc827e21ec76750de39dfb30ecc05
1722 Author: djm@openbsd.org <djm@openbsd.org>
1723 Date: Fri Apr 29 04:55:07 2022 +0000
1725 upstream: be stricter in which characters will be accepted in
1727 specifying a mask length; allow only 0-9. From khaleesicodes via GHPR#278; ok
1730 OpenBSD-Commit-ID: e267746c047ea86665cdeccef795a8a56082eeb2
1732 commit 4835544d2dd31de6ffc7dba59f92093aea98155b
1733 Author: Darren Tucker <dtucker@dtucker.net>
1734 Date: Sat Apr 30 10:56:41 2022 +1000
1736 Add Mac OS X 12 test target.
1738 commit 97a6a8b8c1f2da09712d0e72d0ef800e4edd34cd
1739 Author: Darren Tucker <dtucker@dtucker.net>
1740 Date: Fri Apr 29 18:27:34 2022 +1000
1742 Only run tests when source files change.
1744 Also run tests on changes to V_9_0 branch.
1746 commit 6d0392b9ff4b50a56ac5685d1b9392e2cd432ca3
1747 Author: Darren Tucker <dtucker@dtucker.net>
1748 Date: Fri Apr 29 18:22:34 2022 +1000
1750 Remove now-empty int32_minmax.inc.
1752 commit af59463553b5ad52d3b42c4455ee3c5600158bb7
1753 Author: djm@openbsd.org <djm@openbsd.org>
1754 Date: Fri Apr 29 03:24:30 2022 +0000
1756 upstream: mention that the helpers are used by ssh(1), ssh-agent(1)
1758 and ssh-keygen(1). Previously only ssh(1) was mentioned. From Pedro
1761 OpenBSD-Commit-ID: 30f880f989d4b329589c1c404315685960a5f153
1763 commit 3e26b3a6eebcee27be177207cc0846fb844b7a56
1764 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1765 Date: Fri Apr 29 03:16:48 2022 +0000
1767 upstream: Don't leak SK device. Patch from Pedro Martelletto via
1769 github PR#316. ok djm@
1771 OpenBSD-Commit-ID: 17d11327545022e727d95fd08b213171c5a4585d
1773 commit 247082b5013f0d4fcae8f97453f2a2f01bcda811
1774 Author: djm@openbsd.org <djm@openbsd.org>
1775 Date: Fri Apr 29 03:13:32 2022 +0000
1777 upstream: fix memleak on session-bind path; from Pedro Martelletto, ok
1781 OpenBSD-Commit-ID: e85899a26ba402b4c0717b531317e8fc258f0a7e
1783 commit e05522008092ceb86a87bdd4ad7878424315db89
1784 Author: djm@openbsd.org <djm@openbsd.org>
1785 Date: Thu Apr 28 02:53:31 2022 +0000
1787 upstream: avoid printing hash algorithm twice; from lucas AT sexy.is
1789 OpenBSD-Commit-ID: 9d24671e10a84141b7c504396cabad600e47a941
1791 commit 0979e29356915261d69a9517a1e0aaade7c9fc75
1792 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1793 Date: Wed Apr 27 11:08:55 2022 +0000
1795 upstream: Add authfd path to debug output. ok markus@
1797 OpenBSD-Commit-ID: f735a17d1a6f2bee63bfc609d76ef8db8c090890
1799 commit 67b7c784769c74fd4d6b147d91e17e1ac1a8a96d
1800 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1801 Date: Tue Apr 26 07:41:44 2022 +0000
1803 upstream: Check sshauthopt_new() for NULL. bz#3425, from
1805 tessgauthier at microsoft.com. ok djm@
1807 OpenBSD-Commit-ID: af0315bc3e44aa406daa7e0ae7c2d719a974483f
1809 commit d571314d14b919fbd7c84a61f9bf2065fc0a6841
1810 Author: millert@openbsd.org <millert@openbsd.org>
1811 Date: Wed Apr 20 16:00:25 2022 +0000
1813 upstream: Remove unnecessary includes: openssl/hmac.h and
1815 openssl/evp.h. From Martin Vahlensieck.
1817 OpenBSD-Commit-ID: a6debb5fb0c8a44e43e8d5ca7cc70ad2f3ea31c3
1819 commit da8dddf8cc1f2516ff894b8183e83a7c5ba3ef80
1820 Author: millert@openbsd.org <millert@openbsd.org>
1821 Date: Wed Apr 20 15:59:18 2022 +0000
1823 upstream: Add missing includes of stdlib.h and stdint.h. We need
1825 stdlib.h for malloc(3) and stdint.h for SIZE_MAX. Unlike the other xmss
1826 files, ssh-xmss.c does not include xmss_commons.h so ssh-xmss.c must include
1827 those headers itself. From Martin Vahlensieck
1829 OpenBSD-Commit-ID: 70e28a9818cee3da1be2ef6503d4b396dd421e6b
1831 commit fe9d87a6800a7a33be08f4d5ab662a758055ced2
1832 Author: millert@openbsd.org <millert@openbsd.org>
1833 Date: Wed Apr 20 15:56:49 2022 +0000
1835 upstream: Avoid an unnecessary xstrdup in rm_env() when matching
1837 patterns. Since match_pattern() doesn't modify its arguments (they are
1838 const), there is no need to make an extra copy of the strings in
1839 options->send_env. From Martin Vahlensieck
1841 OpenBSD-Commit-ID: 2c9db31e3f4d3403b49642c64ee048b2a0a39351
1843 commit 7bf2eb958fbb551e7d61e75c176bb3200383285d
1844 Author: Darren Tucker <dtucker@dtucker.net>
1845 Date: Tue Apr 26 23:30:59 2022 +1000
1847 Add debian-riscv64 test target.
1849 commit 3913c935523902482974c4c503bcff20bd850a6a
1850 Author: Darren Tucker <dtucker@dtucker.net>
1851 Date: Mon Apr 25 17:20:06 2022 +1000
1853 Update OpenSSL and LibreSSL versions in tests.
1855 commit dcd8dca29bcdb193ff6be35b96fc55e6e30d37d9
1856 Author: Darren Tucker <dtucker@dtucker.net>
1857 Date: Sat Apr 23 20:40:28 2022 +1000
1859 Include stdlib.h for free() prototype.
1861 ... which is used inside the CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG block.
1863 commit 4cc05de568e1c3edd7834ff3bd9d8214eb34861b
1864 Author: Darren Tucker <dtucker@dtucker.net>
1865 Date: Sat Apr 23 20:17:26 2022 +1000
1867 Cache timezone data in capsicum sandbox.
1869 From emaste at freebsd.org, originally part of FreeBSD commit r339216
1870 / fc3c19a9 with autoconf bits added by me.
1872 commit c31404426d212e2964ff9e5e58e1d0fce3d83f27
1873 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1874 Date: Thu Apr 21 01:36:46 2022 +0000
1876 upstream: It looks like we can't completely avoid
1878 waiting for processes to exit so retrieve the pid via controlmaster and
1881 OpenBSD-Regress-ID: 8246f00f22b14e49d2ff1744c94897ead33d457b
1883 commit d19b21afab5c8e2f3df6bd8aee9766bdad3d8c58
1884 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1885 Date: Wed Apr 20 13:25:55 2022 +0000
1887 upstream: Use ssh -f and ControlPersist ..
1889 to start up test forwards and ssh -O stop to shut them down intead of
1890 sleep loops. This speeds up the test by an order of magnitude.
1892 OpenBSD-Regress-ID: eb3db5f805100919b092a3b2579c611fba3e83e7
1894 commit 5f76286a126721fa005de6edf3d1c7a265555f19
1895 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1896 Date: Wed Apr 20 05:24:13 2022 +0000
1898 upstream: Simplify forward-control test.
1900 Since we no longer need to support SSH1 we don't need to run shell
1901 commands on the other end of the connection and can use ssh -N instead.
1902 This also makes the test less racy.
1904 OpenBSD-Regress-ID: 32e94ce272820cc398f30b848b2b0f080d10302c
1906 commit 687bbf23572d8bdf25cbbcdf8ac583514e1ba710
1907 Author: djm@openbsd.org <djm@openbsd.org>
1908 Date: Thu Mar 31 03:07:33 2022 +0000
1910 upstream: regression test for sftp cp command
1912 OpenBSD-Regress-ID: c96bea9edde3a384b254785e7f9b2b24a81cdf82
1914 commit f1233f19a6a9fe58f52946f50df4772f5b136761
1915 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1916 Date: Wed Apr 20 01:13:47 2022 +0000
1918 upstream: Import regenerated moduli
1920 OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
1922 commit fec014785de198b9a325d1b94e324bb958c5fe7b
1923 Author: djm@openbsd.org <djm@openbsd.org>
1924 Date: Wed Apr 20 04:19:11 2022 +0000
1926 upstream: Try to continue running local I/O for channels in state
1928 OPEN during SSH transport rekeying. The most visible benefit is that it
1929 should make ~-escapes work in the client (e.g. to exit) if the connection
1930 happened to have stalled during a rekey event. Based work by and ok dtucker@
1932 OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45
1934 commit e68154b0d4f0f5085a050ea896955da1b1be6e30
1935 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1936 Date: Wed Apr 20 01:13:47 2022 +0000
1938 upstream: Import regenerated moduli
1940 OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
1942 commit 69928b106d8f0fa15b88cf3850d992ed81c44ae0
1943 Author: tj@openbsd.org <tj@openbsd.org>
1944 Date: Sat Apr 16 00:22:31 2022 +0000
1946 upstream: list the correct version number
1948 for when usage of the sftp protocol became default and fix a typo
1951 OpenBSD-Commit-ID: 24e1795ed2283fdeacf16413c2f07503bcdebb31
1953 commit 21042a05c0b304c16f655efeec97438249d2e2cc
1954 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1955 Date: Tue Apr 12 05:09:49 2022 +0000
1957 upstream: Correct path for system known hosts file in description
1959 of IgnoreUserKnownHosts. Patch from Martin Vahlensieck via tech@
1961 OpenBSD-Commit-ID: 9b7784f054fa5aa4d63cb36bd563889477127215
1963 commit 53f4aff60a7c1a08a23917bd47496f8901c471f5
1964 Author: Darren Tucker <dtucker@dtucker.net>
1965 Date: Sat Apr 16 14:33:20 2022 +1000
1967 Resync moduli.5 with upstream.
1969 1.18: remove duplicate publication year; carsten dot kunze at arcor dot de
1970 1.19: ssh-keygen's -G/-T have been replaced with -M generate/screen.
1972 commit d2b888762b9844eb0d8eb59909cdf5af5159f810
1973 Author: Darren Tucker <dtucker@dtucker.net>
1974 Date: Sat Apr 16 14:31:13 2022 +1000
1976 Retire fbsd6 test VM.
1978 It's long since out of support, relatively slow (it's i686) and the
1979 compiler has trouble with PIE.
1981 commit cd1f70009860a154b51230d367c55ea5f9a4504e
1982 Author: djm@openbsd.org <djm@openbsd.org>
1983 Date: Mon Apr 11 22:52:08 2022 +0000
1985 upstream: clear io_want/io_ready flags at start of poll() cycle;
1987 avoids plausible spin during rekeying if channel io_want flags are reused
1988 across cycles. ok markus@ deraadt@
1990 OpenBSD-Commit-ID: 91034f855b7c73cd2591657c49ac30f10322b967
1992 commit aa1920302778273f7f94c2091319aba199068ca0
1993 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1994 Date: Fri Apr 8 05:43:39 2022 +0000
1996 upstream: Note that curve25519-sha256 was later published in
2000 OpenBSD-Commit-ID: 2ac2b5d642d4cf5918eaec8653cad9a4460b2743
2002 commit 4673fa8f2be983f2f88d5afd754adb1a2a39ec9e
2003 Author: djm@openbsd.org <djm@openbsd.org>
2004 Date: Fri Apr 8 04:40:40 2022 +0000
2006 upstream: two defensive changes from Tobias Stoeckmann via GHPR287
2008 enforce stricter invarient for sshbuf_set_parent() - never allow
2009 a buffer to have a previously-set parent changed.
2011 In sshbuf_reset(), if the reallocation fails, then zero the entire
2012 buffer and not the (potentially smaller) default initial alloc size.
2014 OpenBSD-Commit-ID: 14583203aa5d50ad38d2e209ae10abaf8955e6a9
2016 commit 26eef015e2d2254375e13afaaf753b78932b1bf5
2017 Author: Damien Miller <djm@mindrot.org>
2018 Date: Mon Apr 11 16:07:09 2022 +1000
2020 Revert "update build-aux files to match autoconf-2.71"
2022 This reverts commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2.
2024 It turns out that the checked-in copies of these files are actually newer
2025 than autoconf-2.71's copies, so this was effectively a downgrade.
2026 Spotted by Bo Anderson via github
2028 commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2
2029 Author: Damien Miller <djm@mindrot.org>
2030 Date: Fri Apr 8 14:48:58 2022 +1000
2032 update build-aux files to match autoconf-2.71
2034 i.e. config.guess, config.sub and install-sh
2036 commit 94eb6858efecc1b4f02d8a6bd35e149f55c814c8
2037 Author: Damien Miller <djm@mindrot.org>
2038 Date: Wed Apr 6 10:47:48 2022 +1000
2040 update version numbers for release
2042 commit 8e4a8eadf4fe74e65e6492f34250f8cf7d67e8da
2043 Author: djm@openbsd.org <djm@openbsd.org>
2044 Date: Mon Apr 4 22:45:25 2022 +0000
2046 upstream: openssh-9.0
2048 OpenBSD-Commit-ID: 0dfb461188f4513ec024c1534da8c1ce14c20b64
2050 commit a9f23ea2e3227f406880c2634d066f6f50fa5eaa
2051 Author: naddy@openbsd.org <naddy@openbsd.org>
2052 Date: Thu Mar 31 17:58:44 2022 +0000
2054 upstream: ssh: document sntrup761x25519-sha512@openssh.com as
2058 OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171
2060 commit 9ec2713d122af79d66ebb9c1d6d9ae8621a8945f
2061 Author: naddy@openbsd.org <naddy@openbsd.org>
2062 Date: Thu Mar 31 17:27:27 2022 +0000
2064 upstream: man pages: add missing commas between subordinate and
2068 jmc@ dislikes a comma before "then" in a conditional, so leave those
2073 OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3
2075 commit 3741df98ffaaff92b474ee70d8ef276b5882f85a
2076 Author: Darren Tucker <dtucker@dtucker.net>
2077 Date: Mon Apr 4 23:52:11 2022 +1000
2079 Disable security key on fbsd6 test host.
2081 commit 32c12236f27ae83bfe6d2983b67c9bc67a83a417
2082 Author: Darren Tucker <dtucker@dtucker.net>
2083 Date: Mon Apr 4 15:16:51 2022 +1000
2085 Specify TEST_SHELL=bash on AIX.
2087 The system shells cause the agent-restrict test to fail due to some
2088 quoting so explicitly specify bash until we can get configure to
2089 autmatically work around that.
2091 commit 90452c8b69d065b7c7c285ff78b81418a75bcd76
2092 Author: Darren Tucker <dtucker@dtucker.net>
2093 Date: Fri Apr 1 23:38:44 2022 +1100
2095 Only return events from ppoll that were requested.
2097 If the underlying system's select() returns bits that were not in the
2098 request set, our ppoll() implementation can return revents for events
2099 not requested, which can apparently cause a hang. Only return revents
2100 for activity in the requested event set. bz#3416, analysis and fix by
2101 yaroslav.kuzmin at vmssoftware com, ok djm@
2103 commit 6c49eb5fabc56f4865164ed818aa5112d09c31a8
2104 Author: Darren Tucker <dtucker@dtucker.net>
2105 Date: Fri Apr 1 23:21:40 2022 +1100
2107 Only run regression tests on slow VMs.
2109 commit f67e47903977b42cb6abcd5565a61bd7293e4dc3
2110 Author: Darren Tucker <dtucker@dtucker.net>
2111 Date: Fri Apr 1 23:21:06 2022 +1100
2113 Increase test timeout to allow slow VMs to finish
2115 commit 02488c1b54065ddc4f25835dbd2618b2a2fe21f5
2116 Author: Darren Tucker <dtucker@dtucker.net>
2117 Date: Fri Apr 1 16:27:38 2022 +1100
2119 Use bash or ksh if available for SH in Makefile.
2121 commit 34c7018c316af4773e432066de28d0ef9d0888cd
2122 Author: Darren Tucker <dtucker@dtucker.net>
2123 Date: Fri Apr 1 14:56:54 2022 +1100
2125 Set Makefile SHELL as determined by configure.
2127 This should improve compatibility for users with non-POSIX shells. If
2128 using Makefile.in directly (eg make -f Makefile.in distprep) then SHELL
2129 will need to be specified on the command line (along with MANFMT in that
2130 particular case). ok djm@
2132 commit 5b054d76402faab38c48377efd112426469553a0
2133 Author: Darren Tucker <dtucker@dtucker.net>
2134 Date: Fri Apr 1 13:16:47 2022 +1100
2136 Skip slow tests on (very) slow test targets.
2138 commit b275818065b31a865142c48c2acf6a7c1655c542
2139 Author: Damien Miller <djm@mindrot.org>
2140 Date: Thu Mar 31 14:11:36 2022 +1100
2144 commit 3fa539c3ffaabd6211995512d33e29150f88c5c5
2145 Author: djm@openbsd.org <djm@openbsd.org>
2146 Date: Thu Mar 31 03:07:03 2022 +0000
2148 upstream: add a sftp client "cp" command that supports server-side
2150 copying of files. Useful for this task and for testing the copy-data
2151 extension. Patch from Mike Frysinger; ok dtucker@
2153 OpenBSD-Commit-ID: 1bb1b950af0d49f0d5425b1f267e197aa1b57444
2155 commit 7988bfc4b701c4b3fe9b36c8561a3d1c5d4c9a74
2156 Author: djm@openbsd.org <djm@openbsd.org>
2157 Date: Thu Mar 31 03:05:49 2022 +0000
2159 upstream: add support for the "corp-data" protocol extension to
2161 allow server-side copies to be performed without having to go via the client.
2162 Patch by Mike Frysinger, ok dtucker@
2164 OpenBSD-Commit-ID: 00aa510940fedd66dab1843b58682de4eb7156d5
2166 commit 32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba
2167 Author: djm@openbsd.org <djm@openbsd.org>
2168 Date: Wed Mar 30 21:13:23 2022 +0000
2170 upstream: select post-quantum KEX
2172 sntrup761x25519-sha512@openssh.com as the default; ok markus@
2174 OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9
2176 commit d6556de1db0822c76ba2745cf5c097d9472adf7c
2177 Author: djm@openbsd.org <djm@openbsd.org>
2178 Date: Wed Mar 30 21:10:25 2022 +0000
2180 upstream: fix poll() spin when a channel's output fd closes without
2182 data in the channel buffer. Introduce more exact packing of channel fds into
2183 the pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@
2185 OpenBSD-Commit-ID: 06740737849c9047785622ad5d472cb6a3907d10
2187 commit 8a74a96d25ca4d32fbf298f6c0ac5a148501777d
2188 Author: djm@openbsd.org <djm@openbsd.org>
2189 Date: Wed Mar 30 04:33:09 2022 +0000
2191 upstream: ssh is almost out of getopt() characters; note the
2193 remaining remaining available ones in a comment
2195 OpenBSD-Commit-ID: 48d38cef59d6bc8e84c6c066f6d601875d3253fd
2197 commit 6d4fc51adb9d8a42f67b5474f02f877422379de6
2198 Author: djm@openbsd.org <djm@openbsd.org>
2199 Date: Wed Mar 30 04:27:51 2022 +0000
2201 upstream: avoid NULL deref via ssh-keygen -Y find-principals.
2203 bz3409, reported by Mateusz Adamowski
2205 OpenBSD-Commit-ID: a3b2c02438052ee858e0ee18e5a288586b5df2c5
2207 commit e937514920335b92b543fd9be79cd6481d1eb0b6
2208 Author: Darren Tucker <dtucker@dtucker.net>
2209 Date: Mon Mar 28 17:51:03 2022 +1100
2211 Add AIX 5.1 test target.
2213 commit 4bbe815ba974b4fd89cc3fc3e3ef1be847a0befe
2214 Author: Darren Tucker <dtucker@dtucker.net>
2215 Date: Sat Mar 26 22:01:31 2022 +1100
2217 Drop leading "v" from release version identifier.
2219 It's present in the git tags but not in the release tarball names.
2220 Also drop extra "/" from URL path.
2222 commit f5cdd3b3c275dffaebfca91df782dca29975e9ac
2223 Author: Darren Tucker <dtucker@dtucker.net>
2224 Date: Sat Mar 26 16:28:04 2022 +1100
2226 Use tarballs when testing LibreSSL releases.
2228 This means they'll still work when the combination of -portable and
2229 openbsd github repos no longer match.
2231 commit 24dc37d198f35a7cf71bf4d5384363c7ef4209d4
2232 Author: Darren Tucker <dtucker@dtucker.net>
2233 Date: Sat Mar 26 15:02:45 2022 +1100
2235 Remove now-unused passwd variable.
2237 commit 5b467ceef2c356f0a77f5e8ab4eb0fac367e4d24
2238 Author: Darren Tucker <dtucker@dtucker.net>
2239 Date: Sat Mar 26 13:15:44 2022 +1100
2243 commit 2923d026e55998133c0f6e5186dca2a3c0fa5ff5
2244 Author: Darren Tucker <dtucker@dtucker.net>
2245 Date: Sat Mar 26 12:49:50 2022 +1100
2247 Factor out platform-specific locked account check.
2249 Also fixes an incorrect free on platforms with both libiaf and shadow
2250 passwords (probably only Unixware). Prompted by github PR#284,
2251 originally from @c3h2_ctf and stoeckmann@.
2253 commit d23efe4b12886ffe416be10bc0a7da6ca8aa72d1
2254 Author: Darren Tucker <dtucker@dtucker.net>
2255 Date: Sat Mar 26 08:13:46 2022 +1100
2257 Add OpenWRT mips and mipsel test targets.
2259 commit 16ea8b85838dd7a4dbeba4e51ac4f43fd68b1e5b
2260 Author: djm@openbsd.org <djm@openbsd.org>
2261 Date: Sun Mar 20 08:52:17 2022 +0000
2263 upstream: don't leak argument list; bz3404, reported by Balu
2267 OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6
2269 commit a72bde294fe0518c9a44ba63864093a1ef2425e3
2270 Author: djm@openbsd.org <djm@openbsd.org>
2271 Date: Sun Mar 20 08:51:21 2022 +0000
2273 upstream: make addargs() and replacearg() a little more robust and
2275 improve error reporting
2277 make freeargs(NULL) a noop like the other free functions
2279 ok dtucker as part of bz3403
2281 OpenBSD-Commit-ID: 15f86da83176978b4d1d288caa24c766dfa2983d
2283 commit 731087d2619fa7f01e675b23f57af10d745e8af2
2284 Author: djm@openbsd.org <djm@openbsd.org>
2285 Date: Fri Mar 18 04:04:11 2022 +0000
2287 upstream: don't try to resolve ListenAddress directives in the sshd
2289 re-exec path - we're never going to use the result and if the operation fails
2290 then it can prevent connections from being accepted. Reported by Aaron
2291 Poffenberger; with / ok dtucker@
2293 OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60
2295 commit 1c83c082128694ddd11ac05fdf31d70312ff1763
2296 Author: djm@openbsd.org <djm@openbsd.org>
2297 Date: Fri Mar 18 02:50:21 2022 +0000
2299 upstream: remove blank line
2301 OpenBSD-Commit-ID: d5e0182965b2fbfb03ad5f256d1a1ce5706bcddf
2303 commit 807be68684da7a1fe969c399ddce2fafb7997dcb
2304 Author: djm@openbsd.org <djm@openbsd.org>
2305 Date: Fri Mar 18 02:32:22 2022 +0000
2307 upstream: helpful comment
2309 OpenBSD-Commit-ID: e3315a45cb04e7feeb614d76ec80a9fe4ca0e8c7
2311 commit a0b5816f8f1f645acdf74f7bc11b34455ec30bac
2312 Author: djm@openbsd.org <djm@openbsd.org>
2313 Date: Fri Mar 18 02:31:25 2022 +0000
2315 upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV
2317 will ensue. Patch from Mateusz Adamowski via GHPR#307
2319 OpenBSD-Commit-ID: 99e8ec38f9feb38bce6de240335be34aedeba5fd
2321 commit 5a252d54a63be30d5ba4be76210942d754a531c0
2322 Author: djm@openbsd.org <djm@openbsd.org>
2323 Date: Tue Mar 15 05:27:37 2022 +0000
2325 upstream: improve DEBUG_CHANNEL_POLL debugging message
2327 OpenBSD-Commit-ID: 2275eb7bc4707d019b1a0194b9c92c0b78da848f
2329 commit ce324cf58ba2840e31afeb996935800780c8fa4b
2330 Author: cheloha@openbsd.org <cheloha@openbsd.org>
2331 Date: Sun Mar 13 23:27:54 2022 +0000
2333 upstream: ssh: xstrdup(): use memcpy(3)
2335 Copying the given string into the buffer with strlcpy(3) confers no
2336 benefit in this context because we have already determined the
2337 string's length with strlen(3) in order to allocate that buffer.
2339 Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2
2341 ok dtucker@ millert@
2343 OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a
2345 commit 2893c5e764557f48f9d6a929e224ed49c59545db
2346 Author: Darren Tucker <dtucker@dtucker.net>
2347 Date: Fri Mar 11 18:43:58 2022 +1100
2349 Resync fmt_scaled. with OpenBSD.
2351 Fixes underflow reported in bz#3401.
2353 commit 5ae31a0fdd27855af29f48ff027491629fff5979
2354 Author: Darren Tucker <dtucker@dtucker.net>
2355 Date: Wed Mar 9 09:41:56 2022 +1100
2357 Provide killpg implementation.
2359 Based on github PR#301 for Tandem NonStop.
2361 commit c41c84b439f4cd74d4fe44298a4b4037ddd7d2ae
2362 Author: Darren Tucker <dtucker@dtucker.net>
2363 Date: Wed Mar 9 09:29:30 2022 +1100
2365 Check for missing ftruncate prototype.
2367 From github PR#301 in conjunction with rsbeckerca.
2369 commit 8cf5275452a950869cb90eeac7d220b01f77b12e
2370 Author: Darren Tucker <dtucker@dtucker.net>
2371 Date: Tue Mar 8 20:04:06 2022 +1100
2373 Default to not using sandbox when cross compiling.
2375 On most systems poll(2) does not work when the number of FDs is reduced
2376 with setrlimit, so assume it doesn't when cross compiling and we can't
2377 run the test. bz#3398.
2379 commit 379b30120da53d7c84aa8299c26b18c51c2a0dac
2380 Author: djm@openbsd.org <djm@openbsd.org>
2381 Date: Tue Mar 1 01:59:19 2022 +0000
2383 upstream: pack pollfd array before server_accept_loop() ppoll()
2385 call, and terminate sshd if ppoll() returns errno==EINVAL
2387 avoids spin in ppoll when MaxStartups > RLIMIT_NOFILE, reported by
2392 OpenBSD-Commit-ID: dbab1c24993ac977ec24d83283b8b7528f7c2c15
2394 commit eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd
2395 Author: naddy@openbsd.org <naddy@openbsd.org>
2396 Date: Sun Feb 27 01:33:59 2022 +0000
2398 upstream: include rejected signature algorithm in error message and
2400 not the (useless) key type; ok djm@
2402 OpenBSD-Commit-ID: d0c0f552a4d9161203e07e95d58a76eb602a76ff
2404 commit f2f3269423618a83157e18902385e720f9776007
2405 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2406 Date: Fri Feb 25 09:46:24 2022 +0000
2408 upstream: Remove the char * casts from arguments to do_lstat,
2410 do_readdir and do_stat paths since the underlying functions now take a const
2411 char *. Patch from vapier at gentoo.org.
2413 OpenBSD-Commit-ID: 9e4d964dbfb0ed683a2a2900711b88e7f1c0297b
2415 commit 4a66dac052c5ff5047161853f36904607649e4f9
2416 Author: djm@openbsd.org <djm@openbsd.org>
2417 Date: Fri Feb 25 02:09:27 2022 +0000
2419 upstream: save an unneccessary alloc/free, based on patch from
2421 Martin Vahlensieck; ok dtucker@
2423 OpenBSD-Commit-ID: 90ffbf1f837e509742f2c31a1fbf2c0fd376fd5f
2425 commit 6f117cb151efe138ac57bdd8e26165f350328f5f
2426 Author: Darren Tucker <dtucker@dtucker.net>
2427 Date: Tue Mar 1 09:02:06 2022 +1100
2429 Remove unused ivbits argument from chacha_keysetup
2431 commit 15974235dd528aeab0ec67fb92a0a1d733f62be2
2432 Author: Darren Tucker <dtucker@dtucker.net>
2433 Date: Tue Mar 1 09:00:20 2022 +1100
2435 Add OPENBSD ORIGINAL marker.
2437 commit f2ff669347d320532e7c1b63cdf5c62f46e73150
2438 Author: Darren Tucker <dtucker@dtucker.net>
2439 Date: Mon Feb 28 22:21:36 2022 +1100
2441 No unused param warnings for clang-12 and gcc-11.
2443 These have too many false positives in -Werror tests on the github CI
2444 since we often provide empty stub functions for functionality not needed
2445 for particular configurations.
2447 commit 96558ecd87adac62efa9a2b5479f686ab86b0be1
2448 Author: Darren Tucker <dtucker@dtucker.net>
2449 Date: Sat Feb 26 14:10:41 2022 +1100
2451 Add debian-i386 test target.
2453 commit 284b6e5394652d519e31782e3b3cdfd7b21d1a81
2454 Author: Darren Tucker <dtucker@dtucker.net>
2455 Date: Sat Feb 26 14:06:14 2022 +1100
2457 Allow ppoll_time64 in seccomp sandbox.
2459 Should fix sandbox violations on (some? at least i386 and armhf) 32bit
2460 Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at
2461 debian.org via bz#3396.
2463 commit 0132056efabc5edb85c3c7105d2fb6dee41843c6
2464 Author: Darren Tucker <dtucker@dtucker.net>
2465 Date: Fri Feb 25 19:47:48 2022 +1100
2467 Improve handling of _getshort and _getlong.
2469 If the system native ones are exactly as required then use them,
2470 otherwise use the local versions mapped to another name to prevent
2473 commit 8e206e0dd6b9f757b07979e48f53ad5bf9b7b52b
2474 Author: Darren Tucker <dtucker@dtucker.net>
2475 Date: Fri Feb 25 15:14:22 2022 +1100
2477 Constify utimes in compat library to match specs.
2479 Patch from vapier at chromium.org.
2481 commit 1b2920e3b63db2eddebeec7330ffe8b723055573
2482 Author: Darren Tucker <dtucker@dtucker.net>
2483 Date: Fri Feb 25 13:50:56 2022 +1100
2485 ANSIfy getshort and getlong.
2487 These functions appear to have come from OpenBSD's lib/libc/net/res_comp.c
2488 which made this change in 2005.
2490 commit 54a86f4f6e1c43a2ca2be23ef799ab8910d4af70
2491 Author: Darren Tucker <dtucker@dtucker.net>
2492 Date: Fri Feb 25 13:23:04 2022 +1100
2494 Use PICFLAG instead of hard coding -fPIC.
2496 commit 3016ba47035ac3561aabd48e2be70167fe157d6a
2497 Author: Darren Tucker <dtucker@dtucker.net>
2498 Date: Fri Feb 25 11:37:11 2022 +1100
2500 Add tests for latest releases of {Libre,Open}SSL.
2502 commit f107467179428a0e3ea9e4aa9738ac12ff02822d
2503 Author: Colin Watson <cjwatson@debian.org>
2504 Date: Thu Feb 24 16:04:18 2022 +0000
2506 Improve detection of -fzero-call-used-regs=all support
2508 GCC doesn't tell us whether this option is supported unless it runs into
2509 the situation where it would need to emit corresponding code.
2511 commit 3383b2cac0e9275bc93c4b4760e6e048f537e1d6
2512 Author: djm@openbsd.org <djm@openbsd.org>
2513 Date: Wed Feb 23 21:21:49 2022 +0000
2515 upstream: free(3) wants stdlib.h
2517 OpenBSD-Commit-ID: 227a8c70a95b4428c49e46863c9ef4bd318a3b8a
2519 commit a4537e79ab4ac6db4493c5158744b9ebde5efcb0
2520 Author: djm@openbsd.org <djm@openbsd.org>
2521 Date: Wed Feb 23 21:21:16 2022 +0000
2523 upstream: put back the scp manpage changes for SFTP mode too
2525 OpenBSD-Commit-ID: 05dc53921f927e1b5e5694e1f3aa314549f2e768
2527 commit 449bcb8403adfb9724805d02a51aea76046de185
2528 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2529 Date: Wed Feb 23 19:01:00 2022 +0000
2531 upstream: and we go back to testing sftp-scp after the 8.9
2535 OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c
2537 commit 166456cedad3962b83b848b1e9caf80794831f0f
2538 Author: Damien Miller <djm@mindrot.org>
2539 Date: Wed Feb 23 22:31:11 2022 +1100
2543 commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4
2544 Author: djm@openbsd.org <djm@openbsd.org>
2545 Date: Wed Feb 23 11:18:13 2022 +0000
2547 upstream: avoid integer overflow of auth attempts (harmless, caught
2551 OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86
2553 commit 6e0258c64c901753df695e06498b26f9f4812ea6
2554 Author: djm@openbsd.org <djm@openbsd.org>
2555 Date: Wed Feb 23 11:17:10 2022 +0000
2557 upstream: randomise the password used in fakepw
2559 OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947
2561 commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9
2562 Author: djm@openbsd.org <djm@openbsd.org>
2563 Date: Wed Feb 23 11:15:57 2022 +0000
2565 upstream: use asprintf to construct .rhosts paths
2567 OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b
2569 commit c07e154fbdc7285e9ec54e78d8a31f7325d43537
2570 Author: djm@openbsd.org <djm@openbsd.org>
2571 Date: Wed Feb 23 11:07:09 2022 +0000
2573 upstream: openssh-8.9
2575 OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e
2577 commit bc16667b4a1c3cad7029304853c143a32ae04bd4
2578 Author: Darren Tucker <dtucker@dtucker.net>
2579 Date: Tue Feb 22 15:29:22 2022 +1100
2581 Extend select+rlimit sanbox test to include poll.
2583 POSIX specifies that poll() shall fail if "nfds argument is greater
2584 than {OPEN_MAX}". The setrlimit sandbox sets this to effectively zero
2585 so this causes poll() to fail in the preauth privsep process.
2587 This is likely the underlying cause for the previously observed similar
2588 behaviour of select() on plaforms where it is implement in userspace on
2591 commit 6520c488de95366be031d49287ed243620399e23
2592 Author: Darren Tucker <dtucker@dtucker.net>
2593 Date: Tue Feb 22 13:08:59 2022 +1100
2595 Add Alpine Linux test VM.
2597 commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb
2598 Author: Darren Tucker <dtucker@dtucker.net>
2599 Date: Tue Feb 22 12:27:07 2022 +1100
2601 Include sys/param.h if present.
2603 Needed for howmany() on MUSL systems such as Alpine.
2605 commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c
2606 Author: Darren Tucker <dtucker@dtucker.net>
2607 Date: Tue Feb 22 12:25:52 2022 +1100
2609 Only include sys/poll.h if we don't have poll.h.
2611 Prevents warnings on MUSL based systems such as Alpine.
2613 commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5
2614 Author: Damien Miller <djm@mindrot.org>
2615 Date: Tue Feb 22 11:14:51 2022 +1100
2617 disable agent-restrict test on minix3
2619 Minix seems to have a platform-wide limit on the number of
2620 select(2) syscalls that can be concurrently issued. This test
2621 seems to exceed this limit.
2625 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114
2626 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31
2628 commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a
2629 Author: Darren Tucker <dtucker@dtucker.net>
2630 Date: Mon Feb 21 21:27:20 2022 +1100
2632 Skip agent-getpeereid when running as root.
2634 commit fbd772570a25436a33924d91c164d2b24021f010
2635 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2636 Date: Sun Feb 20 03:47:26 2022 +0000
2638 upstream: Aproximate realpath on the expected output by deduping
2640 leading slashes. Fixes test failure when user's home dir is / which is
2641 possible in some portable configurations.
2643 OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63
2645 commit 336685d223a59f893faeedf0a562e053fd84058e
2646 Author: Darren Tucker <dtucker@dtucker.net>
2647 Date: Sun Feb 20 13:30:52 2022 +1100
2649 Really move DSA to end of list.
2651 In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to
2652 the end of the list instead of DSA. Spotted by andrew at fyfe.gb.net.
2654 commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3
2655 Author: Darren Tucker <dtucker@dtucker.net>
2656 Date: Fri Feb 18 12:12:21 2022 +1100
2658 Add test configs for MUSL C library.
2660 commit f7fc6a43f1173e8b2c38770bf6cee485a562d03b
2661 Author: Damien Miller <djm@mindrot.org>
2662 Date: Thu Feb 17 22:54:19 2022 +1100
2664 minix needs BROKEN_POLL too; chokes on /dev/null
2666 commit 667fec5d4fe4406745750a32f69b5d2e1a75e94b
2667 Author: djm@openbsd.org <djm@openbsd.org>
2668 Date: Thu Feb 17 10:58:27 2022 +0000
2670 upstream: check for EINTR/EAGAIN failures in the rfd fast-path; caught
2672 by dtucker's minix3 vm :) ok dtucker@
2674 OpenBSD-Commit-ID: 2e2c895a3e82ef347aa6694394a76a438be91361
2676 commit 41417dbda9fb55a0af49a8236e3ef9d50d862644
2677 Author: Darren Tucker <dtucker@dtucker.net>
2678 Date: Thu Feb 17 22:05:29 2022 +1100
2680 Comment hurd test, the VM is currently broken.
2682 commit b2aee35a1f0dc798339b3fcf96136da71b7e3f6d
2683 Author: Damien Miller <djm@mindrot.org>
2684 Date: Thu Feb 17 21:15:16 2022 +1100
2686 find sk-dummy.so when build_dir != src_dir
2688 spotted by Corinna Vinschen; feedback & ok dtucker@
2690 commit 62a2d4e50b2e89f2ef04576931895d5139a5d037
2691 Author: Damien Miller <djm@mindrot.org>
2692 Date: Wed Feb 16 16:26:17 2022 +1100
2694 update versions in preparation for 8.9 release
2696 commit dd6d3dded721ac653ea73c017325e5bfeeec837f
2697 Author: djm@openbsd.org <djm@openbsd.org>
2698 Date: Tue Feb 15 05:13:36 2022 +0000
2700 upstream: document the unbound/host-bound options to
2702 PubkeyAuthentication; spotted by HARUYAMA Seigo
2704 OpenBSD-Commit-ID: 298f681b66a9ecd498f0700082c7a6c46e948981
2706 commit df93529dd727fdf2fb290700cd4f1adb0c3c084b
2707 Author: Darren Tucker <dtucker@dtucker.net>
2708 Date: Mon Feb 14 14:19:40 2022 +1100
2710 Test if sshd accidentally acquires controlling tty
2712 When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour
2713 in the STREAMS code before activating the workaround. ok djm@
2715 commit 766176cfdbfd7ec38bb6118dde6e4daa0df34888
2716 Author: Darren Tucker <dtucker@dtucker.net>
2717 Date: Sat Feb 12 10:24:56 2022 +1100
2719 Add cygwin-release test config.
2721 This tests the flags used to build the cygwin release binaries.
2723 commit b30698662b862f5397116d23688aac0764e0886e
2724 Author: Darren Tucker <dtucker@dtucker.net>
2725 Date: Fri Feb 11 21:00:35 2022 +1100
2727 Move SSHD_ACQUIRES_CTTY workaround into compat.
2729 On some (most? all?) SysV based systems with STREAMS based ptys,
2730 sshd could acquire a controlling terminal during pty setup when
2731 it pushed the "ptem" module, due to what is probably a bug in
2732 the STREAMS driver that's old enough to vote. Because it was the
2733 privileged sshd's controlling terminal, it was not available for
2734 the user's session, which ended up without one. This is known to
2735 affect at least Solaris <=10, derivatives such as OpenIndiana and
2736 several other SysV systems. See bz#245 for the backstory.
2738 In the we past worked around that by not calling setsid in the
2739 privileged sshd child, which meant it was not a session or process
2740 group leader. This solved controlling terminal problem because sshd
2741 was not eligble to acquire one, but had other side effects such as
2742 not cleaning up helper subprocesses in the SIGALRM handler since it
2743 was not PG leader. Recent cleanups in the signal handler uncovered
2744 this, resulting in the LoginGraceTime timer not cleaning up privsep
2745 unprivileged processes.
2747 This change moves the workaround into the STREAMS pty allocation code,
2748 by allocating a sacrificial pty to act as sshd's controlling terminal
2749 before allocating user ptys, so those are still available for users'
2753 - this will waste a pty per ssh connection on affected platforms.
2756 - it makes the process group behaviour consistent between platforms.
2758 - it puts the workaround nearest the code that actually causes the
2759 problem and competely out of the mainline code.
2761 - the workaround is only activated if you use the STREAMS code. If,
2762 say, Solaris 11 has the bug but also a working openpty() it doesn't
2763 matter that we defined SSHD_ACQUIRES_CTTY.
2765 - the workaround is only activated when the fist pty is allocated,
2766 ie in the post-auth privsep monitor. This means there's no risk
2767 of fd leaks to the unprivileged processes, and there's no effect on
2768 sessions that do not allocate a pty.
2770 Based on analysis and work by djm@, ok djm@
2772 commit cd00b48cf10f3565936a418c1e6d7e48b5c36140
2773 Author: Darren Tucker <dtucker@dtucker.net>
2774 Date: Fri Feb 11 20:09:32 2022 +1100
2776 Simplify handling of --with-ssl-dir.
2780 commit ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0
2781 Author: Darren Tucker <dtucker@dtucker.net>
2782 Date: Fri Feb 11 13:39:29 2022 +1100
2784 Stop testing OpenBSD HEAD on 6.9 and 7.0.
2786 HEAD is not guaranteed to work on previous stable branches, and at the
2787 moment is broken due to libfido API changes.
2789 commit 50b9e4a4514697ffb9592200e722de6b427cb9ff
2790 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2791 Date: Fri Feb 11 00:43:56 2022 +0000
2793 upstream: Always initialize delim before passing to hpdelim2 which
2795 might not set it. Found by the Valgrind tests on github, ok deraadt@
2797 OpenBSD-Commit-ID: c830c0db185ca43beff3f41c19943c724b4f636d
2799 commit 6ee53064f476cf163acd5521da45b11b7c57321b
2800 Author: Darren Tucker <dtucker@dtucker.net>
2801 Date: Fri Feb 11 10:03:06 2022 +1100
2803 Fix helper include path and remove excess code.
2805 Looks like test_hpdelim.c was imported twice into the same file.
2806 Spotted by kevin.brott at gmail com and chris at cataclysmal org.
2808 commit 9fa63a19f68bc87452d3cf5c577cafad2921b7a4
2809 Author: Darren Tucker <dtucker@dtucker.net>
2810 Date: Thu Feb 10 23:27:02 2022 +1100
2812 Put poll.h inside ifdef.
2814 commit 3ac00dfeb54b252c15dcbf1971582e9e3b946de6
2815 Author: Darren Tucker <dtucker@dtucker.net>
2816 Date: Thu Feb 10 22:17:31 2022 +1100
2818 We now support POLLPRI so actually define it.
2820 commit 25bd659cc72268f2858c5415740c442ee950049f
2821 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2822 Date: Sun Feb 6 22:58:33 2022 +0000
2824 upstream: Add test for empty hostname with port.
2826 OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3
2828 commit a29af853cff41c0635f0378c00fe91bf9c91dea4
2829 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2830 Date: Fri Feb 4 07:53:44 2022 +0000
2832 upstream: Add unit tests for hpdelim.
2834 OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018
2836 commit 9699151b039ecc5fad9ac6c6c02e9afdbd26f15f
2837 Author: djm@openbsd.org <djm@openbsd.org>
2838 Date: Thu Feb 10 04:12:38 2022 +0000
2840 upstream: revert for imminent OpenSSH release, which wil ship with
2845 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl;
2846 > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
2847 > protocol for copying. Let's get back to testing the SFTP protocol.
2849 This will be put back once the OpenSSH release is done.
2851 OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768
2853 commit 45279abceb37c3cbfac8ba36dde8b2c8cdd63d32
2854 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2855 Date: Tue Feb 8 08:59:12 2022 +0000
2857 upstream: Switch hpdelim interface to accept only ":" as delimiter.
2859 Historicallly, hpdelim accepted ":" or "/" as a port delimiter between
2860 hosts (or addresses) and ports. These days most of the uses for "/"
2861 are no longer accepted, so there are several places where it checks the
2862 delimiter to disallow it. Make hpdelim accept only ":" and use hpdelim2
2863 in the other cases. ok djm@
2865 OpenBSD-Commit-ID: 7e6420bd1be87590b6840973f5ad5305804e3102
2867 commit a1bcbf04a7c2d81944141db7ecd0ba292d175a66
2868 Author: pedro martelletto <pedro@yubico.com>
2869 Date: Mon Feb 7 09:09:59 2022 +0100
2871 fix typos in previous
2873 commit 56192518e329b39f063487bc2dc4d796f791eca0
2874 Author: Damien Miller <djm@mindrot.org>
2875 Date: Mon Feb 7 12:53:47 2022 +1100
2877 compat code for fido_assert_set_clientdata()
2879 commit d6b5aa08fdcf9b527f8b8f932432941d5b76b7ab
2880 Author: djm@openbsd.org <djm@openbsd.org>
2881 Date: Mon Feb 7 01:25:12 2022 +0000
2883 upstream: use libfido2 1.8.0+ fido_assert_set_clientdata() instead
2885 of manually hashing data outselves. Saves a fair bit of code and makes life
2886 easier for some -portable platforms.
2888 OpenBSD-Commit-ID: 351dfaaa5ab1ee928c0e623041fca28078cff0e0
2890 commit 86cc93fd3c26b2e0c7663c6394995fb04ebfbf3b
2891 Author: jsg@openbsd.org <jsg@openbsd.org>
2892 Date: Sun Feb 6 00:29:03 2022 +0000
2894 upstream: remove please from manual pages ok jmc@ sthen@ millert@
2896 OpenBSD-Commit-ID: 6543acb00f4f38a23472538e1685c013ca1a99aa
2898 commit ad16a84e64a8cf1c69c63de3fb9008320a37009c
2899 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2900 Date: Fri Feb 4 02:49:17 2022 +0000
2902 upstream: Since they are deprecated, move DSA to the end of the
2904 default list of public keys so that they will be tried last. From github
2905 PR#295 from "ProBackup-nl", ok djm@
2907 OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0
2909 commit 253de42753de85dde266e061b6fec12ca6589f7d
2910 Author: Damien Miller <djm@mindrot.org>
2911 Date: Wed Feb 2 16:52:07 2022 +1100
2913 portable-specific string array constification
2917 commit dfdcc2220cf359c492d5d34eb723370e8bd8a19e
2918 Author: djm@openbsd.org <djm@openbsd.org>
2919 Date: Tue Feb 1 23:37:15 2022 +0000
2921 upstream: test 'ssh-keygen -Y find-principals' with wildcard
2923 principals; from Fabian Stelzer
2925 OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40
2927 commit 968e508967ef42480cebad8cf3172465883baa77
2928 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2929 Date: Fri Jan 21 02:54:41 2022 +0000
2931 upstream: Enable all supported ciphers and macs in the server
2933 before trying to benchmark them. Increase the data file size to get more
2936 OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6
2938 commit 15b7199a1fd37eff4c695e09d573f3db9f4274b7
2939 Author: djm@openbsd.org <djm@openbsd.org>
2940 Date: Tue Feb 1 23:34:47 2022 +0000
2942 upstream: allow 'ssh-keygen -Y find-principals' to match wildcard
2944 principals in allowed_signers files; from Fabian Stelzer
2946 OpenBSD-Commit-ID: 1e970b9c025b80717dddff5018fe5e6f470c5098
2948 commit 541667fe6dc26d7881e55f0bb3a4baa6f3171645
2949 Author: djm@openbsd.org <djm@openbsd.org>
2950 Date: Tue Feb 1 23:32:51 2022 +0000
2952 upstream: mark const string array contents const too, i.e. static
2954 const char *array => static const char * const array from Mike Frysinger
2956 OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1
2958 commit 8cfa73f8a2bde4c98773f33f974c650bdb40dd3c
2959 Author: djm@openbsd.org <djm@openbsd.org>
2960 Date: Tue Feb 1 23:11:11 2022 +0000
2962 upstream: better match legacy scp behaviour: show un-expanded paths
2964 in error messages. Spotted by and ok tb@
2966 OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7
2968 commit 4e62c13ab419b4b224c8bc6a761e91fcf048012d
2969 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2970 Date: Tue Feb 1 07:57:32 2022 +0000
2972 upstream: Remove explicit kill of privsep preauth child's PID in
2974 SIGALRM handler. It's no longer needed since the child will get terminated by
2975 the SIGTERM to the process group that cleans up any auth helpers, it
2976 simplifies the signal handler and removes the risk of a race when updating
2977 the PID. Based on analysis by HerrSpace in github PR#289, ok djm@
2979 OpenBSD-Commit-ID: 2be1ffa28b4051ad9e33bb4371e2ec8a31d6d663
2981 commit 2a7ccd2ec4022917b745af7186f514f365b7ebe9
2982 Author: guenther@openbsd.org <guenther@openbsd.org>
2983 Date: Fri Jan 28 06:18:42 2022 +0000
2985 upstream: When it's the possessive of 'it', it's spelled "its",
2987 without the apostrophe.
2989 OpenBSD-Commit-ID: fb6ab9c65bd31de831da1eb4631ddac018c5fae7
2991 commit 8a0848cdd3b25c049332cd56034186b7853ae754
2992 Author: Alex James <theracermaster@gmail.com>
2993 Date: Sun Jan 30 16:13:36 2022 -0600
2995 sandbox-seccomp-filter: allow gettid
2997 Some allocators (such as Scudo) use gettid while tracing allocations [1].
2998 Allow gettid in preauth to prevent sshd from crashing with Scudo.
3000 [1]: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.0/compiler-rt/lib/gwp_asan/common.cpp#L46
3002 commit b30d32159dc3c7052f4bfdf36357996c905af739
3003 Author: djm@openbsd.org <djm@openbsd.org>
3004 Date: Sat Jan 22 00:49:34 2022 +0000
3006 upstream: add a ssh_packet_process_read() function that reads from
3008 a fd directly into the transport input buffer.
3010 Use this in the client and server mainloops to avoid unnecessary
3011 copying. It also lets us use a more greedy read size without penalty.
3013 Yields a 2-3% performance gain on cipher-speed.sh (in a fairly
3014 unscientific test tbf)
3016 feedback dtucker@ ok markus@
3018 OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632
3020 commit a1a8efeaaa9cccb15cdc0a2bd7c347a149a3a7e3
3021 Author: djm@openbsd.org <djm@openbsd.org>
3022 Date: Sat Jan 22 00:45:31 2022 +0000
3024 upstream: Use sshbuf_read() to read directly into the channel input
3026 buffer rather than into a stack buffer that needs to be copied again;
3027 Improves performance by about 1% on cipher-speed.sh feedback dtucker@ ok
3030 OpenBSD-Commit-ID: bf5e6e3c821ac3546dc8241d8a94e70d47716572
3032 commit 29a76994e21623a1f84d68ebb9dc5a3c909fa3a7
3033 Author: Damien Miller <djm@mindrot.org>
3034 Date: Tue Jan 25 11:52:34 2022 +1100
3038 commit 754e0d5c7712296a7a3a83ace863812604c7bc4f
3039 Author: djm@openbsd.org <djm@openbsd.org>
3040 Date: Sat Jan 22 00:43:43 2022 +0000
3042 upstream: Add a sshbuf_read() that attempts to read(2) directly in
3044 to a sshbuf; ok markus@
3046 OpenBSD-Commit-ID: 2d8f249040a4279f3bc23c018947384de8d4a45b
3048 commit c7964fb9829d9ae2ece8b51a76e4a02e8449338d
3049 Author: djm@openbsd.org <djm@openbsd.org>
3050 Date: Fri Jan 21 07:04:19 2022 +0000
3052 upstream: add a helper for writing an error message to the
3054 stderr_buf and setting quit_pending; no functional change but saves a bunch
3057 OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d
3059 commit d23b4f7fdb1bd87e2cd7a9ae7c198ae99d347916
3060 Author: djm@openbsd.org <djm@openbsd.org>
3061 Date: Fri Jan 21 06:58:06 2022 +0000
3063 upstream: correct comment and use local variable instead of long
3065 indirection; spotted by dtucker@
3067 OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965
3069 commit d069b020a02b6e3935080204ee44d233e8158ebb
3070 Author: deraadt@openbsd.org <deraadt@openbsd.org>
3071 Date: Fri Jan 21 00:53:40 2022 +0000
3073 upstream: When poll(2) returns -1, for some error conditions
3075 pfd[].revents is not cleared. There are subtle errors in various programs.
3076 In this particular case, the program should error out. ok djm millert
3078 OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c
3080 commit e204b34337a965feb439826157c191919fd9ecf8
3081 Author: Damien Miller <djm@mindrot.org>
3082 Date: Sat Jan 22 11:38:21 2022 +1100
3084 restore tty force-read hack
3086 This portable-specific hack fixes a hang on exit for ttyful sessions
3087 on Linux and some SysVish Unix variants. It was accidentally disabled
3088 in commit 5c79952dfe1a (a precursor to the mainloop poll(2) conversion).
3090 Spotted by John in bz3383
3092 commit 68085066b6bad43643b43f5957fcc5fd34782ccd
3093 Author: Corinna Vinschen <vinschen@redhat.com>
3094 Date: Fri Jan 21 03:22:56 2022 +1100
3096 Fix signedness bug in Cygwin code
3098 The Cygwin-specific pattern match code has a bug. It checks
3099 the size_t value returned by mbstowcs for being < 0. The right
3100 thing to do is to check against (size_t) -1. Fix that.
3102 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
3104 commit 2e5cfed513e84444483baf1d8b31c40072b05103
3105 Author: Darren Tucker <dtucker@dtucker.net>
3106 Date: Thu Jan 20 13:26:27 2022 +1100
3108 Improve compatibility of early exit trap handling.
3110 Dash (as used by the github runners) has some differences in its trap
3112 - it doesn't have -p (which is fine, that's not in posix).
3113 - it doesn't work in a subshell (which turns out to be in compliance
3114 with posix, which means bash isn't).
3115 - it doesn't work in a pipeline, ie "trap|cat" produces no output.
3117 commit 3fe6800b6027add478e648934cbb29d684e51943
3118 Author: Darren Tucker <dtucker@dtucker.net>
3119 Date: Thu Jan 20 00:49:57 2022 +1100
3121 Move more tests out of valgrind-1 runner.
3123 commit 20da6ed136dd76e6a0b229ca3036ef9c7c7ef798
3124 Author: Darren Tucker <dtucker@dtucker.net>
3125 Date: Wed Jan 19 15:37:39 2022 +1100
3127 Invoke EXIT handler early when using Valgrind.
3129 When using Valgrind, we need to wait for all invoked programs to
3130 complete before checking their valgrind logs. Some tests, notably
3131 agent-restrict, set an EXIT trap handler to clean up things like
3132 ssh-agent, but those do not get invoked until test-exec.sh exits.
3133 This causes the Valgrind wait to deadlock, so if present invoke
3134 the EXIT handler before checking the Valgrind logs.
3136 commit ad2e0580c87b0714cf166bca9d926a95ddeee1c8
3137 Author: Darren Tucker <dtucker@dtucker.net>
3138 Date: Tue Jan 18 12:55:21 2022 +1100
3140 Remove line leftover from upstream sync.
3142 commit d1051c0f11a6b749027e26bbeb61b07df4b67e15
3143 Author: djm@openbsd.org <djm@openbsd.org>
3144 Date: Mon Jan 17 22:56:04 2022 +0000
3146 upstream: when decompressing zlib compressed packets, use
3148 Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually
3149 specified as a valid mode for inflate(). There should be no practical change
3150 in behaviour as the compression side ensures a flush that should make all
3151 data available to the receiver in all cases.
3153 repoted by lamm AT ibm.com via bz3372; ok markus
3155 OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b
3157 commit d5981b1883746b1ae178a46229c26b53af99e37a
3158 Author: djm@openbsd.org <djm@openbsd.org>
3159 Date: Mon Jan 17 21:41:04 2022 +0000
3161 upstream: make most of the sftp errors more idiomatic, following
3163 the general form of "[local/remote] operation path: error message"; ok markus
3165 OpenBSD-Commit-ID: 61364cd5f3a9fecaf8d63b4c38a42c0c91f8b571
3167 commit ac7c9ec894ed0825d04ef69c55babb49bab1d32e
3168 Author: djm@openbsd.org <djm@openbsd.org>
3169 Date: Mon Jan 17 21:39:51 2022 +0000
3171 upstream: when transferring multiple files in SFTP mode, create the
3173 destination directory if it doesn't already exist to match olde-scp(1)
3174 behaviour. noticed by deraadt@ ok markus@
3176 OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407
3178 commit 39d17e189f8e72c34c722579d8d4e701fa5132da
3179 Author: djm@openbsd.org <djm@openbsd.org>
3180 Date: Fri Jan 14 03:43:48 2022 +0000
3182 upstream: allow pin-required FIDO keys to be added to ssh-agent(1).
3184 ssh-askpass will be used to request the PIN at authentication time.
3186 From Pedro Martelletto, ok djm
3188 OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950
3190 commit 52423f64e13db2bdc31a51b32e999cb1bfcf1263
3191 Author: djm@openbsd.org <djm@openbsd.org>
3192 Date: Fri Jan 14 03:35:10 2022 +0000
3194 upstream: ssh-sk: free a resident key's user id
3196 From Pedro Martelletto; ok dtucker & me
3198 OpenBSD-Commit-ID: 47be40d602b7a6458c4c71114df9b53d149fc2e9
3200 commit 014e2f147a2788bfb3cc58d1b170dcf2bf2ee493
3201 Author: djm@openbsd.org <djm@openbsd.org>
3202 Date: Fri Jan 14 03:34:00 2022 +0000
3204 upstream: sshsk_load_resident: don't preallocate resp
3206 resp is allocated by client_converse(), at which point we lose
3207 the original pointer.
3209 From Pedro Martelletto; ok dtucker & me
3211 OpenBSD-Commit-ID: 1f1b5ea3282017d6584dfed4f8370dc1db1f44b1
3213 commit c88265f207dfe0e8bdbaf9f0eda63ed6b33781cf
3214 Author: djm@openbsd.org <djm@openbsd.org>
3215 Date: Fri Jan 14 03:32:52 2022 +0000
3217 upstream: sshsk_sign: trim call to sshkey_fingerprint()
3219 the resulting fingerprint doesn't appear to be used for anything,
3220 and we end up leaking it.
3222 from Pedro Martelletto; ok dtucker & me
3224 OpenBSD-Commit-ID: 5625cf6c68f082bc2cbbd348e69a3ed731d2f9b7
3226 commit 1cd1b2eac39661b849d5a4b4b56363e22bb5f61e
3227 Author: djm@openbsd.org <djm@openbsd.org>
3228 Date: Fri Jan 14 03:31:52 2022 +0000
3230 upstream: use status error message to communicate ~user expansion
3232 failures; provides better experience for scp in sftp mode, where ~user paths
3233 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
3236 (forgot to include this file in previous commit)
3238 OpenBSD-Commit-ID: d37cc4c8c861ce48cd6ea9899e96aaac3476847b
3240 commit a1d42a6ce0398da3833bedf374ef2571af7fea50
3241 Author: Damien Miller <djm@mindrot.org>
3242 Date: Fri Jan 14 13:49:32 2022 +1100
3244 fix edge case in poll(2) wrapper
3246 Correct handling of select(2) exceptfds. These should only be consulted
3247 for POLLPRI flagged pfds and not unconditionally converted to POLLERR.
3249 with and ok dtucker@
3251 commit 976b9588b4b5babcaceec4767a241c11a67a5ccb
3252 Author: Darren Tucker <dtucker@dtucker.net>
3253 Date: Fri Jan 14 13:46:35 2022 +1100
3255 Wrap OpenSSL includes in unit tests in ifdef.
3257 Fixes unit test on systems that do not have OpenSSL headers installed.
3259 commit c171879374b2e8b07157503f5639ed0bce59ce89
3260 Author: Darren Tucker <dtucker@dtucker.net>
3261 Date: Thu Jan 13 15:53:33 2022 +1100
3263 Remove sort wrapper.
3265 agent-restrict now takes care of this itself.
3267 commit 9cc2654403f1a686bb26c07a6ac790edf334cef5
3268 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3269 Date: Thu Jan 13 04:53:16 2022 +0000
3271 upstream: Set LC_ALL in both local and remote shells so that sorted
3273 output matches regardless of what the user's shell sets it to. ok djm@
3275 OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f
3277 commit 7a75f748cb2dd2f771bf70ea72698aa027996ab1
3278 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3279 Date: Thu Jan 13 04:22:10 2022 +0000
3281 upstream: Avoid %'s in commands (not used in OpenBSD, but used in
3283 -portable's Valgrind test) being interpretted as printf format strings.
3285 OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043
3287 commit 6c435bd4994d71442192001483a1cdb846e5ffcd
3288 Author: Darren Tucker <dtucker@dtucker.net>
3289 Date: Wed Jan 12 16:58:13 2022 +1100
3291 Stop on first test failure to minimize logs.
3293 commit 4bc2ba6095620a4484b708ece12842afd8c7685b
3294 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3295 Date: Wed Jan 12 07:18:37 2022 +0000
3297 upstream: Use egrep when searching for an anchored string.
3299 OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4
3301 commit 6bf2efa2679da1e8e60731f41677b2081dedae2c
3302 Author: Darren Tucker <dtucker@dtucker.net>
3303 Date: Wed Jan 12 18:25:06 2022 +1100
3305 Add "rev" command replacement if needed.
3307 commit 72bcd7993dadaf967bb3d8564ee31cbf38132b5d
3308 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3309 Date: Wed Jan 12 03:30:32 2022 +0000
3311 upstream: Don't log NULL hostname in restricted agent code,
3313 printf("%s", NULL) is not safe on all platforms. with & ok djm
3315 OpenBSD-Commit-ID: faf10cdae4adde00cdd668cd1f6e05d0a0e32a02
3317 commit acabefe3f8fb58c867c99fed9bbf84dfa1771727
3318 Author: djm@openbsd.org <djm@openbsd.org>
3319 Date: Tue Jan 11 22:33:16 2022 +0000
3321 upstream: remove hardcoded domain and use window.location.host, so this
3325 OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92
3327 commit 96da0946e44f34adc0397eb7caa6ec35a3e79891
3328 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3329 Date: Tue Jan 11 02:56:19 2022 +0000
3331 upstream: "void" functions should not return anything. From Tim Rice
3335 OpenBSD-Commit-ID: ce6616304f4c9881b46413e616b226c306830e2a
3337 commit a882a09722c9f086c9edb65d0c4022fd965ec1ed
3338 Author: djm@openbsd.org <djm@openbsd.org>
3339 Date: Tue Jan 11 01:26:47 2022 +0000
3341 upstream: suppress "Connection to xxx closed" messages at LogLevel >=
3343 error bz3378; ok dtucker@
3345 OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c
3347 commit 61a1a6af22e17fc94999a5d1294f27346e6c4668
3348 Author: Damien Miller <djm@mindrot.org>
3349 Date: Wed Jan 12 08:57:49 2022 +1100
3351 OS X poll(2) is broken; use compat replacement
3353 Darwin's poll(2) implementation is broken. For character-special
3354 devices like /dev/null, it returns POLLNVAL when polled with
3357 Apparently this is Apple bug 3710161, which is AFAIK not public,
3358 but a websearch will find other OSS projects rediscovering it
3359 periodically since it was first identified in 2005 (!!)
3361 commit 613a6545fc5a9542753b503cbe5906538a640b60
3362 Author: Darren Tucker <dtucker@dtucker.net>
3363 Date: Tue Jan 11 20:56:01 2022 +1100
3365 libhardended_malloc.so moved into out dir.
3367 commit 61761340be5e11046556623f8f5412b236cefa95
3368 Author: Tim Rice <tim@multitalents.net>
3369 Date: Mon Jan 10 11:07:04 2022 -0800
3371 Make USL compilers happy
3372 UX:acomp: ERROR: "sftp-server.c", line 567: void function cannot return value
3374 commit 3ef403f351e80a59b6f7e9d43cb82c181855483c
3375 Author: Darren Tucker <dtucker@dtucker.net>
3376 Date: Mon Jan 10 21:07:38 2022 +1100
3378 Add wrapper for "sort" to set LC_ALL=C.
3380 Found by djm, this should make sorts stable and reduce test flakiness.
3382 commit bd69e29f5716090181dbe0b8272eb7eab1a383bb
3383 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3384 Date: Sat Jan 8 07:55:26 2022 +0000
3386 upstream: Remove errant "set -x" left over from debugging.
3388 OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc
3390 commit 1a7c88e26fd673813dc5f61c4ac278564845e004
3391 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3392 Date: Sat Jan 8 07:01:13 2022 +0000
3394 upstream: Enable all supported hostkey algorithms (but no others).
3396 Allows hostbased test to pass when built without OpenSSL.
3398 OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562
3400 commit 12b457c2a42ff271e7967d9bedd068cebb048db9
3401 Author: djm@openbsd.org <djm@openbsd.org>
3402 Date: Sat Jan 8 07:37:32 2022 +0000
3404 upstream: use status error message to communicate ~user expansion
3406 failures; provides better experience for scp in sftp mode, where ~user paths
3407 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
3410 OpenBSD-Commit-ID: fc610ce00ca0cdc2ecdabbd49ce7cb82033f905f
3412 commit 63670d4e9030bcee490d5a9cce561373ac5b3b23
3413 Author: djm@openbsd.org <djm@openbsd.org>
3414 Date: Sat Jan 8 07:36:11 2022 +0000
3416 upstream: fix some corner-case bugs in scp sftp-mode handling of
3418 ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus
3420 OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222
3422 commit e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0
3423 Author: djm@openbsd.org <djm@openbsd.org>
3424 Date: Sat Jan 8 07:34:57 2022 +0000
3426 upstream: more idiomatic error messages; spotted by jsg & deraadt
3430 OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8
3432 commit 9acddcd5918c623f7ebf454520ffe946a8f15e90
3433 Author: djm@openbsd.org <djm@openbsd.org>
3434 Date: Sat Jan 8 07:33:54 2022 +0000
3436 upstream: add a variant of send_status() that allows overriding the
3438 default, generic error message. feedback/ok markus & jsg
3440 OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f
3442 commit 961411337719d4cd78f1ab33e4ac549f3fa22f50
3443 Author: djm@openbsd.org <djm@openbsd.org>
3444 Date: Sat Jan 8 07:32:45 2022 +0000
3446 upstream: refactor tilde_expand_filename() and make it handle ~user
3448 paths with no trailing slash; feedback/ok markus and jsg
3450 OpenBSD-Commit-ID: a2ab365598a902f0f14ba6a4f8fb2d07a9b5d51d
3452 commit dc38236ab6827dec575064cac65c8e7035768773
3453 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3454 Date: Thu Jan 6 22:14:25 2022 +0000
3456 upstream: Don't explicitly set HostbasedAuthentication in
3458 sshd_config. It defaults to "no", and not explicitly setting it allows us to
3459 enable it for the (optional) hostbased test.
3461 OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c
3463 commit e12d912ddf1c873cb72e5de9a197afbe0b6622d2
3464 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3465 Date: Thu Jan 6 21:46:56 2022 +0000
3467 upstream: Add test for hostbased auth. It requires some external
3469 setup (see comments at the top) and thus is disabled unless
3470 TEST_SSH_HOSTBASED_AUTH and SUDO are set.
3472 OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a
3474 commit a48533a8da6a0f4f05ecd055dc8048047e53569e
3475 Author: Damien Miller <djm@mindrot.org>
3476 Date: Fri Jan 7 09:24:26 2022 +1100
3480 commit d9dbb5d9a0326e252d3c7bc13beb9c2434f59409
3481 Author: djm@openbsd.org <djm@openbsd.org>
3482 Date: Thu Jan 6 22:06:51 2022 +0000
3484 upstream: allow hostbased auth to select RSA keys when only
3486 RSA/SHA2 are configured (this is the default case); ok markus@
3488 OpenBSD-Commit-ID: 411c18c7bde40c60cc6dfb7017968577b4d4a827
3490 commit fdb1d58d0d3888b042e5a500f6ce524486aaf782
3491 Author: djm@openbsd.org <djm@openbsd.org>
3492 Date: Thu Jan 6 22:05:42 2022 +0000
3494 upstream: add a helper function to match a key type to a list of
3496 signature algorithms. RSA keys can make signatures with multiple algorithms,
3497 so some special handling is required. ok markus@
3499 OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff
3501 commit 11e8c4309a5086a45fbbbc87d0af5323c6152914
3502 Author: djm@openbsd.org <djm@openbsd.org>
3503 Date: Thu Jan 6 22:04:20 2022 +0000
3505 upstream: log some details on hostkeys that ssh loads for
3507 hostbased authn ok markus@
3509 OpenBSD-Commit-ID: da17061fa1f0e58cb31b88478a40643e18233e38
3511 commit c6706f661739514a34125aa3136532a958929510
3512 Author: djm@openbsd.org <djm@openbsd.org>
3513 Date: Thu Jan 6 22:03:59 2022 +0000
3515 upstream: log signature algorithm during verification by monitor;
3519 OpenBSD-Commit-ID: 02b92bb42c4d4bf05a051702a56eb915151d9ecc
3521 commit 8832402bd500d1661ccc80a476fd563335ef6cdc
3522 Author: djm@openbsd.org <djm@openbsd.org>
3523 Date: Thu Jan 6 22:02:52 2022 +0000
3525 upstream: piece of UpdateHostkeys client strictification: when
3527 updating known_hosts with new keys, ignore NULL keys (forgot to include in
3530 OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08
3532 commit c2d9ced1da0276961d86690b3bd7ebdaca7fdbf7
3533 Author: djm@openbsd.org <djm@openbsd.org>
3534 Date: Thu Jan 6 22:01:14 2022 +0000
3536 upstream: include rejected signature algorithm in error message
3538 and not the (useless) key type; ok markus
3540 OpenBSD-Commit-ID: 4180b5ec7ab347b43f84e00b1972515296dab023
3542 commit 7aa7b096cf2bafe2777085abdeed5ce00581f641
3543 Author: djm@openbsd.org <djm@openbsd.org>
3544 Date: Thu Jan 6 22:00:18 2022 +0000
3546 upstream: make ssh-keysign use the requested signature algorithm
3548 and not the default for the keytype. Part of unbreaking hostbased auth for
3549 RSA/SHA2 keys. ok markus@
3551 OpenBSD-Commit-ID: b5639a14462948970da3a8020dc06f9a80ecccdc
3553 commit 291721bc7c840d113a49518f3fca70e86248b8e8
3554 Author: djm@openbsd.org <djm@openbsd.org>
3555 Date: Thu Jan 6 21:57:28 2022 +0000
3557 upstream: stricter UpdateHostkey signature verification logic on
3559 the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when
3560 RSA/SHA1 was explicitly negotiated during initial KEX; bz3375
3564 OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29
3566 commit 0fa33683223c76289470a954404047bc762be84c
3567 Author: djm@openbsd.org <djm@openbsd.org>
3568 Date: Thu Jan 6 21:55:23 2022 +0000
3570 upstream: Fix signature algorithm selection logic for
3572 UpdateHostkeys on the server side. The previous code tried to prefer RSA/SHA2
3573 for hostkey proofs of RSA keys, but missed some cases. This will use RSA/SHA2
3574 signatures for RSA keys if the client proposed these algorithms in initial
3577 Mostly by Dmitry Belyavskiy with some tweaks by me.
3581 OpenBSD-Commit-ID: c17ba0c3236340d2c6a248158ebed042ac6a8029
3583 commit 17877bc81db3846e6e7d4cfb124d966bb9c9296b
3584 Author: djm@openbsd.org <djm@openbsd.org>
3585 Date: Thu Jan 6 21:48:38 2022 +0000
3587 upstream: convert ssh, sshd mainloops from select() to poll();
3589 feedback & ok deraadt@ and markus@ has been in snaps for a few months
3591 OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c
3593 commit 5c79952dfe1aa36105c93b3f383ce9be04dee384
3594 Author: djm@openbsd.org <djm@openbsd.org>
3595 Date: Thu Jan 6 21:46:23 2022 +0000
3597 upstream: prepare for conversion of ssh, sshd mainloop from
3599 select() to poll() by moving FD_SET construction out of channel handlers into
3600 separate functions. ok markus
3602 OpenBSD-Commit-ID: 937fbf2a4de12b19fb9d5168424e206124807027
3604 commit 24c5187edfef4651a625b7d5d692c8c7e794f71f
3605 Author: djm@openbsd.org <djm@openbsd.org>
3606 Date: Wed Jan 5 21:54:37 2022 +0000
3608 upstream: add a comment so I don't make this mistake again
3610 OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e
3612 commit 7369900441929058263a17f56aa67e05ff7ec628
3613 Author: djm@openbsd.org <djm@openbsd.org>
3614 Date: Wed Jan 5 21:50:00 2022 +0000
3616 upstream: fix cut-and-pasto in error message
3618 OpenBSD-Commit-ID: 4cc5c619e4b456cd2e9bb760d17e3a9c84659198
3620 commit 294c11b1c7d56d3fb61e329603a782315ed70c62
3621 Author: djm@openbsd.org <djm@openbsd.org>
3622 Date: Wed Jan 5 08:25:05 2022 +0000
3624 upstream: select all RSA hostkey algorithms for UpdateHostkeys tests,
3628 OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8
3630 commit 2ea1108c30e3edb6f872dfc1e6da10b041ddf2c0
3631 Author: djm@openbsd.org <djm@openbsd.org>
3632 Date: Wed Jan 5 04:56:15 2022 +0000
3634 upstream: regress test both sshsig message hash algorithms, possible
3636 now because the algorithm is controllable via the CLI
3638 OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f
3640 commit 2327c306b5d4a2b7e71178e5a4d139af9902c2b0
3641 Author: djm@openbsd.org <djm@openbsd.org>
3642 Date: Wed Jan 5 04:50:11 2022 +0000
3644 upstream: allow selection of hash at sshsig signing time; code
3646 already supported either sha512 (default) or sha256, but plumbing wasn't
3647 there mostly by Linus Nordberg
3649 OpenBSD-Commit-ID: 1b536404b9da74a84b3a1c8d0b05fd564cdc96cd
3651 commit 56e941d0a00d6d8bae88317717d5e1b7395c9529
3652 Author: djm@openbsd.org <djm@openbsd.org>
3653 Date: Wed Jan 5 04:27:54 2022 +0000
3655 upstream: add missing -O option to usage() for ssh-keygen -Y sign;
3659 OpenBSD-Commit-ID: 4e78feb4aa830727ab76bb2e3d940440ae1d7af0
3661 commit 141a14ec9b0924709c98df2dd8013bde5d8d12c7
3662 Author: djm@openbsd.org <djm@openbsd.org>
3663 Date: Wed Jan 5 04:27:01 2022 +0000
3665 upstream: move sig_process_opts() to before sig_sign(); no
3667 functional code change
3669 OpenBSD-Commit-ID: da02d61f5464f72b4e8b299f83e93c3b657932f9
3671 commit 37a14249ec993599a9051731e4fb0ac5e976aec1
3672 Author: djm@openbsd.org <djm@openbsd.org>
3673 Date: Wed Jan 5 04:10:39 2022 +0000
3675 upstream: regression test for find-principals NULL deref; from Fabian
3679 OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5
3681 commit eb1f042142fdaba93f6c9560cf6c91ae25f6884a
3682 Author: djm@openbsd.org <djm@openbsd.org>
3683 Date: Wed Jan 5 04:02:42 2022 +0000
3685 upstream: NULL deref when using find-principals when matching an
3687 allowed_signers line that contains a namespace restriction, but no
3688 restriction specified on the command-line; report and fix from Fabian Stelzer
3690 OpenBSD-Commit-ID: 4a201b86afb668c908d1a559c6af456a61f4b145
3692 commit 8f3b18030579f395eca2181da31a5f945af12a59
3693 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3694 Date: Tue Jan 4 08:38:53 2022 +0000
3696 upstream: Log command invocation while debugging.
3698 This will aid in manually reproducing failing commands.
3700 OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a
3702 commit bbf285164df535f0d38c36237f007551bbdae27f
3703 Author: Darren Tucker <dtucker@dtucker.net>
3704 Date: Sun Dec 26 10:31:15 2021 +1100
3706 Always save config.h as build artifact.
3708 Should allow better comparison between failing and succeeding test
3711 commit 03bd4ed0db699687c5cd83405d26f81d2dc28d22
3712 Author: Darren Tucker <dtucker@dtucker.net>
3713 Date: Sat Dec 25 16:42:51 2021 +1100
3715 Add OpenBSD 7.0 target. Retire 6.8.
3717 commit c45a752f0de611afd87755c2887c8a24816d08ee
3718 Author: jsg@openbsd.org <jsg@openbsd.org>
3719 Date: Sat Jan 1 05:55:06 2022 +0000
3723 OpenBSD-Commit-ID: c63e43087a64d0727af13409c708938e05147b62
3725 commit c672f83a89a756564db0d3af9934ba0e1cf8fa3e
3726 Author: djm@openbsd.org <djm@openbsd.org>
3727 Date: Tue Jan 4 07:20:33 2022 +0000
3729 upstream: unbreak test: was picking up system ssh-add instead of the
3731 one supposedly being tested. Spotted by dtucker and using his VM zoo (which
3732 includes some systems old enough to lack ed25519 key support)
3734 OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5
3736 commit a23698c3082ffe661abed14b020eac9b0c25eb9f
3737 Author: djm@openbsd.org <djm@openbsd.org>
3738 Date: Sat Jan 1 04:18:06 2022 +0000
3740 upstream: fix memleak in process_extension(); oss-fuzz issue #42719
3742 OpenBSD-Commit-ID: d8d49f840162fb7b8949e3a5adb8107444b6de1e
3744 commit cb885178f36b83d0f14cfe9f345d2068103feed0
3745 Author: jsg@openbsd.org <jsg@openbsd.org>
3746 Date: Sat Jan 1 01:55:30 2022 +0000
3748 upstream: spelling ok dtucker@
3750 OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19
3752 commit 6b977f8080a32c5b3cbb9edb634b9d5789fb79be
3753 Author: djm@openbsd.org <djm@openbsd.org>
3754 Date: Sun Dec 26 23:34:41 2021 +0000
3756 upstream: split method list search functionality from
3758 authmethod_lookup() into a separate authmethod_byname(), for cases where we
3759 don't need to check whether a method is enabled, etc.
3761 use this to fix the "none" authentication method regression reported
3762 by Nam Nguyen via bugs@
3766 OpenBSD-Commit-ID: 8cd188dc3a83aa8abe5b7693e762975cd8ea8a17
3768 commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07
3769 Author: jmc@openbsd.org <jmc@openbsd.org>
3770 Date: Wed Dec 22 06:56:41 2021 +0000
3772 upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;
3776 OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965
3778 commit 1c9853a68b2319f2e5f929179735e8fbb9988a67
3779 Author: Darren Tucker <dtucker@dtucker.net>
3780 Date: Wed Dec 22 19:33:10 2021 +1100
3782 Use SHA.*_HMAC_BLOCK_SIZE if needed.
3784 If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH
3785 but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter.
3786 Should fix --without-openssl build on Solaris.
3788 commit 715c892f0a5295b391ae92c26ef4d6a86ea96e8e
3789 Author: Damien Miller <djm@mindrot.org>
3790 Date: Wed Dec 22 09:02:50 2021 +1100
3792 remove sys/param.h in -portable, after upstream
3794 commit 7a7c69d8b4022b1e5c0afb169c416af8ce70f3e8
3795 Author: Damien Miller <djm@mindrot.org>
3796 Date: Mon Dec 20 13:05:20 2021 +1100
3798 add agent-restrict.sh file, missed in last commit
3800 commit f539136ca51a4976644db5d0be8158cc1914c72a
3801 Author: djm@openbsd.org <djm@openbsd.org>
3802 Date: Sun Dec 19 22:20:12 2021 +0000
3804 upstream: regression test for destination restrictions in ssh-agent
3806 OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d
3808 commit 6e4980eb8ef94c04874a79dd380c3f568e8416d6
3809 Author: anton@openbsd.org <anton@openbsd.org>
3810 Date: Sat Dec 18 06:53:59 2021 +0000
3812 upstream: Make use of ntests variable, pointed out by clang 13.
3814 OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72
3816 commit 3eead8158393b697f663ec4301e3c7b6f24580b1
3817 Author: deraadt@openbsd.org <deraadt@openbsd.org>
3818 Date: Tue Dec 14 21:25:27 2021 +0000
3820 upstream: sys/param.h cleanup, mostly using MINIMUM() and
3822 <limits.h> ok dtucker
3824 OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0
3826 commit 266678e19eb0e86fdf865b431b6e172e7a95bf48
3827 Author: djm@openbsd.org <djm@openbsd.org>
3828 Date: Sun Dec 19 22:15:42 2021 +0000
3830 upstream: document host-bound publickey authentication
3832 OpenBSD-Commit-ID: ea6ed91779a81f06d961e30ecc49316b3d71961b
3834 commit 3d00024b3b156aa9bbd05d105f1deb9cb088f6f7
3835 Author: djm@openbsd.org <djm@openbsd.org>
3836 Date: Sun Dec 19 22:15:21 2021 +0000
3838 upstream: document agent protocol extensions
3840 OpenBSD-Commit-ID: 09e8bb391bbaf24c409b75a4af44e0cac65405a7
3842 commit c385abf76511451bcba78568167b1cd9e90587d5
3843 Author: djm@openbsd.org <djm@openbsd.org>
3844 Date: Sun Dec 19 22:14:47 2021 +0000
3846 upstream: PubkeyAuthentication=yes|no|unbound|host-bound
3848 Allow control over which pubkey methods are used. Added out of
3849 concern that some hardware devices may have difficulty signing
3850 the longer pubkey authentication challenges. This provides a
3851 way for them to disable the extension. It's also handy for
3854 feedback / ok markus@
3856 OpenBSD-Commit-ID: ee52580db95c355cf6d563ba89974c210e603b1a
3858 commit 34b1e9cc7654f41cd4c5b1cc290b999dcf6579bb
3859 Author: djm@openbsd.org <djm@openbsd.org>
3860 Date: Sun Dec 19 22:14:12 2021 +0000
3862 upstream: document destination-constrained keys
3864 feedback / ok markus@
3866 OpenBSD-Commit-ID: cd8c526c77268f6d91c06adbee66b014d22d672e
3868 commit a6d7677c4abcfba268053e5867f2acabe3aa371b
3869 Author: djm@openbsd.org <djm@openbsd.org>
3870 Date: Sun Dec 19 22:13:55 2021 +0000
3872 upstream: Use hostkey parsed from hostbound userauth request
3874 Require host-bound userauth requests for forwarded SSH connections.
3876 The hostkey parsed from the host-bound userauth request is now checked
3877 against the most recently bound session ID / hostkey on the agent socket
3878 and the signature refused if they do not match.
3882 OpenBSD-Commit-ID: d69877c9a3bd8d1189a5dbdeceefa432044dae02
3884 commit baaff0ff4357cc5a079621ba6e2d7e247b765061
3885 Author: djm@openbsd.org <djm@openbsd.org>
3886 Date: Sun Dec 19 22:13:33 2021 +0000
3888 upstream: agent support for parsing hostkey-bound signatures
3890 Allow parse_userauth_request() to work with blobs from
3891 publickey-hostbound-v00@openssh.com userauth attempts.
3893 Extract hostkey from these blobs.
3897 OpenBSD-Commit-ID: 81c064255634c1109477dc65c3e983581d336df8
3899 commit 3e16365a79cdeb2d758cf1da6051b1c5266ceed7
3900 Author: djm@openbsd.org <djm@openbsd.org>
3901 Date: Sun Dec 19 22:13:12 2021 +0000
3903 upstream: EXT_INFO negotiation of hostbound pubkey auth
3905 the EXT_INFO packet gets a new publickey-hostbound@openssh.com to
3906 advertise the hostbound public key method.
3908 Client side support to parse this feature flag and set the kex->flags
3909 indicator if the expected version is offered (currently "0").
3913 OpenBSD-Commit-ID: 4cdb2ca5017ec1ed7a9d33bda95c1d6a97b583b0
3915 commit 94ae0c6f0e35903b695e033bf4beacea1d376bb1
3916 Author: djm@openbsd.org <djm@openbsd.org>
3917 Date: Sun Dec 19 22:12:54 2021 +0000
3919 upstream: client side of host-bound pubkey authentication
3921 Add kex->flags member to enable the publickey-hostbound-v00@openssh.com
3922 authentication method.
3924 Use the new hostbound method in client if the kex->flags flag was set,
3925 and include the inital KEX hostkey in the userauth request.
3927 Note: nothing in kex.c actually sets the new flag yet
3931 OpenBSD-Commit-ID: 5a6fce8c6c8a77a80ee1526dc467d91036a5910d
3933 commit 288fd0218dbfdcb05d9fbd1885904bed9b6d42e6
3934 Author: djm@openbsd.org <djm@openbsd.org>
3935 Date: Sun Dec 19 22:12:30 2021 +0000
3937 upstream: sshd side of hostbound public key auth
3939 This is identical to the standard "publickey" method, but it also includes
3940 the initial server hostkey in the message signed by the client.
3942 feedback / ok markus@
3944 OpenBSD-Commit-ID: 7ea01bb7238a560c1bfb426fda0c10a8aac07862
3946 commit dbb339f015c33d63484261d140c84ad875a9e548
3947 Author: djm@openbsd.org <djm@openbsd.org>
3948 Date: Sun Dec 19 22:12:07 2021 +0000
3950 upstream: prepare for multiple names for authmethods
3952 allow authentication methods to have one additional name beyond their
3955 allow lookup by this synonym
3957 Use primary name for authentication decisions, e.g. for
3958 PermitRootLogin=publickey
3960 Pass actual invoked name to the authmethods, so they can tell whether they
3961 were requested via the their primary name or synonym.
3965 OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559
3967 commit 39f00dcf44915f20684160f0a88d3ef8a3278351
3968 Author: djm@openbsd.org <djm@openbsd.org>
3969 Date: Sun Dec 19 22:11:39 2021 +0000
3971 upstream: ssh-agent side of destination constraints
3973 Gives ssh-agent the ability to parse restrict-destination-v00@openssh.com
3974 constraints and to apply them to keys.
3976 Check constraints against the hostkeys recorded for a SocketEntry when
3977 attempting a signature, adding, listing or deleting keys. Note that
3978 the "delete all keys" request will remove constrained keys regardless of
3981 feedback Jann Horn & markus@
3984 OpenBSD-Commit-ID: 84a7fb81106c2d609a6ac17469436df16d196319
3986 commit ce943912df812c573a33d00bf9e5435b7fcca3f7
3987 Author: djm@openbsd.org <djm@openbsd.org>
3988 Date: Sun Dec 19 22:11:06 2021 +0000
3990 upstream: ssh-add side of destination constraints
3992 Have ssh-add accept a list of "destination constraints" that allow
3993 restricting where keys may be used in conjunction with a ssh-agent/ssh
3994 that supports session ID/hostkey binding.
3996 Constraints are specified as either "[user@]host-pattern" or
3997 "host-pattern>[user@]host-pattern".
3999 The first form permits a key to be used to authenticate as the
4000 specified user to the specified host.
4002 The second form permits a key that has previously been permitted
4003 for use at a host to be available via a forwarded agent to an
4006 For example, constraining a key with "user1@host_a" and
4007 "host_a>host_b". Would permit authentication as "user1" at
4008 "host_a", and allow the key to be available on an agent forwarded
4009 to "host_a" only for authentication to "host_b". The key would not
4010 be visible on agent forwarded to other hosts or usable for
4011 authentication there.
4013 Internally, destination constraints use host keys to identify hosts.
4014 The host patterns are used to obtain lists of host keys for that
4015 destination that are communicated to the agent. The user/hostkeys are
4016 encoded using a new restrict-destination-v00@openssh.com key
4019 host keys are looked up in the default client user/system known_hosts
4020 files. It is possible to override this set on the command-line.
4022 feedback Jann Horn & markus@
4025 OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5
4027 commit 5e950d765727ee0b20fc3d2cbb0c790b21ac2425
4028 Author: djm@openbsd.org <djm@openbsd.org>
4029 Date: Sun Dec 19 22:10:24 2021 +0000
4031 upstream: ssh-add side of destination constraints
4033 Have ssh-add accept a list of "destination constraints" that allow
4034 restricting where keys may be used in conjunction with a ssh-agent/ssh
4035 that supports session ID/hostkey binding.
4037 Constraints are specified as either "[user@]host-pattern" or
4038 "host-pattern>[user@]host-pattern".
4040 The first form permits a key to be used to authenticate as the
4041 specified user to the specified host.
4043 The second form permits a key that has previously been permitted
4044 for use at a host to be available via a forwarded agent to an
4047 For example, constraining a key with "user1@host_a" and
4048 "host_a>host_b". Would permit authentication as "user1" at
4049 "host_a", and allow the key to be available on an agent forwarded
4050 to "host_a" only for authentication to "host_b". The key would not
4051 be visible on agent forwarded to other hosts or usable for
4052 authentication there.
4054 Internally, destination constraints use host keys to identify hosts.
4055 The host patterns are used to obtain lists of host keys for that
4056 destination that are communicated to the agent. The user/hostkeys are
4057 encoded using a new restrict-destination-v00@openssh.com key
4060 host keys are looked up in the default client user/system known_hosts
4061 files. It is possible to override this set on the command-line.
4063 feedback Jann Horn & markus@
4066 OpenBSD-Commit-ID: ef47fa9ec0e3c2a82e30d37ef616e245df73163e
4068 commit 4c1e3ce85e183a9d0c955c88589fed18e4d6a058
4069 Author: djm@openbsd.org <djm@openbsd.org>
4070 Date: Sun Dec 19 22:09:23 2021 +0000
4072 upstream: ssh-agent side of binding
4074 record session ID/hostkey/forwarding status for each active socket.
4076 Attempt to parse data-to-be-signed at signature request time and extract
4077 session ID from the blob if it is a pubkey userauth request.
4081 OpenBSD-Commit-ID: a80fd41e292b18b67508362129e9fed549abd318
4083 commit e9497ecf73f3c16667288bce48d4e3d7e746fea1
4084 Author: djm@openbsd.org <djm@openbsd.org>
4085 Date: Sun Dec 19 22:08:48 2021 +0000
4087 upstream: ssh client side of binding
4089 send session ID, hostkey, signature and a flag indicating whether the
4090 agent connection is being forwarded to ssh agent each time a connection
4091 is opened via a new "session-bind@openssh.com" agent extension.
4095 OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135
4097 commit b42c61d6840d16ef392ed0f365e8c000734669aa
4098 Author: djm@openbsd.org <djm@openbsd.org>
4099 Date: Sun Dec 19 22:08:06 2021 +0000
4101 upstream: Record session ID, host key and sig at intital KEX
4103 These will be used later for agent session ID / hostkey binding
4107 OpenBSD-Commit-ID: a9af29e33772b18e3e867c6fa8ab35e1694a81fe
4109 commit 26ca33d186473d58a32d812e19273ce078b6ffff
4110 Author: djm@openbsd.org <djm@openbsd.org>
4111 Date: Tue Dec 7 22:06:45 2021 +0000
4113 upstream: better error message for FIDO keys when we can't match
4117 OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650
4119 commit adb0ea006d7668190f0c42aafe3a2864d352e34a
4120 Author: Darren Tucker <dtucker@dtucker.net>
4121 Date: Wed Dec 15 10:50:33 2021 +1100
4123 Correct value for IPTOS_DSCP_LE.
4125 It needs to allow for the preceeding two ECN bits. From daisuke.higashi
4126 at gmail.com via OpenSSH bz#3373, ok claudio@, job@, djm@.
4128 commit 3dafd3fe220bd9046f11fcf5191a79ec8800819f
4129 Author: Darren Tucker <dtucker@dtucker.net>
4130 Date: Fri Dec 10 11:57:30 2021 +1100
4132 Increase timeout for test step.
4134 commit 5aefb05cd5b843e975b191d6ebb7ddf8de35c112
4135 Author: Darren Tucker <dtucker@dtucker.net>
4136 Date: Fri Dec 10 10:27:27 2021 +1100
4138 Update the list of tests that don't work on Minix.
4140 While there, remove CC (configure will now find clang) and make the test
4141 list easier to update via cut and paste.
4143 commit 1c09bb1b2e207d091cec299c49416c23d24a1b31
4144 Author: Darren Tucker <dtucker@dtucker.net>
4145 Date: Fri Dec 10 10:12:57 2021 +1100
4147 Add minix host tuple.
4149 Define SETEUID_BREAKS_SETUID for it which should make privsep work.
4151 commit a2188579032cf080213a78255373263466cb90cc
4152 Author: jsg@openbsd.org <jsg@openbsd.org>
4153 Date: Sun Dec 5 12:28:27 2021 +0000
4155 upstream: fix unintended sizeof pointer in debug path ok markus@
4157 OpenBSD-Commit-ID: b9c0481ffc0cd801e0840e342e6a282a85aac93c
4159 commit da40355234068c82f1a36196f2d18dd2d81aaafd
4160 Author: naddy@openbsd.org <naddy@openbsd.org>
4161 Date: Sat Dec 4 00:05:39 2021 +0000
4163 upstream: RSA/SHA-1 is not used by default anymore on the server
4165 OpenBSD-Commit-ID: 64abef6cfc3e53088225f6b8a1dcd86d52dc8353
4167 commit e9c71498a083a8b502aa831ea931ce294228eda0
4168 Author: djm@openbsd.org <djm@openbsd.org>
4169 Date: Thu Dec 2 23:45:36 2021 +0000
4171 upstream: hash full host:port when asked to hash output, fixes hashes
4173 for non- default ports. bz3367 ok dtucker@
4175 OpenBSD-Commit-ID: 096021cc847da7318ac408742f2d0813ebe9aa73
4177 commit b5601202145a03106012c22cb8980bcac2949f0b
4178 Author: djm@openbsd.org <djm@openbsd.org>
4179 Date: Thu Dec 2 23:23:13 2021 +0000
4181 upstream: improve the testing of credentials against inserted FIDO
4183 keys a little more: ask the token whether a particular key belongs to it in
4184 cases where the token support on-token user- verification (e.g. biometrics)
4185 rather than just assuming that it will accept it.
4187 Will reduce spurious "Confirm user presence" notifications for key
4188 handles that relate to FIDO keys that are not currently inserted in at
4191 Motivated by bz3366; by Pedro Martelletto
4193 OpenBSD-Commit-ID: ffac7f3215842397800e1ae2e20229671a55a63d
4195 commit ca709e27c41c90f4565b17282c48dca7756e083c
4196 Author: djm@openbsd.org <djm@openbsd.org>
4197 Date: Thu Dec 2 22:40:05 2021 +0000
4199 upstream: move check_sk_options() up so we can use it earlier
4201 OpenBSD-Commit-ID: 67fe98ba1c846d22035279782c4664c1865763b4
4203 commit b711bc01a7ec76bb6a285730990cbce9b8ca5773
4204 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4205 Date: Thu Dec 2 22:35:05 2021 +0000
4207 upstream: ssh-rsa is no longer in the default for
4209 PubkeyAcceptedAlgorithms.
4211 OpenBSD-Commit-ID: 34a9e1bc30966fdcc922934ae00f09f2596cd73c
4213 commit dc91ceea33cd4a9f05be953e8d8062f732db5c8a
4214 Author: djm@openbsd.org <djm@openbsd.org>
4215 Date: Thu Dec 2 02:44:44 2021 +0000
4217 upstream: don't put the tty into raw mode when SessionType=none, avoids
4219 ^c being unable to kill such a session. bz3360; ok dtucker@
4221 OpenBSD-Commit-ID: 83960c433052303b643b4c380ae2f799ac896f65
4223 commit e6e7d2654a13ba10141da7b42ea683ea4eeb1f38
4224 Author: Damien Miller <djm@mindrot.org>
4225 Date: Mon Nov 29 14:11:03 2021 +1100
4227 previous commit broke bcrypt_pbkdf()
4229 Accidentally reverted part of the conversion to use SHA512 from SUPERCOP
4230 instead of OpenBSD-style libc SHA512.
4232 commit c0459588b8d00b73e506c6095958ecfe62a4a7ba
4233 Author: Darren Tucker <dtucker@dtucker.net>
4234 Date: Mon Nov 29 14:03:19 2021 +1100
4236 Fix typo in Neils' name.
4238 commit 158bf854e2a22cf09064305f4a4e442670562685
4239 Author: Damien Miller <djm@mindrot.org>
4240 Date: Mon Nov 29 12:30:22 2021 +1100
4242 sync bcrypt-related files with OpenBSD
4244 The main change is that Niels Provos kindly agreed to rescind the
4245 BSD license advertising clause, shifting them to the 3-term BSD
4248 This was the last thing in OpenSSH that used the advertising clause.
4250 commit e8976d92a42883ff6b8991438f07df60c2c0d82d
4251 Author: Damien Miller <djm@mindrot.org>
4252 Date: Mon Nov 29 12:29:29 2021 +1100
4256 commit 8249afeec013e557fe7491a72ca3285de03e25b1
4257 Author: djm@openbsd.org <djm@openbsd.org>
4258 Date: Sun Nov 28 07:21:26 2021 +0000
4260 upstream: sshsig: return "key not found" when searching empty files
4262 rather than "internal error"
4264 OpenBSD-Commit-ID: e2ccae554c78d7a7cd33fc5d217f35be7e2507ed
4266 commit 9e3227d4dbb5ad9c9091b4c14982cab4bba87b4d
4267 Author: djm@openbsd.org <djm@openbsd.org>
4268 Date: Sun Nov 28 07:15:10 2021 +0000
4270 upstream: ssh-keygen -Y match-principals doesn't accept any -O
4272 options at present, so don't say otherwise in SYNOPSIS; spotted jmc@
4274 OpenBSD-Commit-ID: 9cc43a18f4091010741930b48b3db2f2e4f1d35c
4276 commit 56db1f4a4cf5039fc3b42e84c4b16291fdff32b1
4277 Author: djm@openbsd.org <djm@openbsd.org>
4278 Date: Sun Nov 28 07:14:29 2021 +0000
4280 upstream: fix indenting in last commit
4282 OpenBSD-Commit-ID: 8b9ba989815d0dec1fdf5427a4a4b58eb9cac4d2
4284 commit 50bea24a9a9bdebad327c76e700def3261f5694e
4285 Author: djm@openbsd.org <djm@openbsd.org>
4286 Date: Sun Nov 28 07:10:18 2021 +0000
4288 upstream: missing initialisation for oerrno
4290 OpenBSD-Commit-ID: 05d646bba238080259bec821c831a6f0b48d2a95
4292 commit 5a0f4619041d09cd29f3a08da41db5040372bdd1
4293 Author: Darren Tucker <dtucker@dtucker.net>
4294 Date: Sun Nov 28 15:31:37 2021 +1100
4296 Correct ifdef to activate poll() only if needed.
4298 commit d4035c81a71237f690edd7eda32bef7d63fd9528
4299 Author: djm@openbsd.org <djm@openbsd.org>
4300 Date: Sat Nov 27 07:23:35 2021 +0000
4302 upstream: whitespac e
4304 OpenBSD-Regress-ID: b9511d41568056bda489e13524390167889908f8
4306 commit a443491e6782ef0f5a8bb87a5536c8ee4ff233a1
4307 Author: djm@openbsd.org <djm@openbsd.org>
4308 Date: Sat Nov 27 07:20:58 2021 +0000
4310 upstream: regression test for match-principals. Mostly by Fabian
4314 OpenBSD-Regress-ID: ced0bec89af90935103438986bbbc4ad1df9cfa7
4316 commit 78230b3ec8cbabc1e7de68732dc5cbd4837c6675
4317 Author: djm@openbsd.org <djm@openbsd.org>
4318 Date: Sat Nov 27 07:14:46 2021 +0000
4320 upstream: Add ssh-keygen -Y match-principals operation to perform
4322 matching of principals names against an allowed signers file.
4324 Requested by and mostly written by Fabian Stelzer, towards a TOFU
4325 model for SSH signatures in git. Some tweaks by me.
4327 "doesn't bother me" deraadt@
4329 OpenBSD-Commit-ID: 8d1b71f5a4127bc5e10a880c8ea6053394465247
4331 commit 15db86611baaafb24c40632784dabf82e3ddb1a7
4332 Author: djm@openbsd.org <djm@openbsd.org>
4333 Date: Thu Nov 25 23:02:24 2021 +0000
4335 upstream: debug("func: ...") -> debug_f("...")
4337 OpenBSD-Commit-ID: d58494dc05c985326a895adfbe16fbd5bcc54347
4339 commit b7ffbb17e37f59249c31f1ff59d6c5d80888f689
4340 Author: Darren Tucker <dtucker@dtucker.net>
4341 Date: Fri Nov 19 18:53:46 2021 +1100
4343 Allow for fd = -1 in compat ppoll overflow check.
4345 Fixes tests on at least FreeBSD 6, possibly others.
4347 commit 04b172da5b96a51b0d55c905b423ababff9f4e0b
4348 Author: Darren Tucker <dtucker@dtucker.net>
4349 Date: Fri Nov 19 16:01:51 2021 +1100
4351 Don't auto-enable Capsicum sandbox on FreeBSD 9/10.
4353 Since we changed from select() to ppoll() tests have been failing.
4354 This seems to be because FreeBSD 10 (and presumably 9) do not allow
4355 ppoll() in the privsep process and sshd will fail with "Not permitted in
4356 capability mode". Setting CAP_EVENT on the FDs doesn't help, but weirdly,
4357 poll() works without that. Those versions are EOL so this situation is
4360 commit a823f39986e7b879f26412e64c15630e1cfa0dc5
4361 Author: djm@openbsd.org <djm@openbsd.org>
4362 Date: Thu Nov 18 03:53:48 2021 +0000
4364 upstream: regression test for ssh-keygen -Y find-principals fix; from
4366 Fabian Stelzer ok djm markus
4368 OpenBSD-Regress-ID: 34fe4088854c1a2eb4c0c51cc4676ba24096bac4
4370 commit 199c4df66c0e39dd5c3333b162af274678c0501d
4371 Author: djm@openbsd.org <djm@openbsd.org>
4372 Date: Thu Nov 18 21:32:11 2021 +0000
4374 upstream: less confusing debug message; bz#3365
4376 OpenBSD-Commit-ID: 836268d3642c2cdc84d39b98d65837f5241e4a50
4378 commit 97f9b6e61316c97a32dad94b7a37daa9b5f6b836
4379 Author: djm@openbsd.org <djm@openbsd.org>
4380 Date: Thu Nov 18 21:11:01 2021 +0000
4382 upstream: avoid xmalloc(0) for PKCS#11 keyid for ECDSA keys (we
4384 already did this for RSA keys). Avoids fatal errors for PKCS#11 libraries
4385 that return empty keyid, e.g. Microchip ATECC608B "cryptoauthlib"; bz#3364
4387 OpenBSD-Commit-ID: 054d4dc1d6a99a2e6f8eebc48207b534057c154d
4389 commit c74aa0eb73bd1edf79947d92d9c618fc3424c4a6
4390 Author: djm@openbsd.org <djm@openbsd.org>
4391 Date: Thu Nov 18 03:50:41 2021 +0000
4393 upstream: ssh-keygen -Y find-principals was verifying key validity
4395 when using ca certs but not with simple key lifetimes within the allowed
4398 Since it returns the first keys principal it finds this could
4399 result in a principal with an expired key even though a valid
4402 patch from Fabian Stelzer; feedback/ok djm markus
4404 OpenBSD-Commit-ID: b108ed0a76b813226baf683ab468dc1cc79e0905
4406 commit d902d728dfd81622454260e23bc09d5e5a9a795e
4407 Author: Darren Tucker <dtucker@dtucker.net>
4408 Date: Thu Nov 18 23:44:07 2021 +1100
4410 Correct calculation of tv_nsec in poll().
4412 commit 21dd5a9a3fb35e8299a1fbcf8d506f1f6b752b85
4413 Author: Darren Tucker <dtucker@dtucker.net>
4414 Date: Thu Nov 18 23:11:37 2021 +1100
4416 Add compat implementation of ppoll using pselect.
4418 commit b544ce1ad4afb7ee2b09f714aa63efffc73fa93a
4419 Author: Darren Tucker <dtucker@dtucker.net>
4420 Date: Thu Nov 18 23:05:34 2021 +1100
4422 Put poll.h inside ifdef HAVE_POLL_H.
4424 commit 875408270c5a7dd69ed5449e5d85bd7120c88f70
4425 Author: djm@openbsd.org <djm@openbsd.org>
4426 Date: Thu Nov 18 03:31:44 2021 +0000
4428 upstream: check for POLLHUP wherever we check for POLLIN
4430 OpenBSD-Commit-ID: 6aa6f3ec6b17c3bd9bfec672a917f003a76d93e5
4432 commit 36b5e37030d35bbaa18ba56825b1af55971d18a0
4433 Author: djm@openbsd.org <djm@openbsd.org>
4434 Date: Thu Nov 18 03:07:59 2021 +0000
4436 upstream: fd leak in sshd listen loop error path; from Gleb
4440 OpenBSD-Commit-ID: a7a2be27a690a74bf2381bc16cea38e265657412
4442 commit b99498d0c93f1edd04857b318308a66b28316bd8
4443 Author: djm@openbsd.org <djm@openbsd.org>
4444 Date: Thu Nov 18 03:07:20 2021 +0000
4446 upstream: check for POLLHUP as well as POLLIN in sshd listen loop;
4450 OpenBSD-Commit-ID: a4f1244c5a9c2b08dac4f3b1dc22e9d1dc60c587
4452 commit 1f3055d788e8cf80851eb1728b535d57eb0dba6a
4453 Author: djm@openbsd.org <djm@openbsd.org>
4454 Date: Thu Nov 18 03:06:03 2021 +0000
4456 upstream: check for POLLHUP as well as POLLIN, handle transient IO
4458 errors as well as half-close on the output side; ok deraadt millert
4460 OpenBSD-Commit-ID: de5c5b9939a37476d256328cbb96305bdecf511e
4462 commit 9778a15fa6dbdac6a95bf15865c2688b4bd6944e
4463 Author: Damien Miller <djm@mindrot.org>
4464 Date: Thu Nov 18 10:16:55 2021 +1100
4466 adjust seccomp filter for select->poll conversion
4468 Needed to add ppoll syscall but also to relax the fallback rlimit
4469 sandbox. Linux poll() fails with EINVAL if npfds > RLIMIT_NOFILE,
4470 so we have to allow a single fd in the rlimit.
4472 commit fcd8d895bbb849c64f0aed934e3303d37f696f5d
4473 Author: Damien Miller <djm@mindrot.org>
4474 Date: Thu Nov 18 10:16:44 2021 +1100
4478 commit 76292787a1e93e668f10e36b4bf59ce0ae28e156
4479 Author: Damien Miller <djm@mindrot.org>
4480 Date: Thu Nov 18 09:26:20 2021 +1100
4482 compat for timespecsub() and friends
4484 commit fd7e7de4ddb4399c7e929b44f2bbfc118eddfcf8
4485 Author: djm@openbsd.org <djm@openbsd.org>
4486 Date: Wed Nov 17 21:06:39 2021 +0000
4488 upstream: set num_listen_socks to 0 on close-all instead of -1,
4490 which interferes with the new poll()-based listen loop; spotted and debugged
4493 OpenBSD-Commit-ID: f7ab8ab124f615a2e0c45fee14c38d2f2abbabbd
4495 commit fd9343579afac30a971f06643a669733d9acb407
4496 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4497 Date: Sun Nov 14 18:47:43 2021 +0000
4499 upstream: use ppoll() instead of pselect() with djm
4501 OpenBSD-Commit-ID: 980f87c9564d5d2ad55722b7a6f44f21284cd215
4503 commit 092d29b232ef1a19609a5316ed7e4d896bb2e696
4504 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4505 Date: Sun Nov 14 06:15:36 2021 +0000
4507 upstream: match .events with .fd better
4509 OpenBSD-Commit-ID: 77eef212ca0add905949532af390164489c5984b
4511 commit 8d642c9a90fa4ed5a3effd785fb3591e14de00cd
4512 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4513 Date: Sun Nov 14 03:25:10 2021 +0000
4515 upstream: convert select() to poll() ok djm
4517 OpenBSD-Commit-ID: b53e4940ff10dd24f8d16e8db8ef1970015d7ead
4519 commit 6582a31c388968f4073af2bd8621880735c3d42b
4520 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4521 Date: Sat Nov 13 21:14:13 2021 +0000
4523 upstream: replace select() with ppoll(), including converting
4525 timeval's to timespec's to make things easier. back and forth and ok; djm
4527 OpenBSD-Commit-ID: 89d3b23c60875da919e7820f9de6213286ffbec9
4529 commit 7c025c005550c86a40200a2bcdd355d09413d61a
4530 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4531 Date: Sat Nov 13 17:26:13 2021 +0000
4533 upstream: It really looks like pledge "stdio dns" is possible
4535 earlier. Discussed with mestre
4537 OpenBSD-Commit-ID: 610873de63a593e0ac7bbbcb7a0f2894d36f4c01
4539 commit 06acb04c20ee483fe4757bd12aec870cc4bb1076
4540 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4541 Date: Fri Nov 12 05:23:49 2021 +0000
4543 upstream: aggressively pre-fill the pollfd array with fd=-1
4545 OpenBSD-Commit-ID: c2a525de8f83c1a04405bd79122c424140552a5b
4547 commit 7eec76793dec06e8f06b6cf71f9473141c69d109
4548 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4549 Date: Thu Nov 11 15:32:32 2021 +0000
4551 upstream: Convert from select() to ppoll(). Along the way, I
4553 observed that the select() code was using exceptfds incorrectly.. ok millert
4555 OpenBSD-Commit-ID: 548e05bfc31b2af02319eb3d051286d4128dec96
4557 commit e665ed2d0c24fe11d5470ce72fa1e187377d3fc4
4558 Author: Darren Tucker <dtucker@dtucker.net>
4559 Date: Fri Nov 12 22:55:27 2021 +1100
4561 Switch from LibreSSL 3.4.0 to 3.4.1.
4563 The LibreSSL 3.4.0 release has an OPENBSD_BRANCH that points to
4564 "master" and that branch no longer has the files LibreSSL expects
4565 and thus it will no longer build, breaking the test.
4567 commit 21b6b5a06c8c53c548d25e6074c5240e88e2ef34
4568 Author: djm@openbsd.org <djm@openbsd.org>
4569 Date: Wed Nov 10 06:29:25 2021 +0000
4571 upstream: add the sntrup761x25519-sha512@openssh.com hybrid
4573 ECDH/x25519 + Streamlined NTRU Prime post-quantum KEX to the default
4574 KEXAlgorithms list (after the ECDH methods but before the prime-group DH
4579 OpenBSD-Commit-ID: 22b77e27a04e497a10e22f138107579652854210
4581 commit 239da797cbf07a640d7b1ea02d3f99ace3ef792d
4582 Author: djm@openbsd.org <djm@openbsd.org>
4583 Date: Wed Nov 10 06:25:08 2021 +0000
4585 upstream: fix ssh-keysign for KEX algorithms that use SHA384/512
4587 exchange hashes; feedback/ok markus@
4589 OpenBSD-Commit-ID: 09a8fda1c081f5de1e3128df64f28b7bdadee239
4591 commit 6997a592ecb1013df0c6d7f8df3e6517827aef11
4592 Author: djm@openbsd.org <djm@openbsd.org>
4593 Date: Mon Nov 8 21:32:49 2021 +0000
4595 upstream: improve error message when trying to expand a ~user path
4597 for a user that doesn't exist; better matches what the shell does
4601 OpenBSD-Commit-ID: 1ddefa3c3a78b69ce13d1b8f67bc9f2cefd23ad6
4603 commit 10b899a15c88eb40eb5f73cd0fa84ef0966f79c9
4604 Author: Darren Tucker <dtucker@dtucker.net>
4605 Date: Wed Nov 10 12:34:25 2021 +1100
4607 Don't trust closefrom() on Linux.
4609 glibc's closefrom implementation does not work in a chroot when the kernel
4610 does not have close_range. It tries to read from /proc/self/fd and when
4611 that fails dies with an assertion of sorts. Instead, call close_range
4612 ourselves from our compat code and fall back if that fails. bz#3349,
4613 with william.wilson at canonical.com and fweimer at redhat.com.
4615 commit eb1f63195a9a38b519536a5b398d9939261ec081
4616 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4617 Date: Sat Nov 6 10:13:39 2021 +0000
4619 upstream: Plug a couple of minor mem leaks. From beldmit at
4621 gmail.com via github PR#283, ok markus@
4623 OpenBSD-Commit-ID: ec1fa7d305d46226861c3ca6fb9c9beb2ada2892
4625 commit e4f501bf1d3b53f1cc23d9521fd7c5163307b760
4626 Author: djm@openbsd.org <djm@openbsd.org>
4627 Date: Fri Nov 5 03:10:58 2021 +0000
4629 upstream: move cert_filter_principals() to earlier in the file for
4631 reuse; no code change
4633 OpenBSD-Commit-ID: 598fa9528b656b2f38bcc3cf5b6f3869a8c115cf
4635 commit 59c60f96fee321c7f38f00372826d37f289534af
4636 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4637 Date: Wed Nov 3 22:00:56 2021 +0000
4639 upstream: Many downstreams expect ssh to compile as non-C99...
4641 OpenBSD-Commit-ID: e6aa3e08bda68e5fb838fc8a49b1d2dfc38ee783
4643 commit 7a78fe63b0b28ef7231913dfefe9d08f9bc41c61
4644 Author: Darren Tucker <dtucker@dtucker.net>
4645 Date: Sat Nov 6 21:07:03 2021 +1100
4647 Skip getline() on HP-UX 10.x.
4649 HP-UX 10.x has a getline() implementation in libc that does not behave
4650 as we expect so don't use it. With correction from Thorsten Glaser and
4651 typo fix from Larkin Nickle.
4653 commit 343ae252ebb35c6ecae26b447bf1551a7666720e
4654 Author: Damien Miller <djm@mindrot.org>
4655 Date: Wed Nov 3 12:08:21 2021 +1100
4657 basic SECURITY.md (refers people to the website)
4659 commit ed45a0168638319e0a710633f6085b96b9cec656
4660 Author: djm@openbsd.org <djm@openbsd.org>
4661 Date: Tue Nov 2 22:57:27 2021 +0000
4663 upstream: crank SSH_SK_VERSION_MAJOR to match recent change in
4667 OpenBSD-Regress-ID: 113d181c7e3305e138db9b688cdb8b0a0019e552
4669 commit f3c34df860c4c1ebddacb973954e58167d9dbade
4670 Author: djm@openbsd.org <djm@openbsd.org>
4671 Date: Tue Nov 2 22:56:40 2021 +0000
4673 upstream: Better handle FIDO keys on tokens that provide user
4675 verification (UV) on the device itself, including biometric keys.
4677 Query the token during key creation to determine whether it supports
4678 on-token UV and, if so, clear the SSH_SK_USER_VERIFICATION_REQD flag
4679 in the key so that ssh(1) doesn't automatically prompty for PIN later.
4681 When making signatures with the key, query the token's capabilities
4682 again and check whether the token is able (right now) to perform user-
4683 verification without a PIN. If it is then the PIN prompt is bypassed
4684 and user verification delegated to the token. If not (e.g. the token
4685 is biometric capable, but no biometric are enrolled), then fall back
4686 to user verification via the usual PIN prompt.
4688 Work by Pedro Martelletto; ok myself and markus@
4690 NB. cranks SSH_SK_VERSION_MAJOR
4692 OpenBSD-Commit-ID: e318a8c258d9833a0b7eb0236cdb68b5143b2f27
4694 commit 0328a081f38c09d2d4d650e94461a47fb5eef536
4695 Author: djm@openbsd.org <djm@openbsd.org>
4696 Date: Fri Oct 29 03:03:06 2021 +0000
4698 upstream: sshsig: add tests for signing key validity and
4702 - adds generic find-principals tests (this command had none before)
4703 - tests certs with a timeboxed validity both with and without a
4704 restriced lifetime for the CA
4705 - test for a revoked CA cert
4709 OpenBSD-Regress-ID: 9704b2c6df5b8ccfbdf2c06c5431f5f8cad280c9
4711 commit ccd358e1e25e25c13f0825996283cbf7a1647a3b
4712 Author: djm@openbsd.org <djm@openbsd.org>
4713 Date: Fri Oct 29 02:48:19 2021 +0000
4715 upstream: avoid signedness warning; spotted in -portable
4717 OpenBSD-Regress-ID: 4cacc126086487c0ea7f3d86b42dec458cf0d0c6
4719 commit 2741f52beb11490d7033a25e56ed0496f0c78006
4720 Author: djm@openbsd.org <djm@openbsd.org>
4721 Date: Fri Oct 29 03:20:46 2021 +0000
4723 upstream: ssh-keygen: make verify-time argument parsing optional
4727 OpenBSD-Commit-ID: 1ff35e4c366a45a073663df90381be6a8ef4d370
4729 commit a1217d363b88b32cfe54c4f02c6c1cf4bdefdd23
4730 Author: Damien Miller <djm@mindrot.org>
4731 Date: Fri Oct 29 13:48:34 2021 +1100
4733 unbreak fuzz harness for recent changes
4735 commit 68e522ed8183587c9367fa3842c5b75f64f3d12b
4736 Author: Darren Tucker <dtucker@dtucker.net>
4737 Date: Fri Oct 29 13:32:24 2021 +1100
4739 Use -Wbitwise-instead-of-logical if supported.
4741 commit be28b23012aa3fa323be7ec84863cf238927c078
4742 Author: Damien Miller <djm@mindrot.org>
4743 Date: Thu Oct 28 16:24:53 2021 +1100
4745 use -Wmisleading-indentation cflag if available
4749 commit 2e6f5f24dd2f9217f4ab8b737ed428d5d5278f91
4750 Author: Damien Miller <djm@mindrot.org>
4751 Date: Thu Oct 28 16:24:44 2021 +1100
4755 commit a5ab4882348d26addc9830a44e053238dfa2cb58
4756 Author: Damien Miller <djm@mindrot.org>
4757 Date: Thu May 6 10:08:30 2021 +1000
4759 remove built-in support for md5crypt()
4761 Users of MD5-hashed password should arrange for ./configure to link
4762 against libxcrypt or similar. Though it would be better to avoid use
4763 of MD5 password hashing entirely, it's arguably worse than DEScrypt.
4765 feedback and ok dtucker@
4767 commit c5de1fffa6328b8246b87da28fa9df05813f76a3
4768 Author: djm@openbsd.org <djm@openbsd.org>
4769 Date: Thu Oct 28 02:55:30 2021 +0000
4771 upstream: increment SSH_SK_VERSION_MAJOR to match last change
4773 OpenBSD-Regress-ID: 17873814d1cbda97f49c8528d7b5ac9cadf6ddc0
4775 commit 0001d04e55802d5bd9d6dece1081a99aa4ba2828
4776 Author: djm@openbsd.org <djm@openbsd.org>
4777 Date: Thu Oct 28 02:54:18 2021 +0000
4779 upstream: When downloading resident keys from a FIDO token, pass
4781 back the user ID that was used when the key was created and append it to the
4782 filename the key is written to (if it is not the default).
4784 Avoids keys being clobbered if the user created multiple
4785 resident keys with the same application string but different
4788 feedback Pedro Martelletto; ok markus
4790 NB. increments SSH_SK_VERSION_MAJOR
4792 OpenBSD-Commit-ID: dbd658b5950f583106d945641a634bc6562dd3a3
4794 commit d4bed5445646e605c383a4374fa962e23bf9e3a3
4795 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4796 Date: Sun Oct 24 21:24:17 2021 +0000
4798 upstream: For open/openat, if the flags parameter does not contain
4800 O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant. Many developers
4801 in the past have passed mode_t (0, 044, 0644, or such), which might lead
4802 future people to copy this broken idiom, and perhaps even believe this
4803 parameter has some meaning or implication or application. Delete them all.
4804 This comes out of a conversation where tb@ noticed that a strange (but
4805 intentional) pledge behaviour is to always knock-out high-bits from mode_t on
4806 a number of system calls as a safety factor, and his bewilderment that this
4807 appeared to be happening against valid modes (at least visually), but no
4808 sorry, they are all irrelevant junk. They could all be 0xdeafbeef. ok
4811 OpenBSD-Commit-ID: 503d11633497115688c0c6952686524f01f53121
4813 commit d575cf44895104e0fcb0629920fb645207218129
4814 Author: Darren Tucker <dtucker@dtucker.net>
4815 Date: Fri Oct 22 23:27:41 2021 +1100
4817 kitchensink test target now needs krb5.
4819 commit 4ae39cada214e955bcfd3448ff28f0ed18886706
4820 Author: Darren Tucker <dtucker@dtucker.net>
4821 Date: Fri Oct 22 22:54:33 2021 +1100
4823 Test both MIT KRB5 and Heimdal.
4825 commit 22b2681d88619e5247dc53c9f112058a7e248d48
4826 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4827 Date: Fri Oct 22 10:51:57 2021 +0000
4829 upstream: Plug mem addrinfo mem leaks.
4831 Prevent mem leaks in the (unlikely) event that getaddrinfo returns
4832 no addresses. ALso, remove an unneeded NULL check in addr_ntop. From
4833 khaleesicodes via github PR#281, ok deraadt@
4835 OpenBSD-Commit-ID: e8a5afc686376637c355c5f7e122dc4b080b9c1a
4837 commit 27c8c343b610263f83ac2328735feeb881c6c92f
4838 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4839 Date: Fri Oct 22 09:22:04 2021 +0000
4841 upstream: Remove unnecessary semicolons
4843 ... in case statements. From khaleesicodes via github PR#280.
4845 OpenBSD-Commit-ID: e1e89360b65775cff83e77ce040b342015caf4ed
4847 commit e7eb73b8d1fe1008d92433ea949491ce654bfaba
4848 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4849 Date: Fri Oct 22 09:19:34 2021 +0000
4851 upstream: Fix typos in comments.
4853 From khaleesicodes via github PR#280.
4855 OpenBSD-Commit-ID: 26fdd83652c40f098bf7c685e8ebb9eb72cc45fc
4857 commit 052a9d8494175e24312daa6c132665e58c17fe6e
4858 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4859 Date: Fri Oct 15 14:46:46 2021 +0000
4861 upstream: switch scp(1) back to sftp protocol.
4863 openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
4864 protocol for copying. Let's get back to testing the SFTP protocol.
4866 OpenBSD-Commit-ID: 9eaa35d95fd547b78b0a043b3f518e135f151f30
4868 commit a07664646bf6d293f5bbd45a5de54f3c36bb85da
4869 Author: Darren Tucker <dtucker@dtucker.net>
4870 Date: Fri Oct 22 14:00:05 2021 +1100
4872 Source configs script so setup_ci can use settings
4874 commit 34df52c201c6b47e5a46b50c215e4d98a8bf6587
4875 Author: Darren Tucker <dtucker@dtucker.net>
4876 Date: Fri Oct 22 09:42:14 2021 +1100
4878 Install libedit and pam based on config flags.
4880 commit 8c626cc563e8d21d844d06f9971a9ee01de6aa2a
4881 Author: Darren Tucker <dtucker@dtucker.net>
4882 Date: Thu Oct 21 16:53:39 2021 +1100
4884 Don't use 'here string", it's not POSIX.
4886 commit 086a4b5977472aefa3de918b88efad0faf83b2b1
4887 Author: Darren Tucker <dtucker@dtucker.net>
4888 Date: Thu Oct 21 15:33:27 2021 +1100
4890 Remove -Werror from compiler package to install.
4892 commit 5a7a4687507d057f9b5e7497f3d3f82e64753c02
4893 Author: Darren Tucker <dtucker@dtucker.net>
4894 Date: Thu Oct 21 15:00:53 2021 +1100
4896 Build with -Werror on most recent gcc and clang.
4898 commit 4d2cbdb525d673acf941d48a7044fcf03125611a
4899 Author: Darren Tucker <dtucker@dtucker.net>
4900 Date: Fri Oct 15 12:59:06 2021 +1100
4902 Include string.h and stdio.h for strerror.
4904 commit fff13aaa262b7b3ec83ed21e29674cbf331780a7
4905 Author: Darren Tucker <dtucker@dtucker.net>
4906 Date: Fri Oct 15 12:43:36 2021 +1100
4908 Include error reason if trace disabling fails.
4910 commit d4b38144c02f3faa5271e5fb35df93507e06f1b4
4911 Author: Darren Tucker <dtucker@dtucker.net>
4912 Date: Tue Oct 12 22:55:51 2021 +1100
4914 Add tcmalloc test target.
4916 commit 002d65b0a30063c6e49bf8a53e709d8d5a0d45c1
4917 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4918 Date: Sat Oct 9 10:52:42 2021 +0000
4920 upstream: Document that CASignatureAlgorithms, ExposeAuthInfo and
4922 PubkeyAuthOptions can be used in a Match block. Patch from eehakkin via
4925 OpenBSD-Commit-ID: c0a63f5f52e918645967ac022b28392da4b866aa
4927 commit 40bd3709dddaae3a1b6113748bec3faa6a607531
4928 Author: Darren Tucker <dtucker@dtucker.net>
4929 Date: Thu Oct 7 15:55:49 2021 +1100
4931 Skip SK unit tests when built without security-key
4933 commit 482f73be10f10b93f818df19fcc8a912c0c371fc
4934 Author: Darren Tucker <dtucker@dtucker.net>
4935 Date: Thu Oct 7 15:55:04 2021 +1100
4937 Include relevant env vars on command line.
4939 Makes it easier to reproduce a build by cut/pasting the configure line.
4941 commit ef5916b8acd9b1d2f39fad4951dae03b00dbe390
4942 Author: Darren Tucker <dtucker@dtucker.net>
4943 Date: Thu Oct 7 14:28:02 2021 +1100
4945 Only enable sk-* key types if ENABLE_SK is defined
4947 commit 52d4232b493a9858fe616e28a8bbcc89afa2ad4d
4948 Author: Darren Tucker <dtucker@dtucker.net>
4949 Date: Wed Oct 6 18:14:37 2021 +1100
4951 Disable security key on minix3.
4953 The test doesn't work so disable.
4955 commit 7cd062c3a29669b8d7dc2a97e6575f4dcb7d35a2
4956 Author: Darren Tucker <dtucker@dtucker.net>
4957 Date: Wed Oct 6 17:45:28 2021 +1100
4959 Add USE_LIBC_SHA2 for (at least) NetBSD 9.
4961 commit 639c440f6c3c2a8216a5eb9455ef13bf4204089c
4962 Author: Darren Tucker <dtucker@dtucker.net>
4963 Date: Wed Oct 6 17:09:31 2021 +1100
4965 Define OPENSSL_NO_SHA including OpenSSL from test.
4967 We don't use SHA256 from OpenSSL in the sk-dummy module and the
4968 definitions can conflict with system sha2.h (eg on NetBSD) so define
4969 OPENSSL_NO_SHA so we don't attempt to redefine them.
4971 commit 8f4be526a338d06624f146fa26007bb9dd3a4f7b
4972 Author: Darren Tucker <dtucker@dtucker.net>
4973 Date: Wed Oct 6 15:40:58 2021 +1100
4975 Disable security key on NetBSD4 test.
4977 sk-dummy used for the security key test includes both sha2.h and OpenSSL
4978 causing the definitions conflict so disable security key support on this
4981 commit 3b353ae58aa07a1cbbeb1da3ace21fc0dcccd66a
4982 Author: Damien Miller <djm@mindrot.org>
4983 Date: Wed Oct 6 15:07:01 2021 +1100
4985 clean regress/misc/sk-dummy in cleandir target
4987 commit 57680a2ab43518c5ccbd8242c40482106cde6ac1
4988 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4989 Date: Sat Oct 2 03:17:01 2021 +0000
4991 upstream: Dynamically allocate encoded HashKnownHosts and free as
4993 appropriate. Saves 1k of static storage and prevents snprintf "possible
4994 truncation" warnings from newer compilers (although in this case it's false
4995 positive since the actual sizes are limited by the output size of the SHA1).
4998 OpenBSD-Commit-ID: e254ae723f7e3dce352c7d5abc4b6d87faf61bf4
5000 commit e3e62deb549fde215b777d95276c304f84bf00c6
5001 Author: djm@openbsd.org <djm@openbsd.org>
5002 Date: Wed Oct 6 03:35:13 2021 +0000
5004 upstream: use libc SHA256 functions; make this work when compiled
5008 OpenBSD-Regress-ID: fda0764c1097cd42f979ace29b07eb3481259890
5010 commit 12937d867019469ebce83c2ff614cdc6688fc2d8
5011 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5012 Date: Fri Oct 1 05:20:20 2021 +0000
5014 upstream: Add test for ssh hashed known_hosts handling.
5016 OpenBSD-Regress-ID: bcef3b3cd5a1ad9899327b4b2183de2541aaf9cf
5018 commit 5a37cc118f464416d08cd0291a9b1611d8de9943
5019 Author: Damien Miller <djm@mindrot.org>
5020 Date: Wed Oct 6 13:16:21 2021 +1100
5022 fix broken OPENSSL_HAS_ECC test
5026 commit 16a25414f303cd6790eb967aeb962040e32c9c7a
5027 Author: Damien Miller <djm@mindrot.org>
5028 Date: Fri Oct 1 22:40:06 2021 +1000
5030 make sk-dummy.so work without libcrypto installed
5032 commit dee22129bbc61e25b1003adfa2bc584c5406ef2d
5033 Author: Damien Miller <djm@mindrot.org>
5034 Date: Fri Oct 1 16:35:49 2021 +1000
5036 make OPENSSL_HAS_ECC checks more thorough
5040 commit 872595572b6c9a584ed754165e8b7c4c9e7e1d61
5041 Author: Damien Miller <djm@mindrot.org>
5042 Date: Fri Oct 1 16:35:05 2021 +1000
5044 fix FIDO key support for !OPENSSL_HAS_ECC case
5048 commit 489741dc68366940d369ac670b210b4834a6c272
5049 Author: Damien Miller <djm@mindrot.org>
5050 Date: Fri Oct 1 14:51:37 2021 +1000
5052 enable security key support for --without-openssl
5054 commit c978565c8589acfe4ea37ab5099d39c84158c713
5055 Author: Damien Miller <djm@mindrot.org>
5056 Date: Fri Oct 1 13:27:50 2021 +1000
5058 need stdlib.h for free(3)
5060 commit 76a398edfb51951b2d65d522d7b02c72304db300
5061 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5062 Date: Thu Sep 30 05:26:26 2021 +0000
5064 upstream: Fix up whitespace left by previous
5066 change removing privsep. No other changes.
5068 OpenBSD-Regress-ID: 87adec225d8afaee4d6a91b2b71203f52bf14b15
5070 commit ddcb53b7a7b29be65d57562302b2d5f41733e8dd
5071 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5072 Date: Thu Sep 30 05:20:08 2021 +0000
5074 upstream: Remove references to privsep.
5076 This removes several do..while loops but does not change the
5077 indentation of the now-shallower loops, which will be done in a separate
5078 whitespace-only commit to keep changes of style and substance separate.
5080 OpenBSD-Regress-ID: 4bed1a0249df7b4a87c965066ce689e79472a8f7
5082 commit ece2fbe486164860de8df3f8b943cccca3085eff
5083 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5084 Date: Thu Sep 30 04:22:50 2021 +0000
5086 upstream: Use "skip" instead of "fatal"
5088 if SUDO isn't set for the *-command tests. This means running "make tests"
5089 without SUDO set will perform all of the tests that it can instead of
5090 failing on the ones it cannot run.
5092 OpenBSD-Regress-ID: bd4dbbb02f34b2e8c890558ad4a696248def763a
5094 commit bb754b470c360e787a99fb4e88e2668198e97b41
5095 Author: djm@openbsd.org <djm@openbsd.org>
5096 Date: Fri Oct 1 04:50:36 2021 +0000
5098 upstream: unbreak FIDO sk-ed25519 key enrollment for OPENSSL=no builds;
5102 OpenBSD-Commit-ID: 6323a5241728626cbb2bf0452cf6a5bcbd7ff709
5104 commit 207648d7a6415dc915260ca75850404dbf9f0a0b
5105 Author: Darren Tucker <dtucker@dtucker.net>
5106 Date: Wed Sep 29 20:03:58 2021 +1000
5108 Include stdlib.h for arc4random_uniform prototype.
5110 commit 696aadc854582c164d5fc04933d2f3e212dc0e06
5111 Author: Darren Tucker <dtucker@dtucker.net>
5112 Date: Wed Sep 29 20:00:30 2021 +1000
5114 Look for clang after cc and gcc.
5116 commit a3c6375555026d85dbf811fab566b9f76f196144
5117 Author: Darren Tucker <dtucker@dtucker.net>
5118 Date: Wed Sep 29 19:30:59 2021 +1000
5120 Use backticks instead of $(..) for portability.
5122 Older shells (eg /bin/sh on Solaris 10) don't support $() syntax.
5124 commit 958aaa0387133d51f84fe9c8f30bca03025f2867
5125 Author: Darren Tucker <dtucker@dtucker.net>
5126 Date: Wed Sep 29 18:53:32 2021 +1000
5128 Skip file-based tests by default on Mac OS.
5130 The file-based tests need OpenSSL so skip them.
5132 commit 55c8bdf6e9afb0f9fa8e4f10c25c7f0081b48fd0
5133 Author: Darren Tucker <dtucker@dtucker.net>
5134 Date: Wed Sep 29 18:42:47 2021 +1000
5136 Build without OpenSSL on Mac OS.
5138 Modern versions don't ship enough libcrypto to build against.
5140 commit c9172193ea975415facf0afb356d87df21535f88
5141 Author: Darren Tucker <dtucker@dtucker.net>
5142 Date: Wed Sep 29 18:33:38 2021 +1000
5144 Remove TEST_SSH_ECC.
5146 Convert the only remaining user of it to runtime detection using ssh -Q.
5148 commit 5e6d28b7874b0deae95d2c68947c45212d32e599
5149 Author: Darren Tucker <dtucker@dtucker.net>
5150 Date: Wed Sep 29 17:48:09 2021 +1000
5152 Split c89 test openssl setting out.
5154 commit c4ac7f98e230e83c015678dc958b1ffe828564ad
5155 Author: Darren Tucker <dtucker@dtucker.net>
5156 Date: Wed Sep 29 17:40:50 2021 +1000
5158 Expand TEST_SHELL consistently with other vars.
5160 commit cfe5f7b0eb7621bfb0a756222de0431315c2ab8b
5161 Author: Darren Tucker <dtucker@dtucker.net>
5162 Date: Wed Sep 29 17:26:50 2021 +1000
5164 Replace `pwd` with make variable in regress cmd.
5166 commit 899be59da5fbc3372444bd0fbe74af48313bed33
5167 Author: Darren Tucker <dtucker@dtucker.net>
5168 Date: Wed Sep 29 17:14:33 2021 +1000
5170 Get BUILDDIR from autoconf.
5172 Use this to replace `pwd`s in regress test command line.
5174 commit c8d92d3d4f7d560146f2f936156ec4dac3fc5811
5175 Author: Darren Tucker <dtucker@dtucker.net>
5176 Date: Wed Sep 29 13:28:56 2021 +1000
5178 Add make clean step to tests.
5180 commit 360fb41ef8359619ab90b0d131c914494e55d3dd
5181 Author: Darren Tucker <dtucker@dtucker.net>
5182 Date: Wed Sep 29 11:36:13 2021 +1000
5184 Test all available clang and gcc versions.
5186 commit 4fb49899d7da22952d35a4bc4c9bdb2311087893
5187 Author: djm@openbsd.org <djm@openbsd.org>
5188 Date: Wed Sep 29 01:32:21 2021 +0000
5190 upstream: Test certificate hostkeys held in ssh-agent too. Would have
5192 caught regression fixed in sshd r1.575
5196 OpenBSD-Regress-ID: 1f164d7bd89f83762db823eec4ddf2d2556145ed
5198 commit ce4854e12e749a05646e5775e9deb8cfaf49a755
5199 Author: djm@openbsd.org <djm@openbsd.org>
5200 Date: Wed Sep 29 01:33:32 2021 +0000
5202 upstream: add some debug output showing how many key file/command lines
5204 were processed. Useful to see whether a file or command actually has keys
5207 OpenBSD-Commit-ID: 0bd9ff94e84e03a22df8e6c12f6074a95d27f23c
5209 commit 15abdd523501c349b703d9a27e2bb4252ad921ef
5210 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5211 Date: Tue Sep 28 11:14:50 2021 +0000
5213 upstream: Make prototype for rijndaelEncrypt match function
5215 including the bounds. Fixes error in portable where GCC>=11 takes notice of
5216 the bounds. ok deraadt@
5218 OpenBSD-Commit-ID: cdd2f05fd1549e1786a70871e513cf9e9cf099a6
5220 commit d1d29ea1d1ef1a1a54b209f062ec1dcc8399cf03
5221 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5222 Date: Tue Sep 28 11:10:05 2021 +0000
5224 upstream: Import regenerated moduli.
5226 OpenBSD-Commit-ID: 4bec5db13b736b64b06a0fca704cbecc2874c8e1
5228 commit 39f2111b1d5f00206446257377dcce58cc72369f
5229 Author: Darren Tucker <dtucker@dtucker.net>
5230 Date: Wed Sep 29 10:53:55 2021 +1000
5232 Add new compiler hardening flags.
5234 Add -fzero-call-used-regs and -ftrivial-auto-var-init to the list of
5235 compiler hardening flags that configure checks for. These are supported
5236 by clang and gcc, and make ROP gadgets less useful and mitigate
5237 stack-based infoleaks respectively. ok djm@
5239 commit bf944e3794eff5413f2df1ef37cddf96918c6bde
5240 Author: Damien Miller <djm@mindrot.org>
5241 Date: Mon Sep 27 00:03:19 2021 +1000
5243 initgroups needs grp.h
5245 commit 8c5b5655149bd76ea21026d7fe73ab387dbc3bc7
5246 Author: djm@openbsd.org <djm@openbsd.org>
5247 Date: Sun Sep 26 14:01:11 2021 +0000
5249 upstream: openssh-8.8
5251 OpenBSD-Commit-ID: 12357794602ac979eb7312a1fb190c453f492ec4
5253 commit f3cbe43e28fe71427d41cfe3a17125b972710455
5254 Author: djm@openbsd.org <djm@openbsd.org>
5255 Date: Sun Sep 26 14:01:03 2021 +0000
5257 upstream: need initgroups() before setresgid(); reported by anton@,
5261 OpenBSD-Commit-ID: 6aa003ee658b316960d94078f2a16edbc25087ce
5263 commit 8acaff41f7518be40774c626334157b1b1c5583c
5264 Author: Damien Miller <djm@mindrot.org>
5265 Date: Sun Sep 26 22:16:36 2021 +1000
5267 update version numbers for release
5269 commit d39039ddc0010baa91c70a0fa0753a2699bbf435
5270 Author: kn@openbsd.org <kn@openbsd.org>
5271 Date: Sat Sep 25 09:40:33 2021 +0000
5273 upstream: RSA/SHA-1 is not used by default anymore
5275 OK dtucker deraadt djm
5277 OpenBSD-Commit-ID: 055c51a221c3f099dd75c95362f902da1b8678c6
5279 commit 9b2ee74e3aa8c461eb5552a6ebf260449bb06f7e
5280 Author: Darren Tucker <dtucker@dtucker.net>
5281 Date: Fri Sep 24 11:08:03 2021 +1000
5283 Move the fgrep replacement to hostkey-rotate.sh.
5285 The fgrep replacement for buggy greps doesn't work in the sftp-glob test
5286 so move it to just where we know it's needed.
5288 commit f7039541570d4b66d76e6f574544db176d8d5c02
5289 Author: Darren Tucker <dtucker@dtucker.net>
5290 Date: Fri Sep 24 08:04:14 2021 +1000
5292 Replacement function for buggy fgrep.
5294 GNU (f)grep <=2.18, as shipped by FreeBSD<=12 and NetBSD<=9 will
5295 occasionally fail to find ssh host keys in the hostkey-rotate test.
5296 If we have those versions, use awk instead.
5298 commit f6a660e5bf28a01962af87568e118a2d2e79eaa0
5299 Author: David Manouchehri <david.manouchehri@riseup.net>
5300 Date: Thu Sep 23 17:03:18 2021 -0400
5302 Don't prompt for yes/no questions.
5304 commit 7ed1a3117c09f8c3f1add35aad77d3ebe1b85b4d
5305 Author: djm@openbsd.org <djm@openbsd.org>
5306 Date: Mon Sep 20 06:53:56 2021 +0000
5308 upstream: fix missing -s in SYNOPSYS and usage() as well as a
5310 capitalisation mistake; spotted by jmc@
5312 OpenBSD-Commit-ID: 0ed8ee085c7503c60578941d8b45f3a61d4c9710
5314 commit 8c07170135dde82a26886b600a8bf6fb290b633d
5315 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5316 Date: Mon Sep 20 04:02:13 2021 +0000
5318 upstream: Fix "Allocated port" debug message
5320 for unix domain sockets. From peder.stray at gmail.com via github PR#272,
5323 OpenBSD-Commit-ID: 8d5ef3fbdcdd29ebb0792b5022a4942db03f017e
5325 commit 277d3c6adfb128b4129db08e3d65195d94b55fe7
5326 Author: djm@openbsd.org <djm@openbsd.org>
5327 Date: Mon Sep 20 01:55:42 2021 +0000
5329 upstream: Switch scp back to use the old protocol by default, ahead of
5331 release. We'll wait a little longer for people to pick up sftp-server(8) that
5332 supports the extension that scp needs for ~user paths to continue working in
5333 SFTP protocol mode. Discussed with deraadt@
5335 OpenBSD-Commit-ID: f281f603a705fba317ff076e7b11bcf2df941871
5337 commit ace19b34cc15bea3482be90450c1ed0cd0dd0669
5338 Author: djm@openbsd.org <djm@openbsd.org>
5339 Date: Sat Sep 18 02:03:25 2021 +0000
5341 upstream: better error message for ~user failures when the
5343 sftp-server lacks the expand-path extension; ok deraadt@
5345 OpenBSD-Commit-ID: 9c1d965d389411f7e86f0a445158bf09b8f9e4bc
5347 commit 6b1238ba971ee722a310d95037b498ede5539c03
5348 Author: djm@openbsd.org <djm@openbsd.org>
5349 Date: Thu Sep 16 15:22:22 2021 +0000
5351 upstream: make some more scp-in-SFTP mode better match Unix idioms
5353 suggested by deraadt@
5355 OpenBSD-Commit-ID: 0f2439404ed4cf0b0be8bf49a1ee734836e1ac87
5357 commit e694f8ac4409931e67d08ac44ed251b20b10a957
5358 Author: djm@openbsd.org <djm@openbsd.org>
5359 Date: Thu Sep 16 15:11:19 2021 +0000
5361 upstream: allow log_stderr==2 to prefix log messages with argv[0]
5363 use this to make scp's SFTP mode error messages more scp-like
5365 prompted by and ok deraadt@
5367 OpenBSD-Commit-ID: 0e821dbde423fc2280e47414bdc22aaa5b4e0733
5369 commit 8a7a06ee505cb833e613f74a07392e9296286c30
5370 Author: Darren Tucker <dtucker@dtucker.net>
5371 Date: Fri Sep 17 13:03:31 2021 +1000
5373 Test against LibreSSL 3.2.6, 3.3.4, 3.4.0.
5375 commit c25c84074a47f700dd6534995b4af4b456927150
5376 Author: djm@openbsd.org <djm@openbsd.org>
5377 Date: Thu Sep 16 05:36:03 2021 +0000
5379 upstream: missing space character in ssh -G output broke the
5381 t-sshcfgparse regression test; spotted by anton@
5383 OpenBSD-Commit-ID: bcc36fae2f233caac4baa8e58482da4aa350eed0
5385 commit a4bee1934bf5e5575fea486628f4123d6a29dff8
5386 Author: djm@openbsd.org <djm@openbsd.org>
5387 Date: Wed Sep 15 06:56:01 2021 +0000
5389 upstream: allow CanonicalizePermittedCNAMEs=none in ssh_config; ok
5393 OpenBSD-Commit-ID: 668a82ba8e56d731b26ffc5703213bfe071df623
5395 commit d0fffc88c8fe90c1815c6f4097bc8cbcabc0f3dd
5396 Author: mbuhl@openbsd.org <mbuhl@openbsd.org>
5397 Date: Tue Sep 14 11:04:21 2021 +0000
5399 upstream: put back the mux_ctx memleak fix for SSH_CHANNEL_MUX_CLIENT
5403 OpenBSD-Commit-ID: 1aba1da828956cacaadb81a637338734697d9798
5405 commit 19b3d846f06697c85957ab79a63454f57f8e22d6
5406 Author: schwarze@openbsd.org <schwarze@openbsd.org>
5407 Date: Sat Sep 11 09:05:50 2021 +0000
5409 upstream: Do not ignore SIGINT while waiting for input if editline(3)
5411 is not used. Instead, in non-interactive mode, exit sftp(1), like for other
5412 serious errors. As pointed out by dtucker@, when compiled without editline(3)
5413 support in portable OpenSSH, the el == NULL branch is also used for
5414 interactive mode. In that case, discard the input line and provide a fresh
5415 prompt to the user just like in the case where editline(3) is used. OK djm@
5417 OpenBSD-Commit-ID: 7d06f4d3ebba62115527fafacf38370d09dfb393
5419 commit ba61123eef9c6356d438c90c1199a57a0d7bcb0a
5420 Author: djm@openbsd.org <djm@openbsd.org>
5421 Date: Sat Sep 11 00:40:24 2021 +0000
5423 upstream: when using SFTP protocol, continue transferring files after a
5425 transfer error occurs. This matches original scp/rcp behaviour. ok dtucker@
5427 OpenBSD-Commit-ID: dfe4558d71dd09707e9b5d6e7d2e53b793da69fa
5429 commit b0ec59a708b493c6f3940336b1a537bcb64dd2a7
5430 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5431 Date: Fri Sep 10 11:38:38 2021 +0000
5433 upstream: Document that non-interactive commands are run via the user's
5435 shell using the -c flag. ok jmc@
5437 OpenBSD-Commit-ID: 4f0d912077732eead10423afd1acf4fc0ceec477
5439 commit 66a658b5d9e009ea11f8a0ca6e69c7feb2d851ea
5440 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5441 Date: Fri Sep 10 10:26:02 2021 +0000
5443 upstream: Document behaviour of arguments following non-interactive
5445 commands. Prompted by github PR#139 from EvanTheB, feedback & ok djm@ jmc@
5447 OpenBSD-Commit-ID: fc758d1fe0471dfab4304fcad6cd4ecc3d79162a
5449 commit 1d47e28e407d1f95fdf8f799be23f48dcfa5206b
5450 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5451 Date: Fri Sep 10 07:11:11 2021 +0000
5453 upstream: Clarify which file's attributes -p preserves, and that
5455 it's specifically the file mode bits. bz#3340 from calestyo at scientia.net,
5458 OpenBSD-Commit-ID: f09e6098ed1c4be00c730873049825f8ee7cb884
5460 commit b344db7a413478e4c21e4cadba4a970ad3e6128a
5461 Author: djm@openbsd.org <djm@openbsd.org>
5462 Date: Fri Sep 10 05:46:09 2021 +0000
5464 upstream: openssh-7.4 was incorrectly listed twice; spotted by
5466 Dmitry Belyavskiy, ok dtucker@
5468 OpenBSD-Commit-ID: 4b823ae448f6e899927ce7b04225ac9e489f58ef
5470 commit 9136d6239ad7a4a293e0418a49b69e70c76d58b8
5471 Author: jmc@openbsd.org <jmc@openbsd.org>
5472 Date: Thu Sep 9 06:17:39 2021 +0000
5474 upstream: - move CAVEATS to its correct order - use the term
5476 "legacy" protocol rather than "original", as the latter made the text
5477 misleading - uppercase SCP
5481 OpenBSD-Commit-ID: 8479255746d5fa76a358ee59e7340fecf4245ff0
5483 commit 2d678c5e3bdc2f5c99f7af5122e9d054925d560d
5484 Author: David Carlier <devnexen@gmail.com>
5485 Date: Wed Sep 8 19:49:54 2021 +0100
5487 Disable tracing on FreeBSD using procctl.
5489 Placed at the start of platform_disable_tracing() to prevent declaration
5490 after code errors from strict C89 compilers (in the unlikely event that
5491 more than one method is enabled).
5493 commit 73050fa38fb36ae3326d768b574806352b97002d
5494 Author: djm@openbsd.org <djm@openbsd.org>
5495 Date: Wed Sep 8 23:31:39 2021 +0000
5497 upstream: Use the SFTP protocol by default. The original scp/rcp
5499 protocol remains available via the -O flag.
5501 Note that ~user/ prefixed paths in SFTP mode require a protocol extension
5502 that was first shipped in OpenSSH 8.7.
5504 ok deraadt, after baking in snaps for a while without incident
5506 OpenBSD-Commit-ID: 23588976e28c281ff5988da0848cb821fec9213c
5508 commit c4565e69ffa2485cff715aa842ea7a350296bfb6
5509 Author: Darren Tucker <dtucker@dtucker.net>
5510 Date: Wed Sep 8 21:09:49 2021 +1000
5512 Really fix test on OpenSSL 1.1.1 stable.
5514 commit 79f1bb5f56cef3ae9276207316345b8309248478
5515 Author: Darren Tucker <dtucker@dtucker.net>
5516 Date: Wed Sep 8 18:51:39 2021 +1000
5518 Correct OpenSSL 1.1.1 stable identifier.
5520 commit b6255593ed5ccbe5e7d3d4b26b2ad31ad4afc232
5521 Author: Darren Tucker <dtucker@dtucker.net>
5522 Date: Wed Sep 8 18:39:44 2021 +1000
5524 Increment nfds when coming from startup_pipe.
5526 If we have to increase nfds because startup_pipe[0] is above any of the
5527 descriptors passed in the fd_sets, we also need to add 1 to nfds since
5528 select takes highest FD number plus one. bz#3345 from yaroslav.kuzmin
5531 commit a3e92a6794817df6012ac8546aea19652cc91b61
5532 Author: Darren Tucker <dtucker@dtucker.net>
5533 Date: Wed Sep 8 13:45:10 2021 +1000
5535 Tests for OpenSSL 3.0.0 release & 1.1.1 branch.
5537 commit 4afe431da98ec1cf6a2933fe5658f4fd68dee9e2
5538 Author: djm@openbsd.org <djm@openbsd.org>
5539 Date: Wed Sep 8 03:23:44 2021 +0000
5541 upstream: correct my mistake in previous fix; spotted by halex
5543 OpenBSD-Commit-ID: 3cc62d92e3f70006bf02468fc146bfc36fffa183
5545 commit ca0e455b9331213ff9505a21b94c38e34faa2bba
5546 Author: djm@openbsd.org <djm@openbsd.org>
5547 Date: Tue Sep 7 06:03:51 2021 +0000
5549 upstream: avoid NULL deref in -Y find-principals. Report and fix
5551 from Carlo Marcelo Arenas Belón
5553 Content-Type: text/plain; charset=UTF-8
5554 Content-Transfer-Encoding: 8bit
5556 OpenBSD-Commit-ID: 6238486f8ecc888d6ccafcd9ad99e621bb41f1e0
5558 commit 37616807f150fb46610bbd5031c31af4857ad1e9
5559 Author: millert@openbsd.org <millert@openbsd.org>
5560 Date: Mon Sep 6 00:36:01 2021 +0000
5562 upstream: revision 1.381 neglected to remove
5564 sChallengeResponseAuthentication from the enum. Noticed by
5565 christos@zoulas.com. OK dtucker@
5567 OpenBSD-Commit-ID: b533283a4dd6d04a867da411a4c7a8fbc90e34ff
5569 commit 7acb3578cdfec0b3d34501408071f7a96c1684ea
5570 Author: Darren Tucker <dtucker@dtucker.net>
5571 Date: Sun Sep 5 20:45:42 2021 +1000
5573 Correct version_num for OpenSSL dev branch.
5575 commit 65bb01111320dfd0d25e21e1fd4d3f2b77532669
5576 Author: Darren Tucker <dtucker@dtucker.net>
5577 Date: Sun Sep 5 19:37:39 2021 +1000
5579 Test against OpenSSL 3 branch as well as dev.
5581 Now that OpenSSL development has moved to 3.1, test against the most
5582 recent version of the openssl-3.0 branch too.
5584 commit 864ed0d5e04a503b97202c776b7cf3f163f3eeaa
5585 Author: Darren Tucker <dtucker@dtucker.net>
5586 Date: Sun Sep 5 19:33:22 2021 +1000
5588 OpenSSL development is now 3.1.*
5590 commit a60209a586a928f92ab323bf23bd07f57093342e
5591 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5592 Date: Fri Sep 3 07:43:23 2021 +0000
5594 upstream: Use .Cm instead of .Dq in StrictHostKeyChecking list for
5596 consistency. Patch from scop via github PR#257, ok jmc@
5598 OpenBSD-Commit-ID: 3652a91564570779431802c31224fb4a9cf39872
5600 commit 8d1d9eb6de37331e872700e9e399a3190cca1242
5601 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5602 Date: Fri Sep 3 07:27:03 2021 +0000
5604 upstream: Mention using ssh -i for specifying the public key file
5606 in the case where the private key is loaded into ssh-agent but is not present
5607 locally. Based on patch from rafork via github PR#215, ok jmc@
5609 OpenBSD-Commit-ID: 2282e83b0ff78d2efbe705883b67240745fa5bb2
5611 commit eb4362e5e3aa7ac26138b11e44d8c191910aff64
5612 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5613 Date: Fri Sep 3 05:25:50 2021 +0000
5615 upstream: Refer to KEX "algorithms" instead of "methods" to match
5617 other references and improve consistency. Patch from scop via github PR#241,
5620 OpenBSD-Commit-ID: 840bc94ff6861b28d8603c8e8c16499bfb65e32c
5622 commit b3318946ce5725da43c4bf7eeea1b73129c47d2a
5623 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5624 Date: Fri Sep 3 05:12:25 2021 +0000
5626 upstream: Remove redundant attrib_clear in upload_dir_internal.
5628 The subsequent call to stat_to_attrib clears the struct as its first step
5629 anyway. From pmeinhardt via github PR#220, ok djm@
5631 OpenBSD-Commit-ID: f5234fc6d7425b607e179acb3383f21716f3029e
5633 commit 7cc3fe28896e653956a6a2eed0a25d551b83a029
5634 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5635 Date: Fri Sep 3 04:11:13 2021 +0000
5637 upstream: Add test for client termination status on signal.
5639 Based on patch from Alexxz via github PR#235 with some tweaks, to
5640 match patch in bz#3281.
5642 OpenBSD-Regress-ID: d87c7446fb8b5f8b45894fbbd6875df326e729e2
5644 commit 5428b0d239f6b516c81d1dd15aa9fe9e60af75d4
5645 Author: deraadt@openbsd.org <deraadt@openbsd.org>
5646 Date: Thu Sep 2 21:03:54 2021 +0000
5648 upstream: sys/param.h is not needed for any visible reason
5650 OpenBSD-Commit-ID: 8bdea2d0c75692e4c5777670ac039d4b01c1f368
5652 commit 1ff38f34b4c4545eb28106629cafa1e0496bc726
5653 Author: Shchelkunov Artem <a.shchelkunov@ideco.ru>
5654 Date: Wed Aug 11 18:07:58 2021 +0500
5656 Fix memory leak in error path.
5658 *info is allocated via xstrdup but was leaked in the PAM_AUTH_ERR path.
5661 commit cb37e2f0c0ca4fef844ed7edc5d0e3b7d0e83f6a
5662 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5663 Date: Wed Sep 1 03:16:06 2021 +0000
5665 upstream: Fix ssh-rsa fallback for old PuTTY interop tests.
5667 OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37
5669 commit 8b02ef0f28dc24cda8cbcd8b7eb02bda8f8bbe59
5670 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5671 Date: Wed Sep 1 00:50:27 2021 +0000
5673 upstream: Add a function to skip remaining tests.
5675 Many tests skip tests for various reasons but not in a consistent way and
5676 don't always clean up, so add that and switch the tests that do that over.
5678 OpenBSD-Regress-ID: 72d2ec90a3ee8849486956a808811734281af735
5680 commit d486845c07324c04240f1674ac513985bd356f66
5681 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5682 Date: Tue Aug 31 07:13:59 2021 +0000
5684 upstream: Specify path to PuTTY keys.
5686 Portable needs this and it makes no difference on OpenBSD, so resync
5687 them. (Id sync only, Portable already had this.)
5689 OpenBSD-Regress-ID: 33f6f66744455886d148527af8368811e4264162
5691 commit d22b299115e27606e846b23490746f69fdd4fb38
5692 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5693 Date: Tue Aug 31 06:13:23 2021 +0000
5695 upstream: Better compat tests with old PuTTY.
5697 When running PuTTY interop tests and using a PuTTY version older than
5698 0.76, re-enable the ssh-rsa host key algorithm (the 256 and 512 variants
5699 of RSA were added some time between 0.73 and 0.76).
5701 OpenBSD-Regress-ID: e6138d6987aa705fa1e4f216db0bb386e1ff38e1
5703 commit 87ad70d605c3e39c9b8aa275db27120d7cc09b77
5704 Author: Darren Tucker <dtucker@dtucker.net>
5705 Date: Tue Aug 31 17:04:50 2021 +1000
5707 Resync PuTTY interop tests.
5709 Resync behaviour when REGRESS_INTEROP_PUTTY is not set with OpenBSD.
5711 commit e47b82a7bf51021afac218bf59a3be121827653d
5712 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5713 Date: Tue Aug 31 01:25:27 2021 +0000
5715 upstream: Specify hostkeyalgorithms in SSHFP test.
5717 Specify host key algorithms in sshd's default set for the SSHFP test,
5718 from djm@. Make the reason for when the test is skipped a bit clearer.
5720 OpenBSD-Regress-ID: 4f923dfc761480d5411de17ea6f0b30de3e32cea
5722 commit 7db3e0a9e8477c018757b59ee955f7372c0b55fb
5723 Author: djm@openbsd.org <djm@openbsd.org>
5724 Date: Mon Aug 30 01:15:45 2021 +0000
5726 upstream: adapt to RSA/SHA1 deprectation
5728 OpenBSD-Regress-ID: 952397c39a22722880e4de9d1c50bb1a14f907bb
5730 commit 2344750250247111a6c3c6a4fe84ed583a61cc11
5731 Author: djm@openbsd.org <djm@openbsd.org>
5732 Date: Sun Aug 29 23:53:10 2021 +0000
5734 upstream: After years of forewarning, disable the RSA/SHA-1
5736 signature algorithm by default. It is feasible to create colliding SHA1
5737 hashes, so we need to deprecate its use.
5739 RSA/SHA-256/512 remains available and will be transparently selected
5740 instead of RSA/SHA1 for most SSH servers released in the last five+
5741 years. There is no need to regenerate RSA keys.
5743 The use of RSA/SHA1 can be re-enabled by adding "ssh-rsa" to the
5744 PubkeyAcceptedAlgorithms directives on the client and server.
5748 OpenBSD-Commit-ID: 189bcc4789c7254e09e23734bdd5def8354ff1d5
5750 commit 56c4455d3b54b7d481c77c82115c830b9c8ce328
5751 Author: djm@openbsd.org <djm@openbsd.org>
5752 Date: Sun Aug 29 23:44:07 2021 +0000
5754 upstream: wrap at 80 columns
5756 OpenBSD-Commit-ID: 47ca2286d6b52a9747f34da16d742879e1a37bf0
5758 commit 95401eea8503943449f712e5f3de52fc0bc612c5
5759 Author: Darren Tucker <dtucker@dtucker.net>
5760 Date: Fri Aug 20 18:14:13 2021 +1000
5762 Replace shell function with ssh-keygen -A.
5764 Prevents the init script in the SysV package from trying (and failing)
5765 to generate unsupported key types. Remove now-unused COMMENT_OUT_ECC.
5768 commit d83ec9ed995a76ed1d5c65cf10b447222ec86131
5769 Author: Darren Tucker <dtucker@dtucker.net>
5770 Date: Fri Aug 20 15:39:05 2021 +1000
5772 Remove obsolete Redhat PAM config and init script.
5774 commit e1a596186c81e65a34ce13076449712d3bf97eb4
5775 Author: Damien Miller <djm@mindrot.org>
5776 Date: Fri Aug 20 14:03:49 2021 +1000
5780 commit 5450606c8f7f7a0d70211cea78bc2dab74ab35d1
5781 Author: Damien Miller <djm@mindrot.org>
5782 Date: Fri Aug 20 13:59:43 2021 +1000
5784 update version numbers
5786 commit feee2384ab8d694c770b7750cfa76a512bdf8246
5787 Author: djm@openbsd.org <djm@openbsd.org>
5788 Date: Fri Aug 20 03:22:55 2021 +0000
5790 upstream: openssh-8.7
5792 OpenBSD-Commit-ID: 8769dff0fd76ae3193d77bf83b439adee0f300cd
5794 commit 9a2ed62173cc551b2b5f479460bb015b19499de8
5795 Author: Darren Tucker <dtucker@dtucker.net>
5796 Date: Fri Aug 20 10:48:13 2021 +1000
5798 Also check pid in pselect_notify_setup.
5802 commit deaadcb93ca15d4f38aa38fb340156077792ce87
5803 Author: Darren Tucker <dtucker@dtucker.net>
5804 Date: Fri Aug 20 08:39:33 2021 +1000
5806 Prefix pselect functions to clarify debug messages
5808 commit 10e45654cff221ca60fd35ee069df67208fcf415
5809 Author: Darren Tucker <dtucker@dtucker.net>
5810 Date: Fri Aug 20 08:30:42 2021 +1000
5812 Fix race in pselect replacement code.
5814 On the second and subsequent calls to pselect the notify_pipe was not
5815 added to the select readset, opening up a race that om G. Christensen
5816 discovered on multiprocessor Solaris <=9 systems.
5818 Also reinitialize notify_pipe if the pid changes. This will prevent a
5819 parent and child from using the same FD, although this is not an issue
5820 in the current structure it might be in future.
5822 commit 464ba22f1e38d25402e5ec79a9b8d34a32df5a3f
5823 Author: Darren Tucker <dtucker@dtucker.net>
5824 Date: Wed Aug 18 12:51:30 2021 +1000
5826 Check compiler for c99 declarations after code.
5828 The sntrup761 reference code contains c99-style declarations after code
5829 so don't try to build that if the compiler doesn't support it.
5831 commit 7d878679a4b155a359d32104ff473f789501748d
5832 Author: Darren Tucker <dtucker@dtucker.net>
5833 Date: Tue Aug 17 15:12:04 2021 +1000
5835 Remove trailing backslash on regress-unit-binaries
5837 commit b71b2508f17c68c5d9dbbe537686d81cedb9a781
5838 Author: Darren Tucker <dtucker@dtucker.net>
5839 Date: Tue Aug 17 07:59:27 2021 +1000
5841 Put stdint.h inside HAVE_STDINT_H.
5843 From Tom G. Christensen.
5845 commit 6a24567a29bd7b4ab64e1afad859ea845cbc6b8c
5846 Author: Darren Tucker <dtucker@dtucker.net>
5847 Date: Mon Aug 16 14:13:02 2021 +1000
5849 Improve github test driver script.
5851 - use a trap to always output any failed regress logs (since the script
5852 sets -e, the existing log output is never invoked).
5853 - pass LTESTS and SKIP_LTESTS when re-running with sshd options (eg.
5856 commit b467cf13705f59ed348b620722ac098fe31879b7
5857 Author: Darren Tucker <dtucker@dtucker.net>
5858 Date: Mon Aug 16 11:32:23 2021 +1000
5860 Remove deprecated ubuntu-16.04 test targets.
5862 Github has deprecated ubuntu-16.04 and it will be removed on 20
5865 commit 20e6eefcdf78394f05e453d456c1212ffaa6b6a4
5866 Author: Darren Tucker <dtucker@dtucker.net>
5867 Date: Sun Aug 15 23:25:26 2021 +1000
5869 Skip agent ptrace test on hurd.
5871 commit 7c9115bbbf958fbf85259a061c1122e2d046aabf
5872 Author: Darren Tucker <dtucker@dtucker.net>
5873 Date: Sun Aug 15 19:37:22 2021 +1000
5875 Add hurd test target.
5877 commit 7909a566f6c6a78fcd30708dc49f4e4f9bb80ce3
5878 Author: Darren Tucker <dtucker@dtucker.net>
5879 Date: Sun Aug 15 12:45:10 2021 +1000
5881 Skip scp3 tests on all dfly58 and 60 configs.
5883 commit e65198e52cb03534e8c846d1bca74c310b1526de
5884 Author: Tim Rice <tim@multitalents.net>
5885 Date: Sat Aug 14 13:08:07 2021 -0700
5887 openbsd-compat/openbsd-compat.h: put bsd-signal.h before bsd-misc.h
5888 to get sigset_t from signal.h needed for the pselect replacement.
5890 commit e50635640f79920d9375e0155cb3f4adb870eee5
5891 Author: Darren Tucker <dtucker@dtucker.net>
5892 Date: Fri Aug 13 13:21:00 2021 +1000
5894 Test OpenSSH from OpenBSD head on 6.8 and 6.9.
5896 commit e0ba38861c490c680117b7fe0a1d61a181cd00e7
5897 Author: Darren Tucker <dtucker@dtucker.net>
5898 Date: Fri Aug 13 13:00:14 2021 +1000
5900 Skip scp3 test on dragonfly 58 and 60.
5902 The tests hang, so skip until we figure them out.
5904 commit dcce2a2bcf007bf817a2fb0dce3db83fa9201e92
5905 Author: djm@openbsd.org <djm@openbsd.org>
5906 Date: Thu Aug 12 23:59:25 2021 +0000
5908 upstream: mention that CASignatureAlgorithms accepts +/- similarly to
5910 the other algorithm list directives; ok jmc bz#3335
5912 OpenBSD-Commit-ID: 0d46b53995817052c78e2dce9dbd133963b073d9
5914 commit 090a82486e5d7a8f7f16613d67e66a673a40367f
5915 Author: schwarze@openbsd.org <schwarze@openbsd.org>
5916 Date: Thu Aug 12 09:59:00 2021 +0000
5918 upstream: In the editline(3) branch of the sftp(1) event loop,
5920 handle SIGINT rather than ignoring it, such that the user can use Ctrl-C to
5921 discard the currently edited command line and get a fresh prompt, just like
5922 in ftp(1), bc(1), and in shells.
5924 It is critical to not use ssl_signal() for this particular case
5925 because that function unconditionally sets SA_RESTART, but here we
5926 need the signal to interrupt the read(2) in the el_gets(3) event loop.
5928 OK dtucker@ deraadt@
5930 OpenBSD-Commit-ID: 8025115a773f52e9bb562eaab37ea2e021cc7299
5932 commit e1371e4f58404d6411d9f95eb774b444cea06a26
5933 Author: naddy@openbsd.org <naddy@openbsd.org>
5934 Date: Wed Aug 11 14:07:54 2021 +0000
5936 upstream: scp: tweak man page and error message for -3 by default
5938 Now that the -3 option is enabled by default, flip the documentation
5939 and error message logic from "requires -3" to "blocked by -R".
5943 OpenBSD-Commit-ID: a872592118444fb3acda5267b2a8c3d4c4252020
5945 commit 49f46f6d77328a3d10a758522b670a3e8c2235e7
5946 Author: naddy@openbsd.org <naddy@openbsd.org>
5947 Date: Wed Aug 11 14:05:19 2021 +0000
5949 upstream: scp: do not spawn ssh with two -s flags for
5951 remote-to-remote copies
5953 Do not add another "-s" to the argument vector every time an SFTP
5954 connection is initiated. Instead, introduce a subsystem flag to
5955 do_cmd() and add "-s" when the flag is set.
5959 OpenBSD-Commit-ID: 25df69759f323661d31b2e1e790faa22e27966c1
5961 commit 2a2cd00783e1da45ee730b7f453408af1358ef5b
5962 Author: djm@openbsd.org <djm@openbsd.org>
5963 Date: Wed Aug 11 08:55:04 2021 +0000
5965 upstream: test -Oprint-pubkey
5967 OpenBSD-Regress-ID: 3d51afb6d1f287975fb6fddd7a2c00a3bc5094e0
5969 commit b9f4635ea5bc33ed5ebbacf332d79bae463b0f54
5970 Author: djm@openbsd.org <djm@openbsd.org>
5971 Date: Wed Aug 11 08:54:17 2021 +0000
5973 upstream: when verifying sshsig signatures, support an option
5975 (-Oprint-pubkey) to dump the full public key to stdout; based on patch from
5976 Fabian Stelzer; ok markus@
5978 OpenBSD-Commit-ID: 0598000e5b9adfb45d42afa76ff80daaa12fc3e2
5980 commit 750c1a45ba4e8ad63793d49418a0780e77947b9b
5981 Author: djm@openbsd.org <djm@openbsd.org>
5982 Date: Wed Aug 11 05:21:32 2021 +0000
5984 upstream: oops, missed one more %p
5986 OpenBSD-Commit-ID: e7e62818d1564cc5cd9086eaf7a51cbd1a9701eb
5988 commit b5aa27b69ab2e1c13ac2b5ad3f8f7d389bad7489
5989 Author: djm@openbsd.org <djm@openbsd.org>
5990 Date: Wed Aug 11 05:20:17 2021 +0000
5992 upstream: remove a bunch of %p in format strings; leftovers of
5994 debuggings past. prompted by Michael Forney, ok dtucker@
5996 OpenBSD-Commit-ID: 4853a0d6c9cecaba9ecfcc19066e52d3a8dcb2ac
5998 commit 419aa01123db5ff5dbc68b2376ef23b222862338
5999 Author: Darren Tucker <dtucker@dtucker.net>
6000 Date: Wed Aug 11 09:21:09 2021 +1000
6002 Add includes.h to compat tests.
6004 On platforms where closefrom returns void (eg glibc>=2.34) the prototype
6005 for closefrom in its compat tests would cause compile errors. Remove
6006 this and have the tests pull in the compat headers in the same way as
6007 the main code. bz#3336.
6009 commit 931f592f26239154eea3eb35a086585897b1a185
6010 Author: djm@openbsd.org <djm@openbsd.org>
6011 Date: Tue Aug 10 03:35:45 2021 +0000
6013 upstream: adapt to scp -M flag change; make scp3.sh test SFTP mode too
6015 OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0
6017 commit 391ca67fb978252c48d20c910553f803f988bd37
6018 Author: djm@openbsd.org <djm@openbsd.org>
6019 Date: Tue Aug 10 03:33:34 2021 +0000
6021 upstream: Prepare for a future where scp(1) uses the SFTP protocol by
6023 default. Replace recently added -M option to select the protocol with -O
6024 (olde) and -s (SFTP) flags, and label the -s flag with a clear warning that
6025 it will be removed in the near future (so no, don't use it in scripts!).
6027 prompted by/feedback from deraadt@
6029 OpenBSD-Commit-ID: 92ad72cc6f0023c9be9e316d8b30eb6d8d749cfc
6031 commit bfdd4b722f124a4fa9173d20dd64dd0fc69856be
6032 Author: djm@openbsd.org <djm@openbsd.org>
6033 Date: Mon Aug 9 23:56:36 2021 +0000
6035 upstream: make scp -3 the default for remote-to-remote copies. It
6037 provides a much better and more intuitive user experience and doesn't require
6038 exposing credentials to the source host.
6040 thanks naddy@ for catching the missing argument in usage()
6042 "Yes please!" - markus@
6043 "makes a lot of sense" - deraadt@
6044 "the right thing to do" - dtucker@
6046 OpenBSD-Commit-ID: d0d2af5f0965c5192ba5b2fa461c9f9b130e5dd9
6048 commit 2f7a3b51cef689ad9e93d0c6c17db5a194eb5555
6049 Author: djm@openbsd.org <djm@openbsd.org>
6050 Date: Mon Aug 9 23:49:31 2021 +0000
6052 upstream: make scp in SFTP mode try to use relative paths as much
6054 as possible. Previosuly, it would try to make relative and ~/-rooted paths
6055 absolute before requesting transfers.
6057 prompted by and much discussion deraadt@
6060 OpenBSD-Commit-ID: 46639d382ea99546a4914b545fa7b00fa1be5566
6062 commit 2ab864010e0a93c5dd95116fb5ceaf430e2fc23c
6063 Author: djm@openbsd.org <djm@openbsd.org>
6064 Date: Mon Aug 9 23:47:44 2021 +0000
6066 upstream: SFTP protocol extension to allow the server to expand
6068 ~-prefixed paths, in particular ~user ones. Allows scp in sftp mode to accept
6069 these paths, like scp in rcp mode does.
6071 prompted by and much discussion deraadt@
6074 OpenBSD-Commit-ID: 7d794def9e4de348e1e777f6030fc9bafdfff392
6076 commit 41b019ac067f1d1f7d99914d0ffee4d2a547c3d8
6077 Author: djm@openbsd.org <djm@openbsd.org>
6078 Date: Mon Aug 9 23:44:32 2021 +0000
6080 upstream: when scp is in SFTP mode, try to deal better with ~
6082 prefixed paths. ~user paths aren't supported, but ~/ paths will be accepted
6083 and prefixed with the SFTP server starting directory (more to come)
6085 prompted by and discussed with deraadt@
6088 OpenBSD-Commit-ID: 263a071f14555c045fd03132a8fb6cbd983df00d
6090 commit b4b3f3da6cdceb3fd168b5fab69d11fba73bd0ae
6091 Author: djm@openbsd.org <djm@openbsd.org>
6092 Date: Mon Aug 9 07:21:01 2021 +0000
6094 upstream: on fatal errors, make scp wait for ssh connection before
6096 exiting avoids LogLevel=verbose (or greater) messages from ssh appearing
6097 after scp has returned exited and control has returned to the shell; ok
6100 (this was originally committed as r1.223 along with unrelated stuff that
6101 I rolled back in r1.224)
6103 OpenBSD-Commit-ID: 1261fd667ad918484889ed3d7aec074f3956a74b
6105 commit 2ae7771749e0b4cecb107f9d4860bec16c3f4245
6106 Author: djm@openbsd.org <djm@openbsd.org>
6107 Date: Mon Aug 9 07:19:12 2021 +0000
6109 upstream: rever r1.223 - I accidentally committed unrelated changes
6111 OpenBSD-Commit-ID: fb73f3865b2647a27dd94db73d6589506a9625f9
6113 commit 986abe94d481a1e82a01747360bd767b96b41eda
6114 Author: djm@openbsd.org <djm@openbsd.org>
6115 Date: Mon Aug 9 07:16:09 2021 +0000
6117 upstream: show only the final path component in the progress meter;
6119 more useful with long paths (that may truncate) and better matches
6120 traditional scp behaviour; spotted by naddy@ ok deraadt@
6122 OpenBSD-Commit-ID: 26b544d0074f03ebb8a3ebce42317d8d7ee291a3
6124 commit 2b67932bb3176dee4fd447af4368789e04a82b93
6125 Author: djm@openbsd.org <djm@openbsd.org>
6126 Date: Mon Aug 9 07:13:54 2021 +0000
6128 upstream: on fatal errors, make scp wait for ssh connection before
6130 exiting avoids LogLevel=verbose (or greater) messages from ssh appearing
6131 after scp has returned exited and control has returned to the shell; ok
6134 OpenBSD-Commit-ID: ef9dab5ef5ae54a6a4c3b15d380568e94263456c
6136 commit 724eb900ace30661d45db2ba01d0f924d95ecccb
6137 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6138 Date: Sun Aug 8 08:49:09 2021 +0000
6140 upstream: xstrdup environment variable used by ForwardAgent. bz#3328
6142 from goetze at dovetail.com, ok djm@ deraadt@
6144 OpenBSD-Commit-ID: 760320dac1c3b26904284ba417a7d63fccc5e742
6146 commit 86b4cb3a884846b358305aad17a6ef53045fa41f
6147 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6148 Date: Sun Aug 8 08:27:28 2021 +0000
6150 upstream: Although it's POSIX, not all shells used in Portable support
6152 the implicit 'in "$@"' after 'for i'.
6154 OpenBSD-Regress-ID: 3c9aec6bca4868f85d2742b6ba5223fce110bdbc
6156 commit f2ccf6c9f395923695f22345e626dfd691227aaf
6157 Author: Darren Tucker <dtucker@dtucker.net>
6158 Date: Sun Aug 8 17:39:56 2021 +1000
6160 Move portable specific settings down.
6162 This brings the top hunk of the file back in sync with OpenBSD
6163 so patches to the CVS Id should apply instead of always being
6166 commit 71b0eb997e220b0fc9331635af409ad84979f2af
6167 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6168 Date: Sun Aug 8 07:27:52 2021 +0000
6170 upstream: Move setting of USER further down the startup In portable
6172 we have to change this and having it in the same hunk as the CVS Id string
6173 means applying changes fails every. single. time.
6175 OpenBSD-Regress-ID: 87cd603eb6db58c9b430bf90adacb7f90864429b
6177 commit f0aca2706c710a0da1a4be705f825a807cd15400
6178 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6179 Date: Sun Aug 8 06:38:33 2021 +0000
6181 upstream: Drop -q in ssh-log-wrapper.sh to preserve logs.
6183 scp and sftp like to add -q to the command line passed to ssh which
6184 overrides the LogLevel we set in the config files and suppresses output
6185 to the debug logs so drop any "-q" from the invoked ssh. In the one
6186 case where we actually want to use -q in the banner test, call the ssh
6187 binary directly bypassing the logging wrapper.
6189 OpenBSD-Regress-ID: e2c97d3c964bda33a751374c56f65cdb29755b75
6191 commit cf27810a649c5cfae60f8ce66eeb25caa53b13bc
6192 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6193 Date: Sat Aug 7 01:57:08 2021 +0000
6195 upstream: Fix prototype mismatch for do_cmd. ok djm@
6197 OpenBSD-Commit-ID: 1c1598bb5237a7ae0be99152f185e0071163714d
6199 commit 85de69f64665245786e28c81ab01fe18b0e2a149
6200 Author: djm@openbsd.org <djm@openbsd.org>
6201 Date: Sat Aug 7 01:55:01 2021 +0000
6203 upstream: sftp-client.c needs poll.h
6205 remove unused variable
6207 OpenBSD-Commit-ID: 233ac6c012cd23af62f237167a661db391055a16
6209 commit 397c4d72e50023af5fe3aee5cc2ad407a6eb1073
6210 Author: Darren Tucker <dtucker@dtucker.net>
6211 Date: Sat Aug 7 11:30:57 2021 +1000
6213 Include poll.h and friends for struct pollfd.
6215 commit a9e2c533195f28627f205682482d9da384c4c52e
6216 Author: djm@openbsd.org <djm@openbsd.org>
6217 Date: Sat Aug 7 00:14:17 2021 +0000
6219 upstream: do_upload() used a near-identical structure for
6221 tracking expected status replies from the server to what do_download() was
6224 Refactor it to use the same structure and factor out some common
6225 code into helper functions.
6227 OpenBSD-Commit-ID: 0c167df8ab6df4a5292c32421922b0cf379e9054
6229 commit 7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee
6230 Author: djm@openbsd.org <djm@openbsd.org>
6231 Date: Sat Aug 7 00:12:09 2021 +0000
6233 upstream: make scp(1) in SFTP mode follow symlinks like
6235 traditional scp(1) ok markus@
6237 OpenBSD-Commit-ID: 97255e55be37e8e26605e4ba1e69f9781765d231
6239 commit 133b44e500422df68c9c25c3b6de35c0263132f1
6240 Author: djm@openbsd.org <djm@openbsd.org>
6241 Date: Sat Aug 7 00:10:49 2021 +0000
6243 upstream: fix incorrect directory permissions on scp -3
6245 transfers; ok markus@
6247 OpenBSD-Commit-ID: 64b2abaa5635a2be65ee2e77688ad9bcebf576c2
6249 commit 98b59244ca10e62ff67a420856770cb700164f59
6250 Author: djm@openbsd.org <djm@openbsd.org>
6251 Date: Sat Aug 7 00:09:57 2021 +0000
6253 upstream: a bit more debugging of file attributes being
6255 sent/received over the wire
6257 OpenBSD-Commit-ID: f68c4e207b08ef95200a8b2de499d422808e089b
6259 commit c677e65365d6f460c084e41e0c4807bb8a9cf601
6260 Author: djm@openbsd.org <djm@openbsd.org>
6261 Date: Sat Aug 7 00:08:52 2021 +0000
6263 upstream: make scp(1) in SFTP mode output better match original
6265 scp(1) by suppressing "Retrieving [path]" lines that were emitted to support
6266 the interactive sftp(1) client. ok markus@
6268 OpenBSD-Commit-ID: 06be293df5f156a18f366079be2f33fa68001acc
6270 commit 48cd39b7a4e5e7c25101c6d1179f98fe544835cd
6271 Author: djm@openbsd.org <djm@openbsd.org>
6272 Date: Sat Aug 7 00:07:18 2021 +0000
6274 upstream: factor out a structure duplicated between downloading
6276 and crossloading; ok markus@
6278 OpenBSD-Commit-ID: 96eede24d520569232086a129febe342e4765d39
6280 commit 318c06bb04ee21a0cfa6b6022a201eacaa53f388
6281 Author: djm@openbsd.org <djm@openbsd.org>
6282 Date: Sat Aug 7 00:06:30 2021 +0000
6284 upstream: use sftp_client crossloading to implement scp -3
6288 OpenBSD-Commit-ID: 7db4c0086cfc12afc9cfb71d4c2fd3c7e9416ee9
6290 commit de7115b373ba0be3861c65de9b606a3e0e9d29a3
6291 Author: djm@openbsd.org <djm@openbsd.org>
6292 Date: Sat Aug 7 00:02:41 2021 +0000
6294 upstream: support for "cross"-loading files/directories, i.e.
6296 downloading from one SFTP server while simultaneously uploading to another.
6298 feedback & ok markus@
6300 OpenBSD-Commit-ID: 3982878e29d8df0fa4ddc502f5ff6126ac714235
6302 commit a50bd0367ff2063bbc70a387740a2aa6914de094
6303 Author: djm@openbsd.org <djm@openbsd.org>
6304 Date: Sat Aug 7 00:01:29 2021 +0000
6306 upstream: factor our SSH2_FXP_OPEN calls into their own function;
6308 "looks fine" markus@
6310 OpenBSD-Commit-ID: d3dea2153f08855c6d9dacc01973248944adeffb
6312 commit e3c0ba05873cf3d3f7d19d595667a251026b2d84
6313 Author: djm@openbsd.org <djm@openbsd.org>
6314 Date: Sat Aug 7 00:00:33 2021 +0000
6316 upstream: prepare for scp -3 implemented via sftp
6318 OpenBSD-Commit-ID: 194aac0dd87cb175334b71c2a30623a5ad55bb44
6320 commit 395d8fbdb094497211e1461cf0e2f80af5617e0a
6321 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6322 Date: Fri Aug 6 09:00:18 2021 +0000
6324 upstream: Make diff invocation more portable.
6326 POSIX does not require diff to have -N, so compare in both directions
6327 with just -r, which should catch missing files in either directory.
6329 OpenBSD-Regress-ID: 0e2ec8594556a6f369ed5a0a90c6806419b845f7
6331 commit d247a73ce27b460138599648d9c637c6f2b77605
6332 Author: djm@openbsd.org <djm@openbsd.org>
6333 Date: Wed Aug 4 21:28:00 2021 +0000
6335 upstream: regression test for scp -3
6337 OpenBSD-Regress-ID: b44375d125c827754a1f722ec6b6b75b634de05d
6339 commit 35c8e41a6f6d8ad76f8d1cd81ac2ea23d0d993b2
6340 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6341 Date: Fri Aug 6 05:04:42 2021 +0000
6343 upstream: Document "ProxyJump none". bz#3334.
6345 OpenBSD-Commit-ID: f78cc6f55731f2cd35c3a41d5352ac1ee419eba7
6347 commit 911ec6411821bda535d09778df7503b92f0eafab
6348 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6349 Date: Wed Aug 4 01:34:55 2021 +0000
6351 upstream: Allow for different (but POSIX compliant) behaviour of
6353 basename(3) and prevent a use-after-free in that case in the new sftp-compat
6356 POSIX allows basename(3) to either return a pointer to static storage
6357 or modify the passed string and return a pointer to that. OpenBSD does
6358 the former and works as is, but on other platforms "filename" points
6359 into "tmp" which was just freed. This makes the freeing of tmp
6360 consistent with the other variable in the loop.
6362 Pinpointed by the -portable Valgrind regress test. ok djm@ deraadt@
6364 OpenBSD-Commit-ID: 750f3c19bd4440e4210e30dd5d7367386e833374
6366 commit 6df1fecb5d3e51f3a8027a74885c3a44f6cbfcbd
6367 Author: Damien Miller <djm@mindrot.org>
6368 Date: Wed Aug 4 11:05:11 2021 +1000
6370 use openbsd-compat glob.h is required
6372 commit 9ebd1828881dfc9014a344587934a5ce7db6fa1b
6373 Author: Darren Tucker <dtucker@dtucker.net>
6374 Date: Tue Aug 3 21:03:23 2021 +1000
6376 Missing space between macro arg and punctuation.
6380 commit 0fd3f62eddc7cf54dcc9053be6f58998f3eb926a
6381 Author: Darren Tucker <dtucker@dtucker.net>
6382 Date: Tue Aug 3 21:02:33 2021 +1000
6384 Avoid lines >80 chars. From jmc@
6386 commit af5d8094d8b755e1daaf2e20ff1dc252800b4c9b
6387 Author: djm@openbsd.org <djm@openbsd.org>
6388 Date: Tue Aug 3 01:05:24 2021 +0000
6390 upstream: regression tests for scp SFTP protocol support; mostly by
6392 Jakub Jelen in GHPR#194 ok markus
6394 OpenBSD-Regress-ID: 36f1458525bcb111741ec8547eaf58b13cddc715
6396 commit e4673b7f67ae7740131a4ecea29a846593049a91
6397 Author: anton@openbsd.org <anton@openbsd.org>
6398 Date: Thu Jul 29 15:34:09 2021 +0000
6400 upstream: Treat doas with arguments as a valid SUDO variable.
6402 Allows one to specify SUDO="doas -n" which I do while running make regress.
6406 OpenBSD-Regress-ID: 4fe5814b5010dbf0885500d703bea06048d11005
6408 commit 197e29f1cca190d767c4b2b63a662f9a9e5da0b3
6409 Author: djm@openbsd.org <djm@openbsd.org>
6410 Date: Mon Aug 2 23:38:27 2021 +0000
6412 upstream: support for using the SFTP protocol for file transfers in
6414 scp, via a new "-M sftp" option. Marked as experimental for now.
6416 Some corner-cases exist, in particular there is no attempt to
6417 provide bug-compatibility with scp's weird "double shell" quoting
6420 Mostly by Jakub Jelen in GHPR#194 with some tweaks by me. ok markus@
6421 Thanks jmc@ for improving the scp.1 bits.
6423 OpenBSD-Commit-ID: 6ce4c9157ff17b650ace571c9f7793d92874051c
6425 commit dd533c7ab79d61a7796b77b64bd81b098e0d7f9f
6426 Author: jmc@openbsd.org <jmc@openbsd.org>
6427 Date: Fri Jul 30 14:28:13 2021 +0000
6429 upstream: fix a formatting error and add some Xr; from debian at
6433 removed references to rlogin etc. as no longer relevant;
6438 OpenBSD-Commit-ID: 3c431c303068d3aec5bb18573a0bd5e0cd77c5ae
6440 commit c7cd347a8823819411222c1e10a0d26747d0fd5c
6441 Author: jmc@openbsd.org <jmc@openbsd.org>
6442 Date: Fri Jul 30 14:25:01 2021 +0000
6444 upstream: fix a formatting error and mark up known_hosts
6446 consistently; issues reported by debian at helgefjell de
6450 OpenBSD-Commit-ID: a1fd8d21dc77f507685443832df0c9700481b0ce
6452 commit 4455aec2e4fc90f64ae4fc47e78ebc9c18721738
6453 Author: jmc@openbsd.org <jmc@openbsd.org>
6454 Date: Wed Jul 28 05:57:42 2021 +0000
6456 upstream: no need to talk about version 2 with the -Q option, so
6458 rewrite the text to read better;
6460 issue reported by debian at helgefjell de
6463 OpenBSD-Commit-ID: 59fe2e8219c37906740ad062e0fdaea487dbe9cf
6465 commit bec429338e9b30d2c7668060e82608286a8a4777
6466 Author: jmc@openbsd.org <jmc@openbsd.org>
6467 Date: Tue Jul 27 14:28:46 2021 +0000
6469 upstream: word fix; reported by debian at helgefjell de
6471 OpenBSD-Commit-ID: 0c6fd22142422a25343c5bd1a618f31618f41ece
6473 commit efad4deb5a1f1cf79ebefd63c6625059060bfbe1
6474 Author: jmc@openbsd.org <jmc@openbsd.org>
6475 Date: Tue Jul 27 14:14:25 2021 +0000
6477 upstream: standardise the grammar in the options list; issue
6479 reported by debian at helgefjell de
6483 OpenBSD-Commit-ID: 7ac15575045d82f4b205a42cc7d5207fe4c3f8e6
6485 commit 1e11fb24066f3fc259ee30db3dbb2a3127e05956
6486 Author: Darren Tucker <dtucker@dtucker.net>
6487 Date: Mon Aug 2 18:56:29 2021 +1000
6489 Check for RLIMIT_NOFILE before trying to use it.
6491 commit 0f494236b49fb48c1ef33669f14822ca4f3ce2f4
6492 Author: Darren Tucker <dtucker@dtucker.net>
6493 Date: Tue Jul 27 17:45:34 2021 +1000
6495 lastenv is only used in setenv.
6497 Prevents an unused variable warning on platforms that have setenv but
6500 commit a1f78e08bdb3eaa88603ba3c6e01de7c8671e28a
6501 Author: Darren Tucker <dtucker@dtucker.net>
6502 Date: Mon Jul 26 12:45:30 2021 +1000
6504 Move SUDO to "make test" command line.
6506 Environment variables don't get passed by vmrun, so move to command
6509 commit 02e624273b9c78a49a01239159b8c09b8409b1a0
6510 Author: Darren Tucker <dtucker@dtucker.net>
6511 Date: Sun Jul 25 23:26:36 2021 +1000
6513 Set SUDO for tests and cleanup.
6515 commit 460ae5d93051bab70239ad823dd784822d58baad
6516 Author: Darren Tucker <dtucker@dtucker.net>
6517 Date: Sun Jul 25 22:37:55 2021 +1000
6519 Pass OPENSSL=no to make tests too.
6521 commit b398f499c68d74ebe3298b73757cf3f36e14e0cb
6522 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6523 Date: Sun Jul 25 12:27:37 2021 +0000
6525 upstream: Skip unit and makefile-based key conversion tests when
6527 we're building with OPENSSL=no.
6529 OpenBSD-Regress-ID: 20455ed9a977c93f846059d1fcb48e29e2c8d732
6531 commit 727ce36c8c5941bde99216d27109405907caae4f
6532 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6533 Date: Sun Jul 25 12:13:03 2021 +0000
6535 upstream: Replace OPENSSL as the variable that points to the
6537 openssl binary with OPENSSL_BIN. This will allow us to use the OPENSSL
6538 variable from mk.conf or the make(1) command line indicating if we're
6539 building with our without OpenSSL, and ultimately get the regress tests
6540 working in the OPENSSL=no configuration.
6542 OpenBSD-Regress-ID: 2d788fade3264d7803e5b54cae8875963f688c4e
6544 commit 55e17101a9075f6a63af724261c5744809dcb95c
6545 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6546 Date: Sat Jul 24 02:57:28 2021 +0000
6548 upstream: Skip RFC4716 format import and export tests when built
6552 OpenBSD-Regress-ID: d2c2d5d38c1acc2b88cc99cfe00a2eb8bb39dfa4
6554 commit f5ccb5895d39cd627ad9e7b2c671d2587616100d
6555 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6556 Date: Sat Jul 24 02:51:14 2021 +0000
6558 upstream: Don't omit ssh-keygen -y from usage when built without
6560 OpenSSL. It is actually available, albeit only for ed25519 keys.
6562 OpenBSD-Commit-ID: 7a254c33d0e6a55c30c6b016a8d298d3cb7a7674
6564 commit 819d57ac23469f1f03baa8feb38ddefbada90fdc
6565 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6566 Date: Sat Jul 24 02:08:13 2021 +0000
6568 upstream: Exclude key conversion options from usage when built
6570 without OpenSSL since those are not available, similar to what we currently
6571 do with the moduli screening options. We can also use this to skip the
6572 conversion regression tests in this case.
6574 OpenBSD-Commit-ID: 3c82caa398cf99cd4518c23bba5a2fc66b16bafe
6576 commit b6673b1d2ee90b4690ee84f634efe40225423c38
6577 Author: Darren Tucker <dtucker@dtucker.net>
6578 Date: Sat Jul 24 13:02:51 2021 +1000
6580 Test OpenBSD upstream with and without OpenSSL.
6582 commit 9d38074b5453c1abbdf888e80828c278d3b886ac
6583 Author: djm@openbsd.org <djm@openbsd.org>
6584 Date: Sat Jul 24 01:54:23 2021 +0000
6586 upstream: test for first-match-wins in authorized_keys environment=
6590 OpenBSD-Regress-ID: 1517c90276fe84b5dc5821c59f88877fcc34c0e8
6592 commit 2b76f1dd19787e784711ea297ad8fc938b4484fd
6593 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6594 Date: Fri Jul 23 05:53:02 2021 +0000
6596 upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly.
6598 OpenBSD-Regress-ID: cdbe408ec3671ea9ee9b55651ee551370d2a4108
6600 commit 7d64a9fb587ba9592f027f7a2264226c713d6579
6601 Author: djm@openbsd.org <djm@openbsd.org>
6602 Date: Sat Jul 24 01:55:19 2021 +0000
6604 upstream: don't leak environment= variable when it is not the first
6608 OpenBSD-Commit-ID: 7fbdc3dfe0032deaf003fd937eeb4d434ee4efe0
6610 commit db2130e2340bf923e41c791aa9cd27b9e926042c
6611 Author: jmc@openbsd.org <jmc@openbsd.org>
6612 Date: Fri Jul 23 06:01:17 2021 +0000
6614 upstream: punctuation;
6616 OpenBSD-Commit-ID: 64be152e378c45975073ab1c07e0db7eddd15806
6618 commit 03190d10980c6fc9124e988cb2df13101f266507
6619 Author: djm@openbsd.org <djm@openbsd.org>
6620 Date: Fri Jul 23 05:56:47 2021 +0000
6622 upstream: mention in comment that read_passphrase(..., RP_ALLOW_STDIN)
6624 will try to use askpass first. bz3314
6626 convert a couple of debug() -> debug_f() while here
6628 OpenBSD-Commit-ID: c7e812aebc28fcc5db06d4710e0f73613dee545c
6630 commit 1653ece6832b2b304d46866b262d5f69880a9ec7
6631 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6632 Date: Fri Jul 23 05:07:16 2021 +0000
6634 upstream: Test conversion of ed25519 and ecdsa keys too.
6636 OpenBSD-Regress-ID: 3676d2d00e58e0d6d37f2878f108cc2b83bbe4bb
6638 commit 8b7af02dcf9d2b738787efd27da7ffda9859bed2
6639 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6640 Date: Fri Jul 23 04:56:21 2021 +0000
6642 upstream: Add test for exporting pubkey from a passphrase-protected
6646 OpenBSD-Regress-ID: da99d93e7b235fbd5b5aaa01efc411225e6ba8ac
6648 commit 441095d4a3e5048fe3c87a6c5db5bc3383d767fb
6649 Author: djm@openbsd.org <djm@openbsd.org>
6650 Date: Fri Jul 23 03:54:55 2021 +0000
6652 upstream: regression test for time-limited signature keys
6654 OpenBSD-Regress-ID: 2a6f3bd900dbee0a3c96f1ff23e032c93ab392bc
6656 commit 9e1882ef6489a7dd16b6d7794af96629cae61a53
6657 Author: djm@openbsd.org <djm@openbsd.org>
6658 Date: Fri Jul 23 05:24:02 2021 +0000
6660 upstream: note successful authentication method in final "Authenticated
6662 to ..." message and partial auth success messages (all at LogLevel=verbose)
6665 OpenBSD-Commit-ID: 06834b89ceb89f8f16c5321d368a66c08f441984
6667 commit a917e973a1b90b40ff1e950df083364b48fc6c78
6668 Author: djm@openbsd.org <djm@openbsd.org>
6669 Date: Fri Jul 23 04:04:52 2021 +0000
6671 upstream: Add a ForkAfterAuthentication ssh_config(5) counterpart
6673 to the ssh(1) -f flag. Last part of GHPR231 from Volker Diels-Grabsch. ok
6676 OpenBSD-Commit-ID: b18aeda12efdebe2093d55263c90fe4ea0bce0d3
6678 commit e0c5088f1c96a145eb6ea1dee438010da78f9ef5
6679 Author: djm@openbsd.org <djm@openbsd.org>
6680 Date: Fri Jul 23 04:00:59 2021 +0000
6682 upstream: Add a StdinNull directive to ssh_config(5) that allows
6684 the config file to do the same thing as -n does on the ssh(1) commandline.
6685 Patch from Volker Diels-Grabsch via GHPR231; ok dtucker
6687 OpenBSD-Commit-ID: 66ddf3f15c76796d4dcd22ff464aed1edd62468e
6689 commit e3957e21ffdc119d6d04c0b1686f8e2fe052f5ea
6690 Author: djm@openbsd.org <djm@openbsd.org>
6691 Date: Fri Jul 23 03:57:20 2021 +0000
6693 upstream: make authorized_keys environment="..." directives
6695 first-match-wins and more strictly limit their maximum number; prompted by
6696 OOM reported by OSS-fuzz (35470).
6698 feedback and ok dtucker@
6700 OpenBSD-Commit-ID: 01f63fc10dcd995e7aed9c378ad879161af83121
6702 commit d0bb1ce731762c55acb95817df4d5fab526c7ecd
6703 Author: djm@openbsd.org <djm@openbsd.org>
6704 Date: Fri Jul 23 03:37:52 2021 +0000
6706 upstream: Let allowed signers files used by ssh-keygen(1)
6708 signatures support key lifetimes, and allow the verification mode to specify
6709 a signature time to check at. This is intended for use by git to support
6710 signing objects using ssh keys. ok dtucker@
6712 OpenBSD-Commit-ID: 3e2c67b7dcd94f0610194d1e8e4907829a40cf31
6714 commit 44142068dc7ef783d135e91ff954e754d2ed432e
6715 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6716 Date: Mon Jul 19 08:48:33 2021 +0000
6718 upstream: Use SUDO when setting up hostkey.
6720 OpenBSD-Regress-ID: 990cf4481cab8dad62e90818a9b4b36c533851a7
6722 commit 6b67f3f1d1d187597e54a139cc7785c0acebd9a2
6723 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6724 Date: Mon Jul 19 05:08:54 2021 +0000
6726 upstream: Increase time margin for rekey tests. Should help
6728 reliability on very heavily loaded hosts.
6730 OpenBSD-Regress-ID: 4c28a0fce3ea89ebde441d7091464176e9730533
6732 commit 7953e1bfce9e76bec41c1331a29bc6cff9d416b8
6733 Author: Darren Tucker <dtucker@dtucker.net>
6734 Date: Mon Jul 19 13:47:51 2021 +1000
6736 Add sshfp-connect.sh file missed in previous.
6738 commit b75a80fa8369864916d4c93a50576155cad4df03
6739 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6740 Date: Mon Jul 19 03:13:28 2021 +0000
6742 upstream: Ensure that all returned SSHFP records for the specified host
6744 name and hostkey type match instead of only one. While there, simplify the
6745 code somewhat and add some debugging. Based on discussion in bz#3322, ok
6748 OpenBSD-Commit-ID: 0a6a0a476eb7f9dfe8fe2c05a1a395e3e9b22ee4
6750 commit 1cc1fd095393663cd72ddac927d82c6384c622ba
6751 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6752 Date: Mon Jul 19 02:21:50 2021 +0000
6754 upstream: Id sync only, -portable already has this.
6756 Put dh_set_moduli_file call inside ifdef WITH_OPENSSL. Fixes
6757 build with OPENSSL=no.
6759 OpenBSD-Commit-ID: af54abbebfb12bcde6219a44d544e18204defb15
6761 commit 33abbe2f4153f5ca5c874582f6a7cc91ae167485
6762 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6763 Date: Mon Jul 19 02:46:34 2021 +0000
6765 upstream: Add test for host key verification via SSHFP records. This
6767 requires some external setup to operate so is disabled by default (see
6768 comments in sshfp-connect.sh).
6770 OpenBSD-Regress-ID: c52c461bd1df3a803d17498917d156ef64512fd9
6772 commit f0cd000d8e3afeb0416dce1c711c3d7c28d89bdd
6773 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6774 Date: Mon Jul 19 02:29:28 2021 +0000
6776 upstream: Add ed25519 key and test SSHFP export of it. Only test
6778 RSA SSHFP export if we have RSA functionality compiled in.
6780 OpenBSD-Regress-ID: b4ff5181b8c9a5862e7f0ecdd96108622333a9af
6782 commit 0075511e27e5394faa28edca02bfbf13b9a6693e
6783 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6784 Date: Mon Jul 19 00:16:26 2021 +0000
6786 upstream: Group keygen tests together.
6788 OpenBSD-Regress-ID: 07e2d25c527bb44f03b7c329d893a1f2d6c5c40c
6790 commit 034828820c7e62652e7c48f9ee6b67fb7ba6fa26
6791 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6792 Date: Sun Jul 18 23:10:10 2021 +0000
6794 upstream: Add test for ssh-keygen printing of SSHFP records.
6796 OpenBSD-Regress-ID: fde9566b56eeb980e149bbe157a884838507c46b
6798 commit 52c3b6985ef1d5dadb4c4fe212f8b3a78ca96812
6799 Author: djm@openbsd.org <djm@openbsd.org>
6800 Date: Sat Jul 17 00:38:11 2021 +0000
6802 upstream: wrap some long lines
6804 OpenBSD-Commit-ID: 4f5186b1466656762dae37d3e569438d900c350d
6806 commit 43ec991a782791d0b3f42898cd789f99a07bfaa4
6807 Author: djm@openbsd.org <djm@openbsd.org>
6808 Date: Sat Jul 17 00:36:53 2021 +0000
6810 upstream: fix sftp on ControlPersist connections, broken by recent
6812 SessionType change; spotted by sthen@
6814 OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234
6816 commit 073f45c236550f158c9a94003e4611c07dea5279
6817 Author: djm@openbsd.org <djm@openbsd.org>
6818 Date: Fri Jul 16 09:00:23 2021 +0000
6820 upstream: Explicitly check for and start time-based rekeying in the
6822 client and server mainloops.
6824 Previously the rekey timeout could expire but rekeying would not start
6825 until a packet was sent or received. This could cause us to spin in
6826 select() on the rekey timeout if the connection was quiet.
6830 OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987
6832 commit ef7c4e52d5d840607f9ca3a302a4cbb81053eccf
6833 Author: jmc@openbsd.org <jmc@openbsd.org>
6834 Date: Wed Jul 14 06:46:38 2021 +0000
6836 upstream: reorder SessionType; ok djm
6838 OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c
6840 commit 8aa2f9aeb56506dca996d68ab90ab9c0bebd7ec3
6841 Author: Darren Tucker <dtucker@dtucker.net>
6842 Date: Wed Jul 14 11:26:50 2021 +1000
6844 Make whitespace consistent.
6846 commit 4f4297ee9b8a39f4dfd243a74c5f51f9e7a05723
6847 Author: Darren Tucker <dtucker@dtucker.net>
6848 Date: Wed Jul 14 11:26:12 2021 +1000
6850 Add ARM64 Linux self-hosted runner.
6852 commit eda8909d1b0a85b9c3804a04d03ec6738fd9dc7f
6853 Author: djm@openbsd.org <djm@openbsd.org>
6854 Date: Tue Jul 13 23:48:36 2021 +0000
6856 upstream: add a SessionType directive to ssh_config, allowing the
6858 configuration file to offer equivalent control to the -N (no session) and -s
6859 (subsystem) command-line flags.
6861 Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks;
6862 feedback and ok dtucker@
6864 OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12
6866 commit 7ae69f2628e338ba6e0eae7ee8a63bcf8fea7538
6867 Author: djm@openbsd.org <djm@openbsd.org>
6868 Date: Mon Jul 12 02:12:22 2021 +0000
6870 upstream: fix some broken tests; clean up output
6872 OpenBSD-Regress-ID: 1d5038edb511dc4ce1622344c1e724626a253566
6874 commit f5fc6a4c3404bbf65c21ca6361853b33d78aa87e
6875 Author: Darren Tucker <dtucker@dtucker.net>
6876 Date: Mon Jul 12 18:00:05 2021 +1000
6878 Add configure-time detection for SSH_TIME_T_MAX.
6880 Should fix printing cert times exceeding INT_MAX (bz#3329) on platforms
6881 were time_t is a long long. The limit used is for the signed type, so if
6882 some system has a 32bit unsigned time_t then the lower limit will still
6883 be imposed and we would need to add some way to detect this. Anyone using
6884 an unsigned 64bit can let us know when it starts being a problem.
6886 commit fd2d06ae4442820429d634c0a8bae11c8e40c174
6887 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6888 Date: Mon Jul 12 06:22:57 2021 +0000
6890 upstream: Make limit for time_t test unconditional in the
6892 format_absolute_time fix for bz#3329 that allows printing of timestamps past
6893 INT_MAX. This was incorrectly included with the previous commit. Based on
6894 discussion with djm@.
6896 OpenBSD-Commit-ID: 835936f6837c86504b07cabb596b613600cf0f6e
6898 commit 6c29b387cd64a57b0ec8ae7d2c8d02789d88fcc3
6899 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6900 Date: Mon Jul 12 06:08:57 2021 +0000
6902 upstream: Use existing format_absolute_time() function when
6904 printing cert validity instead of doing it inline. Part of bz#3329.
6906 OpenBSD-Commit-ID: a13d4e3c4f59644c23745eb02a09b2a4e717c00c
6908 commit 99981d5f8bfa383791afea03f6bce8454e96e323
6909 Author: djm@openbsd.org <djm@openbsd.org>
6910 Date: Fri Jul 9 09:55:56 2021 +0000
6912 upstream: silence redundant error message; reported by Fabian Stelzer
6914 OpenBSD-Commit-ID: 9349a703016579a60557dafd03af2fe1d44e6aa2
6916 commit e86097813419b49d5bff5c4b51d1c3a5d4d2d804
6917 Author: John Ericson <John.Ericson@Obsidian.Systems>
6918 Date: Sat Dec 26 11:40:49 2020 -0500
6920 Re-indent krb5 section after pkg-config addition.
6922 commit 32dd2daa56c294e40ff7efea482c9eac536d8cbb
6923 Author: John Ericson <John.Ericson@Obsidian.Systems>
6924 Date: Sat Dec 26 11:40:49 2020 -0500
6926 Support finding Kerberos via pkg-config
6928 This makes cross compilation easier.
6930 commit def7a72234d7e4f684d72d33a0f7229f9eee0aa4
6931 Author: Darren Tucker <dtucker@dtucker.net>
6932 Date: Fri Jul 9 14:34:06 2021 +1000
6934 Update comments about EGD to include prngd.
6936 commit b5d23150b4e3368f4983fd169d432c07afeee45a
6937 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6938 Date: Mon Jul 5 01:21:07 2021 +0000
6940 upstream: Fix a couple of whitespace things. Portable already has
6942 these so this removes two diffs between the two.
6944 OpenBSD-Commit-ID: 769f017ebafd8e741e337b3e9e89eb5ac73c9c56
6946 commit 8f57be9f279b8e905f9883066aa633c7e67b31cf
6947 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6948 Date: Mon Jul 5 01:16:46 2021 +0000
6950 upstream: Order includes as per style(9). Portable already has
6952 these so this removes a handful of diffs between the two.
6954 OpenBSD-Commit-ID: 8bd7452d809b199c19bfc49511a798f414eb4a77
6956 commit b75624f8733b3ed9e240f86cac5d4a39dae11848
6957 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6958 Date: Mon Jul 5 00:50:25 2021 +0000
6960 upstream: Remove comment referencing now-removed
6962 RhostsRSAAuthentication. ok djm@
6964 OpenBSD-Commit-ID: 3d864bfbd99a1d4429a58e301688f3be464827a9
6966 commit b67eb12f013c5441bb4f0893a97533582ad4eb13
6967 Author: djm@openbsd.org <djm@openbsd.org>
6968 Date: Mon Jul 5 00:25:42 2021 +0000
6970 upstream: allow spaces to appear in usernames for local to remote,
6972 and scp -3 remote to remote copies. with & ok dtucker bz#1164
6974 OpenBSD-Commit-ID: e9b550f3a85ffbb079b6720833da31317901d6dd
6976 commit 8c4ef0943e574f614fc7c6c7e427fd81ee64ab87
6977 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6978 Date: Fri Jul 2 07:20:44 2021 +0000
6980 upstream: Remove obsolete comments about SSHv1 auth methods. ok
6984 OpenBSD-Commit-ID: 6060f70966f362d8eb4bec3da2f6c4712fbfb98f
6986 commit 88908c9b61bcb99f16e8d398fc41e2b3b4be2003
6987 Author: Darren Tucker <dtucker@dtucker.net>
6988 Date: Sat Jul 3 23:00:19 2021 +1000
6990 Remove reference to ChallengeResponse.
6992 challenge_response_authentication was removed from the struct, keeping
6993 kbd_interactive_authentication.
6995 commit 321874416d610ad2158ce6112f094a4862c2e37f
6996 Author: Darren Tucker <dtucker@dtucker.net>
6997 Date: Sat Jul 3 20:38:09 2021 +1000
6999 Move signal.h up include order to match upstream.
7001 commit 4fa83e2d0e32c2dd758653e0359984bbf1334f32
7002 Author: Darren Tucker <dtucker@dtucker.net>
7003 Date: Sat Jul 3 20:36:06 2021 +1000
7005 Remove old OpenBSD version marker.
7007 Looks like an accidental leftover from a sync.
7009 commit 9d5e31f55d5f3899b72645bac41a932d298ad73b
7010 Author: Darren Tucker <dtucker@dtucker.net>
7011 Date: Sat Jul 3 20:34:19 2021 +1000
7013 Remove duplicate error on error path.
7015 There's an extra error() call on the listen error path, it looks like
7016 its removal was missed during an upstream sync.
7018 commit 888c459925c7478ce22ff206c9ac1fb812a40caf
7019 Author: Darren Tucker <dtucker@dtucker.net>
7020 Date: Sat Jul 3 20:32:46 2021 +1000
7022 Remove some whitespace not in upstream.
7024 Reduces diff vs OpenBSD by a small amount.
7026 commit 4d2d4d47a18d93f3e0a91a241a6fdb545bbf7dc2
7027 Author: Darren Tucker <dtucker@dtucker.net>
7028 Date: Sat Jul 3 19:27:43 2021 +1000
7030 Replace remaining references to ChallengeResponse.
7032 Portable had a few additional references to ChallengeResponse related to
7033 UsePAM, replaces these with equivalent keyboard-interactive ones.
7035 commit 53237ac789183946dac6dcb8838bc3b6b9b43be1
7036 Author: Darren Tucker <dtucker@dtucker.net>
7037 Date: Sat Jul 3 19:23:28 2021 +1000
7039 Sync remaining ChallengeResponse removal.
7041 These were omitted from commit 88868fd131.
7043 commit 2c9e4b319f7e98744b188b0f58859d431def343b
7044 Author: Darren Tucker <dtucker@dtucker.net>
7045 Date: Sat Jul 3 19:17:31 2021 +1000
7047 Disable rocky84 to figure out why agent test fails
7049 commit bfe19197a92b7916f64a121fbd3c179abf15e218
7050 Author: Darren Tucker <dtucker@dtucker.net>
7051 Date: Fri Jul 2 15:43:28 2021 +1000
7053 Remove now-unused SSHv1 enums.
7055 sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options
7056 and are no longer used.
7058 commit c73b02d92d72458a5312bd098f32ce88868fd131
7059 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7060 Date: Fri Jul 2 05:11:20 2021 +0000
7062 upstream: Remove references to ChallengeResponseAuthentication in
7064 favour of KbdInteractiveAuthentication. The former is what was in SSHv1, the
7065 latter is what is in SSHv2 (RFC4256) and they were treated as somewhat but
7066 not entirely equivalent. We retain the old name as deprecated alias so
7067 config files continue to work and a reference in the man page for people
7070 Prompted by bz#3303 which pointed out the discrepancy between the two
7071 when used with Match. Man page help & ok jmc@, with & ok djm@
7073 OpenBSD-Commit-ID: 2c1bff8e5c9852cfcdab1f3ea94dfef5a22f3b7e
7075 commit f841fc9c8c7568a3b5d84a4cc0cefacb7dbc16b9
7076 Author: Darren Tucker <dtucker@dtucker.net>
7077 Date: Fri Jul 2 15:20:32 2021 +1000
7079 Fix ifdefs around get_random_bytes_prngd.
7081 get_random_bytes_prngd() is used if either of PRNGD_PORT or PRNGD_SOCKET
7082 are defined, so adjust ifdef accordingly.
7084 commit 0767627cf66574484b9c0834500b42ea04fe528a
7085 Author: Damien Miller <djm@mindrot.org>
7086 Date: Fri Jul 2 14:30:23 2021 +1000
7088 wrap get_random_bytes_prngd() in ifdef
7090 avoid unused static function warning
7092 commit f93fdc4de158386efe1116bd44c5b3f4a7a82c25
7093 Author: Darren Tucker <dtucker@dtucker.net>
7094 Date: Mon Jun 28 13:06:37 2021 +1000
7096 Add rocky84 test target.
7098 commit d443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b
7099 Author: djm@openbsd.org <djm@openbsd.org>
7100 Date: Fri Jun 25 06:30:22 2021 +0000
7102 upstream: fix decoding of X.509 subject name; from Leif Thuresson
7104 via bz3327 ok markus@
7106 OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8
7108 commit 2a5704ec142202d387fda2d6872fd4715ab81347
7109 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7110 Date: Fri Jun 25 06:20:39 2021 +0000
7112 upstream: Use better language to refer to the user. From l1ving
7114 via github PR#250, ok jmc@
7116 OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf
7118 commit 4bdf7a04797a0ea1c431a9d54588417c29177d19
7119 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7120 Date: Fri Jun 25 03:38:17 2021 +0000
7122 upstream: Replace SIGCHLD/notify_pipe kludge with pselect.
7124 Previously sshd's SIGCHLD handler would wake up select() by writing a
7125 byte to notify_pipe. We can remove this by blocking SIGCHLD, checking
7126 for child terminations then passing the original signal mask through
7127 to pselect. This ensures that the pselect will immediately wake up if
7128 a child terminates between wait()ing on them and the pselect.
7130 In -portable, for platforms that do not have pselect the kludge is still
7131 there but is hidden behind a pselect interface.
7133 Based on other changes for bz#2158, ok djm@
7135 OpenBSD-Commit-ID: 202c85de0b3bdf1744fe53529a05404c5480d813
7137 commit c9f7bba2e6f70b7ac1f5ea190d890cb5162ce127
7138 Author: Darren Tucker <dtucker@dtucker.net>
7139 Date: Fri Jun 25 15:08:18 2021 +1000
7141 Move closefrom() to before first malloc.
7143 When built against tcmalloc, tcmalloc allocates a descriptor for its
7144 internal use, so calling closefrom() afterward causes the descriptor
7145 number to be reused resulting in a corrupted connection. Moving the
7146 closefrom a little earlier should resolve this. From kircherlike at
7147 outlook.com via bz#3321, ok djm@
7149 commit 7ebfe4e439853b88997c9cfc2ff703408a1cca92
7150 Author: Darren Tucker <dtucker@dtucker.net>
7151 Date: Fri Jun 18 20:41:45 2021 +1000
7153 Put second -lssh in link line for sftp-server.
7155 When building --without-openssl the recent port-prngd.c change adds
7156 a dependency on atomicio, but since nothing else in sftp-server uses
7157 it, the linker may not find it. Add a second -lssh similar to other
7160 commit e409d7966785cfd9f5970e66a820685c42169717
7161 Author: Darren Tucker <dtucker@dtucker.net>
7162 Date: Fri Jun 18 18:34:08 2021 +1000
7164 Try EGD/PRNGD if random device fails.
7166 When built --without-openssl, try EGD/PRGGD (if configured) as a last
7167 resort before failing.
7169 commit e43a898043faa3a965dbaa1193cc60e0b479033d
7170 Author: Darren Tucker <dtucker@dtucker.net>
7171 Date: Fri Jun 18 18:32:51 2021 +1000
7173 Split EGD/PRNGD interface into its own file.
7175 This will allow us to use it when building --without-openssl.
7177 commit acb2887a769a1b1912cfd7067f3ce04fad240260
7178 Author: Darren Tucker <dtucker@dtucker.net>
7179 Date: Thu Jun 17 21:03:19 2021 +1000
7181 Handle GIDs > 2^31 in getgrouplist.
7183 When compiled in 32bit mode, the getgrouplist implementation may fail
7184 for GIDs greater than LONG_MAX. Analysis and change from ralf.winkel
7187 commit 31fac20c941126281b527605b73bff30a8f02edd
7188 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7189 Date: Thu Jun 10 09:46:28 2021 +0000
7191 upstream: Use $SUDO when reading sshd's pidfile here too.
7193 OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409
7195 commit a3a58acffc8cc527f8fc6729486d34e4c3d27643
7196 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7197 Date: Thu Jun 10 09:43:51 2021 +0000
7199 upstream: Use $SUDO when reading sshd's pidfile in case it was
7201 created with a very restrictive umask. This resyncs with -portable.
7203 OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d
7205 commit 249ad4ae51cd3bc235e75a4846eccdf8b1416611
7206 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7207 Date: Thu Jun 10 09:37:59 2021 +0000
7209 upstream: Set umask when creating hostkeys to prevent excessive
7211 permissions warning.
7213 OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef
7215 commit 9d0892153c005cc65897e9372b01fa66fcbe2842
7216 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7217 Date: Thu Jun 10 03:45:31 2021 +0000
7219 upstream: Add regress test for SIGHUP restart
7221 while handling active and unauthenticated clients. Should catch anything
7222 similar to the pselect bug just fixed in sshd.c.
7224 OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73
7226 commit 73f6f191f44440ca3049b9d3c8e5401d10b55097
7227 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7228 Date: Thu Jun 10 03:14:14 2021 +0000
7230 upstream: Continue accept loop when pselect
7232 returns -1, eg if it was interrupted by a signal. This should prevent
7233 the hang discovered by sthen@ wherein sshd receives a SIGHUP while it has
7234 an unauthenticated child and goes on to a blocking read on a notify_pipe.
7235 feedback deraadt@, ok djm@
7237 OpenBSD-Commit-ID: 0243c1c5544fca0974dae92cd4079543a3fceaa0
7239 commit c785c0ae134a8e8b5c82b2193f64c632a98159e4
7240 Author: djm@openbsd.org <djm@openbsd.org>
7241 Date: Tue Jun 8 22:30:27 2021 +0000
7243 upstream: test that UserKnownHostsFile correctly accepts multiple
7245 arguments; would have caught readconf.c r1.356 regression
7247 OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a
7249 commit 1a6f6b08e62c78906a3032e8d9a83e721c84574e
7250 Author: djm@openbsd.org <djm@openbsd.org>
7251 Date: Tue Jun 8 22:06:12 2021 +0000
7253 upstream: fix regression in r1.356: for ssh_config options that
7255 accepted multiple string arguments, ssh was only recording the first.
7256 Reported by Lucas via bugs@
7258 OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d
7260 commit 78e30af3e2b2dd540a341cc827c6b98dd8b0a6de
7261 Author: djm@openbsd.org <djm@openbsd.org>
7262 Date: Tue Jun 8 07:40:12 2021 +0000
7264 upstream: test argv_split() optional termination on comments
7266 OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c
7268 commit a023138957ea2becf1c7f93fcc42b0aaac6f2b03
7269 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7270 Date: Tue Jun 8 07:05:27 2021 +0000
7272 upstream: Add testcases from bz#3319 for IPQoS and TunnelDevice
7274 being overridden on the command line.
7276 OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8
7278 commit 660cea10b2cdc11f13ba99c89b1bbb368a4d9ff2
7279 Author: djm@openbsd.org <djm@openbsd.org>
7280 Date: Tue Jun 8 06:52:43 2021 +0000
7282 upstream: sprinkle some "# comment" at end of configuration lines
7284 to test comment handling
7286 OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7
7288 commit acc9c32dcb6def6c7d3688bceb4c0e59bd26b411
7289 Author: djm@openbsd.org <djm@openbsd.org>
7290 Date: Tue Jun 8 06:51:47 2021 +0000
7292 upstream: more descriptive failure message
7294 OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509
7296 commit ce04dd4eae23d1c9cf7c424a702f48ee78573bc1
7297 Author: djm@openbsd.org <djm@openbsd.org>
7298 Date: Mon Jun 7 01:16:34 2021 +0000
7300 upstream: test AuthenticationMethods inside a Match block as well
7302 as in the main config section
7304 OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7
7306 commit 9018bd821fca17e26e92f7a7e51d9b24cd62f2db
7307 Author: djm@openbsd.org <djm@openbsd.org>
7308 Date: Mon Jun 7 00:00:50 2021 +0000
7310 upstream: prepare for stricter sshd_config parsing that will refuse
7312 a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent
7313 arguments. Such lines are permitted but are nonsensical noops ATM
7315 OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650
7317 commit a10f929d1ce80640129fc5b6bc1acd9bf689169e
7318 Author: djm@openbsd.org <djm@openbsd.org>
7319 Date: Tue Jun 8 07:09:42 2021 +0000
7321 upstream: switch sshd_config parsing to argv_split()
7323 similar to the previous commit, this switches sshd_config parsing to
7324 the newer tokeniser. Config parsing will be a little stricter wrt
7325 quote correctness and directives appearing without arguments.
7327 feedback and ok markus@
7329 tested in snaps for the last five or so days - thanks Theo and those who
7332 OpenBSD-Commit-ID: 9c4305631d20c2d194661504ce11e1f68b20d93e
7334 commit ea9e45c89a4822d74a9d97fef8480707d584da4d
7335 Author: djm@openbsd.org <djm@openbsd.org>
7336 Date: Tue Jun 8 07:07:15 2021 +0000
7338 upstream: Switch ssh_config parsing to use argv_split()
7340 This fixes a couple of problems with the previous tokeniser,
7343 1. strdelim() is permissive wrt accepting '=' characters. This is
7344 intended to allow it to tokenise "Option=value" but because it
7345 cannot keep state, it will incorrectly split "Opt=val=val2".
7346 2. strdelim() has rudimentry handling of quoted strings, but it
7347 is incomplete and inconsistent. E.g. it doesn't handle escaped
7348 quotes inside a quoted string.
7349 3. It has no support for stopping on a (unquoted) comment. Because
7350 of this readconf.c r1.343 added chopping of lines at '#', but
7351 this caused a regression because these characters may legitimately
7352 appear inside quoted strings.
7354 The new tokeniser is stricter is a number of cases, including #1 above
7355 but previously it was also possible for some directives to appear
7356 without arguments. AFAIK these were nonsensical in all cases, and the
7357 new tokeniser refuses to accept them.
7359 The new code handles quotes much better, permitting quoted space as
7360 well as escaped closing quotes. Finally, comment handling should be
7361 fixed - the tokeniser will terminate only on unquoted # characters.
7363 feedback & ok markus@
7365 tested in snaps for the last five or so days - thanks Theo and those who
7368 OpenBSD-Commit-ID: dc72fd12af9d5398f4d9e159d671f9269c5b14d5
7370 commit d786424986c04d1d375f231fda177c8408e05c3e
7371 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7372 Date: Tue Jun 8 07:02:46 2021 +0000
7374 upstream: Check if IPQoS or TunnelDevice are already set before
7376 overriding. Prevents values in config files from overriding values supplied
7377 on the command line. bz#3319, ok markus.
7379 OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74
7381 commit aae4b4d3585b9f944d7dbd3c9e5ba0006c55e457
7382 Author: djm@openbsd.org <djm@openbsd.org>
7383 Date: Tue Jun 8 06:54:40 2021 +0000
7385 upstream: Allow argv_split() to optionally terminate tokenisation
7387 when it encounters an unquoted comment.
7389 Add some additional utility function for working with argument
7390 vectors, since we'll be switching to using them to parse
7391 ssh/sshd_config shortly.
7393 ok markus@ as part of a larger diff; tested in snaps
7395 OpenBSD-Commit-ID: fd9c108cef2f713f24e3bc5848861d221bb3a1ac
7397 commit da9f9acaac5bab95dca642b48e0c8182b246ab69
7398 Author: Darren Tucker <dtucker@dtucker.net>
7399 Date: Mon Jun 7 19:19:23 2021 +1000
7401 Save logs on failure for upstream test
7403 commit 76883c60161e5f3808787085a27a8c37f8cc4e08
7404 Author: Darren Tucker <dtucker@dtucker.net>
7405 Date: Mon Jun 7 14:36:32 2021 +1000
7407 Add obsdsnap-i386 upstream test target.
7409 commit d45b9c63f947ec5ec314696e70281f6afddc0ac3
7410 Author: djm@openbsd.org <djm@openbsd.org>
7411 Date: Mon Jun 7 03:38:38 2021 +0000
7413 upstream: fix debug message when finding a private key to match a
7415 certificate being attempted for user authentication. Previously it would
7416 print the certificate's path, whereas it was supposed to be showing the
7417 private key's path. Patch from Alex Sherwin via GHPR247
7419 OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b
7421 commit 530739d42f6102668aecd699be0ce59815c1eceb
7422 Author: djm@openbsd.org <djm@openbsd.org>
7423 Date: Sun Jun 6 11:34:16 2021 +0000
7425 upstream: Match host certificates against host public keys, not private
7427 keys. Allows use of certificates with private keys held in a ssh-agent.
7428 Reported by Miles Zhou in bz3524; ok dtucker@
7430 OpenBSD-Commit-ID: 25f5bf70003126d19162862d9eb380bf34bac22a
7432 commit 4265215d7300901fd7097061c7517688ade82f8e
7433 Author: djm@openbsd.org <djm@openbsd.org>
7434 Date: Sun Jun 6 03:40:39 2021 +0000
7436 upstream: Client-side workaround for a bug in OpenSSH 7.4: this release
7438 allows RSA/SHA2 signatures for public key authentication but fails to
7439 advertise this correctly via SSH2_MSG_EXT_INFO. This causes clients of these
7440 server to incorrectly match PubkeyAcceptedAlgorithms and potentially refuse
7441 to offer valid keys.
7443 Reported by and based on patch from Gordon Messmer via bz3213, thanks
7444 also for additional analysis by Jakub Jelen. ok dtucker
7446 OpenBSD-Commit-ID: d6d0b7351d5d44c45f3daaa26efac65847a564f7
7448 commit bda270d7fb8522d43c21a79a4b02a052d7c64de8
7449 Author: djm@openbsd.org <djm@openbsd.org>
7450 Date: Sun Jun 6 03:17:02 2021 +0000
7452 upstream: degrade gracefully if a sftp-server offers the
7454 limits@openssh.com extension but fails when the client tries to invoke it.
7455 Reported by Hector Martin via bz3318
7457 OpenBSD-Commit-ID: bd9d1839c41811616ede4da467e25746fcd9b967
7459 commit d345d5811afdc2d6923019b653cdd93c4cc95f76
7460 Author: djm@openbsd.org <djm@openbsd.org>
7461 Date: Sun Jun 6 03:15:39 2021 +0000
7463 upstream: the limits@openssh.com extension was incorrectly marked
7465 as an operation that writes to the filesystem, which made it unavailable in
7466 sftp-server read-only mode. Spotted by Hector Martin via bz3318
7468 OpenBSD-Commit-ID: f054465230787e37516c4b57098fc7975e00f067
7470 commit 2b71010d9b43d7b8c9ec1bf010beb00d98fa765a
7471 Author: naddy@openbsd.org <naddy@openbsd.org>
7472 Date: Sat Jun 5 13:47:00 2021 +0000
7474 upstream: PROTOCOL.certkeys: update reference from IETF draft to
7478 Also fix some typos.
7481 OpenBSD-Commit-ID: 5e855b6c5a22b5b13f8ffa3897a868e40d349b44
7483 commit aa99b2d9a3e45b943196914e8d8bf086646fdb54
7484 Author: Darren Tucker <dtucker@dtucker.net>
7485 Date: Fri Jun 4 23:41:29 2021 +1000
7487 Clear notify_pipe from readset if present.
7489 Prevents leaking an implementation detail to the caller.
7491 commit 6de8dadf6b4d0627d35bca0667ca44b1d61c2c6b
7492 Author: Darren Tucker <dtucker@dtucker.net>
7493 Date: Fri Jun 4 23:24:25 2021 +1000
7497 commit c8677065070ee34c05c7582a9c2f58d8642e552d
7498 Author: Darren Tucker <dtucker@dtucker.net>
7499 Date: Fri Jun 4 18:39:48 2021 +1000
7501 Add pselect implementation for platforms without.
7503 This is basically the existing notify_pipe kludge from serverloop.c
7504 moved behind a pselect interface. It works by installing a signal
7505 handler that writes to a pipe that the select is watching, then calls
7506 the original handler.
7508 The select call in serverloop will become pselect soon, at which point the
7509 kludge will be removed from thereand will only exist in the compat layer.
7510 Original code by markus, help from djm.
7512 commit 7cd7f302d3a072748299f362f9e241d81fcecd26
7513 Author: Vincent Brillault <vincent.brillault@cern.ch>
7514 Date: Sun May 24 09:15:06 2020 +0200
7516 auth_log: dont log partial successes as failures
7518 By design, 'partial' logins are successful logins, so initially with
7519 authenticated set to 1, for which another authentication is required. As
7520 a result, authenticated is always reset to 0 when partial is set to 1.
7521 However, even if authenticated is 0, those are not failed login
7522 attempts, similarly to attempts with authctxt->postponed set to 1.
7524 commit e7606919180661edc7f698e6a1b4ef2cfb363ebf
7525 Author: djm@openbsd.org <djm@openbsd.org>
7526 Date: Fri Jun 4 06:19:07 2021 +0000
7528 upstream: The RB_GENERATE_STATIC(3) macro expands to a series of
7530 function definitions and not a statement, so there should be no semicolon
7531 following them. Patch from Michael Forney
7533 OpenBSD-Commit-ID: c975dd180580f0bdc0a4d5b7d41ab1f5e9b7bedd
7535 commit c298c4da574ab92df2f051561aeb3e106b0ec954
7536 Author: djm@openbsd.org <djm@openbsd.org>
7537 Date: Fri Jun 4 05:59:18 2021 +0000
7539 upstream: rework authorized_keys example section, removing irrelevant
7541 stuff, de-wrapping the example lines and better aligning the examples with
7542 common usage and FAQs; ok jmc
7544 OpenBSD-Commit-ID: d59f1c9281f828148e2a2e49eb9629266803b75c
7546 commit d9cb35bbec5f623589d7c58fc094817b33030f35
7547 Author: djm@openbsd.org <djm@openbsd.org>
7548 Date: Fri Jun 4 05:10:03 2021 +0000
7550 upstream: adjust SetEnv description to clarify $TERM handling
7552 OpenBSD-Commit-ID: 8b8cc0124856bc1094949d55615e5c44390bcb22
7554 commit 771f57a8626709f2ad207058efd68fbf30d31553
7555 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7556 Date: Fri Jun 4 05:09:08 2021 +0000
7558 upstream: Switch the listening select loop from select() to
7560 pselect() and mask signals while checking signal flags, umasking for pselect
7561 and restoring afterwards. Also restore signals before sighup_restart so they
7562 don't remain blocked after restart.
7564 This prevents a race where a SIGTERM or SIGHUP can arrive between
7565 checking the flag and calling select (eg if sshd is processing a
7566 new connection) resulting in sshd not shutting down until the next
7567 time it receives a new connection. bz#2158, with & ok djm@
7569 OpenBSD-Commit-ID: bf85bf880fd78e00d7478657644fcda97b9a936f
7571 commit f64f8c00d158acc1359b8a096835849b23aa2e86
7572 Author: djm@openbsd.org <djm@openbsd.org>
7573 Date: Fri Jun 4 05:02:40 2021 +0000
7575 upstream: allow ssh_config SetEnv to override $TERM, which is otherwise
7577 handled specially by the protocol. Useful in ~/.ssh/config to set TERM to
7578 something generic (e.g. "xterm" instead of "xterm-256color") for destinations
7579 that lack terminfo entries. feedback and ok dtucker@
7581 OpenBSD-Commit-ID: 38b1ef4d5bc159c7d9d589d05e3017433e2d5758
7583 commit 60107677dc0ce1e93c61f23c433ad54687fcd9f5
7584 Author: djm@openbsd.org <djm@openbsd.org>
7585 Date: Fri Jun 4 04:02:21 2021 +0000
7587 upstream: correct extension name "no-presence-required" =>
7591 document "verify-required" option
7593 OpenBSD-Commit-ID: 1879ff4062cf61d79b515e433aff0bf49a6c55c5
7595 commit ecc186e46e3e30f27539b4311366dfda502f0a08
7596 Author: Darren Tucker <dtucker@dtucker.net>
7597 Date: Wed Jun 2 13:54:11 2021 +1000
7599 Retire fbsd7 test target.
7601 It's the slowest of the selfhosted targets (since it's 32bit but has
7602 most of the crypto algos). We still have coverage for 32bit i386.
7604 commit 5de0867b822ec48b5eec9abde0f5f95d1d646546
7605 Author: Darren Tucker <dtucker@dtucker.net>
7606 Date: Wed Jun 2 11:21:40 2021 +1000
7608 Check for $OPENSSL in md5 fallback too.
7610 commit 1db69d1b6542f8419c04cee7fd523a4a11004be2
7611 Author: Darren Tucker <dtucker@dtucker.net>
7612 Date: Wed Jun 2 11:17:54 2021 +1000
7616 commit a3f2dd955f1c19cad387a139f0e719af346ca6ef
7617 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7618 Date: Wed Jun 2 00:17:45 2021 +0000
7620 upstream: Merge back shell portability changes
7622 bringing it back in sync with -portable.
7624 OpenBSD-Regress-ID: c07905ba931e66ad7d849b87b7d19648007175d1
7626 commit 9d482295c9f073e84d75af46b720a1c0f7ec2867
7627 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7628 Date: Tue Jun 1 23:56:20 2021 +0000
7630 upstream: Use a default value for $OPENSSL,
7632 allowing it to be overridden. Do the same in the PuTTY tests since it's
7633 needed there and not exported by test-exec.sh.
7635 OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16
7637 commit 07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1
7638 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7639 Date: Mon May 24 10:25:18 2021 +0000
7641 upstream: Find openssl binary via environment variable. This
7643 allows overriding if necessary (eg in -portable where we're testing against a
7644 specific version of OpenSSL).
7646 OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5
7648 commit 1a4d1da9188d7c88f646b61f0d6a3b34f47c5439
7649 Author: djm@openbsd.org <djm@openbsd.org>
7650 Date: Fri May 21 04:03:47 2021 +0000
7652 upstream: fix memleak in test
7654 OpenBSD-Regress-ID: 5e529d0982aa04666604936df43242e97a7a6f81
7656 commit 60455a5d98065a73ec9a1f303345856bbd49aecc
7657 Author: djm@openbsd.org <djm@openbsd.org>
7658 Date: Fri May 21 03:59:01 2021 +0000
7660 upstream: also check contents of remaining string
7662 OpenBSD-Regress-ID: d526fa07253f4eebbc7d6205a0ab3d491ec71a28
7664 commit 39f6cd207851d7b67ca46903bfce4a9f615b5b1c
7665 Author: djm@openbsd.org <djm@openbsd.org>
7666 Date: Fri May 21 03:48:07 2021 +0000
7668 upstream: unit test for misc.c:strdelim() that mostly servces to
7670 highlight its inconsistencies
7672 OpenBSD-Regress-ID: 8d2bf970fcc01ccc6e36a5065f89b9c7fa934195
7674 commit 7a3a1dd2c7d4461962acbcc0ebee9445ba892be0
7675 Author: Darren Tucker <dtucker@dtucker.net>
7676 Date: Thu May 27 21:23:15 2021 +1000
7678 Put minix3 config in the host-specific block.
7680 commit 59a194825f12fff8a7f75d91bf751ea17645711b
7681 Author: djm@openbsd.org <djm@openbsd.org>
7682 Date: Mon May 31 06:48:42 2021 +0000
7684 upstream: Hash challenge supplied by client during FIDO key enrollment
7686 prior to passing it to libfido2, which does expect a hash.
7688 There is no effect for users who are simply generating FIDO keys using
7689 ssh-keygen - by default we generate a random 256 bit challenge, but
7690 people building attestation workflows around our tools should now have
7691 a more consistent experience (esp. fewer failures when they fail to
7692 guess the magic 32-byte challenge length requirement).
7696 OpenBSD-Commit-ID: b8d5363a6a7ca3b23dc28f3ca69470472959f2b5
7698 commit eb68e669bc8ab968d4cca5bf1357baca7136a826
7699 Author: Darren Tucker <dtucker@dtucker.net>
7700 Date: Thu May 27 21:14:15 2021 +1000
7702 Include login_cap.h for login_getpwclass override.
7704 On minix3, login_getpwclass is __RENAME'ed to __login_getpwclass50 so
7705 without this the include overriding login_getpwclass causes a compile
7708 commit 2063af71422501b65c7a92a5e14c0e6a3799ed89
7709 Author: Darren Tucker <dtucker@dtucker.net>
7710 Date: Thu May 27 21:13:38 2021 +1000
7712 Add minix3 test target.
7714 commit 2e1efcfd9f94352ca5f4b6958af8a454f8cf48cd
7715 Author: djm@openbsd.org <djm@openbsd.org>
7716 Date: Wed May 26 01:47:24 2021 +0000
7718 upstream: fix SEGV in UpdateHostkeys debug() message, triggered
7720 when the update removed more host keys than remain present. Fix tested by
7721 reporter James Cook, via bugs@
7723 OpenBSD-Commit-ID: 44f641f6ee02bb957f0c1d150495b60cf7b869d3
7725 commit 9acd76e6e4d2b519773e7119c33cf77f09534909
7726 Author: naddy@openbsd.org <naddy@openbsd.org>
7727 Date: Sun May 23 18:22:57 2021 +0000
7729 upstream: ssh: The client configuration keyword is
7731 "hostbasedacceptedalgorithms"
7733 This fixes a mistake that slipped in when "HostbasedKeyTypes" was
7734 renamed to "HostbasedAcceptedAlgorithms".
7736 Bug report by zack@philomathiclife.com
7738 OpenBSD-Commit-ID: d745a7e8e50b2589fc56877f322ea204bc784f38
7740 commit 078a0e60c92700da4c536c93c007257828ccd05b
7741 Author: Darren Tucker <dtucker@dtucker.net>
7742 Date: Tue May 25 11:40:47 2021 +1000
7744 Rename README.md to ci-status.md.
7746 The original intent was to provide a status page for the CIs configured
7747 in that directory, but it had the side effect of replacing the top-level
7750 commit 7be4ac813662f68e89f23c50de058a49aa32f7e4
7751 Author: djm@openbsd.org <djm@openbsd.org>
7752 Date: Wed May 19 01:24:05 2021 +0000
7754 upstream: restore blocking status on stdio fds before close
7756 ssh(1) needs to set file descriptors to non-blocking mode to operate
7757 but it was not restoring the original state on exit. This could cause
7758 problems with fds shared with other programs via the shell, e.g.
7760 > $ cat > test.sh << _EOF
7763 > ssh -Fnone -oLogLevel=verbose ::1 hostname
7764 > cat /usr/share/dict/words
7768 > Authenticated to ::1 ([::1]:22).
7769 > Transferred: sent 2352, received 2928 bytes, in 0.1 seconds
7770 > Bytes per second: sent 44338.9, received 55197.4
7771 > cat: stdout: Resource temporarily unavailable
7773 This restores the blocking status for fds 0,1,2 (stdio) before ssh(1)
7774 abandons/closes them.
7776 This was reported as bz3280 and GHPR246; ok dtucker@
7778 OpenBSD-Commit-ID: 8cc67346f05aa85a598bddf2383fcfcc3aae61ce
7780 commit c4902e1a653c67fea850ec99c7537f358904c0af
7781 Author: djm@openbsd.org <djm@openbsd.org>
7782 Date: Mon May 17 11:43:16 2021 +0000
7784 upstream: fix breakage of -W forwaring introduced in 1.554; reported by
7786 naddy@ and sthen@, ok sthen@
7788 OpenBSD-Commit-ID: f72558e643a26dc4150cff6e5097b5502f6c85fd
7790 commit afea01381ad1fcea1543b133040f75f7542257e6
7791 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7792 Date: Mon May 17 07:22:45 2021 +0000
7794 upstream: Regenerate moduli.
7796 OpenBSD-Commit-ID: 83c93a2a07c584c347ac6114d6329b18ce515557
7798 commit be2866d6207b090615ff083c9ef212b603816a56
7799 Author: Damien Miller <djm@mindrot.org>
7800 Date: Mon May 17 09:40:23 2021 +1000
7802 Handle Android libc returning NULL pw->pw_passwd
7804 Reported by Luke Dashjr
7806 commit 5953c143008259d87342fb5155bd0b8835ba88e5
7807 Author: djm@openbsd.org <djm@openbsd.org>
7808 Date: Fri May 14 05:20:32 2021 +0000
7810 upstream: fix previous: test saved no_shell_flag, not the one that just
7814 OpenBSD-Commit-ID: b8deace085d9d941b2d02f810243b9c302e5355d
7816 commit 1e9fa55f4dc4b334651d569d3448aaa3841f736f
7817 Author: djm@openbsd.org <djm@openbsd.org>
7818 Date: Fri May 14 03:09:48 2021 +0000
7820 upstream: Fix ssh started with ControlPersist incorrectly executing a
7822 shell when the -N (no shell) option was specified. bz3290 reported by Richard
7823 Schwab; patch from markus@ ok me
7825 OpenBSD-Commit-ID: ea1ea4af16a95687302f7690bdbe36a6aabf87e1
7827 commit d1320c492f655d8f5baef8c93899d79dded217a5
7828 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7829 Date: Wed May 12 11:34:30 2021 +0000
7831 upstream: Clarify language about moduli. While both ends of the
7833 connection do need to use the same parameters (ie groups), the DH-GEX
7834 protocol takes care of that and both ends do not need the same contents in
7835 the moduli file, which is what the previous text suggested. ok djm@ jmc@
7837 OpenBSD-Commit-ID: f0c18cc8e79c2fbf537a432a9070ed94e96a622a
7839 commit d3cc4d650ce3e59f3e370b101778b0e8f1c02c4d
7840 Author: djm@openbsd.org <djm@openbsd.org>
7841 Date: Fri May 7 04:11:51 2021 +0000
7843 upstream: include pid in LogVerbose spam
7845 OpenBSD-Commit-ID: aacb86f96ee90c7cb84ec27452374285f89a7f00
7847 commit e3c032333be5fdbbaf2751f6f478e044922b4ec4
7848 Author: djm@openbsd.org <djm@openbsd.org>
7849 Date: Fri May 7 03:09:38 2021 +0000
7851 upstream: don't sigdie() in signal handler in privsep child process;
7853 this can end up causing sandbox violations per bz3286; ok dtucker@
7855 OpenBSD-Commit-ID: a7f40b2141dca4287920da68ede812bff7ccfdda
7857 commit a4039724a3f2abac810735fc95cf9114a3856049
7858 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7859 Date: Fri May 7 09:23:40 2021 +0000
7861 upstream: Increase ConnectionAttempts from 4 to 10 as the tests
7863 occasionally time out on heavily loaded hosts.
7865 OpenBSD-Regress-ID: 29a8cdef354fc9da471a301f7f65184770434f3a
7867 commit c0d7e36e979fa3cdb60f5dcb6ac9ad3fd018543b
7868 Author: djm@openbsd.org <djm@openbsd.org>
7869 Date: Fri May 7 02:26:55 2021 +0000
7871 upstream: dump out a usable private key string too; inspired by Tyson
7875 OpenBSD-Regress-ID: 65572d5333801cb2f650ebc778cbdc955e372058
7877 commit 24fee8973abdf1c521cd2c0047d89e86d9c3fc38
7878 Author: djm@openbsd.org <djm@openbsd.org>
7879 Date: Fri May 7 02:29:40 2021 +0000
7881 upstream: correct mistake in spec - the private key blobs are encoded
7883 verbatim and not as strings (i.e. no 4-byte length header)
7885 OpenBSD-Commit-ID: 3606b5d443d72118c5b76c4af6dd87a5d5a4f837
7887 commit f43859159cc62396ad5d080f0b1f2635a67dac02
7888 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7889 Date: Tue May 4 22:53:52 2021 +0000
7891 upstream: Don't pass NULL as a string in debugging as it does not work
7893 on some platforms in -portable. ok djm@
7895 OpenBSD-Commit-ID: 937c892c99aa3c9c272a8ed78fa7c2aba3a44fc9
7897 commit ac31aa3c6341905935e75f0539cf4a61bbe99779
7898 Author: djm@openbsd.org <djm@openbsd.org>
7899 Date: Mon May 3 00:16:45 2021 +0000
7901 upstream: more debugging for UpdateHostKeys signature failures
7903 OpenBSD-Commit-ID: 1ee95f03875e1725df15d5e4bea3e73493d57d36
7905 commit 8e32e97e788e0676ce83018a742203614df6a2b3
7906 Author: Darren Tucker <dtucker@dtucker.net>
7907 Date: Sat May 1 20:07:47 2021 +1000
7909 Add obsd69 test target.
7911 commit f06893063597c5bb9d9e93f851c4070e77d2fba9
7912 Author: djm@openbsd.org <djm@openbsd.org>
7913 Date: Fri Apr 30 04:29:53 2021 +0000
7915 upstream: a little debugging in the main mux process for status
7917 confirmation failures in multiplexed sessions
7919 OpenBSD-Commit-ID: 6e27b87c95176107597035424e1439c3232bcb49
7921 commit e65cf00da6bc31e5f54603b7feb7252dc018c033
7922 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7923 Date: Fri Apr 30 04:02:52 2021 +0000
7925 upstream: Remove now-unused skey function prototypes leftover from
7929 OpenBSD-Commit-ID: 2fc36d519fd37c6f10ce74854c628561555a94c3
7931 commit ae5f9b0d5c8126214244ee6b35aae29c21028133
7932 Author: Darren Tucker <dtucker@dtucker.net>
7933 Date: Thu Apr 29 13:01:50 2021 +1000
7935 Wrap sntrup761x25519 inside ifdef.
7937 From balu.gajjala at gmail.com via bz#3306.
7939 commit 70a8dc138a6480f85065cdb239915ad4b7f928cf
7940 Author: Darren Tucker <dtucker@dtucker.net>
7941 Date: Wed Apr 28 14:44:07 2021 +1000
7943 Add status badges for Actions-based tests.
7945 commit 40b59024cc3365815381474cdf4fe423102e391b
7946 Author: Darren Tucker <dtucker@dtucker.net>
7947 Date: Wed Apr 28 12:22:11 2021 +1000
7949 Add obsdsnap (OpenBSD snapshot) test target.
7951 commit e627067ec8ef9ae8e7a638f4dbac91d52dee3e6d
7952 Author: Darren Tucker <dtucker@dtucker.net>
7953 Date: Wed Apr 28 11:35:28 2021 +1000
7955 Add test building upstream OpenBSD source.
7957 commit 1b8108ebd12fc4ed0fb39ef94c5ba122558ac373
7958 Author: Darren Tucker <dtucker@dtucker.net>
7959 Date: Tue Apr 27 14:22:20 2021 +1000
7961 Test against OpenSSL 1.1.0h instead of 1.1.0g.
7963 1.1.0g requires a perl glob module that's not installed by default.
7965 commit 9bc20efd39ce8525be33df3ee009f5a4564224f1
7966 Author: Darren Tucker <dtucker@dtucker.net>
7967 Date: Tue Apr 27 12:37:59 2021 +1000
7969 Use the default VM type for libcrypto ver tests.
7971 commit 9f79e80dc40965c2e73164531250b83b176c1eea
7972 Author: Darren Tucker <dtucker@dtucker.net>
7973 Date: Tue Apr 27 12:24:10 2021 +1000
7975 Always build OpenSSL shared.
7977 This is the default for current versions but we need it to test against
7980 commit b3cc9fbdff2782eca79e33e02ac22450dc63bce9
7981 Author: Darren Tucker <dtucker@dtucker.net>
7982 Date: Tue Apr 27 09:18:02 2021 +1000
7984 Fix custom OpenSSL tests.
7986 Check out specified OpenSSL version. Install custom libcrypto where
7987 configure expects to find it. Remove unneeded OpenSSL config time
7988 options. Older OpenSSL versions were not make -j safe so remove it.
7990 commit 77532609874a99a19e3e2eb2d1b7fa93aef963bb
7991 Author: Darren Tucker <dtucker@dtucker.net>
7992 Date: Mon Apr 26 17:18:25 2021 +1000
7994 Export CC and CFLAGS for c89 test.
7996 commit 33f62dfbe865f4de77980ab88774bf1eb5e4e040
7997 Author: Darren Tucker <dtucker@dtucker.net>
7998 Date: Mon Apr 26 17:13:44 2021 +1000
8002 commit da9d59f526fce58e11cba49cd8eb011dc0bf5677
8003 Author: Darren Tucker <dtucker@dtucker.net>
8004 Date: Mon Apr 26 15:34:23 2021 +1000
8006 Add test against OpenSSL w/out ECC.
8008 commit 29e194a752359ebf85bf7fce100f23a0477fc4de
8009 Author: Darren Tucker <dtucker@dtucker.net>
8010 Date: Mon Apr 26 14:49:59 2021 +1000
8012 Ensure we can still build with C89.
8014 commit a38016d369d21df5d35f761f2b67e175e132ba22
8015 Author: Darren Tucker <dtucker@dtucker.net>
8016 Date: Mon Apr 26 14:29:03 2021 +1000
8018 Interop test agains PuTTY.
8020 commit 095b0307a77be8803768857cc6c0963fa52ed85b
8021 Author: Darren Tucker <dtucker@dtucker.net>
8022 Date: Mon Apr 26 14:02:03 2021 +1000
8024 Support testing against arbitary libcrytpo vers.
8026 Add tests against various LibreSSL and OpenSSL versions.
8028 commit b16082aa110fa7128ece2a9037ff420c4a285317
8029 Author: Darren Tucker <dtucker@dtucker.net>
8030 Date: Mon Apr 26 13:35:44 2021 +1000
8032 Add fbsd10 test target.
8034 commit 2c805f16b24ea37cc051c6018fcb05defab6e57a
8035 Author: Darren Tucker <dtucker@dtucker.net>
8036 Date: Sun Apr 25 14:15:02 2021 +1000
8038 Disable compiler hardening on nbsd4.
8040 The system compiler supports -fstack-protector-all, but using it will
8041 result in an internal compiler error on some files.
8043 commit 6a5d39305649da5dff1934ee54292ee0cebd579d
8044 Author: Darren Tucker <dtucker@dtucker.net>
8045 Date: Sun Apr 25 13:01:34 2021 +1000
8047 Add nbsd3, nbsd4 and nbsd9 test targets.
8049 commit d1aed05bd2e4ae70f359a394dc60a2d96b88f78c
8050 Author: Darren Tucker <dtucker@dtucker.net>
8051 Date: Sat Apr 24 22:03:46 2021 +1000
8053 Comment out nbsd2 test target for now.
8055 commit a6b4ec94e5bd5a8a18cd2c9942d829d2e5698837
8056 Author: Darren Tucker <dtucker@dtucker.net>
8057 Date: Sat Apr 24 17:52:24 2021 +1000
8059 Add OPENBSD ORIGINAL marker.
8061 commit 3737c9f66ee590255546c4b637b6d2be669a11eb
8062 Author: Darren Tucker <dtucker@dtucker.net>
8063 Date: Fri Apr 23 19:49:46 2021 +1000
8065 Replace "==" (a bashism) with "=".
8067 commit a116b6f5be17a1dd345b7d54bf8aa3779a28a0df
8068 Author: Darren Tucker <dtucker@dtucker.net>
8069 Date: Fri Apr 23 16:34:48 2021 +1000
8071 Add nbsd2 test target.
8073 commit 196bf2a9bb771f45d9b0429cee7d325962233c44
8074 Author: Darren Tucker <dtucker@dtucker.net>
8075 Date: Fri Apr 23 14:54:10 2021 +1000
8077 Add obsd68 test target.
8079 commit e3ba6574ed69e8b7af725cf5e8a9edaac04ff077
8080 Author: Darren Tucker <dtucker@dtucker.net>
8081 Date: Fri Apr 23 14:53:32 2021 +1000
8083 Remove dependency on bash.
8085 commit db1f9ab8feb838aee9f5b99c6fd3f211355dfdcf
8086 Author: Darren Tucker <dtucker@dtucker.net>
8087 Date: Fri Apr 23 14:41:13 2021 +1000
8089 Add obsd67 test target.
8091 commit c039a6bf79192fe1daa9ddcc7c87dd98e258ae7c
8092 Author: Darren Tucker <dtucker@dtucker.net>
8093 Date: Fri Apr 23 11:08:23 2021 +1000
8095 Re-add macos-11.0 test target.
8097 commit a6db3a47b56adb76870d59225ffb90a65bc4daf2
8098 Author: Darren Tucker <dtucker@dtucker.net>
8099 Date: Fri Apr 23 10:28:28 2021 +1000
8101 Add openindiana test target.
8103 commit 3fe7e73b025c07eda46d78049f1da8ed7dfc0c69
8104 Author: Darren Tucker <dtucker@dtucker.net>
8105 Date: Fri Apr 23 10:26:35 2021 +1000
8107 Test krb5 on Solaris 11 too.
8109 commit f57fbfe5eb02df1a91f1a237c4d27165afd87c13
8110 Author: Darren Tucker <dtucker@dtucker.net>
8111 Date: Thu Apr 22 22:27:26 2021 +1000
8113 Don't always set SUDO.
8115 Rely on sourcing configs to set as appropriate.
8117 commit e428f29402fb6ac140b52f8f12e06ece7bb104a0
8118 Author: Darren Tucker <dtucker@dtucker.net>
8119 Date: Thu Apr 22 22:26:08 2021 +1000
8121 Remove now-unused 2nd arg to configs.
8123 commit cb4ff640d79b3c736879582139778f016bbb2cd7
8124 Author: Darren Tucker <dtucker@dtucker.net>
8125 Date: Wed Apr 21 01:08:04 2021 +1000
8127 Add win10 test target.
8129 commit 4457837238072836b2fa3107d603aac809624983
8130 Author: Darren Tucker <dtucker@dtucker.net>
8131 Date: Tue Apr 20 23:31:29 2021 +1000
8133 Add nbsd8 test target.
8135 commit bd4fba22e14da2fa196009010aabec5a8ba9dd42
8136 Author: Darren Tucker <dtucker@dtucker.net>
8137 Date: Sat Apr 17 09:55:47 2021 +1000
8141 commit 9403d0e805c77a5741ea8c3281bbe92558c2f125
8142 Author: Darren Tucker <dtucker@dtucker.net>
8143 Date: Fri Apr 16 18:14:25 2021 +1000
8147 commit e86968280e358e62649d268d41f698d64d0dc9fa
8148 Author: Damien Miller <djm@mindrot.org>
8149 Date: Fri Apr 16 13:55:25 2021 +1000
8153 commit 2fb25ca11e8b281363a2a2a4dec4c497a1475d9a
8154 Author: Damien Miller <djm@mindrot.org>
8155 Date: Fri Apr 16 13:53:02 2021 +1000
8157 crank version in README and RPM spec files
8159 commit b2b60ebab0cb77b5bc02d364d72e13db882f33ae
8160 Author: djm@openbsd.org <djm@openbsd.org>
8161 Date: Fri Apr 16 03:42:00 2021 +0000
8163 upstream: openssh-8.6
8165 OpenBSD-Commit-ID: b5f3e133c846127ec114812248bc17eff07c3e19
8167 commit faf2b86a46c9281d237bcdec18c99e94a4eb820a
8168 Author: markus@openbsd.org <markus@openbsd.org>
8169 Date: Thu Apr 15 16:24:31 2021 +0000
8171 upstream: do not pass file/func to monitor; noted by Ilja van Sprundel;
8175 OpenBSD-Commit-ID: 85ae5c063845c410283cbdce685515dcd19479fa
8177 commit 2dc328023f60212cd29504fc05d849133ae47355
8178 Author: Damien Miller <djm@mindrot.org>
8179 Date: Wed Apr 14 11:42:55 2021 +1000
8181 sshd don't exit on transient read errors
8183 openssh-8.5 introduced a regression that would cause sshd to exit
8184 because of transient read errors on the network socket (e.g. EINTR,
8185 EAGAIN). Reported by balu.gajjala AT gmail.com via bz3297
8187 commit d5d6b7d76d171a2e6861609dcd92e714ee62ad88
8188 Author: Damien Miller <djm@mindrot.org>
8189 Date: Sat Apr 10 18:45:00 2021 +1000
8191 perform report_failed_grab() inline
8193 commit ea996ce2d023aa3c6d31125e2c3ebda1cb42db8c
8194 Author: Damien Miller <djm@mindrot.org>
8195 Date: Sat Apr 10 18:22:57 2021 +1000
8197 dedicated gnome-ssk-askpass3 source
8199 Compatibility with Wayland requires that we use the gdk_seat_grab()
8200 API for grabbing mouse/keyboard, however these API don't exist in
8203 This branches gnome-ssk-askpass2.c => gnome-ssk-askpass3.c and
8204 makes the changes to use the gdk_seat_grab() instead of grabbing
8205 mouse/focus separately via GDK.
8207 In the future, we can also use the branched file to avoid some
8208 API that has been soft-deprecated in GTK+3, e.g. gtk_widget_modify_fg
8210 commit bfa5405da05d906ffd58216eb77c4375b62d64c2
8211 Author: Darren Tucker <dtucker@dtucker.net>
8212 Date: Thu Apr 8 15:18:15 2021 +1000
8214 Ensure valgrind-out exists.
8216 Normally the regress tests would create it, but running the unit tests
8217 on their own would fail because the directory did not exist.
8219 commit 1f189181f3ea09a9b08aa866f78843fec800874f
8220 Author: Darren Tucker <dtucker@dtucker.net>
8221 Date: Thu Apr 8 15:17:19 2021 +1000
8223 Pass OBJ to unit test make invocation.
8225 At least the Valgrind unit tests uses $OBJ.
8227 commit f42b550c281d28bd19e9dd6ce65069164f3482b0
8228 Author: Darren Tucker <dtucker@dtucker.net>
8229 Date: Thu Apr 8 14:20:12 2021 +1000
8231 Add pattern for valgrind-unit.
8233 commit 19e534462710e98737478fd9c44768b50c27c4c6
8234 Author: Darren Tucker <dtucker@dtucker.net>
8235 Date: Thu Apr 8 13:31:08 2021 +1000
8237 Run unit tests under valgrind.
8239 Run a separate build for the unit tests under Valgrind. They take long
8240 enough that running in parallel with the other Valgrind tests helps.
8242 commit 80032102d05e866dc2a48a5caf760cf42c2e090e
8243 Author: Darren Tucker <dtucker@dtucker.net>
8244 Date: Thu Apr 8 13:25:57 2021 +1000
8246 ifdef out MIN and MAX.
8248 In -portable, defines.h ensures that these are defined, so redefining
8249 potentially causes a warning. We don't just delete it to make any
8250 future code syncs a little but easier. bz#3293.
8252 commit d1bd184046bc310c405f45da3614a1dc5b3e521a
8253 Author: Darren Tucker <dtucker@dtucker.net>
8254 Date: Wed Apr 7 10:23:51 2021 +1000
8256 Remove only use of warn().
8258 The warn() function is only used in one place in portable and does not
8259 exist upstream. Upgrade the only instance it's used to fail()
8260 (the privsep/sandbox+proxyconnect, from back when that was new) and
8261 remove the now-unused function.
8263 commit fea8f4b1aa85026ad5aee5ad8e1599a8d5141fe0
8264 Author: Darren Tucker <dtucker@dtucker.net>
8265 Date: Wed Apr 7 10:18:32 2021 +1000
8267 Move make_tmpdir() into portable-specific area.
8269 Reduces diff vs OpenBSD and makes it more likely diffs will apply
8272 commit 13e5fa2acffd26e754c6ee1d070d0afd035d4cb7
8273 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8274 Date: Tue Apr 6 23:57:56 2021 +0000
8276 upstream: Add TEST_SSH_ELAPSED_TIMES environment variable to print the
8278 elapsed time in seconds of each test. This depends on "date +%s" which is
8279 not specified by POSIX but is commonly implemented.
8281 OpenBSD-Regress-ID: ec3c8c19ff49b2192116a0a646ee7c9b944e8a9c
8283 commit ef4f46ab4387bb863b471bad124d46e8d911a79a
8284 Author: Darren Tucker <dtucker@dtucker.net>
8285 Date: Wed Apr 7 09:59:15 2021 +1000
8287 Move the TEST_SSH_PORT section down a bit.
8289 This groups the portable-specific changes together and makes it a
8290 little more likely that patches will apply cleanly.
8292 commit 3674e33fa70dfa1fe69b345bf576113af7b7be11
8293 Author: Darren Tucker <dtucker@dtucker.net>
8294 Date: Wed Apr 7 10:05:10 2021 +1000
8296 Further split Valgrind tests.
8298 Even split in two, the Valgrind tests take by far the longest to run,
8299 so split them four ways to further increase parallelism.
8301 commit 961af266b861e30fce1e26170ee0dbb5bf591f29
8302 Author: djm@openbsd.org <djm@openbsd.org>
8303 Date: Tue Apr 6 23:24:30 2021 +0000
8305 upstream: include "ssherr.h" not <ssherr.h>; from Balu Gajjala via
8309 OpenBSD-Commit-ID: e9535cd9966eb2e69e73d1ede1f44905c30310bd
8311 commit e7d0a285dbdd65d8df16123ad90f15e91862f959
8312 Author: Damien Miller <djm@mindrot.org>
8313 Date: Wed Apr 7 08:50:38 2021 +1000
8315 wrap struct rlimit in HAVE_GETRLIMIT too
8317 commit f283a6c2e0a9bd9369e18462acd00be56fbe5b0d
8318 Author: Damien Miller <djm@mindrot.org>
8319 Date: Wed Apr 7 08:20:35 2021 +1000
8321 wrap getrlimit call in HAVE_GETRLIMIT; bz3291
8323 commit 679bdc4a5c9244f427a7aee9c14b0a0ed086da1f
8324 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8325 Date: Tue Apr 6 09:07:33 2021 +0000
8327 upstream: Don't check return value of unsetenv(). It's part of the
8329 environment setup and not part of the actual test, and some platforms
8330 -portable runs on declare it as returning void, which prevents the test from
8333 OpenBSD-Regress-ID: 24f08543ee3cdebc404f2951f3e388cc82b844a1
8335 commit 320af2f3de6333aa123f1b088eca146a245e968a
8336 Author: jmc@openbsd.org <jmc@openbsd.org>
8337 Date: Sun Apr 4 11:36:56 2021 +0000
8339 upstream: remove stray inserts; from matthias schmidt
8341 OpenBSD-Commit-ID: 2c36ebdc54e14bbf1daad70c6a05479a073d5c63
8343 commit 801f710953b24dd2f21939171c622eac77c7484d
8344 Author: jmc@openbsd.org <jmc@openbsd.org>
8345 Date: Sun Apr 4 06:11:24 2021 +0000
8347 upstream: missing comma; from kawashima james
8349 OpenBSD-Commit-ID: 31cec6bf26c6db4ffefc8a070715ebef274e68ea
8351 commit b3ca08cb174266884d44ec710a84cd64c12414ea
8352 Author: Darren Tucker <dtucker@dtucker.net>
8353 Date: Mon Apr 5 23:46:42 2021 +1000
8355 Install libcbor with libfido2.
8357 commit f3ca8af87a4c32ada660da12ae95cf03d190c083
8358 Author: Damien Miller <djm@mindrot.org>
8359 Date: Sat Apr 3 18:21:08 2021 +1100
8361 enable authopt and misc unit tests
8363 Neither were wired into the build, both required some build
8364 adaptations for -portable
8366 commit dc1b45841fb97e3d7f655ddbcfef3839735cae5f
8367 Author: djm@openbsd.org <djm@openbsd.org>
8368 Date: Sat Apr 3 06:58:30 2021 +0000
8370 upstream: typos in comments; GHPR#180 from Vill
8372 =?UTF-8?q?e=20Skytt=C3=A4?=
8374 Content-Type: text/plain; charset=UTF-8
8375 Content-Transfer-Encoding: 8bit
8377 OpenBSD-Commit-ID: 93c732381ae0e2b680c79e67c40c1814b7ceed2c
8379 commit 53ea05e09b04fd7b6dea66b42b34d65fe61b9636
8380 Author: djm@openbsd.org <djm@openbsd.org>
8381 Date: Sat Apr 3 06:55:52 2021 +0000
8383 upstream: sync CASignatureAlgorithms lists with reality. GHPR#174 from
8387 OpenBSD-Commit-ID: f05e4ca54d7e67b90fe58fe1bdb1d2a37e0e2696
8389 commit 57ed647ee07bb883a2f2264231bcd1df6a5b9392
8390 Author: Damien Miller <djm@mindrot.org>
8391 Date: Sat Apr 3 17:47:37 2021 +1100
8393 polish whitespace for portable files
8395 commit 31d8d231eb9377df474746a822d380c5d68d7ad6
8396 Author: djm@openbsd.org <djm@openbsd.org>
8397 Date: Sat Apr 3 06:18:40 2021 +0000
8399 upstream: highly polished whitespace, mostly fixing spaces-for-tab
8401 and bad indentation on continuation lines. Prompted by GHPR#185
8403 OpenBSD-Commit-ID: e5c81f0cbdcc6144df1ce468ec1bac366d8ad6e9
8405 commit 34afde5c73b5570d6f8cce9b49993b23b77bfb86
8406 Author: djm@openbsd.org <djm@openbsd.org>
8407 Date: Sat Apr 3 05:54:14 2021 +0000
8409 upstream: whitespace (tab after space)
8411 OpenBSD-Commit-ID: 0e2b3f7674e985d3f7c27ff5028e690ba1c2efd4
8413 commit 7cd262c1c5a08cc7f4f30e3cab108ef089d0a57b
8414 Author: Darren Tucker <dtucker@dtucker.net>
8415 Date: Sat Apr 3 16:59:10 2021 +1100
8417 Save config.h and config.log on failure too.
8419 commit 460aee9298f365357e9fd26851c22e0dca51fd6a
8420 Author: djm@openbsd.org <djm@openbsd.org>
8421 Date: Sat Apr 3 05:46:41 2021 +0000
8423 upstream: fix incorrect plural; from Ville Skyt
8425 =?UTF-8?q?t=C3=A4=20via=20GHPR#181?=
8427 Content-Type: text/plain; charset=UTF-8
8428 Content-Transfer-Encoding: 8bit
8430 OpenBSD-Commit-ID: 92f31754c6296d8f403d7c293e09dc27292d22c9
8432 commit 082804c14e548cada75c81003a3c68ee098138ee
8433 Author: djm@openbsd.org <djm@openbsd.org>
8434 Date: Sat Apr 3 05:40:39 2021 +0000
8436 upstream: ensure that pkcs11_del_provider() is called before exit -
8438 some PKCS#11 providers get upset if C_Initialize is not matched with
8441 From Adithya Baglody via GHPR#234; ok markus
8443 OpenBSD-Commit-ID: f8e770e03b416ee9a58f9762e162add900f832b6
8445 commit 464ebc82aa926dd132ec75a0b064574ef375675e
8446 Author: djm@openbsd.org <djm@openbsd.org>
8447 Date: Sat Apr 3 05:28:43 2021 +0000
8449 upstream: unused variable
8451 OpenBSD-Commit-ID: 85f6a394c8e0f60d15ecddda75176f112007b205
8453 commit dc3c0be8208c488e64a8bcb7d9efad98514e0ffb
8454 Author: djm@openbsd.org <djm@openbsd.org>
8455 Date: Sat Apr 3 05:21:46 2021 +0000
8457 upstream: Fix two problems in string->argv conversion: 1) multiple
8459 backslashes were not being dequoted correctly and 2) quoted space in the
8460 middle of a string was being incorrectly split.
8462 Content-Type: text/plain; charset=UTF-8
8463 Content-Transfer-Encoding: 8bit
8465 A unit test for these cases has already been committed
8467 prompted by and based on GHPR#223 by Eero Häkkinen; ok markus@
8469 OpenBSD-Commit-ID: d7ef27abb4eeeaf6e167e9312e4abe9e89faf1e4
8471 commit f75bcbba58a08c670727ece5e3f8812125969799
8472 Author: Damien Miller <djm@mindrot.org>
8473 Date: Sat Apr 3 16:22:48 2021 +1100
8475 missing bits from 259d648e
8477 commit 4cbc4a722873d9b68cb5496304dc050d7168df78
8478 Author: djm@openbsd.org <djm@openbsd.org>
8479 Date: Wed Mar 31 21:59:26 2021 +0000
8481 upstream: cannot effectively test posix-rename extension after
8483 changes in feature advertisment.
8485 OpenBSD-Regress-ID: 5e390bf88d379162aaa81b60ed86b34cb0c54d29
8487 commit 259d648e63e82ade4fe2c2c73c8b67fe57d9d049
8488 Author: djm@openbsd.org <djm@openbsd.org>
8489 Date: Fri Mar 19 04:23:50 2021 +0000
8491 upstream: add a test for misc.c:argv_split(), currently fails
8493 OpenBSD-Regress-ID: ad6b96d6ebeb9643b698b3575bdd6f78bb144200
8495 commit 473ddfc2d6b602cb2d1d897e0e5c204de145cd9a
8496 Author: djm@openbsd.org <djm@openbsd.org>
8497 Date: Fri Mar 19 03:25:01 2021 +0000
8501 OpenBSD-Regress-ID: f6c03c0e4c58b3b9e04b161757b8c10dc8378c34
8503 commit 1339800fef8d0dfbfeabff71b34670105bcfddd2
8504 Author: djm@openbsd.org <djm@openbsd.org>
8505 Date: Wed Mar 31 22:16:34 2021 +0000
8507 upstream: Use new limits@openssh.com protocol extension to let the
8509 client select good limits based on what the server supports. Split the
8510 download and upload buffer sizes to allow them to be chosen independently.
8512 In practice (and assuming upgraded sftp/sftp-server at each end), this
8513 increases the download buffer 32->64KiB and the upload buffer
8516 Patches from Mike Frysinger; ok dtucker@
8518 OpenBSD-Commit-ID: ebd61c80d85b951b794164acc4b2f2fd8e88606c
8520 commit 6653c61202d104e59c8e741329fcc567f7bc36b8
8521 Author: djm@openbsd.org <djm@openbsd.org>
8522 Date: Wed Mar 31 21:58:07 2021 +0000
8524 upstream: do not advertise protocol extensions that have been
8526 disallowed by the command-line options (e.g. -p/-P/-R); ok dtucker@
8528 OpenBSD-Commit-ID: 3a8a76b3f5131741aca4b41bfab8d101c9926205
8530 commit 71241fc05db4bbb11bb29340b44b92e2575373d8
8531 Author: Damien Miller <djm@mindrot.org>
8532 Date: Mon Mar 29 15:14:25 2021 +1100
8534 gnome-ssh-askpass3 is a valid target here
8536 commit 8a9520836e71830f4fccca066dba73fea3d16bda
8537 Author: djm@openbsd.org <djm@openbsd.org>
8538 Date: Fri Mar 19 02:22:34 2021 +0000
8540 upstream: return non-zero exit status when killed by signal; bz#3281 ok
8544 OpenBSD-Commit-ID: 117b31cf3c807993077b596bd730c24da9e9b816
8546 commit 1269b8a686bf1254b03cd38af78167a04aa6ec88
8547 Author: djm@openbsd.org <djm@openbsd.org>
8548 Date: Fri Mar 19 02:18:28 2021 +0000
8550 upstream: increase maximum SSH2_FXP_READ to match the maximum
8552 packet size. Also handle zero-length reads that are borderline nonsensical
8553 but not explicitly banned by the spec. Based on patch from Mike Frysinger,
8554 feedback deraadt@ ok dtucker@
8556 OpenBSD-Commit-ID: 4e67d60d81bde7b84a742b4ee5a34001bdf80d9c
8558 commit 860b67604416640e8db14f365adc3f840aebcb1f
8559 Author: djm@openbsd.org <djm@openbsd.org>
8560 Date: Tue Mar 16 06:15:43 2021 +0000
8562 upstream: don't let logging clobber errno before use
8564 OpenBSD-Commit-ID: ce6cca370005c270c277c51c111bb6911e1680ec
8566 commit 5ca8a9216559349c56e09039c4335636fd85c241
8567 Author: Darren Tucker <dtucker@dtucker.net>
8568 Date: Sat Mar 13 14:40:43 2021 +1100
8570 Only call dh_set_moduli_file if using OpenSSL.
8572 Fixes link failure when configuring --without-openssl since dh.c is not
8575 commit 867a7dcf003c51d5a83f83565771a35f0d9530ac
8576 Author: Darren Tucker <dtucker@dtucker.net>
8577 Date: Sat Mar 13 13:52:53 2021 +1100
8579 Don't install moduli during tests.
8581 Now that we have TEST_SSH_MODULI_FILE pointing to the moduli in the
8582 soure directory we don't need to install the file to prevent warnings
8583 about it being missing.
8585 commit 0c054538fccf92b4a028008321d3711107bee6d5
8586 Author: Darren Tucker <dtucker@dtucker.net>
8587 Date: Sat Mar 13 13:51:26 2021 +1100
8589 Point TEST_SSH_MODULI_FILE at our own moduli.
8591 This will allow the test to run without requiring a moduli file
8592 installed at the configured default path.
8594 commit 4d48219c72ab0c71238806f057f0e9630b7dd25c
8595 Author: jsg@openbsd.org <jsg@openbsd.org>
8596 Date: Fri Mar 12 05:18:01 2021 +0000
8600 OpenBSD-Commit-ID: 478bc3db04f62f1048ed6e1765400f3ab325e60f
8602 commit 88057eb6df912abf2678ea5c846d9d9cbc92752c
8603 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8604 Date: Fri Mar 12 04:08:19 2021 +0000
8606 upstream: Add ModuliFile keyword to sshd_config to specify the
8608 location of the "moduli" file containing the groups for DH-GEX. This will
8609 allow us to run tests against arbitrary moduli files without having to
8610 install them. ok djm@
8612 OpenBSD-Commit-ID: 8df99d60b14ecaaa28f3469d01fc7f56bff49f66
8614 commit f07519a2af96109325b5a48b1af18b57601074ca
8615 Author: djm@openbsd.org <djm@openbsd.org>
8616 Date: Fri Mar 12 03:43:40 2021 +0000
8618 upstream: pwcopy() struct passwd that we're going to reuse across a
8620 bunch of library calls; bz3273 ok dtucker@
8622 OpenBSD-Commit-ID: b6eafa977b2e44607b1b121f5de855107809b762
8624 commit 69d6d4b0c8a88d3d1288415605f36e2df61a2f12
8625 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8626 Date: Wed Mar 10 06:32:27 2021 +0000
8628 upstream: Import regenerated moduli file.
8630 OpenBSD-Commit-ID: 7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b
8632 commit e5895e8ecfac65086ea6b34d0d168409a66a15e1
8633 Author: djm@openbsd.org <djm@openbsd.org>
8634 Date: Wed Mar 10 04:58:45 2021 +0000
8636 upstream: no need to reset buffer after send_msg() as that is done
8638 for us; patch from Mike Frysinger
8640 OpenBSD-Commit-ID: 565516495ff8362a38231e0f1a087b8ae66da59c
8642 commit 721948e67488767df0fa0db71ff2578ee2bb9210
8643 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8644 Date: Sat Mar 13 01:52:16 2021 +0000
8646 upstream: Add TEST_SSH_MODULI_FILE variable to allow overriding of the
8648 moduli file used during the test run.
8650 OpenBSD-Regress-ID: be10f785263120edb64fc87db0e0d6570a10220a
8652 commit 82fef71e20ffef425b932bec26f5bc46aa1ed41c
8653 Author: Darren Tucker <dtucker@dtucker.net>
8654 Date: Fri Mar 12 15:58:57 2021 +1100
8656 Allow (but return EACCES) fstatat64 in sandbox.
8658 This is apparently used in some configurations of OpenSSL when glibc
8659 has getrandom(). bz#3276, patch from Kris Karas, ok djm@
8661 commit 1cd67ee15ce3d192ab51be22bc4872a6a7a4b6d9
8662 Author: Darren Tucker <dtucker@dtucker.net>
8663 Date: Fri Mar 12 13:16:10 2021 +1100
8665 Move generic includes outside of ifdef.
8667 This ensures that the macros in log.h are defined in the case where
8668 either of --with-solaris-projects or --with-solaris-privs are used
8669 without --with-solaris-contracts. bz#3278.
8671 commit 2421a567a8862fe5102a4e7d60003ebffd1313dd
8672 Author: Darren Tucker <dtucker@dtucker.net>
8673 Date: Wed Mar 10 17:41:21 2021 +1100
8675 Import regenerated moduli file.
8677 commit e99080c05d9d48dbbdb022538533d53ae1bd567d
8678 Author: millert@openbsd.org <millert@openbsd.org>
8679 Date: Sat Mar 6 20:36:31 2021 +0000
8681 upstream: Fix PRINT macro, the suffix param to sshlog() was missing.
8683 Also remove redundant __func__ prefix from PRINT calls as the macro already
8684 adds __FILE__, __func__ and __LINE__. From Christos Zoulas. OK dtucker@
8686 OpenBSD-Commit-ID: 01fdfa9c5541151b5461d9d7d6ca186a3413d949
8688 commit 160db17fc678ceb5e3fd4a7e006cc73866f484aa
8689 Author: djm@openbsd.org <djm@openbsd.org>
8690 Date: Wed Mar 3 22:41:49 2021 +0000
8692 upstream: don't sshbuf_get_u32() into an enum; reported by goetze
8694 AT dovetail.com via bz3269
8696 OpenBSD-Commit-ID: 99a30a8f1df9bd72be54e21eee5c56a0f050921a
8698 commit cffd033817a5aa388764b6661855dcdaabab0588
8699 Author: sthen@openbsd.org <sthen@openbsd.org>
8700 Date: Wed Mar 3 21:40:16 2021 +0000
8702 upstream: typo in other_hostkeys_message() display output, ok djm
8704 OpenBSD-Commit-ID: 276f58afc97b6f5826e0be58380b737603dbf5f5
8706 commit 7fe141b96b13bd7dc67ca985e14d55b9bd8a03fd
8707 Author: djm@openbsd.org <djm@openbsd.org>
8708 Date: Wed Mar 3 08:42:52 2021 +0000
8710 upstream: needs FILE*; from Mike Frysinger
8712 OpenBSD-Commit-ID: dddb3aa9cb5792eeeaa37a1af67b5a3f25ded41d
8714 commit d2afd717e62d76bb41ab5f3ab4ce6f885c8edc98
8715 Author: Damien Miller <djm@mindrot.org>
8716 Date: Tue Mar 2 21:31:47 2021 +1100
8720 commit f0c4eddf7cf224ebcac1f07ac8afdb30c6e9fe0a
8721 Author: Damien Miller <djm@mindrot.org>
8722 Date: Tue Mar 2 21:30:14 2021 +1100
8726 commit 67a8bb7fe62a381634db4c261720092e7d514a3d
8727 Author: Damien Miller <djm@mindrot.org>
8728 Date: Tue Mar 2 21:29:54 2021 +1100
8730 update RPM spec version numbers
8732 commit 0a4b23b11b9a4e6eec332dd5c6ab2ac6f62aa164
8733 Author: djm@openbsd.org <djm@openbsd.org>
8734 Date: Tue Mar 2 01:48:18 2021 +0000
8736 upstream: openssh-8.5
8738 OpenBSD-Commit-ID: 185e85d60fe042b8f8fa1ef29d4ef637bdf397d6
8740 commit de3866383b6720ad4cad83be76fe4c8aa111a249
8741 Author: Darren Tucker <dtucker@dtucker.net>
8742 Date: Mon Mar 1 21:13:24 2021 +1100
8744 Only upload config logs if configure fails.
8746 commit 85ff2a564ce838f8690050081176c1de1fb33116
8747 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8748 Date: Sun Feb 28 22:56:30 2021 +0000
8750 upstream: Add %k to list of keywords. From
8752 =?UTF-8?q?=20Eero=20H=C3=A4kkinenvia=20bz#3267?=
8754 Content-Type: text/plain; charset=UTF-8
8755 Content-Transfer-Encoding: 8bit
8757 OpenBSD-Commit-ID: 9c87f39a048cee2a7d1c8bab951b2f716256865e
8759 commit e774bac35933e71f924f4301786e7fb5bbe1422f
8760 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8761 Date: Sun Feb 28 01:50:47 2021 +0000
8763 upstream: Do not try to reset signal handler for signal 0 in
8765 subprocess. Prevents spurious debug message. ok djm@
8767 OpenBSD-Commit-ID: 7f9785e292dcf304457566ad4637effd27ad1d46
8769 commit 351c5dbbd74ce300c4f058112f9731c867c6e225
8770 Author: djm@openbsd.org <djm@openbsd.org>
8771 Date: Sat Feb 27 23:42:37 2021 +0000
8773 upstream: fix alphabetic ordering of options; spotted by Iain Morgan
8775 OpenBSD-Commit-ID: f955fec617d74af0feb5b275831a9fee813d7ad5
8777 commit 0d1c9dbe578597f8d45d3ac7690df10d32d743e5
8778 Author: Darren Tucker <dtucker@dtucker.net>
8779 Date: Sat Feb 27 12:25:25 2021 +1100
8781 zlib is now optional.
8783 commit b7c6ee7b437d9adfd19ef49d6c0f19f13f26f9b3
8784 Author: Jeffrey H. Johnson <61629094+johnsonjh@users.noreply.github.com>
8785 Date: Sat Feb 27 01:04:58 2021 +0000
8787 Fix punctuatio and typo in README.md.
8789 Some very minor fixes, missing 's' and punctuation.
8791 commit 6248b86074804983e8f7a2058856a516dbfe2924
8792 Author: Damien Miller <djm@mindrot.org>
8793 Date: Fri Feb 26 16:45:50 2021 +1100
8795 Revert "ssh: optional bind interface if bind address specified."
8797 This reverts commit 5a878a71a3528c2626aa1d331934fd964782d41c.
8799 Apologies - I accidentally pushed this.
8801 commit 493339a940b13be6071629c3c2dd5a3b6fc17023
8802 Author: Damien Miller <djm@mindrot.org>
8803 Date: Fri Feb 26 15:45:38 2021 +1100
8805 detech BSD libc hash functions in libbsd / libmd
8807 Some Linux distributions are shipping the BSD-style hashing functions
8808 (e.g. SHA256Update) in libbsd and/or libmd. Detect this situation to
8809 avoid header/replacement clashes later. ok dtucker@
8811 commit 5a878a71a3528c2626aa1d331934fd964782d41c
8812 Author: Dmitrii Turlupov <dturlupov@factor-ts.ru>
8813 Date: Thu Feb 4 16:27:31 2021 +0300
8815 ssh: optional bind interface if bind address specified.
8817 Allows the -b and -B options to be used together.
8818 For example, when the interface is in the VRF.
8820 commit 1fe4d70df94d3bcc2b35fd57cad6b5fc4b2d7b16
8821 Author: djm@openbsd.org <djm@openbsd.org>
8822 Date: Fri Feb 26 04:18:42 2021 +0000
8824 upstream: remove this KEX fuzzer; it's awkward to use and doesn't play
8826 nice with popular fuzzing drivers like libfuzzer. AFAIK nobody has used it
8829 OpenBSD-Regress-ID: cad919522b3ce90c147c95abaf81b0492ac296c9
8831 commit 24a3a67bd7421740d08803b84bd784e764107928
8832 Author: Darren Tucker <dtucker@dtucker.net>
8833 Date: Fri Feb 26 11:49:19 2021 +1100
8835 Remove macos-11.00 PAM test target too.
8837 These are failing apparently due to some kind of infrastructure problem,
8838 making it look like every commit is busted.
8840 commit 473201783f732ca8b0ec528b56aa55fa0d8cf717
8841 Author: djm@openbsd.org <djm@openbsd.org>
8842 Date: Fri Feb 26 00:16:58 2021 +0000
8844 upstream: a bit more debugging behind #ifdef DEBUG_SK
8846 OpenBSD-Commit-ID: d9fbce14945721061cb322f0084c2165d33d1993
8848 commit fd9fa76a344118fe1ef10b9a6c9e85d39599e9a8
8849 Author: Darren Tucker <dtucker@dtucker.net>
8850 Date: Fri Feb 26 01:15:10 2021 +1100
8852 Remove macos-11.0 from the test target list.
8854 It has been consistently failing for the past few days with a github
8855 actions internal error.
8857 commit 476ac8e9d33dbf96ef97aab812b8d7089d0cdc24
8858 Author: Philip Hands <phil@hands.com>
8859 Date: Wed Feb 24 23:43:16 2021 +0100
8861 tidy the $INSTALLKEY_SH code layout a little
8863 SSH-Copy-ID-Upstream: 78178aa5017222773e4c23d9001391eeaeca8983
8865 commit 983e05ef3b81329d76d6a802b39ad0d1f637c06c
8866 Author: Jakub Jelen <jjelen@redhat.com>
8867 Date: Tue Sep 29 10:02:45 2020 +0000
8869 if unable to add a missing newline, fail
8871 SSH-Copy-ID-Upstream: 76b25e18f55499ea9edb4c4d6dc4a80bebc36d95
8873 commit 3594b3b015f6014591da88ba71bf6ff010be7411
8874 Author: Philip Hands <phil@hands.com>
8875 Date: Tue Oct 13 14:12:58 2020 +0200
8877 use $AUTH_KEY_DIR, now that we have it
8879 since that was a change made since jjelen's commit was written
8881 also, quote the variables
8883 SSH-Copy-ID-Upstream: 588cd8e5cbf95f3443d92b9ab27c5d73ceaf6616
8885 commit 333e25f7bc43cee6e36f766e39dad6f9918b318c
8886 Author: Jakub Jelen <jjelen@redhat.com>
8887 Date: Tue Sep 29 10:00:01 2020 +0000
8889 restorecon the correct directory
8891 if using different path for authorized_keys file
8893 SSH-Copy-ID-Upstream: 791a3df47b48412c726bff6f7b1d190721e65d51
8895 commit 9beeab8a37a49a9e3ffb1972fff6621ee5bd7a71
8896 Author: djm@openbsd.org <djm@openbsd.org>
8897 Date: Thu Feb 25 03:27:34 2021 +0000
8899 upstream: s/PubkeyAcceptedKeyTypes/PubkeyAcceptedAlgorithms/
8901 OpenBSD-Regress-ID: 3dbc005fa29f69dc23d97e433b6dffed6fe7cb69
8903 commit 2dd9870c16ddbd83740adeead5030d6840288c8f
8904 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8905 Date: Wed Feb 24 23:12:35 2021 +0000
8907 upstream: Rename pubkeyacceptedkeytypes to pubkeyacceptedalgorithms in
8909 test to match change to config-dump output.
8911 OpenBSD-Regress-ID: 74c9a4ad50306be873d032819d5e55c24eb74d5d
8913 commit b9225c3a1c3f5827e31d5d64a71b8e0504a25619
8914 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8915 Date: Wed Feb 24 01:18:08 2021 +0000
8917 upstream: Put obsolete aliases for hostbasedalgorithms and
8919 pubkeyacceptedalgorithms after their current names so that the config-dump
8920 mode finds and uses the current names. Spotted by Phil Pennock.
8922 OpenBSD-Commit-ID: 5dd10e93cccfaff3aaaa09060c917adff04a9b15
8924 commit 8b8b60542d6652b2c91e0ef9e9cc81bcb65e6b42
8925 Author: djm@openbsd.org <djm@openbsd.org>
8926 Date: Tue Feb 23 21:55:08 2021 +0000
8928 upstream: lots more s/key types/signature algorithms/ mostly in
8930 HostbasedAcceptedAlgorithms and HostKeyAlgorithms; prompted by Jakub Jelen
8932 OpenBSD-Commit-ID: 3f719de4385b1a89e4323b2549c66aae050129cb
8934 commit 0aeb508aaabc4818970c90831e3d21843c3c6d09
8935 Author: djm@openbsd.org <djm@openbsd.org>
8936 Date: Tue Feb 23 21:50:18 2021 +0000
8938 upstream: Correct reference to signature algorithms as keys; from
8942 OpenBSD-Commit-ID: 36f7ecee86fc811aa0f8e21e7a872eee044b4be5
8944 commit f186a020f2ba5f9c462a23293750e29ba0a746b1
8945 Author: Darren Tucker <dtucker@dtucker.net>
8946 Date: Tue Feb 23 16:05:22 2021 +1100
8948 Add a couple more test VMs.
8950 commit ffcdd3d90e74176b3bb22937ad1f65a6c1cd3f9d
8951 Author: Darren Tucker <dtucker@dtucker.net>
8952 Date: Mon Feb 22 08:09:27 2021 +1100
8954 Valgrind test: split and move up list.
8956 Since the valgrind test takes so long it approaches the limit allowed by
8957 github, move it to the head of the list so it's the first one started and
8958 split the longest tests out into a second instance that runs concurrently
8961 commit c3b1636770785cc2830dedd0f22ef7d3d3491d6d
8962 Author: djm@openbsd.org <djm@openbsd.org>
8963 Date: Tue Feb 23 00:05:31 2021 +0000
8965 upstream: warn when the user specifies a ForwardAgent path that does
8967 not exist and exit if ExitOnForwardFailure is set; bz3264
8969 OpenBSD-Commit-ID: 72f7875865e723e464c71bf8692e83110699bf26
8971 commit 5fcb0514949d61aadaf4a89cf16eb78fb47491ec
8972 Author: Darren Tucker <dtucker@dtucker.net>
8973 Date: Sat Feb 20 13:34:02 2021 +1100
8975 Disable rlimit sandbox, doesn't work with valgrind
8977 Only run regress tests, runing unit tests as well makes it run longer
8978 than allowed y github.
8980 commit bb0b9bf45396c19486080d3eb0a159f94de7e6ba
8981 Author: Darren Tucker <dtucker@dtucker.net>
8982 Date: Sat Feb 20 13:06:25 2021 +1100
8984 Upload valgrind logs on failure.
8986 commit ebb3b75e974cb241c6b9b9f5881b09c7bd32b651
8987 Author: Darren Tucker <dtucker@dtucker.net>
8988 Date: Fri Feb 19 22:18:50 2021 +1100
8990 Rename "vm" to "os" in selfhosted to match c-cpp.
8992 Should make it easier to share code or maybe merge at some point.
8994 commit 76c0be0fe0465cb2b975dbd409f8d38b55e55bcb
8995 Author: Darren Tucker <dtucker@dtucker.net>
8996 Date: Fri Feb 19 22:15:22 2021 +1100
8998 Upload regress failure logs in c-cpp too.
9000 commit 8751b6c3136f5225c40f41bbf29aa29e15795f6e
9001 Author: Darren Tucker <dtucker@dtucker.net>
9002 Date: Fri Feb 19 22:13:36 2021 +1100
9004 Comment out Solaris 64bit PAM build...
9006 until I can figure out why it's failing.
9008 commit e9f6d563c06886b277c6b9abafa99fa80726dc48
9009 Author: Darren Tucker <dtucker@dtucker.net>
9010 Date: Fri Feb 19 10:20:17 2021 +1100
9012 Actually run Valgrind tests.
9014 commit 41d232e226624f1a81c17091c36b44c9010aae62
9015 Author: Darren Tucker <dtucker@dtucker.net>
9016 Date: Fri Feb 19 10:16:56 2021 +1100
9018 Add test against Valgrind.
9020 commit e6528d91f12fba05f0ea64224091c9d0f38bdf1d
9021 Author: Darren Tucker <dtucker@dtucker.net>
9022 Date: Thu Feb 18 16:30:01 2021 +1100
9024 Add fbsd12 test target.
9026 commit 6506cb2798d98ff03a7cc06567c392a81f540680
9027 Author: Darren Tucker <dtucker@dtucker.net>
9028 Date: Thu Feb 18 15:21:13 2021 +1100
9032 commit 93c31a623973b0fad508214593aab6ca94b11dcb
9033 Author: Darren Tucker <dtucker@dtucker.net>
9034 Date: Thu Feb 18 14:54:07 2021 +1100
9036 Add DEBUG_SK to kitchensink builds.
9038 commit 65085740d3574eeb3289d592f042df62c2689bb0
9039 Author: Darren Tucker <dtucker@dtucker.net>
9040 Date: Thu Feb 18 14:53:14 2021 +1100
9042 Add bbone test target (arm32).
9044 commit 63238f5aed66148b8d6ca7bd5fb347d624200155
9045 Author: djm@openbsd.org <djm@openbsd.org>
9046 Date: Thu Feb 18 02:49:35 2021 +0000
9048 upstream: Fix the hostkeys rotation extension documentation
9050 The documentation was lacking the needed want-reply field in the initial
9053 https://github.com/openssh/openssh-portable/pull/218 by dbussink
9055 OpenBSD-Commit-ID: 051824fd78edf6d647a0b9ac011bf88e28775054
9057 commit 34c5ef6e2d06d9f0e20cb04a9aebf67a6f96609a
9058 Author: djm@openbsd.org <djm@openbsd.org>
9059 Date: Thu Feb 18 02:15:07 2021 +0000
9061 upstream: make names in function prototypes match those in
9063 definition from https://github.com/openssh/openssh-portable/pull/225 by
9066 OpenBSD-Commit-ID: 7c736307bf3f2c7cb24d6f82f244eee959485acd
9068 commit 88e3d4de31ab4f14cac658e9e0c512043b15b146
9069 Author: djm@openbsd.org <djm@openbsd.org>
9070 Date: Thu Feb 18 02:13:58 2021 +0000
9072 upstream: unbreak SK_DEBUG builds
9074 from https://github.com/openssh/openssh-portable/pull/225 by
9077 OpenBSD-Commit-ID: 28d7259ce1b04d025411464decfa2f1a097b43eb
9079 commit 788cbc5b74a53956ba9fff11e1ca506271a3597f
9080 Author: djm@openbsd.org <djm@openbsd.org>
9081 Date: Thu Feb 18 00:30:17 2021 +0000
9083 upstream: sftp-server: implement limits@openssh.com extension
9085 This is a simple extension that allows the server to clearly
9086 communicate transfer limits it is imposing so the client doesn't
9087 have to guess, or force the user to manually tune. This is
9088 particularly useful when an attempt to use too large of a value
9089 causes the server to abort the connection.
9091 Patch from Mike Frysinger; ok dtucker@
9093 OpenBSD-Commit-ID: f96293221e5aa24102d9bf30e4f4ef04d5f4fb51
9095 commit 324449a68d510720d0e4dfcc8e9e5a702fe6a48f
9096 Author: Damien Miller <djm@mindrot.org>
9097 Date: Thu Feb 18 12:06:25 2021 +1100
9099 support OpenSSL 3.x cipher IV API change
9101 OpenSSL renamed the "get current CIPHER_CTX" IV operation in 3.x.
9102 This uses the new name if available.
9104 https://github.com/openssl/openssl/issues/13411
9108 commit 845fe9811c047063d935eca89188ed55c993626b
9109 Author: Damien Miller <djm@mindrot.org>
9110 Date: Thu Feb 18 11:25:38 2021 +1100
9112 prefer login_getpwclass() to login_getclass()
9114 FreeBSD has login_getpwclass() that does some special magic for
9115 UID=0. Prefer this to login_getclass() as its easier to emulate
9116 the former with the latter.
9118 Based on FreeBSD PR 37416 via Ed Maste; ok dtucker@
9120 commit d0763c8d566119cce84d9806e419badf20444b02
9121 Author: Darren Tucker <dtucker@dtucker.net>
9122 Date: Thu Feb 18 10:45:27 2021 +1100
9124 Fixing quoting for installing moduli on target guest.
9126 commit b3afc243bc820f323a09e3218e9ec8a30a3c1933
9127 Author: Darren Tucker <dtucker@dtucker.net>
9128 Date: Thu Feb 18 10:27:16 2021 +1100
9130 Install moduli on target not host.
9132 commit f060c2bc85d59d111fa18a12eb3872ee4b9f7e97
9133 Author: Damien Miller <djm@mindrot.org>
9134 Date: Thu Feb 18 10:33:58 2021 +1100
9136 don't free string returned by login_getcapstr(3)
9138 OpenBSD and NetBSD require the caller to free strings returned
9139 bu the login_* functions, but FreeBSD requires that callers don't.
9141 Fortunately in this case, we can harmlessly leak as the process is
9142 about to exec the shell/command.
9144 From https://reviews.freebsd.org/D28617 via Ed Maste; ok dtucker@
9146 commit bc9b0c25703215501da28aa7a6539f96c0fa656f
9147 Author: Darren Tucker <dtucker@dtucker.net>
9148 Date: Thu Feb 18 10:10:00 2021 +1100
9150 Skip unit tests on sol11 to speed things up.
9152 commit 161873035c12cc22211fc73d07170ade47746bc5
9153 Author: Darren Tucker <dtucker@dtucker.net>
9154 Date: Thu Feb 18 10:09:27 2021 +1100
9156 Remove SKIP_UNIT as it needs to be a make arg.
9158 commit 1c293868e4b4e8e74e3ea15b8dff90f6b089967a
9159 Author: Darren Tucker <dtucker@dtucker.net>
9160 Date: Thu Feb 18 10:05:03 2021 +1100
9162 Always intall moduli.
9164 Allows us to run tests without falling back to a fixed modulus. Ensure that
9165 the directory exists.
9167 commit 5c8f41ad100601ec2fdcbccdfe92890c31f81bbe
9168 Author: Darren Tucker <dtucker@dtucker.net>
9169 Date: Thu Feb 18 09:59:09 2021 +1100
9171 Quote SSHD_CONFOPTS in case it contains spaces.
9173 commit 4653116c1f5384ea7006e6396d9b53c33d218975
9174 Author: Darren Tucker <dtucker@dtucker.net>
9175 Date: Thu Feb 18 09:51:18 2021 +1100
9177 Fix labels on targets (dots vs underscores).
9179 commit 4512047f57ca3c6e8cd68f0cc69be59e98b25287
9180 Author: Darren Tucker <dtucker@dtucker.net>
9181 Date: Wed Feb 17 21:47:48 2021 +1100
9183 More compact representation of config matrix.
9185 commit 0406cd09f05c2e419b113dd4c0eac8bc34ec915b
9186 Author: Darren Tucker <dtucker@dtucker.net>
9187 Date: Wed Feb 17 21:19:18 2021 +1100
9189 Skip unit tests on hosted VMs to speed things up.
9191 commit 4582612e6147d766c336198c498740242fb8f1ec
9192 Author: Darren Tucker <dtucker@dtucker.net>
9193 Date: Wed Feb 17 20:21:29 2021 +1100
9195 Merge macos and ubuntu tests.
9197 commit 09f4b84654b71099559492e9aed5e1a38bf24815
9198 Author: Darren Tucker <dtucker@dtucker.net>
9199 Date: Wed Feb 17 18:41:30 2021 +1100
9201 Convert most github hosted tests to new config structure.
9203 commit 65380ff7e054be1454e5ab4fd7bb9c66f8fcbaa9
9204 Author: Darren Tucker <dtucker@dtucker.net>
9205 Date: Wed Feb 17 18:27:36 2021 +1100
9207 Only run selfhosted tests from selfhosted repo.
9209 commit f031366535650b88248ed7dbf23033afdf466240
9210 Author: Darren Tucker <dtucker@dtucker.net>
9211 Date: Fri Jan 15 14:11:43 2021 +1100
9213 Add self-hosted runners for VMs of other platforms.
9215 Github only hosts a limited number of platforms, and the runner code
9216 is only supported on slightly wider range of platforms. To increase
9217 our test coverage beyond that, we run the runner natively on a VM host,
9218 where it runs a jobs that boot VMs of other platforms, waits for them
9219 to come up then runs the build and test by ssh'ing into the guest.
9220 This means that the minimum dependencies for the guests are quite low
9221 (basically just sshd, a compiler and make).
9223 The interface to the VM host is fairly simple (basically 3 scripts:
9224 vmstartup, vmrun and vmshutdown), but those are specific to the VM host
9225 so are not in the public repo. We also mount the working directory on the
9226 host via sshfs, so things like artifact upload by the runner also work.
9228 As part of this we are moving the per-test-target configs into a single
9229 place (.github/configs) where there will be referenced by a single short
9230 "config" key. I plan to make the github-hosted runners use this too.
9232 The self-hosted runners are run off a private repo on github since that
9233 prevents third parties from accessing them[0], and since runner quota is
9234 limited on private repos, we avoid running the tests we run on the public
9237 [0] https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories
9239 commit 64bbd7444d658ef7ee14a7ea5ccc7f5810279ee7
9240 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9241 Date: Wed Feb 17 03:59:00 2021 +0000
9243 upstream: Make sure puttygen is new enough to successfully run the
9245 PuTTY interop tests, otherwise skip them.
9247 OpenBSD-Regress-ID: 34565bb50b8aec58331ed02a5e9e0a9a929bef51
9249 commit da0a9afcc446a30ca49dd216612c41ac3cb1f2d4
9250 Author: markus@openbsd.org <markus@openbsd.org>
9251 Date: Mon Feb 15 20:43:15 2021 +0000
9253 upstream: ssh: add PermitRemoteOpen for remote dynamic forwarding
9255 with SOCKS ok djm@, dtucker@
9257 OpenBSD-Commit-ID: 64fe7b6360acc4ea56aa61b66498b5ecc0a96a7c
9259 commit b696858a7f9db72a83d02cb6edaca4b30a91b386
9260 Author: markus@openbsd.org <markus@openbsd.org>
9261 Date: Mon Feb 15 20:36:35 2021 +0000
9263 upstream: factor out opt_array_append; ok djm@
9265 OpenBSD-Commit-ID: 571bc5dd35f99c5cf9de6aaeac428b168218e74a
9267 commit ad74fc127cc45567e170e8c6dfa2cfd9767324ec
9268 Author: dlg@openbsd.org <dlg@openbsd.org>
9269 Date: Mon Feb 15 11:09:22 2021 +0000
9271 upstream: ProxyJump takes "none" to disable processing like
9277 OpenBSD-Commit-ID: 941a2399da2193356bdc30b879d6e1692f18b6d3
9279 commit 16eacdb016ccf38dd9959c78edd3a6282513aa53
9280 Author: djm@openbsd.org <djm@openbsd.org>
9281 Date: Fri Feb 12 03:49:09 2021 +0000
9283 upstream: sftp: add missing lsetstat@openssh.com documentation
9285 patch from Mike Frysinger
9287 OpenBSD-Commit-ID: 9c114db88d505864075bfe7888b7c8745549715b
9289 commit e04fd6dde16de1cdc5a4d9946397ff60d96568db
9290 Author: djm@openbsd.org <djm@openbsd.org>
9291 Date: Fri Feb 12 03:14:18 2021 +0000
9293 upstream: factor SSH_AGENT_CONSTRAIN_EXTENSION parsing into its own
9295 function and remove an unused variable; ok dtucker@
9297 OpenBSD-Commit-ID: e1a938657fbf7ef0ba5e73b30365734a0cc96559
9299 commit 1bb130ed34721d46452529d094d9bbf045607d79
9300 Author: Darren Tucker <dtucker@dtucker.net>
9301 Date: Thu Feb 11 10:18:05 2021 +1100
9303 Add __NR_futex_time64 to seccomp sandbox.
9305 This is apparently needed for (some) 32 bit platforms with glibc 2.33.
9306 Patch from nix at esperi.org.uk and jjelen at redhat.com via bz#3260.
9308 commit f88a7a431212a16e572ecabd559e632f369c363e
9309 Author: Darren Tucker <dtucker@dtucker.net>
9310 Date: Sat Feb 6 09:37:01 2021 +1100
9312 Add a hostname function for systems that don't have it.
9314 Some systems don't have a hostname command (it's not required by POSIX).
9315 The do have uname -n (which is), but as found by tim@ some others (eg
9316 UnixWare) do not report the FQDN from uname -n.
9318 commit 5e385a71ef2317856f37c91a98658eb12eb5a89c
9319 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9320 Date: Fri Feb 5 22:03:40 2021 +0000
9322 upstream: Roll back the hostname->uname change in rev 1.10. It turns
9324 out uname -n doesn't do what we need for some platforms in portable, so we'll
9325 fix the original problem (that some other platforms don't have hostname at
9326 all) by providing wrapper function to implement it.
9328 OpenBSD-Regress-ID: 827a707d6201d5a8e196a8c28aec1d2c76c52341
9330 commit b446c214279de50ed8388e54897eb1be5281c894
9331 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9332 Date: Fri Feb 5 06:01:58 2021 +0000
9334 upstream: hostname is not specified by POSIX but uname -n is, so use
9336 the latter for portability. Patch from Geert Hendrickx via github PR#208.
9338 OpenBSD-Regress-ID: d6a79c7c4d141a0d05ade4a042eb57dddbce89f3
9340 commit 1cb6ce98d658e5fbdae025a3bd65793980e3b5d9
9341 Author: David Carlier <devnexen@gmail.com>
9342 Date: Sat Nov 21 12:22:23 2020 +0000
9344 Using explicit_memset for the explicit_bzero compatibility layer.
9346 Favoriting the native implementation in this case.
9348 commit 2e0beff67def2120f4b051b1016d7fbf84823e78
9349 Author: Luca Weiss <luca@z3ntu.xyz>
9350 Date: Sun Nov 8 14:19:23 2020 +0100
9352 Deny (non-fatal) statx in preauth privsep child.
9354 commit a35d3e911e193a652bd09eed40907e3e165b0a7b
9355 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9356 Date: Fri Feb 5 02:20:23 2021 +0000
9358 upstream: Remove debug message from sigchld handler. While this
9360 works on OpenBSD it can cause problems on other platforms. From kircherlike
9361 at outlook.com via bz#3259, ok djm@
9363 OpenBSD-Commit-ID: 3e241d7ac1ee77e3de3651780b5dc47b283a7668
9365 commit 69338ab46afe9e3dfb7762ad65351d854077c998
9366 Author: djm@openbsd.org <djm@openbsd.org>
9367 Date: Tue Feb 2 22:36:59 2021 +0000
9369 upstream: whitespace
9371 OpenBSD-Commit-ID: 544bb092e03fcbecb420196cd0f70af13ea868ad
9373 commit f71219a01d8f71c4b3ed7e456337a84ddba1653e
9374 Author: djm@openbsd.org <djm@openbsd.org>
9375 Date: Tue Feb 2 22:36:46 2021 +0000
9377 upstream: fix memleaks in private key deserialisation; enforce more
9379 consistency between redundant fields in private key certificate and private
9380 key body; ok markus@
9382 OpenBSD-Commit-ID: dec344e414d47f0a7adc13aecf3760fe58101240
9384 commit 3287790e78bf5b53c4a3cafb67bb5aa03e3910f0
9385 Author: djm@openbsd.org <djm@openbsd.org>
9386 Date: Tue Feb 2 22:35:14 2021 +0000
9388 upstream: memleak on error path; ok markus@
9390 OpenBSD-Commit-ID: 2091a36d6ca3980c81891a6c4bdc544e63cb13a8
9392 commit 3dd0c64e08f1bba21d71996d635c7256c8c139d1
9393 Author: djm@openbsd.org <djm@openbsd.org>
9394 Date: Sun Jan 31 22:55:29 2021 +0000
9396 upstream: more strictly enforce KEX state-machine by banning packet
9398 types once they are received. Fixes memleak caused by duplicate
9399 SSH2_MSG_KEX_DH_GEX_REQUEST (spotted by portable OpenSSH kex_fuzz via
9404 OpenBSD-Commit-ID: 87331c715c095b587d5c88724694cdeb701c9def
9406 commit 7a92a324a2e351fabd0ba8ef9b434d3b12d54ee3
9407 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9408 Date: Sun Jan 31 10:50:10 2021 +0000
9410 upstream: Set linesize returned by getline to zero when freeing and
9412 NULLing the returned string. OpenBSD's getline handles this just fine, but
9413 some implementations used by -portable do not. ok djm@
9415 OpenBSD-Commit-ID: 4d7bd5169d3397654247db9655cc69a9908d165c
9417 commit a5dfc5bae8c16e2a7caf564758d812c7672480b5
9418 Author: Damien Miller <djm@mindrot.org>
9419 Date: Sat Jan 30 16:32:29 2021 +1100
9421 allow a fuzz case to contain more than one request
9423 loop until input buffer empty, no message consumed or 256 messages
9426 commit 0ef24ad60204022f7e33b6e9d171172c50514132
9427 Author: Damien Miller <djm@mindrot.org>
9428 Date: Sat Jan 30 16:28:23 2021 +1100
9430 expect fuzz cases to have length prefix
9432 might make life a little easier for the fuzzer, e.g. it can now
9433 produce valid (multi-request) messages by smashing two cases together.
9435 commit de613f2713d2dfcd3b03c00e5558a40997f52712
9436 Author: Damien Miller <djm@mindrot.org>
9437 Date: Sat Jan 30 12:03:30 2021 +1100
9441 commit 7e96c877bcb2fb645355a687b8cb7347987c1c58
9442 Author: Damien Miller <djm@mindrot.org>
9443 Date: Sat Jan 30 12:02:46 2021 +1100
9445 move keys out of kex_fuzz.cc into separate header
9447 add certificates and missing key types
9449 commit 76f46d75664fdaa1112739ca523ff85ee4eb52b4
9450 Author: Damien Miller <djm@mindrot.org>
9451 Date: Sat Jan 30 12:02:10 2021 +1100
9453 some fixed test data (mostly keys) for fuzzing
9455 commit 7c2e3d6de1f2edb0c8b4725b4c2b56360e032b19
9456 Author: djm@openbsd.org <djm@openbsd.org>
9457 Date: Sat Jan 30 00:56:38 2021 +0000
9459 upstream: add a SK_DUMMY_INTEGRATE define that allows the dummy
9461 security key middleware to be directly linked; useful for writing fuzzers,
9464 OpenBSD-Regress-ID: 0ebd00159b58ebd85e61d8270fc02f1e45df1544
9466 commit 1a4b92758690faa12f49079dd3b72567f909466d
9467 Author: djm@openbsd.org <djm@openbsd.org>
9468 Date: Fri Jan 29 06:29:46 2021 +0000
9470 upstream: fix the values of enum sock_type
9472 OpenBSD-Commit-ID: 18d048f4dbfbb159ff500cfc2700b8fb1407facd
9474 commit 8afaa7d7918419d3da6c0477b83db2159879cb33
9475 Author: djm@openbsd.org <djm@openbsd.org>
9476 Date: Fri Jan 29 06:28:10 2021 +0000
9478 upstream: give typedef'd struct a struct name; makes the fuzzer I'm
9480 writing a bit easier
9482 OpenBSD-Commit-ID: 1052ab521505a4d8384d67acb3974ef81b8896cb
9484 commit 1e660115f0c7c4a750cd31e468ff889f33dd8088
9485 Author: Damien Miller <djm@mindrot.org>
9486 Date: Fri Jan 29 11:09:14 2021 +1100
9488 fuzz diffie-hellman-group-exchange-sha1 kex too
9490 commit be5f0048ea2aaeddd27be7dcca23aaad345fa16c
9491 Author: Damien Miller <djm@mindrot.org>
9492 Date: Fri Jan 29 11:03:35 2021 +1100
9494 support for running kex fuzzer with null cipher
9496 commit 3d59e88c0e42182c3749b446ccd9027933c84be4
9497 Author: Darren Tucker <dtucker@dtucker.net>
9498 Date: Thu Jan 28 20:55:16 2021 +1100
9500 make with -j2 to use available CPUs.
9502 commit 66dd9ddb5d2ea8c407908c8e8468c9d6e71db05b
9503 Author: Darren Tucker <dtucker@dtucker.net>
9504 Date: Thu Jan 28 14:31:01 2021 +1100
9506 Add test against openssl head and libressl head.
9508 commit 237dbb34e24b6b7ea888d54bda4d17da0a0fd0fa
9509 Author: Darren Tucker <dtucker@dtucker.net>
9510 Date: Thu Jan 28 14:30:50 2021 +1100
9514 commit d983e1732b8135d7ee8d92290d6dce35f736ab88
9515 Author: djm@openbsd.org <djm@openbsd.org>
9516 Date: Wed Jan 27 23:49:46 2021 +0000
9518 upstream: fix leak: was double allocating kex->session_id buffer
9520 OpenBSD-Commit-ID: 3765f4cc3ae1df874dba9102a3588ba7b48b8183
9522 commit 1134a48cdcef8e7363b9f6c73ebdd24405066738
9523 Author: Damien Miller <djm@mindrot.org>
9524 Date: Thu Jan 28 08:57:31 2021 +1100
9526 correct kex name in disabled code
9528 commit 67f47f1965abafc1830a287761125c2f4790857e
9529 Author: djm@openbsd.org <djm@openbsd.org>
9530 Date: Wed Jan 27 10:15:08 2021 +0000
9532 upstream: this needs kex.h now
9534 OpenBSD-Commit-ID: c5a42166c5aa002197217421a971e48be7cb5d41
9536 commit 39be3dc209f28f9c1ebfeba42adde8963b01e1cd
9537 Author: djm@openbsd.org <djm@openbsd.org>
9538 Date: Wed Jan 27 10:05:28 2021 +0000
9540 upstream: make ssh->kex->session_id a sshbuf instead of u_char*/size_t
9542 and use that instead of global variables containing copies of it. feedback/ok
9545 OpenBSD-Commit-ID: a4b1b1ca4afd2e37cb9f64f737b30a6a7f96af68
9547 commit 4ca6a1fac328477c642329676d6469dba59019a3
9548 Author: djm@openbsd.org <djm@openbsd.org>
9549 Date: Wed Jan 27 09:26:53 2021 +0000
9551 upstream: remove global variable used to stash compat flags and use the
9553 purpose-built ssh->compat variable instead; feedback/ok markus@
9555 OpenBSD-Commit-ID: 7c4f200e112dae6bcf99f5bae1a5629288378a06
9557 commit bba229b6f3328171f5e3ae85de443002523c0452
9558 Author: Darren Tucker <dtucker@dtucker.net>
9559 Date: Wed Jan 27 12:34:07 2021 +1100
9561 Install moduli file before tests.
9563 Reduces warnings during test runs.
9565 commit 1b83185593a90a73860a503d753a95ca6d726c00
9566 Author: Darren Tucker <dtucker@dtucker.net>
9567 Date: Wed Jan 27 11:58:26 2021 +1100
9569 Run one test with -Werror to catch warnings.
9571 commit d1532d90074b212054d5fd965f833231b09982f5
9572 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9573 Date: Wed Jan 27 00:37:26 2021 +0000
9575 upstream: Logical not bitwise or. ok djm@
9577 OpenBSD-Commit-ID: d4dc855cf04951b93c45caa383e1ac9af0a3b0e5
9579 commit 507b448a2465a53ab03a88acbc71cc51b48ca6ac
9580 Author: naddy@openbsd.org <naddy@openbsd.org>
9581 Date: Tue Jan 26 15:40:17 2021 +0000
9583 upstream: move HostbasedAcceptedAlgorithms to the right place in
9587 OpenBSD-Commit-ID: d766820d33dd874d944c14b0638239adb522c7ec
9589 commit e26c980778b228bdd42b8353cc70101cf49b731b
9590 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9591 Date: Tue Jan 26 11:25:01 2021 +0000
9593 upstream: Remove unused variables leftover from refactoring. ok
9597 OpenBSD-Commit-ID: 8b3ad58bff828fcf874e54b2fc27a4cf1d9505e8
9599 commit e9f78d6b06fc323bba1890b2dc3b8423138fb35c
9600 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9601 Date: Tue Jan 26 05:32:21 2021 +0000
9603 upstream: Rename HostbasedKeyTypes (ssh) and
9605 HostbasedAcceptedKeyTypes (sshd) to HostbasedAcceptedAlgorithms, which more
9606 accurately reflects its effect. This matches a previous change to
9607 PubkeyAcceptedAlgorithms. The previous names are retained as aliases. ok
9610 OpenBSD-Commit-ID: 49451c382adc6e69d3fa0e0663eeef2daa4b199e
9612 commit 48d0d7a4dd31154c4208ec39029d60646192f978
9613 Author: Darren Tucker <dtucker@dtucker.net>
9614 Date: Tue Jan 26 14:48:07 2021 +1100
9616 Disable sntrup761 if compiler doesn't support VLAs.
9618 The sntrup761 code sourced from supercop uses variable length
9619 arrays. Although widely supported, they are not part of the ANSI
9620 C89 spec so if the compiler does not support VLAs, disable the
9621 sntrup761x25519-sha512@openssh.com KEX method by replacing the kex
9622 functions with no-op ones similar to what we do in kexecdh.c.
9624 This should allow OpenSSH to build with a plain C89 compiler again.
9625 Spotted by tim@, ok djm@.
9627 commit 37c70ea8d4f3664a88141bcdf0bf7a16bd5fd1ac
9628 Author: djm@openbsd.org <djm@openbsd.org>
9629 Date: Tue Jan 26 00:54:49 2021 +0000
9631 upstream: refactor key constraint parsing in ssh-agent
9633 Key constraints parsing code previously existed in both the "add regular
9634 key" and "add smartcard key" path. This unifies them but also introduces
9635 more consistency checking: duplicated constraints and constraints that
9636 are nonsensical for a particular situation (e.g. FIDO provider for a
9637 smartcard key) are now banned.
9641 OpenBSD-Commit-ID: 511cb1b1c021ee1d51a4c2d649b937445de7983c
9643 commit e0e8bee8024fa9e31974244d14f03d799e5c0775
9644 Author: djm@openbsd.org <djm@openbsd.org>
9645 Date: Tue Jan 26 00:53:31 2021 +0000
9647 upstream: more ssh-agent refactoring
9649 Allow confirm_key() to accept an additional reason suffix
9651 Factor publickey userauth parsing out into its own function and allow
9652 it to optionally return things it parsed out of the message to its
9657 OpenBSD-Commit-ID: 29006515617d1aa2d8b85cd2bf667e849146477e
9659 commit dfe18a295542c169ffde8533b3d7fe42088e2de7
9660 Author: djm@openbsd.org <djm@openbsd.org>
9661 Date: Tue Jan 26 00:51:30 2021 +0000
9663 upstream: make struct hostkeys public; I have no idea why I made it
9669 OpenBSD-Commit-ID: e50780b34d4bbe628d69b2405b024dd749d982f3
9671 commit 3b44f2513cae89c920e8fe927b9bc910a1c8c65a
9672 Author: djm@openbsd.org <djm@openbsd.org>
9673 Date: Tue Jan 26 00:49:30 2021 +0000
9675 upstream: move check_host_cert() from sshconnect,c to sshkey.c and
9677 refactor it to make it more generally usable and testable.
9681 OpenBSD-Commit-ID: 536f489f5ff38808c1fa711ba58d4579b636f9e4
9683 commit 1fe16fd61bb53944ec510882acc0491abd66ff76
9684 Author: djm@openbsd.org <djm@openbsd.org>
9685 Date: Tue Jan 26 00:47:47 2021 +0000
9687 upstream: use recallocarray to allocate the agent sockets table;
9689 also clear socket entries that are being marked as unused.
9691 spinkle in some debug2() spam to make it easier to watch an agent
9696 OpenBSD-Commit-ID: 74582c8e82e96afea46f6c7b6813a429cbc75922
9698 commit cb7b22ea20a01332c81c0ddcb3555ad50de9cce2
9699 Author: djm@openbsd.org <djm@openbsd.org>
9700 Date: Tue Jan 26 00:46:17 2021 +0000
9702 upstream: factor out common code in the agent client
9704 Add a ssh_request_reply_decode() function that sends a message to
9705 the agent, reads and parses a success/failure reply.
9706 Use it for all requests that only expect success/failure
9710 OpenBSD-Commit-ID: e0c1f4d5e6cfa525d62581e2b8de93be0cb85adb
9712 commit d1e578afe7cd48140ad6e92a453f9b035363fd7f
9713 Author: djm@openbsd.org <djm@openbsd.org>
9714 Date: Mon Jan 25 06:00:17 2021 +0000
9716 upstream: make ssh hostbased authentication send the signature
9718 algorithm in its SSH2_MSG_USERAUTH_REQUEST packets instead of the key type.
9719 This make HostbasedAcceptedAlgorithms do what it is supposed to - filter on
9720 signature algorithm and not key type.
9722 spotted with dtucker@ ok markus@
9724 OpenBSD-Commit-ID: 25bffe19f0326972f5728170f7da81d5f45c78c6
9726 commit 95eca1e195a3b41baa1a725c2c5af8a09d885e4b
9727 Author: Darren Tucker <dtucker@dtucker.net>
9728 Date: Sat Jan 23 18:26:05 2021 +1100
9730 ifdef new instance of sin6_scope_id
9732 Put inside HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID similar to
9733 existing instance. Should fix error on UnixWare 7.
9735 commit 6ffdcdda128045226dda7fbb3956407978028a1e
9736 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9737 Date: Mon Jan 18 11:43:34 2021 +0000
9739 upstream: Fix long->int for convtime tests here too. Spotted by
9743 OpenBSD-Regress-ID: a87094f5863312d00938afba771d25f788c849d0
9745 commit b55b7565f15327d82ad7acbddafa90b658c5f0af
9746 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9747 Date: Fri Jan 22 02:46:40 2021 +0000
9749 upstream: PubkeyAcceptedKeyTypes->PubkeyAcceptedAlgorithms
9753 OpenBSD-Commit-ID: 3b64a640f8ce8c21d9314da9df7ce2420eefde3a
9755 commit ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec
9756 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9757 Date: Fri Jan 22 02:44:58 2021 +0000
9759 upstream: Rename PubkeyAcceptedKeyTypes keyword to
9761 PubkeyAcceptedAlgorithms. While the two were originally equivalent, this
9762 actually specifies the signature algorithms that are accepted. Some key
9763 types (eg RSA) can be used by multiple algorithms (eg ssh-rsa, rsa-sha2-512)
9764 so the old name is becoming increasingly misleading. The old name is
9765 retained as an alias. Prompted by bz#3253, help & ok djm@, man page help jmc@
9767 OpenBSD-Commit-ID: 0346b2f73f54c43d4e001089759d149bfe402ca5
9769 commit a8e798feabe36d02de292bcfd274712cae1d8d17
9770 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9771 Date: Fri Jan 15 02:58:11 2021 +0000
9773 upstream: Change types in convtime() unit test to int to match change
9775 its new type. Add tests for boundary conditions and fix convtime to work up
9778 OpenBSD-Regress-ID: ba2b81e9a3257fff204b020affe85b604a44f97e
9780 commit 9bde1a420626da5007bf7ab499fa2159b9eddf72
9781 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9782 Date: Fri Jan 15 04:31:25 2021 +0000
9784 upstream: Make output buffer larger to prevent potential truncation
9786 warnings from compilers not smart enough to know the strftime calls won't
9787 ever fully fill "to" and "from". ok djm@
9789 OpenBSD-Commit-ID: 83733f1b01b82da88b9dd1769475952aff10bdd7
9791 commit 02da325f10b214219eae2bb1bc2d3bf0c2f13f9f
9792 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9793 Date: Fri Jan 15 02:58:11 2021 +0000
9795 upstream: Change types in convtime() unit test to int to match
9797 change its new type. Add tests for boundary conditions and fix convtime to
9798 work up to INT_MAX. ok djm@
9800 OpenBSD-Commit-ID: 01dc0475f1484ac2f47facdfcf9221f9472145de
9802 commit 5339ab369c225b40bc64d5ec3374f5c91b3ad609
9803 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9804 Date: Fri Jan 15 02:32:41 2021 +0000
9806 upstream: In waitfd(), when poll returns early we are subtracting
9808 the elapsed time from the timeout each loop, so we only want to measure the
9809 elapsed time the poll() in that loop, not since the start of the function.
9810 Spotted by chris.xj.zhu at gmail.com, ok djm@
9812 OpenBSD-Commit-ID: 199df060978ee9aa89b8041a3dfaf1bf7ae8dd7a
9814 commit a164862dfa863b54b7897f66e1dd75437f086c11
9815 Author: rob@openbsd.org <rob@openbsd.org>
9816 Date: Thu Jan 14 19:45:06 2021 +0000
9818 upstream: Minor grammatical correction.
9822 OpenBSD-Commit-ID: de0fad0581e212b2750751e479b79c18ff8cac02
9824 commit 8635e7df7e3a3fbb4a4f6cd5a7202883b2506087
9825 Author: Darren Tucker <dtucker@dtucker.net>
9826 Date: Wed Jan 13 18:00:57 2021 +1100
9828 Merge Mac OS X targets into a single config.
9830 commit ac112ade990585c511048ed4edaf2d9fc92b61f0
9831 Author: Darren Tucker <dtucker@dtucker.net>
9832 Date: Tue Jan 12 19:22:47 2021 +1100
9834 Add Mac OS X test targets.
9836 commit 1050109b4b2884bf50fd1b3aa084c7fd0a42ae90
9837 Author: anatasluo <luolongjuna@gmail.com>
9838 Date: Mon Jan 11 13:51:39 2021 +0000
9840 Remove duplicated declaration in fatal.c .
9842 commit 7d0f8a3369579dfe398536eb4e3da7bc15da9599
9843 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9844 Date: Mon Jan 11 04:48:22 2021 +0000
9846 upstream: Correct spelling of persourcenetblocksize in config-dump
9850 OpenBSD-Commit-ID: ecdc49e2b6bde6b6b0e52163d621831f6ac7b13d
9852 commit ba328bd7a6774f30daaf90b83f1933cc4afc866c
9853 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9854 Date: Sat Jan 9 12:31:46 2021 +0000
9856 upstream: Adjust kexfuzz to addr.c/addrmatch.c split.
9858 OpenBSD-Regress-ID: 1d8d23bb548078020be2fb52c4c643efb190f0eb
9860 commit b08ef25552443e94c0857d5e3806dd019ccc55d7
9861 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9862 Date: Sat Jan 9 12:24:30 2021 +0000
9864 upstream: Update unittests for addr.c/addrmatch.c split.
9866 OpenBSD-Regress-ID: de2b415fb7af084a91c6ef147a90482d8f771eef
9868 commit 6d30673fedec2d251f4962c526fd0451f70c4d97
9869 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9870 Date: Mon Jan 11 02:12:57 2021 +0000
9872 upstream: Change convtime() from returning long to returning int.
9874 On platforms where sizeof(int) != sizeof(long), convtime could accept values
9875 >MAX_INT which subsequently truncate when stored in an int during config
9876 parsing. bz#3250, ok djm@
9878 OpenBSD-Commit-ID: 8fc932683d6b4660d52f50911d62bd6639c5db31
9880 commit 7a57adb8b07b2ad0aead4b2e09ee18edc04d0481
9881 Author: jmc@openbsd.org <jmc@openbsd.org>
9882 Date: Sat Jan 9 12:51:12 2021 +0000
9884 upstream: add a comma to previous;
9886 OpenBSD-Commit-ID: 9139433701c0aa86a0d3a6c7afe10d1c9c2e0869
9888 commit 3a923129534b007c2e24176a8655dec74eca9c46
9889 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9890 Date: Sat Jan 9 12:10:02 2021 +0000
9892 upstream: Add PerSourceMaxStartups and PerSourceNetBlockSize
9894 options which provide more fine grained MaxStartups limits. Man page help
9895 jmc@, feedback & ok djm@
9897 OpenBSD-Commit-ID: e2f68664e3d02c0895b35aa751c48a2af622047b
9899 commit d9a2bc71693ea27461a78110005d5a2d8b0c6a50
9900 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9901 Date: Sat Jan 9 11:58:50 2021 +0000
9903 upstream: Move address handling functions out into their own file
9905 in order to reuse them for per-source maxstartups limiting. Supplement with
9906 some additional functions from djm's flowtools that we'll also need. ok djm@
9907 (as part of a larger diff).
9909 OpenBSD-Commit-ID: e3e7d9ccc6c9b82e25cfef0ec83598e8e2327cbf
9911 commit b744914fcb76d70761f1b667de95841b3fc80a56
9912 Author: Darren Tucker <dtucker@dtucker.net>
9913 Date: Sat Jan 9 00:36:05 2021 +1100
9915 Add test against Graphene hardened malloc.
9917 commit 6cb52d5bf771f6769b630fce35a8e9b8e433044f
9918 Author: djm@openbsd.org <djm@openbsd.org>
9919 Date: Fri Jan 8 04:49:13 2021 +0000
9921 upstream: make CheckHostIP default to 'no'. It doesn't provide any
9923 perceptible value and makes it much harder for hosts to change host keys,
9924 particularly ones that use IP-based load-balancing.
9928 OpenBSD-Commit-ID: 0db98413e82074f78c7d46784b1286d08aee78f0
9930 commit 309b642e1442961b5e57701f095bcd4acd2bfb5f
9931 Author: Darren Tucker <dtucker@dtucker.net>
9932 Date: Fri Jan 8 15:50:41 2021 +1100
9934 Run tests with sudo for better coverage.
9936 commit c336644351fa3c715a08b7a292e309e72792e71e
9937 Author: Darren Tucker <dtucker@dtucker.net>
9938 Date: Fri Jan 8 14:26:32 2021 +1100
9940 Add Ubuntu 16.04 and 20.04 test targets.
9942 commit 4c7af01f9dcc1606dec033e7665a042cb0d8ec52
9943 Author: djm@openbsd.org <djm@openbsd.org>
9944 Date: Fri Jan 8 02:57:24 2021 +0000
9946 upstream: If a signature operation on a FIDO key fails with a
9948 "incorrect PIN" reason and no PIN was initially requested from the user, then
9949 request a PIN and retry the operation.
9951 This smoothes over a few corner cases including FIDO devices that
9952 require PINs for all hosted credentials, biometric FIDO devices that
9953 fall back to requiring PIN when reading the biometric failed, devices
9954 that don't implement reading credProtect status for downloaded keys
9955 and probably a few more cases that I haven't though of yet.
9959 OpenBSD-Commit-ID: 176db8518933d6a5bbf81a2e3cf62447158dc878
9961 commit 64ddd0fe68c4a7acf99b78624f8af45e919cd317
9962 Author: djm@openbsd.org <djm@openbsd.org>
9963 Date: Fri Jan 8 02:44:14 2021 +0000
9965 upstream: don't try to use timespeccmp(3) directly as a qsort(3)
9967 comparison function - it returns 0/1 and not the -1/0/1 that qsort expectes.
9969 fixes sftp "ls -ltr" under some circumstances.
9971 Based on patch by Masahiro Matsuya via bz3248.
9973 OpenBSD-Commit-ID: 65b5e9f18bb0d10573868c3516de6e5170adb163
9975 commit 599df78f3008cf78af21f8977be3e1dd085f8e2e
9976 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9977 Date: Fri Jan 8 02:33:13 2021 +0000
9979 upstream: Update the sntrup761 creation script and generated code:
9981 - remove unneeded header files and typedefs and rely on crypto_api.h - add
9982 defines to map types used to the crypto_api ones instead of typedefs. This
9983 prevents typedef name collisions in -portable. - remove CRYPTO_NAMESPACE
9984 entirely instead of making it a no-op - delete unused functions and make the
9985 remaining ones that aren't exported static.
9989 OpenBSD-Commit-ID: 7b9d0cf3acd5a3c1091da8afe00c904d38cf5783
9991 commit 16448ff529affda7e2a15ee7c3200793abde0759
9992 Author: djm@openbsd.org <djm@openbsd.org>
9993 Date: Fri Jan 8 02:19:24 2021 +0000
9995 upstream: mention that DisableForwarding is valid in a sshd_config
9997 Match block reported by Fredrik Eriksson in bz3239
9999 OpenBSD-Commit-ID: 3a71c3d84b597f5e43e4b40d5232797daf0993f6
10001 commit 91bac5e95b1b0debf9b2b4f05c20dcfa96b368b9
10002 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10003 Date: Mon Jan 4 21:58:58 2021 +0000
10005 upstream: estructure sntrup761.sh to process all files in a single
10007 list, which will make it easier to reorder. Re-inline int32_MINMAX. ok
10010 OpenBSD-Commit-ID: d145c6c19b08bb93c9e14bfaa7af589d90f144c0
10012 commit 4d96a3ebab2224f17e639a15078e03be1ad3736d
10013 Author: tobhe@openbsd.org <tobhe@openbsd.org>
10014 Date: Sun Jan 3 18:05:21 2021 +0000
10016 upstream: Prevent redefinition of `crypto_int32' error with gcc3.
10018 Fixes compilation on luna88k.
10021 Found by and ok aoyama@
10023 OpenBSD-Commit-ID: f305ddfe575a26cc53431af3fde3f4aeebed9ba6
10025 commit a23954eeb930ccc8a66a2710153730769dba31b6
10026 Author: Darren Tucker <dtucker@dtucker.net>
10027 Date: Fri Jan 1 22:00:49 2021 +1100
10029 Undef int32 after sort routines.
10031 This prevents typedef'ing crypto_int32 twice, in sntrup761.c and
10032 crypto_api.h, which some compilers (at least some GCCs) don't accept.
10034 commit 148b8a661c3f93e4b6d049ee902de3d521261fbc
10035 Author: Damien Miller <djm@mindrot.org>
10036 Date: Thu Dec 31 12:47:22 2020 +1100
10038 fix: missing pieces of previous commit
10040 commit 3d999be7b987c848feda718cfcfcdc005ddf670d
10041 Author: tobhe@openbsd.org <tobhe@openbsd.org>
10042 Date: Wed Dec 30 14:13:28 2020 +0000
10044 upstream: Use int64_t for intermediate values in int32_MINMAX to
10046 prevent signed 32-bit integer overflow.
10048 Found by and ok djm@
10051 OpenBSD-Commit-ID: 4f0704768e34cf45fdd792bac4011c6971881bb3
10053 commit 5c1953bf98732da5a76c706714ac066dbfa015ac
10054 Author: Damien Miller <djm@mindrot.org>
10055 Date: Tue Dec 29 12:40:54 2020 +1100
10057 adapt KEX fuzzer to PQ kex change
10059 commit 659864fe81dbc57eeed3769c462679d83e026640
10060 Author: djm@openbsd.org <djm@openbsd.org>
10061 Date: Tue Dec 29 01:02:15 2020 +0000
10063 upstream: Adapt to replacement of
10065 sntrup4591761x25519-sha512@tinyssh.org with
10066 sntrup761x25519-sha512@openssh.com.
10068 Also test sntrup761x25519-sha512@openssh.com in unittests/kex
10070 OpenBSD-Regress-ID: cfa3506b2b077a9cac1877fb521efd2641b6030c
10072 commit 2c71cec020219d69df84055c59eba5799a1233ec
10073 Author: djm@openbsd.org <djm@openbsd.org>
10074 Date: Tue Dec 29 00:59:15 2020 +0000
10076 upstream: Update/replace the experimental post-quantim hybrid key
10078 exchange method based on Streamlined NTRU Prime (coupled with X25519).
10080 The previous sntrup4591761x25519-sha512@tinyssh.org method is
10081 replaced with sntrup761x25519-sha512@openssh.com. Per the authors,
10082 sntrup4591761 was replaced almost two years ago by sntrup761.
10084 The sntrup761 implementaion, like sntrup4591761 before it, is public
10085 domain code extracted from the SUPERCOP cryptography benchmark
10086 suite (https://bench.cr.yp.to/supercop.html).
10088 Thanks for Daniel J Bernstein for guidance on algorithm selection.
10089 Patch from Tobias Heider; feedback & ok markus@ and myself
10091 (note this both the updated method and the one that it replaced are
10092 disabled by default)
10094 OpenBSD-Commit-ID: 2bf582b772d81ee24e911bb6f4b2aecfd39338ae
10096 commit 09d070ccc3574ae0d7947d212ed53c7268ef7e1f
10097 Author: jmc@openbsd.org <jmc@openbsd.org>
10098 Date: Tue Dec 22 07:40:26 2020 +0000
10100 upstream: tweak the description of KnownHostsCommand in ssh_conf.5,
10102 and add entries for it to the -O list in scp.1 and sftp.1;
10106 OpenBSD-Commit-ID: aba31ebea03f38f8d218857f7ce16a500c3e4aff
10108 commit 931c93389a80e32272712459b1102d303844453d
10109 Author: Damien Miller <djm@mindrot.org>
10110 Date: Tue Dec 22 19:43:55 2020 +1100
10114 commit 397b1c4d393f97427283a4717e9015a2bd31b8a5
10115 Author: Damien Miller <djm@mindrot.org>
10116 Date: Tue Dec 22 19:42:37 2020 +1100
10120 commit 33fa3ac547e5349ca34681cce6727b2f933dff0a
10121 Author: Darren Tucker <dtucker@dtucker.net>
10122 Date: Tue Dec 22 19:21:26 2020 +1100
10126 commit 0f2e21c9dca89598b694932b5b05848380a23ec0
10127 Author: Darren Tucker <dtucker@dtucker.net>
10128 Date: Tue Dec 22 18:56:54 2020 +1100
10130 Include stdio.h for FILE in misc.h.
10132 Fixes build on at least OpenBSD.
10134 commit 3e9811e57b57ee66b0f70d99d7258da3153b0e8a
10135 Author: Damien Miller <djm@mindrot.org>
10136 Date: Tue Dec 22 18:31:50 2020 +1100
10138 ensure $LOGNAME is set in tests
10140 commit 3eb647cbb34d87a063aa7714256c6e56103fffda
10141 Author: djm@openbsd.org <djm@openbsd.org>
10142 Date: Tue Dec 22 06:47:24 2020 +0000
10144 upstream: more detail for failing tests
10146 OpenBSD-Regress-ID: c68c0e5a521cad7e7f68e54c54ebf86d6c10ee1d
10148 commit 2873f19570d4d8758be24dbf78332be9a779009b
10149 Author: djm@openbsd.org <djm@openbsd.org>
10150 Date: Tue Dec 22 06:03:36 2020 +0000
10152 upstream: regress test for KnownHostsCommand
10154 OpenBSD-Regress-ID: ffc77464320b6dabdcfa0a72e0df02659233a38a
10156 commit 0121aa87bab9ad2365de2d07f2832b56d5ff9871
10157 Author: tb@openbsd.org <tb@openbsd.org>
10158 Date: Tue Dec 22 03:05:31 2020 +0000
10160 upstream: Remove lines accidentally left behind in the ProxyJump
10162 parsing fix r1.345.
10166 OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c
10168 commit da4bf0db942b5f0278f33238b86235e5813d7a5a
10169 Author: djm@openbsd.org <djm@openbsd.org>
10170 Date: Tue Dec 22 00:15:22 2020 +0000
10172 upstream: add a ssh_config KnownHostsCommand that allows the client
10174 to obtain known_hosts data from a command in addition to the usual files.
10176 The command accepts bunch of %-expansions, including details of the
10177 connection and the offered server host key. Note that the command may
10178 be invoked up to three times per connection (see the manpage for
10183 OpenBSD-Commit-ID: 2433cff4fb323918ae968da6ff38feb99b4d33d0
10185 commit a34e14a5a0071de2036826a00197ce38c8b4ba8b
10186 Author: djm@openbsd.org <djm@openbsd.org>
10187 Date: Tue Dec 22 00:12:22 2020 +0000
10189 upstream: move subprocess() from auth.c to misc.c
10191 make privilege dropping optional but allow it via callbacks (to avoid
10192 need to link uidswap.c everywhere)
10194 add some other flags (keep environment, disable strict path safety check)
10195 that make this more useful for client-side use.
10197 feedback & ok markus@
10199 OpenBSD-Commit-ID: a80ea9fdcc156f1a18e9c166122c759fae1637bf
10201 commit 649205fe388b56acb3481a1b2461f6b5b7c6efa6
10202 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10203 Date: Mon Dec 21 22:48:41 2020 +0000
10205 upstream: Remove explicit rijndael-cbc@lysator.liu.se test since the
10207 cipher was removed.
10209 OpenBSD-Regress-ID: aa93cddb4ecd9bc21446a79008a1a53050e64f17
10211 commit 03e93c753d7c223063ad8acaf9a30aa511e5f931
10212 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10213 Date: Mon Dec 21 11:09:32 2020 +0000
10215 upstream: Remove the pre-standardization cipher
10217 rijndael-cbc@lysator.liu.se. It is an alias for aes256-cbc which was
10218 standardized in RFC4253 (2006), has been deprecated and disabled by default
10219 since OpenSSH 7.2 (2016) and was only briefly documented in ssh.1 in 2001.
10221 This will reduce the amount of work the cipher/kex regression tests need
10222 to do by a little bit. ok markus@ djm@
10224 OpenBSD-Commit-ID: fb460acc18290a998fd70910b19c29b4e4f199ad
10226 commit a11ca015879eab941add8c6bdaaec7d41107c6f5
10227 Author: djm@openbsd.org <djm@openbsd.org>
10228 Date: Mon Dec 21 09:19:53 2020 +0000
10230 upstream: properly fix ProxyJump parsing; Thanks to tb@ for
10232 pointing out my error (parse_ssh_uri() can return -1/0/1, that I missed).
10233 Reported by Raf Czlonka via bugs@
10237 OpenBSD-Commit-ID: a2991a3794bcaf1ca2b025212cce11cdb5f6b7d6
10239 commit d97fb879724f1670bf55d9adfea7278a93c33ae2
10240 Author: djm@openbsd.org <djm@openbsd.org>
10241 Date: Mon Dec 21 01:31:06 2020 +0000
10243 upstream: adapt to API change in hostkeys_foreach()/load_hostkeys()
10245 OpenBSD-Regress-ID: dcb468514f32da49a446372453497dc6eeafdbf3
10247 commit bf7eb3c266b7fd4ddda108fcf72b860af2af6406
10248 Author: djm@openbsd.org <djm@openbsd.org>
10249 Date: Fri Oct 16 14:02:24 2020 +0000
10251 upstream: few more things needs match.c and addrmatch.c now that
10253 log.c calls match_pattern_list()
10255 OpenBSD-Regress-ID: f7c95c76b150d0aeb00a67858b9579b7d1b2db74
10257 commit 2c64f24e27a5e72a7f59e515fc4f4985355237ae
10258 Author: Darren Tucker <dtucker@dtucker.net>
10259 Date: Mon Dec 21 14:02:56 2020 +1100
10261 Pull in missing rev 1.2.
10263 commit 0f504f592d15d8047e466eb7453067a6880992a8
10264 Author: djm@openbsd.org <djm@openbsd.org>
10265 Date: Sun Dec 20 23:40:19 2020 +0000
10267 upstream: plumb ssh_conn_info through to sshconnect.c; feedback/ok
10271 OpenBSD-Commit-ID: e8d14a09cda3f1dc55df08f8a4889beff74e68b0
10273 commit 729b05f59ded35483acef90a6f88aa03eae33b29
10274 Author: djm@openbsd.org <djm@openbsd.org>
10275 Date: Sun Dec 20 23:38:00 2020 +0000
10277 upstream: allow UserKnownHostsFile=none; feedback and ok markus@
10279 OpenBSD-Commit-ID: c46d515eac94a35a1d50d5fd71c4b1ca53334b48
10281 commit b4c7cd1185c5dc0593d47eafcc1a34fda569dd1d
10282 Author: djm@openbsd.org <djm@openbsd.org>
10283 Date: Sun Dec 20 23:36:51 2020 +0000
10285 upstream: load_hostkeys()/hostkeys_foreach() variants for FILE*
10287 Add load_hostkeys_file() and hostkeys_foreach_file() that accept a
10288 FILE* argument instead of opening the file directly.
10290 Original load_hostkeys() and hostkeys_foreach() are implemented using
10291 these new interfaces.
10293 Add a u_int note field to the hostkey_entry and hostkey_foreach_line
10294 structs that is passed directly from the load_hostkeys() and
10295 hostkeys_foreach() call. This is a lightweight way to annotate results
10296 between different invocations of load_hostkeys().
10300 OpenBSD-Commit-ID: 6ff6db13ec9ee4edfa658b2c38baad0f505d8c20
10302 commit 06fbb386bed666581095cb9cbc7a900e02bfe1b7
10303 Author: tobhe@openbsd.org <tobhe@openbsd.org>
10304 Date: Sat Dec 19 22:09:21 2020 +0000
10306 upstream: Print client kem key with correct length.
10310 OpenBSD-Commit-ID: 91689e14a4fc6c270e265a32d1c8faba63a45755
10312 commit 0ebead6593e2441e4af2735bbe2cd097607cd0d3
10313 Author: djm@openbsd.org <djm@openbsd.org>
10314 Date: Thu Dec 17 23:28:50 2020 +0000
10316 upstream: fix possible error("%s", NULL) on error paths
10318 OpenBSD-Commit-ID: 0b3833c2cb985453ecca1d76803ebb8f3b736a11
10320 commit d060bc7f6e6244f001e658208f53e3e2ecbbd382
10321 Author: djm@openbsd.org <djm@openbsd.org>
10322 Date: Thu Dec 17 23:26:11 2020 +0000
10324 upstream: refactor client percent_expand() argument passing;
10326 consolidate the common arguments into a single struct and pass that around
10327 instead of using a bunch of globals. ok markus@
10329 OpenBSD-Commit-ID: 035e6d7ca9145ad504f6af5a021943f1958cd19b
10331 commit 43026da035cd266db37df1f723d5575056150744
10332 Author: djm@openbsd.org <djm@openbsd.org>
10333 Date: Thu Dec 17 23:10:27 2020 +0000
10335 upstream: prepare readconf.c for fuzzing; remove fatal calls and
10337 fix some (one-off) memory leaks; ok markus@
10339 OpenBSD-Commit-ID: 91c6aec57b0e7aae9190de188e9fe8933aad5ec5
10341 commit bef92346c4a808f33216e54d6f4948f9df2ad7c1
10342 Author: djm@openbsd.org <djm@openbsd.org>
10343 Date: Mon Dec 14 03:13:12 2020 +0000
10345 upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path
10347 OpenBSD-Commit-ID: 5c1048468813107baa872f5ee33ba51623630e01
10349 commit a5ab499bd2644b4026596fc2cb24a744fa310666
10350 Author: Damien Miller <djm@mindrot.org>
10351 Date: Fri Dec 4 14:01:27 2020 +1100
10353 basic KEX fuzzer; adapted from Markus' unittest
10355 commit 021ff33e383c77b11badd60cec5b141a3e3fa532
10356 Author: Damien Miller <djm@mindrot.org>
10357 Date: Fri Dec 4 13:57:43 2020 +1100
10359 use options that work with recent clang
10361 commit e4d1a0b40add800b6e9352b40c2223e44acc3a45
10362 Author: djm@openbsd.org <djm@openbsd.org>
10363 Date: Fri Dec 4 02:41:10 2020 +0000
10365 upstream: shuffle a few utility functions into sftp-client.c; from
10369 OpenBSD-Commit-ID: fdeb1aae1f6149b193f12cd2af158f948c514a2a
10371 commit ace12dc64f8e3a2496ca48d36b53cb3c0a090755
10372 Author: djm@openbsd.org <djm@openbsd.org>
10373 Date: Fri Dec 4 02:29:56 2020 +0000
10375 upstream: make ssh_free(NULL) a no-op
10377 OpenBSD-Commit-ID: 42cb285d94789cefe6608db89c63040ab0a80fa0
10379 commit 3b98b6e27f8a122dbfda9966b1afeb3e371cce91
10380 Author: djm@openbsd.org <djm@openbsd.org>
10381 Date: Fri Dec 4 02:29:25 2020 +0000
10383 upstream: memleak of DH public bignum; found with libfuzzer
10385 OpenBSD-Commit-ID: 0e913b542c3764b100b1571fdb0d0e5cc086fe97
10387 commit 553b90feedd7da5b90901d73005f86705456d686
10388 Author: djm@openbsd.org <djm@openbsd.org>
10389 Date: Fri Dec 4 02:27:57 2020 +0000
10391 upstream: fix minor memleak of kex->hostkey_alg on rekex
10393 OpenBSD-Commit-ID: 2c3969c74966d4ccdfeff5e5f0df0791919aef50
10395 commit ac0364b85e66eb53da2f9618f699ba6bd195ceea
10396 Author: djm@openbsd.org <djm@openbsd.org>
10397 Date: Fri Dec 4 02:27:08 2020 +0000
10399 upstream: typos: s/hex/kex/ in error messages
10401 OpenBSD-Commit-ID: 43a026c9571dd779ec148de1829cf5a6b6651905
10403 commit ee22db7c5885a1d90219202c0695bc621aa0409b
10404 Author: djm@openbsd.org <djm@openbsd.org>
10405 Date: Fri Dec 4 02:25:13 2020 +0000
10407 upstream: make program name be const
10409 OpenBSD-Commit-ID: ece25680ec637fdf20502721ccb0276691df5384
10411 commit 2bcbf679de838bb77a8bd7fa18e100df471a679c
10412 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10413 Date: Mon Nov 30 05:36:39 2020 +0000
10415 upstream: Ignore comments at the end of config lines in ssh_config,
10417 similar to what we already do for sshd_config. bz#2320, with & ok djm@
10419 OpenBSD-Commit-ID: bdbf9fc5bc72b1a14266f5f61723ed57307a6db4
10421 commit b755264e7d3cdf1de34e18df1af4efaa76a3c015
10422 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10423 Date: Sat Nov 28 12:52:32 2020 +0000
10425 upstream: Include cipher.h for declaration of cipher_by_name.
10427 OpenBSD-Commit-ID: ddfebbca03ca0e14e00bbad9d35f94b99655d032
10429 commit 022def7bd16c3426a95e25f57cb259d54468341c
10430 Author: djm@openbsd.org <djm@openbsd.org>
10431 Date: Sat Nov 28 03:27:59 2020 +0000
10433 upstream: check result of strchr() against NULL rather than
10435 searched-for characters; from zhongjubin@huawei.com
10437 OpenBSD-Commit-ID: e6f57de1d4a4d25f8db2d44e8d58d847e247a4fe
10439 commit 57bf03f0217554afb8980f6697a7a0b88658d0a9
10440 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10441 Date: Fri Nov 27 10:12:30 2020 +0000
10443 upstream: Document ssh-keygen -Z, sanity check its argument earlier and
10445 provide a better error message if it's not correct. Prompted by bz#2879, ok
10448 OpenBSD-Commit-ID: 484178a173e92230fb1803fb4f206d61f7b58005
10450 commit 33313ebc1c7135085676db62189e3520341d6b73
10451 Author: djm@openbsd.org <djm@openbsd.org>
10452 Date: Fri Nov 27 00:49:58 2020 +0000
10454 upstream: Set the specified TOS/DSCP for interactive use prior to
10456 TCP connect. The connection phase of the SSH session is time-sensitive (due
10457 to server side login grace periods) and is frequently interactive (e.g.
10458 entering passwords). The ultimate interactive/bulk TOS/DSCP will be set after
10459 authentication completes.
10463 OpenBSD-Commit-ID: f31ab10d9233363a6d2c9996007083ba43a093f1
10465 commit b2bcec13f17ce9174238a704e91d52203e916432
10466 Author: djm@openbsd.org <djm@openbsd.org>
10467 Date: Fri Nov 27 00:37:10 2020 +0000
10469 upstream: clean up passing of struct passwd from monitor to preauth
10471 privsep process. No longer copy entire struct w/ pointer addresses, but pass
10472 remaining scalar fields explicitly,
10474 Prompted by Yuichiro NAITO, feedback Thorsten Glaser; ok dtucker@
10476 OpenBSD-Commit-ID: 9925df75a56732c43f3663e70dd15ff413ab3e53
10478 commit 19af04e2231155d513e24fdc81fbec2217ae36a6
10479 Author: djm@openbsd.org <djm@openbsd.org>
10480 Date: Sun Nov 22 22:38:26 2020 +0000
10482 upstream: when loading PKCS#11 keys, include the key fingerprints
10484 and provider/slot information in debug output.
10486 OpenBSD-Commit-ID: 969a089575d0166a9a364a9901bb6a8d9b8a1431
10488 commit 9b9465ea856e15b9e9890b4ecb4110d7106e7766
10489 Author: djm@openbsd.org <djm@openbsd.org>
10490 Date: Sun Nov 22 22:37:11 2020 +0000
10492 upstream: when mentioning that the host key has changed, don't
10494 report the type because it is ambiguous as to whether it referred to the
10495 known or new host key. bz3216; ok dtucker@
10497 OpenBSD-Commit-ID: 2d5ce4a83dbcf44e340a572e361decad8aab7bad
10499 commit 637017a7dd3281d3f2df804993cc27c30dbfda47
10500 Author: Darren Tucker <dtucker@dtucker.net>
10501 Date: Wed Nov 25 17:38:46 2020 +1100
10503 Use "=" not "==" in string test.
10505 POSIX says "=" is string comparison and some shells (eg HP-UX) will
10506 complain about "==".
10508 commit 9880f3480f9768897f3b8e714d5317fb993bc5b3
10509 Author: Darren Tucker <dtucker@dtucker.net>
10510 Date: Fri Nov 20 17:16:51 2020 +1100
10512 Restore correct flags during localtime_r check.
10514 We were restoring the wrong thing CPPFLAGS (we used CFLAGS) for any
10515 platform that doesn't have localtime_r.
10517 commit 41935882f4e82de60dbd6e033eabe79e1b963518
10518 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10519 Date: Fri Nov 20 03:16:56 2020 +0000
10521 upstream: When doing an sftp recursive upload or download of a
10523 read-only directory, ensure that the directory is created with write and
10524 execute permissions in the interim so that we can actually complete the
10525 transfer, then set the directory permission as the final step. (The execute
10526 bit is only likely to be an issue with a non-POSIX server). bz#3222, ok djm@
10528 OpenBSD-Commit-ID: a82606212f2796e31f0e1af94a63355a7ad5d903
10530 commit 0f90440ca70abab947acbd77795e9f130967956c
10531 Author: Darren Tucker <dtucker@dtucker.net>
10532 Date: Fri Nov 20 13:37:54 2020 +1100
10534 Add new pselect6_time64 syscall on ARM.
10536 This is apparently needed on armhfp/armv7hl. bz#3232, patch from
10537 jjelen at redhat.com.
10539 commit 3a7c46c72b6a1f643b1fc3589cd20d8320c3d9e1
10540 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10541 Date: Fri Nov 20 02:14:16 2020 +0000
10543 upstream: Explicitly initialize all members of the
10545 find_by_key_ctx struct. Initializing a single member should be enough
10546 (the spec says the remainder should be initialized as per the static
10547 rules) but some GCCs warn on this which prevents us testing with -Werror
10548 on those. ok deraadt@ djm@
10550 OpenBSD-Commit-ID: 687126e60a27d30f02614760ef3c3ae4e8d6af28
10552 commit 076cb616b87d1ea1d292973fcd0ba38c08ea6832
10553 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10554 Date: Thu Nov 19 23:05:05 2020 +0000
10556 upstream: draft-ietf-secsh-architecture is now RFC4251.
10558 OpenBSD-Commit-ID: cb0bb58c2711fb5ed519507659be1dcf179ed403
10560 commit 85cceda21f1471548e04111aefe2c4943131c1c8
10561 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10562 Date: Tue Nov 17 11:23:58 2020 +0000
10564 upstream: Specify that the KDF function is bcrypt. Based on github
10566 PR#214 from rafork, ok markus@, mdoc correction jmc@
10568 OpenBSD-Commit-ID: d8f2853e7edbcd483f31b50da77ab80ffa18b4ef
10570 commit 5b9720f9adbd70ba5a994f407fe07a7d016d8d65
10571 Author: djm@openbsd.org <djm@openbsd.org>
10572 Date: Sun Nov 15 22:34:58 2020 +0000
10574 upstream: revert r1.341; it breaks ProxyJump; reported by sthen@
10576 OpenBSD-Commit-ID: 6ac2f945b26cb86d936eed338f77861d6da8356a
10578 commit 04088725ec9c44880c01799b588cd4ba47b3e8bc
10579 Author: djm@openbsd.org <djm@openbsd.org>
10580 Date: Fri Nov 13 07:30:44 2020 +0000
10582 upstream: scrub keyboard-interactive authentication prompts coming
10584 from the server through asmprintf() prior to display; suggested by and ok
10587 OpenBSD-Commit-ID: 31fe93367645c37fbfe4691596bf6cf1e3972a58
10589 commit 5442b491d0ee4bb82f6341ad0ee620ef3947f8c5
10590 Author: djm@openbsd.org <djm@openbsd.org>
10591 Date: Fri Nov 13 04:53:12 2020 +0000
10593 upstream: prefix keyboard interactive prompts with (user@host) to
10595 make it easier to determine which connection they are associated with in
10596 cases like scp -3, ProxyJump, etc. bz#3224 ok dtucker
10598 OpenBSD-Commit-ID: 67e6189b04b46c867662f8a6759cf3ecb5f59170
10600 commit 2992e4e7014ac1047062acfdbbf6feb156fef616
10601 Author: Darren Tucker <dtucker@dtucker.net>
10602 Date: Fri Nov 13 17:56:11 2020 +1100
10604 Remove use of TIME_WITH_SYS_TIME.
10606 It was only set by the recently removed AC_HEADER_TIME macro, replace
10607 with simple inclusions of both sys/time.h and time.h. Should prevent
10608 mis-detection of struct timespec.
10610 commit e3f27006f15abacb7e89fda3f5e9a0bd420b7e38
10611 Author: Damien Miller <djm@mindrot.org>
10612 Date: Fri Nov 13 14:20:43 2020 +1100
10614 Revert "detect Linux/X32 systems"
10616 This reverts commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885.
10618 The approach used was incorrect; discussion in bz#3085
10620 commit e51dc7fab61df36e43f3bc64b673f88d388cab91
10621 Author: Damien Miller <djm@mindrot.org>
10622 Date: Fri Nov 13 13:22:15 2020 +1100
10624 SELinux has deprecated security_context_t
10626 (it was only ever a char* anyway)
10628 commit b79add37d118276d67f3899987b9f0629c9449c3
10629 Author: Darren Tucker <dtucker@dtucker.net>
10630 Date: Fri Nov 13 13:43:30 2020 +1100
10632 Remove obsolete AC_HEADER_TIME macro.
10634 AC_HEADER_TIME is marked as obsolete in autoconf-2.70 and as far as I
10635 can tell everything we have that might be old enough to need it doesn't.
10637 commit d5d05cdb3d4efd4a618aa52caab5bec73097c163
10638 Author: djm@openbsd.org <djm@openbsd.org>
10639 Date: Thu Nov 12 22:56:00 2020 +0000
10641 upstream: when prompting the user to accept a new hostkey, display
10643 any other host names/addresses already associated with the key. E.g.
10645 > The authenticity of host 'test (10.0.0.1)' can't be established.
10646 > ECDSA key fingerprint is SHA256:milU4MODXm8iJQI18wlsbPG7Yup+34fuNNmV08qDnax.
10647 > This host key is known by the following other names/addresses:
10648 > ~/.ssh/known_hosts:1: host.example.org,10.0.0.1
10649 > ~/.ssh/known_hosts:2: [hashed name]
10650 > ~/.ssh/known_hosts:3: [hashed name]
10651 > ~/.ssh/known_hosts:4: host
10652 > ~/.ssh/known_hosts:5: [host]:2222
10653 > Are you sure you want to continue connecting (yes/no/[fingerprint])?
10655 feedback and ok markus@
10657 OpenBSD-Commit-ID: f6f58a77b49f1368b5883b3a1f776447cfcc7ef4
10659 commit 819b44e8b9af6ce18d3ec7505b9f461bf7991a1f
10660 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10661 Date: Thu Nov 12 22:38:57 2020 +0000
10663 upstream: Prevent integer overflow when ridiculously large
10665 ConnectTimeout is specified, capping the effective value (for most platforms)
10666 at 24 days. bz#3229, ok djm@
10668 OpenBSD-Commit-ID: 62d4c4b7b87d111045f8e9f28b5b532d17ac5bc0
10670 commit add926dd1bbe3c4db06e27cab8ab0f9a3d00a0c2
10671 Author: djm@openbsd.org <djm@openbsd.org>
10672 Date: Wed Nov 11 05:22:32 2020 +0000
10674 upstream: fix logic error that broke URI parsing in ProxyJump
10676 directives; ok dtucker@
10678 OpenBSD-Commit-ID: 96d48839b1704882a0e9a77898f5e14b2d222705
10680 commit 4340dd43928dfe746cb7e75fe920b63c0d909a9a
10681 Author: claudio@openbsd.org <claudio@openbsd.org>
10682 Date: Tue Nov 10 07:46:20 2020 +0000
10684 upstream: Free the previously allocated msg buffer after writing it
10688 OpenBSD-Commit-ID: 18c055870fc75e4cb9f926c86c7543e2e21d7fa4
10690 commit fcf429a4c69d30d8725612a55b37181594da8ddf
10691 Author: Darren Tucker <dtucker@dtucker.net>
10692 Date: Wed Nov 11 12:30:46 2020 +1100
10694 Prevent excessively long username going to PAM.
10696 This is a mitigation for a buffer overflow in Solaris' PAM username
10697 handling (CVE-2020-14871), and is only enabled for Sun-derived PAM
10698 implementations. This is not a problem in sshd itself, it only
10699 prevents sshd from being used as a vector to attack Solaris' PAM.
10700 It does not prevent the bug in PAM from being exploited via some other
10703 Based on github PR#212 from Mike Scott but implemented slightly
10704 differently. ok tim@ djm@
10706 commit 10dce8ff68ef615362cfcab0c0cc33ce524e7682
10707 Author: djm@openbsd.org <djm@openbsd.org>
10708 Date: Sun Nov 8 23:19:03 2020 +0000
10710 upstream: unbreak; missing NULL check
10712 OpenBSD-Commit-ID: 6613dfab488123f454d348ef496824476b8c11c0
10714 commit d5a0cd4fc430c8eda213a4010a612d4778867cd9
10715 Author: djm@openbsd.org <djm@openbsd.org>
10716 Date: Sun Nov 8 22:37:24 2020 +0000
10718 upstream: when requesting a security key touch on stderr, inform the
10720 user once the touch has been recorded; requested by claudio@ ok markus@
10722 OpenBSD-Commit-ID: 3b76ee444490e546b9ea7f879e4092ee0d256233
10724 commit 292bcb2479deb27204e3ff796539c003975a5f7a
10725 Author: Darren Tucker <dtucker@dtucker.net>
10726 Date: Mon Nov 9 00:33:35 2020 +1100
10728 Remove preprocessor directive from log macro calls.
10730 Preprocessor directives inside macro calls, such as the new log macros,
10731 are undefined behaviour and do not work with, eg old GCCs. Put the
10732 entire log call inside the ifdef for OPENSSL_HAS_NISTP521.
10734 commit 71693251b7cbb7dd89aaac18815147124732d0d3
10735 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10736 Date: Sun Nov 8 12:10:20 2020 +0000
10738 upstream: Add a comment documenting the source of the moduli group
10742 OpenBSD-Commit-ID: aec0725ce607630caaa62682624c6763b350391c
10744 commit 4d94b031ff88b015f0db57e140f481bff7ae1a91
10745 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10746 Date: Sun Nov 8 11:46:12 2020 +0000
10748 upstream: Replace WITH_OPENSSL ifdefs in log calls with a macro.
10750 The log calls are themselves now macros, and preprocessor directives inside
10751 macro arguments are undefined behaviour which some compilers (eg old GCCs)
10752 choke on. It also makes the code tidier. ok deraadt@
10754 OpenBSD-Commit-ID: cc12a9029833d222043aecd252d654965c351a69
10756 commit 6d2564b94e51184eb0b73b97d13a36ad50b4f810
10757 Author: Darren Tucker <dtucker@dtucker.net>
10758 Date: Fri Nov 6 17:11:16 2020 +1100
10760 Fix function body for variadic macro test.
10762 AC_LANG_PROGRAM puts its second argument inside main() so we don't need
10763 to do it ourselves.
10765 commit 586f9bd2f5980e12f8cf0d3c2a761fa63175da52
10766 Author: Darren Tucker <dtucker@dtucker.net>
10767 Date: Fri Nov 6 16:53:24 2020 +1100
10769 Remove AC_PROC_CC_C99 obsoleted in autoconf 2.70.
10771 Since we only use it to make sure we can handle variadic macros,
10772 explicitly check only for that. with & ok djm@
10774 commit a019e353df04de1b2ca78d91b39c393256044ad7
10775 Author: Darren Tucker <dtucker@dtucker.net>
10776 Date: Fri Nov 6 13:56:41 2020 +1100
10778 Replace AC_TRY_COMPILE obsoleted in autoconf 2.70.
10780 Replace with the equivalent AC_COMPILE_IFELSE.
10782 commit 771b7795c0ef6a2fb43b4c6c66b615c2085cb9cd
10783 Author: Darren Tucker <dtucker@dtucker.net>
10784 Date: Fri Nov 6 13:55:33 2020 +1100
10786 Move AC_PROG_CC_C99 to immediately afer AC_PROG_CC.
10788 This puts the related C version selection output in the same place.
10790 commit e5591161f21ab493c6284a85ac3c0710ad94998f
10791 Author: Darren Tucker <dtucker@dtucker.net>
10792 Date: Fri Nov 6 13:54:17 2020 +1100
10794 AC_CHECK_HEADER() is obsoleted in autoconf 2.70.
10796 Replace with the non-obsoleted AC_CHECK_HEADERS().
10798 commit 05bcd0cadf160fd4826a2284afa7cba6ec432633
10799 Author: djm@openbsd.org <djm@openbsd.org>
10800 Date: Tue Nov 3 22:53:12 2020 +0000
10802 upstream: fold consecutive '*' wildcards to mitigate combinatorial
10804 explosion of recursive searches; ok dtucker
10806 OpenBSD-Commit-ID: d18bcb39c40fb8a1ab61153db987e7d11dd3792b
10808 commit 7d680448db5858dc76307663f78d0b8d3c2b4a3d
10809 Author: djm@openbsd.org <djm@openbsd.org>
10810 Date: Fri Oct 30 01:50:07 2020 +0000
10812 upstream: print reason in fatal error message when
10814 kex_assemble_namelist() fails
10816 OpenBSD-Commit-ID: a9975ee8db6c98d6f32233d88051b2077ca63dab
10818 commit 95d1109fec7e89ad21f2a97e92bde1305d32a353
10819 Author: djm@openbsd.org <djm@openbsd.org>
10820 Date: Thu Oct 29 03:13:06 2020 +0000
10822 upstream: fix sshd_config SetEnv directive inside Match blocks; part of
10824 github PR#201 from github user manuelm
10826 OpenBSD-Commit-ID: 9772e3748abff3ad65ae8fc43d026ed569b1d2bc
10828 commit b12b835dc022ba161afe68348e05a83dfbcb1515
10829 Author: djm@openbsd.org <djm@openbsd.org>
10830 Date: Thu Oct 29 03:01:18 2020 +0000
10832 upstream: fix type of nid in type_bits_valid(); github PR#202 from
10834 github user thingsconnected
10836 OpenBSD-Commit-ID: 769d2b040dec7ab32d323daf54b854dd5dcb5485
10838 commit 1a14c13147618144d1798c36a588397ba9008fcc
10839 Author: djm@openbsd.org <djm@openbsd.org>
10840 Date: Thu Oct 29 02:52:43 2020 +0000
10842 upstream: whitespace; no code change
10844 OpenBSD-Commit-ID: efefc1c47e880887bdee8cd2127ca93177eaad79
10846 commit 815209abfdd2991fb92ad7d2e33374916cdcbcf4
10847 Author: djm@openbsd.org <djm@openbsd.org>
10848 Date: Thu Oct 29 02:47:23 2020 +0000
10850 upstream: UpdateHostkeys: fixed/better detection of host keys that
10852 exist under other names and addresses; spotted by and debugged with lots of
10855 OpenBSD-Commit-ID: 5113d7f550bbd48243db1705afbf16b63792d4b7
10857 commit a575cf44e59a65506c67bddb62a712208a7a279c
10858 Author: Duncan Eastoe <duncan.eastoe@att.com>
10859 Date: Wed Oct 21 10:11:10 2020 +0100
10861 session.c: use "denylist" terminology
10863 Follow upstream (6d755706a0059eb9e2d63517f288b75cbc3b4701) language
10864 improvements in this portable-specific code.
10866 commit 33267feaffd5d98aa56d2f0b3a99ec352effe938
10867 Author: Damien Miller <djm@mindrot.org>
10868 Date: Tue Oct 27 16:46:31 2020 +1100
10870 Remove checks for strict POSIX mkdtemp()
10872 We needed a mkdtemp() that accepted template paths that did not
10873 end in XXXXXX a long time ago for KRB4, but that code is long
10874 deprecated. We no longer need to replace mkdtemp() for strictly
10875 following POSIX. ok dtucker@
10877 commit 492d70e18bad5a8c97d05f5eddac817171e88d2c
10878 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10879 Date: Mon Oct 26 00:39:04 2020 +0000
10881 upstream: Minor man page fixes (capitalization, commas) identified by
10883 the manpage-l10n project via bz#3223. feedback deraadt@, ok jmc@
10885 OpenBSD-Commit-ID: ab83af0daf18369244a72daaec6c4a58a9eb7e2c
10887 commit eab2888cfc6cc4e2ef24bd017da9835a0f365f3f
10888 Author: dtucker@openbsd.org <dtucker@openbsd.org>
10889 Date: Mon Oct 19 22:49:23 2020 +0000
10891 upstream: Adapt XMSS to new logging infrastructure. With markus@, ok
10895 OpenBSD-Commit-ID: 9c35ec3aa0f710e4e3325187ceff4fa3791686de
10897 commit f7bd11e4941620991f3e727cd0131b01f0311a58
10898 Author: djm@openbsd.org <djm@openbsd.org>
10899 Date: Mon Oct 19 08:07:08 2020 +0000
10901 upstream: fix SEGV on fatal() errors spotted by dtucker@
10903 OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2
10905 commit 7715a3b171049afa1feffb1d5a1245dfac36ce99
10906 Author: Darren Tucker <dtucker@dtucker.net>
10907 Date: Mon Oct 19 10:54:41 2020 +1100
10909 Use fatal_fr not fatal_r when passing r.
10911 Caught by the PAM -Werror tinderbox build.
10913 commit 816036f142ecd284c12bb3685ae316a68d2ef190
10914 Author: djm@openbsd.org <djm@openbsd.org>
10915 Date: Sun Oct 18 11:32:01 2020 +0000
10917 upstream: use the new variant log macros instead of prepending
10919 __func__ and appending ssh_err(r) manually; ok markus@
10921 OpenBSD-Commit-ID: 1f14b80bcfa85414b2a1a6ff714fb5362687ace8
10923 commit 9e2c4f64224f68fb84c49b5182e449f94b0dc985
10924 Author: djm@openbsd.org <djm@openbsd.org>
10925 Date: Sun Oct 18 11:21:59 2020 +0000
10927 upstream: variants of the log methods that append a ssherr.h string
10929 from a supplied error code; ok markus@
10931 OpenBSD-Commit-ID: aed98c4435d48d036ae6740300f6a8357b7cc0bf
10933 commit 28cb0a4b03940d1ee576eb767a81a4113bdc917e
10934 Author: djm@openbsd.org <djm@openbsd.org>
10935 Date: Sun Oct 18 11:14:27 2020 +0000
10937 upstream: remove a level of macro indirection; ok markus@
10939 OpenBSD-Commit-ID: 0c529d06e902c5d1a6b231e1bec6157f76dc67c9
10941 commit 9cac1db52e6c4961c447910fe02cd68a3b2f9460
10942 Author: djm@openbsd.org <djm@openbsd.org>
10943 Date: Sun Oct 18 11:13:45 2020 +0000
10945 upstream: add some variant log.h calls that prepend the calling
10947 function name; ok markus@
10949 OpenBSD-Commit-ID: 4be1b2e2455b271ddb7457bc195c5367644f4e48
10951 commit d55dfed34ef6ef1f028d552a90d5f3dba8dd6f7b
10952 Author: Damien Miller <djm@mindrot.org>
10953 Date: Sat Oct 17 22:55:24 2020 +1100
10957 commit 999d7cb79a3a73d92a6dfbf174c33da0d984c7a2
10958 Author: Damien Miller <djm@mindrot.org>
10959 Date: Sat Oct 17 22:47:52 2020 +1100
10961 sync regress/misc/sk-dummy/fatal.c
10963 commit 3554b4afa38b3483a3302f1be18eaa6f843bb260
10964 Author: djm@openbsd.org <djm@openbsd.org>
10965 Date: Sat Oct 17 01:28:20 2020 +0000
10967 upstream: make the log functions that exit (sshlogdie(),
10969 sshfatal(), etc) have identical signatures. Makes things a bit more
10972 OpenBSD-Commit-ID: bd0ae124733389d7c0042e135c71ee9091362eb9
10974 commit 616029a85ad7529b24bb8c4631d9607c0d6e7afe
10975 Author: jmc@openbsd.org <jmc@openbsd.org>
10976 Date: Fri Oct 16 14:34:33 2020 +0000
10978 upstream: add space between macro arg and punctuation;
10980 OpenBSD-Commit-ID: bb81e2ed5a77832fe62ab30a915ae67cda57633e
10982 commit f812a36cee5727147bc897d34ab9af068dd4561e
10983 Author: Damien Miller <djm@mindrot.org>
10984 Date: Sat Oct 17 12:03:34 2020 +1100
10986 check for and require a C99 capable compiler
10988 recent logging changes use __VA_ARGS__.
10990 commit f9ea6515202b59a1e2d5b885cafc1b12eff33016
10991 Author: Damien Miller <djm@mindrot.org>
10992 Date: Sat Oct 17 11:51:20 2020 +1100
10994 logging is now macros, remove function pointers
10996 commit 0f938f998626e8359324f803157cd7c9f8f403e2
10997 Author: Damien Miller <djm@mindrot.org>
10998 Date: Sat Oct 17 11:42:26 2020 +1100
11000 adapt sk-dummy's fatal implementation to changes
11002 commit afbd9ec9e2dbad04834ce7ce53e58740434f32a5
11003 Author: Damien Miller <djm@mindrot.org>
11004 Date: Sat Oct 17 11:33:13 2020 +1100
11006 fix netcat build problem
11008 commit 793b583d097381730adaf6f68bed3c343139a013
11009 Author: djm@openbsd.org <djm@openbsd.org>
11010 Date: Fri Oct 16 13:26:13 2020 +0000
11012 upstream: LogVerbose keyword for ssh and sshd
11014 Allows forcing maximum debug logging by file/function/line pattern-
11019 OpenBSD-Commit-ID: c294c25732d1b4fe7e345cb3e044df00531a6356
11021 commit 752250caabda3dd24635503c4cd689b32a650794
11022 Author: djm@openbsd.org <djm@openbsd.org>
11023 Date: Fri Oct 16 13:24:45 2020 +0000
11025 upstream: revised log infrastructure for OpenSSH
11027 log functions receive function, filename and line number of caller.
11028 We can use this to selectively enable logging via pattern-lists.
11032 OpenBSD-Commit-ID: 51a472610cbe37834ce6ce4a3f0e0b1ccc95a349
11034 commit acadbb3402b70f72f14d9a6930ad41be97c2f9dc
11035 Author: djm@openbsd.org <djm@openbsd.org>
11036 Date: Fri Oct 16 02:37:12 2020 +0000
11038 upstream: use do_log2 instead of function pointers to different log
11042 OpenBSD-Commit-ID: 88077b826d348c58352a6b394755520f4e484480
11044 commit 95b0bcfd1531d59e056ae8af27bb741391f26ab0
11045 Author: djm@openbsd.org <djm@openbsd.org>
11046 Date: Wed Oct 14 00:55:17 2020 +0000
11048 upstream: make UpdateHostkeys still more conservative: refuse to
11050 proceed if one of the keys offered by the server is already in known_hosts
11051 under another name. This avoid collisions between address entries for
11052 different host aliases when CheckHostIP=yes
11054 Also, do not attempt to fix known_hosts with incomplete host/ip matches
11055 when there are no new or deprecated hostkeys.
11057 OpenBSD-Commit-ID: 95c19842f7c41f9bd9c92aa6441a278c0fd0c4a3
11059 commit a336ce8c2c55547cc00e0070a18c55f30bb53fb6
11060 Author: kn@openbsd.org <kn@openbsd.org>
11061 Date: Mon Oct 12 08:36:36 2020 +0000
11063 upstream: Zap unused family parameter from ssh_connect_direct()
11065 sshconnect.c r1.241 from 2013 made it unused; found while reading code.
11069 OpenBSD-Commit-ID: 219ba6d7f9925d0b7992918612680399d86712b5
11071 commit e545d94b713effab8e6c7dfabbfb76c1d84d7498
11072 Author: Philip Hands <phil@hands.com>
11073 Date: Sun Oct 4 00:15:46 2020 +0200
11075 shift contents of long $() into filter_ids()
11077 This was prompted by the fact that posh does not deal with $()
11078 that contains comments where the comment includes an odd number
11079 of single-quotes. It seems to get befuddled into trying to find
11080 the matching quote.
11081 Regardless, making a function for filtering the unneeded ids
11082 seems much neater than avoiding apostrophes,
11083 so that's what I've done.
11085 SSH-Copy-ID-Upstream: 3dab3366a584427045c8a690a93282f02c09cf24
11087 commit fd360174596047b52aa1cddda74d85012a03ca4b
11088 Author: Philip Hands <phil@hands.com>
11089 Date: Sat Oct 3 23:15:16 2020 +0200
11091 combine if/elif to avoid duplication of the action
11093 SSH-Copy-ID-Upstream: 42aeb1cc53d3f7f6e78edc210fb121fda0834914
11095 commit f7c3a39b016dd77709ecbf18da8282f967b86cd7
11096 Author: Philip Hands <phil@hands.com>
11097 Date: Sat Oct 3 21:45:16 2020 +0200
11101 SSH-Copy-ID-Upstream: 5b08f840e78ac544288b3983010a1b0585e966fd
11103 commit 108676c3f26be6c873db0dd8754063699908727b
11104 Author: Philip Hands <phil@hands.com>
11105 Date: Sat Oct 3 21:10:03 2020 +0200
11107 tidy up test of $SCRATCH_DIR creation
11109 SSH-Copy-ID-Upstream: 2d8b22d96c105d87743ffe8874887b06f8989b93
11111 commit a9c9e91a82bc1a2cf801b4e3ef27a941dbd27717
11112 Author: Philip Hands <phil@hands.com>
11113 Date: Wed Sep 16 16:13:30 2020 +0200
11115 add -s flag: to install keys via SFTP
11117 This is prompted by:
11119 https://bugzilla.mindrot.org/show_bug.cgi?id=3201
11121 Thanks go to Matthias Blümel for the idea, and the helpful patch, from
11122 which this patch grew.
11124 SSH-Copy-ID-Upstream: f7c76dc64427cd20287a6868f672423b62057614
11126 commit f92424970c02b78852ff149378c7f2616ada4ccf
11127 Author: djm@openbsd.org <djm@openbsd.org>
11128 Date: Sun Oct 11 22:14:38 2020 +0000
11130 upstream: UpdateHostkeys: check for keys under other names
11132 Stop UpdateHostkeys from automatically removing deprecated keys from
11133 known_hosts files if the same keys exist under a different name or
11134 address to the host that is being connected to.
11136 This avoids UpdateHostkeys from making known_hosts inconsistent in
11137 some cases. For example, multiple host aliases sharing address-based
11138 known_hosts on different lines, or hosts that resolves to multiple
11143 OpenBSD-Commit-ID: 6444a705ba504c3c8ccddccd8d1b94aa33bd11c1
11145 commit d98f14b5328922ae3085e07007d820c4f655b57a
11146 Author: djm@openbsd.org <djm@openbsd.org>
11147 Date: Sun Oct 11 22:13:37 2020 +0000
11149 upstream: UpdateHostkeys: better CheckHostIP handling
11151 When preparing to update the known_hosts file, fully check both
11152 entries for both the host and the address (if CheckHostIP enabled)
11153 and ensure that, at the end of the operation, entries for both are
11156 Make sure this works with HashKnownHosts too, which requires maintaining
11157 a list of entry-types seen across the whole file for each key.
11161 OpenBSD-Commit-ID: 374dc263103f6b343d9671f87dbf81ffd0d6abdd
11163 commit af5941ae9b013aac12585e84c4cf494f3728982f
11164 Author: djm@openbsd.org <djm@openbsd.org>
11165 Date: Sun Oct 11 22:12:44 2020 +0000
11167 upstream: UpdateHostkeys: better detect manual host entries
11169 Disable UpdateHostkeys if the known_hosts line has more than two
11170 entries in the pattern-list. ssh(1) only writes "host" or "host,ip"
11171 lines so anything else was added by a different tool or by a human.
11175 OpenBSD-Commit-ID: e434828191fb5f3877d4887c218682825aa59820
11177 commit 6247812c76f70b2245f3c23f5074665b3d436cae
11178 Author: djm@openbsd.org <djm@openbsd.org>
11179 Date: Thu Oct 8 01:15:16 2020 +0000
11181 upstream: don't misdetect comma-separated hostkey names as wildcards;
11185 OpenBSD-Commit-ID: 4b874edfec7fc324a21b130bdb42f912177739ce
11187 commit 67146c7d022a170be3cdad2f5f40259a663fb266
11188 Author: wangxp006 <wangxiaopeng7@huawei.com>
11189 Date: Thu Oct 8 17:49:59 2020 +0800
11191 fix TEST_MALLOC_OPTIONS var
11193 commit 3205eaa3f8883a34fa4559ddef6c90d1067c5cce
11194 Author: djm@openbsd.org <djm@openbsd.org>
11195 Date: Thu Oct 8 00:31:05 2020 +0000
11197 upstream: clarify conditions for UpdateHostkeys
11199 OpenBSD-Commit-ID: 9cba714cf6aeed769f998ccbe8c483077a618e27
11201 commit e8dfca9bfeff05de87160407fb3e6a5717fa3dcb
11202 Author: djm@openbsd.org <djm@openbsd.org>
11203 Date: Wed Oct 7 06:38:16 2020 +0000
11205 upstream: remove GlobalKnownHostsFile for this test after
11207 UpdateHostkeys change
11209 OpenBSD-Regress-ID: a940ad79d59343319613ba8fc46b6ef24aa3f8e1
11211 commit 4aa2717d7517cff4bc423a6cfba3a2defb055aea
11212 Author: djm@openbsd.org <djm@openbsd.org>
11213 Date: Wed Oct 7 02:26:28 2020 +0000
11215 upstream: Disable UpdateHostkeys when hostkey checking fails
11217 If host key checking fails (i.e. a wrong host key is recorded for the
11218 server) and the user elects to continue (via StrictHostKeyChecking=no),
11219 then disable UpdateHostkeys for the session.
11221 reminded by Mark D. Baushke; ok markus@
11223 OpenBSD-Commit-ID: 98b524f121f4252309dd21becd8c4cacb0c6042a
11225 commit 04c06d04475f1f673e9d9743710d194453fe3888
11226 Author: djm@openbsd.org <djm@openbsd.org>
11227 Date: Wed Oct 7 02:25:43 2020 +0000
11229 upstream: Fix UpdateHostkeys/HashKnownHosts/CheckHostIP bug
11231 When all of UpdateHostkeys, HashKnownHosts and ChechHostIP
11232 were enabled and new host keys were learned, known_hosts IP
11233 entries were not being recorded for new host keys.
11235 reported by matthieu@ ok markus@
11237 OpenBSD-Commit-ID: a654a8290bd1c930aac509e8158cf85e42e49cb7
11239 commit b70e33711291f3081702133175a41cccafc0212a
11240 Author: djm@openbsd.org <djm@openbsd.org>
11241 Date: Wed Oct 7 02:24:51 2020 +0000
11243 upstream: don't UpdateHostkeys when the hostkey is verified by the
11245 GlobalKnownHostsFile file, support only UserKnownHostsFile matches
11247 suggested by Mark D. Baushke; feedback and ok markus@
11249 OpenBSD-Commit-ID: eabb771a6add676c398d38a143a1aff5f04abbb9
11251 commit aa623142e426ca1ab9db77b06dcc9b1b70bd102b
11252 Author: djm@openbsd.org <djm@openbsd.org>
11253 Date: Wed Oct 7 02:22:23 2020 +0000
11255 upstream: revert kex->flags cert hostkey downgrade back to a plain
11257 key (commitid VtF8vozGOF8DMKVg). We now do this a simpler way that needs less
11262 OpenBSD-Commit-ID: fb92d25b216bff8c136da818ac2221efaadf18ed
11264 commit f4f14e023cafee1cd9ebe4bb0db4029e6e1fafac
11265 Author: djm@openbsd.org <djm@openbsd.org>
11266 Date: Wed Oct 7 02:20:35 2020 +0000
11268 upstream: simply disable UpdateHostkeys when a certificate
11270 successfully authenticated the host; simpler than the complicated plumbing
11271 via kex->flags we have now.
11275 OpenBSD-Commit-ID: 80e39644eed75717d563a7f177e8117a0e14f42c
11277 commit e79957e877db42c4c68fabcf6ecff2268e53acb5
11278 Author: djm@openbsd.org <djm@openbsd.org>
11279 Date: Wed Oct 7 02:18:45 2020 +0000
11281 upstream: disable UpdateHostkeys by default if VerifyHostKeyDNS is
11283 enabled; suggested by Mark D. Baushke
11285 OpenBSD-Commit-ID: 85a1b88592c81bc85df7ee7787dbbe721a0542bf
11287 commit 3d4c2016bae1a6f14b48c1150a4c79ca4c9968bd
11288 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11289 Date: Tue Oct 6 07:12:04 2020 +0000
11291 upstream: Agent protocol draft is now at rev 4. ok djm@
11293 OpenBSD-Commit-ID: 8c01ea3aae48aab45e01b7421b0fca2dad5e7837
11295 commit af889a40ffc113af9105c03d7b32131eb4372d50
11296 Author: djm@openbsd.org <djm@openbsd.org>
11297 Date: Sun Oct 4 09:45:01 2020 +0000
11299 upstream: when ordering host key algorithms in the client, consider
11301 the ECDSA key subtype; ok markus@
11303 OpenBSD-Commit-ID: 3097686f853c61ff61772ea35f8b699931392ece
11305 commit 2d39fc9f7e039351daa3d6aead1538ac29258add
11306 Author: dtucker@openbsd.org <dtucker@openbsd.org>
11307 Date: Sun Oct 4 03:04:02 2020 +0000
11309 upstream: Allow full range of UIDs and GIDs for sftp chown and
11311 chgrp on 32bit platforms instead of being limited by LONG_MAX. bz#3206,
11312 found by booking00 at sina.cn, ok markus@
11314 OpenBSD-Commit-ID: 373b7bbf1f15ae482d39567ce30d18b51c9229b5