1 commit 80a2f64b8c1d27383cc83d182b73920d1e6a91f1
2 Author: Damien Miller <djm@mindrot.org>
3 Date: Wed Oct 4 15:34:10 2023 +1100
7 commit f65f187b105d9b5c12fd750a211397d08c17c6d4
8 Author: djm@openbsd.org <djm@openbsd.org>
9 Date: Wed Oct 4 04:04:09 2023 +0000
13 OpenBSD-Commit-ID: 5e0af680480bd3b6f5560cf840ad032d48fd6b16
15 commit ffe27e54a4bb18d5d3bbd3f4cc93a41b8d94dfd2
16 Author: djm@openbsd.org <djm@openbsd.org>
17 Date: Wed Oct 4 04:03:50 2023 +0000
19 upstream: add some cautionary text about % token expansion and
21 shell metacharacters; based on report from vinci AT protonmail.ch
23 OpenBSD-Commit-ID: aa1450a54fcee2f153ef70368d90edb1e7019113
25 commit 60ec3d54fd1ebfe2dda75893fa1e870b8dffbb0d
26 Author: djm@openbsd.org <djm@openbsd.org>
27 Date: Tue Oct 3 23:56:10 2023 +0000
29 upstream: fix link to agent draft; spotted by Jann Horn
31 OpenBSD-Commit-ID: ff5bda21a83ec013db683e282256a85201d2dc4b
33 commit 12e2d4b13f6f63ce2de13cbfcc9e4d0d4b4ab231
34 Author: Damien Miller <djm@mindrot.org>
35 Date: Wed Oct 4 10:54:04 2023 +1100
37 use portable provider allowlist path in manpage
41 commit 6c2c6ffde75df95fd838039850d3dd3d84956d87
42 Author: deraadt@openbsd.org <deraadt@openbsd.org>
43 Date: Tue Sep 19 20:37:07 2023 +0000
45 upstream: typo; from Jim Spath
47 OpenBSD-Commit-ID: 2f5fba917b5d4fcf93d9e0b0756c7f63189e228e
49 commit b6b49130a0089b297245ee39e769231d7c763014
50 Author: djm@openbsd.org <djm@openbsd.org>
51 Date: Sun Sep 10 23:12:32 2023 +0000
53 upstream: rename remote_glob() -> sftp_glob() to match other API
55 OpenBSD-Commit-ID: d9dfb3708d824ec02970a84d96cf5937e0887229
57 commit 21b79af6c8d2357c822c84cef3fbdb8001ed263b
58 Author: djm@openbsd.org <djm@openbsd.org>
59 Date: Sun Sep 10 03:51:55 2023 +0000
61 upstream: typo in comment
63 OpenBSD-Commit-ID: 69285e0ce962a7c6b0ab5f17a293c60a0a360a18
65 commit 41232d25532b4d2ef6c5db62efc0cf50a79d26ca
66 Author: Darren Tucker <dtucker@dtucker.net>
67 Date: Sun Sep 10 15:45:38 2023 +1000
69 Use zero-call-used-regs=used with Apple compilers.
71 Apple's versions of clang have version numbers that do not match the
72 corresponding upstream clang versions. Unfortunately, they do still
73 have the clang-15 zero-call-used-regs=all bug, so for now use the value
74 that doesn't result in segfaults. We could allowlist future versions
75 that are known to work. bz#3584 (and probably also our github CI
78 commit 90ccc5918ea505bf156c31148b6b59a1bf5d6dc6
79 Author: djm@openbsd.org <djm@openbsd.org>
80 Date: Sun Sep 10 03:25:53 2023 +0000
82 upstream: randomise keystroke obfuscation intervals and average
84 interval rate. ok dtucker@
86 OpenBSD-Commit-ID: 05f61d051ab418fcfc4857ff306e420037502382
88 commit bd1b9e52f5fa94d87223c90905c5fdc1a7c32aa6
89 Author: djm@openbsd.org <djm@openbsd.org>
90 Date: Fri Sep 8 06:34:24 2023 +0000
92 upstream: fix sizeof(*ptr) instead sizeof(ptr) in realloc (pointer here
94 is char**, so harmless); spotted in CID 416964
96 OpenBSD-Commit-ID: c61caa4a5a667ee20bb1042098861e6c72c69002
98 commit c4f966482983e18601eec70a1563115de836616f
99 Author: djm@openbsd.org <djm@openbsd.org>
100 Date: Fri Sep 8 06:10:57 2023 +0000
102 upstream: regress test recursive remote-remote directories copies where
104 the directory contains a symlink to another directory.
106 also remove errant `set -x` that snuck in at some point
108 OpenBSD-Regress-ID: 1c94a48bdbd633ef2285954ee257725cd7bc456f
110 commit 5e1dfe5014ebc194641678303e22ab3bba15f4e5
111 Author: djm@openbsd.org <djm@openbsd.org>
112 Date: Fri Sep 8 06:10:02 2023 +0000
114 upstream: fix recursive remote-remote copies of directories that
116 contain symlinks to other directories (similar to bz3611)
118 OpenBSD-Commit-ID: 7e19d2ae09b4f941bf8eecc3955c9120171da37f
120 commit 7c0ce2bf98b303b6ad91493ee3247d96c18ba1f6
121 Author: djm@openbsd.org <djm@openbsd.org>
122 Date: Fri Sep 8 05:50:57 2023 +0000
124 upstream: regress test for recursive copies of directories containing
126 symlinks to other directories. bz3611, ok dtucker@
128 OpenBSD-Regress-ID: eaa4c29cc5cddff4e72a16bcce14aeb1ecfc94b9
130 commit 2de990142a83bf60ef694378b8598706bc654b08
131 Author: djm@openbsd.org <djm@openbsd.org>
132 Date: Fri Sep 8 05:56:13 2023 +0000
134 upstream: the sftp code was one of my first contributions to
136 OpenSSH and it shows - the function names are terrible.
138 Rename do_blah() to sftp_blah() to make them less so.
140 Completely mechanical except for sftp_stat() and sftp_lstat() which
141 change from returning a pointer to a static variable (error-prone) to
142 taking a pointer to a caller-provided receiver.
144 OpenBSD-Commit-ID: eb54d6a72d0bbba4d623e2175cf5cc4c75dc2ba4
146 commit 249d8bd0472b53e3a2a0e138b4c030a31e83346a
147 Author: djm@openbsd.org <djm@openbsd.org>
148 Date: Fri Sep 8 05:50:12 2023 +0000
150 upstream: fix scp in SFTP mode recursive upload and download of
152 directories that contain symlinks to other directories. In scp mode, the
153 links would be followed, but in SFTP mode they were not. bz3611, ok dtucker@
155 OpenBSD-Commit-ID: 9760fda668eaa94a992250d7670dfbc62a45197c
157 commit 0e1f4401c466fa4fdaea81b6dadc8dd1fc4cf0af
158 Author: djm@openbsd.org <djm@openbsd.org>
159 Date: Wed Sep 6 23:36:09 2023 +0000
161 upstream: regression test for override of subsystem in match blocks
163 OpenBSD-Regress-ID: 5f8135da3bfda71067084c048d717b0e8793e87c
165 commit 8a1450c62035e834d8a79a5d0d1c904236f9dcfe
166 Author: djm@openbsd.org <djm@openbsd.org>
167 Date: Wed Sep 6 23:35:35 2023 +0000
169 upstream: allow override of Sybsystem directives in sshd Match
173 OpenBSD-Commit-ID: 3911d18a826a2d2fe7e4519075cf3e57af439722
175 commit 6e52826e2a74d077147a82ead8d4fbd5b54f4e3b
176 Author: djm@openbsd.org <djm@openbsd.org>
177 Date: Wed Sep 6 23:26:37 2023 +0000
179 upstream: allocate the subsystems array as necessary and remove the
181 fixed limit of subsystems. Saves a few kb of memory in the server and makes
182 it more like the other options.
184 OpenBSD-Commit-ID: e683dfca6bdcbc3cc339bb6c6517c0c4736a547f
186 commit e19069c9fac4c111d6496b19c7f7db43b4f07b4f
187 Author: djm@openbsd.org <djm@openbsd.org>
188 Date: Wed Sep 6 23:23:53 2023 +0000
190 upstream: preserve quoting of Subsystem commands and arguments.
192 This may change behaviour of exotic configurations, but the most common
193 subsystem configuration (sftp-server) is unlikely to be affected.
195 OpenBSD-Commit-ID: 8ffa296aeca981de5b0945242ce75aa6dee479bf
197 commit 52dfe3c72d98503d8b7c6f64fc7e19d685636c0b
198 Author: djm@openbsd.org <djm@openbsd.org>
199 Date: Wed Sep 6 23:21:36 2023 +0000
201 upstream: downgrade duplicate Subsystem directives from being a
203 fatal error to being a debug message to match behaviour with just about all
206 OpenBSD-Commit-ID: fc90ed2cc0c18d4eb8e33d2c5e98d25f282588ce
208 commit 1ee0a16e07b6f0847ff463d7b5221c4bf1876e25
209 Author: djm@openbsd.org <djm@openbsd.org>
210 Date: Wed Sep 6 23:18:15 2023 +0000
212 upstream: handle cr+lf (instead of just cr) in sshsig signature
216 OpenBSD-Commit-ID: 647460a212b916540016d066568816507375fd7f
218 commit e1c284d60a928bcdd60bc575c6f9604663502770
219 Author: job@openbsd.org <job@openbsd.org>
220 Date: Mon Sep 4 10:29:58 2023 +0000
222 upstream: Generate Ed25519 keys when invoked without arguments
224 Ed25519 public keys are very convenient due to their small size.
225 OpenSSH has supported Ed25519 since version 6.5 (January 2014).
227 OK djm@ markus@ sthen@ deraadt@
229 OpenBSD-Commit-ID: f498beaad19c8cdcc357381a60df4a9c69858b3f
231 commit 694150ad92765574ff82a18f4e86322bd3231e68
232 Author: djm@openbsd.org <djm@openbsd.org>
233 Date: Mon Sep 4 00:08:14 2023 +0000
235 upstream: trigger keystroke timing obfucation only if the channels
237 layer enqueud some data in the last poll() cycle; this avoids triggering the
238 obfuscatior for non-channels data like ClientAlive probes and also fixes a
239 related problem were the obfucations would be triggered on fully quiescent
242 Based on / tested by naddy@
244 OpenBSD-Commit-ID: d98f32dc62d7663ff4660e4556e184032a0db123
246 commit b5fd97896b59a3a46245cf438cc8b16c795d9f74
247 Author: djm@openbsd.org <djm@openbsd.org>
248 Date: Mon Sep 4 00:04:02 2023 +0000
250 upstream: avoid bogus "obfuscate_keystroke_timing: stopping ..."
252 debug messages when keystroke timing obfuscation was never started; spotted
255 OpenBSD-Commit-ID: 5c270d35f7d2974db5c1646e9c64188f9393be31
257 commit ccf7d913db34e49b7a6db1b8331bd402004c840d
258 Author: djm@openbsd.org <djm@openbsd.org>
259 Date: Mon Sep 4 00:01:46 2023 +0000
261 upstream: make channel_output_poll() return a flag indicating
263 whether channel data was enqueued. Will be used to improve keystroke timing
264 obfuscation. Problem spotted by / tested by naddy@
266 OpenBSD-Commit-ID: f9776c7b0065ba7c3bbe50431fd3b629f44314d0
268 commit 43254b326ac6e2131dbd750f9464dc62c14bd5a7
269 Author: djm@openbsd.org <djm@openbsd.org>
270 Date: Sun Sep 3 23:59:32 2023 +0000
272 upstream: set interactive mode for ControlPersist sessions if they
274 originally requested a tty; enables keystroke timing obfuscation for most
275 ControlPersist sessions. Spotted by naddy@
277 OpenBSD-Commit-ID: 72783a26254202e2f3f41a2818a19956fe49a772
279 commit ff3eda68ceb2e2bb8f48e3faceb96076c3e85c20
280 Author: Darren Tucker <dtucker@dtucker.net>
281 Date: Thu Aug 31 23:02:35 2023 +1000
283 Set LLONG_MAX for C89 test.
285 If we don't have LLONG_MAX, configure will figure out that it can get it
286 by setting -std=gnu99, at which point we won't be testing C89 any more.
287 To avoid this, feed it in via CFLAGS.
289 commit f98031773db361424d59e3301aa92aacf423d920
290 Author: djm@openbsd.org <djm@openbsd.org>
291 Date: Tue Aug 29 02:50:10 2023 +0000
293 upstream: make PerSourceMaxStartups first-match-wins; ok dtucker@
295 OpenBSD-Commit-ID: dac0c24cb709e3c595b8b4f422a0355dc5a3b4e7
297 commit cfa66857db90cd908de131e0041a50ffc17c7df8
298 Author: djm@openbsd.org <djm@openbsd.org>
299 Date: Mon Aug 28 09:52:09 2023 +0000
301 upstream: descriptive text shouldn't be under .Cm
303 OpenBSD-Commit-ID: b1afaeb456a52bc8a58f4f9f8b2f9fa8f6bf651b
305 commit 01dbf3d46651b7d6ddf5e45d233839bbfffaeaec
306 Author: djm@openbsd.org <djm@openbsd.org>
307 Date: Mon Aug 28 09:48:11 2023 +0000
309 upstream: limit artificial login delay to a reasonable maximum (5s)
311 and don't delay at all for the "none" authentication mechanism. Patch by
312 Dmitry Belyavskiy in bz3602 with polish/ok dtucker@
314 OpenBSD-Commit-ID: 85b364676dd84cf1de0e98fc2fbdcb1a844ce515
316 commit 528da5b9d7c5da01ed7a73ff21c722e1b5326006
317 Author: jmc@openbsd.org <jmc@openbsd.org>
318 Date: Mon Aug 28 05:32:28 2023 +0000
320 upstream: add spacing for punctuation when macro args;
322 OpenBSD-Commit-ID: e80343c16ce0420b2aec98701527cf90371bd0db
324 commit 3867361ca691d0956ef7d5fb8181cf554a91d84a
325 Author: djm@openbsd.org <djm@openbsd.org>
326 Date: Mon Aug 28 04:06:52 2023 +0000
328 upstream: explicit long long type in timing calculations (doesn't
330 matter, since the range is pre-clamped)
332 OpenBSD-Commit-ID: f786ed902d04a5b8ecc581d068fea1a79aa772de
334 commit 7603ba71264e7fa938325c37eca993e2fa61272f
335 Author: djm@openbsd.org <djm@openbsd.org>
336 Date: Mon Aug 28 03:31:16 2023 +0000
338 upstream: Add keystroke timing obfuscation to the client.
340 This attempts to hide inter-keystroke timings by sending interactive
341 traffic at fixed intervals (default: every 20ms) when there is only a
342 small amount of data being sent. It also sends fake "chaff" keystrokes
343 for a random interval after the last real keystroke. These are
344 controlled by a new ssh_config ObscureKeystrokeTiming keyword/
348 OpenBSD-Commit-ID: 02231ddd4f442212820976068c34a36e3c1b15be
350 commit dce6d80d2ed3cad2c516082682d5f6ca877ef714
351 Author: djm@openbsd.org <djm@openbsd.org>
352 Date: Mon Aug 28 03:28:43 2023 +0000
354 upstream: Introduce a transport-level ping facility
356 This adds a pair of SSH transport protocol messages SSH2_MSG_PING/PONG
357 to implement a ping capability. These messages use numbers in the "local
358 extensions" number space and are advertised using a "ping@openssh.com"
359 ext-info message with a string version number of "0".
363 OpenBSD-Commit-ID: b6b3c4cb2084c62f85a8dc67cf74954015eb547f
365 commit d2d247938b38b928f8a6e1a47a330c5584d3a358
366 Author: tobhe@openbsd.org <tobhe@openbsd.org>
367 Date: Mon Aug 21 21:16:18 2023 +0000
369 upstream: Log errors in kex_exchange_identification() with level
371 verbose instead of error to reduce preauth log spam. All of those get logged
372 with a more generic error message by sshpkt_fatal().
377 OpenBSD-Commit-ID: bd47dab4695b134a44c379f0e9a39eed33047809
379 commit 9d7193a8359639801193ad661a59d1ae4dc3d302
380 Author: djm@openbsd.org <djm@openbsd.org>
381 Date: Mon Aug 21 04:59:54 2023 +0000
383 upstream: correct math for ClientAliveInterval that caused the
385 probes to be sent less frequently than configured; from Dawid Majchrzak
387 OpenBSD-Commit-ID: 641153e7c05117436ddfc58267aa267ca8b80038
389 commit 3c6ab63b383b0b7630da175941e01de9db32a256
390 Author: Darren Tucker <dtucker@dtucker.net>
391 Date: Fri Aug 25 14:48:02 2023 +1000
393 Include Portable version in sshd version string.
397 commit 17fa6cd10a26e193bb6f65d21264d2fe553bcd87
398 Author: Darren Tucker <dtucker@dtucker.net>
399 Date: Mon Aug 21 19:47:58 2023 +1000
401 obsd-arm64 host is real hardware...
403 so put in the correct config location.
405 commit 598ca75c85acaaacee5ef954251e489cc20d7be9
406 Author: Darren Tucker <dtucker@dtucker.net>
407 Date: Mon Aug 21 18:38:36 2023 +1000
409 Add OpenBSD ARM64 test host.
411 commit 1acac79bfbe207e8db639e8043524962037c8feb
412 Author: Darren Tucker <dtucker@dtucker.net>
413 Date: Mon Aug 21 18:05:26 2023 +1000
415 Add test for zlib development branch.
417 commit 84efebf352fc700e9040c8065707c63caedd36a3
418 Author: djm@openbsd.org <djm@openbsd.org>
419 Date: Mon Aug 21 04:36:46 2023 +0000
421 upstream: want stdlib.h for free(3)
423 OpenBSD-Commit-ID: 743af3c6e3ce5e6cecd051668f0327a01f44af29
425 commit cb4ed12ffc332d1f72d054ed92655b5f1c38f621
426 Author: Darren Tucker <dtucker@dtucker.net>
427 Date: Sat Aug 19 07:39:08 2023 +1000
429 Fix zlib version check for 1.3 and future version.
433 commit 25b75e21f16bccdaa472ea1889b293c9bd51a87b
434 Author: Darren Tucker <dtucker@dtucker.net>
435 Date: Mon Aug 14 11:10:08 2023 +1000
437 Add 9.4 branch to CI status page.
439 commit 803e22eabd3ba75485eedd8b7b44d6ace79f2052
440 Author: djm@openbsd.org <djm@openbsd.org>
441 Date: Fri Aug 18 01:37:41 2023 +0000
443 upstream: fix regression in OpenSSH 9.4 (mux.c r1.99) that caused
445 multiplexed sessions to ignore SIGINT under some circumstances. Reported by /
446 feedback naddy@, ok dtucker@
448 OpenBSD-Commit-ID: 4d5c6c894664f50149153fd4764f21f43e7d7e5a
450 commit e706bca324a70f68dadfd0ec69edfdd486eed23a
451 Author: djm@openbsd.org <djm@openbsd.org>
452 Date: Wed Aug 16 16:14:11 2023 +0000
454 upstream: defence-in-depth MaxAuthTries check in monitor; ok markus
456 OpenBSD-Commit-ID: 65a4225dc708e2dae71315adf93677edace46c21
458 commit d1ab7eb90474df656d5e9935bae6df0bd000d343
459 Author: djm@openbsd.org <djm@openbsd.org>
460 Date: Mon Aug 14 03:37:00 2023 +0000
462 upstream: add message number of SSH2_MSG_NEWCOMPRESS defined in RFC8308
464 OpenBSD-Commit-ID: 6c984171c96ed67effd7b5092f3d3975d55d6028
466 commit fa8da52934cb7dff6f660a143276bdb28bb9bbe1
467 Author: Darren Tucker <dtucker@dtucker.net>
468 Date: Sun Aug 13 15:01:27 2023 +1000
470 Add obsd72 and obsd73 test targets.
472 commit f9f18006678d2eac8b0c5a5dddf17ab7c50d1e9f
473 Author: djm@openbsd.org <djm@openbsd.org>
474 Date: Thu Aug 10 23:05:48 2023 +0000
476 upstream: better debug logging of sessions' exit status
478 OpenBSD-Commit-ID: 82237567fcd4098797cbdd17efa6ade08e1a36b0
480 commit a8c57bcb077f0cfdffcf9f23866bf73bb93e185c
481 Author: naddy@openbsd.org <naddy@openbsd.org>
482 Date: Thu Aug 10 14:37:32 2023 +0000
484 upstream: drop a wayward comma, ok jmc@
486 OpenBSD-Commit-ID: 5c11fbb9592a29b37bbf36f66df50db9d38182c6
488 commit e962f9b318a238db1becc53c2bf79dd3a49095b4
489 Author: Damien Miller <djm@mindrot.org>
490 Date: Thu Aug 10 11:10:22 2023 +1000
494 commit 0fcb60bf83130dfa428bc4422b3a3ac20fb528af
495 Author: Damien Miller <djm@mindrot.org>
496 Date: Thu Aug 10 11:05:42 2023 +1000
498 update versions in RPM specs
500 commit d0cee4298491314f09afa1c4383a66d913150b26
501 Author: Damien Miller <djm@mindrot.org>
502 Date: Thu Aug 10 11:05:14 2023 +1000
504 update version in README
506 commit 78b4dc6684f4d35943b46b24ee645edfdb9974f5
507 Author: djm@openbsd.org <djm@openbsd.org>
508 Date: Thu Aug 10 01:01:07 2023 +0000
510 upstream: openssh-9.4
512 OpenBSD-Commit-ID: 71fc1e01a4c4ea061b252bd399cda7be757e6e35
514 commit 58ca4f0aa8c4306ac0a629c9a85fb1efaf4ff092
515 Author: Darren Tucker <dtucker@dtucker.net>
516 Date: Thu Aug 10 11:30:24 2023 +1000
518 Only include unistd.h once.
520 commit 3961ed02dc578517a9d2535128cff5c3a5460d28
521 Author: Damien Miller <djm@mindrot.org>
522 Date: Thu Aug 10 09:08:49 2023 +1000
524 wrap poll.h include in HAVE_POLL_H
526 commit e535fbe2af893046c28adfcd787c1fdbae36a24a
527 Author: dtucker@openbsd.org <dtucker@openbsd.org>
528 Date: Fri Aug 4 06:32:40 2023 +0000
530 upstream: Apply ConnectTimeout to multiplexing local socket
532 connections. If the multiplex socket exists but the connection times out,
533 ssh will fall back to a direct connection the same way it would if the socket
534 did not exist at all. ok djm@
536 OpenBSD-Commit-ID: 2fbe1a36d4a24b98531b2d298a6557c8285dc1b4
538 commit 9d92e7b24848fcc605945f7c2e3460c7c31832ce
539 Author: Darren Tucker <dtucker@dtucker.net>
540 Date: Thu Aug 3 19:35:33 2023 +1000
542 Fix RNG seeding for OpenSSL w/out self seeding.
544 When sshd is built with an OpenSSL that does not self-seed, it would
545 fail in the preauth privsep process while handling a new connection.
546 Sanity checked by djm@
548 commit f70010d9b0b3e7e95de8aa0b961e1d74362cfb5d
549 Author: djm@openbsd.org <djm@openbsd.org>
550 Date: Wed Aug 2 23:04:38 2023 +0000
552 upstream: CheckHostIP has defaulted to 'no' for a while; make the
554 commented- out config option match. From Ed Maste
556 OpenBSD-Commit-ID: e66e934c45a9077cb1d51fc4f8d3df4505db58d9
558 commit c88a8788f9865d02b986d00405b9f0be65ad0b5a
559 Author: dtucker@openbsd.org <dtucker@openbsd.org>
560 Date: Tue Aug 1 08:15:04 2023 +0000
562 upstream: remove unnecessary if statement.
564 github PR#422 from eyalasulin999, ok djm@
566 OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55
568 commit 77b8b865cd5a8c79a47605c0c5b2bacf4692c4d5
569 Author: jmc@openbsd.org <jmc@openbsd.org>
570 Date: Fri Jul 28 05:42:36 2023 +0000
572 upstream: %C is a callable macro in mdoc(7)
574 so, as we do for %D, escape it;
576 OpenBSD-Commit-ID: 538cfcddbbb59dc3a8739604319491dcb8e0c0c9
578 commit e0f91aa9c2fbfc951e9ced7e1305455fc614d3f2
579 Author: djm@openbsd.org <djm@openbsd.org>
580 Date: Fri Jul 28 05:33:15 2023 +0000
582 upstream: don't need to start a command here; use ssh -N instead.
584 Fixes failure on cygwin spotted by Darren
586 OpenBSD-Regress-ID: ff678a8cc69160a3b862733d935ec4a383f93cfb
588 commit f446a44f30bc680e0d026a4204844b02646c1c2d
589 Author: djm@openbsd.org <djm@openbsd.org>
590 Date: Wed May 17 05:52:01 2023 +0000
592 upstream: add LTESTS_FROM variable to allow skipping of tests up to
594 a specific point. e.g. "make LTESTS_FROM=t-sftp" will only run the sftp.sh
595 test and subsequent ones. ok dtucker@
597 OpenBSD-Regress-ID: 07f653de731def074b29293db946042706fcead3
599 commit 8eb8899d612440a9b608bee7f916081d3d0b7812
600 Author: djm@openbsd.org <djm@openbsd.org>
601 Date: Fri May 12 06:37:42 2023 +0000
603 upstream: test ChrootDirectory in Match block
605 OpenBSD-Regress-ID: a6150262f39065939f025e546af2a346ffe674c1
607 commit e43f43d3f19516222e9a143468ea0dc1b3ab67b6
608 Author: djm@openbsd.org <djm@openbsd.org>
609 Date: Fri May 12 06:36:27 2023 +0000
611 upstream: better error messages
613 OpenBSD-Regress-ID: 55e4186604e80259496d841e690ea2090981bc7a
615 commit 6958f00acf3b9e0b3730f7287e69996bcf3ceda4
616 Author: djm@openbsd.org <djm@openbsd.org>
617 Date: Thu Jul 27 22:26:49 2023 +0000
619 upstream: don't incorrectly truncate logged strings retrieved from
621 PKCS#11 modules; based on GHPR406 by Jakub Jelen; ok markus
623 OpenBSD-Commit-ID: 7ed1082f23a13b38c373008f856fd301d50012f9
625 commit d1ffde6b55170cd4b9a72bfd9a3f17508e6cf714
626 Author: djm@openbsd.org <djm@openbsd.org>
627 Date: Thu Jul 27 22:25:17 2023 +0000
629 upstream: make sshd_config AuthorizedPrincipalsCommand and
631 AuthorizedKeysCommand accept the %D (routing domain) and a new %C (connection
632 address/port 4-tuple) as expansion sequences; ok markus
634 OpenBSD-Commit-ID: ee9a48bf1a74c4ace71b69de69cfdaa2a7388565
636 commit 999a2886ca1844a7a74b905e5f2c8c701f9838cd
637 Author: djm@openbsd.org <djm@openbsd.org>
638 Date: Thu Jul 27 22:23:05 2023 +0000
640 upstream: increase default KDF work-factor for OpenSSH format
642 private keys from 16 to 24; { feedback ok } x { deraadt markus }
644 OpenBSD-Commit-ID: a3afb1383f8ff0a49613d449f02395d9e8d4a9ec
646 commit 0fa803a1dd1c7b546c166000e23a869cf6c4ec10
647 Author: Darren Tucker <dtucker@dtucker.net>
648 Date: Thu Jul 27 02:25:09 2023 +1000
650 Prefer OpenSSL's SHA256 in sk-dummy.so
652 Previously sk-dummy.so used libc's (or compat's) SHA256 since it may be
653 built without OpenSSL. In many cases, however, including both libc's
654 and OpenSSL's headers together caused conflicting definitions.
656 We tried working around this (on OpenSSL <1.1 you could define
657 OPENSSL_NO_SHA, NetBSD had USE_LIBC_SHA2, various #define hacks) with
658 varying levels of success. Since OpenSSL >=1.1 removed OPENSSL_NO_SHA
659 and including most OpenSSL headers would bring sha.h in, even if it
660 wasn't used directly this was a constant hassle.
662 Admit defeat and use OpenSSL's SHA256 unless we aren't using OpenSSL at
665 commit 36cdb5dbf55c99c0faad06066f56a7c341258c1f
666 Author: Darren Tucker <dtucker@dtucker.net>
667 Date: Thu Jul 27 10:29:44 2023 +1000
669 Retire dfly58 test VM. Add dfly64.
671 commit 2d34205dab08ede9b0676efa57647fc49e6decbe
672 Author: djm@openbsd.org <djm@openbsd.org>
673 Date: Wed Jul 26 23:06:00 2023 +0000
675 upstream: make ssh -f (fork after authentication) work properly in
677 multiplexed cases (inc. ControlPersist). bz3589 bz3589 Based on patches by
678 Peter Chubb; ok dtucker@
680 OpenBSD-Commit-ID: a7a2976a54b93e6767dc846b85647e6ec26969ac
682 commit 076aeda86a7ee9be8fd2f0181ec7b9729a6ceb37
683 Author: naddy@openbsd.org <naddy@openbsd.org>
684 Date: Sun Jul 23 20:04:45 2023 +0000
686 upstream: man page typos; ok jmc@
688 OpenBSD-Commit-ID: e6ddfef94b0eb867ad88abe07cedc8ed581c07f0
690 commit 135e7d5fe31f700e6dfc61ce914970c5ee7175ba
691 Author: jmc@openbsd.org <jmc@openbsd.org>
692 Date: Thu Jul 20 05:43:39 2023 +0000
694 upstream: tweak the allow-remote-pkcs11 text;
696 OpenBSD-Commit-ID: bc965460a89edf76865b7279b45cf9cbdebd558a
698 commit 5f83342b61d1f76c141de608ed2bd293990416bd
699 Author: Darren Tucker <dtucker@dtucker.net>
700 Date: Tue Jul 25 13:00:22 2023 +1000
702 Handle a couple more OpenSSL no-ecc cases.
706 commit edc2ef4e418e514c99701451fae4428ec04ce538
707 Author: Damien Miller <djm@mindrot.org>
708 Date: Thu Jul 20 12:53:44 2023 +1000
712 commit 51fda734e0d3c2df256fc03e8b060c4305be6e59
713 Author: Damien Miller <djm@mindrot.org>
714 Date: Thu Jul 20 12:53:21 2023 +1000
716 Bring back OPENSSL_HAS_ECC to ssh-pkcs11-client
718 commit 099cdf59ce1e72f55d421c8445bf6321b3004755
719 Author: djm@openbsd.org <djm@openbsd.org>
720 Date: Wed Jul 19 14:03:45 2023 +0000
722 upstream: Separate ssh-pkcs11-helpers for each p11 module
724 Make ssh-pkcs11-client start an independent helper for each provider,
725 providing better isolation between modules and reliability if a single
728 This also implements reference counting of PKCS#11-hosted keys,
729 allowing ssh-pkcs11-helper subprocesses to be automatically reaped
730 when no remaining keys reference them. This fixes some bugs we have
731 that make PKCS11 keys unusable after they have been deleted, e.g.
732 https://bugzilla.mindrot.org/show_bug.cgi?id=3125
736 OpenBSD-Commit-ID: 0ce188b14fe271ab0568f4500070d96c5657244e
738 commit 29ef8a04866ca14688d5b7fed7b8b9deab851f77
739 Author: djm@openbsd.org <djm@openbsd.org>
740 Date: Wed Jul 19 14:02:27 2023 +0000
742 upstream: Ensure FIDO/PKCS11 libraries contain expected symbols
744 This checks via nlist(3) that candidate provider libraries contain one
745 of the symbols that we will require prior to dlopen(), which can cause
746 a number of side effects, including execution of constructors.
748 Feedback deraadt; ok markus
750 OpenBSD-Commit-ID: 1508a5fbd74e329e69a55b56c453c292029aefbe
752 commit 1f2731f5d7a8f8a8385c6031667ed29072c0d92a
753 Author: djm@openbsd.org <djm@openbsd.org>
754 Date: Wed Jul 19 13:56:33 2023 +0000
756 upstream: Disallow remote addition of FIDO/PKCS11 provider
758 libraries to ssh-agent by default.
760 The old behaviour of allowing remote clients from loading providers
761 can be restored using `ssh-agent -O allow-remote-pkcs11`.
763 Detection of local/remote clients requires a ssh(1) that supports
764 the `session-bind@openssh.com` extension. Forwarding access to a
765 ssh-agent socket using non-OpenSSH tools may circumvent this control.
769 OpenBSD-Commit-ID: 4c2bdf79b214ae7e60cc8c39a45501344fa7bd7c
771 commit 892506b13654301f69f9545f48213fc210e5c5cc
772 Author: djm@openbsd.org <djm@openbsd.org>
773 Date: Wed Jul 19 13:55:53 2023 +0000
775 upstream: terminate process if requested to load a PKCS#11 provider
777 that isn't a PKCS#11 provider; from / ok markus@
779 OpenBSD-Commit-ID: 39532cf18b115881bb4cfaee32084497aadfa05c
781 commit f3f56df8ec476b2de6cbdbdfdb77a2a61087829d
782 Author: Damien Miller <djm@mindrot.org>
783 Date: Wed Jul 19 12:07:18 2023 +1000
785 agent_fuzz doesn't want stdint.h conditionalised
787 commit 750911fd31d307a767cc86e3bfa90bbbb77b1a25
788 Author: Damien Miller <djm@mindrot.org>
789 Date: Tue Jul 18 15:41:12 2023 +1000
791 conditionalise stdint.h inclusion on HAVE_STDINT_H
793 fixes build on AIX5 at least
795 commit ff047504fa6e008c4092f8929881816b8993bea0
796 Author: Damien Miller <djm@mindrot.org>
797 Date: Tue Jul 18 15:30:45 2023 +1000
799 conditionalise match localnetwork on ifaddrs.h
801 Fixes build breakage on platforms that lack getifaddrs()
803 commit b87b03282e466ca2927954ce93f5dbf0bfdc68f6
804 Author: djm@openbsd.org <djm@openbsd.org>
805 Date: Mon Jul 17 06:16:33 2023 +0000
807 upstream: missing match localnetwork negation check
809 OpenBSD-Commit-ID: 9a08ed8dae27d3f38cf280f1b28d4e0ff41a737a
811 commit 6d6e185ba29ef4274164b77eab4dc763907f8821
812 Author: jmc@openbsd.org <jmc@openbsd.org>
813 Date: Mon Jul 17 05:41:53 2023 +0000
815 upstream: - add -P to usage() - sync the arg name to -J in usage()
817 with that in ssh.1 - reformat usage() to match what "man ssh" does on 80width
819 OpenBSD-Commit-ID: 5235dd7aa42e5bf90ae54579d519f92fc107036e
821 commit f1a9898283a0638667b587ee4a950afd61ab51b0
822 Author: jmc@openbsd.org <jmc@openbsd.org>
823 Date: Mon Jul 17 05:38:10 2023 +0000
825 upstream: -P before -p in SYNOPSIS;
827 OpenBSD-Commit-ID: 535f5257c779e26c6a662a038d241b017f8cab7c
829 commit eef4d7e873568e1c84c36bb4034e2c3378250a61
830 Author: jsg@openbsd.org <jsg@openbsd.org>
831 Date: Mon Jul 17 05:36:14 2023 +0000
833 upstream: configuation -> configuration
835 OpenBSD-Commit-ID: 4776ced33b780f1db0b2902faec99312f26a726b
837 commit dc1dbe94cf6532bd546a3373ad436404f8850e5f
838 Author: djm@openbsd.org <djm@openbsd.org>
839 Date: Mon Jul 17 05:26:38 2023 +0000
841 upstream: move other RCSIDs to before their respective license blocks
845 OpenBSD-Commit-ID: ef5bf46b57726e4260a63b032b0b5ac3b4fe9cd4
847 commit ebe11044681caff78834ca6b78311ad19c1860b8
848 Author: djm@openbsd.org <djm@openbsd.org>
849 Date: Mon Jul 17 05:22:30 2023 +0000
851 upstream: Move RCSID to before license block and away from #includes,
853 where it caused merge conflict in -portable for each commit :(
855 OpenBSD-Commit-ID: 756ebac963df3245258b962e88150ebab9d5fc20
857 commit 05c08e5f628de3ecf6f7ea20947735bcfa3201e0
858 Author: djm@openbsd.org <djm@openbsd.org>
859 Date: Mon Jul 17 05:20:15 2023 +0000
861 upstream: return SSH_ERR_KRL_BAD_MAGIC when a KRL doesn't contain a
863 valid magic number and not SSH_ERR_MESSAGE_INCOMPLETE; the former is needed
864 to fall back to text revocation lists in some cases; fixes t-cert-hostkey.
866 OpenBSD-Commit-ID: 5c670a6c0f027e99b7774ef29f18ba088549c7e1
868 commit c6fad2c3d19b74f0bd0af1ef040fc74f3a1d9ebb
869 Author: Damien Miller <djm@mindrot.org>
870 Date: Mon Jul 17 14:56:14 2023 +1000
872 avoid AF_LINK on platforms that don't define it
874 commit 919bc3d3b712c920de1ae6be5ac6561c98886d7e
875 Author: djm@openbsd.org <djm@openbsd.org>
876 Date: Mon Jul 17 04:08:31 2023 +0000
878 upstream: Add support for configuration tags to ssh(1).
880 This adds a ssh_config(5) "Tag" directive and corresponding
881 "Match tag" predicate that may be used to select blocks of
882 configuration similar to the pf.conf(5) keywords of the same
887 OpenBSD-Commit-ID: dc08358e70e702b59ac3e591827e5a96141b06a3
889 commit 3071d85a47061c1bdaf11a0ac233b501ecba862c
890 Author: djm@openbsd.org <djm@openbsd.org>
891 Date: Mon Jul 17 04:04:36 2023 +0000
893 upstream: add a "match localnetwork" predicate.
895 This allows matching on the addresses of available network interfaces
896 and may be used to vary the effective client configuration based on
897 network location (e.g. to use a ProxyJump when not on a particular
902 OpenBSD-Commit-ID: cffb6ff9a3803abfc52b5cad0aa190c5e424c139
904 commit beec17bb311365b75a0a5941418d4b96df7d7888
905 Author: djm@openbsd.org <djm@openbsd.org>
906 Date: Mon Jul 17 04:01:10 2023 +0000
908 upstream: remove vestigal support for KRL signatures
910 When the KRL format was originally defined, it included support for
911 signing of KRL objects. However, the code to sign KRLs and verify KRL
912 signatues was never completed in OpenSSH.
914 Now, some years later, we have SSHSIG support in ssh-keygen that is
915 more general, well tested and actually works. So this removes the
916 semi-finished KRL signing/verification support from OpenSSH and
917 refactors the remaining code to realise the benefit - primarily, we
918 no longer need to perform multiple parsing passes over KRL objects.
922 OpenBSD-Commit-ID: 517437bab3d8180f695c775410c052340e038804
924 commit 449566f64c21b4578d5c0c431badd0328adc53ed
925 Author: djm@openbsd.org <djm@openbsd.org>
926 Date: Mon Jul 17 03:57:21 2023 +0000
928 upstream: Support for KRL extensions.
930 This defines wire formats for optional KRL extensions and implements
931 parsing of the new submessages. No actual extensions are supported at
936 OpenBSD-Commit-ID: ae2fcde9a22a9ba7f765bd4f36b3f5901d8c3fa7
938 commit 18ea857770e84825a3a6238bb37f54864487b59f
939 Author: dtucker@openbsd.org <dtucker@openbsd.org>
940 Date: Fri Jul 14 07:44:21 2023 +0000
942 upstream: Include stdint.h for SIZE_MAX. Fixes OPENSSL=no build.
944 OpenBSD-Commit-ID: e7c31034a5434f2ead3579b13a7892960651e6b0
946 commit 20b768fcd13effe0f2d3619661b6c8592c773553
947 Author: Darren Tucker <dtucker@dtucker.net>
948 Date: Fri Jul 14 17:07:32 2023 +1000
950 Fix typo in declaration of nmesg.
952 commit 4b94d09542e36ebde2eb9ad89bc68431609932de
953 Author: Damien Miller <djm@mindrot.org>
954 Date: Fri Jul 14 15:34:47 2023 +1000
956 portable-specific int overflow defence-in-depth
958 These too are unreachable, but we want the code to be safe regardless of
959 context. Reported by Yair Mizrahi @ JFrog
961 commit 2ee48adb9fc8692e8d6ac679dcc9f35e89ad68f0
962 Author: djm@openbsd.org <djm@openbsd.org>
963 Date: Fri Jul 14 05:31:44 2023 +0000
965 upstream: add defence-in-depth checks for some unreachable integer
967 overflows reported by Yair Mizrahi @ JFrog; feedback/ok millert@
969 OpenBSD-Commit-ID: 52af085f4e7ef9f9d8423d8c1840a6a88bda90bd
971 commit 4b43bc358ae6f6b19a973679246dc5172f6ac41b
972 Author: djm@openbsd.org <djm@openbsd.org>
973 Date: Mon Jul 10 04:51:26 2023 +0000
975 upstream: misplaced debug message
977 OpenBSD-Commit-ID: d0f12af0a5067a756aa707bc39a83fa6f58bf7e5
979 commit 8c7203bcee4c4f98a22487b4631fe068b992099b
980 Author: Damien Miller <djm@mindrot.org>
981 Date: Wed Jul 12 11:41:19 2023 +1000
983 replace deprecate selinux matchpathcon function
985 This function is apparently deprecated. Documentation on what is the
986 supposed replacement is is non-existent, so this follows the approach
987 glibc used https://sourceware.org/git/?p=glibc.git;a=patch;h=f278835f59
991 commit 7e8800f5d701efffa39ccb63ca1e095ea777c31a
992 Author: dtucker@openbsd.org <dtucker@openbsd.org>
993 Date: Thu Jul 6 22:17:59 2023 +0000
995 upstream: minleft and maxsign are u_int so cast appropriately. Prompted
997 by github PR#410, ok deraadt.
999 OpenBSD-Commit-ID: 0514cd51db3ec60239966622a0d3495b15406ddd
1001 commit 94842bfe9b09fc93189c6ed0dc9bbebc1d44a426
1002 Author: dlg@openbsd.org <dlg@openbsd.org>
1003 Date: Tue Jul 4 03:59:21 2023 +0000
1005 upstream: add support for unix domain sockets to ssh -W
1009 OpenBSD-Commit-ID: 3e6d47567b895c7c28855c7bd614e106c987a6d8
1011 commit a95fc5eed09a0238fb127b6c50e8498432b79dae
1012 Author: David Seifert <soap@gentoo.org>
1013 Date: Fri May 12 14:06:01 2023 +0200
1015 gss-serv.c: `MAXHOSTNAMELEN` -> `HOST_NAME_MAX`
1017 `MAXHOSTNAMELEN` is not defined in POSIX, which breaks on musl:
1018 https://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html
1020 Bug: https://bugs.gentoo.org/834044
1022 commit 8a6cd08850f576e7527c52a1b086cae82fab290e
1023 Author: Darren Tucker <dtucker@dtucker.net>
1024 Date: Fri Jun 23 09:49:02 2023 +1000
1026 Update runner OS version for hardenedmalloc test.
1028 Hardenedmalloc dropped support for "legacy glibc" versions in their
1029 64dad0a69 so use a newer Ubuntu version for the runner for that test.
1031 commit cfca6f17e64baed6822bb927ed9f372ce64d9c5b
1032 Author: Damien Miller <djm@mindrot.org>
1033 Date: Thu Jun 22 15:04:03 2023 +1000
1035 handle sysconf(SC_OPEN_MAX) returning > INT_MAX;
1039 commit c1c2ca1365b3f7b626683690bd2c68265f6d8ffd
1040 Author: djm@openbsd.org <djm@openbsd.org>
1041 Date: Wed Jun 21 05:10:26 2023 +0000
1043 upstream: better validate CASignatureAlgorithms in ssh_config and
1047 Previously this directive would accept certificate algorithm names, but
1048 these were unusable in practice as OpenSSH does not support CA chains.
1050 part of bz3577; ok dtucker@
1052 OpenBSD-Commit-ID: a992d410c8a78ec982701bc3f91043dbdb359912
1054 commit 4e73cd0f4ab3e5b576c56cac9732da62c8fc0565
1055 Author: djm@openbsd.org <djm@openbsd.org>
1056 Date: Wed Jun 21 05:08:32 2023 +0000
1058 upstream: make `ssh -Q CASignatureAlgorithms` only list signature
1060 algorithms that are valid for CA signing. Previous behaviour was to list all
1061 signing algorithms, including certificate algorithms (OpenSSH certificates do
1062 not support CA chains). part of bz3577; ok dtucker@
1064 OpenBSD-Commit-ID: 99c2b072dbac0f44fd1f2269e3ff6c1b5d7d3e59
1066 commit a69062f1695ac9c3c3dea29d3044c72aaa6af0ea
1067 Author: djm@openbsd.org <djm@openbsd.org>
1068 Date: Wed Jun 21 05:06:04 2023 +0000
1070 upstream: handle rlimits > INT_MAX (rlim_t is u64); ok dtucker
1074 OpenBSD-Commit-ID: 31cf59c041becc0e5ccb0a77106f812c4cd1cd74
1076 commit 8d33f2aa6bb895a7f85a47189913639086347b75
1077 Author: djm@openbsd.org <djm@openbsd.org>
1078 Date: Tue Jun 20 23:59:33 2023 +0000
1080 upstream: prepare for support for connecting to unix domain sockets
1082 using ssh -W by explicitly decoding PORT_STREAMLOCAL (a negative number) from
1083 the u32 that's passed over the multiplexing socket; previously code would
1084 just cast, which is UB.
1086 OpenBSD-Commit-ID: e5ac5f40d354096c51e8c118a5c1b2d2b7a31384
1088 commit b4ac435b4e67f8eb5932d8f59eb5b3cf7dc38df0
1089 Author: djm@openbsd.org <djm@openbsd.org>
1090 Date: Tue Jun 20 00:05:09 2023 +0000
1092 upstream: reset comment=NULL for each key in do_fingerprint();
1094 fixes "no comment" not showing on when running `ssh-keygen -l` on multiple
1095 keys where one has a comment and other following keys do not. Patch from
1096 Markus Kuhn via GHPR407, bz3580
1098 OpenBSD-Commit-ID: 3cce84456fdcd67dc6b84e369f92c6686d111d9b
1100 commit b53a809a549dcd4fbde554c6aa283e597b15ea33
1101 Author: millert@openbsd.org <millert@openbsd.org>
1102 Date: Mon Jun 5 13:24:36 2023 +0000
1104 upstream: Store timeouts as int, not u_int as they are limited to
1106 INT_MAX. Fixes sign compare warnings systems with 32-bit time_t due to type
1109 OpenBSD-Commit-ID: 48081e9ad35705c5f1705711704a4c2ff94e87b7
1111 commit 2709809fd616a0991dc18e3a58dea10fb383c3f0
1112 Author: Philip Hands <phil@hands.com>
1113 Date: Wed May 24 19:41:14 2023 +0200
1115 fixup! if -s & -p specified, mention 'sftp -P' on
1119 SSH-Copy-ID-Upstream: 32686e7c65b4fa2846e474d3315102dfa0f043b0
1121 commit 204e0bf05161b7641500d7ab266c21217412379f
1122 Author: Darren Tucker <dtucker@dtucker.net>
1123 Date: Tue Aug 3 21:25:48 2021 +1000
1125 Make ssh-copy-id(1) consistent with OpenSSH.
1127 This makes the ssh-copy-id man page more consistent with the rest of the
1129 - new sentence, new line
1133 - zap trailing whitespace
1135 Report from Debian via mindrot bz#3331, diff from jmc at openbsd.org.
1137 SSH-Copy-ID-Upstream: d8974cfb6242316460ed22a1ccc662800a50c5d3
1139 commit 9de79df66d1430d290fab670bb4b18612875e518
1140 Author: Philip Hands <phil@hands.com>
1141 Date: Wed May 24 11:45:43 2023 +0200
1143 if -s & -p specified, mention 'sftp -P' on success
1145 This was inspired by this:
1146 https://github.com/openssh/openssh-portable/pull/321
1147 but I thought that it was better to not do the sed patching.
1149 BTW the reason one can get away with using $SSH_OPTS throughout, despite
1150 the lowercase -p in there, even if sftp is in use, is that the sftp call
1151 is using the already-established ssh master connection, so the port was
1152 passed to the earlier ssh.
1154 SSH-Copy-ID-Upstream: 1c124d9bfafdbe28a00b683367ebf5750ce12eb2
1156 commit 801cda54c00e0f4e7d89345a90874c8d05dc233a
1157 Author: Philip Hands <phil@hands.com>
1158 Date: Tue May 23 23:07:11 2023 +0200
1162 SSH-Copy-ID-Upstream: e604fae1cdee35c18055d35dcec530cf12ef00ad
1164 commit 288482f53613f3e74544eb92deeb24f7c7f1f371
1165 Author: Philip Hands <phil@hands.com>
1166 Date: Tue May 23 20:52:13 2023 +0200
1168 make -x also apply to the target script
1170 SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4
1172 commit b79e7b88ed44f0e4339f0ff35c96c78a92175a8d
1173 Author: Philip Hands <phil@hands.com>
1174 Date: Tue May 23 16:46:42 2023 +0200
1176 add -t option to specify the target path
1178 Allow the default target path (.ssh/authorized_files) to be over-riden
1180 This was inspired by this MR from Panagiotis Cheilaris <philaris@cs.ntua.gr>
1182 https://gitlab.com/phil_hands/ssh-copy-id/-/merge_requests/8
1184 SSH-Copy-ID-Upstream: a942a0e076874adb6d8b2f0fb76d6c7918190fcd
1186 commit 914f4ad138714c471ba72fb6d5496b6235320edd
1187 Author: Carlos RodrÃguez Gili <carlos.rodriguez-gili@upc.edu>
1188 Date: Tue Apr 20 19:23:57 2021 +0200
1190 Fix test error for /bin/sh on Solaris 10 and older
1192 On Solaris 10 and older targets /bin/sh is not POSIX-compliant.
1193 Test -z `...` fails with error 'sh: test: argument expected'.
1194 Using quotes around backticks fixes this and doesn't break
1195 POSIX compatibility.
1197 SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065
1199 commit bd382dca316c721aed1e45edcf4c4e0f6374afb0
1200 Author: Jakub Jelen <jjelen@redhat.com>
1201 Date: Tue Mar 2 21:34:05 2021 +0000
1203 Remove outdated comment
1205 The commit b068122 removed the code dropping the trailing colon, but the comment stayed leaving the code confusing for future readers
1207 SSH-Copy-ID-Upstream: 930d39f238117cd53810240ec989d0356aa1c1f6
1209 commit bdcaf7939029433635d63aade8f9ac762aca2bbe
1210 Author: Darren Tucker <dtucker@dtucker.net>
1211 Date: Wed May 10 18:50:46 2023 +1000
1213 Special case OpenWrt instead of Dropbear.
1215 OpenWrt overrides the location of authorized_keys for root. Currently we
1216 assume that all Dropbear installations behave this way, which is not the
1217 case. Check for OpenWrt and root user before using that location instead
1218 of assuming that for all Dropbear servers. Prompted by Github PR#250.
1220 SSH-Copy-ID-Upstream: 0e1f5d443a9967483c33945793107ae3f3e4af2d
1222 commit cf84498f67abe93f813a296167b406a0db7b288e
1223 Author: Philip Hands <phil@hands.com>
1224 Date: Thu May 18 18:20:55 2023 +0200
1226 ssh-copy-id: add -x option (for debugging)
1228 This option causes the ssh-copy-id to run with set -x
1230 SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844
1232 commit b4a1efdcb88f03394c08e7f68ed4e11676830002
1233 Author: Philip Hands <phil@hands.com>
1234 Date: Thu May 18 17:14:41 2023 +0200
1236 update copyright notices
1238 SSH-Copy-ID-Upstream: c284ed33b361814ea48ff68cbd01ca525b2bf117
1240 commit fcd78e31cdd45a7e69ccfe6d8a3b1037dc1de290
1241 Author: djm@openbsd.org <djm@openbsd.org>
1242 Date: Wed May 24 23:01:06 2023 +0000
1244 upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand
1246 appears previously in configuration. Reported by John Meyers in bz3574 ok
1249 OpenBSD-Commit-ID: 1c92e4517284386703936e1d3abaa36cfacf1951
1251 commit 5ec5504f1d328d5bfa64280cd617c3efec4f78f3
1252 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1253 Date: Wed May 10 10:04:20 2023 +0000
1255 upstream: Remove unused prototypes for ssh1 RSA functions.
1257 From lengyijun via github PR#396.
1259 OpenBSD-Commit-ID: 379a5afa8b7a0f3cba0c8a9bcceb4e5e33a5c1ef
1261 commit fbf362b3891ae4b36052d1b39f37fc618b41c476
1262 Author: Darren Tucker <dtucker@dtucker.net>
1263 Date: Tue May 9 19:26:56 2023 +1000
1265 main(void) to prevent unused variable warning.
1267 commit baf854c8bb0a6d0af5c696c801e631a48dabbaba
1268 Author: Darren Tucker <dtucker@dtucker.net>
1269 Date: Tue May 9 19:25:45 2023 +1000
1271 Remove warning pragma since clang doesn't like it.
1273 commit 5fbb7a1349fbbb48ccb1b8cafff2c1854370d87d
1274 Author: Darren Tucker <dtucker@dtucker.net>
1275 Date: Tue May 9 17:13:33 2023 +1000
1277 Suppress warning for snprintf truncation test.
1279 commit 47742c513e4e045ecc985c6483fc5c8b050acda2
1280 Author: Darren Tucker <dtucker@dtucker.net>
1281 Date: Tue May 9 17:12:50 2023 +1000
1283 Update OpenSSL compat test for 3.x.
1285 commit 86ad25d455a2313126125540e61e0f9314283f88
1286 Author: Darren Tucker <dtucker@dtucker.net>
1287 Date: Mon May 8 20:23:08 2023 +1000
1289 Add macos13 PAM test target.
1291 commit 77cca2c4b13bc6e5f389565583b6202b0d1bccc2
1292 Author: Darren Tucker <dtucker@dtucker.net>
1293 Date: Mon May 8 20:14:46 2023 +1000
1295 Skip agent-peereid test on macos13.
1297 sudo -S nobody doesn't work on the github runners (probably a
1298 permission issue) so skip that test.
1300 commit b356b8e91678ea295bcf44df5248c3fbf499fdcf
1301 Author: Darren Tucker <dtucker@dtucker.net>
1302 Date: Mon May 8 20:14:28 2023 +1000
1304 Include config.guess in debug output.
1306 commit b7afd8a4ecaca8afd3179b55e9db79c0ff210237
1307 Author: Darren Tucker <dtucker@dtucker.net>
1308 Date: Mon May 8 20:12:59 2023 +1000
1310 Handle OpenSSL >=3 ABI compatibility.
1312 Beyond OpenSSL 3.0, the ABI compatibility guarantees are wider (only
1313 major must match instead of major and minor in earlier versions).
1316 commit 0e9e2663eb2c6e9c3e10d15d70418312ae67e542
1317 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1318 Date: Mon May 1 08:57:29 2023 +0000
1320 upstream: Import regenerated moduli.
1322 OpenBSD-Commit-ID: 3d5f811cfcaed8cc4a97e1db49ac61bdf118113c
1324 commit d9687f49682e1e93383fc15ab2018850b2ef38c3
1325 Author: Darren Tucker <dtucker@dtucker.net>
1326 Date: Mon May 1 11:45:14 2023 +1000
1328 Add macos-13 test target.
1330 Also flatten OS list for clarity.
1332 commit aacfd6767497b8fa6d41ecdd3f8e265d1e9ef1f6
1333 Author: djm@openbsd.org <djm@openbsd.org>
1334 Date: Sun Apr 30 22:54:22 2023 +0000
1336 upstream: adjust ftruncate() logic to handle servers that reorder
1340 sftp/scp will ftruncate the destination file after a transfer completes,
1341 to deal with the case where a longer destination file already existed.
1342 We tracked the highest contiguous block transferred to deal with this
1343 case, but our naive tracking doesn't deal with servers that reorder
1344 requests - a misfeature strictly permitted by the protocol but seldom
1347 Adjust the logic to ftruncate() at the highest absolute block received
1348 when the transfer is successful. feedback deraadt@ ok markus@
1350 prompted by https://github.com/openssh/openssh-portable/commit/9b733#commitcomment-110679778
1352 OpenBSD-Commit-ID: 4af7fac75958ad8507b4fea58706f3ff0cfddb1b
1354 commit c8eb3941758615c8284a48fff47872db926da63c
1355 Author: djm@openbsd.org <djm@openbsd.org>
1356 Date: Wed Apr 26 01:36:03 2023 +0000
1358 upstream: Check for ProxyJump=none in CanonicalizeHostname logic.
1360 Previously ssh would incorrectly refuse to canonicalise the hostname
1361 if ProxyJump was explicitly set to "none" when CanonicalizeHostname=yes
1365 OpenBSD-Commit-ID: 80a58e43c3a32f97361282f756ec8d3f37989efd
1367 commit ac383f3a5c6f529a2e8a5bc44af79a08c7da294e
1368 Author: jsg@openbsd.org <jsg@openbsd.org>
1369 Date: Wed Apr 12 14:22:04 2023 +0000
1371 upstream: remove duplicate signal.h include
1373 OpenBSD-Commit-ID: 30c0a34d74d91ddd0e6992525da70d3293392f70
1375 commit 740dafa20f3f3d325f6f5d44e990b8c8a6d3d816
1376 Author: jsg@openbsd.org <jsg@openbsd.org>
1377 Date: Wed Apr 12 08:53:54 2023 +0000
1379 upstream: fix double words ok dtucker@
1381 OpenBSD-Commit-ID: 44d3223902fbce5276422bdc8063ab72a4078489
1383 commit 6452f89577ec4f22440c31b8e19b061d1a7c4b2a
1384 Author: Darren Tucker <dtucker@dtucker.net>
1385 Date: Tue Apr 11 16:49:19 2023 +1000
1387 Test against LibreSSL 3.7.2.
1389 commit 2138f6be595ca106fe4805a1e3ab9c4d8acc697b
1390 Author: Damien Miller <djm@mindrot.org>
1391 Date: Thu Apr 6 14:33:10 2023 +1000
1393 remove unused upper-case const strings in fmtfp
1395 no float format that uses upper-case is supported nor are hex floats.
1398 commit 484c5e6168fdb22cbcd73c4ff987cf9ca47989ca
1399 Author: djm@openbsd.org <djm@openbsd.org>
1400 Date: Thu Apr 6 03:56:02 2023 +0000
1402 upstream: simplify sshsig_find_principals() similar to what happened to
1404 sshsig_check_allowed_keys() in r1.31, removing some dead code
1406 OpenBSD-Commit-ID: a493e628d4d6c08f878c276d998f4313ba61702d
1408 commit 3a7b110fbc7e096423f8f7b459deffe4c65d70f4
1409 Author: djm@openbsd.org <djm@openbsd.org>
1410 Date: Thu Apr 6 03:21:31 2023 +0000
1412 upstream: remove redundant ssh!=NULL check; we'd already
1416 OpenBSD-Commit-ID: 852bf12591ec5a9fb12dcbde9b1fd3945ad0df3c
1418 commit 2519110659a1efac6c976895a86659d1b341c91b
1419 Author: djm@openbsd.org <djm@openbsd.org>
1420 Date: Thu Apr 6 03:19:32 2023 +0000
1422 upstream: match_user() shouldn't be called with user==NULL unless
1424 host and ipaddr are also NULL
1426 OpenBSD-Commit-ID: fa3518346c21483e9e01a2e4b9436ae501daf8ea
1428 commit 3b9ceaad7ad63c1c03c2a89e148340ad3a62a482
1429 Author: djm@openbsd.org <djm@openbsd.org>
1430 Date: Thu Apr 6 03:12:32 2023 +0000
1432 upstream: don't care about glob() return value here.
1434 OpenBSD-Commit-ID: 85bb82fea90478a482e9f65a1bec0aa24227fd66
1436 commit 09d8da0849e2791b2500267cda333cd238f38754
1437 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1438 Date: Mon Apr 3 08:10:54 2023 +0000
1440 upstream: Move up null check and simplify process_escapes.
1442 Based on Coverity CID 291863 which points out we check the channel
1443 pointer for NULLness after dereferencing it. Move this to the start
1444 of the function, and while there simplify initialization of efc a bit.
1447 OpenBSD-Commit-ID: de36e5ad6fde0fe263ca134e986b9095dc59380a
1449 commit b36b162be5e6206f12b734222b7bc517c13a6bc8
1450 Author: Damien Miller <djm@mindrot.org>
1451 Date: Fri Mar 31 14:51:20 2023 +1100
1453 need va_end() after va_copy(); ok dtucker
1457 commit f703757234a5c585553e72bba279b255a272750a
1458 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1459 Date: Fri Mar 31 05:56:36 2023 +0000
1461 upstream: Explicitly ignore return from waitpid here too.
1463 OpenBSD-Commit-ID: eef2403df083c61028969fc679ee370373eacacb
1465 commit 6b73aa29035991d1448a1a76f63ac152a6bf931c
1466 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1467 Date: Fri Mar 31 04:45:08 2023 +0000
1469 upstream: Explictly ignore return codes
1471 where we don't check them.
1473 OpenBSD-Commit-ID: 1ffb03038ba1b6b72667be50cf5e5e396b5f2740
1475 commit 6f0308a3e717ebe68eeb3f95253612fab5dbf20e
1476 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1477 Date: Fri Mar 31 04:42:29 2023 +0000
1479 upstream: Return immediately from get_sock_port
1481 if sock <0 so we don't call getsockname on a negative FD. From Coverity
1484 OpenBSD-Commit-ID: de1c1130646230c2eda559831fc6bfd1b61d9618
1486 commit 1c1124dc901fca1ea2cb762044b8f1a5793a2bed
1487 Author: djm@openbsd.org <djm@openbsd.org>
1488 Date: Fri Mar 31 04:23:02 2023 +0000
1490 upstream: don't leak arg2 on parse_pubkey_algos error path; ok
1494 OpenBSD-Commit-ID: 7d0270ad3dd102412ca76add2b3760518abdef75
1496 commit 8ba2d4764bb6a4701cd447d8b52604622ffe65f4
1497 Author: djm@openbsd.org <djm@openbsd.org>
1498 Date: Fri Mar 31 04:22:27 2023 +0000
1500 upstream: clamp max number of GSSAPI mechanisms to 2048; ok dtucker
1502 OpenBSD-Commit-ID: ce66db603a913d3dd57063e330cb5494d70722c4
1504 commit 1883841fc13d0eada8743cac5d3abe142ee2efa7
1505 Author: djm@openbsd.org <djm@openbsd.org>
1506 Date: Fri Mar 31 04:21:56 2023 +0000
1508 upstream: don't print key if printing hostname failed; with/ok
1512 OpenBSD-Commit-ID: ad42971a6ee5a46feab2d79f7f656f8cf4b119f3
1514 commit c6011129cafe4c411f6ef670a4cf271314708eb8
1515 Author: djm@openbsd.org <djm@openbsd.org>
1516 Date: Fri Mar 31 04:04:15 2023 +0000
1518 upstream: remove redundant test
1520 OpenBSD-Commit-ID: 6a0b719f9b1ae9d42ad8c5b144c7962c93792f7c
1522 commit 4fb29eeafb40a2076c0dbe54e46b687c318f87aa
1523 Author: djm@openbsd.org <djm@openbsd.org>
1524 Date: Fri Mar 31 04:00:37 2023 +0000
1526 upstream: don't attempt to decode a ridiculous number of
1528 attributes; harmless because of bounds elsewhere, but better to be explicit
1530 OpenBSD-Commit-ID: 1a34f4b6896155b80327d15dc7ccf294b538a9f2
1532 commit fc437c154ef724621a4af236de9bc7e51a8381ae
1533 Author: djm@openbsd.org <djm@openbsd.org>
1534 Date: Fri Mar 31 03:22:49 2023 +0000
1536 upstream: remove unused variable; prompted by Coverity CID 291879
1538 OpenBSD-Commit-ID: 4c7d20ef776887b0ba1aabcfc1b14690e4ad0a40
1540 commit 0eb8131e4a53b33a8fc9b9ab694e6b6778b87ade
1541 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1542 Date: Fri Mar 31 00:44:29 2023 +0000
1544 upstream: Check fd against >=0 instead of >0 in error path. The
1546 dup could in theory return fd 0 although currently it doesn't in practice.
1547 From Dmitry Belyavskiy vi github PR#238.
1549 OpenBSD-Commit-ID: 4a95f3f7330394dffee5c749d52713cbf3b54846
1551 commit 7174ba6f8a431ca4257767a260fc50e204068242
1552 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1553 Date: Thu Mar 30 07:19:50 2023 +0000
1555 upstream: Ignore return value from muxclient(). It normally loops
1557 without returning, but it if returns on failure we immediately exit.
1558 Coverity CID 405050.
1560 OpenBSD-Commit-ID: ab3fde6da384ea588226037c38635a6b2e015295
1562 commit a4c1c2513e36f111eeaa1322c510067930e5e51e
1563 Author: Damien Miller <djm@mindrot.org>
1564 Date: Fri Mar 31 14:17:22 2023 +1100
1566 don't call connect() on negative socket
1570 commit 34ee842cdd981a759fe8f0d4a37521f9a1c63170
1571 Author: djm@openbsd.org <djm@openbsd.org>
1572 Date: Thu Mar 30 03:05:01 2023 +0000
1574 upstream: return SSH_ERR_KEY_NOT_FOUND if the allowed_signers file
1576 is empty, not SSH_ERR_INTERNAL_ERROR. Also remove some dead code spotted
1577 by Coverity; with/ok dtucker@
1579 OpenBSD-Commit-ID: 898a1e817cda9869554b1f586a434f67bcc3b650
1581 commit f108e77a9dc9852e72215af1bf27731c48434557
1582 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1583 Date: Thu Mar 30 00:49:37 2023 +0000
1585 upstream: Remove dead code from inside if block.
1587 The only way the if statement can be true is if both dup()s fail, and
1588 in that case the tmp2 can never be set. Coverity CID 291805, ok djm@
1590 OpenBSD-Commit-ID: c0d6089b3fb725015462040cd94e23237449f0c8
1592 commit 05b8e88ebe23db690abbfb1a91111abea09cde08
1593 Author: Darren Tucker <dtucker@dtucker.net>
1594 Date: Thu Mar 30 13:53:29 2023 +1100
1596 child_set_eng: verify both env pointer and count.
1598 If child_set env was called with a NULL env pointer and a non-zero count
1599 it would end up in a null deref, although we don't currently do this.
1600 Prompted by Coverity CID 291850, tweak & ok djm@
1602 commit 28f1b8ef9b84b8cd2f6c9889a0c60aa4a90dadfa
1603 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1604 Date: Wed Mar 29 01:07:48 2023 +0000
1606 upstream: Ignore return from sshpkt_disconnect
1608 since we set our own return value for the function. Coverity CID 291797,
1611 OpenBSD-Commit-ID: 710b57ba954c139240895e23feea41f203201f04
1613 commit c3da05d95922f5550bcc7815e799474d6a160175
1614 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1615 Date: Wed Mar 29 00:59:08 2023 +0000
1617 upstream: Plug potential mem leak in process_put.
1619 It allocates abs_dst inside a loop but only frees it on exit, so free
1620 inside the loop if necessary. Coverity CID 291837, ok djm@
1622 OpenBSD-Commit-ID: a01616503a185519b16f00dde25d34ceaf4ae1a3
1624 commit 13ae327eae598b1043e5ec30e4b170edb3c898a5
1625 Author: djm@openbsd.org <djm@openbsd.org>
1626 Date: Wed Mar 29 00:18:35 2023 +0000
1628 upstream: fix memory leak; Coverity CID 291848
1632 OpenBSD-Commit-ID: 37f80cb5d075ead5a00ad1b74175684ab1156ff8
1634 commit 9ffa76e1284c85bf459c3dcb8e995733a8967e1b
1635 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1636 Date: Tue Mar 28 07:44:32 2023 +0000
1638 upstream: Plug more mem leaks in sftp by making
1640 make_absolute_pwd_glob work in the same way as make_absolute: you
1641 pass it a dynamically allocated string and it either returns it, or
1642 frees it and allocates a new one. Patch from emaste at freebsd.org and
1643 https://reviews.freebsd.org/D37253 ok djm@
1645 OpenBSD-Commit-ID: 85f7404e9d47fd28b222fbc412678f3361d2dffc
1647 commit 82b2b8326962b1a98af279bc5bbbbbcab15b3e45
1648 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1649 Date: Tue Mar 28 06:12:38 2023 +0000
1651 upstream: Remove compat code for OpenSSL < 1.1.*
1653 since -portable no longer supports them.
1655 OpenBSD-Commit-ID: ea2893783331947cd29a67612b4e56f818f185ff
1657 commit b500afcf00ae1b6b73b2ccf171111dfbfeaef74d
1658 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1659 Date: Mon Mar 27 23:56:54 2023 +0000
1661 upstream: Remove compat code for OpenSSL 1.0.*
1663 versions now that -portable has dropped support for those versions.
1665 OpenBSD-Regress-ID: 82a8eacd87aec28e4aa19f17246ddde9d5ce7fe7
1667 commit 727560e6011efcb36d2f3ac6910444bc775abaa1
1668 Author: Darren Tucker <dtucker@dtucker.net>
1669 Date: Tue Mar 28 18:06:42 2023 +1100
1671 Prevent conflicts between Solaris SHA2 and OpenSSL.
1673 We used to prevent conflicts between native SHA2 headers and OpenSSL's
1674 by setting OPENSSL_NO_SHA but that was removed prior to OpenSSL 1.1.0
1676 commit 46db8e14b7f186d32173dcdecd5b785334429b8b
1677 Author: Darren Tucker <dtucker@dtucker.net>
1678 Date: Tue Mar 28 12:44:03 2023 +1100
1680 Remove HEADER_SHA_H from previous...
1682 since it causes more problems than it solves.
1684 commit 72bd68d37387aa5f81da928f6e82f1c88ed8f674
1685 Author: Darren Tucker <dtucker@dtucker.net>
1686 Date: Tue Mar 28 10:35:18 2023 +1100
1688 Replace OPENSSL_NO_SHA with HEADER_SHA_H.
1690 Since this test doesn't use OpenSSL's SHA2 and may cause conflicts we
1691 don't want to include it, but OPENSSL_NO_SHA was removed beginning in
1692 OpenSSL's 1.1 series.
1694 commit 99668f2e6e0deb833e46cfab56db59ff0fc28c7e
1695 Author: Darren Tucker <dtucker@dtucker.net>
1696 Date: Tue Mar 28 09:50:06 2023 +1100
1698 Configure with --target instead of deprecated form.
1700 commit f751d9306c62cd1061f966e6a7483d9bab9c379b
1701 Author: Darren Tucker <dtucker@dtucker.net>
1702 Date: Mon Mar 27 22:05:29 2023 +1100
1704 Pass rpath when building 64bit Solaris.
1706 commit a64b935cd450ee8d04c26c9cd728629cf9ca5c91
1707 Author: Darren Tucker <dtucker@dtucker.net>
1708 Date: Mon Mar 27 19:21:19 2023 +1100
1710 Explicitly disable OpenSSL on AIX test VM.
1712 commit 7ebc6f060fc2f70495a56e16d210baae6424cd96
1713 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1714 Date: Mon Mar 27 03:56:50 2023 +0000
1716 upstream: Add RevokedHostKeys to percent expansion test.
1718 OpenBSD-Regress-ID: c077fd12a38005dd53d878c5b944154dec88d2ff
1720 commit f1a17de150f8d309d0c52f9abfaebf11c51a8537
1721 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1722 Date: Mon Mar 27 03:56:11 2023 +0000
1724 upstream: Add tilde and environment variable expansion to
1726 RevokedHostKeys. bz#3552, ok djm@
1728 OpenBSD-Commit-ID: ce5d8e0219b63cded594c17d4c2958c06918ec0d
1730 commit 009eb4cb48a9708ab9174684dcbcc0f942907abe
1731 Author: djm@openbsd.org <djm@openbsd.org>
1732 Date: Mon Mar 27 03:31:05 2023 +0000
1734 upstream: fix test: getnameinfo returns a non-zero value on error, not
1736 (neccessarily) -1. From GHPR#384
1738 OpenBSD-Commit-ID: d35e2b71268f66f5543a7ea68751972b3ae22b25
1740 commit 4f0a676486700f10a4788f7e9426e94e39c1c89e
1741 Author: djm@openbsd.org <djm@openbsd.org>
1742 Date: Mon Mar 27 03:25:08 2023 +0000
1744 upstream: scp: when copying local->remote, check that source file
1746 exists before opening SFTP connection to the server. Based on GHPR#370 ok
1749 OpenBSD-Commit-ID: b4dd68e15bfe22ce4fac9960a1066a2b721e54fb
1751 commit 154d8baf631327163571760c2c524bc93c37567c
1752 Author: Darren Tucker <dtucker@dtucker.net>
1753 Date: Mon Mar 27 12:22:30 2023 +1100
1755 Also look for gdb error message from OpenIndiana.
1757 commit fbd3811ddb2b6ce2e6dba91fde7352c8978e5412
1758 Author: Darren Tucker <dtucker@dtucker.net>
1759 Date: Mon Mar 27 11:08:00 2023 +1100
1761 Explicitly disable security key test on aix51 VM.
1763 We don't know how to build the shared objects required for the security
1764 key tests so skip them.
1766 commit 4922ac3be8a996780ef3dc220411da2e27c29d9c
1767 Author: Darren Tucker <dtucker@dtucker.net>
1768 Date: Sun Mar 26 14:49:43 2023 +1100
1770 Split libcrypto and other config flags.
1772 This should allow the automatic OpenSSL version selection in the tests
1775 commit 4a948b1469f185e871160a2d70e2a0fce2858f9e
1776 Author: Darren Tucker <dtucker@dtucker.net>
1777 Date: Sun Mar 26 14:39:45 2023 +1100
1779 Specify test target if we build without OpenSSL.
1781 When we decide we can't use the versions of OpenSSL available, also
1782 restrict the tests we run to avoid the ones that need OpenSSL.
1784 commit b308c636f5b5d89eecb98be00b3d56306a005a09
1785 Author: Darren Tucker <dtucker@dtucker.net>
1786 Date: Sun Mar 26 14:22:53 2023 +1100
1788 Find suitable OpenSSL version.
1790 Check the installed OpenSSL versions for a suitable one, and if there
1791 isn't (and we don't have a specific version configured) then build
1794 commit 021ea5c2860f133f44790970968e0e73208b3a87
1795 Author: Damien Miller <djm@mindrot.org>
1796 Date: Fri Mar 24 15:02:52 2023 +1100
1798 Github testing support for BoringSSL
1800 commit 9a97cd106466a2a9bda2bfaa4c48c4f1b2cc9c1b
1801 Author: Damien Miller <djm@mindrot.org>
1802 Date: Fri Mar 24 15:34:29 2023 +1100
1804 BoringSSL doesn't support EC_POINT_point2bn()
1806 so don't invoke it in unittest
1808 commit cc5969c033a032d126ff78e5d95cf20abbede4c7
1809 Author: Damien Miller <djm@mindrot.org>
1810 Date: Fri Mar 24 15:34:05 2023 +1100
1812 another ERR_load_CRYPTO_strings() vestige
1814 commit 4974293899a068133e976f81d6693670d2b576ca
1815 Author: Damien Miller <djm@mindrot.org>
1816 Date: Fri Mar 24 15:24:05 2023 +1100
1818 don't use obsolete ERR_load_CRYPTO_strings()
1820 OpenSSL (and elsewhere in OpenSSH) uses ERR_load_crypto_strings()
1822 commit 3c527d55f906e6970d17c4cab6db90ae9e013235
1823 Author: Damien Miller <djm@mindrot.org>
1824 Date: Fri Mar 24 15:23:05 2023 +1100
1826 Allow building with BoringSSL
1828 commit b7e27cfd7f163fc16b4c5d041cc28ee488a5eeec
1829 Author: Damien Miller <djm@mindrot.org>
1830 Date: Fri Mar 24 15:21:18 2023 +1100
1832 put back SSLeay_version compat in configure test
1834 Needed to detect old versions and give good "your version is bad"
1835 messages at configure time; spotted by dtucker@
1837 commit 7280401bdd77ca54be6867a154cc01e0d72612e0
1838 Author: Damien Miller <djm@mindrot.org>
1839 Date: Fri Mar 24 13:56:25 2023 +1100
1841 remove support for old libcrypto
1843 OpenSSH now requires LibreSSL 3.1.0 or greater or
1844 OpenSSL 1.1.1 or greater
1848 commit abda22fb48302f2142233f71d27c74040288c518
1849 Author: Darren Tucker <dtucker@dtucker.net>
1850 Date: Sun Mar 19 15:36:13 2023 +1100
1852 Test latest OpenSSL 1.1, 3.0 and LibreSSL 3.7.
1854 commit 610ac1cb077cd5a1ebfc21612154bfa13d2ec825
1855 Author: Darren Tucker <dtucker@dtucker.net>
1856 Date: Thu Mar 16 21:38:04 2023 +1100
1858 Show 9.3 branch instead of 9.2.
1860 commit cb30fbdbee869f1ce11f06aa97e1cb8717a0b645
1861 Author: Damien Miller <djm@mindrot.org>
1862 Date: Thu Mar 16 08:28:19 2023 +1100
1866 commit 1dba63eb10c40b6fda9f5012ed6ae87e2d3d028e
1867 Author: Damien Miller <djm@mindrot.org>
1868 Date: Thu Mar 16 08:27:54 2023 +1100
1872 commit ba7532d0dac9aaf0ad7270664c43837fc9f64a5f
1873 Author: djm@openbsd.org <djm@openbsd.org>
1874 Date: Wed Mar 15 21:19:57 2023 +0000
1876 upstream: openssh-9.3
1878 OpenBSD-Commit-ID: 8011495f2449c1029bb316bd015eab2e00509848
1880 commit 6fd4daafb949b66bf555f3100f715a9ec64c3390
1881 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1882 Date: Tue Mar 14 07:28:47 2023 +0000
1884 upstream: Free KRL ptr in addition to its contents.
1886 From Coverity CID 291841, ok djm@
1888 OpenBSD-Commit-ID: f146ba08b1b43af4e0d7ad8c4dae3748b4fa31b6
1890 commit 1d270bd303afaf6d94e9098cbbf18e5e539e2088
1891 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1892 Date: Tue Mar 14 07:26:25 2023 +0000
1894 upstream: Check pointer for NULL before deref.
1896 None of the existing callers seem to do that, but it's worth checking.
1897 From Coverity CID 291834, ok djm@
1899 OpenBSD-Commit-ID: a0a97113f192a7cb1a2c97b932f677f573cda7a4
1901 commit d95af508e78c0cd3dce56b83853baaa59ae295cf
1902 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1903 Date: Sun Mar 12 10:40:39 2023 +0000
1905 upstream: Limit number of entries in SSH2_MSG_EXT_INFO
1907 request. This is already constrained by the maximum SSH packet size but this
1908 makes it explicit. Prompted by Coverity CID 291868, ok djm@ markus@
1910 OpenBSD-Commit-ID: aea023819aa44a2dcb9dd0fbec10561896fc3a09
1912 commit 8f287ba60d342b3e2f750e7332d2131e3ec7ecd0
1913 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1914 Date: Sun Mar 12 09:41:18 2023 +0000
1916 upstream: calloc can return NULL but xcalloc can't.
1918 From Coverity CID 291881, ok djm@
1920 OpenBSD-Commit-ID: 50204b755f66b2ec7ac3cfe379d07d85ca161d2b
1922 commit 83a56a49fd50f4acf900f934279482e4ef329715
1923 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1924 Date: Fri Mar 10 07:17:08 2023 +0000
1926 upstream: Explicitly ignore return from fcntl
1928 (... FD_CLOEXEC) here too. Coverity CID 291853.
1930 OpenBSD-Commit-ID: 99d8b3da9d0be1d07ca8dd8e98800a890349e9b5
1932 commit 0fda9d704d3bbf54a5e64ce02a6fecb11fe7f047
1933 Author: Damien Miller <djm@mindrot.org>
1934 Date: Fri Mar 10 15:59:46 2023 +1100
1936 bounds checking for getrrsetbyname() replacement;
1938 Spotted by Coverity in CID 405033; ok millert@
1940 commit 89b8df518f21677045599df0ad3e5dd0f39909b5
1941 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1942 Date: Fri Mar 10 04:06:21 2023 +0000
1944 upstream: Plug mem leak on error path. Coverity CID 405026, ok djm@.
1946 OpenBSD-Commit-ID: 8212ca05d01966fb5e72205c592b2257708a2aac
1948 commit bf4dae0ad192c3e2f03f7223834b00d88ace3d3e
1949 Author: Darren Tucker <dtucker@dtucker.net>
1950 Date: Fri Mar 10 14:46:57 2023 +1100
1952 Add prototypes for mkstemp replacements.
1954 Should prevent warnings due to our wrapper function.
1956 commit 4e04d68d6a33cdc73b831fd4b5e6124175555d3d
1957 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1958 Date: Fri Mar 10 03:01:51 2023 +0000
1960 upstream: Expliticly ignore return code from fcntl(.. FD_CLOEXEC) since
1962 there's not much we can do anyway. From Coverity CID 291857, ok djm@
1964 OpenBSD-Commit-ID: 051429dd07af8db3fec10d82cdc78d90bb051729
1966 commit d6d38fd77cbe091c59e1bb720c3a494df4990640
1967 Author: djm@openbsd.org <djm@openbsd.org>
1968 Date: Fri Mar 10 02:32:04 2023 +0000
1970 upstream: Like sshd_config, some ssh_config options are not
1972 first-match-wins. sshd_config.5 was fixed in r1.348, this is the same for
1975 OpenBSD-Commit-ID: 7be55b9351cde449b136afcc52d07aa4113b215e
1977 commit 7187d3f86bf8f2066cc9941f217d23b0cacae25e
1978 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1979 Date: Fri Mar 10 02:24:56 2023 +0000
1981 upstream: Remove no-op (int) > INT_MAX checks
1983 since they can never be true. From Coverity CID 405031, ok djm@
1985 OpenBSD-Commit-ID: 9df3783b181e056595e2bb9edf7ed41d61cf8e84
1987 commit 77adde4305542ebe3005dd456122624fe2347b01
1988 Author: Darren Tucker <dtucker@dtucker.net>
1989 Date: Fri Mar 10 13:27:29 2023 +1100
1991 Wrap mkstemp calls with umask set/restore.
1993 glibc versions 2.06 and earlier did not set a umask on files created by
1994 mkstemp created the world-writable. Wrap mkstemp to set and restore
1995 the umask. From Coverity (CIDs 291826 291886 291891), ok djm@
1997 commit 633d3dc2a1e9e2a013d019a0576a0771c8423713
1998 Author: jcs@openbsd.org <jcs@openbsd.org>
1999 Date: Thu Mar 9 21:06:24 2023 +0000
2001 upstream: modify parentheses in conditionals to make it clearer what is
2003 being assigned and what is being checked
2007 OpenBSD-Commit-ID: 19c10baa46ae559474409f75a5cb3d0eade7a9b8
2009 commit 733030840c4772f858de95d5940ec0c37663e8b0
2010 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2011 Date: Thu Mar 9 07:11:05 2023 +0000
2013 upstream: Re-split the merge of the reorder-hostkeys test.
2015 In the kex_proposal_populate_entries change I merged the the check for
2016 reordering hostkeys with the actual reordering, but kex_assemble_names
2017 mutates options.hostkeyalgorithms which renders the check ineffective.
2018 Put the check back where it was. Spotted and tested by jsg@, ok djm@
2020 OpenBSD-Commit-ID: a7469f25a738db5567395d1881e32479a7ffc9de
2022 commit 54ac4ab2b53ce9fcb66b8250dee91c070e4167ed
2023 Author: djm@openbsd.org <djm@openbsd.org>
2024 Date: Thu Mar 9 06:58:26 2023 +0000
2026 upstream: include destination constraints for smartcard keys too.
2028 Spotted by Luci Stanescu; ok deraadt@ markus@
2030 OpenBSD-Commit-ID: add879fac6903a1cb1d1e42c4309e5359c3d870f
2032 commit bfd1ad01d974a316b60622759ad17537fa2d92b4
2033 Author: Darren Tucker <dtucker@dtucker.net>
2034 Date: Thu Mar 9 18:24:54 2023 +1100
2036 Limit the number of PAM environment variables.
2038 xcalloc has its own limits, but these are specific to PAM. From
2039 Coverity CID 405198, ok djm@
2041 commit a231414970e01a35f45a295d5f93698fa1249b28
2042 Author: Darren Tucker <dtucker@dtucker.net>
2043 Date: Thu Mar 9 18:19:44 2023 +1100
2045 Limit the number of PAM environment variables.
2047 From Coverity CID 405194, tweaks and ok djm@
2049 commit 36c6c3eff5e4a669ff414b9daf85f919666e8e03
2050 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2051 Date: Wed Mar 8 06:21:32 2023 +0000
2053 upstream: Plug mem leak. Coverity CID 405196, ok djm@
2055 OpenBSD-Commit-ID: 175f09349387c292f626da68f65f334faaa085f2
2057 commit dfb9b736e1ccf9e6b03eea21cd961f4fd0634c98
2058 Author: tb@openbsd.org <tb@openbsd.org>
2059 Date: Wed Mar 8 05:33:53 2023 +0000
2061 upstream: ssh-pkcs11: synchronize error messages with errors
2063 A handful of error messages contained incorrect function names or
2064 otherwise inaccurate descriptions. Fix them to match reality.
2068 OpenBSD-Commit-ID: 165a15db52f75b31e1804b043480c36af09f3411
2070 commit 51875897b81b5c21b80c256a29597916edbde454
2071 Author: guenther@openbsd.org <guenther@openbsd.org>
2072 Date: Wed Mar 8 04:43:12 2023 +0000
2074 upstream: Delete obsolete /* ARGSUSED */ lint comments.
2078 OpenBSD-Commit-ID: 7be168a570264d59e96a7d2d22e927d45fee0e4c
2080 commit a76085bda883c2104afb33ab0334eca190927362
2081 Author: Darren Tucker <dtucker@dtucker.net>
2082 Date: Wed Mar 8 17:25:37 2023 +1100
2084 Extra brackets to prevent warning.
2086 commit 147ae57d4dfa0508109f93b78a7d8b92819e1f83
2087 Author: djm@openbsd.org <djm@openbsd.org>
2088 Date: Wed Mar 8 00:05:58 2023 +0000
2090 upstream: use RSA/SHA256 when testing usability of private key in
2092 agent; with/ok dtucker
2094 OpenBSD-Commit-ID: fe1382e2fdf23fcae631308e72342bad56066a56
2096 commit 27fd251bc906a763e70ce0f27c8abdf8bbd1e416
2097 Author: djm@openbsd.org <djm@openbsd.org>
2098 Date: Wed Mar 8 00:05:37 2023 +0000
2100 upstream: use RSA/SHA256 when testing usability of private key;
2102 based on fix in bz3546 by Dmitry Belyavskiy; with/ok dtucker
2104 OpenBSD-Commit-ID: 0ef414cc363a832f9fab92a5da0234448bce2eba
2106 commit eee9f3fc3d52ae7d2106929bb06b7f291fb0b81a
2107 Author: djm@openbsd.org <djm@openbsd.org>
2108 Date: Tue Mar 7 21:47:42 2023 +0000
2110 upstream: refactor to be more readable top to bottom. Prompted by
2112 Coverity CID 405048 which was a false-positive fd leak; ok dtucker@
2114 OpenBSD-Commit-ID: fc55ec2af622a017defb9b768bf26faefc792c00
2116 commit 42a06b29a4c99272bf690f9b3be520b08b448dc5
2117 Author: Darren Tucker <dtucker@dtucker.net>
2118 Date: Tue Mar 7 18:34:41 2023 +1100
2120 Add header changes missed in previous.
2122 commit 4710077096edff2e6926dd5b15bf586491d317db
2123 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2124 Date: Tue Mar 7 06:09:14 2023 +0000
2126 upstream: Fix mem leak in environment setup.
2128 From jjelen at redhat.com via bz#2687, ok djm@
2130 OpenBSD-Commit-ID: 9f9e4ba3cac003e6f81da3bcebd1b9ec43e7f353
2132 commit 03acc50d0ccb78fc91d1570de1cd0fdfea646028
2133 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2134 Date: Mon Mar 6 12:15:47 2023 +0000
2136 upstream: Unit test for kex_proposal_populate_entries.
2138 OpenBSD-Regress-ID: bdb211d80d572a08bf14b49fe2a58b9ff265c006
2140 commit 3f9231c2e1f374ebb08016ba00ea97b47c0ed20b
2141 Author: djm@openbsd.org <djm@openbsd.org>
2142 Date: Tue Mar 7 05:37:26 2023 +0000
2144 upstream: fix memory leak in process_read() path; Spotted by James
2146 Robinson in GHPR363; ok markus@
2148 OpenBSD-Commit-ID: cdc2d98e6478b7e7f3a36976845adae3820429d8
2150 commit c5e6e890839ec520ab9301a92cba56303749dea2
2151 Author: djm@openbsd.org <djm@openbsd.org>
2152 Date: Tue Mar 7 01:30:52 2023 +0000
2154 upstream: correct size for array argument when changing
2156 UMAC_OUTPUT_LEN Coverity CID 291845; ok dtucker@
2158 OpenBSD-Commit-ID: 2eb017d10705bb623d4418691f961c930eafaec0
2160 commit 9641753e0fd146204d57b2a4165f552a81afade4
2161 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2162 Date: Mon Mar 6 12:14:48 2023 +0000
2164 upstream: Refactor creation of KEX proposal.
2166 This adds kex_proposal_populate_entries (and corresponding free) which
2167 populates the KEX proposal array with dynamically allocated strings.
2168 This replaces the previous mix of static and dynamic that has been the
2169 source of previous leaks and bugs. Remove unused compat functions.
2172 OpenBSD-Commit-ID: f2f99da4aae2233cb18bf9c749320c5e040a9c7b
2174 commit aa59d6a489fb20973fa461d0fdb1110db412947b
2175 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2176 Date: Sun Mar 5 09:24:35 2023 +0000
2178 upstream: Fix mem and FILE leaks in moduli screening.
2180 If multiple -Ocheckpoint= options are passed, the earlier ones would
2181 be overwritten and leaked. If we use an input file that wasn't stdin,
2182 close that. From Coverity CIDs 291884 and 291894.
2184 OpenBSD-Commit-ID: a4d9d15f572926f841788912e2b282485ad09e8b
2186 commit 23b8cb41767af99a1aac24589d1882d9c8c2c205
2187 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2188 Date: Sun Mar 5 08:18:58 2023 +0000
2190 upstream: Plug mem leak in moduli checkpoint option parsing.
2192 From Coverity CID 291894.
2194 OpenBSD-Commit-ID: 9b1aba2d049741ae21c8dc4560a7e29ab17310f4
2196 commit fc7f8f2188d4a4fc8ba77eddbe863c7665666db5
2197 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2198 Date: Sun Mar 5 05:34:09 2023 +0000
2200 upstream: Remove unused compat.h includes.
2202 We've previously removed a lot of the really old compatibility code,
2203 and with it went the need to include compat.h in most of the files that
2206 OpenBSD-Commit-ID: 5af8baa194be00a3092d17598e88a5b29f7ea2b4
2208 commit 6c165c36246d8004c20e1df5cec4961a5ac422d6
2209 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2210 Date: Sat Mar 4 03:22:59 2023 +0000
2212 upstream: Use time_t for x11 timeout.
2214 Use time_t instead of u_int for remaining x11 timeout checks for 64bit
2215 time_t safety. From Coverity CIDs 405197 and 405028, ok djm@
2217 OpenBSD-Commit-ID: 356685bfa1fc3d81bd95722d3fc47101cc1a4972
2219 commit 4a3918f51bd2d968387e7aa87e33b32c78077fb4
2220 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2221 Date: Fri Mar 3 10:23:42 2023 +0000
2223 upstream: Ensure ms_remain is always initialized
2225 similar to what we do in ssh_packet_write_wait. bz#2687, from jjelen
2228 OpenBSD-Commit-ID: a50e0541cf823f8d1c72f71ccde925d3dbe6dfac
2230 commit e44846a4487d2885ac7f2610be09b1e2bf52249b
2231 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2232 Date: Fri Mar 3 09:48:51 2023 +0000
2234 upstream: Check for non-NULL before string
2236 comparison. From jjelen at redhat.com via bz#2687.
2238 OpenBSD-Commit-ID: 0d9b2e0cac88a311b5766b1aef737082583c285f
2240 commit 1842d523fae63b862ce8e60725c9b606cddb86a6
2241 Author: djm@openbsd.org <djm@openbsd.org>
2242 Date: Fri Mar 3 05:00:34 2023 +0000
2244 upstream: guard against getsockname(-1, ...) from Coverity CID
2248 OpenBSD-Commit-ID: e58d5227327917d189229b7f0b37d2780f360d5f
2250 commit 78571a5fe9847d40d7f220c92b707574ae9ec4ce
2251 Author: djm@openbsd.org <djm@openbsd.org>
2252 Date: Fri Mar 3 04:36:20 2023 +0000
2254 upstream: some options are not first-match-wins. Mention that there
2256 are exceptions at the start of the manpage and label some of them in the
2259 OpenBSD-Commit-ID: 3b74728446fa6fc8742769eeb8c3674e233e84c4
2261 commit d1c1b3272e8895a96c4f5889bd6e07a8525bd9f1
2262 Author: djm@openbsd.org <djm@openbsd.org>
2263 Date: Fri Mar 3 04:34:49 2023 +0000
2265 upstream: actually print "channeltimeout none" in config dump mode;
2267 spotted via Coverity CID 405022
2269 OpenBSD-Commit-ID: b074b52bf138b75f08264e8da15880b29c7a630f
2271 commit 8bf61e95610b48192d4e1720cc15d9004617301d
2272 Author: Darren Tucker <dtucker@dtucker.net>
2273 Date: Fri Mar 3 14:50:03 2023 +1100
2275 Add Coverity badges.
2277 commit 93291bd723959adf462b1df958106cf07a7734dd
2278 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2279 Date: Fri Mar 3 03:12:24 2023 +0000
2281 upstream: Check return values of dup2. Spotted by Coverity, ok djm@
2283 OpenBSD-Commit-ID: 19fb1b53072826d00c67df677731d2f6c1dd602b
2285 commit e37261dff33af23f37202cfce0848d36f5c1055c
2286 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2287 Date: Fri Mar 3 02:37:58 2023 +0000
2289 upstream: Use time_t for x11_refuse_time timeout. We need
2291 SSH_TIME_T_MAX for this, so move from misc.c to misc.h so it's available.
2292 Fixes a Coverity warning for 64bit time_t safety, ok djm@
2294 OpenBSD-Commit-ID: c69c4c3152cdaab953706db4ccf4d5fd682f7d8d
2296 commit 32755a98c29114b13f4c9d47454bbb265b932ad7
2297 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2298 Date: Fri Mar 3 02:34:29 2023 +0000
2300 upstream: Check return value from fctnl and warn on failure.
2302 Spotted by Coverity, ok djm@
2304 OpenBSD-Commit-ID: 2097c7db3cf657f1e3a6c5077041bacc63143cab
2306 commit 5fc60e8246c36b8255f72a937ebe9787b39648c6
2307 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2308 Date: Thu Mar 2 11:10:27 2023 +0000
2310 upstream: Remove SUDO in proxy command wrapper. Anything that needs
2312 sudo is already run by it, and it breaks if root isn't in sudoers.
2314 OpenBSD-Regress-ID: 6cf22fda32a89c16915f31a6ed9bbdbef2a3bac9
2316 commit 0d514659b23a257247491179cfbb53a6dd64e164
2317 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2318 Date: Thu Mar 2 08:24:41 2023 +0000
2320 upstream: Fix breakage on dhgex test.
2322 This was due to the sshd logs being written to the wrong log file.
2323 While there, make save_debug_logs less verbose, write the name of the
2324 tarball to regress.log and use $SUDO to remove the old symlinks (which
2325 shouldn't be needed, but won't hurt). Initial problem spotted by anton@.
2327 OpenBSD-Regress-ID: 9c44fb9cd418e6ff31165e7a6c1f9f11a6d19f5b
2329 commit 860201201d4ae655702807966901682cff30a171
2330 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2331 Date: Thu Mar 2 08:14:52 2023 +0000
2333 upstream: Quote grep and log message better.
2335 OpenBSD-Regress-ID: 3823d9063127169736aa274b1784cb28e15b64d4
2337 commit 03a03c6002525f5ad9c8fc874a5d5826a35d9858
2338 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2339 Date: Thu Mar 2 06:41:56 2023 +0000
2341 upstream: Always call fclose on checkpoints.
2343 In the case of an fprintf failure we would not call fclose which would
2344 leak the FILE pointer. While we're there, try to clean up the temp file
2345 on failure. Spotted by Coverity, ok djm@
2347 OpenBSD-Commit-ID: 73c7ccc5d4fcc235f54c6b20767a2815408525ef
2349 commit 13fe8f9785e6d90400ce548939a0b0ddc11fcb3c
2350 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2351 Date: Wed Mar 1 21:54:50 2023 +0000
2353 upstream: Remove old log symlinks
2355 before creating new ones. In -portable some platforms don't like
2356 overwriting existing symlinks.
2358 OpenBSD-Regress-ID: 7e7ddc0beb73e945e1c4c58d51c8a125b518120f
2360 commit 131fcbcaffd1e3bcf5ab766ec497b5d768955310
2361 Author: Darren Tucker <dtucker@dtucker.net>
2362 Date: Wed Mar 1 23:23:02 2023 +1100
2364 Adjust test jobs for new log directory.
2366 commit a6f4ac8a2baf77e5361cfa017d0dc250d1409bec
2367 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2368 Date: Wed Mar 1 09:29:32 2023 +0000
2370 upstream: Rework logging for the regression tests.
2372 Previously we would log to ssh.log and sshd.log, but that is insufficient
2373 for tests that have more than one concurent ssh/sshd.
2375 Instead, we'll log to separate datestamped files in a $OBJ/log/ and
2376 leave a symlink at the previous location pointing at the most recent
2377 instance with an entry in regress.log showing which files were created
2378 at each point. This should be sufficient to reconstruct what happened
2379 even for tests that use multiple instances of each program. If the test
2380 fails, tar up all of the logs for later analysis.
2382 This will let us also capture the output from some of the other tools
2383 which was previously sent to /dev/null although most of those will be
2386 OpenBSD-Regress-ID: f802aa9e7fa51d1a01225c05fb0412d015c33e24
2388 commit 8ead62ed5e86c7df597d8604f332f49cd1527b85
2389 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2390 Date: Tue Feb 28 21:31:50 2023 +0000
2392 upstream: fatal out if allocating banner string fails to avoid
2394 potential null deref later in sscanf. Spotted by Coverity, ok deraadt@
2396 OpenBSD-Commit-ID: 74e8d228ac00552e96e9e968dfcccf8dd1f46ad5
2398 commit 44ca56ba0b3f531f1d85730cc701097cd49e6868
2399 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2400 Date: Tue Feb 28 08:45:24 2023 +0000
2402 upstream: Explicitly ignore return from fchmod
2404 similar to other calls to prevent warning.
2406 OpenBSD-Commit-ID: fdc5287dcee0860b5a493186414226c655b0eb0a
2408 commit 803392933a3a6f09f834aa5f0c2aab06a3b382f4
2409 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2410 Date: Mon Feb 27 22:12:40 2023 +0000
2412 upstream: Plug mem leak on globbed ls error path.
2414 Spotted by Coverity, ok deraadt@
2416 OpenBSD-Commit-ID: de28476025db29820a9a2e56e98b964d8a02861c
2418 commit aa33b4d396abf47a2a45f982f28d054fb1dcb5c3
2419 Author: Darren Tucker <dtucker@dtucker.net>
2420 Date: Mon Feb 27 21:04:22 2023 +1100
2422 Cast time_t's in debug output to long long.
2424 Should fix Coverity warning about truncation of 64bit time_t.
2426 commit b0fd60a9de62a03189ad57d0c07f0ac51dc00e95
2427 Author: Darren Tucker <dtucker@dtucker.net>
2428 Date: Mon Feb 27 17:28:59 2023 +1100
2430 Do shadow expiry calcs using "long long".
2432 Coverity flags these as potentially not 64bit time_t safe so use
2433 long long for the calculations and debug output. ok djm@
2435 commit 01dbeb3084d714bbd001ff9d03b9de542e8cdf58
2436 Author: Damien Miller <djm@mindrot.org>
2437 Date: Mon Feb 27 17:07:52 2023 +1100
2439 avoid clash between for getopt's struct option
2441 Since we don't use getopt_long() nothing outside the getopt()
2442 implementation itself uses this structure, so move it into the
2443 source to remove it from visibility and clashes with libc's
2447 commit eb88d07c43afe407094e7d609248d85a15e148ef
2448 Author: Darren Tucker <dtucker@dtucker.net>
2449 Date: Sat Feb 25 14:45:41 2023 +1100
2451 Revert explicit chmods on private keys.
2453 This should no longer be needed on Cygwin test runners due to previous
2456 commit 52b75db61030a6c8baf66b73644380cf3f58e26a
2457 Author: Darren Tucker <dtucker@dtucker.net>
2458 Date: Sat Feb 25 14:43:28 2023 +1100
2460 Remove extended ACLs from working dirs.
2462 This should allow umask to work as expected and prevent tests from
2463 failing due to excessive permissions on private keys.
2465 commit 0c5d4c843df5605b043a758d69f9a611ef63c479
2466 Author: Darren Tucker <dtucker@dtucker.net>
2467 Date: Fri Feb 24 13:44:13 2023 +1100
2469 Explicitly set permissions on user and host keys.
2471 On cygwin, the umask might not be sufficient. Should fix tests on
2474 commit 6c9fc9d7a9f7abf82c3294d74e6d4a25735862ce
2475 Author: djm@openbsd.org <djm@openbsd.org>
2476 Date: Wed Feb 22 03:56:43 2023 +0000
2478 upstream: fix progressmeter corruption on wide displays; bz3534
2480 feedback/ok dtucker@
2482 OpenBSD-Commit-ID: f4affee067cec7c182f3e0b307d758e0472762a3
2484 commit fe0bd3cde9665d364e5eedd2c2c2e60d4cdc3786
2485 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2486 Date: Tue Feb 21 06:48:18 2023 +0000
2488 upstream: fseek to end of known_hosts before writing to it.
2490 POSIX and ANSI C require that applications call fseek or similar between
2491 read and writing to a RW file. OpenBSD doesn't enforce this, but some
2492 (System V derived) platforms need this to prevent it from writing a
2493 spurious extra byte (in this case, a newline). ok djm@ deraadt@
2495 OpenBSD-Commit-ID: 33e680dcd8110582a93a40a8491024e961f45137
2497 commit 357fb8ae14c07cd025eeed66e73de91bab569849
2498 Author: Darren Tucker <dtucker@dtucker.net>
2499 Date: Tue Feb 21 17:51:09 2023 +1100
2501 Also run unit tests on AIX VMs.
2503 In the past these tests took too long, but these days it only adds
2504 about 5 min to the run.
2506 commit 17781aaa5188ee1477f7779b280d105512e3dbed
2507 Author: Darren Tucker <dtucker@dtucker.net>
2508 Date: Tue Feb 21 17:38:55 2023 +1100
2510 Wrap stdint.h inside ifdef.
2512 commit ef798bad38505f7bf1b5fa5c0843dfc5a2b192b9
2513 Author: Mayank Sharma <mayank.fit2010@gmail.com>
2514 Date: Mon Feb 20 17:37:15 2023 +0530
2516 Add includes to ptimeout test.
2518 Fixes test failures on AIX due to type mismatches.
2520 commit ab69dda05d5268454209f529fa80f477e60d846a
2521 Author: Darren Tucker <dtucker@dtucker.net>
2522 Date: Mon Feb 20 18:24:39 2023 +1100
2524 Always use the openssl binary configure tells us.
2526 This fixes tests on platforms that do not have the openssl tool
2529 commit 2a7e3449908571af601a4c2d12ab140096442e47
2530 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2531 Date: Fri Feb 17 04:22:50 2023 +0000
2533 upstream: Remove now-unused compat bit SSH_BUG_RSASIGMD5. The code
2535 to set this was removed in OpenSSH 7.7 when support for SSH implementations
2536 dating back to before RFC standardization were removed. "burn it all" djm@
2538 OpenBSD-Commit-ID: 6330935fbe23dd00be79891505e06d1ffdac7cda
2540 commit 0833ccf2c8b7ae08b296c06f17bd53e3ab94b0b0
2541 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2542 Date: Fri Feb 17 03:06:18 2023 +0000
2544 upstream: Remove now-unused compat bit SSH_BUG_BIGENDIANAES. This
2546 was previously set for OpenSSH 2.3 (released in 2000) but this check was
2547 removed in OpenSSH 7.7 (2018). ok djm@ deraadt@
2549 OpenBSD-Commit-ID: 326426ea328707fc9e83305291ab135c87f678af
2551 commit c81c2bea6e828d52b62b448b4ffdd3c163177975
2552 Author: Damien Miller <djm@mindrot.org>
2553 Date: Fri Feb 17 10:12:40 2023 +1100
2557 commit 500f90b39db5f0014e6b0c49ff1f45c994b69293
2558 Author: Damien Miller <djm@mindrot.org>
2559 Date: Fri Feb 17 10:02:08 2023 +1100
2563 commit 68350152406339170721c15e97afdf827a5e4001
2564 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2565 Date: Thu Feb 16 10:10:00 2023 +0000
2567 upstream: Remove SSH_BUG_PASSWORDPAD compat bit
2569 since it's no longer used. ok markus@
2571 OpenBSD-Commit-ID: b92c21f56fe4b7f9a54790d6a9650725c226820b
2573 commit 537cccd804eaf65f32bdce037cc31db4e0ab0f44
2574 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2575 Date: Thu Feb 16 07:55:15 2023 +0000
2577 upstream: Remove SSH_BUG_IGNOREMSG compat flag
2579 since it's only applicable to SSH1 and thus no longer used. ok markus@
2580 "kill it with fire" djm@
2582 OpenBSD-Commit-ID: ea13318b1937795d9db4790d3ce0a6ed01584dab
2584 commit 285cf6cd4b91a0a0ce33193c358c99085af33e43
2585 Author: jmc@openbsd.org <jmc@openbsd.org>
2586 Date: Fri Feb 10 06:41:53 2023 +0000
2588 upstream: space between macro and punctuation; sort usage();
2590 OpenBSD-Commit-ID: 6141610cfca037700730e41f868d1d9124958f8c
2592 commit d39a96f70f81878c77336ed35f5c648c1804b71a
2593 Author: jmc@openbsd.org <jmc@openbsd.org>
2594 Date: Fri Feb 10 06:40:48 2023 +0000
2596 upstream: space between macro and punctuation;
2598 OpenBSD-Commit-ID: abc95e550be9e6d9a7ff64b65c104c7be21ab19e
2600 commit 16e82bf53fc34e43e3b948d43b68d5b27a7335e6
2601 Author: jmc@openbsd.org <jmc@openbsd.org>
2602 Date: Fri Feb 10 06:39:27 2023 +0000
2604 upstream: sort SYNOPSIS;
2606 OpenBSD-Commit-ID: dacd9da33277d5669a51213d880632599c890c1e
2608 commit d9685121ff6d57b8797411f3cb123884a4b96e30
2609 Author: Darren Tucker <dtucker@dtucker.net>
2610 Date: Sat Feb 11 12:32:19 2023 +1100
2612 Improve seccomp compat on older systems.
2614 Check if flags to mmap and madvise are defined before using them.
2615 Should fix problems building on older Linux systems that don't have
2616 these. bz#3537, with & ok djm@.
2618 commit 6180b0fa4f7996687678702806257e661fd5931e
2619 Author: djm@openbsd.org <djm@openbsd.org>
2620 Date: Fri Feb 10 05:06:03 2023 +0000
2622 upstream: test -Ohashalg=... and that the default output contains both
2624 specified hash algorithms; prompted by dtucker@
2626 OpenBSD-Regress-ID: 26f309208c8d8b8fa9c5f419767b85f1e9b22f51
2628 commit d651f5c9fe37e61491eee46c49ba9fa03dbc0e6a
2629 Author: djm@openbsd.org <djm@openbsd.org>
2630 Date: Fri Feb 10 04:56:30 2023 +0000
2632 upstream: let ssh-keygen and ssh-keyscan accept
2634 -Ohashalg=sha1|sha256 when outputting SSHFP fingerprints to allow algorithm
2635 selection. bz3493 ok dtucker@
2637 OpenBSD-Commit-ID: e6e07fe21318a873bd877f333e189eb963a11b3d
2639 commit 18938d11a90b74d63c20b2d3c965d5bd64786ab1
2640 Author: djm@openbsd.org <djm@openbsd.org>
2641 Date: Fri Feb 10 04:47:19 2023 +0000
2643 upstream: add a `sshd -G` option that parses and prints the
2645 effective configuration without attempting to load private keys and perform
2646 other checks. This allows usage of the option before keys have been
2649 bz3460 feedback/ok dtucker@
2651 OpenBSD-Commit-ID: 774504f629023fc25a559ab1d95401adb3a7fb29
2653 commit df7d3dbf7194db8e97730ee0425d4d9d7bdb8b10
2654 Author: djm@openbsd.org <djm@openbsd.org>
2655 Date: Fri Feb 10 04:40:28 2023 +0000
2657 upstream: make `ssh -Q CASignatureAlgorithms` work as the manpage says
2661 OpenBSD-Commit-ID: 0ddb17b3fcbd99bfb5baea4ac5e449620cbd3adc
2663 commit d3b8d4198b6595f23b5859d43dc8fc701f97429b
2664 Author: Darren Tucker <dtucker@dtucker.net>
2665 Date: Fri Feb 10 14:26:44 2023 +1100
2667 Add CentOS 7 test targets.
2669 commit 22efb01e355bba4755b730ed417f91c081445bfc
2670 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2671 Date: Thu Feb 9 09:55:33 2023 +0000
2673 upstream: Test adding terminating newline to known_hosts.
2675 OpenBSD-Regress-ID: 5fc3010ac450195b3fbdeb68e875564968800365
2677 commit caec6da1a583ed8c32c6ad3b81bbcaab46ac8b61
2678 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2679 Date: Wed Feb 8 08:06:03 2023 +0000
2681 upstream: ssh-agent doesn't actually take -v,
2683 so the recently-added ones will result in the test not cleaning up
2684 after itself. Patch from cjwatson at debian.org vi bz#3536.
2686 OpenBSD-Regress-ID: 1fc8283568f5bf2f918517c2c1e778072cf61b1a
2688 commit 3c379c9a849a635cc7f05cbe49fe473ccf469ef9
2689 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2690 Date: Thu Feb 9 09:54:11 2023 +0000
2692 upstream: Ensure that there is a terminating newline when adding a new
2694 entry to known_hosts. bz#3529, with git+openssh at limpsquid.nl, ok deraadt@
2697 OpenBSD-Commit-ID: fa8d90698da1886570512b96f051e266eac105e0
2699 commit 95b6bbd2553547260b324b39d602061c88b774bc
2700 Author: Darren Tucker <dtucker@dtucker.net>
2701 Date: Tue Feb 7 08:43:47 2023 +1100
2703 Replace 9.1 with 9.2 on CI status page.
2705 commit 195313dfe10a23c82e9d56d5fdd2f59beee1bdcf
2706 Author: Damien Miller <djm@mindrot.org>
2707 Date: Fri Feb 3 16:33:09 2023 +1100
2709 harden Linux seccomp sandbox
2711 Linux mmap(2) and madvise(2) syscalls support quite a number of funky
2712 flags that we don't expect that sshd/libc will ever need. We can
2713 exclude this kernel attack surface by filtering the mmap(2) flags
2714 and the madvise(2) advice arguments.
2716 Similarly, the sandboxed process in sshd is a single-threaded program
2717 that does not use shared memory for synchronisation or communication.
2718 Therefore, there should be no reason for the advanced priority
2719 inheritance futex(2) operations to be necessary. These can also be
2722 Motivated by Jann Horn pointing out that there have been kernel bugs
2723 in nearby Linux kernel code, e.g. CVE-2020-29368, CVE-2020-29374 and
2726 Feedback Jann Horn, ok dtucker@
2728 commit 6dfb65de949cdd0a5d198edee9a118f265924f33
2729 Author: Damien Miller <djm@mindrot.org>
2730 Date: Thu Feb 2 23:21:54 2023 +1100
2732 crank versions in RPM specs
2734 commit d07cfb11a0ca574eb68a3931d8c46fbe862a2021
2735 Author: Damien Miller <djm@mindrot.org>
2736 Date: Thu Feb 2 23:21:45 2023 +1100
2738 update version in README
2740 commit 9fe207565b4ab0fe5d1ac5bb85e39188d96fb214
2741 Author: Damien Miller <djm@mindrot.org>
2742 Date: Thu Feb 2 23:17:49 2023 +1100
2744 adapt compat_kex_proposal() test to portable
2746 commit 903c556b938fff2d7bff8da2cc460254430963c5
2747 Author: djm@openbsd.org <djm@openbsd.org>
2748 Date: Thu Feb 2 12:12:52 2023 +0000
2750 upstream: test compat_kex_proposal(); by dtucker@
2752 OpenBSD-Regress-ID: 0e404ee264db546f9fdbf53390689ab5f8d38bf2
2754 commit 405fba71962dec8409c0c962408e09049e5624b5
2755 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2756 Date: Thu Jan 19 07:53:45 2023 +0000
2758 upstream: Check if we can copy sshd or need to use sudo to do so
2760 during reexec test. Skip test if neither can work. Patch from anton@, tweaks
2763 OpenBSD-Regress-ID: 731b96ae74d02d5744e1f1a8e51d09877ffd9b6d
2765 commit b2a2a8f69fd7737ea17dc044353c514f2f962f35
2766 Author: djm@openbsd.org <djm@openbsd.org>
2767 Date: Thu Feb 2 12:10:22 2023 +0000
2769 upstream: openssh-9.2
2771 OpenBSD-Commit-ID: f7389f32413c74d6e2055f05cf65e7082de03923
2773 commit 12da7823336434a403f25c7cc0c2c6aed0737a35
2774 Author: djm@openbsd.org <djm@openbsd.org>
2775 Date: Thu Feb 2 12:10:05 2023 +0000
2777 upstream: fix double-free caused by compat_kex_proposal(); bz3522
2781 OpenBSD-Commit-ID: 2bfc37cd2d41f67dad64c17a64cf2cd3806a5c80
2783 commit 79efd95ab5ff99f4cb3a955e2d713b3f54fb807e
2784 Author: Darren Tucker <dtucker@dtucker.net>
2785 Date: Wed Feb 1 17:17:26 2023 +1100
2787 Skip connection-timeout test on minix3.
2789 Minix 3's Unix domain sockets don't seem to work the way we expect, so
2790 skip connection-timeout test on that platform. While there, group
2791 together all similarly skipped tests and explicitly comment.
2793 commit 6b508c4e039619842bcf5a16f8a6b08dd6bec44a
2794 Author: Damien Miller <djm@mindrot.org>
2795 Date: Wed Feb 1 12:12:05 2023 +1100
2797 fix libfido2 detection without pkg-config
2799 Place libfido2 before additional libraries (that it may depend upon)
2800 and not after. bz3530 from James Zhang; ok dtucker@
2802 commit 358e300fed5e6def233a2c06326e51e20ebed621
2803 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2804 Date: Wed Jan 18 20:56:36 2023 +0000
2806 upstream: delete useless dependency
2808 OpenBSD-Commit-ID: e1dc11143f83082e3154d6094f9136d0dc2637ad
2810 commit a4cb9be1b021b511e281ee55c356f964487d9e82
2811 Author: deraadt@openbsd.org <deraadt@openbsd.org>
2812 Date: Wed Jan 18 20:43:15 2023 +0000
2814 upstream: Create and install sshd random relink kit.
2816 ../Makefile.inc and Makfile are concatenated for reuse, which hopefully won't
2817 be too fragile, we'll see if we need a different approach. The resulting sshd
2818 binary is tested with the new sshd -V option before installation. As the
2819 binary layout is now semi-unknown (meaning relative, fixed, and gadget
2820 offsets are not precisely known), change the filesystem permissions to 511 to
2821 prevent what I call "logged in BROP". I have ideas for improving this further
2822 but this is a first step ok djm
2824 OpenBSD-Commit-ID: 1e0a2692b7e20b126dda60bf04999d1d30d959d8
2826 commit bc7de6f91a9a0ae2f148a9d31a4027d441a51999
2827 Author: jmc@openbsd.org <jmc@openbsd.org>
2828 Date: Wed Jan 18 06:55:32 2023 +0000
2830 upstream: tweak previous; ok djm
2832 OpenBSD-Commit-ID: df71ce4180c58202dfdc1d92626cfe900b91b7c3
2834 commit a20b7e999773e6333c8aa9b0a7fa41966e63b037
2835 Author: Darren Tucker <dtucker@dtucker.net>
2836 Date: Tue Jan 31 19:35:44 2023 +1100
2838 Skip connection-timeout test under Valgrind.
2840 Valgrind slows things down so much that the timeout test fails. Skip
2841 this test until we figure out if we can make it work.
2843 commit c3ffb54b4fc5e608206037921db6ccbc2f5ab25f
2844 Author: Darren Tucker <dtucker@dtucker.net>
2845 Date: Wed Jan 25 21:58:40 2023 +1100
2847 Skip connection-timeout when missing FD passing.
2849 This tests uses multiplexing which uses file descriptor passing, so
2850 skip it if we don't have that. Fixes test failures on Cygwin.
2852 commit 35253af01d8c0ab444c8377402121816e71c71f5
2853 Author: djm@openbsd.org <djm@openbsd.org>
2854 Date: Wed Jan 18 02:00:10 2023 +0000
2856 upstream: when restoring non-blocking mode to stdio fds, restore
2858 exactly the flags that ssh started with and don't just clobber them with
2859 zero, as this could also remove the append flag from the set;
2863 OpenBSD-Commit-ID: 1336b03e881db7564a4b66014eb24c5230e9a0c0
2865 commit 7d17ea151c0b2519f023bd9cc7f141128833ac47
2866 Author: millert@openbsd.org <millert@openbsd.org>
2867 Date: Wed Jan 18 01:50:21 2023 +0000
2869 upstream: Add a -V (version) option to sshd like the ssh client
2871 has. OK markus@ deraadt@
2873 OpenBSD-Commit-ID: abe990ec3e636fb040132aab8cbbede98f0c413e
2875 commit 62360feb7f08f2a4c6fc36f3b3449309203c42c9
2876 Author: millert@openbsd.org <millert@openbsd.org>
2877 Date: Tue Jan 17 18:52:44 2023 +0000
2879 upstream: For "ssh -V" always exit 0, there is no need to check opt
2881 again. This was missed when the fallthrough in the switch case above it was
2882 removed. OK deraadt@
2884 OpenBSD-Commit-ID: 5583e5d8f6d62a8a4215cfa95a69932f344c8120
2886 commit 12492c0abf1eb415d08a897cc1d8b9e789888230
2887 Author: djm@openbsd.org <djm@openbsd.org>
2888 Date: Tue Jan 17 10:15:10 2023 +0000
2890 upstream: also check that an active session inhibits
2892 UnusedConnectionTimeout idea markus@
2894 OpenBSD-Regress-ID: 55c0fb61f3bf9e092b0a53f9041d3d2012f14003
2896 commit cef2593c33ac46a58238ff998818754eabdf64ff
2897 Author: djm@openbsd.org <djm@openbsd.org>
2898 Date: Tue Jan 17 10:02:34 2023 +0000
2900 upstream: regression test for UnusedConnectionTimeout
2902 OpenBSD-Regress-ID: 7f29001374a68e71e5e078f69e4520cf4bcca084
2904 commit aff9493a89c71d6a080419b49ac64eead9730491
2905 Author: djm@openbsd.org <djm@openbsd.org>
2906 Date: Mon Jan 16 04:11:29 2023 +0000
2908 upstream: unbreak test: cannot access shell positional parameters
2910 past $9 without wrapping the position in braces (i.e. need ${10}, etc.)
2912 OpenBSD-Regress-ID: 3750ec98d5d409ce6a93406fedde6f220d2ea2ac
2914 commit 0293c19807f83141cdf33b443154459f9ee471f6
2915 Author: djm@openbsd.org <djm@openbsd.org>
2916 Date: Tue Jan 17 09:44:48 2023 +0000
2918 upstream: Add a sshd_config UnusedConnectionTimeout option to terminate
2920 client connections that have no open channels for some length of time. This
2921 complements the recently-added ChannelTimeout option that terminates inactive
2922 channels after a timeout.
2926 OpenBSD-Commit-ID: ca983be74c0350364c11f8ba3bd692f6f24f5da9
2928 commit 8ec2e3123802d2beeca06c1644b0b647f6d36dab
2929 Author: djm@openbsd.org <djm@openbsd.org>
2930 Date: Sun Jan 15 23:35:10 2023 +0000
2932 upstream: adapt to ed25519 changes in src/usr.bin/ssh
2934 OpenBSD-Regress-ID: 4b3e7ba7ee486ae8a0b4790f8112eded2bb7dcd5
2936 commit 9fbbfeca1ce4c7ec0001c827bbf4189a3ba0964b
2937 Author: djm@openbsd.org <djm@openbsd.org>
2938 Date: Sun Jan 15 23:05:32 2023 +0000
2940 upstream: update OpenSSH's Ed25519 code to the last version of SUPERCOP
2942 (20221122) and change the import approach to the same one we use for
2943 Streamlined NTRUPrime: use a shell script to extract the bits we need from
2944 SUPERCOP, make some minor adjustments and squish them all into a single file.
2948 OpenBSD-Commit-ID: 1bc0fd624cb6af440905b8ba74ac7c03311b8e3b
2950 commit 6283f4bd83eee714d0f5fc55802eff836b06fea8
2951 Author: Darren Tucker <dtucker@dtucker.net>
2952 Date: Sat Jan 14 22:02:44 2023 +1100
2954 Allow writev is seccomp sandbox.
2956 This seems to be used by recent glibcs at least in some configurations.
2957 From bz#3512, ok djm@
2959 commit 923c3f437f439cfca238fba37e97a7041782f615
2960 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2961 Date: Sat Jan 14 10:05:54 2023 +0000
2963 upstream: Shell syntax fix. From ren mingshuai vi github PR#369.
2965 OpenBSD-Regress-ID: 6696b2eeefe128099fc3d7ea9f23252cc35156f9
2967 commit 4d87a00f704e0365e11c3c38b170c1275ec461fc
2968 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2969 Date: Sat Jan 14 09:57:08 2023 +0000
2971 upstream: Instead of skipping the all-tokens test if we don't have
2973 OpenSSL (since we use it to compute the hash), put the hash at the end and
2974 just omit it if we don't have it. Prompted by bz#3521.
2976 OpenBSD-Regress-ID: c79ecba64250ed3b6417294b6c965e6b12ca5eea
2978 commit b05406d6f93b8c8ec11ec8b27e7c76cc7a5a55fb
2979 Author: jmc@openbsd.org <jmc@openbsd.org>
2980 Date: Fri Jan 13 07:13:40 2023 +0000
2982 upstream: fix double phrase in previous;
2984 OpenBSD-Commit-ID: 671e6c8dc5e9230518b2bbfa143daaa88adc66c2
2986 commit 40564812b659c530eb1f4b62d09e85612aef3107
2987 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2988 Date: Fri Jan 13 03:16:29 2023 +0000
2990 upstream: Document "UserKnownHostsFile none". ok djm@
2992 OpenBSD-Commit-ID: f695742d39e34ecdcc3c861c3739a84648a4bce5
2994 commit d03e245e034019a37388f6f5f893ce848ab6d2e2
2995 Author: Darren Tucker <dtucker@dtucker.net>
2996 Date: Fri Jan 13 23:02:34 2023 +1100
2998 Retry package installation 3 times.
3000 When setting up the CI environment, retry package installation 3 times
3001 before going up. Should help prevent spurious failures during
3002 infrastructure issues.
3004 commit 625f6bc39840167dafb3bf5b6a3e18503ac986e8
3005 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3006 Date: Fri Jan 13 04:47:34 2023 +0000
3008 upstream: Move scp path setting to a helper function. The previous
3010 commit to add scp to the test sshd's path causes the t-envpass test to fail
3011 when the test scp is given using a fully qualified path. Put this in a
3012 helper function and only call it from the scp tests.
3014 OpenBSD-Regress-ID: 7533dc1c4265c1de716abb062957994195b36df4
3016 commit 6e6f88647042b3cde54a628545c2f5fb656a9327
3017 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3018 Date: Fri Jan 13 04:23:00 2023 +0000
3020 upstream: Add scp's path to test sshd's PATH.
3022 If the scp we're testing is fully qualified (eg it's not in the system
3023 PATH) then add its path to the under-test sshd's PATH so we can find
3024 it. Prompted by bz#3518.
3026 OpenBSD-Regress-ID: 7df4f5a0be3aa135495b7e5a6719d3cbc26cc4c0
3028 commit 8a5e99a70fcf9b022a8aa175ebf6a71f58511da3
3029 Author: Darren Tucker <dtucker@dtucker.net>
3030 Date: Fri Jan 13 15:49:48 2023 +1100
3032 Remove skipping test when scp not in path.
3034 An upcoming change renders this obsolete by adding scp's path to the
3035 test sshd's PATH, and removing this first will make the subsequent sync
3038 commit 41f36dd896c8fb8337d403fcf476762986976e9d
3039 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3040 Date: Fri Jan 13 02:58:20 2023 +0000
3042 upstream: Add a "Host" line to the output of ssh -G showing the
3044 original host arg. Inspired by patch from vincent at bernat.ch via bz#3343,
3047 OpenBSD-Commit-ID: 59c0f60a222113a44d0650cd394376e3beecc883
3049 commit f673b49f3be3eb51074fbb8a405beb6cd0f7d93e
3050 Author: djm@openbsd.org <djm@openbsd.org>
3051 Date: Fri Jan 13 02:44:02 2023 +0000
3053 upstream: avoid printf("%s", NULL) if using ssh
3055 -oUserKnownHostsFile=none and a hostkey in one of the system known hosts file
3056 changes; ok dtucker@
3058 OpenBSD-Commit-ID: 7ca87614bfc6da491315536a7f2301434a9fe614
3060 commit 93fc7c576563e3d88a1dc019dd213f65607784cc
3061 Author: djm@openbsd.org <djm@openbsd.org>
3062 Date: Wed Jan 11 05:39:38 2023 +0000
3064 upstream: clamp the minimum buffer lengths and number of inflight
3068 OpenBSD-Commit-ID: c4965f62fa0ba850940fd66ae3f60cf516bbcd56
3070 commit 48bf234322e639d279c5a28435eae50155e9b514
3071 Author: djm@openbsd.org <djm@openbsd.org>
3072 Date: Wed Jan 11 05:36:50 2023 +0000
3074 upstream: ignore bogus upload/download buffer lengths in the limits
3078 OpenBSD-Commit-ID: c5b023e0954693ba9a5376e4280c739b5db575f8
3080 commit 36b00d31833ca74cb0f7c7d8eda1bde55700f929
3081 Author: djm@openbsd.org <djm@openbsd.org>
3082 Date: Wed Jan 11 02:13:52 2023 +0000
3084 upstream: remove whitespace at EOL from code extracted from SUPERCOP
3086 OpenBSD-Commit-ID: 1ec524ff2fbb9387d731601437c82008f35a60f4
3088 commit d888de06c5e4d7dbf2f2b85f2b5bf028c570cf78
3089 Author: djm@openbsd.org <djm@openbsd.org>
3090 Date: Wed Jan 11 00:51:27 2023 +0000
3092 upstream: rewrite this test to use a multiplexed ssh session so we can
3094 control its lifecycle without risk of race conditions; fixes some of the
3095 Github integration tests for openssh-portable
3097 OpenBSD-Regress-ID: 5451cad59ba0d43ae9eeda48ec80f54405fee969
3099 commit 4bcc737a35fdd9cc4af7423d6c23dfd0c7ef4786
3100 Author: Damien Miller <djm@mindrot.org>
3101 Date: Wed Jan 11 11:45:17 2023 +1100
3103 remove buffer len workaround for NetBSD 4.x
3105 Switching to from pipes to a socketpair for communicating with the
3106 ssh process avoids the (kernel bug?) problem.
3108 commit f5154d2aac3e6a32a1b13dec23a701a087850cdc
3109 Author: Damien Miller <djm@mindrot.org>
3110 Date: Wed Jan 11 11:44:19 2023 +1100
3112 add back use of pipes in scp.c under USE_PIPES
3114 This matches sftp.c which prefers socketpair but uses pipes on
3115 some older platforms.
3117 commit eec737b59cf13841de46134967a206607000acd4
3118 Author: millert@openbsd.org <millert@openbsd.org>
3119 Date: Tue Jan 10 23:22:15 2023 +0000
3121 upstream: Switch scp from using pipes to a socketpair for
3123 communication with it's ssh sub-processes. We no longer need to reserve two
3124 descriptors to ensure that we don't end up using fd 0-2 unexpectedly, that is
3125 handled by sanitise_stdfd() in main(). Based on an original diff from djm@.
3128 OpenBSD-Commit-ID: b80c372faac462471e955ddeab9480d668a2e48d
3130 commit d213d126a4a343abd3a1eb13687d39c1891fe5c8
3131 Author: jmc@openbsd.org <jmc@openbsd.org>
3132 Date: Fri Jan 6 08:44:11 2023 +0000
3134 upstream: tweak previous; ok djm
3136 OpenBSD-Commit-ID: 229c493452766d70a78b0f02f6ff9894f9028858
3138 commit 4a5590a5ee47b7dfd49773e9fdba48ad3089fe64
3139 Author: Damien Miller <djm@mindrot.org>
3140 Date: Mon Jan 9 16:33:56 2023 +1100
3142 try to improve logging for dynamic-forward test
3144 previously the logs from the ssh used to exercise the forwarding
3145 channel would clobber the logs from the ssh actually doing the
3148 commit 715bc25dcfccf9fb2bee820155fe071d01a618db
3149 Author: Darren Tucker <dtucker@dtucker.net>
3150 Date: Sat Jan 7 23:24:50 2023 +1100
3152 Skip dynamic-forward test on minix3.
3154 This test relies on loopback addresses which minix does not have.
3155 Previously the test would not run at all since it also doesn't have
3156 netcat, but now we use our own netcat it tries and fails.
3158 commit dd1249bd5c45128a908395c61b26996a70f82205
3159 Author: Damien Miller <djm@mindrot.org>
3160 Date: Sun Jan 8 12:08:59 2023 +1100
3162 don't test IPv6 addresses if platform lacks support
3164 commit d77fc611a62f2dfee0b654c31a50a814b13310dd
3165 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3166 Date: Fri Jan 6 12:33:33 2023 +0000
3168 upstream: When OpenSSL is not available, skip parts of percent test
3170 that require it. Based on github pr#368 from ren mingshuai.
3172 OpenBSD-Regress-ID: 49a375b2cf61ccb95b52e75e2e025cd10988ebb2
3174 commit 1cd2aac312af9172f1b5cb06c2e1cd090abb83cf
3175 Author: Darren Tucker <dtucker@dtucker.net>
3176 Date: Sat Jan 7 23:01:11 2023 +1100
3178 Use our own netcat for dynamic-forward test.
3180 That way we can be surer about its behaviour rather than trying to
3181 second-guess the behaviour of various netcat implementations.
3183 commit 26cab41c05d7b0859d2a1ea5b6ed253d91848a80
3184 Author: Darren Tucker <dtucker@dtucker.net>
3185 Date: Sat Jan 7 14:30:43 2023 +1100
3187 Use autoconf to find openssl binary.
3189 It's possible to install an OpenSSL in a path not in the system's
3190 default library search path. OpenSSH can still use this (eg if you
3191 specify an rpath) but the openssl binary there may not work. If one is
3192 available on the system path just use that.
3194 commit 5532e010a0eeb6aa264396514f9aed7948471538
3195 Author: Darren Tucker <dtucker@dtucker.net>
3196 Date: Sat Jan 7 10:34:18 2023 +1100
3198 Check openssl_bin path is executable before using.
3200 commit 5d7b16cff48598d5908db970bfdc9ff9326142c8
3201 Author: Darren Tucker <dtucker@dtucker.net>
3202 Date: Fri Jan 6 23:19:07 2023 +1100
3204 Set OPENSSL_BIN from OpenSSL directory.
3206 commit 344a0e8240eaf08da5d46a5e3a9ecad6e4f64c35
3207 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3208 Date: Fri Jan 6 08:50:33 2023 +0000
3210 upstream: Save debug logs from ssh for debugging purposes.
3212 OpenBSD-Regress-ID: 109e40b06de1c006a3b8e0d8745b790b2c5870a0
3214 commit e1ef172646f7f49c80807eea90225ef5e0be55a8
3215 Author: djm@openbsd.org <djm@openbsd.org>
3216 Date: Fri Jan 6 08:07:39 2023 +0000
3218 upstream: regression test for ChannelTimeout
3220 OpenBSD-Regress-ID: 280bfbefcfa415428ad744e43f69a8dede8ad685
3222 commit 2393ea8daf25853459eb07a528d7577688847777
3223 Author: djm@openbsd.org <djm@openbsd.org>
3224 Date: Fri Jan 6 07:18:18 2023 +0000
3226 upstream: fix typo in verbose logging
3228 OpenBSD-Regress-ID: 0497cdb66e003b2f50ed77291a9104fba2e017e9
3230 commit 161a5378a3cc2e7aa3f9674cb7f4686ae6ce9586
3231 Author: djm@openbsd.org <djm@openbsd.org>
3232 Date: Fri Jan 6 02:59:50 2023 +0000
3234 upstream: unit tests for misc.c:ptimeout_* API
3236 OpenBSD-Regress-ID: 01f8fb12d08e5aaadd4bd4e71f456b6588be9a94
3238 commit 018d671d78145f03d6f07ae9d64d51321da70325
3239 Author: tb@openbsd.org <tb@openbsd.org>
3240 Date: Wed Jan 4 22:48:57 2023 +0000
3242 upstream: Copy bytes from the_banana[] rather than banana()
3244 Fixes test failure due to segfault seen on arm64 with xonly snap.
3248 OpenBSD-Regress-ID: 86e2aa4bbd1dff1bc4ebb2969c0d6474485be046
3250 commit ab6bb69e251faa8b24f81b25c72ec0120f20cad4
3251 Author: Damien Miller <djm@mindrot.org>
3252 Date: Fri Jan 6 19:13:36 2023 +1100
3254 unbreak scp on NetBSD 4.x
3256 e555d5cad5 effectively increased the default copy buffer size for SFTP
3257 transfers. This caused NetBSD 4.x to hang during the "copy local file to
3258 remote file in place" scp.sh regression test.
3260 This puts back the original 32KB copy buffer size until we can properly
3263 lots of debugging assistance from dtucker@
3265 commit 2d1ff2b9431393ad99ef496d5e3b9dd0d4f5ac8c
3266 Author: djm@openbsd.org <djm@openbsd.org>
3267 Date: Fri Jan 6 02:47:18 2023 +0000
3269 upstream: Implement channel inactivity timeouts
3271 This adds a sshd_config ChannelTimeouts directive that allows channels that
3272 have not seen traffic in a configurable interval to be automatically closed.
3273 Different timeouts may be applied to session, X11, agent and TCP forwarding
3276 Note: this only affects channels over an opened SSH connection and not
3277 the connection itself. Most clients close the connection when their channels
3278 go away, with a notable exception being ssh(1) in multiplexing mode.
3282 OpenBSD-Commit-ID: ae8bba3ed9d9f95ff2e2dc8dcadfa36b48e6c0b8
3284 commit 0e34348d0bc0b1522f75d6212a53d6d1d1367980
3285 Author: djm@openbsd.org <djm@openbsd.org>
3286 Date: Fri Jan 6 02:42:34 2023 +0000
3288 upstream: Add channel_set_xtype()
3290 This sets an "extended" channel type after channel creation (e.g.
3291 "session:subsystem:sftp") that will be used for setting channel inactivity
3296 OpenBSD-Commit-ID: 42564aa92345045b4a74300528f960416a15d4ca
3298 commit ceedf09b2977f3a756c759a6e7eb8f8e9db86a18
3299 Author: djm@openbsd.org <djm@openbsd.org>
3300 Date: Fri Jan 6 02:41:49 2023 +0000
3302 upstream: tweak channel ctype names
3304 These are now used by sshd_config:ChannelTimeouts to specify timeouts by
3305 channel type, so force them all to use a similar format without whitespace.
3309 OpenBSD-Commit-ID: 66834765bb4ae14f96d2bb981ac98a7dae361b65
3311 commit c60438158ad4b2f83d8504257aba1be7d0b0bb4b
3312 Author: djm@openbsd.org <djm@openbsd.org>
3313 Date: Fri Jan 6 02:39:59 2023 +0000
3315 upstream: Add channel_force_close()
3317 This will forcibly close an open channel by simulating read/write errors,
3318 draining the IO buffers and calling the detach function.
3320 Previously the detach function was only ever called during channel garbage
3321 collection, but there was no way to signal the user of a channel (e.g.
3322 session.c) that its channel was being closed deliberately (vs. by the
3323 usual state-machine logic). So this adds an extra "force" argument to the
3324 channel cleanup callback to indicate this condition.
3328 OpenBSD-Commit-ID: 23052707a42bdc62fda2508636e624afd466324b
3330 commit d478cdc7ad6edd4b1bcd1e86fb2f23194ff33d5a
3331 Author: djm@openbsd.org <djm@openbsd.org>
3332 Date: Fri Jan 6 02:38:23 2023 +0000
3334 upstream: replace manual poll/ppoll timeout math with ptimeout API
3336 feedback markus / ok markus dtucker
3338 OpenBSD-Commit-ID: c5ec4f2d52684cdb788cd9cbc1bcf89464014be2
3340 commit 4adf3817a24efe99b06e62630577d683c7cd8065
3341 Author: djm@openbsd.org <djm@openbsd.org>
3342 Date: Fri Jan 6 02:37:04 2023 +0000
3344 upstream: add ptimeout API for keeping track of poll/ppoll
3346 timeouts; ok dtucker markus
3348 OpenBSD-Commit-ID: 3335268ca135b3ec15a947547d7cfbb8ff929ead
3350 commit 8c7c69d32375d2f3ce9da0109c9bffc560842316
3351 Author: djm@openbsd.org <djm@openbsd.org>
3352 Date: Thu Jan 5 05:49:13 2023 +0000
3354 upstream: suppress "Connection closed" message when in quiet mode
3356 OpenBSD-Commit-ID: 8a3ab7176764da55f60bfacfeae9b82d84e3908f
3358 commit 845ceecea2ac311b0c267f9ecbd34862e1876fc6
3359 Author: djm@openbsd.org <djm@openbsd.org>
3360 Date: Mon Jan 2 07:03:57 2023 +0000
3362 upstream: regression test for PermitRemoteOpen
3364 OpenBSD-Regress-ID: 8271aafbf5c21950cd5bf966f08e585cebfe630c
3366 commit b3daa8dc582348d6ab8150bc1e571b7aa08c5388
3367 Author: djm@openbsd.org <djm@openbsd.org>
3368 Date: Mon Jan 2 07:03:30 2023 +0000
3370 upstream: fix bug in PermitRemoteOpen which caused it to ignore its
3372 first argument unless it was one of the special keywords "any" or "none".
3374 Reported by Georges Chaudy in bz3515; ok dtucker@
3376 OpenBSD-Commit-ID: c5678a39f1ff79993d5ae3cfac5746a4ae148ea5
3378 commit 0872663a7be0301bcc3d49acdbc9b740a3d972d4
3379 Author: jmc@openbsd.org <jmc@openbsd.org>
3380 Date: Mon Dec 26 19:16:03 2022 +0000
3382 upstream: spelling fixes; from paul tagliamonte amendments to his
3384 diff are noted on tech
3386 OpenBSD-Commit-ID: d776dd03d0b882ca9c83b84f6b384f6f9bd7de4a
3388 commit 797da2812a71785b34890bb6eb44767a7d09cd34
3389 Author: djm@openbsd.org <djm@openbsd.org>
3390 Date: Fri Dec 16 07:13:22 2022 +0000
3392 upstream: Mention that scp uses the SFTP protocol and remove
3394 reference to legacy flag. Spotted by, feedback and ok jmc@
3396 OpenBSD-Commit-ID: 9dfe04966f52e941966b46c7a2972147f95281b3
3398 commit 93f2ce8c050a7a2a628646c00b40b9b53fef93ef
3399 Author: djm@openbsd.org <djm@openbsd.org>
3400 Date: Fri Dec 16 06:56:47 2022 +0000
3402 upstream: Clear signal mask early in main(); sshd may have been
3404 started with one or more signals masked (sigprocmask(2) is not cleared
3405 on fork/exec) and this could interfere with various things, e.g. the
3408 Execution environments that fail to clear the signal mask before running
3409 sshd are clearly broken, but apparently they do exist.
3411 Reported by Sreedhar Balasubramanian; ok dtucker@
3413 OpenBSD-Commit-ID: 77078c0b1c53c780269fc0c416f121d05e3010ae
3415 commit 4acfaabfae41badb9d334a2ee88c5c6ad041c0d5
3416 Author: jmc@openbsd.org <jmc@openbsd.org>
3417 Date: Fri Dec 16 06:52:48 2022 +0000
3419 upstream: add -X to usage();
3421 OpenBSD-Commit-ID: 1bdc3df7de11d766587b0428318336dbffe4a9d0
3423 commit e555d5cad5afae7d5ef2bbc02ca591178fe16fed
3424 Author: djm@openbsd.org <djm@openbsd.org>
3425 Date: Fri Dec 16 03:40:03 2022 +0000
3427 upstream: add a -X option to both scp(1) and sftp(1) to allow
3429 control over some SFTP protocol knobs: the copy buffer length and
3430 the number of inflight requests, both of which are used during
3433 Previously these could be controlled in sftp(1) using the -b/-R options.
3434 This makes them available in both SFTP protocol clients using the same
3435 option character sequence.
3439 OpenBSD-Commit-ID: 27502bffc589776f5da1f31df8cb51abe9a15f1c
3441 commit 5a7a7acab2f466dc1d7467b5d05d35268c3137aa
3442 Author: deraadt@openbsd.org <deraadt@openbsd.org>
3443 Date: Thu Dec 15 18:20:39 2022 +0000
3445 upstream: The idiomatic way of coping with signed char vs unsigned
3447 char (which did not come from stdio read functions) in the presence of
3448 ctype macros, is to always cast to (unsigned char). casting to (int)
3449 for a "macro" which is documented to take int, is weird. And sadly wrong,
3450 because of the sing extension risk.. same diff from florian
3452 OpenBSD-Commit-ID: 65b9a49a68e22ff3a0ebd593f363e9f22dd73fea
3454 commit b0b58222c7cc62efd8212c4fb65a545f58ebb22d
3455 Author: Darren Tucker <dtucker@dtucker.net>
3456 Date: Mon Dec 19 18:49:51 2022 +1100
3458 Simply handling of SSH_CONNECTION PAM env var.
3460 Prompted by bz#3508: there's no need to cache the value of
3461 sshpam_conninfo so remove the global. While there, add check of
3462 return value from pam_putenv. ok djm@
3464 commit ed8444572ae684fdb892f97bae342c6cb6456f04
3465 Author: Darren Tucker <dtucker@dtucker.net>
3466 Date: Mon Dec 19 18:42:34 2022 +1100
3468 Add tests for LibreSSL 3.7.0 and OpenSSL 1.1.1s.
3470 commit abb9a8aaddfcacbd12641f6e4f203da0fa85a287
3471 Author: Darren Tucker <dtucker@dtucker.net>
3472 Date: Sun Dec 18 21:36:25 2022 +1100
3474 Use sudo when resetting perms on directories.
3476 commit 2f5664c5908d84697cbe91302d5d5c4d83cb2121
3477 Author: Darren Tucker <dtucker@dtucker.net>
3478 Date: Sun Dec 18 21:19:33 2022 +1100
3480 Set group perms on regress dir.
3482 This ensures that the tests don't fail due to StrictMode checks.
3484 commit 137196300fc1540affadde880210f02ba6cb4abf
3485 Author: Darren Tucker <dtucker@dtucker.net>
3486 Date: Sun Dec 18 21:13:42 2022 +1100
3488 Fetch regress logs from obj dir.
3490 commit 5f93c4836527d9fda05de8944a1c7b4a205080c7
3491 Author: Darren Tucker <dtucker@dtucker.net>
3492 Date: Tue Dec 13 20:59:54 2022 +1100
3494 obsdsnap test VMs runs-on libvirt too.
3496 commit 8386886fb1ab7fda73069fb0db1dbe0e5a52f758
3497 Author: Darren Tucker <dtucker@dtucker.net>
3498 Date: Tue Dec 13 20:55:37 2022 +1100
3500 Run upstream obsdsnap tests on ephemeral runners.
3502 commit b6e01459b55ece85d7f296b2bc719d1841e1009e
3503 Author: Darren Tucker <dtucker@dtucker.net>
3504 Date: Tue Dec 13 20:48:56 2022 +1100
3506 Move obsdsnap test VMs to ephemeral runners.
3508 commit ea6fdf9a1aa71a411f7db218a986392c4fb55693
3509 Author: Damien Miller <djm@mindrot.org>
3510 Date: Fri Dec 9 18:00:21 2022 +1100
3512 use calloc for allocating arc4random structs
3516 commit 4403b62f5548e91389cb3339d26a9d0c4bb07b34
3517 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3518 Date: Fri Dec 9 00:22:29 2022 +0000
3520 upstream: Warn if no host keys for hostbased auth can be loaded.
3522 OpenBSD-Commit-ID: 2a0a13132000cf8d3593133c1b49768aa3c95977
3524 commit a6183e25e3f1842e21999fe88bc40bb99b121dc3
3525 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3526 Date: Fri Dec 9 00:17:40 2022 +0000
3528 upstream: Add server debugging for hostbased auth.
3530 auth_debug_add queues messages about the auth process which is sent to
3531 the client after successful authentication. This also sends those to
3532 the server debug log to aid in debugging. From bz#3507, ok djm@
3534 OpenBSD-Commit-ID: 46ff67518cccf9caf47e06393e2a121ee5aa258a
3536 commit b85c3581c16aaf6e83b9a797c80705a56b1f312e
3537 Author: cheloha@openbsd.org <cheloha@openbsd.org>
3538 Date: Sun Dec 4 23:50:49 2022 +0000
3540 upstream: remove '?' from getopt(3) loops
3542 userspace: remove vestigial '?' cases from top-level getopt(3) loops
3544 getopt(3) returns '?' when it encounters a flag not present in the in
3545 the optstring or if a flag is missing its option argument. We can
3546 handle this case with the "default" failure case with no loss of
3547 legibility. Hence, remove all the redundant "case '?':" lines.
3549 Prompted by dlg@. With help from dlg@ and millert@.
3551 Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2
3553 ok naddy@ millert@ dlg@
3555 OpenBSD-Commit-ID: b2f89346538ce4f5b33ab8011a23e0626a67e66e
3557 commit 9a067e8d28a2249fd73f004961e30c113ee85e5d
3558 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3559 Date: Wed Dec 7 11:45:43 2022 +0000
3561 upstream: Fix comment typo.
3563 OpenBSD-Regress-ID: 3b04faced6511bb5e74648c6a4ef4bf2c4decf03
3565 commit ce3c3e78ce45d68a82c7c8dc89895f297a67f225
3566 Author: Darren Tucker <dtucker@dtucker.net>
3567 Date: Wed Dec 7 18:58:25 2022 +1100
3569 Add SANDBOX_DEBUG to the kitchensink test build.
3571 commit bc234605fa3eb10f56bf0d74c8ecb0d91ada9d05
3572 Author: Damien Miller <djm@mindrot.org>
3573 Date: Wed Dec 7 18:38:25 2022 +1100
3575 disable SANDBOX_SECCOMP_FILTER_DEBUG
3577 It was mistakenly enabled in 2580916e4872
3579 Reported by Peter sec-openssh-com.22.fichtner AT 0sg.net
3581 commit b087c5cfa011b27992e01589314fec830266f99d
3582 Author: Rose <83477269+AtariDreams@users.noreply.github.com>
3583 Date: Tue Nov 29 15:12:54 2022 -0500
3587 Regenerate config files using latest autotools
3589 commit d63f5494978a185c7421d492b9c2f6f05bb54138
3590 Author: Darren Tucker <dtucker@dtucker.net>
3591 Date: Tue Dec 6 12:22:36 2022 +1100
3593 Fix typo in comment. Spotted by tim@
3595 commit 73dcca12115aa12ed0d123b914d473c384e52651
3596 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3597 Date: Sun Dec 4 11:03:11 2022 +0000
3599 upstream: Remove duplicate includes.
3601 Patch from AtariDreams via github PR#364.
3603 OpenBSD-Commit-ID: b9186638a05cb8b56ef7c0de521922b6723644ea
3605 commit 3cec15543010bc8d6997d896b1717a650afb7e92
3606 Author: djm@openbsd.org <djm@openbsd.org>
3607 Date: Fri Dec 2 04:40:27 2022 +0000
3609 upstream: make struct sshbuf private
3611 and remove an unused field; ok dtucker
3613 OpenBSD-Commit-ID: c7a3d77c0b8c153d463398606a8d57569186a0c3
3615 commit 5796bf8ca9535f9fa7d01829a540d2550e05c860
3616 Author: Darren Tucker <dtucker@dtucker.net>
3617 Date: Fri Dec 2 11:43:36 2022 +1100
3619 Restore ssh-agent permissions on exit.
3621 ...enough that subsequent builds can overwrite ssh-agent if necessary.
3623 commit ccf5a13868cbb4659107458cac1e017c98abcbda
3624 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3625 Date: Thu Dec 1 02:22:13 2022 +0000
3627 upstream: Clean up ssh-add and ssh-agent logs.
3629 OpenBSD-Regress-ID: 9eda8e4c3714d7f943ab2e73ed58a233bd29cd2c
3631 commit 7a8b40cf6a5eda80173140cc6750a6db8412fa87
3632 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3633 Date: Thu Dec 1 02:19:29 2022 +0000
3635 upstream: Log output of ssh-agent and ssh-add
3637 This should make debugging easier.
3639 OpenBSD-Regress-ID: 5974b02651f428d7e1079b41304c498ca7e306c8
3641 commit 4a1805d532616233dd6072e5cd273b96dd3062e6
3642 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3643 Date: Tue Nov 29 22:41:14 2022 +0000
3645 upstream: Add void to client_repledge args to fix compiler warning. ok djm@
3647 OpenBSD-Commit-ID: 7e964a641ce4a0a0a11f047953b29929d7a4b866
3649 commit 815c4704930aa449edf6e812e99d69e9ffd31f01
3650 Author: djm@openbsd.org <djm@openbsd.org>
3651 Date: Mon Nov 28 01:38:22 2022 +0000
3653 upstream: tighten pledge(2) after session establishment
3655 feedback, ok & testing in snaps deraadt@
3657 OpenBSD-Commit-ID: aecf4d49d28586dfbcc74328d9333398fef9eb58
3659 commit f7cebbbf407d772ed71403d314343766782fe540
3660 Author: djm@openbsd.org <djm@openbsd.org>
3661 Date: Mon Nov 28 01:37:36 2022 +0000
3663 upstream: New EnableEscapeCommandline ssh_config(5) option
3665 This option (default "no") controls whether the ~C escape is available.
3666 Turning it off by default means we will soon be able to use a stricter
3667 default pledge(2) in the client.
3669 feedback deraadt@ dtucker@; tested in snaps for a while
3671 OpenBSD-Commit-ID: 7e277595d60acb8263118dcb66554472257b387a
3673 commit d323f7ecf52e3d4ec1f4939bf31693e02f891dca
3674 Author: mbuhl@openbsd.org <mbuhl@openbsd.org>
3675 Date: Fri Nov 18 19:47:40 2022 +0000
3677 upstream: In channel_request_remote_forwarding the parameters for
3679 permission_set_add are leaked as they are also duplicated in the call. Found
3680 by CodeChecker. ok djm
3682 OpenBSD-Commit-ID: 4aef50fa9be7c0b138188814c8fe3dccc196f61e
3684 commit 62cc33e6eed847aafdc29e34aa69e9bd82a0ee16
3685 Author: Darren Tucker <dtucker@dtucker.net>
3686 Date: Wed Nov 30 11:23:11 2022 +1100
3688 Use -fzero-call-used-regs=used on clang 15.
3690 clang 15 seems to have a problem with -fzero-call-used-reg=all which
3691 causes spurious "incorrect signature" failures with ED25519. On those
3692 versions, use -fzero-call-used-regs=used instead. (We may add exceptions
3693 later if specific versions prove to be OK). Also move the GCC version
3696 Initial investigation by Daniel Pouzzner (douzzer at mega nu), workaround
3697 suggested by Bill Wendling (morbo at google com). bz#3475, ok djm@
3699 commit f84b9cffd52c9c5c359a54a1929f9948e803ab1d
3700 Author: Darren Tucker <dtucker@dtucker.net>
3701 Date: Mon Nov 28 21:09:28 2022 +1100
3703 Skip unit tests on slow riscv64 hardware.
3705 commit 9f2747e0bed3faca92679eae69aef10c95dc82f5
3706 Author: Darren Tucker <dtucker@dtucker.net>
3707 Date: Sun Nov 27 15:26:22 2022 +1100
3709 Rework how selfhosted tests interact with runners.
3711 Previously there was one runner per test target (mostly VMs). This had
3713 - multiple tests that ran on the same target (eg multiple build
3714 configs) were serialized on availability or that runner.
3715 - it needed manual balancing of VMs over host machines.
3717 To address this, make VMs that use ephemeral disks (ie most of them)
3718 all use a pool of runners with the "libvirt" label. This requires that
3719 we distinguish between "host" and "target" for those. Native runners
3720 and VMs with persistent disks (eg the constantly-updated snapshot ones)
3721 specify the same host and target.
3723 This should improve test throughput.
3725 commit d664ddaec87bdc7385be8ef7f1337793e1679d48
3726 Author: Darren Tucker <dtucker@dtucker.net>
3727 Date: Sun Nov 27 12:19:37 2022 +1100
3729 Run vmstartup from temp dir.
3731 This will allow us to create ephemeral disk images per-runner.
3733 commit 0fa16e952b1fc1c4cf65e3dd138b0e87003e2e45
3734 Author: Darren Tucker <dtucker@dtucker.net>
3735 Date: Sun Nov 27 12:14:00 2022 +1100
3737 Make "config" in matrix singular and pass in env.
3739 This will allow the startup scripts to adapt their behaviour based on
3740 the type and config.
3742 commit e8857043af54809187be1e8b06749db61112899f
3743 Author: Darren Tucker <dtucker@dtucker.net>
3744 Date: Sun Nov 27 11:42:22 2022 +1100
3746 Add "libvirt" label to dfly30.
3748 commit 9775473d84902dc37753686cd10ae71fbe67efda
3749 Author: Darren Tucker <dtucker@dtucker.net>
3750 Date: Sun Nov 27 09:28:20 2022 +1100
3752 Rename "os" in matrix to "target".
3754 This is in preparation to distinguish this from the host that the runner
3755 runs on in case where they are separate (eg VMs).
3757 commit 04fd00ceff39f4544ced6f5342060abe584835d0
3758 Author: Darren Tucker <dtucker@dtucker.net>
3759 Date: Sun Nov 27 09:23:04 2022 +1100
3761 Remove unused self-hosted test targets.
3763 commit c9d9fcad2a11c1cd1550a541f44091d65f0b5584
3764 Author: Darren Tucker <dtucker@dtucker.net>
3765 Date: Sun Nov 27 09:16:15 2022 +1100
3767 Remove explicit "default" test config argument.
3769 Not specifying the test config implicitly selects default args.
3771 commit 15a01cf15f396f87c6d221c5a6af98331c818962
3772 Author: Darren Tucker <dtucker@dtucker.net>
3773 Date: Wed Nov 23 13:18:54 2022 +1100
3775 Add fallback for old platforms w/out MAP_ANON.
3777 commit 6b9bbbfe8b26db6e9a30a7e08c223e85421aed98
3778 Author: Darren Tucker <dtucker@dtucker.net>
3779 Date: Wed Nov 23 13:09:11 2022 +1100
3781 If we haven't found it yet, recheck for sys/stat.h.
3783 On some very old platforms, sys/stat.h needs sys/types.h, however
3784 autoconf 2.71's AC_CHECK_INCLUDES_DEFAULT checks for them in the
3785 opposite order, which in combination with modern autoconf's
3786 "present but cannot be compiled" behaviour causes it to not be
3789 commit 8926956f22639132a9f2433fcd25224e01b900f5
3790 Author: Darren Tucker <dtucker@dtucker.net>
3791 Date: Fri Nov 11 11:25:37 2022 +1100
3793 Add dfly62 test target.
3795 commit 650de7ecd3567b5a5dbf16dd1eb598bd8c20bca8
3796 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3797 Date: Thu Nov 10 23:03:10 2022 +0000
3799 upstream: Handle dynamic remote port forwarding in escape commandline's
3801 -R processing. bz#3499, ok djm@
3803 OpenBSD-Commit-ID: 194ee4cfe7ed0e2b8ad0727f493c798a50454208
3805 commit 5372db7e7985ba2c00f20fdff8942145ca99e033
3806 Author: Darren Tucker <dtucker@dtucker.net>
3807 Date: Thu Nov 10 12:44:51 2022 +1100
3809 Remove seed passing over reexec.
3811 This was added for the benefit of platforms using ssh-rand-helper to
3812 prevent a delay on each connection as sshd reseeded itself.
3814 ssh-random-helper is long gone, and since the re-exec happens before the
3815 chroot the re-execed sshd can reseed itself normally. ok djm@
3817 commit ca98d3f8c64cfc51af81e1b01c36a919d5947ec2
3818 Author: Darren Tucker <dtucker@dtucker.net>
3819 Date: Wed Nov 9 20:59:20 2022 +1100
3821 Skip reexec test on OpenSSL 1.1.1 specifically.
3823 OpenSSL 1.1.1 has a bug in its RNG that breaks reexec fallback, so skip
3824 that test. See bz#3483 for details.
3826 commit 5ec4ebc2548e5f7f1b55b2a5cef5b67bdca8146f
3827 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3828 Date: Wed Nov 9 09:04:12 2022 +0000
3830 upstream: Fix typo in fatal error message.
3832 Patch from vapier at chromium.org.
3834 OpenBSD-Commit-ID: 8a0c164a6a25eef0eedfc30df95bfa27644e35cf
3836 commit e6abafe9a6d809422d3432b95b3f9747b0acaa71
3837 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3838 Date: Wed Nov 9 09:01:52 2022 +0000
3840 upstream: Remove errant colon and simplify format
3842 string in error messages. Patch from vapier at chromium.org.
3844 OpenBSD-Commit-ID: fc28466ebc7b74e0072331947a89bdd239c160d3
3846 commit db2027a687516f87c3fb141e87154bb3d8a7807c
3847 Author: djm@openbsd.org <djm@openbsd.org>
3848 Date: Wed Nov 9 01:37:44 2022 +0000
3850 upstream: rename client_global_hostkeys_private_confirm() to
3852 client_global_hostkeys_prove_confirm(), as it handles the
3853 "hostkeys-prove00@openssh.com" message; no functional change
3855 OpenBSD-Commit-ID: 31e09bd3cca6eed26855b88fb8beed18e9bd026d
3857 commit 1c2be7c2004cf1abcd172fee9fe3eab57cd4c426
3858 Author: djm@openbsd.org <djm@openbsd.org>
3859 Date: Wed Nov 9 00:15:59 2022 +0000
3861 upstream: typo in comment
3863 OpenBSD-Commit-ID: 39c58f41e0f32d1ff31731fa6f5bbbc3ad25084a
3865 commit cf1a9852d7fc93e4abc4168aed09529a57427cdc
3866 Author: Darren Tucker <dtucker@dtucker.net>
3867 Date: Wed Nov 9 09:23:47 2022 +1100
3869 Defer seed_rng until after closefrom call.
3871 seed_rng will initialize OpenSSL, and some engine providers (eg Intel's
3872 QAT) will open descriptors for their own use. bz#3483, patch from
3873 joel.d.schuetze at intel.com, ok djm@
3875 commit dffa64480163fbf76af7e4fb62c26bb0dd6642aa
3876 Author: Darren Tucker <dtucker@dtucker.net>
3877 Date: Wed Nov 9 08:27:47 2022 +1100
3879 Fix comment text. From emaste at freebsd.org.
3881 commit d9df5689c29823ab830ec4f54c83c6cc3c0077ad
3882 Author: Pierre Ossman <ossman@cendio.se>
3883 Date: Wed Jul 6 13:52:10 2022 +0200
3885 Avoid assuming layout of fd_set
3887 POSIX doesn't specify the internal layout of the fd_set object, so let's
3888 not assume it is just a bit mask. This increases compatibility with
3889 systems that have a different layout.
3891 The assumption is also worthless as we already refuse to use file
3892 descriptors over FD_SETSIZE anyway. Meaning that the default size of
3893 fd_set is quite sufficient.
3895 commit 419aa8a312e8d8f491933ca3d5933e602cb05aae
3896 Author: Darren Tucker <dtucker@dtucker.net>
3897 Date: Tue Nov 8 12:42:52 2022 +1100
3899 Shutdown any VM before trying to check out repo.
3901 In the case where the previous run did not clean up, the checkout will
3902 fail as it'll leave a stale mount.
3904 commit a32c07cbb78f65d8527642b96474a83b413f8108
3905 Author: Darren Tucker <dtucker@dtucker.net>
3906 Date: Tue Nov 8 11:33:25 2022 +1100
3908 Run vm startup and shutdown from runner temp dir.
3910 Should work even if the github workspace dir is on a stale sshfs mount.
3912 commit 2b40a7dfcdb8e616155b9504145aa52b271455aa
3913 Author: Darren Tucker <dtucker@dtucker.net>
3914 Date: Tue Nov 8 11:03:31 2022 +1100
3916 Add valrind-5 test here too.
3918 commit 2ea03d1f6d0a05ee2b63ed2dc0f2d54f1e4655a1
3919 Author: Darren Tucker <dtucker@dtucker.net>
3920 Date: Tue Nov 8 09:21:10 2022 +1100
3922 Update checkout and upload actions.
3924 Update actions/checkout and actions/upload-artifact to main branch for
3925 compatibility with node.js v16.
3927 commit 4e316ff0f18a118232bb9ac6512ee62773a9e8ea
3928 Author: Darren Tucker <dtucker@dtucker.net>
3929 Date: Tue Nov 8 09:17:04 2022 +1100
3931 Split out rekey test since it runs the longest.
3933 commit 21625a6424258a92a96a3bb73ae6aabc5ed8a6b4
3934 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3935 Date: Mon Nov 7 10:09:28 2022 +0000
3937 upstream: The IdentityFile option in ssh_config can also be used to
3939 specify a public key file, as documented in ssh.1 for the -i option. Document
3940 this also for IdentityFile in ssh_config.5, for documentation completeness.
3941 From laalsaas at systemli.org via portable github PR#352, ok jmc@ djm@
3943 OpenBSD-Commit-ID: 2f943be9f96e60ef81a9a4faa25b009999f9883b
3945 commit 747691604d3325ed2b62bad85b6fd8563ad32f6c
3946 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3947 Date: Mon Nov 7 10:05:38 2022 +0000
3949 upstream: Remove some set but otherwise unused variables, spotted
3951 in -portable by clang 16's -Wunused-but-set-variable. ok djm@
3953 OpenBSD-Commit-ID: 3d943ddf2369b38fbf89f5f19728e7dc1daf3982
3955 commit 1d78d25653805aefc7a8dd9d86cd7359ada3823c
3956 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3957 Date: Mon Nov 7 10:02:59 2022 +0000
3959 upstream: Check for and disallow MaxStartups values less than or
3961 equal to zero during config parsing, rather than faling later at runtime.
3964 OpenBSD-Commit-ID: d79c2b7a8601eb9be493629a91245d761154308b
3966 commit a00f59a645072e5f5a8d207af15916a7b23e2642
3967 Author: djm@openbsd.org <djm@openbsd.org>
3968 Date: Mon Nov 7 04:04:40 2022 +0000
3970 upstream: fix parsing of hex cert expiry time; was checking whether the
3972 start time began with "0x", not the expiry time.
3976 OpenBSD-Commit-ID: 6269242c3e1a130b47c92cfca4d661df15f05739
3978 commit f58acaf8c7315483f4ac87d46a1aa2142a713cd8
3979 Author: Darren Tucker <dtucker@dtucker.net>
3980 Date: Mon Nov 7 15:10:59 2022 +1100
3984 commit 162e5741020a8d996c0c12b988b118e71ed728e6
3985 Author: Darren Tucker <dtucker@dtucker.net>
3986 Date: Mon Nov 7 15:04:33 2022 +1100
3988 Branch-specific links for master status badges.
3990 commit e4b7c12ab24579312aa3ed38ce7041a439ec2d56
3991 Author: Darren Tucker <dtucker@dtucker.net>
3992 Date: Mon Nov 7 14:46:38 2022 +1100
3994 Add CIFuzz status badge.
3996 commit b496b9f831acd1e5bcd875e26e797488beef494a
3997 Author: Darren Tucker <dtucker@dtucker.net>
3998 Date: Mon Nov 7 14:45:16 2022 +1100
4000 Do not run CIFuzz on selfhosted tree.
4002 We already run it on the regular tree, no need to double up.
4004 commit 2138b1c4ddb300129a41a5104627b0d561184c7b
4005 Author: Darren Tucker <dtucker@dtucker.net>
4006 Date: Mon Nov 7 14:41:58 2022 +1100
4008 Whitespace change to trigger CIFuzz workflow.
4010 commit 4670b97ef87c7b0f21283c9b07c7191be88dda05
4011 Author: Darren Tucker <dtucker@dtucker.net>
4012 Date: Mon Nov 7 14:34:04 2022 +1100
4014 Run cifuzz workflow on the actions as regular CI.
4016 commit 79391e66ce851ace1baf3c6a35e83a23f08ec2ba
4017 Author: David Korczynski <david@adalogics.com>
4018 Date: Tue Nov 30 11:45:20 2021 +0000
4020 Add CIFuzz integration
4022 commit c1893364a0be243270014d7d34362a8101d55112
4023 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4024 Date: Mon Nov 7 02:21:22 2022 +0000
4026 upstream: Import regenerated moduli.
4028 OpenBSD-Commit-ID: b0e54ee4d703bd6929bbc624068666a7a42ecb1f
4030 commit 5c3f18fb994ef27e685b205ee2351851b80fdbd1
4031 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4032 Date: Mon Nov 7 01:53:01 2022 +0000
4034 upstream: Fix typo. From pablomh via -portable github PR#344.
4036 OpenBSD-Commit-ID: d056ee2e73691dc3ecdb44a6de68e6b88cd93827
4038 commit e1c6fcc142066417c9832e634463faa3dd5d116c
4039 Author: Darren Tucker <dtucker@dtucker.net>
4040 Date: Mon Nov 7 12:46:58 2022 +1100
4042 Link to branch-specific queries for V_9_1 status.
4044 commit 4f4a5fad6d8892c3f8ee9cd81ec7de6458210c9f
4045 Author: Darren Tucker <dtucker@dtucker.net>
4046 Date: Sun Nov 6 10:55:59 2022 +1100
4048 Use "prohibit-password" in -portable comments.
4050 "without-password" is the deprecated alias for "prohibit-password",
4051 so we should reference the latter. From emaste at freebsd.org.
4053 commit 0f7e1eba55259ec037f515000b4c4afbf446230a
4054 Author: Darren Tucker <dtucker@dtucker.net>
4055 Date: Sun Nov 6 10:50:01 2022 +1100
4057 Fix tracing disable on FreeBSD.
4059 Some versions of FreeBSD do not support using id 0 to refer to the
4060 current pid for procctl, so pass getpid() explicitly. From
4061 emaste at freebsd.org.
4063 commit 32fddb982fd61b11a2f218a115975a87ab126d43
4064 Author: Darren Tucker <dtucker@dtucker.net>
4065 Date: Mon Nov 7 10:39:01 2022 +1100
4067 Fix setres*id checks to work with clang-16.
4069 glibc has the prototypes for setresuid and setresgid behind _GNU_SOURCE,
4070 and clang 16 will error out on implicit function definitions, so add
4071 _GNU_SOURCE and the required headers to the configure checks. From
4072 sam at @gentoo.org via bz#3497.
4074 commit 12af712d116f42164bcfa56db901d06e4fa27199
4075 Author: Sam James <sam@gentoo.org>
4076 Date: Sun Nov 6 04:52:38 2022 +0000
4078 configure.ac: Fix -Wstrict-prototypes
4080 Clang 16 now warns on this and it'll be removed in C23, so let's
4081 just be future proof. It also reduces noise when doing general
4082 Clang 16 porting work (which is a big job as it is). github PR#355.
4084 Signed-off-by: Sam James <sam@gentoo.org>
4086 commit 40b0a5eb6e3edfa2886b60c09c7803353b0cc7f5
4087 Author: Sam James <sam@gentoo.org>
4088 Date: Sun Nov 6 04:47:35 2022 +0000
4090 configure.ac: Add <pty.h> include for openpty
4092 Another Clang 16ish fix (which makes -Wimplicit-function-declaration
4093 an error by default). github PR#355.
4095 See: 2efd71da49b9cfeab7987058cf5919e473ff466b
4096 See: be197635329feb839865fdc738e34e24afd1fca8
4098 commit 6b17e128879ec6cc32ca2c28b5d894b4aa72e32d
4099 Author: Rochdi Nassah <rochdinassah.1998@gmail.com>
4100 Date: Fri Oct 28 01:26:31 2022 +0100
4102 Fix broken zlib link.
4104 commit 99500df246ccb736ddbdd04160dcc82165d81a77
4105 Author: Darren Tucker <dtucker@dtucker.net>
4106 Date: Fri Nov 4 16:59:26 2022 +1100
4108 Don't run openbsd-compat tests on Cygwin.
4110 Add "compat-tests" to the default TEST_TARGET so we can override as
4111 necessary. Override TEST_TARGET for Cygwin as the tests don't currently
4114 commit 3cae9f92a31897409666aa1e6f696f779759332b
4115 Author: djm@openbsd.org <djm@openbsd.org>
4116 Date: Thu Nov 3 21:59:20 2022 +0000
4118 upstream: replace recently-added valid_domain() check for hostnames
4120 going to known_hosts with a more relaxed check for bad characters; previous
4121 commit broke address literals. Reported by/feedback from florian@
4123 OpenBSD-Commit-ID: 10b86dc6a4b206adaa0c11b58b6d5933898d43e0
4125 commit 9655217231c9056200bea7ae2dffcc9c0c3eb265
4126 Author: Darren Tucker <dtucker@dtucker.net>
4127 Date: Thu Nov 3 23:07:50 2022 +1100
4129 Rerun tests on changes to Makefile.in in any dir.
4131 commit 3500f0405a3ab16b59a26f3508c4257a3fc3bce6
4132 Author: Darren Tucker <dtucker@dtucker.net>
4133 Date: Thu Nov 3 23:04:08 2022 +1100
4135 Link libssh into compat tests.
4137 The cygwin compat code uses xmalloc, so add libssh.a so pick up that.
4139 commit ec59effcf65b8a4c85d47ff5a271123259dd0ab8
4140 Author: Darren Tucker <dtucker@dtucker.net>
4141 Date: Thu Nov 3 21:44:23 2022 +1100
4143 Fix compat regress to work with non-GNU make.
4145 commit 73550a218e7dfbbd599534cbf856309bc924f6fd
4146 Author: Darren Tucker <dtucker@dtucker.net>
4147 Date: Thu Nov 3 13:41:16 2022 +1100
4149 Increase selfhosted job timeout.
4151 The default job timeout of 360 (6h) is not enough to complete the
4152 regress tests for some of the slow VMs depending on the load on the host.
4153 Increase to 600 (10h).
4155 commit db97d8d0b90c6ce52b94b153d6f8f5f7d3b11777
4156 Author: Darren Tucker <dtucker@dtucker.net>
4157 Date: Thu Nov 3 10:00:43 2022 +1100
4159 Only run opensslver tests if built with OpenSSL.
4161 commit ba053709638dff2f6603df0c1f340352261d63ea
4162 Author: Darren Tucker <dtucker@dtucker.net>
4163 Date: Wed Nov 2 14:16:04 2022 +1100
4165 Add tests for OpenSSL 3.0.7 and LibreSSL 3.6.1.
4167 commit edd24101c7e17d1a8f6576e1aaf62233b47ad6f5
4168 Author: Darren Tucker <dtucker@dtucker.net>
4169 Date: Thu Nov 3 08:17:39 2022 +1100
4171 Run compat regress tests too.
4173 commit fe88d67e7599b0bc73f6e4524add28d743e7f977
4174 Author: Darren Tucker <dtucker@dtucker.net>
4175 Date: Thu Nov 3 08:14:05 2022 +1100
4177 Compat tests need libcrypto.
4179 This was moved to CHANNELLIBS during the libs refactor. Spotted by
4182 commit 96b519726b7944eee3c23a54eee3d5c031ba1533
4183 Author: Darren Tucker <dtucker@dtucker.net>
4184 Date: Thu Nov 3 04:24:39 2022 +1100
4186 Include time.h when defining timegm.
4188 Fixes build on some platforms eg recent AIX.
4190 commit da6038bd5cd55eb212eb2aec1fc8ae79bbf76156
4191 Author: Darren Tucker <dtucker@dtucker.net>
4192 Date: Tue Nov 1 19:10:30 2022 +1100
4194 Always use compat getentropy.
4196 Have it call native getentropy and fall back as required. Should fix
4197 issues of platforms where libc has getentropy but it is not implemented
4198 in the kernel. Based on github PR#354 from simsergey.
4200 commit 5ebe18cab6be3247b44c807ac145164010465b82
4201 Author: Darren Tucker <dtucker@dtucker.net>
4202 Date: Wed Nov 2 10:51:48 2022 +1100
4204 Check for sockaddr_in.sin_len.
4206 If found, set SOCK_HAS_LEN which is used in addr.c. Should fix keyscan
4207 tests on platforms with this (eg old NetBSD).
4209 commit a1febadf426536612c2734168d409147c392e7cf
4210 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4211 Date: Sun Oct 30 18:42:07 2022 +0000
4213 upstream: Use variable for diff options
4215 instead of unconditionally specifying "-rN". This will make life easier
4216 in -portable where not all diff's understand -N.
4218 OpenBSD-Regress-ID: 8b8a407115546be1c6d72d350b1e4f1f960d3cd3
4220 commit f6d3ed9a8a9280cbb68d6a499850cfe810e92bd0
4221 Author: Darren Tucker <dtucker@dtucker.net>
4222 Date: Mon Oct 31 05:13:02 2022 +1100
4224 OpenSSL dev branch is 302 not 320.
4226 While there, also accept 301 which it shat it was previously.
4228 commit 25c8a2bbcc10c493d27faea57c42a6bf13fa51f2
4229 Author: djm@openbsd.org <djm@openbsd.org>
4230 Date: Fri Oct 28 02:47:04 2022 +0000
4232 upstream: put sshkey_check_rsa_length() back in sshkey.c to unbreak
4236 OpenBSD-Commit-ID: 99eec58abe382ecd14b14043b195ee1babb9cf6e
4238 commit 1192588546c29ceec10775125f396555ea71850f
4239 Author: djm@openbsd.org <djm@openbsd.org>
4240 Date: Fri Oct 28 02:29:34 2022 +0000
4242 upstream: allow ssh-keyscan(1) to accept CIDR address ranges, e.g.
4244 ssh-keyscan 192.168.0.0/24
4246 If a CIDR range is passed, then it will be expanded to all possible
4247 addresses in the range including the all-0s and all-1s addresses.
4249 bz#976 feedback/ok markus@
4251 OpenBSD-Commit-ID: ce6c5211f936ac0053fd4a2ddb415277931e6c4b
4253 commit 64af4209309461c79c39eda2d13f9d77816c6398
4254 Author: Damien Miller <djm@mindrot.org>
4255 Date: Fri Oct 28 12:54:35 2022 +1100
4259 commit 27267642699342412964aa785b98afd69d952c88
4260 Author: djm@openbsd.org <djm@openbsd.org>
4261 Date: Fri Oct 28 00:44:44 2022 +0000
4263 upstream: refactor sshkey_private_deserialize
4267 OpenBSD-Commit-ID: f5ca6932fdaf840a5e8250becb38315a29b5fc9f
4269 commit 2519a7077a9332f70935e5242ba91ee670ed6b87
4270 Author: djm@openbsd.org <djm@openbsd.org>
4271 Date: Fri Oct 28 00:44:17 2022 +0000
4273 upstream: refactor sshkey_private_serialize_opt()
4277 OpenBSD-Commit-ID: 61e0fe989897901294efe7c3b6d670cefaf44cbd
4279 commit 11a768adf98371fe4e43f3b06014024c033385d5
4280 Author: djm@openbsd.org <djm@openbsd.org>
4281 Date: Fri Oct 28 00:43:30 2022 +0000
4283 upstream: refactor certify
4287 OpenBSD-Commit-ID: 35d742992e223eaca3537e6fb3d3002c08eed4f6
4289 commit 3fbc58bb249d967cc43ebdc554f6781bb73d4a58
4290 Author: djm@openbsd.org <djm@openbsd.org>
4291 Date: Fri Oct 28 00:43:08 2022 +0000
4293 upstream: refactor sshkey_sign() and sshkey_verify()
4297 OpenBSD-Commit-ID: 368e662c128c99d05cc043b1308d2b6c71a4d3cc
4299 commit a1deb6cdbbe6afaab74ecb08fcb62db5739267be
4300 Author: djm@openbsd.org <djm@openbsd.org>
4301 Date: Fri Oct 28 00:41:52 2022 +0000
4303 upstream: refactor sshkey_from_blob_internal()
4307 OpenBSD-Commit-ID: 1f46c0cbb8060ee9666a02749594ad6658c8e283
4309 commit 7d00799c935271ce89300494c5677190779f6453
4310 Author: djm@openbsd.org <djm@openbsd.org>
4311 Date: Fri Oct 28 00:41:17 2022 +0000
4313 upstream: refactor sshkey_from_private()
4317 OpenBSD-Commit-ID: e5dbe7a3545930c50f70ee75c867a1e08b382b53
4319 commit 262647c2e920492ca57f1b9320d74f4a0f6e482b
4320 Author: djm@openbsd.org <djm@openbsd.org>
4321 Date: Fri Oct 28 00:39:29 2022 +0000
4323 upstream: factor out key generation
4327 OpenBSD-Commit-ID: 5b4211bff4de8d9adb84bc72857a8c42c44e7ceb
4329 commit 401c74e7dc15eab60540653d2f94d9306a927bab
4330 Author: djm@openbsd.org <djm@openbsd.org>
4331 Date: Fri Oct 28 00:38:58 2022 +0000
4333 upstream: refactor and simplify sshkey_read()
4337 OpenBSD-Commit-ID: 0d93b7a56e31cd06a8bb0d2191d084ce254b0971
4339 commit 591fed94e66a016acf87f4b7cd416ce812f2abe8
4340 Author: djm@openbsd.org <djm@openbsd.org>
4341 Date: Fri Oct 28 00:37:24 2022 +0000
4343 upstream: factor out public key serialization
4347 OpenBSD-Commit-ID: a3570c4b97290c5662890aea7328d87f55939033
4349 commit 1e78844ae2b2dc01ba735d5ae740904c57e13685
4350 Author: djm@openbsd.org <djm@openbsd.org>
4351 Date: Fri Oct 28 00:36:31 2022 +0000
4353 upstream: factor out sshkey_equal_public()
4357 OpenBSD-Commit-ID: 1368ba114cb37732fe6ec3d89c7e6d27ea6fdc94
4359 commit 25de1c01a8b9a2c8ab9b1da22444a03e89c982de
4360 Author: djm@openbsd.org <djm@openbsd.org>
4361 Date: Fri Oct 28 00:35:40 2022 +0000
4363 upstream: begin big refactor of sshkey
4365 Move keytype data and some of the type-specific code (allocation,
4366 cleanup, etc) out into each key type's implementation. Subsequent
4367 commits will move more, with the goal of having each key-*.c file
4368 owning as much of its keytype's implementation as possible.
4370 lots of feedback + ok markus@
4372 OpenBSD-Commit-ID: 0f2b4334f73914344e9e5b3d33522d41762a57ec
4374 commit 445363433ba20b8a3e655b113858c836da46a1cb
4375 Author: djm@openbsd.org <djm@openbsd.org>
4376 Date: Mon Oct 24 22:43:36 2022 +0000
4378 upstream: Be more paranoid with host/domain names coming from the
4380 never write a name with bad characters to a known_hosts file.
4382 reported by David Leadbeater, ok deraadt@
4384 OpenBSD-Commit-ID: ba9b25fa8b5490b49398471e0c9657b0cbc7a5ad
4386 commit 7190154de2c9fe135f0cc1ad349cb2fa45152b89
4387 Author: djm@openbsd.org <djm@openbsd.org>
4388 Date: Mon Oct 24 21:52:50 2022 +0000
4390 upstream: regress test for unmatched glob characters; fails before
4392 previous commit but passes now. bz3488; prodded by dtucker@
4394 OpenBSD-Regress-ID: 0cc5cc9ea4a6fd170dc61b9212f15badaafb3bbd
4396 commit a4821a592456c3add3cd325db433110cdaaa3e5c
4397 Author: djm@openbsd.org <djm@openbsd.org>
4398 Date: Mon Oct 24 21:51:55 2022 +0000
4400 upstream: when scp(1) is using the SFTP protocol for transport (the
4402 default), better match scp/rcp's handling of globs that don't match the
4403 globbed characters but do match literally (e.g. trying to transfer
4406 Previously scp(1) in SFTP mode would not match these pathnames but
4407 legacy scp/rcp mode would.
4409 Reported by Michael Yagliyan in bz3488; ok dtucker@
4411 OpenBSD-Commit-ID: d8a3773f53015ba811fddba7473769a2fd343e11
4413 commit 18376847b8043ba967eabbe23692ef74c9a3fddc
4414 Author: jsg@openbsd.org <jsg@openbsd.org>
4415 Date: Thu Oct 13 09:09:28 2022 +0000
4417 upstream: use correct type with sizeof ok djm@
4419 OpenBSD-Commit-ID: d6c882c2e8a42ff831a5b3cbc2c961ecb2dd6143
4421 commit 4a4883664d6b4e9e4e459a8cdc16bd8d4b735de9
4422 Author: jmc@openbsd.org <jmc@openbsd.org>
4423 Date: Fri Oct 7 06:00:58 2022 +0000
4425 upstream: ssh-agent.1: - use Nm not Xr for self-ref - while here,
4432 OpenBSD-Commit-ID: 855dac4695cef22e96d69c53436496bc408ca389
4434 commit 9fd2441113fce2a83fc7470968c3b27809cc7f10
4435 Author: djm@openbsd.org <djm@openbsd.org>
4436 Date: Fri Oct 7 04:06:26 2022 +0000
4438 upstream: document "-O no-restrict-websafe"; spotted by Ross L
4442 OpenBSD-Commit-ID: fe9eaa50237693a14ebe5b5614bf32a02145fe8b
4444 commit 614252b05d70f798a0929b1cd3d213030ad4d007
4445 Author: Darren Tucker <dtucker@dtucker.net>
4446 Date: Tue Oct 18 06:29:16 2022 +1100
4448 OpenSSL dev branch now identifies as 3.2.0.
4450 commit 195e5a65fd793a738ea8451ebfdd1919db5aff3e
4451 Author: Damien Miller <djm@mindrot.org>
4452 Date: Mon Oct 17 09:41:47 2022 +1100
4454 revert c64b62338b4 and guard POLL* defines instead
4456 c64b62338b4 broke OSX builds, which do have poll.h but lack ppoll(2)
4459 commit bc2e480d99613bd59720edae244d1764636544c4
4460 Author: Damien Miller <djm@mindrot.org>
4461 Date: Fri Oct 14 14:52:22 2022 +1100
4463 undef _get{short,long} before redefining
4465 commit 5eb796a369c64f18d55a6ae9b1fa9b35eea237fb
4466 Author: Harmen Stoppels <harmenstoppels@gmail.com>
4467 Date: Thu Oct 13 16:08:46 2022 +0200
4469 Fix snprintf configure test for clang 15
4471 Clang 15 -Wimplicit-int defaults to an error in C99 mode and above.
4472 A handful of tests have "main(..." and not "int main(..." which caused
4473 the tests to produce incorrect results.
4475 commit c64b62338b46ffa08839f05f21ad69fa6234dc17
4476 Author: Damien Miller <djm@mindrot.org>
4477 Date: Mon Oct 10 12:32:43 2022 +1100
4479 skip bsd-poll.h if poll.h found; ok dtucker
4481 commit 5ee2b8ccfcf4b606f450eb0ff2305e311f68b0be
4482 Author: djm@openbsd.org <djm@openbsd.org>
4483 Date: Thu Oct 6 22:42:37 2022 +0000
4485 upstream: honour user's umask if it is more restrictive then the ssh
4487 default (022); based on patch from Alex Henrie, ok dtucker@ deraadt@
4489 OpenBSD-Commit-ID: fe1b9e15fc9a4f49fc338e848ce14d8727abe82d
4491 commit a75cffc2700cebd3e2dd9093f7f7388d2be95cb7
4492 Author: Darren Tucker <dtucker@dtucker.net>
4493 Date: Fri Oct 7 03:54:56 2022 +1100
4495 Add LibreSSL 3.6.0 to test suite.
4497 While there, bump OpenSSL to latest 1.1.1q release.
4499 commit fcc0f0c0e96a30076683fea9a7c9eedc72931742
4500 Author: Darren Tucker <dtucker@dtucker.net>
4501 Date: Thu Oct 6 21:18:16 2022 +1100
4503 Add 9.1 branch to CI status page.
4505 commit ef211eee63821d894a8bf81f22bfba9f6899d0fe
4506 Author: Darren Tucker <dtucker@dtucker.net>
4507 Date: Tue Oct 4 23:20:23 2022 +1100
4509 Test commits to all branches of portable.
4511 Only test OpenBSD upstream on commits to master since that's what it
4514 commit fe646de03cafb6593ff4e4954bca9ec4b4b753a8
4515 Author: Damien Miller <djm@mindrot.org>
4516 Date: Wed Oct 5 03:47:26 2022 +1100
4520 commit a6e1852d10c63a830196e82168dadd957aaf28ec
4521 Author: Damien Miller <djm@mindrot.org>
4522 Date: Wed Oct 5 03:40:01 2022 +1100
4524 mention libfido2 autodetection
4526 commit 7360c2c206f33d309edbaf64036c96fadf74d640
4527 Author: Damien Miller <djm@mindrot.org>
4528 Date: Wed Oct 5 03:37:36 2022 +1100
4530 remove mention of --with-security-key-builtin
4532 it is enabled by default when libfido2 is installed
4534 commit 0ffb46f2ee2ffcc4daf45ee679e484da8fcf338c
4535 Author: Damien Miller <djm@mindrot.org>
4536 Date: Tue Oct 4 01:51:42 2022 +1100
4540 commit 657e676ff696c7bb787bffb0e249ea1be3b474e1
4541 Author: Damien Miller <djm@mindrot.org>
4542 Date: Tue Oct 4 01:45:52 2022 +1100
4544 update release notes URL
4546 commit f059da2b29840c0f048448809c317ce2ae014da7
4547 Author: Damien Miller <djm@mindrot.org>
4548 Date: Tue Oct 4 01:45:41 2022 +1100
4550 crank versions in RPM spec files
4552 commit b51f3f172d87cbdb80ca4eb7b2149e56a7647557
4553 Author: djm@openbsd.org <djm@openbsd.org>
4554 Date: Mon Sep 26 22:18:40 2022 +0000
4556 upstream: openssh-9.1
4558 OpenBSD-Commit-ID: 5a467b2ee81da01a86adf1ad93b62b1728494e56
4560 commit 4cf8d0c0f3030f594a238bab21a0695735515487
4561 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4562 Date: Wed Sep 21 22:26:50 2022 +0000
4564 upstream: Fix typo. From AlexanderStohr via github PR#343.
4566 OpenBSD-Commit-ID: a134c9b4039e48803fc6a87f955b0f4a03181497
4568 commit 8179fed3264d5919899900ed8881d5f9bb57ca33
4569 Author: djm@openbsd.org <djm@openbsd.org>
4570 Date: Mon Sep 19 21:39:16 2022 +0000
4572 upstream: add RequiredRSASize to the list of keywords accepted by
4576 OpenBSD-Commit-ID: fe871408cf6f9d3699afeda876f8adbac86a035e
4578 commit 5f954929e9f173dd1e279e07d0e8b14fa845814d
4579 Author: Damien Miller <djm@mindrot.org>
4580 Date: Mon Sep 19 20:59:34 2022 +1000
4582 no need for glob.h here
4584 it also causes portability problems
4586 commit 03d94a47207d58b3db37eba4f87eb6ae5a63168a
4587 Author: Damien Miller <djm@mindrot.org>
4588 Date: Mon Sep 19 20:59:04 2022 +1000
4590 avoid Wuninitialized false positive in gcc-12ish
4592 commit 9d952529113831fb3071ab6e408d2726fd72e771
4593 Author: djm@openbsd.org <djm@openbsd.org>
4594 Date: Mon Sep 19 10:46:00 2022 +0000
4596 upstream: use users-groups-by-id@openssh.com sftp-server extension
4598 (when available) to fill in user/group names for directory listings.
4599 Implement a client-side cache of see uid/gid=>user/group names. ok markus@
4601 OpenBSD-Commit-ID: f239aeeadfa925a37ceee36ee8b256b8ccf4466e
4603 commit 8ff680368b0bccf88ae85d4c99de69387fbad7a6
4604 Author: djm@openbsd.org <djm@openbsd.org>
4605 Date: Mon Sep 19 10:43:12 2022 +0000
4607 upstream: sftp client library support for
4609 users-groups-by-id@openssh.com; ok markus@
4611 OpenBSD-Commit-ID: ddb2f33a2da6349a9a89a8b5bcb9ca7c999394de
4613 commit 488f6e1c582212c2374a4bf8cd1b703d2e70fb8b
4614 Author: djm@openbsd.org <djm@openbsd.org>
4615 Date: Mon Sep 19 10:41:58 2022 +0000
4617 upstream: extend sftp-common.c:extend ls_file() to support supplied
4619 user/group names; ok markus@
4621 OpenBSD-Commit-ID: c70c70498b1fdcf158531117e405b6245863bfb0
4623 commit 74b77f7497dba3a58315c8f308883de448078057
4624 Author: djm@openbsd.org <djm@openbsd.org>
4625 Date: Mon Sep 19 10:40:52 2022 +0000
4627 upstream: sftp-server(8): add a "users-groups-by-id@openssh.com"
4629 extension request that allows the client to obtain user/group names that
4630 correspond to a set of uids/gids.
4632 Will be used to make directory listings more useful and consistent
4637 OpenBSD-Commit-ID: 7ebabde0bcb95ef949c4840fe89e697e30df47d3
4639 commit 231a346c0c67cc7ca098360f9a554fa7d4f1eddb
4640 Author: djm@openbsd.org <djm@openbsd.org>
4641 Date: Mon Sep 19 08:49:50 2022 +0000
4643 upstream: better debugging for connect_next()
4645 OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640
4647 commit 1875042c52a3b950ae5963c9ca3774a4cc7f0380
4648 Author: djm@openbsd.org <djm@openbsd.org>
4649 Date: Sat Sep 17 10:34:29 2022 +0000
4651 upstream: Add RequiredRSASize for sshd(8); RSA keys that fall
4653 beneath this limit will be ignored for user and host-based authentication.
4655 Feedback deraadt@ ok markus@
4657 OpenBSD-Commit-ID: 187931dfc19d51873df5930a04f2d972adf1f7f1
4659 commit 54b333d12e55e6560b328c737d514ff3511f1afd
4660 Author: djm@openbsd.org <djm@openbsd.org>
4661 Date: Sat Sep 17 10:33:18 2022 +0000
4663 upstream: add a RequiredRSASize for checking RSA key length in
4665 ssh(1). User authentication keys that fall beneath this limit will be
4666 ignored. If a host presents a host key beneath this limit then the connection
4667 will be terminated (unfortunately there are no fallbacks in the protocol for
4668 host authentication).
4670 feedback deraadt, Dmitry Belyavskiy; ok markus@
4672 OpenBSD-Commit-ID: 430e339b2a79fa9ecc63f2837b06fdd88a7da13a
4674 commit 07d8771bacfefbcfb37fa8a6dc6103bcc097e0ab
4675 Author: djm@openbsd.org <djm@openbsd.org>
4676 Date: Sat Sep 17 10:30:45 2022 +0000
4678 upstream: Add a sshkey_check_rsa_length() call for checking the
4680 length of an RSA key; ok markus@
4682 OpenBSD-Commit-ID: de77cd5b11594297eda82edc594b0d32b8535134
4684 commit 3991a0cf947cf3ae0f0373bcec5a90e86a7152f5
4685 Author: djm@openbsd.org <djm@openbsd.org>
4686 Date: Sat Sep 17 10:11:29 2022 +0000
4688 upstream: actually hook up restrict_websafe; the command-line flag
4690 was never actually used. Spotted by Matthew Garrett
4692 OpenBSD-Commit-ID: 0b363518ac4c2819dbaa3dfad4028633ab9cdff1
4694 commit 30b2a7e4291fb9e357f80a237931ff008d686d3b
4695 Author: djm@openbsd.org <djm@openbsd.org>
4696 Date: Fri Sep 16 06:55:37 2022 +0000
4698 upstream: correct error value
4700 OpenBSD-Commit-ID: 780efcbad76281f11f14b2a5ff04eb6db3dfdad4
4702 commit ac1ec9545947d9f9657259f55d04cb49d3a94c8a
4703 Author: djm@openbsd.org <djm@openbsd.org>
4704 Date: Fri Sep 16 03:33:14 2022 +0000
4706 upstream: sftp: Be a bit more clever about completions
4708 There are commands (e.g. "get" or "put") that accept two
4709 arguments, a local path and a remote path. However, the way
4710 current completion is written doesn't take this distinction into
4711 account and always completes remote or local paths.
4713 By expanding CMD struct and "cmds" array this distinction can be
4714 reflected and with small adjustment to completer code the correct
4715 path can be completed.
4717 By Michal Privoznik, ok dtucker@
4719 OpenBSD-Commit-ID: 1396d921c4eb1befd531f5c4a8ab47e7a74b610b
4721 commit 590db83384f9d99fc51c84505792d26d1ef60df9
4722 Author: djm@openbsd.org <djm@openbsd.org>
4723 Date: Fri Sep 16 03:13:34 2022 +0000
4725 upstream: sftp: Don't attempt to complete arguments for
4727 non-existent commands
4729 If user entered a non-existent command (e.g. because they made a
4730 typo) there is no point in trying to complete its arguments. Skip
4731 calling complete_match() if that's the case.
4733 From Michal Privoznik
4735 OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a
4737 commit ff9809fdfd1d9a91067bb14a77d176002edb153c
4738 Author: djm@openbsd.org <djm@openbsd.org>
4739 Date: Wed Sep 14 00:14:37 2022 +0000
4741 upstream: sk_enroll: never drop SSH_SK_USER_VERIFICATION_REQD flag
4745 Now that all FIDO signing calls attempt first without PIN and then
4746 fall back to trying PIN only if that attempt fails, we can remove the
4747 hack^wtrick that removed the UV flag from the keys returned during
4752 OpenBSD-Commit-ID: 684517608c8491503bf80cd175425f0178d91d7f
4754 commit 940dc10729cb5a95b7ee82c10184e2b9621c8a1d
4755 Author: djm@openbsd.org <djm@openbsd.org>
4756 Date: Wed Sep 14 00:13:13 2022 +0000
4758 upstream: a little extra debugging
4760 OpenBSD-Commit-ID: edf1601c1d0905f6da4c713f4d9cecc7d1c0295a
4762 commit 4b5f91cb959358141181b934156513fcb8a6c1e3
4763 Author: djm@openbsd.org <djm@openbsd.org>
4764 Date: Wed Sep 14 00:02:03 2022 +0000
4766 upstream: ssh-agent: attempt FIDO key signing without PIN and use
4768 the error to determine whether a PIN is required and prompt only if
4769 necessary. from Corinna Vinschen
4771 OpenBSD-Commit-ID: dd6be6a0b7148608e834ee737c3479b3270b00dd
4773 commit 113523bf0bc33600b07ebb083572c8c346b6fdf4
4774 Author: jmc@openbsd.org <jmc@openbsd.org>
4775 Date: Sun Sep 11 06:38:11 2022 +0000
4777 upstream: .Li -> .Vt where appropriate; from josiah frentsos,
4783 OpenBSD-Commit-ID: 565046e3ce68b46c2f440a93d67c2a92726de8ed
4785 commit 86af013b56cecb5ee58ae0bd9d495cd586fc5918
4786 Author: jsg@openbsd.org <jsg@openbsd.org>
4787 Date: Sat Sep 10 08:50:53 2022 +0000
4789 upstream: fix repeated words ok miod@ jmc@
4791 OpenBSD-Commit-ID: 6765daefe26a6b648cc15cadbbe337596af709b7
4793 commit 0ba39b93b326a7d5dfab776cc9b9d326161a9b16
4794 Author: djm@openbsd.org <djm@openbsd.org>
4795 Date: Fri Sep 9 03:31:42 2022 +0000
4797 upstream: notifier_complete(NULL, ...) is a noop, so no need to test
4799 that ctx!=NULL; from Corinna Vinschen
4801 OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a
4803 commit be197635329feb839865fdc738e34e24afd1fca8
4804 Author: Sam James <sam@gentoo.org>
4805 Date: Thu Sep 8 02:49:29 2022 +0100
4807 openbsd-compat/bsd-asprintf: add <stdio.h> include for vsnprintf
4809 Fixes the following build failure with Clang 15 on musl:
4811 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
4813 implicit function declarations [-Wimplicit-function-declaration]
4814 ret = vsnprintf(string, INIT_SZ, fmt, ap2);
4816 bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf'
4820 commit 6cb6f660bb35f77a0456dd2581ddf39c29398a5e
4821 Author: Darren Tucker <dtucker@dtucker.net>
4822 Date: Fri Sep 2 16:43:27 2022 +1000
4824 Remove DEF_WEAK, it's already in defines.h.
4826 commit ce39e7d8b70c4726defde5d3bc4cb7d40d131153
4827 Author: Darren Tucker <dtucker@dtucker.net>
4828 Date: Fri Sep 2 14:28:14 2022 +1000
4830 Resync arc4random with OpenBSD.
4832 This brings us up to current, including djm's random-reseeding change,
4833 as prompted by logan at cyberstorm.mu in bz#3467. It brings the
4834 platform-specific hooks from LibreSSL Portable, simplified to match our
4837 commit beaddde26f30e2195b8aa4f3193970e140e17305
4838 Author: Darren Tucker <dtucker@dtucker.net>
4839 Date: Fri Sep 2 14:20:04 2022 +1000
4841 Move OPENBSD ORIGINAL marker.
4843 Putting this after the copyright statement (which doesn't change)
4844 instead of before the version identifier (which does) prevents merge
4845 conflicts when resyncing changes.
4847 commit c83e467ead67a8cb48ef4bec8085d6fb880a2ff4
4848 Author: Darren Tucker <dtucker@dtucker.net>
4849 Date: Fri Sep 2 14:17:28 2022 +1000
4851 Remove arc4random_uniform from arc4random.c
4853 This was previously moved into its own file (matching OpenBSD) which
4854 prematurely committed in commit 73541f2.
4856 commit 5f45c2395c60865e59fa44152ff1d003a128c5bc
4857 Author: djm@openbsd.org <djm@openbsd.org>
4858 Date: Fri Sep 2 04:20:02 2022 +0000
4860 upstream: sk-usbhid: fix key_lookup() on tokens with built-in UV
4862 explicitly test whether the token performs built-in UV (e.g. biometric
4863 tokens) and enable UV in that case. From Pedro Martelletto via GHPR#388
4865 OpenBSD-Commit-ID: 007eb7e387d27cf3029ab06b88224e03eca62ccd
4867 commit 03277a4aa49b80af541a3e691f264c0c0d8f9cec
4868 Author: Darren Tucker <dtucker@dtucker.net>
4869 Date: Wed Aug 31 20:26:30 2022 +1000
4871 Move sftp from valgrind-2 to 3 to rebalance.
4873 commit fcf5365da69c516817321ba89c3a91df98d098df
4874 Author: djm@openbsd.org <djm@openbsd.org>
4875 Date: Wed Aug 31 02:56:40 2022 +0000
4877 upstream: whitespace
4879 OpenBSD-Commit-ID: c2bcbf93610d3d62ed206cdf9bf9ff98c6aaf232
4881 commit e60136a3d7a223dd8e84ba8a6895bc3142360993
4882 Author: Damien Miller <djm@mindrot.org>
4883 Date: Mon Aug 29 13:27:45 2022 +1000
4887 commit 2b02dcb505288c462d1b5dd1ac04e603d01340eb
4888 Author: Damien Miller <djm@mindrot.org>
4889 Date: Mon Aug 29 13:23:43 2022 +1000
4891 cross-sign allowed_signers with PGP key
4893 Provides continuity of trust from legacy PGP release key to
4894 the SSHSIG signing keys that we will use henceforth for git
4897 commit 51b345f177ae981b8755f6bdf8358b1cc5e83d67
4898 Author: Darren Tucker <dtucker@dtucker.net>
4899 Date: Sat Aug 27 21:49:27 2022 +1000
4901 Add libcrypt-devel to cygwin-release deps.
4903 Based on feedback from vinschen at redhat.com.
4905 commit 9f81736cf16dd8dda1c8942f1973a5f80b8cd78c
4906 Author: Darren Tucker <dtucker@dtucker.net>
4907 Date: Sat Aug 27 09:37:40 2022 +1000
4909 Add Windows 2022 test targets.
4911 commit 85e1a69243f12be8520438ad6a3cfdc0b7fcbb2d
4912 Author: Darren Tucker <dtucker@dtucker.net>
4913 Date: Fri Aug 26 16:26:06 2022 +1000
4915 Add cygwin-release test target.
4917 This also moves the cygwin package install from the workflow file to
4918 setup_ci.sh so that we can install different sets of Cygwin packages
4919 for different test configs.
4921 commit 92382dbe8bf9ea1225b16858f9b9b208c15c7e8d
4922 Author: djm@openbsd.org <djm@openbsd.org>
4923 Date: Fri Aug 26 08:16:27 2022 +0000
4925 upstream: whitespace
4927 OpenBSD-Commit-ID: a5d015efbfd228dc598ffdef612d2da3a579e5d8
4929 commit 70a5de0a50e84d7250eb4e4537f765599f64c4af
4930 Author: djm@openbsd.org <djm@openbsd.org>
4931 Date: Fri Aug 26 08:12:56 2022 +0000
4933 upstream: whitespace
4935 OpenBSD-Commit-ID: d297e4387935d4aef091c5e9432578c2e513f538
4937 commit 3a683a19fd116ea15ebf8aa13d02646cceb302a9
4938 Author: Damien Miller <djm@mindrot.org>
4939 Date: Fri Aug 26 14:23:55 2022 +1000
4941 initial list of allowed signers
4943 commit 6851f4b8c3fc1b3e1114c56106e4dc31369c8513
4944 Author: Darren Tucker <dtucker@dtucker.net>
4945 Date: Fri Aug 19 17:22:18 2022 +1000
4947 Install Cygwin packages based on OS not config.
4949 commit f96480906893ed93665df8cdf9065865c51c1475
4950 Author: djm@openbsd.org <djm@openbsd.org>
4951 Date: Fri Aug 19 06:07:47 2022 +0000
4953 upstream: attemp FIDO key signing without PIN and use the error
4955 code returned to fall back only if necessary. Avoids PIN prompts for FIDO
4956 tokens that don't require them; part of GHPR#302
4958 OpenBSD-Commit-ID: 4f752aaf9f2e7c28bcaaf3d4f8fc290131bd038e
4960 commit 5453333b5d28e313284cb9aae82899704103f98d
4961 Author: djm@openbsd.org <djm@openbsd.org>
4962 Date: Fri Aug 19 05:53:28 2022 +0000
4964 upstream: remove incorrect check that can break enrolling a
4966 resident key (introduced in r1.40)
4968 OpenBSD-Commit-ID: 4cab364d518470e29e624af3d3f9ffa9c92b6f01
4970 commit ff89b1bed80721295555bd083b173247a9c0484e
4971 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4972 Date: Fri Aug 19 04:02:46 2022 +0000
4974 upstream: Strictly enforce the maximum allowed SSH2 banner size in
4976 ssh-keyscan and prevent a one-byte buffer overflow. Patch from Qualys, ok
4979 OpenBSD-Commit-ID: 6ae664f9f4db6e8a0589425f74cd0bbf3aeef4e4
4981 commit 1b470b9036639cef4f32fb303bb35ea0b711178d
4982 Author: Darren Tucker <dtucker@dtucker.net>
4983 Date: Fri Aug 19 15:18:09 2022 +1000
4985 Fix cygwin conditional steps.
4987 commit fd6ee741ab16714b7035d60aca924123ba28135a
4988 Author: Darren Tucker <dtucker@dtucker.net>
4989 Date: Fri Aug 19 15:12:57 2022 +1000
4991 Add a bit more debug output.
4993 commit a9305c4c739f4d91a3d3a92c0b6d4949404a36c5
4994 Author: Darren Tucker <dtucker@dtucker.net>
4995 Date: Fri Aug 12 15:08:47 2022 +1000
4997 Add Cygwin (on windows-2019) test target.
4999 In addition to installing the requisite Cygwin packages, we also need to
5000 explicitly invoke "sh" for steps that run other scripts since the runner
5001 environment doesn't understand #! paths.
5003 commit 5062ad48814b06162511c4f5924a33d97b6b2566
5004 Author: djm@openbsd.org <djm@openbsd.org>
5005 Date: Fri Aug 19 03:06:30 2022 +0000
5007 upstream: double free() in error path; from Eusgor via GHPR333
5009 OpenBSD-Commit-ID: 39f35e16ba878c8d02b4d01d8826d9b321be26d4
5011 commit 5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e
5012 Author: Darren Tucker <dtucker@dtucker.net>
5013 Date: Thu Aug 18 21:36:39 2022 +1000
5015 Check for perms to run agent-getpeereid test.
5017 Ubuntu 22.04 defaults to private home dirs which prevents "nobody"
5018 running ssh-add during the agent-getpeereid test. Check for this and
5019 add the necessary permissions.
5021 commit cd06a76b7ccc706e2bb4f1cc4aa9e9796a28a812
5022 Author: Damien Miller <djm@mindrot.org>
5023 Date: Wed Aug 17 16:04:16 2022 +1000
5025 on Cygwin, prefer WinHello FIDO device
5027 If no FIDO device was explictly specified, then prefer the
5028 windows://hello FIDO device. An exception to this is when
5029 probing resident FIDO keys, in which case hardware FIDO
5030 devices are preferred.
5032 commit 47f72f534ac5cc2cd3027675a3df7b00a8f77575
5033 Author: djm@openbsd.org <djm@openbsd.org>
5034 Date: Wed Aug 17 06:01:57 2022 +0000
5036 upstream: add an extra flag to sk_probe() to indicate whether we're
5038 probing for a FIDO resident key or not. Unused here, but will make like
5041 OpenBSD-Commit-ID: 432c8ff70e270378df9dbceb9bdeaa5b43b5a832
5043 commit edb0bcb3c79b16031dc87a8e57aecc3c4a3414f0
5044 Author: jmc@openbsd.org <jmc@openbsd.org>
5045 Date: Tue Aug 16 20:24:08 2022 +0000
5047 upstream: use .Cm for "sign"; from josiah frentsos
5049 OpenBSD-Commit-ID: 7f80a53d54857ac6ae49ea6ad93c5bd12231d1e4
5051 commit cccb011e130cbbac538b1689d10e4a067298df8b
5052 Author: Corinna Vinschen <vinschen@redhat.com>
5053 Date: Thu Aug 11 20:19:35 2022 +0200
5055 Revert "check_sk_options: add temporary WinHello workaround"
5057 Cygwin now comes with libfido2 1.11.0, so this workaround
5058 isn't required anymore.
5060 This reverts commit 242c044ab111a37aad3b0775727c36a4c5f0102c.
5062 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
5064 commit 9468cd7cf9d989dfa2ac20e2a0268ba6e93bfa5a
5065 Author: Corinna Vinschen <vinschen@redhat.com>
5066 Date: Thu Aug 11 20:18:17 2022 +0200
5068 fido_dev_is_winhello: return 0, not "false"
5070 "false" is not used anywhere in OpenSSH, so return 0 like
5073 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
5075 commit 730a80609472ee0451c99482d75c9c41f3ebc42d
5076 Author: djm@openbsd.org <djm@openbsd.org>
5077 Date: Fri Aug 12 05:20:28 2022 +0000
5079 upstream: sftp-server: support home-directory request
5081 Add support to the sftp-server for the home-directory extension defined
5082 in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the
5083 existing expand-path@openssh.com, but uses a more official protocol name,
5084 and so is a bit more likely to be implemented by non-OpenSSH clients.
5086 From Mike Frysinger, ok dtucker@
5088 OpenBSD-Commit-ID: bfc580d05cc0c817831ae7ecbac4a481c23566ab
5090 commit 5e820bf79ce3ce99ef7e98b0ab642b0a0a4f396c
5091 Author: Darren Tucker <dtucker@dtucker.net>
5092 Date: Fri Aug 12 14:56:55 2022 +1000
5094 Replace deprecated ubuntu-18.04 runners with 22.04
5096 commit 87b0d9c1b789d3ff958ec45df2ac912e24461bae
5097 Author: Darren Tucker <dtucker@dtucker.net>
5098 Date: Thu Aug 11 22:48:23 2022 +1000
5100 Add a timegm implementation from Heimdal via Samba.
5102 Fixes build on (at least Solaris 10).
5104 commit d0c4fa58594577994921b593f10037c5282597ca
5105 Author: Darren Tucker <dtucker@dtucker.net>
5106 Date: Thu Aug 11 14:23:58 2022 +1000
5108 Rerun tests if any .github config file changes.
5110 commit 113fe6c77ab43769fc61e953d07cb619fd7ea54b
5111 Author: Darren Tucker <dtucker@dtucker.net>
5112 Date: Thu Aug 11 13:33:51 2022 +1000
5114 Skip hostbased during Valgrind tests.
5116 Valgrind doesn't let ssh exec ssh-keysign (because it's setuid) so skip
5117 it during the Valgrind based tests.
5119 See https://bugs.kde.org/show_bug.cgi?id=119404 for a discussion of this
5120 (ironically there the problematic binary was ssh(1) back when it could
5123 commit b98a42afb69d60891eb0488935990df6ee571c4d
5124 Author: djm@openbsd.org <djm@openbsd.org>
5125 Date: Thu Aug 11 01:57:50 2022 +0000
5127 upstream: add some tests for parse_absolute_time(), including cases
5129 where it is forced to the UTC timezone. bz3468 ok dtucker
5131 OpenBSD-Regress-ID: ea07ca31c2f3847a38df028ca632763ae44e8759
5133 commit ec1ddb72a146fd66d18df9cd423517453a5d8044
5134 Author: djm@openbsd.org <djm@openbsd.org>
5135 Date: Thu Aug 11 01:56:51 2022 +0000
5137 upstream: allow certificate validity intervals, sshsig verification
5139 times and authorized_keys expiry-time options to accept dates in the UTC time
5140 zone in addition to the default of interpreting them in the system time zone.
5141 YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if
5142 suffixed with a 'Z' character.
5144 Also allow certificate validity intervals to be specified in raw
5145 seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This
5146 is intended for use by regress tests and other tools that call
5147 ssh-keygen as part of a CA workflow.
5151 OpenBSD-Commit-ID: 454db1cdffa9fa346aea5211223a2ce0588dfe13
5153 commit 4df246ec75751da7eb925e1880498300d8bda187
5154 Author: Darren Tucker <dtucker@dtucker.net>
5155 Date: Thu Aug 11 10:23:55 2022 +1000
5157 Fix conditional for running hostbased tests.
5159 commit 2580916e48721802220c61ce9e0df1297c00bc07
5160 Author: Damien Miller <djm@mindrot.org>
5161 Date: Thu Aug 11 08:58:28 2022 +1000
5163 fix SANDBOX_SECCOMP_FILTER_DEBUG
5165 commit fdbd5bf507fc271ff813714fab8a72ff2c6cb5ca
5166 Author: Darren Tucker <dtucker@dtucker.net>
5167 Date: Wed Aug 10 17:35:52 2022 +1000
5169 Test hostbased auth on github runners.
5171 commit 7e2f51940ba48a1c0fae1107801ea643fa83c971
5172 Author: Darren Tucker <dtucker@dtucker.net>
5173 Date: Wed Aug 10 17:25:24 2022 +1000
5175 Rename our getentropy to prevent possible loops.
5177 Since arc4random seeds from getentropy, and we use OpenSSL for that
5178 if enabled, there's the possibility that if we build on a system that
5179 does not have getentropy then run on a system that does have it, then
5180 OpenSSL could end up calling our getentropy and getting stuck in a loop.
5181 Pointed out by deraadt@, ok djm@
5183 commit 7a01f61be8d0aca0e975e7417f26371495fe7674
5184 Author: Darren Tucker <dtucker@dtucker.net>
5185 Date: Mon Aug 8 12:17:04 2022 +1000
5187 Actually put HAVE_STDINT_H around the stdint.h.
5189 commit 73541f29f0b50480da6c20dceb7a7191bd8ea7d3
5190 Author: Darren Tucker <dtucker@dtucker.net>
5191 Date: Mon Aug 8 10:30:34 2022 +1000
5193 Give unused param a name.
5195 Fixes builds on platforms that do have fido2 but don't have
5196 fido_dev_is_winhello.
5198 commit 2a108c0ea960381bd9b14ee0d84e818a23df4482
5199 Author: djm@openbsd.org <djm@openbsd.org>
5200 Date: Fri Aug 5 05:01:40 2022 +0000
5202 upstream: don't prompt for FIDO passphrase before attempting to enroll
5204 the credential, just let the enroll operating fail and we'll attempt to get a
5205 PIN anyway. Might avoid some unneccessary PIN prompts.
5207 Part of GHPR#302 from Corinna Vinschen; ok dtucker@
5209 OpenBSD-Commit-ID: bd5342ffc353ee37d39617906867c305564d1ce2
5211 commit 2886975c0ad9244e60dc5e4be34fde3aa573a4b5
5212 Author: Corinna Vinschen <vinschen@redhat.com>
5213 Date: Fri Feb 11 14:33:41 2022 +0100
5215 sk_sign: set FIDO2 uv attribute explicitely for WinHello
5217 WinHello via libfido2 performs user verification by default.
5218 However, if we stick to that, there's no way to differentiate
5219 between keys created with or without "-O verify-required".
5220 Set FIDO2 uv attribute explicitely to FIDO_OPT_FALSE, then check
5221 if user verification has been requested.
5223 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
5225 commit 242c044ab111a37aad3b0775727c36a4c5f0102c
5226 Author: Corinna Vinschen <vinschen@redhat.com>
5227 Date: Tue Feb 15 11:28:08 2022 +0100
5229 check_sk_options: add temporary WinHello workaround
5231 Up to libfido 1.10.0, WinHello advertises "clientPin" rather
5232 than "uv" capability. This is fixed in 1.11.0. For the time
5233 being, workaround it here.
5235 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
5237 commit 78774c08cc4b4997382975b0f414a86e06b6780c
5238 Author: Corinna Vinschen <vinschen@redhat.com>
5239 Date: Thu Feb 10 18:19:29 2022 +0100
5241 compat code for fido_dev_is_winhello()
5243 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
5245 commit 3d3a932a019aedfb891e0779bb4990cd5008a390
5246 Author: Darren Tucker <dtucker@dtucker.net>
5247 Date: Fri Aug 5 13:12:27 2022 +1000
5249 Factor out getrnd() and rename to getentropy().
5251 Factor out the arc4random seeding into its own file and change the
5252 interface to match getentropy. Use native getentropy if available.
5253 This will make it easier to resync OpenBSD changes to arc4random.
5254 Prompted by bz#3467, ok djm@.
5256 commit 9385d277b787403be9dfcb229cf372202496d2f3
5257 Author: Darren Tucker <dtucker@dtucker.net>
5258 Date: Thu Aug 4 18:55:48 2022 +1000
5260 Include CHANNEL and FIDO2 libs in configure output
5262 commit 141535b904b6fba01724444f38193a8599201f82
5263 Author: djm@openbsd.org <djm@openbsd.org>
5264 Date: Mon Aug 1 11:09:26 2022 +0000
5266 upstream: avoid double-free in error path introduced in r1.70; report
5268 and fix based on GHPR#332 by v-rzh ok dtucker@
5270 OpenBSD-Commit-ID: 3d21aa127b1f37cfc5bdc21461db369a663a951f
5272 commit dba7099ffcba3ca07b3946f017ba6a4c3158d9b1
5273 Author: Darren Tucker <dtucker@dtucker.net>
5274 Date: Wed Jul 27 18:40:12 2022 +1000
5276 Remove deprecated MacOS 10.15 runners.
5278 commit 722a56439aa5972c830e4a9a724cf52aff4a950a
5279 Author: Darren Tucker <dtucker@dtucker.net>
5280 Date: Wed Jul 27 18:31:14 2022 +1000
5282 Move stale-configure check as early as possible.
5284 We added a check in Makefile to catch the case where configure needs to
5285 be rebuilt, however this did not happen until a build was attempted in
5286 which case all of the work done by configure was wasted. Move this check
5287 to the start of configure to catch it as early as possible. ok djm@
5289 commit 099d6b56288b421ba38531d26dc1bd6bb685e311
5290 Author: Darren Tucker <dtucker@dtucker.net>
5291 Date: Fri Jul 22 10:47:19 2022 +1000
5293 Move libcrypto into CHANNELLIBS.
5295 This will result in sftp, sftp-server and scp no longer being linked
5296 against libcrypto. ok djm@
5298 commit 1bdf86725b77733bb5f17c54888b88a10b2f6538
5299 Author: Darren Tucker <dtucker@dtucker.net>
5300 Date: Fri Jul 22 10:45:47 2022 +1000
5302 Remove seed_rng calls from scp, sftp, sftp-server.
5304 These binaries don't use OpenSSL's random functions. The next step
5305 will be to stop linking them against libcrypto. ok djm@
5307 commit d73f77b8cb9b422f1ac4facee7890aa10ff2bc21
5308 Author: Darren Tucker <dtucker@dtucker.net>
5309 Date: Fri Jul 22 09:51:51 2022 +1000
5311 Group libcrypto and PRNGD checks together.
5313 They're related more than the libcrypt or libiaf checks which are
5314 currently between them. ok djm@
5316 commit f117e372b3f42f2fbdb0a578d063b2609ab58e1f
5317 Author: Darren Tucker <dtucker@dtucker.net>
5318 Date: Fri Jul 22 09:24:45 2022 +1000
5320 Do not link scp, sftp and sftp-server w/ zlib.
5322 Some of our binaries (eg sftp, sftp-server, scp) do not interact with
5323 the channels code and thus do use libraries such as zlib and libcrypto
5324 although they are linked with them. This adds a CHANNELLIBS and starts
5325 by moving zlib into it, which means the aformentioned binaries are no
5326 longer linked against zlib. ok djm@
5328 commit 800c2483e68db38bd1566ff69677124be974aceb
5329 Author: Darren Tucker <dtucker@dtucker.net>
5330 Date: Mon Jul 25 21:49:04 2022 +1000
5332 Remove workarounds for OpenSSL missing AES-CTR.
5334 We have some compatibility hacks that were added to support OpenSSL
5335 versions that do not support AES CTR mode. Since that time, however,
5336 the minimum OpenSSL version that we support has moved to 1.0.1 which
5337 *does* have CTR, so this is no longer needed. ok djm@
5339 commit b7c56b65c12f51fe0dbae798d19c8f58224a5d95
5340 Author: Darren Tucker <dtucker@dtucker.net>
5341 Date: Mon Jul 25 21:43:00 2022 +1000
5343 Remove workarounds for OpenSSL missing AES-GCM.
5345 We have some compatibility hacks that were added to support OpenSSL
5346 versions that do not support AES GCM mode. Since that time, however,
5347 the minimum OpenSSL version that we support has moved to 1.0.1 which
5348 *does* have GCM, so this is no longer needed. ok djm@
5350 commit 5a4a9f7a968fbf92cc1eac519c65638e79ae9f1f
5351 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5352 Date: Mon Jul 25 07:12:45 2022 +0000
5354 upstream: Restore missing "!" in TEST_SSH_ELAPSED_TIMES test.
5356 OpenBSD-Regress-ID: 38783f9676ec348c5a792caecee9a16e354b37b0
5358 commit 0ff886be132299386cc29d87c2aa16ff68a1aa08
5359 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5360 Date: Sun Jul 24 23:29:10 2022 +0000
5362 upstream: Test TEST_SSH_ELAPSED_TIMES for empty string not
5364 executable. No-op on most platforms but should prevent warnings in -portable
5365 on systems that don't have 'date %s'.
5367 OpenBSD-Regress-ID: e39d79867b8065e33d0c5926fa1a31f85659d2a4
5369 commit f69319ad8ad1dd50f90bbcf5912e11cc8ed3e037
5370 Author: Darren Tucker <dtucker@dtucker.net>
5371 Date: Sat Jul 23 14:38:22 2022 +1000
5373 Convert "have_prog" function into "which".
5375 "which" and its behaviour is not standardized, so convert the existing
5376 have_prog function into "which" so we can rely on it being available
5377 and what its semantics are. Add a have_prog wrapper that maintains the
5380 commit ea7ecc2c3ae39fdf5c6ad97b7bc0b47a98847f43
5381 Author: Darren Tucker <dtucker@dtucker.net>
5382 Date: Sat Jul 23 14:36:38 2022 +1000
5384 Skip scp3 test if there's no scp on remote path.
5386 scp -3 ends up using the scp that's in the remote path and will fail if
5387 one is not available. Based on a patch from rapier at psc.edu.
5389 commit c46f6fed419167c1671e4227459e108036c760f8
5390 Author: Damien Miller <djm@mindrot.org>
5391 Date: Wed Jul 20 13:39:14 2022 +1000
5393 crank SSH_SK_VERSION_MAJOR in sk-dummy.so
5395 commit f208e3b9ffb5ee76cf9c95df7ff967adc7f51c7d
5396 Author: djm@openbsd.org <djm@openbsd.org>
5397 Date: Wed Jul 20 03:33:22 2022 +0000
5399 upstream: ssh-keygen: fix touch prompt, pin retries;
5401 part of GHPR329 from Pedro Martelletto
5403 OpenBSD-Commit-ID: 75d1005bd2ef8f29fa834c90d2684e73556fffe8
5405 commit 8638a2ce7e90c8a51d9af3143404282126c524f8
5406 Author: djm@openbsd.org <djm@openbsd.org>
5407 Date: Wed Jul 20 03:31:42 2022 +0000
5409 upstream: sk-usbhid: preserve error code returned by key_lookup()
5411 it conveys useful information, such as the supplied pin being wrong.
5413 Part of GHPR329 from Pedro Martelletto
5415 OpenBSD-Commit-ID: c0647eb9290f793add363d81378439b273756c1b
5417 commit 9ab929ca2d820520327b41929372bcb9e261534c
5418 Author: djm@openbsd.org <djm@openbsd.org>
5419 Date: Wed Jul 20 03:29:14 2022 +0000
5421 upstream: when enrolling a resident key on a security token, check
5423 if a credential with matching application and user ID strings already exists.
5424 if so, prompt the user for confirmation before overwriting the credential.
5426 patch from Pedro Martelletto via GHPR329
5428 NB. cranks SSH_SK_VERSION_MAJOR, so any third-party FIDO middleware
5429 implementations will need to adjust
5431 OpenBSD-Commit-ID: e45e9f1bf2b2f32d9850669e7a8dbd64acc5fca4
5433 commit 5bcfc788b38d5b64e4c347bdc04bd9a01bbc36da
5434 Author: djm@openbsd.org <djm@openbsd.org>
5435 Date: Wed Jul 20 03:13:04 2022 +0000
5437 upstream: pull passphrase reading and confirmation into a separate
5439 function so it can be used for FIDO2 PINs; no functional change
5441 OpenBSD-Commit-ID: bf34f76b8283cc1d3f54633e0d4f13613d87bb2f
5443 commit eb679e2959bdb15454eb94751930eb4c9110da94
5444 Author: Darren Tucker <dtucker@dtucker.net>
5445 Date: Fri Jul 15 21:31:48 2022 +1000
5447 Move vmshutdown to first step.
5449 If a previous run on a physical runner has failed to clean up, the next
5450 run will fail because it'll try to check out the code to a broken
5451 directory mount. Make cleanup the first step.
5453 commit 46b91b70ff3cb9c147e2875ef5dc609fd64c0c96
5454 Author: Darren Tucker <dtucker@dtucker.net>
5455 Date: Fri Jul 15 20:25:27 2022 +1000
5457 Rename bbone test target to ARM.
5459 commit 751d22cdeffed9fe921db78eedc32a29f9e80510
5460 Author: Darren Tucker <dtucker@dtucker.net>
5461 Date: Fri Jul 15 13:37:29 2022 +1000
5463 Add AUDIT_ARCH_PPC to supported seccomp arches.
5465 Patch from dries.deschout at dodeco.eu.
5467 commit a061792a6e8d235fc40a9b5d4c22a1762bb75a7b
5468 Author: Darren Tucker <dtucker@dtucker.net>
5469 Date: Thu Jul 14 19:20:24 2022 +1000
5471 Remove unintended changes.
5473 I inadvertently included a couple of local changes with the OpenSSL
5474 3.0.4 change. Revert, anything that should be there will be committed
5477 commit 527cb43fa1b4e55df661feabbac51b8e608b6519
5478 Author: Darren Tucker <dtucker@dtucker.net>
5479 Date: Thu Jul 14 11:22:08 2022 +1000
5481 Return ERANGE from getcwd() if buffer size is 1.
5483 If getcwd() is supplied a buffer size of exactly 1 and a path of "/", it
5484 could result in a nul byte being written out of array bounds. POSIX says
5485 it should return ERANGE if the path will not fit in the available buffer
5486 (with terminating nul). 1 byte cannot fit any possible path with its nul,
5487 so immediately return ERANGE in that case.
5489 OpenSSH never uses getcwd() with this buffer size, and all current
5490 (and even quite old) platforms that we are currently known to work
5491 on have a native getcwd() so this code is not used on those anyway.
5492 Reported by Qualys, ok djm@
5494 commit 36857fefd8849c4b0e877cfd9d1eb22f79b76650
5495 Author: Darren Tucker <dtucker@dtucker.net>
5496 Date: Thu Jul 14 10:02:35 2022 +1000
5498 Split README.platform into its own line.
5500 README.platform has general platform-specific information, having it
5501 following text about FIDO2 on the same line could imply that it only
5502 has information about FIDO2.
5504 commit 00a496c6c14f2d41f2a9365714d494dd5f3aac9f
5505 Author: Darren Tucker <dtucker@dtucker.net>
5506 Date: Thu Jul 14 09:56:01 2022 +1000
5508 Clarify README.md text.
5510 Clarify the text about the implications of building without OpenSSL, and
5511 prefix the "configure --help" example command with a "./" so it's likely
5512 to work as-is in more shells. From bz#3461.
5514 commit f40b52f21fbc52eb513279168a49d3285c65256c
5515 Author: Darren Tucker <dtucker@dtucker.net>
5516 Date: Tue Jul 12 19:48:44 2022 +1000
5518 Remove special casing of crypt().
5520 Configure goes to some lengths to pick crypt() from either libcrypt
5521 or OpenSSL's libcrypto because they can more or less featureful (eg
5522 supporting md5-style passwords).
5524 OpenSSL removed its crypt() interface in 2002:
5525 https://github.com/openssl/openssl/commit/69deec58 so these hijinks
5526 should no longer be necessary. This also only links sshd with libcrypt
5527 which is the only thing that needs it. ok djm@
5529 commit 76f4e48631d7b09fb243b47d7b393d100d3741b7
5530 Author: Darren Tucker <dtucker@dtucker.net>
5531 Date: Wed Jul 13 13:17:47 2022 +1000
5533 Only refuse to use OpenSSL 3.0.4 on x86_64.
5535 The potential RCE only impacts x86_64, so only refuse to use it if we're
5536 targetting a potentially impacted architecture. ok djm@
5538 commit e75bbc1d88491fa85e61b2cc8783d4bbd00cd131
5539 Author: Darren Tucker <dtucker@dtucker.net>
5540 Date: Tue Jul 12 14:37:15 2022 +1000
5542 Capture stderr output from configure.
5544 commit d9eaea4bea6271bcee6a2b9428f1271faf2d033b
5545 Author: Darren Tucker <dtucker@dtucker.net>
5546 Date: Tue Jul 12 12:54:49 2022 +1000
5548 Refuse to use OpenSSL 3.0.4 due to potential RCE.
5550 OpenSSL has a potential RCE in its RSA implementation (CVE-2022-2274)
5551 so refuse to use that specific version.
5553 commit fb2f3a61bf3d28fff285524535f7ffcd177c9235
5554 Author: Darren Tucker <dtucker@dtucker.net>
5555 Date: Tue Jul 12 12:54:24 2022 +1000
5557 Move unset to before we set anything.
5559 commit c483a5c0fb8e8b8915fad85c5f6113386a4341ca
5560 Author: Darren Tucker <dtucker@dtucker.net>
5561 Date: Wed Jul 6 11:52:54 2022 +1000
5563 Test against openssl-3.0.5.
5565 commit 669a56bcfe73f8b985f2bba476ba834d55253acf
5566 Author: Darren Tucker <dtucker@dtucker.net>
5567 Date: Tue Jul 5 18:35:53 2022 +1000
5569 Update sanitizer test targets:
5571 - remove clang-sanitize-memory for now. It takes so long that the test
5573 - add gcc sanitize-address and sanitize-undefined test targets.
5575 commit 48cc68b69118b3ce8d07fd4f82e00d58667d5379
5576 Author: Darren Tucker <dtucker@dtucker.net>
5577 Date: Tue Jul 5 16:23:28 2022 +1000
5579 Add GCC address sanitizer build/test.
5581 commit 55c60bdd39b82457e92efa77da8d16cfa6a49391
5582 Author: Darren Tucker <dtucker@dtucker.net>
5583 Date: Tue Jul 5 12:02:33 2022 +1000
5585 Move sanitizer logs into regress for collection.
5587 commit 35ef2b3b6ef198f8574904a45780487ec2f17858
5588 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5589 Date: Mon Jul 4 09:10:31 2022 +0000
5591 upstream: Add TEST_REGRESS_CACHE_DIR.
5593 If set, it is used to cache regress test names that have succeeded and
5594 skip those on a re-run.
5596 OpenBSD-Regress-ID: a7570dd29a58df59f2cca647c3c2ec989b49f247
5598 commit 7394ed80c4de8b228a43c8956cf2fa1b9c6b2622
5599 Author: Darren Tucker <dtucker@dtucker.net>
5600 Date: Sun Jul 3 21:46:44 2022 +1000
5602 Add clang sanitizer tests.
5604 commit bfce0e66b6017a9bfab450b9dc7d4b16f90de817
5605 Author: Darren Tucker <dtucker@dtucker.net>
5606 Date: Sun Jul 3 18:14:09 2022 +1000
5608 Skip all rlimit tests when sandboxing disabled.
5610 The rlimit tests can hang when being run with some compiler sanitizers
5611 so skip all of them if sandbox=no.
5613 commit 6208d611520f9ea94d5369f9da404b709930029d
5614 Author: Darren Tucker <dtucker@dtucker.net>
5615 Date: Sun Jul 3 17:54:49 2022 +1000
5617 Move checks for pollfd.fd and nfds_t.
5619 Move the checks for struct pollfd.fd and nfds_t to before the sandboxing
5620 checks. This groups all the sandbox checks together so we can skip them
5621 all when sandboxing is disabled.
5623 commit 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b
5624 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5625 Date: Fri Jul 1 05:08:23 2022 +0000
5627 upstream: Remove leftover line.
5629 Remove extra line leftover from merge conflict. ok djm@
5631 OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e
5633 commit 7ec81daad0e03a64e8d91c5590960c48c1a899a3
5634 Author: djm@openbsd.org <djm@openbsd.org>
5635 Date: Fri Jul 1 04:45:50 2022 +0000
5637 upstream: use consistent field names (s/char/byte)
5639 in format description
5641 OpenBSD-Commit-ID: 3de33572733ee7fcfd7db33d37db23d2280254f0
5643 commit 32e82a392d9f263485effdd606ff5862d289a4a0
5644 Author: Darren Tucker <dtucker@dtucker.net>
5645 Date: Fri Jul 1 13:55:19 2022 +1000
5647 Skip select+rlimit check if sandboxing is disabled
5649 It's not needed in that case, and the test can fail when being built
5650 with some compiler memory sanitizer flags. bz#3441
5652 commit 4be7184ebe2a2ccef175983517a35ee06766e1b4
5653 Author: djm@openbsd.org <djm@openbsd.org>
5654 Date: Fri Jul 1 03:52:57 2022 +0000
5656 upstream: bump up loglevel from debug to info when unable to open
5658 authorized keys/principals file for errno != ENOENT; bz2042 ok dtucker
5660 OpenBSD-Commit-ID: e79aa550d91ade6a80f081bda689da24c086d66b
5662 commit 6c31ba10e97b6953c4f325f526f3e846dfea647a
5663 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5664 Date: Fri Jul 1 03:39:44 2022 +0000
5666 upstream: Don't leak the strings allocated by order_hostkeyalgs()
5668 and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
5669 github PR#324 from ZoltanFridrich, ok djm@
5671 This is a roll-forward of the previous rollback now that the required
5672 changes in compat.c have been done.
5674 OpenBSD-Commit-ID: c7cd93730b3b9f53cdad3ae32462922834ef73eb
5676 commit 486c4dc3b83b4b67d663fb0fa62bc24138ec3946
5677 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5678 Date: Fri Jul 1 03:35:45 2022 +0000
5680 upstream: Always return allocated strings from the kex filtering so
5682 that we can free them later. Fix one leak in compat_kex_proposal. Based on
5683 github PR#324 from ZoltanFridrich with some simplications by me. ok djm@
5685 OpenBSD-Commit-ID: 9171616da3307612d0ede086fd511142f91246e4
5687 commit 96faa0de6c673a2ce84736eba37fc9fb723d9e5c
5688 Author: djm@openbsd.org <djm@openbsd.org>
5689 Date: Fri Jul 1 00:36:30 2022 +0000
5691 upstream: ignore SIGPIPE earlier in main(), specifically before
5693 muxclient() which performs operations that could cause one; Reported by Noam
5694 Lewis via bz3454, ok dtucker@
5696 OpenBSD-Commit-ID: 63d8e13276869eebac6d7a05d5a96307f9026e47
5698 commit 33efac790f6b09d54894ba6c3e17dfb08b6fc7e1
5699 Author: jmc@openbsd.org <jmc@openbsd.org>
5700 Date: Tue Jun 28 06:09:14 2022 +0000
5702 upstream: reflect the update to -D arg name in usage();
5704 OpenBSD-Commit-ID: abdcde4f92b1ef094ae44210ee99d3b0155aad9c
5706 commit c71a1442d02f0a3586109dfe2cb366de36dee08e
5707 Author: Darren Tucker <dtucker@dtucker.net>
5708 Date: Wed Jun 29 18:28:47 2022 +1000
5710 Update OpenSSL tests to the most recent releases.
5712 commit 2a822f29300b2de7335fbff65f0b187a0c582304
5713 Author: djm@openbsd.org <djm@openbsd.org>
5714 Date: Mon Jun 27 21:41:55 2022 +0000
5716 upstream: allow arguments to sftp -D option, e.g. sftp -D
5718 "/usr/libexec/sftp-server -el debug3"
5722 OpenBSD-Commit-ID: 5a002b9f3a7aef2731fc0ffa9c921cf15f38ecce
5724 commit 2369a2810187e08f2af5d58b343956062fb96ee8
5725 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5726 Date: Fri Jun 24 10:45:06 2022 +0000
5728 upstream: Roll back previous KEX changes as they aren't safe until
5730 compat_pkalg_proposal and friends always allocate their returned strings.
5733 OpenBSD-Commit-ID: 1c7a88a0d5033f42f88ab9bec58ef1cf72c81ad0
5735 commit 646686136c34c2dbf6a01296dfaa9ebee029386d
5736 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5737 Date: Fri Jun 24 04:37:00 2022 +0000
5739 upstream: Don't leak the strings allocated by order_hostkeyalgs()
5741 and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
5742 github PR#324 from ZoltanFridrich, ok djm@
5744 OpenBSD-Commit-ID: b2f6e5f60f2bba293b831654328a8a0035ef4a1b
5746 commit 193c6d8d905dde836b628fc07a7b9cf2d347e2a3
5747 Author: Darren Tucker <dtucker@dtucker.net>
5748 Date: Sat Jun 25 12:16:15 2022 +1000
5750 Zero out LIBFIDO2 when SK support not usable.
5752 Prevents us from trying to link them into ssh-sk-helper and failing to
5755 commit 40f5d849d25c60b4ae21261e78484d435f5cfd51
5756 Author: Darren Tucker <dtucker@dtucker.net>
5757 Date: Sat Jun 25 11:47:28 2022 +1000
5759 Disable SK support if FIDO libs not found.
5761 commit 5fd922ade1b25880fe8a8249f5c0385e413108f9
5762 Author: Damien Miller <djm@mindrot.org>
5763 Date: Fri Jun 24 14:43:54 2022 +1000
5765 fix broken case statement in previous
5767 commit f51423bdaf0008d46b6af082bcfd7a22a87375f0
5768 Author: Damien Miller <djm@mindrot.org>
5769 Date: Fri Jun 24 14:40:42 2022 +1000
5771 request 1.1x API compatibility for OpenSSL >=3.x
5773 idea/patch from Pedro Martelletto via GHPR#322; ok dtucker@
5775 commit 455cee8d6c2e4c48c5af9faead3599c49948411e
5776 Author: djm@openbsd.org <djm@openbsd.org>
5777 Date: Fri Jun 24 04:27:14 2022 +0000
5779 upstream: make it clear that RekeyLimit applies to both transmitted
5781 and received data. GHPR#328 from Jan Pazdziora
5783 OpenBSD-Commit-ID: d180a905fec9ff418a75c07bb96ea41c9308c3f9
5785 commit 17904f05802988d0bb9ed3c8d1d37411e8f459c3
5786 Author: tobhe@openbsd.org <tobhe@openbsd.org>
5787 Date: Tue Jun 21 14:52:13 2022 +0000
5789 upstream: Make sure not to fclose() the same fd twice in case of an
5795 OpenBSD-Commit-ID: e384c4e05d5521e7866b3d53ca59acd2a86eef99
5797 commit f29d6cf98c25bf044079032d22c1a57c63ab9d8e
5798 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5799 Date: Sat Jun 18 02:17:16 2022 +0000
5801 upstream: Don't attempt to fprintf a null identity comment. From
5803 Martin Vahlensieck via tech@.
5805 OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2
5807 commit ad1762173bb38716a106e8979806149fd0f2753e
5808 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5809 Date: Fri Jun 17 01:00:03 2022 +0000
5811 upstream: Log an error if pipe() fails while accepting a
5813 connection. bz#3447, from vincent-openssh at vinc17 net, ok djm@
5815 OpenBSD-Commit-ID: 9d59f19872b94900a5c79da2d57850241ac5df94
5817 commit 9c59e7486cc8691401228b43b96a3edbb06e0412
5818 Author: Damien Miller <djm@mindrot.org>
5819 Date: Fri Jun 24 14:20:43 2022 +1000
5821 automatically enable built-in FIDO support
5823 If libfido2 is found and usable, then enable the built-in
5824 security key support unless --without-security-key-builtin
5829 commit 7d25b37fb2a5ff4dadabcbdac6087a97479434f5
5830 Author: Damien Miller <djm@mindrot.org>
5831 Date: Fri Jun 24 13:46:39 2022 +1000
5833 fix possible NULL deref when built without FIDO
5835 Analysis/fix from kircher in bz3443; ok dtucker@
5837 commit f5ba85daddfc2da6a8dab6038269e02c0695be44
5838 Author: djm@openbsd.org <djm@openbsd.org>
5839 Date: Wed Jun 15 16:08:25 2022 +0000
5841 upstream: make sure that UseDNS hostname lookup happens in the monitor
5843 and not in the pledge(2)'d unprivileged process; fixes regression caused by
5844 recent refactoring spotted by henning@
5846 OpenBSD-Commit-ID: a089870b95101cd8881a2dff65b2f1627d13e88d
5848 commit acb2059febaddd71ee06c2ebf63dcf211d9ab9f2
5849 Author: djm@openbsd.org <djm@openbsd.org>
5850 Date: Fri Jun 3 04:47:21 2022 +0000
5852 upstream: move auth_openprincipals() and auth_openkeyfile() over to
5854 auth2-pubkeyfile.c too; they make more sense there.
5856 OpenBSD-Commit-ID: 9970d99f900e1117fdaab13e9e910a621b7c60ee
5858 commit 3d9b0845f34510111cc693bb99a667662ca50cd8
5859 Author: djm@openbsd.org <djm@openbsd.org>
5860 Date: Fri Jun 3 04:31:54 2022 +0000
5862 upstream: test setenv in both client and server, test first-match-wins
5866 OpenBSD-Regress-ID: 4c8804f9db38a02db480b9923317457b377fe34b
5868 commit 22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40
5869 Author: djm@openbsd.org <djm@openbsd.org>
5870 Date: Fri Jun 3 04:30:46 2022 +0000
5872 upstream: Make SetEnv directives first-match-wins in both
5874 sshd_config and sshd_config; previously if the same name was reused then the
5875 last would win (which is the opposite to how the config is supposed to work).
5877 While there, make the ssh_config parsing more like sshd_config.
5881 OpenBSD-Commit-ID: 797909c1e0262c0d00e09280459d7ab00f18273b
5883 commit 38ed6c57e9e592c08e020fa6e82b45b4e1040970
5884 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5885 Date: Fri Jun 3 04:00:15 2022 +0000
5887 upstream: Add missing *-sk types to ssh-keyscan manpage. From
5889 skazi0 via github PR#294.
5891 OpenBSD-Commit-ID: fda2c869cdb871f3c90a89fb3f985370bb5d25c0
5893 commit ea97ec98c41ec2b755dfab459347db674ff9a5de
5894 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5895 Date: Fri Jun 3 03:21:09 2022 +0000
5897 upstream: Add period at end of "not known by any other names"
5899 message. github PR#320 from jschauma, ok djm@
5901 OpenBSD-Commit-ID: bd60809803c4bfd3ebb7c5c4d918b10e275266f2
5903 commit 88e376fcd67478ad1660d94bc73ab348ac9f4527
5904 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5905 Date: Fri Jun 3 03:17:42 2022 +0000
5907 upstream: ssh-keygen -A: do not generate DSA keys by default.
5909 Based on github PR#303 from jsegitz with man page text from jmc@, ok markus@
5912 OpenBSD-Commit-ID: 5c4c57bdd7063ff03381cfb6696659dd3f9f5b9f
5914 commit 6b3fb624675082a1e5aa615d1b8479873d8b5731
5915 Author: naddy@openbsd.org <naddy@openbsd.org>
5916 Date: Tue May 31 14:05:12 2022 +0000
5918 upstream: ssh-keygen: implement "verify-required" certificate option.
5920 This was already documented when support for user-verified FIDO
5921 keys was added, but the ssh-keygen(1) code was missing.
5925 OpenBSD-Commit-ID: f660f973391b593fea4b7b25913c9a15c3eb8a06
5927 commit b7f86ffc301be105bba9a3e0618b6fab3ae379bd
5928 Author: jmc@openbsd.org <jmc@openbsd.org>
5929 Date: Sat May 28 05:57:56 2022 +0000
5931 upstream: keywords ref ssh_config.5;
5933 from caspar schutijser
5935 OpenBSD-Commit-ID: f146a19d7d5c9374c3b9c520da43b2732d7d1a4e
5937 commit dc7bc52372f2744fa39191577be5306ee57aacd4
5938 Author: Damien Miller <djm@mindrot.org>
5939 Date: Mon May 30 09:29:09 2022 +1000
5941 fix some bugs in the fuzzer
5943 commit 1781f507c113667613351c19898efaf1e311a865
5944 Author: Darren Tucker <dtucker@dtucker.net>
5945 Date: Fri May 27 18:19:48 2022 +1000
5947 Test against OpenSSL 1.1.1o and 3.0.3.
5949 commit c53906e0c59e569691b4095d3e8db79cf78fa058
5950 Author: Darren Tucker <dtucker@dtucker.net>
5951 Date: Fri May 27 18:18:31 2022 +1000
5953 Test against LibreSSL 3.5.3.
5955 commit 9b3ad432ad2f19319bcc089370e356c6315d682f
5956 Author: Damien Miller <djm@mindrot.org>
5957 Date: Fri May 27 17:00:43 2022 +1000
5959 fuzzer for authorized_keys parsing
5961 mostly redundant to authopt_fuzz, but it's sensitive code so IMO it
5962 makes sense to test this layer too
5964 commit c83d8c4d6f3ccceef84d46de107f6b71cda06359
5965 Author: djm@openbsd.org <djm@openbsd.org>
5966 Date: Fri May 27 05:02:46 2022 +0000
5968 upstream: split the low-level file handling functions out from
5972 Put them in a new auth2-pubkeyfile.c to make it easier to refer to them
5973 (e.g. in unit/fuzz tests) without having to refer to everything else
5974 pubkey auth brings in.
5978 OpenBSD-Commit-ID: 3fdca2c61ad97dc1b8d4a7346816f83dc4ce2217
5980 commit 3b0b142d2a0767d8cd838e2f3aefde8a0aaa41e1
5981 Author: djm@openbsd.org <djm@openbsd.org>
5982 Date: Fri May 27 05:01:25 2022 +0000
5984 upstream: refactor authorized_keys/principals handling
5986 remove "struct ssh *" from arguments - this was only used to pass the
5987 remote host/address. These can be passed in instead and the resulting
5988 code is less tightly coupled to ssh_api.[ch]
5992 OpenBSD-Commit-ID: 9d4373d013edc4cc4b5c21a599e1837ac31dda0d
5994 commit 2c334fd36f80cb91cc42e4b978b10aa35e0df236
5995 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5996 Date: Fri May 27 04:29:40 2022 +0000
5998 upstream: f sshpkt functions fail, then password is not cleared
6000 with freezero. Unconditionally call freezero to guarantee that password is
6003 From tobias@ and c3h2_ctf via github PR#286, ok djm@
6005 OpenBSD-Commit-ID: 6b093619c9515328e25b0f8093779c52402c89cd
6007 commit 5d3a77f4c5ae774c6796387266503f52c7cdc7c2
6008 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6009 Date: Fri May 27 04:27:49 2022 +0000
6011 upstream: Avoid kill with -1 argument. The out_ctx label can be
6013 reached before fork has been called. If this happens, then kill -1 would be
6014 called, sending SIGTERM to all processes reachable by the current process.
6016 From tobias@ and c3h2_ctf via github PR#286, ok djm@
6018 OpenBSD-Commit-ID: 6277af1207d81202f5daffdccfeeaed4c763b1a8
6020 commit 533b31cd08e4b97f455466f91c36915e2924c15a
6021 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6022 Date: Fri May 27 04:13:24 2022 +0000
6024 upstream: Note that ProxyJump also accepts the same tokens as
6026 ProxyCommand. From pallxk via github PR#305.
6028 OpenBSD-Commit-ID: 7115ac351b129205f1f1ffa6bbfd62abd76be7c5
6030 commit 9d8c80f8a304babe61ca28f2e3fb5eb6dc9c39bf
6031 Author: djm@openbsd.org <djm@openbsd.org>
6032 Date: Wed May 25 06:03:44 2022 +0000
6034 upstream: revert previous; it was broken (spotted by Theo)
6036 OpenBSD-Commit-ID: 457c79afaca2f89ec2606405c1059b98b30d8b0d
6038 commit 9e0d02ef7ce88b67643bfb1c2272c9f5f04cc680
6039 Author: djm@openbsd.org <djm@openbsd.org>
6040 Date: Wed May 25 00:31:13 2022 +0000
6042 upstream: make SSHBUF_DBG/SSHBUF_TELL (off by default and only enabled
6044 via #define) dump to stderr rather than stdout
6046 OpenBSD-Commit-ID: 10298513ee32db8390aecb0397d782d68cb14318
6048 commit 2487163630f28be28b7e2396b4bd6511b98f1d3e
6049 Author: Tim Rice <tim@multitalents.net>
6050 Date: Tue May 24 10:21:25 2022 -0700
6052 configure.ac: Add missing AC_DEFINE for caph_cache_tzdata test causing
6053 HAVE_CAPH_CACHE_TZDATA to be missing from config.h.in.
6054 Spotted by Bryan Drewery
6056 commit bedb93415b60db3dfd704a3d525e82adb14a2481
6057 Author: djm@openbsd.org <djm@openbsd.org>
6058 Date: Sun May 15 23:48:07 2022 +0000
6060 upstream: regress test for in-place transfers and clobbering larger
6062 files with smaller ones; would have caught last regression in scp(1)
6064 OpenBSD-Regress-ID: 19de4e88dd3a4f7e5c1618c9be3c32415bd93bc2
6066 commit b4f0d719c2548cb74da509fb65f384dada4ebd37
6067 Author: anton@openbsd.org <anton@openbsd.org>
6068 Date: Fri Apr 22 05:08:43 2022 +0000
6070 upstream: Only run agent-ptrace.sh if gdb is available as all
6072 architectures do not ship with gdb.
6074 OpenBSD-Regress-ID: ec53e928803e6b87f9ac142d38888ca79a45348d
6076 commit 9b73345f80255a7f3048026462f2c0c6a241eeac
6077 Author: djm@openbsd.org <djm@openbsd.org>
6078 Date: Sun May 15 23:47:21 2022 +0000
6080 upstream: fix in-place copies; r1.163 incorrectly skipped truncation in
6082 all cases, not just at the start of a transfer. This could cause overwrites
6083 of larger files to leave junk at the end. Spotted by tb@
6085 OpenBSD-Commit-ID: b189f19cd68119548c8e24e39c79f61e115bf92c
6087 commit 56a0697fe079ff3e1ba30a2d5c26b5e45f7b71f8
6088 Author: djm@openbsd.org <djm@openbsd.org>
6089 Date: Fri May 13 06:31:50 2022 +0000
6091 upstream: arrange for scp, when in sftp mode, to not ftruncate(3) files
6095 previous behavious of unconditionally truncating the destination file
6096 would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to
6097 delete all the contents of their destination.
6099 spotted by solene@ sthen@, also bz3431; ok dtucker@
6101 OpenBSD-Commit-ID: ca39fdd39e0ec1466b9666f15cbcfddea6aaa179
6103 commit fbcef70c2832712f027bccea1aa9bc4b4103da93
6104 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6105 Date: Mon May 9 08:25:27 2022 +0000
6107 upstream: Remove errant apostrophe. From haruyama at queen-ml org.
6109 OpenBSD-Commit-ID: dc6b294567cb84b384ad6ced9ca469f2bbf0bd10
6111 commit 0086a286ea6bbd11ca9b664ac3bb12b27443d6eb
6112 Author: djm@openbsd.org <djm@openbsd.org>
6113 Date: Mon May 9 03:09:53 2022 +0000
6115 upstream: Allow existing -U (use agent) flag to work with "-Y sign"
6117 operations, where it will be interpreted to require that the private keys is
6118 hosted in an agent; bz3429, suggested by Adam Szkoda; ok dtucker@
6120 OpenBSD-Commit-ID: a7bc69873b99c32c42c7628ed9ea91565ba08c2f
6122 commit cb010744cc98f651b1029bb09efa986eb54e4ccf
6123 Author: djm@openbsd.org <djm@openbsd.org>
6124 Date: Sun May 8 22:58:35 2022 +0000
6126 upstream: improve error message when 'ssh-keygen -Y sign' is unable to
6128 load a private key; bz3429, reported by Adam Szkoda ok dtucker@
6130 OpenBSD-Commit-ID: bb57b285e67bea536ef81b1055467be2fc380e74
6132 commit aa61fc82c63d309a90c22ca74fb1da6c6f4372fd
6133 Author: Tobias Heider <me@tobhe.de>
6134 Date: Mon May 9 02:00:01 2022 +0200
6136 Remove duplicate bcrypt_pbkdf.o from Makefile
6138 bcrypt_pbkdf.o is duplicated in the openbsd-compat Makefile's object
6141 commit deb506d00da8d11fb04c1e7b9b1e1cc379c1705c
6142 Author: djm@openbsd.org <djm@openbsd.org>
6143 Date: Sun May 8 22:32:36 2022 +0000
6145 upstream: When performing operations that glob(3) a remote path, ensure
6147 that the implicit working directory used to construct that path escapes
6150 This prevents glob characters from being processed in places they
6151 shouldn't, e.g. "cd /tmp/a*/", "get *.txt" should have the get operation
6152 treat the path "/tmp/a*" literally and not attempt to expand it.
6154 Reported by Lusia Kundel; ok markus@
6156 OpenBSD-Commit-ID: 4f647f58482cbad3d58b1eab7f6a1691433deeef
6158 commit f38cf74f20b5da113cfa823afd5bfb5c6ba65f3d
6159 Author: Darren Tucker <dtucker@dtucker.net>
6160 Date: Fri May 6 14:50:18 2022 +1000
6162 Also retest OpenBSD upstream on .yml changes.
6164 commit f87a132800ba3710ab130d703448a31ef1128d77
6165 Author: Darren Tucker <dtucker@dtucker.net>
6166 Date: Fri May 6 14:46:09 2022 +1000
6168 Note that, for now, we need variadic macros.
6170 commit 217b518e0f7c52c4b909e935141a55344c61e644
6171 Author: Darren Tucker <dtucker@dtucker.net>
6172 Date: Fri May 6 14:39:34 2022 +1000
6174 Add ubsan minimal testcase on OpenBSD.
6176 As suggested by djm@.
6178 commit 457dce2cfef6a48f5442591cd8b21c7e8cba13f8
6179 Author: djm@openbsd.org <djm@openbsd.org>
6180 Date: Thu May 5 01:04:14 2022 +0000
6182 upstream: sshkey_unshield_private() contains a exact duplicate of
6184 the code in private2_check_padding(). Pull private2_check_padding() up so the
6185 code can be reused. From Martin Vahlensieck, ok deraadt@
6187 OpenBSD-Commit-ID: 876884c3f0e62e8fd8d1594bab06900f971c9c85
6189 commit 0e44db4d9cb313e68a59a44d27884af66c02356e
6190 Author: djm@openbsd.org <djm@openbsd.org>
6191 Date: Thu May 5 00:56:58 2022 +0000
6193 upstream: channel_new no longer frees remote_name. So update the
6195 comment accordingly. As remote_name is not modified, it can be const as
6196 well. From Martin Vahlensieck
6198 OpenBSD-Commit-ID: e4e10dc8dc9f40c166ea5a8e991942bedc75a76a
6200 commit 37b62fd5caf19c85a48241535277cefff65adace
6201 Author: djm@openbsd.org <djm@openbsd.org>
6202 Date: Thu May 5 00:55:11 2022 +0000
6204 upstream: mux.c: mark argument as const; from Martin Vahlensieck
6206 OpenBSD-Commit-ID: 69a1a93a55986c7c2ad9f733c093b46a47184341
6208 commit f4e67c0ad259b4cf10177277a5827fa5545bac53
6209 Author: markus@openbsd.org <markus@openbsd.org>
6210 Date: Wed May 4 07:31:22 2022 +0000
6212 upstream: make sure stdout is non-blocking; ok djm@
6214 OpenBSD-Commit-ID: 64940fffbd1b882eda2d7c8c7a43c79368309c0d
6216 commit e5c036d2092c00bef395e9161dc5ce42d4be9565
6217 Author: florian@openbsd.org <florian@openbsd.org>
6218 Date: Tue May 3 07:42:27 2022 +0000
6220 upstream: Add FIDO AUTHENTICATOR section and explain a bit how FIDO
6222 works. The wording came mostly from the 8.2 OpenSSH release notes, addapted
6223 to fit the man page. Then move the -O bits into the new section as is already
6224 done for CERTIFICATES and MODULI GENERATION. Finally we can explain the
6225 trade-offs of resident keys. While here, consistently refer to the FIDO
6226 thingies as "FIDO authenticators", not "FIDO tokens".
6228 input & OK jmc, naddy
6230 OpenBSD-Commit-ID: dd98748d7644df048f78dcf793b3b63db9ab1d25
6232 commit 575771bf79bef7127be6aaccddc46031ea15529e
6233 Author: jmc@openbsd.org <jmc@openbsd.org>
6234 Date: Mon May 2 05:40:37 2022 +0000
6236 upstream: remove an obsolete rsa1 format example from an example;
6241 OpenBSD-Commit-ID: db2c89879c29bf083df996bd830abfb1e70d62bf
6243 commit 0bc6b4c8f04e292577bdb44d5dc6b630d3448087
6244 Author: djm@openbsd.org <djm@openbsd.org>
6245 Date: Sun May 1 23:20:30 2022 +0000
6247 upstream: fix some integer overflows in sieve_large() that show up when
6249 trying to generate modp groups > 16k bits. Reported via GHPR#306 by Bertram
6250 Felgenhauer, but fixed in a different way. feedback/ok tb@
6252 OpenBSD-Commit-ID: 81cbc6dd3a21c57bd6fadea10e44afe37bca558e
6254 commit a45615cb172bc827e21ec76750de39dfb30ecc05
6255 Author: djm@openbsd.org <djm@openbsd.org>
6256 Date: Fri Apr 29 04:55:07 2022 +0000
6258 upstream: be stricter in which characters will be accepted in
6260 specifying a mask length; allow only 0-9. From khaleesicodes via GHPR#278; ok
6263 OpenBSD-Commit-ID: e267746c047ea86665cdeccef795a8a56082eeb2
6265 commit 4835544d2dd31de6ffc7dba59f92093aea98155b
6266 Author: Darren Tucker <dtucker@dtucker.net>
6267 Date: Sat Apr 30 10:56:41 2022 +1000
6269 Add Mac OS X 12 test target.
6271 commit 97a6a8b8c1f2da09712d0e72d0ef800e4edd34cd
6272 Author: Darren Tucker <dtucker@dtucker.net>
6273 Date: Fri Apr 29 18:27:34 2022 +1000
6275 Only run tests when source files change.
6277 Also run tests on changes to V_9_0 branch.
6279 commit 6d0392b9ff4b50a56ac5685d1b9392e2cd432ca3
6280 Author: Darren Tucker <dtucker@dtucker.net>
6281 Date: Fri Apr 29 18:22:34 2022 +1000
6283 Remove now-empty int32_minmax.inc.
6285 commit af59463553b5ad52d3b42c4455ee3c5600158bb7
6286 Author: djm@openbsd.org <djm@openbsd.org>
6287 Date: Fri Apr 29 03:24:30 2022 +0000
6289 upstream: mention that the helpers are used by ssh(1), ssh-agent(1)
6291 and ssh-keygen(1). Previously only ssh(1) was mentioned. From Pedro
6294 OpenBSD-Commit-ID: 30f880f989d4b329589c1c404315685960a5f153
6296 commit 3e26b3a6eebcee27be177207cc0846fb844b7a56
6297 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6298 Date: Fri Apr 29 03:16:48 2022 +0000
6300 upstream: Don't leak SK device. Patch from Pedro Martelletto via
6302 github PR#316. ok djm@
6304 OpenBSD-Commit-ID: 17d11327545022e727d95fd08b213171c5a4585d
6306 commit 247082b5013f0d4fcae8f97453f2a2f01bcda811
6307 Author: djm@openbsd.org <djm@openbsd.org>
6308 Date: Fri Apr 29 03:13:32 2022 +0000
6310 upstream: fix memleak on session-bind path; from Pedro Martelletto, ok
6314 OpenBSD-Commit-ID: e85899a26ba402b4c0717b531317e8fc258f0a7e
6316 commit e05522008092ceb86a87bdd4ad7878424315db89
6317 Author: djm@openbsd.org <djm@openbsd.org>
6318 Date: Thu Apr 28 02:53:31 2022 +0000
6320 upstream: avoid printing hash algorithm twice; from lucas AT sexy.is
6322 OpenBSD-Commit-ID: 9d24671e10a84141b7c504396cabad600e47a941
6324 commit 0979e29356915261d69a9517a1e0aaade7c9fc75
6325 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6326 Date: Wed Apr 27 11:08:55 2022 +0000
6328 upstream: Add authfd path to debug output. ok markus@
6330 OpenBSD-Commit-ID: f735a17d1a6f2bee63bfc609d76ef8db8c090890
6332 commit 67b7c784769c74fd4d6b147d91e17e1ac1a8a96d
6333 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6334 Date: Tue Apr 26 07:41:44 2022 +0000
6336 upstream: Check sshauthopt_new() for NULL. bz#3425, from
6338 tessgauthier at microsoft.com. ok djm@
6340 OpenBSD-Commit-ID: af0315bc3e44aa406daa7e0ae7c2d719a974483f
6342 commit d571314d14b919fbd7c84a61f9bf2065fc0a6841
6343 Author: millert@openbsd.org <millert@openbsd.org>
6344 Date: Wed Apr 20 16:00:25 2022 +0000
6346 upstream: Remove unnecessary includes: openssl/hmac.h and
6348 openssl/evp.h. From Martin Vahlensieck.
6350 OpenBSD-Commit-ID: a6debb5fb0c8a44e43e8d5ca7cc70ad2f3ea31c3
6352 commit da8dddf8cc1f2516ff894b8183e83a7c5ba3ef80
6353 Author: millert@openbsd.org <millert@openbsd.org>
6354 Date: Wed Apr 20 15:59:18 2022 +0000
6356 upstream: Add missing includes of stdlib.h and stdint.h. We need
6358 stdlib.h for malloc(3) and stdint.h for SIZE_MAX. Unlike the other xmss
6359 files, ssh-xmss.c does not include xmss_commons.h so ssh-xmss.c must include
6360 those headers itself. From Martin Vahlensieck
6362 OpenBSD-Commit-ID: 70e28a9818cee3da1be2ef6503d4b396dd421e6b
6364 commit fe9d87a6800a7a33be08f4d5ab662a758055ced2
6365 Author: millert@openbsd.org <millert@openbsd.org>
6366 Date: Wed Apr 20 15:56:49 2022 +0000
6368 upstream: Avoid an unnecessary xstrdup in rm_env() when matching
6370 patterns. Since match_pattern() doesn't modify its arguments (they are
6371 const), there is no need to make an extra copy of the strings in
6372 options->send_env. From Martin Vahlensieck
6374 OpenBSD-Commit-ID: 2c9db31e3f4d3403b49642c64ee048b2a0a39351
6376 commit 7bf2eb958fbb551e7d61e75c176bb3200383285d
6377 Author: Darren Tucker <dtucker@dtucker.net>
6378 Date: Tue Apr 26 23:30:59 2022 +1000
6380 Add debian-riscv64 test target.
6382 commit 3913c935523902482974c4c503bcff20bd850a6a
6383 Author: Darren Tucker <dtucker@dtucker.net>
6384 Date: Mon Apr 25 17:20:06 2022 +1000
6386 Update OpenSSL and LibreSSL versions in tests.
6388 commit dcd8dca29bcdb193ff6be35b96fc55e6e30d37d9
6389 Author: Darren Tucker <dtucker@dtucker.net>
6390 Date: Sat Apr 23 20:40:28 2022 +1000
6392 Include stdlib.h for free() prototype.
6394 ... which is used inside the CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG block.
6396 commit 4cc05de568e1c3edd7834ff3bd9d8214eb34861b
6397 Author: Darren Tucker <dtucker@dtucker.net>
6398 Date: Sat Apr 23 20:17:26 2022 +1000
6400 Cache timezone data in capsicum sandbox.
6402 From emaste at freebsd.org, originally part of FreeBSD commit r339216
6403 / fc3c19a9 with autoconf bits added by me.
6405 commit c31404426d212e2964ff9e5e58e1d0fce3d83f27
6406 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6407 Date: Thu Apr 21 01:36:46 2022 +0000
6409 upstream: It looks like we can't completely avoid
6411 waiting for processes to exit so retrieve the pid via controlmaster and
6414 OpenBSD-Regress-ID: 8246f00f22b14e49d2ff1744c94897ead33d457b
6416 commit d19b21afab5c8e2f3df6bd8aee9766bdad3d8c58
6417 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6418 Date: Wed Apr 20 13:25:55 2022 +0000
6420 upstream: Use ssh -f and ControlPersist ..
6422 to start up test forwards and ssh -O stop to shut them down intead of
6423 sleep loops. This speeds up the test by an order of magnitude.
6425 OpenBSD-Regress-ID: eb3db5f805100919b092a3b2579c611fba3e83e7
6427 commit 5f76286a126721fa005de6edf3d1c7a265555f19
6428 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6429 Date: Wed Apr 20 05:24:13 2022 +0000
6431 upstream: Simplify forward-control test.
6433 Since we no longer need to support SSH1 we don't need to run shell
6434 commands on the other end of the connection and can use ssh -N instead.
6435 This also makes the test less racy.
6437 OpenBSD-Regress-ID: 32e94ce272820cc398f30b848b2b0f080d10302c
6439 commit 687bbf23572d8bdf25cbbcdf8ac583514e1ba710
6440 Author: djm@openbsd.org <djm@openbsd.org>
6441 Date: Thu Mar 31 03:07:33 2022 +0000
6443 upstream: regression test for sftp cp command
6445 OpenBSD-Regress-ID: c96bea9edde3a384b254785e7f9b2b24a81cdf82
6447 commit f1233f19a6a9fe58f52946f50df4772f5b136761
6448 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6449 Date: Wed Apr 20 01:13:47 2022 +0000
6451 upstream: Import regenerated moduli
6453 OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
6455 commit fec014785de198b9a325d1b94e324bb958c5fe7b
6456 Author: djm@openbsd.org <djm@openbsd.org>
6457 Date: Wed Apr 20 04:19:11 2022 +0000
6459 upstream: Try to continue running local I/O for channels in state
6461 OPEN during SSH transport rekeying. The most visible benefit is that it
6462 should make ~-escapes work in the client (e.g. to exit) if the connection
6463 happened to have stalled during a rekey event. Based work by and ok dtucker@
6465 OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45
6467 commit e68154b0d4f0f5085a050ea896955da1b1be6e30
6468 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6469 Date: Wed Apr 20 01:13:47 2022 +0000
6471 upstream: Import regenerated moduli
6473 OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
6475 commit 69928b106d8f0fa15b88cf3850d992ed81c44ae0
6476 Author: tj@openbsd.org <tj@openbsd.org>
6477 Date: Sat Apr 16 00:22:31 2022 +0000
6479 upstream: list the correct version number
6481 for when usage of the sftp protocol became default and fix a typo
6484 OpenBSD-Commit-ID: 24e1795ed2283fdeacf16413c2f07503bcdebb31
6486 commit 21042a05c0b304c16f655efeec97438249d2e2cc
6487 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6488 Date: Tue Apr 12 05:09:49 2022 +0000
6490 upstream: Correct path for system known hosts file in description
6492 of IgnoreUserKnownHosts. Patch from Martin Vahlensieck via tech@
6494 OpenBSD-Commit-ID: 9b7784f054fa5aa4d63cb36bd563889477127215
6496 commit 53f4aff60a7c1a08a23917bd47496f8901c471f5
6497 Author: Darren Tucker <dtucker@dtucker.net>
6498 Date: Sat Apr 16 14:33:20 2022 +1000
6500 Resync moduli.5 with upstream.
6502 1.18: remove duplicate publication year; carsten dot kunze at arcor dot de
6503 1.19: ssh-keygen's -G/-T have been replaced with -M generate/screen.
6505 commit d2b888762b9844eb0d8eb59909cdf5af5159f810
6506 Author: Darren Tucker <dtucker@dtucker.net>
6507 Date: Sat Apr 16 14:31:13 2022 +1000
6509 Retire fbsd6 test VM.
6511 It's long since out of support, relatively slow (it's i686) and the
6512 compiler has trouble with PIE.
6514 commit cd1f70009860a154b51230d367c55ea5f9a4504e
6515 Author: djm@openbsd.org <djm@openbsd.org>
6516 Date: Mon Apr 11 22:52:08 2022 +0000
6518 upstream: clear io_want/io_ready flags at start of poll() cycle;
6520 avoids plausible spin during rekeying if channel io_want flags are reused
6521 across cycles. ok markus@ deraadt@
6523 OpenBSD-Commit-ID: 91034f855b7c73cd2591657c49ac30f10322b967
6525 commit aa1920302778273f7f94c2091319aba199068ca0
6526 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6527 Date: Fri Apr 8 05:43:39 2022 +0000
6529 upstream: Note that curve25519-sha256 was later published in
6533 OpenBSD-Commit-ID: 2ac2b5d642d4cf5918eaec8653cad9a4460b2743
6535 commit 4673fa8f2be983f2f88d5afd754adb1a2a39ec9e
6536 Author: djm@openbsd.org <djm@openbsd.org>
6537 Date: Fri Apr 8 04:40:40 2022 +0000
6539 upstream: two defensive changes from Tobias Stoeckmann via GHPR287
6541 enforce stricter invarient for sshbuf_set_parent() - never allow
6542 a buffer to have a previously-set parent changed.
6544 In sshbuf_reset(), if the reallocation fails, then zero the entire
6545 buffer and not the (potentially smaller) default initial alloc size.
6547 OpenBSD-Commit-ID: 14583203aa5d50ad38d2e209ae10abaf8955e6a9
6549 commit 26eef015e2d2254375e13afaaf753b78932b1bf5
6550 Author: Damien Miller <djm@mindrot.org>
6551 Date: Mon Apr 11 16:07:09 2022 +1000
6553 Revert "update build-aux files to match autoconf-2.71"
6555 This reverts commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2.
6557 It turns out that the checked-in copies of these files are actually newer
6558 than autoconf-2.71's copies, so this was effectively a downgrade.
6559 Spotted by Bo Anderson via github
6561 commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2
6562 Author: Damien Miller <djm@mindrot.org>
6563 Date: Fri Apr 8 14:48:58 2022 +1000
6565 update build-aux files to match autoconf-2.71
6567 i.e. config.guess, config.sub and install-sh
6569 commit 94eb6858efecc1b4f02d8a6bd35e149f55c814c8
6570 Author: Damien Miller <djm@mindrot.org>
6571 Date: Wed Apr 6 10:47:48 2022 +1000
6573 update version numbers for release
6575 commit 8e4a8eadf4fe74e65e6492f34250f8cf7d67e8da
6576 Author: djm@openbsd.org <djm@openbsd.org>
6577 Date: Mon Apr 4 22:45:25 2022 +0000
6579 upstream: openssh-9.0
6581 OpenBSD-Commit-ID: 0dfb461188f4513ec024c1534da8c1ce14c20b64
6583 commit a9f23ea2e3227f406880c2634d066f6f50fa5eaa
6584 Author: naddy@openbsd.org <naddy@openbsd.org>
6585 Date: Thu Mar 31 17:58:44 2022 +0000
6587 upstream: ssh: document sntrup761x25519-sha512@openssh.com as
6591 OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171
6593 commit 9ec2713d122af79d66ebb9c1d6d9ae8621a8945f
6594 Author: naddy@openbsd.org <naddy@openbsd.org>
6595 Date: Thu Mar 31 17:27:27 2022 +0000
6597 upstream: man pages: add missing commas between subordinate and
6601 jmc@ dislikes a comma before "then" in a conditional, so leave those
6606 OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3
6608 commit 3741df98ffaaff92b474ee70d8ef276b5882f85a
6609 Author: Darren Tucker <dtucker@dtucker.net>
6610 Date: Mon Apr 4 23:52:11 2022 +1000
6612 Disable security key on fbsd6 test host.
6614 commit 32c12236f27ae83bfe6d2983b67c9bc67a83a417
6615 Author: Darren Tucker <dtucker@dtucker.net>
6616 Date: Mon Apr 4 15:16:51 2022 +1000
6618 Specify TEST_SHELL=bash on AIX.
6620 The system shells cause the agent-restrict test to fail due to some
6621 quoting so explicitly specify bash until we can get configure to
6622 autmatically work around that.
6624 commit 90452c8b69d065b7c7c285ff78b81418a75bcd76
6625 Author: Darren Tucker <dtucker@dtucker.net>
6626 Date: Fri Apr 1 23:38:44 2022 +1100
6628 Only return events from ppoll that were requested.
6630 If the underlying system's select() returns bits that were not in the
6631 request set, our ppoll() implementation can return revents for events
6632 not requested, which can apparently cause a hang. Only return revents
6633 for activity in the requested event set. bz#3416, analysis and fix by
6634 yaroslav.kuzmin at vmssoftware com, ok djm@
6636 commit 6c49eb5fabc56f4865164ed818aa5112d09c31a8
6637 Author: Darren Tucker <dtucker@dtucker.net>
6638 Date: Fri Apr 1 23:21:40 2022 +1100
6640 Only run regression tests on slow VMs.
6642 commit f67e47903977b42cb6abcd5565a61bd7293e4dc3
6643 Author: Darren Tucker <dtucker@dtucker.net>
6644 Date: Fri Apr 1 23:21:06 2022 +1100
6646 Increase test timeout to allow slow VMs to finish
6648 commit 02488c1b54065ddc4f25835dbd2618b2a2fe21f5
6649 Author: Darren Tucker <dtucker@dtucker.net>
6650 Date: Fri Apr 1 16:27:38 2022 +1100
6652 Use bash or ksh if available for SH in Makefile.
6654 commit 34c7018c316af4773e432066de28d0ef9d0888cd
6655 Author: Darren Tucker <dtucker@dtucker.net>
6656 Date: Fri Apr 1 14:56:54 2022 +1100
6658 Set Makefile SHELL as determined by configure.
6660 This should improve compatibility for users with non-POSIX shells. If
6661 using Makefile.in directly (eg make -f Makefile.in distprep) then SHELL
6662 will need to be specified on the command line (along with MANFMT in that
6663 particular case). ok djm@
6665 commit 5b054d76402faab38c48377efd112426469553a0
6666 Author: Darren Tucker <dtucker@dtucker.net>
6667 Date: Fri Apr 1 13:16:47 2022 +1100
6669 Skip slow tests on (very) slow test targets.
6671 commit b275818065b31a865142c48c2acf6a7c1655c542
6672 Author: Damien Miller <djm@mindrot.org>
6673 Date: Thu Mar 31 14:11:36 2022 +1100
6677 commit 3fa539c3ffaabd6211995512d33e29150f88c5c5
6678 Author: djm@openbsd.org <djm@openbsd.org>
6679 Date: Thu Mar 31 03:07:03 2022 +0000
6681 upstream: add a sftp client "cp" command that supports server-side
6683 copying of files. Useful for this task and for testing the copy-data
6684 extension. Patch from Mike Frysinger; ok dtucker@
6686 OpenBSD-Commit-ID: 1bb1b950af0d49f0d5425b1f267e197aa1b57444
6688 commit 7988bfc4b701c4b3fe9b36c8561a3d1c5d4c9a74
6689 Author: djm@openbsd.org <djm@openbsd.org>
6690 Date: Thu Mar 31 03:05:49 2022 +0000
6692 upstream: add support for the "corp-data" protocol extension to
6694 allow server-side copies to be performed without having to go via the client.
6695 Patch by Mike Frysinger, ok dtucker@
6697 OpenBSD-Commit-ID: 00aa510940fedd66dab1843b58682de4eb7156d5
6699 commit 32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba
6700 Author: djm@openbsd.org <djm@openbsd.org>
6701 Date: Wed Mar 30 21:13:23 2022 +0000
6703 upstream: select post-quantum KEX
6705 sntrup761x25519-sha512@openssh.com as the default; ok markus@
6707 OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9
6709 commit d6556de1db0822c76ba2745cf5c097d9472adf7c
6710 Author: djm@openbsd.org <djm@openbsd.org>
6711 Date: Wed Mar 30 21:10:25 2022 +0000
6713 upstream: fix poll() spin when a channel's output fd closes without
6715 data in the channel buffer. Introduce more exact packing of channel fds into
6716 the pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@
6718 OpenBSD-Commit-ID: 06740737849c9047785622ad5d472cb6a3907d10
6720 commit 8a74a96d25ca4d32fbf298f6c0ac5a148501777d
6721 Author: djm@openbsd.org <djm@openbsd.org>
6722 Date: Wed Mar 30 04:33:09 2022 +0000
6724 upstream: ssh is almost out of getopt() characters; note the
6726 remaining remaining available ones in a comment
6728 OpenBSD-Commit-ID: 48d38cef59d6bc8e84c6c066f6d601875d3253fd
6730 commit 6d4fc51adb9d8a42f67b5474f02f877422379de6
6731 Author: djm@openbsd.org <djm@openbsd.org>
6732 Date: Wed Mar 30 04:27:51 2022 +0000
6734 upstream: avoid NULL deref via ssh-keygen -Y find-principals.
6736 bz3409, reported by Mateusz Adamowski
6738 OpenBSD-Commit-ID: a3b2c02438052ee858e0ee18e5a288586b5df2c5
6740 commit e937514920335b92b543fd9be79cd6481d1eb0b6
6741 Author: Darren Tucker <dtucker@dtucker.net>
6742 Date: Mon Mar 28 17:51:03 2022 +1100
6744 Add AIX 5.1 test target.
6746 commit 4bbe815ba974b4fd89cc3fc3e3ef1be847a0befe
6747 Author: Darren Tucker <dtucker@dtucker.net>
6748 Date: Sat Mar 26 22:01:31 2022 +1100
6750 Drop leading "v" from release version identifier.
6752 It's present in the git tags but not in the release tarball names.
6753 Also drop extra "/" from URL path.
6755 commit f5cdd3b3c275dffaebfca91df782dca29975e9ac
6756 Author: Darren Tucker <dtucker@dtucker.net>
6757 Date: Sat Mar 26 16:28:04 2022 +1100
6759 Use tarballs when testing LibreSSL releases.
6761 This means they'll still work when the combination of -portable and
6762 openbsd github repos no longer match.
6764 commit 24dc37d198f35a7cf71bf4d5384363c7ef4209d4
6765 Author: Darren Tucker <dtucker@dtucker.net>
6766 Date: Sat Mar 26 15:02:45 2022 +1100
6768 Remove now-unused passwd variable.
6770 commit 5b467ceef2c356f0a77f5e8ab4eb0fac367e4d24
6771 Author: Darren Tucker <dtucker@dtucker.net>
6772 Date: Sat Mar 26 13:15:44 2022 +1100
6776 commit 2923d026e55998133c0f6e5186dca2a3c0fa5ff5
6777 Author: Darren Tucker <dtucker@dtucker.net>
6778 Date: Sat Mar 26 12:49:50 2022 +1100
6780 Factor out platform-specific locked account check.
6782 Also fixes an incorrect free on platforms with both libiaf and shadow
6783 passwords (probably only Unixware). Prompted by github PR#284,
6784 originally from @c3h2_ctf and stoeckmann@.
6786 commit d23efe4b12886ffe416be10bc0a7da6ca8aa72d1
6787 Author: Darren Tucker <dtucker@dtucker.net>
6788 Date: Sat Mar 26 08:13:46 2022 +1100
6790 Add OpenWRT mips and mipsel test targets.
6792 commit 16ea8b85838dd7a4dbeba4e51ac4f43fd68b1e5b
6793 Author: djm@openbsd.org <djm@openbsd.org>
6794 Date: Sun Mar 20 08:52:17 2022 +0000
6796 upstream: don't leak argument list; bz3404, reported by Balu
6800 OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6
6802 commit a72bde294fe0518c9a44ba63864093a1ef2425e3
6803 Author: djm@openbsd.org <djm@openbsd.org>
6804 Date: Sun Mar 20 08:51:21 2022 +0000
6806 upstream: make addargs() and replacearg() a little more robust and
6808 improve error reporting
6810 make freeargs(NULL) a noop like the other free functions
6812 ok dtucker as part of bz3403
6814 OpenBSD-Commit-ID: 15f86da83176978b4d1d288caa24c766dfa2983d
6816 commit 731087d2619fa7f01e675b23f57af10d745e8af2
6817 Author: djm@openbsd.org <djm@openbsd.org>
6818 Date: Fri Mar 18 04:04:11 2022 +0000
6820 upstream: don't try to resolve ListenAddress directives in the sshd
6822 re-exec path - we're never going to use the result and if the operation fails
6823 then it can prevent connections from being accepted. Reported by Aaron
6824 Poffenberger; with / ok dtucker@
6826 OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60
6828 commit 1c83c082128694ddd11ac05fdf31d70312ff1763
6829 Author: djm@openbsd.org <djm@openbsd.org>
6830 Date: Fri Mar 18 02:50:21 2022 +0000
6832 upstream: remove blank line
6834 OpenBSD-Commit-ID: d5e0182965b2fbfb03ad5f256d1a1ce5706bcddf
6836 commit 807be68684da7a1fe969c399ddce2fafb7997dcb
6837 Author: djm@openbsd.org <djm@openbsd.org>
6838 Date: Fri Mar 18 02:32:22 2022 +0000
6840 upstream: helpful comment
6842 OpenBSD-Commit-ID: e3315a45cb04e7feeb614d76ec80a9fe4ca0e8c7
6844 commit a0b5816f8f1f645acdf74f7bc11b34455ec30bac
6845 Author: djm@openbsd.org <djm@openbsd.org>
6846 Date: Fri Mar 18 02:31:25 2022 +0000
6848 upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV
6850 will ensue. Patch from Mateusz Adamowski via GHPR#307
6852 OpenBSD-Commit-ID: 99e8ec38f9feb38bce6de240335be34aedeba5fd
6854 commit 5a252d54a63be30d5ba4be76210942d754a531c0
6855 Author: djm@openbsd.org <djm@openbsd.org>
6856 Date: Tue Mar 15 05:27:37 2022 +0000
6858 upstream: improve DEBUG_CHANNEL_POLL debugging message
6860 OpenBSD-Commit-ID: 2275eb7bc4707d019b1a0194b9c92c0b78da848f
6862 commit ce324cf58ba2840e31afeb996935800780c8fa4b
6863 Author: cheloha@openbsd.org <cheloha@openbsd.org>
6864 Date: Sun Mar 13 23:27:54 2022 +0000
6866 upstream: ssh: xstrdup(): use memcpy(3)
6868 Copying the given string into the buffer with strlcpy(3) confers no
6869 benefit in this context because we have already determined the
6870 string's length with strlen(3) in order to allocate that buffer.
6872 Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2
6874 ok dtucker@ millert@
6876 OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a
6878 commit 2893c5e764557f48f9d6a929e224ed49c59545db
6879 Author: Darren Tucker <dtucker@dtucker.net>
6880 Date: Fri Mar 11 18:43:58 2022 +1100
6882 Resync fmt_scaled. with OpenBSD.
6884 Fixes underflow reported in bz#3401.
6886 commit 5ae31a0fdd27855af29f48ff027491629fff5979
6887 Author: Darren Tucker <dtucker@dtucker.net>
6888 Date: Wed Mar 9 09:41:56 2022 +1100
6890 Provide killpg implementation.
6892 Based on github PR#301 for Tandem NonStop.
6894 commit c41c84b439f4cd74d4fe44298a4b4037ddd7d2ae
6895 Author: Darren Tucker <dtucker@dtucker.net>
6896 Date: Wed Mar 9 09:29:30 2022 +1100
6898 Check for missing ftruncate prototype.
6900 From github PR#301 in conjunction with rsbeckerca.
6902 commit 8cf5275452a950869cb90eeac7d220b01f77b12e
6903 Author: Darren Tucker <dtucker@dtucker.net>
6904 Date: Tue Mar 8 20:04:06 2022 +1100
6906 Default to not using sandbox when cross compiling.
6908 On most systems poll(2) does not work when the number of FDs is reduced
6909 with setrlimit, so assume it doesn't when cross compiling and we can't
6910 run the test. bz#3398.
6912 commit 379b30120da53d7c84aa8299c26b18c51c2a0dac
6913 Author: djm@openbsd.org <djm@openbsd.org>
6914 Date: Tue Mar 1 01:59:19 2022 +0000
6916 upstream: pack pollfd array before server_accept_loop() ppoll()
6918 call, and terminate sshd if ppoll() returns errno==EINVAL
6920 avoids spin in ppoll when MaxStartups > RLIMIT_NOFILE, reported by
6925 OpenBSD-Commit-ID: dbab1c24993ac977ec24d83283b8b7528f7c2c15
6927 commit eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd
6928 Author: naddy@openbsd.org <naddy@openbsd.org>
6929 Date: Sun Feb 27 01:33:59 2022 +0000
6931 upstream: include rejected signature algorithm in error message and
6933 not the (useless) key type; ok djm@
6935 OpenBSD-Commit-ID: d0c0f552a4d9161203e07e95d58a76eb602a76ff
6937 commit f2f3269423618a83157e18902385e720f9776007
6938 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6939 Date: Fri Feb 25 09:46:24 2022 +0000
6941 upstream: Remove the char * casts from arguments to do_lstat,
6943 do_readdir and do_stat paths since the underlying functions now take a const
6944 char *. Patch from vapier at gentoo.org.
6946 OpenBSD-Commit-ID: 9e4d964dbfb0ed683a2a2900711b88e7f1c0297b
6948 commit 4a66dac052c5ff5047161853f36904607649e4f9
6949 Author: djm@openbsd.org <djm@openbsd.org>
6950 Date: Fri Feb 25 02:09:27 2022 +0000
6952 upstream: save an unneccessary alloc/free, based on patch from
6954 Martin Vahlensieck; ok dtucker@
6956 OpenBSD-Commit-ID: 90ffbf1f837e509742f2c31a1fbf2c0fd376fd5f
6958 commit 6f117cb151efe138ac57bdd8e26165f350328f5f
6959 Author: Darren Tucker <dtucker@dtucker.net>
6960 Date: Tue Mar 1 09:02:06 2022 +1100
6962 Remove unused ivbits argument from chacha_keysetup
6964 commit 15974235dd528aeab0ec67fb92a0a1d733f62be2
6965 Author: Darren Tucker <dtucker@dtucker.net>
6966 Date: Tue Mar 1 09:00:20 2022 +1100
6968 Add OPENBSD ORIGINAL marker.
6970 commit f2ff669347d320532e7c1b63cdf5c62f46e73150
6971 Author: Darren Tucker <dtucker@dtucker.net>
6972 Date: Mon Feb 28 22:21:36 2022 +1100
6974 No unused param warnings for clang-12 and gcc-11.
6976 These have too many false positives in -Werror tests on the github CI
6977 since we often provide empty stub functions for functionality not needed
6978 for particular configurations.
6980 commit 96558ecd87adac62efa9a2b5479f686ab86b0be1
6981 Author: Darren Tucker <dtucker@dtucker.net>
6982 Date: Sat Feb 26 14:10:41 2022 +1100
6984 Add debian-i386 test target.
6986 commit 284b6e5394652d519e31782e3b3cdfd7b21d1a81
6987 Author: Darren Tucker <dtucker@dtucker.net>
6988 Date: Sat Feb 26 14:06:14 2022 +1100
6990 Allow ppoll_time64 in seccomp sandbox.
6992 Should fix sandbox violations on (some? at least i386 and armhf) 32bit
6993 Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at
6994 debian.org via bz#3396.
6996 commit 0132056efabc5edb85c3c7105d2fb6dee41843c6
6997 Author: Darren Tucker <dtucker@dtucker.net>
6998 Date: Fri Feb 25 19:47:48 2022 +1100
7000 Improve handling of _getshort and _getlong.
7002 If the system native ones are exactly as required then use them,
7003 otherwise use the local versions mapped to another name to prevent
7006 commit 8e206e0dd6b9f757b07979e48f53ad5bf9b7b52b
7007 Author: Darren Tucker <dtucker@dtucker.net>
7008 Date: Fri Feb 25 15:14:22 2022 +1100
7010 Constify utimes in compat library to match specs.
7012 Patch from vapier at chromium.org.
7014 commit 1b2920e3b63db2eddebeec7330ffe8b723055573
7015 Author: Darren Tucker <dtucker@dtucker.net>
7016 Date: Fri Feb 25 13:50:56 2022 +1100
7018 ANSIfy getshort and getlong.
7020 These functions appear to have come from OpenBSD's lib/libc/net/res_comp.c
7021 which made this change in 2005.
7023 commit 54a86f4f6e1c43a2ca2be23ef799ab8910d4af70
7024 Author: Darren Tucker <dtucker@dtucker.net>
7025 Date: Fri Feb 25 13:23:04 2022 +1100
7027 Use PICFLAG instead of hard coding -fPIC.
7029 commit 3016ba47035ac3561aabd48e2be70167fe157d6a
7030 Author: Darren Tucker <dtucker@dtucker.net>
7031 Date: Fri Feb 25 11:37:11 2022 +1100
7033 Add tests for latest releases of {Libre,Open}SSL.
7035 commit f107467179428a0e3ea9e4aa9738ac12ff02822d
7036 Author: Colin Watson <cjwatson@debian.org>
7037 Date: Thu Feb 24 16:04:18 2022 +0000
7039 Improve detection of -fzero-call-used-regs=all support
7041 GCC doesn't tell us whether this option is supported unless it runs into
7042 the situation where it would need to emit corresponding code.
7044 commit 3383b2cac0e9275bc93c4b4760e6e048f537e1d6
7045 Author: djm@openbsd.org <djm@openbsd.org>
7046 Date: Wed Feb 23 21:21:49 2022 +0000
7048 upstream: free(3) wants stdlib.h
7050 OpenBSD-Commit-ID: 227a8c70a95b4428c49e46863c9ef4bd318a3b8a
7052 commit a4537e79ab4ac6db4493c5158744b9ebde5efcb0
7053 Author: djm@openbsd.org <djm@openbsd.org>
7054 Date: Wed Feb 23 21:21:16 2022 +0000
7056 upstream: put back the scp manpage changes for SFTP mode too
7058 OpenBSD-Commit-ID: 05dc53921f927e1b5e5694e1f3aa314549f2e768
7060 commit 449bcb8403adfb9724805d02a51aea76046de185
7061 Author: deraadt@openbsd.org <deraadt@openbsd.org>
7062 Date: Wed Feb 23 19:01:00 2022 +0000
7064 upstream: and we go back to testing sftp-scp after the 8.9
7068 OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c
7070 commit 166456cedad3962b83b848b1e9caf80794831f0f
7071 Author: Damien Miller <djm@mindrot.org>
7072 Date: Wed Feb 23 22:31:11 2022 +1100
7076 commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4
7077 Author: djm@openbsd.org <djm@openbsd.org>
7078 Date: Wed Feb 23 11:18:13 2022 +0000
7080 upstream: avoid integer overflow of auth attempts (harmless, caught
7084 OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86
7086 commit 6e0258c64c901753df695e06498b26f9f4812ea6
7087 Author: djm@openbsd.org <djm@openbsd.org>
7088 Date: Wed Feb 23 11:17:10 2022 +0000
7090 upstream: randomise the password used in fakepw
7092 OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947
7094 commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9
7095 Author: djm@openbsd.org <djm@openbsd.org>
7096 Date: Wed Feb 23 11:15:57 2022 +0000
7098 upstream: use asprintf to construct .rhosts paths
7100 OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b
7102 commit c07e154fbdc7285e9ec54e78d8a31f7325d43537
7103 Author: djm@openbsd.org <djm@openbsd.org>
7104 Date: Wed Feb 23 11:07:09 2022 +0000
7106 upstream: openssh-8.9
7108 OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e
7110 commit bc16667b4a1c3cad7029304853c143a32ae04bd4
7111 Author: Darren Tucker <dtucker@dtucker.net>
7112 Date: Tue Feb 22 15:29:22 2022 +1100
7114 Extend select+rlimit sanbox test to include poll.
7116 POSIX specifies that poll() shall fail if "nfds argument is greater
7117 than {OPEN_MAX}". The setrlimit sandbox sets this to effectively zero
7118 so this causes poll() to fail in the preauth privsep process.
7120 This is likely the underlying cause for the previously observed similar
7121 behaviour of select() on plaforms where it is implement in userspace on
7124 commit 6520c488de95366be031d49287ed243620399e23
7125 Author: Darren Tucker <dtucker@dtucker.net>
7126 Date: Tue Feb 22 13:08:59 2022 +1100
7128 Add Alpine Linux test VM.
7130 commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb
7131 Author: Darren Tucker <dtucker@dtucker.net>
7132 Date: Tue Feb 22 12:27:07 2022 +1100
7134 Include sys/param.h if present.
7136 Needed for howmany() on MUSL systems such as Alpine.
7138 commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c
7139 Author: Darren Tucker <dtucker@dtucker.net>
7140 Date: Tue Feb 22 12:25:52 2022 +1100
7142 Only include sys/poll.h if we don't have poll.h.
7144 Prevents warnings on MUSL based systems such as Alpine.
7146 commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5
7147 Author: Damien Miller <djm@mindrot.org>
7148 Date: Tue Feb 22 11:14:51 2022 +1100
7150 disable agent-restrict test on minix3
7152 Minix seems to have a platform-wide limit on the number of
7153 select(2) syscalls that can be concurrently issued. This test
7154 seems to exceed this limit.
7158 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114
7159 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31
7161 commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a
7162 Author: Darren Tucker <dtucker@dtucker.net>
7163 Date: Mon Feb 21 21:27:20 2022 +1100
7165 Skip agent-getpeereid when running as root.
7167 commit fbd772570a25436a33924d91c164d2b24021f010
7168 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7169 Date: Sun Feb 20 03:47:26 2022 +0000
7171 upstream: Aproximate realpath on the expected output by deduping
7173 leading slashes. Fixes test failure when user's home dir is / which is
7174 possible in some portable configurations.
7176 OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63
7178 commit 336685d223a59f893faeedf0a562e053fd84058e
7179 Author: Darren Tucker <dtucker@dtucker.net>
7180 Date: Sun Feb 20 13:30:52 2022 +1100
7182 Really move DSA to end of list.
7184 In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to
7185 the end of the list instead of DSA. Spotted by andrew at fyfe.gb.net.
7187 commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3
7188 Author: Darren Tucker <dtucker@dtucker.net>
7189 Date: Fri Feb 18 12:12:21 2022 +1100
7191 Add test configs for MUSL C library.
7193 commit f7fc6a43f1173e8b2c38770bf6cee485a562d03b
7194 Author: Damien Miller <djm@mindrot.org>
7195 Date: Thu Feb 17 22:54:19 2022 +1100
7197 minix needs BROKEN_POLL too; chokes on /dev/null
7199 commit 667fec5d4fe4406745750a32f69b5d2e1a75e94b
7200 Author: djm@openbsd.org <djm@openbsd.org>
7201 Date: Thu Feb 17 10:58:27 2022 +0000
7203 upstream: check for EINTR/EAGAIN failures in the rfd fast-path; caught
7205 by dtucker's minix3 vm :) ok dtucker@
7207 OpenBSD-Commit-ID: 2e2c895a3e82ef347aa6694394a76a438be91361
7209 commit 41417dbda9fb55a0af49a8236e3ef9d50d862644
7210 Author: Darren Tucker <dtucker@dtucker.net>
7211 Date: Thu Feb 17 22:05:29 2022 +1100
7213 Comment hurd test, the VM is currently broken.
7215 commit b2aee35a1f0dc798339b3fcf96136da71b7e3f6d
7216 Author: Damien Miller <djm@mindrot.org>
7217 Date: Thu Feb 17 21:15:16 2022 +1100
7219 find sk-dummy.so when build_dir != src_dir
7221 spotted by Corinna Vinschen; feedback & ok dtucker@
7223 commit 62a2d4e50b2e89f2ef04576931895d5139a5d037
7224 Author: Damien Miller <djm@mindrot.org>
7225 Date: Wed Feb 16 16:26:17 2022 +1100
7227 update versions in preparation for 8.9 release
7229 commit dd6d3dded721ac653ea73c017325e5bfeeec837f
7230 Author: djm@openbsd.org <djm@openbsd.org>
7231 Date: Tue Feb 15 05:13:36 2022 +0000
7233 upstream: document the unbound/host-bound options to
7235 PubkeyAuthentication; spotted by HARUYAMA Seigo
7237 OpenBSD-Commit-ID: 298f681b66a9ecd498f0700082c7a6c46e948981
7239 commit df93529dd727fdf2fb290700cd4f1adb0c3c084b
7240 Author: Darren Tucker <dtucker@dtucker.net>
7241 Date: Mon Feb 14 14:19:40 2022 +1100
7243 Test if sshd accidentally acquires controlling tty
7245 When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour
7246 in the STREAMS code before activating the workaround. ok djm@
7248 commit 766176cfdbfd7ec38bb6118dde6e4daa0df34888
7249 Author: Darren Tucker <dtucker@dtucker.net>
7250 Date: Sat Feb 12 10:24:56 2022 +1100
7252 Add cygwin-release test config.
7254 This tests the flags used to build the cygwin release binaries.
7256 commit b30698662b862f5397116d23688aac0764e0886e
7257 Author: Darren Tucker <dtucker@dtucker.net>
7258 Date: Fri Feb 11 21:00:35 2022 +1100
7260 Move SSHD_ACQUIRES_CTTY workaround into compat.
7262 On some (most? all?) SysV based systems with STREAMS based ptys,
7263 sshd could acquire a controlling terminal during pty setup when
7264 it pushed the "ptem" module, due to what is probably a bug in
7265 the STREAMS driver that's old enough to vote. Because it was the
7266 privileged sshd's controlling terminal, it was not available for
7267 the user's session, which ended up without one. This is known to
7268 affect at least Solaris <=10, derivatives such as OpenIndiana and
7269 several other SysV systems. See bz#245 for the backstory.
7271 In the we past worked around that by not calling setsid in the
7272 privileged sshd child, which meant it was not a session or process
7273 group leader. This solved controlling terminal problem because sshd
7274 was not eligble to acquire one, but had other side effects such as
7275 not cleaning up helper subprocesses in the SIGALRM handler since it
7276 was not PG leader. Recent cleanups in the signal handler uncovered
7277 this, resulting in the LoginGraceTime timer not cleaning up privsep
7278 unprivileged processes.
7280 This change moves the workaround into the STREAMS pty allocation code,
7281 by allocating a sacrificial pty to act as sshd's controlling terminal
7282 before allocating user ptys, so those are still available for users'
7286 - this will waste a pty per ssh connection on affected platforms.
7289 - it makes the process group behaviour consistent between platforms.
7291 - it puts the workaround nearest the code that actually causes the
7292 problem and competely out of the mainline code.
7294 - the workaround is only activated if you use the STREAMS code. If,
7295 say, Solaris 11 has the bug but also a working openpty() it doesn't
7296 matter that we defined SSHD_ACQUIRES_CTTY.
7298 - the workaround is only activated when the fist pty is allocated,
7299 ie in the post-auth privsep monitor. This means there's no risk
7300 of fd leaks to the unprivileged processes, and there's no effect on
7301 sessions that do not allocate a pty.
7303 Based on analysis and work by djm@, ok djm@
7305 commit cd00b48cf10f3565936a418c1e6d7e48b5c36140
7306 Author: Darren Tucker <dtucker@dtucker.net>
7307 Date: Fri Feb 11 20:09:32 2022 +1100
7309 Simplify handling of --with-ssl-dir.
7313 commit ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0
7314 Author: Darren Tucker <dtucker@dtucker.net>
7315 Date: Fri Feb 11 13:39:29 2022 +1100
7317 Stop testing OpenBSD HEAD on 6.9 and 7.0.
7319 HEAD is not guaranteed to work on previous stable branches, and at the
7320 moment is broken due to libfido API changes.
7322 commit 50b9e4a4514697ffb9592200e722de6b427cb9ff
7323 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7324 Date: Fri Feb 11 00:43:56 2022 +0000
7326 upstream: Always initialize delim before passing to hpdelim2 which
7328 might not set it. Found by the Valgrind tests on github, ok deraadt@
7330 OpenBSD-Commit-ID: c830c0db185ca43beff3f41c19943c724b4f636d
7332 commit 6ee53064f476cf163acd5521da45b11b7c57321b
7333 Author: Darren Tucker <dtucker@dtucker.net>
7334 Date: Fri Feb 11 10:03:06 2022 +1100
7336 Fix helper include path and remove excess code.
7338 Looks like test_hpdelim.c was imported twice into the same file.
7339 Spotted by kevin.brott at gmail com and chris at cataclysmal org.
7341 commit 9fa63a19f68bc87452d3cf5c577cafad2921b7a4
7342 Author: Darren Tucker <dtucker@dtucker.net>
7343 Date: Thu Feb 10 23:27:02 2022 +1100
7345 Put poll.h inside ifdef.
7347 commit 3ac00dfeb54b252c15dcbf1971582e9e3b946de6
7348 Author: Darren Tucker <dtucker@dtucker.net>
7349 Date: Thu Feb 10 22:17:31 2022 +1100
7351 We now support POLLPRI so actually define it.
7353 commit 25bd659cc72268f2858c5415740c442ee950049f
7354 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7355 Date: Sun Feb 6 22:58:33 2022 +0000
7357 upstream: Add test for empty hostname with port.
7359 OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3
7361 commit a29af853cff41c0635f0378c00fe91bf9c91dea4
7362 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7363 Date: Fri Feb 4 07:53:44 2022 +0000
7365 upstream: Add unit tests for hpdelim.
7367 OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018
7369 commit 9699151b039ecc5fad9ac6c6c02e9afdbd26f15f
7370 Author: djm@openbsd.org <djm@openbsd.org>
7371 Date: Thu Feb 10 04:12:38 2022 +0000
7373 upstream: revert for imminent OpenSSH release, which wil ship with
7378 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl;
7379 > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
7380 > protocol for copying. Let's get back to testing the SFTP protocol.
7382 This will be put back once the OpenSSH release is done.
7384 OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768
7386 commit 45279abceb37c3cbfac8ba36dde8b2c8cdd63d32
7387 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7388 Date: Tue Feb 8 08:59:12 2022 +0000
7390 upstream: Switch hpdelim interface to accept only ":" as delimiter.
7392 Historicallly, hpdelim accepted ":" or "/" as a port delimiter between
7393 hosts (or addresses) and ports. These days most of the uses for "/"
7394 are no longer accepted, so there are several places where it checks the
7395 delimiter to disallow it. Make hpdelim accept only ":" and use hpdelim2
7396 in the other cases. ok djm@
7398 OpenBSD-Commit-ID: 7e6420bd1be87590b6840973f5ad5305804e3102
7400 commit a1bcbf04a7c2d81944141db7ecd0ba292d175a66
7401 Author: pedro martelletto <pedro@yubico.com>
7402 Date: Mon Feb 7 09:09:59 2022 +0100
7404 fix typos in previous
7406 commit 56192518e329b39f063487bc2dc4d796f791eca0
7407 Author: Damien Miller <djm@mindrot.org>
7408 Date: Mon Feb 7 12:53:47 2022 +1100
7410 compat code for fido_assert_set_clientdata()
7412 commit d6b5aa08fdcf9b527f8b8f932432941d5b76b7ab
7413 Author: djm@openbsd.org <djm@openbsd.org>
7414 Date: Mon Feb 7 01:25:12 2022 +0000
7416 upstream: use libfido2 1.8.0+ fido_assert_set_clientdata() instead
7418 of manually hashing data outselves. Saves a fair bit of code and makes life
7419 easier for some -portable platforms.
7421 OpenBSD-Commit-ID: 351dfaaa5ab1ee928c0e623041fca28078cff0e0
7423 commit 86cc93fd3c26b2e0c7663c6394995fb04ebfbf3b
7424 Author: jsg@openbsd.org <jsg@openbsd.org>
7425 Date: Sun Feb 6 00:29:03 2022 +0000
7427 upstream: remove please from manual pages ok jmc@ sthen@ millert@
7429 OpenBSD-Commit-ID: 6543acb00f4f38a23472538e1685c013ca1a99aa
7431 commit ad16a84e64a8cf1c69c63de3fb9008320a37009c
7432 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7433 Date: Fri Feb 4 02:49:17 2022 +0000
7435 upstream: Since they are deprecated, move DSA to the end of the
7437 default list of public keys so that they will be tried last. From github
7438 PR#295 from "ProBackup-nl", ok djm@
7440 OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0
7442 commit 253de42753de85dde266e061b6fec12ca6589f7d
7443 Author: Damien Miller <djm@mindrot.org>
7444 Date: Wed Feb 2 16:52:07 2022 +1100
7446 portable-specific string array constification
7450 commit dfdcc2220cf359c492d5d34eb723370e8bd8a19e
7451 Author: djm@openbsd.org <djm@openbsd.org>
7452 Date: Tue Feb 1 23:37:15 2022 +0000
7454 upstream: test 'ssh-keygen -Y find-principals' with wildcard
7456 principals; from Fabian Stelzer
7458 OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40
7460 commit 968e508967ef42480cebad8cf3172465883baa77
7461 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7462 Date: Fri Jan 21 02:54:41 2022 +0000
7464 upstream: Enable all supported ciphers and macs in the server
7466 before trying to benchmark them. Increase the data file size to get more
7469 OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6
7471 commit 15b7199a1fd37eff4c695e09d573f3db9f4274b7
7472 Author: djm@openbsd.org <djm@openbsd.org>
7473 Date: Tue Feb 1 23:34:47 2022 +0000
7475 upstream: allow 'ssh-keygen -Y find-principals' to match wildcard
7477 principals in allowed_signers files; from Fabian Stelzer
7479 OpenBSD-Commit-ID: 1e970b9c025b80717dddff5018fe5e6f470c5098
7481 commit 541667fe6dc26d7881e55f0bb3a4baa6f3171645
7482 Author: djm@openbsd.org <djm@openbsd.org>
7483 Date: Tue Feb 1 23:32:51 2022 +0000
7485 upstream: mark const string array contents const too, i.e. static
7487 const char *array => static const char * const array from Mike Frysinger
7489 OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1
7491 commit 8cfa73f8a2bde4c98773f33f974c650bdb40dd3c
7492 Author: djm@openbsd.org <djm@openbsd.org>
7493 Date: Tue Feb 1 23:11:11 2022 +0000
7495 upstream: better match legacy scp behaviour: show un-expanded paths
7497 in error messages. Spotted by and ok tb@
7499 OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7
7501 commit 4e62c13ab419b4b224c8bc6a761e91fcf048012d
7502 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7503 Date: Tue Feb 1 07:57:32 2022 +0000
7505 upstream: Remove explicit kill of privsep preauth child's PID in
7507 SIGALRM handler. It's no longer needed since the child will get terminated by
7508 the SIGTERM to the process group that cleans up any auth helpers, it
7509 simplifies the signal handler and removes the risk of a race when updating
7510 the PID. Based on analysis by HerrSpace in github PR#289, ok djm@
7512 OpenBSD-Commit-ID: 2be1ffa28b4051ad9e33bb4371e2ec8a31d6d663
7514 commit 2a7ccd2ec4022917b745af7186f514f365b7ebe9
7515 Author: guenther@openbsd.org <guenther@openbsd.org>
7516 Date: Fri Jan 28 06:18:42 2022 +0000
7518 upstream: When it's the possessive of 'it', it's spelled "its",
7520 without the apostrophe.
7522 OpenBSD-Commit-ID: fb6ab9c65bd31de831da1eb4631ddac018c5fae7
7524 commit 8a0848cdd3b25c049332cd56034186b7853ae754
7525 Author: Alex James <theracermaster@gmail.com>
7526 Date: Sun Jan 30 16:13:36 2022 -0600
7528 sandbox-seccomp-filter: allow gettid
7530 Some allocators (such as Scudo) use gettid while tracing allocations [1].
7531 Allow gettid in preauth to prevent sshd from crashing with Scudo.
7533 [1]: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.0/compiler-rt/lib/gwp_asan/common.cpp#L46
7535 commit b30d32159dc3c7052f4bfdf36357996c905af739
7536 Author: djm@openbsd.org <djm@openbsd.org>
7537 Date: Sat Jan 22 00:49:34 2022 +0000
7539 upstream: add a ssh_packet_process_read() function that reads from
7541 a fd directly into the transport input buffer.
7543 Use this in the client and server mainloops to avoid unnecessary
7544 copying. It also lets us use a more greedy read size without penalty.
7546 Yields a 2-3% performance gain on cipher-speed.sh (in a fairly
7547 unscientific test tbf)
7549 feedback dtucker@ ok markus@
7551 OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632
7553 commit a1a8efeaaa9cccb15cdc0a2bd7c347a149a3a7e3
7554 Author: djm@openbsd.org <djm@openbsd.org>
7555 Date: Sat Jan 22 00:45:31 2022 +0000
7557 upstream: Use sshbuf_read() to read directly into the channel input
7559 buffer rather than into a stack buffer that needs to be copied again;
7560 Improves performance by about 1% on cipher-speed.sh feedback dtucker@ ok
7563 OpenBSD-Commit-ID: bf5e6e3c821ac3546dc8241d8a94e70d47716572
7565 commit 29a76994e21623a1f84d68ebb9dc5a3c909fa3a7
7566 Author: Damien Miller <djm@mindrot.org>
7567 Date: Tue Jan 25 11:52:34 2022 +1100
7571 commit 754e0d5c7712296a7a3a83ace863812604c7bc4f
7572 Author: djm@openbsd.org <djm@openbsd.org>
7573 Date: Sat Jan 22 00:43:43 2022 +0000
7575 upstream: Add a sshbuf_read() that attempts to read(2) directly in
7577 to a sshbuf; ok markus@
7579 OpenBSD-Commit-ID: 2d8f249040a4279f3bc23c018947384de8d4a45b
7581 commit c7964fb9829d9ae2ece8b51a76e4a02e8449338d
7582 Author: djm@openbsd.org <djm@openbsd.org>
7583 Date: Fri Jan 21 07:04:19 2022 +0000
7585 upstream: add a helper for writing an error message to the
7587 stderr_buf and setting quit_pending; no functional change but saves a bunch
7590 OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d
7592 commit d23b4f7fdb1bd87e2cd7a9ae7c198ae99d347916
7593 Author: djm@openbsd.org <djm@openbsd.org>
7594 Date: Fri Jan 21 06:58:06 2022 +0000
7596 upstream: correct comment and use local variable instead of long
7598 indirection; spotted by dtucker@
7600 OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965
7602 commit d069b020a02b6e3935080204ee44d233e8158ebb
7603 Author: deraadt@openbsd.org <deraadt@openbsd.org>
7604 Date: Fri Jan 21 00:53:40 2022 +0000
7606 upstream: When poll(2) returns -1, for some error conditions
7608 pfd[].revents is not cleared. There are subtle errors in various programs.
7609 In this particular case, the program should error out. ok djm millert
7611 OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c
7613 commit e204b34337a965feb439826157c191919fd9ecf8
7614 Author: Damien Miller <djm@mindrot.org>
7615 Date: Sat Jan 22 11:38:21 2022 +1100
7617 restore tty force-read hack
7619 This portable-specific hack fixes a hang on exit for ttyful sessions
7620 on Linux and some SysVish Unix variants. It was accidentally disabled
7621 in commit 5c79952dfe1a (a precursor to the mainloop poll(2) conversion).
7623 Spotted by John in bz3383
7625 commit 68085066b6bad43643b43f5957fcc5fd34782ccd
7626 Author: Corinna Vinschen <vinschen@redhat.com>
7627 Date: Fri Jan 21 03:22:56 2022 +1100
7629 Fix signedness bug in Cygwin code
7631 The Cygwin-specific pattern match code has a bug. It checks
7632 the size_t value returned by mbstowcs for being < 0. The right
7633 thing to do is to check against (size_t) -1. Fix that.
7635 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
7637 commit 2e5cfed513e84444483baf1d8b31c40072b05103
7638 Author: Darren Tucker <dtucker@dtucker.net>
7639 Date: Thu Jan 20 13:26:27 2022 +1100
7641 Improve compatibility of early exit trap handling.
7643 Dash (as used by the github runners) has some differences in its trap
7645 - it doesn't have -p (which is fine, that's not in posix).
7646 - it doesn't work in a subshell (which turns out to be in compliance
7647 with posix, which means bash isn't).
7648 - it doesn't work in a pipeline, ie "trap|cat" produces no output.
7650 commit 3fe6800b6027add478e648934cbb29d684e51943
7651 Author: Darren Tucker <dtucker@dtucker.net>
7652 Date: Thu Jan 20 00:49:57 2022 +1100
7654 Move more tests out of valgrind-1 runner.
7656 commit 20da6ed136dd76e6a0b229ca3036ef9c7c7ef798
7657 Author: Darren Tucker <dtucker@dtucker.net>
7658 Date: Wed Jan 19 15:37:39 2022 +1100
7660 Invoke EXIT handler early when using Valgrind.
7662 When using Valgrind, we need to wait for all invoked programs to
7663 complete before checking their valgrind logs. Some tests, notably
7664 agent-restrict, set an EXIT trap handler to clean up things like
7665 ssh-agent, but those do not get invoked until test-exec.sh exits.
7666 This causes the Valgrind wait to deadlock, so if present invoke
7667 the EXIT handler before checking the Valgrind logs.
7669 commit ad2e0580c87b0714cf166bca9d926a95ddeee1c8
7670 Author: Darren Tucker <dtucker@dtucker.net>
7671 Date: Tue Jan 18 12:55:21 2022 +1100
7673 Remove line leftover from upstream sync.
7675 commit d1051c0f11a6b749027e26bbeb61b07df4b67e15
7676 Author: djm@openbsd.org <djm@openbsd.org>
7677 Date: Mon Jan 17 22:56:04 2022 +0000
7679 upstream: when decompressing zlib compressed packets, use
7681 Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually
7682 specified as a valid mode for inflate(). There should be no practical change
7683 in behaviour as the compression side ensures a flush that should make all
7684 data available to the receiver in all cases.
7686 repoted by lamm AT ibm.com via bz3372; ok markus
7688 OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b
7690 commit d5981b1883746b1ae178a46229c26b53af99e37a
7691 Author: djm@openbsd.org <djm@openbsd.org>
7692 Date: Mon Jan 17 21:41:04 2022 +0000
7694 upstream: make most of the sftp errors more idiomatic, following
7696 the general form of "[local/remote] operation path: error message"; ok markus
7698 OpenBSD-Commit-ID: 61364cd5f3a9fecaf8d63b4c38a42c0c91f8b571
7700 commit ac7c9ec894ed0825d04ef69c55babb49bab1d32e
7701 Author: djm@openbsd.org <djm@openbsd.org>
7702 Date: Mon Jan 17 21:39:51 2022 +0000
7704 upstream: when transferring multiple files in SFTP mode, create the
7706 destination directory if it doesn't already exist to match olde-scp(1)
7707 behaviour. noticed by deraadt@ ok markus@
7709 OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407
7711 commit 39d17e189f8e72c34c722579d8d4e701fa5132da
7712 Author: djm@openbsd.org <djm@openbsd.org>
7713 Date: Fri Jan 14 03:43:48 2022 +0000
7715 upstream: allow pin-required FIDO keys to be added to ssh-agent(1).
7717 ssh-askpass will be used to request the PIN at authentication time.
7719 From Pedro Martelletto, ok djm
7721 OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950
7723 commit 52423f64e13db2bdc31a51b32e999cb1bfcf1263
7724 Author: djm@openbsd.org <djm@openbsd.org>
7725 Date: Fri Jan 14 03:35:10 2022 +0000
7727 upstream: ssh-sk: free a resident key's user id
7729 From Pedro Martelletto; ok dtucker & me
7731 OpenBSD-Commit-ID: 47be40d602b7a6458c4c71114df9b53d149fc2e9
7733 commit 014e2f147a2788bfb3cc58d1b170dcf2bf2ee493
7734 Author: djm@openbsd.org <djm@openbsd.org>
7735 Date: Fri Jan 14 03:34:00 2022 +0000
7737 upstream: sshsk_load_resident: don't preallocate resp
7739 resp is allocated by client_converse(), at which point we lose
7740 the original pointer.
7742 From Pedro Martelletto; ok dtucker & me
7744 OpenBSD-Commit-ID: 1f1b5ea3282017d6584dfed4f8370dc1db1f44b1
7746 commit c88265f207dfe0e8bdbaf9f0eda63ed6b33781cf
7747 Author: djm@openbsd.org <djm@openbsd.org>
7748 Date: Fri Jan 14 03:32:52 2022 +0000
7750 upstream: sshsk_sign: trim call to sshkey_fingerprint()
7752 the resulting fingerprint doesn't appear to be used for anything,
7753 and we end up leaking it.
7755 from Pedro Martelletto; ok dtucker & me
7757 OpenBSD-Commit-ID: 5625cf6c68f082bc2cbbd348e69a3ed731d2f9b7
7759 commit 1cd1b2eac39661b849d5a4b4b56363e22bb5f61e
7760 Author: djm@openbsd.org <djm@openbsd.org>
7761 Date: Fri Jan 14 03:31:52 2022 +0000
7763 upstream: use status error message to communicate ~user expansion
7765 failures; provides better experience for scp in sftp mode, where ~user paths
7766 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
7769 (forgot to include this file in previous commit)
7771 OpenBSD-Commit-ID: d37cc4c8c861ce48cd6ea9899e96aaac3476847b
7773 commit a1d42a6ce0398da3833bedf374ef2571af7fea50
7774 Author: Damien Miller <djm@mindrot.org>
7775 Date: Fri Jan 14 13:49:32 2022 +1100
7777 fix edge case in poll(2) wrapper
7779 Correct handling of select(2) exceptfds. These should only be consulted
7780 for POLLPRI flagged pfds and not unconditionally converted to POLLERR.
7782 with and ok dtucker@
7784 commit 976b9588b4b5babcaceec4767a241c11a67a5ccb
7785 Author: Darren Tucker <dtucker@dtucker.net>
7786 Date: Fri Jan 14 13:46:35 2022 +1100
7788 Wrap OpenSSL includes in unit tests in ifdef.
7790 Fixes unit test on systems that do not have OpenSSL headers installed.
7792 commit c171879374b2e8b07157503f5639ed0bce59ce89
7793 Author: Darren Tucker <dtucker@dtucker.net>
7794 Date: Thu Jan 13 15:53:33 2022 +1100
7796 Remove sort wrapper.
7798 agent-restrict now takes care of this itself.
7800 commit 9cc2654403f1a686bb26c07a6ac790edf334cef5
7801 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7802 Date: Thu Jan 13 04:53:16 2022 +0000
7804 upstream: Set LC_ALL in both local and remote shells so that sorted
7806 output matches regardless of what the user's shell sets it to. ok djm@
7808 OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f
7810 commit 7a75f748cb2dd2f771bf70ea72698aa027996ab1
7811 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7812 Date: Thu Jan 13 04:22:10 2022 +0000
7814 upstream: Avoid %'s in commands (not used in OpenBSD, but used in
7816 -portable's Valgrind test) being interpretted as printf format strings.
7818 OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043
7820 commit 6c435bd4994d71442192001483a1cdb846e5ffcd
7821 Author: Darren Tucker <dtucker@dtucker.net>
7822 Date: Wed Jan 12 16:58:13 2022 +1100
7824 Stop on first test failure to minimize logs.
7826 commit 4bc2ba6095620a4484b708ece12842afd8c7685b
7827 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7828 Date: Wed Jan 12 07:18:37 2022 +0000
7830 upstream: Use egrep when searching for an anchored string.
7832 OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4
7834 commit 6bf2efa2679da1e8e60731f41677b2081dedae2c
7835 Author: Darren Tucker <dtucker@dtucker.net>
7836 Date: Wed Jan 12 18:25:06 2022 +1100
7838 Add "rev" command replacement if needed.
7840 commit 72bcd7993dadaf967bb3d8564ee31cbf38132b5d
7841 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7842 Date: Wed Jan 12 03:30:32 2022 +0000
7844 upstream: Don't log NULL hostname in restricted agent code,
7846 printf("%s", NULL) is not safe on all platforms. with & ok djm
7848 OpenBSD-Commit-ID: faf10cdae4adde00cdd668cd1f6e05d0a0e32a02
7850 commit acabefe3f8fb58c867c99fed9bbf84dfa1771727
7851 Author: djm@openbsd.org <djm@openbsd.org>
7852 Date: Tue Jan 11 22:33:16 2022 +0000
7854 upstream: remove hardcoded domain and use window.location.host, so this
7858 OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92
7860 commit 96da0946e44f34adc0397eb7caa6ec35a3e79891
7861 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7862 Date: Tue Jan 11 02:56:19 2022 +0000
7864 upstream: "void" functions should not return anything. From Tim Rice
7868 OpenBSD-Commit-ID: ce6616304f4c9881b46413e616b226c306830e2a
7870 commit a882a09722c9f086c9edb65d0c4022fd965ec1ed
7871 Author: djm@openbsd.org <djm@openbsd.org>
7872 Date: Tue Jan 11 01:26:47 2022 +0000
7874 upstream: suppress "Connection to xxx closed" messages at LogLevel >=
7876 error bz3378; ok dtucker@
7878 OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c
7880 commit 61a1a6af22e17fc94999a5d1294f27346e6c4668
7881 Author: Damien Miller <djm@mindrot.org>
7882 Date: Wed Jan 12 08:57:49 2022 +1100
7884 OS X poll(2) is broken; use compat replacement
7886 Darwin's poll(2) implementation is broken. For character-special
7887 devices like /dev/null, it returns POLLNVAL when polled with
7890 Apparently this is Apple bug 3710161, which is AFAIK not public,
7891 but a websearch will find other OSS projects rediscovering it
7892 periodically since it was first identified in 2005 (!!)
7894 commit 613a6545fc5a9542753b503cbe5906538a640b60
7895 Author: Darren Tucker <dtucker@dtucker.net>
7896 Date: Tue Jan 11 20:56:01 2022 +1100
7898 libhardended_malloc.so moved into out dir.
7900 commit 61761340be5e11046556623f8f5412b236cefa95
7901 Author: Tim Rice <tim@multitalents.net>
7902 Date: Mon Jan 10 11:07:04 2022 -0800
7904 Make USL compilers happy
7905 UX:acomp: ERROR: "sftp-server.c", line 567: void function cannot return value
7907 commit 3ef403f351e80a59b6f7e9d43cb82c181855483c
7908 Author: Darren Tucker <dtucker@dtucker.net>
7909 Date: Mon Jan 10 21:07:38 2022 +1100
7911 Add wrapper for "sort" to set LC_ALL=C.
7913 Found by djm, this should make sorts stable and reduce test flakiness.
7915 commit bd69e29f5716090181dbe0b8272eb7eab1a383bb
7916 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7917 Date: Sat Jan 8 07:55:26 2022 +0000
7919 upstream: Remove errant "set -x" left over from debugging.
7921 OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc
7923 commit 1a7c88e26fd673813dc5f61c4ac278564845e004
7924 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7925 Date: Sat Jan 8 07:01:13 2022 +0000
7927 upstream: Enable all supported hostkey algorithms (but no others).
7929 Allows hostbased test to pass when built without OpenSSL.
7931 OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562
7933 commit 12b457c2a42ff271e7967d9bedd068cebb048db9
7934 Author: djm@openbsd.org <djm@openbsd.org>
7935 Date: Sat Jan 8 07:37:32 2022 +0000
7937 upstream: use status error message to communicate ~user expansion
7939 failures; provides better experience for scp in sftp mode, where ~user paths
7940 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
7943 OpenBSD-Commit-ID: fc610ce00ca0cdc2ecdabbd49ce7cb82033f905f
7945 commit 63670d4e9030bcee490d5a9cce561373ac5b3b23
7946 Author: djm@openbsd.org <djm@openbsd.org>
7947 Date: Sat Jan 8 07:36:11 2022 +0000
7949 upstream: fix some corner-case bugs in scp sftp-mode handling of
7951 ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus
7953 OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222
7955 commit e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0
7956 Author: djm@openbsd.org <djm@openbsd.org>
7957 Date: Sat Jan 8 07:34:57 2022 +0000
7959 upstream: more idiomatic error messages; spotted by jsg & deraadt
7963 OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8
7965 commit 9acddcd5918c623f7ebf454520ffe946a8f15e90
7966 Author: djm@openbsd.org <djm@openbsd.org>
7967 Date: Sat Jan 8 07:33:54 2022 +0000
7969 upstream: add a variant of send_status() that allows overriding the
7971 default, generic error message. feedback/ok markus & jsg
7973 OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f
7975 commit 961411337719d4cd78f1ab33e4ac549f3fa22f50
7976 Author: djm@openbsd.org <djm@openbsd.org>
7977 Date: Sat Jan 8 07:32:45 2022 +0000
7979 upstream: refactor tilde_expand_filename() and make it handle ~user
7981 paths with no trailing slash; feedback/ok markus and jsg
7983 OpenBSD-Commit-ID: a2ab365598a902f0f14ba6a4f8fb2d07a9b5d51d
7985 commit dc38236ab6827dec575064cac65c8e7035768773
7986 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7987 Date: Thu Jan 6 22:14:25 2022 +0000
7989 upstream: Don't explicitly set HostbasedAuthentication in
7991 sshd_config. It defaults to "no", and not explicitly setting it allows us to
7992 enable it for the (optional) hostbased test.
7994 OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c
7996 commit e12d912ddf1c873cb72e5de9a197afbe0b6622d2
7997 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7998 Date: Thu Jan 6 21:46:56 2022 +0000
8000 upstream: Add test for hostbased auth. It requires some external
8002 setup (see comments at the top) and thus is disabled unless
8003 TEST_SSH_HOSTBASED_AUTH and SUDO are set.
8005 OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a
8007 commit a48533a8da6a0f4f05ecd055dc8048047e53569e
8008 Author: Damien Miller <djm@mindrot.org>
8009 Date: Fri Jan 7 09:24:26 2022 +1100
8013 commit d9dbb5d9a0326e252d3c7bc13beb9c2434f59409
8014 Author: djm@openbsd.org <djm@openbsd.org>
8015 Date: Thu Jan 6 22:06:51 2022 +0000
8017 upstream: allow hostbased auth to select RSA keys when only
8019 RSA/SHA2 are configured (this is the default case); ok markus@
8021 OpenBSD-Commit-ID: 411c18c7bde40c60cc6dfb7017968577b4d4a827
8023 commit fdb1d58d0d3888b042e5a500f6ce524486aaf782
8024 Author: djm@openbsd.org <djm@openbsd.org>
8025 Date: Thu Jan 6 22:05:42 2022 +0000
8027 upstream: add a helper function to match a key type to a list of
8029 signature algorithms. RSA keys can make signatures with multiple algorithms,
8030 so some special handling is required. ok markus@
8032 OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff
8034 commit 11e8c4309a5086a45fbbbc87d0af5323c6152914
8035 Author: djm@openbsd.org <djm@openbsd.org>
8036 Date: Thu Jan 6 22:04:20 2022 +0000
8038 upstream: log some details on hostkeys that ssh loads for
8040 hostbased authn ok markus@
8042 OpenBSD-Commit-ID: da17061fa1f0e58cb31b88478a40643e18233e38
8044 commit c6706f661739514a34125aa3136532a958929510
8045 Author: djm@openbsd.org <djm@openbsd.org>
8046 Date: Thu Jan 6 22:03:59 2022 +0000
8048 upstream: log signature algorithm during verification by monitor;
8052 OpenBSD-Commit-ID: 02b92bb42c4d4bf05a051702a56eb915151d9ecc
8054 commit 8832402bd500d1661ccc80a476fd563335ef6cdc
8055 Author: djm@openbsd.org <djm@openbsd.org>
8056 Date: Thu Jan 6 22:02:52 2022 +0000
8058 upstream: piece of UpdateHostkeys client strictification: when
8060 updating known_hosts with new keys, ignore NULL keys (forgot to include in
8063 OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08
8065 commit c2d9ced1da0276961d86690b3bd7ebdaca7fdbf7
8066 Author: djm@openbsd.org <djm@openbsd.org>
8067 Date: Thu Jan 6 22:01:14 2022 +0000
8069 upstream: include rejected signature algorithm in error message
8071 and not the (useless) key type; ok markus
8073 OpenBSD-Commit-ID: 4180b5ec7ab347b43f84e00b1972515296dab023
8075 commit 7aa7b096cf2bafe2777085abdeed5ce00581f641
8076 Author: djm@openbsd.org <djm@openbsd.org>
8077 Date: Thu Jan 6 22:00:18 2022 +0000
8079 upstream: make ssh-keysign use the requested signature algorithm
8081 and not the default for the keytype. Part of unbreaking hostbased auth for
8082 RSA/SHA2 keys. ok markus@
8084 OpenBSD-Commit-ID: b5639a14462948970da3a8020dc06f9a80ecccdc
8086 commit 291721bc7c840d113a49518f3fca70e86248b8e8
8087 Author: djm@openbsd.org <djm@openbsd.org>
8088 Date: Thu Jan 6 21:57:28 2022 +0000
8090 upstream: stricter UpdateHostkey signature verification logic on
8092 the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when
8093 RSA/SHA1 was explicitly negotiated during initial KEX; bz3375
8097 OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29
8099 commit 0fa33683223c76289470a954404047bc762be84c
8100 Author: djm@openbsd.org <djm@openbsd.org>
8101 Date: Thu Jan 6 21:55:23 2022 +0000
8103 upstream: Fix signature algorithm selection logic for
8105 UpdateHostkeys on the server side. The previous code tried to prefer RSA/SHA2
8106 for hostkey proofs of RSA keys, but missed some cases. This will use RSA/SHA2
8107 signatures for RSA keys if the client proposed these algorithms in initial
8110 Mostly by Dmitry Belyavskiy with some tweaks by me.
8114 OpenBSD-Commit-ID: c17ba0c3236340d2c6a248158ebed042ac6a8029
8116 commit 17877bc81db3846e6e7d4cfb124d966bb9c9296b
8117 Author: djm@openbsd.org <djm@openbsd.org>
8118 Date: Thu Jan 6 21:48:38 2022 +0000
8120 upstream: convert ssh, sshd mainloops from select() to poll();
8122 feedback & ok deraadt@ and markus@ has been in snaps for a few months
8124 OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c
8126 commit 5c79952dfe1aa36105c93b3f383ce9be04dee384
8127 Author: djm@openbsd.org <djm@openbsd.org>
8128 Date: Thu Jan 6 21:46:23 2022 +0000
8130 upstream: prepare for conversion of ssh, sshd mainloop from
8132 select() to poll() by moving FD_SET construction out of channel handlers into
8133 separate functions. ok markus
8135 OpenBSD-Commit-ID: 937fbf2a4de12b19fb9d5168424e206124807027
8137 commit 24c5187edfef4651a625b7d5d692c8c7e794f71f
8138 Author: djm@openbsd.org <djm@openbsd.org>
8139 Date: Wed Jan 5 21:54:37 2022 +0000
8141 upstream: add a comment so I don't make this mistake again
8143 OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e
8145 commit 7369900441929058263a17f56aa67e05ff7ec628
8146 Author: djm@openbsd.org <djm@openbsd.org>
8147 Date: Wed Jan 5 21:50:00 2022 +0000
8149 upstream: fix cut-and-pasto in error message
8151 OpenBSD-Commit-ID: 4cc5c619e4b456cd2e9bb760d17e3a9c84659198
8153 commit 294c11b1c7d56d3fb61e329603a782315ed70c62
8154 Author: djm@openbsd.org <djm@openbsd.org>
8155 Date: Wed Jan 5 08:25:05 2022 +0000
8157 upstream: select all RSA hostkey algorithms for UpdateHostkeys tests,
8161 OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8
8163 commit 2ea1108c30e3edb6f872dfc1e6da10b041ddf2c0
8164 Author: djm@openbsd.org <djm@openbsd.org>
8165 Date: Wed Jan 5 04:56:15 2022 +0000
8167 upstream: regress test both sshsig message hash algorithms, possible
8169 now because the algorithm is controllable via the CLI
8171 OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f
8173 commit 2327c306b5d4a2b7e71178e5a4d139af9902c2b0
8174 Author: djm@openbsd.org <djm@openbsd.org>
8175 Date: Wed Jan 5 04:50:11 2022 +0000
8177 upstream: allow selection of hash at sshsig signing time; code
8179 already supported either sha512 (default) or sha256, but plumbing wasn't
8180 there mostly by Linus Nordberg
8182 OpenBSD-Commit-ID: 1b536404b9da74a84b3a1c8d0b05fd564cdc96cd
8184 commit 56e941d0a00d6d8bae88317717d5e1b7395c9529
8185 Author: djm@openbsd.org <djm@openbsd.org>
8186 Date: Wed Jan 5 04:27:54 2022 +0000
8188 upstream: add missing -O option to usage() for ssh-keygen -Y sign;
8192 OpenBSD-Commit-ID: 4e78feb4aa830727ab76bb2e3d940440ae1d7af0
8194 commit 141a14ec9b0924709c98df2dd8013bde5d8d12c7
8195 Author: djm@openbsd.org <djm@openbsd.org>
8196 Date: Wed Jan 5 04:27:01 2022 +0000
8198 upstream: move sig_process_opts() to before sig_sign(); no
8200 functional code change
8202 OpenBSD-Commit-ID: da02d61f5464f72b4e8b299f83e93c3b657932f9
8204 commit 37a14249ec993599a9051731e4fb0ac5e976aec1
8205 Author: djm@openbsd.org <djm@openbsd.org>
8206 Date: Wed Jan 5 04:10:39 2022 +0000
8208 upstream: regression test for find-principals NULL deref; from Fabian
8212 OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5
8214 commit eb1f042142fdaba93f6c9560cf6c91ae25f6884a
8215 Author: djm@openbsd.org <djm@openbsd.org>
8216 Date: Wed Jan 5 04:02:42 2022 +0000
8218 upstream: NULL deref when using find-principals when matching an
8220 allowed_signers line that contains a namespace restriction, but no
8221 restriction specified on the command-line; report and fix from Fabian Stelzer
8223 OpenBSD-Commit-ID: 4a201b86afb668c908d1a559c6af456a61f4b145
8225 commit 8f3b18030579f395eca2181da31a5f945af12a59
8226 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8227 Date: Tue Jan 4 08:38:53 2022 +0000
8229 upstream: Log command invocation while debugging.
8231 This will aid in manually reproducing failing commands.
8233 OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a
8235 commit bbf285164df535f0d38c36237f007551bbdae27f
8236 Author: Darren Tucker <dtucker@dtucker.net>
8237 Date: Sun Dec 26 10:31:15 2021 +1100
8239 Always save config.h as build artifact.
8241 Should allow better comparison between failing and succeeding test
8244 commit 03bd4ed0db699687c5cd83405d26f81d2dc28d22
8245 Author: Darren Tucker <dtucker@dtucker.net>
8246 Date: Sat Dec 25 16:42:51 2021 +1100
8248 Add OpenBSD 7.0 target. Retire 6.8.
8250 commit c45a752f0de611afd87755c2887c8a24816d08ee
8251 Author: jsg@openbsd.org <jsg@openbsd.org>
8252 Date: Sat Jan 1 05:55:06 2022 +0000
8256 OpenBSD-Commit-ID: c63e43087a64d0727af13409c708938e05147b62
8258 commit c672f83a89a756564db0d3af9934ba0e1cf8fa3e
8259 Author: djm@openbsd.org <djm@openbsd.org>
8260 Date: Tue Jan 4 07:20:33 2022 +0000
8262 upstream: unbreak test: was picking up system ssh-add instead of the
8264 one supposedly being tested. Spotted by dtucker and using his VM zoo (which
8265 includes some systems old enough to lack ed25519 key support)
8267 OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5
8269 commit a23698c3082ffe661abed14b020eac9b0c25eb9f
8270 Author: djm@openbsd.org <djm@openbsd.org>
8271 Date: Sat Jan 1 04:18:06 2022 +0000
8273 upstream: fix memleak in process_extension(); oss-fuzz issue #42719
8275 OpenBSD-Commit-ID: d8d49f840162fb7b8949e3a5adb8107444b6de1e
8277 commit cb885178f36b83d0f14cfe9f345d2068103feed0
8278 Author: jsg@openbsd.org <jsg@openbsd.org>
8279 Date: Sat Jan 1 01:55:30 2022 +0000
8281 upstream: spelling ok dtucker@
8283 OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19
8285 commit 6b977f8080a32c5b3cbb9edb634b9d5789fb79be
8286 Author: djm@openbsd.org <djm@openbsd.org>
8287 Date: Sun Dec 26 23:34:41 2021 +0000
8289 upstream: split method list search functionality from
8291 authmethod_lookup() into a separate authmethod_byname(), for cases where we
8292 don't need to check whether a method is enabled, etc.
8294 use this to fix the "none" authentication method regression reported
8295 by Nam Nguyen via bugs@
8299 OpenBSD-Commit-ID: 8cd188dc3a83aa8abe5b7693e762975cd8ea8a17
8301 commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07
8302 Author: jmc@openbsd.org <jmc@openbsd.org>
8303 Date: Wed Dec 22 06:56:41 2021 +0000
8305 upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;
8309 OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965
8311 commit 1c9853a68b2319f2e5f929179735e8fbb9988a67
8312 Author: Darren Tucker <dtucker@dtucker.net>
8313 Date: Wed Dec 22 19:33:10 2021 +1100
8315 Use SHA.*_HMAC_BLOCK_SIZE if needed.
8317 If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH
8318 but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter.
8319 Should fix --without-openssl build on Solaris.
8321 commit 715c892f0a5295b391ae92c26ef4d6a86ea96e8e
8322 Author: Damien Miller <djm@mindrot.org>
8323 Date: Wed Dec 22 09:02:50 2021 +1100
8325 remove sys/param.h in -portable, after upstream
8327 commit 7a7c69d8b4022b1e5c0afb169c416af8ce70f3e8
8328 Author: Damien Miller <djm@mindrot.org>
8329 Date: Mon Dec 20 13:05:20 2021 +1100
8331 add agent-restrict.sh file, missed in last commit
8333 commit f539136ca51a4976644db5d0be8158cc1914c72a
8334 Author: djm@openbsd.org <djm@openbsd.org>
8335 Date: Sun Dec 19 22:20:12 2021 +0000
8337 upstream: regression test for destination restrictions in ssh-agent
8339 OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d
8341 commit 6e4980eb8ef94c04874a79dd380c3f568e8416d6
8342 Author: anton@openbsd.org <anton@openbsd.org>
8343 Date: Sat Dec 18 06:53:59 2021 +0000
8345 upstream: Make use of ntests variable, pointed out by clang 13.
8347 OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72
8349 commit 3eead8158393b697f663ec4301e3c7b6f24580b1
8350 Author: deraadt@openbsd.org <deraadt@openbsd.org>
8351 Date: Tue Dec 14 21:25:27 2021 +0000
8353 upstream: sys/param.h cleanup, mostly using MINIMUM() and
8355 <limits.h> ok dtucker
8357 OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0
8359 commit 266678e19eb0e86fdf865b431b6e172e7a95bf48
8360 Author: djm@openbsd.org <djm@openbsd.org>
8361 Date: Sun Dec 19 22:15:42 2021 +0000
8363 upstream: document host-bound publickey authentication
8365 OpenBSD-Commit-ID: ea6ed91779a81f06d961e30ecc49316b3d71961b
8367 commit 3d00024b3b156aa9bbd05d105f1deb9cb088f6f7
8368 Author: djm@openbsd.org <djm@openbsd.org>
8369 Date: Sun Dec 19 22:15:21 2021 +0000
8371 upstream: document agent protocol extensions
8373 OpenBSD-Commit-ID: 09e8bb391bbaf24c409b75a4af44e0cac65405a7
8375 commit c385abf76511451bcba78568167b1cd9e90587d5
8376 Author: djm@openbsd.org <djm@openbsd.org>
8377 Date: Sun Dec 19 22:14:47 2021 +0000
8379 upstream: PubkeyAuthentication=yes|no|unbound|host-bound
8381 Allow control over which pubkey methods are used. Added out of
8382 concern that some hardware devices may have difficulty signing
8383 the longer pubkey authentication challenges. This provides a
8384 way for them to disable the extension. It's also handy for
8387 feedback / ok markus@
8389 OpenBSD-Commit-ID: ee52580db95c355cf6d563ba89974c210e603b1a
8391 commit 34b1e9cc7654f41cd4c5b1cc290b999dcf6579bb
8392 Author: djm@openbsd.org <djm@openbsd.org>
8393 Date: Sun Dec 19 22:14:12 2021 +0000
8395 upstream: document destination-constrained keys
8397 feedback / ok markus@
8399 OpenBSD-Commit-ID: cd8c526c77268f6d91c06adbee66b014d22d672e
8401 commit a6d7677c4abcfba268053e5867f2acabe3aa371b
8402 Author: djm@openbsd.org <djm@openbsd.org>
8403 Date: Sun Dec 19 22:13:55 2021 +0000
8405 upstream: Use hostkey parsed from hostbound userauth request
8407 Require host-bound userauth requests for forwarded SSH connections.
8409 The hostkey parsed from the host-bound userauth request is now checked
8410 against the most recently bound session ID / hostkey on the agent socket
8411 and the signature refused if they do not match.
8415 OpenBSD-Commit-ID: d69877c9a3bd8d1189a5dbdeceefa432044dae02
8417 commit baaff0ff4357cc5a079621ba6e2d7e247b765061
8418 Author: djm@openbsd.org <djm@openbsd.org>
8419 Date: Sun Dec 19 22:13:33 2021 +0000
8421 upstream: agent support for parsing hostkey-bound signatures
8423 Allow parse_userauth_request() to work with blobs from
8424 publickey-hostbound-v00@openssh.com userauth attempts.
8426 Extract hostkey from these blobs.
8430 OpenBSD-Commit-ID: 81c064255634c1109477dc65c3e983581d336df8
8432 commit 3e16365a79cdeb2d758cf1da6051b1c5266ceed7
8433 Author: djm@openbsd.org <djm@openbsd.org>
8434 Date: Sun Dec 19 22:13:12 2021 +0000
8436 upstream: EXT_INFO negotiation of hostbound pubkey auth
8438 the EXT_INFO packet gets a new publickey-hostbound@openssh.com to
8439 advertise the hostbound public key method.
8441 Client side support to parse this feature flag and set the kex->flags
8442 indicator if the expected version is offered (currently "0").
8446 OpenBSD-Commit-ID: 4cdb2ca5017ec1ed7a9d33bda95c1d6a97b583b0
8448 commit 94ae0c6f0e35903b695e033bf4beacea1d376bb1
8449 Author: djm@openbsd.org <djm@openbsd.org>
8450 Date: Sun Dec 19 22:12:54 2021 +0000
8452 upstream: client side of host-bound pubkey authentication
8454 Add kex->flags member to enable the publickey-hostbound-v00@openssh.com
8455 authentication method.
8457 Use the new hostbound method in client if the kex->flags flag was set,
8458 and include the inital KEX hostkey in the userauth request.
8460 Note: nothing in kex.c actually sets the new flag yet
8464 OpenBSD-Commit-ID: 5a6fce8c6c8a77a80ee1526dc467d91036a5910d
8466 commit 288fd0218dbfdcb05d9fbd1885904bed9b6d42e6
8467 Author: djm@openbsd.org <djm@openbsd.org>
8468 Date: Sun Dec 19 22:12:30 2021 +0000
8470 upstream: sshd side of hostbound public key auth
8472 This is identical to the standard "publickey" method, but it also includes
8473 the initial server hostkey in the message signed by the client.
8475 feedback / ok markus@
8477 OpenBSD-Commit-ID: 7ea01bb7238a560c1bfb426fda0c10a8aac07862
8479 commit dbb339f015c33d63484261d140c84ad875a9e548
8480 Author: djm@openbsd.org <djm@openbsd.org>
8481 Date: Sun Dec 19 22:12:07 2021 +0000
8483 upstream: prepare for multiple names for authmethods
8485 allow authentication methods to have one additional name beyond their
8488 allow lookup by this synonym
8490 Use primary name for authentication decisions, e.g. for
8491 PermitRootLogin=publickey
8493 Pass actual invoked name to the authmethods, so they can tell whether they
8494 were requested via the their primary name or synonym.
8498 OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559
8500 commit 39f00dcf44915f20684160f0a88d3ef8a3278351
8501 Author: djm@openbsd.org <djm@openbsd.org>
8502 Date: Sun Dec 19 22:11:39 2021 +0000
8504 upstream: ssh-agent side of destination constraints
8506 Gives ssh-agent the ability to parse restrict-destination-v00@openssh.com
8507 constraints and to apply them to keys.
8509 Check constraints against the hostkeys recorded for a SocketEntry when
8510 attempting a signature, adding, listing or deleting keys. Note that
8511 the "delete all keys" request will remove constrained keys regardless of
8514 feedback Jann Horn & markus@
8517 OpenBSD-Commit-ID: 84a7fb81106c2d609a6ac17469436df16d196319
8519 commit ce943912df812c573a33d00bf9e5435b7fcca3f7
8520 Author: djm@openbsd.org <djm@openbsd.org>
8521 Date: Sun Dec 19 22:11:06 2021 +0000
8523 upstream: ssh-add side of destination constraints
8525 Have ssh-add accept a list of "destination constraints" that allow
8526 restricting where keys may be used in conjunction with a ssh-agent/ssh
8527 that supports session ID/hostkey binding.
8529 Constraints are specified as either "[user@]host-pattern" or
8530 "host-pattern>[user@]host-pattern".
8532 The first form permits a key to be used to authenticate as the
8533 specified user to the specified host.
8535 The second form permits a key that has previously been permitted
8536 for use at a host to be available via a forwarded agent to an
8539 For example, constraining a key with "user1@host_a" and
8540 "host_a>host_b". Would permit authentication as "user1" at
8541 "host_a", and allow the key to be available on an agent forwarded
8542 to "host_a" only for authentication to "host_b". The key would not
8543 be visible on agent forwarded to other hosts or usable for
8544 authentication there.
8546 Internally, destination constraints use host keys to identify hosts.
8547 The host patterns are used to obtain lists of host keys for that
8548 destination that are communicated to the agent. The user/hostkeys are
8549 encoded using a new restrict-destination-v00@openssh.com key
8552 host keys are looked up in the default client user/system known_hosts
8553 files. It is possible to override this set on the command-line.
8555 feedback Jann Horn & markus@
8558 OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5
8560 commit 5e950d765727ee0b20fc3d2cbb0c790b21ac2425
8561 Author: djm@openbsd.org <djm@openbsd.org>
8562 Date: Sun Dec 19 22:10:24 2021 +0000
8564 upstream: ssh-add side of destination constraints
8566 Have ssh-add accept a list of "destination constraints" that allow
8567 restricting where keys may be used in conjunction with a ssh-agent/ssh
8568 that supports session ID/hostkey binding.
8570 Constraints are specified as either "[user@]host-pattern" or
8571 "host-pattern>[user@]host-pattern".
8573 The first form permits a key to be used to authenticate as the
8574 specified user to the specified host.
8576 The second form permits a key that has previously been permitted
8577 for use at a host to be available via a forwarded agent to an
8580 For example, constraining a key with "user1@host_a" and
8581 "host_a>host_b". Would permit authentication as "user1" at
8582 "host_a", and allow the key to be available on an agent forwarded
8583 to "host_a" only for authentication to "host_b". The key would not
8584 be visible on agent forwarded to other hosts or usable for
8585 authentication there.
8587 Internally, destination constraints use host keys to identify hosts.
8588 The host patterns are used to obtain lists of host keys for that
8589 destination that are communicated to the agent. The user/hostkeys are
8590 encoded using a new restrict-destination-v00@openssh.com key
8593 host keys are looked up in the default client user/system known_hosts
8594 files. It is possible to override this set on the command-line.
8596 feedback Jann Horn & markus@
8599 OpenBSD-Commit-ID: ef47fa9ec0e3c2a82e30d37ef616e245df73163e
8601 commit 4c1e3ce85e183a9d0c955c88589fed18e4d6a058
8602 Author: djm@openbsd.org <djm@openbsd.org>
8603 Date: Sun Dec 19 22:09:23 2021 +0000
8605 upstream: ssh-agent side of binding
8607 record session ID/hostkey/forwarding status for each active socket.
8609 Attempt to parse data-to-be-signed at signature request time and extract
8610 session ID from the blob if it is a pubkey userauth request.
8614 OpenBSD-Commit-ID: a80fd41e292b18b67508362129e9fed549abd318
8616 commit e9497ecf73f3c16667288bce48d4e3d7e746fea1
8617 Author: djm@openbsd.org <djm@openbsd.org>
8618 Date: Sun Dec 19 22:08:48 2021 +0000
8620 upstream: ssh client side of binding
8622 send session ID, hostkey, signature and a flag indicating whether the
8623 agent connection is being forwarded to ssh agent each time a connection
8624 is opened via a new "session-bind@openssh.com" agent extension.
8628 OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135
8630 commit b42c61d6840d16ef392ed0f365e8c000734669aa
8631 Author: djm@openbsd.org <djm@openbsd.org>
8632 Date: Sun Dec 19 22:08:06 2021 +0000
8634 upstream: Record session ID, host key and sig at intital KEX
8636 These will be used later for agent session ID / hostkey binding
8640 OpenBSD-Commit-ID: a9af29e33772b18e3e867c6fa8ab35e1694a81fe
8642 commit 26ca33d186473d58a32d812e19273ce078b6ffff
8643 Author: djm@openbsd.org <djm@openbsd.org>
8644 Date: Tue Dec 7 22:06:45 2021 +0000
8646 upstream: better error message for FIDO keys when we can't match
8650 OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650
8652 commit adb0ea006d7668190f0c42aafe3a2864d352e34a
8653 Author: Darren Tucker <dtucker@dtucker.net>
8654 Date: Wed Dec 15 10:50:33 2021 +1100
8656 Correct value for IPTOS_DSCP_LE.
8658 It needs to allow for the preceeding two ECN bits. From daisuke.higashi
8659 at gmail.com via OpenSSH bz#3373, ok claudio@, job@, djm@.
8661 commit 3dafd3fe220bd9046f11fcf5191a79ec8800819f
8662 Author: Darren Tucker <dtucker@dtucker.net>
8663 Date: Fri Dec 10 11:57:30 2021 +1100
8665 Increase timeout for test step.
8667 commit 5aefb05cd5b843e975b191d6ebb7ddf8de35c112
8668 Author: Darren Tucker <dtucker@dtucker.net>
8669 Date: Fri Dec 10 10:27:27 2021 +1100
8671 Update the list of tests that don't work on Minix.
8673 While there, remove CC (configure will now find clang) and make the test
8674 list easier to update via cut and paste.
8676 commit 1c09bb1b2e207d091cec299c49416c23d24a1b31
8677 Author: Darren Tucker <dtucker@dtucker.net>
8678 Date: Fri Dec 10 10:12:57 2021 +1100
8680 Add minix host tuple.
8682 Define SETEUID_BREAKS_SETUID for it which should make privsep work.
8684 commit a2188579032cf080213a78255373263466cb90cc
8685 Author: jsg@openbsd.org <jsg@openbsd.org>
8686 Date: Sun Dec 5 12:28:27 2021 +0000
8688 upstream: fix unintended sizeof pointer in debug path ok markus@
8690 OpenBSD-Commit-ID: b9c0481ffc0cd801e0840e342e6a282a85aac93c
8692 commit da40355234068c82f1a36196f2d18dd2d81aaafd
8693 Author: naddy@openbsd.org <naddy@openbsd.org>
8694 Date: Sat Dec 4 00:05:39 2021 +0000
8696 upstream: RSA/SHA-1 is not used by default anymore on the server
8698 OpenBSD-Commit-ID: 64abef6cfc3e53088225f6b8a1dcd86d52dc8353
8700 commit e9c71498a083a8b502aa831ea931ce294228eda0
8701 Author: djm@openbsd.org <djm@openbsd.org>
8702 Date: Thu Dec 2 23:45:36 2021 +0000
8704 upstream: hash full host:port when asked to hash output, fixes hashes
8706 for non- default ports. bz3367 ok dtucker@
8708 OpenBSD-Commit-ID: 096021cc847da7318ac408742f2d0813ebe9aa73
8710 commit b5601202145a03106012c22cb8980bcac2949f0b
8711 Author: djm@openbsd.org <djm@openbsd.org>
8712 Date: Thu Dec 2 23:23:13 2021 +0000
8714 upstream: improve the testing of credentials against inserted FIDO
8716 keys a little more: ask the token whether a particular key belongs to it in
8717 cases where the token support on-token user- verification (e.g. biometrics)
8718 rather than just assuming that it will accept it.
8720 Will reduce spurious "Confirm user presence" notifications for key
8721 handles that relate to FIDO keys that are not currently inserted in at
8724 Motivated by bz3366; by Pedro Martelletto
8726 OpenBSD-Commit-ID: ffac7f3215842397800e1ae2e20229671a55a63d
8728 commit ca709e27c41c90f4565b17282c48dca7756e083c
8729 Author: djm@openbsd.org <djm@openbsd.org>
8730 Date: Thu Dec 2 22:40:05 2021 +0000
8732 upstream: move check_sk_options() up so we can use it earlier
8734 OpenBSD-Commit-ID: 67fe98ba1c846d22035279782c4664c1865763b4
8736 commit b711bc01a7ec76bb6a285730990cbce9b8ca5773
8737 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8738 Date: Thu Dec 2 22:35:05 2021 +0000
8740 upstream: ssh-rsa is no longer in the default for
8742 PubkeyAcceptedAlgorithms.
8744 OpenBSD-Commit-ID: 34a9e1bc30966fdcc922934ae00f09f2596cd73c
8746 commit dc91ceea33cd4a9f05be953e8d8062f732db5c8a
8747 Author: djm@openbsd.org <djm@openbsd.org>
8748 Date: Thu Dec 2 02:44:44 2021 +0000
8750 upstream: don't put the tty into raw mode when SessionType=none, avoids
8752 ^c being unable to kill such a session. bz3360; ok dtucker@
8754 OpenBSD-Commit-ID: 83960c433052303b643b4c380ae2f799ac896f65
8756 commit e6e7d2654a13ba10141da7b42ea683ea4eeb1f38
8757 Author: Damien Miller <djm@mindrot.org>
8758 Date: Mon Nov 29 14:11:03 2021 +1100
8760 previous commit broke bcrypt_pbkdf()
8762 Accidentally reverted part of the conversion to use SHA512 from SUPERCOP
8763 instead of OpenBSD-style libc SHA512.
8765 commit c0459588b8d00b73e506c6095958ecfe62a4a7ba
8766 Author: Darren Tucker <dtucker@dtucker.net>
8767 Date: Mon Nov 29 14:03:19 2021 +1100
8769 Fix typo in Neils' name.
8771 commit 158bf854e2a22cf09064305f4a4e442670562685
8772 Author: Damien Miller <djm@mindrot.org>
8773 Date: Mon Nov 29 12:30:22 2021 +1100
8775 sync bcrypt-related files with OpenBSD
8777 The main change is that Niels Provos kindly agreed to rescind the
8778 BSD license advertising clause, shifting them to the 3-term BSD
8781 This was the last thing in OpenSSH that used the advertising clause.
8783 commit e8976d92a42883ff6b8991438f07df60c2c0d82d
8784 Author: Damien Miller <djm@mindrot.org>
8785 Date: Mon Nov 29 12:29:29 2021 +1100
8789 commit 8249afeec013e557fe7491a72ca3285de03e25b1
8790 Author: djm@openbsd.org <djm@openbsd.org>
8791 Date: Sun Nov 28 07:21:26 2021 +0000
8793 upstream: sshsig: return "key not found" when searching empty files
8795 rather than "internal error"
8797 OpenBSD-Commit-ID: e2ccae554c78d7a7cd33fc5d217f35be7e2507ed
8799 commit 9e3227d4dbb5ad9c9091b4c14982cab4bba87b4d
8800 Author: djm@openbsd.org <djm@openbsd.org>
8801 Date: Sun Nov 28 07:15:10 2021 +0000
8803 upstream: ssh-keygen -Y match-principals doesn't accept any -O
8805 options at present, so don't say otherwise in SYNOPSIS; spotted jmc@
8807 OpenBSD-Commit-ID: 9cc43a18f4091010741930b48b3db2f2e4f1d35c
8809 commit 56db1f4a4cf5039fc3b42e84c4b16291fdff32b1
8810 Author: djm@openbsd.org <djm@openbsd.org>
8811 Date: Sun Nov 28 07:14:29 2021 +0000
8813 upstream: fix indenting in last commit
8815 OpenBSD-Commit-ID: 8b9ba989815d0dec1fdf5427a4a4b58eb9cac4d2
8817 commit 50bea24a9a9bdebad327c76e700def3261f5694e
8818 Author: djm@openbsd.org <djm@openbsd.org>
8819 Date: Sun Nov 28 07:10:18 2021 +0000
8821 upstream: missing initialisation for oerrno
8823 OpenBSD-Commit-ID: 05d646bba238080259bec821c831a6f0b48d2a95
8825 commit 5a0f4619041d09cd29f3a08da41db5040372bdd1
8826 Author: Darren Tucker <dtucker@dtucker.net>
8827 Date: Sun Nov 28 15:31:37 2021 +1100
8829 Correct ifdef to activate poll() only if needed.
8831 commit d4035c81a71237f690edd7eda32bef7d63fd9528
8832 Author: djm@openbsd.org <djm@openbsd.org>
8833 Date: Sat Nov 27 07:23:35 2021 +0000
8835 upstream: whitespac e
8837 OpenBSD-Regress-ID: b9511d41568056bda489e13524390167889908f8
8839 commit a443491e6782ef0f5a8bb87a5536c8ee4ff233a1
8840 Author: djm@openbsd.org <djm@openbsd.org>
8841 Date: Sat Nov 27 07:20:58 2021 +0000
8843 upstream: regression test for match-principals. Mostly by Fabian
8847 OpenBSD-Regress-ID: ced0bec89af90935103438986bbbc4ad1df9cfa7
8849 commit 78230b3ec8cbabc1e7de68732dc5cbd4837c6675
8850 Author: djm@openbsd.org <djm@openbsd.org>
8851 Date: Sat Nov 27 07:14:46 2021 +0000
8853 upstream: Add ssh-keygen -Y match-principals operation to perform
8855 matching of principals names against an allowed signers file.
8857 Requested by and mostly written by Fabian Stelzer, towards a TOFU
8858 model for SSH signatures in git. Some tweaks by me.
8860 "doesn't bother me" deraadt@
8862 OpenBSD-Commit-ID: 8d1b71f5a4127bc5e10a880c8ea6053394465247
8864 commit 15db86611baaafb24c40632784dabf82e3ddb1a7
8865 Author: djm@openbsd.org <djm@openbsd.org>
8866 Date: Thu Nov 25 23:02:24 2021 +0000
8868 upstream: debug("func: ...") -> debug_f("...")
8870 OpenBSD-Commit-ID: d58494dc05c985326a895adfbe16fbd5bcc54347
8872 commit b7ffbb17e37f59249c31f1ff59d6c5d80888f689
8873 Author: Darren Tucker <dtucker@dtucker.net>
8874 Date: Fri Nov 19 18:53:46 2021 +1100
8876 Allow for fd = -1 in compat ppoll overflow check.
8878 Fixes tests on at least FreeBSD 6, possibly others.
8880 commit 04b172da5b96a51b0d55c905b423ababff9f4e0b
8881 Author: Darren Tucker <dtucker@dtucker.net>
8882 Date: Fri Nov 19 16:01:51 2021 +1100
8884 Don't auto-enable Capsicum sandbox on FreeBSD 9/10.
8886 Since we changed from select() to ppoll() tests have been failing.
8887 This seems to be because FreeBSD 10 (and presumably 9) do not allow
8888 ppoll() in the privsep process and sshd will fail with "Not permitted in
8889 capability mode". Setting CAP_EVENT on the FDs doesn't help, but weirdly,
8890 poll() works without that. Those versions are EOL so this situation is
8893 commit a823f39986e7b879f26412e64c15630e1cfa0dc5
8894 Author: djm@openbsd.org <djm@openbsd.org>
8895 Date: Thu Nov 18 03:53:48 2021 +0000
8897 upstream: regression test for ssh-keygen -Y find-principals fix; from
8899 Fabian Stelzer ok djm markus
8901 OpenBSD-Regress-ID: 34fe4088854c1a2eb4c0c51cc4676ba24096bac4
8903 commit 199c4df66c0e39dd5c3333b162af274678c0501d
8904 Author: djm@openbsd.org <djm@openbsd.org>
8905 Date: Thu Nov 18 21:32:11 2021 +0000
8907 upstream: less confusing debug message; bz#3365
8909 OpenBSD-Commit-ID: 836268d3642c2cdc84d39b98d65837f5241e4a50
8911 commit 97f9b6e61316c97a32dad94b7a37daa9b5f6b836
8912 Author: djm@openbsd.org <djm@openbsd.org>
8913 Date: Thu Nov 18 21:11:01 2021 +0000
8915 upstream: avoid xmalloc(0) for PKCS#11 keyid for ECDSA keys (we
8917 already did this for RSA keys). Avoids fatal errors for PKCS#11 libraries
8918 that return empty keyid, e.g. Microchip ATECC608B "cryptoauthlib"; bz#3364
8920 OpenBSD-Commit-ID: 054d4dc1d6a99a2e6f8eebc48207b534057c154d
8922 commit c74aa0eb73bd1edf79947d92d9c618fc3424c4a6
8923 Author: djm@openbsd.org <djm@openbsd.org>
8924 Date: Thu Nov 18 03:50:41 2021 +0000
8926 upstream: ssh-keygen -Y find-principals was verifying key validity
8928 when using ca certs but not with simple key lifetimes within the allowed
8931 Since it returns the first keys principal it finds this could
8932 result in a principal with an expired key even though a valid
8935 patch from Fabian Stelzer; feedback/ok djm markus
8937 OpenBSD-Commit-ID: b108ed0a76b813226baf683ab468dc1cc79e0905
8939 commit d902d728dfd81622454260e23bc09d5e5a9a795e
8940 Author: Darren Tucker <dtucker@dtucker.net>
8941 Date: Thu Nov 18 23:44:07 2021 +1100
8943 Correct calculation of tv_nsec in poll().
8945 commit 21dd5a9a3fb35e8299a1fbcf8d506f1f6b752b85
8946 Author: Darren Tucker <dtucker@dtucker.net>
8947 Date: Thu Nov 18 23:11:37 2021 +1100
8949 Add compat implementation of ppoll using pselect.
8951 commit b544ce1ad4afb7ee2b09f714aa63efffc73fa93a
8952 Author: Darren Tucker <dtucker@dtucker.net>
8953 Date: Thu Nov 18 23:05:34 2021 +1100
8955 Put poll.h inside ifdef HAVE_POLL_H.
8957 commit 875408270c5a7dd69ed5449e5d85bd7120c88f70
8958 Author: djm@openbsd.org <djm@openbsd.org>
8959 Date: Thu Nov 18 03:31:44 2021 +0000
8961 upstream: check for POLLHUP wherever we check for POLLIN
8963 OpenBSD-Commit-ID: 6aa6f3ec6b17c3bd9bfec672a917f003a76d93e5
8965 commit 36b5e37030d35bbaa18ba56825b1af55971d18a0
8966 Author: djm@openbsd.org <djm@openbsd.org>
8967 Date: Thu Nov 18 03:07:59 2021 +0000
8969 upstream: fd leak in sshd listen loop error path; from Gleb
8973 OpenBSD-Commit-ID: a7a2be27a690a74bf2381bc16cea38e265657412
8975 commit b99498d0c93f1edd04857b318308a66b28316bd8
8976 Author: djm@openbsd.org <djm@openbsd.org>
8977 Date: Thu Nov 18 03:07:20 2021 +0000
8979 upstream: check for POLLHUP as well as POLLIN in sshd listen loop;
8983 OpenBSD-Commit-ID: a4f1244c5a9c2b08dac4f3b1dc22e9d1dc60c587
8985 commit 1f3055d788e8cf80851eb1728b535d57eb0dba6a
8986 Author: djm@openbsd.org <djm@openbsd.org>
8987 Date: Thu Nov 18 03:06:03 2021 +0000
8989 upstream: check for POLLHUP as well as POLLIN, handle transient IO
8991 errors as well as half-close on the output side; ok deraadt millert
8993 OpenBSD-Commit-ID: de5c5b9939a37476d256328cbb96305bdecf511e
8995 commit 9778a15fa6dbdac6a95bf15865c2688b4bd6944e
8996 Author: Damien Miller <djm@mindrot.org>
8997 Date: Thu Nov 18 10:16:55 2021 +1100
8999 adjust seccomp filter for select->poll conversion
9001 Needed to add ppoll syscall but also to relax the fallback rlimit
9002 sandbox. Linux poll() fails with EINVAL if npfds > RLIMIT_NOFILE,
9003 so we have to allow a single fd in the rlimit.
9005 commit fcd8d895bbb849c64f0aed934e3303d37f696f5d
9006 Author: Damien Miller <djm@mindrot.org>
9007 Date: Thu Nov 18 10:16:44 2021 +1100
9011 commit 76292787a1e93e668f10e36b4bf59ce0ae28e156
9012 Author: Damien Miller <djm@mindrot.org>
9013 Date: Thu Nov 18 09:26:20 2021 +1100
9015 compat for timespecsub() and friends
9017 commit fd7e7de4ddb4399c7e929b44f2bbfc118eddfcf8
9018 Author: djm@openbsd.org <djm@openbsd.org>
9019 Date: Wed Nov 17 21:06:39 2021 +0000
9021 upstream: set num_listen_socks to 0 on close-all instead of -1,
9023 which interferes with the new poll()-based listen loop; spotted and debugged
9026 OpenBSD-Commit-ID: f7ab8ab124f615a2e0c45fee14c38d2f2abbabbd
9028 commit fd9343579afac30a971f06643a669733d9acb407
9029 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9030 Date: Sun Nov 14 18:47:43 2021 +0000
9032 upstream: use ppoll() instead of pselect() with djm
9034 OpenBSD-Commit-ID: 980f87c9564d5d2ad55722b7a6f44f21284cd215
9036 commit 092d29b232ef1a19609a5316ed7e4d896bb2e696
9037 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9038 Date: Sun Nov 14 06:15:36 2021 +0000
9040 upstream: match .events with .fd better
9042 OpenBSD-Commit-ID: 77eef212ca0add905949532af390164489c5984b
9044 commit 8d642c9a90fa4ed5a3effd785fb3591e14de00cd
9045 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9046 Date: Sun Nov 14 03:25:10 2021 +0000
9048 upstream: convert select() to poll() ok djm
9050 OpenBSD-Commit-ID: b53e4940ff10dd24f8d16e8db8ef1970015d7ead
9052 commit 6582a31c388968f4073af2bd8621880735c3d42b
9053 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9054 Date: Sat Nov 13 21:14:13 2021 +0000
9056 upstream: replace select() with ppoll(), including converting
9058 timeval's to timespec's to make things easier. back and forth and ok; djm
9060 OpenBSD-Commit-ID: 89d3b23c60875da919e7820f9de6213286ffbec9
9062 commit 7c025c005550c86a40200a2bcdd355d09413d61a
9063 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9064 Date: Sat Nov 13 17:26:13 2021 +0000
9066 upstream: It really looks like pledge "stdio dns" is possible
9068 earlier. Discussed with mestre
9070 OpenBSD-Commit-ID: 610873de63a593e0ac7bbbcb7a0f2894d36f4c01
9072 commit 06acb04c20ee483fe4757bd12aec870cc4bb1076
9073 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9074 Date: Fri Nov 12 05:23:49 2021 +0000
9076 upstream: aggressively pre-fill the pollfd array with fd=-1
9078 OpenBSD-Commit-ID: c2a525de8f83c1a04405bd79122c424140552a5b
9080 commit 7eec76793dec06e8f06b6cf71f9473141c69d109
9081 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9082 Date: Thu Nov 11 15:32:32 2021 +0000
9084 upstream: Convert from select() to ppoll(). Along the way, I
9086 observed that the select() code was using exceptfds incorrectly.. ok millert
9088 OpenBSD-Commit-ID: 548e05bfc31b2af02319eb3d051286d4128dec96
9090 commit e665ed2d0c24fe11d5470ce72fa1e187377d3fc4
9091 Author: Darren Tucker <dtucker@dtucker.net>
9092 Date: Fri Nov 12 22:55:27 2021 +1100
9094 Switch from LibreSSL 3.4.0 to 3.4.1.
9096 The LibreSSL 3.4.0 release has an OPENBSD_BRANCH that points to
9097 "master" and that branch no longer has the files LibreSSL expects
9098 and thus it will no longer build, breaking the test.
9100 commit 21b6b5a06c8c53c548d25e6074c5240e88e2ef34
9101 Author: djm@openbsd.org <djm@openbsd.org>
9102 Date: Wed Nov 10 06:29:25 2021 +0000
9104 upstream: add the sntrup761x25519-sha512@openssh.com hybrid
9106 ECDH/x25519 + Streamlined NTRU Prime post-quantum KEX to the default
9107 KEXAlgorithms list (after the ECDH methods but before the prime-group DH
9112 OpenBSD-Commit-ID: 22b77e27a04e497a10e22f138107579652854210
9114 commit 239da797cbf07a640d7b1ea02d3f99ace3ef792d
9115 Author: djm@openbsd.org <djm@openbsd.org>
9116 Date: Wed Nov 10 06:25:08 2021 +0000
9118 upstream: fix ssh-keysign for KEX algorithms that use SHA384/512
9120 exchange hashes; feedback/ok markus@
9122 OpenBSD-Commit-ID: 09a8fda1c081f5de1e3128df64f28b7bdadee239
9124 commit 6997a592ecb1013df0c6d7f8df3e6517827aef11
9125 Author: djm@openbsd.org <djm@openbsd.org>
9126 Date: Mon Nov 8 21:32:49 2021 +0000
9128 upstream: improve error message when trying to expand a ~user path
9130 for a user that doesn't exist; better matches what the shell does
9134 OpenBSD-Commit-ID: 1ddefa3c3a78b69ce13d1b8f67bc9f2cefd23ad6
9136 commit 10b899a15c88eb40eb5f73cd0fa84ef0966f79c9
9137 Author: Darren Tucker <dtucker@dtucker.net>
9138 Date: Wed Nov 10 12:34:25 2021 +1100
9140 Don't trust closefrom() on Linux.
9142 glibc's closefrom implementation does not work in a chroot when the kernel
9143 does not have close_range. It tries to read from /proc/self/fd and when
9144 that fails dies with an assertion of sorts. Instead, call close_range
9145 ourselves from our compat code and fall back if that fails. bz#3349,
9146 with william.wilson at canonical.com and fweimer at redhat.com.
9148 commit eb1f63195a9a38b519536a5b398d9939261ec081
9149 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9150 Date: Sat Nov 6 10:13:39 2021 +0000
9152 upstream: Plug a couple of minor mem leaks. From beldmit at
9154 gmail.com via github PR#283, ok markus@
9156 OpenBSD-Commit-ID: ec1fa7d305d46226861c3ca6fb9c9beb2ada2892
9158 commit e4f501bf1d3b53f1cc23d9521fd7c5163307b760
9159 Author: djm@openbsd.org <djm@openbsd.org>
9160 Date: Fri Nov 5 03:10:58 2021 +0000
9162 upstream: move cert_filter_principals() to earlier in the file for
9164 reuse; no code change
9166 OpenBSD-Commit-ID: 598fa9528b656b2f38bcc3cf5b6f3869a8c115cf
9168 commit 59c60f96fee321c7f38f00372826d37f289534af
9169 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9170 Date: Wed Nov 3 22:00:56 2021 +0000
9172 upstream: Many downstreams expect ssh to compile as non-C99...
9174 OpenBSD-Commit-ID: e6aa3e08bda68e5fb838fc8a49b1d2dfc38ee783
9176 commit 7a78fe63b0b28ef7231913dfefe9d08f9bc41c61
9177 Author: Darren Tucker <dtucker@dtucker.net>
9178 Date: Sat Nov 6 21:07:03 2021 +1100
9180 Skip getline() on HP-UX 10.x.
9182 HP-UX 10.x has a getline() implementation in libc that does not behave
9183 as we expect so don't use it. With correction from Thorsten Glaser and
9184 typo fix from Larkin Nickle.
9186 commit 343ae252ebb35c6ecae26b447bf1551a7666720e
9187 Author: Damien Miller <djm@mindrot.org>
9188 Date: Wed Nov 3 12:08:21 2021 +1100
9190 basic SECURITY.md (refers people to the website)
9192 commit ed45a0168638319e0a710633f6085b96b9cec656
9193 Author: djm@openbsd.org <djm@openbsd.org>
9194 Date: Tue Nov 2 22:57:27 2021 +0000
9196 upstream: crank SSH_SK_VERSION_MAJOR to match recent change in
9200 OpenBSD-Regress-ID: 113d181c7e3305e138db9b688cdb8b0a0019e552
9202 commit f3c34df860c4c1ebddacb973954e58167d9dbade
9203 Author: djm@openbsd.org <djm@openbsd.org>
9204 Date: Tue Nov 2 22:56:40 2021 +0000
9206 upstream: Better handle FIDO keys on tokens that provide user
9208 verification (UV) on the device itself, including biometric keys.
9210 Query the token during key creation to determine whether it supports
9211 on-token UV and, if so, clear the SSH_SK_USER_VERIFICATION_REQD flag
9212 in the key so that ssh(1) doesn't automatically prompty for PIN later.
9214 When making signatures with the key, query the token's capabilities
9215 again and check whether the token is able (right now) to perform user-
9216 verification without a PIN. If it is then the PIN prompt is bypassed
9217 and user verification delegated to the token. If not (e.g. the token
9218 is biometric capable, but no biometric are enrolled), then fall back
9219 to user verification via the usual PIN prompt.
9221 Work by Pedro Martelletto; ok myself and markus@
9223 NB. cranks SSH_SK_VERSION_MAJOR
9225 OpenBSD-Commit-ID: e318a8c258d9833a0b7eb0236cdb68b5143b2f27
9227 commit 0328a081f38c09d2d4d650e94461a47fb5eef536
9228 Author: djm@openbsd.org <djm@openbsd.org>
9229 Date: Fri Oct 29 03:03:06 2021 +0000
9231 upstream: sshsig: add tests for signing key validity and
9235 - adds generic find-principals tests (this command had none before)
9236 - tests certs with a timeboxed validity both with and without a
9237 restriced lifetime for the CA
9238 - test for a revoked CA cert
9242 OpenBSD-Regress-ID: 9704b2c6df5b8ccfbdf2c06c5431f5f8cad280c9
9244 commit ccd358e1e25e25c13f0825996283cbf7a1647a3b
9245 Author: djm@openbsd.org <djm@openbsd.org>
9246 Date: Fri Oct 29 02:48:19 2021 +0000
9248 upstream: avoid signedness warning; spotted in -portable
9250 OpenBSD-Regress-ID: 4cacc126086487c0ea7f3d86b42dec458cf0d0c6
9252 commit 2741f52beb11490d7033a25e56ed0496f0c78006
9253 Author: djm@openbsd.org <djm@openbsd.org>
9254 Date: Fri Oct 29 03:20:46 2021 +0000
9256 upstream: ssh-keygen: make verify-time argument parsing optional
9260 OpenBSD-Commit-ID: 1ff35e4c366a45a073663df90381be6a8ef4d370
9262 commit a1217d363b88b32cfe54c4f02c6c1cf4bdefdd23
9263 Author: Damien Miller <djm@mindrot.org>
9264 Date: Fri Oct 29 13:48:34 2021 +1100
9266 unbreak fuzz harness for recent changes
9268 commit 68e522ed8183587c9367fa3842c5b75f64f3d12b
9269 Author: Darren Tucker <dtucker@dtucker.net>
9270 Date: Fri Oct 29 13:32:24 2021 +1100
9272 Use -Wbitwise-instead-of-logical if supported.
9274 commit be28b23012aa3fa323be7ec84863cf238927c078
9275 Author: Damien Miller <djm@mindrot.org>
9276 Date: Thu Oct 28 16:24:53 2021 +1100
9278 use -Wmisleading-indentation cflag if available
9282 commit 2e6f5f24dd2f9217f4ab8b737ed428d5d5278f91
9283 Author: Damien Miller <djm@mindrot.org>
9284 Date: Thu Oct 28 16:24:44 2021 +1100
9288 commit a5ab4882348d26addc9830a44e053238dfa2cb58
9289 Author: Damien Miller <djm@mindrot.org>
9290 Date: Thu May 6 10:08:30 2021 +1000
9292 remove built-in support for md5crypt()
9294 Users of MD5-hashed password should arrange for ./configure to link
9295 against libxcrypt or similar. Though it would be better to avoid use
9296 of MD5 password hashing entirely, it's arguably worse than DEScrypt.
9298 feedback and ok dtucker@
9300 commit c5de1fffa6328b8246b87da28fa9df05813f76a3
9301 Author: djm@openbsd.org <djm@openbsd.org>
9302 Date: Thu Oct 28 02:55:30 2021 +0000
9304 upstream: increment SSH_SK_VERSION_MAJOR to match last change
9306 OpenBSD-Regress-ID: 17873814d1cbda97f49c8528d7b5ac9cadf6ddc0
9308 commit 0001d04e55802d5bd9d6dece1081a99aa4ba2828
9309 Author: djm@openbsd.org <djm@openbsd.org>
9310 Date: Thu Oct 28 02:54:18 2021 +0000
9312 upstream: When downloading resident keys from a FIDO token, pass
9314 back the user ID that was used when the key was created and append it to the
9315 filename the key is written to (if it is not the default).
9317 Avoids keys being clobbered if the user created multiple
9318 resident keys with the same application string but different
9321 feedback Pedro Martelletto; ok markus
9323 NB. increments SSH_SK_VERSION_MAJOR
9325 OpenBSD-Commit-ID: dbd658b5950f583106d945641a634bc6562dd3a3
9327 commit d4bed5445646e605c383a4374fa962e23bf9e3a3
9328 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9329 Date: Sun Oct 24 21:24:17 2021 +0000
9331 upstream: For open/openat, if the flags parameter does not contain
9333 O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant. Many developers
9334 in the past have passed mode_t (0, 044, 0644, or such), which might lead
9335 future people to copy this broken idiom, and perhaps even believe this
9336 parameter has some meaning or implication or application. Delete them all.
9337 This comes out of a conversation where tb@ noticed that a strange (but
9338 intentional) pledge behaviour is to always knock-out high-bits from mode_t on
9339 a number of system calls as a safety factor, and his bewilderment that this
9340 appeared to be happening against valid modes (at least visually), but no
9341 sorry, they are all irrelevant junk. They could all be 0xdeafbeef. ok
9344 OpenBSD-Commit-ID: 503d11633497115688c0c6952686524f01f53121
9346 commit d575cf44895104e0fcb0629920fb645207218129
9347 Author: Darren Tucker <dtucker@dtucker.net>
9348 Date: Fri Oct 22 23:27:41 2021 +1100
9350 kitchensink test target now needs krb5.
9352 commit 4ae39cada214e955bcfd3448ff28f0ed18886706
9353 Author: Darren Tucker <dtucker@dtucker.net>
9354 Date: Fri Oct 22 22:54:33 2021 +1100
9356 Test both MIT KRB5 and Heimdal.
9358 commit 22b2681d88619e5247dc53c9f112058a7e248d48
9359 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9360 Date: Fri Oct 22 10:51:57 2021 +0000
9362 upstream: Plug mem addrinfo mem leaks.
9364 Prevent mem leaks in the (unlikely) event that getaddrinfo returns
9365 no addresses. ALso, remove an unneeded NULL check in addr_ntop. From
9366 khaleesicodes via github PR#281, ok deraadt@
9368 OpenBSD-Commit-ID: e8a5afc686376637c355c5f7e122dc4b080b9c1a
9370 commit 27c8c343b610263f83ac2328735feeb881c6c92f
9371 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9372 Date: Fri Oct 22 09:22:04 2021 +0000
9374 upstream: Remove unnecessary semicolons
9376 ... in case statements. From khaleesicodes via github PR#280.
9378 OpenBSD-Commit-ID: e1e89360b65775cff83e77ce040b342015caf4ed
9380 commit e7eb73b8d1fe1008d92433ea949491ce654bfaba
9381 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9382 Date: Fri Oct 22 09:19:34 2021 +0000
9384 upstream: Fix typos in comments.
9386 From khaleesicodes via github PR#280.
9388 OpenBSD-Commit-ID: 26fdd83652c40f098bf7c685e8ebb9eb72cc45fc
9390 commit 052a9d8494175e24312daa6c132665e58c17fe6e
9391 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9392 Date: Fri Oct 15 14:46:46 2021 +0000
9394 upstream: switch scp(1) back to sftp protocol.
9396 openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
9397 protocol for copying. Let's get back to testing the SFTP protocol.
9399 OpenBSD-Commit-ID: 9eaa35d95fd547b78b0a043b3f518e135f151f30
9401 commit a07664646bf6d293f5bbd45a5de54f3c36bb85da
9402 Author: Darren Tucker <dtucker@dtucker.net>
9403 Date: Fri Oct 22 14:00:05 2021 +1100
9405 Source configs script so setup_ci can use settings
9407 commit 34df52c201c6b47e5a46b50c215e4d98a8bf6587
9408 Author: Darren Tucker <dtucker@dtucker.net>
9409 Date: Fri Oct 22 09:42:14 2021 +1100
9411 Install libedit and pam based on config flags.
9413 commit 8c626cc563e8d21d844d06f9971a9ee01de6aa2a
9414 Author: Darren Tucker <dtucker@dtucker.net>
9415 Date: Thu Oct 21 16:53:39 2021 +1100
9417 Don't use 'here string", it's not POSIX.
9419 commit 086a4b5977472aefa3de918b88efad0faf83b2b1
9420 Author: Darren Tucker <dtucker@dtucker.net>
9421 Date: Thu Oct 21 15:33:27 2021 +1100
9423 Remove -Werror from compiler package to install.
9425 commit 5a7a4687507d057f9b5e7497f3d3f82e64753c02
9426 Author: Darren Tucker <dtucker@dtucker.net>
9427 Date: Thu Oct 21 15:00:53 2021 +1100
9429 Build with -Werror on most recent gcc and clang.
9431 commit 4d2cbdb525d673acf941d48a7044fcf03125611a
9432 Author: Darren Tucker <dtucker@dtucker.net>
9433 Date: Fri Oct 15 12:59:06 2021 +1100
9435 Include string.h and stdio.h for strerror.
9437 commit fff13aaa262b7b3ec83ed21e29674cbf331780a7
9438 Author: Darren Tucker <dtucker@dtucker.net>
9439 Date: Fri Oct 15 12:43:36 2021 +1100
9441 Include error reason if trace disabling fails.
9443 commit d4b38144c02f3faa5271e5fb35df93507e06f1b4
9444 Author: Darren Tucker <dtucker@dtucker.net>
9445 Date: Tue Oct 12 22:55:51 2021 +1100
9447 Add tcmalloc test target.
9449 commit 002d65b0a30063c6e49bf8a53e709d8d5a0d45c1
9450 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9451 Date: Sat Oct 9 10:52:42 2021 +0000
9453 upstream: Document that CASignatureAlgorithms, ExposeAuthInfo and
9455 PubkeyAuthOptions can be used in a Match block. Patch from eehakkin via
9458 OpenBSD-Commit-ID: c0a63f5f52e918645967ac022b28392da4b866aa
9460 commit 40bd3709dddaae3a1b6113748bec3faa6a607531
9461 Author: Darren Tucker <dtucker@dtucker.net>
9462 Date: Thu Oct 7 15:55:49 2021 +1100
9464 Skip SK unit tests when built without security-key
9466 commit 482f73be10f10b93f818df19fcc8a912c0c371fc
9467 Author: Darren Tucker <dtucker@dtucker.net>
9468 Date: Thu Oct 7 15:55:04 2021 +1100
9470 Include relevant env vars on command line.
9472 Makes it easier to reproduce a build by cut/pasting the configure line.
9474 commit ef5916b8acd9b1d2f39fad4951dae03b00dbe390
9475 Author: Darren Tucker <dtucker@dtucker.net>
9476 Date: Thu Oct 7 14:28:02 2021 +1100
9478 Only enable sk-* key types if ENABLE_SK is defined
9480 commit 52d4232b493a9858fe616e28a8bbcc89afa2ad4d
9481 Author: Darren Tucker <dtucker@dtucker.net>
9482 Date: Wed Oct 6 18:14:37 2021 +1100
9484 Disable security key on minix3.
9486 The test doesn't work so disable.
9488 commit 7cd062c3a29669b8d7dc2a97e6575f4dcb7d35a2
9489 Author: Darren Tucker <dtucker@dtucker.net>
9490 Date: Wed Oct 6 17:45:28 2021 +1100
9492 Add USE_LIBC_SHA2 for (at least) NetBSD 9.
9494 commit 639c440f6c3c2a8216a5eb9455ef13bf4204089c
9495 Author: Darren Tucker <dtucker@dtucker.net>
9496 Date: Wed Oct 6 17:09:31 2021 +1100
9498 Define OPENSSL_NO_SHA including OpenSSL from test.
9500 We don't use SHA256 from OpenSSL in the sk-dummy module and the
9501 definitions can conflict with system sha2.h (eg on NetBSD) so define
9502 OPENSSL_NO_SHA so we don't attempt to redefine them.
9504 commit 8f4be526a338d06624f146fa26007bb9dd3a4f7b
9505 Author: Darren Tucker <dtucker@dtucker.net>
9506 Date: Wed Oct 6 15:40:58 2021 +1100
9508 Disable security key on NetBSD4 test.
9510 sk-dummy used for the security key test includes both sha2.h and OpenSSL
9511 causing the definitions conflict so disable security key support on this
9514 commit 3b353ae58aa07a1cbbeb1da3ace21fc0dcccd66a
9515 Author: Damien Miller <djm@mindrot.org>
9516 Date: Wed Oct 6 15:07:01 2021 +1100
9518 clean regress/misc/sk-dummy in cleandir target
9520 commit 57680a2ab43518c5ccbd8242c40482106cde6ac1
9521 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9522 Date: Sat Oct 2 03:17:01 2021 +0000
9524 upstream: Dynamically allocate encoded HashKnownHosts and free as
9526 appropriate. Saves 1k of static storage and prevents snprintf "possible
9527 truncation" warnings from newer compilers (although in this case it's false
9528 positive since the actual sizes are limited by the output size of the SHA1).
9531 OpenBSD-Commit-ID: e254ae723f7e3dce352c7d5abc4b6d87faf61bf4
9533 commit e3e62deb549fde215b777d95276c304f84bf00c6
9534 Author: djm@openbsd.org <djm@openbsd.org>
9535 Date: Wed Oct 6 03:35:13 2021 +0000
9537 upstream: use libc SHA256 functions; make this work when compiled
9541 OpenBSD-Regress-ID: fda0764c1097cd42f979ace29b07eb3481259890
9543 commit 12937d867019469ebce83c2ff614cdc6688fc2d8
9544 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9545 Date: Fri Oct 1 05:20:20 2021 +0000
9547 upstream: Add test for ssh hashed known_hosts handling.
9549 OpenBSD-Regress-ID: bcef3b3cd5a1ad9899327b4b2183de2541aaf9cf
9551 commit 5a37cc118f464416d08cd0291a9b1611d8de9943
9552 Author: Damien Miller <djm@mindrot.org>
9553 Date: Wed Oct 6 13:16:21 2021 +1100
9555 fix broken OPENSSL_HAS_ECC test