1commit 8241b9c0529228b4b86d88b1a6076fb9f97e4a99 2Author: Damien Miller <djm@mindrot.org> 3Date: Tue Dec 19 01:59:50 2023 +1100 4 5 crank versions 6 7commit 2f2c65cb5f1518a9c556d3e8efa27ea0ca305c6b 8Author: Damien Miller <djm@mindrot.org> 9Date: Tue Dec 19 01:59:06 2023 +1100 10 11 depend 12 13commit e48cdee8e19059203b1aeeabec2350b8375fa61f 14Author: djm@openbsd.org <djm@openbsd.org> 15Date: Mon Dec 18 14:50:08 2023 +0000 16 17 upstream: regress test for agent PKCS#11-backed certificates 18 19 OpenBSD-Regress-ID: 38f681777cb944a8cc3bf9d0ad62959a16764df9 20 21commit 2f512f862df1d5f456f82a0334c9e8cc7208a2a1 22Author: djm@openbsd.org <djm@openbsd.org> 23Date: Mon Dec 18 14:49:39 2023 +0000 24 25 upstream: regress test for constrained PKCS#11 keys 26 27 OpenBSD-Regress-ID: b2f26ae95d609d12257b43aef7cd7714c82618ff 28 29commit cdddd66412ca5920ed4d3ebbfa6ace12dbd9b82f 30Author: djm@openbsd.org <djm@openbsd.org> 31Date: Mon Dec 18 14:48:44 2023 +0000 32 33 upstream: openssh-9.6 34 35 OpenBSD-Commit-ID: 21759837cf0e0092d9a2079f8fb562071c11016b 36 37commit 6d51feab157cedf1e7ef5b3f8781ca8ff9c4ab1b 38Author: djm@openbsd.org <djm@openbsd.org> 39Date: Mon Dec 18 14:48:08 2023 +0000 40 41 upstream: ssh-agent: record failed session-bind attempts 42 43 Record failed attempts to session-bind a connection and refuse signing 44 operations on that connection henceforth. 45 46 Prevents a future situation where we add a new hostkey type that is not 47 recognised by an older ssh-agent, that consequently causes session-bind 48 to fail (this situation is only likely to arise when people mix ssh(1) 49 and ssh-agent(1) of different versions on the same host). Previously, 50 after such a failure the agent socket would be considered unbound and 51 not subject to restriction. 52 53 Spotted by Jann Horn 54 55 OpenBSD-Commit-ID: b0fdd023e920aa4831413f640de4c5307b53552e 56 57commit 7ef3787c84b6b524501211b11a26c742f829af1a 58Author: djm@openbsd.org <djm@openbsd.org> 59Date: Mon Dec 18 14:47:44 2023 +0000 60 61 upstream: ban user/hostnames with most shell metacharacters 62 63 This makes ssh(1) refuse user or host names provided on the 64 commandline that contain most shell metacharacters. 65 66 Some programs that invoke ssh(1) using untrusted data do not filter 67 metacharacters in arguments they supply. This could create 68 interactions with user-specified ProxyCommand and other directives 69 that allow shell injection attacks to occur. 70 71 It's a mistake to invoke ssh(1) with arbitrary untrusted arguments, 72 but getting this stuff right can be tricky, so this should prevent 73 most obvious ways of creating risky situations. It however is not 74 and cannot be perfect: ssh(1) has no practical way of interpreting 75 what shell quoting rules are in use and how they interact with the 76 user's specified ProxyCommand. 77 78 To allow configurations that use strange user or hostnames to 79 continue to work, this strictness is applied only to names coming 80 from the commandline. Names specified using User or Hostname 81 directives in ssh_config(5) are not affected. 82 83 feedback/ok millert@ markus@ dtucker@ deraadt@ 84 85 OpenBSD-Commit-ID: 3b487348b5964f3e77b6b4d3da4c3b439e94b2d9 86 87commit 0cb50eefdd29f0fec31d0e71cc4b004a5f704e67 88Author: djm@openbsd.org <djm@openbsd.org> 89Date: Mon Dec 18 14:47:20 2023 +0000 90 91 upstream: stricter handling of channel window limits 92 93 This makes ssh/sshd more strict in handling non-compliant peers that 94 send more data than the advertised channel window allows. Previously 95 the additional data would be silently discarded. This change will 96 cause ssh/sshd to terminate the connection if the channel window is 97 exceeded by more than a small grace allowance. 98 99 ok markus@ 100 101 OpenBSD-Commit-ID: 811e21b41831eba3dd7f67b3d409a438f20d3037 102 103commit 4448a2938abc76e6bd33ba09b2ec17a216dfb491 104Author: djm@openbsd.org <djm@openbsd.org> 105Date: Mon Dec 18 14:46:56 2023 +0000 106 107 upstream: Make it possible to load certs from PKCS#11 tokens 108 109 Adds a protocol extension to allow grafting certificates supplied by 110 ssh-add to keys loaded from PKCS#11 tokens in the agent. 111 112 feedback/ok markus@ 113 114 OpenBSD-Commit-ID: bb5433cd28ede2bc910996eb3c0b53e20f86037f 115 116commit 881d9c6af9da4257c69c327c4e2f1508b2fa754b 117Author: djm@openbsd.org <djm@openbsd.org> 118Date: Mon Dec 18 14:46:12 2023 +0000 119 120 upstream: apply destination constraints to all p11 keys 121 122 Previously applied only to the first key returned from each token. 123 124 ok markus@ 125 126 OpenBSD-Commit-ID: 36df3afb8eb94eec6b2541f063d0d164ef8b488d 127 128commit a7ed931caeb68947d30af8a795f4108b6efad761 129Author: djm@openbsd.org <djm@openbsd.org> 130Date: Mon Dec 18 14:45:49 2023 +0000 131 132 upstream: add "ext-info-in-auth@openssh.com" extension 133 134 This adds another transport protocol extension to allow a sshd to send 135 SSH2_MSG_EXT_INFO during user authentication, after the server has 136 learned the username that is being logged in to. 137 138 This lets sshd to update the acceptable signature algoritms for public 139 key authentication, and allows these to be varied via sshd_config(5) 140 "Match" directives, which are evaluated after the server learns the 141 username being authenticated. 142 143 Full details in the PROTOCOL file 144 145 OpenBSD-Commit-ID: 1de7da7f2b6c32a46043d75fcd49b0cbb7db7779 146 147commit 1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5 148Author: djm@openbsd.org <djm@openbsd.org> 149Date: Mon Dec 18 14:45:17 2023 +0000 150 151 upstream: implement "strict key exchange" in ssh and sshd 152 153 This adds a protocol extension to improve the integrity of the SSH 154 transport protocol, particular in and around the initial key exchange 155 (KEX) phase. 156 157 Full details of the extension are in the PROTOCOL file. 158 159 with markus@ 160 161 OpenBSD-Commit-ID: 2a66ac962f0a630d7945fee54004ed9e9c439f14 162 163commit 59d691b886c79e70b1d1c4ab744e81fd176222fd 164Author: Damien Miller <djm@mindrot.org> 165Date: Mon Dec 18 14:49:11 2023 +1100 166 167 better detection of broken -fzero-call-used-regs 168 169 Use OSSH_CHECK_CFLAG_LINK() for detection of these flags and extend 170 test program to exercise varargs, which seems to catch more stuff. 171 172 ok dtucker@ 173 174commit aa7b21708511a6d4aed3839fc9f6e82e849dd4a1 175Author: djm@openbsd.org <djm@openbsd.org> 176Date: Wed Dec 13 03:28:19 2023 +0000 177 178 upstream: when invoking KnownHostsCommand to determine the order of 179 180 host key algorithms to request, ensure that the hostname passed to the 181 command is decorated with the port number for ports other than 22. 182 183 This matches the behaviour of KnownHostsCommand when invoked to look 184 up the actual host key. 185 186 bz3643, ok dtucker@ 187 188 OpenBSD-Commit-ID: 5cfabc0b7c6c7ab473666df314f377b1f15420b1 189 190commit 4086bd6652c0badccc020218a62190a7798fb72c 191Author: markus@openbsd.org <markus@openbsd.org> 192Date: Fri Dec 8 09:18:39 2023 +0000 193 194 upstream: prevent leak in sshsig_match_principals; ok djm@ 195 196 OpenBSD-Commit-ID: 594f61ad4819ff5c72dfe99ba666a17f0e1030ae 197 198commit 19d3ee2f3adf7d9a606ff015c1e153744702c4c9 199Author: djm@openbsd.org <djm@openbsd.org> 200Date: Wed Dec 6 21:06:48 2023 +0000 201 202 upstream: short circuit debug log processing early if we're not going 203 204 to log anything. From Kobe Housen 205 206 OpenBSD-Commit-ID: 2bcddd695872a1bef137cfff7823044dcded90ea 207 208commit 947affad4831df015c498c00c6351ea6f13895d5 209Author: Darren Tucker <dtucker@dtucker.net> 210Date: Mon Nov 27 09:37:28 2023 +1100 211 212 Add tests for OpenSSL 3.2.0 and 3.2 stable branch. 213 214commit 747dce36206675ca6b885010a835733df469351b 215Author: Darren Tucker <dtucker@dtucker.net> 216Date: Sat Nov 25 09:03:38 2023 +1100 217 218 Use non-zero arg in compiler test program. 219 220 Now that we're running the test program, passing zero to the test function 221 can cause divide-by-zero exceptions which might show up in logs. 222 223commit 3d44a5c56585d1c351dbc006240a591b6da502b1 224Author: dtucker@openbsd.org <dtucker@openbsd.org> 225Date: Fri Nov 24 00:31:30 2023 +0000 226 227 upstream: Plug mem leak of msg when processing a quit message. 228 229 Coverity CID#427852, ok djm@ 230 231 OpenBSD-Commit-ID: bf85362addbe2134c3d8c4b80f16601fbff823b7 232 233commit 1d7f9b6e297877bd00973e6dc5c0642dbefc3b5f 234Author: dtucker@openbsd.org <dtucker@openbsd.org> 235Date: Thu Nov 23 03:37:05 2023 +0000 236 237 upstream: Include existing mux path in debug message. 238 239 OpenBSD-Commit-ID: 1c3641be10c2f4fbad2a1b088a441d072e18bf16 240 241commit f29934066bd0e561a2e516b7e584fb92d2eedee0 242Author: Darren Tucker <dtucker@dtucker.net> 243Date: Thu Nov 23 19:41:27 2023 +1100 244 245 Add an Ubuntu 22.04 test VM. 246 247 This is the same version as Github's runners so most of the testing on 248 it is over there, but having a local VM makes debugging much easier. 249 250commit a93284a780cd3972afe5f89086b75d564ba157f3 251Author: Darren Tucker <dtucker@dtucker.net> 252Date: Thu Nov 23 19:36:22 2023 +1100 253 254 Add gcc-12 -Werror test on Ubuntu 22.04. 255 256 Explictly specify gcc-11 on Ubuntu 22.04 (it's the system compiler). 257 258commit 670f5a647e98b6fd95ad64f789f87ee3274b481b 259Author: Darren Tucker <dtucker@dtucker.net> 260Date: Thu Nov 23 19:34:57 2023 +1100 261 262 Check return value from write to prevent warning. 263 264 ... and since we're testing for flags with -Werror, this caused 265 configure to mis-detect compiler flags. 266 267commit cea007d691cfedfa07a5b8599f97ce0511f53fc9 268Author: Darren Tucker <dtucker@dtucker.net> 269Date: Wed Nov 22 21:18:55 2023 +1100 270 271 Run compiler test program when compiling natively. 272 273 ok djm@ 274 275commit ee0d305828f13536c0a416bbf9c3e81039d9ea55 276Author: Darren Tucker <dtucker@dtucker.net> 277Date: Wed Nov 22 21:18:07 2023 +1100 278 279 Factor out compiler test program into a macro. 280 281 ok djm@ 282 283commit de304c76316b029df460673725a9104224b9959b 284Author: Darren Tucker <dtucker@dtucker.net> 285Date: Wed Nov 22 08:55:36 2023 +1100 286 287 Add fbsd14 VM to test pool. 288 289commit 99a2df5e1994cdcb44ba2187b5f34d0e9190be91 290Author: Darren Tucker <dtucker@dtucker.net> 291Date: Tue Nov 21 16:19:29 2023 +1100 292 293 Expand -fzero-call-used-regs test to cover gcc 11. 294 295 It turns out that gcc also has some problems with -fzero-call-used-regs, 296 at least v11 on mips. Previously the test in OSSH_CHECK_CFLAG_COMPILE 297 was sufficient to catch it with "=all", but not sufficient for "=used". 298 Expand the testcase and include it in the other tests for good measure. 299 See bz#3629. ok djm@. 300 301commit ff220d4010717f7bfbbc02a2400666fb9d24f250 302Author: Darren Tucker <dtucker@dtucker.net> 303Date: Tue Nov 21 14:04:34 2023 +1100 304 305 Stop using -fzero-call-used-regs=all 306 307 ... since it seems to be problematic with several different versions of 308 clang. Only use -fzero-call-used-regs=used which is less 309 problematic, except with Apple's clang where we don't use it at all. 310 bz#3629, ok djm@ 311 312commit 2a19e02f36b16f0f6cc915f7d1e60ead5e36303b 313Author: Darren Tucker <dtucker@dtucker.net> 314Date: Tue Nov 21 14:02:18 2023 +1100 315 316 Allow for vendor prefix on clang version numbers. 317 318 Correctly detects the version of OpenBSD's native clang, as well as 319 Apple's. Spotted tb@, ok djm@. 320 321commit c52db0114826d73eff6cdbf205e9c1fa4f7ca6c6 322Author: djm@openbsd.org <djm@openbsd.org> 323Date: Mon Nov 20 02:50:00 2023 +0000 324 325 upstream: set errno=EAFNOSUPPORT when filtering addresses that don't 326 327 match AddressFamily; yields slightly better error message if no address 328 matches. bz#3526 329 330 OpenBSD-Commit-ID: 29cea900ddd8b04a4d1968da5c4a893be2ebd9e6 331 332commit 26f3f3bbc69196d908cad6558c8c7dc5beb8d74a 333Author: djm@openbsd.org <djm@openbsd.org> 334Date: Wed Nov 15 23:03:38 2023 +0000 335 336 upstream: when connecting via socket (the default case), filter 337 338 addresses by AddressFamily if one was specified. Fixes the case where, if 339 CanonicalizeHostname is enabled, ssh may ignore AddressFamily. bz5326; ok 340 dtucker 341 342 OpenBSD-Commit-ID: 6c7d7751f6cd055126b2b268a7b64dcafa447439 343 344commit 050c335c8da43741ed0df2570ebfbd5d1dfd0a31 345Author: djm@openbsd.org <djm@openbsd.org> 346Date: Wed Nov 15 22:51:49 2023 +0000 347 348 upstream: when deciding whether to enable keystroke timing 349 350 obfuscation, only consider enabling it when a channel with a tty is open. 351 352 Avoids turning on the obfucation when X11 forwarding only is in use, 353 which slows it right down. Reported by Roger Marsh 354 355 OpenBSD-Commit-ID: c292f738db410f729190f92de100c39ec931a4f1 356 357commit 676377ce67807a24e08a54cd60ec832946cc6cae 358Author: tobhe@openbsd.org <tobhe@openbsd.org> 359Date: Mon Nov 13 09:18:19 2023 +0000 360 361 upstream: Make sure sftp_get_limits() only returns 0 if 'limits' 362 363 was initialized. This fixes a potential uninitialized use of 'limits' in 364 sftp_init() if sftp_get_limits() returned early because of an unexpected 365 message type. 366 367 ok djm@ 368 369 OpenBSD-Commit-ID: 1c177d7c3becc1d71bc8763eecf61873a1d3884c 370 371commit 64e0600f23c6dec36c3875392ac95b8a9100c2d6 372Author: Darren Tucker <dtucker@dtucker.net> 373Date: Mon Nov 13 20:03:31 2023 +1100 374 375 Test current releases of LibreSSL and OpenSSL. 376 377 Retire some of the older releases. 378 379commit c8ed7cc545879ac15f6ce428be4b29c35598bb2a 380Author: dtucker@openbsd.org <dtucker@openbsd.org> 381Date: Wed Nov 1 02:08:38 2023 +0000 382 383 upstream: Specify ssh binary to use 384 385 ... instead of relying on installed one. Fixes test failures in -portable 386 when running tests prior to installation. 387 388 OpenBSD-Regress-ID: b6d6ba71c23209c616efc805a60d9a445d53a685 389 390commit e9fc2c48121cada1b4dcc5dadea5d447fe0093c3 391Author: Darren Tucker <dtucker@dtucker.net> 392Date: Wed Nov 1 13:11:31 2023 +1100 393 394 Put long-running test targets on hipri runners. 395 396 Some of the selfhosted test targets take a long time to run for various 397 reasons, so label them for "libvirt-hipri" runners so that they can 398 start immediately. This should reduce the time to complete all tests. 399 400commit 7ddf27668f0e21233f08c0ab2fe9ee3fdd6ab1e2 401Author: djm@openbsd.org <djm@openbsd.org> 402Date: Wed Nov 1 00:29:46 2023 +0000 403 404 upstream: add some tests of forced commands overriding Subsystem 405 406 directives 407 408 OpenBSD-Regress-ID: eb48610282f6371672bdf2a8b5d2aa33cfbd322b 409 410commit fb06f9b5a065dfbbef5916fc4accc03c0bf026dd 411Author: dtucker@openbsd.org <dtucker@openbsd.org> 412Date: Tue Oct 31 04:15:40 2023 +0000 413 414 upstream: Don't try to use sudo inside sshd log wrapper. 415 416 We still need to check if we're using sudo since we don't want to chown 417 unecessarily, as on some platforms this causes an error which pollutes 418 stderr. We also don't want to unnecessarily invoke sudo, since it's 419 running in the context of the proxycommand, on *other* platforms it 420 may not be able to authenticate, and if we're using SUDO then it should 421 already be privileged. 422 423 OpenBSD-Regress-ID: 70d58df7503db699de579a9479300e5f3735f4ee 424 425commit fc3cc33e88c242c704781c6c48087838f1dcfa2a 426Author: dtucker@openbsd.org <dtucker@openbsd.org> 427Date: Tue Oct 31 02:58:45 2023 +0000 428 429 upstream: Only try to chmod logfile if we have sudo. If we don't have 430 431 sudo then we won't need to chmod. 432 433 OpenBSD-Regress-ID: dbad2f5ece839658ef8af3376cb1fb1cabe2e324 434 435commit 3a506598fddd3f18f9095af3fe917f24cbdd32e0 436Author: djm@openbsd.org <djm@openbsd.org> 437Date: Mon Oct 30 23:00:25 2023 +0000 438 439 upstream: move PKCS#11 setup code to test-exec.sh so it can be reused 440 441 elsewhere 442 443 OpenBSD-Regress-ID: 1d29e6be40f994419795d9e660a8d07f538f0acb 444 445commit f82fa227a52661c37404a6d33bbabf14fed05db0 446Author: djm@openbsd.org <djm@openbsd.org> 447Date: Mon Oct 30 17:32:00 2023 +0000 448 449 upstream: tidy and refactor PKCS#11 setup code 450 451 Replace the use of a perl script to delete the controlling TTY with a 452 SSH_ASKPASS script to directly load the PIN. 453 454 Move PKCS#11 setup code to functions in anticipation of it being used 455 elsewhere in additional tests. 456 457 Reduce stdout spam 458 459 OpenBSD-Regress-ID: 07705c31de30bab9601a95daf1ee6bef821dd262 460 461commit 3cf698c6d4ffa9be1da55672a3519e2135a6366a 462Author: Darren Tucker <dtucker@dtucker.net> 463Date: Mon Oct 30 21:35:03 2023 +1100 464 465 Add obsd74 test VM and retire obsd69 and obsd70. 466 467commit 3e21d58a09894acb38dc69ed615d101131f473d0 468Author: Darren Tucker <dtucker@dtucker.net> 469Date: Mon Oct 30 18:34:12 2023 +1100 470 471 Add OpenSSL 3.3.0 as a known dev version. 472 473commit 917ba181c2cbdb250a443589ec732aa36fd51ffa 474Author: Darren Tucker <dtucker@dtucker.net> 475Date: Mon Oct 30 13:32:03 2023 +1100 476 477 Restore nopasswd sudo rule on Mac OS X. 478 479 This seems to be missing from some (but not all) github runners, so 480 restore it if it seems to be missing. 481 482commit c5698abad6d4ec98ca20bcaaabaeacd5e1ec3f4f 483Author: Darren Tucker <dtucker@dtucker.net> 484Date: Mon Oct 30 13:26:52 2023 +1100 485 486 Don't exit early when setting up on Mac OS X. 487 488 We probably need some of the other bits in there (specifically, setting 489 the perms on the home directory) so make it less of a special snowflake. 490 491commit 1d6a878ceba60b9dc14037dddc8f036070c0065f 492Author: dtucker@openbsd.org <dtucker@openbsd.org> 493Date: Sun Oct 29 06:22:07 2023 +0000 494 495 upstream: Only try to chown logfiles that exist to prevent spurious 496 497 errors. 498 499 OpenBSD-Regress-ID: f1b20a476734e885078c481f1324c9ea03af991e 500 501commit e612376427a66f835e284f6b426d16d7c85301bc 502Author: anton@openbsd.org <anton@openbsd.org> 503Date: Thu Oct 26 18:52:45 2023 +0000 504 505 upstream: make use of bsd.regress.mk in extra and interop targets; ok 506 507 dtucker@ 508 509 OpenBSD-Regress-ID: 7ea21b5f6fc4506165093b2123d88d20ff13a4f0 510 511commit ea0039173957d0edcd6469b9614dcedb44dcb4f9 512Author: dtucker@openbsd.org <dtucker@openbsd.org> 513Date: Thu Oct 26 12:44:07 2023 +0000 514 515 upstream: Skip conch interop tests when not enabled instead of fatal. 516 517 OpenBSD-Regress-ID: b0abf81c24ac6c21f367233663228ba16fa96a46 518 519commit d220b9ed5494252b26b95f05be118472bc3ab5c0 520Author: dtucker@openbsd.org <dtucker@openbsd.org> 521Date: Wed Oct 25 05:38:08 2023 +0000 522 523 upstream: Import regenerated moduli. 524 525 OpenBSD-Commit-ID: 95f5dd6107e8902b87dc5b005ef2b53f1ff378b8 526 527commit a611e4db4009447a0151f31a44e235ca32ed4429 528Author: anton@openbsd.org <anton@openbsd.org> 529Date: Wed Oct 25 08:01:59 2023 +0000 530 531 upstream: ssh conch interop tests requires a controlling terminal; 532 533 ok dtucker@ 534 535 OpenBSD-Regress-ID: cbf2701bc347c2f19d907f113779c666f1ecae4a 536 537commit da951b5e08c167acb5d6e2eec6f146502f5d6ed8 538Author: anton@openbsd.org <anton@openbsd.org> 539Date: Mon Oct 23 11:30:49 2023 +0000 540 541 upstream: Use private key that is allowed by sshd defaults in conch 542 543 interop tests. 544 545 ok dtucker@ 546 547 OpenBSD-Regress-ID: 3b7f65c8f409c328bcd4b704f60cb3d31746f045 548 549commit 1ca166dbb3c0ce632b98869cd955f69320aa6fe8 550Author: Darren Tucker <dtucker@dtucker.net> 551Date: Fri Oct 20 20:43:00 2023 +1100 552 553 Install Dropbear for interop testing. 554 555commit f993bb58351c5cb71e61aede63805a34a6d4daea 556Author: Darren Tucker <dtucker@dtucker.net> 557Date: Fri Oct 20 20:39:03 2023 +1100 558 559 Resync PuTTY and Conch path handling with upstream. 560 561 Now that configure finds these for us we can remove these -portable 562 specific changes. 563 564commit ff85becd5f5f06a76efa45d30fb204a3c5e5215c 565Author: Darren Tucker <dtucker@dtucker.net> 566Date: Fri Oct 20 20:35:46 2023 +1100 567 568 Have configure find PuTTY and Conch binaries. 569 570 This will let us remove some -portable specific changes from 571 test-exec.sh. 572 573commit c54a50359b9cecddbf3ffcdc26efcb3cd6071ec1 574Author: dtucker@openbsd.org <dtucker@openbsd.org> 575Date: Fri Oct 20 07:37:07 2023 +0000 576 577 upstream: Allow overriding the locations of the Dropbear binaries 578 579 similar to what we do for the PuTTY ones. 580 581 OpenBSD-Regress-ID: 7de0e00518fb0c8fdc5f243b7f82f523c936049c 582 583commit fbaa707d455a61d0aef8ae65e02a25bac5351e5c 584Author: dtucker@openbsd.org <dtucker@openbsd.org> 585Date: Fri Oct 20 06:56:45 2023 +0000 586 587 upstream: Add interop test with Dropbear. 588 589 Right now this is only dbclient not the Dropbear server since it won't 590 currently run as a ProxyCommand. 591 592 OpenBSD-Regress-ID: 8cb898c414fcdb252ca6328896b0687acdaee496 593 594commit c2003d0dbdcdb61ca336c3f90c5c2b4a09c8e73f 595Author: Fabio Pedretti <pedretti.fabio@gmail.com> 596Date: Mon Oct 16 11:59:53 2023 +0200 597 598 Update openssl-devel dependency in RPM spec. 599 600 Since openssh 9.4p1, openssl >= 1.1.1 is required, so 601 build with --without-openssl elsewhere. 602 According to https://repology.org/project/openssl/versions 603 openssl 1.1.1 is available on fedora >= 29 and rhel >= 8. 604 Successfully build tested, installed and run on rhel 6 605 606commit 064e09cd632721c7e6889904e07767443ee23821 607Author: Fabio Pedretti <pedretti.fabio@gmail.com> 608Date: Mon Oct 16 10:13:06 2023 +0200 609 610 Remove reference of dropped sshd.pam.old file 611 612 The file was removed in openssh 8.8 613 614commit 62db354b696b378a164b6e478cb6b0171dcb0c3d 615Author: dtucker@openbsd.org <dtucker@openbsd.org> 616Date: Mon Oct 16 08:40:00 2023 +0000 617 618 upstream: Move declaration of "len" into the block where it's used. 619 620 This lets us compile Portable with -Werror with when OpenSSL doesn't have 621 Ed25519 support. 622 623 OpenBSD-Commit-ID: e02e4b4af351946562a7caee905da60eff16ba29 624 625commit 6eee8c972d5901d10e80634a006b4e346b2c8c19 626Author: Damien Miller <djm@mindrot.org> 627Date: Fri Oct 13 15:15:05 2023 +1100 628 629 run t-extra regress tests 630 631 This exposes the t-extra regress tests (including agent-pkcs11.sh) as 632 a new extra-tests target in the top level Makefile and runs them by 633 default. ok dtucker@ 634 635commit 637624dbbac13f2bc3c8ec5b15c9d627d07f2935 636Author: Darren Tucker <dtucker@dtucker.net> 637Date: Thu Oct 12 22:01:23 2023 +1100 638 639 Don't use make -j2. 640 641 While we have 2 cores available on github runners, not using it means 642 that the most recent log message is the actual failure, rather than 643 having to search back through the log for it. 644 645commit 971e0cfcfd52ef1d73cf5244074c306a60006e89 646Author: Darren Tucker <dtucker@dtucker.net> 647Date: Thu Oct 12 16:23:05 2023 +1100 648 649 Correct arg order for ED255519 AC_LINK_IFELSE test. 650 651commit c616e64688b2a0c1b4daad69b056099be998d121 652Author: djm@openbsd.org <djm@openbsd.org> 653Date: Thu Oct 12 03:51:08 2023 +0000 654 655 upstream: typos and extra debug trace calls 656 657 OpenBSD-Regress-ID: 98a2a6b9333743274359e3c0f0e65cf919a591d1 658 659commit c49a3fbf10162128c67c59562348de2041188974 660Author: djm@openbsd.org <djm@openbsd.org> 661Date: Thu Oct 12 03:48:53 2023 +0000 662 663 upstream: ensure logs are owned by correct user; feedback/ok 664 665 dtucker@ 666 667 OpenBSD-Regress-ID: c3297af8f07717f1d400a5d34529962f1a76b5a3 668 669commit 5ec0ed79ac074c3437b25f6cba8b8cf21c8d4587 670Author: djm@openbsd.org <djm@openbsd.org> 671Date: Thu Oct 12 03:36:32 2023 +0000 672 673 upstream: 64 %-expansion keys ought to be enough for anybody; ok 674 675 dtucker (we just hit the previous limit in some cases) 676 677 OpenBSD-Commit-ID: 84070f8001ec22ff5d669f836b62f206e08c5787 678 679commit f59a94e22e46db2c23eddeb871aa9e8d93ab0016 680Author: djm@openbsd.org <djm@openbsd.org> 681Date: Thu Oct 12 02:48:43 2023 +0000 682 683 upstream: don't dereference NULL pointer when hashing jumphost 684 685 OpenBSD-Commit-ID: 251c0263e1759a921341c7efe7f1d4c73e1c70f4 686 687commit 281c79168edcc303abfd5bca983616eaa24c5f32 688Author: Damien Miller <djm@mindrot.org> 689Date: Thu Oct 12 13:20:01 2023 +1100 690 691 Solaris: prefer PRIV_XPOLICY to PRIV_LIMIT 692 693 If the system support PRIV_XPOLICY and one is set, then don't 694 modify PRIV_LIMIT. bz2833, patch from Ron Jordan, ok dtucker@ 695 696commit 98fc34df837f3a3b79d2a111b96fe8a39adcab55 697Author: djm@openbsd.org <djm@openbsd.org> 698Date: Thu Oct 12 02:18:18 2023 +0000 699 700 upstream: add %j token that expands to the configured ProxyJump 701 702 hostname (or the empty string if this option is not being used). bz3610, ok 703 dtucker 704 705 OpenBSD-Commit-ID: ce9983f7efe6a178db90dc5c1698df025df5e339 706 707commit 7f3180be8a85320b5d3221714b40c16e66881249 708Author: djm@openbsd.org <djm@openbsd.org> 709Date: Thu Oct 12 02:15:53 2023 +0000 710 711 upstream: release GSS OIDs only at end of authentication; bz2982, 712 713 ok dtucker@ 714 715 OpenBSD-Commit-ID: 0daa41e0525ae63cae4483519ecaa37ac485d94c 716 717commit a612b93de5d86e955bfb6e24278f621118eea500 718Author: djm@openbsd.org <djm@openbsd.org> 719Date: Thu Oct 12 02:12:53 2023 +0000 720 721 upstream: mask SIGINT/TERM/QUIT/HUP before checking quit_pending 722 723 and use ppoll() to unmask them in the mainloop. Avoids race condition between 724 signaling ssh to exit and polling. bz3531; ok dtucker 725 726 OpenBSD-Commit-ID: 5c14e1aabcddedb95cdf972283d9c0d5083229e7 727 728commit 531b27a006116fe7aff325510aaa576f24844452 729Author: djm@openbsd.org <djm@openbsd.org> 730Date: Wed Oct 11 23:23:58 2023 +0000 731 732 upstream: sync usage() with ssh.1; spotted by kn@ 733 734 OpenBSD-Commit-ID: 191a85639477dcb5fa1616d270d93b7c8d5c1dfd 735 736commit 64f7ca881b19be754425dca60d1590d306c9d1d0 737Author: djm@openbsd.org <djm@openbsd.org> 738Date: Wed Oct 11 23:14:33 2023 +0000 739 740 upstream: ssh -Q does not make sense with other command-line options, 741 742 so give it its own line in the manpage 743 744 OpenBSD-Commit-ID: 00a747f0655c12122bbb77c2796be0013c105361 745 746commit a752a6c0e1001f93696d7025f0c867f0376e2ecf 747Author: djm@openbsd.org <djm@openbsd.org> 748Date: Wed Oct 11 22:42:26 2023 +0000 749 750 upstream: add ChannelTimeout support to the client, mirroring the 751 752 same option in the server. ok markus@ 753 754 OpenBSD-Commit-ID: 55630b26f390ac063980cfe7ad8c54b03284ef02 755 756commit 76e91e7238cdc5662bc818e2a48d466283840d23 757Author: djm@openbsd.org <djm@openbsd.org> 758Date: Wed Oct 11 22:41:05 2023 +0000 759 760 upstream: add support for reading ED25519 private keys in PEM PKCS8 761 762 format; ok markus@ tb@ 763 764 OpenBSD-Commit-ID: 01b85c91757e6b057e9b23b8a23f96415c3c7174 765 766commit fc77c8e352c0f44125425c05265e3a00c183d78a 767Author: djm@openbsd.org <djm@openbsd.org> 768Date: Wed Oct 11 06:40:54 2023 +0000 769 770 upstream: mention "none" is a valid argument to IdentityFile; bz3080 771 772 OpenBSD-Commit-ID: 1b4fb590ef731099349a7d468b77f02b240ac926 773 774commit c97520d23d1fe53d30725a2af25d2dddd6f2faff 775Author: djm@openbsd.org <djm@openbsd.org> 776Date: Wed Oct 11 05:42:08 2023 +0000 777 778 upstream: in olde rcp/scp protocol mode, when rejecting a path from the 779 780 server as not matching the glob that the client sent, log (at debug level) 781 the received pathname as well as the list of possible expected paths expanded 782 from the glob. bz2966 783 784 OpenBSD-Commit-ID: 0bd8db8a595334ca86bca8f36e23fc0395315765 785 786commit 208c2b719879805983398160791d6a1ef9c2c3fc 787Author: djm@openbsd.org <djm@openbsd.org> 788Date: Wed Oct 11 04:46:29 2023 +0000 789 790 upstream: s/%.100s/%s/ in SSH- banner construction as there's no 791 792 reason to limit its size: the version string bring included is a compile time 793 constant going into an allocated banner string. 794 795 OpenBSD-Commit-ID: 0ef73304b9bf3e534c60900cd84ab699f859ebcd 796 797commit 0354790826b97c41bbd171a965574e159b58d83e 798Author: tb@openbsd.org <tb@openbsd.org> 799Date: Tue Oct 10 06:49:54 2023 +0000 800 801 upstream: Garbage collect cipher_get_keyiv_len() 802 803 This is a compat20 leftover, unused since 2017. 804 805 ok djm 806 807 OpenBSD-Commit-ID: 91fa5497c9dc6883064624ac27813a567883fdce 808 809commit 8d29ee4115001a02641386ae394992c65ed279e0 810Author: djm@openbsd.org <djm@openbsd.org> 811Date: Tue Oct 10 03:57:45 2023 +0000 812 813 upstream: Reserve a range of "local extension" message numbers that 814 815 OpenSSH promises not to use (comment change only) 816 817 OpenBSD-Commit-ID: e61795b453d4892d2c99ce1039112c4a00250e03 818 819commit 90b0d73d63a706e85f6431f05a62d2ce1b476472 820Author: djm@openbsd.org <djm@openbsd.org> 821Date: Fri Oct 6 03:32:15 2023 +0000 822 823 upstream: typo in error message 824 825 OpenBSD-Regress-ID: 6a8edf0dc39941298e3780b147b10c0a600b4fee 826 827commit e84517f51532ec913d8fb01a8aab7307134774bb 828Author: djm@openbsd.org <djm@openbsd.org> 829Date: Fri Oct 6 03:25:14 2023 +0000 830 831 upstream: Perform the softhsm2 setup as discrete steps rather than 832 833 as a long shell pipeline. Makes it easier to figure out what has happened 834 when it breaks. 835 836 OpenBSD-Regress-ID: b3f1292115fed65765d0a95414df16e27772d81c 837 838commit cb54becff4d776238e0e9072943ba0872260535d 839Author: claudio@openbsd.org <claudio@openbsd.org> 840Date: Sun Sep 24 08:14:13 2023 +0000 841 842 upstream: REGRESS_FAIL_EARLY defaults to yes now. So no need to 843 844 overload the value here anymore. OK tb@ bluhm@ 845 846 OpenBSD-Regress-ID: f063330f1bebbcd373100afccebc91a965b14496 847 848commit f01f5137ceba65baf34ceac5a298c12ac01b1fef 849Author: jmc@openbsd.org <jmc@openbsd.org> 850Date: Wed Oct 4 05:42:10 2023 +0000 851 852 upstream: spelling fix; 853 854 OpenBSD-Commit-ID: 493f95121567e5ab0d9dd1150f873b5535ca0195 855 856commit 80a2f64b8c1d27383cc83d182b73920d1e6a91f1 857Author: Damien Miller <djm@mindrot.org> 858Date: Wed Oct 4 15:34:10 2023 +1100 859 860 crank version numbers 861 862commit f65f187b105d9b5c12fd750a211397d08c17c6d4 863Author: djm@openbsd.org <djm@openbsd.org> 864Date: Wed Oct 4 04:04:09 2023 +0000 865 866 upstream: openssh-9.5 867 868 OpenBSD-Commit-ID: 5e0af680480bd3b6f5560cf840ad032d48fd6b16 869 870commit ffe27e54a4bb18d5d3bbd3f4cc93a41b8d94dfd2 871Author: djm@openbsd.org <djm@openbsd.org> 872Date: Wed Oct 4 04:03:50 2023 +0000 873 874 upstream: add some cautionary text about % token expansion and 875 876 shell metacharacters; based on report from vinci AT protonmail.ch 877 878 OpenBSD-Commit-ID: aa1450a54fcee2f153ef70368d90edb1e7019113 879 880commit 60ec3d54fd1ebfe2dda75893fa1e870b8dffbb0d 881Author: djm@openbsd.org <djm@openbsd.org> 882Date: Tue Oct 3 23:56:10 2023 +0000 883 884 upstream: fix link to agent draft; spotted by Jann Horn 885 886 OpenBSD-Commit-ID: ff5bda21a83ec013db683e282256a85201d2dc4b 887 888commit 12e2d4b13f6f63ce2de13cbfcc9e4d0d4b4ab231 889Author: Damien Miller <djm@mindrot.org> 890Date: Wed Oct 4 10:54:04 2023 +1100 891 892 use portable provider allowlist path in manpage 893 894 spotted by Jann Horn 895 896commit 6c2c6ffde75df95fd838039850d3dd3d84956d87 897Author: deraadt@openbsd.org <deraadt@openbsd.org> 898Date: Tue Sep 19 20:37:07 2023 +0000 899 900 upstream: typo; from Jim Spath 901 902 OpenBSD-Commit-ID: 2f5fba917b5d4fcf93d9e0b0756c7f63189e228e 903 904commit b6b49130a0089b297245ee39e769231d7c763014 905Author: djm@openbsd.org <djm@openbsd.org> 906Date: Sun Sep 10 23:12:32 2023 +0000 907 908 upstream: rename remote_glob() -> sftp_glob() to match other API 909 910 OpenBSD-Commit-ID: d9dfb3708d824ec02970a84d96cf5937e0887229 911 912commit 21b79af6c8d2357c822c84cef3fbdb8001ed263b 913Author: djm@openbsd.org <djm@openbsd.org> 914Date: Sun Sep 10 03:51:55 2023 +0000 915 916 upstream: typo in comment 917 918 OpenBSD-Commit-ID: 69285e0ce962a7c6b0ab5f17a293c60a0a360a18 919 920commit 41232d25532b4d2ef6c5db62efc0cf50a79d26ca 921Author: Darren Tucker <dtucker@dtucker.net> 922Date: Sun Sep 10 15:45:38 2023 +1000 923 924 Use zero-call-used-regs=used with Apple compilers. 925 926 Apple's versions of clang have version numbers that do not match the 927 corresponding upstream clang versions. Unfortunately, they do still 928 have the clang-15 zero-call-used-regs=all bug, so for now use the value 929 that doesn't result in segfaults. We could allowlist future versions 930 that are known to work. bz#3584 (and probably also our github CI 931 failures). 932 933commit 90ccc5918ea505bf156c31148b6b59a1bf5d6dc6 934Author: djm@openbsd.org <djm@openbsd.org> 935Date: Sun Sep 10 03:25:53 2023 +0000 936 937 upstream: randomise keystroke obfuscation intervals and average 938 939 interval rate. ok dtucker@ 940 941 OpenBSD-Commit-ID: 05f61d051ab418fcfc4857ff306e420037502382 942 943commit bd1b9e52f5fa94d87223c90905c5fdc1a7c32aa6 944Author: djm@openbsd.org <djm@openbsd.org> 945Date: Fri Sep 8 06:34:24 2023 +0000 946 947 upstream: fix sizeof(*ptr) instead sizeof(ptr) in realloc (pointer here 948 949 is char**, so harmless); spotted in CID 416964 950 951 OpenBSD-Commit-ID: c61caa4a5a667ee20bb1042098861e6c72c69002 952 953commit c4f966482983e18601eec70a1563115de836616f 954Author: djm@openbsd.org <djm@openbsd.org> 955Date: Fri Sep 8 06:10:57 2023 +0000 956 957 upstream: regress test recursive remote-remote directories copies where 958 959 the directory contains a symlink to another directory. 960 961 also remove errant `set -x` that snuck in at some point 962 963 OpenBSD-Regress-ID: 1c94a48bdbd633ef2285954ee257725cd7bc456f 964 965commit 5e1dfe5014ebc194641678303e22ab3bba15f4e5 966Author: djm@openbsd.org <djm@openbsd.org> 967Date: Fri Sep 8 06:10:02 2023 +0000 968 969 upstream: fix recursive remote-remote copies of directories that 970 971 contain symlinks to other directories (similar to bz3611) 972 973 OpenBSD-Commit-ID: 7e19d2ae09b4f941bf8eecc3955c9120171da37f 974 975commit 7c0ce2bf98b303b6ad91493ee3247d96c18ba1f6 976Author: djm@openbsd.org <djm@openbsd.org> 977Date: Fri Sep 8 05:50:57 2023 +0000 978 979 upstream: regress test for recursive copies of directories containing 980 981 symlinks to other directories. bz3611, ok dtucker@ 982 983 OpenBSD-Regress-ID: eaa4c29cc5cddff4e72a16bcce14aeb1ecfc94b9 984 985commit 2de990142a83bf60ef694378b8598706bc654b08 986Author: djm@openbsd.org <djm@openbsd.org> 987Date: Fri Sep 8 05:56:13 2023 +0000 988 989 upstream: the sftp code was one of my first contributions to 990 991 OpenSSH and it shows - the function names are terrible. 992 993 Rename do_blah() to sftp_blah() to make them less so. 994 995 Completely mechanical except for sftp_stat() and sftp_lstat() which 996 change from returning a pointer to a static variable (error-prone) to 997 taking a pointer to a caller-provided receiver. 998 999 OpenBSD-Commit-ID: eb54d6a72d0bbba4d623e2175cf5cc4c75dc2ba4 1000 1001commit 249d8bd0472b53e3a2a0e138b4c030a31e83346a 1002Author: djm@openbsd.org <djm@openbsd.org> 1003Date: Fri Sep 8 05:50:12 2023 +0000 1004 1005 upstream: fix scp in SFTP mode recursive upload and download of 1006 1007 directories that contain symlinks to other directories. In scp mode, the 1008 links would be followed, but in SFTP mode they were not. bz3611, ok dtucker@ 1009 1010 OpenBSD-Commit-ID: 9760fda668eaa94a992250d7670dfbc62a45197c 1011 1012commit 0e1f4401c466fa4fdaea81b6dadc8dd1fc4cf0af 1013Author: djm@openbsd.org <djm@openbsd.org> 1014Date: Wed Sep 6 23:36:09 2023 +0000 1015 1016 upstream: regression test for override of subsystem in match blocks 1017 1018 OpenBSD-Regress-ID: 5f8135da3bfda71067084c048d717b0e8793e87c 1019 1020commit 8a1450c62035e834d8a79a5d0d1c904236f9dcfe 1021Author: djm@openbsd.org <djm@openbsd.org> 1022Date: Wed Sep 6 23:35:35 2023 +0000 1023 1024 upstream: allow override of Sybsystem directives in sshd Match 1025 1026 blocks 1027 1028 OpenBSD-Commit-ID: 3911d18a826a2d2fe7e4519075cf3e57af439722 1029 1030commit 6e52826e2a74d077147a82ead8d4fbd5b54f4e3b 1031Author: djm@openbsd.org <djm@openbsd.org> 1032Date: Wed Sep 6 23:26:37 2023 +0000 1033 1034 upstream: allocate the subsystems array as necessary and remove the 1035 1036 fixed limit of subsystems. Saves a few kb of memory in the server and makes 1037 it more like the other options. 1038 1039 OpenBSD-Commit-ID: e683dfca6bdcbc3cc339bb6c6517c0c4736a547f 1040 1041commit e19069c9fac4c111d6496b19c7f7db43b4f07b4f 1042Author: djm@openbsd.org <djm@openbsd.org> 1043Date: Wed Sep 6 23:23:53 2023 +0000 1044 1045 upstream: preserve quoting of Subsystem commands and arguments. 1046 1047 This may change behaviour of exotic configurations, but the most common 1048 subsystem configuration (sftp-server) is unlikely to be affected. 1049 1050 OpenBSD-Commit-ID: 8ffa296aeca981de5b0945242ce75aa6dee479bf 1051 1052commit 52dfe3c72d98503d8b7c6f64fc7e19d685636c0b 1053Author: djm@openbsd.org <djm@openbsd.org> 1054Date: Wed Sep 6 23:21:36 2023 +0000 1055 1056 upstream: downgrade duplicate Subsystem directives from being a 1057 1058 fatal error to being a debug message to match behaviour with just about all 1059 other directives. 1060 1061 OpenBSD-Commit-ID: fc90ed2cc0c18d4eb8e33d2c5e98d25f282588ce 1062 1063commit 1ee0a16e07b6f0847ff463d7b5221c4bf1876e25 1064Author: djm@openbsd.org <djm@openbsd.org> 1065Date: Wed Sep 6 23:18:15 2023 +0000 1066 1067 upstream: handle cr+lf (instead of just cr) in sshsig signature 1068 1069 files 1070 1071 OpenBSD-Commit-ID: 647460a212b916540016d066568816507375fd7f 1072 1073commit e1c284d60a928bcdd60bc575c6f9604663502770 1074Author: job@openbsd.org <job@openbsd.org> 1075Date: Mon Sep 4 10:29:58 2023 +0000 1076 1077 upstream: Generate Ed25519 keys when invoked without arguments 1078 1079 Ed25519 public keys are very convenient due to their small size. 1080 OpenSSH has supported Ed25519 since version 6.5 (January 2014). 1081 1082 OK djm@ markus@ sthen@ deraadt@ 1083 1084 OpenBSD-Commit-ID: f498beaad19c8cdcc357381a60df4a9c69858b3f 1085 1086commit 694150ad92765574ff82a18f4e86322bd3231e68 1087Author: djm@openbsd.org <djm@openbsd.org> 1088Date: Mon Sep 4 00:08:14 2023 +0000 1089 1090 upstream: trigger keystroke timing obfucation only if the channels 1091 1092 layer enqueud some data in the last poll() cycle; this avoids triggering the 1093 obfuscatior for non-channels data like ClientAlive probes and also fixes a 1094 related problem were the obfucations would be triggered on fully quiescent 1095 connections. 1096 1097 Based on / tested by naddy@ 1098 1099 OpenBSD-Commit-ID: d98f32dc62d7663ff4660e4556e184032a0db123 1100 1101commit b5fd97896b59a3a46245cf438cc8b16c795d9f74 1102Author: djm@openbsd.org <djm@openbsd.org> 1103Date: Mon Sep 4 00:04:02 2023 +0000 1104 1105 upstream: avoid bogus "obfuscate_keystroke_timing: stopping ..." 1106 1107 debug messages when keystroke timing obfuscation was never started; spotted 1108 by naddy@ 1109 1110 OpenBSD-Commit-ID: 5c270d35f7d2974db5c1646e9c64188f9393be31 1111 1112commit ccf7d913db34e49b7a6db1b8331bd402004c840d 1113Author: djm@openbsd.org <djm@openbsd.org> 1114Date: Mon Sep 4 00:01:46 2023 +0000 1115 1116 upstream: make channel_output_poll() return a flag indicating 1117 1118 whether channel data was enqueued. Will be used to improve keystroke timing 1119 obfuscation. Problem spotted by / tested by naddy@ 1120 1121 OpenBSD-Commit-ID: f9776c7b0065ba7c3bbe50431fd3b629f44314d0 1122 1123commit 43254b326ac6e2131dbd750f9464dc62c14bd5a7 1124Author: djm@openbsd.org <djm@openbsd.org> 1125Date: Sun Sep 3 23:59:32 2023 +0000 1126 1127 upstream: set interactive mode for ControlPersist sessions if they 1128 1129 originally requested a tty; enables keystroke timing obfuscation for most 1130 ControlPersist sessions. Spotted by naddy@ 1131 1132 OpenBSD-Commit-ID: 72783a26254202e2f3f41a2818a19956fe49a772 1133 1134commit ff3eda68ceb2e2bb8f48e3faceb96076c3e85c20 1135Author: Darren Tucker <dtucker@dtucker.net> 1136Date: Thu Aug 31 23:02:35 2023 +1000 1137 1138 Set LLONG_MAX for C89 test. 1139 1140 If we don't have LLONG_MAX, configure will figure out that it can get it 1141 by setting -std=gnu99, at which point we won't be testing C89 any more. 1142 To avoid this, feed it in via CFLAGS. 1143 1144commit f98031773db361424d59e3301aa92aacf423d920 1145Author: djm@openbsd.org <djm@openbsd.org> 1146Date: Tue Aug 29 02:50:10 2023 +0000 1147 1148 upstream: make PerSourceMaxStartups first-match-wins; ok dtucker@ 1149 1150 OpenBSD-Commit-ID: dac0c24cb709e3c595b8b4f422a0355dc5a3b4e7 1151 1152commit cfa66857db90cd908de131e0041a50ffc17c7df8 1153Author: djm@openbsd.org <djm@openbsd.org> 1154Date: Mon Aug 28 09:52:09 2023 +0000 1155 1156 upstream: descriptive text shouldn't be under .Cm 1157 1158 OpenBSD-Commit-ID: b1afaeb456a52bc8a58f4f9f8b2f9fa8f6bf651b 1159 1160commit 01dbf3d46651b7d6ddf5e45d233839bbfffaeaec 1161Author: djm@openbsd.org <djm@openbsd.org> 1162Date: Mon Aug 28 09:48:11 2023 +0000 1163 1164 upstream: limit artificial login delay to a reasonable maximum (5s) 1165 1166 and don't delay at all for the "none" authentication mechanism. Patch by 1167 Dmitry Belyavskiy in bz3602 with polish/ok dtucker@ 1168 1169 OpenBSD-Commit-ID: 85b364676dd84cf1de0e98fc2fbdcb1a844ce515 1170 1171commit 528da5b9d7c5da01ed7a73ff21c722e1b5326006 1172Author: jmc@openbsd.org <jmc@openbsd.org> 1173Date: Mon Aug 28 05:32:28 2023 +0000 1174 1175 upstream: add spacing for punctuation when macro args; 1176 1177 OpenBSD-Commit-ID: e80343c16ce0420b2aec98701527cf90371bd0db 1178 1179commit 3867361ca691d0956ef7d5fb8181cf554a91d84a 1180Author: djm@openbsd.org <djm@openbsd.org> 1181Date: Mon Aug 28 04:06:52 2023 +0000 1182 1183 upstream: explicit long long type in timing calculations (doesn't 1184 1185 matter, since the range is pre-clamped) 1186 1187 OpenBSD-Commit-ID: f786ed902d04a5b8ecc581d068fea1a79aa772de 1188 1189commit 7603ba71264e7fa938325c37eca993e2fa61272f 1190Author: djm@openbsd.org <djm@openbsd.org> 1191Date: Mon Aug 28 03:31:16 2023 +0000 1192 1193 upstream: Add keystroke timing obfuscation to the client. 1194 1195 This attempts to hide inter-keystroke timings by sending interactive 1196 traffic at fixed intervals (default: every 20ms) when there is only a 1197 small amount of data being sent. It also sends fake "chaff" keystrokes 1198 for a random interval after the last real keystroke. These are 1199 controlled by a new ssh_config ObscureKeystrokeTiming keyword/ 1200 1201 feedback/ok markus@ 1202 1203 OpenBSD-Commit-ID: 02231ddd4f442212820976068c34a36e3c1b15be 1204 1205commit dce6d80d2ed3cad2c516082682d5f6ca877ef714 1206Author: djm@openbsd.org <djm@openbsd.org> 1207Date: Mon Aug 28 03:28:43 2023 +0000 1208 1209 upstream: Introduce a transport-level ping facility 1210 1211 This adds a pair of SSH transport protocol messages SSH2_MSG_PING/PONG 1212 to implement a ping capability. These messages use numbers in the "local 1213 extensions" number space and are advertised using a "ping@openssh.com" 1214 ext-info message with a string version number of "0". 1215 1216 ok markus@ 1217 1218 OpenBSD-Commit-ID: b6b3c4cb2084c62f85a8dc67cf74954015eb547f 1219 1220commit d2d247938b38b928f8a6e1a47a330c5584d3a358 1221Author: tobhe@openbsd.org <tobhe@openbsd.org> 1222Date: Mon Aug 21 21:16:18 2023 +0000 1223 1224 upstream: Log errors in kex_exchange_identification() with level 1225 1226 verbose instead of error to reduce preauth log spam. All of those get logged 1227 with a more generic error message by sshpkt_fatal(). 1228 1229 feedback from sthen@ 1230 ok djm@ 1231 1232 OpenBSD-Commit-ID: bd47dab4695b134a44c379f0e9a39eed33047809 1233 1234commit 9d7193a8359639801193ad661a59d1ae4dc3d302 1235Author: djm@openbsd.org <djm@openbsd.org> 1236Date: Mon Aug 21 04:59:54 2023 +0000 1237 1238 upstream: correct math for ClientAliveInterval that caused the 1239 1240 probes to be sent less frequently than configured; from Dawid Majchrzak 1241 1242 OpenBSD-Commit-ID: 641153e7c05117436ddfc58267aa267ca8b80038 1243 1244commit 3c6ab63b383b0b7630da175941e01de9db32a256 1245Author: Darren Tucker <dtucker@dtucker.net> 1246Date: Fri Aug 25 14:48:02 2023 +1000 1247 1248 Include Portable version in sshd version string. 1249 1250 bz#3608, ok djm@ 1251 1252commit 17fa6cd10a26e193bb6f65d21264d2fe553bcd87 1253Author: Darren Tucker <dtucker@dtucker.net> 1254Date: Mon Aug 21 19:47:58 2023 +1000 1255 1256 obsd-arm64 host is real hardware... 1257 1258 so put in the correct config location. 1259 1260commit 598ca75c85acaaacee5ef954251e489cc20d7be9 1261Author: Darren Tucker <dtucker@dtucker.net> 1262Date: Mon Aug 21 18:38:36 2023 +1000 1263 1264 Add OpenBSD ARM64 test host. 1265 1266commit 1acac79bfbe207e8db639e8043524962037c8feb 1267Author: Darren Tucker <dtucker@dtucker.net> 1268Date: Mon Aug 21 18:05:26 2023 +1000 1269 1270 Add test for zlib development branch. 1271 1272commit 84efebf352fc700e9040c8065707c63caedd36a3 1273Author: djm@openbsd.org <djm@openbsd.org> 1274Date: Mon Aug 21 04:36:46 2023 +0000 1275 1276 upstream: want stdlib.h for free(3) 1277 1278 OpenBSD-Commit-ID: 743af3c6e3ce5e6cecd051668f0327a01f44af29 1279 1280commit cb4ed12ffc332d1f72d054ed92655b5f1c38f621 1281Author: Darren Tucker <dtucker@dtucker.net> 1282Date: Sat Aug 19 07:39:08 2023 +1000 1283 1284 Fix zlib version check for 1.3 and future version. 1285 1286 bz#3604. 1287 1288commit 25b75e21f16bccdaa472ea1889b293c9bd51a87b 1289Author: Darren Tucker <dtucker@dtucker.net> 1290Date: Mon Aug 14 11:10:08 2023 +1000 1291 1292 Add 9.4 branch to CI status page. 1293 1294commit 803e22eabd3ba75485eedd8b7b44d6ace79f2052 1295Author: djm@openbsd.org <djm@openbsd.org> 1296Date: Fri Aug 18 01:37:41 2023 +0000 1297 1298 upstream: fix regression in OpenSSH 9.4 (mux.c r1.99) that caused 1299 1300 multiplexed sessions to ignore SIGINT under some circumstances. Reported by / 1301 feedback naddy@, ok dtucker@ 1302 1303 OpenBSD-Commit-ID: 4d5c6c894664f50149153fd4764f21f43e7d7e5a 1304 1305commit e706bca324a70f68dadfd0ec69edfdd486eed23a 1306Author: djm@openbsd.org <djm@openbsd.org> 1307Date: Wed Aug 16 16:14:11 2023 +0000 1308 1309 upstream: defence-in-depth MaxAuthTries check in monitor; ok markus 1310 1311 OpenBSD-Commit-ID: 65a4225dc708e2dae71315adf93677edace46c21 1312 1313commit d1ab7eb90474df656d5e9935bae6df0bd000d343 1314Author: djm@openbsd.org <djm@openbsd.org> 1315Date: Mon Aug 14 03:37:00 2023 +0000 1316 1317 upstream: add message number of SSH2_MSG_NEWCOMPRESS defined in RFC8308 1318 1319 OpenBSD-Commit-ID: 6c984171c96ed67effd7b5092f3d3975d55d6028 1320 1321commit fa8da52934cb7dff6f660a143276bdb28bb9bbe1 1322Author: Darren Tucker <dtucker@dtucker.net> 1323Date: Sun Aug 13 15:01:27 2023 +1000 1324 1325 Add obsd72 and obsd73 test targets. 1326 1327commit f9f18006678d2eac8b0c5a5dddf17ab7c50d1e9f 1328Author: djm@openbsd.org <djm@openbsd.org> 1329Date: Thu Aug 10 23:05:48 2023 +0000 1330 1331 upstream: better debug logging of sessions' exit status 1332 1333 OpenBSD-Commit-ID: 82237567fcd4098797cbdd17efa6ade08e1a36b0 1334 1335commit a8c57bcb077f0cfdffcf9f23866bf73bb93e185c 1336Author: naddy@openbsd.org <naddy@openbsd.org> 1337Date: Thu Aug 10 14:37:32 2023 +0000 1338 1339 upstream: drop a wayward comma, ok jmc@ 1340 1341 OpenBSD-Commit-ID: 5c11fbb9592a29b37bbf36f66df50db9d38182c6 1342 1343commit e962f9b318a238db1becc53c2bf79dd3a49095b4 1344Author: Damien Miller <djm@mindrot.org> 1345Date: Thu Aug 10 11:10:22 2023 +1000 1346 1347 depend 1348 1349commit 0fcb60bf83130dfa428bc4422b3a3ac20fb528af 1350Author: Damien Miller <djm@mindrot.org> 1351Date: Thu Aug 10 11:05:42 2023 +1000 1352 1353 update versions in RPM specs 1354 1355commit d0cee4298491314f09afa1c4383a66d913150b26 1356Author: Damien Miller <djm@mindrot.org> 1357Date: Thu Aug 10 11:05:14 2023 +1000 1358 1359 update version in README 1360 1361commit 78b4dc6684f4d35943b46b24ee645edfdb9974f5 1362Author: djm@openbsd.org <djm@openbsd.org> 1363Date: Thu Aug 10 01:01:07 2023 +0000 1364 1365 upstream: openssh-9.4 1366 1367 OpenBSD-Commit-ID: 71fc1e01a4c4ea061b252bd399cda7be757e6e35 1368 1369commit 58ca4f0aa8c4306ac0a629c9a85fb1efaf4ff092 1370Author: Darren Tucker <dtucker@dtucker.net> 1371Date: Thu Aug 10 11:30:24 2023 +1000 1372 1373 Only include unistd.h once. 1374 1375commit 3961ed02dc578517a9d2535128cff5c3a5460d28 1376Author: Damien Miller <djm@mindrot.org> 1377Date: Thu Aug 10 09:08:49 2023 +1000 1378 1379 wrap poll.h include in HAVE_POLL_H 1380 1381commit e535fbe2af893046c28adfcd787c1fdbae36a24a 1382Author: dtucker@openbsd.org <dtucker@openbsd.org> 1383Date: Fri Aug 4 06:32:40 2023 +0000 1384 1385 upstream: Apply ConnectTimeout to multiplexing local socket 1386 1387 connections. If the multiplex socket exists but the connection times out, 1388 ssh will fall back to a direct connection the same way it would if the socket 1389 did not exist at all. ok djm@ 1390 1391 OpenBSD-Commit-ID: 2fbe1a36d4a24b98531b2d298a6557c8285dc1b4 1392 1393commit 9d92e7b24848fcc605945f7c2e3460c7c31832ce 1394Author: Darren Tucker <dtucker@dtucker.net> 1395Date: Thu Aug 3 19:35:33 2023 +1000 1396 1397 Fix RNG seeding for OpenSSL w/out self seeding. 1398 1399 When sshd is built with an OpenSSL that does not self-seed, it would 1400 fail in the preauth privsep process while handling a new connection. 1401 Sanity checked by djm@ 1402 1403commit f70010d9b0b3e7e95de8aa0b961e1d74362cfb5d 1404Author: djm@openbsd.org <djm@openbsd.org> 1405Date: Wed Aug 2 23:04:38 2023 +0000 1406 1407 upstream: CheckHostIP has defaulted to 'no' for a while; make the 1408 1409 commented- out config option match. From Ed Maste 1410 1411 OpenBSD-Commit-ID: e66e934c45a9077cb1d51fc4f8d3df4505db58d9 1412 1413commit c88a8788f9865d02b986d00405b9f0be65ad0b5a 1414Author: dtucker@openbsd.org <dtucker@openbsd.org> 1415Date: Tue Aug 1 08:15:04 2023 +0000 1416 1417 upstream: remove unnecessary if statement. 1418 1419 github PR#422 from eyalasulin999, ok djm@ 1420 1421 OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55 1422 1423commit 77b8b865cd5a8c79a47605c0c5b2bacf4692c4d5 1424Author: jmc@openbsd.org <jmc@openbsd.org> 1425Date: Fri Jul 28 05:42:36 2023 +0000 1426 1427 upstream: %C is a callable macro in mdoc(7) 1428 1429 so, as we do for %D, escape it; 1430 1431 OpenBSD-Commit-ID: 538cfcddbbb59dc3a8739604319491dcb8e0c0c9 1432 1433commit e0f91aa9c2fbfc951e9ced7e1305455fc614d3f2 1434Author: djm@openbsd.org <djm@openbsd.org> 1435Date: Fri Jul 28 05:33:15 2023 +0000 1436 1437 upstream: don't need to start a command here; use ssh -N instead. 1438 1439 Fixes failure on cygwin spotted by Darren 1440 1441 OpenBSD-Regress-ID: ff678a8cc69160a3b862733d935ec4a383f93cfb 1442 1443commit f446a44f30bc680e0d026a4204844b02646c1c2d 1444Author: djm@openbsd.org <djm@openbsd.org> 1445Date: Wed May 17 05:52:01 2023 +0000 1446 1447 upstream: add LTESTS_FROM variable to allow skipping of tests up to 1448 1449 a specific point. e.g. "make LTESTS_FROM=t-sftp" will only run the sftp.sh 1450 test and subsequent ones. ok dtucker@ 1451 1452 OpenBSD-Regress-ID: 07f653de731def074b29293db946042706fcead3 1453 1454commit 8eb8899d612440a9b608bee7f916081d3d0b7812 1455Author: djm@openbsd.org <djm@openbsd.org> 1456Date: Fri May 12 06:37:42 2023 +0000 1457 1458 upstream: test ChrootDirectory in Match block 1459 1460 OpenBSD-Regress-ID: a6150262f39065939f025e546af2a346ffe674c1 1461 1462commit e43f43d3f19516222e9a143468ea0dc1b3ab67b6 1463Author: djm@openbsd.org <djm@openbsd.org> 1464Date: Fri May 12 06:36:27 2023 +0000 1465 1466 upstream: better error messages 1467 1468 OpenBSD-Regress-ID: 55e4186604e80259496d841e690ea2090981bc7a 1469 1470commit 6958f00acf3b9e0b3730f7287e69996bcf3ceda4 1471Author: djm@openbsd.org <djm@openbsd.org> 1472Date: Thu Jul 27 22:26:49 2023 +0000 1473 1474 upstream: don't incorrectly truncate logged strings retrieved from 1475 1476 PKCS#11 modules; based on GHPR406 by Jakub Jelen; ok markus 1477 1478 OpenBSD-Commit-ID: 7ed1082f23a13b38c373008f856fd301d50012f9 1479 1480commit d1ffde6b55170cd4b9a72bfd9a3f17508e6cf714 1481Author: djm@openbsd.org <djm@openbsd.org> 1482Date: Thu Jul 27 22:25:17 2023 +0000 1483 1484 upstream: make sshd_config AuthorizedPrincipalsCommand and 1485 1486 AuthorizedKeysCommand accept the %D (routing domain) and a new %C (connection 1487 address/port 4-tuple) as expansion sequences; ok markus 1488 1489 OpenBSD-Commit-ID: ee9a48bf1a74c4ace71b69de69cfdaa2a7388565 1490 1491commit 999a2886ca1844a7a74b905e5f2c8c701f9838cd 1492Author: djm@openbsd.org <djm@openbsd.org> 1493Date: Thu Jul 27 22:23:05 2023 +0000 1494 1495 upstream: increase default KDF work-factor for OpenSSH format 1496 1497 private keys from 16 to 24; { feedback ok } x { deraadt markus } 1498 1499 OpenBSD-Commit-ID: a3afb1383f8ff0a49613d449f02395d9e8d4a9ec 1500 1501commit 0fa803a1dd1c7b546c166000e23a869cf6c4ec10 1502Author: Darren Tucker <dtucker@dtucker.net> 1503Date: Thu Jul 27 02:25:09 2023 +1000 1504 1505 Prefer OpenSSL's SHA256 in sk-dummy.so 1506 1507 Previously sk-dummy.so used libc's (or compat's) SHA256 since it may be 1508 built without OpenSSL. In many cases, however, including both libc's 1509 and OpenSSL's headers together caused conflicting definitions. 1510 1511 We tried working around this (on OpenSSL <1.1 you could define 1512 OPENSSL_NO_SHA, NetBSD had USE_LIBC_SHA2, various #define hacks) with 1513 varying levels of success. Since OpenSSL >=1.1 removed OPENSSL_NO_SHA 1514 and including most OpenSSL headers would bring sha.h in, even if it 1515 wasn't used directly this was a constant hassle. 1516 1517 Admit defeat and use OpenSSL's SHA256 unless we aren't using OpenSSL at 1518 all. ok djm@ 1519 1520commit 36cdb5dbf55c99c0faad06066f56a7c341258c1f 1521Author: Darren Tucker <dtucker@dtucker.net> 1522Date: Thu Jul 27 10:29:44 2023 +1000 1523 1524 Retire dfly58 test VM. Add dfly64. 1525 1526commit 2d34205dab08ede9b0676efa57647fc49e6decbe 1527Author: djm@openbsd.org <djm@openbsd.org> 1528Date: Wed Jul 26 23:06:00 2023 +0000 1529 1530 upstream: make ssh -f (fork after authentication) work properly in 1531 1532 multiplexed cases (inc. ControlPersist). bz3589 bz3589 Based on patches by 1533 Peter Chubb; ok dtucker@ 1534 1535 OpenBSD-Commit-ID: a7a2976a54b93e6767dc846b85647e6ec26969ac 1536 1537commit 076aeda86a7ee9be8fd2f0181ec7b9729a6ceb37 1538Author: naddy@openbsd.org <naddy@openbsd.org> 1539Date: Sun Jul 23 20:04:45 2023 +0000 1540 1541 upstream: man page typos; ok jmc@ 1542 1543 OpenBSD-Commit-ID: e6ddfef94b0eb867ad88abe07cedc8ed581c07f0 1544 1545commit 135e7d5fe31f700e6dfc61ce914970c5ee7175ba 1546Author: jmc@openbsd.org <jmc@openbsd.org> 1547Date: Thu Jul 20 05:43:39 2023 +0000 1548 1549 upstream: tweak the allow-remote-pkcs11 text; 1550 1551 OpenBSD-Commit-ID: bc965460a89edf76865b7279b45cf9cbdebd558a 1552 1553commit 5f83342b61d1f76c141de608ed2bd293990416bd 1554Author: Darren Tucker <dtucker@dtucker.net> 1555Date: Tue Jul 25 13:00:22 2023 +1000 1556 1557 Handle a couple more OpenSSL no-ecc cases. 1558 1559 ok djm@ 1560 1561commit edc2ef4e418e514c99701451fae4428ec04ce538 1562Author: Damien Miller <djm@mindrot.org> 1563Date: Thu Jul 20 12:53:44 2023 +1000 1564 1565 depend 1566 1567commit 51fda734e0d3c2df256fc03e8b060c4305be6e59 1568Author: Damien Miller <djm@mindrot.org> 1569Date: Thu Jul 20 12:53:21 2023 +1000 1570 1571 Bring back OPENSSL_HAS_ECC to ssh-pkcs11-client 1572 1573commit 099cdf59ce1e72f55d421c8445bf6321b3004755 1574Author: djm@openbsd.org <djm@openbsd.org> 1575Date: Wed Jul 19 14:03:45 2023 +0000 1576 1577 upstream: Separate ssh-pkcs11-helpers for each p11 module 1578 1579 Make ssh-pkcs11-client start an independent helper for each provider, 1580 providing better isolation between modules and reliability if a single 1581 module misbehaves. 1582 1583 This also implements reference counting of PKCS#11-hosted keys, 1584 allowing ssh-pkcs11-helper subprocesses to be automatically reaped 1585 when no remaining keys reference them. This fixes some bugs we have 1586 that make PKCS11 keys unusable after they have been deleted, e.g. 1587 https://bugzilla.mindrot.org/show_bug.cgi?id=3125 1588 1589 ok markus@ 1590 1591 OpenBSD-Commit-ID: 0ce188b14fe271ab0568f4500070d96c5657244e 1592 1593commit 29ef8a04866ca14688d5b7fed7b8b9deab851f77 1594Author: djm@openbsd.org <djm@openbsd.org> 1595Date: Wed Jul 19 14:02:27 2023 +0000 1596 1597 upstream: Ensure FIDO/PKCS11 libraries contain expected symbols 1598 1599 This checks via nlist(3) that candidate provider libraries contain one 1600 of the symbols that we will require prior to dlopen(), which can cause 1601 a number of side effects, including execution of constructors. 1602 1603 Feedback deraadt; ok markus 1604 1605 OpenBSD-Commit-ID: 1508a5fbd74e329e69a55b56c453c292029aefbe 1606 1607commit 1f2731f5d7a8f8a8385c6031667ed29072c0d92a 1608Author: djm@openbsd.org <djm@openbsd.org> 1609Date: Wed Jul 19 13:56:33 2023 +0000 1610 1611 upstream: Disallow remote addition of FIDO/PKCS11 provider 1612 1613 libraries to ssh-agent by default. 1614 1615 The old behaviour of allowing remote clients from loading providers 1616 can be restored using `ssh-agent -O allow-remote-pkcs11`. 1617 1618 Detection of local/remote clients requires a ssh(1) that supports 1619 the `session-bind@openssh.com` extension. Forwarding access to a 1620 ssh-agent socket using non-OpenSSH tools may circumvent this control. 1621 1622 ok markus@ 1623 1624 OpenBSD-Commit-ID: 4c2bdf79b214ae7e60cc8c39a45501344fa7bd7c 1625 1626commit 892506b13654301f69f9545f48213fc210e5c5cc 1627Author: djm@openbsd.org <djm@openbsd.org> 1628Date: Wed Jul 19 13:55:53 2023 +0000 1629 1630 upstream: terminate process if requested to load a PKCS#11 provider 1631 1632 that isn't a PKCS#11 provider; from / ok markus@ 1633 1634 OpenBSD-Commit-ID: 39532cf18b115881bb4cfaee32084497aadfa05c 1635 1636commit f3f56df8ec476b2de6cbdbdfdb77a2a61087829d 1637Author: Damien Miller <djm@mindrot.org> 1638Date: Wed Jul 19 12:07:18 2023 +1000 1639 1640 agent_fuzz doesn't want stdint.h conditionalised 1641 1642commit 750911fd31d307a767cc86e3bfa90bbbb77b1a25 1643Author: Damien Miller <djm@mindrot.org> 1644Date: Tue Jul 18 15:41:12 2023 +1000 1645 1646 conditionalise stdint.h inclusion on HAVE_STDINT_H 1647 1648 fixes build on AIX5 at least 1649 1650commit ff047504fa6e008c4092f8929881816b8993bea0 1651Author: Damien Miller <djm@mindrot.org> 1652Date: Tue Jul 18 15:30:45 2023 +1000 1653 1654 conditionalise match localnetwork on ifaddrs.h 1655 1656 Fixes build breakage on platforms that lack getifaddrs() 1657 1658commit b87b03282e466ca2927954ce93f5dbf0bfdc68f6 1659Author: djm@openbsd.org <djm@openbsd.org> 1660Date: Mon Jul 17 06:16:33 2023 +0000 1661 1662 upstream: missing match localnetwork negation check 1663 1664 OpenBSD-Commit-ID: 9a08ed8dae27d3f38cf280f1b28d4e0ff41a737a 1665 1666commit 6d6e185ba29ef4274164b77eab4dc763907f8821 1667Author: jmc@openbsd.org <jmc@openbsd.org> 1668Date: Mon Jul 17 05:41:53 2023 +0000 1669 1670 upstream: - add -P to usage() - sync the arg name to -J in usage() 1671 1672 with that in ssh.1 - reformat usage() to match what "man ssh" does on 80width 1673 1674 OpenBSD-Commit-ID: 5235dd7aa42e5bf90ae54579d519f92fc107036e 1675 1676commit f1a9898283a0638667b587ee4a950afd61ab51b0 1677Author: jmc@openbsd.org <jmc@openbsd.org> 1678Date: Mon Jul 17 05:38:10 2023 +0000 1679 1680 upstream: -P before -p in SYNOPSIS; 1681 1682 OpenBSD-Commit-ID: 535f5257c779e26c6a662a038d241b017f8cab7c 1683 1684commit eef4d7e873568e1c84c36bb4034e2c3378250a61 1685Author: jsg@openbsd.org <jsg@openbsd.org> 1686Date: Mon Jul 17 05:36:14 2023 +0000 1687 1688 upstream: configuation -> configuration 1689 1690 OpenBSD-Commit-ID: 4776ced33b780f1db0b2902faec99312f26a726b 1691 1692commit dc1dbe94cf6532bd546a3373ad436404f8850e5f 1693Author: djm@openbsd.org <djm@openbsd.org> 1694Date: Mon Jul 17 05:26:38 2023 +0000 1695 1696 upstream: move other RCSIDs to before their respective license blocks 1697 1698 too no code change 1699 1700 OpenBSD-Commit-ID: ef5bf46b57726e4260a63b032b0b5ac3b4fe9cd4 1701 1702commit ebe11044681caff78834ca6b78311ad19c1860b8 1703Author: djm@openbsd.org <djm@openbsd.org> 1704Date: Mon Jul 17 05:22:30 2023 +0000 1705 1706 upstream: Move RCSID to before license block and away from #includes, 1707 1708 where it caused merge conflict in -portable for each commit :( 1709 1710 OpenBSD-Commit-ID: 756ebac963df3245258b962e88150ebab9d5fc20 1711 1712commit 05c08e5f628de3ecf6f7ea20947735bcfa3201e0 1713Author: djm@openbsd.org <djm@openbsd.org> 1714Date: Mon Jul 17 05:20:15 2023 +0000 1715 1716 upstream: return SSH_ERR_KRL_BAD_MAGIC when a KRL doesn't contain a 1717 1718 valid magic number and not SSH_ERR_MESSAGE_INCOMPLETE; the former is needed 1719 to fall back to text revocation lists in some cases; fixes t-cert-hostkey. 1720 1721 OpenBSD-Commit-ID: 5c670a6c0f027e99b7774ef29f18ba088549c7e1 1722 1723commit c6fad2c3d19b74f0bd0af1ef040fc74f3a1d9ebb 1724Author: Damien Miller <djm@mindrot.org> 1725Date: Mon Jul 17 14:56:14 2023 +1000 1726 1727 avoid AF_LINK on platforms that don't define it 1728 1729commit 919bc3d3b712c920de1ae6be5ac6561c98886d7e 1730Author: djm@openbsd.org <djm@openbsd.org> 1731Date: Mon Jul 17 04:08:31 2023 +0000 1732 1733 upstream: Add support for configuration tags to ssh(1). 1734 1735 This adds a ssh_config(5) "Tag" directive and corresponding 1736 "Match tag" predicate that may be used to select blocks of 1737 configuration similar to the pf.conf(5) keywords of the same 1738 name. 1739 1740 ok markus 1741 1742 OpenBSD-Commit-ID: dc08358e70e702b59ac3e591827e5a96141b06a3 1743 1744commit 3071d85a47061c1bdaf11a0ac233b501ecba862c 1745Author: djm@openbsd.org <djm@openbsd.org> 1746Date: Mon Jul 17 04:04:36 2023 +0000 1747 1748 upstream: add a "match localnetwork" predicate. 1749 1750 This allows matching on the addresses of available network interfaces 1751 and may be used to vary the effective client configuration based on 1752 network location (e.g. to use a ProxyJump when not on a particular 1753 network). 1754 1755 ok markus@ 1756 1757 OpenBSD-Commit-ID: cffb6ff9a3803abfc52b5cad0aa190c5e424c139 1758 1759commit beec17bb311365b75a0a5941418d4b96df7d7888 1760Author: djm@openbsd.org <djm@openbsd.org> 1761Date: Mon Jul 17 04:01:10 2023 +0000 1762 1763 upstream: remove vestigal support for KRL signatures 1764 1765 When the KRL format was originally defined, it included support for 1766 signing of KRL objects. However, the code to sign KRLs and verify KRL 1767 signatues was never completed in OpenSSH. 1768 1769 Now, some years later, we have SSHSIG support in ssh-keygen that is 1770 more general, well tested and actually works. So this removes the 1771 semi-finished KRL signing/verification support from OpenSSH and 1772 refactors the remaining code to realise the benefit - primarily, we 1773 no longer need to perform multiple parsing passes over KRL objects. 1774 1775 ok markus@ 1776 1777 OpenBSD-Commit-ID: 517437bab3d8180f695c775410c052340e038804 1778 1779commit 449566f64c21b4578d5c0c431badd0328adc53ed 1780Author: djm@openbsd.org <djm@openbsd.org> 1781Date: Mon Jul 17 03:57:21 2023 +0000 1782 1783 upstream: Support for KRL extensions. 1784 1785 This defines wire formats for optional KRL extensions and implements 1786 parsing of the new submessages. No actual extensions are supported at 1787 this point. 1788 1789 ok markus 1790 1791 OpenBSD-Commit-ID: ae2fcde9a22a9ba7f765bd4f36b3f5901d8c3fa7 1792 1793commit 18ea857770e84825a3a6238bb37f54864487b59f 1794Author: dtucker@openbsd.org <dtucker@openbsd.org> 1795Date: Fri Jul 14 07:44:21 2023 +0000 1796 1797 upstream: Include stdint.h for SIZE_MAX. Fixes OPENSSL=no build. 1798 1799 OpenBSD-Commit-ID: e7c31034a5434f2ead3579b13a7892960651e6b0 1800 1801commit 20b768fcd13effe0f2d3619661b6c8592c773553 1802Author: Darren Tucker <dtucker@dtucker.net> 1803Date: Fri Jul 14 17:07:32 2023 +1000 1804 1805 Fix typo in declaration of nmesg. 1806 1807commit 4b94d09542e36ebde2eb9ad89bc68431609932de 1808Author: Damien Miller <djm@mindrot.org> 1809Date: Fri Jul 14 15:34:47 2023 +1000 1810 1811 portable-specific int overflow defence-in-depth 1812 1813 These too are unreachable, but we want the code to be safe regardless of 1814 context. Reported by Yair Mizrahi @ JFrog 1815 1816commit 2ee48adb9fc8692e8d6ac679dcc9f35e89ad68f0 1817Author: djm@openbsd.org <djm@openbsd.org> 1818Date: Fri Jul 14 05:31:44 2023 +0000 1819 1820 upstream: add defence-in-depth checks for some unreachable integer 1821 1822 overflows reported by Yair Mizrahi @ JFrog; feedback/ok millert@ 1823 1824 OpenBSD-Commit-ID: 52af085f4e7ef9f9d8423d8c1840a6a88bda90bd 1825 1826commit 4b43bc358ae6f6b19a973679246dc5172f6ac41b 1827Author: djm@openbsd.org <djm@openbsd.org> 1828Date: Mon Jul 10 04:51:26 2023 +0000 1829 1830 upstream: misplaced debug message 1831 1832 OpenBSD-Commit-ID: d0f12af0a5067a756aa707bc39a83fa6f58bf7e5 1833 1834commit 8c7203bcee4c4f98a22487b4631fe068b992099b 1835Author: Damien Miller <djm@mindrot.org> 1836Date: Wed Jul 12 11:41:19 2023 +1000 1837 1838 replace deprecate selinux matchpathcon function 1839 1840 This function is apparently deprecated. Documentation on what is the 1841 supposed replacement is is non-existent, so this follows the approach 1842 glibc used https://sourceware.org/git/?p=glibc.git;a=patch;h=f278835f59 1843 1844 ok dtucker@ 1845 1846commit 7e8800f5d701efffa39ccb63ca1e095ea777c31a 1847Author: dtucker@openbsd.org <dtucker@openbsd.org> 1848Date: Thu Jul 6 22:17:59 2023 +0000 1849 1850 upstream: minleft and maxsign are u_int so cast appropriately. Prompted 1851 1852 by github PR#410, ok deraadt. 1853 1854 OpenBSD-Commit-ID: 0514cd51db3ec60239966622a0d3495b15406ddd 1855 1856commit 94842bfe9b09fc93189c6ed0dc9bbebc1d44a426 1857Author: dlg@openbsd.org <dlg@openbsd.org> 1858Date: Tue Jul 4 03:59:21 2023 +0000 1859 1860 upstream: add support for unix domain sockets to ssh -W 1861 1862 ok djm@ dtucker@ 1863 1864 OpenBSD-Commit-ID: 3e6d47567b895c7c28855c7bd614e106c987a6d8 1865 1866commit a95fc5eed09a0238fb127b6c50e8498432b79dae 1867Author: David Seifert <soap@gentoo.org> 1868Date: Fri May 12 14:06:01 2023 +0200 1869 1870 gss-serv.c: `MAXHOSTNAMELEN` -> `HOST_NAME_MAX` 1871 1872 `MAXHOSTNAMELEN` is not defined in POSIX, which breaks on musl: 1873 https://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html 1874 1875 Bug: https://bugs.gentoo.org/834044 1876 1877commit 8a6cd08850f576e7527c52a1b086cae82fab290e 1878Author: Darren Tucker <dtucker@dtucker.net> 1879Date: Fri Jun 23 09:49:02 2023 +1000 1880 1881 Update runner OS version for hardenedmalloc test. 1882 1883 Hardenedmalloc dropped support for "legacy glibc" versions in their 1884 64dad0a69 so use a newer Ubuntu version for the runner for that test. 1885 1886commit cfca6f17e64baed6822bb927ed9f372ce64d9c5b 1887Author: Damien Miller <djm@mindrot.org> 1888Date: Thu Jun 22 15:04:03 2023 +1000 1889 1890 handle sysconf(SC_OPEN_MAX) returning > INT_MAX; 1891 1892 bz3581; ok dtucker 1893 1894commit c1c2ca1365b3f7b626683690bd2c68265f6d8ffd 1895Author: djm@openbsd.org <djm@openbsd.org> 1896Date: Wed Jun 21 05:10:26 2023 +0000 1897 1898 upstream: better validate CASignatureAlgorithms in ssh_config and 1899 1900 sshd_config. 1901 1902 Previously this directive would accept certificate algorithm names, but 1903 these were unusable in practice as OpenSSH does not support CA chains. 1904 1905 part of bz3577; ok dtucker@ 1906 1907 OpenBSD-Commit-ID: a992d410c8a78ec982701bc3f91043dbdb359912 1908 1909commit 4e73cd0f4ab3e5b576c56cac9732da62c8fc0565 1910Author: djm@openbsd.org <djm@openbsd.org> 1911Date: Wed Jun 21 05:08:32 2023 +0000 1912 1913 upstream: make `ssh -Q CASignatureAlgorithms` only list signature 1914 1915 algorithms that are valid for CA signing. Previous behaviour was to list all 1916 signing algorithms, including certificate algorithms (OpenSSH certificates do 1917 not support CA chains). part of bz3577; ok dtucker@ 1918 1919 OpenBSD-Commit-ID: 99c2b072dbac0f44fd1f2269e3ff6c1b5d7d3e59 1920 1921commit a69062f1695ac9c3c3dea29d3044c72aaa6af0ea 1922Author: djm@openbsd.org <djm@openbsd.org> 1923Date: Wed Jun 21 05:06:04 2023 +0000 1924 1925 upstream: handle rlimits > INT_MAX (rlim_t is u64); ok dtucker 1926 1927 bz3581 1928 1929 OpenBSD-Commit-ID: 31cf59c041becc0e5ccb0a77106f812c4cd1cd74 1930 1931commit 8d33f2aa6bb895a7f85a47189913639086347b75 1932Author: djm@openbsd.org <djm@openbsd.org> 1933Date: Tue Jun 20 23:59:33 2023 +0000 1934 1935 upstream: prepare for support for connecting to unix domain sockets 1936 1937 using ssh -W by explicitly decoding PORT_STREAMLOCAL (a negative number) from 1938 the u32 that's passed over the multiplexing socket; previously code would 1939 just cast, which is UB. 1940 1941 OpenBSD-Commit-ID: e5ac5f40d354096c51e8c118a5c1b2d2b7a31384 1942 1943commit b4ac435b4e67f8eb5932d8f59eb5b3cf7dc38df0 1944Author: djm@openbsd.org <djm@openbsd.org> 1945Date: Tue Jun 20 00:05:09 2023 +0000 1946 1947 upstream: reset comment=NULL for each key in do_fingerprint(); 1948 1949 fixes "no comment" not showing on when running `ssh-keygen -l` on multiple 1950 keys where one has a comment and other following keys do not. Patch from 1951 Markus Kuhn via GHPR407, bz3580 1952 1953 OpenBSD-Commit-ID: 3cce84456fdcd67dc6b84e369f92c6686d111d9b 1954 1955commit b53a809a549dcd4fbde554c6aa283e597b15ea33 1956Author: millert@openbsd.org <millert@openbsd.org> 1957Date: Mon Jun 5 13:24:36 2023 +0000 1958 1959 upstream: Store timeouts as int, not u_int as they are limited to 1960 1961 INT_MAX. Fixes sign compare warnings systems with 32-bit time_t due to type 1962 promotion. OK djm@ 1963 1964 OpenBSD-Commit-ID: 48081e9ad35705c5f1705711704a4c2ff94e87b7 1965 1966commit 2709809fd616a0991dc18e3a58dea10fb383c3f0 1967Author: Philip Hands <phil@hands.com> 1968Date: Wed May 24 19:41:14 2023 +0200 1969 1970 fixup! if -s & -p specified, mention 'sftp -P' on 1971 1972 success 1973 1974 SSH-Copy-ID-Upstream: 32686e7c65b4fa2846e474d3315102dfa0f043b0 1975 1976commit 204e0bf05161b7641500d7ab266c21217412379f 1977Author: Darren Tucker <dtucker@dtucker.net> 1978Date: Tue Aug 3 21:25:48 2021 +1000 1979 1980 Make ssh-copy-id(1) consistent with OpenSSH. 1981 1982 This makes the ssh-copy-id man page more consistent with the rest of the 1983 OpenSSH man pages: 1984 - new sentence, new line 1985 - no sentences >80 1986 - N.B. -> NB 1987 - zap unused .Pp 1988 - zap trailing whitespace 1989 1990 Report from Debian via mindrot bz#3331, diff from jmc at openbsd.org. 1991 1992 SSH-Copy-ID-Upstream: d8974cfb6242316460ed22a1ccc662800a50c5d3 1993 1994commit 9de79df66d1430d290fab670bb4b18612875e518 1995Author: Philip Hands <phil@hands.com> 1996Date: Wed May 24 11:45:43 2023 +0200 1997 1998 if -s & -p specified, mention 'sftp -P' on success 1999 2000 This was inspired by this: 2001 https://github.com/openssh/openssh-portable/pull/321 2002 but I thought that it was better to not do the sed patching. 2003 2004 BTW the reason one can get away with using $SSH_OPTS throughout, despite 2005 the lowercase -p in there, even if sftp is in use, is that the sftp call 2006 is using the already-established ssh master connection, so the port was 2007 passed to the earlier ssh. 2008 2009 SSH-Copy-ID-Upstream: 1c124d9bfafdbe28a00b683367ebf5750ce12eb2 2010 2011commit 801cda54c00e0f4e7d89345a90874c8d05dc233a 2012Author: Philip Hands <phil@hands.com> 2013Date: Tue May 23 23:07:11 2023 +0200 2014 2015 drop whitespace 2016 2017 SSH-Copy-ID-Upstream: e604fae1cdee35c18055d35dcec530cf12ef00ad 2018 2019commit 288482f53613f3e74544eb92deeb24f7c7f1f371 2020Author: Philip Hands <phil@hands.com> 2021Date: Tue May 23 20:52:13 2023 +0200 2022 2023 make -x also apply to the target script 2024 2025 SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4 2026 2027commit b79e7b88ed44f0e4339f0ff35c96c78a92175a8d 2028Author: Philip Hands <phil@hands.com> 2029Date: Tue May 23 16:46:42 2023 +0200 2030 2031 add -t option to specify the target path 2032 2033 Allow the default target path (.ssh/authorized_files) to be over-riden 2034 2035 This was inspired by this MR from Panagiotis Cheilaris <philaris@cs.ntua.gr> 2036 2037 https://gitlab.com/phil_hands/ssh-copy-id/-/merge_requests/8 2038 2039 SSH-Copy-ID-Upstream: a942a0e076874adb6d8b2f0fb76d6c7918190fcd 2040 2041commit 914f4ad138714c471ba72fb6d5496b6235320edd 2042Author: Carlos Rodríguez Gili <carlos.rodriguez-gili@upc.edu> 2043Date: Tue Apr 20 19:23:57 2021 +0200 2044 2045 Fix test error for /bin/sh on Solaris 10 and older 2046 2047 On Solaris 10 and older targets /bin/sh is not POSIX-compliant. 2048 Test -z `...` fails with error 'sh: test: argument expected'. 2049 Using quotes around backticks fixes this and doesn't break 2050 POSIX compatibility. 2051 2052 SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065 2053 2054commit bd382dca316c721aed1e45edcf4c4e0f6374afb0 2055Author: Jakub Jelen <jjelen@redhat.com> 2056Date: Tue Mar 2 21:34:05 2021 +0000 2057 2058 Remove outdated comment 2059 2060 The commit b068122 removed the code dropping the trailing colon, but the comment stayed leaving the code confusing for future readers 2061 2062 SSH-Copy-ID-Upstream: 930d39f238117cd53810240ec989d0356aa1c1f6 2063 2064commit bdcaf7939029433635d63aade8f9ac762aca2bbe 2065Author: Darren Tucker <dtucker@dtucker.net> 2066Date: Wed May 10 18:50:46 2023 +1000 2067 2068 Special case OpenWrt instead of Dropbear. 2069 2070 OpenWrt overrides the location of authorized_keys for root. Currently we 2071 assume that all Dropbear installations behave this way, which is not the 2072 case. Check for OpenWrt and root user before using that location instead 2073 of assuming that for all Dropbear servers. Prompted by Github PR#250. 2074 2075 SSH-Copy-ID-Upstream: 0e1f5d443a9967483c33945793107ae3f3e4af2d 2076 2077commit cf84498f67abe93f813a296167b406a0db7b288e 2078Author: Philip Hands <phil@hands.com> 2079Date: Thu May 18 18:20:55 2023 +0200 2080 2081 ssh-copy-id: add -x option (for debugging) 2082 2083 This option causes the ssh-copy-id to run with set -x 2084 2085 SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844 2086 2087commit b4a1efdcb88f03394c08e7f68ed4e11676830002 2088Author: Philip Hands <phil@hands.com> 2089Date: Thu May 18 17:14:41 2023 +0200 2090 2091 update copyright notices 2092 2093 SSH-Copy-ID-Upstream: c284ed33b361814ea48ff68cbd01ca525b2bf117 2094 2095commit fcd78e31cdd45a7e69ccfe6d8a3b1037dc1de290 2096Author: djm@openbsd.org <djm@openbsd.org> 2097Date: Wed May 24 23:01:06 2023 +0000 2098 2099 upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand 2100 2101 appears previously in configuration. Reported by John Meyers in bz3574 ok 2102 dtucker@ 2103 2104 OpenBSD-Commit-ID: 1c92e4517284386703936e1d3abaa36cfacf1951 2105 2106commit 5ec5504f1d328d5bfa64280cd617c3efec4f78f3 2107Author: dtucker@openbsd.org <dtucker@openbsd.org> 2108Date: Wed May 10 10:04:20 2023 +0000 2109 2110 upstream: Remove unused prototypes for ssh1 RSA functions. 2111 2112 From lengyijun via github PR#396. 2113 2114 OpenBSD-Commit-ID: 379a5afa8b7a0f3cba0c8a9bcceb4e5e33a5c1ef 2115 2116commit fbf362b3891ae4b36052d1b39f37fc618b41c476 2117Author: Darren Tucker <dtucker@dtucker.net> 2118Date: Tue May 9 19:26:56 2023 +1000 2119 2120 main(void) to prevent unused variable warning. 2121 2122commit baf854c8bb0a6d0af5c696c801e631a48dabbaba 2123Author: Darren Tucker <dtucker@dtucker.net> 2124Date: Tue May 9 19:25:45 2023 +1000 2125 2126 Remove warning pragma since clang doesn't like it. 2127 2128commit 5fbb7a1349fbbb48ccb1b8cafff2c1854370d87d 2129Author: Darren Tucker <dtucker@dtucker.net> 2130Date: Tue May 9 17:13:33 2023 +1000 2131 2132 Suppress warning for snprintf truncation test. 2133 2134commit 47742c513e4e045ecc985c6483fc5c8b050acda2 2135Author: Darren Tucker <dtucker@dtucker.net> 2136Date: Tue May 9 17:12:50 2023 +1000 2137 2138 Update OpenSSL compat test for 3.x. 2139 2140commit 86ad25d455a2313126125540e61e0f9314283f88 2141Author: Darren Tucker <dtucker@dtucker.net> 2142Date: Mon May 8 20:23:08 2023 +1000 2143 2144 Add macos13 PAM test target. 2145 2146commit 77cca2c4b13bc6e5f389565583b6202b0d1bccc2 2147Author: Darren Tucker <dtucker@dtucker.net> 2148Date: Mon May 8 20:14:46 2023 +1000 2149 2150 Skip agent-peereid test on macos13. 2151 2152 sudo -S nobody doesn't work on the github runners (probably a 2153 permission issue) so skip that test. 2154 2155commit b356b8e91678ea295bcf44df5248c3fbf499fdcf 2156Author: Darren Tucker <dtucker@dtucker.net> 2157Date: Mon May 8 20:14:28 2023 +1000 2158 2159 Include config.guess in debug output. 2160 2161commit b7afd8a4ecaca8afd3179b55e9db79c0ff210237 2162Author: Darren Tucker <dtucker@dtucker.net> 2163Date: Mon May 8 20:12:59 2023 +1000 2164 2165 Handle OpenSSL >=3 ABI compatibility. 2166 2167 Beyond OpenSSL 3.0, the ABI compatibility guarantees are wider (only 2168 major must match instead of major and minor in earlier versions). 2169 bz#3548, ok djm@ 2170 2171commit 0e9e2663eb2c6e9c3e10d15d70418312ae67e542 2172Author: dtucker@openbsd.org <dtucker@openbsd.org> 2173Date: Mon May 1 08:57:29 2023 +0000 2174 2175 upstream: Import regenerated moduli. 2176 2177 OpenBSD-Commit-ID: 3d5f811cfcaed8cc4a97e1db49ac61bdf118113c 2178 2179commit d9687f49682e1e93383fc15ab2018850b2ef38c3 2180Author: Darren Tucker <dtucker@dtucker.net> 2181Date: Mon May 1 11:45:14 2023 +1000 2182 2183 Add macos-13 test target. 2184 2185 Also flatten OS list for clarity. 2186 2187commit aacfd6767497b8fa6d41ecdd3f8e265d1e9ef1f6 2188Author: djm@openbsd.org <djm@openbsd.org> 2189Date: Sun Apr 30 22:54:22 2023 +0000 2190 2191 upstream: adjust ftruncate() logic to handle servers that reorder 2192 2193 requests. 2194 2195 sftp/scp will ftruncate the destination file after a transfer completes, 2196 to deal with the case where a longer destination file already existed. 2197 We tracked the highest contiguous block transferred to deal with this 2198 case, but our naive tracking doesn't deal with servers that reorder 2199 requests - a misfeature strictly permitted by the protocol but seldom 2200 implemented. 2201 2202 Adjust the logic to ftruncate() at the highest absolute block received 2203 when the transfer is successful. feedback deraadt@ ok markus@ 2204 2205 prompted by https://github.com/openssh/openssh-portable/commit/9b733#commitcomment-110679778 2206 2207 OpenBSD-Commit-ID: 4af7fac75958ad8507b4fea58706f3ff0cfddb1b 2208 2209commit c8eb3941758615c8284a48fff47872db926da63c 2210Author: djm@openbsd.org <djm@openbsd.org> 2211Date: Wed Apr 26 01:36:03 2023 +0000 2212 2213 upstream: Check for ProxyJump=none in CanonicalizeHostname logic. 2214 2215 Previously ssh would incorrectly refuse to canonicalise the hostname 2216 if ProxyJump was explicitly set to "none" when CanonicalizeHostname=yes 2217 2218 bz3567; ok dtucker 2219 2220 OpenBSD-Commit-ID: 80a58e43c3a32f97361282f756ec8d3f37989efd 2221 2222commit ac383f3a5c6f529a2e8a5bc44af79a08c7da294e 2223Author: jsg@openbsd.org <jsg@openbsd.org> 2224Date: Wed Apr 12 14:22:04 2023 +0000 2225 2226 upstream: remove duplicate signal.h include 2227 2228 OpenBSD-Commit-ID: 30c0a34d74d91ddd0e6992525da70d3293392f70 2229 2230commit 740dafa20f3f3d325f6f5d44e990b8c8a6d3d816 2231Author: jsg@openbsd.org <jsg@openbsd.org> 2232Date: Wed Apr 12 08:53:54 2023 +0000 2233 2234 upstream: fix double words ok dtucker@ 2235 2236 OpenBSD-Commit-ID: 44d3223902fbce5276422bdc8063ab72a4078489 2237 2238commit 6452f89577ec4f22440c31b8e19b061d1a7c4b2a 2239Author: Darren Tucker <dtucker@dtucker.net> 2240Date: Tue Apr 11 16:49:19 2023 +1000 2241 2242 Test against LibreSSL 3.7.2. 2243 2244commit 2138f6be595ca106fe4805a1e3ab9c4d8acc697b 2245Author: Damien Miller <djm@mindrot.org> 2246Date: Thu Apr 6 14:33:10 2023 +1000 2247 2248 remove unused upper-case const strings in fmtfp 2249 2250 no float format that uses upper-case is supported nor are hex floats. 2251 ok dtucker 2252 2253commit 484c5e6168fdb22cbcd73c4ff987cf9ca47989ca 2254Author: djm@openbsd.org <djm@openbsd.org> 2255Date: Thu Apr 6 03:56:02 2023 +0000 2256 2257 upstream: simplify sshsig_find_principals() similar to what happened to 2258 2259 sshsig_check_allowed_keys() in r1.31, removing some dead code 2260 2261 OpenBSD-Commit-ID: a493e628d4d6c08f878c276d998f4313ba61702d 2262 2263commit 3a7b110fbc7e096423f8f7b459deffe4c65d70f4 2264Author: djm@openbsd.org <djm@openbsd.org> 2265Date: Thu Apr 6 03:21:31 2023 +0000 2266 2267 upstream: remove redundant ssh!=NULL check; we'd already 2268 2269 dereferenced it 2270 2271 OpenBSD-Commit-ID: 852bf12591ec5a9fb12dcbde9b1fd3945ad0df3c 2272 2273commit 2519110659a1efac6c976895a86659d1b341c91b 2274Author: djm@openbsd.org <djm@openbsd.org> 2275Date: Thu Apr 6 03:19:32 2023 +0000 2276 2277 upstream: match_user() shouldn't be called with user==NULL unless 2278 2279 host and ipaddr are also NULL 2280 2281 OpenBSD-Commit-ID: fa3518346c21483e9e01a2e4b9436ae501daf8ea 2282 2283commit 3b9ceaad7ad63c1c03c2a89e148340ad3a62a482 2284Author: djm@openbsd.org <djm@openbsd.org> 2285Date: Thu Apr 6 03:12:32 2023 +0000 2286 2287 upstream: don't care about glob() return value here. 2288 2289 OpenBSD-Commit-ID: 85bb82fea90478a482e9f65a1bec0aa24227fd66 2290 2291commit 09d8da0849e2791b2500267cda333cd238f38754 2292Author: dtucker@openbsd.org <dtucker@openbsd.org> 2293Date: Mon Apr 3 08:10:54 2023 +0000 2294 2295 upstream: Move up null check and simplify process_escapes. 2296 2297 Based on Coverity CID 291863 which points out we check the channel 2298 pointer for NULLness after dereferencing it. Move this to the start 2299 of the function, and while there simplify initialization of efc a bit. 2300 ok djm@ 2301 2302 OpenBSD-Commit-ID: de36e5ad6fde0fe263ca134e986b9095dc59380a 2303 2304commit b36b162be5e6206f12b734222b7bc517c13a6bc8 2305Author: Damien Miller <djm@mindrot.org> 2306Date: Fri Mar 31 14:51:20 2023 +1100 2307 2308 need va_end() after va_copy(); ok dtucker 2309 2310 spotted by Coverity 2311 2312commit f703757234a5c585553e72bba279b255a272750a 2313Author: dtucker@openbsd.org <dtucker@openbsd.org> 2314Date: Fri Mar 31 05:56:36 2023 +0000 2315 2316 upstream: Explicitly ignore return from waitpid here too. 2317 2318 OpenBSD-Commit-ID: eef2403df083c61028969fc679ee370373eacacb 2319 2320commit 6b73aa29035991d1448a1a76f63ac152a6bf931c 2321Author: dtucker@openbsd.org <dtucker@openbsd.org> 2322Date: Fri Mar 31 04:45:08 2023 +0000 2323 2324 upstream: Explictly ignore return codes 2325 2326 where we don't check them. 2327 2328 OpenBSD-Commit-ID: 1ffb03038ba1b6b72667be50cf5e5e396b5f2740 2329 2330commit 6f0308a3e717ebe68eeb3f95253612fab5dbf20e 2331Author: dtucker@openbsd.org <dtucker@openbsd.org> 2332Date: Fri Mar 31 04:42:29 2023 +0000 2333 2334 upstream: Return immediately from get_sock_port 2335 2336 if sock <0 so we don't call getsockname on a negative FD. From Coverity 2337 CID 291840, ok djm@ 2338 2339 OpenBSD-Commit-ID: de1c1130646230c2eda559831fc6bfd1b61d9618 2340 2341commit 1c1124dc901fca1ea2cb762044b8f1a5793a2bed 2342Author: djm@openbsd.org <djm@openbsd.org> 2343Date: Fri Mar 31 04:23:02 2023 +0000 2344 2345 upstream: don't leak arg2 on parse_pubkey_algos error path; ok 2346 2347 dtucker@ 2348 2349 OpenBSD-Commit-ID: 7d0270ad3dd102412ca76add2b3760518abdef75 2350 2351commit 8ba2d4764bb6a4701cd447d8b52604622ffe65f4 2352Author: djm@openbsd.org <djm@openbsd.org> 2353Date: Fri Mar 31 04:22:27 2023 +0000 2354 2355 upstream: clamp max number of GSSAPI mechanisms to 2048; ok dtucker 2356 2357 OpenBSD-Commit-ID: ce66db603a913d3dd57063e330cb5494d70722c4 2358 2359commit 1883841fc13d0eada8743cac5d3abe142ee2efa7 2360Author: djm@openbsd.org <djm@openbsd.org> 2361Date: Fri Mar 31 04:21:56 2023 +0000 2362 2363 upstream: don't print key if printing hostname failed; with/ok 2364 2365 dtucker@ 2366 2367 OpenBSD-Commit-ID: ad42971a6ee5a46feab2d79f7f656f8cf4b119f3 2368 2369commit c6011129cafe4c411f6ef670a4cf271314708eb8 2370Author: djm@openbsd.org <djm@openbsd.org> 2371Date: Fri Mar 31 04:04:15 2023 +0000 2372 2373 upstream: remove redundant test 2374 2375 OpenBSD-Commit-ID: 6a0b719f9b1ae9d42ad8c5b144c7962c93792f7c 2376 2377commit 4fb29eeafb40a2076c0dbe54e46b687c318f87aa 2378Author: djm@openbsd.org <djm@openbsd.org> 2379Date: Fri Mar 31 04:00:37 2023 +0000 2380 2381 upstream: don't attempt to decode a ridiculous number of 2382 2383 attributes; harmless because of bounds elsewhere, but better to be explicit 2384 2385 OpenBSD-Commit-ID: 1a34f4b6896155b80327d15dc7ccf294b538a9f2 2386 2387commit fc437c154ef724621a4af236de9bc7e51a8381ae 2388Author: djm@openbsd.org <djm@openbsd.org> 2389Date: Fri Mar 31 03:22:49 2023 +0000 2390 2391 upstream: remove unused variable; prompted by Coverity CID 291879 2392 2393 OpenBSD-Commit-ID: 4c7d20ef776887b0ba1aabcfc1b14690e4ad0a40 2394 2395commit 0eb8131e4a53b33a8fc9b9ab694e6b6778b87ade 2396Author: dtucker@openbsd.org <dtucker@openbsd.org> 2397Date: Fri Mar 31 00:44:29 2023 +0000 2398 2399 upstream: Check fd against >=0 instead of >0 in error path. The 2400 2401 dup could in theory return fd 0 although currently it doesn't in practice. 2402 From Dmitry Belyavskiy vi github PR#238. 2403 2404 OpenBSD-Commit-ID: 4a95f3f7330394dffee5c749d52713cbf3b54846 2405 2406commit 7174ba6f8a431ca4257767a260fc50e204068242 2407Author: dtucker@openbsd.org <dtucker@openbsd.org> 2408Date: Thu Mar 30 07:19:50 2023 +0000 2409 2410 upstream: Ignore return value from muxclient(). It normally loops 2411 2412 without returning, but it if returns on failure we immediately exit. 2413 Coverity CID 405050. 2414 2415 OpenBSD-Commit-ID: ab3fde6da384ea588226037c38635a6b2e015295 2416 2417commit a4c1c2513e36f111eeaa1322c510067930e5e51e 2418Author: Damien Miller <djm@mindrot.org> 2419Date: Fri Mar 31 14:17:22 2023 +1100 2420 2421 don't call connect() on negative socket 2422 2423 Coverity CID 405037 2424 2425commit 34ee842cdd981a759fe8f0d4a37521f9a1c63170 2426Author: djm@openbsd.org <djm@openbsd.org> 2427Date: Thu Mar 30 03:05:01 2023 +0000 2428 2429 upstream: return SSH_ERR_KEY_NOT_FOUND if the allowed_signers file 2430 2431 is empty, not SSH_ERR_INTERNAL_ERROR. Also remove some dead code spotted 2432 by Coverity; with/ok dtucker@ 2433 2434 OpenBSD-Commit-ID: 898a1e817cda9869554b1f586a434f67bcc3b650 2435 2436commit f108e77a9dc9852e72215af1bf27731c48434557 2437Author: dtucker@openbsd.org <dtucker@openbsd.org> 2438Date: Thu Mar 30 00:49:37 2023 +0000 2439 2440 upstream: Remove dead code from inside if block. 2441 2442 The only way the if statement can be true is if both dup()s fail, and 2443 in that case the tmp2 can never be set. Coverity CID 291805, ok djm@ 2444 2445 OpenBSD-Commit-ID: c0d6089b3fb725015462040cd94e23237449f0c8 2446 2447commit 05b8e88ebe23db690abbfb1a91111abea09cde08 2448Author: Darren Tucker <dtucker@dtucker.net> 2449Date: Thu Mar 30 13:53:29 2023 +1100 2450 2451 child_set_eng: verify both env pointer and count. 2452 2453 If child_set env was called with a NULL env pointer and a non-zero count 2454 it would end up in a null deref, although we don't currently do this. 2455 Prompted by Coverity CID 291850, tweak & ok djm@ 2456 2457commit 28f1b8ef9b84b8cd2f6c9889a0c60aa4a90dadfa 2458Author: dtucker@openbsd.org <dtucker@openbsd.org> 2459Date: Wed Mar 29 01:07:48 2023 +0000 2460 2461 upstream: Ignore return from sshpkt_disconnect 2462 2463 since we set our own return value for the function. Coverity CID 291797, 2464 ok djm@ 2465 2466 OpenBSD-Commit-ID: 710b57ba954c139240895e23feea41f203201f04 2467 2468commit c3da05d95922f5550bcc7815e799474d6a160175 2469Author: dtucker@openbsd.org <dtucker@openbsd.org> 2470Date: Wed Mar 29 00:59:08 2023 +0000 2471 2472 upstream: Plug potential mem leak in process_put. 2473 2474 It allocates abs_dst inside a loop but only frees it on exit, so free 2475 inside the loop if necessary. Coverity CID 291837, ok djm@ 2476 2477 OpenBSD-Commit-ID: a01616503a185519b16f00dde25d34ceaf4ae1a3 2478 2479commit 13ae327eae598b1043e5ec30e4b170edb3c898a5 2480Author: djm@openbsd.org <djm@openbsd.org> 2481Date: Wed Mar 29 00:18:35 2023 +0000 2482 2483 upstream: fix memory leak; Coverity CID 291848 2484 2485 with/ok dtucker@ 2486 2487 OpenBSD-Commit-ID: 37f80cb5d075ead5a00ad1b74175684ab1156ff8 2488 2489commit 9ffa76e1284c85bf459c3dcb8e995733a8967e1b 2490Author: dtucker@openbsd.org <dtucker@openbsd.org> 2491Date: Tue Mar 28 07:44:32 2023 +0000 2492 2493 upstream: Plug more mem leaks in sftp by making 2494 2495 make_absolute_pwd_glob work in the same way as make_absolute: you 2496 pass it a dynamically allocated string and it either returns it, or 2497 frees it and allocates a new one. Patch from emaste at freebsd.org and 2498 https://reviews.freebsd.org/D37253 ok djm@ 2499 2500 OpenBSD-Commit-ID: 85f7404e9d47fd28b222fbc412678f3361d2dffc 2501 2502commit 82b2b8326962b1a98af279bc5bbbbbcab15b3e45 2503Author: dtucker@openbsd.org <dtucker@openbsd.org> 2504Date: Tue Mar 28 06:12:38 2023 +0000 2505 2506 upstream: Remove compat code for OpenSSL < 1.1.* 2507 2508 since -portable no longer supports them. 2509 2510 OpenBSD-Commit-ID: ea2893783331947cd29a67612b4e56f818f185ff 2511 2512commit b500afcf00ae1b6b73b2ccf171111dfbfeaef74d 2513Author: dtucker@openbsd.org <dtucker@openbsd.org> 2514Date: Mon Mar 27 23:56:54 2023 +0000 2515 2516 upstream: Remove compat code for OpenSSL 1.0.* 2517 2518 versions now that -portable has dropped support for those versions. 2519 2520 OpenBSD-Regress-ID: 82a8eacd87aec28e4aa19f17246ddde9d5ce7fe7 2521 2522commit 727560e6011efcb36d2f3ac6910444bc775abaa1 2523Author: Darren Tucker <dtucker@dtucker.net> 2524Date: Tue Mar 28 18:06:42 2023 +1100 2525 2526 Prevent conflicts between Solaris SHA2 and OpenSSL. 2527 2528 We used to prevent conflicts between native SHA2 headers and OpenSSL's 2529 by setting OPENSSL_NO_SHA but that was removed prior to OpenSSL 1.1.0 2530 2531commit 46db8e14b7f186d32173dcdecd5b785334429b8b 2532Author: Darren Tucker <dtucker@dtucker.net> 2533Date: Tue Mar 28 12:44:03 2023 +1100 2534 2535 Remove HEADER_SHA_H from previous... 2536 2537 since it causes more problems than it solves. 2538 2539commit 72bd68d37387aa5f81da928f6e82f1c88ed8f674 2540Author: Darren Tucker <dtucker@dtucker.net> 2541Date: Tue Mar 28 10:35:18 2023 +1100 2542 2543 Replace OPENSSL_NO_SHA with HEADER_SHA_H. 2544 2545 Since this test doesn't use OpenSSL's SHA2 and may cause conflicts we 2546 don't want to include it, but OPENSSL_NO_SHA was removed beginning in 2547 OpenSSL's 1.1 series. 2548 2549commit 99668f2e6e0deb833e46cfab56db59ff0fc28c7e 2550Author: Darren Tucker <dtucker@dtucker.net> 2551Date: Tue Mar 28 09:50:06 2023 +1100 2552 2553 Configure with --target instead of deprecated form. 2554 2555commit f751d9306c62cd1061f966e6a7483d9bab9c379b 2556Author: Darren Tucker <dtucker@dtucker.net> 2557Date: Mon Mar 27 22:05:29 2023 +1100 2558 2559 Pass rpath when building 64bit Solaris. 2560 2561commit a64b935cd450ee8d04c26c9cd728629cf9ca5c91 2562Author: Darren Tucker <dtucker@dtucker.net> 2563Date: Mon Mar 27 19:21:19 2023 +1100 2564 2565 Explicitly disable OpenSSL on AIX test VM. 2566 2567commit 7ebc6f060fc2f70495a56e16d210baae6424cd96 2568Author: dtucker@openbsd.org <dtucker@openbsd.org> 2569Date: Mon Mar 27 03:56:50 2023 +0000 2570 2571 upstream: Add RevokedHostKeys to percent expansion test. 2572 2573 OpenBSD-Regress-ID: c077fd12a38005dd53d878c5b944154dec88d2ff 2574 2575commit f1a17de150f8d309d0c52f9abfaebf11c51a8537 2576Author: dtucker@openbsd.org <dtucker@openbsd.org> 2577Date: Mon Mar 27 03:56:11 2023 +0000 2578 2579 upstream: Add tilde and environment variable expansion to 2580 2581 RevokedHostKeys. bz#3552, ok djm@ 2582 2583 OpenBSD-Commit-ID: ce5d8e0219b63cded594c17d4c2958c06918ec0d 2584 2585commit 009eb4cb48a9708ab9174684dcbcc0f942907abe 2586Author: djm@openbsd.org <djm@openbsd.org> 2587Date: Mon Mar 27 03:31:05 2023 +0000 2588 2589 upstream: fix test: getnameinfo returns a non-zero value on error, not 2590 2591 (neccessarily) -1. From GHPR#384 2592 2593 OpenBSD-Commit-ID: d35e2b71268f66f5543a7ea68751972b3ae22b25 2594 2595commit 4f0a676486700f10a4788f7e9426e94e39c1c89e 2596Author: djm@openbsd.org <djm@openbsd.org> 2597Date: Mon Mar 27 03:25:08 2023 +0000 2598 2599 upstream: scp: when copying local->remote, check that source file 2600 2601 exists before opening SFTP connection to the server. Based on GHPR#370 ok 2602 dtucker, markus 2603 2604 OpenBSD-Commit-ID: b4dd68e15bfe22ce4fac9960a1066a2b721e54fb 2605 2606commit 154d8baf631327163571760c2c524bc93c37567c 2607Author: Darren Tucker <dtucker@dtucker.net> 2608Date: Mon Mar 27 12:22:30 2023 +1100 2609 2610 Also look for gdb error message from OpenIndiana. 2611 2612commit fbd3811ddb2b6ce2e6dba91fde7352c8978e5412 2613Author: Darren Tucker <dtucker@dtucker.net> 2614Date: Mon Mar 27 11:08:00 2023 +1100 2615 2616 Explicitly disable security key test on aix51 VM. 2617 2618 We don't know how to build the shared objects required for the security 2619 key tests so skip them. 2620 2621commit 4922ac3be8a996780ef3dc220411da2e27c29d9c 2622Author: Darren Tucker <dtucker@dtucker.net> 2623Date: Sun Mar 26 14:49:43 2023 +1100 2624 2625 Split libcrypto and other config flags. 2626 2627 This should allow the automatic OpenSSL version selection in the tests 2628 to work better. 2629 2630commit 4a948b1469f185e871160a2d70e2a0fce2858f9e 2631Author: Darren Tucker <dtucker@dtucker.net> 2632Date: Sun Mar 26 14:39:45 2023 +1100 2633 2634 Specify test target if we build without OpenSSL. 2635 2636 When we decide we can't use the versions of OpenSSL available, also 2637 restrict the tests we run to avoid the ones that need OpenSSL. 2638 2639commit b308c636f5b5d89eecb98be00b3d56306a005a09 2640Author: Darren Tucker <dtucker@dtucker.net> 2641Date: Sun Mar 26 14:22:53 2023 +1100 2642 2643 Find suitable OpenSSL version. 2644 2645 Check the installed OpenSSL versions for a suitable one, and if there 2646 isn't (and we don't have a specific version configured) then build 2647 without OpenSSL. 2648 2649commit 021ea5c2860f133f44790970968e0e73208b3a87 2650Author: Damien Miller <djm@mindrot.org> 2651Date: Fri Mar 24 15:02:52 2023 +1100 2652 2653 Github testing support for BoringSSL 2654 2655commit 9a97cd106466a2a9bda2bfaa4c48c4f1b2cc9c1b 2656Author: Damien Miller <djm@mindrot.org> 2657Date: Fri Mar 24 15:34:29 2023 +1100 2658 2659 BoringSSL doesn't support EC_POINT_point2bn() 2660 2661 so don't invoke it in unittest 2662 2663commit cc5969c033a032d126ff78e5d95cf20abbede4c7 2664Author: Damien Miller <djm@mindrot.org> 2665Date: Fri Mar 24 15:34:05 2023 +1100 2666 2667 another ERR_load_CRYPTO_strings() vestige 2668 2669commit 4974293899a068133e976f81d6693670d2b576ca 2670Author: Damien Miller <djm@mindrot.org> 2671Date: Fri Mar 24 15:24:05 2023 +1100 2672 2673 don't use obsolete ERR_load_CRYPTO_strings() 2674 2675 OpenSSL (and elsewhere in OpenSSH) uses ERR_load_crypto_strings() 2676 2677commit 3c527d55f906e6970d17c4cab6db90ae9e013235 2678Author: Damien Miller <djm@mindrot.org> 2679Date: Fri Mar 24 15:23:05 2023 +1100 2680 2681 Allow building with BoringSSL 2682 2683commit b7e27cfd7f163fc16b4c5d041cc28ee488a5eeec 2684Author: Damien Miller <djm@mindrot.org> 2685Date: Fri Mar 24 15:21:18 2023 +1100 2686 2687 put back SSLeay_version compat in configure test 2688 2689 Needed to detect old versions and give good "your version is bad" 2690 messages at configure time; spotted by dtucker@ 2691 2692commit 7280401bdd77ca54be6867a154cc01e0d72612e0 2693Author: Damien Miller <djm@mindrot.org> 2694Date: Fri Mar 24 13:56:25 2023 +1100 2695 2696 remove support for old libcrypto 2697 2698 OpenSSH now requires LibreSSL 3.1.0 or greater or 2699 OpenSSL 1.1.1 or greater 2700 2701 with/ok dtucker@ 2702 2703commit abda22fb48302f2142233f71d27c74040288c518 2704Author: Darren Tucker <dtucker@dtucker.net> 2705Date: Sun Mar 19 15:36:13 2023 +1100 2706 2707 Test latest OpenSSL 1.1, 3.0 and LibreSSL 3.7. 2708 2709commit 610ac1cb077cd5a1ebfc21612154bfa13d2ec825 2710Author: Darren Tucker <dtucker@dtucker.net> 2711Date: Thu Mar 16 21:38:04 2023 +1100 2712 2713 Show 9.3 branch instead of 9.2. 2714 2715commit cb30fbdbee869f1ce11f06aa97e1cb8717a0b645 2716Author: Damien Miller <djm@mindrot.org> 2717Date: Thu Mar 16 08:28:19 2023 +1100 2718 2719 depend 2720 2721commit 1dba63eb10c40b6fda9f5012ed6ae87e2d3d028e 2722Author: Damien Miller <djm@mindrot.org> 2723Date: Thu Mar 16 08:27:54 2023 +1100 2724 2725 crank version 2726 2727commit ba7532d0dac9aaf0ad7270664c43837fc9f64a5f 2728Author: djm@openbsd.org <djm@openbsd.org> 2729Date: Wed Mar 15 21:19:57 2023 +0000 2730 2731 upstream: openssh-9.3 2732 2733 OpenBSD-Commit-ID: 8011495f2449c1029bb316bd015eab2e00509848 2734 2735commit 6fd4daafb949b66bf555f3100f715a9ec64c3390 2736Author: dtucker@openbsd.org <dtucker@openbsd.org> 2737Date: Tue Mar 14 07:28:47 2023 +0000 2738 2739 upstream: Free KRL ptr in addition to its contents. 2740 2741 From Coverity CID 291841, ok djm@ 2742 2743 OpenBSD-Commit-ID: f146ba08b1b43af4e0d7ad8c4dae3748b4fa31b6 2744 2745commit 1d270bd303afaf6d94e9098cbbf18e5e539e2088 2746Author: dtucker@openbsd.org <dtucker@openbsd.org> 2747Date: Tue Mar 14 07:26:25 2023 +0000 2748 2749 upstream: Check pointer for NULL before deref. 2750 2751 None of the existing callers seem to do that, but it's worth checking. 2752 From Coverity CID 291834, ok djm@ 2753 2754 OpenBSD-Commit-ID: a0a97113f192a7cb1a2c97b932f677f573cda7a4 2755 2756commit d95af508e78c0cd3dce56b83853baaa59ae295cf 2757Author: dtucker@openbsd.org <dtucker@openbsd.org> 2758Date: Sun Mar 12 10:40:39 2023 +0000 2759 2760 upstream: Limit number of entries in SSH2_MSG_EXT_INFO 2761 2762 request. This is already constrained by the maximum SSH packet size but this 2763 makes it explicit. Prompted by Coverity CID 291868, ok djm@ markus@ 2764 2765 OpenBSD-Commit-ID: aea023819aa44a2dcb9dd0fbec10561896fc3a09 2766 2767commit 8f287ba60d342b3e2f750e7332d2131e3ec7ecd0 2768Author: dtucker@openbsd.org <dtucker@openbsd.org> 2769Date: Sun Mar 12 09:41:18 2023 +0000 2770 2771 upstream: calloc can return NULL but xcalloc can't. 2772 2773 From Coverity CID 291881, ok djm@ 2774 2775 OpenBSD-Commit-ID: 50204b755f66b2ec7ac3cfe379d07d85ca161d2b 2776 2777commit 83a56a49fd50f4acf900f934279482e4ef329715 2778Author: dtucker@openbsd.org <dtucker@openbsd.org> 2779Date: Fri Mar 10 07:17:08 2023 +0000 2780 2781 upstream: Explicitly ignore return from fcntl 2782 2783 (... FD_CLOEXEC) here too. Coverity CID 291853. 2784 2785 OpenBSD-Commit-ID: 99d8b3da9d0be1d07ca8dd8e98800a890349e9b5 2786 2787commit 0fda9d704d3bbf54a5e64ce02a6fecb11fe7f047 2788Author: Damien Miller <djm@mindrot.org> 2789Date: Fri Mar 10 15:59:46 2023 +1100 2790 2791 bounds checking for getrrsetbyname() replacement; 2792 2793 Spotted by Coverity in CID 405033; ok millert@ 2794 2795commit 89b8df518f21677045599df0ad3e5dd0f39909b5 2796Author: dtucker@openbsd.org <dtucker@openbsd.org> 2797Date: Fri Mar 10 04:06:21 2023 +0000 2798 2799 upstream: Plug mem leak on error path. Coverity CID 405026, ok djm@. 2800 2801 OpenBSD-Commit-ID: 8212ca05d01966fb5e72205c592b2257708a2aac 2802 2803commit bf4dae0ad192c3e2f03f7223834b00d88ace3d3e 2804Author: Darren Tucker <dtucker@dtucker.net> 2805Date: Fri Mar 10 14:46:57 2023 +1100 2806 2807 Add prototypes for mkstemp replacements. 2808 2809 Should prevent warnings due to our wrapper function. 2810 2811commit 4e04d68d6a33cdc73b831fd4b5e6124175555d3d 2812Author: dtucker@openbsd.org <dtucker@openbsd.org> 2813Date: Fri Mar 10 03:01:51 2023 +0000 2814 2815 upstream: Expliticly ignore return code from fcntl(.. FD_CLOEXEC) since 2816 2817 there's not much we can do anyway. From Coverity CID 291857, ok djm@ 2818 2819 OpenBSD-Commit-ID: 051429dd07af8db3fec10d82cdc78d90bb051729 2820 2821commit d6d38fd77cbe091c59e1bb720c3a494df4990640 2822Author: djm@openbsd.org <djm@openbsd.org> 2823Date: Fri Mar 10 02:32:04 2023 +0000 2824 2825 upstream: Like sshd_config, some ssh_config options are not 2826 2827 first-match-wins. sshd_config.5 was fixed in r1.348, this is the same for 2828 this file 2829 2830 OpenBSD-Commit-ID: 7be55b9351cde449b136afcc52d07aa4113b215e 2831 2832commit 7187d3f86bf8f2066cc9941f217d23b0cacae25e 2833Author: dtucker@openbsd.org <dtucker@openbsd.org> 2834Date: Fri Mar 10 02:24:56 2023 +0000 2835 2836 upstream: Remove no-op (int) > INT_MAX checks 2837 2838 since they can never be true. From Coverity CID 405031, ok djm@ 2839 2840 OpenBSD-Commit-ID: 9df3783b181e056595e2bb9edf7ed41d61cf8e84 2841 2842commit 77adde4305542ebe3005dd456122624fe2347b01 2843Author: Darren Tucker <dtucker@dtucker.net> 2844Date: Fri Mar 10 13:27:29 2023 +1100 2845 2846 Wrap mkstemp calls with umask set/restore. 2847 2848 glibc versions 2.06 and earlier did not set a umask on files created by 2849 mkstemp created the world-writable. Wrap mkstemp to set and restore 2850 the umask. From Coverity (CIDs 291826 291886 291891), ok djm@ 2851 2852commit 633d3dc2a1e9e2a013d019a0576a0771c8423713 2853Author: jcs@openbsd.org <jcs@openbsd.org> 2854Date: Thu Mar 9 21:06:24 2023 +0000 2855 2856 upstream: modify parentheses in conditionals to make it clearer what is 2857 2858 being assigned and what is being checked 2859 2860 ok djm dtucker 2861 2862 OpenBSD-Commit-ID: 19c10baa46ae559474409f75a5cb3d0eade7a9b8 2863 2864commit 733030840c4772f858de95d5940ec0c37663e8b0 2865Author: dtucker@openbsd.org <dtucker@openbsd.org> 2866Date: Thu Mar 9 07:11:05 2023 +0000 2867 2868 upstream: Re-split the merge of the reorder-hostkeys test. 2869 2870 In the kex_proposal_populate_entries change I merged the the check for 2871 reordering hostkeys with the actual reordering, but kex_assemble_names 2872 mutates options.hostkeyalgorithms which renders the check ineffective. 2873 Put the check back where it was. Spotted and tested by jsg@, ok djm@ 2874 2875 OpenBSD-Commit-ID: a7469f25a738db5567395d1881e32479a7ffc9de 2876 2877commit 54ac4ab2b53ce9fcb66b8250dee91c070e4167ed 2878Author: djm@openbsd.org <djm@openbsd.org> 2879Date: Thu Mar 9 06:58:26 2023 +0000 2880 2881 upstream: include destination constraints for smartcard keys too. 2882 2883 Spotted by Luci Stanescu; ok deraadt@ markus@ 2884 2885 OpenBSD-Commit-ID: add879fac6903a1cb1d1e42c4309e5359c3d870f 2886 2887commit bfd1ad01d974a316b60622759ad17537fa2d92b4 2888Author: Darren Tucker <dtucker@dtucker.net> 2889Date: Thu Mar 9 18:24:54 2023 +1100 2890 2891 Limit the number of PAM environment variables. 2892 2893 xcalloc has its own limits, but these are specific to PAM. From 2894 Coverity CID 405198, ok djm@ 2895 2896commit a231414970e01a35f45a295d5f93698fa1249b28 2897Author: Darren Tucker <dtucker@dtucker.net> 2898Date: Thu Mar 9 18:19:44 2023 +1100 2899 2900 Limit the number of PAM environment variables. 2901 2902 From Coverity CID 405194, tweaks and ok djm@ 2903 2904commit 36c6c3eff5e4a669ff414b9daf85f919666e8e03 2905Author: dtucker@openbsd.org <dtucker@openbsd.org> 2906Date: Wed Mar 8 06:21:32 2023 +0000 2907 2908 upstream: Plug mem leak. Coverity CID 405196, ok djm@ 2909 2910 OpenBSD-Commit-ID: 175f09349387c292f626da68f65f334faaa085f2 2911 2912commit dfb9b736e1ccf9e6b03eea21cd961f4fd0634c98 2913Author: tb@openbsd.org <tb@openbsd.org> 2914Date: Wed Mar 8 05:33:53 2023 +0000 2915 2916 upstream: ssh-pkcs11: synchronize error messages with errors 2917 2918 A handful of error messages contained incorrect function names or 2919 otherwise inaccurate descriptions. Fix them to match reality. 2920 2921 input/ok djm 2922 2923 OpenBSD-Commit-ID: 165a15db52f75b31e1804b043480c36af09f3411 2924 2925commit 51875897b81b5c21b80c256a29597916edbde454 2926Author: guenther@openbsd.org <guenther@openbsd.org> 2927Date: Wed Mar 8 04:43:12 2023 +0000 2928 2929 upstream: Delete obsolete /* ARGSUSED */ lint comments. 2930 2931 ok miod@ millert@ 2932 2933 OpenBSD-Commit-ID: 7be168a570264d59e96a7d2d22e927d45fee0e4c 2934 2935commit a76085bda883c2104afb33ab0334eca190927362 2936Author: Darren Tucker <dtucker@dtucker.net> 2937Date: Wed Mar 8 17:25:37 2023 +1100 2938 2939 Extra brackets to prevent warning. 2940 2941commit 147ae57d4dfa0508109f93b78a7d8b92819e1f83 2942Author: djm@openbsd.org <djm@openbsd.org> 2943Date: Wed Mar 8 00:05:58 2023 +0000 2944 2945 upstream: use RSA/SHA256 when testing usability of private key in 2946 2947 agent; with/ok dtucker 2948 2949 OpenBSD-Commit-ID: fe1382e2fdf23fcae631308e72342bad56066a56 2950 2951commit 27fd251bc906a763e70ce0f27c8abdf8bbd1e416 2952Author: djm@openbsd.org <djm@openbsd.org> 2953Date: Wed Mar 8 00:05:37 2023 +0000 2954 2955 upstream: use RSA/SHA256 when testing usability of private key; 2956 2957 based on fix in bz3546 by Dmitry Belyavskiy; with/ok dtucker 2958 2959 OpenBSD-Commit-ID: 0ef414cc363a832f9fab92a5da0234448bce2eba 2960 2961commit eee9f3fc3d52ae7d2106929bb06b7f291fb0b81a 2962Author: djm@openbsd.org <djm@openbsd.org> 2963Date: Tue Mar 7 21:47:42 2023 +0000 2964 2965 upstream: refactor to be more readable top to bottom. Prompted by 2966 2967 Coverity CID 405048 which was a false-positive fd leak; ok dtucker@ 2968 2969 OpenBSD-Commit-ID: fc55ec2af622a017defb9b768bf26faefc792c00 2970 2971commit 42a06b29a4c99272bf690f9b3be520b08b448dc5 2972Author: Darren Tucker <dtucker@dtucker.net> 2973Date: Tue Mar 7 18:34:41 2023 +1100 2974 2975 Add header changes missed in previous. 2976 2977commit 4710077096edff2e6926dd5b15bf586491d317db 2978Author: dtucker@openbsd.org <dtucker@openbsd.org> 2979Date: Tue Mar 7 06:09:14 2023 +0000 2980 2981 upstream: Fix mem leak in environment setup. 2982 2983 From jjelen at redhat.com via bz#2687, ok djm@ 2984 2985 OpenBSD-Commit-ID: 9f9e4ba3cac003e6f81da3bcebd1b9ec43e7f353 2986 2987commit 03acc50d0ccb78fc91d1570de1cd0fdfea646028 2988Author: dtucker@openbsd.org <dtucker@openbsd.org> 2989Date: Mon Mar 6 12:15:47 2023 +0000 2990 2991 upstream: Unit test for kex_proposal_populate_entries. 2992 2993 OpenBSD-Regress-ID: bdb211d80d572a08bf14b49fe2a58b9ff265c006 2994 2995commit 3f9231c2e1f374ebb08016ba00ea97b47c0ed20b 2996Author: djm@openbsd.org <djm@openbsd.org> 2997Date: Tue Mar 7 05:37:26 2023 +0000 2998 2999 upstream: fix memory leak in process_read() path; Spotted by James 3000 3001 Robinson in GHPR363; ok markus@ 3002 3003 OpenBSD-Commit-ID: cdc2d98e6478b7e7f3a36976845adae3820429d8 3004 3005commit c5e6e890839ec520ab9301a92cba56303749dea2 3006Author: djm@openbsd.org <djm@openbsd.org> 3007Date: Tue Mar 7 01:30:52 2023 +0000 3008 3009 upstream: correct size for array argument when changing 3010 3011 UMAC_OUTPUT_LEN Coverity CID 291845; ok dtucker@ 3012 3013 OpenBSD-Commit-ID: 2eb017d10705bb623d4418691f961c930eafaec0 3014 3015commit 9641753e0fd146204d57b2a4165f552a81afade4 3016Author: dtucker@openbsd.org <dtucker@openbsd.org> 3017Date: Mon Mar 6 12:14:48 2023 +0000 3018 3019 upstream: Refactor creation of KEX proposal. 3020 3021 This adds kex_proposal_populate_entries (and corresponding free) which 3022 populates the KEX proposal array with dynamically allocated strings. 3023 This replaces the previous mix of static and dynamic that has been the 3024 source of previous leaks and bugs. Remove unused compat functions. 3025 With & ok djm@. 3026 3027 OpenBSD-Commit-ID: f2f99da4aae2233cb18bf9c749320c5e040a9c7b 3028 3029commit aa59d6a489fb20973fa461d0fdb1110db412947b 3030Author: dtucker@openbsd.org <dtucker@openbsd.org> 3031Date: Sun Mar 5 09:24:35 2023 +0000 3032 3033 upstream: Fix mem and FILE leaks in moduli screening. 3034 3035 If multiple -Ocheckpoint= options are passed, the earlier ones would 3036 be overwritten and leaked. If we use an input file that wasn't stdin, 3037 close that. From Coverity CIDs 291884 and 291894. 3038 3039 OpenBSD-Commit-ID: a4d9d15f572926f841788912e2b282485ad09e8b 3040 3041commit 23b8cb41767af99a1aac24589d1882d9c8c2c205 3042Author: dtucker@openbsd.org <dtucker@openbsd.org> 3043Date: Sun Mar 5 08:18:58 2023 +0000 3044 3045 upstream: Plug mem leak in moduli checkpoint option parsing. 3046 3047 From Coverity CID 291894. 3048 3049 OpenBSD-Commit-ID: 9b1aba2d049741ae21c8dc4560a7e29ab17310f4 3050 3051commit fc7f8f2188d4a4fc8ba77eddbe863c7665666db5 3052Author: dtucker@openbsd.org <dtucker@openbsd.org> 3053Date: Sun Mar 5 05:34:09 2023 +0000 3054 3055 upstream: Remove unused compat.h includes. 3056 3057 We've previously removed a lot of the really old compatibility code, 3058 and with it went the need to include compat.h in most of the files that 3059 have it. 3060 3061 OpenBSD-Commit-ID: 5af8baa194be00a3092d17598e88a5b29f7ea2b4 3062 3063commit 6c165c36246d8004c20e1df5cec4961a5ac422d6 3064Author: dtucker@openbsd.org <dtucker@openbsd.org> 3065Date: Sat Mar 4 03:22:59 2023 +0000 3066 3067 upstream: Use time_t for x11 timeout. 3068 3069 Use time_t instead of u_int for remaining x11 timeout checks for 64bit 3070 time_t safety. From Coverity CIDs 405197 and 405028, ok djm@ 3071 3072 OpenBSD-Commit-ID: 356685bfa1fc3d81bd95722d3fc47101cc1a4972 3073 3074commit 4a3918f51bd2d968387e7aa87e33b32c78077fb4 3075Author: dtucker@openbsd.org <dtucker@openbsd.org> 3076Date: Fri Mar 3 10:23:42 2023 +0000 3077 3078 upstream: Ensure ms_remain is always initialized 3079 3080 similar to what we do in ssh_packet_write_wait. bz#2687, from jjelen 3081 at redhat.com. 3082 3083 OpenBSD-Commit-ID: a50e0541cf823f8d1c72f71ccde925d3dbe6dfac 3084 3085commit e44846a4487d2885ac7f2610be09b1e2bf52249b 3086Author: dtucker@openbsd.org <dtucker@openbsd.org> 3087Date: Fri Mar 3 09:48:51 2023 +0000 3088 3089 upstream: Check for non-NULL before string 3090 3091 comparison. From jjelen at redhat.com via bz#2687. 3092 3093 OpenBSD-Commit-ID: 0d9b2e0cac88a311b5766b1aef737082583c285f 3094 3095commit 1842d523fae63b862ce8e60725c9b606cddb86a6 3096Author: djm@openbsd.org <djm@openbsd.org> 3097Date: Fri Mar 3 05:00:34 2023 +0000 3098 3099 upstream: guard against getsockname(-1, ...) from Coverity CID 3100 3101 291832 3102 3103 OpenBSD-Commit-ID: e58d5227327917d189229b7f0b37d2780f360d5f 3104 3105commit 78571a5fe9847d40d7f220c92b707574ae9ec4ce 3106Author: djm@openbsd.org <djm@openbsd.org> 3107Date: Fri Mar 3 04:36:20 2023 +0000 3108 3109 upstream: some options are not first-match-wins. Mention that there 3110 3111 are exceptions at the start of the manpage and label some of them in the 3112 option description. 3113 3114 OpenBSD-Commit-ID: 3b74728446fa6fc8742769eeb8c3674e233e84c4 3115 3116commit d1c1b3272e8895a96c4f5889bd6e07a8525bd9f1 3117Author: djm@openbsd.org <djm@openbsd.org> 3118Date: Fri Mar 3 04:34:49 2023 +0000 3119 3120 upstream: actually print "channeltimeout none" in config dump mode; 3121 3122 spotted via Coverity CID 405022 3123 3124 OpenBSD-Commit-ID: b074b52bf138b75f08264e8da15880b29c7a630f 3125 3126commit 8bf61e95610b48192d4e1720cc15d9004617301d 3127Author: Darren Tucker <dtucker@dtucker.net> 3128Date: Fri Mar 3 14:50:03 2023 +1100 3129 3130 Add Coverity badges. 3131 3132commit 93291bd723959adf462b1df958106cf07a7734dd 3133Author: dtucker@openbsd.org <dtucker@openbsd.org> 3134Date: Fri Mar 3 03:12:24 2023 +0000 3135 3136 upstream: Check return values of dup2. Spotted by Coverity, ok djm@ 3137 3138 OpenBSD-Commit-ID: 19fb1b53072826d00c67df677731d2f6c1dd602b 3139 3140commit e37261dff33af23f37202cfce0848d36f5c1055c 3141Author: dtucker@openbsd.org <dtucker@openbsd.org> 3142Date: Fri Mar 3 02:37:58 2023 +0000 3143 3144 upstream: Use time_t for x11_refuse_time timeout. We need 3145 3146 SSH_TIME_T_MAX for this, so move from misc.c to misc.h so it's available. 3147 Fixes a Coverity warning for 64bit time_t safety, ok djm@ 3148 3149 OpenBSD-Commit-ID: c69c4c3152cdaab953706db4ccf4d5fd682f7d8d 3150 3151commit 32755a98c29114b13f4c9d47454bbb265b932ad7 3152Author: dtucker@openbsd.org <dtucker@openbsd.org> 3153Date: Fri Mar 3 02:34:29 2023 +0000 3154 3155 upstream: Check return value from fctnl and warn on failure. 3156 3157 Spotted by Coverity, ok djm@ 3158 3159 OpenBSD-Commit-ID: 2097c7db3cf657f1e3a6c5077041bacc63143cab 3160 3161commit 5fc60e8246c36b8255f72a937ebe9787b39648c6 3162Author: dtucker@openbsd.org <dtucker@openbsd.org> 3163Date: Thu Mar 2 11:10:27 2023 +0000 3164 3165 upstream: Remove SUDO in proxy command wrapper. Anything that needs 3166 3167 sudo is already run by it, and it breaks if root isn't in sudoers. 3168 3169 OpenBSD-Regress-ID: 6cf22fda32a89c16915f31a6ed9bbdbef2a3bac9 3170 3171commit 0d514659b23a257247491179cfbb53a6dd64e164 3172Author: dtucker@openbsd.org <dtucker@openbsd.org> 3173Date: Thu Mar 2 08:24:41 2023 +0000 3174 3175 upstream: Fix breakage on dhgex test. 3176 3177 This was due to the sshd logs being written to the wrong log file. 3178 While there, make save_debug_logs less verbose, write the name of the 3179 tarball to regress.log and use $SUDO to remove the old symlinks (which 3180 shouldn't be needed, but won't hurt). Initial problem spotted by anton@. 3181 3182 OpenBSD-Regress-ID: 9c44fb9cd418e6ff31165e7a6c1f9f11a6d19f5b 3183 3184commit 860201201d4ae655702807966901682cff30a171 3185Author: dtucker@openbsd.org <dtucker@openbsd.org> 3186Date: Thu Mar 2 08:14:52 2023 +0000 3187 3188 upstream: Quote grep and log message better. 3189 3190 OpenBSD-Regress-ID: 3823d9063127169736aa274b1784cb28e15b64d4 3191 3192commit 03a03c6002525f5ad9c8fc874a5d5826a35d9858 3193Author: dtucker@openbsd.org <dtucker@openbsd.org> 3194Date: Thu Mar 2 06:41:56 2023 +0000 3195 3196 upstream: Always call fclose on checkpoints. 3197 3198 In the case of an fprintf failure we would not call fclose which would 3199 leak the FILE pointer. While we're there, try to clean up the temp file 3200 on failure. Spotted by Coverity, ok djm@ 3201 3202 OpenBSD-Commit-ID: 73c7ccc5d4fcc235f54c6b20767a2815408525ef 3203 3204commit 13fe8f9785e6d90400ce548939a0b0ddc11fcb3c 3205Author: dtucker@openbsd.org <dtucker@openbsd.org> 3206Date: Wed Mar 1 21:54:50 2023 +0000 3207 3208 upstream: Remove old log symlinks 3209 3210 before creating new ones. In -portable some platforms don't like 3211 overwriting existing symlinks. 3212 3213 OpenBSD-Regress-ID: 7e7ddc0beb73e945e1c4c58d51c8a125b518120f 3214 3215commit 131fcbcaffd1e3bcf5ab766ec497b5d768955310 3216Author: Darren Tucker <dtucker@dtucker.net> 3217Date: Wed Mar 1 23:23:02 2023 +1100 3218 3219 Adjust test jobs for new log directory. 3220 3221commit a6f4ac8a2baf77e5361cfa017d0dc250d1409bec 3222Author: dtucker@openbsd.org <dtucker@openbsd.org> 3223Date: Wed Mar 1 09:29:32 2023 +0000 3224 3225 upstream: Rework logging for the regression tests. 3226 3227 Previously we would log to ssh.log and sshd.log, but that is insufficient 3228 for tests that have more than one concurent ssh/sshd. 3229 3230 Instead, we'll log to separate datestamped files in a $OBJ/log/ and 3231 leave a symlink at the previous location pointing at the most recent 3232 instance with an entry in regress.log showing which files were created 3233 at each point. This should be sufficient to reconstruct what happened 3234 even for tests that use multiple instances of each program. If the test 3235 fails, tar up all of the logs for later analysis. 3236 3237 This will let us also capture the output from some of the other tools 3238 which was previously sent to /dev/null although most of those will be 3239 in future commits. 3240 3241 OpenBSD-Regress-ID: f802aa9e7fa51d1a01225c05fb0412d015c33e24 3242 3243commit 8ead62ed5e86c7df597d8604f332f49cd1527b85 3244Author: dtucker@openbsd.org <dtucker@openbsd.org> 3245Date: Tue Feb 28 21:31:50 2023 +0000 3246 3247 upstream: fatal out if allocating banner string fails to avoid 3248 3249 potential null deref later in sscanf. Spotted by Coverity, ok deraadt@ 3250 3251 OpenBSD-Commit-ID: 74e8d228ac00552e96e9e968dfcccf8dd1f46ad5 3252 3253commit 44ca56ba0b3f531f1d85730cc701097cd49e6868 3254Author: dtucker@openbsd.org <dtucker@openbsd.org> 3255Date: Tue Feb 28 08:45:24 2023 +0000 3256 3257 upstream: Explicitly ignore return from fchmod 3258 3259 similar to other calls to prevent warning. 3260 3261 OpenBSD-Commit-ID: fdc5287dcee0860b5a493186414226c655b0eb0a 3262 3263commit 803392933a3a6f09f834aa5f0c2aab06a3b382f4 3264Author: dtucker@openbsd.org <dtucker@openbsd.org> 3265Date: Mon Feb 27 22:12:40 2023 +0000 3266 3267 upstream: Plug mem leak on globbed ls error path. 3268 3269 Spotted by Coverity, ok deraadt@ 3270 3271 OpenBSD-Commit-ID: de28476025db29820a9a2e56e98b964d8a02861c 3272 3273commit aa33b4d396abf47a2a45f982f28d054fb1dcb5c3 3274Author: Darren Tucker <dtucker@dtucker.net> 3275Date: Mon Feb 27 21:04:22 2023 +1100 3276 3277 Cast time_t's in debug output to long long. 3278 3279 Should fix Coverity warning about truncation of 64bit time_t. 3280 3281commit b0fd60a9de62a03189ad57d0c07f0ac51dc00e95 3282Author: Darren Tucker <dtucker@dtucker.net> 3283Date: Mon Feb 27 17:28:59 2023 +1100 3284 3285 Do shadow expiry calcs using "long long". 3286 3287 Coverity flags these as potentially not 64bit time_t safe so use 3288 long long for the calculations and debug output. ok djm@ 3289 3290commit 01dbeb3084d714bbd001ff9d03b9de542e8cdf58 3291Author: Damien Miller <djm@mindrot.org> 3292Date: Mon Feb 27 17:07:52 2023 +1100 3293 3294 avoid clash between for getopt's struct option 3295 3296 Since we don't use getopt_long() nothing outside the getopt() 3297 implementation itself uses this structure, so move it into the 3298 source to remove it from visibility and clashes with libc's 3299 3300 ok dtucker@ 3301 3302commit eb88d07c43afe407094e7d609248d85a15e148ef 3303Author: Darren Tucker <dtucker@dtucker.net> 3304Date: Sat Feb 25 14:45:41 2023 +1100 3305 3306 Revert explicit chmods on private keys. 3307 3308 This should no longer be needed on Cygwin test runners due to previous 3309 commit. 3310 3311commit 52b75db61030a6c8baf66b73644380cf3f58e26a 3312Author: Darren Tucker <dtucker@dtucker.net> 3313Date: Sat Feb 25 14:43:28 2023 +1100 3314 3315 Remove extended ACLs from working dirs. 3316 3317 This should allow umask to work as expected and prevent tests from 3318 failing due to excessive permissions on private keys. 3319 3320commit 0c5d4c843df5605b043a758d69f9a611ef63c479 3321Author: Darren Tucker <dtucker@dtucker.net> 3322Date: Fri Feb 24 13:44:13 2023 +1100 3323 3324 Explicitly set permissions on user and host keys. 3325 3326 On cygwin, the umask might not be sufficient. Should fix tests on 3327 Github runners. 3328 3329commit 6c9fc9d7a9f7abf82c3294d74e6d4a25735862ce 3330Author: djm@openbsd.org <djm@openbsd.org> 3331Date: Wed Feb 22 03:56:43 2023 +0000 3332 3333 upstream: fix progressmeter corruption on wide displays; bz3534 3334 3335 feedback/ok dtucker@ 3336 3337 OpenBSD-Commit-ID: f4affee067cec7c182f3e0b307d758e0472762a3 3338 3339commit fe0bd3cde9665d364e5eedd2c2c2e60d4cdc3786 3340Author: dtucker@openbsd.org <dtucker@openbsd.org> 3341Date: Tue Feb 21 06:48:18 2023 +0000 3342 3343 upstream: fseek to end of known_hosts before writing to it. 3344 3345 POSIX and ANSI C require that applications call fseek or similar between 3346 read and writing to a RW file. OpenBSD doesn't enforce this, but some 3347 (System V derived) platforms need this to prevent it from writing a 3348 spurious extra byte (in this case, a newline). ok djm@ deraadt@ 3349 3350 OpenBSD-Commit-ID: 33e680dcd8110582a93a40a8491024e961f45137 3351 3352commit 357fb8ae14c07cd025eeed66e73de91bab569849 3353Author: Darren Tucker <dtucker@dtucker.net> 3354Date: Tue Feb 21 17:51:09 2023 +1100 3355 3356 Also run unit tests on AIX VMs. 3357 3358 In the past these tests took too long, but these days it only adds 3359 about 5 min to the run. 3360 3361commit 17781aaa5188ee1477f7779b280d105512e3dbed 3362Author: Darren Tucker <dtucker@dtucker.net> 3363Date: Tue Feb 21 17:38:55 2023 +1100 3364 3365 Wrap stdint.h inside ifdef. 3366 3367commit ef798bad38505f7bf1b5fa5c0843dfc5a2b192b9 3368Author: Mayank Sharma <mayank.fit2010@gmail.com> 3369Date: Mon Feb 20 17:37:15 2023 +0530 3370 3371 Add includes to ptimeout test. 3372 3373 Fixes test failures on AIX due to type mismatches. 3374 3375commit ab69dda05d5268454209f529fa80f477e60d846a 3376Author: Darren Tucker <dtucker@dtucker.net> 3377Date: Mon Feb 20 18:24:39 2023 +1100 3378 3379 Always use the openssl binary configure tells us. 3380 3381 This fixes tests on platforms that do not have the openssl tool 3382 installed at all. 3383 3384commit 2a7e3449908571af601a4c2d12ab140096442e47 3385Author: dtucker@openbsd.org <dtucker@openbsd.org> 3386Date: Fri Feb 17 04:22:50 2023 +0000 3387 3388 upstream: Remove now-unused compat bit SSH_BUG_RSASIGMD5. The code 3389 3390 to set this was removed in OpenSSH 7.7 when support for SSH implementations 3391 dating back to before RFC standardization were removed. "burn it all" djm@ 3392 3393 OpenBSD-Commit-ID: 6330935fbe23dd00be79891505e06d1ffdac7cda 3394 3395commit 0833ccf2c8b7ae08b296c06f17bd53e3ab94b0b0 3396Author: dtucker@openbsd.org <dtucker@openbsd.org> 3397Date: Fri Feb 17 03:06:18 2023 +0000 3398 3399 upstream: Remove now-unused compat bit SSH_BUG_BIGENDIANAES. This 3400 3401 was previously set for OpenSSH 2.3 (released in 2000) but this check was 3402 removed in OpenSSH 7.7 (2018). ok djm@ deraadt@ 3403 3404 OpenBSD-Commit-ID: 326426ea328707fc9e83305291ab135c87f678af 3405 3406commit c81c2bea6e828d52b62b448b4ffdd3c163177975 3407Author: Damien Miller <djm@mindrot.org> 3408Date: Fri Feb 17 10:12:40 2023 +1100 3409 3410 whitespace fixes 3411 3412commit 500f90b39db5f0014e6b0c49ff1f45c994b69293 3413Author: Damien Miller <djm@mindrot.org> 3414Date: Fri Feb 17 10:02:08 2023 +1100 3415 3416 whitespace at EOL 3417 3418commit 68350152406339170721c15e97afdf827a5e4001 3419Author: dtucker@openbsd.org <dtucker@openbsd.org> 3420Date: Thu Feb 16 10:10:00 2023 +0000 3421 3422 upstream: Remove SSH_BUG_PASSWORDPAD compat bit 3423 3424 since it's no longer used. ok markus@ 3425 3426 OpenBSD-Commit-ID: b92c21f56fe4b7f9a54790d6a9650725c226820b 3427 3428commit 537cccd804eaf65f32bdce037cc31db4e0ab0f44 3429Author: dtucker@openbsd.org <dtucker@openbsd.org> 3430Date: Thu Feb 16 07:55:15 2023 +0000 3431 3432 upstream: Remove SSH_BUG_IGNOREMSG compat flag 3433 3434 since it's only applicable to SSH1 and thus no longer used. ok markus@ 3435 "kill it with fire" djm@ 3436 3437 OpenBSD-Commit-ID: ea13318b1937795d9db4790d3ce0a6ed01584dab 3438 3439commit 285cf6cd4b91a0a0ce33193c358c99085af33e43 3440Author: jmc@openbsd.org <jmc@openbsd.org> 3441Date: Fri Feb 10 06:41:53 2023 +0000 3442 3443 upstream: space between macro and punctuation; sort usage(); 3444 3445 OpenBSD-Commit-ID: 6141610cfca037700730e41f868d1d9124958f8c 3446 3447commit d39a96f70f81878c77336ed35f5c648c1804b71a 3448Author: jmc@openbsd.org <jmc@openbsd.org> 3449Date: Fri Feb 10 06:40:48 2023 +0000 3450 3451 upstream: space between macro and punctuation; 3452 3453 OpenBSD-Commit-ID: abc95e550be9e6d9a7ff64b65c104c7be21ab19e 3454 3455commit 16e82bf53fc34e43e3b948d43b68d5b27a7335e6 3456Author: jmc@openbsd.org <jmc@openbsd.org> 3457Date: Fri Feb 10 06:39:27 2023 +0000 3458 3459 upstream: sort SYNOPSIS; 3460 3461 OpenBSD-Commit-ID: dacd9da33277d5669a51213d880632599c890c1e 3462 3463commit d9685121ff6d57b8797411f3cb123884a4b96e30 3464Author: Darren Tucker <dtucker@dtucker.net> 3465Date: Sat Feb 11 12:32:19 2023 +1100 3466 3467 Improve seccomp compat on older systems. 3468 3469 Check if flags to mmap and madvise are defined before using them. 3470 Should fix problems building on older Linux systems that don't have 3471 these. bz#3537, with & ok djm@. 3472 3473commit 6180b0fa4f7996687678702806257e661fd5931e 3474Author: djm@openbsd.org <djm@openbsd.org> 3475Date: Fri Feb 10 05:06:03 2023 +0000 3476 3477 upstream: test -Ohashalg=... and that the default output contains both 3478 3479 specified hash algorithms; prompted by dtucker@ 3480 3481 OpenBSD-Regress-ID: 26f309208c8d8b8fa9c5f419767b85f1e9b22f51 3482 3483commit d651f5c9fe37e61491eee46c49ba9fa03dbc0e6a 3484Author: djm@openbsd.org <djm@openbsd.org> 3485Date: Fri Feb 10 04:56:30 2023 +0000 3486 3487 upstream: let ssh-keygen and ssh-keyscan accept 3488 3489 -Ohashalg=sha1|sha256 when outputting SSHFP fingerprints to allow algorithm 3490 selection. bz3493 ok dtucker@ 3491 3492 OpenBSD-Commit-ID: e6e07fe21318a873bd877f333e189eb963a11b3d 3493 3494commit 18938d11a90b74d63c20b2d3c965d5bd64786ab1 3495Author: djm@openbsd.org <djm@openbsd.org> 3496Date: Fri Feb 10 04:47:19 2023 +0000 3497 3498 upstream: add a `sshd -G` option that parses and prints the 3499 3500 effective configuration without attempting to load private keys and perform 3501 other checks. This allows usage of the option before keys have been 3502 generated. 3503 3504 bz3460 feedback/ok dtucker@ 3505 3506 OpenBSD-Commit-ID: 774504f629023fc25a559ab1d95401adb3a7fb29 3507 3508commit df7d3dbf7194db8e97730ee0425d4d9d7bdb8b10 3509Author: djm@openbsd.org <djm@openbsd.org> 3510Date: Fri Feb 10 04:40:28 2023 +0000 3511 3512 upstream: make `ssh -Q CASignatureAlgorithms` work as the manpage says 3513 3514 it should bz3532 3515 3516 OpenBSD-Commit-ID: 0ddb17b3fcbd99bfb5baea4ac5e449620cbd3adc 3517 3518commit d3b8d4198b6595f23b5859d43dc8fc701f97429b 3519Author: Darren Tucker <dtucker@dtucker.net> 3520Date: Fri Feb 10 14:26:44 2023 +1100 3521 3522 Add CentOS 7 test targets. 3523 3524commit 22efb01e355bba4755b730ed417f91c081445bfc 3525Author: dtucker@openbsd.org <dtucker@openbsd.org> 3526Date: Thu Feb 9 09:55:33 2023 +0000 3527 3528 upstream: Test adding terminating newline to known_hosts. 3529 3530 OpenBSD-Regress-ID: 5fc3010ac450195b3fbdeb68e875564968800365 3531 3532commit caec6da1a583ed8c32c6ad3b81bbcaab46ac8b61 3533Author: dtucker@openbsd.org <dtucker@openbsd.org> 3534Date: Wed Feb 8 08:06:03 2023 +0000 3535 3536 upstream: ssh-agent doesn't actually take -v, 3537 3538 so the recently-added ones will result in the test not cleaning up 3539 after itself. Patch from cjwatson at debian.org vi bz#3536. 3540 3541 OpenBSD-Regress-ID: 1fc8283568f5bf2f918517c2c1e778072cf61b1a 3542 3543commit 3c379c9a849a635cc7f05cbe49fe473ccf469ef9 3544Author: dtucker@openbsd.org <dtucker@openbsd.org> 3545Date: Thu Feb 9 09:54:11 2023 +0000 3546 3547 upstream: Ensure that there is a terminating newline when adding a new 3548 3549 entry to known_hosts. bz#3529, with git+openssh at limpsquid.nl, ok deraadt@ 3550 markus@ 3551 3552 OpenBSD-Commit-ID: fa8d90698da1886570512b96f051e266eac105e0 3553 3554commit 95b6bbd2553547260b324b39d602061c88b774bc 3555Author: Darren Tucker <dtucker@dtucker.net> 3556Date: Tue Feb 7 08:43:47 2023 +1100 3557 3558 Replace 9.1 with 9.2 on CI status page. 3559 3560commit 195313dfe10a23c82e9d56d5fdd2f59beee1bdcf 3561Author: Damien Miller <djm@mindrot.org> 3562Date: Fri Feb 3 16:33:09 2023 +1100 3563 3564 harden Linux seccomp sandbox 3565 3566 Linux mmap(2) and madvise(2) syscalls support quite a number of funky 3567 flags that we don't expect that sshd/libc will ever need. We can 3568 exclude this kernel attack surface by filtering the mmap(2) flags 3569 and the madvise(2) advice arguments. 3570 3571 Similarly, the sandboxed process in sshd is a single-threaded program 3572 that does not use shared memory for synchronisation or communication. 3573 Therefore, there should be no reason for the advanced priority 3574 inheritance futex(2) operations to be necessary. These can also be 3575 excluded. 3576 3577 Motivated by Jann Horn pointing out that there have been kernel bugs 3578 in nearby Linux kernel code, e.g. CVE-2020-29368, CVE-2020-29374 and 3579 CVE-2022-42703. 3580 3581 Feedback Jann Horn, ok dtucker@ 3582 3583commit 6dfb65de949cdd0a5d198edee9a118f265924f33 3584Author: Damien Miller <djm@mindrot.org> 3585Date: Thu Feb 2 23:21:54 2023 +1100 3586 3587 crank versions in RPM specs 3588 3589commit d07cfb11a0ca574eb68a3931d8c46fbe862a2021 3590Author: Damien Miller <djm@mindrot.org> 3591Date: Thu Feb 2 23:21:45 2023 +1100 3592 3593 update version in README 3594 3595commit 9fe207565b4ab0fe5d1ac5bb85e39188d96fb214 3596Author: Damien Miller <djm@mindrot.org> 3597Date: Thu Feb 2 23:17:49 2023 +1100 3598 3599 adapt compat_kex_proposal() test to portable 3600 3601commit 903c556b938fff2d7bff8da2cc460254430963c5 3602Author: djm@openbsd.org <djm@openbsd.org> 3603Date: Thu Feb 2 12:12:52 2023 +0000 3604 3605 upstream: test compat_kex_proposal(); by dtucker@ 3606 3607 OpenBSD-Regress-ID: 0e404ee264db546f9fdbf53390689ab5f8d38bf2 3608 3609commit 405fba71962dec8409c0c962408e09049e5624b5 3610Author: dtucker@openbsd.org <dtucker@openbsd.org> 3611Date: Thu Jan 19 07:53:45 2023 +0000 3612 3613 upstream: Check if we can copy sshd or need to use sudo to do so 3614 3615 during reexec test. Skip test if neither can work. Patch from anton@, tweaks 3616 from me. 3617 3618 OpenBSD-Regress-ID: 731b96ae74d02d5744e1f1a8e51d09877ffd9b6d 3619 3620commit b2a2a8f69fd7737ea17dc044353c514f2f962f35 3621Author: djm@openbsd.org <djm@openbsd.org> 3622Date: Thu Feb 2 12:10:22 2023 +0000 3623 3624 upstream: openssh-9.2 3625 3626 OpenBSD-Commit-ID: f7389f32413c74d6e2055f05cf65e7082de03923 3627 3628commit 12da7823336434a403f25c7cc0c2c6aed0737a35 3629Author: djm@openbsd.org <djm@openbsd.org> 3630Date: Thu Feb 2 12:10:05 2023 +0000 3631 3632 upstream: fix double-free caused by compat_kex_proposal(); bz3522 3633 3634 by dtucker@, ok me 3635 3636 OpenBSD-Commit-ID: 2bfc37cd2d41f67dad64c17a64cf2cd3806a5c80 3637 3638commit 79efd95ab5ff99f4cb3a955e2d713b3f54fb807e 3639Author: Darren Tucker <dtucker@dtucker.net> 3640Date: Wed Feb 1 17:17:26 2023 +1100 3641 3642 Skip connection-timeout test on minix3. 3643 3644 Minix 3's Unix domain sockets don't seem to work the way we expect, so 3645 skip connection-timeout test on that platform. While there, group 3646 together all similarly skipped tests and explicitly comment. 3647 3648commit 6b508c4e039619842bcf5a16f8a6b08dd6bec44a 3649Author: Damien Miller <djm@mindrot.org> 3650Date: Wed Feb 1 12:12:05 2023 +1100 3651 3652 fix libfido2 detection without pkg-config 3653 3654 Place libfido2 before additional libraries (that it may depend upon) 3655 and not after. bz3530 from James Zhang; ok dtucker@ 3656 3657commit 358e300fed5e6def233a2c06326e51e20ebed621 3658Author: deraadt@openbsd.org <deraadt@openbsd.org> 3659Date: Wed Jan 18 20:56:36 2023 +0000 3660 3661 upstream: delete useless dependency 3662 3663 OpenBSD-Commit-ID: e1dc11143f83082e3154d6094f9136d0dc2637ad 3664 3665commit a4cb9be1b021b511e281ee55c356f964487d9e82 3666Author: deraadt@openbsd.org <deraadt@openbsd.org> 3667Date: Wed Jan 18 20:43:15 2023 +0000 3668 3669 upstream: Create and install sshd random relink kit. 3670 3671 ../Makefile.inc and Makfile are concatenated for reuse, which hopefully won't 3672 be too fragile, we'll see if we need a different approach. The resulting sshd 3673 binary is tested with the new sshd -V option before installation. As the 3674 binary layout is now semi-unknown (meaning relative, fixed, and gadget 3675 offsets are not precisely known), change the filesystem permissions to 511 to 3676 prevent what I call "logged in BROP". I have ideas for improving this further 3677 but this is a first step ok djm 3678 3679 OpenBSD-Commit-ID: 1e0a2692b7e20b126dda60bf04999d1d30d959d8 3680 3681commit bc7de6f91a9a0ae2f148a9d31a4027d441a51999 3682Author: jmc@openbsd.org <jmc@openbsd.org> 3683Date: Wed Jan 18 06:55:32 2023 +0000 3684 3685 upstream: tweak previous; ok djm 3686 3687 OpenBSD-Commit-ID: df71ce4180c58202dfdc1d92626cfe900b91b7c3 3688 3689commit a20b7e999773e6333c8aa9b0a7fa41966e63b037 3690Author: Darren Tucker <dtucker@dtucker.net> 3691Date: Tue Jan 31 19:35:44 2023 +1100 3692 3693 Skip connection-timeout test under Valgrind. 3694 3695 Valgrind slows things down so much that the timeout test fails. Skip 3696 this test until we figure out if we can make it work. 3697 3698commit c3ffb54b4fc5e608206037921db6ccbc2f5ab25f 3699Author: Darren Tucker <dtucker@dtucker.net> 3700Date: Wed Jan 25 21:58:40 2023 +1100 3701 3702 Skip connection-timeout when missing FD passing. 3703 3704 This tests uses multiplexing which uses file descriptor passing, so 3705 skip it if we don't have that. Fixes test failures on Cygwin. 3706 3707commit 35253af01d8c0ab444c8377402121816e71c71f5 3708Author: djm@openbsd.org <djm@openbsd.org> 3709Date: Wed Jan 18 02:00:10 2023 +0000 3710 3711 upstream: when restoring non-blocking mode to stdio fds, restore 3712 3713 exactly the flags that ssh started with and don't just clobber them with 3714 zero, as this could also remove the append flag from the set; 3715 3716 bz3523; ok dtucker@ 3717 3718 OpenBSD-Commit-ID: 1336b03e881db7564a4b66014eb24c5230e9a0c0 3719 3720commit 7d17ea151c0b2519f023bd9cc7f141128833ac47 3721Author: millert@openbsd.org <millert@openbsd.org> 3722Date: Wed Jan 18 01:50:21 2023 +0000 3723 3724 upstream: Add a -V (version) option to sshd like the ssh client 3725 3726 has. OK markus@ deraadt@ 3727 3728 OpenBSD-Commit-ID: abe990ec3e636fb040132aab8cbbede98f0c413e 3729 3730commit 62360feb7f08f2a4c6fc36f3b3449309203c42c9 3731Author: millert@openbsd.org <millert@openbsd.org> 3732Date: Tue Jan 17 18:52:44 2023 +0000 3733 3734 upstream: For "ssh -V" always exit 0, there is no need to check opt 3735 3736 again. This was missed when the fallthrough in the switch case above it was 3737 removed. OK deraadt@ 3738 3739 OpenBSD-Commit-ID: 5583e5d8f6d62a8a4215cfa95a69932f344c8120 3740 3741commit 12492c0abf1eb415d08a897cc1d8b9e789888230 3742Author: djm@openbsd.org <djm@openbsd.org> 3743Date: Tue Jan 17 10:15:10 2023 +0000 3744 3745 upstream: also check that an active session inhibits 3746 3747 UnusedConnectionTimeout idea markus@ 3748 3749 OpenBSD-Regress-ID: 55c0fb61f3bf9e092b0a53f9041d3d2012f14003 3750 3751commit cef2593c33ac46a58238ff998818754eabdf64ff 3752Author: djm@openbsd.org <djm@openbsd.org> 3753Date: Tue Jan 17 10:02:34 2023 +0000 3754 3755 upstream: regression test for UnusedConnectionTimeout 3756 3757 OpenBSD-Regress-ID: 7f29001374a68e71e5e078f69e4520cf4bcca084 3758 3759commit aff9493a89c71d6a080419b49ac64eead9730491 3760Author: djm@openbsd.org <djm@openbsd.org> 3761Date: Mon Jan 16 04:11:29 2023 +0000 3762 3763 upstream: unbreak test: cannot access shell positional parameters 3764 3765 past $9 without wrapping the position in braces (i.e. need ${10}, etc.) 3766 3767 OpenBSD-Regress-ID: 3750ec98d5d409ce6a93406fedde6f220d2ea2ac 3768 3769commit 0293c19807f83141cdf33b443154459f9ee471f6 3770Author: djm@openbsd.org <djm@openbsd.org> 3771Date: Tue Jan 17 09:44:48 2023 +0000 3772 3773 upstream: Add a sshd_config UnusedConnectionTimeout option to terminate 3774 3775 client connections that have no open channels for some length of time. This 3776 complements the recently-added ChannelTimeout option that terminates inactive 3777 channels after a timeout. 3778 3779 ok markus@ 3780 3781 OpenBSD-Commit-ID: ca983be74c0350364c11f8ba3bd692f6f24f5da9 3782 3783commit 8ec2e3123802d2beeca06c1644b0b647f6d36dab 3784Author: djm@openbsd.org <djm@openbsd.org> 3785Date: Sun Jan 15 23:35:10 2023 +0000 3786 3787 upstream: adapt to ed25519 changes in src/usr.bin/ssh 3788 3789 OpenBSD-Regress-ID: 4b3e7ba7ee486ae8a0b4790f8112eded2bb7dcd5 3790 3791commit 9fbbfeca1ce4c7ec0001c827bbf4189a3ba0964b 3792Author: djm@openbsd.org <djm@openbsd.org> 3793Date: Sun Jan 15 23:05:32 2023 +0000 3794 3795 upstream: update OpenSSH's Ed25519 code to the last version of SUPERCOP 3796 3797 (20221122) and change the import approach to the same one we use for 3798 Streamlined NTRUPrime: use a shell script to extract the bits we need from 3799 SUPERCOP, make some minor adjustments and squish them all into a single file. 3800 3801 ok tb@ tobhe@ 3802 3803 OpenBSD-Commit-ID: 1bc0fd624cb6af440905b8ba74ac7c03311b8e3b 3804 3805commit 6283f4bd83eee714d0f5fc55802eff836b06fea8 3806Author: Darren Tucker <dtucker@dtucker.net> 3807Date: Sat Jan 14 22:02:44 2023 +1100 3808 3809 Allow writev is seccomp sandbox. 3810 3811 This seems to be used by recent glibcs at least in some configurations. 3812 From bz#3512, ok djm@ 3813 3814commit 923c3f437f439cfca238fba37e97a7041782f615 3815Author: dtucker@openbsd.org <dtucker@openbsd.org> 3816Date: Sat Jan 14 10:05:54 2023 +0000 3817 3818 upstream: Shell syntax fix. From ren mingshuai vi github PR#369. 3819 3820 OpenBSD-Regress-ID: 6696b2eeefe128099fc3d7ea9f23252cc35156f9 3821 3822commit 4d87a00f704e0365e11c3c38b170c1275ec461fc 3823Author: dtucker@openbsd.org <dtucker@openbsd.org> 3824Date: Sat Jan 14 09:57:08 2023 +0000 3825 3826 upstream: Instead of skipping the all-tokens test if we don't have 3827 3828 OpenSSL (since we use it to compute the hash), put the hash at the end and 3829 just omit it if we don't have it. Prompted by bz#3521. 3830 3831 OpenBSD-Regress-ID: c79ecba64250ed3b6417294b6c965e6b12ca5eea 3832 3833commit b05406d6f93b8c8ec11ec8b27e7c76cc7a5a55fb 3834Author: jmc@openbsd.org <jmc@openbsd.org> 3835Date: Fri Jan 13 07:13:40 2023 +0000 3836 3837 upstream: fix double phrase in previous; 3838 3839 OpenBSD-Commit-ID: 671e6c8dc5e9230518b2bbfa143daaa88adc66c2 3840 3841commit 40564812b659c530eb1f4b62d09e85612aef3107 3842Author: dtucker@openbsd.org <dtucker@openbsd.org> 3843Date: Fri Jan 13 03:16:29 2023 +0000 3844 3845 upstream: Document "UserKnownHostsFile none". ok djm@ 3846 3847 OpenBSD-Commit-ID: f695742d39e34ecdcc3c861c3739a84648a4bce5 3848 3849commit d03e245e034019a37388f6f5f893ce848ab6d2e2 3850Author: Darren Tucker <dtucker@dtucker.net> 3851Date: Fri Jan 13 23:02:34 2023 +1100 3852 3853 Retry package installation 3 times. 3854 3855 When setting up the CI environment, retry package installation 3 times 3856 before going up. Should help prevent spurious failures during 3857 infrastructure issues. 3858 3859commit 625f6bc39840167dafb3bf5b6a3e18503ac986e8 3860Author: dtucker@openbsd.org <dtucker@openbsd.org> 3861Date: Fri Jan 13 04:47:34 2023 +0000 3862 3863 upstream: Move scp path setting to a helper function. The previous 3864 3865 commit to add scp to the test sshd's path causes the t-envpass test to fail 3866 when the test scp is given using a fully qualified path. Put this in a 3867 helper function and only call it from the scp tests. 3868 3869 OpenBSD-Regress-ID: 7533dc1c4265c1de716abb062957994195b36df4 3870 3871commit 6e6f88647042b3cde54a628545c2f5fb656a9327 3872Author: dtucker@openbsd.org <dtucker@openbsd.org> 3873Date: Fri Jan 13 04:23:00 2023 +0000 3874 3875 upstream: Add scp's path to test sshd's PATH. 3876 3877 If the scp we're testing is fully qualified (eg it's not in the system 3878 PATH) then add its path to the under-test sshd's PATH so we can find 3879 it. Prompted by bz#3518. 3880 3881 OpenBSD-Regress-ID: 7df4f5a0be3aa135495b7e5a6719d3cbc26cc4c0 3882 3883commit 8a5e99a70fcf9b022a8aa175ebf6a71f58511da3 3884Author: Darren Tucker <dtucker@dtucker.net> 3885Date: Fri Jan 13 15:49:48 2023 +1100 3886 3887 Remove skipping test when scp not in path. 3888 3889 An upcoming change renders this obsolete by adding scp's path to the 3890 test sshd's PATH, and removing this first will make the subsequent sync 3891 easier. 3892 3893commit 41f36dd896c8fb8337d403fcf476762986976e9d 3894Author: dtucker@openbsd.org <dtucker@openbsd.org> 3895Date: Fri Jan 13 02:58:20 2023 +0000 3896 3897 upstream: Add a "Host" line to the output of ssh -G showing the 3898 3899 original host arg. Inspired by patch from vincent at bernat.ch via bz#3343, 3900 ok djm@ 3901 3902 OpenBSD-Commit-ID: 59c0f60a222113a44d0650cd394376e3beecc883 3903 3904commit f673b49f3be3eb51074fbb8a405beb6cd0f7d93e 3905Author: djm@openbsd.org <djm@openbsd.org> 3906Date: Fri Jan 13 02:44:02 2023 +0000 3907 3908 upstream: avoid printf("%s", NULL) if using ssh 3909 3910 -oUserKnownHostsFile=none and a hostkey in one of the system known hosts file 3911 changes; ok dtucker@ 3912 3913 OpenBSD-Commit-ID: 7ca87614bfc6da491315536a7f2301434a9fe614 3914 3915commit 93fc7c576563e3d88a1dc019dd213f65607784cc 3916Author: djm@openbsd.org <djm@openbsd.org> 3917Date: Wed Jan 11 05:39:38 2023 +0000 3918 3919 upstream: clamp the minimum buffer lengths and number of inflight 3920 3921 requests too 3922 3923 OpenBSD-Commit-ID: c4965f62fa0ba850940fd66ae3f60cf516bbcd56 3924 3925commit 48bf234322e639d279c5a28435eae50155e9b514 3926Author: djm@openbsd.org <djm@openbsd.org> 3927Date: Wed Jan 11 05:36:50 2023 +0000 3928 3929 upstream: ignore bogus upload/download buffer lengths in the limits 3930 3931 extension 3932 3933 OpenBSD-Commit-ID: c5b023e0954693ba9a5376e4280c739b5db575f8 3934 3935commit 36b00d31833ca74cb0f7c7d8eda1bde55700f929 3936Author: djm@openbsd.org <djm@openbsd.org> 3937Date: Wed Jan 11 02:13:52 2023 +0000 3938 3939 upstream: remove whitespace at EOL from code extracted from SUPERCOP 3940 3941 OpenBSD-Commit-ID: 1ec524ff2fbb9387d731601437c82008f35a60f4 3942 3943commit d888de06c5e4d7dbf2f2b85f2b5bf028c570cf78 3944Author: djm@openbsd.org <djm@openbsd.org> 3945Date: Wed Jan 11 00:51:27 2023 +0000 3946 3947 upstream: rewrite this test to use a multiplexed ssh session so we can 3948 3949 control its lifecycle without risk of race conditions; fixes some of the 3950 Github integration tests for openssh-portable 3951 3952 OpenBSD-Regress-ID: 5451cad59ba0d43ae9eeda48ec80f54405fee969 3953 3954commit 4bcc737a35fdd9cc4af7423d6c23dfd0c7ef4786 3955Author: Damien Miller <djm@mindrot.org> 3956Date: Wed Jan 11 11:45:17 2023 +1100 3957 3958 remove buffer len workaround for NetBSD 4.x 3959 3960 Switching to from pipes to a socketpair for communicating with the 3961 ssh process avoids the (kernel bug?) problem. 3962 3963commit f5154d2aac3e6a32a1b13dec23a701a087850cdc 3964Author: Damien Miller <djm@mindrot.org> 3965Date: Wed Jan 11 11:44:19 2023 +1100 3966 3967 add back use of pipes in scp.c under USE_PIPES 3968 3969 This matches sftp.c which prefers socketpair but uses pipes on 3970 some older platforms. 3971 3972commit eec737b59cf13841de46134967a206607000acd4 3973Author: millert@openbsd.org <millert@openbsd.org> 3974Date: Tue Jan 10 23:22:15 2023 +0000 3975 3976 upstream: Switch scp from using pipes to a socketpair for 3977 3978 communication with it's ssh sub-processes. We no longer need to reserve two 3979 descriptors to ensure that we don't end up using fd 0-2 unexpectedly, that is 3980 handled by sanitise_stdfd() in main(). Based on an original diff from djm@. 3981 OK deraadt@ djm@ 3982 3983 OpenBSD-Commit-ID: b80c372faac462471e955ddeab9480d668a2e48d 3984 3985commit d213d126a4a343abd3a1eb13687d39c1891fe5c8 3986Author: jmc@openbsd.org <jmc@openbsd.org> 3987Date: Fri Jan 6 08:44:11 2023 +0000 3988 3989 upstream: tweak previous; ok djm 3990 3991 OpenBSD-Commit-ID: 229c493452766d70a78b0f02f6ff9894f9028858 3992 3993commit 4a5590a5ee47b7dfd49773e9fdba48ad3089fe64 3994Author: Damien Miller <djm@mindrot.org> 3995Date: Mon Jan 9 16:33:56 2023 +1100 3996 3997 try to improve logging for dynamic-forward test 3998 3999 previously the logs from the ssh used to exercise the forwarding 4000 channel would clobber the logs from the ssh actually doing the 4001 forwarding 4002 4003commit 715bc25dcfccf9fb2bee820155fe071d01a618db 4004Author: Darren Tucker <dtucker@dtucker.net> 4005Date: Sat Jan 7 23:24:50 2023 +1100 4006 4007 Skip dynamic-forward test on minix3. 4008 4009 This test relies on loopback addresses which minix does not have. 4010 Previously the test would not run at all since it also doesn't have 4011 netcat, but now we use our own netcat it tries and fails. 4012 4013commit dd1249bd5c45128a908395c61b26996a70f82205 4014Author: Damien Miller <djm@mindrot.org> 4015Date: Sun Jan 8 12:08:59 2023 +1100 4016 4017 don't test IPv6 addresses if platform lacks support 4018 4019commit d77fc611a62f2dfee0b654c31a50a814b13310dd 4020Author: dtucker@openbsd.org <dtucker@openbsd.org> 4021Date: Fri Jan 6 12:33:33 2023 +0000 4022 4023 upstream: When OpenSSL is not available, skip parts of percent test 4024 4025 that require it. Based on github pr#368 from ren mingshuai. 4026 4027 OpenBSD-Regress-ID: 49a375b2cf61ccb95b52e75e2e025cd10988ebb2 4028 4029commit 1cd2aac312af9172f1b5cb06c2e1cd090abb83cf 4030Author: Darren Tucker <dtucker@dtucker.net> 4031Date: Sat Jan 7 23:01:11 2023 +1100 4032 4033 Use our own netcat for dynamic-forward test. 4034 4035 That way we can be surer about its behaviour rather than trying to 4036 second-guess the behaviour of various netcat implementations. 4037 4038commit 26cab41c05d7b0859d2a1ea5b6ed253d91848a80 4039Author: Darren Tucker <dtucker@dtucker.net> 4040Date: Sat Jan 7 14:30:43 2023 +1100 4041 4042 Use autoconf to find openssl binary. 4043 4044 It's possible to install an OpenSSL in a path not in the system's 4045 default library search path. OpenSSH can still use this (eg if you 4046 specify an rpath) but the openssl binary there may not work. If one is 4047 available on the system path just use that. 4048 4049commit 5532e010a0eeb6aa264396514f9aed7948471538 4050Author: Darren Tucker <dtucker@dtucker.net> 4051Date: Sat Jan 7 10:34:18 2023 +1100 4052 4053 Check openssl_bin path is executable before using. 4054 4055commit 5d7b16cff48598d5908db970bfdc9ff9326142c8 4056Author: Darren Tucker <dtucker@dtucker.net> 4057Date: Fri Jan 6 23:19:07 2023 +1100 4058 4059 Set OPENSSL_BIN from OpenSSL directory. 4060 4061commit 344a0e8240eaf08da5d46a5e3a9ecad6e4f64c35 4062Author: dtucker@openbsd.org <dtucker@openbsd.org> 4063Date: Fri Jan 6 08:50:33 2023 +0000 4064 4065 upstream: Save debug logs from ssh for debugging purposes. 4066 4067 OpenBSD-Regress-ID: 109e40b06de1c006a3b8e0d8745b790b2c5870a0 4068 4069commit e1ef172646f7f49c80807eea90225ef5e0be55a8 4070Author: djm@openbsd.org <djm@openbsd.org> 4071Date: Fri Jan 6 08:07:39 2023 +0000 4072 4073 upstream: regression test for ChannelTimeout 4074 4075 OpenBSD-Regress-ID: 280bfbefcfa415428ad744e43f69a8dede8ad685 4076 4077commit 2393ea8daf25853459eb07a528d7577688847777 4078Author: djm@openbsd.org <djm@openbsd.org> 4079Date: Fri Jan 6 07:18:18 2023 +0000 4080 4081 upstream: fix typo in verbose logging 4082 4083 OpenBSD-Regress-ID: 0497cdb66e003b2f50ed77291a9104fba2e017e9 4084 4085commit 161a5378a3cc2e7aa3f9674cb7f4686ae6ce9586 4086Author: djm@openbsd.org <djm@openbsd.org> 4087Date: Fri Jan 6 02:59:50 2023 +0000 4088 4089 upstream: unit tests for misc.c:ptimeout_* API 4090 4091 OpenBSD-Regress-ID: 01f8fb12d08e5aaadd4bd4e71f456b6588be9a94 4092 4093commit 018d671d78145f03d6f07ae9d64d51321da70325 4094Author: tb@openbsd.org <tb@openbsd.org> 4095Date: Wed Jan 4 22:48:57 2023 +0000 4096 4097 upstream: Copy bytes from the_banana[] rather than banana() 4098 4099 Fixes test failure due to segfault seen on arm64 with xonly snap. 4100 4101 ok djm 4102 4103 OpenBSD-Regress-ID: 86e2aa4bbd1dff1bc4ebb2969c0d6474485be046 4104 4105commit ab6bb69e251faa8b24f81b25c72ec0120f20cad4 4106Author: Damien Miller <djm@mindrot.org> 4107Date: Fri Jan 6 19:13:36 2023 +1100 4108 4109 unbreak scp on NetBSD 4.x 4110 4111 e555d5cad5 effectively increased the default copy buffer size for SFTP 4112 transfers. This caused NetBSD 4.x to hang during the "copy local file to 4113 remote file in place" scp.sh regression test. 4114 4115 This puts back the original 32KB copy buffer size until we can properly 4116 figure out why. 4117 4118 lots of debugging assistance from dtucker@ 4119 4120commit 2d1ff2b9431393ad99ef496d5e3b9dd0d4f5ac8c 4121Author: djm@openbsd.org <djm@openbsd.org> 4122Date: Fri Jan 6 02:47:18 2023 +0000 4123 4124 upstream: Implement channel inactivity timeouts 4125 4126 This adds a sshd_config ChannelTimeouts directive that allows channels that 4127 have not seen traffic in a configurable interval to be automatically closed. 4128 Different timeouts may be applied to session, X11, agent and TCP forwarding 4129 channels. 4130 4131 Note: this only affects channels over an opened SSH connection and not 4132 the connection itself. Most clients close the connection when their channels 4133 go away, with a notable exception being ssh(1) in multiplexing mode. 4134 4135 ok markus dtucker 4136 4137 OpenBSD-Commit-ID: ae8bba3ed9d9f95ff2e2dc8dcadfa36b48e6c0b8 4138 4139commit 0e34348d0bc0b1522f75d6212a53d6d1d1367980 4140Author: djm@openbsd.org <djm@openbsd.org> 4141Date: Fri Jan 6 02:42:34 2023 +0000 4142 4143 upstream: Add channel_set_xtype() 4144 4145 This sets an "extended" channel type after channel creation (e.g. 4146 "session:subsystem:sftp") that will be used for setting channel inactivity 4147 timeouts. 4148 4149 ok markus dtucker 4150 4151 OpenBSD-Commit-ID: 42564aa92345045b4a74300528f960416a15d4ca 4152 4153commit ceedf09b2977f3a756c759a6e7eb8f8e9db86a18 4154Author: djm@openbsd.org <djm@openbsd.org> 4155Date: Fri Jan 6 02:41:49 2023 +0000 4156 4157 upstream: tweak channel ctype names 4158 4159 These are now used by sshd_config:ChannelTimeouts to specify timeouts by 4160 channel type, so force them all to use a similar format without whitespace. 4161 4162 ok dtucker markus 4163 4164 OpenBSD-Commit-ID: 66834765bb4ae14f96d2bb981ac98a7dae361b65 4165 4166commit c60438158ad4b2f83d8504257aba1be7d0b0bb4b 4167Author: djm@openbsd.org <djm@openbsd.org> 4168Date: Fri Jan 6 02:39:59 2023 +0000 4169 4170 upstream: Add channel_force_close() 4171 4172 This will forcibly close an open channel by simulating read/write errors, 4173 draining the IO buffers and calling the detach function. 4174 4175 Previously the detach function was only ever called during channel garbage 4176 collection, but there was no way to signal the user of a channel (e.g. 4177 session.c) that its channel was being closed deliberately (vs. by the 4178 usual state-machine logic). So this adds an extra "force" argument to the 4179 channel cleanup callback to indicate this condition. 4180 4181 ok markus dtucker 4182 4183 OpenBSD-Commit-ID: 23052707a42bdc62fda2508636e624afd466324b 4184 4185commit d478cdc7ad6edd4b1bcd1e86fb2f23194ff33d5a 4186Author: djm@openbsd.org <djm@openbsd.org> 4187Date: Fri Jan 6 02:38:23 2023 +0000 4188 4189 upstream: replace manual poll/ppoll timeout math with ptimeout API 4190 4191 feedback markus / ok markus dtucker 4192 4193 OpenBSD-Commit-ID: c5ec4f2d52684cdb788cd9cbc1bcf89464014be2 4194 4195commit 4adf3817a24efe99b06e62630577d683c7cd8065 4196Author: djm@openbsd.org <djm@openbsd.org> 4197Date: Fri Jan 6 02:37:04 2023 +0000 4198 4199 upstream: add ptimeout API for keeping track of poll/ppoll 4200 4201 timeouts; ok dtucker markus 4202 4203 OpenBSD-Commit-ID: 3335268ca135b3ec15a947547d7cfbb8ff929ead 4204 4205commit 8c7c69d32375d2f3ce9da0109c9bffc560842316 4206Author: djm@openbsd.org <djm@openbsd.org> 4207Date: Thu Jan 5 05:49:13 2023 +0000 4208 4209 upstream: suppress "Connection closed" message when in quiet mode 4210 4211 OpenBSD-Commit-ID: 8a3ab7176764da55f60bfacfeae9b82d84e3908f 4212 4213commit 845ceecea2ac311b0c267f9ecbd34862e1876fc6 4214Author: djm@openbsd.org <djm@openbsd.org> 4215Date: Mon Jan 2 07:03:57 2023 +0000 4216 4217 upstream: regression test for PermitRemoteOpen 4218 4219 OpenBSD-Regress-ID: 8271aafbf5c21950cd5bf966f08e585cebfe630c 4220 4221commit b3daa8dc582348d6ab8150bc1e571b7aa08c5388 4222Author: djm@openbsd.org <djm@openbsd.org> 4223Date: Mon Jan 2 07:03:30 2023 +0000 4224 4225 upstream: fix bug in PermitRemoteOpen which caused it to ignore its 4226 4227 first argument unless it was one of the special keywords "any" or "none". 4228 4229 Reported by Georges Chaudy in bz3515; ok dtucker@ 4230 4231 OpenBSD-Commit-ID: c5678a39f1ff79993d5ae3cfac5746a4ae148ea5 4232 4233commit 0872663a7be0301bcc3d49acdbc9b740a3d972d4 4234Author: jmc@openbsd.org <jmc@openbsd.org> 4235Date: Mon Dec 26 19:16:03 2022 +0000 4236 4237 upstream: spelling fixes; from paul tagliamonte amendments to his 4238 4239 diff are noted on tech 4240 4241 OpenBSD-Commit-ID: d776dd03d0b882ca9c83b84f6b384f6f9bd7de4a 4242 4243commit 797da2812a71785b34890bb6eb44767a7d09cd34 4244Author: djm@openbsd.org <djm@openbsd.org> 4245Date: Fri Dec 16 07:13:22 2022 +0000 4246 4247 upstream: Mention that scp uses the SFTP protocol and remove 4248 4249 reference to legacy flag. Spotted by, feedback and ok jmc@ 4250 4251 OpenBSD-Commit-ID: 9dfe04966f52e941966b46c7a2972147f95281b3 4252 4253commit 93f2ce8c050a7a2a628646c00b40b9b53fef93ef 4254Author: djm@openbsd.org <djm@openbsd.org> 4255Date: Fri Dec 16 06:56:47 2022 +0000 4256 4257 upstream: Clear signal mask early in main(); sshd may have been 4258 4259 started with one or more signals masked (sigprocmask(2) is not cleared 4260 on fork/exec) and this could interfere with various things, e.g. the 4261 login grace timer. 4262 4263 Execution environments that fail to clear the signal mask before running 4264 sshd are clearly broken, but apparently they do exist. 4265 4266 Reported by Sreedhar Balasubramanian; ok dtucker@ 4267 4268 OpenBSD-Commit-ID: 77078c0b1c53c780269fc0c416f121d05e3010ae 4269 4270commit 4acfaabfae41badb9d334a2ee88c5c6ad041c0d5 4271Author: jmc@openbsd.org <jmc@openbsd.org> 4272Date: Fri Dec 16 06:52:48 2022 +0000 4273 4274 upstream: add -X to usage(); 4275 4276 OpenBSD-Commit-ID: 1bdc3df7de11d766587b0428318336dbffe4a9d0 4277 4278commit e555d5cad5afae7d5ef2bbc02ca591178fe16fed 4279Author: djm@openbsd.org <djm@openbsd.org> 4280Date: Fri Dec 16 03:40:03 2022 +0000 4281 4282 upstream: add a -X option to both scp(1) and sftp(1) to allow 4283 4284 control over some SFTP protocol knobs: the copy buffer length and 4285 the number of inflight requests, both of which are used during 4286 upload/download. 4287 4288 Previously these could be controlled in sftp(1) using the -b/-R options. 4289 This makes them available in both SFTP protocol clients using the same 4290 option character sequence. 4291 4292 ok dtucker@ 4293 4294 OpenBSD-Commit-ID: 27502bffc589776f5da1f31df8cb51abe9a15f1c 4295 4296commit 5a7a7acab2f466dc1d7467b5d05d35268c3137aa 4297Author: deraadt@openbsd.org <deraadt@openbsd.org> 4298Date: Thu Dec 15 18:20:39 2022 +0000 4299 4300 upstream: The idiomatic way of coping with signed char vs unsigned 4301 4302 char (which did not come from stdio read functions) in the presence of 4303 ctype macros, is to always cast to (unsigned char). casting to (int) 4304 for a "macro" which is documented to take int, is weird. And sadly wrong, 4305 because of the sing extension risk.. same diff from florian 4306 4307 OpenBSD-Commit-ID: 65b9a49a68e22ff3a0ebd593f363e9f22dd73fea 4308 4309commit b0b58222c7cc62efd8212c4fb65a545f58ebb22d 4310Author: Darren Tucker <dtucker@dtucker.net> 4311Date: Mon Dec 19 18:49:51 2022 +1100 4312 4313 Simply handling of SSH_CONNECTION PAM env var. 4314 4315 Prompted by bz#3508: there's no need to cache the value of 4316 sshpam_conninfo so remove the global. While there, add check of 4317 return value from pam_putenv. ok djm@ 4318 4319commit ed8444572ae684fdb892f97bae342c6cb6456f04 4320Author: Darren Tucker <dtucker@dtucker.net> 4321Date: Mon Dec 19 18:42:34 2022 +1100 4322 4323 Add tests for LibreSSL 3.7.0 and OpenSSL 1.1.1s. 4324 4325commit abb9a8aaddfcacbd12641f6e4f203da0fa85a287 4326Author: Darren Tucker <dtucker@dtucker.net> 4327Date: Sun Dec 18 21:36:25 2022 +1100 4328 4329 Use sudo when resetting perms on directories. 4330 4331commit 2f5664c5908d84697cbe91302d5d5c4d83cb2121 4332Author: Darren Tucker <dtucker@dtucker.net> 4333Date: Sun Dec 18 21:19:33 2022 +1100 4334 4335 Set group perms on regress dir. 4336 4337 This ensures that the tests don't fail due to StrictMode checks. 4338 4339commit 137196300fc1540affadde880210f02ba6cb4abf 4340Author: Darren Tucker <dtucker@dtucker.net> 4341Date: Sun Dec 18 21:13:42 2022 +1100 4342 4343 Fetch regress logs from obj dir. 4344 4345commit 5f93c4836527d9fda05de8944a1c7b4a205080c7 4346Author: Darren Tucker <dtucker@dtucker.net> 4347Date: Tue Dec 13 20:59:54 2022 +1100 4348 4349 obsdsnap test VMs runs-on libvirt too. 4350 4351commit 8386886fb1ab7fda73069fb0db1dbe0e5a52f758 4352Author: Darren Tucker <dtucker@dtucker.net> 4353Date: Tue Dec 13 20:55:37 2022 +1100 4354 4355 Run upstream obsdsnap tests on ephemeral runners. 4356 4357commit b6e01459b55ece85d7f296b2bc719d1841e1009e 4358Author: Darren Tucker <dtucker@dtucker.net> 4359Date: Tue Dec 13 20:48:56 2022 +1100 4360 4361 Move obsdsnap test VMs to ephemeral runners. 4362 4363commit ea6fdf9a1aa71a411f7db218a986392c4fb55693 4364Author: Damien Miller <djm@mindrot.org> 4365Date: Fri Dec 9 18:00:21 2022 +1100 4366 4367 use calloc for allocating arc4random structs 4368 4369 ok dtucker 4370 4371commit 4403b62f5548e91389cb3339d26a9d0c4bb07b34 4372Author: dtucker@openbsd.org <dtucker@openbsd.org> 4373Date: Fri Dec 9 00:22:29 2022 +0000 4374 4375 upstream: Warn if no host keys for hostbased auth can be loaded. 4376 4377 OpenBSD-Commit-ID: 2a0a13132000cf8d3593133c1b49768aa3c95977 4378 4379commit a6183e25e3f1842e21999fe88bc40bb99b121dc3 4380Author: dtucker@openbsd.org <dtucker@openbsd.org> 4381Date: Fri Dec 9 00:17:40 2022 +0000 4382 4383 upstream: Add server debugging for hostbased auth. 4384 4385 auth_debug_add queues messages about the auth process which is sent to 4386 the client after successful authentication. This also sends those to 4387 the server debug log to aid in debugging. From bz#3507, ok djm@ 4388 4389 OpenBSD-Commit-ID: 46ff67518cccf9caf47e06393e2a121ee5aa258a 4390 4391commit b85c3581c16aaf6e83b9a797c80705a56b1f312e 4392Author: cheloha@openbsd.org <cheloha@openbsd.org> 4393Date: Sun Dec 4 23:50:49 2022 +0000 4394 4395 upstream: remove '?' from getopt(3) loops 4396 4397 userspace: remove vestigial '?' cases from top-level getopt(3) loops 4398 4399 getopt(3) returns '?' when it encounters a flag not present in the in 4400 the optstring or if a flag is missing its option argument. We can 4401 handle this case with the "default" failure case with no loss of 4402 legibility. Hence, remove all the redundant "case '?':" lines. 4403 4404 Prompted by dlg@. With help from dlg@ and millert@. 4405 4406 Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2 4407 4408 ok naddy@ millert@ dlg@ 4409 4410 OpenBSD-Commit-ID: b2f89346538ce4f5b33ab8011a23e0626a67e66e 4411 4412commit 9a067e8d28a2249fd73f004961e30c113ee85e5d 4413Author: dtucker@openbsd.org <dtucker@openbsd.org> 4414Date: Wed Dec 7 11:45:43 2022 +0000 4415 4416 upstream: Fix comment typo. 4417 4418 OpenBSD-Regress-ID: 3b04faced6511bb5e74648c6a4ef4bf2c4decf03 4419 4420commit ce3c3e78ce45d68a82c7c8dc89895f297a67f225 4421Author: Darren Tucker <dtucker@dtucker.net> 4422Date: Wed Dec 7 18:58:25 2022 +1100 4423 4424 Add SANDBOX_DEBUG to the kitchensink test build. 4425 4426commit bc234605fa3eb10f56bf0d74c8ecb0d91ada9d05 4427Author: Damien Miller <djm@mindrot.org> 4428Date: Wed Dec 7 18:38:25 2022 +1100 4429 4430 disable SANDBOX_SECCOMP_FILTER_DEBUG 4431 4432 It was mistakenly enabled in 2580916e4872 4433 4434 Reported by Peter sec-openssh-com.22.fichtner AT 0sg.net 4435 4436commit b087c5cfa011b27992e01589314fec830266f99d 4437Author: Rose <83477269+AtariDreams@users.noreply.github.com> 4438Date: Tue Nov 29 15:12:54 2022 -0500 4439 4440 Update autotools 4441 4442 Regenerate config files using latest autotools 4443 4444commit d63f5494978a185c7421d492b9c2f6f05bb54138 4445Author: Darren Tucker <dtucker@dtucker.net> 4446Date: Tue Dec 6 12:22:36 2022 +1100 4447 4448 Fix typo in comment. Spotted by tim@ 4449 4450commit 73dcca12115aa12ed0d123b914d473c384e52651 4451Author: dtucker@openbsd.org <dtucker@openbsd.org> 4452Date: Sun Dec 4 11:03:11 2022 +0000 4453 4454 upstream: Remove duplicate includes. 4455 4456 Patch from AtariDreams via github PR#364. 4457 4458 OpenBSD-Commit-ID: b9186638a05cb8b56ef7c0de521922b6723644ea 4459 4460commit 3cec15543010bc8d6997d896b1717a650afb7e92 4461Author: djm@openbsd.org <djm@openbsd.org> 4462Date: Fri Dec 2 04:40:27 2022 +0000 4463 4464 upstream: make struct sshbuf private 4465 4466 and remove an unused field; ok dtucker 4467 4468 OpenBSD-Commit-ID: c7a3d77c0b8c153d463398606a8d57569186a0c3 4469 4470commit 5796bf8ca9535f9fa7d01829a540d2550e05c860 4471Author: Darren Tucker <dtucker@dtucker.net> 4472Date: Fri Dec 2 11:43:36 2022 +1100 4473 4474 Restore ssh-agent permissions on exit. 4475 4476 ...enough that subsequent builds can overwrite ssh-agent if necessary. 4477 4478commit ccf5a13868cbb4659107458cac1e017c98abcbda 4479Author: dtucker@openbsd.org <dtucker@openbsd.org> 4480Date: Thu Dec 1 02:22:13 2022 +0000 4481 4482 upstream: Clean up ssh-add and ssh-agent logs. 4483 4484 OpenBSD-Regress-ID: 9eda8e4c3714d7f943ab2e73ed58a233bd29cd2c 4485 4486commit 7a8b40cf6a5eda80173140cc6750a6db8412fa87 4487Author: dtucker@openbsd.org <dtucker@openbsd.org> 4488Date: Thu Dec 1 02:19:29 2022 +0000 4489 4490 upstream: Log output of ssh-agent and ssh-add 4491 4492 This should make debugging easier. 4493 4494 OpenBSD-Regress-ID: 5974b02651f428d7e1079b41304c498ca7e306c8 4495 4496commit 4a1805d532616233dd6072e5cd273b96dd3062e6 4497Author: dtucker@openbsd.org <dtucker@openbsd.org> 4498Date: Tue Nov 29 22:41:14 2022 +0000 4499 4500 upstream: Add void to client_repledge args to fix compiler warning. ok djm@ 4501 4502 OpenBSD-Commit-ID: 7e964a641ce4a0a0a11f047953b29929d7a4b866 4503 4504commit 815c4704930aa449edf6e812e99d69e9ffd31f01 4505Author: djm@openbsd.org <djm@openbsd.org> 4506Date: Mon Nov 28 01:38:22 2022 +0000 4507 4508 upstream: tighten pledge(2) after session establishment 4509 4510 feedback, ok & testing in snaps deraadt@ 4511 4512 OpenBSD-Commit-ID: aecf4d49d28586dfbcc74328d9333398fef9eb58 4513 4514commit f7cebbbf407d772ed71403d314343766782fe540 4515Author: djm@openbsd.org <djm@openbsd.org> 4516Date: Mon Nov 28 01:37:36 2022 +0000 4517 4518 upstream: New EnableEscapeCommandline ssh_config(5) option 4519 4520 This option (default "no") controls whether the ~C escape is available. 4521 Turning it off by default means we will soon be able to use a stricter 4522 default pledge(2) in the client. 4523 4524 feedback deraadt@ dtucker@; tested in snaps for a while 4525 4526 OpenBSD-Commit-ID: 7e277595d60acb8263118dcb66554472257b387a 4527 4528commit d323f7ecf52e3d4ec1f4939bf31693e02f891dca 4529Author: mbuhl@openbsd.org <mbuhl@openbsd.org> 4530Date: Fri Nov 18 19:47:40 2022 +0000 4531 4532 upstream: In channel_request_remote_forwarding the parameters for 4533 4534 permission_set_add are leaked as they are also duplicated in the call. Found 4535 by CodeChecker. ok djm 4536 4537 OpenBSD-Commit-ID: 4aef50fa9be7c0b138188814c8fe3dccc196f61e 4538 4539commit 62cc33e6eed847aafdc29e34aa69e9bd82a0ee16 4540Author: Darren Tucker <dtucker@dtucker.net> 4541Date: Wed Nov 30 11:23:11 2022 +1100 4542 4543 Use -fzero-call-used-regs=used on clang 15. 4544 4545 clang 15 seems to have a problem with -fzero-call-used-reg=all which 4546 causes spurious "incorrect signature" failures with ED25519. On those 4547 versions, use -fzero-call-used-regs=used instead. (We may add exceptions 4548 later if specific versions prove to be OK). Also move the GCC version 4549 check to match. 4550 4551 Initial investigation by Daniel Pouzzner (douzzer at mega nu), workaround 4552 suggested by Bill Wendling (morbo at google com). bz#3475, ok djm@ 4553 4554commit f84b9cffd52c9c5c359a54a1929f9948e803ab1d 4555Author: Darren Tucker <dtucker@dtucker.net> 4556Date: Mon Nov 28 21:09:28 2022 +1100 4557 4558 Skip unit tests on slow riscv64 hardware. 4559 4560commit 9f2747e0bed3faca92679eae69aef10c95dc82f5 4561Author: Darren Tucker <dtucker@dtucker.net> 4562Date: Sun Nov 27 15:26:22 2022 +1100 4563 4564 Rework how selfhosted tests interact with runners. 4565 4566 Previously there was one runner per test target (mostly VMs). This had 4567 a few limitations: 4568 - multiple tests that ran on the same target (eg multiple build 4569 configs) were serialized on availability or that runner. 4570 - it needed manual balancing of VMs over host machines. 4571 4572 To address this, make VMs that use ephemeral disks (ie most of them) 4573 all use a pool of runners with the "libvirt" label. This requires that 4574 we distinguish between "host" and "target" for those. Native runners 4575 and VMs with persistent disks (eg the constantly-updated snapshot ones) 4576 specify the same host and target. 4577 4578 This should improve test throughput. 4579 4580commit d664ddaec87bdc7385be8ef7f1337793e1679d48 4581Author: Darren Tucker <dtucker@dtucker.net> 4582Date: Sun Nov 27 12:19:37 2022 +1100 4583 4584 Run vmstartup from temp dir. 4585 4586 This will allow us to create ephemeral disk images per-runner. 4587 4588commit 0fa16e952b1fc1c4cf65e3dd138b0e87003e2e45 4589Author: Darren Tucker <dtucker@dtucker.net> 4590Date: Sun Nov 27 12:14:00 2022 +1100 4591 4592 Make "config" in matrix singular and pass in env. 4593 4594 This will allow the startup scripts to adapt their behaviour based on 4595 the type and config. 4596 4597commit e8857043af54809187be1e8b06749db61112899f 4598Author: Darren Tucker <dtucker@dtucker.net> 4599Date: Sun Nov 27 11:42:22 2022 +1100 4600 4601 Add "libvirt" label to dfly30. 4602 4603commit 9775473d84902dc37753686cd10ae71fbe67efda 4604Author: Darren Tucker <dtucker@dtucker.net> 4605Date: Sun Nov 27 09:28:20 2022 +1100 4606 4607 Rename "os" in matrix to "target". 4608 4609 This is in preparation to distinguish this from the host that the runner 4610 runs on in case where they are separate (eg VMs). 4611 4612commit 04fd00ceff39f4544ced6f5342060abe584835d0 4613Author: Darren Tucker <dtucker@dtucker.net> 4614Date: Sun Nov 27 09:23:04 2022 +1100 4615 4616 Remove unused self-hosted test targets. 4617 4618commit c9d9fcad2a11c1cd1550a541f44091d65f0b5584 4619Author: Darren Tucker <dtucker@dtucker.net> 4620Date: Sun Nov 27 09:16:15 2022 +1100 4621 4622 Remove explicit "default" test config argument. 4623 4624 Not specifying the test config implicitly selects default args. 4625 4626commit 15a01cf15f396f87c6d221c5a6af98331c818962 4627Author: Darren Tucker <dtucker@dtucker.net> 4628Date: Wed Nov 23 13:18:54 2022 +1100 4629 4630 Add fallback for old platforms w/out MAP_ANON. 4631 4632commit 6b9bbbfe8b26db6e9a30a7e08c223e85421aed98 4633Author: Darren Tucker <dtucker@dtucker.net> 4634Date: Wed Nov 23 13:09:11 2022 +1100 4635 4636 If we haven't found it yet, recheck for sys/stat.h. 4637 4638 On some very old platforms, sys/stat.h needs sys/types.h, however 4639 autoconf 2.71's AC_CHECK_INCLUDES_DEFAULT checks for them in the 4640 opposite order, which in combination with modern autoconf's 4641 "present but cannot be compiled" behaviour causes it to not be 4642 detected. 4643 4644commit 8926956f22639132a9f2433fcd25224e01b900f5 4645Author: Darren Tucker <dtucker@dtucker.net> 4646Date: Fri Nov 11 11:25:37 2022 +1100 4647 4648 Add dfly62 test target. 4649 4650commit 650de7ecd3567b5a5dbf16dd1eb598bd8c20bca8 4651Author: dtucker@openbsd.org <dtucker@openbsd.org> 4652Date: Thu Nov 10 23:03:10 2022 +0000 4653 4654 upstream: Handle dynamic remote port forwarding in escape commandline's 4655 4656 -R processing. bz#3499, ok djm@ 4657 4658 OpenBSD-Commit-ID: 194ee4cfe7ed0e2b8ad0727f493c798a50454208 4659 4660commit 5372db7e7985ba2c00f20fdff8942145ca99e033 4661Author: Darren Tucker <dtucker@dtucker.net> 4662Date: Thu Nov 10 12:44:51 2022 +1100 4663 4664 Remove seed passing over reexec. 4665 4666 This was added for the benefit of platforms using ssh-rand-helper to 4667 prevent a delay on each connection as sshd reseeded itself. 4668 4669 ssh-random-helper is long gone, and since the re-exec happens before the 4670 chroot the re-execed sshd can reseed itself normally. ok djm@ 4671 4672commit ca98d3f8c64cfc51af81e1b01c36a919d5947ec2 4673Author: Darren Tucker <dtucker@dtucker.net> 4674Date: Wed Nov 9 20:59:20 2022 +1100 4675 4676 Skip reexec test on OpenSSL 1.1.1 specifically. 4677 4678 OpenSSL 1.1.1 has a bug in its RNG that breaks reexec fallback, so skip 4679 that test. See bz#3483 for details. 4680 4681commit 5ec4ebc2548e5f7f1b55b2a5cef5b67bdca8146f 4682Author: dtucker@openbsd.org <dtucker@openbsd.org> 4683Date: Wed Nov 9 09:04:12 2022 +0000 4684 4685 upstream: Fix typo in fatal error message. 4686 4687 Patch from vapier at chromium.org. 4688 4689 OpenBSD-Commit-ID: 8a0c164a6a25eef0eedfc30df95bfa27644e35cf 4690 4691commit e6abafe9a6d809422d3432b95b3f9747b0acaa71 4692Author: dtucker@openbsd.org <dtucker@openbsd.org> 4693Date: Wed Nov 9 09:01:52 2022 +0000 4694 4695 upstream: Remove errant colon and simplify format 4696 4697 string in error messages. Patch from vapier at chromium.org. 4698 4699 OpenBSD-Commit-ID: fc28466ebc7b74e0072331947a89bdd239c160d3 4700 4701commit db2027a687516f87c3fb141e87154bb3d8a7807c 4702Author: djm@openbsd.org <djm@openbsd.org> 4703Date: Wed Nov 9 01:37:44 2022 +0000 4704 4705 upstream: rename client_global_hostkeys_private_confirm() to 4706 4707 client_global_hostkeys_prove_confirm(), as it handles the 4708 "hostkeys-prove00@openssh.com" message; no functional change 4709 4710 OpenBSD-Commit-ID: 31e09bd3cca6eed26855b88fb8beed18e9bd026d 4711 4712commit 1c2be7c2004cf1abcd172fee9fe3eab57cd4c426 4713Author: djm@openbsd.org <djm@openbsd.org> 4714Date: Wed Nov 9 00:15:59 2022 +0000 4715 4716 upstream: typo in comment 4717 4718 OpenBSD-Commit-ID: 39c58f41e0f32d1ff31731fa6f5bbbc3ad25084a 4719 4720commit cf1a9852d7fc93e4abc4168aed09529a57427cdc 4721Author: Darren Tucker <dtucker@dtucker.net> 4722Date: Wed Nov 9 09:23:47 2022 +1100 4723 4724 Defer seed_rng until after closefrom call. 4725 4726 seed_rng will initialize OpenSSL, and some engine providers (eg Intel's 4727 QAT) will open descriptors for their own use. bz#3483, patch from 4728 joel.d.schuetze at intel.com, ok djm@ 4729 4730commit dffa64480163fbf76af7e4fb62c26bb0dd6642aa 4731Author: Darren Tucker <dtucker@dtucker.net> 4732Date: Wed Nov 9 08:27:47 2022 +1100 4733 4734 Fix comment text. From emaste at freebsd.org. 4735 4736commit d9df5689c29823ab830ec4f54c83c6cc3c0077ad 4737Author: Pierre Ossman <ossman@cendio.se> 4738Date: Wed Jul 6 13:52:10 2022 +0200 4739 4740 Avoid assuming layout of fd_set 4741 4742 POSIX doesn't specify the internal layout of the fd_set object, so let's 4743 not assume it is just a bit mask. This increases compatibility with 4744 systems that have a different layout. 4745 4746 The assumption is also worthless as we already refuse to use file 4747 descriptors over FD_SETSIZE anyway. Meaning that the default size of 4748 fd_set is quite sufficient. 4749 4750commit 419aa8a312e8d8f491933ca3d5933e602cb05aae 4751Author: Darren Tucker <dtucker@dtucker.net> 4752Date: Tue Nov 8 12:42:52 2022 +1100 4753 4754 Shutdown any VM before trying to check out repo. 4755 4756 In the case where the previous run did not clean up, the checkout will 4757 fail as it'll leave a stale mount. 4758 4759commit a32c07cbb78f65d8527642b96474a83b413f8108 4760Author: Darren Tucker <dtucker@dtucker.net> 4761Date: Tue Nov 8 11:33:25 2022 +1100 4762 4763 Run vm startup and shutdown from runner temp dir. 4764 4765 Should work even if the github workspace dir is on a stale sshfs mount. 4766 4767commit 2b40a7dfcdb8e616155b9504145aa52b271455aa 4768Author: Darren Tucker <dtucker@dtucker.net> 4769Date: Tue Nov 8 11:03:31 2022 +1100 4770 4771 Add valrind-5 test here too. 4772 4773commit 2ea03d1f6d0a05ee2b63ed2dc0f2d54f1e4655a1 4774Author: Darren Tucker <dtucker@dtucker.net> 4775Date: Tue Nov 8 09:21:10 2022 +1100 4776 4777 Update checkout and upload actions. 4778 4779 Update actions/checkout and actions/upload-artifact to main branch for 4780 compatibility with node.js v16. 4781 4782commit 4e316ff0f18a118232bb9ac6512ee62773a9e8ea 4783Author: Darren Tucker <dtucker@dtucker.net> 4784Date: Tue Nov 8 09:17:04 2022 +1100 4785 4786 Split out rekey test since it runs the longest. 4787 4788commit 21625a6424258a92a96a3bb73ae6aabc5ed8a6b4 4789Author: dtucker@openbsd.org <dtucker@openbsd.org> 4790Date: Mon Nov 7 10:09:28 2022 +0000 4791 4792 upstream: The IdentityFile option in ssh_config can also be used to 4793 4794 specify a public key file, as documented in ssh.1 for the -i option. Document 4795 this also for IdentityFile in ssh_config.5, for documentation completeness. 4796 From laalsaas at systemli.org via portable github PR#352, ok jmc@ djm@ 4797 4798 OpenBSD-Commit-ID: 2f943be9f96e60ef81a9a4faa25b009999f9883b 4799 4800commit 747691604d3325ed2b62bad85b6fd8563ad32f6c 4801Author: dtucker@openbsd.org <dtucker@openbsd.org> 4802Date: Mon Nov 7 10:05:38 2022 +0000 4803 4804 upstream: Remove some set but otherwise unused variables, spotted 4805 4806 in -portable by clang 16's -Wunused-but-set-variable. ok djm@ 4807 4808 OpenBSD-Commit-ID: 3d943ddf2369b38fbf89f5f19728e7dc1daf3982 4809 4810commit 1d78d25653805aefc7a8dd9d86cd7359ada3823c 4811Author: dtucker@openbsd.org <dtucker@openbsd.org> 4812Date: Mon Nov 7 10:02:59 2022 +0000 4813 4814 upstream: Check for and disallow MaxStartups values less than or 4815 4816 equal to zero during config parsing, rather than faling later at runtime. 4817 bz#3489, ok djm@ 4818 4819 OpenBSD-Commit-ID: d79c2b7a8601eb9be493629a91245d761154308b 4820 4821commit a00f59a645072e5f5a8d207af15916a7b23e2642 4822Author: djm@openbsd.org <djm@openbsd.org> 4823Date: Mon Nov 7 04:04:40 2022 +0000 4824 4825 upstream: fix parsing of hex cert expiry time; was checking whether the 4826 4827 start time began with "0x", not the expiry time. 4828 4829 from Ed Maste 4830 4831 OpenBSD-Commit-ID: 6269242c3e1a130b47c92cfca4d661df15f05739 4832 4833commit f58acaf8c7315483f4ac87d46a1aa2142a713cd8 4834Author: Darren Tucker <dtucker@dtucker.net> 4835Date: Mon Nov 7 15:10:59 2022 +1100 4836 4837 Fix merge conflict. 4838 4839commit 162e5741020a8d996c0c12b988b118e71ed728e6 4840Author: Darren Tucker <dtucker@dtucker.net> 4841Date: Mon Nov 7 15:04:33 2022 +1100 4842 4843 Branch-specific links for master status badges. 4844 4845commit e4b7c12ab24579312aa3ed38ce7041a439ec2d56 4846Author: Darren Tucker <dtucker@dtucker.net> 4847Date: Mon Nov 7 14:46:38 2022 +1100 4848 4849 Add CIFuzz status badge. 4850 4851commit b496b9f831acd1e5bcd875e26e797488beef494a 4852Author: Darren Tucker <dtucker@dtucker.net> 4853Date: Mon Nov 7 14:45:16 2022 +1100 4854 4855 Do not run CIFuzz on selfhosted tree. 4856 4857 We already run it on the regular tree, no need to double up. 4858 4859commit 2138b1c4ddb300129a41a5104627b0d561184c7b 4860Author: Darren Tucker <dtucker@dtucker.net> 4861Date: Mon Nov 7 14:41:58 2022 +1100 4862 4863 Whitespace change to trigger CIFuzz workflow. 4864 4865commit 4670b97ef87c7b0f21283c9b07c7191be88dda05 4866Author: Darren Tucker <dtucker@dtucker.net> 4867Date: Mon Nov 7 14:34:04 2022 +1100 4868 4869 Run cifuzz workflow on the actions as regular CI. 4870 4871commit 79391e66ce851ace1baf3c6a35e83a23f08ec2ba 4872Author: David Korczynski <david@adalogics.com> 4873Date: Tue Nov 30 11:45:20 2021 +0000 4874 4875 Add CIFuzz integration 4876 4877commit c1893364a0be243270014d7d34362a8101d55112 4878Author: dtucker@openbsd.org <dtucker@openbsd.org> 4879Date: Mon Nov 7 02:21:22 2022 +0000 4880 4881 upstream: Import regenerated moduli. 4882 4883 OpenBSD-Commit-ID: b0e54ee4d703bd6929bbc624068666a7a42ecb1f 4884 4885commit 5c3f18fb994ef27e685b205ee2351851b80fdbd1 4886Author: dtucker@openbsd.org <dtucker@openbsd.org> 4887Date: Mon Nov 7 01:53:01 2022 +0000 4888 4889 upstream: Fix typo. From pablomh via -portable github PR#344. 4890 4891 OpenBSD-Commit-ID: d056ee2e73691dc3ecdb44a6de68e6b88cd93827 4892 4893commit e1c6fcc142066417c9832e634463faa3dd5d116c 4894Author: Darren Tucker <dtucker@dtucker.net> 4895Date: Mon Nov 7 12:46:58 2022 +1100 4896 4897 Link to branch-specific queries for V_9_1 status. 4898 4899commit 4f4a5fad6d8892c3f8ee9cd81ec7de6458210c9f 4900Author: Darren Tucker <dtucker@dtucker.net> 4901Date: Sun Nov 6 10:55:59 2022 +1100 4902 4903 Use "prohibit-password" in -portable comments. 4904 4905 "without-password" is the deprecated alias for "prohibit-password", 4906 so we should reference the latter. From emaste at freebsd.org. 4907 4908commit 0f7e1eba55259ec037f515000b4c4afbf446230a 4909Author: Darren Tucker <dtucker@dtucker.net> 4910Date: Sun Nov 6 10:50:01 2022 +1100 4911 4912 Fix tracing disable on FreeBSD. 4913 4914 Some versions of FreeBSD do not support using id 0 to refer to the 4915 current pid for procctl, so pass getpid() explicitly. From 4916 emaste at freebsd.org. 4917 4918commit 32fddb982fd61b11a2f218a115975a87ab126d43 4919Author: Darren Tucker <dtucker@dtucker.net> 4920Date: Mon Nov 7 10:39:01 2022 +1100 4921 4922 Fix setres*id checks to work with clang-16. 4923 4924 glibc has the prototypes for setresuid and setresgid behind _GNU_SOURCE, 4925 and clang 16 will error out on implicit function definitions, so add 4926 _GNU_SOURCE and the required headers to the configure checks. From 4927 sam at @gentoo.org via bz#3497. 4928 4929commit 12af712d116f42164bcfa56db901d06e4fa27199 4930Author: Sam James <sam@gentoo.org> 4931Date: Sun Nov 6 04:52:38 2022 +0000 4932 4933 configure.ac: Fix -Wstrict-prototypes 4934 4935 Clang 16 now warns on this and it'll be removed in C23, so let's 4936 just be future proof. It also reduces noise when doing general 4937 Clang 16 porting work (which is a big job as it is). github PR#355. 4938 4939 Signed-off-by: Sam James <sam@gentoo.org> 4940 4941commit 40b0a5eb6e3edfa2886b60c09c7803353b0cc7f5 4942Author: Sam James <sam@gentoo.org> 4943Date: Sun Nov 6 04:47:35 2022 +0000 4944 4945 configure.ac: Add <pty.h> include for openpty 4946 4947 Another Clang 16ish fix (which makes -Wimplicit-function-declaration 4948 an error by default). github PR#355. 4949 4950 See: 2efd71da49b9cfeab7987058cf5919e473ff466b 4951 See: be197635329feb839865fdc738e34e24afd1fca8 4952 4953commit 6b17e128879ec6cc32ca2c28b5d894b4aa72e32d 4954Author: Rochdi Nassah <rochdinassah.1998@gmail.com> 4955Date: Fri Oct 28 01:26:31 2022 +0100 4956 4957 Fix broken zlib link. 4958 4959commit 99500df246ccb736ddbdd04160dcc82165d81a77 4960Author: Darren Tucker <dtucker@dtucker.net> 4961Date: Fri Nov 4 16:59:26 2022 +1100 4962 4963 Don't run openbsd-compat tests on Cygwin. 4964 4965 Add "compat-tests" to the default TEST_TARGET so we can override as 4966 necessary. Override TEST_TARGET for Cygwin as the tests don't currently 4967 compile there. 4968 4969commit 3cae9f92a31897409666aa1e6f696f779759332b 4970Author: djm@openbsd.org <djm@openbsd.org> 4971Date: Thu Nov 3 21:59:20 2022 +0000 4972 4973 upstream: replace recently-added valid_domain() check for hostnames 4974 4975 going to known_hosts with a more relaxed check for bad characters; previous 4976 commit broke address literals. Reported by/feedback from florian@ 4977 4978 OpenBSD-Commit-ID: 10b86dc6a4b206adaa0c11b58b6d5933898d43e0 4979 4980commit 9655217231c9056200bea7ae2dffcc9c0c3eb265 4981Author: Darren Tucker <dtucker@dtucker.net> 4982Date: Thu Nov 3 23:07:50 2022 +1100 4983 4984 Rerun tests on changes to Makefile.in in any dir. 4985 4986commit 3500f0405a3ab16b59a26f3508c4257a3fc3bce6 4987Author: Darren Tucker <dtucker@dtucker.net> 4988Date: Thu Nov 3 23:04:08 2022 +1100 4989 4990 Link libssh into compat tests. 4991 4992 The cygwin compat code uses xmalloc, so add libssh.a so pick up that. 4993 4994commit ec59effcf65b8a4c85d47ff5a271123259dd0ab8 4995Author: Darren Tucker <dtucker@dtucker.net> 4996Date: Thu Nov 3 21:44:23 2022 +1100 4997 4998 Fix compat regress to work with non-GNU make. 4999 5000commit 73550a218e7dfbbd599534cbf856309bc924f6fd 5001Author: Darren Tucker <dtucker@dtucker.net> 5002Date: Thu Nov 3 13:41:16 2022 +1100 5003 5004 Increase selfhosted job timeout. 5005 5006 The default job timeout of 360 (6h) is not enough to complete the 5007 regress tests for some of the slow VMs depending on the load on the host. 5008 Increase to 600 (10h). 5009 5010commit db97d8d0b90c6ce52b94b153d6f8f5f7d3b11777 5011Author: Darren Tucker <dtucker@dtucker.net> 5012Date: Thu Nov 3 10:00:43 2022 +1100 5013 5014 Only run opensslver tests if built with OpenSSL. 5015 5016commit ba053709638dff2f6603df0c1f340352261d63ea 5017Author: Darren Tucker <dtucker@dtucker.net> 5018Date: Wed Nov 2 14:16:04 2022 +1100 5019 5020 Add tests for OpenSSL 3.0.7 and LibreSSL 3.6.1. 5021 5022commit edd24101c7e17d1a8f6576e1aaf62233b47ad6f5 5023Author: Darren Tucker <dtucker@dtucker.net> 5024Date: Thu Nov 3 08:17:39 2022 +1100 5025 5026 Run compat regress tests too. 5027 5028commit fe88d67e7599b0bc73f6e4524add28d743e7f977 5029Author: Darren Tucker <dtucker@dtucker.net> 5030Date: Thu Nov 3 08:14:05 2022 +1100 5031 5032 Compat tests need libcrypto. 5033 5034 This was moved to CHANNELLIBS during the libs refactor. Spotted by 5035 rapier at psc.edu. 5036 5037commit 96b519726b7944eee3c23a54eee3d5c031ba1533 5038Author: Darren Tucker <dtucker@dtucker.net> 5039Date: Thu Nov 3 04:24:39 2022 +1100 5040 5041 Include time.h when defining timegm. 5042 5043 Fixes build on some platforms eg recent AIX. 5044 5045commit da6038bd5cd55eb212eb2aec1fc8ae79bbf76156 5046Author: Darren Tucker <dtucker@dtucker.net> 5047Date: Tue Nov 1 19:10:30 2022 +1100 5048 5049 Always use compat getentropy. 5050 5051 Have it call native getentropy and fall back as required. Should fix 5052 issues of platforms where libc has getentropy but it is not implemented 5053 in the kernel. Based on github PR#354 from simsergey. 5054 5055commit 5ebe18cab6be3247b44c807ac145164010465b82 5056Author: Darren Tucker <dtucker@dtucker.net> 5057Date: Wed Nov 2 10:51:48 2022 +1100 5058 5059 Check for sockaddr_in.sin_len. 5060 5061 If found, set SOCK_HAS_LEN which is used in addr.c. Should fix keyscan 5062 tests on platforms with this (eg old NetBSD). 5063 5064commit a1febadf426536612c2734168d409147c392e7cf 5065Author: dtucker@openbsd.org <dtucker@openbsd.org> 5066Date: Sun Oct 30 18:42:07 2022 +0000 5067 5068 upstream: Use variable for diff options 5069 5070 instead of unconditionally specifying "-rN". This will make life easier 5071 in -portable where not all diff's understand -N. 5072 5073 OpenBSD-Regress-ID: 8b8a407115546be1c6d72d350b1e4f1f960d3cd3 5074 5075commit f6d3ed9a8a9280cbb68d6a499850cfe810e92bd0 5076Author: Darren Tucker <dtucker@dtucker.net> 5077Date: Mon Oct 31 05:13:02 2022 +1100 5078 5079 OpenSSL dev branch is 302 not 320. 5080 5081 While there, also accept 301 which it shat it was previously. 5082 5083commit 25c8a2bbcc10c493d27faea57c42a6bf13fa51f2 5084Author: djm@openbsd.org <djm@openbsd.org> 5085Date: Fri Oct 28 02:47:04 2022 +0000 5086 5087 upstream: put sshkey_check_rsa_length() back in sshkey.c to unbreak 5088 5089 OPENSSL=no builds 5090 5091 OpenBSD-Commit-ID: 99eec58abe382ecd14b14043b195ee1babb9cf6e 5092 5093commit 1192588546c29ceec10775125f396555ea71850f 5094Author: djm@openbsd.org <djm@openbsd.org> 5095Date: Fri Oct 28 02:29:34 2022 +0000 5096 5097 upstream: allow ssh-keyscan(1) to accept CIDR address ranges, e.g. 5098 5099 ssh-keyscan 192.168.0.0/24 5100 5101 If a CIDR range is passed, then it will be expanded to all possible 5102 addresses in the range including the all-0s and all-1s addresses. 5103 5104 bz#976 feedback/ok markus@ 5105 5106 OpenBSD-Commit-ID: ce6c5211f936ac0053fd4a2ddb415277931e6c4b 5107 5108commit 64af4209309461c79c39eda2d13f9d77816c6398 5109Author: Damien Miller <djm@mindrot.org> 5110Date: Fri Oct 28 12:54:35 2022 +1100 5111 5112 fix merge botch 5113 5114commit 27267642699342412964aa785b98afd69d952c88 5115Author: djm@openbsd.org <djm@openbsd.org> 5116Date: Fri Oct 28 00:44:44 2022 +0000 5117 5118 upstream: refactor sshkey_private_deserialize 5119 5120 feedback/ok markus@ 5121 5122 OpenBSD-Commit-ID: f5ca6932fdaf840a5e8250becb38315a29b5fc9f 5123 5124commit 2519a7077a9332f70935e5242ba91ee670ed6b87 5125Author: djm@openbsd.org <djm@openbsd.org> 5126Date: Fri Oct 28 00:44:17 2022 +0000 5127 5128 upstream: refactor sshkey_private_serialize_opt() 5129 5130 feedback/ok markus@ 5131 5132 OpenBSD-Commit-ID: 61e0fe989897901294efe7c3b6d670cefaf44cbd 5133 5134commit 11a768adf98371fe4e43f3b06014024c033385d5 5135Author: djm@openbsd.org <djm@openbsd.org> 5136Date: Fri Oct 28 00:43:30 2022 +0000 5137 5138 upstream: refactor certify 5139 5140 feedback/ok markus@ 5141 5142 OpenBSD-Commit-ID: 35d742992e223eaca3537e6fb3d3002c08eed4f6 5143 5144commit 3fbc58bb249d967cc43ebdc554f6781bb73d4a58 5145Author: djm@openbsd.org <djm@openbsd.org> 5146Date: Fri Oct 28 00:43:08 2022 +0000 5147 5148 upstream: refactor sshkey_sign() and sshkey_verify() 5149 5150 feedback/ok markus@ 5151 5152 OpenBSD-Commit-ID: 368e662c128c99d05cc043b1308d2b6c71a4d3cc 5153 5154commit a1deb6cdbbe6afaab74ecb08fcb62db5739267be 5155Author: djm@openbsd.org <djm@openbsd.org> 5156Date: Fri Oct 28 00:41:52 2022 +0000 5157 5158 upstream: refactor sshkey_from_blob_internal() 5159 5160 feedback/ok markus@ 5161 5162 OpenBSD-Commit-ID: 1f46c0cbb8060ee9666a02749594ad6658c8e283 5163 5164commit 7d00799c935271ce89300494c5677190779f6453 5165Author: djm@openbsd.org <djm@openbsd.org> 5166Date: Fri Oct 28 00:41:17 2022 +0000 5167 5168 upstream: refactor sshkey_from_private() 5169 5170 feedback/ok markus@ 5171 5172 OpenBSD-Commit-ID: e5dbe7a3545930c50f70ee75c867a1e08b382b53 5173 5174commit 262647c2e920492ca57f1b9320d74f4a0f6e482b 5175Author: djm@openbsd.org <djm@openbsd.org> 5176Date: Fri Oct 28 00:39:29 2022 +0000 5177 5178 upstream: factor out key generation 5179 5180 feedback/ok markus@ 5181 5182 OpenBSD-Commit-ID: 5b4211bff4de8d9adb84bc72857a8c42c44e7ceb 5183 5184commit 401c74e7dc15eab60540653d2f94d9306a927bab 5185Author: djm@openbsd.org <djm@openbsd.org> 5186Date: Fri Oct 28 00:38:58 2022 +0000 5187 5188 upstream: refactor and simplify sshkey_read() 5189 5190 feedback/ok markus@ 5191 5192 OpenBSD-Commit-ID: 0d93b7a56e31cd06a8bb0d2191d084ce254b0971 5193 5194commit 591fed94e66a016acf87f4b7cd416ce812f2abe8 5195Author: djm@openbsd.org <djm@openbsd.org> 5196Date: Fri Oct 28 00:37:24 2022 +0000 5197 5198 upstream: factor out public key serialization 5199 5200 feedback/ok markus@ 5201 5202 OpenBSD-Commit-ID: a3570c4b97290c5662890aea7328d87f55939033 5203 5204commit 1e78844ae2b2dc01ba735d5ae740904c57e13685 5205Author: djm@openbsd.org <djm@openbsd.org> 5206Date: Fri Oct 28 00:36:31 2022 +0000 5207 5208 upstream: factor out sshkey_equal_public() 5209 5210 feedback/ok markus@ 5211 5212 OpenBSD-Commit-ID: 1368ba114cb37732fe6ec3d89c7e6d27ea6fdc94 5213 5214commit 25de1c01a8b9a2c8ab9b1da22444a03e89c982de 5215Author: djm@openbsd.org <djm@openbsd.org> 5216Date: Fri Oct 28 00:35:40 2022 +0000 5217 5218 upstream: begin big refactor of sshkey 5219 5220 Move keytype data and some of the type-specific code (allocation, 5221 cleanup, etc) out into each key type's implementation. Subsequent 5222 commits will move more, with the goal of having each key-*.c file 5223 owning as much of its keytype's implementation as possible. 5224 5225 lots of feedback + ok markus@ 5226 5227 OpenBSD-Commit-ID: 0f2b4334f73914344e9e5b3d33522d41762a57ec 5228 5229commit 445363433ba20b8a3e655b113858c836da46a1cb 5230Author: djm@openbsd.org <djm@openbsd.org> 5231Date: Mon Oct 24 22:43:36 2022 +0000 5232 5233 upstream: Be more paranoid with host/domain names coming from the 5234 5235 never write a name with bad characters to a known_hosts file. 5236 5237 reported by David Leadbeater, ok deraadt@ 5238 5239 OpenBSD-Commit-ID: ba9b25fa8b5490b49398471e0c9657b0cbc7a5ad 5240 5241commit 7190154de2c9fe135f0cc1ad349cb2fa45152b89 5242Author: djm@openbsd.org <djm@openbsd.org> 5243Date: Mon Oct 24 21:52:50 2022 +0000 5244 5245 upstream: regress test for unmatched glob characters; fails before 5246 5247 previous commit but passes now. bz3488; prodded by dtucker@ 5248 5249 OpenBSD-Regress-ID: 0cc5cc9ea4a6fd170dc61b9212f15badaafb3bbd 5250 5251commit a4821a592456c3add3cd325db433110cdaaa3e5c 5252Author: djm@openbsd.org <djm@openbsd.org> 5253Date: Mon Oct 24 21:51:55 2022 +0000 5254 5255 upstream: when scp(1) is using the SFTP protocol for transport (the 5256 5257 default), better match scp/rcp's handling of globs that don't match the 5258 globbed characters but do match literally (e.g. trying to transfer 5259 "foo.[1]"). 5260 5261 Previously scp(1) in SFTP mode would not match these pathnames but 5262 legacy scp/rcp mode would. 5263 5264 Reported by Michael Yagliyan in bz3488; ok dtucker@ 5265 5266 OpenBSD-Commit-ID: d8a3773f53015ba811fddba7473769a2fd343e11 5267 5268commit 18376847b8043ba967eabbe23692ef74c9a3fddc 5269Author: jsg@openbsd.org <jsg@openbsd.org> 5270Date: Thu Oct 13 09:09:28 2022 +0000 5271 5272 upstream: use correct type with sizeof ok djm@ 5273 5274 OpenBSD-Commit-ID: d6c882c2e8a42ff831a5b3cbc2c961ecb2dd6143 5275 5276commit 4a4883664d6b4e9e4e459a8cdc16bd8d4b735de9 5277Author: jmc@openbsd.org <jmc@openbsd.org> 5278Date: Fri Oct 7 06:00:58 2022 +0000 5279 5280 upstream: ssh-agent.1: - use Nm not Xr for self-ref - while here, 5281 5282 wrap a long line 5283 5284 ssh-agent.c: 5285 - add -O to usage() 5286 5287 OpenBSD-Commit-ID: 855dac4695cef22e96d69c53436496bc408ca389 5288 5289commit 9fd2441113fce2a83fc7470968c3b27809cc7f10 5290Author: djm@openbsd.org <djm@openbsd.org> 5291Date: Fri Oct 7 04:06:26 2022 +0000 5292 5293 upstream: document "-O no-restrict-websafe"; spotted by Ross L 5294 5295 Richardson 5296 5297 OpenBSD-Commit-ID: fe9eaa50237693a14ebe5b5614bf32a02145fe8b 5298 5299commit 614252b05d70f798a0929b1cd3d213030ad4d007 5300Author: Darren Tucker <dtucker@dtucker.net> 5301Date: Tue Oct 18 06:29:16 2022 +1100 5302 5303 OpenSSL dev branch now identifies as 3.2.0. 5304 5305commit 195e5a65fd793a738ea8451ebfdd1919db5aff3e 5306Author: Damien Miller <djm@mindrot.org> 5307Date: Mon Oct 17 09:41:47 2022 +1100 5308 5309 revert c64b62338b4 and guard POLL* defines instead 5310 5311 c64b62338b4 broke OSX builds, which do have poll.h but lack ppoll(2) 5312 Spotted by dtucker 5313 5314commit bc2e480d99613bd59720edae244d1764636544c4 5315Author: Damien Miller <djm@mindrot.org> 5316Date: Fri Oct 14 14:52:22 2022 +1100 5317 5318 undef _get{short,long} before redefining 5319 5320commit 5eb796a369c64f18d55a6ae9b1fa9b35eea237fb 5321Author: Harmen Stoppels <harmenstoppels@gmail.com> 5322Date: Thu Oct 13 16:08:46 2022 +0200 5323 5324 Fix snprintf configure test for clang 15 5325 5326 Clang 15 -Wimplicit-int defaults to an error in C99 mode and above. 5327 A handful of tests have "main(..." and not "int main(..." which caused 5328 the tests to produce incorrect results. 5329 5330commit c64b62338b46ffa08839f05f21ad69fa6234dc17 5331Author: Damien Miller <djm@mindrot.org> 5332Date: Mon Oct 10 12:32:43 2022 +1100 5333 5334 skip bsd-poll.h if poll.h found; ok dtucker 5335 5336commit 5ee2b8ccfcf4b606f450eb0ff2305e311f68b0be 5337Author: djm@openbsd.org <djm@openbsd.org> 5338Date: Thu Oct 6 22:42:37 2022 +0000 5339 5340 upstream: honour user's umask if it is more restrictive then the ssh 5341 5342 default (022); based on patch from Alex Henrie, ok dtucker@ deraadt@ 5343 5344 OpenBSD-Commit-ID: fe1b9e15fc9a4f49fc338e848ce14d8727abe82d 5345 5346commit a75cffc2700cebd3e2dd9093f7f7388d2be95cb7 5347Author: Darren Tucker <dtucker@dtucker.net> 5348Date: Fri Oct 7 03:54:56 2022 +1100 5349 5350 Add LibreSSL 3.6.0 to test suite. 5351 5352 While there, bump OpenSSL to latest 1.1.1q release. 5353 5354commit fcc0f0c0e96a30076683fea9a7c9eedc72931742 5355Author: Darren Tucker <dtucker@dtucker.net> 5356Date: Thu Oct 6 21:18:16 2022 +1100 5357 5358 Add 9.1 branch to CI status page. 5359 5360commit ef211eee63821d894a8bf81f22bfba9f6899d0fe 5361Author: Darren Tucker <dtucker@dtucker.net> 5362Date: Tue Oct 4 23:20:23 2022 +1100 5363 5364 Test commits to all branches of portable. 5365 5366 Only test OpenBSD upstream on commits to master since that's what it 5367 tracks. 5368 5369commit fe646de03cafb6593ff4e4954bca9ec4b4b753a8 5370Author: Damien Miller <djm@mindrot.org> 5371Date: Wed Oct 5 03:47:26 2022 +1100 5372 5373 whitespace at EOL 5374 5375commit a6e1852d10c63a830196e82168dadd957aaf28ec 5376Author: Damien Miller <djm@mindrot.org> 5377Date: Wed Oct 5 03:40:01 2022 +1100 5378 5379 mention libfido2 autodetection 5380 5381commit 7360c2c206f33d309edbaf64036c96fadf74d640 5382Author: Damien Miller <djm@mindrot.org> 5383Date: Wed Oct 5 03:37:36 2022 +1100 5384 5385 remove mention of --with-security-key-builtin 5386 5387 it is enabled by default when libfido2 is installed 5388 5389commit 0ffb46f2ee2ffcc4daf45ee679e484da8fcf338c 5390Author: Damien Miller <djm@mindrot.org> 5391Date: Tue Oct 4 01:51:42 2022 +1100 5392 5393 update .depend 5394 5395commit 657e676ff696c7bb787bffb0e249ea1be3b474e1 5396Author: Damien Miller <djm@mindrot.org> 5397Date: Tue Oct 4 01:45:52 2022 +1100 5398 5399 update release notes URL 5400 5401commit f059da2b29840c0f048448809c317ce2ae014da7 5402Author: Damien Miller <djm@mindrot.org> 5403Date: Tue Oct 4 01:45:41 2022 +1100 5404 5405 crank versions in RPM spec files 5406 5407commit b51f3f172d87cbdb80ca4eb7b2149e56a7647557 5408Author: djm@openbsd.org <djm@openbsd.org> 5409Date: Mon Sep 26 22:18:40 2022 +0000 5410 5411 upstream: openssh-9.1 5412 5413 OpenBSD-Commit-ID: 5a467b2ee81da01a86adf1ad93b62b1728494e56 5414 5415commit 4cf8d0c0f3030f594a238bab21a0695735515487 5416Author: dtucker@openbsd.org <dtucker@openbsd.org> 5417Date: Wed Sep 21 22:26:50 2022 +0000 5418 5419 upstream: Fix typo. From AlexanderStohr via github PR#343. 5420 5421 OpenBSD-Commit-ID: a134c9b4039e48803fc6a87f955b0f4a03181497 5422 5423commit 8179fed3264d5919899900ed8881d5f9bb57ca33 5424Author: djm@openbsd.org <djm@openbsd.org> 5425Date: Mon Sep 19 21:39:16 2022 +0000 5426 5427 upstream: add RequiredRSASize to the list of keywords accepted by 5428 5429 -o; spotted by jmc@ 5430 5431 OpenBSD-Commit-ID: fe871408cf6f9d3699afeda876f8adbac86a035e 5432 5433commit 5f954929e9f173dd1e279e07d0e8b14fa845814d 5434Author: Damien Miller <djm@mindrot.org> 5435Date: Mon Sep 19 20:59:34 2022 +1000 5436 5437 no need for glob.h here 5438 5439 it also causes portability problems 5440 5441commit 03d94a47207d58b3db37eba4f87eb6ae5a63168a 5442Author: Damien Miller <djm@mindrot.org> 5443Date: Mon Sep 19 20:59:04 2022 +1000 5444 5445 avoid Wuninitialized false positive in gcc-12ish 5446 5447commit 9d952529113831fb3071ab6e408d2726fd72e771 5448Author: djm@openbsd.org <djm@openbsd.org> 5449Date: Mon Sep 19 10:46:00 2022 +0000 5450 5451 upstream: use users-groups-by-id@openssh.com sftp-server extension 5452 5453 (when available) to fill in user/group names for directory listings. 5454 Implement a client-side cache of see uid/gid=>user/group names. ok markus@ 5455 5456 OpenBSD-Commit-ID: f239aeeadfa925a37ceee36ee8b256b8ccf4466e 5457 5458commit 8ff680368b0bccf88ae85d4c99de69387fbad7a6 5459Author: djm@openbsd.org <djm@openbsd.org> 5460Date: Mon Sep 19 10:43:12 2022 +0000 5461 5462 upstream: sftp client library support for 5463 5464 users-groups-by-id@openssh.com; ok markus@ 5465 5466 OpenBSD-Commit-ID: ddb2f33a2da6349a9a89a8b5bcb9ca7c999394de 5467 5468commit 488f6e1c582212c2374a4bf8cd1b703d2e70fb8b 5469Author: djm@openbsd.org <djm@openbsd.org> 5470Date: Mon Sep 19 10:41:58 2022 +0000 5471 5472 upstream: extend sftp-common.c:extend ls_file() to support supplied 5473 5474 user/group names; ok markus@ 5475 5476 OpenBSD-Commit-ID: c70c70498b1fdcf158531117e405b6245863bfb0 5477 5478commit 74b77f7497dba3a58315c8f308883de448078057 5479Author: djm@openbsd.org <djm@openbsd.org> 5480Date: Mon Sep 19 10:40:52 2022 +0000 5481 5482 upstream: sftp-server(8): add a "users-groups-by-id@openssh.com" 5483 5484 extension request that allows the client to obtain user/group names that 5485 correspond to a set of uids/gids. 5486 5487 Will be used to make directory listings more useful and consistent 5488 in sftp(1). 5489 5490 ok markus@ 5491 5492 OpenBSD-Commit-ID: 7ebabde0bcb95ef949c4840fe89e697e30df47d3 5493 5494commit 231a346c0c67cc7ca098360f9a554fa7d4f1eddb 5495Author: djm@openbsd.org <djm@openbsd.org> 5496Date: Mon Sep 19 08:49:50 2022 +0000 5497 5498 upstream: better debugging for connect_next() 5499 5500 OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640 5501 5502commit 1875042c52a3b950ae5963c9ca3774a4cc7f0380 5503Author: djm@openbsd.org <djm@openbsd.org> 5504Date: Sat Sep 17 10:34:29 2022 +0000 5505 5506 upstream: Add RequiredRSASize for sshd(8); RSA keys that fall 5507 5508 beneath this limit will be ignored for user and host-based authentication. 5509 5510 Feedback deraadt@ ok markus@ 5511 5512 OpenBSD-Commit-ID: 187931dfc19d51873df5930a04f2d972adf1f7f1 5513 5514commit 54b333d12e55e6560b328c737d514ff3511f1afd 5515Author: djm@openbsd.org <djm@openbsd.org> 5516Date: Sat Sep 17 10:33:18 2022 +0000 5517 5518 upstream: add a RequiredRSASize for checking RSA key length in 5519 5520 ssh(1). User authentication keys that fall beneath this limit will be 5521 ignored. If a host presents a host key beneath this limit then the connection 5522 will be terminated (unfortunately there are no fallbacks in the protocol for 5523 host authentication). 5524 5525 feedback deraadt, Dmitry Belyavskiy; ok markus@ 5526 5527 OpenBSD-Commit-ID: 430e339b2a79fa9ecc63f2837b06fdd88a7da13a 5528 5529commit 07d8771bacfefbcfb37fa8a6dc6103bcc097e0ab 5530Author: djm@openbsd.org <djm@openbsd.org> 5531Date: Sat Sep 17 10:30:45 2022 +0000 5532 5533 upstream: Add a sshkey_check_rsa_length() call for checking the 5534 5535 length of an RSA key; ok markus@ 5536 5537 OpenBSD-Commit-ID: de77cd5b11594297eda82edc594b0d32b8535134 5538 5539commit 3991a0cf947cf3ae0f0373bcec5a90e86a7152f5 5540Author: djm@openbsd.org <djm@openbsd.org> 5541Date: Sat Sep 17 10:11:29 2022 +0000 5542 5543 upstream: actually hook up restrict_websafe; the command-line flag 5544 5545 was never actually used. Spotted by Matthew Garrett 5546 5547 OpenBSD-Commit-ID: 0b363518ac4c2819dbaa3dfad4028633ab9cdff1 5548 5549commit 30b2a7e4291fb9e357f80a237931ff008d686d3b 5550Author: djm@openbsd.org <djm@openbsd.org> 5551Date: Fri Sep 16 06:55:37 2022 +0000 5552 5553 upstream: correct error value 5554 5555 OpenBSD-Commit-ID: 780efcbad76281f11f14b2a5ff04eb6db3dfdad4 5556 5557commit ac1ec9545947d9f9657259f55d04cb49d3a94c8a 5558Author: djm@openbsd.org <djm@openbsd.org> 5559Date: Fri Sep 16 03:33:14 2022 +0000 5560 5561 upstream: sftp: Be a bit more clever about completions 5562 5563 There are commands (e.g. "get" or "put") that accept two 5564 arguments, a local path and a remote path. However, the way 5565 current completion is written doesn't take this distinction into 5566 account and always completes remote or local paths. 5567 5568 By expanding CMD struct and "cmds" array this distinction can be 5569 reflected and with small adjustment to completer code the correct 5570 path can be completed. 5571 5572 By Michal Privoznik, ok dtucker@ 5573 5574 OpenBSD-Commit-ID: 1396d921c4eb1befd531f5c4a8ab47e7a74b610b 5575 5576commit 590db83384f9d99fc51c84505792d26d1ef60df9 5577Author: djm@openbsd.org <djm@openbsd.org> 5578Date: Fri Sep 16 03:13:34 2022 +0000 5579 5580 upstream: sftp: Don't attempt to complete arguments for 5581 5582 non-existent commands 5583 5584 If user entered a non-existent command (e.g. because they made a 5585 typo) there is no point in trying to complete its arguments. Skip 5586 calling complete_match() if that's the case. 5587 5588 From Michal Privoznik 5589 5590 OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a 5591 5592commit ff9809fdfd1d9a91067bb14a77d176002edb153c 5593Author: djm@openbsd.org <djm@openbsd.org> 5594Date: Wed Sep 14 00:14:37 2022 +0000 5595 5596 upstream: sk_enroll: never drop SSH_SK_USER_VERIFICATION_REQD flag 5597 5598 from response 5599 5600 Now that all FIDO signing calls attempt first without PIN and then 5601 fall back to trying PIN only if that attempt fails, we can remove the 5602 hack^wtrick that removed the UV flag from the keys returned during 5603 enroll. 5604 5605 By Corinna Vinschen 5606 5607 OpenBSD-Commit-ID: 684517608c8491503bf80cd175425f0178d91d7f 5608 5609commit 940dc10729cb5a95b7ee82c10184e2b9621c8a1d 5610Author: djm@openbsd.org <djm@openbsd.org> 5611Date: Wed Sep 14 00:13:13 2022 +0000 5612 5613 upstream: a little extra debugging 5614 5615 OpenBSD-Commit-ID: edf1601c1d0905f6da4c713f4d9cecc7d1c0295a 5616 5617commit 4b5f91cb959358141181b934156513fcb8a6c1e3 5618Author: djm@openbsd.org <djm@openbsd.org> 5619Date: Wed Sep 14 00:02:03 2022 +0000 5620 5621 upstream: ssh-agent: attempt FIDO key signing without PIN and use 5622 5623 the error to determine whether a PIN is required and prompt only if 5624 necessary. from Corinna Vinschen 5625 5626 OpenBSD-Commit-ID: dd6be6a0b7148608e834ee737c3479b3270b00dd 5627 5628commit 113523bf0bc33600b07ebb083572c8c346b6fdf4 5629Author: jmc@openbsd.org <jmc@openbsd.org> 5630Date: Sun Sep 11 06:38:11 2022 +0000 5631 5632 upstream: .Li -> .Vt where appropriate; from josiah frentsos, 5633 5634 tweaked by schwarze 5635 5636 ok schwarze 5637 5638 OpenBSD-Commit-ID: 565046e3ce68b46c2f440a93d67c2a92726de8ed 5639 5640commit 86af013b56cecb5ee58ae0bd9d495cd586fc5918 5641Author: jsg@openbsd.org <jsg@openbsd.org> 5642Date: Sat Sep 10 08:50:53 2022 +0000 5643 5644 upstream: fix repeated words ok miod@ jmc@ 5645 5646 OpenBSD-Commit-ID: 6765daefe26a6b648cc15cadbbe337596af709b7 5647 5648commit 0ba39b93b326a7d5dfab776cc9b9d326161a9b16 5649Author: djm@openbsd.org <djm@openbsd.org> 5650Date: Fri Sep 9 03:31:42 2022 +0000 5651 5652 upstream: notifier_complete(NULL, ...) is a noop, so no need to test 5653 5654 that ctx!=NULL; from Corinna Vinschen 5655 5656 OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a 5657 5658commit be197635329feb839865fdc738e34e24afd1fca8 5659Author: Sam James <sam@gentoo.org> 5660Date: Thu Sep 8 02:49:29 2022 +0100 5661 5662 openbsd-compat/bsd-asprintf: add <stdio.h> include for vsnprintf 5663 5664 Fixes the following build failure with Clang 15 on musl: 5665 ``` 5666 bsd-asprintf.c:51:8: error: call to undeclared library function 'vsnprintf' with type 'int (char *, unsigned long, const char *, struct __va_list_tag *)'; ISO C99 and laterclang -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fstack-protector-strong -fPIE -I. -I. -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DSSHDIR=\"/etc/ssh\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/lib/misc/ssh-askpass\" -D_PATH_SFTP_SERVER=\"/usr/lib/misc/sftp-server\" -D_PATH_SSH_KEY_SIGN=\"/usr/lib/misc/ssh-keysign\" -D_PATH_SSH_PKCS11_HELPER=\"/usr/lib/misc/ssh-pkcs11-helper\" -D_PATH_SSH_SK_HELPER=\"/usr/lib/misc/ssh-sk-helper\" -D_PATH_SSH_PIDDIR=\"/run\" -D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c cipher-aes.c -o cipher-aes.o 5667 do not support 5668 implicit function declarations [-Wimplicit-function-declaration] 5669 ret = vsnprintf(string, INIT_SZ, fmt, ap2); 5670 ^ 5671 bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf' 5672 1 error generated. 5673 ``` 5674 5675commit 6cb6f660bb35f77a0456dd2581ddf39c29398a5e 5676Author: Darren Tucker <dtucker@dtucker.net> 5677Date: Fri Sep 2 16:43:27 2022 +1000 5678 5679 Remove DEF_WEAK, it's already in defines.h. 5680 5681commit ce39e7d8b70c4726defde5d3bc4cb7d40d131153 5682Author: Darren Tucker <dtucker@dtucker.net> 5683Date: Fri Sep 2 14:28:14 2022 +1000 5684 5685 Resync arc4random with OpenBSD. 5686 5687 This brings us up to current, including djm's random-reseeding change, 5688 as prompted by logan at cyberstorm.mu in bz#3467. It brings the 5689 platform-specific hooks from LibreSSL Portable, simplified to match our 5690 use case. ok djm@. 5691 5692commit beaddde26f30e2195b8aa4f3193970e140e17305 5693Author: Darren Tucker <dtucker@dtucker.net> 5694Date: Fri Sep 2 14:20:04 2022 +1000 5695 5696 Move OPENBSD ORIGINAL marker. 5697 5698 Putting this after the copyright statement (which doesn't change) 5699 instead of before the version identifier (which does) prevents merge 5700 conflicts when resyncing changes. 5701 5702commit c83e467ead67a8cb48ef4bec8085d6fb880a2ff4 5703Author: Darren Tucker <dtucker@dtucker.net> 5704Date: Fri Sep 2 14:17:28 2022 +1000 5705 5706 Remove arc4random_uniform from arc4random.c 5707 5708 This was previously moved into its own file (matching OpenBSD) which 5709 prematurely committed in commit 73541f2. 5710 5711commit 5f45c2395c60865e59fa44152ff1d003a128c5bc 5712Author: djm@openbsd.org <djm@openbsd.org> 5713Date: Fri Sep 2 04:20:02 2022 +0000 5714 5715 upstream: sk-usbhid: fix key_lookup() on tokens with built-in UV 5716 5717 explicitly test whether the token performs built-in UV (e.g. biometric 5718 tokens) and enable UV in that case. From Pedro Martelletto via GHPR#388 5719 5720 OpenBSD-Commit-ID: 007eb7e387d27cf3029ab06b88224e03eca62ccd 5721 5722commit 03277a4aa49b80af541a3e691f264c0c0d8f9cec 5723Author: Darren Tucker <dtucker@dtucker.net> 5724Date: Wed Aug 31 20:26:30 2022 +1000 5725 5726 Move sftp from valgrind-2 to 3 to rebalance. 5727 5728commit fcf5365da69c516817321ba89c3a91df98d098df 5729Author: djm@openbsd.org <djm@openbsd.org> 5730Date: Wed Aug 31 02:56:40 2022 +0000 5731 5732 upstream: whitespace 5733 5734 OpenBSD-Commit-ID: c2bcbf93610d3d62ed206cdf9bf9ff98c6aaf232 5735 5736commit e60136a3d7a223dd8e84ba8a6895bc3142360993 5737Author: Damien Miller <djm@mindrot.org> 5738Date: Mon Aug 29 13:27:45 2022 +1000 5739 5740 additional keys 5741 5742commit 2b02dcb505288c462d1b5dd1ac04e603d01340eb 5743Author: Damien Miller <djm@mindrot.org> 5744Date: Mon Aug 29 13:23:43 2022 +1000 5745 5746 cross-sign allowed_signers with PGP key 5747 5748 Provides continuity of trust from legacy PGP release key to 5749 the SSHSIG signing keys that we will use henceforth for git 5750 signing. 5751 5752commit 51b345f177ae981b8755f6bdf8358b1cc5e83d67 5753Author: Darren Tucker <dtucker@dtucker.net> 5754Date: Sat Aug 27 21:49:27 2022 +1000 5755 5756 Add libcrypt-devel to cygwin-release deps. 5757 5758 Based on feedback from vinschen at redhat.com. 5759 5760commit 9f81736cf16dd8dda1c8942f1973a5f80b8cd78c 5761Author: Darren Tucker <dtucker@dtucker.net> 5762Date: Sat Aug 27 09:37:40 2022 +1000 5763 5764 Add Windows 2022 test targets. 5765 5766commit 85e1a69243f12be8520438ad6a3cfdc0b7fcbb2d 5767Author: Darren Tucker <dtucker@dtucker.net> 5768Date: Fri Aug 26 16:26:06 2022 +1000 5769 5770 Add cygwin-release test target. 5771 5772 This also moves the cygwin package install from the workflow file to 5773 setup_ci.sh so that we can install different sets of Cygwin packages 5774 for different test configs. 5775 5776commit 92382dbe8bf9ea1225b16858f9b9b208c15c7e8d 5777Author: djm@openbsd.org <djm@openbsd.org> 5778Date: Fri Aug 26 08:16:27 2022 +0000 5779 5780 upstream: whitespace 5781 5782 OpenBSD-Commit-ID: a5d015efbfd228dc598ffdef612d2da3a579e5d8 5783 5784commit 70a5de0a50e84d7250eb4e4537f765599f64c4af 5785Author: djm@openbsd.org <djm@openbsd.org> 5786Date: Fri Aug 26 08:12:56 2022 +0000 5787 5788 upstream: whitespace 5789 5790 OpenBSD-Commit-ID: d297e4387935d4aef091c5e9432578c2e513f538 5791 5792commit 3a683a19fd116ea15ebf8aa13d02646cceb302a9 5793Author: Damien Miller <djm@mindrot.org> 5794Date: Fri Aug 26 14:23:55 2022 +1000 5795 5796 initial list of allowed signers 5797 5798commit 6851f4b8c3fc1b3e1114c56106e4dc31369c8513 5799Author: Darren Tucker <dtucker@dtucker.net> 5800Date: Fri Aug 19 17:22:18 2022 +1000 5801 5802 Install Cygwin packages based on OS not config. 5803 5804commit f96480906893ed93665df8cdf9065865c51c1475 5805Author: djm@openbsd.org <djm@openbsd.org> 5806Date: Fri Aug 19 06:07:47 2022 +0000 5807 5808 upstream: attemp FIDO key signing without PIN and use the error 5809 5810 code returned to fall back only if necessary. Avoids PIN prompts for FIDO 5811 tokens that don't require them; part of GHPR#302 5812 5813 OpenBSD-Commit-ID: 4f752aaf9f2e7c28bcaaf3d4f8fc290131bd038e 5814 5815commit 5453333b5d28e313284cb9aae82899704103f98d 5816Author: djm@openbsd.org <djm@openbsd.org> 5817Date: Fri Aug 19 05:53:28 2022 +0000 5818 5819 upstream: remove incorrect check that can break enrolling a 5820 5821 resident key (introduced in r1.40) 5822 5823 OpenBSD-Commit-ID: 4cab364d518470e29e624af3d3f9ffa9c92b6f01 5824 5825commit ff89b1bed80721295555bd083b173247a9c0484e 5826Author: dtucker@openbsd.org <dtucker@openbsd.org> 5827Date: Fri Aug 19 04:02:46 2022 +0000 5828 5829 upstream: Strictly enforce the maximum allowed SSH2 banner size in 5830 5831 ssh-keyscan and prevent a one-byte buffer overflow. Patch from Qualys, ok 5832 djm@ 5833 5834 OpenBSD-Commit-ID: 6ae664f9f4db6e8a0589425f74cd0bbf3aeef4e4 5835 5836commit 1b470b9036639cef4f32fb303bb35ea0b711178d 5837Author: Darren Tucker <dtucker@dtucker.net> 5838Date: Fri Aug 19 15:18:09 2022 +1000 5839 5840 Fix cygwin conditional steps. 5841 5842commit fd6ee741ab16714b7035d60aca924123ba28135a 5843Author: Darren Tucker <dtucker@dtucker.net> 5844Date: Fri Aug 19 15:12:57 2022 +1000 5845 5846 Add a bit more debug output. 5847 5848commit a9305c4c739f4d91a3d3a92c0b6d4949404a36c5 5849Author: Darren Tucker <dtucker@dtucker.net> 5850Date: Fri Aug 12 15:08:47 2022 +1000 5851 5852 Add Cygwin (on windows-2019) test target. 5853 5854 In addition to installing the requisite Cygwin packages, we also need to 5855 explicitly invoke "sh" for steps that run other scripts since the runner 5856 environment doesn't understand #! paths. 5857 5858commit 5062ad48814b06162511c4f5924a33d97b6b2566 5859Author: djm@openbsd.org <djm@openbsd.org> 5860Date: Fri Aug 19 03:06:30 2022 +0000 5861 5862 upstream: double free() in error path; from Eusgor via GHPR333 5863 5864 OpenBSD-Commit-ID: 39f35e16ba878c8d02b4d01d8826d9b321be26d4 5865 5866commit 5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e 5867Author: Darren Tucker <dtucker@dtucker.net> 5868Date: Thu Aug 18 21:36:39 2022 +1000 5869 5870 Check for perms to run agent-getpeereid test. 5871 5872 Ubuntu 22.04 defaults to private home dirs which prevents "nobody" 5873 running ssh-add during the agent-getpeereid test. Check for this and 5874 add the necessary permissions. 5875 5876commit cd06a76b7ccc706e2bb4f1cc4aa9e9796a28a812 5877Author: Damien Miller <djm@mindrot.org> 5878Date: Wed Aug 17 16:04:16 2022 +1000 5879 5880 on Cygwin, prefer WinHello FIDO device 5881 5882 If no FIDO device was explictly specified, then prefer the 5883 windows://hello FIDO device. An exception to this is when 5884 probing resident FIDO keys, in which case hardware FIDO 5885 devices are preferred. 5886 5887commit 47f72f534ac5cc2cd3027675a3df7b00a8f77575 5888Author: djm@openbsd.org <djm@openbsd.org> 5889Date: Wed Aug 17 06:01:57 2022 +0000 5890 5891 upstream: add an extra flag to sk_probe() to indicate whether we're 5892 5893 probing for a FIDO resident key or not. Unused here, but will make like 5894 easier for portable 5895 5896 OpenBSD-Commit-ID: 432c8ff70e270378df9dbceb9bdeaa5b43b5a832 5897 5898commit edb0bcb3c79b16031dc87a8e57aecc3c4a3414f0 5899Author: jmc@openbsd.org <jmc@openbsd.org> 5900Date: Tue Aug 16 20:24:08 2022 +0000 5901 5902 upstream: use .Cm for "sign"; from josiah frentsos 5903 5904 OpenBSD-Commit-ID: 7f80a53d54857ac6ae49ea6ad93c5bd12231d1e4 5905 5906commit cccb011e130cbbac538b1689d10e4a067298df8b 5907Author: Corinna Vinschen <vinschen@redhat.com> 5908Date: Thu Aug 11 20:19:35 2022 +0200 5909 5910 Revert "check_sk_options: add temporary WinHello workaround" 5911 5912 Cygwin now comes with libfido2 1.11.0, so this workaround 5913 isn't required anymore. 5914 5915 This reverts commit 242c044ab111a37aad3b0775727c36a4c5f0102c. 5916 5917 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 5918 5919commit 9468cd7cf9d989dfa2ac20e2a0268ba6e93bfa5a 5920Author: Corinna Vinschen <vinschen@redhat.com> 5921Date: Thu Aug 11 20:18:17 2022 +0200 5922 5923 fido_dev_is_winhello: return 0, not "false" 5924 5925 "false" is not used anywhere in OpenSSH, so return 0 like 5926 everywhere else. 5927 5928 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 5929 5930commit 730a80609472ee0451c99482d75c9c41f3ebc42d 5931Author: djm@openbsd.org <djm@openbsd.org> 5932Date: Fri Aug 12 05:20:28 2022 +0000 5933 5934 upstream: sftp-server: support home-directory request 5935 5936 Add support to the sftp-server for the home-directory extension defined 5937 in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the 5938 existing expand-path@openssh.com, but uses a more official protocol name, 5939 and so is a bit more likely to be implemented by non-OpenSSH clients. 5940 5941 From Mike Frysinger, ok dtucker@ 5942 5943 OpenBSD-Commit-ID: bfc580d05cc0c817831ae7ecbac4a481c23566ab 5944 5945commit 5e820bf79ce3ce99ef7e98b0ab642b0a0a4f396c 5946Author: Darren Tucker <dtucker@dtucker.net> 5947Date: Fri Aug 12 14:56:55 2022 +1000 5948 5949 Replace deprecated ubuntu-18.04 runners with 22.04 5950 5951commit 87b0d9c1b789d3ff958ec45df2ac912e24461bae 5952Author: Darren Tucker <dtucker@dtucker.net> 5953Date: Thu Aug 11 22:48:23 2022 +1000 5954 5955 Add a timegm implementation from Heimdal via Samba. 5956 5957 Fixes build on (at least Solaris 10). 5958 5959commit d0c4fa58594577994921b593f10037c5282597ca 5960Author: Darren Tucker <dtucker@dtucker.net> 5961Date: Thu Aug 11 14:23:58 2022 +1000 5962 5963 Rerun tests if any .github config file changes. 5964 5965commit 113fe6c77ab43769fc61e953d07cb619fd7ea54b 5966Author: Darren Tucker <dtucker@dtucker.net> 5967Date: Thu Aug 11 13:33:51 2022 +1000 5968 5969 Skip hostbased during Valgrind tests. 5970 5971 Valgrind doesn't let ssh exec ssh-keysign (because it's setuid) so skip 5972 it during the Valgrind based tests. 5973 5974 See https://bugs.kde.org/show_bug.cgi?id=119404 for a discussion of this 5975 (ironically there the problematic binary was ssh(1) back when it could 5976 still be setuid). 5977 5978commit b98a42afb69d60891eb0488935990df6ee571c4d 5979Author: djm@openbsd.org <djm@openbsd.org> 5980Date: Thu Aug 11 01:57:50 2022 +0000 5981 5982 upstream: add some tests for parse_absolute_time(), including cases 5983 5984 where it is forced to the UTC timezone. bz3468 ok dtucker 5985 5986 OpenBSD-Regress-ID: ea07ca31c2f3847a38df028ca632763ae44e8759 5987 5988commit ec1ddb72a146fd66d18df9cd423517453a5d8044 5989Author: djm@openbsd.org <djm@openbsd.org> 5990Date: Thu Aug 11 01:56:51 2022 +0000 5991 5992 upstream: allow certificate validity intervals, sshsig verification 5993 5994 times and authorized_keys expiry-time options to accept dates in the UTC time 5995 zone in addition to the default of interpreting them in the system time zone. 5996 YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if 5997 suffixed with a 'Z' character. 5998 5999 Also allow certificate validity intervals to be specified in raw 6000 seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This 6001 is intended for use by regress tests and other tools that call 6002 ssh-keygen as part of a CA workflow. 6003 6004 bz3468 ok dtucker 6005 6006 OpenBSD-Commit-ID: 454db1cdffa9fa346aea5211223a2ce0588dfe13 6007 6008commit 4df246ec75751da7eb925e1880498300d8bda187 6009Author: Darren Tucker <dtucker@dtucker.net> 6010Date: Thu Aug 11 10:23:55 2022 +1000 6011 6012 Fix conditional for running hostbased tests. 6013 6014commit 2580916e48721802220c61ce9e0df1297c00bc07 6015Author: Damien Miller <djm@mindrot.org> 6016Date: Thu Aug 11 08:58:28 2022 +1000 6017 6018 fix SANDBOX_SECCOMP_FILTER_DEBUG 6019 6020commit fdbd5bf507fc271ff813714fab8a72ff2c6cb5ca 6021Author: Darren Tucker <dtucker@dtucker.net> 6022Date: Wed Aug 10 17:35:52 2022 +1000 6023 6024 Test hostbased auth on github runners. 6025 6026commit 7e2f51940ba48a1c0fae1107801ea643fa83c971 6027Author: Darren Tucker <dtucker@dtucker.net> 6028Date: Wed Aug 10 17:25:24 2022 +1000 6029 6030 Rename our getentropy to prevent possible loops. 6031 6032 Since arc4random seeds from getentropy, and we use OpenSSL for that 6033 if enabled, there's the possibility that if we build on a system that 6034 does not have getentropy then run on a system that does have it, then 6035 OpenSSL could end up calling our getentropy and getting stuck in a loop. 6036 Pointed out by deraadt@, ok djm@ 6037 6038commit 7a01f61be8d0aca0e975e7417f26371495fe7674 6039Author: Darren Tucker <dtucker@dtucker.net> 6040Date: Mon Aug 8 12:17:04 2022 +1000 6041 6042 Actually put HAVE_STDINT_H around the stdint.h. 6043 6044commit 73541f29f0b50480da6c20dceb7a7191bd8ea7d3 6045Author: Darren Tucker <dtucker@dtucker.net> 6046Date: Mon Aug 8 10:30:34 2022 +1000 6047 6048 Give unused param a name. 6049 6050 Fixes builds on platforms that do have fido2 but don't have 6051 fido_dev_is_winhello. 6052 6053commit 2a108c0ea960381bd9b14ee0d84e818a23df4482 6054Author: djm@openbsd.org <djm@openbsd.org> 6055Date: Fri Aug 5 05:01:40 2022 +0000 6056 6057 upstream: don't prompt for FIDO passphrase before attempting to enroll 6058 6059 the credential, just let the enroll operating fail and we'll attempt to get a 6060 PIN anyway. Might avoid some unneccessary PIN prompts. 6061 6062 Part of GHPR#302 from Corinna Vinschen; ok dtucker@ 6063 6064 OpenBSD-Commit-ID: bd5342ffc353ee37d39617906867c305564d1ce2 6065 6066commit 2886975c0ad9244e60dc5e4be34fde3aa573a4b5 6067Author: Corinna Vinschen <vinschen@redhat.com> 6068Date: Fri Feb 11 14:33:41 2022 +0100 6069 6070 sk_sign: set FIDO2 uv attribute explicitely for WinHello 6071 6072 WinHello via libfido2 performs user verification by default. 6073 However, if we stick to that, there's no way to differentiate 6074 between keys created with or without "-O verify-required". 6075 Set FIDO2 uv attribute explicitely to FIDO_OPT_FALSE, then check 6076 if user verification has been requested. 6077 6078 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 6079 6080commit 242c044ab111a37aad3b0775727c36a4c5f0102c 6081Author: Corinna Vinschen <vinschen@redhat.com> 6082Date: Tue Feb 15 11:28:08 2022 +0100 6083 6084 check_sk_options: add temporary WinHello workaround 6085 6086 Up to libfido 1.10.0, WinHello advertises "clientPin" rather 6087 than "uv" capability. This is fixed in 1.11.0. For the time 6088 being, workaround it here. 6089 6090 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 6091 6092commit 78774c08cc4b4997382975b0f414a86e06b6780c 6093Author: Corinna Vinschen <vinschen@redhat.com> 6094Date: Thu Feb 10 18:19:29 2022 +0100 6095 6096 compat code for fido_dev_is_winhello() 6097 6098 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 6099 6100commit 3d3a932a019aedfb891e0779bb4990cd5008a390 6101Author: Darren Tucker <dtucker@dtucker.net> 6102Date: Fri Aug 5 13:12:27 2022 +1000 6103 6104 Factor out getrnd() and rename to getentropy(). 6105 6106 Factor out the arc4random seeding into its own file and change the 6107 interface to match getentropy. Use native getentropy if available. 6108 This will make it easier to resync OpenBSD changes to arc4random. 6109 Prompted by bz#3467, ok djm@. 6110 6111commit 9385d277b787403be9dfcb229cf372202496d2f3 6112Author: Darren Tucker <dtucker@dtucker.net> 6113Date: Thu Aug 4 18:55:48 2022 +1000 6114 6115 Include CHANNEL and FIDO2 libs in configure output 6116 6117commit 141535b904b6fba01724444f38193a8599201f82 6118Author: djm@openbsd.org <djm@openbsd.org> 6119Date: Mon Aug 1 11:09:26 2022 +0000 6120 6121 upstream: avoid double-free in error path introduced in r1.70; report 6122 6123 and fix based on GHPR#332 by v-rzh ok dtucker@ 6124 6125 OpenBSD-Commit-ID: 3d21aa127b1f37cfc5bdc21461db369a663a951f 6126 6127commit dba7099ffcba3ca07b3946f017ba6a4c3158d9b1 6128Author: Darren Tucker <dtucker@dtucker.net> 6129Date: Wed Jul 27 18:40:12 2022 +1000 6130 6131 Remove deprecated MacOS 10.15 runners. 6132 6133commit 722a56439aa5972c830e4a9a724cf52aff4a950a 6134Author: Darren Tucker <dtucker@dtucker.net> 6135Date: Wed Jul 27 18:31:14 2022 +1000 6136 6137 Move stale-configure check as early as possible. 6138 6139 We added a check in Makefile to catch the case where configure needs to 6140 be rebuilt, however this did not happen until a build was attempted in 6141 which case all of the work done by configure was wasted. Move this check 6142 to the start of configure to catch it as early as possible. ok djm@ 6143 6144commit 099d6b56288b421ba38531d26dc1bd6bb685e311 6145Author: Darren Tucker <dtucker@dtucker.net> 6146Date: Fri Jul 22 10:47:19 2022 +1000 6147 6148 Move libcrypto into CHANNELLIBS. 6149 6150 This will result in sftp, sftp-server and scp no longer being linked 6151 against libcrypto. ok djm@ 6152 6153commit 1bdf86725b77733bb5f17c54888b88a10b2f6538 6154Author: Darren Tucker <dtucker@dtucker.net> 6155Date: Fri Jul 22 10:45:47 2022 +1000 6156 6157 Remove seed_rng calls from scp, sftp, sftp-server. 6158 6159 These binaries don't use OpenSSL's random functions. The next step 6160 will be to stop linking them against libcrypto. ok djm@ 6161 6162commit d73f77b8cb9b422f1ac4facee7890aa10ff2bc21 6163Author: Darren Tucker <dtucker@dtucker.net> 6164Date: Fri Jul 22 09:51:51 2022 +1000 6165 6166 Group libcrypto and PRNGD checks together. 6167 6168 They're related more than the libcrypt or libiaf checks which are 6169 currently between them. ok djm@ 6170 6171commit f117e372b3f42f2fbdb0a578d063b2609ab58e1f 6172Author: Darren Tucker <dtucker@dtucker.net> 6173Date: Fri Jul 22 09:24:45 2022 +1000 6174 6175 Do not link scp, sftp and sftp-server w/ zlib. 6176 6177 Some of our binaries (eg sftp, sftp-server, scp) do not interact with 6178 the channels code and thus do use libraries such as zlib and libcrypto 6179 although they are linked with them. This adds a CHANNELLIBS and starts 6180 by moving zlib into it, which means the aformentioned binaries are no 6181 longer linked against zlib. ok djm@ 6182 6183commit 800c2483e68db38bd1566ff69677124be974aceb 6184Author: Darren Tucker <dtucker@dtucker.net> 6185Date: Mon Jul 25 21:49:04 2022 +1000 6186 6187 Remove workarounds for OpenSSL missing AES-CTR. 6188 6189 We have some compatibility hacks that were added to support OpenSSL 6190 versions that do not support AES CTR mode. Since that time, however, 6191 the minimum OpenSSL version that we support has moved to 1.0.1 which 6192 *does* have CTR, so this is no longer needed. ok djm@ 6193 6194commit b7c56b65c12f51fe0dbae798d19c8f58224a5d95 6195Author: Darren Tucker <dtucker@dtucker.net> 6196Date: Mon Jul 25 21:43:00 2022 +1000 6197 6198 Remove workarounds for OpenSSL missing AES-GCM. 6199 6200 We have some compatibility hacks that were added to support OpenSSL 6201 versions that do not support AES GCM mode. Since that time, however, 6202 the minimum OpenSSL version that we support has moved to 1.0.1 which 6203 *does* have GCM, so this is no longer needed. ok djm@ 6204 6205commit 5a4a9f7a968fbf92cc1eac519c65638e79ae9f1f 6206Author: dtucker@openbsd.org <dtucker@openbsd.org> 6207Date: Mon Jul 25 07:12:45 2022 +0000 6208 6209 upstream: Restore missing "!" in TEST_SSH_ELAPSED_TIMES test. 6210 6211 OpenBSD-Regress-ID: 38783f9676ec348c5a792caecee9a16e354b37b0 6212 6213commit 0ff886be132299386cc29d87c2aa16ff68a1aa08 6214Author: dtucker@openbsd.org <dtucker@openbsd.org> 6215Date: Sun Jul 24 23:29:10 2022 +0000 6216 6217 upstream: Test TEST_SSH_ELAPSED_TIMES for empty string not 6218 6219 executable. No-op on most platforms but should prevent warnings in -portable 6220 on systems that don't have 'date %s'. 6221 6222 OpenBSD-Regress-ID: e39d79867b8065e33d0c5926fa1a31f85659d2a4 6223 6224commit f69319ad8ad1dd50f90bbcf5912e11cc8ed3e037 6225Author: Darren Tucker <dtucker@dtucker.net> 6226Date: Sat Jul 23 14:38:22 2022 +1000 6227 6228 Convert "have_prog" function into "which". 6229 6230 "which" and its behaviour is not standardized, so convert the existing 6231 have_prog function into "which" so we can rely on it being available 6232 and what its semantics are. Add a have_prog wrapper that maintains the 6233 existing behaviour. 6234 6235commit ea7ecc2c3ae39fdf5c6ad97b7bc0b47a98847f43 6236Author: Darren Tucker <dtucker@dtucker.net> 6237Date: Sat Jul 23 14:36:38 2022 +1000 6238 6239 Skip scp3 test if there's no scp on remote path. 6240 6241 scp -3 ends up using the scp that's in the remote path and will fail if 6242 one is not available. Based on a patch from rapier at psc.edu. 6243 6244commit c46f6fed419167c1671e4227459e108036c760f8 6245Author: Damien Miller <djm@mindrot.org> 6246Date: Wed Jul 20 13:39:14 2022 +1000 6247 6248 crank SSH_SK_VERSION_MAJOR in sk-dummy.so 6249 6250commit f208e3b9ffb5ee76cf9c95df7ff967adc7f51c7d 6251Author: djm@openbsd.org <djm@openbsd.org> 6252Date: Wed Jul 20 03:33:22 2022 +0000 6253 6254 upstream: ssh-keygen: fix touch prompt, pin retries; 6255 6256 part of GHPR329 from Pedro Martelletto 6257 6258 OpenBSD-Commit-ID: 75d1005bd2ef8f29fa834c90d2684e73556fffe8 6259 6260commit 8638a2ce7e90c8a51d9af3143404282126c524f8 6261Author: djm@openbsd.org <djm@openbsd.org> 6262Date: Wed Jul 20 03:31:42 2022 +0000 6263 6264 upstream: sk-usbhid: preserve error code returned by key_lookup() 6265 6266 it conveys useful information, such as the supplied pin being wrong. 6267 6268 Part of GHPR329 from Pedro Martelletto 6269 6270 OpenBSD-Commit-ID: c0647eb9290f793add363d81378439b273756c1b 6271 6272commit 9ab929ca2d820520327b41929372bcb9e261534c 6273Author: djm@openbsd.org <djm@openbsd.org> 6274Date: Wed Jul 20 03:29:14 2022 +0000 6275 6276 upstream: when enrolling a resident key on a security token, check 6277 6278 if a credential with matching application and user ID strings already exists. 6279 if so, prompt the user for confirmation before overwriting the credential. 6280 6281 patch from Pedro Martelletto via GHPR329 6282 6283 NB. cranks SSH_SK_VERSION_MAJOR, so any third-party FIDO middleware 6284 implementations will need to adjust 6285 6286 OpenBSD-Commit-ID: e45e9f1bf2b2f32d9850669e7a8dbd64acc5fca4 6287 6288commit 5bcfc788b38d5b64e4c347bdc04bd9a01bbc36da 6289Author: djm@openbsd.org <djm@openbsd.org> 6290Date: Wed Jul 20 03:13:04 2022 +0000 6291 6292 upstream: pull passphrase reading and confirmation into a separate 6293 6294 function so it can be used for FIDO2 PINs; no functional change 6295 6296 OpenBSD-Commit-ID: bf34f76b8283cc1d3f54633e0d4f13613d87bb2f 6297 6298commit eb679e2959bdb15454eb94751930eb4c9110da94 6299Author: Darren Tucker <dtucker@dtucker.net> 6300Date: Fri Jul 15 21:31:48 2022 +1000 6301 6302 Move vmshutdown to first step. 6303 6304 If a previous run on a physical runner has failed to clean up, the next 6305 run will fail because it'll try to check out the code to a broken 6306 directory mount. Make cleanup the first step. 6307 6308commit 46b91b70ff3cb9c147e2875ef5dc609fd64c0c96 6309Author: Darren Tucker <dtucker@dtucker.net> 6310Date: Fri Jul 15 20:25:27 2022 +1000 6311 6312 Rename bbone test target to ARM. 6313 6314commit 751d22cdeffed9fe921db78eedc32a29f9e80510 6315Author: Darren Tucker <dtucker@dtucker.net> 6316Date: Fri Jul 15 13:37:29 2022 +1000 6317 6318 Add AUDIT_ARCH_PPC to supported seccomp arches. 6319 6320 Patch from dries.deschout at dodeco.eu. 6321 6322commit a061792a6e8d235fc40a9b5d4c22a1762bb75a7b 6323Author: Darren Tucker <dtucker@dtucker.net> 6324Date: Thu Jul 14 19:20:24 2022 +1000 6325 6326 Remove unintended changes. 6327 6328 I inadvertently included a couple of local changes with the OpenSSL 6329 3.0.4 change. Revert, anything that should be there will be committed 6330 separately. 6331 6332commit 527cb43fa1b4e55df661feabbac51b8e608b6519 6333Author: Darren Tucker <dtucker@dtucker.net> 6334Date: Thu Jul 14 11:22:08 2022 +1000 6335 6336 Return ERANGE from getcwd() if buffer size is 1. 6337 6338 If getcwd() is supplied a buffer size of exactly 1 and a path of "/", it 6339 could result in a nul byte being written out of array bounds. POSIX says 6340 it should return ERANGE if the path will not fit in the available buffer 6341 (with terminating nul). 1 byte cannot fit any possible path with its nul, 6342 so immediately return ERANGE in that case. 6343 6344 OpenSSH never uses getcwd() with this buffer size, and all current 6345 (and even quite old) platforms that we are currently known to work 6346 on have a native getcwd() so this code is not used on those anyway. 6347 Reported by Qualys, ok djm@ 6348 6349commit 36857fefd8849c4b0e877cfd9d1eb22f79b76650 6350Author: Darren Tucker <dtucker@dtucker.net> 6351Date: Thu Jul 14 10:02:35 2022 +1000 6352 6353 Split README.platform into its own line. 6354 6355 README.platform has general platform-specific information, having it 6356 following text about FIDO2 on the same line could imply that it only 6357 has information about FIDO2. 6358 6359commit 00a496c6c14f2d41f2a9365714d494dd5f3aac9f 6360Author: Darren Tucker <dtucker@dtucker.net> 6361Date: Thu Jul 14 09:56:01 2022 +1000 6362 6363 Clarify README.md text. 6364 6365 Clarify the text about the implications of building without OpenSSL, and 6366 prefix the "configure --help" example command with a "./" so it's likely 6367 to work as-is in more shells. From bz#3461. 6368 6369commit f40b52f21fbc52eb513279168a49d3285c65256c 6370Author: Darren Tucker <dtucker@dtucker.net> 6371Date: Tue Jul 12 19:48:44 2022 +1000 6372 6373 Remove special casing of crypt(). 6374 6375 Configure goes to some lengths to pick crypt() from either libcrypt 6376 or OpenSSL's libcrypto because they can more or less featureful (eg 6377 supporting md5-style passwords). 6378 6379 OpenSSL removed its crypt() interface in 2002: 6380 https://github.com/openssl/openssl/commit/69deec58 so these hijinks 6381 should no longer be necessary. This also only links sshd with libcrypt 6382 which is the only thing that needs it. ok djm@ 6383 6384commit 76f4e48631d7b09fb243b47d7b393d100d3741b7 6385Author: Darren Tucker <dtucker@dtucker.net> 6386Date: Wed Jul 13 13:17:47 2022 +1000 6387 6388 Only refuse to use OpenSSL 3.0.4 on x86_64. 6389 6390 The potential RCE only impacts x86_64, so only refuse to use it if we're 6391 targetting a potentially impacted architecture. ok djm@ 6392 6393commit e75bbc1d88491fa85e61b2cc8783d4bbd00cd131 6394Author: Darren Tucker <dtucker@dtucker.net> 6395Date: Tue Jul 12 14:37:15 2022 +1000 6396 6397 Capture stderr output from configure. 6398 6399commit d9eaea4bea6271bcee6a2b9428f1271faf2d033b 6400Author: Darren Tucker <dtucker@dtucker.net> 6401Date: Tue Jul 12 12:54:49 2022 +1000 6402 6403 Refuse to use OpenSSL 3.0.4 due to potential RCE. 6404 6405 OpenSSL has a potential RCE in its RSA implementation (CVE-2022-2274) 6406 so refuse to use that specific version. 6407 6408commit fb2f3a61bf3d28fff285524535f7ffcd177c9235 6409Author: Darren Tucker <dtucker@dtucker.net> 6410Date: Tue Jul 12 12:54:24 2022 +1000 6411 6412 Move unset to before we set anything. 6413 6414commit c483a5c0fb8e8b8915fad85c5f6113386a4341ca 6415Author: Darren Tucker <dtucker@dtucker.net> 6416Date: Wed Jul 6 11:52:54 2022 +1000 6417 6418 Test against openssl-3.0.5. 6419 6420commit 669a56bcfe73f8b985f2bba476ba834d55253acf 6421Author: Darren Tucker <dtucker@dtucker.net> 6422Date: Tue Jul 5 18:35:53 2022 +1000 6423 6424 Update sanitizer test targets: 6425 6426 - remove clang-sanitize-memory for now. It takes so long that the test 6427 times out. 6428 - add gcc sanitize-address and sanitize-undefined test targets. 6429 6430commit 48cc68b69118b3ce8d07fd4f82e00d58667d5379 6431Author: Darren Tucker <dtucker@dtucker.net> 6432Date: Tue Jul 5 16:23:28 2022 +1000 6433 6434 Add GCC address sanitizer build/test. 6435 6436commit 55c60bdd39b82457e92efa77da8d16cfa6a49391 6437Author: Darren Tucker <dtucker@dtucker.net> 6438Date: Tue Jul 5 12:02:33 2022 +1000 6439 6440 Move sanitizer logs into regress for collection. 6441 6442commit 35ef2b3b6ef198f8574904a45780487ec2f17858 6443Author: dtucker@openbsd.org <dtucker@openbsd.org> 6444Date: Mon Jul 4 09:10:31 2022 +0000 6445 6446 upstream: Add TEST_REGRESS_CACHE_DIR. 6447 6448 If set, it is used to cache regress test names that have succeeded and 6449 skip those on a re-run. 6450 6451 OpenBSD-Regress-ID: a7570dd29a58df59f2cca647c3c2ec989b49f247 6452 6453commit 7394ed80c4de8b228a43c8956cf2fa1b9c6b2622 6454Author: Darren Tucker <dtucker@dtucker.net> 6455Date: Sun Jul 3 21:46:44 2022 +1000 6456 6457 Add clang sanitizer tests. 6458 6459commit bfce0e66b6017a9bfab450b9dc7d4b16f90de817 6460Author: Darren Tucker <dtucker@dtucker.net> 6461Date: Sun Jul 3 18:14:09 2022 +1000 6462 6463 Skip all rlimit tests when sandboxing disabled. 6464 6465 The rlimit tests can hang when being run with some compiler sanitizers 6466 so skip all of them if sandbox=no. 6467 6468commit 6208d611520f9ea94d5369f9da404b709930029d 6469Author: Darren Tucker <dtucker@dtucker.net> 6470Date: Sun Jul 3 17:54:49 2022 +1000 6471 6472 Move checks for pollfd.fd and nfds_t. 6473 6474 Move the checks for struct pollfd.fd and nfds_t to before the sandboxing 6475 checks. This groups all the sandbox checks together so we can skip them 6476 all when sandboxing is disabled. 6477 6478commit 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b 6479Author: dtucker@openbsd.org <dtucker@openbsd.org> 6480Date: Fri Jul 1 05:08:23 2022 +0000 6481 6482 upstream: Remove leftover line. 6483 6484 Remove extra line leftover from merge conflict. ok djm@ 6485 6486 OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e 6487 6488commit 7ec81daad0e03a64e8d91c5590960c48c1a899a3 6489Author: djm@openbsd.org <djm@openbsd.org> 6490Date: Fri Jul 1 04:45:50 2022 +0000 6491 6492 upstream: use consistent field names (s/char/byte) 6493 6494 in format description 6495 6496 OpenBSD-Commit-ID: 3de33572733ee7fcfd7db33d37db23d2280254f0 6497 6498commit 32e82a392d9f263485effdd606ff5862d289a4a0 6499Author: Darren Tucker <dtucker@dtucker.net> 6500Date: Fri Jul 1 13:55:19 2022 +1000 6501 6502 Skip select+rlimit check if sandboxing is disabled 6503 6504 It's not needed in that case, and the test can fail when being built 6505 with some compiler memory sanitizer flags. bz#3441 6506 6507commit 4be7184ebe2a2ccef175983517a35ee06766e1b4 6508Author: djm@openbsd.org <djm@openbsd.org> 6509Date: Fri Jul 1 03:52:57 2022 +0000 6510 6511 upstream: bump up loglevel from debug to info when unable to open 6512 6513 authorized keys/principals file for errno != ENOENT; bz2042 ok dtucker 6514 6515 OpenBSD-Commit-ID: e79aa550d91ade6a80f081bda689da24c086d66b 6516 6517commit 6c31ba10e97b6953c4f325f526f3e846dfea647a 6518Author: dtucker@openbsd.org <dtucker@openbsd.org> 6519Date: Fri Jul 1 03:39:44 2022 +0000 6520 6521 upstream: Don't leak the strings allocated by order_hostkeyalgs() 6522 6523 and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of 6524 github PR#324 from ZoltanFridrich, ok djm@ 6525 6526 This is a roll-forward of the previous rollback now that the required 6527 changes in compat.c have been done. 6528 6529 OpenBSD-Commit-ID: c7cd93730b3b9f53cdad3ae32462922834ef73eb 6530 6531commit 486c4dc3b83b4b67d663fb0fa62bc24138ec3946 6532Author: dtucker@openbsd.org <dtucker@openbsd.org> 6533Date: Fri Jul 1 03:35:45 2022 +0000 6534 6535 upstream: Always return allocated strings from the kex filtering so 6536 6537 that we can free them later. Fix one leak in compat_kex_proposal. Based on 6538 github PR#324 from ZoltanFridrich with some simplications by me. ok djm@ 6539 6540 OpenBSD-Commit-ID: 9171616da3307612d0ede086fd511142f91246e4 6541 6542commit 96faa0de6c673a2ce84736eba37fc9fb723d9e5c 6543Author: djm@openbsd.org <djm@openbsd.org> 6544Date: Fri Jul 1 00:36:30 2022 +0000 6545 6546 upstream: ignore SIGPIPE earlier in main(), specifically before 6547 6548 muxclient() which performs operations that could cause one; Reported by Noam 6549 Lewis via bz3454, ok dtucker@ 6550 6551 OpenBSD-Commit-ID: 63d8e13276869eebac6d7a05d5a96307f9026e47 6552 6553commit 33efac790f6b09d54894ba6c3e17dfb08b6fc7e1 6554Author: jmc@openbsd.org <jmc@openbsd.org> 6555Date: Tue Jun 28 06:09:14 2022 +0000 6556 6557 upstream: reflect the update to -D arg name in usage(); 6558 6559 OpenBSD-Commit-ID: abdcde4f92b1ef094ae44210ee99d3b0155aad9c 6560 6561commit c71a1442d02f0a3586109dfe2cb366de36dee08e 6562Author: Darren Tucker <dtucker@dtucker.net> 6563Date: Wed Jun 29 18:28:47 2022 +1000 6564 6565 Update OpenSSL tests to the most recent releases. 6566 6567commit 2a822f29300b2de7335fbff65f0b187a0c582304 6568Author: djm@openbsd.org <djm@openbsd.org> 6569Date: Mon Jun 27 21:41:55 2022 +0000 6570 6571 upstream: allow arguments to sftp -D option, e.g. sftp -D 6572 6573 "/usr/libexec/sftp-server -el debug3" 6574 6575 ok markus@ 6576 6577 OpenBSD-Commit-ID: 5a002b9f3a7aef2731fc0ffa9c921cf15f38ecce 6578 6579commit 2369a2810187e08f2af5d58b343956062fb96ee8 6580Author: dtucker@openbsd.org <dtucker@openbsd.org> 6581Date: Fri Jun 24 10:45:06 2022 +0000 6582 6583 upstream: Roll back previous KEX changes as they aren't safe until 6584 6585 compat_pkalg_proposal and friends always allocate their returned strings. 6586 Reported by Qualys. 6587 6588 OpenBSD-Commit-ID: 1c7a88a0d5033f42f88ab9bec58ef1cf72c81ad0 6589 6590commit 646686136c34c2dbf6a01296dfaa9ebee029386d 6591Author: dtucker@openbsd.org <dtucker@openbsd.org> 6592Date: Fri Jun 24 04:37:00 2022 +0000 6593 6594 upstream: Don't leak the strings allocated by order_hostkeyalgs() 6595 6596 and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of 6597 github PR#324 from ZoltanFridrich, ok djm@ 6598 6599 OpenBSD-Commit-ID: b2f6e5f60f2bba293b831654328a8a0035ef4a1b 6600 6601commit 193c6d8d905dde836b628fc07a7b9cf2d347e2a3 6602Author: Darren Tucker <dtucker@dtucker.net> 6603Date: Sat Jun 25 12:16:15 2022 +1000 6604 6605 Zero out LIBFIDO2 when SK support not usable. 6606 6607 Prevents us from trying to link them into ssh-sk-helper and failing to 6608 build. 6609 6610commit 40f5d849d25c60b4ae21261e78484d435f5cfd51 6611Author: Darren Tucker <dtucker@dtucker.net> 6612Date: Sat Jun 25 11:47:28 2022 +1000 6613 6614 Disable SK support if FIDO libs not found. 6615 6616commit 5fd922ade1b25880fe8a8249f5c0385e413108f9 6617Author: Damien Miller <djm@mindrot.org> 6618Date: Fri Jun 24 14:43:54 2022 +1000 6619 6620 fix broken case statement in previous 6621 6622commit f51423bdaf0008d46b6af082bcfd7a22a87375f0 6623Author: Damien Miller <djm@mindrot.org> 6624Date: Fri Jun 24 14:40:42 2022 +1000 6625 6626 request 1.1x API compatibility for OpenSSL >=3.x 6627 6628 idea/patch from Pedro Martelletto via GHPR#322; ok dtucker@ 6629 6630commit 455cee8d6c2e4c48c5af9faead3599c49948411e 6631Author: djm@openbsd.org <djm@openbsd.org> 6632Date: Fri Jun 24 04:27:14 2022 +0000 6633 6634 upstream: make it clear that RekeyLimit applies to both transmitted 6635 6636 and received data. GHPR#328 from Jan Pazdziora 6637 6638 OpenBSD-Commit-ID: d180a905fec9ff418a75c07bb96ea41c9308c3f9 6639 6640commit 17904f05802988d0bb9ed3c8d1d37411e8f459c3 6641Author: tobhe@openbsd.org <tobhe@openbsd.org> 6642Date: Tue Jun 21 14:52:13 2022 +0000 6643 6644 upstream: Make sure not to fclose() the same fd twice in case of an 6645 6646 error. 6647 6648 ok dtucker@ 6649 6650 OpenBSD-Commit-ID: e384c4e05d5521e7866b3d53ca59acd2a86eef99 6651 6652commit f29d6cf98c25bf044079032d22c1a57c63ab9d8e 6653Author: dtucker@openbsd.org <dtucker@openbsd.org> 6654Date: Sat Jun 18 02:17:16 2022 +0000 6655 6656 upstream: Don't attempt to fprintf a null identity comment. From 6657 6658 Martin Vahlensieck via tech@. 6659 6660 OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2 6661 6662commit ad1762173bb38716a106e8979806149fd0f2753e 6663Author: dtucker@openbsd.org <dtucker@openbsd.org> 6664Date: Fri Jun 17 01:00:03 2022 +0000 6665 6666 upstream: Log an error if pipe() fails while accepting a 6667 6668 connection. bz#3447, from vincent-openssh at vinc17 net, ok djm@ 6669 6670 OpenBSD-Commit-ID: 9d59f19872b94900a5c79da2d57850241ac5df94 6671 6672commit 9c59e7486cc8691401228b43b96a3edbb06e0412 6673Author: Damien Miller <djm@mindrot.org> 6674Date: Fri Jun 24 14:20:43 2022 +1000 6675 6676 automatically enable built-in FIDO support 6677 6678 If libfido2 is found and usable, then enable the built-in 6679 security key support unless --without-security-key-builtin 6680 was requested. 6681 6682 ok dtucker@ 6683 6684commit 7d25b37fb2a5ff4dadabcbdac6087a97479434f5 6685Author: Damien Miller <djm@mindrot.org> 6686Date: Fri Jun 24 13:46:39 2022 +1000 6687 6688 fix possible NULL deref when built without FIDO 6689 6690 Analysis/fix from kircher in bz3443; ok dtucker@ 6691 6692commit f5ba85daddfc2da6a8dab6038269e02c0695be44 6693Author: djm@openbsd.org <djm@openbsd.org> 6694Date: Wed Jun 15 16:08:25 2022 +0000 6695 6696 upstream: make sure that UseDNS hostname lookup happens in the monitor 6697 6698 and not in the pledge(2)'d unprivileged process; fixes regression caused by 6699 recent refactoring spotted by henning@ 6700 6701 OpenBSD-Commit-ID: a089870b95101cd8881a2dff65b2f1627d13e88d 6702 6703commit acb2059febaddd71ee06c2ebf63dcf211d9ab9f2 6704Author: djm@openbsd.org <djm@openbsd.org> 6705Date: Fri Jun 3 04:47:21 2022 +0000 6706 6707 upstream: move auth_openprincipals() and auth_openkeyfile() over to 6708 6709 auth2-pubkeyfile.c too; they make more sense there. 6710 6711 OpenBSD-Commit-ID: 9970d99f900e1117fdaab13e9e910a621b7c60ee 6712 6713commit 3d9b0845f34510111cc693bb99a667662ca50cd8 6714Author: djm@openbsd.org <djm@openbsd.org> 6715Date: Fri Jun 3 04:31:54 2022 +0000 6716 6717 upstream: test setenv in both client and server, test first-match-wins 6718 6719 too 6720 6721 OpenBSD-Regress-ID: 4c8804f9db38a02db480b9923317457b377fe34b 6722 6723commit 22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40 6724Author: djm@openbsd.org <djm@openbsd.org> 6725Date: Fri Jun 3 04:30:46 2022 +0000 6726 6727 upstream: Make SetEnv directives first-match-wins in both 6728 6729 sshd_config and sshd_config; previously if the same name was reused then the 6730 last would win (which is the opposite to how the config is supposed to work). 6731 6732 While there, make the ssh_config parsing more like sshd_config. 6733 6734 bz3438, ok dtucker 6735 6736 OpenBSD-Commit-ID: 797909c1e0262c0d00e09280459d7ab00f18273b 6737 6738commit 38ed6c57e9e592c08e020fa6e82b45b4e1040970 6739Author: dtucker@openbsd.org <dtucker@openbsd.org> 6740Date: Fri Jun 3 04:00:15 2022 +0000 6741 6742 upstream: Add missing *-sk types to ssh-keyscan manpage. From 6743 6744 skazi0 via github PR#294. 6745 6746 OpenBSD-Commit-ID: fda2c869cdb871f3c90a89fb3f985370bb5d25c0 6747 6748commit ea97ec98c41ec2b755dfab459347db674ff9a5de 6749Author: dtucker@openbsd.org <dtucker@openbsd.org> 6750Date: Fri Jun 3 03:21:09 2022 +0000 6751 6752 upstream: Add period at end of "not known by any other names" 6753 6754 message. github PR#320 from jschauma, ok djm@ 6755 6756 OpenBSD-Commit-ID: bd60809803c4bfd3ebb7c5c4d918b10e275266f2 6757 6758commit 88e376fcd67478ad1660d94bc73ab348ac9f4527 6759Author: dtucker@openbsd.org <dtucker@openbsd.org> 6760Date: Fri Jun 3 03:17:42 2022 +0000 6761 6762 upstream: ssh-keygen -A: do not generate DSA keys by default. 6763 6764 Based on github PR#303 from jsegitz with man page text from jmc@, ok markus@ 6765 djm@ 6766 6767 OpenBSD-Commit-ID: 5c4c57bdd7063ff03381cfb6696659dd3f9f5b9f 6768 6769commit 6b3fb624675082a1e5aa615d1b8479873d8b5731 6770Author: naddy@openbsd.org <naddy@openbsd.org> 6771Date: Tue May 31 14:05:12 2022 +0000 6772 6773 upstream: ssh-keygen: implement "verify-required" certificate option. 6774 6775 This was already documented when support for user-verified FIDO 6776 keys was added, but the ssh-keygen(1) code was missing. 6777 6778 ok djm@ 6779 6780 OpenBSD-Commit-ID: f660f973391b593fea4b7b25913c9a15c3eb8a06 6781 6782commit b7f86ffc301be105bba9a3e0618b6fab3ae379bd 6783Author: jmc@openbsd.org <jmc@openbsd.org> 6784Date: Sat May 28 05:57:56 2022 +0000 6785 6786 upstream: keywords ref ssh_config.5; 6787 6788 from caspar schutijser 6789 6790 OpenBSD-Commit-ID: f146a19d7d5c9374c3b9c520da43b2732d7d1a4e 6791 6792commit dc7bc52372f2744fa39191577be5306ee57aacd4 6793Author: Damien Miller <djm@mindrot.org> 6794Date: Mon May 30 09:29:09 2022 +1000 6795 6796 fix some bugs in the fuzzer 6797 6798commit 1781f507c113667613351c19898efaf1e311a865 6799Author: Darren Tucker <dtucker@dtucker.net> 6800Date: Fri May 27 18:19:48 2022 +1000 6801 6802 Test against OpenSSL 1.1.1o and 3.0.3. 6803 6804commit c53906e0c59e569691b4095d3e8db79cf78fa058 6805Author: Darren Tucker <dtucker@dtucker.net> 6806Date: Fri May 27 18:18:31 2022 +1000 6807 6808 Test against LibreSSL 3.5.3. 6809 6810commit 9b3ad432ad2f19319bcc089370e356c6315d682f 6811Author: Damien Miller <djm@mindrot.org> 6812Date: Fri May 27 17:00:43 2022 +1000 6813 6814 fuzzer for authorized_keys parsing 6815 6816 mostly redundant to authopt_fuzz, but it's sensitive code so IMO it 6817 makes sense to test this layer too 6818 6819commit c83d8c4d6f3ccceef84d46de107f6b71cda06359 6820Author: djm@openbsd.org <djm@openbsd.org> 6821Date: Fri May 27 05:02:46 2022 +0000 6822 6823 upstream: split the low-level file handling functions out from 6824 6825 auth2-pubkey.c 6826 6827 Put them in a new auth2-pubkeyfile.c to make it easier to refer to them 6828 (e.g. in unit/fuzz tests) without having to refer to everything else 6829 pubkey auth brings in. 6830 6831 ok dtucker@ 6832 6833 OpenBSD-Commit-ID: 3fdca2c61ad97dc1b8d4a7346816f83dc4ce2217 6834 6835commit 3b0b142d2a0767d8cd838e2f3aefde8a0aaa41e1 6836Author: djm@openbsd.org <djm@openbsd.org> 6837Date: Fri May 27 05:01:25 2022 +0000 6838 6839 upstream: refactor authorized_keys/principals handling 6840 6841 remove "struct ssh *" from arguments - this was only used to pass the 6842 remote host/address. These can be passed in instead and the resulting 6843 code is less tightly coupled to ssh_api.[ch] 6844 6845 ok dtucker@ 6846 6847 OpenBSD-Commit-ID: 9d4373d013edc4cc4b5c21a599e1837ac31dda0d 6848 6849commit 2c334fd36f80cb91cc42e4b978b10aa35e0df236 6850Author: dtucker@openbsd.org <dtucker@openbsd.org> 6851Date: Fri May 27 04:29:40 2022 +0000 6852 6853 upstream: f sshpkt functions fail, then password is not cleared 6854 6855 with freezero. Unconditionally call freezero to guarantee that password is 6856 removed from RAM. 6857 6858 From tobias@ and c3h2_ctf via github PR#286, ok djm@ 6859 6860 OpenBSD-Commit-ID: 6b093619c9515328e25b0f8093779c52402c89cd 6861 6862commit 5d3a77f4c5ae774c6796387266503f52c7cdc7c2 6863Author: dtucker@openbsd.org <dtucker@openbsd.org> 6864Date: Fri May 27 04:27:49 2022 +0000 6865 6866 upstream: Avoid kill with -1 argument. The out_ctx label can be 6867 6868 reached before fork has been called. If this happens, then kill -1 would be 6869 called, sending SIGTERM to all processes reachable by the current process. 6870 6871 From tobias@ and c3h2_ctf via github PR#286, ok djm@ 6872 6873 OpenBSD-Commit-ID: 6277af1207d81202f5daffdccfeeaed4c763b1a8 6874 6875commit 533b31cd08e4b97f455466f91c36915e2924c15a 6876Author: dtucker@openbsd.org <dtucker@openbsd.org> 6877Date: Fri May 27 04:13:24 2022 +0000 6878 6879 upstream: Note that ProxyJump also accepts the same tokens as 6880 6881 ProxyCommand. From pallxk via github PR#305. 6882 6883 OpenBSD-Commit-ID: 7115ac351b129205f1f1ffa6bbfd62abd76be7c5 6884 6885commit 9d8c80f8a304babe61ca28f2e3fb5eb6dc9c39bf 6886Author: djm@openbsd.org <djm@openbsd.org> 6887Date: Wed May 25 06:03:44 2022 +0000 6888 6889 upstream: revert previous; it was broken (spotted by Theo) 6890 6891 OpenBSD-Commit-ID: 457c79afaca2f89ec2606405c1059b98b30d8b0d 6892 6893commit 9e0d02ef7ce88b67643bfb1c2272c9f5f04cc680 6894Author: djm@openbsd.org <djm@openbsd.org> 6895Date: Wed May 25 00:31:13 2022 +0000 6896 6897 upstream: make SSHBUF_DBG/SSHBUF_TELL (off by default and only enabled 6898 6899 via #define) dump to stderr rather than stdout 6900 6901 OpenBSD-Commit-ID: 10298513ee32db8390aecb0397d782d68cb14318 6902 6903commit 2487163630f28be28b7e2396b4bd6511b98f1d3e 6904Author: Tim Rice <tim@multitalents.net> 6905Date: Tue May 24 10:21:25 2022 -0700 6906 6907 configure.ac: Add missing AC_DEFINE for caph_cache_tzdata test causing 6908 HAVE_CAPH_CACHE_TZDATA to be missing from config.h.in. 6909 Spotted by Bryan Drewery 6910 6911commit bedb93415b60db3dfd704a3d525e82adb14a2481 6912Author: djm@openbsd.org <djm@openbsd.org> 6913Date: Sun May 15 23:48:07 2022 +0000 6914 6915 upstream: regress test for in-place transfers and clobbering larger 6916 6917 files with smaller ones; would have caught last regression in scp(1) 6918 6919 OpenBSD-Regress-ID: 19de4e88dd3a4f7e5c1618c9be3c32415bd93bc2 6920 6921commit b4f0d719c2548cb74da509fb65f384dada4ebd37 6922Author: anton@openbsd.org <anton@openbsd.org> 6923Date: Fri Apr 22 05:08:43 2022 +0000 6924 6925 upstream: Only run agent-ptrace.sh if gdb is available as all 6926 6927 architectures do not ship with gdb. 6928 6929 OpenBSD-Regress-ID: ec53e928803e6b87f9ac142d38888ca79a45348d 6930 6931commit 9b73345f80255a7f3048026462f2c0c6a241eeac 6932Author: djm@openbsd.org <djm@openbsd.org> 6933Date: Sun May 15 23:47:21 2022 +0000 6934 6935 upstream: fix in-place copies; r1.163 incorrectly skipped truncation in 6936 6937 all cases, not just at the start of a transfer. This could cause overwrites 6938 of larger files to leave junk at the end. Spotted by tb@ 6939 6940 OpenBSD-Commit-ID: b189f19cd68119548c8e24e39c79f61e115bf92c 6941 6942commit 56a0697fe079ff3e1ba30a2d5c26b5e45f7b71f8 6943Author: djm@openbsd.org <djm@openbsd.org> 6944Date: Fri May 13 06:31:50 2022 +0000 6945 6946 upstream: arrange for scp, when in sftp mode, to not ftruncate(3) files 6947 6948 early 6949 6950 previous behavious of unconditionally truncating the destination file 6951 would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to 6952 delete all the contents of their destination. 6953 6954 spotted by solene@ sthen@, also bz3431; ok dtucker@ 6955 6956 OpenBSD-Commit-ID: ca39fdd39e0ec1466b9666f15cbcfddea6aaa179 6957 6958commit fbcef70c2832712f027bccea1aa9bc4b4103da93 6959Author: dtucker@openbsd.org <dtucker@openbsd.org> 6960Date: Mon May 9 08:25:27 2022 +0000 6961 6962 upstream: Remove errant apostrophe. From haruyama at queen-ml org. 6963 6964 OpenBSD-Commit-ID: dc6b294567cb84b384ad6ced9ca469f2bbf0bd10 6965 6966commit 0086a286ea6bbd11ca9b664ac3bb12b27443d6eb 6967Author: djm@openbsd.org <djm@openbsd.org> 6968Date: Mon May 9 03:09:53 2022 +0000 6969 6970 upstream: Allow existing -U (use agent) flag to work with "-Y sign" 6971 6972 operations, where it will be interpreted to require that the private keys is 6973 hosted in an agent; bz3429, suggested by Adam Szkoda; ok dtucker@ 6974 6975 OpenBSD-Commit-ID: a7bc69873b99c32c42c7628ed9ea91565ba08c2f 6976 6977commit cb010744cc98f651b1029bb09efa986eb54e4ccf 6978Author: djm@openbsd.org <djm@openbsd.org> 6979Date: Sun May 8 22:58:35 2022 +0000 6980 6981 upstream: improve error message when 'ssh-keygen -Y sign' is unable to 6982 6983 load a private key; bz3429, reported by Adam Szkoda ok dtucker@ 6984 6985 OpenBSD-Commit-ID: bb57b285e67bea536ef81b1055467be2fc380e74 6986 6987commit aa61fc82c63d309a90c22ca74fb1da6c6f4372fd 6988Author: Tobias Heider <me@tobhe.de> 6989Date: Mon May 9 02:00:01 2022 +0200 6990 6991 Remove duplicate bcrypt_pbkdf.o from Makefile 6992 6993 bcrypt_pbkdf.o is duplicated in the openbsd-compat Makefile's object 6994 file list. 6995 6996commit deb506d00da8d11fb04c1e7b9b1e1cc379c1705c 6997Author: djm@openbsd.org <djm@openbsd.org> 6998Date: Sun May 8 22:32:36 2022 +0000 6999 7000 upstream: When performing operations that glob(3) a remote path, ensure 7001 7002 that the implicit working directory used to construct that path escapes 7003 glob(3) characters. 7004 7005 This prevents glob characters from being processed in places they 7006 shouldn't, e.g. "cd /tmp/a*/", "get *.txt" should have the get operation 7007 treat the path "/tmp/a*" literally and not attempt to expand it. 7008 7009 Reported by Lusia Kundel; ok markus@ 7010 7011 OpenBSD-Commit-ID: 4f647f58482cbad3d58b1eab7f6a1691433deeef 7012 7013commit f38cf74f20b5da113cfa823afd5bfb5c6ba65f3d 7014Author: Darren Tucker <dtucker@dtucker.net> 7015Date: Fri May 6 14:50:18 2022 +1000 7016 7017 Also retest OpenBSD upstream on .yml changes. 7018 7019commit f87a132800ba3710ab130d703448a31ef1128d77 7020Author: Darren Tucker <dtucker@dtucker.net> 7021Date: Fri May 6 14:46:09 2022 +1000 7022 7023 Note that, for now, we need variadic macros. 7024 7025commit 217b518e0f7c52c4b909e935141a55344c61e644 7026Author: Darren Tucker <dtucker@dtucker.net> 7027Date: Fri May 6 14:39:34 2022 +1000 7028 7029 Add ubsan minimal testcase on OpenBSD. 7030 7031 As suggested by djm@. 7032 7033commit 457dce2cfef6a48f5442591cd8b21c7e8cba13f8 7034Author: djm@openbsd.org <djm@openbsd.org> 7035Date: Thu May 5 01:04:14 2022 +0000 7036 7037 upstream: sshkey_unshield_private() contains a exact duplicate of 7038 7039 the code in private2_check_padding(). Pull private2_check_padding() up so the 7040 code can be reused. From Martin Vahlensieck, ok deraadt@ 7041 7042 OpenBSD-Commit-ID: 876884c3f0e62e8fd8d1594bab06900f971c9c85 7043 7044commit 0e44db4d9cb313e68a59a44d27884af66c02356e 7045Author: djm@openbsd.org <djm@openbsd.org> 7046Date: Thu May 5 00:56:58 2022 +0000 7047 7048 upstream: channel_new no longer frees remote_name. So update the 7049 7050 comment accordingly. As remote_name is not modified, it can be const as 7051 well. From Martin Vahlensieck 7052 7053 OpenBSD-Commit-ID: e4e10dc8dc9f40c166ea5a8e991942bedc75a76a 7054 7055commit 37b62fd5caf19c85a48241535277cefff65adace 7056Author: djm@openbsd.org <djm@openbsd.org> 7057Date: Thu May 5 00:55:11 2022 +0000 7058 7059 upstream: mux.c: mark argument as const; from Martin Vahlensieck 7060 7061 OpenBSD-Commit-ID: 69a1a93a55986c7c2ad9f733c093b46a47184341 7062 7063commit f4e67c0ad259b4cf10177277a5827fa5545bac53 7064Author: markus@openbsd.org <markus@openbsd.org> 7065Date: Wed May 4 07:31:22 2022 +0000 7066 7067 upstream: make sure stdout is non-blocking; ok djm@ 7068 7069 OpenBSD-Commit-ID: 64940fffbd1b882eda2d7c8c7a43c79368309c0d 7070 7071commit e5c036d2092c00bef395e9161dc5ce42d4be9565 7072Author: florian@openbsd.org <florian@openbsd.org> 7073Date: Tue May 3 07:42:27 2022 +0000 7074 7075 upstream: Add FIDO AUTHENTICATOR section and explain a bit how FIDO 7076 7077 works. The wording came mostly from the 8.2 OpenSSH release notes, addapted 7078 to fit the man page. Then move the -O bits into the new section as is already 7079 done for CERTIFICATES and MODULI GENERATION. Finally we can explain the 7080 trade-offs of resident keys. While here, consistently refer to the FIDO 7081 thingies as "FIDO authenticators", not "FIDO tokens". 7082 7083 input & OK jmc, naddy 7084 7085 OpenBSD-Commit-ID: dd98748d7644df048f78dcf793b3b63db9ab1d25 7086 7087commit 575771bf79bef7127be6aaccddc46031ea15529e 7088Author: jmc@openbsd.org <jmc@openbsd.org> 7089Date: Mon May 2 05:40:37 2022 +0000 7090 7091 upstream: remove an obsolete rsa1 format example from an example; 7092 7093 from megan batty 7094 ok djm 7095 7096 OpenBSD-Commit-ID: db2c89879c29bf083df996bd830abfb1e70d62bf 7097 7098commit 0bc6b4c8f04e292577bdb44d5dc6b630d3448087 7099Author: djm@openbsd.org <djm@openbsd.org> 7100Date: Sun May 1 23:20:30 2022 +0000 7101 7102 upstream: fix some integer overflows in sieve_large() that show up when 7103 7104 trying to generate modp groups > 16k bits. Reported via GHPR#306 by Bertram 7105 Felgenhauer, but fixed in a different way. feedback/ok tb@ 7106 7107 OpenBSD-Commit-ID: 81cbc6dd3a21c57bd6fadea10e44afe37bca558e 7108 7109commit a45615cb172bc827e21ec76750de39dfb30ecc05 7110Author: djm@openbsd.org <djm@openbsd.org> 7111Date: Fri Apr 29 04:55:07 2022 +0000 7112 7113 upstream: be stricter in which characters will be accepted in 7114 7115 specifying a mask length; allow only 0-9. From khaleesicodes via GHPR#278; ok 7116 dtucker@ 7117 7118 OpenBSD-Commit-ID: e267746c047ea86665cdeccef795a8a56082eeb2 7119 7120commit 4835544d2dd31de6ffc7dba59f92093aea98155b 7121Author: Darren Tucker <dtucker@dtucker.net> 7122Date: Sat Apr 30 10:56:41 2022 +1000 7123 7124 Add Mac OS X 12 test target. 7125 7126commit 97a6a8b8c1f2da09712d0e72d0ef800e4edd34cd 7127Author: Darren Tucker <dtucker@dtucker.net> 7128Date: Fri Apr 29 18:27:34 2022 +1000 7129 7130 Only run tests when source files change. 7131 7132 Also run tests on changes to V_9_0 branch. 7133 7134commit 6d0392b9ff4b50a56ac5685d1b9392e2cd432ca3 7135Author: Darren Tucker <dtucker@dtucker.net> 7136Date: Fri Apr 29 18:22:34 2022 +1000 7137 7138 Remove now-empty int32_minmax.inc. 7139 7140commit af59463553b5ad52d3b42c4455ee3c5600158bb7 7141Author: djm@openbsd.org <djm@openbsd.org> 7142Date: Fri Apr 29 03:24:30 2022 +0000 7143 7144 upstream: mention that the helpers are used by ssh(1), ssh-agent(1) 7145 7146 and ssh-keygen(1). Previously only ssh(1) was mentioned. From Pedro 7147 Martelletto 7148 7149 OpenBSD-Commit-ID: 30f880f989d4b329589c1c404315685960a5f153 7150 7151commit 3e26b3a6eebcee27be177207cc0846fb844b7a56 7152Author: dtucker@openbsd.org <dtucker@openbsd.org> 7153Date: Fri Apr 29 03:16:48 2022 +0000 7154 7155 upstream: Don't leak SK device. Patch from Pedro Martelletto via 7156 7157 github PR#316. ok djm@ 7158 7159 OpenBSD-Commit-ID: 17d11327545022e727d95fd08b213171c5a4585d 7160 7161commit 247082b5013f0d4fcae8f97453f2a2f01bcda811 7162Author: djm@openbsd.org <djm@openbsd.org> 7163Date: Fri Apr 29 03:13:32 2022 +0000 7164 7165 upstream: fix memleak on session-bind path; from Pedro Martelletto, ok 7166 7167 dtucker@ 7168 7169 OpenBSD-Commit-ID: e85899a26ba402b4c0717b531317e8fc258f0a7e 7170 7171commit e05522008092ceb86a87bdd4ad7878424315db89 7172Author: djm@openbsd.org <djm@openbsd.org> 7173Date: Thu Apr 28 02:53:31 2022 +0000 7174 7175 upstream: avoid printing hash algorithm twice; from lucas AT sexy.is 7176 7177 OpenBSD-Commit-ID: 9d24671e10a84141b7c504396cabad600e47a941 7178 7179commit 0979e29356915261d69a9517a1e0aaade7c9fc75 7180Author: dtucker@openbsd.org <dtucker@openbsd.org> 7181Date: Wed Apr 27 11:08:55 2022 +0000 7182 7183 upstream: Add authfd path to debug output. ok markus@ 7184 7185 OpenBSD-Commit-ID: f735a17d1a6f2bee63bfc609d76ef8db8c090890 7186 7187commit 67b7c784769c74fd4d6b147d91e17e1ac1a8a96d 7188Author: dtucker@openbsd.org <dtucker@openbsd.org> 7189Date: Tue Apr 26 07:41:44 2022 +0000 7190 7191 upstream: Check sshauthopt_new() for NULL. bz#3425, from 7192 7193 tessgauthier at microsoft.com. ok djm@ 7194 7195 OpenBSD-Commit-ID: af0315bc3e44aa406daa7e0ae7c2d719a974483f 7196 7197commit d571314d14b919fbd7c84a61f9bf2065fc0a6841 7198Author: millert@openbsd.org <millert@openbsd.org> 7199Date: Wed Apr 20 16:00:25 2022 +0000 7200 7201 upstream: Remove unnecessary includes: openssl/hmac.h and 7202 7203 openssl/evp.h. From Martin Vahlensieck. 7204 7205 OpenBSD-Commit-ID: a6debb5fb0c8a44e43e8d5ca7cc70ad2f3ea31c3 7206 7207commit da8dddf8cc1f2516ff894b8183e83a7c5ba3ef80 7208Author: millert@openbsd.org <millert@openbsd.org> 7209Date: Wed Apr 20 15:59:18 2022 +0000 7210 7211 upstream: Add missing includes of stdlib.h and stdint.h. We need 7212 7213 stdlib.h for malloc(3) and stdint.h for SIZE_MAX. Unlike the other xmss 7214 files, ssh-xmss.c does not include xmss_commons.h so ssh-xmss.c must include 7215 those headers itself. From Martin Vahlensieck 7216 7217 OpenBSD-Commit-ID: 70e28a9818cee3da1be2ef6503d4b396dd421e6b 7218 7219commit fe9d87a6800a7a33be08f4d5ab662a758055ced2 7220Author: millert@openbsd.org <millert@openbsd.org> 7221Date: Wed Apr 20 15:56:49 2022 +0000 7222 7223 upstream: Avoid an unnecessary xstrdup in rm_env() when matching 7224 7225 patterns. Since match_pattern() doesn't modify its arguments (they are 7226 const), there is no need to make an extra copy of the strings in 7227 options->send_env. From Martin Vahlensieck 7228 7229 OpenBSD-Commit-ID: 2c9db31e3f4d3403b49642c64ee048b2a0a39351 7230 7231commit 7bf2eb958fbb551e7d61e75c176bb3200383285d 7232Author: Darren Tucker <dtucker@dtucker.net> 7233Date: Tue Apr 26 23:30:59 2022 +1000 7234 7235 Add debian-riscv64 test target. 7236 7237commit 3913c935523902482974c4c503bcff20bd850a6a 7238Author: Darren Tucker <dtucker@dtucker.net> 7239Date: Mon Apr 25 17:20:06 2022 +1000 7240 7241 Update OpenSSL and LibreSSL versions in tests. 7242 7243commit dcd8dca29bcdb193ff6be35b96fc55e6e30d37d9 7244Author: Darren Tucker <dtucker@dtucker.net> 7245Date: Sat Apr 23 20:40:28 2022 +1000 7246 7247 Include stdlib.h for free() prototype. 7248 7249 ... which is used inside the CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG block. 7250 7251commit 4cc05de568e1c3edd7834ff3bd9d8214eb34861b 7252Author: Darren Tucker <dtucker@dtucker.net> 7253Date: Sat Apr 23 20:17:26 2022 +1000 7254 7255 Cache timezone data in capsicum sandbox. 7256 7257 From emaste at freebsd.org, originally part of FreeBSD commit r339216 7258 / fc3c19a9 with autoconf bits added by me. 7259 7260commit c31404426d212e2964ff9e5e58e1d0fce3d83f27 7261Author: dtucker@openbsd.org <dtucker@openbsd.org> 7262Date: Thu Apr 21 01:36:46 2022 +0000 7263 7264 upstream: It looks like we can't completely avoid 7265 7266 waiting for processes to exit so retrieve the pid via controlmaster and 7267 use that. 7268 7269 OpenBSD-Regress-ID: 8246f00f22b14e49d2ff1744c94897ead33d457b 7270 7271commit d19b21afab5c8e2f3df6bd8aee9766bdad3d8c58 7272Author: dtucker@openbsd.org <dtucker@openbsd.org> 7273Date: Wed Apr 20 13:25:55 2022 +0000 7274 7275 upstream: Use ssh -f and ControlPersist .. 7276 7277 to start up test forwards and ssh -O stop to shut them down intead of 7278 sleep loops. This speeds up the test by an order of magnitude. 7279 7280 OpenBSD-Regress-ID: eb3db5f805100919b092a3b2579c611fba3e83e7 7281 7282commit 5f76286a126721fa005de6edf3d1c7a265555f19 7283Author: dtucker@openbsd.org <dtucker@openbsd.org> 7284Date: Wed Apr 20 05:24:13 2022 +0000 7285 7286 upstream: Simplify forward-control test. 7287 7288 Since we no longer need to support SSH1 we don't need to run shell 7289 commands on the other end of the connection and can use ssh -N instead. 7290 This also makes the test less racy. 7291 7292 OpenBSD-Regress-ID: 32e94ce272820cc398f30b848b2b0f080d10302c 7293 7294commit 687bbf23572d8bdf25cbbcdf8ac583514e1ba710 7295Author: djm@openbsd.org <djm@openbsd.org> 7296Date: Thu Mar 31 03:07:33 2022 +0000 7297 7298 upstream: regression test for sftp cp command 7299 7300 OpenBSD-Regress-ID: c96bea9edde3a384b254785e7f9b2b24a81cdf82 7301 7302commit f1233f19a6a9fe58f52946f50df4772f5b136761 7303Author: dtucker@openbsd.org <dtucker@openbsd.org> 7304Date: Wed Apr 20 01:13:47 2022 +0000 7305 7306 upstream: Import regenerated moduli 7307 7308 OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0 7309 7310commit fec014785de198b9a325d1b94e324bb958c5fe7b 7311Author: djm@openbsd.org <djm@openbsd.org> 7312Date: Wed Apr 20 04:19:11 2022 +0000 7313 7314 upstream: Try to continue running local I/O for channels in state 7315 7316 OPEN during SSH transport rekeying. The most visible benefit is that it 7317 should make ~-escapes work in the client (e.g. to exit) if the connection 7318 happened to have stalled during a rekey event. Based work by and ok dtucker@ 7319 7320 OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45 7321 7322commit e68154b0d4f0f5085a050ea896955da1b1be6e30 7323Author: dtucker@openbsd.org <dtucker@openbsd.org> 7324Date: Wed Apr 20 01:13:47 2022 +0000 7325 7326 upstream: Import regenerated moduli 7327 7328 OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0 7329 7330commit 69928b106d8f0fa15b88cf3850d992ed81c44ae0 7331Author: tj@openbsd.org <tj@openbsd.org> 7332Date: Sat Apr 16 00:22:31 2022 +0000 7333 7334 upstream: list the correct version number 7335 7336 for when usage of the sftp protocol became default and fix a typo 7337 from ed maste 7338 7339 OpenBSD-Commit-ID: 24e1795ed2283fdeacf16413c2f07503bcdebb31 7340 7341commit 21042a05c0b304c16f655efeec97438249d2e2cc 7342Author: dtucker@openbsd.org <dtucker@openbsd.org> 7343Date: Tue Apr 12 05:09:49 2022 +0000 7344 7345 upstream: Correct path for system known hosts file in description 7346 7347 of IgnoreUserKnownHosts. Patch from Martin Vahlensieck via tech@ 7348 7349 OpenBSD-Commit-ID: 9b7784f054fa5aa4d63cb36bd563889477127215 7350 7351commit 53f4aff60a7c1a08a23917bd47496f8901c471f5 7352Author: Darren Tucker <dtucker@dtucker.net> 7353Date: Sat Apr 16 14:33:20 2022 +1000 7354 7355 Resync moduli.5 with upstream. 7356 7357 1.18: remove duplicate publication year; carsten dot kunze at arcor dot de 7358 1.19: ssh-keygen's -G/-T have been replaced with -M generate/screen. 7359 7360commit d2b888762b9844eb0d8eb59909cdf5af5159f810 7361Author: Darren Tucker <dtucker@dtucker.net> 7362Date: Sat Apr 16 14:31:13 2022 +1000 7363 7364 Retire fbsd6 test VM. 7365 7366 It's long since out of support, relatively slow (it's i686) and the 7367 compiler has trouble with PIE. 7368 7369commit cd1f70009860a154b51230d367c55ea5f9a4504e 7370Author: djm@openbsd.org <djm@openbsd.org> 7371Date: Mon Apr 11 22:52:08 2022 +0000 7372 7373 upstream: clear io_want/io_ready flags at start of poll() cycle; 7374 7375 avoids plausible spin during rekeying if channel io_want flags are reused 7376 across cycles. ok markus@ deraadt@ 7377 7378 OpenBSD-Commit-ID: 91034f855b7c73cd2591657c49ac30f10322b967 7379 7380commit aa1920302778273f7f94c2091319aba199068ca0 7381Author: dtucker@openbsd.org <dtucker@openbsd.org> 7382Date: Fri Apr 8 05:43:39 2022 +0000 7383 7384 upstream: Note that curve25519-sha256 was later published in 7385 7386 RFC8731. ok djm@ 7387 7388 OpenBSD-Commit-ID: 2ac2b5d642d4cf5918eaec8653cad9a4460b2743 7389 7390commit 4673fa8f2be983f2f88d5afd754adb1a2a39ec9e 7391Author: djm@openbsd.org <djm@openbsd.org> 7392Date: Fri Apr 8 04:40:40 2022 +0000 7393 7394 upstream: two defensive changes from Tobias Stoeckmann via GHPR287 7395 7396 enforce stricter invarient for sshbuf_set_parent() - never allow 7397 a buffer to have a previously-set parent changed. 7398 7399 In sshbuf_reset(), if the reallocation fails, then zero the entire 7400 buffer and not the (potentially smaller) default initial alloc size. 7401 7402 OpenBSD-Commit-ID: 14583203aa5d50ad38d2e209ae10abaf8955e6a9 7403 7404commit 26eef015e2d2254375e13afaaf753b78932b1bf5 7405Author: Damien Miller <djm@mindrot.org> 7406Date: Mon Apr 11 16:07:09 2022 +1000 7407 7408 Revert "update build-aux files to match autoconf-2.71" 7409 7410 This reverts commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2. 7411 7412 It turns out that the checked-in copies of these files are actually newer 7413 than autoconf-2.71's copies, so this was effectively a downgrade. 7414 Spotted by Bo Anderson via github 7415 7416commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2 7417Author: Damien Miller <djm@mindrot.org> 7418Date: Fri Apr 8 14:48:58 2022 +1000 7419 7420 update build-aux files to match autoconf-2.71 7421 7422 i.e. config.guess, config.sub and install-sh 7423 7424commit 94eb6858efecc1b4f02d8a6bd35e149f55c814c8 7425Author: Damien Miller <djm@mindrot.org> 7426Date: Wed Apr 6 10:47:48 2022 +1000 7427 7428 update version numbers for release 7429 7430commit 8e4a8eadf4fe74e65e6492f34250f8cf7d67e8da 7431Author: djm@openbsd.org <djm@openbsd.org> 7432Date: Mon Apr 4 22:45:25 2022 +0000 7433 7434 upstream: openssh-9.0 7435 7436 OpenBSD-Commit-ID: 0dfb461188f4513ec024c1534da8c1ce14c20b64 7437 7438commit a9f23ea2e3227f406880c2634d066f6f50fa5eaa 7439Author: naddy@openbsd.org <naddy@openbsd.org> 7440Date: Thu Mar 31 17:58:44 2022 +0000 7441 7442 upstream: ssh: document sntrup761x25519-sha512@openssh.com as 7443 7444 default KEX 7445 7446 OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171 7447 7448commit 9ec2713d122af79d66ebb9c1d6d9ae8621a8945f 7449Author: naddy@openbsd.org <naddy@openbsd.org> 7450Date: Thu Mar 31 17:27:27 2022 +0000 7451 7452 upstream: man pages: add missing commas between subordinate and 7453 7454 main clauses 7455 7456 jmc@ dislikes a comma before "then" in a conditional, so leave those 7457 untouched. 7458 7459 ok jmc@ 7460 7461 OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3 7462 7463commit 3741df98ffaaff92b474ee70d8ef276b5882f85a 7464Author: Darren Tucker <dtucker@dtucker.net> 7465Date: Mon Apr 4 23:52:11 2022 +1000 7466 7467 Disable security key on fbsd6 test host. 7468 7469commit 32c12236f27ae83bfe6d2983b67c9bc67a83a417 7470Author: Darren Tucker <dtucker@dtucker.net> 7471Date: Mon Apr 4 15:16:51 2022 +1000 7472 7473 Specify TEST_SHELL=bash on AIX. 7474 7475 The system shells cause the agent-restrict test to fail due to some 7476 quoting so explicitly specify bash until we can get configure to 7477 autmatically work around that. 7478 7479commit 90452c8b69d065b7c7c285ff78b81418a75bcd76 7480Author: Darren Tucker <dtucker@dtucker.net> 7481Date: Fri Apr 1 23:38:44 2022 +1100 7482 7483 Only return events from ppoll that were requested. 7484 7485 If the underlying system's select() returns bits that were not in the 7486 request set, our ppoll() implementation can return revents for events 7487 not requested, which can apparently cause a hang. Only return revents 7488 for activity in the requested event set. bz#3416, analysis and fix by 7489 yaroslav.kuzmin at vmssoftware com, ok djm@ 7490 7491commit 6c49eb5fabc56f4865164ed818aa5112d09c31a8 7492Author: Darren Tucker <dtucker@dtucker.net> 7493Date: Fri Apr 1 23:21:40 2022 +1100 7494 7495 Only run regression tests on slow VMs. 7496 7497commit f67e47903977b42cb6abcd5565a61bd7293e4dc3 7498Author: Darren Tucker <dtucker@dtucker.net> 7499Date: Fri Apr 1 23:21:06 2022 +1100 7500 7501 Increase test timeout to allow slow VMs to finish 7502 7503commit 02488c1b54065ddc4f25835dbd2618b2a2fe21f5 7504Author: Darren Tucker <dtucker@dtucker.net> 7505Date: Fri Apr 1 16:27:38 2022 +1100 7506 7507 Use bash or ksh if available for SH in Makefile. 7508 7509commit 34c7018c316af4773e432066de28d0ef9d0888cd 7510Author: Darren Tucker <dtucker@dtucker.net> 7511Date: Fri Apr 1 14:56:54 2022 +1100 7512 7513 Set Makefile SHELL as determined by configure. 7514 7515 This should improve compatibility for users with non-POSIX shells. If 7516 using Makefile.in directly (eg make -f Makefile.in distprep) then SHELL 7517 will need to be specified on the command line (along with MANFMT in that 7518 particular case). ok djm@ 7519 7520commit 5b054d76402faab38c48377efd112426469553a0 7521Author: Darren Tucker <dtucker@dtucker.net> 7522Date: Fri Apr 1 13:16:47 2022 +1100 7523 7524 Skip slow tests on (very) slow test targets. 7525 7526commit b275818065b31a865142c48c2acf6a7c1655c542 7527Author: Damien Miller <djm@mindrot.org> 7528Date: Thu Mar 31 14:11:36 2022 +1100 7529 7530 depend 7531 7532commit 3fa539c3ffaabd6211995512d33e29150f88c5c5 7533Author: djm@openbsd.org <djm@openbsd.org> 7534Date: Thu Mar 31 03:07:03 2022 +0000 7535 7536 upstream: add a sftp client "cp" command that supports server-side 7537 7538 copying of files. Useful for this task and for testing the copy-data 7539 extension. Patch from Mike Frysinger; ok dtucker@ 7540 7541 OpenBSD-Commit-ID: 1bb1b950af0d49f0d5425b1f267e197aa1b57444 7542 7543commit 7988bfc4b701c4b3fe9b36c8561a3d1c5d4c9a74 7544Author: djm@openbsd.org <djm@openbsd.org> 7545Date: Thu Mar 31 03:05:49 2022 +0000 7546 7547 upstream: add support for the "corp-data" protocol extension to 7548 7549 allow server-side copies to be performed without having to go via the client. 7550 Patch by Mike Frysinger, ok dtucker@ 7551 7552 OpenBSD-Commit-ID: 00aa510940fedd66dab1843b58682de4eb7156d5 7553 7554commit 32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba 7555Author: djm@openbsd.org <djm@openbsd.org> 7556Date: Wed Mar 30 21:13:23 2022 +0000 7557 7558 upstream: select post-quantum KEX 7559 7560 sntrup761x25519-sha512@openssh.com as the default; ok markus@ 7561 7562 OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9 7563 7564commit d6556de1db0822c76ba2745cf5c097d9472adf7c 7565Author: djm@openbsd.org <djm@openbsd.org> 7566Date: Wed Mar 30 21:10:25 2022 +0000 7567 7568 upstream: fix poll() spin when a channel's output fd closes without 7569 7570 data in the channel buffer. Introduce more exact packing of channel fds into 7571 the pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@ 7572 7573 OpenBSD-Commit-ID: 06740737849c9047785622ad5d472cb6a3907d10 7574 7575commit 8a74a96d25ca4d32fbf298f6c0ac5a148501777d 7576Author: djm@openbsd.org <djm@openbsd.org> 7577Date: Wed Mar 30 04:33:09 2022 +0000 7578 7579 upstream: ssh is almost out of getopt() characters; note the 7580 7581 remaining remaining available ones in a comment 7582 7583 OpenBSD-Commit-ID: 48d38cef59d6bc8e84c6c066f6d601875d3253fd 7584 7585commit 6d4fc51adb9d8a42f67b5474f02f877422379de6 7586Author: djm@openbsd.org <djm@openbsd.org> 7587Date: Wed Mar 30 04:27:51 2022 +0000 7588 7589 upstream: avoid NULL deref via ssh-keygen -Y find-principals. 7590 7591 bz3409, reported by Mateusz Adamowski 7592 7593 OpenBSD-Commit-ID: a3b2c02438052ee858e0ee18e5a288586b5df2c5 7594 7595commit e937514920335b92b543fd9be79cd6481d1eb0b6 7596Author: Darren Tucker <dtucker@dtucker.net> 7597Date: Mon Mar 28 17:51:03 2022 +1100 7598 7599 Add AIX 5.1 test target. 7600 7601commit 4bbe815ba974b4fd89cc3fc3e3ef1be847a0befe 7602Author: Darren Tucker <dtucker@dtucker.net> 7603Date: Sat Mar 26 22:01:31 2022 +1100 7604 7605 Drop leading "v" from release version identifier. 7606 7607 It's present in the git tags but not in the release tarball names. 7608 Also drop extra "/" from URL path. 7609 7610commit f5cdd3b3c275dffaebfca91df782dca29975e9ac 7611Author: Darren Tucker <dtucker@dtucker.net> 7612Date: Sat Mar 26 16:28:04 2022 +1100 7613 7614 Use tarballs when testing LibreSSL releases. 7615 7616 This means they'll still work when the combination of -portable and 7617 openbsd github repos no longer match. 7618 7619commit 24dc37d198f35a7cf71bf4d5384363c7ef4209d4 7620Author: Darren Tucker <dtucker@dtucker.net> 7621Date: Sat Mar 26 15:02:45 2022 +1100 7622 7623 Remove now-unused passwd variable. 7624 7625commit 5b467ceef2c356f0a77f5e8ab4eb0fac367e4d24 7626Author: Darren Tucker <dtucker@dtucker.net> 7627Date: Sat Mar 26 13:15:44 2022 +1100 7628 7629 Missing semicolon. 7630 7631commit 2923d026e55998133c0f6e5186dca2a3c0fa5ff5 7632Author: Darren Tucker <dtucker@dtucker.net> 7633Date: Sat Mar 26 12:49:50 2022 +1100 7634 7635 Factor out platform-specific locked account check. 7636 7637 Also fixes an incorrect free on platforms with both libiaf and shadow 7638 passwords (probably only Unixware). Prompted by github PR#284, 7639 originally from @c3h2_ctf and stoeckmann@. 7640 7641commit d23efe4b12886ffe416be10bc0a7da6ca8aa72d1 7642Author: Darren Tucker <dtucker@dtucker.net> 7643Date: Sat Mar 26 08:13:46 2022 +1100 7644 7645 Add OpenWRT mips and mipsel test targets. 7646 7647commit 16ea8b85838dd7a4dbeba4e51ac4f43fd68b1e5b 7648Author: djm@openbsd.org <djm@openbsd.org> 7649Date: Sun Mar 20 08:52:17 2022 +0000 7650 7651 upstream: don't leak argument list; bz3404, reported by Balu 7652 7653 Gajjala ok dtucker@ 7654 7655 OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6 7656 7657commit a72bde294fe0518c9a44ba63864093a1ef2425e3 7658Author: djm@openbsd.org <djm@openbsd.org> 7659Date: Sun Mar 20 08:51:21 2022 +0000 7660 7661 upstream: make addargs() and replacearg() a little more robust and 7662 7663 improve error reporting 7664 7665 make freeargs(NULL) a noop like the other free functions 7666 7667 ok dtucker as part of bz3403 7668 7669 OpenBSD-Commit-ID: 15f86da83176978b4d1d288caa24c766dfa2983d 7670 7671commit 731087d2619fa7f01e675b23f57af10d745e8af2 7672Author: djm@openbsd.org <djm@openbsd.org> 7673Date: Fri Mar 18 04:04:11 2022 +0000 7674 7675 upstream: don't try to resolve ListenAddress directives in the sshd 7676 7677 re-exec path - we're never going to use the result and if the operation fails 7678 then it can prevent connections from being accepted. Reported by Aaron 7679 Poffenberger; with / ok dtucker@ 7680 7681 OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60 7682 7683commit 1c83c082128694ddd11ac05fdf31d70312ff1763 7684Author: djm@openbsd.org <djm@openbsd.org> 7685Date: Fri Mar 18 02:50:21 2022 +0000 7686 7687 upstream: remove blank line 7688 7689 OpenBSD-Commit-ID: d5e0182965b2fbfb03ad5f256d1a1ce5706bcddf 7690 7691commit 807be68684da7a1fe969c399ddce2fafb7997dcb 7692Author: djm@openbsd.org <djm@openbsd.org> 7693Date: Fri Mar 18 02:32:22 2022 +0000 7694 7695 upstream: helpful comment 7696 7697 OpenBSD-Commit-ID: e3315a45cb04e7feeb614d76ec80a9fe4ca0e8c7 7698 7699commit a0b5816f8f1f645acdf74f7bc11b34455ec30bac 7700Author: djm@openbsd.org <djm@openbsd.org> 7701Date: Fri Mar 18 02:31:25 2022 +0000 7702 7703 upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV 7704 7705 will ensue. Patch from Mateusz Adamowski via GHPR#307 7706 7707 OpenBSD-Commit-ID: 99e8ec38f9feb38bce6de240335be34aedeba5fd 7708 7709commit 5a252d54a63be30d5ba4be76210942d754a531c0 7710Author: djm@openbsd.org <djm@openbsd.org> 7711Date: Tue Mar 15 05:27:37 2022 +0000 7712 7713 upstream: improve DEBUG_CHANNEL_POLL debugging message 7714 7715 OpenBSD-Commit-ID: 2275eb7bc4707d019b1a0194b9c92c0b78da848f 7716 7717commit ce324cf58ba2840e31afeb996935800780c8fa4b 7718Author: cheloha@openbsd.org <cheloha@openbsd.org> 7719Date: Sun Mar 13 23:27:54 2022 +0000 7720 7721 upstream: ssh: xstrdup(): use memcpy(3) 7722 7723 Copying the given string into the buffer with strlcpy(3) confers no 7724 benefit in this context because we have already determined the 7725 string's length with strlen(3) in order to allocate that buffer. 7726 7727 Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2 7728 7729 ok dtucker@ millert@ 7730 7731 OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a 7732 7733commit 2893c5e764557f48f9d6a929e224ed49c59545db 7734Author: Darren Tucker <dtucker@dtucker.net> 7735Date: Fri Mar 11 18:43:58 2022 +1100 7736 7737 Resync fmt_scaled. with OpenBSD. 7738 7739 Fixes underflow reported in bz#3401. 7740 7741commit 5ae31a0fdd27855af29f48ff027491629fff5979 7742Author: Darren Tucker <dtucker@dtucker.net> 7743Date: Wed Mar 9 09:41:56 2022 +1100 7744 7745 Provide killpg implementation. 7746 7747 Based on github PR#301 for Tandem NonStop. 7748 7749commit c41c84b439f4cd74d4fe44298a4b4037ddd7d2ae 7750Author: Darren Tucker <dtucker@dtucker.net> 7751Date: Wed Mar 9 09:29:30 2022 +1100 7752 7753 Check for missing ftruncate prototype. 7754 7755 From github PR#301 in conjunction with rsbeckerca. 7756 7757commit 8cf5275452a950869cb90eeac7d220b01f77b12e 7758Author: Darren Tucker <dtucker@dtucker.net> 7759Date: Tue Mar 8 20:04:06 2022 +1100 7760 7761 Default to not using sandbox when cross compiling. 7762 7763 On most systems poll(2) does not work when the number of FDs is reduced 7764 with setrlimit, so assume it doesn't when cross compiling and we can't 7765 run the test. bz#3398. 7766 7767commit 379b30120da53d7c84aa8299c26b18c51c2a0dac 7768Author: djm@openbsd.org <djm@openbsd.org> 7769Date: Tue Mar 1 01:59:19 2022 +0000 7770 7771 upstream: pack pollfd array before server_accept_loop() ppoll() 7772 7773 call, and terminate sshd if ppoll() returns errno==EINVAL 7774 7775 avoids spin in ppoll when MaxStartups > RLIMIT_NOFILE, reported by 7776 Daniel Micay 7777 7778 feedback/ok deraadt 7779 7780 OpenBSD-Commit-ID: dbab1c24993ac977ec24d83283b8b7528f7c2c15 7781 7782commit eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd 7783Author: naddy@openbsd.org <naddy@openbsd.org> 7784Date: Sun Feb 27 01:33:59 2022 +0000 7785 7786 upstream: include rejected signature algorithm in error message and 7787 7788 not the (useless) key type; ok djm@ 7789 7790 OpenBSD-Commit-ID: d0c0f552a4d9161203e07e95d58a76eb602a76ff 7791 7792commit f2f3269423618a83157e18902385e720f9776007 7793Author: dtucker@openbsd.org <dtucker@openbsd.org> 7794Date: Fri Feb 25 09:46:24 2022 +0000 7795 7796 upstream: Remove the char * casts from arguments to do_lstat, 7797 7798 do_readdir and do_stat paths since the underlying functions now take a const 7799 char *. Patch from vapier at gentoo.org. 7800 7801 OpenBSD-Commit-ID: 9e4d964dbfb0ed683a2a2900711b88e7f1c0297b 7802 7803commit 4a66dac052c5ff5047161853f36904607649e4f9 7804Author: djm@openbsd.org <djm@openbsd.org> 7805Date: Fri Feb 25 02:09:27 2022 +0000 7806 7807 upstream: save an unneccessary alloc/free, based on patch from 7808 7809 Martin Vahlensieck; ok dtucker@ 7810 7811 OpenBSD-Commit-ID: 90ffbf1f837e509742f2c31a1fbf2c0fd376fd5f 7812 7813commit 6f117cb151efe138ac57bdd8e26165f350328f5f 7814Author: Darren Tucker <dtucker@dtucker.net> 7815Date: Tue Mar 1 09:02:06 2022 +1100 7816 7817 Remove unused ivbits argument from chacha_keysetup 7818 7819commit 15974235dd528aeab0ec67fb92a0a1d733f62be2 7820Author: Darren Tucker <dtucker@dtucker.net> 7821Date: Tue Mar 1 09:00:20 2022 +1100 7822 7823 Add OPENBSD ORIGINAL marker. 7824 7825commit f2ff669347d320532e7c1b63cdf5c62f46e73150 7826Author: Darren Tucker <dtucker@dtucker.net> 7827Date: Mon Feb 28 22:21:36 2022 +1100 7828 7829 No unused param warnings for clang-12 and gcc-11. 7830 7831 These have too many false positives in -Werror tests on the github CI 7832 since we often provide empty stub functions for functionality not needed 7833 for particular configurations. 7834 7835commit 96558ecd87adac62efa9a2b5479f686ab86b0be1 7836Author: Darren Tucker <dtucker@dtucker.net> 7837Date: Sat Feb 26 14:10:41 2022 +1100 7838 7839 Add debian-i386 test target. 7840 7841commit 284b6e5394652d519e31782e3b3cdfd7b21d1a81 7842Author: Darren Tucker <dtucker@dtucker.net> 7843Date: Sat Feb 26 14:06:14 2022 +1100 7844 7845 Allow ppoll_time64 in seccomp sandbox. 7846 7847 Should fix sandbox violations on (some? at least i386 and armhf) 32bit 7848 Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at 7849 debian.org via bz#3396. 7850 7851commit 0132056efabc5edb85c3c7105d2fb6dee41843c6 7852Author: Darren Tucker <dtucker@dtucker.net> 7853Date: Fri Feb 25 19:47:48 2022 +1100 7854 7855 Improve handling of _getshort and _getlong. 7856 7857 If the system native ones are exactly as required then use them, 7858 otherwise use the local versions mapped to another name to prevent 7859 name collisions. 7860 7861commit 8e206e0dd6b9f757b07979e48f53ad5bf9b7b52b 7862Author: Darren Tucker <dtucker@dtucker.net> 7863Date: Fri Feb 25 15:14:22 2022 +1100 7864 7865 Constify utimes in compat library to match specs. 7866 7867 Patch from vapier at chromium.org. 7868 7869commit 1b2920e3b63db2eddebeec7330ffe8b723055573 7870Author: Darren Tucker <dtucker@dtucker.net> 7871Date: Fri Feb 25 13:50:56 2022 +1100 7872 7873 ANSIfy getshort and getlong. 7874 7875 These functions appear to have come from OpenBSD's lib/libc/net/res_comp.c 7876 which made this change in 2005. 7877 7878commit 54a86f4f6e1c43a2ca2be23ef799ab8910d4af70 7879Author: Darren Tucker <dtucker@dtucker.net> 7880Date: Fri Feb 25 13:23:04 2022 +1100 7881 7882 Use PICFLAG instead of hard coding -fPIC. 7883 7884commit 3016ba47035ac3561aabd48e2be70167fe157d6a 7885Author: Darren Tucker <dtucker@dtucker.net> 7886Date: Fri Feb 25 11:37:11 2022 +1100 7887 7888 Add tests for latest releases of {Libre,Open}SSL. 7889 7890commit f107467179428a0e3ea9e4aa9738ac12ff02822d 7891Author: Colin Watson <cjwatson@debian.org> 7892Date: Thu Feb 24 16:04:18 2022 +0000 7893 7894 Improve detection of -fzero-call-used-regs=all support 7895 7896 GCC doesn't tell us whether this option is supported unless it runs into 7897 the situation where it would need to emit corresponding code. 7898 7899commit 3383b2cac0e9275bc93c4b4760e6e048f537e1d6 7900Author: djm@openbsd.org <djm@openbsd.org> 7901Date: Wed Feb 23 21:21:49 2022 +0000 7902 7903 upstream: free(3) wants stdlib.h 7904 7905 OpenBSD-Commit-ID: 227a8c70a95b4428c49e46863c9ef4bd318a3b8a 7906 7907commit a4537e79ab4ac6db4493c5158744b9ebde5efcb0 7908Author: djm@openbsd.org <djm@openbsd.org> 7909Date: Wed Feb 23 21:21:16 2022 +0000 7910 7911 upstream: put back the scp manpage changes for SFTP mode too 7912 7913 OpenBSD-Commit-ID: 05dc53921f927e1b5e5694e1f3aa314549f2e768 7914 7915commit 449bcb8403adfb9724805d02a51aea76046de185 7916Author: deraadt@openbsd.org <deraadt@openbsd.org> 7917Date: Wed Feb 23 19:01:00 2022 +0000 7918 7919 upstream: and we go back to testing sftp-scp after the 8.9 7920 7921 release... 7922 7923 OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c 7924 7925commit 166456cedad3962b83b848b1e9caf80794831f0f 7926Author: Damien Miller <djm@mindrot.org> 7927Date: Wed Feb 23 22:31:11 2022 +1100 7928 7929 makedepend 7930 7931commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4 7932Author: djm@openbsd.org <djm@openbsd.org> 7933Date: Wed Feb 23 11:18:13 2022 +0000 7934 7935 upstream: avoid integer overflow of auth attempts (harmless, caught 7936 7937 by monitor) 7938 7939 OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86 7940 7941commit 6e0258c64c901753df695e06498b26f9f4812ea6 7942Author: djm@openbsd.org <djm@openbsd.org> 7943Date: Wed Feb 23 11:17:10 2022 +0000 7944 7945 upstream: randomise the password used in fakepw 7946 7947 OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947 7948 7949commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9 7950Author: djm@openbsd.org <djm@openbsd.org> 7951Date: Wed Feb 23 11:15:57 2022 +0000 7952 7953 upstream: use asprintf to construct .rhosts paths 7954 7955 OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b 7956 7957commit c07e154fbdc7285e9ec54e78d8a31f7325d43537 7958Author: djm@openbsd.org <djm@openbsd.org> 7959Date: Wed Feb 23 11:07:09 2022 +0000 7960 7961 upstream: openssh-8.9 7962 7963 OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e 7964 7965commit bc16667b4a1c3cad7029304853c143a32ae04bd4 7966Author: Darren Tucker <dtucker@dtucker.net> 7967Date: Tue Feb 22 15:29:22 2022 +1100 7968 7969 Extend select+rlimit sanbox test to include poll. 7970 7971 POSIX specifies that poll() shall fail if "nfds argument is greater 7972 than {OPEN_MAX}". The setrlimit sandbox sets this to effectively zero 7973 so this causes poll() to fail in the preauth privsep process. 7974 7975 This is likely the underlying cause for the previously observed similar 7976 behaviour of select() on plaforms where it is implement in userspace on 7977 top of poll(). 7978 7979commit 6520c488de95366be031d49287ed243620399e23 7980Author: Darren Tucker <dtucker@dtucker.net> 7981Date: Tue Feb 22 13:08:59 2022 +1100 7982 7983 Add Alpine Linux test VM. 7984 7985commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb 7986Author: Darren Tucker <dtucker@dtucker.net> 7987Date: Tue Feb 22 12:27:07 2022 +1100 7988 7989 Include sys/param.h if present. 7990 7991 Needed for howmany() on MUSL systems such as Alpine. 7992 7993commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c 7994Author: Darren Tucker <dtucker@dtucker.net> 7995Date: Tue Feb 22 12:25:52 2022 +1100 7996 7997 Only include sys/poll.h if we don't have poll.h. 7998 7999 Prevents warnings on MUSL based systems such as Alpine. 8000 8001commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5 8002Author: Damien Miller <djm@mindrot.org> 8003Date: Tue Feb 22 11:14:51 2022 +1100 8004 8005 disable agent-restrict test on minix3 8006 8007 Minix seems to have a platform-wide limit on the number of 8008 select(2) syscalls that can be concurrently issued. This test 8009 seems to exceed this limit. 8010 8011 Refer to: 8012 8013 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114 8014 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31 8015 8016commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a 8017Author: Darren Tucker <dtucker@dtucker.net> 8018Date: Mon Feb 21 21:27:20 2022 +1100 8019 8020 Skip agent-getpeereid when running as root. 8021 8022commit fbd772570a25436a33924d91c164d2b24021f010 8023Author: dtucker@openbsd.org <dtucker@openbsd.org> 8024Date: Sun Feb 20 03:47:26 2022 +0000 8025 8026 upstream: Aproximate realpath on the expected output by deduping 8027 8028 leading slashes. Fixes test failure when user's home dir is / which is 8029 possible in some portable configurations. 8030 8031 OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63 8032 8033commit 336685d223a59f893faeedf0a562e053fd84058e 8034Author: Darren Tucker <dtucker@dtucker.net> 8035Date: Sun Feb 20 13:30:52 2022 +1100 8036 8037 Really move DSA to end of list. 8038 8039 In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to 8040 the end of the list instead of DSA. Spotted by andrew at fyfe.gb.net. 8041 8042commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3 8043Author: Darren Tucker <dtucker@dtucker.net> 8044Date: Fri Feb 18 12:12:21 2022 +1100 8045 8046 Add test configs for MUSL C library. 8047 8048commit f7fc6a43f1173e8b2c38770bf6cee485a562d03b 8049Author: Damien Miller <djm@mindrot.org> 8050Date: Thu Feb 17 22:54:19 2022 +1100 8051 8052 minix needs BROKEN_POLL too; chokes on /dev/null 8053 8054commit 667fec5d4fe4406745750a32f69b5d2e1a75e94b 8055Author: djm@openbsd.org <djm@openbsd.org> 8056Date: Thu Feb 17 10:58:27 2022 +0000 8057 8058 upstream: check for EINTR/EAGAIN failures in the rfd fast-path; caught 8059 8060 by dtucker's minix3 vm :) ok dtucker@ 8061 8062 OpenBSD-Commit-ID: 2e2c895a3e82ef347aa6694394a76a438be91361 8063 8064commit 41417dbda9fb55a0af49a8236e3ef9d50d862644 8065Author: Darren Tucker <dtucker@dtucker.net> 8066Date: Thu Feb 17 22:05:29 2022 +1100 8067 8068 Comment hurd test, the VM is currently broken. 8069 8070commit b2aee35a1f0dc798339b3fcf96136da71b7e3f6d 8071Author: Damien Miller <djm@mindrot.org> 8072Date: Thu Feb 17 21:15:16 2022 +1100 8073 8074 find sk-dummy.so when build_dir != src_dir 8075 8076 spotted by Corinna Vinschen; feedback & ok dtucker@ 8077 8078commit 62a2d4e50b2e89f2ef04576931895d5139a5d037 8079Author: Damien Miller <djm@mindrot.org> 8080Date: Wed Feb 16 16:26:17 2022 +1100 8081 8082 update versions in preparation for 8.9 release 8083 8084commit dd6d3dded721ac653ea73c017325e5bfeeec837f 8085Author: djm@openbsd.org <djm@openbsd.org> 8086Date: Tue Feb 15 05:13:36 2022 +0000 8087 8088 upstream: document the unbound/host-bound options to 8089 8090 PubkeyAuthentication; spotted by HARUYAMA Seigo 8091 8092 OpenBSD-Commit-ID: 298f681b66a9ecd498f0700082c7a6c46e948981 8093 8094commit df93529dd727fdf2fb290700cd4f1adb0c3c084b 8095Author: Darren Tucker <dtucker@dtucker.net> 8096Date: Mon Feb 14 14:19:40 2022 +1100 8097 8098 Test if sshd accidentally acquires controlling tty 8099 8100 When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour 8101 in the STREAMS code before activating the workaround. ok djm@ 8102 8103commit 766176cfdbfd7ec38bb6118dde6e4daa0df34888 8104Author: Darren Tucker <dtucker@dtucker.net> 8105Date: Sat Feb 12 10:24:56 2022 +1100 8106 8107 Add cygwin-release test config. 8108 8109 This tests the flags used to build the cygwin release binaries. 8110 8111commit b30698662b862f5397116d23688aac0764e0886e 8112Author: Darren Tucker <dtucker@dtucker.net> 8113Date: Fri Feb 11 21:00:35 2022 +1100 8114 8115 Move SSHD_ACQUIRES_CTTY workaround into compat. 8116 8117 On some (most? all?) SysV based systems with STREAMS based ptys, 8118 sshd could acquire a controlling terminal during pty setup when 8119 it pushed the "ptem" module, due to what is probably a bug in 8120 the STREAMS driver that's old enough to vote. Because it was the 8121 privileged sshd's controlling terminal, it was not available for 8122 the user's session, which ended up without one. This is known to 8123 affect at least Solaris <=10, derivatives such as OpenIndiana and 8124 several other SysV systems. See bz#245 for the backstory. 8125 8126 In the we past worked around that by not calling setsid in the 8127 privileged sshd child, which meant it was not a session or process 8128 group leader. This solved controlling terminal problem because sshd 8129 was not eligble to acquire one, but had other side effects such as 8130 not cleaning up helper subprocesses in the SIGALRM handler since it 8131 was not PG leader. Recent cleanups in the signal handler uncovered 8132 this, resulting in the LoginGraceTime timer not cleaning up privsep 8133 unprivileged processes. 8134 8135 This change moves the workaround into the STREAMS pty allocation code, 8136 by allocating a sacrificial pty to act as sshd's controlling terminal 8137 before allocating user ptys, so those are still available for users' 8138 sessions. 8139 8140 On the down side: 8141 - this will waste a pty per ssh connection on affected platforms. 8142 8143 On the up side: 8144 - it makes the process group behaviour consistent between platforms. 8145 8146 - it puts the workaround nearest the code that actually causes the 8147 problem and competely out of the mainline code. 8148 8149 - the workaround is only activated if you use the STREAMS code. If, 8150 say, Solaris 11 has the bug but also a working openpty() it doesn't 8151 matter that we defined SSHD_ACQUIRES_CTTY. 8152 8153 - the workaround is only activated when the fist pty is allocated, 8154 ie in the post-auth privsep monitor. This means there's no risk 8155 of fd leaks to the unprivileged processes, and there's no effect on 8156 sessions that do not allocate a pty. 8157 8158 Based on analysis and work by djm@, ok djm@ 8159 8160commit cd00b48cf10f3565936a418c1e6d7e48b5c36140 8161Author: Darren Tucker <dtucker@dtucker.net> 8162Date: Fri Feb 11 20:09:32 2022 +1100 8163 8164 Simplify handling of --with-ssl-dir. 8165 8166 ok djm@ 8167 8168commit ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0 8169Author: Darren Tucker <dtucker@dtucker.net> 8170Date: Fri Feb 11 13:39:29 2022 +1100 8171 8172 Stop testing OpenBSD HEAD on 6.9 and 7.0. 8173 8174 HEAD is not guaranteed to work on previous stable branches, and at the 8175 moment is broken due to libfido API changes. 8176 8177commit 50b9e4a4514697ffb9592200e722de6b427cb9ff 8178Author: dtucker@openbsd.org <dtucker@openbsd.org> 8179Date: Fri Feb 11 00:43:56 2022 +0000 8180 8181 upstream: Always initialize delim before passing to hpdelim2 which 8182 8183 might not set it. Found by the Valgrind tests on github, ok deraadt@ 8184 8185 OpenBSD-Commit-ID: c830c0db185ca43beff3f41c19943c724b4f636d 8186 8187commit 6ee53064f476cf163acd5521da45b11b7c57321b 8188Author: Darren Tucker <dtucker@dtucker.net> 8189Date: Fri Feb 11 10:03:06 2022 +1100 8190 8191 Fix helper include path and remove excess code. 8192 8193 Looks like test_hpdelim.c was imported twice into the same file. 8194 Spotted by kevin.brott at gmail com and chris at cataclysmal org. 8195 8196commit 9fa63a19f68bc87452d3cf5c577cafad2921b7a4 8197Author: Darren Tucker <dtucker@dtucker.net> 8198Date: Thu Feb 10 23:27:02 2022 +1100 8199 8200 Put poll.h inside ifdef. 8201 8202commit 3ac00dfeb54b252c15dcbf1971582e9e3b946de6 8203Author: Darren Tucker <dtucker@dtucker.net> 8204Date: Thu Feb 10 22:17:31 2022 +1100 8205 8206 We now support POLLPRI so actually define it. 8207 8208commit 25bd659cc72268f2858c5415740c442ee950049f 8209Author: dtucker@openbsd.org <dtucker@openbsd.org> 8210Date: Sun Feb 6 22:58:33 2022 +0000 8211 8212 upstream: Add test for empty hostname with port. 8213 8214 OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3 8215 8216commit a29af853cff41c0635f0378c00fe91bf9c91dea4 8217Author: dtucker@openbsd.org <dtucker@openbsd.org> 8218Date: Fri Feb 4 07:53:44 2022 +0000 8219 8220 upstream: Add unit tests for hpdelim. 8221 8222 OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018 8223 8224commit 9699151b039ecc5fad9ac6c6c02e9afdbd26f15f 8225Author: djm@openbsd.org <djm@openbsd.org> 8226Date: Thu Feb 10 04:12:38 2022 +0000 8227 8228 upstream: revert for imminent OpenSSH release, which wil ship with 8229 8230 scp in RCP mode. 8231 8232 > revision 1.106 8233 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl; 8234 > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP 8235 > protocol for copying. Let's get back to testing the SFTP protocol. 8236 8237 This will be put back once the OpenSSH release is done. 8238 8239 OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768 8240 8241commit 45279abceb37c3cbfac8ba36dde8b2c8cdd63d32 8242Author: dtucker@openbsd.org <dtucker@openbsd.org> 8243Date: Tue Feb 8 08:59:12 2022 +0000 8244 8245 upstream: Switch hpdelim interface to accept only ":" as delimiter. 8246 8247 Historicallly, hpdelim accepted ":" or "/" as a port delimiter between 8248 hosts (or addresses) and ports. These days most of the uses for "/" 8249 are no longer accepted, so there are several places where it checks the 8250 delimiter to disallow it. Make hpdelim accept only ":" and use hpdelim2 8251 in the other cases. ok djm@ 8252 8253 OpenBSD-Commit-ID: 7e6420bd1be87590b6840973f5ad5305804e3102 8254 8255commit a1bcbf04a7c2d81944141db7ecd0ba292d175a66 8256Author: pedro martelletto <pedro@yubico.com> 8257Date: Mon Feb 7 09:09:59 2022 +0100 8258 8259 fix typos in previous 8260 8261commit 56192518e329b39f063487bc2dc4d796f791eca0 8262Author: Damien Miller <djm@mindrot.org> 8263Date: Mon Feb 7 12:53:47 2022 +1100 8264 8265 compat code for fido_assert_set_clientdata() 8266 8267commit d6b5aa08fdcf9b527f8b8f932432941d5b76b7ab 8268Author: djm@openbsd.org <djm@openbsd.org> 8269Date: Mon Feb 7 01:25:12 2022 +0000 8270 8271 upstream: use libfido2 1.8.0+ fido_assert_set_clientdata() instead 8272 8273 of manually hashing data outselves. Saves a fair bit of code and makes life 8274 easier for some -portable platforms. 8275 8276 OpenBSD-Commit-ID: 351dfaaa5ab1ee928c0e623041fca28078cff0e0 8277 8278commit 86cc93fd3c26b2e0c7663c6394995fb04ebfbf3b 8279Author: jsg@openbsd.org <jsg@openbsd.org> 8280Date: Sun Feb 6 00:29:03 2022 +0000 8281 8282 upstream: remove please from manual pages ok jmc@ sthen@ millert@ 8283 8284 OpenBSD-Commit-ID: 6543acb00f4f38a23472538e1685c013ca1a99aa 8285 8286commit ad16a84e64a8cf1c69c63de3fb9008320a37009c 8287Author: dtucker@openbsd.org <dtucker@openbsd.org> 8288Date: Fri Feb 4 02:49:17 2022 +0000 8289 8290 upstream: Since they are deprecated, move DSA to the end of the 8291 8292 default list of public keys so that they will be tried last. From github 8293 PR#295 from "ProBackup-nl", ok djm@ 8294 8295 OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0 8296 8297commit 253de42753de85dde266e061b6fec12ca6589f7d 8298Author: Damien Miller <djm@mindrot.org> 8299Date: Wed Feb 2 16:52:07 2022 +1100 8300 8301 portable-specific string array constification 8302 8303 from Mike Frysinger 8304 8305commit dfdcc2220cf359c492d5d34eb723370e8bd8a19e 8306Author: djm@openbsd.org <djm@openbsd.org> 8307Date: Tue Feb 1 23:37:15 2022 +0000 8308 8309 upstream: test 'ssh-keygen -Y find-principals' with wildcard 8310 8311 principals; from Fabian Stelzer 8312 8313 OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40 8314 8315commit 968e508967ef42480cebad8cf3172465883baa77 8316Author: dtucker@openbsd.org <dtucker@openbsd.org> 8317Date: Fri Jan 21 02:54:41 2022 +0000 8318 8319 upstream: Enable all supported ciphers and macs in the server 8320 8321 before trying to benchmark them. Increase the data file size to get more 8322 signal. 8323 8324 OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6 8325 8326commit 15b7199a1fd37eff4c695e09d573f3db9f4274b7 8327Author: djm@openbsd.org <djm@openbsd.org> 8328Date: Tue Feb 1 23:34:47 2022 +0000 8329 8330 upstream: allow 'ssh-keygen -Y find-principals' to match wildcard 8331 8332 principals in allowed_signers files; from Fabian Stelzer 8333 8334 OpenBSD-Commit-ID: 1e970b9c025b80717dddff5018fe5e6f470c5098 8335 8336commit 541667fe6dc26d7881e55f0bb3a4baa6f3171645 8337Author: djm@openbsd.org <djm@openbsd.org> 8338Date: Tue Feb 1 23:32:51 2022 +0000 8339 8340 upstream: mark const string array contents const too, i.e. static 8341 8342 const char *array => static const char * const array from Mike Frysinger 8343 8344 OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1 8345 8346commit 8cfa73f8a2bde4c98773f33f974c650bdb40dd3c 8347Author: djm@openbsd.org <djm@openbsd.org> 8348Date: Tue Feb 1 23:11:11 2022 +0000 8349 8350 upstream: better match legacy scp behaviour: show un-expanded paths 8351 8352 in error messages. Spotted by and ok tb@ 8353 8354 OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7 8355 8356commit 4e62c13ab419b4b224c8bc6a761e91fcf048012d 8357Author: dtucker@openbsd.org <dtucker@openbsd.org> 8358Date: Tue Feb 1 07:57:32 2022 +0000 8359 8360 upstream: Remove explicit kill of privsep preauth child's PID in 8361 8362 SIGALRM handler. It's no longer needed since the child will get terminated by 8363 the SIGTERM to the process group that cleans up any auth helpers, it 8364 simplifies the signal handler and removes the risk of a race when updating 8365 the PID. Based on analysis by HerrSpace in github PR#289, ok djm@ 8366 8367 OpenBSD-Commit-ID: 2be1ffa28b4051ad9e33bb4371e2ec8a31d6d663 8368 8369commit 2a7ccd2ec4022917b745af7186f514f365b7ebe9 8370Author: guenther@openbsd.org <guenther@openbsd.org> 8371Date: Fri Jan 28 06:18:42 2022 +0000 8372 8373 upstream: When it's the possessive of 'it', it's spelled "its", 8374 8375 without the apostrophe. 8376 8377 OpenBSD-Commit-ID: fb6ab9c65bd31de831da1eb4631ddac018c5fae7 8378 8379commit 8a0848cdd3b25c049332cd56034186b7853ae754 8380Author: Alex James <theracermaster@gmail.com> 8381Date: Sun Jan 30 16:13:36 2022 -0600 8382 8383 sandbox-seccomp-filter: allow gettid 8384 8385 Some allocators (such as Scudo) use gettid while tracing allocations [1]. 8386 Allow gettid in preauth to prevent sshd from crashing with Scudo. 8387 8388 [1]: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.0/compiler-rt/lib/gwp_asan/common.cpp#L46 8389 8390commit b30d32159dc3c7052f4bfdf36357996c905af739 8391Author: djm@openbsd.org <djm@openbsd.org> 8392Date: Sat Jan 22 00:49:34 2022 +0000 8393 8394 upstream: add a ssh_packet_process_read() function that reads from 8395 8396 a fd directly into the transport input buffer. 8397 8398 Use this in the client and server mainloops to avoid unnecessary 8399 copying. It also lets us use a more greedy read size without penalty. 8400 8401 Yields a 2-3% performance gain on cipher-speed.sh (in a fairly 8402 unscientific test tbf) 8403 8404 feedback dtucker@ ok markus@ 8405 8406 OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632 8407 8408commit a1a8efeaaa9cccb15cdc0a2bd7c347a149a3a7e3 8409Author: djm@openbsd.org <djm@openbsd.org> 8410Date: Sat Jan 22 00:45:31 2022 +0000 8411 8412 upstream: Use sshbuf_read() to read directly into the channel input 8413 8414 buffer rather than into a stack buffer that needs to be copied again; 8415 Improves performance by about 1% on cipher-speed.sh feedback dtucker@ ok 8416 markus@ 8417 8418 OpenBSD-Commit-ID: bf5e6e3c821ac3546dc8241d8a94e70d47716572 8419 8420commit 29a76994e21623a1f84d68ebb9dc5a3c909fa3a7 8421Author: Damien Miller <djm@mindrot.org> 8422Date: Tue Jan 25 11:52:34 2022 +1100 8423 8424 depend 8425 8426commit 754e0d5c7712296a7a3a83ace863812604c7bc4f 8427Author: djm@openbsd.org <djm@openbsd.org> 8428Date: Sat Jan 22 00:43:43 2022 +0000 8429 8430 upstream: Add a sshbuf_read() that attempts to read(2) directly in 8431 8432 to a sshbuf; ok markus@ 8433 8434 OpenBSD-Commit-ID: 2d8f249040a4279f3bc23c018947384de8d4a45b 8435 8436commit c7964fb9829d9ae2ece8b51a76e4a02e8449338d 8437Author: djm@openbsd.org <djm@openbsd.org> 8438Date: Fri Jan 21 07:04:19 2022 +0000 8439 8440 upstream: add a helper for writing an error message to the 8441 8442 stderr_buf and setting quit_pending; no functional change but saves a bunch 8443 of boilerplate 8444 8445 OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d 8446 8447commit d23b4f7fdb1bd87e2cd7a9ae7c198ae99d347916 8448Author: djm@openbsd.org <djm@openbsd.org> 8449Date: Fri Jan 21 06:58:06 2022 +0000 8450 8451 upstream: correct comment and use local variable instead of long 8452 8453 indirection; spotted by dtucker@ 8454 8455 OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965 8456 8457commit d069b020a02b6e3935080204ee44d233e8158ebb 8458Author: deraadt@openbsd.org <deraadt@openbsd.org> 8459Date: Fri Jan 21 00:53:40 2022 +0000 8460 8461 upstream: When poll(2) returns -1, for some error conditions 8462 8463 pfd[].revents is not cleared. There are subtle errors in various programs. 8464 In this particular case, the program should error out. ok djm millert 8465 8466 OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c 8467 8468commit e204b34337a965feb439826157c191919fd9ecf8 8469Author: Damien Miller <djm@mindrot.org> 8470Date: Sat Jan 22 11:38:21 2022 +1100 8471 8472 restore tty force-read hack 8473 8474 This portable-specific hack fixes a hang on exit for ttyful sessions 8475 on Linux and some SysVish Unix variants. It was accidentally disabled 8476 in commit 5c79952dfe1a (a precursor to the mainloop poll(2) conversion). 8477 8478 Spotted by John in bz3383 8479 8480commit 68085066b6bad43643b43f5957fcc5fd34782ccd 8481Author: Corinna Vinschen <vinschen@redhat.com> 8482Date: Fri Jan 21 03:22:56 2022 +1100 8483 8484 Fix signedness bug in Cygwin code 8485 8486 The Cygwin-specific pattern match code has a bug. It checks 8487 the size_t value returned by mbstowcs for being < 0. The right 8488 thing to do is to check against (size_t) -1. Fix that. 8489 8490 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 8491 8492commit 2e5cfed513e84444483baf1d8b31c40072b05103 8493Author: Darren Tucker <dtucker@dtucker.net> 8494Date: Thu Jan 20 13:26:27 2022 +1100 8495 8496 Improve compatibility of early exit trap handling. 8497 8498 Dash (as used by the github runners) has some differences in its trap 8499 builtin: 8500 - it doesn't have -p (which is fine, that's not in posix). 8501 - it doesn't work in a subshell (which turns out to be in compliance 8502 with posix, which means bash isn't). 8503 - it doesn't work in a pipeline, ie "trap|cat" produces no output. 8504 8505commit 3fe6800b6027add478e648934cbb29d684e51943 8506Author: Darren Tucker <dtucker@dtucker.net> 8507Date: Thu Jan 20 00:49:57 2022 +1100 8508 8509 Move more tests out of valgrind-1 runner. 8510 8511commit 20da6ed136dd76e6a0b229ca3036ef9c7c7ef798 8512Author: Darren Tucker <dtucker@dtucker.net> 8513Date: Wed Jan 19 15:37:39 2022 +1100 8514 8515 Invoke EXIT handler early when using Valgrind. 8516 8517 When using Valgrind, we need to wait for all invoked programs to 8518 complete before checking their valgrind logs. Some tests, notably 8519 agent-restrict, set an EXIT trap handler to clean up things like 8520 ssh-agent, but those do not get invoked until test-exec.sh exits. 8521 This causes the Valgrind wait to deadlock, so if present invoke 8522 the EXIT handler before checking the Valgrind logs. 8523 8524commit ad2e0580c87b0714cf166bca9d926a95ddeee1c8 8525Author: Darren Tucker <dtucker@dtucker.net> 8526Date: Tue Jan 18 12:55:21 2022 +1100 8527 8528 Remove line leftover from upstream sync. 8529 8530commit d1051c0f11a6b749027e26bbeb61b07df4b67e15 8531Author: djm@openbsd.org <djm@openbsd.org> 8532Date: Mon Jan 17 22:56:04 2022 +0000 8533 8534 upstream: when decompressing zlib compressed packets, use 8535 8536 Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually 8537 specified as a valid mode for inflate(). There should be no practical change 8538 in behaviour as the compression side ensures a flush that should make all 8539 data available to the receiver in all cases. 8540 8541 repoted by lamm AT ibm.com via bz3372; ok markus 8542 8543 OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b 8544 8545commit d5981b1883746b1ae178a46229c26b53af99e37a 8546Author: djm@openbsd.org <djm@openbsd.org> 8547Date: Mon Jan 17 21:41:04 2022 +0000 8548 8549 upstream: make most of the sftp errors more idiomatic, following 8550 8551 the general form of "[local/remote] operation path: error message"; ok markus 8552 8553 OpenBSD-Commit-ID: 61364cd5f3a9fecaf8d63b4c38a42c0c91f8b571 8554 8555commit ac7c9ec894ed0825d04ef69c55babb49bab1d32e 8556Author: djm@openbsd.org <djm@openbsd.org> 8557Date: Mon Jan 17 21:39:51 2022 +0000 8558 8559 upstream: when transferring multiple files in SFTP mode, create the 8560 8561 destination directory if it doesn't already exist to match olde-scp(1) 8562 behaviour. noticed by deraadt@ ok markus@ 8563 8564 OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407 8565 8566commit 39d17e189f8e72c34c722579d8d4e701fa5132da 8567Author: djm@openbsd.org <djm@openbsd.org> 8568Date: Fri Jan 14 03:43:48 2022 +0000 8569 8570 upstream: allow pin-required FIDO keys to be added to ssh-agent(1). 8571 8572 ssh-askpass will be used to request the PIN at authentication time. 8573 8574 From Pedro Martelletto, ok djm 8575 8576 OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950 8577 8578commit 52423f64e13db2bdc31a51b32e999cb1bfcf1263 8579Author: djm@openbsd.org <djm@openbsd.org> 8580Date: Fri Jan 14 03:35:10 2022 +0000 8581 8582 upstream: ssh-sk: free a resident key's user id 8583 8584 From Pedro Martelletto; ok dtucker & me 8585 8586 OpenBSD-Commit-ID: 47be40d602b7a6458c4c71114df9b53d149fc2e9 8587 8588commit 014e2f147a2788bfb3cc58d1b170dcf2bf2ee493 8589Author: djm@openbsd.org <djm@openbsd.org> 8590Date: Fri Jan 14 03:34:00 2022 +0000 8591 8592 upstream: sshsk_load_resident: don't preallocate resp 8593 8594 resp is allocated by client_converse(), at which point we lose 8595 the original pointer. 8596 8597 From Pedro Martelletto; ok dtucker & me 8598 8599 OpenBSD-Commit-ID: 1f1b5ea3282017d6584dfed4f8370dc1db1f44b1 8600 8601commit c88265f207dfe0e8bdbaf9f0eda63ed6b33781cf 8602Author: djm@openbsd.org <djm@openbsd.org> 8603Date: Fri Jan 14 03:32:52 2022 +0000 8604 8605 upstream: sshsk_sign: trim call to sshkey_fingerprint() 8606 8607 the resulting fingerprint doesn't appear to be used for anything, 8608 and we end up leaking it. 8609 8610 from Pedro Martelletto; ok dtucker & me 8611 8612 OpenBSD-Commit-ID: 5625cf6c68f082bc2cbbd348e69a3ed731d2f9b7 8613 8614commit 1cd1b2eac39661b849d5a4b4b56363e22bb5f61e 8615Author: djm@openbsd.org <djm@openbsd.org> 8616Date: Fri Jan 14 03:31:52 2022 +0000 8617 8618 upstream: use status error message to communicate ~user expansion 8619 8620 failures; provides better experience for scp in sftp mode, where ~user paths 8621 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg & 8622 markus 8623 8624 (forgot to include this file in previous commit) 8625 8626 OpenBSD-Commit-ID: d37cc4c8c861ce48cd6ea9899e96aaac3476847b 8627 8628commit a1d42a6ce0398da3833bedf374ef2571af7fea50 8629Author: Damien Miller <djm@mindrot.org> 8630Date: Fri Jan 14 13:49:32 2022 +1100 8631 8632 fix edge case in poll(2) wrapper 8633 8634 Correct handling of select(2) exceptfds. These should only be consulted 8635 for POLLPRI flagged pfds and not unconditionally converted to POLLERR. 8636 8637 with and ok dtucker@ 8638 8639commit 976b9588b4b5babcaceec4767a241c11a67a5ccb 8640Author: Darren Tucker <dtucker@dtucker.net> 8641Date: Fri Jan 14 13:46:35 2022 +1100 8642 8643 Wrap OpenSSL includes in unit tests in ifdef. 8644 8645 Fixes unit test on systems that do not have OpenSSL headers installed. 8646 8647commit c171879374b2e8b07157503f5639ed0bce59ce89 8648Author: Darren Tucker <dtucker@dtucker.net> 8649Date: Thu Jan 13 15:53:33 2022 +1100 8650 8651 Remove sort wrapper. 8652 8653 agent-restrict now takes care of this itself. 8654 8655commit 9cc2654403f1a686bb26c07a6ac790edf334cef5 8656Author: dtucker@openbsd.org <dtucker@openbsd.org> 8657Date: Thu Jan 13 04:53:16 2022 +0000 8658 8659 upstream: Set LC_ALL in both local and remote shells so that sorted 8660 8661 output matches regardless of what the user's shell sets it to. ok djm@ 8662 8663 OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f 8664 8665commit 7a75f748cb2dd2f771bf70ea72698aa027996ab1 8666Author: dtucker@openbsd.org <dtucker@openbsd.org> 8667Date: Thu Jan 13 04:22:10 2022 +0000 8668 8669 upstream: Avoid %'s in commands (not used in OpenBSD, but used in 8670 8671 -portable's Valgrind test) being interpretted as printf format strings. 8672 8673 OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043 8674 8675commit 6c435bd4994d71442192001483a1cdb846e5ffcd 8676Author: Darren Tucker <dtucker@dtucker.net> 8677Date: Wed Jan 12 16:58:13 2022 +1100 8678 8679 Stop on first test failure to minimize logs. 8680 8681commit 4bc2ba6095620a4484b708ece12842afd8c7685b 8682Author: dtucker@openbsd.org <dtucker@openbsd.org> 8683Date: Wed Jan 12 07:18:37 2022 +0000 8684 8685 upstream: Use egrep when searching for an anchored string. 8686 8687 OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4 8688 8689commit 6bf2efa2679da1e8e60731f41677b2081dedae2c 8690Author: Darren Tucker <dtucker@dtucker.net> 8691Date: Wed Jan 12 18:25:06 2022 +1100 8692 8693 Add "rev" command replacement if needed. 8694 8695commit 72bcd7993dadaf967bb3d8564ee31cbf38132b5d 8696Author: dtucker@openbsd.org <dtucker@openbsd.org> 8697Date: Wed Jan 12 03:30:32 2022 +0000 8698 8699 upstream: Don't log NULL hostname in restricted agent code, 8700 8701 printf("%s", NULL) is not safe on all platforms. with & ok djm 8702 8703 OpenBSD-Commit-ID: faf10cdae4adde00cdd668cd1f6e05d0a0e32a02 8704 8705commit acabefe3f8fb58c867c99fed9bbf84dfa1771727 8706Author: djm@openbsd.org <djm@openbsd.org> 8707Date: Tue Jan 11 22:33:16 2022 +0000 8708 8709 upstream: remove hardcoded domain and use window.location.host, so this 8710 8711 can be run anywhere 8712 8713 OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92 8714 8715commit 96da0946e44f34adc0397eb7caa6ec35a3e79891 8716Author: dtucker@openbsd.org <dtucker@openbsd.org> 8717Date: Tue Jan 11 02:56:19 2022 +0000 8718 8719 upstream: "void" functions should not return anything. From Tim Rice 8720 8721 via -portable. 8722 8723 OpenBSD-Commit-ID: ce6616304f4c9881b46413e616b226c306830e2a 8724 8725commit a882a09722c9f086c9edb65d0c4022fd965ec1ed 8726Author: djm@openbsd.org <djm@openbsd.org> 8727Date: Tue Jan 11 01:26:47 2022 +0000 8728 8729 upstream: suppress "Connection to xxx closed" messages at LogLevel >= 8730 8731 error bz3378; ok dtucker@ 8732 8733 OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c 8734 8735commit 61a1a6af22e17fc94999a5d1294f27346e6c4668 8736Author: Damien Miller <djm@mindrot.org> 8737Date: Wed Jan 12 08:57:49 2022 +1100 8738 8739 OS X poll(2) is broken; use compat replacement 8740 8741 Darwin's poll(2) implementation is broken. For character-special 8742 devices like /dev/null, it returns POLLNVAL when polled with 8743 POLLIN. 8744 8745 Apparently this is Apple bug 3710161, which is AFAIK not public, 8746 but a websearch will find other OSS projects rediscovering it 8747 periodically since it was first identified in 2005 (!!) 8748 8749commit 613a6545fc5a9542753b503cbe5906538a640b60 8750Author: Darren Tucker <dtucker@dtucker.net> 8751Date: Tue Jan 11 20:56:01 2022 +1100 8752 8753 libhardended_malloc.so moved into out dir. 8754 8755commit 61761340be5e11046556623f8f5412b236cefa95 8756Author: Tim Rice <tim@multitalents.net> 8757Date: Mon Jan 10 11:07:04 2022 -0800 8758 8759 Make USL compilers happy 8760 UX:acomp: ERROR: "sftp-server.c", line 567: void function cannot return value 8761 8762commit 3ef403f351e80a59b6f7e9d43cb82c181855483c 8763Author: Darren Tucker <dtucker@dtucker.net> 8764Date: Mon Jan 10 21:07:38 2022 +1100 8765 8766 Add wrapper for "sort" to set LC_ALL=C. 8767 8768 Found by djm, this should make sorts stable and reduce test flakiness. 8769 8770commit bd69e29f5716090181dbe0b8272eb7eab1a383bb 8771Author: dtucker@openbsd.org <dtucker@openbsd.org> 8772Date: Sat Jan 8 07:55:26 2022 +0000 8773 8774 upstream: Remove errant "set -x" left over from debugging. 8775 8776 OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc 8777 8778commit 1a7c88e26fd673813dc5f61c4ac278564845e004 8779Author: dtucker@openbsd.org <dtucker@openbsd.org> 8780Date: Sat Jan 8 07:01:13 2022 +0000 8781 8782 upstream: Enable all supported hostkey algorithms (but no others). 8783 8784 Allows hostbased test to pass when built without OpenSSL. 8785 8786 OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562 8787 8788commit 12b457c2a42ff271e7967d9bedd068cebb048db9 8789Author: djm@openbsd.org <djm@openbsd.org> 8790Date: Sat Jan 8 07:37:32 2022 +0000 8791 8792 upstream: use status error message to communicate ~user expansion 8793 8794 failures; provides better experience for scp in sftp mode, where ~user paths 8795 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg & 8796 markus 8797 8798 OpenBSD-Commit-ID: fc610ce00ca0cdc2ecdabbd49ce7cb82033f905f 8799 8800commit 63670d4e9030bcee490d5a9cce561373ac5b3b23 8801Author: djm@openbsd.org <djm@openbsd.org> 8802Date: Sat Jan 8 07:36:11 2022 +0000 8803 8804 upstream: fix some corner-case bugs in scp sftp-mode handling of 8805 8806 ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus 8807 8808 OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222 8809 8810commit e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0 8811Author: djm@openbsd.org <djm@openbsd.org> 8812Date: Sat Jan 8 07:34:57 2022 +0000 8813 8814 upstream: more idiomatic error messages; spotted by jsg & deraadt 8815 8816 ok jsg & markus 8817 8818 OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8 8819 8820commit 9acddcd5918c623f7ebf454520ffe946a8f15e90 8821Author: djm@openbsd.org <djm@openbsd.org> 8822Date: Sat Jan 8 07:33:54 2022 +0000 8823 8824 upstream: add a variant of send_status() that allows overriding the 8825 8826 default, generic error message. feedback/ok markus & jsg 8827 8828 OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f 8829 8830commit 961411337719d4cd78f1ab33e4ac549f3fa22f50 8831Author: djm@openbsd.org <djm@openbsd.org> 8832Date: Sat Jan 8 07:32:45 2022 +0000 8833 8834 upstream: refactor tilde_expand_filename() and make it handle ~user 8835 8836 paths with no trailing slash; feedback/ok markus and jsg 8837 8838 OpenBSD-Commit-ID: a2ab365598a902f0f14ba6a4f8fb2d07a9b5d51d 8839 8840commit dc38236ab6827dec575064cac65c8e7035768773 8841Author: dtucker@openbsd.org <dtucker@openbsd.org> 8842Date: Thu Jan 6 22:14:25 2022 +0000 8843 8844 upstream: Don't explicitly set HostbasedAuthentication in 8845 8846 sshd_config. It defaults to "no", and not explicitly setting it allows us to 8847 enable it for the (optional) hostbased test. 8848 8849 OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c 8850 8851commit e12d912ddf1c873cb72e5de9a197afbe0b6622d2 8852Author: dtucker@openbsd.org <dtucker@openbsd.org> 8853Date: Thu Jan 6 21:46:56 2022 +0000 8854 8855 upstream: Add test for hostbased auth. It requires some external 8856 8857 setup (see comments at the top) and thus is disabled unless 8858 TEST_SSH_HOSTBASED_AUTH and SUDO are set. 8859 8860 OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a 8861 8862commit a48533a8da6a0f4f05ecd055dc8048047e53569e 8863Author: Damien Miller <djm@mindrot.org> 8864Date: Fri Jan 7 09:24:26 2022 +1100 8865 8866 depend 8867 8868commit d9dbb5d9a0326e252d3c7bc13beb9c2434f59409 8869Author: djm@openbsd.org <djm@openbsd.org> 8870Date: Thu Jan 6 22:06:51 2022 +0000 8871 8872 upstream: allow hostbased auth to select RSA keys when only 8873 8874 RSA/SHA2 are configured (this is the default case); ok markus@ 8875 8876 OpenBSD-Commit-ID: 411c18c7bde40c60cc6dfb7017968577b4d4a827 8877 8878commit fdb1d58d0d3888b042e5a500f6ce524486aaf782 8879Author: djm@openbsd.org <djm@openbsd.org> 8880Date: Thu Jan 6 22:05:42 2022 +0000 8881 8882 upstream: add a helper function to match a key type to a list of 8883 8884 signature algorithms. RSA keys can make signatures with multiple algorithms, 8885 so some special handling is required. ok markus@ 8886 8887 OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff 8888 8889commit 11e8c4309a5086a45fbbbc87d0af5323c6152914 8890Author: djm@openbsd.org <djm@openbsd.org> 8891Date: Thu Jan 6 22:04:20 2022 +0000 8892 8893 upstream: log some details on hostkeys that ssh loads for 8894 8895 hostbased authn ok markus@ 8896 8897 OpenBSD-Commit-ID: da17061fa1f0e58cb31b88478a40643e18233e38 8898 8899commit c6706f661739514a34125aa3136532a958929510 8900Author: djm@openbsd.org <djm@openbsd.org> 8901Date: Thu Jan 6 22:03:59 2022 +0000 8902 8903 upstream: log signature algorithm during verification by monitor; 8904 8905 ok markus 8906 8907 OpenBSD-Commit-ID: 02b92bb42c4d4bf05a051702a56eb915151d9ecc 8908 8909commit 8832402bd500d1661ccc80a476fd563335ef6cdc 8910Author: djm@openbsd.org <djm@openbsd.org> 8911Date: Thu Jan 6 22:02:52 2022 +0000 8912 8913 upstream: piece of UpdateHostkeys client strictification: when 8914 8915 updating known_hosts with new keys, ignore NULL keys (forgot to include in 8916 prior commit) 8917 8918 OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08 8919 8920commit c2d9ced1da0276961d86690b3bd7ebdaca7fdbf7 8921Author: djm@openbsd.org <djm@openbsd.org> 8922Date: Thu Jan 6 22:01:14 2022 +0000 8923 8924 upstream: include rejected signature algorithm in error message 8925 8926 and not the (useless) key type; ok markus 8927 8928 OpenBSD-Commit-ID: 4180b5ec7ab347b43f84e00b1972515296dab023 8929 8930commit 7aa7b096cf2bafe2777085abdeed5ce00581f641 8931Author: djm@openbsd.org <djm@openbsd.org> 8932Date: Thu Jan 6 22:00:18 2022 +0000 8933 8934 upstream: make ssh-keysign use the requested signature algorithm 8935 8936 and not the default for the keytype. Part of unbreaking hostbased auth for 8937 RSA/SHA2 keys. ok markus@ 8938 8939 OpenBSD-Commit-ID: b5639a14462948970da3a8020dc06f9a80ecccdc 8940 8941commit 291721bc7c840d113a49518f3fca70e86248b8e8 8942Author: djm@openbsd.org <djm@openbsd.org> 8943Date: Thu Jan 6 21:57:28 2022 +0000 8944 8945 upstream: stricter UpdateHostkey signature verification logic on 8946 8947 the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when 8948 RSA/SHA1 was explicitly negotiated during initial KEX; bz3375 8949 8950 ok markus@ 8951 8952 OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29 8953 8954commit 0fa33683223c76289470a954404047bc762be84c 8955Author: djm@openbsd.org <djm@openbsd.org> 8956Date: Thu Jan 6 21:55:23 2022 +0000 8957 8958 upstream: Fix signature algorithm selection logic for 8959 8960 UpdateHostkeys on the server side. The previous code tried to prefer RSA/SHA2 8961 for hostkey proofs of RSA keys, but missed some cases. This will use RSA/SHA2 8962 signatures for RSA keys if the client proposed these algorithms in initial 8963 KEX. bz3375 8964 8965 Mostly by Dmitry Belyavskiy with some tweaks by me. 8966 8967 ok markus@ 8968 8969 OpenBSD-Commit-ID: c17ba0c3236340d2c6a248158ebed042ac6a8029 8970 8971commit 17877bc81db3846e6e7d4cfb124d966bb9c9296b 8972Author: djm@openbsd.org <djm@openbsd.org> 8973Date: Thu Jan 6 21:48:38 2022 +0000 8974 8975 upstream: convert ssh, sshd mainloops from select() to poll(); 8976 8977 feedback & ok deraadt@ and markus@ has been in snaps for a few months 8978 8979 OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c 8980 8981commit 5c79952dfe1aa36105c93b3f383ce9be04dee384 8982Author: djm@openbsd.org <djm@openbsd.org> 8983Date: Thu Jan 6 21:46:23 2022 +0000 8984 8985 upstream: prepare for conversion of ssh, sshd mainloop from 8986 8987 select() to poll() by moving FD_SET construction out of channel handlers into 8988 separate functions. ok markus 8989 8990 OpenBSD-Commit-ID: 937fbf2a4de12b19fb9d5168424e206124807027 8991 8992commit 24c5187edfef4651a625b7d5d692c8c7e794f71f 8993Author: djm@openbsd.org <djm@openbsd.org> 8994Date: Wed Jan 5 21:54:37 2022 +0000 8995 8996 upstream: add a comment so I don't make this mistake again 8997 8998 OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e 8999 9000commit 7369900441929058263a17f56aa67e05ff7ec628 9001Author: djm@openbsd.org <djm@openbsd.org> 9002Date: Wed Jan 5 21:50:00 2022 +0000 9003 9004 upstream: fix cut-and-pasto in error message 9005 9006 OpenBSD-Commit-ID: 4cc5c619e4b456cd2e9bb760d17e3a9c84659198 9007 9008commit 294c11b1c7d56d3fb61e329603a782315ed70c62 9009Author: djm@openbsd.org <djm@openbsd.org> 9010Date: Wed Jan 5 08:25:05 2022 +0000 9011 9012 upstream: select all RSA hostkey algorithms for UpdateHostkeys tests, 9013 9014 not just RSA-SHA1 9015 9016 OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8 9017 9018commit 2ea1108c30e3edb6f872dfc1e6da10b041ddf2c0 9019Author: djm@openbsd.org <djm@openbsd.org> 9020Date: Wed Jan 5 04:56:15 2022 +0000 9021 9022 upstream: regress test both sshsig message hash algorithms, possible 9023 9024 now because the algorithm is controllable via the CLI 9025 9026 OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f 9027 9028commit 2327c306b5d4a2b7e71178e5a4d139af9902c2b0 9029Author: djm@openbsd.org <djm@openbsd.org> 9030Date: Wed Jan 5 04:50:11 2022 +0000 9031 9032 upstream: allow selection of hash at sshsig signing time; code 9033 9034 already supported either sha512 (default) or sha256, but plumbing wasn't 9035 there mostly by Linus Nordberg 9036 9037 OpenBSD-Commit-ID: 1b536404b9da74a84b3a1c8d0b05fd564cdc96cd 9038 9039commit 56e941d0a00d6d8bae88317717d5e1b7395c9529 9040Author: djm@openbsd.org <djm@openbsd.org> 9041Date: Wed Jan 5 04:27:54 2022 +0000 9042 9043 upstream: add missing -O option to usage() for ssh-keygen -Y sign; 9044 9045 from Linus Nordberg 9046 9047 OpenBSD-Commit-ID: 4e78feb4aa830727ab76bb2e3d940440ae1d7af0 9048 9049commit 141a14ec9b0924709c98df2dd8013bde5d8d12c7 9050Author: djm@openbsd.org <djm@openbsd.org> 9051Date: Wed Jan 5 04:27:01 2022 +0000 9052 9053 upstream: move sig_process_opts() to before sig_sign(); no 9054 9055 functional code change 9056 9057 OpenBSD-Commit-ID: da02d61f5464f72b4e8b299f83e93c3b657932f9 9058 9059commit 37a14249ec993599a9051731e4fb0ac5e976aec1 9060Author: djm@openbsd.org <djm@openbsd.org> 9061Date: Wed Jan 5 04:10:39 2022 +0000 9062 9063 upstream: regression test for find-principals NULL deref; from Fabian 9064 9065 Stelzer 9066 9067 OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5 9068 9069commit eb1f042142fdaba93f6c9560cf6c91ae25f6884a 9070Author: djm@openbsd.org <djm@openbsd.org> 9071Date: Wed Jan 5 04:02:42 2022 +0000 9072 9073 upstream: NULL deref when using find-principals when matching an 9074 9075 allowed_signers line that contains a namespace restriction, but no 9076 restriction specified on the command-line; report and fix from Fabian Stelzer 9077 9078 OpenBSD-Commit-ID: 4a201b86afb668c908d1a559c6af456a61f4b145 9079 9080commit 8f3b18030579f395eca2181da31a5f945af12a59 9081Author: dtucker@openbsd.org <dtucker@openbsd.org> 9082Date: Tue Jan 4 08:38:53 2022 +0000 9083 9084 upstream: Log command invocation while debugging. 9085 9086 This will aid in manually reproducing failing commands. 9087 9088 OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a 9089 9090commit bbf285164df535f0d38c36237f007551bbdae27f 9091Author: Darren Tucker <dtucker@dtucker.net> 9092Date: Sun Dec 26 10:31:15 2021 +1100 9093 9094 Always save config.h as build artifact. 9095 9096 Should allow better comparison between failing and succeeding test 9097 platforms. 9098 9099commit 03bd4ed0db699687c5cd83405d26f81d2dc28d22 9100Author: Darren Tucker <dtucker@dtucker.net> 9101Date: Sat Dec 25 16:42:51 2021 +1100 9102 9103 Add OpenBSD 7.0 target. Retire 6.8. 9104 9105commit c45a752f0de611afd87755c2887c8a24816d08ee 9106Author: jsg@openbsd.org <jsg@openbsd.org> 9107Date: Sat Jan 1 05:55:06 2022 +0000 9108 9109 upstream: spelling 9110 9111 OpenBSD-Commit-ID: c63e43087a64d0727af13409c708938e05147b62 9112 9113commit c672f83a89a756564db0d3af9934ba0e1cf8fa3e 9114Author: djm@openbsd.org <djm@openbsd.org> 9115Date: Tue Jan 4 07:20:33 2022 +0000 9116 9117 upstream: unbreak test: was picking up system ssh-add instead of the 9118 9119 one supposedly being tested. Spotted by dtucker and using his VM zoo (which 9120 includes some systems old enough to lack ed25519 key support) 9121 9122 OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5 9123 9124commit a23698c3082ffe661abed14b020eac9b0c25eb9f 9125Author: djm@openbsd.org <djm@openbsd.org> 9126Date: Sat Jan 1 04:18:06 2022 +0000 9127 9128 upstream: fix memleak in process_extension(); oss-fuzz issue #42719 9129 9130 OpenBSD-Commit-ID: d8d49f840162fb7b8949e3a5adb8107444b6de1e 9131 9132commit cb885178f36b83d0f14cfe9f345d2068103feed0 9133Author: jsg@openbsd.org <jsg@openbsd.org> 9134Date: Sat Jan 1 01:55:30 2022 +0000 9135 9136 upstream: spelling ok dtucker@ 9137 9138 OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19 9139 9140commit 6b977f8080a32c5b3cbb9edb634b9d5789fb79be 9141Author: djm@openbsd.org <djm@openbsd.org> 9142Date: Sun Dec 26 23:34:41 2021 +0000 9143 9144 upstream: split method list search functionality from 9145 9146 authmethod_lookup() into a separate authmethod_byname(), for cases where we 9147 don't need to check whether a method is enabled, etc. 9148 9149 use this to fix the "none" authentication method regression reported 9150 by Nam Nguyen via bugs@ 9151 9152 ok deraadt@ 9153 9154 OpenBSD-Commit-ID: 8cd188dc3a83aa8abe5b7693e762975cd8ea8a17 9155 9156commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07 9157Author: jmc@openbsd.org <jmc@openbsd.org> 9158Date: Wed Dec 22 06:56:41 2021 +0000 9159 9160 upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text; 9161 9162 ok djm 9163 9164 OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965 9165 9166commit 1c9853a68b2319f2e5f929179735e8fbb9988a67 9167Author: Darren Tucker <dtucker@dtucker.net> 9168Date: Wed Dec 22 19:33:10 2021 +1100 9169 9170 Use SHA.*_HMAC_BLOCK_SIZE if needed. 9171 9172 If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH 9173 but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter. 9174 Should fix --without-openssl build on Solaris. 9175 9176commit 715c892f0a5295b391ae92c26ef4d6a86ea96e8e 9177Author: Damien Miller <djm@mindrot.org> 9178Date: Wed Dec 22 09:02:50 2021 +1100 9179 9180 remove sys/param.h in -portable, after upstream 9181 9182commit 7a7c69d8b4022b1e5c0afb169c416af8ce70f3e8 9183Author: Damien Miller <djm@mindrot.org> 9184Date: Mon Dec 20 13:05:20 2021 +1100 9185 9186 add agent-restrict.sh file, missed in last commit 9187 9188commit f539136ca51a4976644db5d0be8158cc1914c72a 9189Author: djm@openbsd.org <djm@openbsd.org> 9190Date: Sun Dec 19 22:20:12 2021 +0000 9191 9192 upstream: regression test for destination restrictions in ssh-agent 9193 9194 OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d 9195 9196commit 6e4980eb8ef94c04874a79dd380c3f568e8416d6 9197Author: anton@openbsd.org <anton@openbsd.org> 9198Date: Sat Dec 18 06:53:59 2021 +0000 9199 9200 upstream: Make use of ntests variable, pointed out by clang 13. 9201 9202 OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72 9203 9204commit 3eead8158393b697f663ec4301e3c7b6f24580b1 9205Author: deraadt@openbsd.org <deraadt@openbsd.org> 9206Date: Tue Dec 14 21:25:27 2021 +0000 9207 9208 upstream: sys/param.h cleanup, mostly using MINIMUM() and 9209 9210 <limits.h> ok dtucker 9211 9212 OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0 9213 9214commit 266678e19eb0e86fdf865b431b6e172e7a95bf48 9215Author: djm@openbsd.org <djm@openbsd.org> 9216Date: Sun Dec 19 22:15:42 2021 +0000 9217 9218 upstream: document host-bound publickey authentication 9219 9220 OpenBSD-Commit-ID: ea6ed91779a81f06d961e30ecc49316b3d71961b 9221 9222commit 3d00024b3b156aa9bbd05d105f1deb9cb088f6f7 9223Author: djm@openbsd.org <djm@openbsd.org> 9224Date: Sun Dec 19 22:15:21 2021 +0000 9225 9226 upstream: document agent protocol extensions 9227 9228 OpenBSD-Commit-ID: 09e8bb391bbaf24c409b75a4af44e0cac65405a7 9229 9230commit c385abf76511451bcba78568167b1cd9e90587d5 9231Author: djm@openbsd.org <djm@openbsd.org> 9232Date: Sun Dec 19 22:14:47 2021 +0000 9233 9234 upstream: PubkeyAuthentication=yes|no|unbound|host-bound 9235 9236 Allow control over which pubkey methods are used. Added out of 9237 concern that some hardware devices may have difficulty signing 9238 the longer pubkey authentication challenges. This provides a 9239 way for them to disable the extension. It's also handy for 9240 testing. 9241 9242 feedback / ok markus@ 9243 9244 OpenBSD-Commit-ID: ee52580db95c355cf6d563ba89974c210e603b1a 9245 9246commit 34b1e9cc7654f41cd4c5b1cc290b999dcf6579bb 9247Author: djm@openbsd.org <djm@openbsd.org> 9248Date: Sun Dec 19 22:14:12 2021 +0000 9249 9250 upstream: document destination-constrained keys 9251 9252 feedback / ok markus@ 9253 9254 OpenBSD-Commit-ID: cd8c526c77268f6d91c06adbee66b014d22d672e 9255 9256commit a6d7677c4abcfba268053e5867f2acabe3aa371b 9257Author: djm@openbsd.org <djm@openbsd.org> 9258Date: Sun Dec 19 22:13:55 2021 +0000 9259 9260 upstream: Use hostkey parsed from hostbound userauth request 9261 9262 Require host-bound userauth requests for forwarded SSH connections. 9263 9264 The hostkey parsed from the host-bound userauth request is now checked 9265 against the most recently bound session ID / hostkey on the agent socket 9266 and the signature refused if they do not match. 9267 9268 ok markus@ 9269 9270 OpenBSD-Commit-ID: d69877c9a3bd8d1189a5dbdeceefa432044dae02 9271 9272commit baaff0ff4357cc5a079621ba6e2d7e247b765061 9273Author: djm@openbsd.org <djm@openbsd.org> 9274Date: Sun Dec 19 22:13:33 2021 +0000 9275 9276 upstream: agent support for parsing hostkey-bound signatures 9277 9278 Allow parse_userauth_request() to work with blobs from 9279 publickey-hostbound-v00@openssh.com userauth attempts. 9280 9281 Extract hostkey from these blobs. 9282 9283 ok markus@ 9284 9285 OpenBSD-Commit-ID: 81c064255634c1109477dc65c3e983581d336df8 9286 9287commit 3e16365a79cdeb2d758cf1da6051b1c5266ceed7 9288Author: djm@openbsd.org <djm@openbsd.org> 9289Date: Sun Dec 19 22:13:12 2021 +0000 9290 9291 upstream: EXT_INFO negotiation of hostbound pubkey auth 9292 9293 the EXT_INFO packet gets a new publickey-hostbound@openssh.com to 9294 advertise the hostbound public key method. 9295 9296 Client side support to parse this feature flag and set the kex->flags 9297 indicator if the expected version is offered (currently "0"). 9298 9299 ok markus@ 9300 9301 OpenBSD-Commit-ID: 4cdb2ca5017ec1ed7a9d33bda95c1d6a97b583b0 9302 9303commit 94ae0c6f0e35903b695e033bf4beacea1d376bb1 9304Author: djm@openbsd.org <djm@openbsd.org> 9305Date: Sun Dec 19 22:12:54 2021 +0000 9306 9307 upstream: client side of host-bound pubkey authentication 9308 9309 Add kex->flags member to enable the publickey-hostbound-v00@openssh.com 9310 authentication method. 9311 9312 Use the new hostbound method in client if the kex->flags flag was set, 9313 and include the inital KEX hostkey in the userauth request. 9314 9315 Note: nothing in kex.c actually sets the new flag yet 9316 9317 ok markus@ 9318 9319 OpenBSD-Commit-ID: 5a6fce8c6c8a77a80ee1526dc467d91036a5910d 9320 9321commit 288fd0218dbfdcb05d9fbd1885904bed9b6d42e6 9322Author: djm@openbsd.org <djm@openbsd.org> 9323Date: Sun Dec 19 22:12:30 2021 +0000 9324 9325 upstream: sshd side of hostbound public key auth 9326 9327 This is identical to the standard "publickey" method, but it also includes 9328 the initial server hostkey in the message signed by the client. 9329 9330 feedback / ok markus@ 9331 9332 OpenBSD-Commit-ID: 7ea01bb7238a560c1bfb426fda0c10a8aac07862 9333 9334commit dbb339f015c33d63484261d140c84ad875a9e548 9335Author: djm@openbsd.org <djm@openbsd.org> 9336Date: Sun Dec 19 22:12:07 2021 +0000 9337 9338 upstream: prepare for multiple names for authmethods 9339 9340 allow authentication methods to have one additional name beyond their 9341 primary name. 9342 9343 allow lookup by this synonym 9344 9345 Use primary name for authentication decisions, e.g. for 9346 PermitRootLogin=publickey 9347 9348 Pass actual invoked name to the authmethods, so they can tell whether they 9349 were requested via the their primary name or synonym. 9350 9351 ok markus@ 9352 9353 OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559 9354 9355commit 39f00dcf44915f20684160f0a88d3ef8a3278351 9356Author: djm@openbsd.org <djm@openbsd.org> 9357Date: Sun Dec 19 22:11:39 2021 +0000 9358 9359 upstream: ssh-agent side of destination constraints 9360 9361 Gives ssh-agent the ability to parse restrict-destination-v00@openssh.com 9362 constraints and to apply them to keys. 9363 9364 Check constraints against the hostkeys recorded for a SocketEntry when 9365 attempting a signature, adding, listing or deleting keys. Note that 9366 the "delete all keys" request will remove constrained keys regardless of 9367 location. 9368 9369 feedback Jann Horn & markus@ 9370 ok markus@ 9371 9372 OpenBSD-Commit-ID: 84a7fb81106c2d609a6ac17469436df16d196319 9373 9374commit ce943912df812c573a33d00bf9e5435b7fcca3f7 9375Author: djm@openbsd.org <djm@openbsd.org> 9376Date: Sun Dec 19 22:11:06 2021 +0000 9377 9378 upstream: ssh-add side of destination constraints 9379 9380 Have ssh-add accept a list of "destination constraints" that allow 9381 restricting where keys may be used in conjunction with a ssh-agent/ssh 9382 that supports session ID/hostkey binding. 9383 9384 Constraints are specified as either "[user@]host-pattern" or 9385 "host-pattern>[user@]host-pattern". 9386 9387 The first form permits a key to be used to authenticate as the 9388 specified user to the specified host. 9389 9390 The second form permits a key that has previously been permitted 9391 for use at a host to be available via a forwarded agent to an 9392 additional host. 9393 9394 For example, constraining a key with "user1@host_a" and 9395 "host_a>host_b". Would permit authentication as "user1" at 9396 "host_a", and allow the key to be available on an agent forwarded 9397 to "host_a" only for authentication to "host_b". The key would not 9398 be visible on agent forwarded to other hosts or usable for 9399 authentication there. 9400 9401 Internally, destination constraints use host keys to identify hosts. 9402 The host patterns are used to obtain lists of host keys for that 9403 destination that are communicated to the agent. The user/hostkeys are 9404 encoded using a new restrict-destination-v00@openssh.com key 9405 constraint. 9406 9407 host keys are looked up in the default client user/system known_hosts 9408 files. It is possible to override this set on the command-line. 9409 9410 feedback Jann Horn & markus@ 9411 ok markus@ 9412 9413 OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5 9414 9415commit 5e950d765727ee0b20fc3d2cbb0c790b21ac2425 9416Author: djm@openbsd.org <djm@openbsd.org> 9417Date: Sun Dec 19 22:10:24 2021 +0000 9418 9419 upstream: ssh-add side of destination constraints 9420 9421 Have ssh-add accept a list of "destination constraints" that allow 9422 restricting where keys may be used in conjunction with a ssh-agent/ssh 9423 that supports session ID/hostkey binding. 9424 9425 Constraints are specified as either "[user@]host-pattern" or 9426 "host-pattern>[user@]host-pattern". 9427 9428 The first form permits a key to be used to authenticate as the 9429 specified user to the specified host. 9430 9431 The second form permits a key that has previously been permitted 9432 for use at a host to be available via a forwarded agent to an 9433 additional host. 9434 9435 For example, constraining a key with "user1@host_a" and 9436 "host_a>host_b". Would permit authentication as "user1" at 9437 "host_a", and allow the key to be available on an agent forwarded 9438 to "host_a" only for authentication to "host_b". The key would not 9439 be visible on agent forwarded to other hosts or usable for 9440 authentication there. 9441 9442 Internally, destination constraints use host keys to identify hosts. 9443 The host patterns are used to obtain lists of host keys for that 9444 destination that are communicated to the agent. The user/hostkeys are 9445 encoded using a new restrict-destination-v00@openssh.com key 9446 constraint. 9447 9448 host keys are looked up in the default client user/system known_hosts 9449 files. It is possible to override this set on the command-line. 9450 9451 feedback Jann Horn & markus@ 9452 ok markus@ 9453 9454 OpenBSD-Commit-ID: ef47fa9ec0e3c2a82e30d37ef616e245df73163e 9455 9456commit 4c1e3ce85e183a9d0c955c88589fed18e4d6a058 9457Author: djm@openbsd.org <djm@openbsd.org> 9458Date: Sun Dec 19 22:09:23 2021 +0000 9459 9460 upstream: ssh-agent side of binding 9461 9462 record session ID/hostkey/forwarding status for each active socket. 9463 9464 Attempt to parse data-to-be-signed at signature request time and extract 9465 session ID from the blob if it is a pubkey userauth request. 9466 9467 ok markus@ 9468 9469 OpenBSD-Commit-ID: a80fd41e292b18b67508362129e9fed549abd318 9470 9471commit e9497ecf73f3c16667288bce48d4e3d7e746fea1 9472Author: djm@openbsd.org <djm@openbsd.org> 9473Date: Sun Dec 19 22:08:48 2021 +0000 9474 9475 upstream: ssh client side of binding 9476 9477 send session ID, hostkey, signature and a flag indicating whether the 9478 agent connection is being forwarded to ssh agent each time a connection 9479 is opened via a new "session-bind@openssh.com" agent extension. 9480 9481 ok markus@ 9482 9483 OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135 9484 9485commit b42c61d6840d16ef392ed0f365e8c000734669aa 9486Author: djm@openbsd.org <djm@openbsd.org> 9487Date: Sun Dec 19 22:08:06 2021 +0000 9488 9489 upstream: Record session ID, host key and sig at intital KEX 9490 9491 These will be used later for agent session ID / hostkey binding 9492 9493 ok markus@ 9494 9495 OpenBSD-Commit-ID: a9af29e33772b18e3e867c6fa8ab35e1694a81fe 9496 9497commit 26ca33d186473d58a32d812e19273ce078b6ffff 9498Author: djm@openbsd.org <djm@openbsd.org> 9499Date: Tue Dec 7 22:06:45 2021 +0000 9500 9501 upstream: better error message for FIDO keys when we can't match 9502 9503 them to a token 9504 9505 OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650 9506