1commit 166456cedad3962b83b848b1e9caf80794831f0f 2Author: Damien Miller <djm@mindrot.org> 3Date: Wed Feb 23 22:31:11 2022 +1100 4 5 makedepend 6 7commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4 8Author: djm@openbsd.org <djm@openbsd.org> 9Date: Wed Feb 23 11:18:13 2022 +0000 10 11 upstream: avoid integer overflow of auth attempts (harmless, caught 12 13 by monitor) 14 15 OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86 16 17commit 6e0258c64c901753df695e06498b26f9f4812ea6 18Author: djm@openbsd.org <djm@openbsd.org> 19Date: Wed Feb 23 11:17:10 2022 +0000 20 21 upstream: randomise the password used in fakepw 22 23 OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947 24 25commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9 26Author: djm@openbsd.org <djm@openbsd.org> 27Date: Wed Feb 23 11:15:57 2022 +0000 28 29 upstream: use asprintf to construct .rhosts paths 30 31 OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b 32 33commit c07e154fbdc7285e9ec54e78d8a31f7325d43537 34Author: djm@openbsd.org <djm@openbsd.org> 35Date: Wed Feb 23 11:07:09 2022 +0000 36 37 upstream: openssh-8.9 38 39 OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e 40 41commit bc16667b4a1c3cad7029304853c143a32ae04bd4 42Author: Darren Tucker <dtucker@dtucker.net> 43Date: Tue Feb 22 15:29:22 2022 +1100 44 45 Extend select+rlimit sanbox test to include poll. 46 47 POSIX specifies that poll() shall fail if "nfds argument is greater 48 than {OPEN_MAX}". The setrlimit sandbox sets this to effectively zero 49 so this causes poll() to fail in the preauth privsep process. 50 51 This is likely the underlying cause for the previously observed similar 52 behaviour of select() on plaforms where it is implement in userspace on 53 top of poll(). 54 55commit 6520c488de95366be031d49287ed243620399e23 56Author: Darren Tucker <dtucker@dtucker.net> 57Date: Tue Feb 22 13:08:59 2022 +1100 58 59 Add Alpine Linux test VM. 60 61commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb 62Author: Darren Tucker <dtucker@dtucker.net> 63Date: Tue Feb 22 12:27:07 2022 +1100 64 65 Include sys/param.h if present. 66 67 Needed for howmany() on MUSL systems such as Alpine. 68 69commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c 70Author: Darren Tucker <dtucker@dtucker.net> 71Date: Tue Feb 22 12:25:52 2022 +1100 72 73 Only include sys/poll.h if we don't have poll.h. 74 75 Prevents warnings on MUSL based systems such as Alpine. 76 77commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5 78Author: Damien Miller <djm@mindrot.org> 79Date: Tue Feb 22 11:14:51 2022 +1100 80 81 disable agent-restrict test on minix3 82 83 Minix seems to have a platform-wide limit on the number of 84 select(2) syscalls that can be concurrently issued. This test 85 seems to exceed this limit. 86 87 Refer to: 88 89 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114 90 https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31 91 92commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a 93Author: Darren Tucker <dtucker@dtucker.net> 94Date: Mon Feb 21 21:27:20 2022 +1100 95 96 Skip agent-getpeereid when running as root. 97 98commit fbd772570a25436a33924d91c164d2b24021f010 99Author: dtucker@openbsd.org <dtucker@openbsd.org> 100Date: Sun Feb 20 03:47:26 2022 +0000 101 102 upstream: Aproximate realpath on the expected output by deduping 103 104 leading slashes. Fixes test failure when user's home dir is / which is 105 possible in some portable configurations. 106 107 OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63 108 109commit 336685d223a59f893faeedf0a562e053fd84058e 110Author: Darren Tucker <dtucker@dtucker.net> 111Date: Sun Feb 20 13:30:52 2022 +1100 112 113 Really move DSA to end of list. 114 115 In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to 116 the end of the list instead of DSA. Spotted by andrew at fyfe.gb.net. 117 118commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3 119Author: Darren Tucker <dtucker@dtucker.net> 120Date: Fri Feb 18 12:12:21 2022 +1100 121 122 Add test configs for MUSL C library. 123 124commit f7fc6a43f1173e8b2c38770bf6cee485a562d03b 125Author: Damien Miller <djm@mindrot.org> 126Date: Thu Feb 17 22:54:19 2022 +1100 127 128 minix needs BROKEN_POLL too; chokes on /dev/null 129 130commit 667fec5d4fe4406745750a32f69b5d2e1a75e94b 131Author: djm@openbsd.org <djm@openbsd.org> 132Date: Thu Feb 17 10:58:27 2022 +0000 133 134 upstream: check for EINTR/EAGAIN failures in the rfd fast-path; caught 135 136 by dtucker's minix3 vm :) ok dtucker@ 137 138 OpenBSD-Commit-ID: 2e2c895a3e82ef347aa6694394a76a438be91361 139 140commit 41417dbda9fb55a0af49a8236e3ef9d50d862644 141Author: Darren Tucker <dtucker@dtucker.net> 142Date: Thu Feb 17 22:05:29 2022 +1100 143 144 Comment hurd test, the VM is currently broken. 145 146commit b2aee35a1f0dc798339b3fcf96136da71b7e3f6d 147Author: Damien Miller <djm@mindrot.org> 148Date: Thu Feb 17 21:15:16 2022 +1100 149 150 find sk-dummy.so when build_dir != src_dir 151 152 spotted by Corinna Vinschen; feedback & ok dtucker@ 153 154commit 62a2d4e50b2e89f2ef04576931895d5139a5d037 155Author: Damien Miller <djm@mindrot.org> 156Date: Wed Feb 16 16:26:17 2022 +1100 157 158 update versions in preparation for 8.9 release 159 160commit dd6d3dded721ac653ea73c017325e5bfeeec837f 161Author: djm@openbsd.org <djm@openbsd.org> 162Date: Tue Feb 15 05:13:36 2022 +0000 163 164 upstream: document the unbound/host-bound options to 165 166 PubkeyAuthentication; spotted by HARUYAMA Seigo 167 168 OpenBSD-Commit-ID: 298f681b66a9ecd498f0700082c7a6c46e948981 169 170commit df93529dd727fdf2fb290700cd4f1adb0c3c084b 171Author: Darren Tucker <dtucker@dtucker.net> 172Date: Mon Feb 14 14:19:40 2022 +1100 173 174 Test if sshd accidentally acquires controlling tty 175 176 When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour 177 in the STREAMS code before activating the workaround. ok djm@ 178 179commit 766176cfdbfd7ec38bb6118dde6e4daa0df34888 180Author: Darren Tucker <dtucker@dtucker.net> 181Date: Sat Feb 12 10:24:56 2022 +1100 182 183 Add cygwin-release test config. 184 185 This tests the flags used to build the cygwin release binaries. 186 187commit b30698662b862f5397116d23688aac0764e0886e 188Author: Darren Tucker <dtucker@dtucker.net> 189Date: Fri Feb 11 21:00:35 2022 +1100 190 191 Move SSHD_ACQUIRES_CTTY workaround into compat. 192 193 On some (most? all?) SysV based systems with STREAMS based ptys, 194 sshd could acquire a controlling terminal during pty setup when 195 it pushed the "ptem" module, due to what is probably a bug in 196 the STREAMS driver that's old enough to vote. Because it was the 197 privileged sshd's controlling terminal, it was not available for 198 the user's session, which ended up without one. This is known to 199 affect at least Solaris <=10, derivatives such as OpenIndiana and 200 several other SysV systems. See bz#245 for the backstory. 201 202 In the we past worked around that by not calling setsid in the 203 privileged sshd child, which meant it was not a session or process 204 group leader. This solved controlling terminal problem because sshd 205 was not eligble to acquire one, but had other side effects such as 206 not cleaning up helper subprocesses in the SIGALRM handler since it 207 was not PG leader. Recent cleanups in the signal handler uncovered 208 this, resulting in the LoginGraceTime timer not cleaning up privsep 209 unprivileged processes. 210 211 This change moves the workaround into the STREAMS pty allocation code, 212 by allocating a sacrificial pty to act as sshd's controlling terminal 213 before allocating user ptys, so those are still available for users' 214 sessions. 215 216 On the down side: 217 - this will waste a pty per ssh connection on affected platforms. 218 219 On the up side: 220 - it makes the process group behaviour consistent between platforms. 221 222 - it puts the workaround nearest the code that actually causes the 223 problem and competely out of the mainline code. 224 225 - the workaround is only activated if you use the STREAMS code. If, 226 say, Solaris 11 has the bug but also a working openpty() it doesn't 227 matter that we defined SSHD_ACQUIRES_CTTY. 228 229 - the workaround is only activated when the fist pty is allocated, 230 ie in the post-auth privsep monitor. This means there's no risk 231 of fd leaks to the unprivileged processes, and there's no effect on 232 sessions that do not allocate a pty. 233 234 Based on analysis and work by djm@, ok djm@ 235 236commit cd00b48cf10f3565936a418c1e6d7e48b5c36140 237Author: Darren Tucker <dtucker@dtucker.net> 238Date: Fri Feb 11 20:09:32 2022 +1100 239 240 Simplify handling of --with-ssl-dir. 241 242 ok djm@ 243 244commit ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0 245Author: Darren Tucker <dtucker@dtucker.net> 246Date: Fri Feb 11 13:39:29 2022 +1100 247 248 Stop testing OpenBSD HEAD on 6.9 and 7.0. 249 250 HEAD is not guaranteed to work on previous stable branches, and at the 251 moment is broken due to libfido API changes. 252 253commit 50b9e4a4514697ffb9592200e722de6b427cb9ff 254Author: dtucker@openbsd.org <dtucker@openbsd.org> 255Date: Fri Feb 11 00:43:56 2022 +0000 256 257 upstream: Always initialize delim before passing to hpdelim2 which 258 259 might not set it. Found by the Valgrind tests on github, ok deraadt@ 260 261 OpenBSD-Commit-ID: c830c0db185ca43beff3f41c19943c724b4f636d 262 263commit 6ee53064f476cf163acd5521da45b11b7c57321b 264Author: Darren Tucker <dtucker@dtucker.net> 265Date: Fri Feb 11 10:03:06 2022 +1100 266 267 Fix helper include path and remove excess code. 268 269 Looks like test_hpdelim.c was imported twice into the same file. 270 Spotted by kevin.brott at gmail com and chris at cataclysmal org. 271 272commit 9fa63a19f68bc87452d3cf5c577cafad2921b7a4 273Author: Darren Tucker <dtucker@dtucker.net> 274Date: Thu Feb 10 23:27:02 2022 +1100 275 276 Put poll.h inside ifdef. 277 278commit 3ac00dfeb54b252c15dcbf1971582e9e3b946de6 279Author: Darren Tucker <dtucker@dtucker.net> 280Date: Thu Feb 10 22:17:31 2022 +1100 281 282 We now support POLLPRI so actually define it. 283 284commit 25bd659cc72268f2858c5415740c442ee950049f 285Author: dtucker@openbsd.org <dtucker@openbsd.org> 286Date: Sun Feb 6 22:58:33 2022 +0000 287 288 upstream: Add test for empty hostname with port. 289 290 OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3 291 292commit a29af853cff41c0635f0378c00fe91bf9c91dea4 293Author: dtucker@openbsd.org <dtucker@openbsd.org> 294Date: Fri Feb 4 07:53:44 2022 +0000 295 296 upstream: Add unit tests for hpdelim. 297 298 OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018 299 300commit 9699151b039ecc5fad9ac6c6c02e9afdbd26f15f 301Author: djm@openbsd.org <djm@openbsd.org> 302Date: Thu Feb 10 04:12:38 2022 +0000 303 304 upstream: revert for imminent OpenSSH release, which wil ship with 305 306 scp in RCP mode. 307 308 > revision 1.106 309 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl; 310 > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP 311 > protocol for copying. Let's get back to testing the SFTP protocol. 312 313 This will be put back once the OpenSSH release is done. 314 315 OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768 316 317commit 45279abceb37c3cbfac8ba36dde8b2c8cdd63d32 318Author: dtucker@openbsd.org <dtucker@openbsd.org> 319Date: Tue Feb 8 08:59:12 2022 +0000 320 321 upstream: Switch hpdelim interface to accept only ":" as delimiter. 322 323 Historicallly, hpdelim accepted ":" or "/" as a port delimiter between 324 hosts (or addresses) and ports. These days most of the uses for "/" 325 are no longer accepted, so there are several places where it checks the 326 delimiter to disallow it. Make hpdelim accept only ":" and use hpdelim2 327 in the other cases. ok djm@ 328 329 OpenBSD-Commit-ID: 7e6420bd1be87590b6840973f5ad5305804e3102 330 331commit a1bcbf04a7c2d81944141db7ecd0ba292d175a66 332Author: pedro martelletto <pedro@yubico.com> 333Date: Mon Feb 7 09:09:59 2022 +0100 334 335 fix typos in previous 336 337commit 56192518e329b39f063487bc2dc4d796f791eca0 338Author: Damien Miller <djm@mindrot.org> 339Date: Mon Feb 7 12:53:47 2022 +1100 340 341 compat code for fido_assert_set_clientdata() 342 343commit d6b5aa08fdcf9b527f8b8f932432941d5b76b7ab 344Author: djm@openbsd.org <djm@openbsd.org> 345Date: Mon Feb 7 01:25:12 2022 +0000 346 347 upstream: use libfido2 1.8.0+ fido_assert_set_clientdata() instead 348 349 of manually hashing data outselves. Saves a fair bit of code and makes life 350 easier for some -portable platforms. 351 352 OpenBSD-Commit-ID: 351dfaaa5ab1ee928c0e623041fca28078cff0e0 353 354commit 86cc93fd3c26b2e0c7663c6394995fb04ebfbf3b 355Author: jsg@openbsd.org <jsg@openbsd.org> 356Date: Sun Feb 6 00:29:03 2022 +0000 357 358 upstream: remove please from manual pages ok jmc@ sthen@ millert@ 359 360 OpenBSD-Commit-ID: 6543acb00f4f38a23472538e1685c013ca1a99aa 361 362commit ad16a84e64a8cf1c69c63de3fb9008320a37009c 363Author: dtucker@openbsd.org <dtucker@openbsd.org> 364Date: Fri Feb 4 02:49:17 2022 +0000 365 366 upstream: Since they are deprecated, move DSA to the end of the 367 368 default list of public keys so that they will be tried last. From github 369 PR#295 from "ProBackup-nl", ok djm@ 370 371 OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0 372 373commit 253de42753de85dde266e061b6fec12ca6589f7d 374Author: Damien Miller <djm@mindrot.org> 375Date: Wed Feb 2 16:52:07 2022 +1100 376 377 portable-specific string array constification 378 379 from Mike Frysinger 380 381commit dfdcc2220cf359c492d5d34eb723370e8bd8a19e 382Author: djm@openbsd.org <djm@openbsd.org> 383Date: Tue Feb 1 23:37:15 2022 +0000 384 385 upstream: test 'ssh-keygen -Y find-principals' with wildcard 386 387 principals; from Fabian Stelzer 388 389 OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40 390 391commit 968e508967ef42480cebad8cf3172465883baa77 392Author: dtucker@openbsd.org <dtucker@openbsd.org> 393Date: Fri Jan 21 02:54:41 2022 +0000 394 395 upstream: Enable all supported ciphers and macs in the server 396 397 before trying to benchmark them. Increase the data file size to get more 398 signal. 399 400 OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6 401 402commit 15b7199a1fd37eff4c695e09d573f3db9f4274b7 403Author: djm@openbsd.org <djm@openbsd.org> 404Date: Tue Feb 1 23:34:47 2022 +0000 405 406 upstream: allow 'ssh-keygen -Y find-principals' to match wildcard 407 408 principals in allowed_signers files; from Fabian Stelzer 409 410 OpenBSD-Commit-ID: 1e970b9c025b80717dddff5018fe5e6f470c5098 411 412commit 541667fe6dc26d7881e55f0bb3a4baa6f3171645 413Author: djm@openbsd.org <djm@openbsd.org> 414Date: Tue Feb 1 23:32:51 2022 +0000 415 416 upstream: mark const string array contents const too, i.e. static 417 418 const char *array => static const char * const array from Mike Frysinger 419 420 OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1 421 422commit 8cfa73f8a2bde4c98773f33f974c650bdb40dd3c 423Author: djm@openbsd.org <djm@openbsd.org> 424Date: Tue Feb 1 23:11:11 2022 +0000 425 426 upstream: better match legacy scp behaviour: show un-expanded paths 427 428 in error messages. Spotted by and ok tb@ 429 430 OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7 431 432commit 4e62c13ab419b4b224c8bc6a761e91fcf048012d 433Author: dtucker@openbsd.org <dtucker@openbsd.org> 434Date: Tue Feb 1 07:57:32 2022 +0000 435 436 upstream: Remove explicit kill of privsep preauth child's PID in 437 438 SIGALRM handler. It's no longer needed since the child will get terminated by 439 the SIGTERM to the process group that cleans up any auth helpers, it 440 simplifies the signal handler and removes the risk of a race when updating 441 the PID. Based on analysis by HerrSpace in github PR#289, ok djm@ 442 443 OpenBSD-Commit-ID: 2be1ffa28b4051ad9e33bb4371e2ec8a31d6d663 444 445commit 2a7ccd2ec4022917b745af7186f514f365b7ebe9 446Author: guenther@openbsd.org <guenther@openbsd.org> 447Date: Fri Jan 28 06:18:42 2022 +0000 448 449 upstream: When it's the possessive of 'it', it's spelled "its", 450 451 without the apostrophe. 452 453 OpenBSD-Commit-ID: fb6ab9c65bd31de831da1eb4631ddac018c5fae7 454 455commit 8a0848cdd3b25c049332cd56034186b7853ae754 456Author: Alex James <theracermaster@gmail.com> 457Date: Sun Jan 30 16:13:36 2022 -0600 458 459 sandbox-seccomp-filter: allow gettid 460 461 Some allocators (such as Scudo) use gettid while tracing allocations [1]. 462 Allow gettid in preauth to prevent sshd from crashing with Scudo. 463 464 [1]: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.0/compiler-rt/lib/gwp_asan/common.cpp#L46 465 466commit b30d32159dc3c7052f4bfdf36357996c905af739 467Author: djm@openbsd.org <djm@openbsd.org> 468Date: Sat Jan 22 00:49:34 2022 +0000 469 470 upstream: add a ssh_packet_process_read() function that reads from 471 472 a fd directly into the transport input buffer. 473 474 Use this in the client and server mainloops to avoid unnecessary 475 copying. It also lets us use a more greedy read size without penalty. 476 477 Yields a 2-3% performance gain on cipher-speed.sh (in a fairly 478 unscientific test tbf) 479 480 feedback dtucker@ ok markus@ 481 482 OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632 483 484commit a1a8efeaaa9cccb15cdc0a2bd7c347a149a3a7e3 485Author: djm@openbsd.org <djm@openbsd.org> 486Date: Sat Jan 22 00:45:31 2022 +0000 487 488 upstream: Use sshbuf_read() to read directly into the channel input 489 490 buffer rather than into a stack buffer that needs to be copied again; 491 Improves performance by about 1% on cipher-speed.sh feedback dtucker@ ok 492 markus@ 493 494 OpenBSD-Commit-ID: bf5e6e3c821ac3546dc8241d8a94e70d47716572 495 496commit 29a76994e21623a1f84d68ebb9dc5a3c909fa3a7 497Author: Damien Miller <djm@mindrot.org> 498Date: Tue Jan 25 11:52:34 2022 +1100 499 500 depend 501 502commit 754e0d5c7712296a7a3a83ace863812604c7bc4f 503Author: djm@openbsd.org <djm@openbsd.org> 504Date: Sat Jan 22 00:43:43 2022 +0000 505 506 upstream: Add a sshbuf_read() that attempts to read(2) directly in 507 508 to a sshbuf; ok markus@ 509 510 OpenBSD-Commit-ID: 2d8f249040a4279f3bc23c018947384de8d4a45b 511 512commit c7964fb9829d9ae2ece8b51a76e4a02e8449338d 513Author: djm@openbsd.org <djm@openbsd.org> 514Date: Fri Jan 21 07:04:19 2022 +0000 515 516 upstream: add a helper for writing an error message to the 517 518 stderr_buf and setting quit_pending; no functional change but saves a bunch 519 of boilerplate 520 521 OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d 522 523commit d23b4f7fdb1bd87e2cd7a9ae7c198ae99d347916 524Author: djm@openbsd.org <djm@openbsd.org> 525Date: Fri Jan 21 06:58:06 2022 +0000 526 527 upstream: correct comment and use local variable instead of long 528 529 indirection; spotted by dtucker@ 530 531 OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965 532 533commit d069b020a02b6e3935080204ee44d233e8158ebb 534Author: deraadt@openbsd.org <deraadt@openbsd.org> 535Date: Fri Jan 21 00:53:40 2022 +0000 536 537 upstream: When poll(2) returns -1, for some error conditions 538 539 pfd[].revents is not cleared. There are subtle errors in various programs. 540 In this particular case, the program should error out. ok djm millert 541 542 OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c 543 544commit e204b34337a965feb439826157c191919fd9ecf8 545Author: Damien Miller <djm@mindrot.org> 546Date: Sat Jan 22 11:38:21 2022 +1100 547 548 restore tty force-read hack 549 550 This portable-specific hack fixes a hang on exit for ttyful sessions 551 on Linux and some SysVish Unix variants. It was accidentally disabled 552 in commit 5c79952dfe1a (a precursor to the mainloop poll(2) conversion). 553 554 Spotted by John in bz3383 555 556commit 68085066b6bad43643b43f5957fcc5fd34782ccd 557Author: Corinna Vinschen <vinschen@redhat.com> 558Date: Fri Jan 21 03:22:56 2022 +1100 559 560 Fix signedness bug in Cygwin code 561 562 The Cygwin-specific pattern match code has a bug. It checks 563 the size_t value returned by mbstowcs for being < 0. The right 564 thing to do is to check against (size_t) -1. Fix that. 565 566 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 567 568commit 2e5cfed513e84444483baf1d8b31c40072b05103 569Author: Darren Tucker <dtucker@dtucker.net> 570Date: Thu Jan 20 13:26:27 2022 +1100 571 572 Improve compatibility of early exit trap handling. 573 574 Dash (as used by the github runners) has some differences in its trap 575 builtin: 576 - it doesn't have -p (which is fine, that's not in posix). 577 - it doesn't work in a subshell (which turns out to be in compliance 578 with posix, which means bash isn't). 579 - it doesn't work in a pipeline, ie "trap|cat" produces no output. 580 581commit 3fe6800b6027add478e648934cbb29d684e51943 582Author: Darren Tucker <dtucker@dtucker.net> 583Date: Thu Jan 20 00:49:57 2022 +1100 584 585 Move more tests out of valgrind-1 runner. 586 587commit 20da6ed136dd76e6a0b229ca3036ef9c7c7ef798 588Author: Darren Tucker <dtucker@dtucker.net> 589Date: Wed Jan 19 15:37:39 2022 +1100 590 591 Invoke EXIT handler early when using Valgrind. 592 593 When using Valgrind, we need to wait for all invoked programs to 594 complete before checking their valgrind logs. Some tests, notably 595 agent-restrict, set an EXIT trap handler to clean up things like 596 ssh-agent, but those do not get invoked until test-exec.sh exits. 597 This causes the Valgrind wait to deadlock, so if present invoke 598 the EXIT handler before checking the Valgrind logs. 599 600commit ad2e0580c87b0714cf166bca9d926a95ddeee1c8 601Author: Darren Tucker <dtucker@dtucker.net> 602Date: Tue Jan 18 12:55:21 2022 +1100 603 604 Remove line leftover from upstream sync. 605 606commit d1051c0f11a6b749027e26bbeb61b07df4b67e15 607Author: djm@openbsd.org <djm@openbsd.org> 608Date: Mon Jan 17 22:56:04 2022 +0000 609 610 upstream: when decompressing zlib compressed packets, use 611 612 Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually 613 specified as a valid mode for inflate(). There should be no practical change 614 in behaviour as the compression side ensures a flush that should make all 615 data available to the receiver in all cases. 616 617 repoted by lamm AT ibm.com via bz3372; ok markus 618 619 OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b 620 621commit d5981b1883746b1ae178a46229c26b53af99e37a 622Author: djm@openbsd.org <djm@openbsd.org> 623Date: Mon Jan 17 21:41:04 2022 +0000 624 625 upstream: make most of the sftp errors more idiomatic, following 626 627 the general form of "[local/remote] operation path: error message"; ok markus 628 629 OpenBSD-Commit-ID: 61364cd5f3a9fecaf8d63b4c38a42c0c91f8b571 630 631commit ac7c9ec894ed0825d04ef69c55babb49bab1d32e 632Author: djm@openbsd.org <djm@openbsd.org> 633Date: Mon Jan 17 21:39:51 2022 +0000 634 635 upstream: when transferring multiple files in SFTP mode, create the 636 637 destination directory if it doesn't already exist to match olde-scp(1) 638 behaviour. noticed by deraadt@ ok markus@ 639 640 OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407 641 642commit 39d17e189f8e72c34c722579d8d4e701fa5132da 643Author: djm@openbsd.org <djm@openbsd.org> 644Date: Fri Jan 14 03:43:48 2022 +0000 645 646 upstream: allow pin-required FIDO keys to be added to ssh-agent(1). 647 648 ssh-askpass will be used to request the PIN at authentication time. 649 650 From Pedro Martelletto, ok djm 651 652 OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950 653 654commit 52423f64e13db2bdc31a51b32e999cb1bfcf1263 655Author: djm@openbsd.org <djm@openbsd.org> 656Date: Fri Jan 14 03:35:10 2022 +0000 657 658 upstream: ssh-sk: free a resident key's user id 659 660 From Pedro Martelletto; ok dtucker & me 661 662 OpenBSD-Commit-ID: 47be40d602b7a6458c4c71114df9b53d149fc2e9 663 664commit 014e2f147a2788bfb3cc58d1b170dcf2bf2ee493 665Author: djm@openbsd.org <djm@openbsd.org> 666Date: Fri Jan 14 03:34:00 2022 +0000 667 668 upstream: sshsk_load_resident: don't preallocate resp 669 670 resp is allocated by client_converse(), at which point we lose 671 the original pointer. 672 673 From Pedro Martelletto; ok dtucker & me 674 675 OpenBSD-Commit-ID: 1f1b5ea3282017d6584dfed4f8370dc1db1f44b1 676 677commit c88265f207dfe0e8bdbaf9f0eda63ed6b33781cf 678Author: djm@openbsd.org <djm@openbsd.org> 679Date: Fri Jan 14 03:32:52 2022 +0000 680 681 upstream: sshsk_sign: trim call to sshkey_fingerprint() 682 683 the resulting fingerprint doesn't appear to be used for anything, 684 and we end up leaking it. 685 686 from Pedro Martelletto; ok dtucker & me 687 688 OpenBSD-Commit-ID: 5625cf6c68f082bc2cbbd348e69a3ed731d2f9b7 689 690commit 1cd1b2eac39661b849d5a4b4b56363e22bb5f61e 691Author: djm@openbsd.org <djm@openbsd.org> 692Date: Fri Jan 14 03:31:52 2022 +0000 693 694 upstream: use status error message to communicate ~user expansion 695 696 failures; provides better experience for scp in sftp mode, where ~user paths 697 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg & 698 markus 699 700 (forgot to include this file in previous commit) 701 702 OpenBSD-Commit-ID: d37cc4c8c861ce48cd6ea9899e96aaac3476847b 703 704commit a1d42a6ce0398da3833bedf374ef2571af7fea50 705Author: Damien Miller <djm@mindrot.org> 706Date: Fri Jan 14 13:49:32 2022 +1100 707 708 fix edge case in poll(2) wrapper 709 710 Correct handling of select(2) exceptfds. These should only be consulted 711 for POLLPRI flagged pfds and not unconditionally converted to POLLERR. 712 713 with and ok dtucker@ 714 715commit 976b9588b4b5babcaceec4767a241c11a67a5ccb 716Author: Darren Tucker <dtucker@dtucker.net> 717Date: Fri Jan 14 13:46:35 2022 +1100 718 719 Wrap OpenSSL includes in unit tests in ifdef. 720 721 Fixes unit test on systems that do not have OpenSSL headers installed. 722 723commit c171879374b2e8b07157503f5639ed0bce59ce89 724Author: Darren Tucker <dtucker@dtucker.net> 725Date: Thu Jan 13 15:53:33 2022 +1100 726 727 Remove sort wrapper. 728 729 agent-restrict now takes care of this itself. 730 731commit 9cc2654403f1a686bb26c07a6ac790edf334cef5 732Author: dtucker@openbsd.org <dtucker@openbsd.org> 733Date: Thu Jan 13 04:53:16 2022 +0000 734 735 upstream: Set LC_ALL in both local and remote shells so that sorted 736 737 output matches regardless of what the user's shell sets it to. ok djm@ 738 739 OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f 740 741commit 7a75f748cb2dd2f771bf70ea72698aa027996ab1 742Author: dtucker@openbsd.org <dtucker@openbsd.org> 743Date: Thu Jan 13 04:22:10 2022 +0000 744 745 upstream: Avoid %'s in commands (not used in OpenBSD, but used in 746 747 -portable's Valgrind test) being interpretted as printf format strings. 748 749 OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043 750 751commit 6c435bd4994d71442192001483a1cdb846e5ffcd 752Author: Darren Tucker <dtucker@dtucker.net> 753Date: Wed Jan 12 16:58:13 2022 +1100 754 755 Stop on first test failure to minimize logs. 756 757commit 4bc2ba6095620a4484b708ece12842afd8c7685b 758Author: dtucker@openbsd.org <dtucker@openbsd.org> 759Date: Wed Jan 12 07:18:37 2022 +0000 760 761 upstream: Use egrep when searching for an anchored string. 762 763 OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4 764 765commit 6bf2efa2679da1e8e60731f41677b2081dedae2c 766Author: Darren Tucker <dtucker@dtucker.net> 767Date: Wed Jan 12 18:25:06 2022 +1100 768 769 Add "rev" command replacement if needed. 770 771commit 72bcd7993dadaf967bb3d8564ee31cbf38132b5d 772Author: dtucker@openbsd.org <dtucker@openbsd.org> 773Date: Wed Jan 12 03:30:32 2022 +0000 774 775 upstream: Don't log NULL hostname in restricted agent code, 776 777 printf("%s", NULL) is not safe on all platforms. with & ok djm 778 779 OpenBSD-Commit-ID: faf10cdae4adde00cdd668cd1f6e05d0a0e32a02 780 781commit acabefe3f8fb58c867c99fed9bbf84dfa1771727 782Author: djm@openbsd.org <djm@openbsd.org> 783Date: Tue Jan 11 22:33:16 2022 +0000 784 785 upstream: remove hardcoded domain and use window.location.host, so this 786 787 can be run anywhere 788 789 OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92 790 791commit 96da0946e44f34adc0397eb7caa6ec35a3e79891 792Author: dtucker@openbsd.org <dtucker@openbsd.org> 793Date: Tue Jan 11 02:56:19 2022 +0000 794 795 upstream: "void" functions should not return anything. From Tim Rice 796 797 via -portable. 798 799 OpenBSD-Commit-ID: ce6616304f4c9881b46413e616b226c306830e2a 800 801commit a882a09722c9f086c9edb65d0c4022fd965ec1ed 802Author: djm@openbsd.org <djm@openbsd.org> 803Date: Tue Jan 11 01:26:47 2022 +0000 804 805 upstream: suppress "Connection to xxx closed" messages at LogLevel >= 806 807 error bz3378; ok dtucker@ 808 809 OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c 810 811commit 61a1a6af22e17fc94999a5d1294f27346e6c4668 812Author: Damien Miller <djm@mindrot.org> 813Date: Wed Jan 12 08:57:49 2022 +1100 814 815 OS X poll(2) is broken; use compat replacement 816 817 Darwin's poll(2) implementation is broken. For character-special 818 devices like /dev/null, it returns POLLNVAL when polled with 819 POLLIN. 820 821 Apparently this is Apple bug 3710161, which is AFAIK not public, 822 but a websearch will find other OSS projects rediscovering it 823 periodically since it was first identified in 2005 (!!) 824 825commit 613a6545fc5a9542753b503cbe5906538a640b60 826Author: Darren Tucker <dtucker@dtucker.net> 827Date: Tue Jan 11 20:56:01 2022 +1100 828 829 libhardended_malloc.so moved into out dir. 830 831commit 61761340be5e11046556623f8f5412b236cefa95 832Author: Tim Rice <tim@multitalents.net> 833Date: Mon Jan 10 11:07:04 2022 -0800 834 835 Make USL compilers happy 836 UX:acomp: ERROR: "sftp-server.c", line 567: void function cannot return value 837 838commit 3ef403f351e80a59b6f7e9d43cb82c181855483c 839Author: Darren Tucker <dtucker@dtucker.net> 840Date: Mon Jan 10 21:07:38 2022 +1100 841 842 Add wrapper for "sort" to set LC_ALL=C. 843 844 Found by djm, this should make sorts stable and reduce test flakiness. 845 846commit bd69e29f5716090181dbe0b8272eb7eab1a383bb 847Author: dtucker@openbsd.org <dtucker@openbsd.org> 848Date: Sat Jan 8 07:55:26 2022 +0000 849 850 upstream: Remove errant "set -x" left over from debugging. 851 852 OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc 853 854commit 1a7c88e26fd673813dc5f61c4ac278564845e004 855Author: dtucker@openbsd.org <dtucker@openbsd.org> 856Date: Sat Jan 8 07:01:13 2022 +0000 857 858 upstream: Enable all supported hostkey algorithms (but no others). 859 860 Allows hostbased test to pass when built without OpenSSL. 861 862 OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562 863 864commit 12b457c2a42ff271e7967d9bedd068cebb048db9 865Author: djm@openbsd.org <djm@openbsd.org> 866Date: Sat Jan 8 07:37:32 2022 +0000 867 868 upstream: use status error message to communicate ~user expansion 869 870 failures; provides better experience for scp in sftp mode, where ~user paths 871 are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg & 872 markus 873 874 OpenBSD-Commit-ID: fc610ce00ca0cdc2ecdabbd49ce7cb82033f905f 875 876commit 63670d4e9030bcee490d5a9cce561373ac5b3b23 877Author: djm@openbsd.org <djm@openbsd.org> 878Date: Sat Jan 8 07:36:11 2022 +0000 879 880 upstream: fix some corner-case bugs in scp sftp-mode handling of 881 882 ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus 883 884 OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222 885 886commit e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0 887Author: djm@openbsd.org <djm@openbsd.org> 888Date: Sat Jan 8 07:34:57 2022 +0000 889 890 upstream: more idiomatic error messages; spotted by jsg & deraadt 891 892 ok jsg & markus 893 894 OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8 895 896commit 9acddcd5918c623f7ebf454520ffe946a8f15e90 897Author: djm@openbsd.org <djm@openbsd.org> 898Date: Sat Jan 8 07:33:54 2022 +0000 899 900 upstream: add a variant of send_status() that allows overriding the 901 902 default, generic error message. feedback/ok markus & jsg 903 904 OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f 905 906commit 961411337719d4cd78f1ab33e4ac549f3fa22f50 907Author: djm@openbsd.org <djm@openbsd.org> 908Date: Sat Jan 8 07:32:45 2022 +0000 909 910 upstream: refactor tilde_expand_filename() and make it handle ~user 911 912 paths with no trailing slash; feedback/ok markus and jsg 913 914 OpenBSD-Commit-ID: a2ab365598a902f0f14ba6a4f8fb2d07a9b5d51d 915 916commit dc38236ab6827dec575064cac65c8e7035768773 917Author: dtucker@openbsd.org <dtucker@openbsd.org> 918Date: Thu Jan 6 22:14:25 2022 +0000 919 920 upstream: Don't explicitly set HostbasedAuthentication in 921 922 sshd_config. It defaults to "no", and not explicitly setting it allows us to 923 enable it for the (optional) hostbased test. 924 925 OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c 926 927commit e12d912ddf1c873cb72e5de9a197afbe0b6622d2 928Author: dtucker@openbsd.org <dtucker@openbsd.org> 929Date: Thu Jan 6 21:46:56 2022 +0000 930 931 upstream: Add test for hostbased auth. It requires some external 932 933 setup (see comments at the top) and thus is disabled unless 934 TEST_SSH_HOSTBASED_AUTH and SUDO are set. 935 936 OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a 937 938commit a48533a8da6a0f4f05ecd055dc8048047e53569e 939Author: Damien Miller <djm@mindrot.org> 940Date: Fri Jan 7 09:24:26 2022 +1100 941 942 depend 943 944commit d9dbb5d9a0326e252d3c7bc13beb9c2434f59409 945Author: djm@openbsd.org <djm@openbsd.org> 946Date: Thu Jan 6 22:06:51 2022 +0000 947 948 upstream: allow hostbased auth to select RSA keys when only 949 950 RSA/SHA2 are configured (this is the default case); ok markus@ 951 952 OpenBSD-Commit-ID: 411c18c7bde40c60cc6dfb7017968577b4d4a827 953 954commit fdb1d58d0d3888b042e5a500f6ce524486aaf782 955Author: djm@openbsd.org <djm@openbsd.org> 956Date: Thu Jan 6 22:05:42 2022 +0000 957 958 upstream: add a helper function to match a key type to a list of 959 960 signature algorithms. RSA keys can make signatures with multiple algorithms, 961 so some special handling is required. ok markus@ 962 963 OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff 964 965commit 11e8c4309a5086a45fbbbc87d0af5323c6152914 966Author: djm@openbsd.org <djm@openbsd.org> 967Date: Thu Jan 6 22:04:20 2022 +0000 968 969 upstream: log some details on hostkeys that ssh loads for 970 971 hostbased authn ok markus@ 972 973 OpenBSD-Commit-ID: da17061fa1f0e58cb31b88478a40643e18233e38 974 975commit c6706f661739514a34125aa3136532a958929510 976Author: djm@openbsd.org <djm@openbsd.org> 977Date: Thu Jan 6 22:03:59 2022 +0000 978 979 upstream: log signature algorithm during verification by monitor; 980 981 ok markus 982 983 OpenBSD-Commit-ID: 02b92bb42c4d4bf05a051702a56eb915151d9ecc 984 985commit 8832402bd500d1661ccc80a476fd563335ef6cdc 986Author: djm@openbsd.org <djm@openbsd.org> 987Date: Thu Jan 6 22:02:52 2022 +0000 988 989 upstream: piece of UpdateHostkeys client strictification: when 990 991 updating known_hosts with new keys, ignore NULL keys (forgot to include in 992 prior commit) 993 994 OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08 995 996commit c2d9ced1da0276961d86690b3bd7ebdaca7fdbf7 997Author: djm@openbsd.org <djm@openbsd.org> 998Date: Thu Jan 6 22:01:14 2022 +0000 999 1000 upstream: include rejected signature algorithm in error message 1001 1002 and not the (useless) key type; ok markus 1003 1004 OpenBSD-Commit-ID: 4180b5ec7ab347b43f84e00b1972515296dab023 1005 1006commit 7aa7b096cf2bafe2777085abdeed5ce00581f641 1007Author: djm@openbsd.org <djm@openbsd.org> 1008Date: Thu Jan 6 22:00:18 2022 +0000 1009 1010 upstream: make ssh-keysign use the requested signature algorithm 1011 1012 and not the default for the keytype. Part of unbreaking hostbased auth for 1013 RSA/SHA2 keys. ok markus@ 1014 1015 OpenBSD-Commit-ID: b5639a14462948970da3a8020dc06f9a80ecccdc 1016 1017commit 291721bc7c840d113a49518f3fca70e86248b8e8 1018Author: djm@openbsd.org <djm@openbsd.org> 1019Date: Thu Jan 6 21:57:28 2022 +0000 1020 1021 upstream: stricter UpdateHostkey signature verification logic on 1022 1023 the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when 1024 RSA/SHA1 was explicitly negotiated during initial KEX; bz3375 1025 1026 ok markus@ 1027 1028 OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29 1029 1030commit 0fa33683223c76289470a954404047bc762be84c 1031Author: djm@openbsd.org <djm@openbsd.org> 1032Date: Thu Jan 6 21:55:23 2022 +0000 1033 1034 upstream: Fix signature algorithm selection logic for 1035 1036 UpdateHostkeys on the server side. The previous code tried to prefer RSA/SHA2 1037 for hostkey proofs of RSA keys, but missed some cases. This will use RSA/SHA2 1038 signatures for RSA keys if the client proposed these algorithms in initial 1039 KEX. bz3375 1040 1041 Mostly by Dmitry Belyavskiy with some tweaks by me. 1042 1043 ok markus@ 1044 1045 OpenBSD-Commit-ID: c17ba0c3236340d2c6a248158ebed042ac6a8029 1046 1047commit 17877bc81db3846e6e7d4cfb124d966bb9c9296b 1048Author: djm@openbsd.org <djm@openbsd.org> 1049Date: Thu Jan 6 21:48:38 2022 +0000 1050 1051 upstream: convert ssh, sshd mainloops from select() to poll(); 1052 1053 feedback & ok deraadt@ and markus@ has been in snaps for a few months 1054 1055 OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c 1056 1057commit 5c79952dfe1aa36105c93b3f383ce9be04dee384 1058Author: djm@openbsd.org <djm@openbsd.org> 1059Date: Thu Jan 6 21:46:23 2022 +0000 1060 1061 upstream: prepare for conversion of ssh, sshd mainloop from 1062 1063 select() to poll() by moving FD_SET construction out of channel handlers into 1064 separate functions. ok markus 1065 1066 OpenBSD-Commit-ID: 937fbf2a4de12b19fb9d5168424e206124807027 1067 1068commit 24c5187edfef4651a625b7d5d692c8c7e794f71f 1069Author: djm@openbsd.org <djm@openbsd.org> 1070Date: Wed Jan 5 21:54:37 2022 +0000 1071 1072 upstream: add a comment so I don't make this mistake again 1073 1074 OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e 1075 1076commit 7369900441929058263a17f56aa67e05ff7ec628 1077Author: djm@openbsd.org <djm@openbsd.org> 1078Date: Wed Jan 5 21:50:00 2022 +0000 1079 1080 upstream: fix cut-and-pasto in error message 1081 1082 OpenBSD-Commit-ID: 4cc5c619e4b456cd2e9bb760d17e3a9c84659198 1083 1084commit 294c11b1c7d56d3fb61e329603a782315ed70c62 1085Author: djm@openbsd.org <djm@openbsd.org> 1086Date: Wed Jan 5 08:25:05 2022 +0000 1087 1088 upstream: select all RSA hostkey algorithms for UpdateHostkeys tests, 1089 1090 not just RSA-SHA1 1091 1092 OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8 1093 1094commit 2ea1108c30e3edb6f872dfc1e6da10b041ddf2c0 1095Author: djm@openbsd.org <djm@openbsd.org> 1096Date: Wed Jan 5 04:56:15 2022 +0000 1097 1098 upstream: regress test both sshsig message hash algorithms, possible 1099 1100 now because the algorithm is controllable via the CLI 1101 1102 OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f 1103 1104commit 2327c306b5d4a2b7e71178e5a4d139af9902c2b0 1105Author: djm@openbsd.org <djm@openbsd.org> 1106Date: Wed Jan 5 04:50:11 2022 +0000 1107 1108 upstream: allow selection of hash at sshsig signing time; code 1109 1110 already supported either sha512 (default) or sha256, but plumbing wasn't 1111 there mostly by Linus Nordberg 1112 1113 OpenBSD-Commit-ID: 1b536404b9da74a84b3a1c8d0b05fd564cdc96cd 1114 1115commit 56e941d0a00d6d8bae88317717d5e1b7395c9529 1116Author: djm@openbsd.org <djm@openbsd.org> 1117Date: Wed Jan 5 04:27:54 2022 +0000 1118 1119 upstream: add missing -O option to usage() for ssh-keygen -Y sign; 1120 1121 from Linus Nordberg 1122 1123 OpenBSD-Commit-ID: 4e78feb4aa830727ab76bb2e3d940440ae1d7af0 1124 1125commit 141a14ec9b0924709c98df2dd8013bde5d8d12c7 1126Author: djm@openbsd.org <djm@openbsd.org> 1127Date: Wed Jan 5 04:27:01 2022 +0000 1128 1129 upstream: move sig_process_opts() to before sig_sign(); no 1130 1131 functional code change 1132 1133 OpenBSD-Commit-ID: da02d61f5464f72b4e8b299f83e93c3b657932f9 1134 1135commit 37a14249ec993599a9051731e4fb0ac5e976aec1 1136Author: djm@openbsd.org <djm@openbsd.org> 1137Date: Wed Jan 5 04:10:39 2022 +0000 1138 1139 upstream: regression test for find-principals NULL deref; from Fabian 1140 1141 Stelzer 1142 1143 OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5 1144 1145commit eb1f042142fdaba93f6c9560cf6c91ae25f6884a 1146Author: djm@openbsd.org <djm@openbsd.org> 1147Date: Wed Jan 5 04:02:42 2022 +0000 1148 1149 upstream: NULL deref when using find-principals when matching an 1150 1151 allowed_signers line that contains a namespace restriction, but no 1152 restriction specified on the command-line; report and fix from Fabian Stelzer 1153 1154 OpenBSD-Commit-ID: 4a201b86afb668c908d1a559c6af456a61f4b145 1155 1156commit 8f3b18030579f395eca2181da31a5f945af12a59 1157Author: dtucker@openbsd.org <dtucker@openbsd.org> 1158Date: Tue Jan 4 08:38:53 2022 +0000 1159 1160 upstream: Log command invocation while debugging. 1161 1162 This will aid in manually reproducing failing commands. 1163 1164 OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a 1165 1166commit bbf285164df535f0d38c36237f007551bbdae27f 1167Author: Darren Tucker <dtucker@dtucker.net> 1168Date: Sun Dec 26 10:31:15 2021 +1100 1169 1170 Always save config.h as build artifact. 1171 1172 Should allow better comparison between failing and succeeding test 1173 platforms. 1174 1175commit 03bd4ed0db699687c5cd83405d26f81d2dc28d22 1176Author: Darren Tucker <dtucker@dtucker.net> 1177Date: Sat Dec 25 16:42:51 2021 +1100 1178 1179 Add OpenBSD 7.0 target. Retire 6.8. 1180 1181commit c45a752f0de611afd87755c2887c8a24816d08ee 1182Author: jsg@openbsd.org <jsg@openbsd.org> 1183Date: Sat Jan 1 05:55:06 2022 +0000 1184 1185 upstream: spelling 1186 1187 OpenBSD-Commit-ID: c63e43087a64d0727af13409c708938e05147b62 1188 1189commit c672f83a89a756564db0d3af9934ba0e1cf8fa3e 1190Author: djm@openbsd.org <djm@openbsd.org> 1191Date: Tue Jan 4 07:20:33 2022 +0000 1192 1193 upstream: unbreak test: was picking up system ssh-add instead of the 1194 1195 one supposedly being tested. Spotted by dtucker and using his VM zoo (which 1196 includes some systems old enough to lack ed25519 key support) 1197 1198 OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5 1199 1200commit a23698c3082ffe661abed14b020eac9b0c25eb9f 1201Author: djm@openbsd.org <djm@openbsd.org> 1202Date: Sat Jan 1 04:18:06 2022 +0000 1203 1204 upstream: fix memleak in process_extension(); oss-fuzz issue #42719 1205 1206 OpenBSD-Commit-ID: d8d49f840162fb7b8949e3a5adb8107444b6de1e 1207 1208commit cb885178f36b83d0f14cfe9f345d2068103feed0 1209Author: jsg@openbsd.org <jsg@openbsd.org> 1210Date: Sat Jan 1 01:55:30 2022 +0000 1211 1212 upstream: spelling ok dtucker@ 1213 1214 OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19 1215 1216commit 6b977f8080a32c5b3cbb9edb634b9d5789fb79be 1217Author: djm@openbsd.org <djm@openbsd.org> 1218Date: Sun Dec 26 23:34:41 2021 +0000 1219 1220 upstream: split method list search functionality from 1221 1222 authmethod_lookup() into a separate authmethod_byname(), for cases where we 1223 don't need to check whether a method is enabled, etc. 1224 1225 use this to fix the "none" authentication method regression reported 1226 by Nam Nguyen via bugs@ 1227 1228 ok deraadt@ 1229 1230 OpenBSD-Commit-ID: 8cd188dc3a83aa8abe5b7693e762975cd8ea8a17 1231 1232commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07 1233Author: jmc@openbsd.org <jmc@openbsd.org> 1234Date: Wed Dec 22 06:56:41 2021 +0000 1235 1236 upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text; 1237 1238 ok djm 1239 1240 OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965 1241 1242commit 1c9853a68b2319f2e5f929179735e8fbb9988a67 1243Author: Darren Tucker <dtucker@dtucker.net> 1244Date: Wed Dec 22 19:33:10 2021 +1100 1245 1246 Use SHA.*_HMAC_BLOCK_SIZE if needed. 1247 1248 If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH 1249 but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter. 1250 Should fix --without-openssl build on Solaris. 1251 1252commit 715c892f0a5295b391ae92c26ef4d6a86ea96e8e 1253Author: Damien Miller <djm@mindrot.org> 1254Date: Wed Dec 22 09:02:50 2021 +1100 1255 1256 remove sys/param.h in -portable, after upstream 1257 1258commit 7a7c69d8b4022b1e5c0afb169c416af8ce70f3e8 1259Author: Damien Miller <djm@mindrot.org> 1260Date: Mon Dec 20 13:05:20 2021 +1100 1261 1262 add agent-restrict.sh file, missed in last commit 1263 1264commit f539136ca51a4976644db5d0be8158cc1914c72a 1265Author: djm@openbsd.org <djm@openbsd.org> 1266Date: Sun Dec 19 22:20:12 2021 +0000 1267 1268 upstream: regression test for destination restrictions in ssh-agent 1269 1270 OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d 1271 1272commit 6e4980eb8ef94c04874a79dd380c3f568e8416d6 1273Author: anton@openbsd.org <anton@openbsd.org> 1274Date: Sat Dec 18 06:53:59 2021 +0000 1275 1276 upstream: Make use of ntests variable, pointed out by clang 13. 1277 1278 OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72 1279 1280commit 3eead8158393b697f663ec4301e3c7b6f24580b1 1281Author: deraadt@openbsd.org <deraadt@openbsd.org> 1282Date: Tue Dec 14 21:25:27 2021 +0000 1283 1284 upstream: sys/param.h cleanup, mostly using MINIMUM() and 1285 1286 <limits.h> ok dtucker 1287 1288 OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0 1289 1290commit 266678e19eb0e86fdf865b431b6e172e7a95bf48 1291Author: djm@openbsd.org <djm@openbsd.org> 1292Date: Sun Dec 19 22:15:42 2021 +0000 1293 1294 upstream: document host-bound publickey authentication 1295 1296 OpenBSD-Commit-ID: ea6ed91779a81f06d961e30ecc49316b3d71961b 1297 1298commit 3d00024b3b156aa9bbd05d105f1deb9cb088f6f7 1299Author: djm@openbsd.org <djm@openbsd.org> 1300Date: Sun Dec 19 22:15:21 2021 +0000 1301 1302 upstream: document agent protocol extensions 1303 1304 OpenBSD-Commit-ID: 09e8bb391bbaf24c409b75a4af44e0cac65405a7 1305 1306commit c385abf76511451bcba78568167b1cd9e90587d5 1307Author: djm@openbsd.org <djm@openbsd.org> 1308Date: Sun Dec 19 22:14:47 2021 +0000 1309 1310 upstream: PubkeyAuthentication=yes|no|unbound|host-bound 1311 1312 Allow control over which pubkey methods are used. Added out of 1313 concern that some hardware devices may have difficulty signing 1314 the longer pubkey authentication challenges. This provides a 1315 way for them to disable the extension. It's also handy for 1316 testing. 1317 1318 feedback / ok markus@ 1319 1320 OpenBSD-Commit-ID: ee52580db95c355cf6d563ba89974c210e603b1a 1321 1322commit 34b1e9cc7654f41cd4c5b1cc290b999dcf6579bb 1323Author: djm@openbsd.org <djm@openbsd.org> 1324Date: Sun Dec 19 22:14:12 2021 +0000 1325 1326 upstream: document destination-constrained keys 1327 1328 feedback / ok markus@ 1329 1330 OpenBSD-Commit-ID: cd8c526c77268f6d91c06adbee66b014d22d672e 1331 1332commit a6d7677c4abcfba268053e5867f2acabe3aa371b 1333Author: djm@openbsd.org <djm@openbsd.org> 1334Date: Sun Dec 19 22:13:55 2021 +0000 1335 1336 upstream: Use hostkey parsed from hostbound userauth request 1337 1338 Require host-bound userauth requests for forwarded SSH connections. 1339 1340 The hostkey parsed from the host-bound userauth request is now checked 1341 against the most recently bound session ID / hostkey on the agent socket 1342 and the signature refused if they do not match. 1343 1344 ok markus@ 1345 1346 OpenBSD-Commit-ID: d69877c9a3bd8d1189a5dbdeceefa432044dae02 1347 1348commit baaff0ff4357cc5a079621ba6e2d7e247b765061 1349Author: djm@openbsd.org <djm@openbsd.org> 1350Date: Sun Dec 19 22:13:33 2021 +0000 1351 1352 upstream: agent support for parsing hostkey-bound signatures 1353 1354 Allow parse_userauth_request() to work with blobs from 1355 publickey-hostbound-v00@openssh.com userauth attempts. 1356 1357 Extract hostkey from these blobs. 1358 1359 ok markus@ 1360 1361 OpenBSD-Commit-ID: 81c064255634c1109477dc65c3e983581d336df8 1362 1363commit 3e16365a79cdeb2d758cf1da6051b1c5266ceed7 1364Author: djm@openbsd.org <djm@openbsd.org> 1365Date: Sun Dec 19 22:13:12 2021 +0000 1366 1367 upstream: EXT_INFO negotiation of hostbound pubkey auth 1368 1369 the EXT_INFO packet gets a new publickey-hostbound@openssh.com to 1370 advertise the hostbound public key method. 1371 1372 Client side support to parse this feature flag and set the kex->flags 1373 indicator if the expected version is offered (currently "0"). 1374 1375 ok markus@ 1376 1377 OpenBSD-Commit-ID: 4cdb2ca5017ec1ed7a9d33bda95c1d6a97b583b0 1378 1379commit 94ae0c6f0e35903b695e033bf4beacea1d376bb1 1380Author: djm@openbsd.org <djm@openbsd.org> 1381Date: Sun Dec 19 22:12:54 2021 +0000 1382 1383 upstream: client side of host-bound pubkey authentication 1384 1385 Add kex->flags member to enable the publickey-hostbound-v00@openssh.com 1386 authentication method. 1387 1388 Use the new hostbound method in client if the kex->flags flag was set, 1389 and include the inital KEX hostkey in the userauth request. 1390 1391 Note: nothing in kex.c actually sets the new flag yet 1392 1393 ok markus@ 1394 1395 OpenBSD-Commit-ID: 5a6fce8c6c8a77a80ee1526dc467d91036a5910d 1396 1397commit 288fd0218dbfdcb05d9fbd1885904bed9b6d42e6 1398Author: djm@openbsd.org <djm@openbsd.org> 1399Date: Sun Dec 19 22:12:30 2021 +0000 1400 1401 upstream: sshd side of hostbound public key auth 1402 1403 This is identical to the standard "publickey" method, but it also includes 1404 the initial server hostkey in the message signed by the client. 1405 1406 feedback / ok markus@ 1407 1408 OpenBSD-Commit-ID: 7ea01bb7238a560c1bfb426fda0c10a8aac07862 1409 1410commit dbb339f015c33d63484261d140c84ad875a9e548 1411Author: djm@openbsd.org <djm@openbsd.org> 1412Date: Sun Dec 19 22:12:07 2021 +0000 1413 1414 upstream: prepare for multiple names for authmethods 1415 1416 allow authentication methods to have one additional name beyond their 1417 primary name. 1418 1419 allow lookup by this synonym 1420 1421 Use primary name for authentication decisions, e.g. for 1422 PermitRootLogin=publickey 1423 1424 Pass actual invoked name to the authmethods, so they can tell whether they 1425 were requested via the their primary name or synonym. 1426 1427 ok markus@ 1428 1429 OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559 1430 1431commit 39f00dcf44915f20684160f0a88d3ef8a3278351 1432Author: djm@openbsd.org <djm@openbsd.org> 1433Date: Sun Dec 19 22:11:39 2021 +0000 1434 1435 upstream: ssh-agent side of destination constraints 1436 1437 Gives ssh-agent the ability to parse restrict-destination-v00@openssh.com 1438 constraints and to apply them to keys. 1439 1440 Check constraints against the hostkeys recorded for a SocketEntry when 1441 attempting a signature, adding, listing or deleting keys. Note that 1442 the "delete all keys" request will remove constrained keys regardless of 1443 location. 1444 1445 feedback Jann Horn & markus@ 1446 ok markus@ 1447 1448 OpenBSD-Commit-ID: 84a7fb81106c2d609a6ac17469436df16d196319 1449 1450commit ce943912df812c573a33d00bf9e5435b7fcca3f7 1451Author: djm@openbsd.org <djm@openbsd.org> 1452Date: Sun Dec 19 22:11:06 2021 +0000 1453 1454 upstream: ssh-add side of destination constraints 1455 1456 Have ssh-add accept a list of "destination constraints" that allow 1457 restricting where keys may be used in conjunction with a ssh-agent/ssh 1458 that supports session ID/hostkey binding. 1459 1460 Constraints are specified as either "[user@]host-pattern" or 1461 "host-pattern>[user@]host-pattern". 1462 1463 The first form permits a key to be used to authenticate as the 1464 specified user to the specified host. 1465 1466 The second form permits a key that has previously been permitted 1467 for use at a host to be available via a forwarded agent to an 1468 additional host. 1469 1470 For example, constraining a key with "user1@host_a" and 1471 "host_a>host_b". Would permit authentication as "user1" at 1472 "host_a", and allow the key to be available on an agent forwarded 1473 to "host_a" only for authentication to "host_b". The key would not 1474 be visible on agent forwarded to other hosts or usable for 1475 authentication there. 1476 1477 Internally, destination constraints use host keys to identify hosts. 1478 The host patterns are used to obtain lists of host keys for that 1479 destination that are communicated to the agent. The user/hostkeys are 1480 encoded using a new restrict-destination-v00@openssh.com key 1481 constraint. 1482 1483 host keys are looked up in the default client user/system known_hosts 1484 files. It is possible to override this set on the command-line. 1485 1486 feedback Jann Horn & markus@ 1487 ok markus@ 1488 1489 OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5 1490 1491commit 5e950d765727ee0b20fc3d2cbb0c790b21ac2425 1492Author: djm@openbsd.org <djm@openbsd.org> 1493Date: Sun Dec 19 22:10:24 2021 +0000 1494 1495 upstream: ssh-add side of destination constraints 1496 1497 Have ssh-add accept a list of "destination constraints" that allow 1498 restricting where keys may be used in conjunction with a ssh-agent/ssh 1499 that supports session ID/hostkey binding. 1500 1501 Constraints are specified as either "[user@]host-pattern" or 1502 "host-pattern>[user@]host-pattern". 1503 1504 The first form permits a key to be used to authenticate as the 1505 specified user to the specified host. 1506 1507 The second form permits a key that has previously been permitted 1508 for use at a host to be available via a forwarded agent to an 1509 additional host. 1510 1511 For example, constraining a key with "user1@host_a" and 1512 "host_a>host_b". Would permit authentication as "user1" at 1513 "host_a", and allow the key to be available on an agent forwarded 1514 to "host_a" only for authentication to "host_b". The key would not 1515 be visible on agent forwarded to other hosts or usable for 1516 authentication there. 1517 1518 Internally, destination constraints use host keys to identify hosts. 1519 The host patterns are used to obtain lists of host keys for that 1520 destination that are communicated to the agent. The user/hostkeys are 1521 encoded using a new restrict-destination-v00@openssh.com key 1522 constraint. 1523 1524 host keys are looked up in the default client user/system known_hosts 1525 files. It is possible to override this set on the command-line. 1526 1527 feedback Jann Horn & markus@ 1528 ok markus@ 1529 1530 OpenBSD-Commit-ID: ef47fa9ec0e3c2a82e30d37ef616e245df73163e 1531 1532commit 4c1e3ce85e183a9d0c955c88589fed18e4d6a058 1533Author: djm@openbsd.org <djm@openbsd.org> 1534Date: Sun Dec 19 22:09:23 2021 +0000 1535 1536 upstream: ssh-agent side of binding 1537 1538 record session ID/hostkey/forwarding status for each active socket. 1539 1540 Attempt to parse data-to-be-signed at signature request time and extract 1541 session ID from the blob if it is a pubkey userauth request. 1542 1543 ok markus@ 1544 1545 OpenBSD-Commit-ID: a80fd41e292b18b67508362129e9fed549abd318 1546 1547commit e9497ecf73f3c16667288bce48d4e3d7e746fea1 1548Author: djm@openbsd.org <djm@openbsd.org> 1549Date: Sun Dec 19 22:08:48 2021 +0000 1550 1551 upstream: ssh client side of binding 1552 1553 send session ID, hostkey, signature and a flag indicating whether the 1554 agent connection is being forwarded to ssh agent each time a connection 1555 is opened via a new "session-bind@openssh.com" agent extension. 1556 1557 ok markus@ 1558 1559 OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135 1560 1561commit b42c61d6840d16ef392ed0f365e8c000734669aa 1562Author: djm@openbsd.org <djm@openbsd.org> 1563Date: Sun Dec 19 22:08:06 2021 +0000 1564 1565 upstream: Record session ID, host key and sig at intital KEX 1566 1567 These will be used later for agent session ID / hostkey binding 1568 1569 ok markus@ 1570 1571 OpenBSD-Commit-ID: a9af29e33772b18e3e867c6fa8ab35e1694a81fe 1572 1573commit 26ca33d186473d58a32d812e19273ce078b6ffff 1574Author: djm@openbsd.org <djm@openbsd.org> 1575Date: Tue Dec 7 22:06:45 2021 +0000 1576 1577 upstream: better error message for FIDO keys when we can't match 1578 1579 them to a token 1580 1581 OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650 1582 1583commit adb0ea006d7668190f0c42aafe3a2864d352e34a 1584Author: Darren Tucker <dtucker@dtucker.net> 1585Date: Wed Dec 15 10:50:33 2021 +1100 1586 1587 Correct value for IPTOS_DSCP_LE. 1588 1589 It needs to allow for the preceeding two ECN bits. From daisuke.higashi 1590 at gmail.com via OpenSSH bz#3373, ok claudio@, job@, djm@. 1591 1592commit 3dafd3fe220bd9046f11fcf5191a79ec8800819f 1593Author: Darren Tucker <dtucker@dtucker.net> 1594Date: Fri Dec 10 11:57:30 2021 +1100 1595 1596 Increase timeout for test step. 1597 1598commit 5aefb05cd5b843e975b191d6ebb7ddf8de35c112 1599Author: Darren Tucker <dtucker@dtucker.net> 1600Date: Fri Dec 10 10:27:27 2021 +1100 1601 1602 Update the list of tests that don't work on Minix. 1603 1604 While there, remove CC (configure will now find clang) and make the test 1605 list easier to update via cut and paste. 1606 1607commit 1c09bb1b2e207d091cec299c49416c23d24a1b31 1608Author: Darren Tucker <dtucker@dtucker.net> 1609Date: Fri Dec 10 10:12:57 2021 +1100 1610 1611 Add minix host tuple. 1612 1613 Define SETEUID_BREAKS_SETUID for it which should make privsep work. 1614 1615commit a2188579032cf080213a78255373263466cb90cc 1616Author: jsg@openbsd.org <jsg@openbsd.org> 1617Date: Sun Dec 5 12:28:27 2021 +0000 1618 1619 upstream: fix unintended sizeof pointer in debug path ok markus@ 1620 1621 OpenBSD-Commit-ID: b9c0481ffc0cd801e0840e342e6a282a85aac93c 1622 1623commit da40355234068c82f1a36196f2d18dd2d81aaafd 1624Author: naddy@openbsd.org <naddy@openbsd.org> 1625Date: Sat Dec 4 00:05:39 2021 +0000 1626 1627 upstream: RSA/SHA-1 is not used by default anymore on the server 1628 1629 OpenBSD-Commit-ID: 64abef6cfc3e53088225f6b8a1dcd86d52dc8353 1630 1631commit e9c71498a083a8b502aa831ea931ce294228eda0 1632Author: djm@openbsd.org <djm@openbsd.org> 1633Date: Thu Dec 2 23:45:36 2021 +0000 1634 1635 upstream: hash full host:port when asked to hash output, fixes hashes 1636 1637 for non- default ports. bz3367 ok dtucker@ 1638 1639 OpenBSD-Commit-ID: 096021cc847da7318ac408742f2d0813ebe9aa73 1640 1641commit b5601202145a03106012c22cb8980bcac2949f0b 1642Author: djm@openbsd.org <djm@openbsd.org> 1643Date: Thu Dec 2 23:23:13 2021 +0000 1644 1645 upstream: improve the testing of credentials against inserted FIDO 1646 1647 keys a little more: ask the token whether a particular key belongs to it in 1648 cases where the token support on-token user- verification (e.g. biometrics) 1649 rather than just assuming that it will accept it. 1650 1651 Will reduce spurious "Confirm user presence" notifications for key 1652 handles that relate to FIDO keys that are not currently inserted in at 1653 least some cases. 1654 1655 Motivated by bz3366; by Pedro Martelletto 1656 1657 OpenBSD-Commit-ID: ffac7f3215842397800e1ae2e20229671a55a63d 1658 1659commit ca709e27c41c90f4565b17282c48dca7756e083c 1660Author: djm@openbsd.org <djm@openbsd.org> 1661Date: Thu Dec 2 22:40:05 2021 +0000 1662 1663 upstream: move check_sk_options() up so we can use it earlier 1664 1665 OpenBSD-Commit-ID: 67fe98ba1c846d22035279782c4664c1865763b4 1666 1667commit b711bc01a7ec76bb6a285730990cbce9b8ca5773 1668Author: dtucker@openbsd.org <dtucker@openbsd.org> 1669Date: Thu Dec 2 22:35:05 2021 +0000 1670 1671 upstream: ssh-rsa is no longer in the default for 1672 1673 PubkeyAcceptedAlgorithms. 1674 1675 OpenBSD-Commit-ID: 34a9e1bc30966fdcc922934ae00f09f2596cd73c 1676 1677commit dc91ceea33cd4a9f05be953e8d8062f732db5c8a 1678Author: djm@openbsd.org <djm@openbsd.org> 1679Date: Thu Dec 2 02:44:44 2021 +0000 1680 1681 upstream: don't put the tty into raw mode when SessionType=none, avoids 1682 1683 ^c being unable to kill such a session. bz3360; ok dtucker@ 1684 1685 OpenBSD-Commit-ID: 83960c433052303b643b4c380ae2f799ac896f65 1686 1687commit e6e7d2654a13ba10141da7b42ea683ea4eeb1f38 1688Author: Damien Miller <djm@mindrot.org> 1689Date: Mon Nov 29 14:11:03 2021 +1100 1690 1691 previous commit broke bcrypt_pbkdf() 1692 1693 Accidentally reverted part of the conversion to use SHA512 from SUPERCOP 1694 instead of OpenBSD-style libc SHA512. 1695 1696commit c0459588b8d00b73e506c6095958ecfe62a4a7ba 1697Author: Darren Tucker <dtucker@dtucker.net> 1698Date: Mon Nov 29 14:03:19 2021 +1100 1699 1700 Fix typo in Neils' name. 1701 1702commit 158bf854e2a22cf09064305f4a4e442670562685 1703Author: Damien Miller <djm@mindrot.org> 1704Date: Mon Nov 29 12:30:22 2021 +1100 1705 1706 sync bcrypt-related files with OpenBSD 1707 1708 The main change is that Niels Provos kindly agreed to rescind the 1709 BSD license advertising clause, shifting them to the 3-term BSD 1710 license. 1711 1712 This was the last thing in OpenSSH that used the advertising clause. 1713 1714commit e8976d92a42883ff6b8991438f07df60c2c0d82d 1715Author: Damien Miller <djm@mindrot.org> 1716Date: Mon Nov 29 12:29:29 2021 +1100 1717 1718 depend 1719 1720commit 8249afeec013e557fe7491a72ca3285de03e25b1 1721Author: djm@openbsd.org <djm@openbsd.org> 1722Date: Sun Nov 28 07:21:26 2021 +0000 1723 1724 upstream: sshsig: return "key not found" when searching empty files 1725 1726 rather than "internal error" 1727 1728 OpenBSD-Commit-ID: e2ccae554c78d7a7cd33fc5d217f35be7e2507ed 1729 1730commit 9e3227d4dbb5ad9c9091b4c14982cab4bba87b4d 1731Author: djm@openbsd.org <djm@openbsd.org> 1732Date: Sun Nov 28 07:15:10 2021 +0000 1733 1734 upstream: ssh-keygen -Y match-principals doesn't accept any -O 1735 1736 options at present, so don't say otherwise in SYNOPSIS; spotted jmc@ 1737 1738 OpenBSD-Commit-ID: 9cc43a18f4091010741930b48b3db2f2e4f1d35c 1739 1740commit 56db1f4a4cf5039fc3b42e84c4b16291fdff32b1 1741Author: djm@openbsd.org <djm@openbsd.org> 1742Date: Sun Nov 28 07:14:29 2021 +0000 1743 1744 upstream: fix indenting in last commit 1745 1746 OpenBSD-Commit-ID: 8b9ba989815d0dec1fdf5427a4a4b58eb9cac4d2 1747 1748commit 50bea24a9a9bdebad327c76e700def3261f5694e 1749Author: djm@openbsd.org <djm@openbsd.org> 1750Date: Sun Nov 28 07:10:18 2021 +0000 1751 1752 upstream: missing initialisation for oerrno 1753 1754 OpenBSD-Commit-ID: 05d646bba238080259bec821c831a6f0b48d2a95 1755 1756commit 5a0f4619041d09cd29f3a08da41db5040372bdd1 1757Author: Darren Tucker <dtucker@dtucker.net> 1758Date: Sun Nov 28 15:31:37 2021 +1100 1759 1760 Correct ifdef to activate poll() only if needed. 1761 1762commit d4035c81a71237f690edd7eda32bef7d63fd9528 1763Author: djm@openbsd.org <djm@openbsd.org> 1764Date: Sat Nov 27 07:23:35 2021 +0000 1765 1766 upstream: whitespac e 1767 1768 OpenBSD-Regress-ID: b9511d41568056bda489e13524390167889908f8 1769 1770commit a443491e6782ef0f5a8bb87a5536c8ee4ff233a1 1771Author: djm@openbsd.org <djm@openbsd.org> 1772Date: Sat Nov 27 07:20:58 2021 +0000 1773 1774 upstream: regression test for match-principals. Mostly by Fabian 1775 1776 Stelzer 1777 1778 OpenBSD-Regress-ID: ced0bec89af90935103438986bbbc4ad1df9cfa7 1779 1780commit 78230b3ec8cbabc1e7de68732dc5cbd4837c6675 1781Author: djm@openbsd.org <djm@openbsd.org> 1782Date: Sat Nov 27 07:14:46 2021 +0000 1783 1784 upstream: Add ssh-keygen -Y match-principals operation to perform 1785 1786 matching of principals names against an allowed signers file. 1787 1788 Requested by and mostly written by Fabian Stelzer, towards a TOFU 1789 model for SSH signatures in git. Some tweaks by me. 1790 1791 "doesn't bother me" deraadt@ 1792 1793 OpenBSD-Commit-ID: 8d1b71f5a4127bc5e10a880c8ea6053394465247 1794 1795commit 15db86611baaafb24c40632784dabf82e3ddb1a7 1796Author: djm@openbsd.org <djm@openbsd.org> 1797Date: Thu Nov 25 23:02:24 2021 +0000 1798 1799 upstream: debug("func: ...") -> debug_f("...") 1800 1801 OpenBSD-Commit-ID: d58494dc05c985326a895adfbe16fbd5bcc54347 1802 1803commit b7ffbb17e37f59249c31f1ff59d6c5d80888f689 1804Author: Darren Tucker <dtucker@dtucker.net> 1805Date: Fri Nov 19 18:53:46 2021 +1100 1806 1807 Allow for fd = -1 in compat ppoll overflow check. 1808 1809 Fixes tests on at least FreeBSD 6, possibly others. 1810 1811commit 04b172da5b96a51b0d55c905b423ababff9f4e0b 1812Author: Darren Tucker <dtucker@dtucker.net> 1813Date: Fri Nov 19 16:01:51 2021 +1100 1814 1815 Don't auto-enable Capsicum sandbox on FreeBSD 9/10. 1816 1817 Since we changed from select() to ppoll() tests have been failing. 1818 This seems to be because FreeBSD 10 (and presumably 9) do not allow 1819 ppoll() in the privsep process and sshd will fail with "Not permitted in 1820 capability mode". Setting CAP_EVENT on the FDs doesn't help, but weirdly, 1821 poll() works without that. Those versions are EOL so this situation is 1822 unlikely to change. 1823 1824commit a823f39986e7b879f26412e64c15630e1cfa0dc5 1825Author: djm@openbsd.org <djm@openbsd.org> 1826Date: Thu Nov 18 03:53:48 2021 +0000 1827 1828 upstream: regression test for ssh-keygen -Y find-principals fix; from 1829 1830 Fabian Stelzer ok djm markus 1831 1832 OpenBSD-Regress-ID: 34fe4088854c1a2eb4c0c51cc4676ba24096bac4 1833 1834commit 199c4df66c0e39dd5c3333b162af274678c0501d 1835Author: djm@openbsd.org <djm@openbsd.org> 1836Date: Thu Nov 18 21:32:11 2021 +0000 1837 1838 upstream: less confusing debug message; bz#3365 1839 1840 OpenBSD-Commit-ID: 836268d3642c2cdc84d39b98d65837f5241e4a50 1841 1842commit 97f9b6e61316c97a32dad94b7a37daa9b5f6b836 1843Author: djm@openbsd.org <djm@openbsd.org> 1844Date: Thu Nov 18 21:11:01 2021 +0000 1845 1846 upstream: avoid xmalloc(0) for PKCS#11 keyid for ECDSA keys (we 1847 1848 already did this for RSA keys). Avoids fatal errors for PKCS#11 libraries 1849 that return empty keyid, e.g. Microchip ATECC608B "cryptoauthlib"; bz#3364 1850 1851 OpenBSD-Commit-ID: 054d4dc1d6a99a2e6f8eebc48207b534057c154d 1852 1853commit c74aa0eb73bd1edf79947d92d9c618fc3424c4a6 1854Author: djm@openbsd.org <djm@openbsd.org> 1855Date: Thu Nov 18 03:50:41 2021 +0000 1856 1857 upstream: ssh-keygen -Y find-principals was verifying key validity 1858 1859 when using ca certs but not with simple key lifetimes within the allowed 1860 signers file. 1861 1862 Since it returns the first keys principal it finds this could 1863 result in a principal with an expired key even though a valid 1864 one is just below. 1865 1866 patch from Fabian Stelzer; feedback/ok djm markus 1867 1868 OpenBSD-Commit-ID: b108ed0a76b813226baf683ab468dc1cc79e0905 1869 1870commit d902d728dfd81622454260e23bc09d5e5a9a795e 1871Author: Darren Tucker <dtucker@dtucker.net> 1872Date: Thu Nov 18 23:44:07 2021 +1100 1873 1874 Correct calculation of tv_nsec in poll(). 1875 1876commit 21dd5a9a3fb35e8299a1fbcf8d506f1f6b752b85 1877Author: Darren Tucker <dtucker@dtucker.net> 1878Date: Thu Nov 18 23:11:37 2021 +1100 1879 1880 Add compat implementation of ppoll using pselect. 1881 1882commit b544ce1ad4afb7ee2b09f714aa63efffc73fa93a 1883Author: Darren Tucker <dtucker@dtucker.net> 1884Date: Thu Nov 18 23:05:34 2021 +1100 1885 1886 Put poll.h inside ifdef HAVE_POLL_H. 1887 1888commit 875408270c5a7dd69ed5449e5d85bd7120c88f70 1889Author: djm@openbsd.org <djm@openbsd.org> 1890Date: Thu Nov 18 03:31:44 2021 +0000 1891 1892 upstream: check for POLLHUP wherever we check for POLLIN 1893 1894 OpenBSD-Commit-ID: 6aa6f3ec6b17c3bd9bfec672a917f003a76d93e5 1895 1896commit 36b5e37030d35bbaa18ba56825b1af55971d18a0 1897Author: djm@openbsd.org <djm@openbsd.org> 1898Date: Thu Nov 18 03:07:59 2021 +0000 1899 1900 upstream: fd leak in sshd listen loop error path; from Gleb 1901 1902 Smirnoff 1903 1904 OpenBSD-Commit-ID: a7a2be27a690a74bf2381bc16cea38e265657412 1905 1906commit b99498d0c93f1edd04857b318308a66b28316bd8 1907Author: djm@openbsd.org <djm@openbsd.org> 1908Date: Thu Nov 18 03:07:20 2021 +0000 1909 1910 upstream: check for POLLHUP as well as POLLIN in sshd listen loop; 1911 1912 ok deraadt millert 1913 1914 OpenBSD-Commit-ID: a4f1244c5a9c2b08dac4f3b1dc22e9d1dc60c587 1915 1916commit 1f3055d788e8cf80851eb1728b535d57eb0dba6a 1917Author: djm@openbsd.org <djm@openbsd.org> 1918Date: Thu Nov 18 03:06:03 2021 +0000 1919 1920 upstream: check for POLLHUP as well as POLLIN, handle transient IO 1921 1922 errors as well as half-close on the output side; ok deraadt millert 1923 1924 OpenBSD-Commit-ID: de5c5b9939a37476d256328cbb96305bdecf511e 1925 1926commit 9778a15fa6dbdac6a95bf15865c2688b4bd6944e 1927Author: Damien Miller <djm@mindrot.org> 1928Date: Thu Nov 18 10:16:55 2021 +1100 1929 1930 adjust seccomp filter for select->poll conversion 1931 1932 Needed to add ppoll syscall but also to relax the fallback rlimit 1933 sandbox. Linux poll() fails with EINVAL if npfds > RLIMIT_NOFILE, 1934 so we have to allow a single fd in the rlimit. 1935 1936commit fcd8d895bbb849c64f0aed934e3303d37f696f5d 1937Author: Damien Miller <djm@mindrot.org> 1938Date: Thu Nov 18 10:16:44 2021 +1100 1939 1940 update depends 1941 1942commit 76292787a1e93e668f10e36b4bf59ce0ae28e156 1943Author: Damien Miller <djm@mindrot.org> 1944Date: Thu Nov 18 09:26:20 2021 +1100 1945 1946 compat for timespecsub() and friends 1947 1948commit fd7e7de4ddb4399c7e929b44f2bbfc118eddfcf8 1949Author: djm@openbsd.org <djm@openbsd.org> 1950Date: Wed Nov 17 21:06:39 2021 +0000 1951 1952 upstream: set num_listen_socks to 0 on close-all instead of -1, 1953 1954 which interferes with the new poll()-based listen loop; spotted and debugged 1955 by anton@+deraadt@ 1956 1957 OpenBSD-Commit-ID: f7ab8ab124f615a2e0c45fee14c38d2f2abbabbd 1958 1959commit fd9343579afac30a971f06643a669733d9acb407 1960Author: deraadt@openbsd.org <deraadt@openbsd.org> 1961Date: Sun Nov 14 18:47:43 2021 +0000 1962 1963 upstream: use ppoll() instead of pselect() with djm 1964 1965 OpenBSD-Commit-ID: 980f87c9564d5d2ad55722b7a6f44f21284cd215 1966 1967commit 092d29b232ef1a19609a5316ed7e4d896bb2e696 1968Author: deraadt@openbsd.org <deraadt@openbsd.org> 1969Date: Sun Nov 14 06:15:36 2021 +0000 1970 1971 upstream: match .events with .fd better 1972 1973 OpenBSD-Commit-ID: 77eef212ca0add905949532af390164489c5984b 1974 1975commit 8d642c9a90fa4ed5a3effd785fb3591e14de00cd 1976Author: deraadt@openbsd.org <deraadt@openbsd.org> 1977Date: Sun Nov 14 03:25:10 2021 +0000 1978 1979 upstream: convert select() to poll() ok djm 1980 1981 OpenBSD-Commit-ID: b53e4940ff10dd24f8d16e8db8ef1970015d7ead 1982 1983commit 6582a31c388968f4073af2bd8621880735c3d42b 1984Author: deraadt@openbsd.org <deraadt@openbsd.org> 1985Date: Sat Nov 13 21:14:13 2021 +0000 1986 1987 upstream: replace select() with ppoll(), including converting 1988 1989 timeval's to timespec's to make things easier. back and forth and ok; djm 1990 1991 OpenBSD-Commit-ID: 89d3b23c60875da919e7820f9de6213286ffbec9 1992 1993commit 7c025c005550c86a40200a2bcdd355d09413d61a 1994Author: deraadt@openbsd.org <deraadt@openbsd.org> 1995Date: Sat Nov 13 17:26:13 2021 +0000 1996 1997 upstream: It really looks like pledge "stdio dns" is possible 1998 1999 earlier. Discussed with mestre 2000 2001 OpenBSD-Commit-ID: 610873de63a593e0ac7bbbcb7a0f2894d36f4c01 2002 2003commit 06acb04c20ee483fe4757bd12aec870cc4bb1076 2004Author: deraadt@openbsd.org <deraadt@openbsd.org> 2005Date: Fri Nov 12 05:23:49 2021 +0000 2006 2007 upstream: aggressively pre-fill the pollfd array with fd=-1 2008 2009 OpenBSD-Commit-ID: c2a525de8f83c1a04405bd79122c424140552a5b 2010 2011commit 7eec76793dec06e8f06b6cf71f9473141c69d109 2012Author: deraadt@openbsd.org <deraadt@openbsd.org> 2013Date: Thu Nov 11 15:32:32 2021 +0000 2014 2015 upstream: Convert from select() to ppoll(). Along the way, I 2016 2017 observed that the select() code was using exceptfds incorrectly.. ok millert 2018 2019 OpenBSD-Commit-ID: 548e05bfc31b2af02319eb3d051286d4128dec96 2020 2021commit e665ed2d0c24fe11d5470ce72fa1e187377d3fc4 2022Author: Darren Tucker <dtucker@dtucker.net> 2023Date: Fri Nov 12 22:55:27 2021 +1100 2024 2025 Switch from LibreSSL 3.4.0 to 3.4.1. 2026 2027 The LibreSSL 3.4.0 release has an OPENBSD_BRANCH that points to 2028 "master" and that branch no longer has the files LibreSSL expects 2029 and thus it will no longer build, breaking the test. 2030 2031commit 21b6b5a06c8c53c548d25e6074c5240e88e2ef34 2032Author: djm@openbsd.org <djm@openbsd.org> 2033Date: Wed Nov 10 06:29:25 2021 +0000 2034 2035 upstream: add the sntrup761x25519-sha512@openssh.com hybrid 2036 2037 ECDH/x25519 + Streamlined NTRU Prime post-quantum KEX to the default 2038 KEXAlgorithms list (after the ECDH methods but before the prime-group DH 2039 ones). 2040 2041 ok markus@ 2042 2043 OpenBSD-Commit-ID: 22b77e27a04e497a10e22f138107579652854210 2044 2045commit 239da797cbf07a640d7b1ea02d3f99ace3ef792d 2046Author: djm@openbsd.org <djm@openbsd.org> 2047Date: Wed Nov 10 06:25:08 2021 +0000 2048 2049 upstream: fix ssh-keysign for KEX algorithms that use SHA384/512 2050 2051 exchange hashes; feedback/ok markus@ 2052 2053 OpenBSD-Commit-ID: 09a8fda1c081f5de1e3128df64f28b7bdadee239 2054 2055commit 6997a592ecb1013df0c6d7f8df3e6517827aef11 2056Author: djm@openbsd.org <djm@openbsd.org> 2057Date: Mon Nov 8 21:32:49 2021 +0000 2058 2059 upstream: improve error message when trying to expand a ~user path 2060 2061 for a user that doesn't exist; better matches what the shell does 2062 2063 ok deraadt@ 2064 2065 OpenBSD-Commit-ID: 1ddefa3c3a78b69ce13d1b8f67bc9f2cefd23ad6 2066 2067commit 10b899a15c88eb40eb5f73cd0fa84ef0966f79c9 2068Author: Darren Tucker <dtucker@dtucker.net> 2069Date: Wed Nov 10 12:34:25 2021 +1100 2070 2071 Don't trust closefrom() on Linux. 2072 2073 glibc's closefrom implementation does not work in a chroot when the kernel 2074 does not have close_range. It tries to read from /proc/self/fd and when 2075 that fails dies with an assertion of sorts. Instead, call close_range 2076 ourselves from our compat code and fall back if that fails. bz#3349, 2077 with william.wilson at canonical.com and fweimer at redhat.com. 2078 2079commit eb1f63195a9a38b519536a5b398d9939261ec081 2080Author: dtucker@openbsd.org <dtucker@openbsd.org> 2081Date: Sat Nov 6 10:13:39 2021 +0000 2082 2083 upstream: Plug a couple of minor mem leaks. From beldmit at 2084 2085 gmail.com via github PR#283, ok markus@ 2086 2087 OpenBSD-Commit-ID: ec1fa7d305d46226861c3ca6fb9c9beb2ada2892 2088 2089commit e4f501bf1d3b53f1cc23d9521fd7c5163307b760 2090Author: djm@openbsd.org <djm@openbsd.org> 2091Date: Fri Nov 5 03:10:58 2021 +0000 2092 2093 upstream: move cert_filter_principals() to earlier in the file for 2094 2095 reuse; no code change 2096 2097 OpenBSD-Commit-ID: 598fa9528b656b2f38bcc3cf5b6f3869a8c115cf 2098 2099commit 59c60f96fee321c7f38f00372826d37f289534af 2100Author: deraadt@openbsd.org <deraadt@openbsd.org> 2101Date: Wed Nov 3 22:00:56 2021 +0000 2102 2103 upstream: Many downstreams expect ssh to compile as non-C99... 2104 2105 OpenBSD-Commit-ID: e6aa3e08bda68e5fb838fc8a49b1d2dfc38ee783 2106 2107commit 7a78fe63b0b28ef7231913dfefe9d08f9bc41c61 2108Author: Darren Tucker <dtucker@dtucker.net> 2109Date: Sat Nov 6 21:07:03 2021 +1100 2110 2111 Skip getline() on HP-UX 10.x. 2112 2113 HP-UX 10.x has a getline() implementation in libc that does not behave 2114 as we expect so don't use it. With correction from Thorsten Glaser and 2115 typo fix from Larkin Nickle. 2116 2117commit 343ae252ebb35c6ecae26b447bf1551a7666720e 2118Author: Damien Miller <djm@mindrot.org> 2119Date: Wed Nov 3 12:08:21 2021 +1100 2120 2121 basic SECURITY.md (refers people to the website) 2122 2123commit ed45a0168638319e0a710633f6085b96b9cec656 2124Author: djm@openbsd.org <djm@openbsd.org> 2125Date: Tue Nov 2 22:57:27 2021 +0000 2126 2127 upstream: crank SSH_SK_VERSION_MAJOR to match recent change in 2128 2129 usr/bin/ssh 2130 2131 OpenBSD-Regress-ID: 113d181c7e3305e138db9b688cdb8b0a0019e552 2132 2133commit f3c34df860c4c1ebddacb973954e58167d9dbade 2134Author: djm@openbsd.org <djm@openbsd.org> 2135Date: Tue Nov 2 22:56:40 2021 +0000 2136 2137 upstream: Better handle FIDO keys on tokens that provide user 2138 2139 verification (UV) on the device itself, including biometric keys. 2140 2141 Query the token during key creation to determine whether it supports 2142 on-token UV and, if so, clear the SSH_SK_USER_VERIFICATION_REQD flag 2143 in the key so that ssh(1) doesn't automatically prompty for PIN later. 2144 2145 When making signatures with the key, query the token's capabilities 2146 again and check whether the token is able (right now) to perform user- 2147 verification without a PIN. If it is then the PIN prompt is bypassed 2148 and user verification delegated to the token. If not (e.g. the token 2149 is biometric capable, but no biometric are enrolled), then fall back 2150 to user verification via the usual PIN prompt. 2151 2152 Work by Pedro Martelletto; ok myself and markus@ 2153 2154 NB. cranks SSH_SK_VERSION_MAJOR 2155 2156 OpenBSD-Commit-ID: e318a8c258d9833a0b7eb0236cdb68b5143b2f27 2157 2158commit 0328a081f38c09d2d4d650e94461a47fb5eef536 2159Author: djm@openbsd.org <djm@openbsd.org> 2160Date: Fri Oct 29 03:03:06 2021 +0000 2161 2162 upstream: sshsig: add tests for signing key validity and 2163 2164 find-principals 2165 2166 - adds generic find-principals tests (this command had none before) 2167 - tests certs with a timeboxed validity both with and without a 2168 restriced lifetime for the CA 2169 - test for a revoked CA cert 2170 2171 by Fabian Stelzer 2172 2173 OpenBSD-Regress-ID: 9704b2c6df5b8ccfbdf2c06c5431f5f8cad280c9 2174 2175commit ccd358e1e25e25c13f0825996283cbf7a1647a3b 2176Author: djm@openbsd.org <djm@openbsd.org> 2177Date: Fri Oct 29 02:48:19 2021 +0000 2178 2179 upstream: avoid signedness warning; spotted in -portable 2180 2181 OpenBSD-Regress-ID: 4cacc126086487c0ea7f3d86b42dec458cf0d0c6 2182 2183commit 2741f52beb11490d7033a25e56ed0496f0c78006 2184Author: djm@openbsd.org <djm@openbsd.org> 2185Date: Fri Oct 29 03:20:46 2021 +0000 2186 2187 upstream: ssh-keygen: make verify-time argument parsing optional 2188 2189 From Fabian Stelzer 2190 2191 OpenBSD-Commit-ID: 1ff35e4c366a45a073663df90381be6a8ef4d370 2192 2193commit a1217d363b88b32cfe54c4f02c6c1cf4bdefdd23 2194Author: Damien Miller <djm@mindrot.org> 2195Date: Fri Oct 29 13:48:34 2021 +1100 2196 2197 unbreak fuzz harness for recent changes 2198 2199commit 68e522ed8183587c9367fa3842c5b75f64f3d12b 2200Author: Darren Tucker <dtucker@dtucker.net> 2201Date: Fri Oct 29 13:32:24 2021 +1100 2202 2203 Use -Wbitwise-instead-of-logical if supported. 2204 2205commit be28b23012aa3fa323be7ec84863cf238927c078 2206Author: Damien Miller <djm@mindrot.org> 2207Date: Thu Oct 28 16:24:53 2021 +1100 2208 2209 use -Wmisleading-indentation cflag if available 2210 2211 ok dtucker@ 2212 2213commit 2e6f5f24dd2f9217f4ab8b737ed428d5d5278f91 2214Author: Damien Miller <djm@mindrot.org> 2215Date: Thu Oct 28 16:24:44 2021 +1100 2216 2217 depend 2218 2219commit a5ab4882348d26addc9830a44e053238dfa2cb58 2220Author: Damien Miller <djm@mindrot.org> 2221Date: Thu May 6 10:08:30 2021 +1000 2222 2223 remove built-in support for md5crypt() 2224 2225 Users of MD5-hashed password should arrange for ./configure to link 2226 against libxcrypt or similar. Though it would be better to avoid use 2227 of MD5 password hashing entirely, it's arguably worse than DEScrypt. 2228 2229 feedback and ok dtucker@ 2230 2231commit c5de1fffa6328b8246b87da28fa9df05813f76a3 2232Author: djm@openbsd.org <djm@openbsd.org> 2233Date: Thu Oct 28 02:55:30 2021 +0000 2234 2235 upstream: increment SSH_SK_VERSION_MAJOR to match last change 2236 2237 OpenBSD-Regress-ID: 17873814d1cbda97f49c8528d7b5ac9cadf6ddc0 2238 2239commit 0001d04e55802d5bd9d6dece1081a99aa4ba2828 2240Author: djm@openbsd.org <djm@openbsd.org> 2241Date: Thu Oct 28 02:54:18 2021 +0000 2242 2243 upstream: When downloading resident keys from a FIDO token, pass 2244 2245 back the user ID that was used when the key was created and append it to the 2246 filename the key is written to (if it is not the default). 2247 2248 Avoids keys being clobbered if the user created multiple 2249 resident keys with the same application string but different 2250 user IDs. 2251 2252 feedback Pedro Martelletto; ok markus 2253 2254 NB. increments SSH_SK_VERSION_MAJOR 2255 2256 OpenBSD-Commit-ID: dbd658b5950f583106d945641a634bc6562dd3a3 2257 2258commit d4bed5445646e605c383a4374fa962e23bf9e3a3 2259Author: deraadt@openbsd.org <deraadt@openbsd.org> 2260Date: Sun Oct 24 21:24:17 2021 +0000 2261 2262 upstream: For open/openat, if the flags parameter does not contain 2263 2264 O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant. Many developers 2265 in the past have passed mode_t (0, 044, 0644, or such), which might lead 2266 future people to copy this broken idiom, and perhaps even believe this 2267 parameter has some meaning or implication or application. Delete them all. 2268 This comes out of a conversation where tb@ noticed that a strange (but 2269 intentional) pledge behaviour is to always knock-out high-bits from mode_t on 2270 a number of system calls as a safety factor, and his bewilderment that this 2271 appeared to be happening against valid modes (at least visually), but no 2272 sorry, they are all irrelevant junk. They could all be 0xdeafbeef. ok 2273 millert 2274 2275 OpenBSD-Commit-ID: 503d11633497115688c0c6952686524f01f53121 2276 2277commit d575cf44895104e0fcb0629920fb645207218129 2278Author: Darren Tucker <dtucker@dtucker.net> 2279Date: Fri Oct 22 23:27:41 2021 +1100 2280 2281 kitchensink test target now needs krb5. 2282 2283commit 4ae39cada214e955bcfd3448ff28f0ed18886706 2284Author: Darren Tucker <dtucker@dtucker.net> 2285Date: Fri Oct 22 22:54:33 2021 +1100 2286 2287 Test both MIT KRB5 and Heimdal. 2288 2289commit 22b2681d88619e5247dc53c9f112058a7e248d48 2290Author: dtucker@openbsd.org <dtucker@openbsd.org> 2291Date: Fri Oct 22 10:51:57 2021 +0000 2292 2293 upstream: Plug mem addrinfo mem leaks. 2294 2295 Prevent mem leaks in the (unlikely) event that getaddrinfo returns 2296 no addresses. ALso, remove an unneeded NULL check in addr_ntop. From 2297 khaleesicodes via github PR#281, ok deraadt@ 2298 2299 OpenBSD-Commit-ID: e8a5afc686376637c355c5f7e122dc4b080b9c1a 2300 2301commit 27c8c343b610263f83ac2328735feeb881c6c92f 2302Author: dtucker@openbsd.org <dtucker@openbsd.org> 2303Date: Fri Oct 22 09:22:04 2021 +0000 2304 2305 upstream: Remove unnecessary semicolons 2306 2307 ... in case statements. From khaleesicodes via github PR#280. 2308 2309 OpenBSD-Commit-ID: e1e89360b65775cff83e77ce040b342015caf4ed 2310 2311commit e7eb73b8d1fe1008d92433ea949491ce654bfaba 2312Author: dtucker@openbsd.org <dtucker@openbsd.org> 2313Date: Fri Oct 22 09:19:34 2021 +0000 2314 2315 upstream: Fix typos in comments. 2316 2317 From khaleesicodes via github PR#280. 2318 2319 OpenBSD-Commit-ID: 26fdd83652c40f098bf7c685e8ebb9eb72cc45fc 2320 2321commit 052a9d8494175e24312daa6c132665e58c17fe6e 2322Author: deraadt@openbsd.org <deraadt@openbsd.org> 2323Date: Fri Oct 15 14:46:46 2021 +0000 2324 2325 upstream: switch scp(1) back to sftp protocol. 2326 2327 openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP 2328 protocol for copying. Let's get back to testing the SFTP protocol. 2329 2330 OpenBSD-Commit-ID: 9eaa35d95fd547b78b0a043b3f518e135f151f30 2331 2332commit a07664646bf6d293f5bbd45a5de54f3c36bb85da 2333Author: Darren Tucker <dtucker@dtucker.net> 2334Date: Fri Oct 22 14:00:05 2021 +1100 2335 2336 Source configs script so setup_ci can use settings 2337 2338commit 34df52c201c6b47e5a46b50c215e4d98a8bf6587 2339Author: Darren Tucker <dtucker@dtucker.net> 2340Date: Fri Oct 22 09:42:14 2021 +1100 2341 2342 Install libedit and pam based on config flags. 2343 2344commit 8c626cc563e8d21d844d06f9971a9ee01de6aa2a 2345Author: Darren Tucker <dtucker@dtucker.net> 2346Date: Thu Oct 21 16:53:39 2021 +1100 2347 2348 Don't use 'here string", it's not POSIX. 2349 2350commit 086a4b5977472aefa3de918b88efad0faf83b2b1 2351Author: Darren Tucker <dtucker@dtucker.net> 2352Date: Thu Oct 21 15:33:27 2021 +1100 2353 2354 Remove -Werror from compiler package to install. 2355 2356commit 5a7a4687507d057f9b5e7497f3d3f82e64753c02 2357Author: Darren Tucker <dtucker@dtucker.net> 2358Date: Thu Oct 21 15:00:53 2021 +1100 2359 2360 Build with -Werror on most recent gcc and clang. 2361 2362commit 4d2cbdb525d673acf941d48a7044fcf03125611a 2363Author: Darren Tucker <dtucker@dtucker.net> 2364Date: Fri Oct 15 12:59:06 2021 +1100 2365 2366 Include string.h and stdio.h for strerror. 2367 2368commit fff13aaa262b7b3ec83ed21e29674cbf331780a7 2369Author: Darren Tucker <dtucker@dtucker.net> 2370Date: Fri Oct 15 12:43:36 2021 +1100 2371 2372 Include error reason if trace disabling fails. 2373 2374commit d4b38144c02f3faa5271e5fb35df93507e06f1b4 2375Author: Darren Tucker <dtucker@dtucker.net> 2376Date: Tue Oct 12 22:55:51 2021 +1100 2377 2378 Add tcmalloc test target. 2379 2380commit 002d65b0a30063c6e49bf8a53e709d8d5a0d45c1 2381Author: dtucker@openbsd.org <dtucker@openbsd.org> 2382Date: Sat Oct 9 10:52:42 2021 +0000 2383 2384 upstream: Document that CASignatureAlgorithms, ExposeAuthInfo and 2385 2386 PubkeyAuthOptions can be used in a Match block. Patch from eehakkin via 2387 github PR#277. 2388 2389 OpenBSD-Commit-ID: c0a63f5f52e918645967ac022b28392da4b866aa 2390 2391commit 40bd3709dddaae3a1b6113748bec3faa6a607531 2392Author: Darren Tucker <dtucker@dtucker.net> 2393Date: Thu Oct 7 15:55:49 2021 +1100 2394 2395 Skip SK unit tests when built without security-key 2396 2397commit 482f73be10f10b93f818df19fcc8a912c0c371fc 2398Author: Darren Tucker <dtucker@dtucker.net> 2399Date: Thu Oct 7 15:55:04 2021 +1100 2400 2401 Include relevant env vars on command line. 2402 2403 Makes it easier to reproduce a build by cut/pasting the configure line. 2404 2405commit ef5916b8acd9b1d2f39fad4951dae03b00dbe390 2406Author: Darren Tucker <dtucker@dtucker.net> 2407Date: Thu Oct 7 14:28:02 2021 +1100 2408 2409 Only enable sk-* key types if ENABLE_SK is defined 2410 2411commit 52d4232b493a9858fe616e28a8bbcc89afa2ad4d 2412Author: Darren Tucker <dtucker@dtucker.net> 2413Date: Wed Oct 6 18:14:37 2021 +1100 2414 2415 Disable security key on minix3. 2416 2417 The test doesn't work so disable. 2418 2419commit 7cd062c3a29669b8d7dc2a97e6575f4dcb7d35a2 2420Author: Darren Tucker <dtucker@dtucker.net> 2421Date: Wed Oct 6 17:45:28 2021 +1100 2422 2423 Add USE_LIBC_SHA2 for (at least) NetBSD 9. 2424 2425commit 639c440f6c3c2a8216a5eb9455ef13bf4204089c 2426Author: Darren Tucker <dtucker@dtucker.net> 2427Date: Wed Oct 6 17:09:31 2021 +1100 2428 2429 Define OPENSSL_NO_SHA including OpenSSL from test. 2430 2431 We don't use SHA256 from OpenSSL in the sk-dummy module and the 2432 definitions can conflict with system sha2.h (eg on NetBSD) so define 2433 OPENSSL_NO_SHA so we don't attempt to redefine them. 2434 2435commit 8f4be526a338d06624f146fa26007bb9dd3a4f7b 2436Author: Darren Tucker <dtucker@dtucker.net> 2437Date: Wed Oct 6 15:40:58 2021 +1100 2438 2439 Disable security key on NetBSD4 test. 2440 2441 sk-dummy used for the security key test includes both sha2.h and OpenSSL 2442 causing the definitions conflict so disable security key support on this 2443 platform. 2444 2445commit 3b353ae58aa07a1cbbeb1da3ace21fc0dcccd66a 2446Author: Damien Miller <djm@mindrot.org> 2447Date: Wed Oct 6 15:07:01 2021 +1100 2448 2449 clean regress/misc/sk-dummy in cleandir target 2450 2451commit 57680a2ab43518c5ccbd8242c40482106cde6ac1 2452Author: dtucker@openbsd.org <dtucker@openbsd.org> 2453Date: Sat Oct 2 03:17:01 2021 +0000 2454 2455 upstream: Dynamically allocate encoded HashKnownHosts and free as 2456 2457 appropriate. Saves 1k of static storage and prevents snprintf "possible 2458 truncation" warnings from newer compilers (although in this case it's false 2459 positive since the actual sizes are limited by the output size of the SHA1). 2460 ok djm@ 2461 2462 OpenBSD-Commit-ID: e254ae723f7e3dce352c7d5abc4b6d87faf61bf4 2463 2464commit e3e62deb549fde215b777d95276c304f84bf00c6 2465Author: djm@openbsd.org <djm@openbsd.org> 2466Date: Wed Oct 6 03:35:13 2021 +0000 2467 2468 upstream: use libc SHA256 functions; make this work when compiled 2469 2470 !WITH_OPENSSL 2471 2472 OpenBSD-Regress-ID: fda0764c1097cd42f979ace29b07eb3481259890 2473 2474commit 12937d867019469ebce83c2ff614cdc6688fc2d8 2475Author: dtucker@openbsd.org <dtucker@openbsd.org> 2476Date: Fri Oct 1 05:20:20 2021 +0000 2477 2478 upstream: Add test for ssh hashed known_hosts handling. 2479 2480 OpenBSD-Regress-ID: bcef3b3cd5a1ad9899327b4b2183de2541aaf9cf 2481 2482commit 5a37cc118f464416d08cd0291a9b1611d8de9943 2483Author: Damien Miller <djm@mindrot.org> 2484Date: Wed Oct 6 13:16:21 2021 +1100 2485 2486 fix broken OPENSSL_HAS_ECC test 2487 2488 spotted by dtucker 2489 2490commit 16a25414f303cd6790eb967aeb962040e32c9c7a 2491Author: Damien Miller <djm@mindrot.org> 2492Date: Fri Oct 1 22:40:06 2021 +1000 2493 2494 make sk-dummy.so work without libcrypto installed 2495 2496commit dee22129bbc61e25b1003adfa2bc584c5406ef2d 2497Author: Damien Miller <djm@mindrot.org> 2498Date: Fri Oct 1 16:35:49 2021 +1000 2499 2500 make OPENSSL_HAS_ECC checks more thorough 2501 2502 ok dtucker 2503 2504commit 872595572b6c9a584ed754165e8b7c4c9e7e1d61 2505Author: Damien Miller <djm@mindrot.org> 2506Date: Fri Oct 1 16:35:05 2021 +1000 2507 2508 fix FIDO key support for !OPENSSL_HAS_ECC case 2509 2510 ok dtucker 2511 2512commit 489741dc68366940d369ac670b210b4834a6c272 2513Author: Damien Miller <djm@mindrot.org> 2514Date: Fri Oct 1 14:51:37 2021 +1000 2515 2516 enable security key support for --without-openssl 2517 2518commit c978565c8589acfe4ea37ab5099d39c84158c713 2519Author: Damien Miller <djm@mindrot.org> 2520Date: Fri Oct 1 13:27:50 2021 +1000 2521 2522 need stdlib.h for free(3) 2523 2524commit 76a398edfb51951b2d65d522d7b02c72304db300 2525Author: dtucker@openbsd.org <dtucker@openbsd.org> 2526Date: Thu Sep 30 05:26:26 2021 +0000 2527 2528 upstream: Fix up whitespace left by previous 2529 2530 change removing privsep. No other changes. 2531 2532 OpenBSD-Regress-ID: 87adec225d8afaee4d6a91b2b71203f52bf14b15 2533 2534commit ddcb53b7a7b29be65d57562302b2d5f41733e8dd 2535Author: dtucker@openbsd.org <dtucker@openbsd.org> 2536Date: Thu Sep 30 05:20:08 2021 +0000 2537 2538 upstream: Remove references to privsep. 2539 2540 This removes several do..while loops but does not change the 2541 indentation of the now-shallower loops, which will be done in a separate 2542 whitespace-only commit to keep changes of style and substance separate. 2543 2544 OpenBSD-Regress-ID: 4bed1a0249df7b4a87c965066ce689e79472a8f7 2545 2546commit ece2fbe486164860de8df3f8b943cccca3085eff 2547Author: dtucker@openbsd.org <dtucker@openbsd.org> 2548Date: Thu Sep 30 04:22:50 2021 +0000 2549 2550 upstream: Use "skip" instead of "fatal" 2551 2552 if SUDO isn't set for the *-command tests. This means running "make tests" 2553 without SUDO set will perform all of the tests that it can instead of 2554 failing on the ones it cannot run. 2555 2556 OpenBSD-Regress-ID: bd4dbbb02f34b2e8c890558ad4a696248def763a 2557 2558commit bb754b470c360e787a99fb4e88e2668198e97b41 2559Author: djm@openbsd.org <djm@openbsd.org> 2560Date: Fri Oct 1 04:50:36 2021 +0000 2561 2562 upstream: unbreak FIDO sk-ed25519 key enrollment for OPENSSL=no builds; 2563 2564 ok dtucker@ 2565 2566 OpenBSD-Commit-ID: 6323a5241728626cbb2bf0452cf6a5bcbd7ff709 2567 2568commit 207648d7a6415dc915260ca75850404dbf9f0a0b 2569Author: Darren Tucker <dtucker@dtucker.net> 2570Date: Wed Sep 29 20:03:58 2021 +1000 2571 2572 Include stdlib.h for arc4random_uniform prototype. 2573 2574commit 696aadc854582c164d5fc04933d2f3e212dc0e06 2575Author: Darren Tucker <dtucker@dtucker.net> 2576Date: Wed Sep 29 20:00:30 2021 +1000 2577 2578 Look for clang after cc and gcc. 2579 2580commit a3c6375555026d85dbf811fab566b9f76f196144 2581Author: Darren Tucker <dtucker@dtucker.net> 2582Date: Wed Sep 29 19:30:59 2021 +1000 2583 2584 Use backticks instead of $(..) for portability. 2585 2586 Older shells (eg /bin/sh on Solaris 10) don't support $() syntax. 2587 2588commit 958aaa0387133d51f84fe9c8f30bca03025f2867 2589Author: Darren Tucker <dtucker@dtucker.net> 2590Date: Wed Sep 29 18:53:32 2021 +1000 2591 2592 Skip file-based tests by default on Mac OS. 2593 2594 The file-based tests need OpenSSL so skip them. 2595 2596commit 55c8bdf6e9afb0f9fa8e4f10c25c7f0081b48fd0 2597Author: Darren Tucker <dtucker@dtucker.net> 2598Date: Wed Sep 29 18:42:47 2021 +1000 2599 2600 Build without OpenSSL on Mac OS. 2601 2602 Modern versions don't ship enough libcrypto to build against. 2603 2604commit c9172193ea975415facf0afb356d87df21535f88 2605Author: Darren Tucker <dtucker@dtucker.net> 2606Date: Wed Sep 29 18:33:38 2021 +1000 2607 2608 Remove TEST_SSH_ECC. 2609 2610 Convert the only remaining user of it to runtime detection using ssh -Q. 2611 2612commit 5e6d28b7874b0deae95d2c68947c45212d32e599 2613Author: Darren Tucker <dtucker@dtucker.net> 2614Date: Wed Sep 29 17:48:09 2021 +1000 2615 2616 Split c89 test openssl setting out. 2617 2618commit c4ac7f98e230e83c015678dc958b1ffe828564ad 2619Author: Darren Tucker <dtucker@dtucker.net> 2620Date: Wed Sep 29 17:40:50 2021 +1000 2621 2622 Expand TEST_SHELL consistently with other vars. 2623 2624commit cfe5f7b0eb7621bfb0a756222de0431315c2ab8b 2625Author: Darren Tucker <dtucker@dtucker.net> 2626Date: Wed Sep 29 17:26:50 2021 +1000 2627 2628 Replace `pwd` with make variable in regress cmd. 2629 2630commit 899be59da5fbc3372444bd0fbe74af48313bed33 2631Author: Darren Tucker <dtucker@dtucker.net> 2632Date: Wed Sep 29 17:14:33 2021 +1000 2633 2634 Get BUILDDIR from autoconf. 2635 2636 Use this to replace `pwd`s in regress test command line. 2637 2638commit c8d92d3d4f7d560146f2f936156ec4dac3fc5811 2639Author: Darren Tucker <dtucker@dtucker.net> 2640Date: Wed Sep 29 13:28:56 2021 +1000 2641 2642 Add make clean step to tests. 2643 2644commit 360fb41ef8359619ab90b0d131c914494e55d3dd 2645Author: Darren Tucker <dtucker@dtucker.net> 2646Date: Wed Sep 29 11:36:13 2021 +1000 2647 2648 Test all available clang and gcc versions. 2649 2650commit 4fb49899d7da22952d35a4bc4c9bdb2311087893 2651Author: djm@openbsd.org <djm@openbsd.org> 2652Date: Wed Sep 29 01:32:21 2021 +0000 2653 2654 upstream: Test certificate hostkeys held in ssh-agent too. Would have 2655 2656 caught regression fixed in sshd r1.575 2657 2658 ok markus@ 2659 2660 OpenBSD-Regress-ID: 1f164d7bd89f83762db823eec4ddf2d2556145ed 2661 2662commit ce4854e12e749a05646e5775e9deb8cfaf49a755 2663Author: djm@openbsd.org <djm@openbsd.org> 2664Date: Wed Sep 29 01:33:32 2021 +0000 2665 2666 upstream: add some debug output showing how many key file/command lines 2667 2668 were processed. Useful to see whether a file or command actually has keys 2669 present 2670 2671 OpenBSD-Commit-ID: 0bd9ff94e84e03a22df8e6c12f6074a95d27f23c 2672 2673commit 15abdd523501c349b703d9a27e2bb4252ad921ef 2674Author: dtucker@openbsd.org <dtucker@openbsd.org> 2675Date: Tue Sep 28 11:14:50 2021 +0000 2676 2677 upstream: Make prototype for rijndaelEncrypt match function 2678 2679 including the bounds. Fixes error in portable where GCC>=11 takes notice of 2680 the bounds. ok deraadt@ 2681 2682 OpenBSD-Commit-ID: cdd2f05fd1549e1786a70871e513cf9e9cf099a6 2683 2684commit d1d29ea1d1ef1a1a54b209f062ec1dcc8399cf03 2685Author: dtucker@openbsd.org <dtucker@openbsd.org> 2686Date: Tue Sep 28 11:10:05 2021 +0000 2687 2688 upstream: Import regenerated moduli. 2689 2690 OpenBSD-Commit-ID: 4bec5db13b736b64b06a0fca704cbecc2874c8e1 2691 2692commit 39f2111b1d5f00206446257377dcce58cc72369f 2693Author: Darren Tucker <dtucker@dtucker.net> 2694Date: Wed Sep 29 10:53:55 2021 +1000 2695 2696 Add new compiler hardening flags. 2697 2698 Add -fzero-call-used-regs and -ftrivial-auto-var-init to the list of 2699 compiler hardening flags that configure checks for. These are supported 2700 by clang and gcc, and make ROP gadgets less useful and mitigate 2701 stack-based infoleaks respectively. ok djm@ 2702 2703commit bf944e3794eff5413f2df1ef37cddf96918c6bde 2704Author: Damien Miller <djm@mindrot.org> 2705Date: Mon Sep 27 00:03:19 2021 +1000 2706 2707 initgroups needs grp.h 2708 2709commit 8c5b5655149bd76ea21026d7fe73ab387dbc3bc7 2710Author: djm@openbsd.org <djm@openbsd.org> 2711Date: Sun Sep 26 14:01:11 2021 +0000 2712 2713 upstream: openssh-8.8 2714 2715 OpenBSD-Commit-ID: 12357794602ac979eb7312a1fb190c453f492ec4 2716 2717commit f3cbe43e28fe71427d41cfe3a17125b972710455 2718Author: djm@openbsd.org <djm@openbsd.org> 2719Date: Sun Sep 26 14:01:03 2021 +0000 2720 2721 upstream: need initgroups() before setresgid(); reported by anton@, 2722 2723 ok deraadt@ 2724 2725 OpenBSD-Commit-ID: 6aa003ee658b316960d94078f2a16edbc25087ce 2726 2727commit 8acaff41f7518be40774c626334157b1b1c5583c 2728Author: Damien Miller <djm@mindrot.org> 2729Date: Sun Sep 26 22:16:36 2021 +1000 2730 2731 update version numbers for release 2732 2733commit d39039ddc0010baa91c70a0fa0753a2699bbf435 2734Author: kn@openbsd.org <kn@openbsd.org> 2735Date: Sat Sep 25 09:40:33 2021 +0000 2736 2737 upstream: RSA/SHA-1 is not used by default anymore 2738 2739 OK dtucker deraadt djm 2740 2741 OpenBSD-Commit-ID: 055c51a221c3f099dd75c95362f902da1b8678c6 2742 2743commit 9b2ee74e3aa8c461eb5552a6ebf260449bb06f7e 2744Author: Darren Tucker <dtucker@dtucker.net> 2745Date: Fri Sep 24 11:08:03 2021 +1000 2746 2747 Move the fgrep replacement to hostkey-rotate.sh. 2748 2749 The fgrep replacement for buggy greps doesn't work in the sftp-glob test 2750 so move it to just where we know it's needed. 2751 2752commit f7039541570d4b66d76e6f574544db176d8d5c02 2753Author: Darren Tucker <dtucker@dtucker.net> 2754Date: Fri Sep 24 08:04:14 2021 +1000 2755 2756 Replacement function for buggy fgrep. 2757 2758 GNU (f)grep <=2.18, as shipped by FreeBSD<=12 and NetBSD<=9 will 2759 occasionally fail to find ssh host keys in the hostkey-rotate test. 2760 If we have those versions, use awk instead. 2761 2762commit f6a660e5bf28a01962af87568e118a2d2e79eaa0 2763Author: David Manouchehri <david.manouchehri@riseup.net> 2764Date: Thu Sep 23 17:03:18 2021 -0400 2765 2766 Don't prompt for yes/no questions. 2767 2768commit 7ed1a3117c09f8c3f1add35aad77d3ebe1b85b4d 2769Author: djm@openbsd.org <djm@openbsd.org> 2770Date: Mon Sep 20 06:53:56 2021 +0000 2771 2772 upstream: fix missing -s in SYNOPSYS and usage() as well as a 2773 2774 capitalisation mistake; spotted by jmc@ 2775 2776 OpenBSD-Commit-ID: 0ed8ee085c7503c60578941d8b45f3a61d4c9710 2777 2778commit 8c07170135dde82a26886b600a8bf6fb290b633d 2779Author: dtucker@openbsd.org <dtucker@openbsd.org> 2780Date: Mon Sep 20 04:02:13 2021 +0000 2781 2782 upstream: Fix "Allocated port" debug message 2783 2784 for unix domain sockets. From peder.stray at gmail.com via github PR#272, 2785 ok deraadt@ 2786 2787 OpenBSD-Commit-ID: 8d5ef3fbdcdd29ebb0792b5022a4942db03f017e 2788 2789commit 277d3c6adfb128b4129db08e3d65195d94b55fe7 2790Author: djm@openbsd.org <djm@openbsd.org> 2791Date: Mon Sep 20 01:55:42 2021 +0000 2792 2793 upstream: Switch scp back to use the old protocol by default, ahead of 2794 2795 release. We'll wait a little longer for people to pick up sftp-server(8) that 2796 supports the extension that scp needs for ~user paths to continue working in 2797 SFTP protocol mode. Discussed with deraadt@ 2798 2799 OpenBSD-Commit-ID: f281f603a705fba317ff076e7b11bcf2df941871 2800 2801commit ace19b34cc15bea3482be90450c1ed0cd0dd0669 2802Author: djm@openbsd.org <djm@openbsd.org> 2803Date: Sat Sep 18 02:03:25 2021 +0000 2804 2805 upstream: better error message for ~user failures when the 2806 2807 sftp-server lacks the expand-path extension; ok deraadt@ 2808 2809 OpenBSD-Commit-ID: 9c1d965d389411f7e86f0a445158bf09b8f9e4bc 2810 2811commit 6b1238ba971ee722a310d95037b498ede5539c03 2812Author: djm@openbsd.org <djm@openbsd.org> 2813Date: Thu Sep 16 15:22:22 2021 +0000 2814 2815 upstream: make some more scp-in-SFTP mode better match Unix idioms 2816 2817 suggested by deraadt@ 2818 2819 OpenBSD-Commit-ID: 0f2439404ed4cf0b0be8bf49a1ee734836e1ac87 2820 2821commit e694f8ac4409931e67d08ac44ed251b20b10a957 2822Author: djm@openbsd.org <djm@openbsd.org> 2823Date: Thu Sep 16 15:11:19 2021 +0000 2824 2825 upstream: allow log_stderr==2 to prefix log messages with argv[0] 2826 2827 use this to make scp's SFTP mode error messages more scp-like 2828 2829 prompted by and ok deraadt@ 2830 2831 OpenBSD-Commit-ID: 0e821dbde423fc2280e47414bdc22aaa5b4e0733 2832 2833commit 8a7a06ee505cb833e613f74a07392e9296286c30 2834Author: Darren Tucker <dtucker@dtucker.net> 2835Date: Fri Sep 17 13:03:31 2021 +1000 2836 2837 Test against LibreSSL 3.2.6, 3.3.4, 3.4.0. 2838 2839commit c25c84074a47f700dd6534995b4af4b456927150 2840Author: djm@openbsd.org <djm@openbsd.org> 2841Date: Thu Sep 16 05:36:03 2021 +0000 2842 2843 upstream: missing space character in ssh -G output broke the 2844 2845 t-sshcfgparse regression test; spotted by anton@ 2846 2847 OpenBSD-Commit-ID: bcc36fae2f233caac4baa8e58482da4aa350eed0 2848 2849commit a4bee1934bf5e5575fea486628f4123d6a29dff8 2850Author: djm@openbsd.org <djm@openbsd.org> 2851Date: Wed Sep 15 06:56:01 2021 +0000 2852 2853 upstream: allow CanonicalizePermittedCNAMEs=none in ssh_config; ok 2854 2855 markus@ 2856 2857 OpenBSD-Commit-ID: 668a82ba8e56d731b26ffc5703213bfe071df623 2858 2859commit d0fffc88c8fe90c1815c6f4097bc8cbcabc0f3dd 2860Author: mbuhl@openbsd.org <mbuhl@openbsd.org> 2861Date: Tue Sep 14 11:04:21 2021 +0000 2862 2863 upstream: put back the mux_ctx memleak fix for SSH_CHANNEL_MUX_CLIENT 2864 2865 OK mfriedl@ 2866 2867 OpenBSD-Commit-ID: 1aba1da828956cacaadb81a637338734697d9798 2868 2869commit 19b3d846f06697c85957ab79a63454f57f8e22d6 2870Author: schwarze@openbsd.org <schwarze@openbsd.org> 2871Date: Sat Sep 11 09:05:50 2021 +0000 2872 2873 upstream: Do not ignore SIGINT while waiting for input if editline(3) 2874 2875 is not used. Instead, in non-interactive mode, exit sftp(1), like for other 2876 serious errors. As pointed out by dtucker@, when compiled without editline(3) 2877 support in portable OpenSSH, the el == NULL branch is also used for 2878 interactive mode. In that case, discard the input line and provide a fresh 2879 prompt to the user just like in the case where editline(3) is used. OK djm@ 2880 2881 OpenBSD-Commit-ID: 7d06f4d3ebba62115527fafacf38370d09dfb393 2882 2883commit ba61123eef9c6356d438c90c1199a57a0d7bcb0a 2884Author: djm@openbsd.org <djm@openbsd.org> 2885Date: Sat Sep 11 00:40:24 2021 +0000 2886 2887 upstream: when using SFTP protocol, continue transferring files after a 2888 2889 transfer error occurs. This matches original scp/rcp behaviour. ok dtucker@ 2890 2891 OpenBSD-Commit-ID: dfe4558d71dd09707e9b5d6e7d2e53b793da69fa 2892 2893commit b0ec59a708b493c6f3940336b1a537bcb64dd2a7 2894Author: dtucker@openbsd.org <dtucker@openbsd.org> 2895Date: Fri Sep 10 11:38:38 2021 +0000 2896 2897 upstream: Document that non-interactive commands are run via the user's 2898 2899 shell using the -c flag. ok jmc@ 2900 2901 OpenBSD-Commit-ID: 4f0d912077732eead10423afd1acf4fc0ceec477 2902 2903commit 66a658b5d9e009ea11f8a0ca6e69c7feb2d851ea 2904Author: dtucker@openbsd.org <dtucker@openbsd.org> 2905Date: Fri Sep 10 10:26:02 2021 +0000 2906 2907 upstream: Document behaviour of arguments following non-interactive 2908 2909 commands. Prompted by github PR#139 from EvanTheB, feedback & ok djm@ jmc@ 2910 2911 OpenBSD-Commit-ID: fc758d1fe0471dfab4304fcad6cd4ecc3d79162a 2912 2913commit 1d47e28e407d1f95fdf8f799be23f48dcfa5206b 2914Author: dtucker@openbsd.org <dtucker@openbsd.org> 2915Date: Fri Sep 10 07:11:11 2021 +0000 2916 2917 upstream: Clarify which file's attributes -p preserves, and that 2918 2919 it's specifically the file mode bits. bz#3340 from calestyo at scientia.net, 2920 ok djm@ jmc@ 2921 2922 OpenBSD-Commit-ID: f09e6098ed1c4be00c730873049825f8ee7cb884 2923 2924commit b344db7a413478e4c21e4cadba4a970ad3e6128a 2925Author: djm@openbsd.org <djm@openbsd.org> 2926Date: Fri Sep 10 05:46:09 2021 +0000 2927 2928 upstream: openssh-7.4 was incorrectly listed twice; spotted by 2929 2930 Dmitry Belyavskiy, ok dtucker@ 2931 2932 OpenBSD-Commit-ID: 4b823ae448f6e899927ce7b04225ac9e489f58ef 2933 2934commit 9136d6239ad7a4a293e0418a49b69e70c76d58b8 2935Author: jmc@openbsd.org <jmc@openbsd.org> 2936Date: Thu Sep 9 06:17:39 2021 +0000 2937 2938 upstream: - move CAVEATS to its correct order - use the term 2939 2940 "legacy" protocol rather than "original", as the latter made the text 2941 misleading - uppercase SCP 2942 2943 ok djm 2944 2945 OpenBSD-Commit-ID: 8479255746d5fa76a358ee59e7340fecf4245ff0 2946 2947commit 2d678c5e3bdc2f5c99f7af5122e9d054925d560d 2948Author: David Carlier <devnexen@gmail.com> 2949Date: Wed Sep 8 19:49:54 2021 +0100 2950 2951 Disable tracing on FreeBSD using procctl. 2952 2953 Placed at the start of platform_disable_tracing() to prevent declaration 2954 after code errors from strict C89 compilers (in the unlikely event that 2955 more than one method is enabled). 2956 2957commit 73050fa38fb36ae3326d768b574806352b97002d 2958Author: djm@openbsd.org <djm@openbsd.org> 2959Date: Wed Sep 8 23:31:39 2021 +0000 2960 2961 upstream: Use the SFTP protocol by default. The original scp/rcp 2962 2963 protocol remains available via the -O flag. 2964 2965 Note that ~user/ prefixed paths in SFTP mode require a protocol extension 2966 that was first shipped in OpenSSH 8.7. 2967 2968 ok deraadt, after baking in snaps for a while without incident 2969 2970 OpenBSD-Commit-ID: 23588976e28c281ff5988da0848cb821fec9213c 2971 2972commit c4565e69ffa2485cff715aa842ea7a350296bfb6 2973Author: Darren Tucker <dtucker@dtucker.net> 2974Date: Wed Sep 8 21:09:49 2021 +1000 2975 2976 Really fix test on OpenSSL 1.1.1 stable. 2977 2978commit 79f1bb5f56cef3ae9276207316345b8309248478 2979Author: Darren Tucker <dtucker@dtucker.net> 2980Date: Wed Sep 8 18:51:39 2021 +1000 2981 2982 Correct OpenSSL 1.1.1 stable identifier. 2983 2984commit b6255593ed5ccbe5e7d3d4b26b2ad31ad4afc232 2985Author: Darren Tucker <dtucker@dtucker.net> 2986Date: Wed Sep 8 18:39:44 2021 +1000 2987 2988 Increment nfds when coming from startup_pipe. 2989 2990 If we have to increase nfds because startup_pipe[0] is above any of the 2991 descriptors passed in the fd_sets, we also need to add 1 to nfds since 2992 select takes highest FD number plus one. bz#3345 from yaroslav.kuzmin 2993 at vmssoftware.com. 2994 2995commit a3e92a6794817df6012ac8546aea19652cc91b61 2996Author: Darren Tucker <dtucker@dtucker.net> 2997Date: Wed Sep 8 13:45:10 2021 +1000 2998 2999 Tests for OpenSSL 3.0.0 release & 1.1.1 branch. 3000 3001commit 4afe431da98ec1cf6a2933fe5658f4fd68dee9e2 3002Author: djm@openbsd.org <djm@openbsd.org> 3003Date: Wed Sep 8 03:23:44 2021 +0000 3004 3005 upstream: correct my mistake in previous fix; spotted by halex 3006 3007 OpenBSD-Commit-ID: 3cc62d92e3f70006bf02468fc146bfc36fffa183 3008 3009commit ca0e455b9331213ff9505a21b94c38e34faa2bba 3010Author: djm@openbsd.org <djm@openbsd.org> 3011Date: Tue Sep 7 06:03:51 2021 +0000 3012 3013 upstream: avoid NULL deref in -Y find-principals. Report and fix 3014 3015 from Carlo Marcelo Arenas Belón 3016 MIME-Version: 1.0 3017 Content-Type: text/plain; charset=UTF-8 3018 Content-Transfer-Encoding: 8bit 3019 3020 OpenBSD-Commit-ID: 6238486f8ecc888d6ccafcd9ad99e621bb41f1e0 3021 3022commit 37616807f150fb46610bbd5031c31af4857ad1e9 3023Author: millert@openbsd.org <millert@openbsd.org> 3024Date: Mon Sep 6 00:36:01 2021 +0000 3025 3026 upstream: revision 1.381 neglected to remove 3027 3028 sChallengeResponseAuthentication from the enum. Noticed by 3029 christos@zoulas.com. OK dtucker@ 3030 3031 OpenBSD-Commit-ID: b533283a4dd6d04a867da411a4c7a8fbc90e34ff 3032 3033commit 7acb3578cdfec0b3d34501408071f7a96c1684ea 3034Author: Darren Tucker <dtucker@dtucker.net> 3035Date: Sun Sep 5 20:45:42 2021 +1000 3036 3037 Correct version_num for OpenSSL dev branch. 3038 3039commit 65bb01111320dfd0d25e21e1fd4d3f2b77532669 3040Author: Darren Tucker <dtucker@dtucker.net> 3041Date: Sun Sep 5 19:37:39 2021 +1000 3042 3043 Test against OpenSSL 3 branch as well as dev. 3044 3045 Now that OpenSSL development has moved to 3.1, test against the most 3046 recent version of the openssl-3.0 branch too. 3047 3048commit 864ed0d5e04a503b97202c776b7cf3f163f3eeaa 3049Author: Darren Tucker <dtucker@dtucker.net> 3050Date: Sun Sep 5 19:33:22 2021 +1000 3051 3052 OpenSSL development is now 3.1.* 3053 3054commit a60209a586a928f92ab323bf23bd07f57093342e 3055Author: dtucker@openbsd.org <dtucker@openbsd.org> 3056Date: Fri Sep 3 07:43:23 2021 +0000 3057 3058 upstream: Use .Cm instead of .Dq in StrictHostKeyChecking list for 3059 3060 consistency. Patch from scop via github PR#257, ok jmc@ 3061 3062 OpenBSD-Commit-ID: 3652a91564570779431802c31224fb4a9cf39872 3063 3064commit 8d1d9eb6de37331e872700e9e399a3190cca1242 3065Author: dtucker@openbsd.org <dtucker@openbsd.org> 3066Date: Fri Sep 3 07:27:03 2021 +0000 3067 3068 upstream: Mention using ssh -i for specifying the public key file 3069 3070 in the case where the private key is loaded into ssh-agent but is not present 3071 locally. Based on patch from rafork via github PR#215, ok jmc@ 3072 3073 OpenBSD-Commit-ID: 2282e83b0ff78d2efbe705883b67240745fa5bb2 3074 3075commit eb4362e5e3aa7ac26138b11e44d8c191910aff64 3076Author: dtucker@openbsd.org <dtucker@openbsd.org> 3077Date: Fri Sep 3 05:25:50 2021 +0000 3078 3079 upstream: Refer to KEX "algorithms" instead of "methods" to match 3080 3081 other references and improve consistency. Patch from scop via github PR#241, 3082 ok djm@ 3083 3084 OpenBSD-Commit-ID: 840bc94ff6861b28d8603c8e8c16499bfb65e32c 3085 3086commit b3318946ce5725da43c4bf7eeea1b73129c47d2a 3087Author: dtucker@openbsd.org <dtucker@openbsd.org> 3088Date: Fri Sep 3 05:12:25 2021 +0000 3089 3090 upstream: Remove redundant attrib_clear in upload_dir_internal. 3091 3092 The subsequent call to stat_to_attrib clears the struct as its first step 3093 anyway. From pmeinhardt via github PR#220, ok djm@ 3094 3095 OpenBSD-Commit-ID: f5234fc6d7425b607e179acb3383f21716f3029e 3096 3097commit 7cc3fe28896e653956a6a2eed0a25d551b83a029 3098Author: dtucker@openbsd.org <dtucker@openbsd.org> 3099Date: Fri Sep 3 04:11:13 2021 +0000 3100 3101 upstream: Add test for client termination status on signal. 3102 3103 Based on patch from Alexxz via github PR#235 with some tweaks, to 3104 match patch in bz#3281. 3105 3106 OpenBSD-Regress-ID: d87c7446fb8b5f8b45894fbbd6875df326e729e2 3107 3108commit 5428b0d239f6b516c81d1dd15aa9fe9e60af75d4 3109Author: deraadt@openbsd.org <deraadt@openbsd.org> 3110Date: Thu Sep 2 21:03:54 2021 +0000 3111 3112 upstream: sys/param.h is not needed for any visible reason 3113 3114 OpenBSD-Commit-ID: 8bdea2d0c75692e4c5777670ac039d4b01c1f368 3115 3116commit 1ff38f34b4c4545eb28106629cafa1e0496bc726 3117Author: Shchelkunov Artem <a.shchelkunov@ideco.ru> 3118Date: Wed Aug 11 18:07:58 2021 +0500 3119 3120 Fix memory leak in error path. 3121 3122 *info is allocated via xstrdup but was leaked in the PAM_AUTH_ERR path. 3123 From github PR#266. 3124 3125commit cb37e2f0c0ca4fef844ed7edc5d0e3b7d0e83f6a 3126Author: dtucker@openbsd.org <dtucker@openbsd.org> 3127Date: Wed Sep 1 03:16:06 2021 +0000 3128 3129 upstream: Fix ssh-rsa fallback for old PuTTY interop tests. 3130 3131 OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37 3132 3133commit 8b02ef0f28dc24cda8cbcd8b7eb02bda8f8bbe59 3134Author: dtucker@openbsd.org <dtucker@openbsd.org> 3135Date: Wed Sep 1 00:50:27 2021 +0000 3136 3137 upstream: Add a function to skip remaining tests. 3138 3139 Many tests skip tests for various reasons but not in a consistent way and 3140 don't always clean up, so add that and switch the tests that do that over. 3141 3142 OpenBSD-Regress-ID: 72d2ec90a3ee8849486956a808811734281af735 3143 3144commit d486845c07324c04240f1674ac513985bd356f66 3145Author: dtucker@openbsd.org <dtucker@openbsd.org> 3146Date: Tue Aug 31 07:13:59 2021 +0000 3147 3148 upstream: Specify path to PuTTY keys. 3149 3150 Portable needs this and it makes no difference on OpenBSD, so resync 3151 them. (Id sync only, Portable already had this.) 3152 3153 OpenBSD-Regress-ID: 33f6f66744455886d148527af8368811e4264162 3154 3155commit d22b299115e27606e846b23490746f69fdd4fb38 3156Author: dtucker@openbsd.org <dtucker@openbsd.org> 3157Date: Tue Aug 31 06:13:23 2021 +0000 3158 3159 upstream: Better compat tests with old PuTTY. 3160 3161 When running PuTTY interop tests and using a PuTTY version older than 3162 0.76, re-enable the ssh-rsa host key algorithm (the 256 and 512 variants 3163 of RSA were added some time between 0.73 and 0.76). 3164 3165 OpenBSD-Regress-ID: e6138d6987aa705fa1e4f216db0bb386e1ff38e1 3166 3167commit 87ad70d605c3e39c9b8aa275db27120d7cc09b77 3168Author: Darren Tucker <dtucker@dtucker.net> 3169Date: Tue Aug 31 17:04:50 2021 +1000 3170 3171 Resync PuTTY interop tests. 3172 3173 Resync behaviour when REGRESS_INTEROP_PUTTY is not set with OpenBSD. 3174 3175commit e47b82a7bf51021afac218bf59a3be121827653d 3176Author: dtucker@openbsd.org <dtucker@openbsd.org> 3177Date: Tue Aug 31 01:25:27 2021 +0000 3178 3179 upstream: Specify hostkeyalgorithms in SSHFP test. 3180 3181 Specify host key algorithms in sshd's default set for the SSHFP test, 3182 from djm@. Make the reason for when the test is skipped a bit clearer. 3183 3184 OpenBSD-Regress-ID: 4f923dfc761480d5411de17ea6f0b30de3e32cea 3185 3186commit 7db3e0a9e8477c018757b59ee955f7372c0b55fb 3187Author: djm@openbsd.org <djm@openbsd.org> 3188Date: Mon Aug 30 01:15:45 2021 +0000 3189 3190 upstream: adapt to RSA/SHA1 deprectation 3191 3192 OpenBSD-Regress-ID: 952397c39a22722880e4de9d1c50bb1a14f907bb 3193 3194commit 2344750250247111a6c3c6a4fe84ed583a61cc11 3195Author: djm@openbsd.org <djm@openbsd.org> 3196Date: Sun Aug 29 23:53:10 2021 +0000 3197 3198 upstream: After years of forewarning, disable the RSA/SHA-1 3199 3200 signature algorithm by default. It is feasible to create colliding SHA1 3201 hashes, so we need to deprecate its use. 3202 3203 RSA/SHA-256/512 remains available and will be transparently selected 3204 instead of RSA/SHA1 for most SSH servers released in the last five+ 3205 years. There is no need to regenerate RSA keys. 3206 3207 The use of RSA/SHA1 can be re-enabled by adding "ssh-rsa" to the 3208 PubkeyAcceptedAlgorithms directives on the client and server. 3209 3210 ok dtucker deraadt 3211 3212 OpenBSD-Commit-ID: 189bcc4789c7254e09e23734bdd5def8354ff1d5 3213 3214commit 56c4455d3b54b7d481c77c82115c830b9c8ce328 3215Author: djm@openbsd.org <djm@openbsd.org> 3216Date: Sun Aug 29 23:44:07 2021 +0000 3217 3218 upstream: wrap at 80 columns 3219 3220 OpenBSD-Commit-ID: 47ca2286d6b52a9747f34da16d742879e1a37bf0 3221 3222commit 95401eea8503943449f712e5f3de52fc0bc612c5 3223Author: Darren Tucker <dtucker@dtucker.net> 3224Date: Fri Aug 20 18:14:13 2021 +1000 3225 3226 Replace shell function with ssh-keygen -A. 3227 3228 Prevents the init script in the SysV package from trying (and failing) 3229 to generate unsupported key types. Remove now-unused COMMENT_OUT_ECC. 3230 ok tim@ 3231 3232commit d83ec9ed995a76ed1d5c65cf10b447222ec86131 3233Author: Darren Tucker <dtucker@dtucker.net> 3234Date: Fri Aug 20 15:39:05 2021 +1000 3235 3236 Remove obsolete Redhat PAM config and init script. 3237 3238commit e1a596186c81e65a34ce13076449712d3bf97eb4 3239Author: Damien Miller <djm@mindrot.org> 3240Date: Fri Aug 20 14:03:49 2021 +1000 3241 3242 depend 3243 3244commit 5450606c8f7f7a0d70211cea78bc2dab74ab35d1 3245Author: Damien Miller <djm@mindrot.org> 3246Date: Fri Aug 20 13:59:43 2021 +1000 3247 3248 update version numbers 3249 3250commit feee2384ab8d694c770b7750cfa76a512bdf8246 3251Author: djm@openbsd.org <djm@openbsd.org> 3252Date: Fri Aug 20 03:22:55 2021 +0000 3253 3254 upstream: openssh-8.7 3255 3256 OpenBSD-Commit-ID: 8769dff0fd76ae3193d77bf83b439adee0f300cd 3257 3258commit 9a2ed62173cc551b2b5f479460bb015b19499de8 3259Author: Darren Tucker <dtucker@dtucker.net> 3260Date: Fri Aug 20 10:48:13 2021 +1000 3261 3262 Also check pid in pselect_notify_setup. 3263 3264 Spotted by djm@. 3265 3266commit deaadcb93ca15d4f38aa38fb340156077792ce87 3267Author: Darren Tucker <dtucker@dtucker.net> 3268Date: Fri Aug 20 08:39:33 2021 +1000 3269 3270 Prefix pselect functions to clarify debug messages 3271 3272commit 10e45654cff221ca60fd35ee069df67208fcf415 3273Author: Darren Tucker <dtucker@dtucker.net> 3274Date: Fri Aug 20 08:30:42 2021 +1000 3275 3276 Fix race in pselect replacement code. 3277 3278 On the second and subsequent calls to pselect the notify_pipe was not 3279 added to the select readset, opening up a race that om G. Christensen 3280 discovered on multiprocessor Solaris <=9 systems. 3281 3282 Also reinitialize notify_pipe if the pid changes. This will prevent a 3283 parent and child from using the same FD, although this is not an issue 3284 in the current structure it might be in future. 3285 3286commit 464ba22f1e38d25402e5ec79a9b8d34a32df5a3f 3287Author: Darren Tucker <dtucker@dtucker.net> 3288Date: Wed Aug 18 12:51:30 2021 +1000 3289 3290 Check compiler for c99 declarations after code. 3291 3292 The sntrup761 reference code contains c99-style declarations after code 3293 so don't try to build that if the compiler doesn't support it. 3294 3295commit 7d878679a4b155a359d32104ff473f789501748d 3296Author: Darren Tucker <dtucker@dtucker.net> 3297Date: Tue Aug 17 15:12:04 2021 +1000 3298 3299 Remove trailing backslash on regress-unit-binaries 3300 3301commit b71b2508f17c68c5d9dbbe537686d81cedb9a781 3302Author: Darren Tucker <dtucker@dtucker.net> 3303Date: Tue Aug 17 07:59:27 2021 +1000 3304 3305 Put stdint.h inside HAVE_STDINT_H. 3306 3307 From Tom G. Christensen. 3308 3309commit 6a24567a29bd7b4ab64e1afad859ea845cbc6b8c 3310Author: Darren Tucker <dtucker@dtucker.net> 3311Date: Mon Aug 16 14:13:02 2021 +1000 3312 3313 Improve github test driver script. 3314 3315 - use a trap to always output any failed regress logs (since the script 3316 sets -e, the existing log output is never invoked). 3317 - pass LTESTS and SKIP_LTESTS when re-running with sshd options (eg. 3318 UsePAM). 3319 3320commit b467cf13705f59ed348b620722ac098fe31879b7 3321Author: Darren Tucker <dtucker@dtucker.net> 3322Date: Mon Aug 16 11:32:23 2021 +1000 3323 3324 Remove deprecated ubuntu-16.04 test targets. 3325 3326 Github has deprecated ubuntu-16.04 and it will be removed on 20 3327 September. 3328 3329commit 20e6eefcdf78394f05e453d456c1212ffaa6b6a4 3330Author: Darren Tucker <dtucker@dtucker.net> 3331Date: Sun Aug 15 23:25:26 2021 +1000 3332 3333 Skip agent ptrace test on hurd. 3334 3335commit 7c9115bbbf958fbf85259a061c1122e2d046aabf 3336Author: Darren Tucker <dtucker@dtucker.net> 3337Date: Sun Aug 15 19:37:22 2021 +1000 3338 3339 Add hurd test target. 3340 3341commit 7909a566f6c6a78fcd30708dc49f4e4f9bb80ce3 3342Author: Darren Tucker <dtucker@dtucker.net> 3343Date: Sun Aug 15 12:45:10 2021 +1000 3344 3345 Skip scp3 tests on all dfly58 and 60 configs. 3346 3347commit e65198e52cb03534e8c846d1bca74c310b1526de 3348Author: Tim Rice <tim@multitalents.net> 3349Date: Sat Aug 14 13:08:07 2021 -0700 3350 3351 openbsd-compat/openbsd-compat.h: put bsd-signal.h before bsd-misc.h 3352 to get sigset_t from signal.h needed for the pselect replacement. 3353 3354commit e50635640f79920d9375e0155cb3f4adb870eee5 3355Author: Darren Tucker <dtucker@dtucker.net> 3356Date: Fri Aug 13 13:21:00 2021 +1000 3357 3358 Test OpenSSH from OpenBSD head on 6.8 and 6.9. 3359 3360commit e0ba38861c490c680117b7fe0a1d61a181cd00e7 3361Author: Darren Tucker <dtucker@dtucker.net> 3362Date: Fri Aug 13 13:00:14 2021 +1000 3363 3364 Skip scp3 test on dragonfly 58 and 60. 3365 3366 The tests hang, so skip until we figure them out. 3367 3368commit dcce2a2bcf007bf817a2fb0dce3db83fa9201e92 3369Author: djm@openbsd.org <djm@openbsd.org> 3370Date: Thu Aug 12 23:59:25 2021 +0000 3371 3372 upstream: mention that CASignatureAlgorithms accepts +/- similarly to 3373 3374 the other algorithm list directives; ok jmc bz#3335 3375 3376 OpenBSD-Commit-ID: 0d46b53995817052c78e2dce9dbd133963b073d9 3377 3378commit 090a82486e5d7a8f7f16613d67e66a673a40367f 3379Author: schwarze@openbsd.org <schwarze@openbsd.org> 3380Date: Thu Aug 12 09:59:00 2021 +0000 3381 3382 upstream: In the editline(3) branch of the sftp(1) event loop, 3383 3384 handle SIGINT rather than ignoring it, such that the user can use Ctrl-C to 3385 discard the currently edited command line and get a fresh prompt, just like 3386 in ftp(1), bc(1), and in shells. 3387 3388 It is critical to not use ssl_signal() for this particular case 3389 because that function unconditionally sets SA_RESTART, but here we 3390 need the signal to interrupt the read(2) in the el_gets(3) event loop. 3391 3392 OK dtucker@ deraadt@ 3393 3394 OpenBSD-Commit-ID: 8025115a773f52e9bb562eaab37ea2e021cc7299 3395 3396commit e1371e4f58404d6411d9f95eb774b444cea06a26 3397Author: naddy@openbsd.org <naddy@openbsd.org> 3398Date: Wed Aug 11 14:07:54 2021 +0000 3399 3400 upstream: scp: tweak man page and error message for -3 by default 3401 3402 Now that the -3 option is enabled by default, flip the documentation 3403 and error message logic from "requires -3" to "blocked by -R". 3404 3405 ok djm@ 3406 3407 OpenBSD-Commit-ID: a872592118444fb3acda5267b2a8c3d4c4252020 3408 3409commit 49f46f6d77328a3d10a758522b670a3e8c2235e7 3410Author: naddy@openbsd.org <naddy@openbsd.org> 3411Date: Wed Aug 11 14:05:19 2021 +0000 3412 3413 upstream: scp: do not spawn ssh with two -s flags for 3414 3415 remote-to-remote copies 3416 3417 Do not add another "-s" to the argument vector every time an SFTP 3418 connection is initiated. Instead, introduce a subsystem flag to 3419 do_cmd() and add "-s" when the flag is set. 3420 3421 ok djm@ 3422 3423 OpenBSD-Commit-ID: 25df69759f323661d31b2e1e790faa22e27966c1 3424 3425commit 2a2cd00783e1da45ee730b7f453408af1358ef5b 3426Author: djm@openbsd.org <djm@openbsd.org> 3427Date: Wed Aug 11 08:55:04 2021 +0000 3428 3429 upstream: test -Oprint-pubkey 3430 3431 OpenBSD-Regress-ID: 3d51afb6d1f287975fb6fddd7a2c00a3bc5094e0 3432 3433commit b9f4635ea5bc33ed5ebbacf332d79bae463b0f54 3434Author: djm@openbsd.org <djm@openbsd.org> 3435Date: Wed Aug 11 08:54:17 2021 +0000 3436 3437 upstream: when verifying sshsig signatures, support an option 3438 3439 (-Oprint-pubkey) to dump the full public key to stdout; based on patch from 3440 Fabian Stelzer; ok markus@ 3441 3442 OpenBSD-Commit-ID: 0598000e5b9adfb45d42afa76ff80daaa12fc3e2 3443 3444commit 750c1a45ba4e8ad63793d49418a0780e77947b9b 3445Author: djm@openbsd.org <djm@openbsd.org> 3446Date: Wed Aug 11 05:21:32 2021 +0000 3447 3448 upstream: oops, missed one more %p 3449 3450 OpenBSD-Commit-ID: e7e62818d1564cc5cd9086eaf7a51cbd1a9701eb 3451 3452commit b5aa27b69ab2e1c13ac2b5ad3f8f7d389bad7489 3453Author: djm@openbsd.org <djm@openbsd.org> 3454Date: Wed Aug 11 05:20:17 2021 +0000 3455 3456 upstream: remove a bunch of %p in format strings; leftovers of 3457 3458 debuggings past. prompted by Michael Forney, ok dtucker@ 3459 3460 OpenBSD-Commit-ID: 4853a0d6c9cecaba9ecfcc19066e52d3a8dcb2ac 3461 3462commit 419aa01123db5ff5dbc68b2376ef23b222862338 3463Author: Darren Tucker <dtucker@dtucker.net> 3464Date: Wed Aug 11 09:21:09 2021 +1000 3465 3466 Add includes.h to compat tests. 3467 3468 On platforms where closefrom returns void (eg glibc>=2.34) the prototype 3469 for closefrom in its compat tests would cause compile errors. Remove 3470 this and have the tests pull in the compat headers in the same way as 3471 the main code. bz#3336. 3472 3473commit 931f592f26239154eea3eb35a086585897b1a185 3474Author: djm@openbsd.org <djm@openbsd.org> 3475Date: Tue Aug 10 03:35:45 2021 +0000 3476 3477 upstream: adapt to scp -M flag change; make scp3.sh test SFTP mode too 3478 3479 OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0 3480 3481commit 391ca67fb978252c48d20c910553f803f988bd37 3482Author: djm@openbsd.org <djm@openbsd.org> 3483Date: Tue Aug 10 03:33:34 2021 +0000 3484 3485 upstream: Prepare for a future where scp(1) uses the SFTP protocol by 3486 3487 default. Replace recently added -M option to select the protocol with -O 3488 (olde) and -s (SFTP) flags, and label the -s flag with a clear warning that 3489 it will be removed in the near future (so no, don't use it in scripts!). 3490 3491 prompted by/feedback from deraadt@ 3492 3493 OpenBSD-Commit-ID: 92ad72cc6f0023c9be9e316d8b30eb6d8d749cfc 3494 3495commit bfdd4b722f124a4fa9173d20dd64dd0fc69856be 3496Author: djm@openbsd.org <djm@openbsd.org> 3497Date: Mon Aug 9 23:56:36 2021 +0000 3498 3499 upstream: make scp -3 the default for remote-to-remote copies. It 3500 3501 provides a much better and more intuitive user experience and doesn't require 3502 exposing credentials to the source host. 3503 3504 thanks naddy@ for catching the missing argument in usage() 3505 3506 "Yes please!" - markus@ 3507 "makes a lot of sense" - deraadt@ 3508 "the right thing to do" - dtucker@ 3509 3510 OpenBSD-Commit-ID: d0d2af5f0965c5192ba5b2fa461c9f9b130e5dd9 3511 3512commit 2f7a3b51cef689ad9e93d0c6c17db5a194eb5555 3513Author: djm@openbsd.org <djm@openbsd.org> 3514Date: Mon Aug 9 23:49:31 2021 +0000 3515 3516 upstream: make scp in SFTP mode try to use relative paths as much 3517 3518 as possible. Previosuly, it would try to make relative and ~/-rooted paths 3519 absolute before requesting transfers. 3520 3521 prompted by and much discussion deraadt@ 3522 ok markus@ 3523 3524 OpenBSD-Commit-ID: 46639d382ea99546a4914b545fa7b00fa1be5566 3525 3526commit 2ab864010e0a93c5dd95116fb5ceaf430e2fc23c 3527Author: djm@openbsd.org <djm@openbsd.org> 3528Date: Mon Aug 9 23:47:44 2021 +0000 3529 3530 upstream: SFTP protocol extension to allow the server to expand 3531 3532 ~-prefixed paths, in particular ~user ones. Allows scp in sftp mode to accept 3533 these paths, like scp in rcp mode does. 3534 3535 prompted by and much discussion deraadt@ 3536 ok markus@ 3537 3538 OpenBSD-Commit-ID: 7d794def9e4de348e1e777f6030fc9bafdfff392 3539 3540commit 41b019ac067f1d1f7d99914d0ffee4d2a547c3d8 3541Author: djm@openbsd.org <djm@openbsd.org> 3542Date: Mon Aug 9 23:44:32 2021 +0000 3543 3544 upstream: when scp is in SFTP mode, try to deal better with ~ 3545 3546 prefixed paths. ~user paths aren't supported, but ~/ paths will be accepted 3547 and prefixed with the SFTP server starting directory (more to come) 3548 3549 prompted by and discussed with deraadt@ 3550 ok markus@ 3551 3552 OpenBSD-Commit-ID: 263a071f14555c045fd03132a8fb6cbd983df00d 3553 3554commit b4b3f3da6cdceb3fd168b5fab69d11fba73bd0ae 3555Author: djm@openbsd.org <djm@openbsd.org> 3556Date: Mon Aug 9 07:21:01 2021 +0000 3557 3558 upstream: on fatal errors, make scp wait for ssh connection before 3559 3560 exiting avoids LogLevel=verbose (or greater) messages from ssh appearing 3561 after scp has returned exited and control has returned to the shell; ok 3562 markus@ 3563 3564 (this was originally committed as r1.223 along with unrelated stuff that 3565 I rolled back in r1.224) 3566 3567 OpenBSD-Commit-ID: 1261fd667ad918484889ed3d7aec074f3956a74b 3568 3569commit 2ae7771749e0b4cecb107f9d4860bec16c3f4245 3570Author: djm@openbsd.org <djm@openbsd.org> 3571Date: Mon Aug 9 07:19:12 2021 +0000 3572 3573 upstream: rever r1.223 - I accidentally committed unrelated changes 3574 3575 OpenBSD-Commit-ID: fb73f3865b2647a27dd94db73d6589506a9625f9 3576 3577commit 986abe94d481a1e82a01747360bd767b96b41eda 3578Author: djm@openbsd.org <djm@openbsd.org> 3579Date: Mon Aug 9 07:16:09 2021 +0000 3580 3581 upstream: show only the final path component in the progress meter; 3582 3583 more useful with long paths (that may truncate) and better matches 3584 traditional scp behaviour; spotted by naddy@ ok deraadt@ 3585 3586 OpenBSD-Commit-ID: 26b544d0074f03ebb8a3ebce42317d8d7ee291a3 3587 3588commit 2b67932bb3176dee4fd447af4368789e04a82b93 3589Author: djm@openbsd.org <djm@openbsd.org> 3590Date: Mon Aug 9 07:13:54 2021 +0000 3591 3592 upstream: on fatal errors, make scp wait for ssh connection before 3593 3594 exiting avoids LogLevel=verbose (or greater) messages from ssh appearing 3595 after scp has returned exited and control has returned to the shell; ok 3596 markus@ 3597 3598 OpenBSD-Commit-ID: ef9dab5ef5ae54a6a4c3b15d380568e94263456c 3599 3600commit 724eb900ace30661d45db2ba01d0f924d95ecccb 3601Author: dtucker@openbsd.org <dtucker@openbsd.org> 3602Date: Sun Aug 8 08:49:09 2021 +0000 3603 3604 upstream: xstrdup environment variable used by ForwardAgent. bz#3328 3605 3606 from goetze at dovetail.com, ok djm@ deraadt@ 3607 3608 OpenBSD-Commit-ID: 760320dac1c3b26904284ba417a7d63fccc5e742 3609 3610commit 86b4cb3a884846b358305aad17a6ef53045fa41f 3611Author: dtucker@openbsd.org <dtucker@openbsd.org> 3612Date: Sun Aug 8 08:27:28 2021 +0000 3613 3614 upstream: Although it's POSIX, not all shells used in Portable support 3615 3616 the implicit 'in "$@"' after 'for i'. 3617 3618 OpenBSD-Regress-ID: 3c9aec6bca4868f85d2742b6ba5223fce110bdbc 3619 3620commit f2ccf6c9f395923695f22345e626dfd691227aaf 3621Author: Darren Tucker <dtucker@dtucker.net> 3622Date: Sun Aug 8 17:39:56 2021 +1000 3623 3624 Move portable specific settings down. 3625 3626 This brings the top hunk of the file back in sync with OpenBSD 3627 so patches to the CVS Id should apply instead of always being 3628 rejected. 3629 3630commit 71b0eb997e220b0fc9331635af409ad84979f2af 3631Author: dtucker@openbsd.org <dtucker@openbsd.org> 3632Date: Sun Aug 8 07:27:52 2021 +0000 3633 3634 upstream: Move setting of USER further down the startup In portable 3635 3636 we have to change this and having it in the same hunk as the CVS Id string 3637 means applying changes fails every. single. time. 3638 3639 OpenBSD-Regress-ID: 87cd603eb6db58c9b430bf90adacb7f90864429b 3640 3641commit f0aca2706c710a0da1a4be705f825a807cd15400 3642Author: dtucker@openbsd.org <dtucker@openbsd.org> 3643Date: Sun Aug 8 06:38:33 2021 +0000 3644 3645 upstream: Drop -q in ssh-log-wrapper.sh to preserve logs. 3646 3647 scp and sftp like to add -q to the command line passed to ssh which 3648 overrides the LogLevel we set in the config files and suppresses output 3649 to the debug logs so drop any "-q" from the invoked ssh. In the one 3650 case where we actually want to use -q in the banner test, call the ssh 3651 binary directly bypassing the logging wrapper. 3652 3653 OpenBSD-Regress-ID: e2c97d3c964bda33a751374c56f65cdb29755b75 3654 3655commit cf27810a649c5cfae60f8ce66eeb25caa53b13bc 3656Author: dtucker@openbsd.org <dtucker@openbsd.org> 3657Date: Sat Aug 7 01:57:08 2021 +0000 3658 3659 upstream: Fix prototype mismatch for do_cmd. ok djm@ 3660 3661 OpenBSD-Commit-ID: 1c1598bb5237a7ae0be99152f185e0071163714d 3662 3663commit 85de69f64665245786e28c81ab01fe18b0e2a149 3664Author: djm@openbsd.org <djm@openbsd.org> 3665Date: Sat Aug 7 01:55:01 2021 +0000 3666 3667 upstream: sftp-client.c needs poll.h 3668 3669 remove unused variable 3670 3671 OpenBSD-Commit-ID: 233ac6c012cd23af62f237167a661db391055a16 3672 3673commit 397c4d72e50023af5fe3aee5cc2ad407a6eb1073 3674Author: Darren Tucker <dtucker@dtucker.net> 3675Date: Sat Aug 7 11:30:57 2021 +1000 3676 3677 Include poll.h and friends for struct pollfd. 3678 3679commit a9e2c533195f28627f205682482d9da384c4c52e 3680Author: djm@openbsd.org <djm@openbsd.org> 3681Date: Sat Aug 7 00:14:17 2021 +0000 3682 3683 upstream: do_upload() used a near-identical structure for 3684 3685 tracking expected status replies from the server to what do_download() was 3686 using. 3687 3688 Refactor it to use the same structure and factor out some common 3689 code into helper functions. 3690 3691 OpenBSD-Commit-ID: 0c167df8ab6df4a5292c32421922b0cf379e9054 3692 3693commit 7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee 3694Author: djm@openbsd.org <djm@openbsd.org> 3695Date: Sat Aug 7 00:12:09 2021 +0000 3696 3697 upstream: make scp(1) in SFTP mode follow symlinks like 3698 3699 traditional scp(1) ok markus@ 3700 3701 OpenBSD-Commit-ID: 97255e55be37e8e26605e4ba1e69f9781765d231 3702 3703commit 133b44e500422df68c9c25c3b6de35c0263132f1 3704Author: djm@openbsd.org <djm@openbsd.org> 3705Date: Sat Aug 7 00:10:49 2021 +0000 3706 3707 upstream: fix incorrect directory permissions on scp -3 3708 3709 transfers; ok markus@ 3710 3711 OpenBSD-Commit-ID: 64b2abaa5635a2be65ee2e77688ad9bcebf576c2 3712 3713commit 98b59244ca10e62ff67a420856770cb700164f59 3714Author: djm@openbsd.org <djm@openbsd.org> 3715Date: Sat Aug 7 00:09:57 2021 +0000 3716 3717 upstream: a bit more debugging of file attributes being 3718 3719 sent/received over the wire 3720 3721 OpenBSD-Commit-ID: f68c4e207b08ef95200a8b2de499d422808e089b 3722 3723commit c677e65365d6f460c084e41e0c4807bb8a9cf601 3724Author: djm@openbsd.org <djm@openbsd.org> 3725Date: Sat Aug 7 00:08:52 2021 +0000 3726 3727 upstream: make scp(1) in SFTP mode output better match original 3728 3729 scp(1) by suppressing "Retrieving [path]" lines that were emitted to support 3730 the interactive sftp(1) client. ok markus@ 3731 3732 OpenBSD-Commit-ID: 06be293df5f156a18f366079be2f33fa68001acc 3733 3734commit 48cd39b7a4e5e7c25101c6d1179f98fe544835cd 3735Author: djm@openbsd.org <djm@openbsd.org> 3736Date: Sat Aug 7 00:07:18 2021 +0000 3737 3738 upstream: factor out a structure duplicated between downloading 3739 3740 and crossloading; ok markus@ 3741 3742 OpenBSD-Commit-ID: 96eede24d520569232086a129febe342e4765d39 3743 3744commit 318c06bb04ee21a0cfa6b6022a201eacaa53f388 3745Author: djm@openbsd.org <djm@openbsd.org> 3746Date: Sat Aug 7 00:06:30 2021 +0000 3747 3748 upstream: use sftp_client crossloading to implement scp -3 3749 3750 feedback/ok markus@ 3751 3752 OpenBSD-Commit-ID: 7db4c0086cfc12afc9cfb71d4c2fd3c7e9416ee9 3753 3754commit de7115b373ba0be3861c65de9b606a3e0e9d29a3 3755Author: djm@openbsd.org <djm@openbsd.org> 3756Date: Sat Aug 7 00:02:41 2021 +0000 3757 3758 upstream: support for "cross"-loading files/directories, i.e. 3759 3760 downloading from one SFTP server while simultaneously uploading to another. 3761 3762 feedback & ok markus@ 3763 3764 OpenBSD-Commit-ID: 3982878e29d8df0fa4ddc502f5ff6126ac714235 3765 3766commit a50bd0367ff2063bbc70a387740a2aa6914de094 3767Author: djm@openbsd.org <djm@openbsd.org> 3768Date: Sat Aug 7 00:01:29 2021 +0000 3769 3770 upstream: factor our SSH2_FXP_OPEN calls into their own function; 3771 3772 "looks fine" markus@ 3773 3774 OpenBSD-Commit-ID: d3dea2153f08855c6d9dacc01973248944adeffb 3775 3776commit e3c0ba05873cf3d3f7d19d595667a251026b2d84 3777Author: djm@openbsd.org <djm@openbsd.org> 3778Date: Sat Aug 7 00:00:33 2021 +0000 3779 3780 upstream: prepare for scp -3 implemented via sftp 3781 3782 OpenBSD-Commit-ID: 194aac0dd87cb175334b71c2a30623a5ad55bb44 3783 3784commit 395d8fbdb094497211e1461cf0e2f80af5617e0a 3785Author: dtucker@openbsd.org <dtucker@openbsd.org> 3786Date: Fri Aug 6 09:00:18 2021 +0000 3787 3788 upstream: Make diff invocation more portable. 3789 3790 POSIX does not require diff to have -N, so compare in both directions 3791 with just -r, which should catch missing files in either directory. 3792 3793 OpenBSD-Regress-ID: 0e2ec8594556a6f369ed5a0a90c6806419b845f7 3794 3795commit d247a73ce27b460138599648d9c637c6f2b77605 3796Author: djm@openbsd.org <djm@openbsd.org> 3797Date: Wed Aug 4 21:28:00 2021 +0000 3798 3799 upstream: regression test for scp -3 3800 3801 OpenBSD-Regress-ID: b44375d125c827754a1f722ec6b6b75b634de05d 3802 3803commit 35c8e41a6f6d8ad76f8d1cd81ac2ea23d0d993b2 3804Author: dtucker@openbsd.org <dtucker@openbsd.org> 3805Date: Fri Aug 6 05:04:42 2021 +0000 3806 3807 upstream: Document "ProxyJump none". bz#3334. 3808 3809 OpenBSD-Commit-ID: f78cc6f55731f2cd35c3a41d5352ac1ee419eba7 3810 3811commit 911ec6411821bda535d09778df7503b92f0eafab 3812Author: dtucker@openbsd.org <dtucker@openbsd.org> 3813Date: Wed Aug 4 01:34:55 2021 +0000 3814 3815 upstream: Allow for different (but POSIX compliant) behaviour of 3816 3817 basename(3) and prevent a use-after-free in that case in the new sftp-compat 3818 code. 3819 3820 POSIX allows basename(3) to either return a pointer to static storage 3821 or modify the passed string and return a pointer to that. OpenBSD does 3822 the former and works as is, but on other platforms "filename" points 3823 into "tmp" which was just freed. This makes the freeing of tmp 3824 consistent with the other variable in the loop. 3825 3826 Pinpointed by the -portable Valgrind regress test. ok djm@ deraadt@ 3827 3828 OpenBSD-Commit-ID: 750f3c19bd4440e4210e30dd5d7367386e833374 3829 3830commit 6df1fecb5d3e51f3a8027a74885c3a44f6cbfcbd 3831Author: Damien Miller <djm@mindrot.org> 3832Date: Wed Aug 4 11:05:11 2021 +1000 3833 3834 use openbsd-compat glob.h is required 3835 3836commit 9ebd1828881dfc9014a344587934a5ce7db6fa1b 3837Author: Darren Tucker <dtucker@dtucker.net> 3838Date: Tue Aug 3 21:03:23 2021 +1000 3839 3840 Missing space between macro arg and punctuation. 3841 3842 From jmc@ 3843 3844commit 0fd3f62eddc7cf54dcc9053be6f58998f3eb926a 3845Author: Darren Tucker <dtucker@dtucker.net> 3846Date: Tue Aug 3 21:02:33 2021 +1000 3847 3848 Avoid lines >80 chars. From jmc@ 3849 3850commit af5d8094d8b755e1daaf2e20ff1dc252800b4c9b 3851Author: djm@openbsd.org <djm@openbsd.org> 3852Date: Tue Aug 3 01:05:24 2021 +0000 3853 3854 upstream: regression tests for scp SFTP protocol support; mostly by 3855 3856 Jakub Jelen in GHPR#194 ok markus 3857 3858 OpenBSD-Regress-ID: 36f1458525bcb111741ec8547eaf58b13cddc715 3859 3860commit e4673b7f67ae7740131a4ecea29a846593049a91 3861Author: anton@openbsd.org <anton@openbsd.org> 3862Date: Thu Jul 29 15:34:09 2021 +0000 3863 3864 upstream: Treat doas with arguments as a valid SUDO variable. 3865 3866 Allows one to specify SUDO="doas -n" which I do while running make regress. 3867 3868 ok dtucker@ 3869 3870 OpenBSD-Regress-ID: 4fe5814b5010dbf0885500d703bea06048d11005 3871 3872commit 197e29f1cca190d767c4b2b63a662f9a9e5da0b3 3873Author: djm@openbsd.org <djm@openbsd.org> 3874Date: Mon Aug 2 23:38:27 2021 +0000 3875 3876 upstream: support for using the SFTP protocol for file transfers in 3877 3878 scp, via a new "-M sftp" option. Marked as experimental for now. 3879 3880 Some corner-cases exist, in particular there is no attempt to 3881 provide bug-compatibility with scp's weird "double shell" quoting 3882 rules. 3883 3884 Mostly by Jakub Jelen in GHPR#194 with some tweaks by me. ok markus@ 3885 Thanks jmc@ for improving the scp.1 bits. 3886 3887 OpenBSD-Commit-ID: 6ce4c9157ff17b650ace571c9f7793d92874051c 3888 3889commit dd533c7ab79d61a7796b77b64bd81b098e0d7f9f 3890Author: jmc@openbsd.org <jmc@openbsd.org> 3891Date: Fri Jul 30 14:28:13 2021 +0000 3892 3893 upstream: fix a formatting error and add some Xr; from debian at 3894 3895 helgefjell de 3896 3897 removed references to rlogin etc. as no longer relevant; 3898 suggested by djm 3899 3900 ok djm dtucker 3901 3902 OpenBSD-Commit-ID: 3c431c303068d3aec5bb18573a0bd5e0cd77c5ae 3903 3904commit c7cd347a8823819411222c1e10a0d26747d0fd5c 3905Author: jmc@openbsd.org <jmc@openbsd.org> 3906Date: Fri Jul 30 14:25:01 2021 +0000 3907 3908 upstream: fix a formatting error and mark up known_hosts 3909 3910 consistently; issues reported by debian at helgefjell de 3911 3912 ok djm dtucker 3913 3914 OpenBSD-Commit-ID: a1fd8d21dc77f507685443832df0c9700481b0ce 3915 3916commit 4455aec2e4fc90f64ae4fc47e78ebc9c18721738 3917Author: jmc@openbsd.org <jmc@openbsd.org> 3918Date: Wed Jul 28 05:57:42 2021 +0000 3919 3920 upstream: no need to talk about version 2 with the -Q option, so 3921 3922 rewrite the text to read better; 3923 3924 issue reported by debian at helgefjell de 3925 ok djm dtucker 3926 3927 OpenBSD-Commit-ID: 59fe2e8219c37906740ad062e0fdaea487dbe9cf 3928 3929commit bec429338e9b30d2c7668060e82608286a8a4777 3930Author: jmc@openbsd.org <jmc@openbsd.org> 3931Date: Tue Jul 27 14:28:46 2021 +0000 3932 3933 upstream: word fix; reported by debian at helgefjell de 3934 3935 OpenBSD-Commit-ID: 0c6fd22142422a25343c5bd1a618f31618f41ece 3936 3937commit efad4deb5a1f1cf79ebefd63c6625059060bfbe1 3938Author: jmc@openbsd.org <jmc@openbsd.org> 3939Date: Tue Jul 27 14:14:25 2021 +0000 3940 3941 upstream: standardise the grammar in the options list; issue 3942 3943 reported by debian at helgefjell de 3944 3945 ok dtucker djm 3946 3947 OpenBSD-Commit-ID: 7ac15575045d82f4b205a42cc7d5207fe4c3f8e6 3948 3949commit 1e11fb24066f3fc259ee30db3dbb2a3127e05956 3950Author: Darren Tucker <dtucker@dtucker.net> 3951Date: Mon Aug 2 18:56:29 2021 +1000 3952 3953 Check for RLIMIT_NOFILE before trying to use it. 3954 3955commit 0f494236b49fb48c1ef33669f14822ca4f3ce2f4 3956Author: Darren Tucker <dtucker@dtucker.net> 3957Date: Tue Jul 27 17:45:34 2021 +1000 3958 3959 lastenv is only used in setenv. 3960 3961 Prevents an unused variable warning on platforms that have setenv but 3962 not unsetenv. 3963 3964commit a1f78e08bdb3eaa88603ba3c6e01de7c8671e28a 3965Author: Darren Tucker <dtucker@dtucker.net> 3966Date: Mon Jul 26 12:45:30 2021 +1000 3967 3968 Move SUDO to "make test" command line. 3969 3970 Environment variables don't get passed by vmrun, so move to command 3971 line. 3972 3973commit 02e624273b9c78a49a01239159b8c09b8409b1a0 3974Author: Darren Tucker <dtucker@dtucker.net> 3975Date: Sun Jul 25 23:26:36 2021 +1000 3976 3977 Set SUDO for tests and cleanup. 3978 3979commit 460ae5d93051bab70239ad823dd784822d58baad 3980Author: Darren Tucker <dtucker@dtucker.net> 3981Date: Sun Jul 25 22:37:55 2021 +1000 3982 3983 Pass OPENSSL=no to make tests too. 3984 3985commit b398f499c68d74ebe3298b73757cf3f36e14e0cb 3986Author: dtucker@openbsd.org <dtucker@openbsd.org> 3987Date: Sun Jul 25 12:27:37 2021 +0000 3988 3989 upstream: Skip unit and makefile-based key conversion tests when 3990 3991 we're building with OPENSSL=no. 3992 3993 OpenBSD-Regress-ID: 20455ed9a977c93f846059d1fcb48e29e2c8d732 3994 3995commit 727ce36c8c5941bde99216d27109405907caae4f 3996Author: dtucker@openbsd.org <dtucker@openbsd.org> 3997Date: Sun Jul 25 12:13:03 2021 +0000 3998 3999 upstream: Replace OPENSSL as the variable that points to the 4000 4001 openssl binary with OPENSSL_BIN. This will allow us to use the OPENSSL 4002 variable from mk.conf or the make(1) command line indicating if we're 4003 building with our without OpenSSL, and ultimately get the regress tests 4004 working in the OPENSSL=no configuration. 4005 4006 OpenBSD-Regress-ID: 2d788fade3264d7803e5b54cae8875963f688c4e 4007 4008commit 55e17101a9075f6a63af724261c5744809dcb95c 4009Author: dtucker@openbsd.org <dtucker@openbsd.org> 4010Date: Sat Jul 24 02:57:28 2021 +0000 4011 4012 upstream: Skip RFC4716 format import and export tests when built 4013 4014 without OpenSSL. 4015 4016 OpenBSD-Regress-ID: d2c2d5d38c1acc2b88cc99cfe00a2eb8bb39dfa4 4017 4018commit f5ccb5895d39cd627ad9e7b2c671d2587616100d 4019Author: dtucker@openbsd.org <dtucker@openbsd.org> 4020Date: Sat Jul 24 02:51:14 2021 +0000 4021 4022 upstream: Don't omit ssh-keygen -y from usage when built without 4023 4024 OpenSSL. It is actually available, albeit only for ed25519 keys. 4025 4026 OpenBSD-Commit-ID: 7a254c33d0e6a55c30c6b016a8d298d3cb7a7674 4027 4028commit 819d57ac23469f1f03baa8feb38ddefbada90fdc 4029Author: dtucker@openbsd.org <dtucker@openbsd.org> 4030Date: Sat Jul 24 02:08:13 2021 +0000 4031 4032 upstream: Exclude key conversion options from usage when built 4033 4034 without OpenSSL since those are not available, similar to what we currently 4035 do with the moduli screening options. We can also use this to skip the 4036 conversion regression tests in this case. 4037 4038 OpenBSD-Commit-ID: 3c82caa398cf99cd4518c23bba5a2fc66b16bafe 4039 4040commit b6673b1d2ee90b4690ee84f634efe40225423c38 4041Author: Darren Tucker <dtucker@dtucker.net> 4042Date: Sat Jul 24 13:02:51 2021 +1000 4043 4044 Test OpenBSD upstream with and without OpenSSL. 4045 4046commit 9d38074b5453c1abbdf888e80828c278d3b886ac 4047Author: djm@openbsd.org <djm@openbsd.org> 4048Date: Sat Jul 24 01:54:23 2021 +0000 4049 4050 upstream: test for first-match-wins in authorized_keys environment= 4051 4052 options 4053 4054 OpenBSD-Regress-ID: 1517c90276fe84b5dc5821c59f88877fcc34c0e8 4055 4056commit 2b76f1dd19787e784711ea297ad8fc938b4484fd 4057Author: dtucker@openbsd.org <dtucker@openbsd.org> 4058Date: Fri Jul 23 05:53:02 2021 +0000 4059 4060 upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly. 4061 4062 OpenBSD-Regress-ID: cdbe408ec3671ea9ee9b55651ee551370d2a4108 4063 4064commit 7d64a9fb587ba9592f027f7a2264226c713d6579 4065Author: djm@openbsd.org <djm@openbsd.org> 4066Date: Sat Jul 24 01:55:19 2021 +0000 4067 4068 upstream: don't leak environment= variable when it is not the first 4069 4070 match 4071 4072 OpenBSD-Commit-ID: 7fbdc3dfe0032deaf003fd937eeb4d434ee4efe0 4073 4074commit db2130e2340bf923e41c791aa9cd27b9e926042c 4075Author: jmc@openbsd.org <jmc@openbsd.org> 4076Date: Fri Jul 23 06:01:17 2021 +0000 4077 4078 upstream: punctuation; 4079 4080 OpenBSD-Commit-ID: 64be152e378c45975073ab1c07e0db7eddd15806 4081 4082commit 03190d10980c6fc9124e988cb2df13101f266507 4083Author: djm@openbsd.org <djm@openbsd.org> 4084Date: Fri Jul 23 05:56:47 2021 +0000 4085 4086 upstream: mention in comment that read_passphrase(..., RP_ALLOW_STDIN) 4087 4088 will try to use askpass first. bz3314 4089 4090 convert a couple of debug() -> debug_f() while here 4091 4092 OpenBSD-Commit-ID: c7e812aebc28fcc5db06d4710e0f73613dee545c 4093 4094commit 1653ece6832b2b304d46866b262d5f69880a9ec7 4095Author: dtucker@openbsd.org <dtucker@openbsd.org> 4096Date: Fri Jul 23 05:07:16 2021 +0000 4097 4098 upstream: Test conversion of ed25519 and ecdsa keys too. 4099 4100 OpenBSD-Regress-ID: 3676d2d00e58e0d6d37f2878f108cc2b83bbe4bb 4101 4102commit 8b7af02dcf9d2b738787efd27da7ffda9859bed2 4103Author: dtucker@openbsd.org <dtucker@openbsd.org> 4104Date: Fri Jul 23 04:56:21 2021 +0000 4105 4106 upstream: Add test for exporting pubkey from a passphrase-protected 4107 4108 private key. 4109 4110 OpenBSD-Regress-ID: da99d93e7b235fbd5b5aaa01efc411225e6ba8ac 4111 4112commit 441095d4a3e5048fe3c87a6c5db5bc3383d767fb 4113Author: djm@openbsd.org <djm@openbsd.org> 4114Date: Fri Jul 23 03:54:55 2021 +0000 4115 4116 upstream: regression test for time-limited signature keys 4117 4118 OpenBSD-Regress-ID: 2a6f3bd900dbee0a3c96f1ff23e032c93ab392bc 4119 4120commit 9e1882ef6489a7dd16b6d7794af96629cae61a53 4121Author: djm@openbsd.org <djm@openbsd.org> 4122Date: Fri Jul 23 05:24:02 2021 +0000 4123 4124 upstream: note successful authentication method in final "Authenticated 4125 4126 to ..." message and partial auth success messages (all at LogLevel=verbose) 4127 ok dtucker@ 4128 4129 OpenBSD-Commit-ID: 06834b89ceb89f8f16c5321d368a66c08f441984 4130 4131commit a917e973a1b90b40ff1e950df083364b48fc6c78 4132Author: djm@openbsd.org <djm@openbsd.org> 4133Date: Fri Jul 23 04:04:52 2021 +0000 4134 4135 upstream: Add a ForkAfterAuthentication ssh_config(5) counterpart 4136 4137 to the ssh(1) -f flag. Last part of GHPR231 from Volker Diels-Grabsch. ok 4138 dtucker 4139 4140 OpenBSD-Commit-ID: b18aeda12efdebe2093d55263c90fe4ea0bce0d3 4141 4142commit e0c5088f1c96a145eb6ea1dee438010da78f9ef5 4143Author: djm@openbsd.org <djm@openbsd.org> 4144Date: Fri Jul 23 04:00:59 2021 +0000 4145 4146 upstream: Add a StdinNull directive to ssh_config(5) that allows 4147 4148 the config file to do the same thing as -n does on the ssh(1) commandline. 4149 Patch from Volker Diels-Grabsch via GHPR231; ok dtucker 4150 4151 OpenBSD-Commit-ID: 66ddf3f15c76796d4dcd22ff464aed1edd62468e 4152 4153commit e3957e21ffdc119d6d04c0b1686f8e2fe052f5ea 4154Author: djm@openbsd.org <djm@openbsd.org> 4155Date: Fri Jul 23 03:57:20 2021 +0000 4156 4157 upstream: make authorized_keys environment="..." directives 4158 4159 first-match-wins and more strictly limit their maximum number; prompted by 4160 OOM reported by OSS-fuzz (35470). 4161 4162 feedback and ok dtucker@ 4163 4164 OpenBSD-Commit-ID: 01f63fc10dcd995e7aed9c378ad879161af83121 4165 4166commit d0bb1ce731762c55acb95817df4d5fab526c7ecd 4167Author: djm@openbsd.org <djm@openbsd.org> 4168Date: Fri Jul 23 03:37:52 2021 +0000 4169 4170 upstream: Let allowed signers files used by ssh-keygen(1) 4171 4172 signatures support key lifetimes, and allow the verification mode to specify 4173 a signature time to check at. This is intended for use by git to support 4174 signing objects using ssh keys. ok dtucker@ 4175 4176 OpenBSD-Commit-ID: 3e2c67b7dcd94f0610194d1e8e4907829a40cf31 4177 4178commit 44142068dc7ef783d135e91ff954e754d2ed432e 4179Author: dtucker@openbsd.org <dtucker@openbsd.org> 4180Date: Mon Jul 19 08:48:33 2021 +0000 4181 4182 upstream: Use SUDO when setting up hostkey. 4183 4184 OpenBSD-Regress-ID: 990cf4481cab8dad62e90818a9b4b36c533851a7 4185 4186commit 6b67f3f1d1d187597e54a139cc7785c0acebd9a2 4187Author: dtucker@openbsd.org <dtucker@openbsd.org> 4188Date: Mon Jul 19 05:08:54 2021 +0000 4189 4190 upstream: Increase time margin for rekey tests. Should help 4191 4192 reliability on very heavily loaded hosts. 4193 4194 OpenBSD-Regress-ID: 4c28a0fce3ea89ebde441d7091464176e9730533 4195 4196commit 7953e1bfce9e76bec41c1331a29bc6cff9d416b8 4197Author: Darren Tucker <dtucker@dtucker.net> 4198Date: Mon Jul 19 13:47:51 2021 +1000 4199 4200 Add sshfp-connect.sh file missed in previous. 4201 4202commit b75a80fa8369864916d4c93a50576155cad4df03 4203Author: dtucker@openbsd.org <dtucker@openbsd.org> 4204Date: Mon Jul 19 03:13:28 2021 +0000 4205 4206 upstream: Ensure that all returned SSHFP records for the specified host 4207 4208 name and hostkey type match instead of only one. While there, simplify the 4209 code somewhat and add some debugging. Based on discussion in bz#3322, ok 4210 djm@. 4211 4212 OpenBSD-Commit-ID: 0a6a0a476eb7f9dfe8fe2c05a1a395e3e9b22ee4 4213 4214commit 1cc1fd095393663cd72ddac927d82c6384c622ba 4215Author: dtucker@openbsd.org <dtucker@openbsd.org> 4216Date: Mon Jul 19 02:21:50 2021 +0000 4217 4218 upstream: Id sync only, -portable already has this. 4219 4220 Put dh_set_moduli_file call inside ifdef WITH_OPENSSL. Fixes 4221 build with OPENSSL=no. 4222 4223 OpenBSD-Commit-ID: af54abbebfb12bcde6219a44d544e18204defb15 4224 4225commit 33abbe2f4153f5ca5c874582f6a7cc91ae167485 4226Author: dtucker@openbsd.org <dtucker@openbsd.org> 4227Date: Mon Jul 19 02:46:34 2021 +0000 4228 4229 upstream: Add test for host key verification via SSHFP records. This 4230 4231 requires some external setup to operate so is disabled by default (see 4232 comments in sshfp-connect.sh). 4233 4234 OpenBSD-Regress-ID: c52c461bd1df3a803d17498917d156ef64512fd9 4235 4236commit f0cd000d8e3afeb0416dce1c711c3d7c28d89bdd 4237Author: dtucker@openbsd.org <dtucker@openbsd.org> 4238Date: Mon Jul 19 02:29:28 2021 +0000 4239 4240 upstream: Add ed25519 key and test SSHFP export of it. Only test 4241 4242 RSA SSHFP export if we have RSA functionality compiled in. 4243 4244 OpenBSD-Regress-ID: b4ff5181b8c9a5862e7f0ecdd96108622333a9af 4245 4246commit 0075511e27e5394faa28edca02bfbf13b9a6693e 4247Author: dtucker@openbsd.org <dtucker@openbsd.org> 4248Date: Mon Jul 19 00:16:26 2021 +0000 4249 4250 upstream: Group keygen tests together. 4251 4252 OpenBSD-Regress-ID: 07e2d25c527bb44f03b7c329d893a1f2d6c5c40c 4253 4254commit 034828820c7e62652e7c48f9ee6b67fb7ba6fa26 4255Author: dtucker@openbsd.org <dtucker@openbsd.org> 4256Date: Sun Jul 18 23:10:10 2021 +0000 4257 4258 upstream: Add test for ssh-keygen printing of SSHFP records. 4259 4260 OpenBSD-Regress-ID: fde9566b56eeb980e149bbe157a884838507c46b 4261 4262commit 52c3b6985ef1d5dadb4c4fe212f8b3a78ca96812 4263Author: djm@openbsd.org <djm@openbsd.org> 4264Date: Sat Jul 17 00:38:11 2021 +0000 4265 4266 upstream: wrap some long lines 4267 4268 OpenBSD-Commit-ID: 4f5186b1466656762dae37d3e569438d900c350d 4269 4270commit 43ec991a782791d0b3f42898cd789f99a07bfaa4 4271Author: djm@openbsd.org <djm@openbsd.org> 4272Date: Sat Jul 17 00:36:53 2021 +0000 4273 4274 upstream: fix sftp on ControlPersist connections, broken by recent 4275 4276 SessionType change; spotted by sthen@ 4277 4278 OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234 4279 4280commit 073f45c236550f158c9a94003e4611c07dea5279 4281Author: djm@openbsd.org <djm@openbsd.org> 4282Date: Fri Jul 16 09:00:23 2021 +0000 4283 4284 upstream: Explicitly check for and start time-based rekeying in the 4285 4286 client and server mainloops. 4287 4288 Previously the rekey timeout could expire but rekeying would not start 4289 until a packet was sent or received. This could cause us to spin in 4290 select() on the rekey timeout if the connection was quiet. 4291 4292 ok markus@ 4293 4294 OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987 4295 4296commit ef7c4e52d5d840607f9ca3a302a4cbb81053eccf 4297Author: jmc@openbsd.org <jmc@openbsd.org> 4298Date: Wed Jul 14 06:46:38 2021 +0000 4299 4300 upstream: reorder SessionType; ok djm 4301 4302 OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c 4303 4304commit 8aa2f9aeb56506dca996d68ab90ab9c0bebd7ec3 4305Author: Darren Tucker <dtucker@dtucker.net> 4306Date: Wed Jul 14 11:26:50 2021 +1000 4307 4308 Make whitespace consistent. 4309 4310commit 4f4297ee9b8a39f4dfd243a74c5f51f9e7a05723 4311Author: Darren Tucker <dtucker@dtucker.net> 4312Date: Wed Jul 14 11:26:12 2021 +1000 4313 4314 Add ARM64 Linux self-hosted runner. 4315 4316commit eda8909d1b0a85b9c3804a04d03ec6738fd9dc7f 4317Author: djm@openbsd.org <djm@openbsd.org> 4318Date: Tue Jul 13 23:48:36 2021 +0000 4319 4320 upstream: add a SessionType directive to ssh_config, allowing the 4321 4322 configuration file to offer equivalent control to the -N (no session) and -s 4323 (subsystem) command-line flags. 4324 4325 Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks; 4326 feedback and ok dtucker@ 4327 4328 OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12 4329 4330commit 7ae69f2628e338ba6e0eae7ee8a63bcf8fea7538 4331Author: djm@openbsd.org <djm@openbsd.org> 4332Date: Mon Jul 12 02:12:22 2021 +0000 4333 4334 upstream: fix some broken tests; clean up output 4335 4336 OpenBSD-Regress-ID: 1d5038edb511dc4ce1622344c1e724626a253566 4337 4338commit f5fc6a4c3404bbf65c21ca6361853b33d78aa87e 4339Author: Darren Tucker <dtucker@dtucker.net> 4340Date: Mon Jul 12 18:00:05 2021 +1000 4341 4342 Add configure-time detection for SSH_TIME_T_MAX. 4343 4344 Should fix printing cert times exceeding INT_MAX (bz#3329) on platforms 4345 were time_t is a long long. The limit used is for the signed type, so if 4346 some system has a 32bit unsigned time_t then the lower limit will still 4347 be imposed and we would need to add some way to detect this. Anyone using 4348 an unsigned 64bit can let us know when it starts being a problem. 4349 4350commit fd2d06ae4442820429d634c0a8bae11c8e40c174 4351Author: dtucker@openbsd.org <dtucker@openbsd.org> 4352Date: Mon Jul 12 06:22:57 2021 +0000 4353 4354 upstream: Make limit for time_t test unconditional in the 4355 4356 format_absolute_time fix for bz#3329 that allows printing of timestamps past 4357 INT_MAX. This was incorrectly included with the previous commit. Based on 4358 discussion with djm@. 4359 4360 OpenBSD-Commit-ID: 835936f6837c86504b07cabb596b613600cf0f6e 4361 4362commit 6c29b387cd64a57b0ec8ae7d2c8d02789d88fcc3 4363Author: dtucker@openbsd.org <dtucker@openbsd.org> 4364Date: Mon Jul 12 06:08:57 2021 +0000 4365 4366 upstream: Use existing format_absolute_time() function when 4367 4368 printing cert validity instead of doing it inline. Part of bz#3329. 4369 4370 OpenBSD-Commit-ID: a13d4e3c4f59644c23745eb02a09b2a4e717c00c 4371 4372commit 99981d5f8bfa383791afea03f6bce8454e96e323 4373Author: djm@openbsd.org <djm@openbsd.org> 4374Date: Fri Jul 9 09:55:56 2021 +0000 4375 4376 upstream: silence redundant error message; reported by Fabian Stelzer 4377 4378 OpenBSD-Commit-ID: 9349a703016579a60557dafd03af2fe1d44e6aa2 4379 4380commit e86097813419b49d5bff5c4b51d1c3a5d4d2d804 4381Author: John Ericson <John.Ericson@Obsidian.Systems> 4382Date: Sat Dec 26 11:40:49 2020 -0500 4383 4384 Re-indent krb5 section after pkg-config addition. 4385 4386commit 32dd2daa56c294e40ff7efea482c9eac536d8cbb 4387Author: John Ericson <John.Ericson@Obsidian.Systems> 4388Date: Sat Dec 26 11:40:49 2020 -0500 4389 4390 Support finding Kerberos via pkg-config 4391 4392 This makes cross compilation easier. 4393 4394commit def7a72234d7e4f684d72d33a0f7229f9eee0aa4 4395Author: Darren Tucker <dtucker@dtucker.net> 4396Date: Fri Jul 9 14:34:06 2021 +1000 4397 4398 Update comments about EGD to include prngd. 4399 4400commit b5d23150b4e3368f4983fd169d432c07afeee45a 4401Author: dtucker@openbsd.org <dtucker@openbsd.org> 4402Date: Mon Jul 5 01:21:07 2021 +0000 4403 4404 upstream: Fix a couple of whitespace things. Portable already has 4405 4406 these so this removes two diffs between the two. 4407 4408 OpenBSD-Commit-ID: 769f017ebafd8e741e337b3e9e89eb5ac73c9c56 4409 4410commit 8f57be9f279b8e905f9883066aa633c7e67b31cf 4411Author: dtucker@openbsd.org <dtucker@openbsd.org> 4412Date: Mon Jul 5 01:16:46 2021 +0000 4413 4414 upstream: Order includes as per style(9). Portable already has 4415 4416 these so this removes a handful of diffs between the two. 4417 4418 OpenBSD-Commit-ID: 8bd7452d809b199c19bfc49511a798f414eb4a77 4419 4420commit b75624f8733b3ed9e240f86cac5d4a39dae11848 4421Author: dtucker@openbsd.org <dtucker@openbsd.org> 4422Date: Mon Jul 5 00:50:25 2021 +0000 4423 4424 upstream: Remove comment referencing now-removed 4425 4426 RhostsRSAAuthentication. ok djm@ 4427 4428 OpenBSD-Commit-ID: 3d864bfbd99a1d4429a58e301688f3be464827a9 4429 4430commit b67eb12f013c5441bb4f0893a97533582ad4eb13 4431Author: djm@openbsd.org <djm@openbsd.org> 4432Date: Mon Jul 5 00:25:42 2021 +0000 4433 4434 upstream: allow spaces to appear in usernames for local to remote, 4435 4436 and scp -3 remote to remote copies. with & ok dtucker bz#1164 4437 4438 OpenBSD-Commit-ID: e9b550f3a85ffbb079b6720833da31317901d6dd 4439 4440commit 8c4ef0943e574f614fc7c6c7e427fd81ee64ab87 4441Author: dtucker@openbsd.org <dtucker@openbsd.org> 4442Date: Fri Jul 2 07:20:44 2021 +0000 4443 4444 upstream: Remove obsolete comments about SSHv1 auth methods. ok 4445 4446 djm@ 4447 4448 OpenBSD-Commit-ID: 6060f70966f362d8eb4bec3da2f6c4712fbfb98f 4449 4450commit 88908c9b61bcb99f16e8d398fc41e2b3b4be2003 4451Author: Darren Tucker <dtucker@dtucker.net> 4452Date: Sat Jul 3 23:00:19 2021 +1000 4453 4454 Remove reference to ChallengeResponse. 4455 4456 challenge_response_authentication was removed from the struct, keeping 4457 kbd_interactive_authentication. 4458 4459commit 321874416d610ad2158ce6112f094a4862c2e37f 4460Author: Darren Tucker <dtucker@dtucker.net> 4461Date: Sat Jul 3 20:38:09 2021 +1000 4462 4463 Move signal.h up include order to match upstream. 4464 4465commit 4fa83e2d0e32c2dd758653e0359984bbf1334f32 4466Author: Darren Tucker <dtucker@dtucker.net> 4467Date: Sat Jul 3 20:36:06 2021 +1000 4468 4469 Remove old OpenBSD version marker. 4470 4471 Looks like an accidental leftover from a sync. 4472 4473commit 9d5e31f55d5f3899b72645bac41a932d298ad73b 4474Author: Darren Tucker <dtucker@dtucker.net> 4475Date: Sat Jul 3 20:34:19 2021 +1000 4476 4477 Remove duplicate error on error path. 4478 4479 There's an extra error() call on the listen error path, it looks like 4480 its removal was missed during an upstream sync. 4481 4482commit 888c459925c7478ce22ff206c9ac1fb812a40caf 4483Author: Darren Tucker <dtucker@dtucker.net> 4484Date: Sat Jul 3 20:32:46 2021 +1000 4485 4486 Remove some whitespace not in upstream. 4487 4488 Reduces diff vs OpenBSD by a small amount. 4489 4490commit 4d2d4d47a18d93f3e0a91a241a6fdb545bbf7dc2 4491Author: Darren Tucker <dtucker@dtucker.net> 4492Date: Sat Jul 3 19:27:43 2021 +1000 4493 4494 Replace remaining references to ChallengeResponse. 4495 4496 Portable had a few additional references to ChallengeResponse related to 4497 UsePAM, replaces these with equivalent keyboard-interactive ones. 4498 4499commit 53237ac789183946dac6dcb8838bc3b6b9b43be1 4500Author: Darren Tucker <dtucker@dtucker.net> 4501Date: Sat Jul 3 19:23:28 2021 +1000 4502 4503 Sync remaining ChallengeResponse removal. 4504 4505 These were omitted from commit 88868fd131. 4506 4507commit 2c9e4b319f7e98744b188b0f58859d431def343b 4508Author: Darren Tucker <dtucker@dtucker.net> 4509Date: Sat Jul 3 19:17:31 2021 +1000 4510 4511 Disable rocky84 to figure out why agent test fails 4512 4513commit bfe19197a92b7916f64a121fbd3c179abf15e218 4514Author: Darren Tucker <dtucker@dtucker.net> 4515Date: Fri Jul 2 15:43:28 2021 +1000 4516 4517 Remove now-unused SSHv1 enums. 4518 4519 sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options 4520 and are no longer used. 4521 4522commit c73b02d92d72458a5312bd098f32ce88868fd131 4523Author: dtucker@openbsd.org <dtucker@openbsd.org> 4524Date: Fri Jul 2 05:11:20 2021 +0000 4525 4526 upstream: Remove references to ChallengeResponseAuthentication in 4527 4528 favour of KbdInteractiveAuthentication. The former is what was in SSHv1, the 4529 latter is what is in SSHv2 (RFC4256) and they were treated as somewhat but 4530 not entirely equivalent. We retain the old name as deprecated alias so 4531 config files continue to work and a reference in the man page for people 4532 looking for it. 4533 4534 Prompted by bz#3303 which pointed out the discrepancy between the two 4535 when used with Match. Man page help & ok jmc@, with & ok djm@ 4536 4537 OpenBSD-Commit-ID: 2c1bff8e5c9852cfcdab1f3ea94dfef5a22f3b7e 4538 4539commit f841fc9c8c7568a3b5d84a4cc0cefacb7dbc16b9 4540Author: Darren Tucker <dtucker@dtucker.net> 4541Date: Fri Jul 2 15:20:32 2021 +1000 4542 4543 Fix ifdefs around get_random_bytes_prngd. 4544 4545 get_random_bytes_prngd() is used if either of PRNGD_PORT or PRNGD_SOCKET 4546 are defined, so adjust ifdef accordingly. 4547 4548commit 0767627cf66574484b9c0834500b42ea04fe528a 4549Author: Damien Miller <djm@mindrot.org> 4550Date: Fri Jul 2 14:30:23 2021 +1000 4551 4552 wrap get_random_bytes_prngd() in ifdef 4553 4554 avoid unused static function warning 4555 4556commit f93fdc4de158386efe1116bd44c5b3f4a7a82c25 4557Author: Darren Tucker <dtucker@dtucker.net> 4558Date: Mon Jun 28 13:06:37 2021 +1000 4559 4560 Add rocky84 test target. 4561 4562commit d443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b 4563Author: djm@openbsd.org <djm@openbsd.org> 4564Date: Fri Jun 25 06:30:22 2021 +0000 4565 4566 upstream: fix decoding of X.509 subject name; from Leif Thuresson 4567 4568 via bz3327 ok markus@ 4569 4570 OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8 4571 4572commit 2a5704ec142202d387fda2d6872fd4715ab81347 4573Author: dtucker@openbsd.org <dtucker@openbsd.org> 4574Date: Fri Jun 25 06:20:39 2021 +0000 4575 4576 upstream: Use better language to refer to the user. From l1ving 4577 4578 via github PR#250, ok jmc@ 4579 4580 OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf 4581 4582commit 4bdf7a04797a0ea1c431a9d54588417c29177d19 4583Author: dtucker@openbsd.org <dtucker@openbsd.org> 4584Date: Fri Jun 25 03:38:17 2021 +0000 4585 4586 upstream: Replace SIGCHLD/notify_pipe kludge with pselect. 4587 4588 Previously sshd's SIGCHLD handler would wake up select() by writing a 4589 byte to notify_pipe. We can remove this by blocking SIGCHLD, checking 4590 for child terminations then passing the original signal mask through 4591 to pselect. This ensures that the pselect will immediately wake up if 4592 a child terminates between wait()ing on them and the pselect. 4593 4594 In -portable, for platforms that do not have pselect the kludge is still 4595 there but is hidden behind a pselect interface. 4596 4597 Based on other changes for bz#2158, ok djm@ 4598 4599 OpenBSD-Commit-ID: 202c85de0b3bdf1744fe53529a05404c5480d813 4600 4601commit c9f7bba2e6f70b7ac1f5ea190d890cb5162ce127 4602Author: Darren Tucker <dtucker@dtucker.net> 4603Date: Fri Jun 25 15:08:18 2021 +1000 4604 4605 Move closefrom() to before first malloc. 4606 4607 When built against tcmalloc, tcmalloc allocates a descriptor for its 4608 internal use, so calling closefrom() afterward causes the descriptor 4609 number to be reused resulting in a corrupted connection. Moving the 4610 closefrom a little earlier should resolve this. From kircherlike at 4611 outlook.com via bz#3321, ok djm@ 4612 4613commit 7ebfe4e439853b88997c9cfc2ff703408a1cca92 4614Author: Darren Tucker <dtucker@dtucker.net> 4615Date: Fri Jun 18 20:41:45 2021 +1000 4616 4617 Put second -lssh in link line for sftp-server. 4618 4619 When building --without-openssl the recent port-prngd.c change adds 4620 a dependency on atomicio, but since nothing else in sftp-server uses 4621 it, the linker may not find it. Add a second -lssh similar to other 4622 binaries. 4623 4624commit e409d7966785cfd9f5970e66a820685c42169717 4625Author: Darren Tucker <dtucker@dtucker.net> 4626Date: Fri Jun 18 18:34:08 2021 +1000 4627 4628 Try EGD/PRNGD if random device fails. 4629 4630 When built --without-openssl, try EGD/PRGGD (if configured) as a last 4631 resort before failing. 4632 4633commit e43a898043faa3a965dbaa1193cc60e0b479033d 4634Author: Darren Tucker <dtucker@dtucker.net> 4635Date: Fri Jun 18 18:32:51 2021 +1000 4636 4637 Split EGD/PRNGD interface into its own file. 4638 4639 This will allow us to use it when building --without-openssl. 4640 4641commit acb2887a769a1b1912cfd7067f3ce04fad240260 4642Author: Darren Tucker <dtucker@dtucker.net> 4643Date: Thu Jun 17 21:03:19 2021 +1000 4644 4645 Handle GIDs > 2^31 in getgrouplist. 4646 4647 When compiled in 32bit mode, the getgrouplist implementation may fail 4648 for GIDs greater than LONG_MAX. Analysis and change from ralf.winkel 4649 at tui.com. 4650 4651commit 31fac20c941126281b527605b73bff30a8f02edd 4652Author: dtucker@openbsd.org <dtucker@openbsd.org> 4653Date: Thu Jun 10 09:46:28 2021 +0000 4654 4655 upstream: Use $SUDO when reading sshd's pidfile here too. 4656 4657 OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409 4658 4659commit a3a58acffc8cc527f8fc6729486d34e4c3d27643 4660Author: dtucker@openbsd.org <dtucker@openbsd.org> 4661Date: Thu Jun 10 09:43:51 2021 +0000 4662 4663 upstream: Use $SUDO when reading sshd's pidfile in case it was 4664 4665 created with a very restrictive umask. This resyncs with -portable. 4666 4667 OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d 4668 4669commit 249ad4ae51cd3bc235e75a4846eccdf8b1416611 4670Author: dtucker@openbsd.org <dtucker@openbsd.org> 4671Date: Thu Jun 10 09:37:59 2021 +0000 4672 4673 upstream: Set umask when creating hostkeys to prevent excessive 4674 4675 permissions warning. 4676 4677 OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef 4678 4679commit 9d0892153c005cc65897e9372b01fa66fcbe2842 4680Author: dtucker@openbsd.org <dtucker@openbsd.org> 4681Date: Thu Jun 10 03:45:31 2021 +0000 4682 4683 upstream: Add regress test for SIGHUP restart 4684 4685 while handling active and unauthenticated clients. Should catch anything 4686 similar to the pselect bug just fixed in sshd.c. 4687 4688 OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73 4689 4690commit 73f6f191f44440ca3049b9d3c8e5401d10b55097 4691Author: dtucker@openbsd.org <dtucker@openbsd.org> 4692Date: Thu Jun 10 03:14:14 2021 +0000 4693 4694 upstream: Continue accept loop when pselect 4695 4696 returns -1, eg if it was interrupted by a signal. This should prevent 4697 the hang discovered by sthen@ wherein sshd receives a SIGHUP while it has 4698 an unauthenticated child and goes on to a blocking read on a notify_pipe. 4699 feedback deraadt@, ok djm@ 4700 4701 OpenBSD-Commit-ID: 0243c1c5544fca0974dae92cd4079543a3fceaa0 4702 4703commit c785c0ae134a8e8b5c82b2193f64c632a98159e4 4704Author: djm@openbsd.org <djm@openbsd.org> 4705Date: Tue Jun 8 22:30:27 2021 +0000 4706 4707 upstream: test that UserKnownHostsFile correctly accepts multiple 4708 4709 arguments; would have caught readconf.c r1.356 regression 4710 4711 OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a 4712 4713commit 1a6f6b08e62c78906a3032e8d9a83e721c84574e 4714Author: djm@openbsd.org <djm@openbsd.org> 4715Date: Tue Jun 8 22:06:12 2021 +0000 4716 4717 upstream: fix regression in r1.356: for ssh_config options that 4718 4719 accepted multiple string arguments, ssh was only recording the first. 4720 Reported by Lucas via bugs@ 4721 4722 OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d 4723 4724commit 78e30af3e2b2dd540a341cc827c6b98dd8b0a6de 4725Author: djm@openbsd.org <djm@openbsd.org> 4726Date: Tue Jun 8 07:40:12 2021 +0000 4727 4728 upstream: test argv_split() optional termination on comments 4729 4730 OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c 4731 4732commit a023138957ea2becf1c7f93fcc42b0aaac6f2b03 4733Author: dtucker@openbsd.org <dtucker@openbsd.org> 4734Date: Tue Jun 8 07:05:27 2021 +0000 4735 4736 upstream: Add testcases from bz#3319 for IPQoS and TunnelDevice 4737 4738 being overridden on the command line. 4739 4740 OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8 4741 4742commit 660cea10b2cdc11f13ba99c89b1bbb368a4d9ff2 4743Author: djm@openbsd.org <djm@openbsd.org> 4744Date: Tue Jun 8 06:52:43 2021 +0000 4745 4746 upstream: sprinkle some "# comment" at end of configuration lines 4747 4748 to test comment handling 4749 4750 OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7 4751 4752commit acc9c32dcb6def6c7d3688bceb4c0e59bd26b411 4753Author: djm@openbsd.org <djm@openbsd.org> 4754Date: Tue Jun 8 06:51:47 2021 +0000 4755 4756 upstream: more descriptive failure message 4757 4758 OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509 4759 4760commit ce04dd4eae23d1c9cf7c424a702f48ee78573bc1 4761Author: djm@openbsd.org <djm@openbsd.org> 4762Date: Mon Jun 7 01:16:34 2021 +0000 4763 4764 upstream: test AuthenticationMethods inside a Match block as well 4765 4766 as in the main config section 4767 4768 OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7 4769 4770commit 9018bd821fca17e26e92f7a7e51d9b24cd62f2db 4771Author: djm@openbsd.org <djm@openbsd.org> 4772Date: Mon Jun 7 00:00:50 2021 +0000 4773 4774 upstream: prepare for stricter sshd_config parsing that will refuse 4775 4776 a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent 4777 arguments. Such lines are permitted but are nonsensical noops ATM 4778 4779 OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650 4780 4781commit a10f929d1ce80640129fc5b6bc1acd9bf689169e 4782Author: djm@openbsd.org <djm@openbsd.org> 4783Date: Tue Jun 8 07:09:42 2021 +0000 4784 4785 upstream: switch sshd_config parsing to argv_split() 4786 4787 similar to the previous commit, this switches sshd_config parsing to 4788 the newer tokeniser. Config parsing will be a little stricter wrt 4789 quote correctness and directives appearing without arguments. 4790 4791 feedback and ok markus@ 4792 4793 tested in snaps for the last five or so days - thanks Theo and those who 4794 caught bugs 4795 4796 OpenBSD-Commit-ID: 9c4305631d20c2d194661504ce11e1f68b20d93e 4797 4798commit ea9e45c89a4822d74a9d97fef8480707d584da4d 4799Author: djm@openbsd.org <djm@openbsd.org> 4800Date: Tue Jun 8 07:07:15 2021 +0000 4801 4802 upstream: Switch ssh_config parsing to use argv_split() 4803 4804 This fixes a couple of problems with the previous tokeniser, 4805 strdelim() 4806 4807 1. strdelim() is permissive wrt accepting '=' characters. This is 4808 intended to allow it to tokenise "Option=value" but because it 4809 cannot keep state, it will incorrectly split "Opt=val=val2". 4810 2. strdelim() has rudimentry handling of quoted strings, but it 4811 is incomplete and inconsistent. E.g. it doesn't handle escaped 4812 quotes inside a quoted string. 4813 3. It has no support for stopping on a (unquoted) comment. Because 4814 of this readconf.c r1.343 added chopping of lines at '#', but 4815 this caused a regression because these characters may legitimately 4816 appear inside quoted strings. 4817 4818 The new tokeniser is stricter is a number of cases, including #1 above 4819 but previously it was also possible for some directives to appear 4820 without arguments. AFAIK these were nonsensical in all cases, and the 4821 new tokeniser refuses to accept them. 4822 4823 The new code handles quotes much better, permitting quoted space as 4824 well as escaped closing quotes. Finally, comment handling should be 4825 fixed - the tokeniser will terminate only on unquoted # characters. 4826 4827 feedback & ok markus@ 4828 4829 tested in snaps for the last five or so days - thanks Theo and those who 4830 caught bugs 4831 4832 OpenBSD-Commit-ID: dc72fd12af9d5398f4d9e159d671f9269c5b14d5 4833 4834commit d786424986c04d1d375f231fda177c8408e05c3e 4835Author: dtucker@openbsd.org <dtucker@openbsd.org> 4836Date: Tue Jun 8 07:02:46 2021 +0000 4837 4838 upstream: Check if IPQoS or TunnelDevice are already set before 4839 4840 overriding. Prevents values in config files from overriding values supplied 4841 on the command line. bz#3319, ok markus. 4842 4843 OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74 4844 4845commit aae4b4d3585b9f944d7dbd3c9e5ba0006c55e457 4846Author: djm@openbsd.org <djm@openbsd.org> 4847Date: Tue Jun 8 06:54:40 2021 +0000 4848 4849 upstream: Allow argv_split() to optionally terminate tokenisation 4850 4851 when it encounters an unquoted comment. 4852 4853 Add some additional utility function for working with argument 4854 vectors, since we'll be switching to using them to parse 4855 ssh/sshd_config shortly. 4856 4857 ok markus@ as part of a larger diff; tested in snaps 4858 4859 OpenBSD-Commit-ID: fd9c108cef2f713f24e3bc5848861d221bb3a1ac 4860 4861commit da9f9acaac5bab95dca642b48e0c8182b246ab69 4862Author: Darren Tucker <dtucker@dtucker.net> 4863Date: Mon Jun 7 19:19:23 2021 +1000 4864 4865 Save logs on failure for upstream test 4866 4867commit 76883c60161e5f3808787085a27a8c37f8cc4e08 4868Author: Darren Tucker <dtucker@dtucker.net> 4869Date: Mon Jun 7 14:36:32 2021 +1000 4870 4871 Add obsdsnap-i386 upstream test target. 4872 4873commit d45b9c63f947ec5ec314696e70281f6afddc0ac3 4874Author: djm@openbsd.org <djm@openbsd.org> 4875Date: Mon Jun 7 03:38:38 2021 +0000 4876 4877 upstream: fix debug message when finding a private key to match a 4878 4879 certificate being attempted for user authentication. Previously it would 4880 print the certificate's path, whereas it was supposed to be showing the 4881 private key's path. Patch from Alex Sherwin via GHPR247 4882 4883 OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b 4884 4885commit 530739d42f6102668aecd699be0ce59815c1eceb 4886Author: djm@openbsd.org <djm@openbsd.org> 4887Date: Sun Jun 6 11:34:16 2021 +0000 4888 4889 upstream: Match host certificates against host public keys, not private 4890 4891 keys. Allows use of certificates with private keys held in a ssh-agent. 4892 Reported by Miles Zhou in bz3524; ok dtucker@ 4893 4894 OpenBSD-Commit-ID: 25f5bf70003126d19162862d9eb380bf34bac22a 4895 4896commit 4265215d7300901fd7097061c7517688ade82f8e 4897Author: djm@openbsd.org <djm@openbsd.org> 4898Date: Sun Jun 6 03:40:39 2021 +0000 4899 4900 upstream: Client-side workaround for a bug in OpenSSH 7.4: this release 4901 4902 allows RSA/SHA2 signatures for public key authentication but fails to 4903 advertise this correctly via SSH2_MSG_EXT_INFO. This causes clients of these 4904 server to incorrectly match PubkeyAcceptedAlgorithms and potentially refuse 4905 to offer valid keys. 4906 4907 Reported by and based on patch from Gordon Messmer via bz3213, thanks 4908 also for additional analysis by Jakub Jelen. ok dtucker 4909 4910 OpenBSD-Commit-ID: d6d0b7351d5d44c45f3daaa26efac65847a564f7 4911 4912commit bda270d7fb8522d43c21a79a4b02a052d7c64de8 4913Author: djm@openbsd.org <djm@openbsd.org> 4914Date: Sun Jun 6 03:17:02 2021 +0000 4915 4916 upstream: degrade gracefully if a sftp-server offers the 4917 4918 limits@openssh.com extension but fails when the client tries to invoke it. 4919 Reported by Hector Martin via bz3318 4920 4921 OpenBSD-Commit-ID: bd9d1839c41811616ede4da467e25746fcd9b967 4922 4923commit d345d5811afdc2d6923019b653cdd93c4cc95f76 4924Author: djm@openbsd.org <djm@openbsd.org> 4925Date: Sun Jun 6 03:15:39 2021 +0000 4926 4927 upstream: the limits@openssh.com extension was incorrectly marked 4928 4929 as an operation that writes to the filesystem, which made it unavailable in 4930 sftp-server read-only mode. Spotted by Hector Martin via bz3318 4931 4932 OpenBSD-Commit-ID: f054465230787e37516c4b57098fc7975e00f067 4933 4934commit 2b71010d9b43d7b8c9ec1bf010beb00d98fa765a 4935Author: naddy@openbsd.org <naddy@openbsd.org> 4936Date: Sat Jun 5 13:47:00 2021 +0000 4937 4938 upstream: PROTOCOL.certkeys: update reference from IETF draft to 4939 4940 RFC 4941 4942 Also fix some typos. 4943 ok djm@ 4944 4945 OpenBSD-Commit-ID: 5e855b6c5a22b5b13f8ffa3897a868e40d349b44 4946 4947commit aa99b2d9a3e45b943196914e8d8bf086646fdb54 4948Author: Darren Tucker <dtucker@dtucker.net> 4949Date: Fri Jun 4 23:41:29 2021 +1000 4950 4951 Clear notify_pipe from readset if present. 4952 4953 Prevents leaking an implementation detail to the caller. 4954 4955commit 6de8dadf6b4d0627d35bca0667ca44b1d61c2c6b 4956Author: Darren Tucker <dtucker@dtucker.net> 4957Date: Fri Jun 4 23:24:25 2021 +1000 4958 4959 space->tabs. 4960 4961commit c8677065070ee34c05c7582a9c2f58d8642e552d 4962Author: Darren Tucker <dtucker@dtucker.net> 4963Date: Fri Jun 4 18:39:48 2021 +1000 4964 4965 Add pselect implementation for platforms without. 4966 4967 This is basically the existing notify_pipe kludge from serverloop.c 4968 moved behind a pselect interface. It works by installing a signal 4969 handler that writes to a pipe that the select is watching, then calls 4970 the original handler. 4971 4972 The select call in serverloop will become pselect soon, at which point the 4973 kludge will be removed from thereand will only exist in the compat layer. 4974 Original code by markus, help from djm. 4975 4976commit 7cd7f302d3a072748299f362f9e241d81fcecd26 4977Author: Vincent Brillault <vincent.brillault@cern.ch> 4978Date: Sun May 24 09:15:06 2020 +0200 4979 4980 auth_log: dont log partial successes as failures 4981 4982 By design, 'partial' logins are successful logins, so initially with 4983 authenticated set to 1, for which another authentication is required. As 4984 a result, authenticated is always reset to 0 when partial is set to 1. 4985 However, even if authenticated is 0, those are not failed login 4986 attempts, similarly to attempts with authctxt->postponed set to 1. 4987 4988commit e7606919180661edc7f698e6a1b4ef2cfb363ebf 4989Author: djm@openbsd.org <djm@openbsd.org> 4990Date: Fri Jun 4 06:19:07 2021 +0000 4991 4992 upstream: The RB_GENERATE_STATIC(3) macro expands to a series of 4993 4994 function definitions and not a statement, so there should be no semicolon 4995 following them. Patch from Michael Forney 4996 4997 OpenBSD-Commit-ID: c975dd180580f0bdc0a4d5b7d41ab1f5e9b7bedd 4998 4999commit c298c4da574ab92df2f051561aeb3e106b0ec954 5000Author: djm@openbsd.org <djm@openbsd.org> 5001Date: Fri Jun 4 05:59:18 2021 +0000 5002 5003 upstream: rework authorized_keys example section, removing irrelevant 5004 5005 stuff, de-wrapping the example lines and better aligning the examples with 5006 common usage and FAQs; ok jmc 5007 5008 OpenBSD-Commit-ID: d59f1c9281f828148e2a2e49eb9629266803b75c 5009 5010commit d9cb35bbec5f623589d7c58fc094817b33030f35 5011Author: djm@openbsd.org <djm@openbsd.org> 5012Date: Fri Jun 4 05:10:03 2021 +0000 5013 5014 upstream: adjust SetEnv description to clarify $TERM handling 5015 5016 OpenBSD-Commit-ID: 8b8cc0124856bc1094949d55615e5c44390bcb22 5017 5018commit 771f57a8626709f2ad207058efd68fbf30d31553 5019Author: dtucker@openbsd.org <dtucker@openbsd.org> 5020Date: Fri Jun 4 05:09:08 2021 +0000 5021 5022 upstream: Switch the listening select loop from select() to 5023 5024 pselect() and mask signals while checking signal flags, umasking for pselect 5025 and restoring afterwards. Also restore signals before sighup_restart so they 5026 don't remain blocked after restart. 5027 5028 This prevents a race where a SIGTERM or SIGHUP can arrive between 5029 checking the flag and calling select (eg if sshd is processing a 5030 new connection) resulting in sshd not shutting down until the next 5031 time it receives a new connection. bz#2158, with & ok djm@ 5032 5033 OpenBSD-Commit-ID: bf85bf880fd78e00d7478657644fcda97b9a936f 5034 5035commit f64f8c00d158acc1359b8a096835849b23aa2e86 5036Author: djm@openbsd.org <djm@openbsd.org> 5037Date: Fri Jun 4 05:02:40 2021 +0000 5038 5039 upstream: allow ssh_config SetEnv to override $TERM, which is otherwise 5040 5041 handled specially by the protocol. Useful in ~/.ssh/config to set TERM to 5042 something generic (e.g. "xterm" instead of "xterm-256color") for destinations 5043 that lack terminfo entries. feedback and ok dtucker@ 5044 5045 OpenBSD-Commit-ID: 38b1ef4d5bc159c7d9d589d05e3017433e2d5758 5046 5047commit 60107677dc0ce1e93c61f23c433ad54687fcd9f5 5048Author: djm@openbsd.org <djm@openbsd.org> 5049Date: Fri Jun 4 04:02:21 2021 +0000 5050 5051 upstream: correct extension name "no-presence-required" => 5052 5053 "no-touch-required" 5054 5055 document "verify-required" option 5056 5057 OpenBSD-Commit-ID: 1879ff4062cf61d79b515e433aff0bf49a6c55c5 5058 5059commit ecc186e46e3e30f27539b4311366dfda502f0a08 5060Author: Darren Tucker <dtucker@dtucker.net> 5061Date: Wed Jun 2 13:54:11 2021 +1000 5062 5063 Retire fbsd7 test target. 5064 5065 It's the slowest of the selfhosted targets (since it's 32bit but has 5066 most of the crypto algos). We still have coverage for 32bit i386. 5067 5068commit 5de0867b822ec48b5eec9abde0f5f95d1d646546 5069Author: Darren Tucker <dtucker@dtucker.net> 5070Date: Wed Jun 2 11:21:40 2021 +1000 5071 5072 Check for $OPENSSL in md5 fallback too. 5073 5074commit 1db69d1b6542f8419c04cee7fd523a4a11004be2 5075Author: Darren Tucker <dtucker@dtucker.net> 5076Date: Wed Jun 2 11:17:54 2021 +1000 5077 5078 Add dfly60 target. 5079 5080commit a3f2dd955f1c19cad387a139f0e719af346ca6ef 5081Author: dtucker@openbsd.org <dtucker@openbsd.org> 5082Date: Wed Jun 2 00:17:45 2021 +0000 5083 5084 upstream: Merge back shell portability changes 5085 5086 bringing it back in sync with -portable. 5087 5088 OpenBSD-Regress-ID: c07905ba931e66ad7d849b87b7d19648007175d1 5089 5090commit 9d482295c9f073e84d75af46b720a1c0f7ec2867 5091Author: dtucker@openbsd.org <dtucker@openbsd.org> 5092Date: Tue Jun 1 23:56:20 2021 +0000 5093 5094 upstream: Use a default value for $OPENSSL, 5095 5096 allowing it to be overridden. Do the same in the PuTTY tests since it's 5097 needed there and not exported by test-exec.sh. 5098 5099 OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16 5100 5101commit 07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1 5102Author: dtucker@openbsd.org <dtucker@openbsd.org> 5103Date: Mon May 24 10:25:18 2021 +0000 5104 5105 upstream: Find openssl binary via environment variable. This 5106 5107 allows overriding if necessary (eg in -portable where we're testing against a 5108 specific version of OpenSSL). 5109 5110 OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5 5111 5112commit 1a4d1da9188d7c88f646b61f0d6a3b34f47c5439 5113Author: djm@openbsd.org <djm@openbsd.org> 5114Date: Fri May 21 04:03:47 2021 +0000 5115 5116 upstream: fix memleak in test 5117 5118 OpenBSD-Regress-ID: 5e529d0982aa04666604936df43242e97a7a6f81 5119 5120commit 60455a5d98065a73ec9a1f303345856bbd49aecc 5121Author: djm@openbsd.org <djm@openbsd.org> 5122Date: Fri May 21 03:59:01 2021 +0000 5123 5124 upstream: also check contents of remaining string 5125 5126 OpenBSD-Regress-ID: d526fa07253f4eebbc7d6205a0ab3d491ec71a28 5127 5128commit 39f6cd207851d7b67ca46903bfce4a9f615b5b1c 5129Author: djm@openbsd.org <djm@openbsd.org> 5130Date: Fri May 21 03:48:07 2021 +0000 5131 5132 upstream: unit test for misc.c:strdelim() that mostly servces to 5133 5134 highlight its inconsistencies 5135 5136 OpenBSD-Regress-ID: 8d2bf970fcc01ccc6e36a5065f89b9c7fa934195 5137 5138commit 7a3a1dd2c7d4461962acbcc0ebee9445ba892be0 5139Author: Darren Tucker <dtucker@dtucker.net> 5140Date: Thu May 27 21:23:15 2021 +1000 5141 5142 Put minix3 config in the host-specific block. 5143 5144commit 59a194825f12fff8a7f75d91bf751ea17645711b 5145Author: djm@openbsd.org <djm@openbsd.org> 5146Date: Mon May 31 06:48:42 2021 +0000 5147 5148 upstream: Hash challenge supplied by client during FIDO key enrollment 5149 5150 prior to passing it to libfido2, which does expect a hash. 5151 5152 There is no effect for users who are simply generating FIDO keys using 5153 ssh-keygen - by default we generate a random 256 bit challenge, but 5154 people building attestation workflows around our tools should now have 5155 a more consistent experience (esp. fewer failures when they fail to 5156 guess the magic 32-byte challenge length requirement). 5157 5158 ok markus@ 5159 5160 OpenBSD-Commit-ID: b8d5363a6a7ca3b23dc28f3ca69470472959f2b5 5161 5162commit eb68e669bc8ab968d4cca5bf1357baca7136a826 5163Author: Darren Tucker <dtucker@dtucker.net> 5164Date: Thu May 27 21:14:15 2021 +1000 5165 5166 Include login_cap.h for login_getpwclass override. 5167 5168 On minix3, login_getpwclass is __RENAME'ed to __login_getpwclass50 so 5169 without this the include overriding login_getpwclass causes a compile 5170 error. 5171 5172commit 2063af71422501b65c7a92a5e14c0e6a3799ed89 5173Author: Darren Tucker <dtucker@dtucker.net> 5174Date: Thu May 27 21:13:38 2021 +1000 5175 5176 Add minix3 test target. 5177 5178commit 2e1efcfd9f94352ca5f4b6958af8a454f8cf48cd 5179Author: djm@openbsd.org <djm@openbsd.org> 5180Date: Wed May 26 01:47:24 2021 +0000 5181 5182 upstream: fix SEGV in UpdateHostkeys debug() message, triggered 5183 5184 when the update removed more host keys than remain present. Fix tested by 5185 reporter James Cook, via bugs@ 5186 5187 OpenBSD-Commit-ID: 44f641f6ee02bb957f0c1d150495b60cf7b869d3 5188 5189commit 9acd76e6e4d2b519773e7119c33cf77f09534909 5190Author: naddy@openbsd.org <naddy@openbsd.org> 5191Date: Sun May 23 18:22:57 2021 +0000 5192 5193 upstream: ssh: The client configuration keyword is 5194 5195 "hostbasedacceptedalgorithms" 5196 5197 This fixes a mistake that slipped in when "HostbasedKeyTypes" was 5198 renamed to "HostbasedAcceptedAlgorithms". 5199 5200 Bug report by zack@philomathiclife.com 5201 5202 OpenBSD-Commit-ID: d745a7e8e50b2589fc56877f322ea204bc784f38 5203 5204commit 078a0e60c92700da4c536c93c007257828ccd05b 5205Author: Darren Tucker <dtucker@dtucker.net> 5206Date: Tue May 25 11:40:47 2021 +1000 5207 5208 Rename README.md to ci-status.md. 5209 5210 The original intent was to provide a status page for the CIs configured 5211 in that directory, but it had the side effect of replacing the top-level 5212 README.md. 5213 5214commit 7be4ac813662f68e89f23c50de058a49aa32f7e4 5215Author: djm@openbsd.org <djm@openbsd.org> 5216Date: Wed May 19 01:24:05 2021 +0000 5217 5218 upstream: restore blocking status on stdio fds before close 5219 5220 ssh(1) needs to set file descriptors to non-blocking mode to operate 5221 but it was not restoring the original state on exit. This could cause 5222 problems with fds shared with other programs via the shell, e.g. 5223 5224 > $ cat > test.sh << _EOF 5225 > #!/bin/sh 5226 > { 5227 > ssh -Fnone -oLogLevel=verbose ::1 hostname 5228 > cat /usr/share/dict/words 5229 > } | sleep 10 5230 > _EOF 5231 > $ ./test.sh 5232 > Authenticated to ::1 ([::1]:22). 5233 > Transferred: sent 2352, received 2928 bytes, in 0.1 seconds 5234 > Bytes per second: sent 44338.9, received 55197.4 5235 > cat: stdout: Resource temporarily unavailable 5236 5237 This restores the blocking status for fds 0,1,2 (stdio) before ssh(1) 5238 abandons/closes them. 5239 5240 This was reported as bz3280 and GHPR246; ok dtucker@ 5241 5242 OpenBSD-Commit-ID: 8cc67346f05aa85a598bddf2383fcfcc3aae61ce 5243 5244commit c4902e1a653c67fea850ec99c7537f358904c0af 5245Author: djm@openbsd.org <djm@openbsd.org> 5246Date: Mon May 17 11:43:16 2021 +0000 5247 5248 upstream: fix breakage of -W forwaring introduced in 1.554; reported by 5249 5250 naddy@ and sthen@, ok sthen@ 5251 5252 OpenBSD-Commit-ID: f72558e643a26dc4150cff6e5097b5502f6c85fd 5253 5254commit afea01381ad1fcea1543b133040f75f7542257e6 5255Author: dtucker@openbsd.org <dtucker@openbsd.org> 5256Date: Mon May 17 07:22:45 2021 +0000 5257 5258 upstream: Regenerate moduli. 5259 5260 OpenBSD-Commit-ID: 83c93a2a07c584c347ac6114d6329b18ce515557 5261 5262commit be2866d6207b090615ff083c9ef212b603816a56 5263Author: Damien Miller <djm@mindrot.org> 5264Date: Mon May 17 09:40:23 2021 +1000 5265 5266 Handle Android libc returning NULL pw->pw_passwd 5267 5268 Reported by Luke Dashjr 5269 5270commit 5953c143008259d87342fb5155bd0b8835ba88e5 5271Author: djm@openbsd.org <djm@openbsd.org> 5272Date: Fri May 14 05:20:32 2021 +0000 5273 5274 upstream: fix previous: test saved no_shell_flag, not the one that just 5275 5276 got clobbered 5277 5278 OpenBSD-Commit-ID: b8deace085d9d941b2d02f810243b9c302e5355d 5279 5280commit 1e9fa55f4dc4b334651d569d3448aaa3841f736f 5281Author: djm@openbsd.org <djm@openbsd.org> 5282Date: Fri May 14 03:09:48 2021 +0000 5283 5284 upstream: Fix ssh started with ControlPersist incorrectly executing a 5285 5286 shell when the -N (no shell) option was specified. bz3290 reported by Richard 5287 Schwab; patch from markus@ ok me 5288 5289 OpenBSD-Commit-ID: ea1ea4af16a95687302f7690bdbe36a6aabf87e1 5290 5291commit d1320c492f655d8f5baef8c93899d79dded217a5 5292Author: dtucker@openbsd.org <dtucker@openbsd.org> 5293Date: Wed May 12 11:34:30 2021 +0000 5294 5295 upstream: Clarify language about moduli. While both ends of the 5296 5297 connection do need to use the same parameters (ie groups), the DH-GEX 5298 protocol takes care of that and both ends do not need the same contents in 5299 the moduli file, which is what the previous text suggested. ok djm@ jmc@ 5300 5301 OpenBSD-Commit-ID: f0c18cc8e79c2fbf537a432a9070ed94e96a622a 5302 5303commit d3cc4d650ce3e59f3e370b101778b0e8f1c02c4d 5304Author: djm@openbsd.org <djm@openbsd.org> 5305Date: Fri May 7 04:11:51 2021 +0000 5306 5307 upstream: include pid in LogVerbose spam 5308 5309 OpenBSD-Commit-ID: aacb86f96ee90c7cb84ec27452374285f89a7f00 5310 5311commit e3c032333be5fdbbaf2751f6f478e044922b4ec4 5312Author: djm@openbsd.org <djm@openbsd.org> 5313Date: Fri May 7 03:09:38 2021 +0000 5314 5315 upstream: don't sigdie() in signal handler in privsep child process; 5316 5317 this can end up causing sandbox violations per bz3286; ok dtucker@ 5318 5319 OpenBSD-Commit-ID: a7f40b2141dca4287920da68ede812bff7ccfdda 5320 5321commit a4039724a3f2abac810735fc95cf9114a3856049 5322Author: dtucker@openbsd.org <dtucker@openbsd.org> 5323Date: Fri May 7 09:23:40 2021 +0000 5324 5325 upstream: Increase ConnectionAttempts from 4 to 10 as the tests 5326 5327 occasionally time out on heavily loaded hosts. 5328 5329 OpenBSD-Regress-ID: 29a8cdef354fc9da471a301f7f65184770434f3a 5330 5331commit c0d7e36e979fa3cdb60f5dcb6ac9ad3fd018543b 5332Author: djm@openbsd.org <djm@openbsd.org> 5333Date: Fri May 7 02:26:55 2021 +0000 5334 5335 upstream: dump out a usable private key string too; inspired by Tyson 5336 5337 Whitehead 5338 5339 OpenBSD-Regress-ID: 65572d5333801cb2f650ebc778cbdc955e372058 5340 5341commit 24fee8973abdf1c521cd2c0047d89e86d9c3fc38 5342Author: djm@openbsd.org <djm@openbsd.org> 5343Date: Fri May 7 02:29:40 2021 +0000 5344 5345 upstream: correct mistake in spec - the private key blobs are encoded 5346 5347 verbatim and not as strings (i.e. no 4-byte length header) 5348 5349 OpenBSD-Commit-ID: 3606b5d443d72118c5b76c4af6dd87a5d5a4f837 5350 5351commit f43859159cc62396ad5d080f0b1f2635a67dac02 5352Author: dtucker@openbsd.org <dtucker@openbsd.org> 5353Date: Tue May 4 22:53:52 2021 +0000 5354 5355 upstream: Don't pass NULL as a string in debugging as it does not work 5356 5357 on some platforms in -portable. ok djm@ 5358 5359 OpenBSD-Commit-ID: 937c892c99aa3c9c272a8ed78fa7c2aba3a44fc9 5360 5361commit ac31aa3c6341905935e75f0539cf4a61bbe99779 5362Author: djm@openbsd.org <djm@openbsd.org> 5363Date: Mon May 3 00:16:45 2021 +0000 5364 5365 upstream: more debugging for UpdateHostKeys signature failures 5366 5367 OpenBSD-Commit-ID: 1ee95f03875e1725df15d5e4bea3e73493d57d36 5368 5369commit 8e32e97e788e0676ce83018a742203614df6a2b3 5370Author: Darren Tucker <dtucker@dtucker.net> 5371Date: Sat May 1 20:07:47 2021 +1000 5372 5373 Add obsd69 test target. 5374 5375commit f06893063597c5bb9d9e93f851c4070e77d2fba9 5376Author: djm@openbsd.org <djm@openbsd.org> 5377Date: Fri Apr 30 04:29:53 2021 +0000 5378 5379 upstream: a little debugging in the main mux process for status 5380 5381 confirmation failures in multiplexed sessions 5382 5383 OpenBSD-Commit-ID: 6e27b87c95176107597035424e1439c3232bcb49 5384 5385commit e65cf00da6bc31e5f54603b7feb7252dc018c033 5386Author: dtucker@openbsd.org <dtucker@openbsd.org> 5387Date: Fri Apr 30 04:02:52 2021 +0000 5388 5389 upstream: Remove now-unused skey function prototypes leftover from 5390 5391 skey removal. 5392 5393 OpenBSD-Commit-ID: 2fc36d519fd37c6f10ce74854c628561555a94c3 5394 5395commit ae5f9b0d5c8126214244ee6b35aae29c21028133 5396Author: Darren Tucker <dtucker@dtucker.net> 5397Date: Thu Apr 29 13:01:50 2021 +1000 5398 5399 Wrap sntrup761x25519 inside ifdef. 5400 5401 From balu.gajjala at gmail.com via bz#3306. 5402 5403commit 70a8dc138a6480f85065cdb239915ad4b7f928cf 5404Author: Darren Tucker <dtucker@dtucker.net> 5405Date: Wed Apr 28 14:44:07 2021 +1000 5406 5407 Add status badges for Actions-based tests. 5408 5409commit 40b59024cc3365815381474cdf4fe423102e391b 5410Author: Darren Tucker <dtucker@dtucker.net> 5411Date: Wed Apr 28 12:22:11 2021 +1000 5412 5413 Add obsdsnap (OpenBSD snapshot) test target. 5414 5415commit e627067ec8ef9ae8e7a638f4dbac91d52dee3e6d 5416Author: Darren Tucker <dtucker@dtucker.net> 5417Date: Wed Apr 28 11:35:28 2021 +1000 5418 5419 Add test building upstream OpenBSD source. 5420 5421commit 1b8108ebd12fc4ed0fb39ef94c5ba122558ac373 5422Author: Darren Tucker <dtucker@dtucker.net> 5423Date: Tue Apr 27 14:22:20 2021 +1000 5424 5425 Test against OpenSSL 1.1.0h instead of 1.1.0g. 5426 5427 1.1.0g requires a perl glob module that's not installed by default. 5428 5429commit 9bc20efd39ce8525be33df3ee009f5a4564224f1 5430Author: Darren Tucker <dtucker@dtucker.net> 5431Date: Tue Apr 27 12:37:59 2021 +1000 5432 5433 Use the default VM type for libcrypto ver tests. 5434 5435commit 9f79e80dc40965c2e73164531250b83b176c1eea 5436Author: Darren Tucker <dtucker@dtucker.net> 5437Date: Tue Apr 27 12:24:10 2021 +1000 5438 5439 Always build OpenSSL shared. 5440 5441 This is the default for current versions but we need it to test against 5442 earlier versions. 5443 5444commit b3cc9fbdff2782eca79e33e02ac22450dc63bce9 5445Author: Darren Tucker <dtucker@dtucker.net> 5446Date: Tue Apr 27 09:18:02 2021 +1000 5447 5448 Fix custom OpenSSL tests. 5449 5450 Check out specified OpenSSL version. Install custom libcrypto where 5451 configure expects to find it. Remove unneeded OpenSSL config time 5452 options. Older OpenSSL versions were not make -j safe so remove it. 5453 5454commit 77532609874a99a19e3e2eb2d1b7fa93aef963bb 5455Author: Darren Tucker <dtucker@dtucker.net> 5456Date: Mon Apr 26 17:18:25 2021 +1000 5457 5458 Export CC and CFLAGS for c89 test. 5459 5460commit 33f62dfbe865f4de77980ab88774bf1eb5e4e040 5461Author: Darren Tucker <dtucker@dtucker.net> 5462Date: Mon Apr 26 17:13:44 2021 +1000 5463 5464 Add c89 here too. 5465 5466commit da9d59f526fce58e11cba49cd8eb011dc0bf5677 5467Author: Darren Tucker <dtucker@dtucker.net> 5468Date: Mon Apr 26 15:34:23 2021 +1000 5469 5470 Add test against OpenSSL w/out ECC. 5471 5472commit 29e194a752359ebf85bf7fce100f23a0477fc4de 5473Author: Darren Tucker <dtucker@dtucker.net> 5474Date: Mon Apr 26 14:49:59 2021 +1000 5475 5476 Ensure we can still build with C89. 5477 5478commit a38016d369d21df5d35f761f2b67e175e132ba22 5479Author: Darren Tucker <dtucker@dtucker.net> 5480Date: Mon Apr 26 14:29:03 2021 +1000 5481 5482 Interop test agains PuTTY. 5483 5484commit 095b0307a77be8803768857cc6c0963fa52ed85b 5485Author: Darren Tucker <dtucker@dtucker.net> 5486Date: Mon Apr 26 14:02:03 2021 +1000 5487 5488 Support testing against arbitary libcrytpo vers. 5489 5490 Add tests against various LibreSSL and OpenSSL versions. 5491 5492commit b16082aa110fa7128ece2a9037ff420c4a285317 5493Author: Darren Tucker <dtucker@dtucker.net> 5494Date: Mon Apr 26 13:35:44 2021 +1000 5495 5496 Add fbsd10 test target. 5497 5498commit 2c805f16b24ea37cc051c6018fcb05defab6e57a 5499Author: Darren Tucker <dtucker@dtucker.net> 5500Date: Sun Apr 25 14:15:02 2021 +1000 5501 5502 Disable compiler hardening on nbsd4. 5503 5504 The system compiler supports -fstack-protector-all, but using it will 5505 result in an internal compiler error on some files. 5506 5507commit 6a5d39305649da5dff1934ee54292ee0cebd579d 5508Author: Darren Tucker <dtucker@dtucker.net> 5509Date: Sun Apr 25 13:01:34 2021 +1000 5510 5511 Add nbsd3, nbsd4 and nbsd9 test targets. 5512 5513commit d1aed05bd2e4ae70f359a394dc60a2d96b88f78c 5514Author: Darren Tucker <dtucker@dtucker.net> 5515Date: Sat Apr 24 22:03:46 2021 +1000 5516 5517 Comment out nbsd2 test target for now. 5518 5519commit a6b4ec94e5bd5a8a18cd2c9942d829d2e5698837 5520Author: Darren Tucker <dtucker@dtucker.net> 5521Date: Sat Apr 24 17:52:24 2021 +1000 5522 5523 Add OPENBSD ORIGINAL marker. 5524 5525commit 3737c9f66ee590255546c4b637b6d2be669a11eb 5526Author: Darren Tucker <dtucker@dtucker.net> 5527Date: Fri Apr 23 19:49:46 2021 +1000 5528 5529 Replace "==" (a bashism) with "=". 5530 5531commit a116b6f5be17a1dd345b7d54bf8aa3779a28a0df 5532Author: Darren Tucker <dtucker@dtucker.net> 5533Date: Fri Apr 23 16:34:48 2021 +1000 5534 5535 Add nbsd2 test target. 5536 5537commit 196bf2a9bb771f45d9b0429cee7d325962233c44 5538Author: Darren Tucker <dtucker@dtucker.net> 5539Date: Fri Apr 23 14:54:10 2021 +1000 5540 5541 Add obsd68 test target. 5542 5543commit e3ba6574ed69e8b7af725cf5e8a9edaac04ff077 5544Author: Darren Tucker <dtucker@dtucker.net> 5545Date: Fri Apr 23 14:53:32 2021 +1000 5546 5547 Remove dependency on bash. 5548 5549commit db1f9ab8feb838aee9f5b99c6fd3f211355dfdcf 5550Author: Darren Tucker <dtucker@dtucker.net> 5551Date: Fri Apr 23 14:41:13 2021 +1000 5552 5553 Add obsd67 test target. 5554 5555commit c039a6bf79192fe1daa9ddcc7c87dd98e258ae7c 5556Author: Darren Tucker <dtucker@dtucker.net> 5557Date: Fri Apr 23 11:08:23 2021 +1000 5558 5559 Re-add macos-11.0 test target. 5560 5561commit a6db3a47b56adb76870d59225ffb90a65bc4daf2 5562Author: Darren Tucker <dtucker@dtucker.net> 5563Date: Fri Apr 23 10:28:28 2021 +1000 5564 5565 Add openindiana test target. 5566 5567commit 3fe7e73b025c07eda46d78049f1da8ed7dfc0c69 5568Author: Darren Tucker <dtucker@dtucker.net> 5569Date: Fri Apr 23 10:26:35 2021 +1000 5570 5571 Test krb5 on Solaris 11 too. 5572 5573commit f57fbfe5eb02df1a91f1a237c4d27165afd87c13 5574Author: Darren Tucker <dtucker@dtucker.net> 5575Date: Thu Apr 22 22:27:26 2021 +1000 5576 5577 Don't always set SUDO. 5578 5579 Rely on sourcing configs to set as appropriate. 5580 5581commit e428f29402fb6ac140b52f8f12e06ece7bb104a0 5582Author: Darren Tucker <dtucker@dtucker.net> 5583Date: Thu Apr 22 22:26:08 2021 +1000 5584 5585 Remove now-unused 2nd arg to configs. 5586 5587commit cb4ff640d79b3c736879582139778f016bbb2cd7 5588Author: Darren Tucker <dtucker@dtucker.net> 5589Date: Wed Apr 21 01:08:04 2021 +1000 5590 5591 Add win10 test target. 5592 5593commit 4457837238072836b2fa3107d603aac809624983 5594Author: Darren Tucker <dtucker@dtucker.net> 5595Date: Tue Apr 20 23:31:29 2021 +1000 5596 5597 Add nbsd8 test target. 5598 5599commit bd4fba22e14da2fa196009010aabec5a8ba9dd42 5600Author: Darren Tucker <dtucker@dtucker.net> 5601Date: Sat Apr 17 09:55:47 2021 +1000 5602 5603 Add obsd51 target. 5604 5605commit 9403d0e805c77a5741ea8c3281bbe92558c2f125 5606Author: Darren Tucker <dtucker@dtucker.net> 5607Date: Fri Apr 16 18:14:25 2021 +1000 5608 5609 Add fbsd13 target. 5610 5611commit e86968280e358e62649d268d41f698d64d0dc9fa 5612Author: Damien Miller <djm@mindrot.org> 5613Date: Fri Apr 16 13:55:25 2021 +1000 5614 5615 depend 5616 5617commit 2fb25ca11e8b281363a2a2a4dec4c497a1475d9a 5618Author: Damien Miller <djm@mindrot.org> 5619Date: Fri Apr 16 13:53:02 2021 +1000 5620 5621 crank version in README and RPM spec files 5622 5623commit b2b60ebab0cb77b5bc02d364d72e13db882f33ae 5624Author: djm@openbsd.org <djm@openbsd.org> 5625Date: Fri Apr 16 03:42:00 2021 +0000 5626 5627 upstream: openssh-8.6 5628 5629 OpenBSD-Commit-ID: b5f3e133c846127ec114812248bc17eff07c3e19 5630 5631commit faf2b86a46c9281d237bcdec18c99e94a4eb820a 5632Author: markus@openbsd.org <markus@openbsd.org> 5633Date: Thu Apr 15 16:24:31 2021 +0000 5634 5635 upstream: do not pass file/func to monitor; noted by Ilja van Sprundel; 5636 5637 ok djm@ 5638 5639 OpenBSD-Commit-ID: 85ae5c063845c410283cbdce685515dcd19479fa 5640 5641commit 2dc328023f60212cd29504fc05d849133ae47355 5642Author: Damien Miller <djm@mindrot.org> 5643Date: Wed Apr 14 11:42:55 2021 +1000 5644 5645 sshd don't exit on transient read errors 5646 5647 openssh-8.5 introduced a regression that would cause sshd to exit 5648 because of transient read errors on the network socket (e.g. EINTR, 5649 EAGAIN). Reported by balu.gajjala AT gmail.com via bz3297 5650 5651commit d5d6b7d76d171a2e6861609dcd92e714ee62ad88 5652Author: Damien Miller <djm@mindrot.org> 5653Date: Sat Apr 10 18:45:00 2021 +1000 5654 5655 perform report_failed_grab() inline 5656 5657commit ea996ce2d023aa3c6d31125e2c3ebda1cb42db8c 5658Author: Damien Miller <djm@mindrot.org> 5659Date: Sat Apr 10 18:22:57 2021 +1000 5660 5661 dedicated gnome-ssk-askpass3 source 5662 5663 Compatibility with Wayland requires that we use the gdk_seat_grab() 5664 API for grabbing mouse/keyboard, however these API don't exist in 5665 Gtk+2. 5666 5667 This branches gnome-ssk-askpass2.c => gnome-ssk-askpass3.c and 5668 makes the changes to use the gdk_seat_grab() instead of grabbing 5669 mouse/focus separately via GDK. 5670 5671 In the future, we can also use the branched file to avoid some 5672 API that has been soft-deprecated in GTK+3, e.g. gtk_widget_modify_fg 5673 5674commit bfa5405da05d906ffd58216eb77c4375b62d64c2 5675Author: Darren Tucker <dtucker@dtucker.net> 5676Date: Thu Apr 8 15:18:15 2021 +1000 5677 5678 Ensure valgrind-out exists. 5679 5680 Normally the regress tests would create it, but running the unit tests 5681 on their own would fail because the directory did not exist. 5682 5683commit 1f189181f3ea09a9b08aa866f78843fec800874f 5684Author: Darren Tucker <dtucker@dtucker.net> 5685Date: Thu Apr 8 15:17:19 2021 +1000 5686 5687 Pass OBJ to unit test make invocation. 5688 5689 At least the Valgrind unit tests uses $OBJ. 5690 5691commit f42b550c281d28bd19e9dd6ce65069164f3482b0 5692Author: Darren Tucker <dtucker@dtucker.net> 5693Date: Thu Apr 8 14:20:12 2021 +1000 5694 5695 Add pattern for valgrind-unit. 5696 5697commit 19e534462710e98737478fd9c44768b50c27c4c6 5698Author: Darren Tucker <dtucker@dtucker.net> 5699Date: Thu Apr 8 13:31:08 2021 +1000 5700 5701 Run unit tests under valgrind. 5702 5703 Run a separate build for the unit tests under Valgrind. They take long 5704 enough that running in parallel with the other Valgrind tests helps. 5705 5706commit 80032102d05e866dc2a48a5caf760cf42c2e090e 5707Author: Darren Tucker <dtucker@dtucker.net> 5708Date: Thu Apr 8 13:25:57 2021 +1000 5709 5710 ifdef out MIN and MAX. 5711 5712 In -portable, defines.h ensures that these are defined, so redefining 5713 potentially causes a warning. We don't just delete it to make any 5714 future code syncs a little but easier. bz#3293. 5715 5716commit d1bd184046bc310c405f45da3614a1dc5b3e521a 5717Author: Darren Tucker <dtucker@dtucker.net> 5718Date: Wed Apr 7 10:23:51 2021 +1000 5719 5720 Remove only use of warn(). 5721 5722 The warn() function is only used in one place in portable and does not 5723 exist upstream. Upgrade the only instance it's used to fail() 5724 (the privsep/sandbox+proxyconnect, from back when that was new) and 5725 remove the now-unused function. 5726 5727commit fea8f4b1aa85026ad5aee5ad8e1599a8d5141fe0 5728Author: Darren Tucker <dtucker@dtucker.net> 5729Date: Wed Apr 7 10:18:32 2021 +1000 5730 5731 Move make_tmpdir() into portable-specific area. 5732 5733 Reduces diff vs OpenBSD and makes it more likely diffs will apply 5734 cleanly. 5735 5736commit 13e5fa2acffd26e754c6ee1d070d0afd035d4cb7 5737Author: dtucker@openbsd.org <dtucker@openbsd.org> 5738Date: Tue Apr 6 23:57:56 2021 +0000 5739 5740 upstream: Add TEST_SSH_ELAPSED_TIMES environment variable to print the 5741 5742 elapsed time in seconds of each test. This depends on "date +%s" which is 5743 not specified by POSIX but is commonly implemented. 5744 5745 OpenBSD-Regress-ID: ec3c8c19ff49b2192116a0a646ee7c9b944e8a9c 5746 5747commit ef4f46ab4387bb863b471bad124d46e8d911a79a 5748Author: Darren Tucker <dtucker@dtucker.net> 5749Date: Wed Apr 7 09:59:15 2021 +1000 5750 5751 Move the TEST_SSH_PORT section down a bit. 5752 5753 This groups the portable-specific changes together and makes it a 5754 little more likely that patches will apply cleanly. 5755 5756commit 3674e33fa70dfa1fe69b345bf576113af7b7be11 5757Author: Darren Tucker <dtucker@dtucker.net> 5758Date: Wed Apr 7 10:05:10 2021 +1000 5759 5760 Further split Valgrind tests. 5761 5762 Even split in two, the Valgrind tests take by far the longest to run, 5763 so split them four ways to further increase parallelism. 5764 5765commit 961af266b861e30fce1e26170ee0dbb5bf591f29 5766Author: djm@openbsd.org <djm@openbsd.org> 5767Date: Tue Apr 6 23:24:30 2021 +0000 5768 5769 upstream: include "ssherr.h" not <ssherr.h>; from Balu Gajjala via 5770 5771 bz#3292 5772 5773 OpenBSD-Commit-ID: e9535cd9966eb2e69e73d1ede1f44905c30310bd 5774 5775commit e7d0a285dbdd65d8df16123ad90f15e91862f959 5776Author: Damien Miller <djm@mindrot.org> 5777Date: Wed Apr 7 08:50:38 2021 +1000 5778 5779 wrap struct rlimit in HAVE_GETRLIMIT too 5780 5781commit f283a6c2e0a9bd9369e18462acd00be56fbe5b0d 5782Author: Damien Miller <djm@mindrot.org> 5783Date: Wed Apr 7 08:20:35 2021 +1000 5784 5785 wrap getrlimit call in HAVE_GETRLIMIT; bz3291 5786 5787commit 679bdc4a5c9244f427a7aee9c14b0a0ed086da1f 5788Author: dtucker@openbsd.org <dtucker@openbsd.org> 5789Date: Tue Apr 6 09:07:33 2021 +0000 5790 5791 upstream: Don't check return value of unsetenv(). It's part of the 5792 5793 environment setup and not part of the actual test, and some platforms 5794 -portable runs on declare it as returning void, which prevents the test from 5795 compiling. 5796 5797 OpenBSD-Regress-ID: 24f08543ee3cdebc404f2951f3e388cc82b844a1 5798 5799commit 320af2f3de6333aa123f1b088eca146a245e968a 5800Author: jmc@openbsd.org <jmc@openbsd.org> 5801Date: Sun Apr 4 11:36:56 2021 +0000 5802 5803 upstream: remove stray inserts; from matthias schmidt 5804 5805 OpenBSD-Commit-ID: 2c36ebdc54e14bbf1daad70c6a05479a073d5c63 5806 5807commit 801f710953b24dd2f21939171c622eac77c7484d 5808Author: jmc@openbsd.org <jmc@openbsd.org> 5809Date: Sun Apr 4 06:11:24 2021 +0000 5810 5811 upstream: missing comma; from kawashima james 5812 5813 OpenBSD-Commit-ID: 31cec6bf26c6db4ffefc8a070715ebef274e68ea 5814 5815commit b3ca08cb174266884d44ec710a84cd64c12414ea 5816Author: Darren Tucker <dtucker@dtucker.net> 5817Date: Mon Apr 5 23:46:42 2021 +1000 5818 5819 Install libcbor with libfido2. 5820 5821commit f3ca8af87a4c32ada660da12ae95cf03d190c083 5822Author: Damien Miller <djm@mindrot.org> 5823Date: Sat Apr 3 18:21:08 2021 +1100 5824 5825 enable authopt and misc unit tests 5826 5827 Neither were wired into the build, both required some build 5828 adaptations for -portable 5829 5830commit dc1b45841fb97e3d7f655ddbcfef3839735cae5f 5831Author: djm@openbsd.org <djm@openbsd.org> 5832Date: Sat Apr 3 06:58:30 2021 +0000 5833 5834 upstream: typos in comments; GHPR#180 from Vill 5835 5836 =?UTF-8?q?e=20Skytt=C3=A4?= 5837 MIME-Version: 1.0 5838 Content-Type: text/plain; charset=UTF-8 5839 Content-Transfer-Encoding: 8bit 5840 5841 OpenBSD-Commit-ID: 93c732381ae0e2b680c79e67c40c1814b7ceed2c 5842 5843commit 53ea05e09b04fd7b6dea66b42b34d65fe61b9636 5844Author: djm@openbsd.org <djm@openbsd.org> 5845Date: Sat Apr 3 06:55:52 2021 +0000 5846 5847 upstream: sync CASignatureAlgorithms lists with reality. GHPR#174 from 5848 5849 Matt Hazinski 5850 5851 OpenBSD-Commit-ID: f05e4ca54d7e67b90fe58fe1bdb1d2a37e0e2696 5852 5853commit 57ed647ee07bb883a2f2264231bcd1df6a5b9392 5854Author: Damien Miller <djm@mindrot.org> 5855Date: Sat Apr 3 17:47:37 2021 +1100 5856 5857 polish whitespace for portable files 5858 5859commit 31d8d231eb9377df474746a822d380c5d68d7ad6 5860Author: djm@openbsd.org <djm@openbsd.org> 5861Date: Sat Apr 3 06:18:40 2021 +0000 5862 5863 upstream: highly polished whitespace, mostly fixing spaces-for-tab 5864 5865 and bad indentation on continuation lines. Prompted by GHPR#185 5866 5867 OpenBSD-Commit-ID: e5c81f0cbdcc6144df1ce468ec1bac366d8ad6e9 5868 5869commit 34afde5c73b5570d6f8cce9b49993b23b77bfb86 5870Author: djm@openbsd.org <djm@openbsd.org> 5871Date: Sat Apr 3 05:54:14 2021 +0000 5872 5873 upstream: whitespace (tab after space) 5874 5875 OpenBSD-Commit-ID: 0e2b3f7674e985d3f7c27ff5028e690ba1c2efd4 5876 5877commit 7cd262c1c5a08cc7f4f30e3cab108ef089d0a57b 5878Author: Darren Tucker <dtucker@dtucker.net> 5879Date: Sat Apr 3 16:59:10 2021 +1100 5880 5881 Save config.h and config.log on failure too. 5882 5883commit 460aee9298f365357e9fd26851c22e0dca51fd6a 5884Author: djm@openbsd.org <djm@openbsd.org> 5885Date: Sat Apr 3 05:46:41 2021 +0000 5886 5887 upstream: fix incorrect plural; from Ville Skyt 5888 5889 =?UTF-8?q?t=C3=A4=20via=20GHPR#181?= 5890 MIME-Version: 1.0 5891 Content-Type: text/plain; charset=UTF-8 5892 Content-Transfer-Encoding: 8bit 5893 5894 OpenBSD-Commit-ID: 92f31754c6296d8f403d7c293e09dc27292d22c9 5895 5896commit 082804c14e548cada75c81003a3c68ee098138ee 5897Author: djm@openbsd.org <djm@openbsd.org> 5898Date: Sat Apr 3 05:40:39 2021 +0000 5899 5900 upstream: ensure that pkcs11_del_provider() is called before exit - 5901 5902 some PKCS#11 providers get upset if C_Initialize is not matched with 5903 C_Finalize. 5904 5905 From Adithya Baglody via GHPR#234; ok markus 5906 5907 OpenBSD-Commit-ID: f8e770e03b416ee9a58f9762e162add900f832b6 5908 5909commit 464ebc82aa926dd132ec75a0b064574ef375675e 5910Author: djm@openbsd.org <djm@openbsd.org> 5911Date: Sat Apr 3 05:28:43 2021 +0000 5912 5913 upstream: unused variable 5914 5915 OpenBSD-Commit-ID: 85f6a394c8e0f60d15ecddda75176f112007b205 5916 5917commit dc3c0be8208c488e64a8bcb7d9efad98514e0ffb 5918Author: djm@openbsd.org <djm@openbsd.org> 5919Date: Sat Apr 3 05:21:46 2021 +0000 5920 5921 upstream: Fix two problems in string->argv conversion: 1) multiple 5922 5923 backslashes were not being dequoted correctly and 2) quoted space in the 5924 middle of a string was being incorrectly split. 5925 MIME-Version: 1.0 5926 Content-Type: text/plain; charset=UTF-8 5927 Content-Transfer-Encoding: 8bit 5928 5929 A unit test for these cases has already been committed 5930 5931 prompted by and based on GHPR#223 by Eero Häkkinen; ok markus@ 5932 5933 OpenBSD-Commit-ID: d7ef27abb4eeeaf6e167e9312e4abe9e89faf1e4 5934 5935commit f75bcbba58a08c670727ece5e3f8812125969799 5936Author: Damien Miller <djm@mindrot.org> 5937Date: Sat Apr 3 16:22:48 2021 +1100 5938 5939 missing bits from 259d648e 5940 5941commit 4cbc4a722873d9b68cb5496304dc050d7168df78 5942Author: djm@openbsd.org <djm@openbsd.org> 5943Date: Wed Mar 31 21:59:26 2021 +0000 5944 5945 upstream: cannot effectively test posix-rename extension after 5946 5947 changes in feature advertisment. 5948 5949 OpenBSD-Regress-ID: 5e390bf88d379162aaa81b60ed86b34cb0c54d29 5950 5951commit 259d648e63e82ade4fe2c2c73c8b67fe57d9d049 5952Author: djm@openbsd.org <djm@openbsd.org> 5953Date: Fri Mar 19 04:23:50 2021 +0000 5954 5955 upstream: add a test for misc.c:argv_split(), currently fails 5956 5957 OpenBSD-Regress-ID: ad6b96d6ebeb9643b698b3575bdd6f78bb144200 5958 5959commit 473ddfc2d6b602cb2d1d897e0e5c204de145cd9a 5960Author: djm@openbsd.org <djm@openbsd.org> 5961Date: Fri Mar 19 03:25:01 2021 +0000 5962 5963 upstream: split 5964 5965 OpenBSD-Regress-ID: f6c03c0e4c58b3b9e04b161757b8c10dc8378c34 5966 5967commit 1339800fef8d0dfbfeabff71b34670105bcfddd2 5968Author: djm@openbsd.org <djm@openbsd.org> 5969Date: Wed Mar 31 22:16:34 2021 +0000 5970 5971 upstream: Use new limits@openssh.com protocol extension to let the 5972 5973 client select good limits based on what the server supports. Split the 5974 download and upload buffer sizes to allow them to be chosen independently. 5975 5976 In practice (and assuming upgraded sftp/sftp-server at each end), this 5977 increases the download buffer 32->64KiB and the upload buffer 5978 32->255KiB. 5979 5980 Patches from Mike Frysinger; ok dtucker@ 5981 5982 OpenBSD-Commit-ID: ebd61c80d85b951b794164acc4b2f2fd8e88606c 5983 5984commit 6653c61202d104e59c8e741329fcc567f7bc36b8 5985Author: djm@openbsd.org <djm@openbsd.org> 5986Date: Wed Mar 31 21:58:07 2021 +0000 5987 5988 upstream: do not advertise protocol extensions that have been 5989 5990 disallowed by the command-line options (e.g. -p/-P/-R); ok dtucker@ 5991 5992 OpenBSD-Commit-ID: 3a8a76b3f5131741aca4b41bfab8d101c9926205 5993 5994commit 71241fc05db4bbb11bb29340b44b92e2575373d8 5995Author: Damien Miller <djm@mindrot.org> 5996Date: Mon Mar 29 15:14:25 2021 +1100 5997 5998 gnome-ssh-askpass3 is a valid target here 5999 6000commit 8a9520836e71830f4fccca066dba73fea3d16bda 6001Author: djm@openbsd.org <djm@openbsd.org> 6002Date: Fri Mar 19 02:22:34 2021 +0000 6003 6004 upstream: return non-zero exit status when killed by signal; bz#3281 ok 6005 6006 dtucker@ 6007 6008 OpenBSD-Commit-ID: 117b31cf3c807993077b596bd730c24da9e9b816 6009 6010commit 1269b8a686bf1254b03cd38af78167a04aa6ec88 6011Author: djm@openbsd.org <djm@openbsd.org> 6012Date: Fri Mar 19 02:18:28 2021 +0000 6013 6014 upstream: increase maximum SSH2_FXP_READ to match the maximum 6015 6016 packet size. Also handle zero-length reads that are borderline nonsensical 6017 but not explicitly banned by the spec. Based on patch from Mike Frysinger, 6018 feedback deraadt@ ok dtucker@ 6019 6020 OpenBSD-Commit-ID: 4e67d60d81bde7b84a742b4ee5a34001bdf80d9c 6021 6022commit 860b67604416640e8db14f365adc3f840aebcb1f 6023Author: djm@openbsd.org <djm@openbsd.org> 6024Date: Tue Mar 16 06:15:43 2021 +0000 6025 6026 upstream: don't let logging clobber errno before use 6027 6028 OpenBSD-Commit-ID: ce6cca370005c270c277c51c111bb6911e1680ec 6029 6030commit 5ca8a9216559349c56e09039c4335636fd85c241 6031Author: Darren Tucker <dtucker@dtucker.net> 6032Date: Sat Mar 13 14:40:43 2021 +1100 6033 6034 Only call dh_set_moduli_file if using OpenSSL. 6035 6036 Fixes link failure when configuring --without-openssl since dh.c is not 6037 linked in. 6038 6039commit 867a7dcf003c51d5a83f83565771a35f0d9530ac 6040Author: Darren Tucker <dtucker@dtucker.net> 6041Date: Sat Mar 13 13:52:53 2021 +1100 6042 6043 Don't install moduli during tests. 6044 6045 Now that we have TEST_SSH_MODULI_FILE pointing to the moduli in the 6046 soure directory we don't need to install the file to prevent warnings 6047 about it being missing. 6048 6049commit 0c054538fccf92b4a028008321d3711107bee6d5 6050Author: Darren Tucker <dtucker@dtucker.net> 6051Date: Sat Mar 13 13:51:26 2021 +1100 6052 6053 Point TEST_SSH_MODULI_FILE at our own moduli. 6054 6055 This will allow the test to run without requiring a moduli file 6056 installed at the configured default path. 6057 6058commit 4d48219c72ab0c71238806f057f0e9630b7dd25c 6059Author: jsg@openbsd.org <jsg@openbsd.org> 6060Date: Fri Mar 12 05:18:01 2021 +0000 6061 6062 upstream: spelling 6063 6064 OpenBSD-Commit-ID: 478bc3db04f62f1048ed6e1765400f3ab325e60f 6065 6066commit 88057eb6df912abf2678ea5c846d9d9cbc92752c 6067Author: dtucker@openbsd.org <dtucker@openbsd.org> 6068Date: Fri Mar 12 04:08:19 2021 +0000 6069 6070 upstream: Add ModuliFile keyword to sshd_config to specify the 6071 6072 location of the "moduli" file containing the groups for DH-GEX. This will 6073 allow us to run tests against arbitrary moduli files without having to 6074 install them. ok djm@ 6075 6076 OpenBSD-Commit-ID: 8df99d60b14ecaaa28f3469d01fc7f56bff49f66 6077 6078commit f07519a2af96109325b5a48b1af18b57601074ca 6079Author: djm@openbsd.org <djm@openbsd.org> 6080Date: Fri Mar 12 03:43:40 2021 +0000 6081 6082 upstream: pwcopy() struct passwd that we're going to reuse across a 6083 6084 bunch of library calls; bz3273 ok dtucker@ 6085 6086 OpenBSD-Commit-ID: b6eafa977b2e44607b1b121f5de855107809b762 6087 6088commit 69d6d4b0c8a88d3d1288415605f36e2df61a2f12 6089Author: dtucker@openbsd.org <dtucker@openbsd.org> 6090Date: Wed Mar 10 06:32:27 2021 +0000 6091 6092 upstream: Import regenerated moduli file. 6093 6094 OpenBSD-Commit-ID: 7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b 6095 6096commit e5895e8ecfac65086ea6b34d0d168409a66a15e1 6097Author: djm@openbsd.org <djm@openbsd.org> 6098Date: Wed Mar 10 04:58:45 2021 +0000 6099 6100 upstream: no need to reset buffer after send_msg() as that is done 6101 6102 for us; patch from Mike Frysinger 6103 6104 OpenBSD-Commit-ID: 565516495ff8362a38231e0f1a087b8ae66da59c 6105 6106commit 721948e67488767df0fa0db71ff2578ee2bb9210 6107Author: dtucker@openbsd.org <dtucker@openbsd.org> 6108Date: Sat Mar 13 01:52:16 2021 +0000 6109 6110 upstream: Add TEST_SSH_MODULI_FILE variable to allow overriding of the 6111 6112 moduli file used during the test run. 6113 6114 OpenBSD-Regress-ID: be10f785263120edb64fc87db0e0d6570a10220a 6115 6116commit 82fef71e20ffef425b932bec26f5bc46aa1ed41c 6117Author: Darren Tucker <dtucker@dtucker.net> 6118Date: Fri Mar 12 15:58:57 2021 +1100 6119 6120 Allow (but return EACCES) fstatat64 in sandbox. 6121 6122 This is apparently used in some configurations of OpenSSL when glibc 6123 has getrandom(). bz#3276, patch from Kris Karas, ok djm@ 6124 6125commit 1cd67ee15ce3d192ab51be22bc4872a6a7a4b6d9 6126Author: Darren Tucker <dtucker@dtucker.net> 6127Date: Fri Mar 12 13:16:10 2021 +1100 6128 6129 Move generic includes outside of ifdef. 6130 6131 This ensures that the macros in log.h are defined in the case where 6132 either of --with-solaris-projects or --with-solaris-privs are used 6133 without --with-solaris-contracts. bz#3278. 6134 6135commit 2421a567a8862fe5102a4e7d60003ebffd1313dd 6136Author: Darren Tucker <dtucker@dtucker.net> 6137Date: Wed Mar 10 17:41:21 2021 +1100 6138 6139 Import regenerated moduli file. 6140 6141commit e99080c05d9d48dbbdb022538533d53ae1bd567d 6142Author: millert@openbsd.org <millert@openbsd.org> 6143Date: Sat Mar 6 20:36:31 2021 +0000 6144 6145 upstream: Fix PRINT macro, the suffix param to sshlog() was missing. 6146 6147 Also remove redundant __func__ prefix from PRINT calls as the macro already 6148 adds __FILE__, __func__ and __LINE__. From Christos Zoulas. OK dtucker@ 6149 6150 OpenBSD-Commit-ID: 01fdfa9c5541151b5461d9d7d6ca186a3413d949 6151 6152commit 160db17fc678ceb5e3fd4a7e006cc73866f484aa 6153Author: djm@openbsd.org <djm@openbsd.org> 6154Date: Wed Mar 3 22:41:49 2021 +0000 6155 6156 upstream: don't sshbuf_get_u32() into an enum; reported by goetze 6157 6158 AT dovetail.com via bz3269 6159 6160 OpenBSD-Commit-ID: 99a30a8f1df9bd72be54e21eee5c56a0f050921a 6161 6162commit cffd033817a5aa388764b6661855dcdaabab0588 6163Author: sthen@openbsd.org <sthen@openbsd.org> 6164Date: Wed Mar 3 21:40:16 2021 +0000 6165 6166 upstream: typo in other_hostkeys_message() display output, ok djm 6167 6168 OpenBSD-Commit-ID: 276f58afc97b6f5826e0be58380b737603dbf5f5 6169 6170commit 7fe141b96b13bd7dc67ca985e14d55b9bd8a03fd 6171Author: djm@openbsd.org <djm@openbsd.org> 6172Date: Wed Mar 3 08:42:52 2021 +0000 6173 6174 upstream: needs FILE*; from Mike Frysinger 6175 6176 OpenBSD-Commit-ID: dddb3aa9cb5792eeeaa37a1af67b5a3f25ded41d 6177 6178commit d2afd717e62d76bb41ab5f3ab4ce6f885c8edc98 6179Author: Damien Miller <djm@mindrot.org> 6180Date: Tue Mar 2 21:31:47 2021 +1100 6181 6182 update depend 6183 6184commit f0c4eddf7cf224ebcac1f07ac8afdb30c6e9fe0a 6185Author: Damien Miller <djm@mindrot.org> 6186Date: Tue Mar 2 21:30:14 2021 +1100 6187 6188 update relnotes URL 6189 6190commit 67a8bb7fe62a381634db4c261720092e7d514a3d 6191Author: Damien Miller <djm@mindrot.org> 6192Date: Tue Mar 2 21:29:54 2021 +1100 6193 6194 update RPM spec version numbers 6195 6196commit 0a4b23b11b9a4e6eec332dd5c6ab2ac6f62aa164 6197Author: djm@openbsd.org <djm@openbsd.org> 6198Date: Tue Mar 2 01:48:18 2021 +0000 6199 6200 upstream: openssh-8.5 6201 6202 OpenBSD-Commit-ID: 185e85d60fe042b8f8fa1ef29d4ef637bdf397d6 6203 6204commit de3866383b6720ad4cad83be76fe4c8aa111a249 6205Author: Darren Tucker <dtucker@dtucker.net> 6206Date: Mon Mar 1 21:13:24 2021 +1100 6207 6208 Only upload config logs if configure fails. 6209 6210commit 85ff2a564ce838f8690050081176c1de1fb33116 6211Author: dtucker@openbsd.org <dtucker@openbsd.org> 6212Date: Sun Feb 28 22:56:30 2021 +0000 6213 6214 upstream: Add %k to list of keywords. From 6215 6216 =?UTF-8?q?=20Eero=20H=C3=A4kkinenvia=20bz#3267?= 6217 MIME-Version: 1.0 6218 Content-Type: text/plain; charset=UTF-8 6219 Content-Transfer-Encoding: 8bit 6220 6221 OpenBSD-Commit-ID: 9c87f39a048cee2a7d1c8bab951b2f716256865e 6222 6223commit e774bac35933e71f924f4301786e7fb5bbe1422f 6224Author: dtucker@openbsd.org <dtucker@openbsd.org> 6225Date: Sun Feb 28 01:50:47 2021 +0000 6226 6227 upstream: Do not try to reset signal handler for signal 0 in 6228 6229 subprocess. Prevents spurious debug message. ok djm@ 6230 6231 OpenBSD-Commit-ID: 7f9785e292dcf304457566ad4637effd27ad1d46 6232 6233commit 351c5dbbd74ce300c4f058112f9731c867c6e225 6234Author: djm@openbsd.org <djm@openbsd.org> 6235Date: Sat Feb 27 23:42:37 2021 +0000 6236 6237 upstream: fix alphabetic ordering of options; spotted by Iain Morgan 6238 6239 OpenBSD-Commit-ID: f955fec617d74af0feb5b275831a9fee813d7ad5 6240 6241commit 0d1c9dbe578597f8d45d3ac7690df10d32d743e5 6242Author: Darren Tucker <dtucker@dtucker.net> 6243Date: Sat Feb 27 12:25:25 2021 +1100 6244 6245 zlib is now optional. 6246 6247commit b7c6ee7b437d9adfd19ef49d6c0f19f13f26f9b3 6248Author: Jeffrey H. Johnson <61629094+johnsonjh@users.noreply.github.com> 6249Date: Sat Feb 27 01:04:58 2021 +0000 6250 6251 Fix punctuatio and typo in README.md. 6252 6253 Some very minor fixes, missing 's' and punctuation. 6254 6255commit 6248b86074804983e8f7a2058856a516dbfe2924 6256Author: Damien Miller <djm@mindrot.org> 6257Date: Fri Feb 26 16:45:50 2021 +1100 6258 6259 Revert "ssh: optional bind interface if bind address specified." 6260 6261 This reverts commit 5a878a71a3528c2626aa1d331934fd964782d41c. 6262 6263 Apologies - I accidentally pushed this. 6264 6265commit 493339a940b13be6071629c3c2dd5a3b6fc17023 6266Author: Damien Miller <djm@mindrot.org> 6267Date: Fri Feb 26 15:45:38 2021 +1100 6268 6269 detech BSD libc hash functions in libbsd / libmd 6270 6271 Some Linux distributions are shipping the BSD-style hashing functions 6272 (e.g. SHA256Update) in libbsd and/or libmd. Detect this situation to 6273 avoid header/replacement clashes later. ok dtucker@ 6274 6275commit 5a878a71a3528c2626aa1d331934fd964782d41c 6276Author: Dmitrii Turlupov <dturlupov@factor-ts.ru> 6277Date: Thu Feb 4 16:27:31 2021 +0300 6278 6279 ssh: optional bind interface if bind address specified. 6280 6281 Allows the -b and -B options to be used together. 6282 For example, when the interface is in the VRF. 6283 6284commit 1fe4d70df94d3bcc2b35fd57cad6b5fc4b2d7b16 6285Author: djm@openbsd.org <djm@openbsd.org> 6286Date: Fri Feb 26 04:18:42 2021 +0000 6287 6288 upstream: remove this KEX fuzzer; it's awkward to use and doesn't play 6289 6290 nice with popular fuzzing drivers like libfuzzer. AFAIK nobody has used it 6291 but me. 6292 6293 OpenBSD-Regress-ID: cad919522b3ce90c147c95abaf81b0492ac296c9 6294 6295commit 24a3a67bd7421740d08803b84bd784e764107928 6296Author: Darren Tucker <dtucker@dtucker.net> 6297Date: Fri Feb 26 11:49:19 2021 +1100 6298 6299 Remove macos-11.00 PAM test target too. 6300 6301 These are failing apparently due to some kind of infrastructure problem, 6302 making it look like every commit is busted. 6303 6304commit 473201783f732ca8b0ec528b56aa55fa0d8cf717 6305Author: djm@openbsd.org <djm@openbsd.org> 6306Date: Fri Feb 26 00:16:58 2021 +0000 6307 6308 upstream: a bit more debugging behind #ifdef DEBUG_SK 6309 6310 OpenBSD-Commit-ID: d9fbce14945721061cb322f0084c2165d33d1993 6311 6312commit fd9fa76a344118fe1ef10b9a6c9e85d39599e9a8 6313Author: Darren Tucker <dtucker@dtucker.net> 6314Date: Fri Feb 26 01:15:10 2021 +1100 6315 6316 Remove macos-11.0 from the test target list. 6317 6318 It has been consistently failing for the past few days with a github 6319 actions internal error. 6320 6321commit 476ac8e9d33dbf96ef97aab812b8d7089d0cdc24 6322Author: Philip Hands <phil@hands.com> 6323Date: Wed Feb 24 23:43:16 2021 +0100 6324 6325 tidy the $INSTALLKEY_SH code layout a little 6326 6327 SSH-Copy-ID-Upstream: 78178aa5017222773e4c23d9001391eeaeca8983 6328 6329commit 983e05ef3b81329d76d6a802b39ad0d1f637c06c 6330Author: Jakub Jelen <jjelen@redhat.com> 6331Date: Tue Sep 29 10:02:45 2020 +0000 6332 6333 if unable to add a missing newline, fail 6334 6335 SSH-Copy-ID-Upstream: 76b25e18f55499ea9edb4c4d6dc4a80bebc36d95 6336 6337commit 3594b3b015f6014591da88ba71bf6ff010be7411 6338Author: Philip Hands <phil@hands.com> 6339Date: Tue Oct 13 14:12:58 2020 +0200 6340 6341 use $AUTH_KEY_DIR, now that we have it 6342 6343 since that was a change made since jjelen's commit was written 6344 6345 also, quote the variables 6346 6347 SSH-Copy-ID-Upstream: 588cd8e5cbf95f3443d92b9ab27c5d73ceaf6616 6348 6349commit 333e25f7bc43cee6e36f766e39dad6f9918b318c 6350Author: Jakub Jelen <jjelen@redhat.com> 6351Date: Tue Sep 29 10:00:01 2020 +0000 6352 6353 restorecon the correct directory 6354 6355 if using different path for authorized_keys file 6356 6357 SSH-Copy-ID-Upstream: 791a3df47b48412c726bff6f7b1d190721e65d51 6358 6359commit 9beeab8a37a49a9e3ffb1972fff6621ee5bd7a71 6360Author: djm@openbsd.org <djm@openbsd.org> 6361Date: Thu Feb 25 03:27:34 2021 +0000 6362 6363 upstream: s/PubkeyAcceptedKeyTypes/PubkeyAcceptedAlgorithms/ 6364 6365 OpenBSD-Regress-ID: 3dbc005fa29f69dc23d97e433b6dffed6fe7cb69 6366 6367commit 2dd9870c16ddbd83740adeead5030d6840288c8f 6368Author: dtucker@openbsd.org <dtucker@openbsd.org> 6369Date: Wed Feb 24 23:12:35 2021 +0000 6370 6371 upstream: Rename pubkeyacceptedkeytypes to pubkeyacceptedalgorithms in 6372 6373 test to match change to config-dump output. 6374 6375 OpenBSD-Regress-ID: 74c9a4ad50306be873d032819d5e55c24eb74d5d 6376 6377commit b9225c3a1c3f5827e31d5d64a71b8e0504a25619 6378Author: dtucker@openbsd.org <dtucker@openbsd.org> 6379Date: Wed Feb 24 01:18:08 2021 +0000 6380 6381 upstream: Put obsolete aliases for hostbasedalgorithms and 6382 6383 pubkeyacceptedalgorithms after their current names so that the config-dump 6384 mode finds and uses the current names. Spotted by Phil Pennock. 6385 6386 OpenBSD-Commit-ID: 5dd10e93cccfaff3aaaa09060c917adff04a9b15 6387 6388commit 8b8b60542d6652b2c91e0ef9e9cc81bcb65e6b42 6389Author: djm@openbsd.org <djm@openbsd.org> 6390Date: Tue Feb 23 21:55:08 2021 +0000 6391 6392 upstream: lots more s/key types/signature algorithms/ mostly in 6393 6394 HostbasedAcceptedAlgorithms and HostKeyAlgorithms; prompted by Jakub Jelen 6395 6396 OpenBSD-Commit-ID: 3f719de4385b1a89e4323b2549c66aae050129cb 6397 6398commit 0aeb508aaabc4818970c90831e3d21843c3c6d09 6399Author: djm@openbsd.org <djm@openbsd.org> 6400Date: Tue Feb 23 21:50:18 2021 +0000 6401 6402 upstream: Correct reference to signature algorithms as keys; from 6403 6404 Jakub Jelen 6405 6406 OpenBSD-Commit-ID: 36f7ecee86fc811aa0f8e21e7a872eee044b4be5 6407 6408commit f186a020f2ba5f9c462a23293750e29ba0a746b1 6409Author: Darren Tucker <dtucker@dtucker.net> 6410Date: Tue Feb 23 16:05:22 2021 +1100 6411 6412 Add a couple more test VMs. 6413 6414commit ffcdd3d90e74176b3bb22937ad1f65a6c1cd3f9d 6415Author: Darren Tucker <dtucker@dtucker.net> 6416Date: Mon Feb 22 08:09:27 2021 +1100 6417 6418 Valgrind test: split and move up list. 6419 6420 Since the valgrind test takes so long it approaches the limit allowed by 6421 github, move it to the head of the list so it's the first one started and 6422 split the longest tests out into a second instance that runs concurrently 6423 with the first. 6424 6425commit c3b1636770785cc2830dedd0f22ef7d3d3491d6d 6426Author: djm@openbsd.org <djm@openbsd.org> 6427Date: Tue Feb 23 00:05:31 2021 +0000 6428 6429 upstream: warn when the user specifies a ForwardAgent path that does 6430 6431 not exist and exit if ExitOnForwardFailure is set; bz3264 6432 6433 OpenBSD-Commit-ID: 72f7875865e723e464c71bf8692e83110699bf26 6434 6435commit 5fcb0514949d61aadaf4a89cf16eb78fb47491ec 6436Author: Darren Tucker <dtucker@dtucker.net> 6437Date: Sat Feb 20 13:34:02 2021 +1100 6438 6439 Disable rlimit sandbox, doesn't work with valgrind 6440 6441 Only run regress tests, runing unit tests as well makes it run longer 6442 than allowed y github. 6443 6444commit bb0b9bf45396c19486080d3eb0a159f94de7e6ba 6445Author: Darren Tucker <dtucker@dtucker.net> 6446Date: Sat Feb 20 13:06:25 2021 +1100 6447 6448 Upload valgrind logs on failure. 6449 6450commit ebb3b75e974cb241c6b9b9f5881b09c7bd32b651 6451Author: Darren Tucker <dtucker@dtucker.net> 6452Date: Fri Feb 19 22:18:50 2021 +1100 6453 6454 Rename "vm" to "os" in selfhosted to match c-cpp. 6455 6456 Should make it easier to share code or maybe merge at some point. 6457 6458commit 76c0be0fe0465cb2b975dbd409f8d38b55e55bcb 6459Author: Darren Tucker <dtucker@dtucker.net> 6460Date: Fri Feb 19 22:15:22 2021 +1100 6461 6462 Upload regress failure logs in c-cpp too. 6463 6464commit 8751b6c3136f5225c40f41bbf29aa29e15795f6e 6465Author: Darren Tucker <dtucker@dtucker.net> 6466Date: Fri Feb 19 22:13:36 2021 +1100 6467 6468 Comment out Solaris 64bit PAM build... 6469 6470 until I can figure out why it's failing. 6471 6472commit e9f6d563c06886b277c6b9abafa99fa80726dc48 6473Author: Darren Tucker <dtucker@dtucker.net> 6474Date: Fri Feb 19 10:20:17 2021 +1100 6475 6476 Actually run Valgrind tests. 6477 6478commit 41d232e226624f1a81c17091c36b44c9010aae62 6479Author: Darren Tucker <dtucker@dtucker.net> 6480Date: Fri Feb 19 10:16:56 2021 +1100 6481 6482 Add test against Valgrind. 6483 6484commit e6528d91f12fba05f0ea64224091c9d0f38bdf1d 6485Author: Darren Tucker <dtucker@dtucker.net> 6486Date: Thu Feb 18 16:30:01 2021 +1100 6487 6488 Add fbsd12 test target. 6489 6490commit 6506cb2798d98ff03a7cc06567c392a81f540680 6491Author: Darren Tucker <dtucker@dtucker.net> 6492Date: Thu Feb 18 15:21:13 2021 +1100 6493 6494 Remove unused arg. 6495 6496commit 93c31a623973b0fad508214593aab6ca94b11dcb 6497Author: Darren Tucker <dtucker@dtucker.net> 6498Date: Thu Feb 18 14:54:07 2021 +1100 6499 6500 Add DEBUG_SK to kitchensink builds. 6501 6502commit 65085740d3574eeb3289d592f042df62c2689bb0 6503Author: Darren Tucker <dtucker@dtucker.net> 6504Date: Thu Feb 18 14:53:14 2021 +1100 6505 6506 Add bbone test target (arm32). 6507 6508commit 63238f5aed66148b8d6ca7bd5fb347d624200155 6509Author: djm@openbsd.org <djm@openbsd.org> 6510Date: Thu Feb 18 02:49:35 2021 +0000 6511 6512 upstream: Fix the hostkeys rotation extension documentation 6513 6514 The documentation was lacking the needed want-reply field in the initial 6515 global request. 6516 6517 https://github.com/openssh/openssh-portable/pull/218 by dbussink 6518 6519 OpenBSD-Commit-ID: 051824fd78edf6d647a0b9ac011bf88e28775054 6520 6521commit 34c5ef6e2d06d9f0e20cb04a9aebf67a6f96609a 6522Author: djm@openbsd.org <djm@openbsd.org> 6523Date: Thu Feb 18 02:15:07 2021 +0000 6524 6525 upstream: make names in function prototypes match those in 6526 6527 definition from https://github.com/openssh/openssh-portable/pull/225 by 6528 ZenithalHourlyRate 6529 6530 OpenBSD-Commit-ID: 7c736307bf3f2c7cb24d6f82f244eee959485acd 6531 6532commit 88e3d4de31ab4f14cac658e9e0c512043b15b146 6533Author: djm@openbsd.org <djm@openbsd.org> 6534Date: Thu Feb 18 02:13:58 2021 +0000 6535 6536 upstream: unbreak SK_DEBUG builds 6537 6538 from https://github.com/openssh/openssh-portable/pull/225 by 6539 ZenithalHourlyRate 6540 6541 OpenBSD-Commit-ID: 28d7259ce1b04d025411464decfa2f1a097b43eb 6542 6543commit 788cbc5b74a53956ba9fff11e1ca506271a3597f 6544Author: djm@openbsd.org <djm@openbsd.org> 6545Date: Thu Feb 18 00:30:17 2021 +0000 6546 6547 upstream: sftp-server: implement limits@openssh.com extension 6548 6549 This is a simple extension that allows the server to clearly 6550 communicate transfer limits it is imposing so the client doesn't 6551 have to guess, or force the user to manually tune. This is 6552 particularly useful when an attempt to use too large of a value 6553 causes the server to abort the connection. 6554 6555 Patch from Mike Frysinger; ok dtucker@ 6556 6557 OpenBSD-Commit-ID: f96293221e5aa24102d9bf30e4f4ef04d5f4fb51 6558 6559commit 324449a68d510720d0e4dfcc8e9e5a702fe6a48f 6560Author: Damien Miller <djm@mindrot.org> 6561Date: Thu Feb 18 12:06:25 2021 +1100 6562 6563 support OpenSSL 3.x cipher IV API change 6564 6565 OpenSSL renamed the "get current CIPHER_CTX" IV operation in 3.x. 6566 This uses the new name if available. 6567 6568 https://github.com/openssl/openssl/issues/13411 6569 6570 bz#3238 ok dtucker@ 6571 6572commit 845fe9811c047063d935eca89188ed55c993626b 6573Author: Damien Miller <djm@mindrot.org> 6574Date: Thu Feb 18 11:25:38 2021 +1100 6575 6576 prefer login_getpwclass() to login_getclass() 6577 6578 FreeBSD has login_getpwclass() that does some special magic for 6579 UID=0. Prefer this to login_getclass() as its easier to emulate 6580 the former with the latter. 6581 6582 Based on FreeBSD PR 37416 via Ed Maste; ok dtucker@ 6583 6584commit d0763c8d566119cce84d9806e419badf20444b02 6585Author: Darren Tucker <dtucker@dtucker.net> 6586Date: Thu Feb 18 10:45:27 2021 +1100 6587 6588 Fixing quoting for installing moduli on target guest. 6589 6590commit b3afc243bc820f323a09e3218e9ec8a30a3c1933 6591Author: Darren Tucker <dtucker@dtucker.net> 6592Date: Thu Feb 18 10:27:16 2021 +1100 6593 6594 Install moduli on target not host. 6595 6596commit f060c2bc85d59d111fa18a12eb3872ee4b9f7e97 6597Author: Damien Miller <djm@mindrot.org> 6598Date: Thu Feb 18 10:33:58 2021 +1100 6599 6600 don't free string returned by login_getcapstr(3) 6601 6602 OpenBSD and NetBSD require the caller to free strings returned 6603 bu the login_* functions, but FreeBSD requires that callers don't. 6604 6605 Fortunately in this case, we can harmlessly leak as the process is 6606 about to exec the shell/command. 6607 6608 From https://reviews.freebsd.org/D28617 via Ed Maste; ok dtucker@ 6609 6610commit bc9b0c25703215501da28aa7a6539f96c0fa656f 6611Author: Darren Tucker <dtucker@dtucker.net> 6612Date: Thu Feb 18 10:10:00 2021 +1100 6613 6614 Skip unit tests on sol11 to speed things up. 6615 6616commit 161873035c12cc22211fc73d07170ade47746bc5 6617Author: Darren Tucker <dtucker@dtucker.net> 6618Date: Thu Feb 18 10:09:27 2021 +1100 6619 6620 Remove SKIP_UNIT as it needs to be a make arg. 6621 6622commit 1c293868e4b4e8e74e3ea15b8dff90f6b089967a 6623Author: Darren Tucker <dtucker@dtucker.net> 6624Date: Thu Feb 18 10:05:03 2021 +1100 6625 6626 Always intall moduli. 6627 6628 Allows us to run tests without falling back to a fixed modulus. Ensure that 6629 the directory exists. 6630 6631commit 5c8f41ad100601ec2fdcbccdfe92890c31f81bbe 6632Author: Darren Tucker <dtucker@dtucker.net> 6633Date: Thu Feb 18 09:59:09 2021 +1100 6634 6635 Quote SSHD_CONFOPTS in case it contains spaces. 6636 6637commit 4653116c1f5384ea7006e6396d9b53c33d218975 6638Author: Darren Tucker <dtucker@dtucker.net> 6639Date: Thu Feb 18 09:51:18 2021 +1100 6640 6641 Fix labels on targets (dots vs underscores). 6642 6643commit 4512047f57ca3c6e8cd68f0cc69be59e98b25287 6644Author: Darren Tucker <dtucker@dtucker.net> 6645Date: Wed Feb 17 21:47:48 2021 +1100 6646 6647 More compact representation of config matrix. 6648 6649commit 0406cd09f05c2e419b113dd4c0eac8bc34ec915b 6650Author: Darren Tucker <dtucker@dtucker.net> 6651Date: Wed Feb 17 21:19:18 2021 +1100 6652 6653 Skip unit tests on hosted VMs to speed things up. 6654 6655commit 4582612e6147d766c336198c498740242fb8f1ec 6656Author: Darren Tucker <dtucker@dtucker.net> 6657Date: Wed Feb 17 20:21:29 2021 +1100 6658 6659 Merge macos and ubuntu tests. 6660 6661commit 09f4b84654b71099559492e9aed5e1a38bf24815 6662Author: Darren Tucker <dtucker@dtucker.net> 6663Date: Wed Feb 17 18:41:30 2021 +1100 6664 6665 Convert most github hosted tests to new config structure. 6666 6667commit 65380ff7e054be1454e5ab4fd7bb9c66f8fcbaa9 6668Author: Darren Tucker <dtucker@dtucker.net> 6669Date: Wed Feb 17 18:27:36 2021 +1100 6670 6671 Only run selfhosted tests from selfhosted repo. 6672 6673commit f031366535650b88248ed7dbf23033afdf466240 6674Author: Darren Tucker <dtucker@dtucker.net> 6675Date: Fri Jan 15 14:11:43 2021 +1100 6676 6677 Add self-hosted runners for VMs of other platforms. 6678 6679 Github only hosts a limited number of platforms, and the runner code 6680 is only supported on slightly wider range of platforms. To increase 6681 our test coverage beyond that, we run the runner natively on a VM host, 6682 where it runs a jobs that boot VMs of other platforms, waits for them 6683 to come up then runs the build and test by ssh'ing into the guest. 6684 This means that the minimum dependencies for the guests are quite low 6685 (basically just sshd, a compiler and make). 6686 6687 The interface to the VM host is fairly simple (basically 3 scripts: 6688 vmstartup, vmrun and vmshutdown), but those are specific to the VM host 6689 so are not in the public repo. We also mount the working directory on the 6690 host via sshfs, so things like artifact upload by the runner also work. 6691 6692 As part of this we are moving the per-test-target configs into a single 6693 place (.github/configs) where there will be referenced by a single short 6694 "config" key. I plan to make the github-hosted runners use this too. 6695 6696 The self-hosted runners are run off a private repo on github since that 6697 prevents third parties from accessing them[0], and since runner quota is 6698 limited on private repos, we avoid running the tests we run on the public 6699 repo. 6700 6701 [0] https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories 6702 6703commit 64bbd7444d658ef7ee14a7ea5ccc7f5810279ee7 6704Author: dtucker@openbsd.org <dtucker@openbsd.org> 6705Date: Wed Feb 17 03:59:00 2021 +0000 6706 6707 upstream: Make sure puttygen is new enough to successfully run the 6708 6709 PuTTY interop tests, otherwise skip them. 6710 6711 OpenBSD-Regress-ID: 34565bb50b8aec58331ed02a5e9e0a9a929bef51 6712 6713commit da0a9afcc446a30ca49dd216612c41ac3cb1f2d4 6714Author: markus@openbsd.org <markus@openbsd.org> 6715Date: Mon Feb 15 20:43:15 2021 +0000 6716 6717 upstream: ssh: add PermitRemoteOpen for remote dynamic forwarding 6718 6719 with SOCKS ok djm@, dtucker@ 6720 6721 OpenBSD-Commit-ID: 64fe7b6360acc4ea56aa61b66498b5ecc0a96a7c 6722 6723commit b696858a7f9db72a83d02cb6edaca4b30a91b386 6724Author: markus@openbsd.org <markus@openbsd.org> 6725Date: Mon Feb 15 20:36:35 2021 +0000 6726 6727 upstream: factor out opt_array_append; ok djm@ 6728 6729 OpenBSD-Commit-ID: 571bc5dd35f99c5cf9de6aaeac428b168218e74a 6730 6731commit ad74fc127cc45567e170e8c6dfa2cfd9767324ec 6732Author: dlg@openbsd.org <dlg@openbsd.org> 6733Date: Mon Feb 15 11:09:22 2021 +0000 6734 6735 upstream: ProxyJump takes "none" to disable processing like 6736 6737 ProxyCommand does 6738 6739 ok djm@ jmc@ 6740 6741 OpenBSD-Commit-ID: 941a2399da2193356bdc30b879d6e1692f18b6d3 6742 6743commit 16eacdb016ccf38dd9959c78edd3a6282513aa53 6744Author: djm@openbsd.org <djm@openbsd.org> 6745Date: Fri Feb 12 03:49:09 2021 +0000 6746 6747 upstream: sftp: add missing lsetstat@openssh.com documentation 6748 6749 patch from Mike Frysinger 6750 6751 OpenBSD-Commit-ID: 9c114db88d505864075bfe7888b7c8745549715b 6752 6753commit e04fd6dde16de1cdc5a4d9946397ff60d96568db 6754Author: djm@openbsd.org <djm@openbsd.org> 6755Date: Fri Feb 12 03:14:18 2021 +0000 6756 6757 upstream: factor SSH_AGENT_CONSTRAIN_EXTENSION parsing into its own 6758 6759 function and remove an unused variable; ok dtucker@ 6760 6761 OpenBSD-Commit-ID: e1a938657fbf7ef0ba5e73b30365734a0cc96559 6762 6763commit 1bb130ed34721d46452529d094d9bbf045607d79 6764Author: Darren Tucker <dtucker@dtucker.net> 6765Date: Thu Feb 11 10:18:05 2021 +1100 6766 6767 Add __NR_futex_time64 to seccomp sandbox. 6768 6769 This is apparently needed for (some) 32 bit platforms with glibc 2.33. 6770 Patch from nix at esperi.org.uk and jjelen at redhat.com via bz#3260. 6771 6772commit f88a7a431212a16e572ecabd559e632f369c363e 6773Author: Darren Tucker <dtucker@dtucker.net> 6774Date: Sat Feb 6 09:37:01 2021 +1100 6775 6776 Add a hostname function for systems that don't have it. 6777 6778 Some systems don't have a hostname command (it's not required by POSIX). 6779 The do have uname -n (which is), but as found by tim@ some others (eg 6780 UnixWare) do not report the FQDN from uname -n. 6781 6782commit 5e385a71ef2317856f37c91a98658eb12eb5a89c 6783Author: dtucker@openbsd.org <dtucker@openbsd.org> 6784Date: Fri Feb 5 22:03:40 2021 +0000 6785 6786 upstream: Roll back the hostname->uname change in rev 1.10. It turns 6787 6788 out uname -n doesn't do what we need for some platforms in portable, so we'll 6789 fix the original problem (that some other platforms don't have hostname at 6790 all) by providing wrapper function to implement it. 6791 6792 OpenBSD-Regress-ID: 827a707d6201d5a8e196a8c28aec1d2c76c52341 6793 6794commit b446c214279de50ed8388e54897eb1be5281c894 6795Author: dtucker@openbsd.org <dtucker@openbsd.org> 6796Date: Fri Feb 5 06:01:58 2021 +0000 6797 6798 upstream: hostname is not specified by POSIX but uname -n is, so use 6799 6800 the latter for portability. Patch from Geert Hendrickx via github PR#208. 6801 6802 OpenBSD-Regress-ID: d6a79c7c4d141a0d05ade4a042eb57dddbce89f3 6803 6804commit 1cb6ce98d658e5fbdae025a3bd65793980e3b5d9 6805Author: David Carlier <devnexen@gmail.com> 6806Date: Sat Nov 21 12:22:23 2020 +0000 6807 6808 Using explicit_memset for the explicit_bzero compatibility layer. 6809 6810 Favoriting the native implementation in this case. 6811 6812commit 2e0beff67def2120f4b051b1016d7fbf84823e78 6813Author: Luca Weiss <luca@z3ntu.xyz> 6814Date: Sun Nov 8 14:19:23 2020 +0100 6815 6816 Deny (non-fatal) statx in preauth privsep child. 6817 6818commit a35d3e911e193a652bd09eed40907e3e165b0a7b 6819Author: dtucker@openbsd.org <dtucker@openbsd.org> 6820Date: Fri Feb 5 02:20:23 2021 +0000 6821 6822 upstream: Remove debug message from sigchld handler. While this 6823 6824 works on OpenBSD it can cause problems on other platforms. From kircherlike 6825 at outlook.com via bz#3259, ok djm@ 6826 6827 OpenBSD-Commit-ID: 3e241d7ac1ee77e3de3651780b5dc47b283a7668 6828 6829commit 69338ab46afe9e3dfb7762ad65351d854077c998 6830Author: djm@openbsd.org <djm@openbsd.org> 6831Date: Tue Feb 2 22:36:59 2021 +0000 6832 6833 upstream: whitespace 6834 6835 OpenBSD-Commit-ID: 544bb092e03fcbecb420196cd0f70af13ea868ad 6836 6837commit f71219a01d8f71c4b3ed7e456337a84ddba1653e 6838Author: djm@openbsd.org <djm@openbsd.org> 6839Date: Tue Feb 2 22:36:46 2021 +0000 6840 6841 upstream: fix memleaks in private key deserialisation; enforce more 6842 6843 consistency between redundant fields in private key certificate and private 6844 key body; ok markus@ 6845 6846 OpenBSD-Commit-ID: dec344e414d47f0a7adc13aecf3760fe58101240 6847 6848commit 3287790e78bf5b53c4a3cafb67bb5aa03e3910f0 6849Author: djm@openbsd.org <djm@openbsd.org> 6850Date: Tue Feb 2 22:35:14 2021 +0000 6851 6852 upstream: memleak on error path; ok markus@ 6853 6854 OpenBSD-Commit-ID: 2091a36d6ca3980c81891a6c4bdc544e63cb13a8 6855 6856commit 3dd0c64e08f1bba21d71996d635c7256c8c139d1 6857Author: djm@openbsd.org <djm@openbsd.org> 6858Date: Sun Jan 31 22:55:29 2021 +0000 6859 6860 upstream: more strictly enforce KEX state-machine by banning packet 6861 6862 types once they are received. Fixes memleak caused by duplicate 6863 SSH2_MSG_KEX_DH_GEX_REQUEST (spotted by portable OpenSSH kex_fuzz via 6864 oss-fuzz #30078). 6865 6866 ok markus@ 6867 6868 OpenBSD-Commit-ID: 87331c715c095b587d5c88724694cdeb701c9def 6869 6870commit 7a92a324a2e351fabd0ba8ef9b434d3b12d54ee3 6871Author: dtucker@openbsd.org <dtucker@openbsd.org> 6872Date: Sun Jan 31 10:50:10 2021 +0000 6873 6874 upstream: Set linesize returned by getline to zero when freeing and 6875 6876 NULLing the returned string. OpenBSD's getline handles this just fine, but 6877 some implementations used by -portable do not. ok djm@ 6878 6879 OpenBSD-Commit-ID: 4d7bd5169d3397654247db9655cc69a9908d165c 6880 6881commit a5dfc5bae8c16e2a7caf564758d812c7672480b5 6882Author: Damien Miller <djm@mindrot.org> 6883Date: Sat Jan 30 16:32:29 2021 +1100 6884 6885 allow a fuzz case to contain more than one request 6886 6887 loop until input buffer empty, no message consumed or 256 messages 6888 processed 6889 6890commit 0ef24ad60204022f7e33b6e9d171172c50514132 6891Author: Damien Miller <djm@mindrot.org> 6892Date: Sat Jan 30 16:28:23 2021 +1100 6893 6894 expect fuzz cases to have length prefix 6895 6896 might make life a little easier for the fuzzer, e.g. it can now 6897 produce valid (multi-request) messages by smashing two cases together. 6898 6899commit de613f2713d2dfcd3b03c00e5558a40997f52712 6900Author: Damien Miller <djm@mindrot.org> 6901Date: Sat Jan 30 12:03:30 2021 +1100 6902 6903 ssh-agent fuzzer 6904 6905commit 7e96c877bcb2fb645355a687b8cb7347987c1c58 6906Author: Damien Miller <djm@mindrot.org> 6907Date: Sat Jan 30 12:02:46 2021 +1100 6908 6909 move keys out of kex_fuzz.cc into separate header 6910 6911 add certificates and missing key types 6912 6913commit 76f46d75664fdaa1112739ca523ff85ee4eb52b4 6914Author: Damien Miller <djm@mindrot.org> 6915Date: Sat Jan 30 12:02:10 2021 +1100 6916 6917 some fixed test data (mostly keys) for fuzzing 6918 6919commit 7c2e3d6de1f2edb0c8b4725b4c2b56360e032b19 6920Author: djm@openbsd.org <djm@openbsd.org> 6921Date: Sat Jan 30 00:56:38 2021 +0000 6922 6923 upstream: add a SK_DUMMY_INTEGRATE define that allows the dummy 6924 6925 security key middleware to be directly linked; useful for writing fuzzers, 6926 etc. 6927 6928 OpenBSD-Regress-ID: 0ebd00159b58ebd85e61d8270fc02f1e45df1544 6929 6930commit 1a4b92758690faa12f49079dd3b72567f909466d 6931Author: djm@openbsd.org <djm@openbsd.org> 6932Date: Fri Jan 29 06:29:46 2021 +0000 6933 6934 upstream: fix the values of enum sock_type 6935 6936 OpenBSD-Commit-ID: 18d048f4dbfbb159ff500cfc2700b8fb1407facd 6937 6938commit 8afaa7d7918419d3da6c0477b83db2159879cb33 6939Author: djm@openbsd.org <djm@openbsd.org> 6940Date: Fri Jan 29 06:28:10 2021 +0000 6941 6942 upstream: give typedef'd struct a struct name; makes the fuzzer I'm 6943 6944 writing a bit easier 6945 6946 OpenBSD-Commit-ID: 1052ab521505a4d8384d67acb3974ef81b8896cb 6947 6948commit 1e660115f0c7c4a750cd31e468ff889f33dd8088 6949Author: Damien Miller <djm@mindrot.org> 6950Date: Fri Jan 29 11:09:14 2021 +1100 6951 6952 fuzz diffie-hellman-group-exchange-sha1 kex too 6953 6954commit be5f0048ea2aaeddd27be7dcca23aaad345fa16c 6955Author: Damien Miller <djm@mindrot.org> 6956Date: Fri Jan 29 11:03:35 2021 +1100 6957 6958 support for running kex fuzzer with null cipher 6959 6960commit 3d59e88c0e42182c3749b446ccd9027933c84be4 6961Author: Darren Tucker <dtucker@dtucker.net> 6962Date: Thu Jan 28 20:55:16 2021 +1100 6963 6964 make with -j2 to use available CPUs. 6965 6966commit 66dd9ddb5d2ea8c407908c8e8468c9d6e71db05b 6967Author: Darren Tucker <dtucker@dtucker.net> 6968Date: Thu Jan 28 14:31:01 2021 +1100 6969 6970 Add test against openssl head and libressl head. 6971 6972commit 237dbb34e24b6b7ea888d54bda4d17da0a0fd0fa 6973Author: Darren Tucker <dtucker@dtucker.net> 6974Date: Thu Jan 28 14:30:50 2021 +1100 6975 6976 Remove whitespace. 6977 6978commit d983e1732b8135d7ee8d92290d6dce35f736ab88 6979Author: djm@openbsd.org <djm@openbsd.org> 6980Date: Wed Jan 27 23:49:46 2021 +0000 6981 6982 upstream: fix leak: was double allocating kex->session_id buffer 6983 6984 OpenBSD-Commit-ID: 3765f4cc3ae1df874dba9102a3588ba7b48b8183 6985 6986commit 1134a48cdcef8e7363b9f6c73ebdd24405066738 6987Author: Damien Miller <djm@mindrot.org> 6988Date: Thu Jan 28 08:57:31 2021 +1100 6989 6990 correct kex name in disabled code 6991 6992commit 67f47f1965abafc1830a287761125c2f4790857e 6993Author: djm@openbsd.org <djm@openbsd.org> 6994Date: Wed Jan 27 10:15:08 2021 +0000 6995 6996 upstream: this needs kex.h now 6997 6998 OpenBSD-Commit-ID: c5a42166c5aa002197217421a971e48be7cb5d41 6999 7000commit 39be3dc209f28f9c1ebfeba42adde8963b01e1cd 7001Author: djm@openbsd.org <djm@openbsd.org> 7002Date: Wed Jan 27 10:05:28 2021 +0000 7003 7004 upstream: make ssh->kex->session_id a sshbuf instead of u_char*/size_t 7005 7006 and use that instead of global variables containing copies of it. feedback/ok 7007 markus@ 7008 7009 OpenBSD-Commit-ID: a4b1b1ca4afd2e37cb9f64f737b30a6a7f96af68 7010 7011commit 4ca6a1fac328477c642329676d6469dba59019a3 7012Author: djm@openbsd.org <djm@openbsd.org> 7013Date: Wed Jan 27 09:26:53 2021 +0000 7014 7015 upstream: remove global variable used to stash compat flags and use the 7016 7017 purpose-built ssh->compat variable instead; feedback/ok markus@ 7018 7019 OpenBSD-Commit-ID: 7c4f200e112dae6bcf99f5bae1a5629288378a06 7020 7021commit bba229b6f3328171f5e3ae85de443002523c0452 7022Author: Darren Tucker <dtucker@dtucker.net> 7023Date: Wed Jan 27 12:34:07 2021 +1100 7024 7025 Install moduli file before tests. 7026 7027 Reduces warnings during test runs. 7028 7029commit 1b83185593a90a73860a503d753a95ca6d726c00 7030Author: Darren Tucker <dtucker@dtucker.net> 7031Date: Wed Jan 27 11:58:26 2021 +1100 7032 7033 Run one test with -Werror to catch warnings. 7034 7035commit d1532d90074b212054d5fd965f833231b09982f5 7036Author: dtucker@openbsd.org <dtucker@openbsd.org> 7037Date: Wed Jan 27 00:37:26 2021 +0000 7038 7039 upstream: Logical not bitwise or. ok djm@ 7040 7041 OpenBSD-Commit-ID: d4dc855cf04951b93c45caa383e1ac9af0a3b0e5 7042 7043commit 507b448a2465a53ab03a88acbc71cc51b48ca6ac 7044Author: naddy@openbsd.org <naddy@openbsd.org> 7045Date: Tue Jan 26 15:40:17 2021 +0000 7046 7047 upstream: move HostbasedAcceptedAlgorithms to the right place in 7048 7049 alphabetical order 7050 7051 OpenBSD-Commit-ID: d766820d33dd874d944c14b0638239adb522c7ec 7052 7053commit e26c980778b228bdd42b8353cc70101cf49b731b 7054Author: dtucker@openbsd.org <dtucker@openbsd.org> 7055Date: Tue Jan 26 11:25:01 2021 +0000 7056 7057 upstream: Remove unused variables leftover from refactoring. ok 7058 7059 djm@ 7060 7061 OpenBSD-Commit-ID: 8b3ad58bff828fcf874e54b2fc27a4cf1d9505e8 7062 7063commit e9f78d6b06fc323bba1890b2dc3b8423138fb35c 7064Author: dtucker@openbsd.org <dtucker@openbsd.org> 7065Date: Tue Jan 26 05:32:21 2021 +0000 7066 7067 upstream: Rename HostbasedKeyTypes (ssh) and 7068 7069 HostbasedAcceptedKeyTypes (sshd) to HostbasedAcceptedAlgorithms, which more 7070 accurately reflects its effect. This matches a previous change to 7071 PubkeyAcceptedAlgorithms. The previous names are retained as aliases. ok 7072 djm@ 7073 7074 OpenBSD-Commit-ID: 49451c382adc6e69d3fa0e0663eeef2daa4b199e 7075 7076commit 48d0d7a4dd31154c4208ec39029d60646192f978 7077Author: Darren Tucker <dtucker@dtucker.net> 7078Date: Tue Jan 26 14:48:07 2021 +1100 7079 7080 Disable sntrup761 if compiler doesn't support VLAs. 7081 7082 The sntrup761 code sourced from supercop uses variable length 7083 arrays. Although widely supported, they are not part of the ANSI 7084 C89 spec so if the compiler does not support VLAs, disable the 7085 sntrup761x25519-sha512@openssh.com KEX method by replacing the kex 7086 functions with no-op ones similar to what we do in kexecdh.c. 7087 7088 This should allow OpenSSH to build with a plain C89 compiler again. 7089 Spotted by tim@, ok djm@. 7090 7091commit 37c70ea8d4f3664a88141bcdf0bf7a16bd5fd1ac 7092Author: djm@openbsd.org <djm@openbsd.org> 7093Date: Tue Jan 26 00:54:49 2021 +0000 7094 7095 upstream: refactor key constraint parsing in ssh-agent 7096 7097 Key constraints parsing code previously existed in both the "add regular 7098 key" and "add smartcard key" path. This unifies them but also introduces 7099 more consistency checking: duplicated constraints and constraints that 7100 are nonsensical for a particular situation (e.g. FIDO provider for a 7101 smartcard key) are now banned. 7102 7103 ok markus@ 7104 7105 OpenBSD-Commit-ID: 511cb1b1c021ee1d51a4c2d649b937445de7983c 7106 7107commit e0e8bee8024fa9e31974244d14f03d799e5c0775 7108Author: djm@openbsd.org <djm@openbsd.org> 7109Date: Tue Jan 26 00:53:31 2021 +0000 7110 7111 upstream: more ssh-agent refactoring 7112 7113 Allow confirm_key() to accept an additional reason suffix 7114 7115 Factor publickey userauth parsing out into its own function and allow 7116 it to optionally return things it parsed out of the message to its 7117 caller. 7118 7119 feedback/ok markus@ 7120 7121 OpenBSD-Commit-ID: 29006515617d1aa2d8b85cd2bf667e849146477e 7122 7123commit dfe18a295542c169ffde8533b3d7fe42088e2de7 7124Author: djm@openbsd.org <djm@openbsd.org> 7125Date: Tue Jan 26 00:51:30 2021 +0000 7126 7127 upstream: make struct hostkeys public; I have no idea why I made it 7128 7129 opaque originally. 7130 7131 ok markus@ 7132 7133 OpenBSD-Commit-ID: e50780b34d4bbe628d69b2405b024dd749d982f3 7134 7135commit 3b44f2513cae89c920e8fe927b9bc910a1c8c65a 7136Author: djm@openbsd.org <djm@openbsd.org> 7137Date: Tue Jan 26 00:49:30 2021 +0000 7138 7139 upstream: move check_host_cert() from sshconnect,c to sshkey.c and 7140 7141 refactor it to make it more generally usable and testable. 7142 7143 ok markus@ 7144 7145 OpenBSD-Commit-ID: 536f489f5ff38808c1fa711ba58d4579b636f9e4 7146 7147commit 1fe16fd61bb53944ec510882acc0491abd66ff76 7148Author: djm@openbsd.org <djm@openbsd.org> 7149Date: Tue Jan 26 00:47:47 2021 +0000 7150 7151 upstream: use recallocarray to allocate the agent sockets table; 7152 7153 also clear socket entries that are being marked as unused. 7154 7155 spinkle in some debug2() spam to make it easier to watch an agent 7156 do its thing. 7157 7158 ok markus 7159 7160 OpenBSD-Commit-ID: 74582c8e82e96afea46f6c7b6813a429cbc75922 7161 7162commit cb7b22ea20a01332c81c0ddcb3555ad50de9cce2 7163Author: djm@openbsd.org <djm@openbsd.org> 7164Date: Tue Jan 26 00:46:17 2021 +0000 7165 7166 upstream: factor out common code in the agent client 7167 7168 Add a ssh_request_reply_decode() function that sends a message to 7169 the agent, reads and parses a success/failure reply. 7170 Use it for all requests that only expect success/failure 7171 7172 ok markus@ 7173 7174 OpenBSD-Commit-ID: e0c1f4d5e6cfa525d62581e2b8de93be0cb85adb 7175 7176commit d1e578afe7cd48140ad6e92a453f9b035363fd7f 7177Author: djm@openbsd.org <djm@openbsd.org> 7178Date: Mon Jan 25 06:00:17 2021 +0000 7179 7180 upstream: make ssh hostbased authentication send the signature 7181 7182 algorithm in its SSH2_MSG_USERAUTH_REQUEST packets instead of the key type. 7183 This make HostbasedAcceptedAlgorithms do what it is supposed to - filter on 7184 signature algorithm and not key type. 7185 7186 spotted with dtucker@ ok markus@ 7187 7188 OpenBSD-Commit-ID: 25bffe19f0326972f5728170f7da81d5f45c78c6 7189 7190commit 95eca1e195a3b41baa1a725c2c5af8a09d885e4b 7191Author: Darren Tucker <dtucker@dtucker.net> 7192Date: Sat Jan 23 18:26:05 2021 +1100 7193 7194 ifdef new instance of sin6_scope_id 7195 7196 Put inside HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID similar to 7197 existing instance. Should fix error on UnixWare 7. 7198 7199commit 6ffdcdda128045226dda7fbb3956407978028a1e 7200Author: dtucker@openbsd.org <dtucker@openbsd.org> 7201Date: Mon Jan 18 11:43:34 2021 +0000 7202 7203 upstream: Fix long->int for convtime tests here too. Spotted by 7204 7205 tobhe@. 7206 7207 OpenBSD-Regress-ID: a87094f5863312d00938afba771d25f788c849d0 7208 7209commit b55b7565f15327d82ad7acbddafa90b658c5f0af 7210Author: dtucker@openbsd.org <dtucker@openbsd.org> 7211Date: Fri Jan 22 02:46:40 2021 +0000 7212 7213 upstream: PubkeyAcceptedKeyTypes->PubkeyAcceptedAlgorithms 7214 7215 here too. 7216 7217 OpenBSD-Commit-ID: 3b64a640f8ce8c21d9314da9df7ce2420eefde3a 7218 7219commit ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec 7220Author: dtucker@openbsd.org <dtucker@openbsd.org> 7221Date: Fri Jan 22 02:44:58 2021 +0000 7222 7223 upstream: Rename PubkeyAcceptedKeyTypes keyword to 7224 7225 PubkeyAcceptedAlgorithms. While the two were originally equivalent, this 7226 actually specifies the signature algorithms that are accepted. Some key 7227 types (eg RSA) can be used by multiple algorithms (eg ssh-rsa, rsa-sha2-512) 7228 so the old name is becoming increasingly misleading. The old name is 7229 retained as an alias. Prompted by bz#3253, help & ok djm@, man page help jmc@ 7230 7231 OpenBSD-Commit-ID: 0346b2f73f54c43d4e001089759d149bfe402ca5 7232 7233commit a8e798feabe36d02de292bcfd274712cae1d8d17 7234Author: dtucker@openbsd.org <dtucker@openbsd.org> 7235Date: Fri Jan 15 02:58:11 2021 +0000 7236 7237 upstream: Change types in convtime() unit test to int to match change 7238 7239 its new type. Add tests for boundary conditions and fix convtime to work up 7240 to INT_MAX. ok djm@ 7241 7242 OpenBSD-Regress-ID: ba2b81e9a3257fff204b020affe85b604a44f97e 7243 7244commit 9bde1a420626da5007bf7ab499fa2159b9eddf72 7245Author: dtucker@openbsd.org <dtucker@openbsd.org> 7246Date: Fri Jan 15 04:31:25 2021 +0000 7247 7248 upstream: Make output buffer larger to prevent potential truncation 7249 7250 warnings from compilers not smart enough to know the strftime calls won't 7251 ever fully fill "to" and "from". ok djm@ 7252 7253 OpenBSD-Commit-ID: 83733f1b01b82da88b9dd1769475952aff10bdd7 7254 7255commit 02da325f10b214219eae2bb1bc2d3bf0c2f13f9f 7256Author: dtucker@openbsd.org <dtucker@openbsd.org> 7257Date: Fri Jan 15 02:58:11 2021 +0000 7258 7259 upstream: Change types in convtime() unit test to int to match 7260 7261 change its new type. Add tests for boundary conditions and fix convtime to 7262 work up to INT_MAX. ok djm@ 7263 7264 OpenBSD-Commit-ID: 01dc0475f1484ac2f47facdfcf9221f9472145de 7265 7266commit 5339ab369c225b40bc64d5ec3374f5c91b3ad609 7267Author: dtucker@openbsd.org <dtucker@openbsd.org> 7268Date: Fri Jan 15 02:32:41 2021 +0000 7269 7270 upstream: In waitfd(), when poll returns early we are subtracting 7271 7272 the elapsed time from the timeout each loop, so we only want to measure the 7273 elapsed time the poll() in that loop, not since the start of the function. 7274 Spotted by chris.xj.zhu at gmail.com, ok djm@ 7275 7276 OpenBSD-Commit-ID: 199df060978ee9aa89b8041a3dfaf1bf7ae8dd7a 7277 7278commit a164862dfa863b54b7897f66e1dd75437f086c11 7279Author: rob@openbsd.org <rob@openbsd.org> 7280Date: Thu Jan 14 19:45:06 2021 +0000 7281 7282 upstream: Minor grammatical correction. 7283 7284 OK jmc@ 7285 7286 OpenBSD-Commit-ID: de0fad0581e212b2750751e479b79c18ff8cac02 7287 7288commit 8635e7df7e3a3fbb4a4f6cd5a7202883b2506087 7289Author: Darren Tucker <dtucker@dtucker.net> 7290Date: Wed Jan 13 18:00:57 2021 +1100 7291 7292 Merge Mac OS X targets into a single config. 7293 7294commit ac112ade990585c511048ed4edaf2d9fc92b61f0 7295Author: Darren Tucker <dtucker@dtucker.net> 7296Date: Tue Jan 12 19:22:47 2021 +1100 7297 7298 Add Mac OS X test targets. 7299 7300commit 1050109b4b2884bf50fd1b3aa084c7fd0a42ae90 7301Author: anatasluo <luolongjuna@gmail.com> 7302Date: Mon Jan 11 13:51:39 2021 +0000 7303 7304 Remove duplicated declaration in fatal.c . 7305 7306commit 7d0f8a3369579dfe398536eb4e3da7bc15da9599 7307Author: dtucker@openbsd.org <dtucker@openbsd.org> 7308Date: Mon Jan 11 04:48:22 2021 +0000 7309 7310 upstream: Correct spelling of persourcenetblocksize in config-dump 7311 7312 mode. 7313 7314 OpenBSD-Commit-ID: ecdc49e2b6bde6b6b0e52163d621831f6ac7b13d 7315 7316commit ba328bd7a6774f30daaf90b83f1933cc4afc866c 7317Author: dtucker@openbsd.org <dtucker@openbsd.org> 7318Date: Sat Jan 9 12:31:46 2021 +0000 7319 7320 upstream: Adjust kexfuzz to addr.c/addrmatch.c split. 7321 7322 OpenBSD-Regress-ID: 1d8d23bb548078020be2fb52c4c643efb190f0eb 7323 7324commit b08ef25552443e94c0857d5e3806dd019ccc55d7 7325Author: dtucker@openbsd.org <dtucker@openbsd.org> 7326Date: Sat Jan 9 12:24:30 2021 +0000 7327 7328 upstream: Update unittests for addr.c/addrmatch.c split. 7329 7330 OpenBSD-Regress-ID: de2b415fb7af084a91c6ef147a90482d8f771eef 7331 7332commit 6d30673fedec2d251f4962c526fd0451f70c4d97 7333Author: dtucker@openbsd.org <dtucker@openbsd.org> 7334Date: Mon Jan 11 02:12:57 2021 +0000 7335 7336 upstream: Change convtime() from returning long to returning int. 7337 7338 On platforms where sizeof(int) != sizeof(long), convtime could accept values 7339 >MAX_INT which subsequently truncate when stored in an int during config 7340 parsing. bz#3250, ok djm@ 7341 7342 OpenBSD-Commit-ID: 8fc932683d6b4660d52f50911d62bd6639c5db31 7343 7344commit 7a57adb8b07b2ad0aead4b2e09ee18edc04d0481 7345Author: jmc@openbsd.org <jmc@openbsd.org> 7346Date: Sat Jan 9 12:51:12 2021 +0000 7347 7348 upstream: add a comma to previous; 7349 7350 OpenBSD-Commit-ID: 9139433701c0aa86a0d3a6c7afe10d1c9c2e0869 7351 7352commit 3a923129534b007c2e24176a8655dec74eca9c46 7353Author: dtucker@openbsd.org <dtucker@openbsd.org> 7354Date: Sat Jan 9 12:10:02 2021 +0000 7355 7356 upstream: Add PerSourceMaxStartups and PerSourceNetBlockSize 7357 7358 options which provide more fine grained MaxStartups limits. Man page help 7359 jmc@, feedback & ok djm@ 7360 7361 OpenBSD-Commit-ID: e2f68664e3d02c0895b35aa751c48a2af622047b 7362 7363commit d9a2bc71693ea27461a78110005d5a2d8b0c6a50 7364Author: dtucker@openbsd.org <dtucker@openbsd.org> 7365Date: Sat Jan 9 11:58:50 2021 +0000 7366 7367 upstream: Move address handling functions out into their own file 7368 7369 in order to reuse them for per-source maxstartups limiting. Supplement with 7370 some additional functions from djm's flowtools that we'll also need. ok djm@ 7371 (as part of a larger diff). 7372 7373 OpenBSD-Commit-ID: e3e7d9ccc6c9b82e25cfef0ec83598e8e2327cbf 7374 7375commit b744914fcb76d70761f1b667de95841b3fc80a56 7376Author: Darren Tucker <dtucker@dtucker.net> 7377Date: Sat Jan 9 00:36:05 2021 +1100 7378 7379 Add test against Graphene hardened malloc. 7380 7381commit 6cb52d5bf771f6769b630fce35a8e9b8e433044f 7382Author: djm@openbsd.org <djm@openbsd.org> 7383Date: Fri Jan 8 04:49:13 2021 +0000 7384 7385 upstream: make CheckHostIP default to 'no'. It doesn't provide any 7386 7387 perceptible value and makes it much harder for hosts to change host keys, 7388 particularly ones that use IP-based load-balancing. 7389 7390 ok dtucker@ 7391 7392 OpenBSD-Commit-ID: 0db98413e82074f78c7d46784b1286d08aee78f0 7393 7394commit 309b642e1442961b5e57701f095bcd4acd2bfb5f 7395Author: Darren Tucker <dtucker@dtucker.net> 7396Date: Fri Jan 8 15:50:41 2021 +1100 7397 7398 Run tests with sudo for better coverage. 7399 7400commit c336644351fa3c715a08b7a292e309e72792e71e 7401Author: Darren Tucker <dtucker@dtucker.net> 7402Date: Fri Jan 8 14:26:32 2021 +1100 7403 7404 Add Ubuntu 16.04 and 20.04 test targets. 7405 7406commit 4c7af01f9dcc1606dec033e7665a042cb0d8ec52 7407Author: djm@openbsd.org <djm@openbsd.org> 7408Date: Fri Jan 8 02:57:24 2021 +0000 7409 7410 upstream: If a signature operation on a FIDO key fails with a 7411 7412 "incorrect PIN" reason and no PIN was initially requested from the user, then 7413 request a PIN and retry the operation. 7414 7415 This smoothes over a few corner cases including FIDO devices that 7416 require PINs for all hosted credentials, biometric FIDO devices that 7417 fall back to requiring PIN when reading the biometric failed, devices 7418 that don't implement reading credProtect status for downloaded keys 7419 and probably a few more cases that I haven't though of yet. 7420 7421 ok dtucker@ 7422 7423 OpenBSD-Commit-ID: 176db8518933d6a5bbf81a2e3cf62447158dc878 7424 7425commit 64ddd0fe68c4a7acf99b78624f8af45e919cd317 7426Author: djm@openbsd.org <djm@openbsd.org> 7427Date: Fri Jan 8 02:44:14 2021 +0000 7428 7429 upstream: don't try to use timespeccmp(3) directly as a qsort(3) 7430 7431 comparison function - it returns 0/1 and not the -1/0/1 that qsort expectes. 7432 7433 fixes sftp "ls -ltr" under some circumstances. 7434 7435 Based on patch by Masahiro Matsuya via bz3248. 7436 7437 OpenBSD-Commit-ID: 65b5e9f18bb0d10573868c3516de6e5170adb163 7438 7439commit 599df78f3008cf78af21f8977be3e1dd085f8e2e 7440Author: dtucker@openbsd.org <dtucker@openbsd.org> 7441Date: Fri Jan 8 02:33:13 2021 +0000 7442 7443 upstream: Update the sntrup761 creation script and generated code: 7444 7445 - remove unneeded header files and typedefs and rely on crypto_api.h - add 7446 defines to map types used to the crypto_api ones instead of typedefs. This 7447 prevents typedef name collisions in -portable. - remove CRYPTO_NAMESPACE 7448 entirely instead of making it a no-op - delete unused functions and make the 7449 remaining ones that aren't exported static. 7450 7451 ok djm@ 7452 7453 OpenBSD-Commit-ID: 7b9d0cf3acd5a3c1091da8afe00c904d38cf5783 7454 7455commit 16448ff529affda7e2a15ee7c3200793abde0759 7456Author: djm@openbsd.org <djm@openbsd.org> 7457Date: Fri Jan 8 02:19:24 2021 +0000 7458 7459 upstream: mention that DisableForwarding is valid in a sshd_config 7460 7461 Match block reported by Fredrik Eriksson in bz3239 7462 7463 OpenBSD-Commit-ID: 3a71c3d84b597f5e43e4b40d5232797daf0993f6 7464 7465commit 91bac5e95b1b0debf9b2b4f05c20dcfa96b368b9 7466Author: dtucker@openbsd.org <dtucker@openbsd.org> 7467Date: Mon Jan 4 21:58:58 2021 +0000 7468 7469 upstream: estructure sntrup761.sh to process all files in a single 7470 7471 list, which will make it easier to reorder. Re-inline int32_MINMAX. ok 7472 tobhe@ 7473 7474 OpenBSD-Commit-ID: d145c6c19b08bb93c9e14bfaa7af589d90f144c0 7475 7476commit 4d96a3ebab2224f17e639a15078e03be1ad3736d 7477Author: tobhe@openbsd.org <tobhe@openbsd.org> 7478Date: Sun Jan 3 18:05:21 2021 +0000 7479 7480 upstream: Prevent redefinition of `crypto_int32' error with gcc3. 7481 7482 Fixes compilation on luna88k. 7483 7484 Feedback millert@ 7485 Found by and ok aoyama@ 7486 7487 OpenBSD-Commit-ID: f305ddfe575a26cc53431af3fde3f4aeebed9ba6 7488 7489commit a23954eeb930ccc8a66a2710153730769dba31b6 7490Author: Darren Tucker <dtucker@dtucker.net> 7491Date: Fri Jan 1 22:00:49 2021 +1100 7492 7493 Undef int32 after sort routines. 7494 7495 This prevents typedef'ing crypto_int32 twice, in sntrup761.c and 7496 crypto_api.h, which some compilers (at least some GCCs) don't accept. 7497 7498commit 148b8a661c3f93e4b6d049ee902de3d521261fbc 7499Author: Damien Miller <djm@mindrot.org> 7500Date: Thu Dec 31 12:47:22 2020 +1100 7501 7502 fix: missing pieces of previous commit 7503 7504commit 3d999be7b987c848feda718cfcfcdc005ddf670d 7505Author: tobhe@openbsd.org <tobhe@openbsd.org> 7506Date: Wed Dec 30 14:13:28 2020 +0000 7507 7508 upstream: Use int64_t for intermediate values in int32_MINMAX to 7509 7510 prevent signed 32-bit integer overflow. 7511 7512 Found by and ok djm@ 7513 ok markus@ 7514 7515 OpenBSD-Commit-ID: 4f0704768e34cf45fdd792bac4011c6971881bb3 7516 7517commit 5c1953bf98732da5a76c706714ac066dbfa015ac 7518Author: Damien Miller <djm@mindrot.org> 7519Date: Tue Dec 29 12:40:54 2020 +1100 7520 7521 adapt KEX fuzzer to PQ kex change 7522 7523commit 659864fe81dbc57eeed3769c462679d83e026640 7524Author: djm@openbsd.org <djm@openbsd.org> 7525Date: Tue Dec 29 01:02:15 2020 +0000 7526 7527 upstream: Adapt to replacement of 7528 7529 sntrup4591761x25519-sha512@tinyssh.org with 7530 sntrup761x25519-sha512@openssh.com. 7531 7532 Also test sntrup761x25519-sha512@openssh.com in unittests/kex 7533 7534 OpenBSD-Regress-ID: cfa3506b2b077a9cac1877fb521efd2641b6030c 7535 7536commit 2c71cec020219d69df84055c59eba5799a1233ec 7537Author: djm@openbsd.org <djm@openbsd.org> 7538Date: Tue Dec 29 00:59:15 2020 +0000 7539 7540 upstream: Update/replace the experimental post-quantim hybrid key 7541 7542 exchange method based on Streamlined NTRU Prime (coupled with X25519). 7543 7544 The previous sntrup4591761x25519-sha512@tinyssh.org method is 7545 replaced with sntrup761x25519-sha512@openssh.com. Per the authors, 7546 sntrup4591761 was replaced almost two years ago by sntrup761. 7547 7548 The sntrup761 implementaion, like sntrup4591761 before it, is public 7549 domain code extracted from the SUPERCOP cryptography benchmark 7550 suite (https://bench.cr.yp.to/supercop.html). 7551 7552 Thanks for Daniel J Bernstein for guidance on algorithm selection. 7553 Patch from Tobias Heider; feedback & ok markus@ and myself 7554 7555 (note this both the updated method and the one that it replaced are 7556 disabled by default) 7557 7558 OpenBSD-Commit-ID: 2bf582b772d81ee24e911bb6f4b2aecfd39338ae 7559 7560commit 09d070ccc3574ae0d7947d212ed53c7268ef7e1f 7561Author: jmc@openbsd.org <jmc@openbsd.org> 7562Date: Tue Dec 22 07:40:26 2020 +0000 7563 7564 upstream: tweak the description of KnownHostsCommand in ssh_conf.5, 7565 7566 and add entries for it to the -O list in scp.1 and sftp.1; 7567 7568 ok djm 7569 7570 OpenBSD-Commit-ID: aba31ebea03f38f8d218857f7ce16a500c3e4aff 7571 7572commit 931c93389a80e32272712459b1102d303844453d 7573Author: Damien Miller <djm@mindrot.org> 7574Date: Tue Dec 22 19:43:55 2020 +1100 7575 7576 whitespace at EOL 7577 7578commit 397b1c4d393f97427283a4717e9015a2bd31b8a5 7579Author: Damien Miller <djm@mindrot.org> 7580Date: Tue Dec 22 19:42:37 2020 +1100 7581 7582 whitespace at EOL 7583 7584commit 33fa3ac547e5349ca34681cce6727b2f933dff0a 7585Author: Darren Tucker <dtucker@dtucker.net> 7586Date: Tue Dec 22 19:21:26 2020 +1100 7587 7588 Improve AIX text. 7589 7590commit 0f2e21c9dca89598b694932b5b05848380a23ec0 7591Author: Darren Tucker <dtucker@dtucker.net> 7592Date: Tue Dec 22 18:56:54 2020 +1100 7593 7594 Include stdio.h for FILE in misc.h. 7595 7596 Fixes build on at least OpenBSD. 7597 7598commit 3e9811e57b57ee66b0f70d99d7258da3153b0e8a 7599Author: Damien Miller <djm@mindrot.org> 7600Date: Tue Dec 22 18:31:50 2020 +1100 7601 7602 ensure $LOGNAME is set in tests 7603 7604commit 3eb647cbb34d87a063aa7714256c6e56103fffda 7605Author: djm@openbsd.org <djm@openbsd.org> 7606Date: Tue Dec 22 06:47:24 2020 +0000 7607 7608 upstream: more detail for failing tests 7609 7610 OpenBSD-Regress-ID: c68c0e5a521cad7e7f68e54c54ebf86d6c10ee1d 7611 7612commit 2873f19570d4d8758be24dbf78332be9a779009b 7613Author: djm@openbsd.org <djm@openbsd.org> 7614Date: Tue Dec 22 06:03:36 2020 +0000 7615 7616 upstream: regress test for KnownHostsCommand 7617 7618 OpenBSD-Regress-ID: ffc77464320b6dabdcfa0a72e0df02659233a38a 7619 7620commit 0121aa87bab9ad2365de2d07f2832b56d5ff9871 7621Author: tb@openbsd.org <tb@openbsd.org> 7622Date: Tue Dec 22 03:05:31 2020 +0000 7623 7624 upstream: Remove lines accidentally left behind in the ProxyJump 7625 7626 parsing fix r1.345. 7627 7628 ok djm 7629 7630 OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c 7631 7632commit da4bf0db942b5f0278f33238b86235e5813d7a5a 7633Author: djm@openbsd.org <djm@openbsd.org> 7634Date: Tue Dec 22 00:15:22 2020 +0000 7635 7636 upstream: add a ssh_config KnownHostsCommand that allows the client 7637 7638 to obtain known_hosts data from a command in addition to the usual files. 7639 7640 The command accepts bunch of %-expansions, including details of the 7641 connection and the offered server host key. Note that the command may 7642 be invoked up to three times per connection (see the manpage for 7643 details). 7644 7645 ok markus@ 7646 7647 OpenBSD-Commit-ID: 2433cff4fb323918ae968da6ff38feb99b4d33d0 7648 7649commit a34e14a5a0071de2036826a00197ce38c8b4ba8b 7650Author: djm@openbsd.org <djm@openbsd.org> 7651Date: Tue Dec 22 00:12:22 2020 +0000 7652 7653 upstream: move subprocess() from auth.c to misc.c 7654 7655 make privilege dropping optional but allow it via callbacks (to avoid 7656 need to link uidswap.c everywhere) 7657 7658 add some other flags (keep environment, disable strict path safety check) 7659 that make this more useful for client-side use. 7660 7661 feedback & ok markus@ 7662 7663 OpenBSD-Commit-ID: a80ea9fdcc156f1a18e9c166122c759fae1637bf 7664 7665commit 649205fe388b56acb3481a1b2461f6b5b7c6efa6 7666Author: dtucker@openbsd.org <dtucker@openbsd.org> 7667Date: Mon Dec 21 22:48:41 2020 +0000 7668 7669 upstream: Remove explicit rijndael-cbc@lysator.liu.se test since the 7670 7671 cipher was removed. 7672 7673 OpenBSD-Regress-ID: aa93cddb4ecd9bc21446a79008a1a53050e64f17 7674 7675commit 03e93c753d7c223063ad8acaf9a30aa511e5f931 7676Author: dtucker@openbsd.org <dtucker@openbsd.org> 7677Date: Mon Dec 21 11:09:32 2020 +0000 7678 7679 upstream: Remove the pre-standardization cipher 7680 7681 rijndael-cbc@lysator.liu.se. It is an alias for aes256-cbc which was 7682 standardized in RFC4253 (2006), has been deprecated and disabled by default 7683 since OpenSSH 7.2 (2016) and was only briefly documented in ssh.1 in 2001. 7684 7685 This will reduce the amount of work the cipher/kex regression tests need 7686 to do by a little bit. ok markus@ djm@ 7687 7688 OpenBSD-Commit-ID: fb460acc18290a998fd70910b19c29b4e4f199ad 7689 7690commit a11ca015879eab941add8c6bdaaec7d41107c6f5 7691Author: djm@openbsd.org <djm@openbsd.org> 7692Date: Mon Dec 21 09:19:53 2020 +0000 7693 7694 upstream: properly fix ProxyJump parsing; Thanks to tb@ for 7695 7696 pointing out my error (parse_ssh_uri() can return -1/0/1, that I missed). 7697 Reported by Raf Czlonka via bugs@ 7698 7699 ok tb@ 7700 7701 OpenBSD-Commit-ID: a2991a3794bcaf1ca2b025212cce11cdb5f6b7d6 7702 7703commit d97fb879724f1670bf55d9adfea7278a93c33ae2 7704Author: djm@openbsd.org <djm@openbsd.org> 7705Date: Mon Dec 21 01:31:06 2020 +0000 7706 7707 upstream: adapt to API change in hostkeys_foreach()/load_hostkeys() 7708 7709 OpenBSD-Regress-ID: dcb468514f32da49a446372453497dc6eeafdbf3 7710 7711commit bf7eb3c266b7fd4ddda108fcf72b860af2af6406 7712Author: djm@openbsd.org <djm@openbsd.org> 7713Date: Fri Oct 16 14:02:24 2020 +0000 7714 7715 upstream: few more things needs match.c and addrmatch.c now that 7716 7717 log.c calls match_pattern_list() 7718 7719 OpenBSD-Regress-ID: f7c95c76b150d0aeb00a67858b9579b7d1b2db74 7720 7721commit 2c64f24e27a5e72a7f59e515fc4f4985355237ae 7722Author: Darren Tucker <dtucker@dtucker.net> 7723Date: Mon Dec 21 14:02:56 2020 +1100 7724 7725 Pull in missing rev 1.2. 7726 7727commit 0f504f592d15d8047e466eb7453067a6880992a8 7728Author: djm@openbsd.org <djm@openbsd.org> 7729Date: Sun Dec 20 23:40:19 2020 +0000 7730 7731 upstream: plumb ssh_conn_info through to sshconnect.c; feedback/ok 7732 7733 markus@ 7734 7735 OpenBSD-Commit-ID: e8d14a09cda3f1dc55df08f8a4889beff74e68b0 7736 7737commit 729b05f59ded35483acef90a6f88aa03eae33b29 7738Author: djm@openbsd.org <djm@openbsd.org> 7739Date: Sun Dec 20 23:38:00 2020 +0000 7740 7741 upstream: allow UserKnownHostsFile=none; feedback and ok markus@ 7742 7743 OpenBSD-Commit-ID: c46d515eac94a35a1d50d5fd71c4b1ca53334b48 7744 7745commit b4c7cd1185c5dc0593d47eafcc1a34fda569dd1d 7746Author: djm@openbsd.org <djm@openbsd.org> 7747Date: Sun Dec 20 23:36:51 2020 +0000 7748 7749 upstream: load_hostkeys()/hostkeys_foreach() variants for FILE* 7750 7751 Add load_hostkeys_file() and hostkeys_foreach_file() that accept a 7752 FILE* argument instead of opening the file directly. 7753 7754 Original load_hostkeys() and hostkeys_foreach() are implemented using 7755 these new interfaces. 7756 7757 Add a u_int note field to the hostkey_entry and hostkey_foreach_line 7758 structs that is passed directly from the load_hostkeys() and 7759 hostkeys_foreach() call. This is a lightweight way to annotate results 7760 between different invocations of load_hostkeys(). 7761 7762 ok markus@ 7763 7764 OpenBSD-Commit-ID: 6ff6db13ec9ee4edfa658b2c38baad0f505d8c20 7765 7766commit 06fbb386bed666581095cb9cbc7a900e02bfe1b7 7767Author: tobhe@openbsd.org <tobhe@openbsd.org> 7768Date: Sat Dec 19 22:09:21 2020 +0000 7769 7770 upstream: Print client kem key with correct length. 7771 7772 ok markus@ 7773 7774 OpenBSD-Commit-ID: 91689e14a4fc6c270e265a32d1c8faba63a45755 7775 7776commit 0ebead6593e2441e4af2735bbe2cd097607cd0d3 7777Author: djm@openbsd.org <djm@openbsd.org> 7778Date: Thu Dec 17 23:28:50 2020 +0000 7779 7780 upstream: fix possible error("%s", NULL) on error paths 7781 7782 OpenBSD-Commit-ID: 0b3833c2cb985453ecca1d76803ebb8f3b736a11 7783 7784commit d060bc7f6e6244f001e658208f53e3e2ecbbd382 7785Author: djm@openbsd.org <djm@openbsd.org> 7786Date: Thu Dec 17 23:26:11 2020 +0000 7787 7788 upstream: refactor client percent_expand() argument passing; 7789 7790 consolidate the common arguments into a single struct and pass that around 7791 instead of using a bunch of globals. ok markus@ 7792 7793 OpenBSD-Commit-ID: 035e6d7ca9145ad504f6af5a021943f1958cd19b 7794 7795commit 43026da035cd266db37df1f723d5575056150744 7796Author: djm@openbsd.org <djm@openbsd.org> 7797Date: Thu Dec 17 23:10:27 2020 +0000 7798 7799 upstream: prepare readconf.c for fuzzing; remove fatal calls and 7800 7801 fix some (one-off) memory leaks; ok markus@ 7802 7803 OpenBSD-Commit-ID: 91c6aec57b0e7aae9190de188e9fe8933aad5ec5 7804 7805commit bef92346c4a808f33216e54d6f4948f9df2ad7c1 7806Author: djm@openbsd.org <djm@openbsd.org> 7807Date: Mon Dec 14 03:13:12 2020 +0000 7808 7809 upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path 7810 7811 OpenBSD-Commit-ID: 5c1048468813107baa872f5ee33ba51623630e01 7812 7813commit a5ab499bd2644b4026596fc2cb24a744fa310666 7814Author: Damien Miller <djm@mindrot.org> 7815Date: Fri Dec 4 14:01:27 2020 +1100 7816 7817 basic KEX fuzzer; adapted from Markus' unittest 7818 7819commit 021ff33e383c77b11badd60cec5b141a3e3fa532 7820Author: Damien Miller <djm@mindrot.org> 7821Date: Fri Dec 4 13:57:43 2020 +1100 7822 7823 use options that work with recent clang 7824 7825commit e4d1a0b40add800b6e9352b40c2223e44acc3a45 7826Author: djm@openbsd.org <djm@openbsd.org> 7827Date: Fri Dec 4 02:41:10 2020 +0000 7828 7829 upstream: shuffle a few utility functions into sftp-client.c; from 7830 7831 Jakub Jelen 7832 7833 OpenBSD-Commit-ID: fdeb1aae1f6149b193f12cd2af158f948c514a2a 7834 7835commit ace12dc64f8e3a2496ca48d36b53cb3c0a090755 7836Author: djm@openbsd.org <djm@openbsd.org> 7837Date: Fri Dec 4 02:29:56 2020 +0000 7838 7839 upstream: make ssh_free(NULL) a no-op 7840 7841 OpenBSD-Commit-ID: 42cb285d94789cefe6608db89c63040ab0a80fa0 7842 7843commit 3b98b6e27f8a122dbfda9966b1afeb3e371cce91 7844Author: djm@openbsd.org <djm@openbsd.org> 7845Date: Fri Dec 4 02:29:25 2020 +0000 7846 7847 upstream: memleak of DH public bignum; found with libfuzzer 7848 7849 OpenBSD-Commit-ID: 0e913b542c3764b100b1571fdb0d0e5cc086fe97 7850 7851commit 553b90feedd7da5b90901d73005f86705456d686 7852Author: djm@openbsd.org <djm@openbsd.org> 7853Date: Fri Dec 4 02:27:57 2020 +0000 7854 7855 upstream: fix minor memleak of kex->hostkey_alg on rekex 7856 7857 OpenBSD-Commit-ID: 2c3969c74966d4ccdfeff5e5f0df0791919aef50 7858 7859commit ac0364b85e66eb53da2f9618f699ba6bd195ceea 7860Author: djm@openbsd.org <djm@openbsd.org> 7861Date: Fri Dec 4 02:27:08 2020 +0000 7862 7863 upstream: typos: s/hex/kex/ in error messages 7864 7865 OpenBSD-Commit-ID: 43a026c9571dd779ec148de1829cf5a6b6651905 7866 7867commit ee22db7c5885a1d90219202c0695bc621aa0409b 7868Author: djm@openbsd.org <djm@openbsd.org> 7869Date: Fri Dec 4 02:25:13 2020 +0000 7870 7871 upstream: make program name be const 7872 7873 OpenBSD-Commit-ID: ece25680ec637fdf20502721ccb0276691df5384 7874 7875commit 2bcbf679de838bb77a8bd7fa18e100df471a679c 7876Author: dtucker@openbsd.org <dtucker@openbsd.org> 7877Date: Mon Nov 30 05:36:39 2020 +0000 7878 7879 upstream: Ignore comments at the end of config lines in ssh_config, 7880 7881 similar to what we already do for sshd_config. bz#2320, with & ok djm@ 7882 7883 OpenBSD-Commit-ID: bdbf9fc5bc72b1a14266f5f61723ed57307a6db4 7884 7885commit b755264e7d3cdf1de34e18df1af4efaa76a3c015 7886Author: dtucker@openbsd.org <dtucker@openbsd.org> 7887Date: Sat Nov 28 12:52:32 2020 +0000 7888 7889 upstream: Include cipher.h for declaration of cipher_by_name. 7890 7891 OpenBSD-Commit-ID: ddfebbca03ca0e14e00bbad9d35f94b99655d032 7892 7893commit 022def7bd16c3426a95e25f57cb259d54468341c 7894Author: djm@openbsd.org <djm@openbsd.org> 7895Date: Sat Nov 28 03:27:59 2020 +0000 7896 7897 upstream: check result of strchr() against NULL rather than 7898 7899 searched-for characters; from zhongjubin@huawei.com 7900 7901 OpenBSD-Commit-ID: e6f57de1d4a4d25f8db2d44e8d58d847e247a4fe 7902 7903commit 57bf03f0217554afb8980f6697a7a0b88658d0a9 7904Author: dtucker@openbsd.org <dtucker@openbsd.org> 7905Date: Fri Nov 27 10:12:30 2020 +0000 7906 7907 upstream: Document ssh-keygen -Z, sanity check its argument earlier and 7908 7909 provide a better error message if it's not correct. Prompted by bz#2879, ok 7910 djm@ jmc@ 7911 7912 OpenBSD-Commit-ID: 484178a173e92230fb1803fb4f206d61f7b58005 7913 7914commit 33313ebc1c7135085676db62189e3520341d6b73 7915Author: djm@openbsd.org <djm@openbsd.org> 7916Date: Fri Nov 27 00:49:58 2020 +0000 7917 7918 upstream: Set the specified TOS/DSCP for interactive use prior to 7919 7920 TCP connect. The connection phase of the SSH session is time-sensitive (due 7921 to server side login grace periods) and is frequently interactive (e.g. 7922 entering passwords). The ultimate interactive/bulk TOS/DSCP will be set after 7923 authentication completes. 7924 7925 ok dtucker@ 7926 7927 OpenBSD-Commit-ID: f31ab10d9233363a6d2c9996007083ba43a093f1 7928 7929commit b2bcec13f17ce9174238a704e91d52203e916432 7930Author: djm@openbsd.org <djm@openbsd.org> 7931Date: Fri Nov 27 00:37:10 2020 +0000 7932 7933 upstream: clean up passing of struct passwd from monitor to preauth 7934 7935 privsep process. No longer copy entire struct w/ pointer addresses, but pass 7936 remaining scalar fields explicitly, 7937 7938 Prompted by Yuichiro NAITO, feedback Thorsten Glaser; ok dtucker@ 7939 7940 OpenBSD-Commit-ID: 9925df75a56732c43f3663e70dd15ff413ab3e53 7941 7942commit 19af04e2231155d513e24fdc81fbec2217ae36a6 7943Author: djm@openbsd.org <djm@openbsd.org> 7944Date: Sun Nov 22 22:38:26 2020 +0000 7945 7946 upstream: when loading PKCS#11 keys, include the key fingerprints 7947 7948 and provider/slot information in debug output. 7949 7950 OpenBSD-Commit-ID: 969a089575d0166a9a364a9901bb6a8d9b8a1431 7951 7952commit 9b9465ea856e15b9e9890b4ecb4110d7106e7766 7953Author: djm@openbsd.org <djm@openbsd.org> 7954Date: Sun Nov 22 22:37:11 2020 +0000 7955 7956 upstream: when mentioning that the host key has changed, don't 7957 7958 report the type because it is ambiguous as to whether it referred to the 7959 known or new host key. bz3216; ok dtucker@ 7960 7961 OpenBSD-Commit-ID: 2d5ce4a83dbcf44e340a572e361decad8aab7bad 7962 7963commit 637017a7dd3281d3f2df804993cc27c30dbfda47 7964Author: Darren Tucker <dtucker@dtucker.net> 7965Date: Wed Nov 25 17:38:46 2020 +1100 7966 7967 Use "=" not "==" in string test. 7968 7969 POSIX says "=" is string comparison and some shells (eg HP-UX) will 7970 complain about "==". 7971 7972commit 9880f3480f9768897f3b8e714d5317fb993bc5b3 7973Author: Darren Tucker <dtucker@dtucker.net> 7974Date: Fri Nov 20 17:16:51 2020 +1100 7975 7976 Restore correct flags during localtime_r check. 7977 7978 We were restoring the wrong thing CPPFLAGS (we used CFLAGS) for any 7979 platform that doesn't have localtime_r. 7980 7981commit 41935882f4e82de60dbd6e033eabe79e1b963518 7982Author: dtucker@openbsd.org <dtucker@openbsd.org> 7983Date: Fri Nov 20 03:16:56 2020 +0000 7984 7985 upstream: When doing an sftp recursive upload or download of a 7986 7987 read-only directory, ensure that the directory is created with write and 7988 execute permissions in the interim so that we can actually complete the 7989 transfer, then set the directory permission as the final step. (The execute 7990 bit is only likely to be an issue with a non-POSIX server). bz#3222, ok djm@ 7991 7992 OpenBSD-Commit-ID: a82606212f2796e31f0e1af94a63355a7ad5d903 7993 7994commit 0f90440ca70abab947acbd77795e9f130967956c 7995Author: Darren Tucker <dtucker@dtucker.net> 7996Date: Fri Nov 20 13:37:54 2020 +1100 7997 7998 Add new pselect6_time64 syscall on ARM. 7999 8000 This is apparently needed on armhfp/armv7hl. bz#3232, patch from 8001 jjelen at redhat.com. 8002 8003commit 3a7c46c72b6a1f643b1fc3589cd20d8320c3d9e1 8004Author: dtucker@openbsd.org <dtucker@openbsd.org> 8005Date: Fri Nov 20 02:14:16 2020 +0000 8006 8007 upstream: Explicitly initialize all members of the 8008 8009 find_by_key_ctx struct. Initializing a single member should be enough 8010 (the spec says the remainder should be initialized as per the static 8011 rules) but some GCCs warn on this which prevents us testing with -Werror 8012 on those. ok deraadt@ djm@ 8013 8014 OpenBSD-Commit-ID: 687126e60a27d30f02614760ef3c3ae4e8d6af28 8015 8016commit 076cb616b87d1ea1d292973fcd0ba38c08ea6832 8017Author: dtucker@openbsd.org <dtucker@openbsd.org> 8018Date: Thu Nov 19 23:05:05 2020 +0000 8019 8020 upstream: draft-ietf-secsh-architecture is now RFC4251. 8021 8022 OpenBSD-Commit-ID: cb0bb58c2711fb5ed519507659be1dcf179ed403 8023 8024commit 85cceda21f1471548e04111aefe2c4943131c1c8 8025Author: dtucker@openbsd.org <dtucker@openbsd.org> 8026Date: Tue Nov 17 11:23:58 2020 +0000 8027 8028 upstream: Specify that the KDF function is bcrypt. Based on github 8029 8030 PR#214 from rafork, ok markus@, mdoc correction jmc@ 8031 8032 OpenBSD-Commit-ID: d8f2853e7edbcd483f31b50da77ab80ffa18b4ef 8033 8034commit 5b9720f9adbd70ba5a994f407fe07a7d016d8d65 8035Author: djm@openbsd.org <djm@openbsd.org> 8036Date: Sun Nov 15 22:34:58 2020 +0000 8037 8038 upstream: revert r1.341; it breaks ProxyJump; reported by sthen@ 8039 8040 OpenBSD-Commit-ID: 6ac2f945b26cb86d936eed338f77861d6da8356a 8041 8042commit 04088725ec9c44880c01799b588cd4ba47b3e8bc 8043Author: djm@openbsd.org <djm@openbsd.org> 8044Date: Fri Nov 13 07:30:44 2020 +0000 8045 8046 upstream: scrub keyboard-interactive authentication prompts coming 8047 8048 from the server through asmprintf() prior to display; suggested by and ok 8049 dtucker@ 8050 8051 OpenBSD-Commit-ID: 31fe93367645c37fbfe4691596bf6cf1e3972a58 8052 8053commit 5442b491d0ee4bb82f6341ad0ee620ef3947f8c5 8054Author: djm@openbsd.org <djm@openbsd.org> 8055Date: Fri Nov 13 04:53:12 2020 +0000 8056 8057 upstream: prefix keyboard interactive prompts with (user@host) to 8058 8059 make it easier to determine which connection they are associated with in 8060 cases like scp -3, ProxyJump, etc. bz#3224 ok dtucker 8061 8062 OpenBSD-Commit-ID: 67e6189b04b46c867662f8a6759cf3ecb5f59170 8063 8064commit 2992e4e7014ac1047062acfdbbf6feb156fef616 8065Author: Darren Tucker <dtucker@dtucker.net> 8066Date: Fri Nov 13 17:56:11 2020 +1100 8067 8068 Remove use of TIME_WITH_SYS_TIME. 8069 8070 It was only set by the recently removed AC_HEADER_TIME macro, replace 8071 with simple inclusions of both sys/time.h and time.h. Should prevent 8072 mis-detection of struct timespec. 8073 8074commit e3f27006f15abacb7e89fda3f5e9a0bd420b7e38 8075Author: Damien Miller <djm@mindrot.org> 8076Date: Fri Nov 13 14:20:43 2020 +1100 8077 8078 Revert "detect Linux/X32 systems" 8079 8080 This reverts commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885. 8081 8082 The approach used was incorrect; discussion in bz#3085 8083 8084commit e51dc7fab61df36e43f3bc64b673f88d388cab91 8085Author: Damien Miller <djm@mindrot.org> 8086Date: Fri Nov 13 13:22:15 2020 +1100 8087 8088 SELinux has deprecated security_context_t 8089 8090 (it was only ever a char* anyway) 8091 8092commit b79add37d118276d67f3899987b9f0629c9449c3 8093Author: Darren Tucker <dtucker@dtucker.net> 8094Date: Fri Nov 13 13:43:30 2020 +1100 8095 8096 Remove obsolete AC_HEADER_TIME macro. 8097 8098 AC_HEADER_TIME is marked as obsolete in autoconf-2.70 and as far as I 8099 can tell everything we have that might be old enough to need it doesn't. 8100 8101commit d5d05cdb3d4efd4a618aa52caab5bec73097c163 8102Author: djm@openbsd.org <djm@openbsd.org> 8103Date: Thu Nov 12 22:56:00 2020 +0000 8104 8105 upstream: when prompting the user to accept a new hostkey, display 8106 8107 any other host names/addresses already associated with the key. E.g. 8108 8109 > The authenticity of host 'test (10.0.0.1)' can't be established. 8110 > ECDSA key fingerprint is SHA256:milU4MODXm8iJQI18wlsbPG7Yup+34fuNNmV08qDnax. 8111 > This host key is known by the following other names/addresses: 8112 > ~/.ssh/known_hosts:1: host.example.org,10.0.0.1 8113 > ~/.ssh/known_hosts:2: [hashed name] 8114 > ~/.ssh/known_hosts:3: [hashed name] 8115 > ~/.ssh/known_hosts:4: host 8116 > ~/.ssh/known_hosts:5: [host]:2222 8117 > Are you sure you want to continue connecting (yes/no/[fingerprint])? 8118 8119 feedback and ok markus@ 8120 8121 OpenBSD-Commit-ID: f6f58a77b49f1368b5883b3a1f776447cfcc7ef4 8122 8123commit 819b44e8b9af6ce18d3ec7505b9f461bf7991a1f 8124Author: dtucker@openbsd.org <dtucker@openbsd.org> 8125Date: Thu Nov 12 22:38:57 2020 +0000 8126 8127 upstream: Prevent integer overflow when ridiculously large 8128 8129 ConnectTimeout is specified, capping the effective value (for most platforms) 8130 at 24 days. bz#3229, ok djm@ 8131 8132 OpenBSD-Commit-ID: 62d4c4b7b87d111045f8e9f28b5b532d17ac5bc0 8133 8134commit add926dd1bbe3c4db06e27cab8ab0f9a3d00a0c2 8135Author: djm@openbsd.org <djm@openbsd.org> 8136Date: Wed Nov 11 05:22:32 2020 +0000 8137 8138 upstream: fix logic error that broke URI parsing in ProxyJump 8139 8140 directives; ok dtucker@ 8141 8142 OpenBSD-Commit-ID: 96d48839b1704882a0e9a77898f5e14b2d222705 8143 8144commit 4340dd43928dfe746cb7e75fe920b63c0d909a9a 8145Author: claudio@openbsd.org <claudio@openbsd.org> 8146Date: Tue Nov 10 07:46:20 2020 +0000 8147 8148 upstream: Free the previously allocated msg buffer after writing it 8149 8150 out. OK djm@ 8151 8152 OpenBSD-Commit-ID: 18c055870fc75e4cb9f926c86c7543e2e21d7fa4 8153 8154commit fcf429a4c69d30d8725612a55b37181594da8ddf 8155Author: Darren Tucker <dtucker@dtucker.net> 8156Date: Wed Nov 11 12:30:46 2020 +1100 8157 8158 Prevent excessively long username going to PAM. 8159 8160 This is a mitigation for a buffer overflow in Solaris' PAM username 8161 handling (CVE-2020-14871), and is only enabled for Sun-derived PAM 8162 implementations. This is not a problem in sshd itself, it only 8163 prevents sshd from being used as a vector to attack Solaris' PAM. 8164 It does not prevent the bug in PAM from being exploited via some other 8165 PAM application. 8166 8167 Based on github PR#212 from Mike Scott but implemented slightly 8168 differently. ok tim@ djm@ 8169 8170commit 10dce8ff68ef615362cfcab0c0cc33ce524e7682 8171Author: djm@openbsd.org <djm@openbsd.org> 8172Date: Sun Nov 8 23:19:03 2020 +0000 8173 8174 upstream: unbreak; missing NULL check 8175 8176 OpenBSD-Commit-ID: 6613dfab488123f454d348ef496824476b8c11c0 8177 8178commit d5a0cd4fc430c8eda213a4010a612d4778867cd9 8179Author: djm@openbsd.org <djm@openbsd.org> 8180Date: Sun Nov 8 22:37:24 2020 +0000 8181 8182 upstream: when requesting a security key touch on stderr, inform the 8183 8184 user once the touch has been recorded; requested by claudio@ ok markus@ 8185 8186 OpenBSD-Commit-ID: 3b76ee444490e546b9ea7f879e4092ee0d256233 8187 8188commit 292bcb2479deb27204e3ff796539c003975a5f7a 8189Author: Darren Tucker <dtucker@dtucker.net> 8190Date: Mon Nov 9 00:33:35 2020 +1100 8191 8192 Remove preprocessor directive from log macro calls. 8193 8194 Preprocessor directives inside macro calls, such as the new log macros, 8195 are undefined behaviour and do not work with, eg old GCCs. Put the 8196 entire log call inside the ifdef for OPENSSL_HAS_NISTP521. 8197 8198commit 71693251b7cbb7dd89aaac18815147124732d0d3 8199Author: dtucker@openbsd.org <dtucker@openbsd.org> 8200Date: Sun Nov 8 12:10:20 2020 +0000 8201 8202 upstream: Add a comment documenting the source of the moduli group 8203 8204 sizes. 8205 8206 OpenBSD-Commit-ID: aec0725ce607630caaa62682624c6763b350391c 8207 8208commit 4d94b031ff88b015f0db57e140f481bff7ae1a91 8209Author: dtucker@openbsd.org <dtucker@openbsd.org> 8210Date: Sun Nov 8 11:46:12 2020 +0000 8211 8212 upstream: Replace WITH_OPENSSL ifdefs in log calls with a macro. 8213 8214 The log calls are themselves now macros, and preprocessor directives inside 8215 macro arguments are undefined behaviour which some compilers (eg old GCCs) 8216 choke on. It also makes the code tidier. ok deraadt@ 8217 8218 OpenBSD-Commit-ID: cc12a9029833d222043aecd252d654965c351a69 8219 8220commit 6d2564b94e51184eb0b73b97d13a36ad50b4f810 8221Author: Darren Tucker <dtucker@dtucker.net> 8222Date: Fri Nov 6 17:11:16 2020 +1100 8223 8224 Fix function body for variadic macro test. 8225 8226 AC_LANG_PROGRAM puts its second argument inside main() so we don't need 8227 to do it ourselves. 8228 8229commit 586f9bd2f5980e12f8cf0d3c2a761fa63175da52 8230Author: Darren Tucker <dtucker@dtucker.net> 8231Date: Fri Nov 6 16:53:24 2020 +1100 8232 8233 Remove AC_PROC_CC_C99 obsoleted in autoconf 2.70. 8234 8235 Since we only use it to make sure we can handle variadic macros, 8236 explicitly check only for that. with & ok djm@ 8237 8238commit a019e353df04de1b2ca78d91b39c393256044ad7 8239Author: Darren Tucker <dtucker@dtucker.net> 8240Date: Fri Nov 6 13:56:41 2020 +1100 8241 8242 Replace AC_TRY_COMPILE obsoleted in autoconf 2.70. 8243 8244 Replace with the equivalent AC_COMPILE_IFELSE. 8245 8246commit 771b7795c0ef6a2fb43b4c6c66b615c2085cb9cd 8247Author: Darren Tucker <dtucker@dtucker.net> 8248Date: Fri Nov 6 13:55:33 2020 +1100 8249 8250 Move AC_PROG_CC_C99 to immediately afer AC_PROG_CC. 8251 8252 This puts the related C version selection output in the same place. 8253 8254commit e5591161f21ab493c6284a85ac3c0710ad94998f 8255Author: Darren Tucker <dtucker@dtucker.net> 8256Date: Fri Nov 6 13:54:17 2020 +1100 8257 8258 AC_CHECK_HEADER() is obsoleted in autoconf 2.70. 8259 8260 Replace with the non-obsoleted AC_CHECK_HEADERS(). 8261 8262commit 05bcd0cadf160fd4826a2284afa7cba6ec432633 8263Author: djm@openbsd.org <djm@openbsd.org> 8264Date: Tue Nov 3 22:53:12 2020 +0000 8265 8266 upstream: fold consecutive '*' wildcards to mitigate combinatorial 8267 8268 explosion of recursive searches; ok dtucker 8269 8270 OpenBSD-Commit-ID: d18bcb39c40fb8a1ab61153db987e7d11dd3792b 8271 8272commit 7d680448db5858dc76307663f78d0b8d3c2b4a3d 8273Author: djm@openbsd.org <djm@openbsd.org> 8274Date: Fri Oct 30 01:50:07 2020 +0000 8275 8276 upstream: print reason in fatal error message when 8277 8278 kex_assemble_namelist() fails 8279 8280 OpenBSD-Commit-ID: a9975ee8db6c98d6f32233d88051b2077ca63dab 8281 8282commit 95d1109fec7e89ad21f2a97e92bde1305d32a353 8283Author: djm@openbsd.org <djm@openbsd.org> 8284Date: Thu Oct 29 03:13:06 2020 +0000 8285 8286 upstream: fix sshd_config SetEnv directive inside Match blocks; part of 8287 8288 github PR#201 from github user manuelm 8289 8290 OpenBSD-Commit-ID: 9772e3748abff3ad65ae8fc43d026ed569b1d2bc 8291 8292commit b12b835dc022ba161afe68348e05a83dfbcb1515 8293Author: djm@openbsd.org <djm@openbsd.org> 8294Date: Thu Oct 29 03:01:18 2020 +0000 8295 8296 upstream: fix type of nid in type_bits_valid(); github PR#202 from 8297 8298 github user thingsconnected 8299 8300 OpenBSD-Commit-ID: 769d2b040dec7ab32d323daf54b854dd5dcb5485 8301 8302commit 1a14c13147618144d1798c36a588397ba9008fcc 8303Author: djm@openbsd.org <djm@openbsd.org> 8304Date: Thu Oct 29 02:52:43 2020 +0000 8305 8306 upstream: whitespace; no code change 8307 8308 OpenBSD-Commit-ID: efefc1c47e880887bdee8cd2127ca93177eaad79 8309 8310commit 815209abfdd2991fb92ad7d2e33374916cdcbcf4 8311Author: djm@openbsd.org <djm@openbsd.org> 8312Date: Thu Oct 29 02:47:23 2020 +0000 8313 8314 upstream: UpdateHostkeys: fixed/better detection of host keys that 8315 8316 exist under other names and addresses; spotted by and debugged with lots of 8317 help from jca@ 8318 8319 OpenBSD-Commit-ID: 5113d7f550bbd48243db1705afbf16b63792d4b7 8320 8321commit a575cf44e59a65506c67bddb62a712208a7a279c 8322Author: Duncan Eastoe <duncan.eastoe@att.com> 8323Date: Wed Oct 21 10:11:10 2020 +0100 8324 8325 session.c: use "denylist" terminology 8326 8327 Follow upstream (6d755706a0059eb9e2d63517f288b75cbc3b4701) language 8328 improvements in this portable-specific code. 8329 8330commit 33267feaffd5d98aa56d2f0b3a99ec352effe938 8331Author: Damien Miller <djm@mindrot.org> 8332Date: Tue Oct 27 16:46:31 2020 +1100 8333 8334 Remove checks for strict POSIX mkdtemp() 8335 8336 We needed a mkdtemp() that accepted template paths that did not 8337 end in XXXXXX a long time ago for KRB4, but that code is long 8338 deprecated. We no longer need to replace mkdtemp() for strictly 8339 following POSIX. ok dtucker@ 8340 8341commit 492d70e18bad5a8c97d05f5eddac817171e88d2c 8342Author: dtucker@openbsd.org <dtucker@openbsd.org> 8343Date: Mon Oct 26 00:39:04 2020 +0000 8344 8345 upstream: Minor man page fixes (capitalization, commas) identified by 8346 8347 the manpage-l10n project via bz#3223. feedback deraadt@, ok jmc@ 8348 8349 OpenBSD-Commit-ID: ab83af0daf18369244a72daaec6c4a58a9eb7e2c 8350 8351commit eab2888cfc6cc4e2ef24bd017da9835a0f365f3f 8352Author: dtucker@openbsd.org <dtucker@openbsd.org> 8353Date: Mon Oct 19 22:49:23 2020 +0000 8354 8355 upstream: Adapt XMSS to new logging infrastructure. With markus@, ok 8356 8357 djm@. 8358 8359 OpenBSD-Commit-ID: 9c35ec3aa0f710e4e3325187ceff4fa3791686de 8360 8361commit f7bd11e4941620991f3e727cd0131b01f0311a58 8362Author: djm@openbsd.org <djm@openbsd.org> 8363Date: Mon Oct 19 08:07:08 2020 +0000 8364 8365 upstream: fix SEGV on fatal() errors spotted by dtucker@ 8366 8367 OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2 8368 8369commit 7715a3b171049afa1feffb1d5a1245dfac36ce99 8370Author: Darren Tucker <dtucker@dtucker.net> 8371Date: Mon Oct 19 10:54:41 2020 +1100 8372 8373 Use fatal_fr not fatal_r when passing r. 8374 8375 Caught by the PAM -Werror tinderbox build. 8376 8377commit 816036f142ecd284c12bb3685ae316a68d2ef190 8378Author: djm@openbsd.org <djm@openbsd.org> 8379Date: Sun Oct 18 11:32:01 2020 +0000 8380 8381 upstream: use the new variant log macros instead of prepending 8382 8383 __func__ and appending ssh_err(r) manually; ok markus@ 8384 8385 OpenBSD-Commit-ID: 1f14b80bcfa85414b2a1a6ff714fb5362687ace8 8386 8387commit 9e2c4f64224f68fb84c49b5182e449f94b0dc985 8388Author: djm@openbsd.org <djm@openbsd.org> 8389Date: Sun Oct 18 11:21:59 2020 +0000 8390 8391 upstream: variants of the log methods that append a ssherr.h string 8392 8393 from a supplied error code; ok markus@ 8394 8395 OpenBSD-Commit-ID: aed98c4435d48d036ae6740300f6a8357b7cc0bf 8396 8397commit 28cb0a4b03940d1ee576eb767a81a4113bdc917e 8398Author: djm@openbsd.org <djm@openbsd.org> 8399Date: Sun Oct 18 11:14:27 2020 +0000 8400 8401 upstream: remove a level of macro indirection; ok markus@ 8402 8403 OpenBSD-Commit-ID: 0c529d06e902c5d1a6b231e1bec6157f76dc67c9 8404 8405commit 9cac1db52e6c4961c447910fe02cd68a3b2f9460 8406Author: djm@openbsd.org <djm@openbsd.org> 8407Date: Sun Oct 18 11:13:45 2020 +0000 8408 8409 upstream: add some variant log.h calls that prepend the calling 8410 8411 function name; ok markus@ 8412 8413 OpenBSD-Commit-ID: 4be1b2e2455b271ddb7457bc195c5367644f4e48 8414 8415commit d55dfed34ef6ef1f028d552a90d5f3dba8dd6f7b 8416Author: Damien Miller <djm@mindrot.org> 8417Date: Sat Oct 17 22:55:24 2020 +1100 8418 8419 missing header 8420 8421commit 999d7cb79a3a73d92a6dfbf174c33da0d984c7a2 8422Author: Damien Miller <djm@mindrot.org> 8423Date: Sat Oct 17 22:47:52 2020 +1100 8424 8425 sync regress/misc/sk-dummy/fatal.c 8426 8427commit 3554b4afa38b3483a3302f1be18eaa6f843bb260 8428Author: djm@openbsd.org <djm@openbsd.org> 8429Date: Sat Oct 17 01:28:20 2020 +0000 8430 8431 upstream: make the log functions that exit (sshlogdie(), 8432 8433 sshfatal(), etc) have identical signatures. Makes things a bit more 8434 consistent... 8435 8436 OpenBSD-Commit-ID: bd0ae124733389d7c0042e135c71ee9091362eb9 8437 8438commit 616029a85ad7529b24bb8c4631d9607c0d6e7afe 8439Author: jmc@openbsd.org <jmc@openbsd.org> 8440Date: Fri Oct 16 14:34:33 2020 +0000 8441 8442 upstream: add space between macro arg and punctuation; 8443 8444 OpenBSD-Commit-ID: bb81e2ed5a77832fe62ab30a915ae67cda57633e 8445 8446commit f812a36cee5727147bc897d34ab9af068dd4561e 8447Author: Damien Miller <djm@mindrot.org> 8448Date: Sat Oct 17 12:03:34 2020 +1100 8449 8450 check for and require a C99 capable compiler 8451 8452 recent logging changes use __VA_ARGS__. 8453 8454commit f9ea6515202b59a1e2d5b885cafc1b12eff33016 8455Author: Damien Miller <djm@mindrot.org> 8456Date: Sat Oct 17 11:51:20 2020 +1100 8457 8458 logging is now macros, remove function pointers 8459 8460commit 0f938f998626e8359324f803157cd7c9f8f403e2 8461Author: Damien Miller <djm@mindrot.org> 8462Date: Sat Oct 17 11:42:26 2020 +1100 8463 8464 adapt sk-dummy's fatal implementation to changes 8465 8466commit afbd9ec9e2dbad04834ce7ce53e58740434f32a5 8467Author: Damien Miller <djm@mindrot.org> 8468Date: Sat Oct 17 11:33:13 2020 +1100 8469 8470 fix netcat build problem 8471 8472commit 793b583d097381730adaf6f68bed3c343139a013 8473Author: djm@openbsd.org <djm@openbsd.org> 8474Date: Fri Oct 16 13:26:13 2020 +0000 8475 8476 upstream: LogVerbose keyword for ssh and sshd 8477 8478 Allows forcing maximum debug logging by file/function/line pattern- 8479 lists. 8480 8481 ok markus@ 8482 8483 OpenBSD-Commit-ID: c294c25732d1b4fe7e345cb3e044df00531a6356 8484 8485commit 752250caabda3dd24635503c4cd689b32a650794 8486Author: djm@openbsd.org <djm@openbsd.org> 8487Date: Fri Oct 16 13:24:45 2020 +0000 8488 8489 upstream: revised log infrastructure for OpenSSH 8490 8491 log functions receive function, filename and line number of caller. 8492 We can use this to selectively enable logging via pattern-lists. 8493 8494 ok markus@ 8495 8496 OpenBSD-Commit-ID: 51a472610cbe37834ce6ce4a3f0e0b1ccc95a349 8497 8498commit acadbb3402b70f72f14d9a6930ad41be97c2f9dc 8499Author: djm@openbsd.org <djm@openbsd.org> 8500Date: Fri Oct 16 02:37:12 2020 +0000 8501 8502 upstream: use do_log2 instead of function pointers to different log 8503 8504 functions 8505 8506 OpenBSD-Commit-ID: 88077b826d348c58352a6b394755520f4e484480 8507 8508commit 95b0bcfd1531d59e056ae8af27bb741391f26ab0 8509Author: djm@openbsd.org <djm@openbsd.org> 8510Date: Wed Oct 14 00:55:17 2020 +0000 8511 8512 upstream: make UpdateHostkeys still more conservative: refuse to 8513 8514 proceed if one of the keys offered by the server is already in known_hosts 8515 under another name. This avoid collisions between address entries for 8516 different host aliases when CheckHostIP=yes 8517 8518 Also, do not attempt to fix known_hosts with incomplete host/ip matches 8519 when there are no new or deprecated hostkeys. 8520 8521 OpenBSD-Commit-ID: 95c19842f7c41f9bd9c92aa6441a278c0fd0c4a3 8522 8523commit a336ce8c2c55547cc00e0070a18c55f30bb53fb6 8524Author: kn@openbsd.org <kn@openbsd.org> 8525Date: Mon Oct 12 08:36:36 2020 +0000 8526 8527 upstream: Zap unused family parameter from ssh_connect_direct() 8528 8529 sshconnect.c r1.241 from 2013 made it unused; found while reading code. 8530 8531 OK djm 8532 8533 OpenBSD-Commit-ID: 219ba6d7f9925d0b7992918612680399d86712b5 8534 8535commit e545d94b713effab8e6c7dfabbfb76c1d84d7498 8536Author: Philip Hands <phil@hands.com> 8537Date: Sun Oct 4 00:15:46 2020 +0200 8538 8539 shift contents of long $() into filter_ids() 8540 8541 This was prompted by the fact that posh does not deal with $() 8542 that contains comments where the comment includes an odd number 8543 of single-quotes. It seems to get befuddled into trying to find 8544 the matching quote. 8545 Regardless, making a function for filtering the unneeded ids 8546 seems much neater than avoiding apostrophes, 8547 so that's what I've done. 8548 8549 SSH-Copy-ID-Upstream: 3dab3366a584427045c8a690a93282f02c09cf24 8550 8551commit fd360174596047b52aa1cddda74d85012a03ca4b 8552Author: Philip Hands <phil@hands.com> 8553Date: Sat Oct 3 23:15:16 2020 +0200 8554 8555 combine if/elif to avoid duplication of the action 8556 8557 SSH-Copy-ID-Upstream: 42aeb1cc53d3f7f6e78edc210fb121fda0834914 8558 8559commit f7c3a39b016dd77709ecbf18da8282f967b86cd7 8560Author: Philip Hands <phil@hands.com> 8561Date: Sat Oct 3 21:45:16 2020 +0200 8562 8563 shellcheck tidyage 8564 8565 SSH-Copy-ID-Upstream: 5b08f840e78ac544288b3983010a1b0585e966fd 8566 8567commit 108676c3f26be6c873db0dd8754063699908727b 8568Author: Philip Hands <phil@hands.com> 8569Date: Sat Oct 3 21:10:03 2020 +0200 8570 8571 tidy up test of $SCRATCH_DIR creation 8572 8573 SSH-Copy-ID-Upstream: 2d8b22d96c105d87743ffe8874887b06f8989b93 8574 8575commit a9c9e91a82bc1a2cf801b4e3ef27a941dbd27717 8576Author: Philip Hands <phil@hands.com> 8577Date: Wed Sep 16 16:13:30 2020 +0200 8578 8579 add -s flag: to install keys via SFTP 8580 8581 This is prompted by: 8582 8583 https://bugzilla.mindrot.org/show_bug.cgi?id=3201 8584 8585 Thanks go to Matthias Blümel for the idea, and the helpful patch, from 8586 which this patch grew. 8587 8588 SSH-Copy-ID-Upstream: f7c76dc64427cd20287a6868f672423b62057614 8589 8590commit f92424970c02b78852ff149378c7f2616ada4ccf 8591Author: djm@openbsd.org <djm@openbsd.org> 8592Date: Sun Oct 11 22:14:38 2020 +0000 8593 8594 upstream: UpdateHostkeys: check for keys under other names 8595 8596 Stop UpdateHostkeys from automatically removing deprecated keys from 8597 known_hosts files if the same keys exist under a different name or 8598 address to the host that is being connected to. 8599 8600 This avoids UpdateHostkeys from making known_hosts inconsistent in 8601 some cases. For example, multiple host aliases sharing address-based 8602 known_hosts on different lines, or hosts that resolves to multiple 8603 addresses. 8604 8605 ok markus@ 8606 8607 OpenBSD-Commit-ID: 6444a705ba504c3c8ccddccd8d1b94aa33bd11c1 8608 8609commit d98f14b5328922ae3085e07007d820c4f655b57a 8610Author: djm@openbsd.org <djm@openbsd.org> 8611Date: Sun Oct 11 22:13:37 2020 +0000 8612 8613 upstream: UpdateHostkeys: better CheckHostIP handling 8614 8615 When preparing to update the known_hosts file, fully check both 8616 entries for both the host and the address (if CheckHostIP enabled) 8617 and ensure that, at the end of the operation, entries for both are 8618 recorded. 8619 8620 Make sure this works with HashKnownHosts too, which requires maintaining 8621 a list of entry-types seen across the whole file for each key. 8622 8623 ok markus@ 8624 8625 OpenBSD-Commit-ID: 374dc263103f6b343d9671f87dbf81ffd0d6abdd 8626 8627commit af5941ae9b013aac12585e84c4cf494f3728982f 8628Author: djm@openbsd.org <djm@openbsd.org> 8629Date: Sun Oct 11 22:12:44 2020 +0000 8630 8631 upstream: UpdateHostkeys: better detect manual host entries 8632 8633 Disable UpdateHostkeys if the known_hosts line has more than two 8634 entries in the pattern-list. ssh(1) only writes "host" or "host,ip" 8635 lines so anything else was added by a different tool or by a human. 8636 8637 ok markus@ 8638 8639 OpenBSD-Commit-ID: e434828191fb5f3877d4887c218682825aa59820 8640 8641commit 6247812c76f70b2245f3c23f5074665b3d436cae 8642Author: djm@openbsd.org <djm@openbsd.org> 8643Date: Thu Oct 8 01:15:16 2020 +0000 8644 8645 upstream: don't misdetect comma-separated hostkey names as wildcards; 8646 8647 spotted by naddy@ 8648 8649 OpenBSD-Commit-ID: 4b874edfec7fc324a21b130bdb42f912177739ce 8650 8651commit 67146c7d022a170be3cdad2f5f40259a663fb266 8652Author: wangxp006 <wangxiaopeng7@huawei.com> 8653Date: Thu Oct 8 17:49:59 2020 +0800 8654 8655 fix TEST_MALLOC_OPTIONS var 8656 8657commit 3205eaa3f8883a34fa4559ddef6c90d1067c5cce 8658Author: djm@openbsd.org <djm@openbsd.org> 8659Date: Thu Oct 8 00:31:05 2020 +0000 8660 8661 upstream: clarify conditions for UpdateHostkeys 8662 8663 OpenBSD-Commit-ID: 9cba714cf6aeed769f998ccbe8c483077a618e27 8664 8665commit e8dfca9bfeff05de87160407fb3e6a5717fa3dcb 8666Author: djm@openbsd.org <djm@openbsd.org> 8667Date: Wed Oct 7 06:38:16 2020 +0000 8668 8669 upstream: remove GlobalKnownHostsFile for this test after 8670 8671 UpdateHostkeys change 8672 8673 OpenBSD-Regress-ID: a940ad79d59343319613ba8fc46b6ef24aa3f8e1 8674 8675commit 4aa2717d7517cff4bc423a6cfba3a2defb055aea 8676Author: djm@openbsd.org <djm@openbsd.org> 8677Date: Wed Oct 7 02:26:28 2020 +0000 8678 8679 upstream: Disable UpdateHostkeys when hostkey checking fails 8680 8681 If host key checking fails (i.e. a wrong host key is recorded for the 8682 server) and the user elects to continue (via StrictHostKeyChecking=no), 8683 then disable UpdateHostkeys for the session. 8684 8685 reminded by Mark D. Baushke; ok markus@ 8686 8687 OpenBSD-Commit-ID: 98b524f121f4252309dd21becd8c4cacb0c6042a 8688 8689commit 04c06d04475f1f673e9d9743710d194453fe3888 8690Author: djm@openbsd.org <djm@openbsd.org> 8691Date: Wed Oct 7 02:25:43 2020 +0000 8692 8693 upstream: Fix UpdateHostkeys/HashKnownHosts/CheckHostIP bug 8694 8695 When all of UpdateHostkeys, HashKnownHosts and ChechHostIP 8696 were enabled and new host keys were learned, known_hosts IP 8697 entries were not being recorded for new host keys. 8698 8699 reported by matthieu@ ok markus@ 8700 8701 OpenBSD-Commit-ID: a654a8290bd1c930aac509e8158cf85e42e49cb7 8702 8703commit b70e33711291f3081702133175a41cccafc0212a 8704Author: djm@openbsd.org <djm@openbsd.org> 8705Date: Wed Oct 7 02:24:51 2020 +0000 8706 8707 upstream: don't UpdateHostkeys when the hostkey is verified by the 8708 8709 GlobalKnownHostsFile file, support only UserKnownHostsFile matches 8710 8711 suggested by Mark D. Baushke; feedback and ok markus@ 8712 8713 OpenBSD-Commit-ID: eabb771a6add676c398d38a143a1aff5f04abbb9 8714 8715commit aa623142e426ca1ab9db77b06dcc9b1b70bd102b 8716Author: djm@openbsd.org <djm@openbsd.org> 8717Date: Wed Oct 7 02:22:23 2020 +0000 8718 8719 upstream: revert kex->flags cert hostkey downgrade back to a plain 8720 8721 key (commitid VtF8vozGOF8DMKVg). We now do this a simpler way that needs less 8722 plumbing. 8723 8724 ok markus@ 8725 8726 OpenBSD-Commit-ID: fb92d25b216bff8c136da818ac2221efaadf18ed 8727 8728commit f4f14e023cafee1cd9ebe4bb0db4029e6e1fafac 8729Author: djm@openbsd.org <djm@openbsd.org> 8730Date: Wed Oct 7 02:20:35 2020 +0000 8731 8732 upstream: simply disable UpdateHostkeys when a certificate 8733 8734 successfully authenticated the host; simpler than the complicated plumbing 8735 via kex->flags we have now. 8736 8737 ok markus@ 8738 8739 OpenBSD-Commit-ID: 80e39644eed75717d563a7f177e8117a0e14f42c 8740 8741commit e79957e877db42c4c68fabcf6ecff2268e53acb5 8742Author: djm@openbsd.org <djm@openbsd.org> 8743Date: Wed Oct 7 02:18:45 2020 +0000 8744 8745 upstream: disable UpdateHostkeys by default if VerifyHostKeyDNS is 8746 8747 enabled; suggested by Mark D. Baushke 8748 8749 OpenBSD-Commit-ID: 85a1b88592c81bc85df7ee7787dbbe721a0542bf 8750 8751commit 3d4c2016bae1a6f14b48c1150a4c79ca4c9968bd 8752Author: dtucker@openbsd.org <dtucker@openbsd.org> 8753Date: Tue Oct 6 07:12:04 2020 +0000 8754 8755 upstream: Agent protocol draft is now at rev 4. ok djm@ 8756 8757 OpenBSD-Commit-ID: 8c01ea3aae48aab45e01b7421b0fca2dad5e7837 8758 8759commit af889a40ffc113af9105c03d7b32131eb4372d50 8760Author: djm@openbsd.org <djm@openbsd.org> 8761Date: Sun Oct 4 09:45:01 2020 +0000 8762 8763 upstream: when ordering host key algorithms in the client, consider 8764 8765 the ECDSA key subtype; ok markus@ 8766 8767 OpenBSD-Commit-ID: 3097686f853c61ff61772ea35f8b699931392ece 8768 8769commit 2d39fc9f7e039351daa3d6aead1538ac29258add 8770Author: dtucker@openbsd.org <dtucker@openbsd.org> 8771Date: Sun Oct 4 03:04:02 2020 +0000 8772 8773 upstream: Allow full range of UIDs and GIDs for sftp chown and 8774 8775 chgrp on 32bit platforms instead of being limited by LONG_MAX. bz#3206, 8776 found by booking00 at sina.cn, ok markus@ 8777 8778 OpenBSD-Commit-ID: 373b7bbf1f15ae482d39567ce30d18b51c9229b5 8779 8780commit 396d32f3a1a16e54df2a76b2a9b237868580dcbe 8781Author: djm@openbsd.org <djm@openbsd.org> 8782Date: Sat Oct 3 09:22:26 2020 +0000 8783 8784 upstream: There are lots of place where we want to redirect stdin, 8785 8786 stdout and/or stderr to /dev/null. Factor all these out to a single 8787 stdfd_devnull() function that allows selection of which of these to redirect. 8788 ok markus@ 8789 8790 OpenBSD-Commit-ID: 3033ba5a4c47cacfd5def020d42cabc52fad3099 8791 8792commit 1286981d08b8429a64613215ce8bff3f6b32488a 8793Author: djm@openbsd.org <djm@openbsd.org> 8794Date: Sat Oct 3 08:30:47 2020 +0000 8795 8796 upstream: enable UpdateHostkeys by default when the configuration 8797 8798 has not overridden UserKnownHostsFile; ok markus@ "The timing is perfect" 8799 deraadt@ 8800 8801 OpenBSD-Commit-ID: 62df71c9c5242da5763cb473c2a2deefbd0cef60 8802 8803commit 332f21537293d66508f7342dc643bc7fe45f0f69 8804Author: djm@openbsd.org <djm@openbsd.org> 8805Date: Sat Oct 3 08:12:59 2020 +0000 8806 8807 upstream: disable UpdateHostkeys when a wildcard hostname pattern 8808 8809 is encountered or when a certificate host key is in use. feedback/ok markus@ 8810 8811 OpenBSD-Commit-ID: b6e5575af7e6732322be82ec299e09051a5413bd 8812 8813commit 13cee44ef907824083d89cb9395adbbd552e46c1 8814Author: djm@openbsd.org <djm@openbsd.org> 8815Date: Sat Oct 3 08:11:28 2020 +0000 8816 8817 upstream: record when the host key checking code downgrades a 8818 8819 certificate host key to a plain key. This occurs when the user connects to a 8820 host with a certificate host key but no corresponding CA key configured in 8821 known_hosts; feedback and ok markus@ 8822 8823 OpenBSD-Commit-ID: 2ada81853ff9ee7824c62f440bcf4ad62030c901 8824 8825commit 12ae8f95e2e0c273e9e7ef930b01a028ef796a3f 8826Author: djm@openbsd.org <djm@openbsd.org> 8827Date: Sat Oct 3 04:15:06 2020 +0000 8828 8829 upstream: prefer ed25519 signature algorithm variants to ECDSA; ok 8830 8831 markus@ 8832 8833 OpenBSD-Commit-ID: 82187926fca96d35a5b5afbc091afa84e0966e5b 8834 8835commit e5ed753add7aa8eed6b167e44db6240a76404db2 8836Author: djm@openbsd.org <djm@openbsd.org> 8837Date: Sat Oct 3 03:40:38 2020 +0000 8838 8839 upstream: want time.h here too 8840 8841 OpenBSD-Commit-ID: fafee8f1108c64ad8b282f9a1ed5ea830d8c58a7 8842 8843commit 66bd9fdf8b7762eb6a85cabbb1ae4ed955679f60 8844Author: deraadt@openbsd.org <deraadt@openbsd.org> 8845Date: Sat Oct 3 02:18:33 2020 +0000 8846 8847 upstream: split introductory paragraph, and insert ominous words about 8848 8849 the glob issue, which cannot be fully fixed and really requires completely 8850 replacing scp with a completely different subsystem. team effort to find the 8851 right words.. 8852 8853 OpenBSD-Commit-ID: 58e1f72d292687f63eb357183036ee242513691c 8854 8855commit 86cc8ce002ea10e88a4c5d622a8fdfab8a7d261f 8856Author: Damien Miller <djm@mindrot.org> 8857Date: Sat Oct 3 13:38:55 2020 +1000 8858 8859 use relative rather than system include here 8860 8861commit 922cfac5ed5ead9f796f7d39f012dd653dc5c173 8862Author: Damien Miller <djm@mindrot.org> 8863Date: Sat Oct 3 13:38:41 2020 +1000 8864 8865 add some openbsd-compat licenses we missed 8866 8867commit ce941c75ea9cd6c358508a5b206809846c8d9240 8868Author: Philip Hands <phil@hands.com> 8869Date: Sat Oct 3 00:20:07 2020 +0200 8870 8871 un-nest $() to make ksh cheerful 8872 8873commit 18ea5f4b88e303677d2003b95e5cb864b439e442 8874Author: Philip Hands <phil@hands.com> 8875Date: Fri Oct 2 21:30:10 2020 +0200 8876 8877 ksh doesn't grok 'local' 8878 8879 and AFAICT it's not actually doing anything useful in the code, so let's 8880 see how things go without it. 8881 8882commit d9e727dcc04a52caaac87543ea1d230e9e6b5604 8883Author: Oleg <Fallmay@users.noreply.github.com> 8884Date: Thu Oct 1 12:09:08 2020 +0300 8885 8886 Fix `EOF: command not found` error in ssh-copy-id 8887 8888commit a1a856d50c89be3206f320baa4bfb32fff4e826f 8889Author: dtucker@openbsd.org <dtucker@openbsd.org> 8890Date: Wed Sep 30 09:11:39 2020 +0000 8891 8892 upstream: Regen moduli. 8893 8894 OpenBSD-Commit-ID: 04967f8c43e9854ac34b917bcd6f5ac96c53a693 8895 8896commit fa1fe3ead7069d90d3c67d62137ad66acfcc9f48 8897Author: HARUYAMA Seigo <haruyama@unixuser.org> 8898Date: Sun Sep 27 20:06:20 2020 +0900 8899 8900 Restore first section title of INSTALL 8901 8902commit 279261e1ea8150c7c64ab5fe7cb4a4ea17acbb29 8903Author: Damien Miller <djm@mindrot.org> 8904Date: Sun Sep 27 17:25:01 2020 +1000 8905 8906 update version numbers 8907 8908commit 58ca6ab6ff035ed12b5078e3e9c7199fe72c8587 8909Author: djm@openbsd.org <djm@openbsd.org> 8910Date: Sun Sep 27 07:22:05 2020 +0000 8911 8912 upstream: openssh 8.4 8913 8914 OpenBSD-Commit-ID: a29e5b372d2c00e297da8a35a3b87c9beb3b4a58 8915 8916commit 9bb8a303ce05ff13fb421de991b495930be103c3 8917Author: Damien Miller <djm@mindrot.org> 8918Date: Tue Sep 22 10:07:43 2020 +1000 8919 8920 sync with upstream ssh-copy-id rev f0da1a1b7 8921 8922commit 0a4a5571ada76b1b012bec9cf6ad1203fc19ec8d 8923Author: djm@openbsd.org <djm@openbsd.org> 8924Date: Mon Sep 21 07:29:09 2020 +0000 8925 8926 upstream: close stdin when forking after authentication too; ok markus 8927 8928 OpenBSD-Commit-ID: 43db17e4abc3e6b4a7b033aa8cdab326a7cb6c24 8929 8930commit d14fe25e6c3b89f8af17e2894046164ac3b45688 8931Author: djm@openbsd.org <djm@openbsd.org> 8932Date: Sun Sep 20 23:31:46 2020 +0000 8933 8934 upstream: close stdout/stderr after "ssh -f ..." forking 8935 8936 bz#3137, ok markus 8937 8938 OpenBSD-Commit-ID: e2d83cc4dea1665651a7aa924ad1ed6bcaaab3e2 8939 8940commit 53a33a0d745179c02108589e1722457ca8ae4372 8941Author: Damien Miller <djm@mindrot.org> 8942Date: Sun Sep 20 15:57:09 2020 +1000 8943 8944 .depend 8945 8946commit 107eb3eeafcd390e1fa7cc7672a05e994d14013e 8947Author: djm@openbsd.org <djm@openbsd.org> 8948Date: Sun Sep 20 05:47:25 2020 +0000 8949 8950 upstream: cap channel input buffer size at 16MB; avoids high memory use 8951 8952 when peer advertises a large window but is slow to consume the data we send 8953 (e.g. because of a slow network) 8954 8955 reported by Pierre-Yves David 8956 8957 fix with & ok markus@ 8958 8959 OpenBSD-Commit-ID: 1452771f5e5e768876d3bfe2544e3866d6ade216 8960 8961commit acfe2ac5fe033e227ad3a56624fbbe4af8b5da04 8962Author: Damien Miller <djm@mindrot.org> 8963Date: Fri Sep 18 22:02:53 2020 +1000 8964 8965 libfido2 1.5.0 is recommended 8966 8967commit 52a03e9fca2d74eef953ddd4709250f365ca3975 8968Author: djm@openbsd.org <djm@openbsd.org> 8969Date: Fri Sep 18 08:16:38 2020 +0000 8970 8971 upstream: handle multiple messages in a single read() 8972 8973 PR#183 by Dennis Kaarsemaker; feedback and ok markus@ 8974 8975 OpenBSD-Commit-ID: 8570bb4d02d00cf70b98590716ea6a7d1cce68d1 8976 8977commit dc098405b2939146e17567a25b08fc6122893cdf 8978Author: pedro martelletto <pedro@ambientworks.net> 8979Date: Fri Sep 18 08:57:29 2020 +0200 8980 8981 configure.ac: add missing includes 8982 8983 when testing, make sure to include the relevant header files that 8984 declare the types of the functions used by the test: 8985 8986 - stdio.h for printf(); 8987 - stdlib.h for exit(); 8988 - string.h for strcmp(); 8989 - unistd.h for unlink(), _exit(), fork(), getppid(), sleep(). 8990 8991commit b3855ff053f5078ec3d3c653cdaedefaa5fc362d 8992Author: djm@openbsd.org <djm@openbsd.org> 8993Date: Fri Sep 18 05:23:03 2020 +0000 8994 8995 upstream: tweak the client hostkey preference ordering algorithm to 8996 8997 prefer the default ordering if the user has a key that matches the 8998 best-preference default algorithm. 8999 9000 feedback and ok markus@ 9001 9002 OpenBSD-Commit-ID: a92dd7d7520ddd95c0a16786a7519e6d0167d35f 9003 9004commit f93b187ab900c7d12875952cc63350fe4de8a0a8 9005Author: Damien Miller <djm@mindrot.org> 9006Date: Fri Sep 18 14:55:48 2020 +1000 9007 9008 control over the colours in gnome-ssh-askpass[23] 9009 9010 Optionally set the textarea colours via $GNOME_SSH_ASKPASS_FG_COLOR and 9011 $GNOME_SSH_ASKPASS_BG_COLOR. These accept the usual three or six digit 9012 hex colours. 9013 9014commit 9d3d36bdb10b66abd1af42e8655502487b6ba1fa 9015Author: Damien Miller <djm@mindrot.org> 9016Date: Fri Sep 18 14:50:38 2020 +1000 9017 9018 focus improvement for gnome-ssh-askpass[23] 9019 9020 When serving a SSH_ASKPASS_PROMPT=none information dialog, ensure 9021 then <enter> doesn't immediately close the dialog. Instead, require an 9022 explicit <tab> to reach the close button, or <esc>. 9023 9024commit d6f507f37e6c75a899db0ef8224e72797c5563b6 9025Author: dtucker@openbsd.org <dtucker@openbsd.org> 9026Date: Wed Sep 16 03:07:31 2020 +0000 9027 9028 upstream: Remove unused buf, last user was removed when switching 9029 9030 to the sshbuf API. Patch from Sebastian Andrzej Siewior. 9031 9032 OpenBSD-Commit-ID: 250fa17f0cec01039cc4abd95917d9746e24c889 9033 9034commit c3c786c3a0973331ee0922b2c51832a3b8d7f20f 9035Author: djm@openbsd.org <djm@openbsd.org> 9036Date: Wed Sep 9 21:57:27 2020 +0000 9037 9038 upstream: For the hostkey confirmation message: 9039 9040 > Are you sure you want to continue connecting (yes/no/[fingerprint])? 9041 9042 compare the fingerprint case sensitively; spotted Patrik Lundin 9043 ok dtucker 9044 9045 OpenBSD-Commit-ID: 73097afee1b3a5929324e345ba4a4a42347409f2 9046 9047commit f2950baf0bafe6aa20dfe2e8d1ca4b23528df617 9048Author: Darren Tucker <dtucker@dtucker.net> 9049Date: Fri Sep 11 14:45:23 2020 +1000 9050 9051 New config-build-time dependency on automake. 9052 9053commit 600c1c27abd496372bd0cf83d21a1c119dfdf9a5 9054Author: Darren Tucker <dtucker@dtucker.net> 9055Date: Sun Sep 6 21:56:36 2020 +1000 9056 9057 Add aclocal.m4 and config.h.in~ to .gitignore. 9058 9059 aclocal.m4 is now generated by autoreconf. 9060 9061commit 4bf7e1d00b1dcd3a6b3239f77465c019e61c6715 9062Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> 9063Date: Sat Sep 5 17:50:03 2020 +0200 9064 9065 Quote the definition of OSSH_CHECK_HEADER_FOR_FIELD 9066 9067 autoreconf complains about underquoted definition of 9068 OSSH_CHECK_HEADER_FOR_FIELD after aclocal.m4 has been and now is beeing 9069 recreated. 9070 9071 Quote OSSH_CHECK_HEADER_FOR_FIELD as suggested. 9072 9073 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> 9074 9075commit a2f3ae386b5f7938ed3c565ad71f30c4f7f010f1 9076Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> 9077Date: Sat Sep 5 17:50:02 2020 +0200 9078 9079 Move the local m4 macros 9080 9081 The `aclocal' step is skipped during `autoreconf' because aclocal.m4 is 9082 present. 9083 Move the current aclocal.m4 which contains local macros into the m4/ 9084 folder. With this change the aclocal.m4 will be re-created during 9085 changes to the m4/ macro. 9086 This is needed so the `aclocal' can fetch m4 macros from the system if 9087 they are references in the configure script. This is a prerequisite to 9088 use PKG_CHECK_MODULES. 9089 9090 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> 9091 9092commit 8372bff3a895b84fd78a81dc39da10928b662f5a 9093Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> 9094Date: Sat Sep 5 17:50:01 2020 +0200 9095 9096 Remove HAVE_MMAP and BROKEN_MMAP 9097 9098 BROKEN_MMAP is no longer defined since commit 9099 1cfd5c06efb12 ("Remove portability support for mmap") 9100 9101 this commit also removed other HAVE_MMAP user. I didn't find anything 9102 that defines HAVE_MMAP. The check does not trigger because compression 9103 on server side is by default COMP_DELAYED (2) so it never triggers. 9104 9105 Remove remaining HAVE_MMAP and BROKEN_MMAP bits. 9106 9107 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> 9108 9109commit bbf20ac8065905f9cb9aeb8f1df57fcab52ee2fb 9110Author: djm@openbsd.org <djm@openbsd.org> 9111Date: Wed Sep 9 03:10:21 2020 +0000 9112 9113 upstream: adapt to SSH_SK_VERSION_MAJOR crank 9114 9115 OpenBSD-Regress-ID: 0f3e76bdc8f9dbd9d22707c7bdd86051d5112ab8 9116 9117commit 9afe2a150893b20bdf9eab764978d817b9a7b783 9118Author: dtucker@openbsd.org <dtucker@openbsd.org> 9119Date: Fri Aug 28 03:17:13 2020 +0000 9120 9121 upstream: Ensure that address/mask mismatches are flagged at 9122 9123 config-check time. ok djm@ 9124 9125 OpenBSD-Regress-ID: 8f5f4c2c0bf00e6ceae7a1755a444666de0ea5c2 9126 9127commit c76773524179cb654ff838dd43ba1ddb155bafaa 9128Author: djm@openbsd.org <djm@openbsd.org> 9129Date: Wed Sep 9 03:08:01 2020 +0000 9130 9131 upstream: when writing an attestation blob for a FIDO key, record all 9132 9133 the data needed to verify the attestation. Previously we were missing the 9134 "authenticator data" that is included in the signature. 9135 9136 spotted by Ian Haken 9137 feedback Pedro Martelletto and Ian Haken; ok markus@ 9138 9139 OpenBSD-Commit-ID: 8439896e63792b2db99c6065dd9a45eabbdb7e0a 9140 9141commit c1c44eeecddf093a7983bd91e70b446de789b363 9142Author: pedro martelletto <pedro@ambientworks.net> 9143Date: Tue Sep 1 17:01:55 2020 +0200 9144 9145 configure.ac: fix libfido2 back-compat 9146 9147 - HAVE_FIDO_CRED_PROD -> HAVE_FIDO_CRED_PROT; 9148 - check for fido_dev_get_touch_begin(), so that 9149 HAVE_FIDO_DEV_GET_TOUCH_BEGIN gets defined. 9150 9151commit 785f0f315bf7ac5909e988bb1ac3e019fb5e1594 9152Author: djm@openbsd.org <djm@openbsd.org> 9153Date: Mon Aug 31 04:33:17 2020 +0000 9154 9155 upstream: refuse to add verify-required (PINful) FIDO keys to 9156 9157 ssh-agent until the agent supports them properly 9158 9159 OpenBSD-Commit-ID: 125bd55a8df32c87c3ec33c6ebe437673a3d037e 9160 9161commit 39e88aeff9c7cb6862b37ad1a87a03ebbb38c233 9162Author: djm@openbsd.org <djm@openbsd.org> 9163Date: Mon Aug 31 00:17:41 2020 +0000 9164 9165 upstream: Add RCS IDs to the few files that are missing them; from 9166 9167 Pedro Martelletto 9168 9169 OpenBSD-Commit-ID: 39aa37a43d0c75ec87f1659f573d3b5867e4a3b3 9170 9171commit 72730249b38a676da94a1366b54a6e96e6928bcb 9172Author: dtucker@openbsd.org <dtucker@openbsd.org> 9173Date: Fri Aug 28 03:15:52 2020 +0000 9174 9175 upstream: Check that the addresses supplied to Match Address and 9176 9177 Match LocalAddress are valid when parsing in config-test mode. This will 9178 catch address/mask mismatches before they cause problems at runtime. Found by 9179 Daniel Stocker, ok djm@ 9180 9181 OpenBSD-Commit-ID: 2d0b10c69fad5d8fda4c703e7c6804935289378b 9182 9183commit 2a3a9822311a565a9df48ed3b6a3c972f462bd7d 9184Author: jmc@openbsd.org <jmc@openbsd.org> 9185Date: Thu Aug 27 12:34:00 2020 +0000 9186 9187 upstream: sentence fix; from pedro martelletto 9188 9189 OpenBSD-Commit-ID: f95b84a1e94e9913173229f3787448eea2f8a575 9190 9191commit ce178be0d954b210c958bc2b9e998cd6a7aa73a9 9192Author: Damien Miller <djm@mindrot.org> 9193Date: Thu Aug 27 20:01:52 2020 +1000 9194 9195 tweak back-compat for older libfido2 9196 9197commit d6f45cdde031acdf434bbb27235a1055621915f4 9198Author: djm@openbsd.org <djm@openbsd.org> 9199Date: Thu Aug 27 09:46:04 2020 +0000 9200 9201 upstream: debug()-print a little info about FIDO-specific key 9202 9203 fields via "ssh-keygen -vyf /path/key" 9204 9205 OpenBSD-Commit-ID: cf315c4fe77db43947d111b00155165cb6b577cf 9206 9207commit b969072cc3d62d05cb41bc6d6f3c22c764ed932f 9208Author: djm@openbsd.org <djm@openbsd.org> 9209Date: Thu Aug 27 09:43:28 2020 +0000 9210 9211 upstream: skip a bit more FIDO token selection logic when only a 9212 9213 single token is attached. 9214 9215 with Pedro Martelletto 9216 9217 OpenBSD-Commit-ID: e4a324bd9814227ec1faa8cb619580e661cca9ac 9218 9219commit 744df42a129d7d7db26947b7561be32edac89f88 9220Author: jmc@openbsd.org <jmc@openbsd.org> 9221Date: Thu Aug 27 06:15:22 2020 +0000 9222 9223 upstream: tweak previous; 9224 9225 OpenBSD-Commit-ID: 92714b6531e244e4da401b2defaa376374e24be7 9226 9227commit e32479645ce649b444ba5c6e7151304306a09654 9228Author: djm@openbsd.org <djm@openbsd.org> 9229Date: Thu Aug 27 03:55:22 2020 +0000 9230 9231 upstream: adapt to API changes 9232 9233 OpenBSD-Regress-ID: 5f147990cb67094fe554333782ab268a572bb2dd 9234 9235commit bbcc858ded3fbc46abfa7760e40389e3ca93884c 9236Author: Damien Miller <djm@mindrot.org> 9237Date: Thu Aug 27 12:37:12 2020 +1000 9238 9239 degrade semi-gracefully when libfido2 is too old 9240 9241commit 9cbbdc12cb6a2ab1e9ffe9974cca91d213c185c2 9242Author: djm@openbsd.org <djm@openbsd.org> 9243Date: Thu Aug 27 01:15:36 2020 +0000 9244 9245 upstream: dummy firmware needs to match API version numner crank (for 9246 9247 verify-required resident keys) even though it doesn't implement this feature 9248 9249 OpenBSD-Regress-ID: 86579ea2891e18e822e204413d011b2ae0e59657 9250 9251commit c1e76c64956b424ba260fd4eec9970e5b5859039 9252Author: djm@openbsd.org <djm@openbsd.org> 9253Date: Thu Aug 27 02:11:09 2020 +0000 9254 9255 upstream: remove unreachable code I forgot to delete in r1.334 9256 9257 OpenBSD-Commit-ID: 9ed6078251a0959ee8deda443b9ae42484fd8b18 9258 9259commit 0caff05350bd5fc635674c9e051a0322faba5ae3 9260Author: djm@openbsd.org <djm@openbsd.org> 9261Date: Thu Aug 27 01:08:45 2020 +0000 9262 9263 upstream: Request PIN ahead of time for certain FIDO actions 9264 9265 When we know that a particular action will require a PIN, such as 9266 downloading resident keys or generating a verify-required key, request 9267 the PIN before attempting it. 9268 9269 joint work with Pedro Martelletto; ok markus@ 9270 9271 OpenBSD-Commit-ID: 863182d38ef075bad1f7d20ca485752a05edb727 9272 9273commit b649b3daa6d4b8ebe1bd6de69b3db5d2c03c9af0 9274Author: djm@openbsd.org <djm@openbsd.org> 9275Date: Thu Aug 27 01:08:19 2020 +0000 9276 9277 upstream: preserve verify-required for resident FIDO keys 9278 9279 When downloading a resident, verify-required key from a FIDO token, 9280 preserve the verify-required in the private key that is written to 9281 disk. Previously we weren't doing that because of lack of support 9282 in the middleware API. 9283 9284 from Pedro Martelletto; ok markus@ and myself 9285 9286 OpenBSD-Commit-ID: 201c46ccdd227cddba3d64e1bdbd082afa956517 9287 9288commit 642e06d0df983fa2af85126cf4b23440bb2985bf 9289Author: djm@openbsd.org <djm@openbsd.org> 9290Date: Thu Aug 27 01:07:51 2020 +0000 9291 9292 upstream: major rework of FIDO token selection logic 9293 9294 When PINs are in use and multiple FIDO tokens are attached to a host, we 9295 cannot just blast requests at all attached tokens with the PIN specified 9296 as this will cause the per-token PIN failure counter to increment. If 9297 this retry counter hits the token's limit (usually 3 attempts), then the 9298 token will lock itself and render all (web and SSH) of its keys invalid. 9299 We don't want this. 9300 9301 So this reworks the key selection logic for the specific case of 9302 multiple keys being attached. When multiple keys are attached and the 9303 operation requires a PIN, then the user must touch the key that they 9304 wish to use first in order to identify it. 9305 9306 This may require multiple touches, but only if there are multiple keys 9307 attached AND (usually) the operation requires a PIN. The usual case of a 9308 single key attached should be unaffected. 9309 9310 Work by Pedro Martelletto; ok myself and markus@ 9311 9312 OpenBSD-Commit-ID: 637d3049ced61b7a9ee796914bbc4843d999a864 9313 9314commit 801c9f095e6d8b7b91aefd98f5001c652ea13488 9315Author: djm@openbsd.org <djm@openbsd.org> 9316Date: Thu Aug 27 01:07:09 2020 +0000 9317 9318 upstream: support for requiring user verified FIDO keys in sshd 9319 9320 This adds a "verify-required" authorized_keys flag and a corresponding 9321 sshd_config option that tells sshd to require that FIDO keys verify the 9322 user identity before completing the signing/authentication attempt. 9323 Whether or not user verification was performed is already baked into the 9324 signature made on the FIDO token, so this is just plumbing that flag 9325 through and adding ways to require it. 9326 9327 feedback and ok markus@ 9328 9329 OpenBSD-Commit-ID: 3a2313aae153e043d57763d766bb6d55c4e276e6 9330 9331commit 9b8ad93824c682ce841f53f3b5762cef4e7cc4dc 9332Author: djm@openbsd.org <djm@openbsd.org> 9333Date: Thu Aug 27 01:06:18 2020 +0000 9334 9335 upstream: support for user-verified FIDO keys 9336 9337 FIDO2 supports a notion of "user verification" where the user is 9338 required to demonstrate their identity to the token before particular 9339 operations (e.g. signing). Typically this is done by authenticating 9340 themselves using a PIN that has been set on the token. 9341 9342 This adds support for generating and using user verified keys where 9343 the verification happens via PIN (other options might be added in the 9344 future, but none are in common use now). Practically, this adds 9345 another key generation option "verify-required" that yields a key that 9346 requires a PIN before each authentication. 9347 9348 feedback markus@ and Pedro Martelletto; ok markus@ 9349 9350 OpenBSD-Commit-ID: 57fd461e4366f87c47502c5614ec08573e6d6a15 9351 9352commit 1196d7f49d4fbc90f37e550de3056561613b0960 9353Author: cheloha@openbsd.org <cheloha@openbsd.org> 9354Date: Wed Aug 12 01:23:45 2020 +0000 9355 9356 upstream: ssh-keyscan(1): simplify conloop() with timercmp(3), 9357 9358 timersub(3); ok djm@ 9359 9360 OpenBSD-Commit-ID: a102acb544f840d33ad73d40088adab4a687fa27 9361 9362commit d0a195c89e26766d3eb8f3e4e2a00ebc98b57795 9363Author: djm@openbsd.org <djm@openbsd.org> 9364Date: Tue Aug 11 09:49:57 2020 +0000 9365 9366 upstream: let ssh_config(5)'s AddKeysToAgent keyword accept a time 9367 9368 limit for keys in addition to its current flag options. Time-limited keys 9369 will automatically be removed from ssh-agent after their expiry time has 9370 passed; ok markus@ 9371 9372 OpenBSD-Commit-ID: 792e71cacbbc25faab5424cf80bee4a006119f94 9373 9374commit e9c2002891a7b8e66f4140557a982978f372e5a3 9375Author: djm@openbsd.org <djm@openbsd.org> 9376Date: Tue Aug 11 09:45:54 2020 +0000 9377 9378 upstream: let the "Confirm user presence for key ..." ssh-askpass 9379 9380 notification respect $SSH_ASKPASS_REQUIRE; ok markus@ 9381 9382 OpenBSD-Commit-ID: 7c1a616b348779bda3b9ad46bf592741f8e206c1 9383 9384commit eaf8672b1b52db2815a229745f4e4b08681bed6d 9385Author: Darren Tucker <dtucker@dtucker.net> 9386Date: Fri Aug 21 00:04:13 2020 +1000 9387 9388 Remove check for 'ent' command. 9389 9390 It was added in 8d1fd57a9 for measuring entropy of ssh_prng_cmds which 9391 has long since been removed and there are no other references to it. 9392 9393commit 05c215de8d224e094a872d97d45f37f60c06206b 9394Author: Darren Tucker <dtucker@dtucker.net> 9395Date: Mon Aug 17 21:34:32 2020 +1000 9396 9397 Wrap stdint.h include in ifdef HAVE_STDINT_H. 9398 9399commit eaf2765efe8bc74feba85c34295d067637fc6635 9400Author: Damien Miller <djm@mindrot.org> 9401Date: Mon Aug 10 13:24:09 2020 +1000 9402 9403 sync memmem.c with OpenBSD 9404 9405commit ed6bef77f5bb5b8f9ca2914478949e29f2f0a780 9406Author: Darren Tucker <dtucker@dtucker.net> 9407Date: Fri Aug 7 17:12:16 2020 +1000 9408 9409 Always send any PAM account messages. 9410 9411 If the PAM account stack reaturns any messages, send them to the user 9412 not just if the check succeeds. bz#2049, ok djm@ 9413 9414commit a09e98dcae1e26f026029b7142b0e0d10130056f 9415Author: Darren Tucker <dtucker@dtucker.net> 9416Date: Fri Aug 7 15:37:37 2020 +1000 9417 9418 Output test debug logs on failure. 9419 9420commit eb122b1eebe58b29a83a507ee814cbcf8aeded1b 9421Author: Darren Tucker <dtucker@dtucker.net> 9422Date: Fri Aug 7 15:11:42 2020 +1000 9423 9424 Add ability to specify exact test target. 9425 9426commit c2ec7a07f8caabb4d8e00c66e7cd46bf2cd1e922 9427Author: Darren Tucker <dtucker@dtucker.net> 9428Date: Fri Aug 7 14:21:15 2020 +1000 9429 9430 Document --without-openssl and --without-zlib. 9431 9432commit 651bb3a31949bbdc3a78b2ede95a77bce0c72984 9433Author: Darren Tucker <dtucker@dtucker.net> 9434Date: Fri Aug 7 14:15:11 2020 +1000 9435 9436 Add without-openssl without-zlib test target. 9437 9438commit 9499f2bb01dc1032ae155999b2d7764b9491341f 9439Author: Stefan Schindler <dns2utf8@estada.ch> 9440Date: Wed Aug 5 19:00:52 2020 +0200 9441 9442 Add CI with prepare script 9443 9444 * Only use heimdal kerberos implementation 9445 * Fetch yubico/libfido2 (see: https://github.com/Yubico/libfido2) 9446 * Add one target for 9447 * all features 9448 * each feature alone 9449 * no features 9450 9451commit ea1f649046546a860f68b97ddc3015b7e44346ca 9452Author: Damien Miller <djm@mindrot.org> 9453Date: Wed Aug 5 08:58:57 2020 +1000 9454 9455 support NetBSD's utmpx.ut_ss address field 9456 9457 bz#960, ok dtucker 9458 9459commit 32c63e75a70a0ed9d6887a55fcb0e4531a6ad617 9460Author: Damien Miller <djm@mindrot.org> 9461Date: Tue Aug 4 14:59:21 2020 +1000 9462 9463 wrap a declaration in the same ifdefs as its use 9464 9465 avoids warnings on NetBSD 9466 9467commit c9e3be9f4b41fda32a2a0138d54c7a6b563bc94d 9468Author: Damien Miller <djm@mindrot.org> 9469Date: Tue Aug 4 14:58:46 2020 +1000 9470 9471 undef TAILQ_CONCAT and friends 9472 9473 Needed for NetBSD. etc that supply these macros 9474 9475commit 2d8a3b7e8b0408dfeb933ac5cfd3a58f5bac49af 9476Author: djm@openbsd.org <djm@openbsd.org> 9477Date: Mon Aug 3 02:53:51 2020 +0000 9478 9479 upstream: ensure that certificate extensions are lexically sorted. 9480 9481 Previously if the user specified a custom extension then the everything would 9482 be in order except the custom ones. bz3198 ok dtucker markus 9483 9484 OpenBSD-Commit-ID: d97deb90587b06cb227c66ffebb2d9667bf886f0 9485 9486commit a8732d74cb8e72f0c6366015687f1e649f60be87 9487Author: djm@openbsd.org <djm@openbsd.org> 9488Date: Mon Aug 3 02:43:41 2020 +0000 9489 9490 upstream: allow -A to explicitly enable agent forwarding in scp and 9491 9492 sftp. The default remains to not forward an agent, even when ssh_config 9493 enables it. ok jmc dtucker markus 9494 9495 OpenBSD-Commit-ID: 36cc526aa3b0f94e4704b8d7b969dd63e8576822 9496 9497commit ab9105470a83ed5d8197959a1b1f367399958ba1 9498Author: deraadt@openbsd.org <deraadt@openbsd.org> 9499Date: Mon Aug 3 02:42:49 2020 +0000 9500 9501 upstream: clang -Wimplicit-fallthrough does not recognise /* 9502 9503 FALLTHROUGH */ comments, which is the style we currently use, and gives too 9504 many boring warnings. ok djm 9505 9506 OpenBSD-Commit-ID: 07b5031e9f49f2b69ac5e85b8da4fc9e393992a0 9507 9508commit ced327b9fb78c94d143879ef4b2a02cbc5d38690 9509Author: dtucker@openbsd.org <dtucker@openbsd.org> 9510Date: Fri Jul 31 04:19:37 2020 +0000 9511 9512 upstream: Also compare username when checking for JumpHost loops. 9513 9514 bz#3057, ok djm@ 9515 9516 OpenBSD-Commit-ID: 9bbc1d138adb34c54f3c03a15a91f75dbf418782 9517 9518commit ae7527010c44b3376b85d036a498f136597b2099 9519Author: Darren Tucker <dtucker@dtucker.net> 9520Date: Fri Jul 31 15:19:04 2020 +1000 9521 9522 Remove AC_REVISION. 9523 9524 It hasn't been useful since we switched to git in 2014. ok djm@ 9525 9526commit 89fc3f414be0ce4e8008332a9739a7d721269e50 9527Author: Darren Tucker <dtucker@dtucker.net> 9528Date: Tue Jul 28 19:40:30 2020 +1000 9529 9530 Use argv in OSSH_CHECK_CFLAG_COMPILE test. 9531 9532 configure.ac is not detecting -Wextra in compilers that implement the 9533 option. The problem is that -Wextra implies -Wunused-parameter, and the 9534 C excerpt used by aclocal.m4 does not use argv. Patch from pedro at 9535 ambientworks.net, ok djm@ 9536 9537commit 62c81ef531b0cc7ff655455dd34f5f0c94f48e82 9538Author: Darren Tucker <dtucker@dtucker.net> 9539Date: Mon Jul 20 22:12:07 2020 +1000 9540 9541 Skip ECDSA-SK webauthn test when built w/out ECC 9542 9543commit 3ec9a6d7317236a9994887d8bd5d246af403a00d 9544Author: Damien Miller <djm@mindrot.org> 9545Date: Mon Jul 20 13:09:25 2020 +1000 9546 9547 Add ssh-sk-helper and manpage to RPM spec file 9548 9549 Based on patch from Fabio Pedretti 9550 9551commit a2855c048b3f4b17d8787bd3f24232ec0cd79abe 9552Author: dtucker@openbsd.org <dtucker@openbsd.org> 9553Date: Fri Jul 17 07:09:24 2020 +0000 9554 9555 upstream: Add %k to the TOKENs for Match Exec for consistency with 9556 9557 the other keywords that recently got %k. 9558 9559 OpenBSD-Commit-ID: 1857d1c40f270cbc254fca91e66110641dddcfdb 9560 9561commit 69860769fa9f4529d8612ec055ae11912f7344cf 9562Author: jmc@openbsd.org <jmc@openbsd.org> 9563Date: Fri Jul 17 05:59:05 2020 +0000 9564 9565 upstream: fix macro slip in previous; 9566 9567 OpenBSD-Commit-ID: 624e47ab209450ad9ad5c69f54fa69244de5ed9a 9568 9569commit 40649bd0822883b684183854b16d0b8461d5697b 9570Author: dtucker@openbsd.org <dtucker@openbsd.org> 9571Date: Fri Jul 17 07:10:24 2020 +0000 9572 9573 upstream: Add test for '%k' (HostKeyAlias) TOKEN. 9574 9575 OpenBSD-Regress-ID: 8ed1ba1a811790031aad3fcea860a34ad7910456 9576 9577commit 6736fe680704a3518cb4f3f8f6723b00433bd3dd 9578Author: dtucker@openbsd.org <dtucker@openbsd.org> 9579Date: Fri Jul 17 03:26:58 2020 +0000 9580 9581 upstream: Add tests for expansions on UserKnownHostsFile. 9582 9583 OpenBSD-Regress-ID: bccf8060306c841bbcceb1392644f906a4d6ca51 9584 9585commit 287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f 9586Author: djm@openbsd.org <djm@openbsd.org> 9587Date: Fri Jul 17 03:51:32 2020 +0000 9588 9589 upstream: log error message for process_write() write failures 9590 9591 OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851 9592 9593commit 8df5774a42d2eaffe057bd7f293fc6a4b1aa411c 9594Author: dtucker@openbsd.org <dtucker@openbsd.org> 9595Date: Fri Jul 17 03:43:42 2020 +0000 9596 9597 upstream: Add a '%k' TOKEN that expands to the effective HostKey of 9598 9599 the destination. This allows, eg, keeping host keys in individual files 9600 using "UserKnownHostsFile ~/.ssh/known_hosts.d/%k". bz#1654, ok djm@, jmc@ 9601 (man page bits) 9602 9603 OpenBSD-Commit-ID: 7084d723c9cc987a5c47194219efd099af5beadc 9604 9605commit c4f239944a4351810fd317edf408bdcd5c0102d9 9606Author: dtucker@openbsd.org <dtucker@openbsd.org> 9607Date: Fri Jul 17 03:23:10 2020 +0000 9608 9609 upstream: Add %-TOKEN, environment variable and tilde expansion to 9610 9611 UserKnownHostsFile, allowing the file to be automagically split up in the 9612 configuration (eg bz#1654). ok djm@, man page parts jmc@ 9613 9614 OpenBSD-Commit-ID: 7e1b406caf147638bb51558836a72d6cc0bd1b18 9615 9616commit dbaaa01daedb423c38124a72c471982fb08a16fb 9617Author: solene@openbsd.org <solene@openbsd.org> 9618Date: Wed Jul 15 07:50:46 2020 +0000 9619 9620 upstream: - Add [-a rounds] in ssh-keygen man page and usage() - 9621 9622 Reorder parameters list in the first usage() case - Sentence rewording 9623 9624 ok dtucker@ 9625 jmc@ noticed usage() missed -a flag too 9626 9627 OpenBSD-Commit-ID: f06b9afe91cc96f260b929a56e9930caecbde246 9628 9629commit 69924a92c3af7b99a7541aa544a2334ec0fb092c 9630Author: jmc@openbsd.org <jmc@openbsd.org> 9631Date: Wed Jul 15 05:40:05 2020 +0000 9632 9633 upstream: start sentence with capital letter; 9634 9635 OpenBSD-Commit-ID: ab06581d51b2b4cc1b4aab781f7f3cfa56cad973 9636 9637commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885 9638Author: Damien Miller <djm@mindrot.org> 9639Date: Fri Jul 17 13:15:50 2020 +1000 9640 9641 detect Linux/X32 systems 9642 9643 This is a frankenstein monster of AMD64 instructions/calling conventions 9644 but with a 4GB address space. Allegedly deprecated but people still run 9645 into it causing weird sandbox failures, e.g. bz#3085 9646 9647commit 9c9ddc1391d6af8d09580a2424ab467d0a5df3c7 9648Author: dtucker@openbsd.org <dtucker@openbsd.org> 9649Date: Wed Jul 15 06:43:16 2020 +0000 9650 9651 upstream: Fix previous by calling the correct function. 9652 9653 OpenBSD-Regress-ID: 821cdd1dff9c502cceff4518b6afcb81767cad5a 9654 9655commit f1a4798941b4372bfe5e46f1c0f8672fe692d9e4 9656Author: dtucker@openbsd.org <dtucker@openbsd.org> 9657Date: Wed Jul 15 05:36:50 2020 +0000 9658 9659 upstream: Update test to match recent change in match.c 9660 9661 OpenBSD-Regress-ID: 965bda1f95f09a765050707340c73ad755f41167 9662 9663commit d7e71be4fd57b7c7e620d733cdf2333b27bfa924 9664Author: Darren Tucker <dtucker@dtucker.net> 9665Date: Wed Jul 15 15:30:43 2020 +1000 9666 9667 Adjust portable code to match changes in 939d787d, 9668 9669commit fec89f32a84fd0aa1afc81deec80a460cbaf451a 9670Author: dtucker@openbsd.org <dtucker@openbsd.org> 9671Date: Wed Jul 15 04:27:34 2020 +0000 9672 9673 upstream: Add default for number of rounds (-a). ok djm@ 9674 9675 OpenBSD-Commit-ID: cb7e9aa04ace01a98e63e4bd77f34a42ab169b15 9676 9677commit aaa8b609a7b332be836cd9a3b782422254972777 9678Author: djm@openbsd.org <djm@openbsd.org> 9679Date: Tue Jul 14 23:57:01 2020 +0000 9680 9681 upstream: allow some additional control over the use of ssh-askpass 9682 9683 via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@ 9684 9685 OpenBSD-Commit-ID: 3a1e6cbbf6241ddc4405c4246caa2c249f149eb2 9686 9687commit 6368022cd4dd508671c4999a59ec5826df098530 9688Author: deraadt@openbsd.org <deraadt@openbsd.org> 9689Date: Tue Jul 7 02:47:21 2020 +0000 9690 9691 upstream: correct recently broken comments 9692 9693 OpenBSD-Commit-ID: 964d9a88f7de1d0eedd3f8070b43fb6e426351f1 9694 9695commit 6d755706a0059eb9e2d63517f288b75cbc3b4701 9696Author: djm@openbsd.org <djm@openbsd.org> 9697Date: Sun Jul 5 23:59:45 2020 +0000 9698 9699 upstream: some language improvements; ok markus 9700 9701 OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8 9702 9703commit b0c1e8384d5e136ebdf895d1434aea7dd8661a1c 9704Author: markus@openbsd.org <markus@openbsd.org> 9705Date: Fri Jul 3 10:12:26 2020 +0000 9706 9707 upstream: update setproctitle after re-exec; ok djm 9708 9709 OpenBSD-Commit-ID: bc92d122f9184ec2a9471ade754b80edd034ce8b 9710 9711commit cd119a5ec2bf0ed5df4daff3bd14f8f7566dafd3 9712Author: markus@openbsd.org <markus@openbsd.org> 9713Date: Fri Jul 3 10:11:33 2020 +0000 9714 9715 upstream: keep ignoring HUP after fork+exec; ok djm 9716 9717 OpenBSD-Commit-ID: 7679985a84ee5ceb09839905bb6f3ddd568749a2 9718 9719commit 8af4a743693ccbea3e15fc9e93edbeb610fa94f4 9720Author: markus@openbsd.org <markus@openbsd.org> 9721Date: Fri Jul 3 10:10:17 2020 +0000 9722 9723 upstream: don't exit the listener on send_rexec_state errors; ok 9724 9725 djm 9726 9727 OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c 9728 9729commit 03da4c2b70468f04ed1c08518ea0a70e67232739 9730Author: dtucker@openbsd.org <dtucker@openbsd.org> 9731Date: Wed Jul 15 04:55:47 2020 +0000 9732 9733 upstream: Use $OBJ to find key files. Fixes test when run on an obj 9734 9735 directory (on OpenBSD) or out of tree (in Portable). 9736 9737 OpenBSD-Regress-ID: 938fa8ac86adaa527d64a305bd2135cfbb1c0a17 9738 9739commit 73f20f195ad18f1cf633eb7d8be95dc1b6111eea 9740Author: Darren Tucker <dtucker@dtucker.net> 9741Date: Sat Jul 4 23:11:23 2020 +1000 9742 9743 Wrap stdint.h in ifdef HAVE_STDINT_H. 9744 9745commit aa6fa4bf3023fa0e5761cd8f4b2cd015d2de74dd 9746Author: djm@openbsd.org <djm@openbsd.org> 9747Date: Fri Jul 3 07:25:18 2020 +0000 9748 9749 upstream: put back the mux_ctx memleak fix, but only for channels of 9750 9751 type SSH_CHANNEL_MUX_LISTENER; Specifically SSH_CHANNEL_MUX_PROXY channels 9752 should not have this structure freed. 9753 9754 OpenBSD-Commit-ID: f3b213ae60405f77439e2b06262f054760c9d325 9755 9756commit d8195914eb43b20b13381f4e5a74f9f8a14f0ded 9757Author: djm@openbsd.org <djm@openbsd.org> 9758Date: Fri Jul 3 07:17:35 2020 +0000 9759 9760 upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex; 9761 9762 simply freeing it here causes other problems 9763 9764 OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed 9765 9766commit 20b5fab9f773b3d3c7f06cb15b8f69a2c081ee80 9767Author: djm@openbsd.org <djm@openbsd.org> 9768Date: Fri Jul 3 07:02:37 2020 +0000 9769 9770 upstream: avoid tilde_expand_filename() in expanding ~/.ssh/rc - if 9771 9772 sshd is in chroot mode, the likely absence of a password database will cause 9773 tilde_expand_filename() to fatal; ok dtucker@ 9774 9775 OpenBSD-Commit-ID: e20aee6159e8b79190d18dba1513fc1b7c8b7ee1 9776 9777commit c8935081db35d73ee6355999142fa0776a2af912 9778Author: djm@openbsd.org <djm@openbsd.org> 9779Date: Fri Jul 3 06:46:41 2020 +0000 9780 9781 upstream: when redirecting sshd's log output to a file, undo this 9782 9783 redirection after the session child process is forked(); ok dtucker@ 9784 9785 OpenBSD-Commit-ID: 6df86dd653c91f5bc8ac1916e7680d9d24690865 9786 9787commit 183c4aaef944af3a1a909ffa01058c65bac55748 9788Author: djm@openbsd.org <djm@openbsd.org> 9789Date: Fri Jul 3 06:29:57 2020 +0000 9790 9791 upstream: start ClientAliveInterval bookkeeping before first pass 9792 9793 through select() loop; fixed theoretical case where busy sshd may ignore 9794 timeouts from client; inspired by and ok dtucker 9795 9796 OpenBSD-Commit-ID: 96bfc4b1f86c7da313882a84755b2b47eb31957f 9797 9798commit 6fcfd303d67f16695198cf23d109a988e40eefb6 9799Author: Damien Miller <djm@mindrot.org> 9800Date: Fri Jul 3 15:28:27 2020 +1000 9801 9802 add check for fido_cred_set_prot() to configure 9803 9804commit f11b23346309e4d5138e733a49321aedd6eeaa2f 9805Author: dtucker@openbsd.org <dtucker@openbsd.org> 9806Date: Fri Jul 3 05:09:06 2020 +0000 9807 9808 upstream: Only reset the serveralive check when we receive traffic from 9809 9810 the server and ignore traffic from a port forwarding client, preventing a 9811 client from keeping a connection alive when it should be terminated. Based 9812 on a patch from jxraynor at gmail.com via openssh-unix-dev and bz#2265, ok 9813 djm@ 9814 9815 OpenBSD-Commit-ID: a941a575a5cbc244c0ef5d7abd0422bbf02c2dcd 9816 9817commit adfdbf1211914b631c038f0867a447db7b519937 9818Author: Damien Miller <djm@mindrot.org> 9819Date: Fri Jul 3 15:15:15 2020 +1000 9820 9821 sync sys-queue.h with OpenBSD upstream 9822 9823 needed for TAILQ_CONCAT 9824 9825commit 1b90ddde49e2ff377204082b6eb130a096411dc1 9826Author: djm@openbsd.org <djm@openbsd.org> 9827Date: Fri Jul 3 05:08:41 2020 +0000 9828 9829 upstream: fix memory leak of mux_ctx; patch from Sergiy Lozovsky 9830 9831 via bz3189 ok dtucker 9832 9833 OpenBSD-Commit-ID: db249bd4526fd42d0f4f43f72f7b8b7705253bde 9834 9835commit 55ef3e9cbd5b336bd0f89205716924886fcf86de 9836Author: markus@openbsd.org <markus@openbsd.org> 9837Date: Wed Jul 1 16:28:31 2020 +0000 9838 9839 upstream: free kex in ssh_packet_close; ok djm semarie 9840 9841 OpenBSD-Commit-ID: dbc181e90d3d32fd97b10d75e68e374270e070a2 9842 9843commit e1c401109b61f7dbc199b5099933d579e7fc5dc9 9844Author: bket@openbsd.org <bket@openbsd.org> 9845Date: Sat Jun 27 13:39:09 2020 +0000 9846 9847 upstream: Replace TAILQ concatenation loops with TAILQ_CONCAT 9848 9849 OK djm@ 9850 9851 OpenBSD-Commit-ID: 454b40e09a117ddb833794358970a65b14c431ef 9852 9853commit 14beca57ac92d62830c42444c26ba861812dc837 9854Author: semarie@openbsd.org <semarie@openbsd.org> 9855Date: Fri Jun 26 11:26:01 2020 +0000 9856 9857 upstream: backout 1.293 fix kex mem-leak in ssh_packet_close at markus 9858 9859 request 9860 9861 the change introduced a NULL deref in sshpkt_vfatal() (uses of ssh->kex after 9862 calling ssh_packet_clear_keys()) 9863 9864 OpenBSD-Commit-ID: 9c9a6721411461b0b1c28dc00930d7251a798484 9865 9866commit 598c3a5e3885080ced0d7c40fde00f1d5cdbb32b 9867Author: Damien Miller <djm@mindrot.org> 9868Date: Fri Jun 26 16:07:12 2020 +1000 9869 9870 document a PAM spec problem in a frustrated comment 9871 9872commit 976c4f86286d52a0cb2aadf4a095d379c0da752e 9873Author: djm@openbsd.org <djm@openbsd.org> 9874Date: Fri Jun 26 05:42:16 2020 +0000 9875 9876 upstream: avoid spurious error message when ssh-keygen creates files 9877 9878 outside ~/.ssh; with dtucker@ 9879 9880 OpenBSD-Commit-ID: ac0c662d44607e00ec78c266ee60752beb1c7e08 9881 9882commit 32b2502a9dfdfded1ccdc1fd6dc2b3fe41bfc205 9883Author: Damien Miller <djm@mindrot.org> 9884Date: Fri Jun 26 15:30:06 2020 +1000 9885 9886 missing ifdef SELINUX; spotted by dtucker 9887 9888commit e073106f370cdd2679e41f6f55a37b491f0e82fe 9889Author: djm@openbsd.org <djm@openbsd.org> 9890Date: Fri Jun 26 05:12:21 2020 +0000 9891 9892 upstream: regress test for ssh-add -d; ok dtucker@ 9893 9894 OpenBSD-Regress-ID: 3a2e044be616afc7dd4f56c100179e83b33d8abf 9895 9896commit c809daaa1bad6b1c305b0e0b5440360f32546c84 9897Author: markus@openbsd.org <markus@openbsd.org> 9898Date: Wed Jun 24 15:16:23 2020 +0000 9899 9900 upstream: add test for mux w/-Oproxy; ok djm 9901 9902 OpenBSD-Regress-ID: 764d5c696e2a259f1316a056e225e50023abb027 9903 9904commit 3d06ff4bbd3dca8054c238d2a94c0da563ef7eee 9905Author: djm@openbsd.org <djm@openbsd.org> 9906Date: Fri Jun 26 05:16:38 2020 +0000 9907 9908 upstream: handle EINTR in waitfd() and timeout_connect() helpers; 9909 9910 bz#3071; ok dtucker@ 9911 9912 OpenBSD-Commit-ID: 08fa87be50070bd8b754d9b1ebb1138d7bc9d8ee 9913 9914commit fe2ec0b9c19adeab0cd9f04b8152dc17f31c31e5 9915Author: djm@openbsd.org <djm@openbsd.org> 9916Date: Fri Jun 26 05:04:07 2020 +0000 9917 9918 upstream: allow "ssh-add -d -" to read keys to be deleted from 9919 9920 stdin bz#3180; ok dtucker@ 9921 9922 OpenBSD-Commit-ID: 15c7f10289511eb19fce7905c9cae8954e3857ff 9923 9924commit a3e0c376ffc11862fa3568b28188bd12965973e1 9925Author: djm@openbsd.org <djm@openbsd.org> 9926Date: Fri Jun 26 05:03:36 2020 +0000 9927 9928 upstream: constify a few things; ok dtucker (as part of another 9929 9930 diff) 9931 9932 OpenBSD-Commit-ID: 7c17fc987085994d752304bd20b1ae267a9bcdf6 9933 9934commit 74344c3ca42c3f53b00b025daf09ae7f6aa38076 9935Author: dtucker@openbsd.org <dtucker@openbsd.org> 9936Date: Fri Jun 26 05:02:03 2020 +0000 9937 9938 upstream: Defer creation of ~/.ssh by ssh(1) until we attempt to 9939 9940 write to it so we don't leave an empty .ssh directory when it's not needed. 9941 Use the same function to replace the code in ssh-keygen that does the same 9942 thing. bz#3156, ok djm@ 9943 9944 OpenBSD-Commit-ID: 59c073b569be1a60f4de36f491a4339bc4ae870f 9945 9946commit c9e24daac6324fcbdba171392c325bf9ccc3c768 9947Author: dtucker@openbsd.org <dtucker@openbsd.org> 9948Date: Fri Jun 26 04:45:11 2020 +0000 9949 9950 upstream: Expand path to ~/.ssh/rc rather than relying on it 9951 9952 being relative to the current directory, so that it'll still be found if the 9953 shell startup changes its directory. Since the path is potentially longer, 9954 make the cmd buffer that uses it dynamically sized. bz#3185, with & ok djm@ 9955 9956 OpenBSD-Commit-ID: 36e33ff01497af3dc8226d0c4c1526fc3a1e46bf 9957 9958commit 07f5f369a25e228a7357ef6c57205f191f073d99 9959Author: markus@openbsd.org <markus@openbsd.org> 9960Date: Wed Jun 24 15:12:09 2020 +0000 9961 9962 upstream: fix kex mem-leak in ssh_packet_close; ok djm 9963 9964 OpenBSD-Commit-ID: e2e9533f393620383afd0b68ef435de8d5e8abe4 9965 9966commit e35995088cd6691a712bfd586bae8084a3a922ba 9967Author: markus@openbsd.org <markus@openbsd.org> 9968Date: Wed Jun 24 15:10:38 2020 +0000 9969 9970 upstream: fix ssh -O proxy w/mux which got broken by no longer 9971 9972 making ssh->kex optional in packet.c revision 1.278 ok djm@ 9973 9974 OpenBSD-Commit-ID: 2b65df04a064c2c6277359921d2320c90ab7d917 9975 9976commit 250246fef22b87a54a63211c60a2def9be431fbd 9977Author: markus@openbsd.org <markus@openbsd.org> 9978Date: Wed Jun 24 15:09:53 2020 +0000 9979 9980 upstream: support loading big sshd_config files w/o realloc; ok 9981 9982 djm 9983 9984 OpenBSD-Commit-ID: ba9238e810074ac907f0cf8cee1737ac04983171 9985 9986commit 89b54900ac61986760452f132bbe3fb7249cfdac 9987Author: markus@openbsd.org <markus@openbsd.org> 9988Date: Wed Jun 24 15:08:53 2020 +0000 9989 9990 upstream: allow sshd_config longer than 256k; ok djm 9991 9992 OpenBSD-Commit-ID: 83f40dd5457a64c1d3928eb4364461b22766beb3 9993 9994commit e3fa6249e6d9ceb57c14b04dd4c0cfab12fa7cd5 9995Author: markus@openbsd.org <markus@openbsd.org> 9996Date: Wed Jun 24 15:07:33 2020 +0000 9997 9998 upstream: only call sshkey_xmss_init() once for KEY_XMSS_CERT; ok 9999 10000 djm 10001 10002 OpenBSD-Commit-ID: d0002ffb7f20f538b014d1d0735facd5a81ff096 10003 10004commit 37f2da069c0619f2947fb92785051d82882876d7 10005Author: djm@openbsd.org <djm@openbsd.org> 10006Date: Mon Jun 22 23:44:27 2020 +0000 10007 10008 upstream: some clarifying comments 10009 10010 OpenBSD-Commit-ID: 5268479000fd97bfa30ab819f3517139daa054a2 10011 10012commit b659319a5bc9e8adf3c4facc51f37b670d2a7426 10013Author: jmc@openbsd.org <jmc@openbsd.org> 10014Date: Mon Jun 22 06:37:38 2020 +0000 10015 10016 upstream: updated argument name for -P in first synopsis was 10017 10018 missed in previous; 10019 10020 OpenBSD-Commit-ID: 8d84dc3050469884ea91e29ee06a371713f2d0b7 10021 10022commit 02a9222cbce7131d639984c2f6c71d1551fc3333 10023Author: jmc@openbsd.org <jmc@openbsd.org> 10024Date: Mon Jun 22 06:36:40 2020 +0000 10025 10026 upstream: supply word missing in previous; 10027 10028 OpenBSD-Commit-ID: 16a38b049f216108f66c8b699aa046063381bd23 10029 10030commit 5098b3b6230852a80ac6cef5d53a785c789a5a56 10031Author: Damien Miller <djm@mindrot.org> 10032Date: Mon Jun 22 16:54:02 2020 +1000 10033 10034 missing files for webauthn/sshsig unit test 10035 10036commit 354535ff79380237924ac8fdc98f8cdf83e67da6 10037Author: djm@openbsd.org <djm@openbsd.org> 10038Date: Mon Jun 22 06:00:06 2020 +0000 10039 10040 upstream: add support for verification of webauthn sshsig signature, 10041 10042 and example HTML/JS to generate webauthn signatures in SSH formats (also used 10043 to generate the testdata/* for the test). 10044 10045 OpenBSD-Regress-ID: dc575be5bb1796fdf4b8aaee0ef52a6671a0f6fb 10046 10047commit bb52e70fa5330070ec9a23069c311d9e277bbd6f 10048Author: djm@openbsd.org <djm@openbsd.org> 10049Date: Mon Jun 22 05:58:35 2020 +0000 10050 10051 upstream: Add support for FIDO webauthn (verification only). 10052 10053 webauthn is a standard for using FIDO keys in web browsers. webauthn 10054 signatures are a slightly different format to plain FIDO signatures - this 10055 support allows verification of these. Feedback and ok markus@ 10056 10057 OpenBSD-Commit-ID: ab7e3a9fb5782d99d574f408614d833379e564ad 10058 10059commit 64bc121097f377142f1387ffb2df7592c49935af 10060Author: djm@openbsd.org <djm@openbsd.org> 10061Date: Mon Jun 22 05:56:23 2020 +0000 10062 10063 upstream: refactor ECDSA-SK verification a little ahead of adding 10064 10065 support for FIDO webauthn signature verification support; ok markus@ 10066 10067 OpenBSD-Commit-ID: c9f478fd8e0c1bd17e511ce8694f010d8e32043e 10068 10069commit 12848191f8fe725af4485d3600e0842d92f8637f 10070Author: djm@openbsd.org <djm@openbsd.org> 10071Date: Mon Jun 22 05:54:10 2020 +0000 10072 10073 upstream: support for RFC4648 base64url encoding; ok markus 10074 10075 OpenBSD-Commit-ID: 0ef22c55e772dda05c112c88412c0797fec66eb4 10076 10077commit 473b4af43db12127137c7fc1a10928313f5a16d2 10078Author: djm@openbsd.org <djm@openbsd.org> 10079Date: Mon Jun 22 05:53:26 2020 +0000 10080 10081 upstream: better terminology for permissions; feedback & ok markus@ 10082 10083 OpenBSD-Commit-ID: ff2a71803b5ea57b83cc3fa9b3be42b70e462fb9 10084 10085commit fc270baf264248c3ee3050b13a6c8c0919e6559f 10086Author: djm@openbsd.org <djm@openbsd.org> 10087Date: Mon Jun 22 05:52:05 2020 +0000 10088 10089 upstream: better terminology for permissions; feedback & ok markus@ 10090 10091 OpenBSD-Commit-ID: ffb220b435610741dcb4de0e7fc68cbbdc876d2c 10092 10093commit 00531bb42f1af17ddabea59c3d9c4b0629000d27 10094Author: dtucker@openbsd.org <dtucker@openbsd.org> 10095Date: Fri Jun 19 07:21:42 2020 +0000 10096 10097 upstream: Correct synopsis and usage for the options accepted when 10098 10099 passing a command to ssh-agent. ok jmc@ 10100 10101 OpenBSD-Commit-ID: b36f0679cb0cac0e33b361051b3406ade82ea846 10102 10103commit b4556c8ad7177e379f0b60305a0cd70f12180e7c 10104Author: Darren Tucker <dtucker@dtucker.net> 10105Date: Fri Jun 19 19:22:00 2020 +1000 10106 10107 Add OPENBSD ORIGINAL marker to bcrypt_pbkdf. 10108 10109commit 1babb8bb14c423011ca34c2f563bb1c51c8fbf1d 10110Author: Darren Tucker <dtucker@dtucker.net> 10111Date: Fri Jun 19 19:10:47 2020 +1000 10112 10113 Extra brackets around sizeof() in bcrypt. 10114 10115 Prevents following warning from clang 10: 10116 bcrypt_pbkdf.c:94:40: error: expression does not compute the number of 10117 elements in this array; element type is ´uint32_tÂ[...] 10118 place parentheses around the ´sizeof(uint64_t)´ expression to 10119 silence this warning 10120 10121commit 9e065729592633290e5ddb6852792913b2286545 10122Author: Darren Tucker <dtucker@dtucker.net> 10123Date: Fri Jun 19 18:47:56 2020 +1000 10124 10125 Add includes.h to new test. 10126 10127 Fixes warnings eg "´bounded´ attribute directive ignor" from gcc. 10128 10129commit e684b1ea365e070433f282a3c1dabc3e2311ce49 10130Author: Darren Tucker <dtucker@dtucker.net> 10131Date: Fri Jun 19 18:38:39 2020 +1000 10132 10133 Skip OpenSSL specific tests w/out OpenSSL. 10134 10135 Allows unit tests to pass when configure'ed --without-openssl. 10136 10137commit 80610e97a76407ca982e62fd051c9be03622fe7b 10138Author: Darren Tucker <dtucker@dtucker.net> 10139Date: Fri Jun 19 17:15:27 2020 +1000 10140 10141 Hook sshsig tests up to Portable Makefiles. 10142 10143commit 5dba1fcabacaab46693338ec829b42a1293d1f52 10144Author: dtucker@openbsd.org <dtucker@openbsd.org> 10145Date: Fri Jun 19 05:07:09 2020 +0000 10146 10147 upstream: Test that ssh-agent exits when running as as subprocess 10148 10149 of a specified command (ie "ssh-agent command"). Would have caught bz#3181. 10150 10151 OpenBSD-Regress-ID: 895b4765ba5153eefaea3160a7fe08ac0b6db8b3 10152 10153commit 68e8294f6b04f9590ea227e63d3e129398a49e27 10154Author: djm@openbsd.org <djm@openbsd.org> 10155Date: Fri Jun 19 04:34:21 2020 +0000 10156 10157 upstream: run sshsig unit tests 10158 10159 OpenBSD-Regress-ID: 706ef17e2b545b64873626e0e35553da7c06052a 10160 10161commit 5edfa1690e9a75048971fd8775f7c16d153779db 10162Author: djm@openbsd.org <djm@openbsd.org> 10163Date: Fri Jun 19 04:32:09 2020 +0000 10164 10165 upstream: basic unit test for sshsig.[ch], including FIDO keys 10166 10167 verification only so far 10168 10169 OpenBSD-Regress-ID: fb1f946c8fc59206bc6a6666e577b5d5d7e45896 10170 10171commit e95c0a0e964827722d29b4bc00d5c0ff4afe0ed2 10172Author: djm@openbsd.org <djm@openbsd.org> 10173Date: Fri Jun 19 03:48:49 2020 +0000 10174 10175 upstream: basic unit test for FIDO kep parsing 10176 10177 OpenBSD-Regress-ID: 8089b88393dd916d7c95422b442a6fd4cfe00c82 10178 10179commit 7775819c6de3e9547ac57b87c7dd2bfd28cefcc5 10180Author: djm@openbsd.org <djm@openbsd.org> 10181Date: Thu Jun 18 23:34:19 2020 +0000 10182 10183 upstream: check public host key matches private; ok markus@ (as 10184 10185 part of previous diff) 10186 10187 OpenBSD-Commit-ID: 65a4f66436028748b59fb88b264cb8c94ce2ba63 10188 10189commit c514f3c0522855b4d548286eaa113e209051a6d2 10190Author: djm@openbsd.org <djm@openbsd.org> 10191Date: Thu Jun 18 23:33:38 2020 +0000 10192 10193 upstream: avoid spurious "Unable to load host key" message when 10194 10195 sshd can load a private key but no public counterpart; with & ok markus@ 10196 10197 OpenBSD-Commit-ID: 0713cbdf9aa1ff8ac7b1f78b09ac911af510f81b 10198 10199commit 7fafaeb5da365f4a408fec355dac04a774f27193 10200Author: djm@openbsd.org <djm@openbsd.org> 10201Date: Fri Jun 12 05:26:37 2020 +0000 10202 10203 upstream: correct RFC number; from HARUYAMA Seigo via GH PR191 10204 10205 OpenBSD-Commit-ID: 8d03b6c96ca98bfbc23d3754c3c33e1fe0852e10 10206 10207commit 3a7f654d5bcb20df24a134b6581b0d235da4564a 10208Author: djm@openbsd.org <djm@openbsd.org> 10209Date: Fri Jun 5 06:18:07 2020 +0000 10210 10211 upstream: unbreak "sshd -ddd" - close of config passing fd happened too 10212 10213 early. ok markus@ 10214 10215 OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0 10216 10217commit 3de02be39e5c0c2208d9682a3844991651620fcc 10218Author: Andreas Schwab <schwab@suse.de> 10219Date: Mon May 25 11:10:44 2020 +0200 10220 10221 Add support for AUDIT_ARCH_RISCV64 10222 10223commit ea547eb0329c2f8da77a4ac05f6c330bd49bdaab 10224Author: djm@openbsd.org <djm@openbsd.org> 10225Date: Fri Jun 5 03:25:35 2020 +0000 10226 10227 upstream: make sshbuf_putb(b, NULL) a no-op 10228 10229 OpenBSD-Commit-ID: 976fdc99b500e347023d430df372f31c1dd128f7 10230 10231commit 69796297c812640415c6cea074ea61afc899cbaa 10232Author: djm@openbsd.org <djm@openbsd.org> 10233Date: Fri Jun 5 03:24:36 2020 +0000 10234 10235 upstream: make sshbuf_dump() args const 10236 10237 OpenBSD-Commit-ID: b4a5accae750875d665b862504169769bcf663bd 10238 10239commit 670428895739d1f79894bdb2457891c3afa60a59 10240Author: djm@openbsd.org <djm@openbsd.org> 10241Date: Fri Jun 5 03:24:16 2020 +0000 10242 10243 upstream: wrap long line 10244 10245 OpenBSD-Commit-ID: ed405a12bd27bdc9c52e169bc5ff3529b4ebbbb2 10246 10247commit 2f648cf222882719040906722b3593b01df4ad1a 10248Author: dtucker@openbsd.org <dtucker@openbsd.org> 10249Date: Fri Jun 5 03:15:26 2020 +0000 10250 10251 upstream: Correct historical comment: provos@ modified OpenSSH to 10252 10253 work with SSLeay (very quickly replaced by OpenSSL) not SSL in general. ok 10254 deraadt, historical context markus@ 10255 10256 OpenBSD-Commit-ID: 7209e07a2984b50411ed8ca5a4932da5030d2b90 10257 10258commit 56548e4efcc3e3e8093c2eba30c75b23e561b172 10259Author: dtucker@openbsd.org <dtucker@openbsd.org> 10260Date: Wed Jun 3 08:23:18 2020 +0000 10261 10262 upstream: Import regenerated moduli file. 10263 10264 OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54 10265 10266commit 8da801f585dd9c534c0cbe487a3b1648036bf2fb 10267Author: Darren Tucker <dtucker@dtucker.net> 10268Date: Fri Jun 5 13:20:10 2020 +1000 10269 10270 Test fallthrough in OSSH_CHECK_CFLAG_COMPILE. 10271 10272 clang 10's -Wimplicit-fallthrough does not understand /* FALLTHROUGH */ 10273 comments and we don't use the __attribute__((fallthrough)) that it's 10274 looking for. This has the effect of turning off -Wimplicit-fallthrough 10275 where it does not currently help (particularly with -Werror). ok djm@ 10276 10277commit 049297de975b92adcc2db77e3fb7046c0e3c695d 10278Author: dtucker@openbsd.org <dtucker@openbsd.org> 10279Date: Wed Jun 3 08:23:18 2020 +0000 10280 10281 upstream: Import regenerated moduli file. 10282 10283 OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54 10284 10285commit b458423a38a3140ac022ffcffcb332609faccfe3 10286Author: dtucker@openbsd.org <dtucker@openbsd.org> 10287Date: Mon Jun 1 07:11:38 2020 +0000 10288 10289 upstream: Remove now-unused proto_spec and associated definitions. 10290 10291 ok djm@ 10292 10293 OpenBSD-Commit-ID: 2e2b18e3aa6ee22a7b69c39f2d3bd679ec35c362 10294 10295commit 5ad3c3a33ef038b55a14ebd31faeeec46073db2c 10296Author: millert@openbsd.org <millert@openbsd.org> 10297Date: Fri May 29 21:22:02 2020 +0000 10298 10299 upstream: Fix error message on close(2) and add printf format 10300 10301 attributes. From Christos Zoulas, OK markus@ 10302 10303 OpenBSD-Commit-ID: 41523c999a9e3561fcc7082fd38ea2e0629ee07e 10304 10305commit 712ac1efb687a945a89db6aa3e998c1a17b38653 10306Author: dtucker@openbsd.org <dtucker@openbsd.org> 10307Date: Fri May 29 11:17:56 2020 +0000 10308 10309 upstream: Make dollar_expand variadic and pass a real va_list to 10310 10311 vdollar_percent_expand. Fixes build error on arm64 spotted by otto@. 10312 10313 OpenBSD-Commit-ID: 181910d7ae489f40ad609b4cf4a20f3d068a7279 10314 10315commit 837ffa9699a9cba47ae7921d2876afaccc027133 10316Author: Darren Tucker <dtucker@dtucker.net> 10317Date: Fri May 29 20:39:00 2020 +1000 10318 10319 Omit ToS setting if we don't have IPV6_TCLASS too. 10320 10321 Fixes tests on old BSDs. 10322 10323commit f85b118d2150847cc333895296bc230e367be6b5 10324Author: dtucker@openbsd.org <dtucker@openbsd.org> 10325Date: Fri May 29 09:02:44 2020 +0000 10326 10327 upstream: Pass a NULL instead of zeroed out va_list from 10328 10329 dollar_expand. The original intent was in case there's some platform where 10330 va_list is not a pointer equivalent, but on i386 this chokes on the memset. 10331 This unbreaks that build, but will require further consideration. 10332 10333 OpenBSD-Commit-ID: 7b90afcd8e1137a1d863204060052aef415baaf7 10334 10335commit ec1d50b01c84ff667240ed525f669454c4ebc8e9 10336Author: jmc@openbsd.org <jmc@openbsd.org> 10337Date: Fri May 29 05:48:39 2020 +0000 10338 10339 upstream: remove a stray .El; 10340 10341 OpenBSD-Commit-ID: 58ddfe6f8a15fe10209db6664ecbe7896f1d167c 10342 10343commit 058674a62ffe33f01d871d46e624bc2a2c22d91f 10344Author: dtucker@openbsd.org <dtucker@openbsd.org> 10345Date: Fri May 29 04:32:26 2020 +0000 10346 10347 upstream: Add regression and unit tests for ${ENV} style 10348 10349 environment variable expansion in various keywords (bz#3140). ok djm@ 10350 10351 OpenBSD-Regress-ID: 4d9ceb95d89365b7b674bc26cf064c15a5bbb197 10352 10353commit 0b15892fc47d6840eba1291a6be9be1a70bc8972 10354Author: dtucker@openbsd.org <dtucker@openbsd.org> 10355Date: Fri May 29 01:21:35 2020 +0000 10356 10357 upstream: Unit test for convtime. ok djm@ 10358 10359 OpenBSD-Regress-ID: cec4239efa2fc4c7062064f07a847e1cbdbcd5dd 10360 10361commit 188e332d1c8f9f24e5b6659e9680bf083f837df9 10362Author: djm@openbsd.org <djm@openbsd.org> 10363Date: Fri May 29 05:37:03 2020 +0000 10364 10365 upstream: mention that wildcards are processed in lexical order; 10366 10367 bz#3165 10368 10369 OpenBSD-Commit-ID: 8856f3d1612bd42e9ee606d89386cae456dd165c 10370 10371commit 4a1b46e6d032608b7ec00ae51c4e25b82f460b05 10372Author: dtucker@openbsd.org <dtucker@openbsd.org> 10373Date: Fri May 29 04:25:40 2020 +0000 10374 10375 upstream: Allow some keywords to expand shell-style ${ENV} 10376 10377 environment variables on the client side. The supported keywords are 10378 CertificateFile, ControlPath, IdentityAgent and IdentityFile, plus 10379 LocalForward and RemoteForward when used for Unix domain socket paths. This 10380 would for example allow forwarding of Unix domain socket paths that change at 10381 runtime. bz#3140, ok djm@ 10382 10383 OpenBSD-Commit-ID: a4a2e801fc2d4df2fe0e58f50d9c81b03822dffa 10384 10385commit c9bab1d3a9e183cef3a3412f57880a0374cc8cb2 10386Author: Damien Miller <djm@mindrot.org> 10387Date: Fri May 29 14:49:16 2020 +1000 10388 10389 depend 10390 10391commit 0b0d219313bf9239ca043f20b1a095db0245588f 10392Author: sobrado <sobrado@openbsd.org> 10393Date: Thu Sep 3 23:06:28 2015 +0000 10394 10395 partial sync of regress/netcat.c with upstream 10396 10397 synchronize synopsis and usage. 10398 10399commit 0f04c8467f589f85a523e19fd684c4f6c4ed9482 10400Author: chl <chl@openbsd.org> 10401Date: Sun Jul 26 19:12:28 2015 +0000 10402 10403 partial sync of regress/netcat.c with upstream 10404 10405 remove unused variable 10406 10407 ok tedu@ 10408 10409commit d6a81050ace2630b06c3c6dd39bb4eef5d1043f8 10410Author: tobias <tobias@openbsd.org> 10411Date: Thu Mar 26 21:22:50 2015 +0000 10412 10413 partial sync of regress/netcat.c with upstream 10414 10415 The code in socks.c writes multiple times in a row to a socket. If the socket becomes invalid between these calls (e.g. connection closed), write will throw SIGPIPE. With this patch, SIGPIPE is ignored so we can handle write's -1 return value (errno will be EPIPE). Ultimately, it leads to program exit, too -- but with nicer error message. :) 10416 10417 with input by and ok djm 10418 10419commit bf3893dddd35e16def04bf48ed2ee1ad695b8f82 10420Author: tobias <tobias@openbsd.org> 10421Date: Thu Mar 26 10:36:03 2015 +0000 10422 10423 partial sync of regress/netcat.c with upstream 10424 10425 Check for short writes in fdpass(). Clean up while at it. 10426 10427 ok djm 10428 10429commit e18435fec124b4c08eb6bbbbee9693dc04f4befb 10430Author: jca <jca@openbsd.org> 10431Date: Sat Feb 14 22:40:22 2015 +0000 10432 10433 partial sync of regress/netcat.c with upstream 10434 10435 Support for nc -T on IPv6 addresses. 10436 10437 ok sthen@ 10438 10439commit 4c607244054a036ad3b2449a6cb4c15feb846a76 10440Author: djm@openbsd.org <djm@openbsd.org> 10441Date: Fri May 29 03:14:02 2020 +0000 10442 10443 upstream: fix compilation on !HAVE_DLOPEN platforms; stub function 10444 10445 was not updated to match API change. From Dale Rahn via beck@ ok markus@ 10446 10447 OpenBSD-Commit-ID: 2b8d054afe34c9ac85e417dae702ef981917b836 10448 10449commit 224418cf55611869a4ace1b8b07bba0dff77a9c3 10450Author: djm@openbsd.org <djm@openbsd.org> 10451Date: Fri May 29 03:11:54 2020 +0000 10452 10453 upstream: fix exit status for downloading of FIDO resident keys; 10454 10455 from Pedro Martelletto, ok markus@ 10456 10457 OpenBSD-Commit-ID: 0da77dc24a1084798eedd83c39a002a9d231faef 10458 10459commit 1001dd148ed7c57bccf56afb40cb77482ea343a6 10460Author: dtucker@openbsd.org <dtucker@openbsd.org> 10461Date: Fri May 29 01:20:46 2020 +0000 10462 10463 upstream: Fix multiplier in convtime when handling seconds after 10464 10465 other units. bz#3171, spotted by ronf at timeheart.net, ok djm@. 10466 10467 OpenBSD-Commit-ID: 95b7a848e1083974a65fbb6ccb381d438e1dd5be 10468 10469commit 7af1e92cd289b7eaa9a683e9a6f2fddd98f37a01 10470Author: djm@openbsd.org <djm@openbsd.org> 10471Date: Wed May 27 22:37:53 2020 +0000 10472 10473 upstream: fix Include before Match in sshd_config; bz#3122 patch 10474 10475 from Jakub Jelen 10476 10477 OpenBSD-Commit-ID: 1b0aaf135fe6732b5d326946042665dd3beba5f4 10478 10479commit 0a9a611619b0a1fecd0195ec86a9885f5d681c84 10480Author: djm@openbsd.org <djm@openbsd.org> 10481Date: Wed May 27 21:59:11 2020 +0000 10482 10483 upstream: Do not call process_queued_listen_addrs() for every 10484 10485 included file from sshd_config; patch from Jakub Jelen 10486 10487 OpenBSD-Commit-ID: 0ff603d6f06a7fab4881f12503b53024799d0a49 10488 10489commit 16ea1fdbe736648f79a827219134331f8d9844fb 10490Author: djm@openbsd.org <djm@openbsd.org> 10491Date: Wed May 27 21:25:18 2020 +0000 10492 10493 upstream: fix crash in recallocarray when deleting SendEnv 10494 10495 variables; spotted by & ok sthen@ 10496 10497 OpenBSD-Commit-ID: b881e8e849edeec5082b5c0a87d8d7cff091a8fd 10498 10499commit 47adfdc07f4f8ea0064a1495500244de08d311ed 10500Author: djm@openbsd.org <djm@openbsd.org> 10501Date: Wed May 27 22:35:19 2020 +0000 10502 10503 upstream: two new tests for Include in sshd_config, checking whether 10504 10505 Port directives are processed correctly and handling of Include directives 10506 that appear before Match. Both tests currently fail. bz#3122 and bz#3169 - 10507 patch from Jakub Jelen 10508 10509 OpenBSD-Regress-ID: 8ad5a4a385a63f0a1c59c59c763ff029b45715df 10510 10511commit 47faad8f794516c33864d866aa1b55d88416f94c 10512Author: Darren Tucker <dtucker@dtucker.net> 10513Date: Wed May 27 23:26:23 2020 +1000 10514 10515 Document that libfido2 >= 1.4.0 is needed. 10516 10517commit 4be563994c0cbe9856e7dd3078909f41beae4a9c 10518Author: djm@openbsd.org <djm@openbsd.org> 10519Date: Tue May 26 01:59:46 2020 +0000 10520 10521 upstream: fix memleak of signature; from Pedro Martelletto 10522 10523 OpenBSD-Commit-ID: d0a6eb07e77c001427d738b220dd024ddc64b2bb 10524 10525commit 0c111eb84efba7c2a38b2cc3278901a0123161b9 10526Author: djm@openbsd.org <djm@openbsd.org> 10527Date: Tue May 26 01:26:58 2020 +0000 10528 10529 upstream: Restrict ssh-agent from signing web challenges for FIDO 10530 10531 keys. 10532 10533 When signing messages in ssh-agent using a FIDO key that has an 10534 application string that does not start with "ssh:", ensure that the 10535 message being signed is one of the forms expected for the SSH protocol 10536 (currently pubkey authentication and sshsig signatures). 10537 10538 This prevents ssh-agent forwarding on a host that has FIDO keys 10539 attached granting the ability for the remote side to sign challenges 10540 for web authentication using those keys too. 10541 10542 Note that the converse case of web browsers signing SSH challenges is 10543 already precluded because no web RP can have the "ssh:" prefix in the 10544 application string that we require. 10545 10546 ok markus@ 10547 10548 OpenBSD-Commit-ID: 9ab6012574ed0352d2f097d307f4a988222d1b19 10549 10550commit 9c5f64b6cb3a68b99915202d318b842c6c76cf14 10551Author: djm@openbsd.org <djm@openbsd.org> 10552Date: Tue May 26 01:09:05 2020 +0000 10553 10554 upstream: improve logging for MaxStartups connection throttling: 10555 10556 have sshd log when it starts and stops throttling and periodically while in 10557 this state. bz#3055 ok markus@ 10558 10559 OpenBSD-Commit-ID: 2e07a09a62ab45d790d3d2d714f8cc09a9ac7ab9 10560 10561commit 756c6f66aee83a5862a6f936a316f761532f3320 10562Author: djm@openbsd.org <djm@openbsd.org> 10563Date: Tue May 26 01:06:52 2020 +0000 10564 10565 upstream: add fmt_timeframe() (from bgpd) to format a time 10566 10567 interval in a human- friendly format. Switch copyright for this file from BSD 10568 to MIT to make it easier to add Henning's copyright for this function. ok 10569 markus@ 10570 10571 OpenBSD-Commit-ID: 414a831c662df7e68893e5233e86f2cac081ccf9 10572 10573commit 2a63ce5cd6d0e782783bf721462239b03757dd49 10574Author: djm@openbsd.org <djm@openbsd.org> 10575Date: Mon May 18 04:29:35 2020 +0000 10576 10577 upstream: avoid possible NULL deref; from Pedro Martelletto 10578 10579 OpenBSD-Commit-ID: e6099c3fbb70aa67eb106e84d8b43f1fa919b721 10580 10581commit 4b307faf2fb0e63e51a550b37652f7f972df9676 10582Author: markus@openbsd.org <markus@openbsd.org> 10583Date: Fri May 15 08:34:03 2020 +0000 10584 10585 upstream: sshd listener must not block if reexecd sshd exits 10586 10587 in write(2) on config_s[0] if the forked child exits early before finishing 10588 recv_rexec_state (e.g. with fatal()) because config_s[1] stays open in the 10589 parent. this prevents the parent from accepting new connections. ok djm, 10590 deraadt 10591 10592 OpenBSD-Commit-ID: 92ccfeb939ccd55bda914dc3fe84582158c4a9ef 10593 10594commit af8b16fb2cce880341c0ee570ceb0d84104bdcc0 10595Author: djm@openbsd.org <djm@openbsd.org> 10596Date: Fri May 15 03:57:33 2020 +0000 10597 10598 upstream: fix off-by-one error that caused sftp downloads to make 10599 10600 one more concurrent request that desired. This prevented using sftp(1) in 10601 unpipelined request/response mode, which is useful when debugging. Patch from 10602 Stephen Goetze in bz#3054 10603 10604 OpenBSD-Commit-ID: 41b394ebe57037dbc43bdd0eef21ff0511191f28 10605 10606commit d7d753e2979f2d3c904b03a08d30856cd2a6e892 10607Author: deraadt@openbsd.org <deraadt@openbsd.org> 10608Date: Wed May 13 22:38:41 2020 +0000 10609 10610 upstream: we are still aiming for pre-C99 ... 10611 10612 OpenBSD-Commit-ID: a240fc9cbe60bc4e6c3d24d022eb4ab01fe1cb38 10613 10614commit 2ad7b7e46408dbebf2a4efc4efd75a9544197d57 10615Author: djm@openbsd.org <djm@openbsd.org> 10616Date: Wed May 13 10:08:02 2020 +0000 10617 10618 upstream: Enable credProtect extension when generating a resident 10619 10620 key. 10621 10622 The FIDO 2.1 Client to Authenticator Protocol introduced a "credProtect" 10623 feature to better protect resident keys. This option allows (amone other 10624 possibilities) requiring a PIN prior to all operations that may retrieve 10625 the key handle. 10626 10627 Patch by Pedro Martelletto; ok djm and markus 10628 10629 OpenBSD-Commit-ID: 013bc06a577dcaa66be3913b7f183eb8cad87e73 10630 10631commit 1e70dc3285fc9b4f6454975acb81e8702c23dd89 10632Author: djm@openbsd.org <djm@openbsd.org> 10633Date: Wed May 13 09:57:17 2020 +0000 10634 10635 upstream: always call fido_init(); previous behaviour only called 10636 10637 fido_init() when SK_DEBUG was defined. Harmless with current libfido2, but 10638 this isn't guaranteed in the future. 10639 10640 OpenBSD-Commit-ID: c7ea20ff2bcd98dd12015d748d3672d4f01f0864 10641 10642commit f2d84f1b3fa68d77c99238d4c645d0266fae2a74 10643Author: djm@openbsd.org <djm@openbsd.org> 10644Date: Wed May 13 09:55:57 2020 +0000 10645 10646 upstream: preserve group/world read permission on known_hosts 10647 10648 file across runs of "ssh-keygen -Rf /path". The old behaviour was to remove 10649 all rights for group/other. bz#3146 ok dtucker@ 10650 10651 OpenBSD-Commit-ID: dc369d0e0b5dd826430c63fd5f4b269953448a8a 10652 10653commit 05a651400da6fbe12296c34e3d3bcf09f034fbbf 10654Author: djm@openbsd.org <djm@openbsd.org> 10655Date: Wed May 13 09:52:41 2020 +0000 10656 10657 upstream: when ordering the hostkey algorithms to request from a 10658 10659 server, prefer certificate types if the known_hosts files contain a key 10660 marked as a @cert-authority; bz#3157 ok markus@ 10661 10662 OpenBSD-Commit-ID: 8f194573e5bb7c01b69bbfaabc68f27c9fa5e0db 10663 10664commit 829451815ec207e14bd54ff5cf7e22046816f042 10665Author: djm@openbsd.org <djm@openbsd.org> 10666Date: Tue May 12 01:41:32 2020 +0000 10667 10668 upstream: fix non-ASCII quote that snuck in; spotted by Gabriel 10669 10670 Kihlman 10671 10672 OpenBSD-Commit-ID: 04bcde311de2325d9e45730c744c8de079b49800 10673 10674commit 5a442cec92c0efd6fffb4af84bf99c70af248ef3 10675Author: djm@openbsd.org <djm@openbsd.org> 10676Date: Mon May 11 02:11:29 2020 +0000 10677 10678 upstream: clarify role of FIDO tokens in multi-factor 10679 10680 authentictation; mostly from Pedro Martelletto 10681 10682 OpenBSD-Commit-ID: fbe05685a1f99c74b1baca7130c5a03c2df7c0ac 10683 10684commit ecb2c02d994b3e21994f31a70ff911667c262f1f 10685Author: djm@openbsd.org <djm@openbsd.org> 10686Date: Fri May 8 05:13:14 2020 +0000 10687 10688 upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@ 10689 10690 OpenBSD-Commit-ID: 832e771948fb45f2270e8b8895aac36d176ba17a 10691 10692commit 3ab6fccc3935e9b778ff52f9c8d40f215d58e01d 10693Author: Damien Miller <djm@mindrot.org> 10694Date: Thu May 14 12:22:09 2020 +1000 10695 10696 prefer ln to cp for temporary copy of sshd 10697 10698 I saw failures on the reexec fallback test on Darwin 19.4 where 10699 fork()ed children of a process that had it's executable removed 10700 would instantly fail. Using ln to preserve the inode avoids this. 10701 10702commit f700d316c6b15a9cfbe87230d2dca81a5d916279 10703Author: Darren Tucker <dtucker@dtucker.net> 10704Date: Wed May 13 15:24:51 2020 +1000 10705 10706 Actually skip pty tests when needed. 10707 10708commit 08ce6b2210f46f795e7db747809f8e587429dfd2 10709Author: Darren Tucker <dtucker@dtucker.net> 10710Date: Wed May 13 13:56:45 2020 +1000 10711 10712 Skip building sk-dummy library if no SK support. 10713 10714commit 102d106bc2e50347d0e545fad6ff5ce408d67247 10715Author: Damien Miller <djm@mindrot.org> 10716Date: Wed May 13 12:08:34 2020 +1000 10717 10718 explicitly manage .depend and .depend.bak 10719 10720 Bring back removal of .depend to give the file a known state before 10721 running makedepend, but manually move aside the current .depend file 10722 and restore it as .depend.bak afterwards so the stale .depend check 10723 works as expected. 10724 10725commit 83a6dc6ba1e03b3fa39d12a8522b8b0e68dd6390 10726Author: Damien Miller <djm@mindrot.org> 10727Date: Wed May 13 12:03:42 2020 +1000 10728 10729 make depend 10730 10731commit 7c0bbed967abed6301a63e0267cc64144357a99a 10732Author: Damien Miller <djm@mindrot.org> 10733Date: Wed May 13 12:01:10 2020 +1000 10734 10735 revert removal of .depend before makedepend 10736 10737 Commit 83657eac4 started removing .depend before running makedepend 10738 to reset the contents of .depend to a known state. Unfortunately 10739 this broke the depend-check step as now .depend.bak would only ever 10740 be created as an empty file. 10741 10742 ok dtucker 10743 10744commit 58ad004acdcabf3b9f40bc3aaa206b25d998db8c 10745Author: Damien Miller <djm@mindrot.org> 10746Date: Tue May 12 12:58:46 2020 +1000 10747 10748 prepare for 8.3 release 10749 10750commit 4fa9e048c2af26beb7dc2ee9479ff3323e92a7b5 10751Author: Darren Tucker <dtucker@dtucker.net> 10752Date: Fri May 8 21:50:43 2020 +1000 10753 10754 Ensure SA_SIGNAL test only signals itself. 10755 10756 When the test's child signals its parent and it exits the result of 10757 getppid changes. On Ubuntu 20.04 this results in the ppid being that 10758 of the GDM session, causing it to exit. Analysis and testing from pedro 10759 at ambientworks.net 10760 10761commit dc2da29aae76e170d22f38bb36f1f5d1edd5ec2b 10762Author: Damien Miller <djm@mindrot.org> 10763Date: Fri May 8 13:31:53 2020 +1000 10764 10765 sync config.guess/config.sub with latest versions 10766 10767 ok dtucker@ 10768 10769commit a8265bd64c14881fc7f4fa592f46dfc66b911f17 10770Author: djm@openbsd.org <djm@openbsd.org> 10771Date: Wed May 6 20:58:01 2020 +0000 10772 10773 upstream: openssh-8.3; ok deraadt@ 10774 10775 OpenBSD-Commit-ID: c8831ec88b9c750f5816aed9051031fb535d22c1 10776 10777commit 955854cafca88e0cdcd3d09ca1ad4ada465364a1 10778Author: djm@openbsd.org <djm@openbsd.org> 10779Date: Wed May 6 20:57:38 2020 +0000 10780 10781 upstream: another case where a utimes() failure could make scp send 10782 10783 a desynchronising error; reminded by Aymeric Vincent ok deraadt markus 10784 10785 OpenBSD-Commit-ID: 2ea611d34d8ff6d703a7a8bf858aa5dbfbfa7381 10786 10787commit 59d531553fd90196946743da391f3a27cf472f4e 10788Author: Darren Tucker <dtucker@dtucker.net> 10789Date: Thu May 7 15:34:12 2020 +1000 10790 10791 Check if -D_REENTRANT is needed for localtime_r. 10792 10793 On at least HP-UX 11.11, the localtime_r declararation is behind 10794 ifdef _REENTRANT. Check for and add if needed. 10795 10796commit c13403e55de8cdbb9da628ed95017b1d4c0f205f 10797Author: Darren Tucker <dtucker@dtucker.net> 10798Date: Tue May 5 11:32:43 2020 +1000 10799 10800 Skip security key tests if ENABLE_SK not set. 10801 10802commit 4da393f87cd52d788c84112ee3f2191c9bcaaf30 10803Author: djm@openbsd.org <djm@openbsd.org> 10804Date: Fri May 1 04:03:14 2020 +0000 10805 10806 upstream: sure enough, some of the test data that we though were in 10807 10808 new format were actually in the old format; fix from Michael Forney 10809 10810 OpenBSD-Regress-ID: a41a5c43a61b0f0b1691994dbf16dfb88e8af933 10811 10812commit 15bfafc1db4c8792265ada9623a96f387990f732 10813Author: djm@openbsd.org <djm@openbsd.org> 10814Date: Fri May 1 04:00:29 2020 +0000 10815 10816 upstream: make mktestdata.sh generate old/new format keys that we 10817 10818 expect. This script was written before OpenSSH switched to new-format private 10819 keys by default and was never updated to the change (until now) From Michael 10820 Forney 10821 10822 OpenBSD-Regress-ID: 38cf354715c96852e5b71c2393fb6e7ad28b7ca7 10823 10824commit 7882d2eda6ad3eb82220a85294de545d20ef82db 10825Author: djm@openbsd.org <djm@openbsd.org> 10826Date: Fri May 1 03:58:02 2020 +0000 10827 10828 upstream: portability fix for sed that always emil a newline even 10829 10830 if the input does not contain one; from Michael Forney 10831 10832 OpenBSD-Regress-ID: 9190c3ddf0d2562ccc02c4a95fce0e392196bfc7 10833 10834commit 8074f9499e454df0acdacea33598858a1453a357 10835Author: djm@openbsd.org <djm@openbsd.org> 10836Date: Fri May 1 03:36:25 2020 +0000 10837 10838 upstream: remove obsolete RSA1 test keys; spotted by Michael Forney 10839 10840 OpenBSD-Regress-ID: 6384ba889594e217d166908ed8253718ab0866da 10841 10842commit c697e46c314aa94574af0d393d80f23e0ebc9748 10843Author: Darren Tucker <dtucker@dtucker.net> 10844Date: Sat May 2 18:34:47 2020 +1000 10845 10846 Update .depend. 10847 10848commit 83657eac42941f270c4b02b2c46d9a21f616ef99 10849Author: Darren Tucker <dtucker@dtucker.net> 10850Date: Sat May 2 18:29:40 2020 +1000 10851 10852 Remove use of tail for 'make depend'. 10853 10854 Not every tail supports +N and we can do with out it so just remove it. 10855 Prompted by mforney at mforney.org. 10856 10857commit d25d630d24c5a1c64d4e646510e79dc22d6d7b88 10858Author: djm@openbsd.org <djm@openbsd.org> 10859Date: Sat May 2 07:19:43 2020 +0000 10860 10861 upstream: we have a sshkey_save_public() function to save public keys; 10862 10863 use it and save a bunch of redundant code. 10864 10865 Patch from loic AT venez.fr; ok markus@ djm@ 10866 10867 OpenBSD-Commit-ID: f93e030a0ebcd0fd9054ab30db501ec63454ea5f 10868 10869commit e9dc9863723e111ae05e353d69df857f0169544a 10870Author: Darren Tucker <dtucker@dtucker.net> 10871Date: Fri May 1 18:32:25 2020 +1000 10872 10873 Use LONG_LONG_MAX and friends if available. 10874 10875 If we don't have LLONG_{MIN,MAX} but do have LONG_LONG_{MIN,MAX} 10876 then use those instead. We do calculate these values in configure, 10877 but it turns out that at least one compiler (old HP ANSI C) can't 10878 parse "-9223372036854775808LL" without mangling it. (It can parse 10879 "-9223372036854775807LL" which is presumably why its limits.h defines 10880 LONG_LONG_MIN as the latter minus 1.) 10881 10882 Fixes rekey test when compiled with the aforementioned compiler. 10883 10884commit aad87b88fc2536b1ea023213729aaf4eaabe1894 10885Author: djm@openbsd.org <djm@openbsd.org> 10886Date: Fri May 1 06:31:42 2020 +0000 10887 10888 upstream: when receving a file in sink(), be careful to send at 10889 10890 most a single error response after the file has been opened. Otherwise the 10891 source() and sink() can become desyncronised. Reported by Daniel Goujot, 10892 Georges-Axel Jaloyan, Ryan Lahfa, and David Naccache. 10893 10894 ok deraadt@ markus@ 10895 10896 OpenBSD-Commit-ID: 6c14d233c97349cb811a8f7921ded3ae7d9e0035 10897 10898commit 31909696c4620c431dd55f6cd15db65c4e9b98da 10899Author: djm@openbsd.org <djm@openbsd.org> 10900Date: Fri May 1 06:28:52 2020 +0000 10901 10902 upstream: expose vasnmprintf(); ok (as part of other commit) markus 10903 10904 deraadt 10905 10906 OpenBSD-Commit-ID: 2e80cea441c599631a870fd40307d2ade5a7f9b5 10907 10908commit 99ce9cefbe532ae979744c6d956b49f4b02aff82 10909Author: djm@openbsd.org <djm@openbsd.org> 10910Date: Fri May 1 04:23:11 2020 +0000 10911 10912 upstream: avoid NULL dereference when attempting to convert invalid 10913 10914 ssh.com private keys using "ssh-keygen -i"; spotted by Michael Forney 10915 10916 OpenBSD-Commit-ID: 2e56e6d26973967d11d13f56ea67145f435bf298 10917 10918commit 6c6072ba8b079e6f5caa38b011a6f4570c14ed38 10919Author: Darren Tucker <dtucker@dtucker.net> 10920Date: Fri May 1 15:09:26 2020 +1000 10921 10922 See if SA_RESTART signals will interrupt select(). 10923 10924 On some platforms (at least older HP-UXes such as 11.11, possibly others) 10925 setting SA_RESTART on signal handers will cause it to not interrupt 10926 select(), at least for calls that do not specify a timeout. Try to 10927 detect this and if found, don't use SA_RESTART. 10928 10929 POSIX says "If SA_RESTART has been set for the interrupting signal, it 10930 is implementation-dependent whether select() restarts or returns with 10931 [EINTR]" so this behaviour is within spec. 10932 10933commit 90a0b434ed41f9c505662dba8782591818599cb3 10934Author: Damien Miller <djm@mindrot.org> 10935Date: Fri May 1 13:55:03 2020 +1000 10936 10937 fix reversed test 10938 10939commit c0dfd18dd1c2107c73d18f70cd164f7ebd434b08 10940Author: Damien Miller <djm@mindrot.org> 10941Date: Fri May 1 13:29:16 2020 +1000 10942 10943 wrap sha2.h inclusion in #ifdef HAVE_SHA2_H 10944 10945commit a01817a9f63dbcbbc6293aacc4019993a4cdc7e3 10946Author: djm@openbsd.org <djm@openbsd.org> 10947Date: Tue Apr 28 04:59:29 2020 +0000 10948 10949 upstream: adapt dummy FIDO middleware to API change; ok markus@ 10950 10951 OpenBSD-Regress-ID: 8bb84ee500c2eaa5616044314dd0247709a1790f 10952 10953commit 261571ddf02ea38fdb5e4a97c69ee53f847ca5b7 10954Author: jmc@openbsd.org <jmc@openbsd.org> 10955Date: Thu Apr 30 18:28:37 2020 +0000 10956 10957 upstream: tweak previous; ok markus 10958 10959 OpenBSD-Commit-ID: 41895450ce2294ec44a5713134491cc31f0c09fd 10960 10961commit 5de21c82e1d806d3e401b5338371e354b2e0a66f 10962Author: markus@openbsd.org <markus@openbsd.org> 10963Date: Thu Apr 30 17:12:20 2020 +0000 10964 10965 upstream: bring back debug() removed in rev 1.74; noted by pradeep 10966 10967 kumar 10968 10969 OpenBSD-Commit-ID: 8d134d22ab25979078a3b48d058557d49c402e65 10970 10971commit ea14103ce9a5e13492e805f7e9277516ff5a4273 10972Author: markus@openbsd.org <markus@openbsd.org> 10973Date: Thu Apr 30 17:07:10 2020 +0000 10974 10975 upstream: run the 2nd ssh with BatchMode for scp -3 10976 10977 OpenBSD-Commit-ID: 77994fc8c7ca02d88e6d0d06d0f0fe842a935748 10978 10979commit 59d2de956ed29aa5565ed5e5947a7abdb27ac013 10980Author: djm@openbsd.org <djm@openbsd.org> 10981Date: Tue Apr 28 04:02:29 2020 +0000 10982 10983 upstream: when signing a challenge using a FIDO toke, perform the 10984 10985 hashing in the middleware layer rather than in ssh code. This allows 10986 middlewares that call APIs that perform the hashing implicitly (including 10987 Microsoft's AFAIK). ok markus@ 10988 10989 OpenBSD-Commit-ID: c9fc8630aba26c75d5016884932f08a5a237f37d 10990 10991commit c9d10dbc0ccfb1c7568bbb784f7aeb7a0b5ded12 10992Author: dtucker@openbsd.org <dtucker@openbsd.org> 10993Date: Sun Apr 26 09:38:14 2020 +0000 10994 10995 upstream: Fix comment typo. Patch from mforney at mforney.org. 10996 10997 OpenBSD-Commit-ID: 3565f056003707a5e678e60e03f7a3efd0464a2b 10998 10999commit 4d2c87b4d1bde019cdd0f00552fcf97dd8b39940 11000Author: dtucker@openbsd.org <dtucker@openbsd.org> 11001Date: Sat Apr 25 06:59:36 2020 +0000 11002 11003 upstream: We've standardized on memset over bzero, replace a couple 11004 11005 that had slipped in. ok deraadt markus djm. 11006 11007 OpenBSD-Commit-ID: f5be055554ee93e6cc66b0053b590bef3728dbd6 11008 11009commit 7f23f42123d64272a7b00754afa6b0841d676691 11010Author: Darren Tucker <dtucker@dtucker.net> 11011Date: Fri May 1 12:21:58 2020 +1000 11012 11013 Include sys/byteorder.h for htons and friends. 11014 11015 These are usually in netinet/in.h but on HP-UX they are not defined if 11016 _XOPEN_SOURCE_EXTENDED is set. Only needed for netcat in the regression 11017 tests. 11018 11019commit d27cba58c972d101a5de976777e518f34ac779cb 11020Author: Darren Tucker <dtucker@dtucker.net> 11021Date: Fri May 1 09:21:52 2020 +1000 11022 11023 Fix conditional for openssl-based chacha20. 11024 11025 Fixes warnings or link errors when building against older OpenSSLs. 11026 ok djm 11027 11028commit 20819b962dc1467cd6fad5486a7020c850efdbee 11029Author: Darren Tucker <dtucker@dtucker.net> 11030Date: Fri Apr 24 15:07:55 2020 +1000 11031 11032 Error out if given RDomain if unsupported. 11033 11034 If the config contained 'RDomain %D' on a platform that did not support 11035 it, the error would not be detected until runtime resulting in a broken 11036 sshd. Detect this earlier and error out if found. bz#3126, based on a 11037 patch from jjelen at redhat.com, tweaks and ok djm@ 11038 11039commit 2c1690115a585c624eed2435075a93a463a894e2 11040Author: dtucker@openbsd.org <dtucker@openbsd.org> 11041Date: Fri Apr 24 03:33:21 2020 +0000 11042 11043 upstream: Fix incorrect error message for "too many known hosts files." 11044 11045 bz#3149, patch from jjelen at redhat.com. 11046 11047 OpenBSD-Commit-ID: e0fcb07ed5cf7fd54ce340471a747c24454235e5 11048 11049commit 3beb7276e7a8aedd3d4a49f9c03b97f643448c92 11050Author: dtucker@openbsd.org <dtucker@openbsd.org> 11051Date: Fri Apr 24 02:19:40 2020 +0000 11052 11053 upstream: Remove leave_non_blocking() which is now dead code 11054 11055 because nothing sets in_non_blocking_mode any more. Patch from 11056 michaael.meeks at collabora.com, ok djm@ 11057 11058 OpenBSD-Commit-ID: c403cefe97a5a99eca816e19cc849cdf926bd09c 11059 11060commit 8654e3561772f0656e7663a0bd6a1a8cb6d43300 11061Author: jmc@openbsd.org <jmc@openbsd.org> 11062Date: Thu Apr 23 21:28:09 2020 +0000 11063 11064 upstream: ce examples of "Ar arg Ar arg" with "Ar arg arg" and 11065 11066 stop the spread; 11067 11068 OpenBSD-Commit-ID: af0e952ea0f5e2019c2ce953ed1796eca47f0705 11069 11070commit 67697e4a8246dd8423e44b8785f3ee31fee72d07 11071Author: Darren Tucker <dtucker@dtucker.net> 11072Date: Fri Apr 24 11:10:18 2020 +1000 11073 11074 Update .depend. 11075 11076commit d6cc76176216fe3fac16cd20d148d75cb9c50876 11077Author: Darren Tucker <dtucker@dtucker.net> 11078Date: Wed Apr 22 14:07:00 2020 +1000 11079 11080 Mailing list is now closed to non-subscribers. 11081 11082 While there, add a reference to the bugzilla. ok djm@ 11083 11084commit cecde6a41689d0ae585ec903b190755613a6de79 11085Author: Darren Tucker <dtucker@dtucker.net> 11086Date: Wed Apr 22 12:09:40 2020 +1000 11087 11088 Put the values from env vars back. 11089 11090 This merges the values from the recently removed environment into make's 11091 command line arguments since we actually need those. 11092 11093commit 300c4322b92e98d3346efa0aec1c094c94d0f964 11094Author: Darren Tucker <dtucker@dtucker.net> 11095Date: Wed Apr 22 11:33:15 2020 +1000 11096 11097 Pass configure's egrep through to test-exec.sh. 11098 11099 Use it to create a wrapper function to call it from tests. Fixes the 11100 keygen-comment test on platforms with impoverished default egrep (eg 11101 Solaris). 11102 11103commit c8d9796cfe046f00eb8b2096d2b7028d6a523a84 11104Author: Darren Tucker <dtucker@dtucker.net> 11105Date: Wed Apr 22 10:56:44 2020 +1000 11106 11107 Remove unneeded env vars from t-exec invocation. 11108 11109commit 01d4cdcd4514e99a4b6eb9523cd832bbf008d1d7 11110Author: dtucker@openbsd.org <dtucker@openbsd.org> 11111Date: Tue Apr 21 23:14:58 2020 +0000 11112 11113 upstream: Backslash '$' at then end of string. Prevents warning on 11114 11115 some shells. 11116 11117 OpenBSD-Regress-ID: 5dc27ab624c09d34078fd326b10e38c1ce9c741f 11118 11119commit 8854724ccefc1fa16f10b37eda2e759c98148caa 11120Author: Darren Tucker <dtucker@dtucker.net> 11121Date: Tue Apr 21 18:27:23 2020 +1000 11122 11123 Sync rev 1.49. 11124 11125 Prevent infinite for loop since i went from ssize_t to size_t. Patch from 11126 eagleoflqj via OpenSSH github PR#178, ok djm@, feedback & ok millert@ 11127 11128commit d00d07b6744d3b4bb7aca46c734ecd670148da23 11129Author: djm@openbsd.org <djm@openbsd.org> 11130Date: Mon Apr 20 04:44:47 2020 +0000 11131 11132 upstream: regression test for printing of private key fingerprints and 11133 11134 key comments, mostly by loic AT venez.fr (slightly tweaked for portability) 11135 ok dtucker@ 11136 11137 OpenBSD-Regress-ID: 8dc6c4feaf4fe58b6d634cd89afac9a13fd19004 11138 11139commit a98d5ba31e5e7e01317352f85fa63b846a960f8c 11140Author: djm@openbsd.org <djm@openbsd.org> 11141Date: Mon Apr 20 04:43:57 2020 +0000 11142 11143 upstream: fix a bug I introduced in r1.406: when printing private key 11144 11145 fingerprint of old-format key, key comments were not being displayed. Spotted 11146 by loic AT venez.fr, ok dtucker 11147 11148 OpenBSD-Commit-ID: 2d98e4f9eb168eea733d17e141e1ead9fe26e533 11149 11150commit 32f2d0aad42c15e19bd3b07496076ca891573a58 11151Author: djm@openbsd.org <djm@openbsd.org> 11152Date: Fri Apr 17 07:16:07 2020 +0000 11153 11154 upstream: repair private key fingerprint printing to also print 11155 11156 comment after regression caused by my recent pubkey loading refactor. 11157 Reported by loic AT venez.fr, ok dtucker@ 11158 11159 OpenBSD-Commit-ID: f8db49acbee6a6ccb2a4259135693b3cceedb89e 11160 11161commit 094dd513f4b42e6a3cebefd18d1837eb709b4d99 11162Author: djm@openbsd.org <djm@openbsd.org> 11163Date: Fri Apr 17 07:15:11 2020 +0000 11164 11165 upstream: refactor out some duplicate private key loading code; 11166 11167 based on patch from loic AT venez.fr, ok dtucker@ 11168 11169 OpenBSD-Commit-ID: 5eff2476b0d8d0614924c55e350fb7bb9c84f45e 11170 11171commit 4e04f46f248f1708e39b900b76c9693c820eff68 11172Author: jmc@openbsd.org <jmc@openbsd.org> 11173Date: Fri Apr 17 06:12:41 2020 +0000 11174 11175 upstream: add space beteen macro arg and punctuation; 11176 11177 OpenBSD-Commit-ID: c93a6cbb4bf9468fc4c13e64bc1fd4efee201a44 11178 11179commit 44ae009a0112081d0d541aeaa90088bedb6f21ce 11180Author: djm@openbsd.org <djm@openbsd.org> 11181Date: Fri Apr 17 04:27:03 2020 +0000 11182 11183 upstream: auth2-pubkey r1.89 changed the order of operations to 11184 11185 checking AuthorizedKeysFile first and falling back to AuthorizedKeysCommand 11186 if no key was found in a file. Document this order here; bz3134 11187 11188 OpenBSD-Commit-ID: afce0872cbfcfc1d4910ad7722e50f792a1dce12 11189 11190commit f96f17f920f38ceea6f3c5cb0b075c46b8929fdc 11191Author: Damien Miller <djm@mindrot.org> 11192Date: Fri Apr 17 14:07:15 2020 +1000 11193 11194 sys/sysctl.h is only used on OpenBSD 11195 11196 so change the preprocessor test used to include it to check 11197 __OpenBSD__, matching the code that uses the symbols it declares. 11198 11199commit 54688e937a69c7aebef8a3d50cbd4c6345bab2ca 11200Author: djm@openbsd.org <djm@openbsd.org> 11201Date: Fri Apr 17 03:38:47 2020 +0000 11202 11203 upstream: fix reversed test that caused IdentitiesOnly=yes to not 11204 11205 apply to keys loaded from a PKCS11Provider; bz3141, ok dtucker@ 11206 11207 OpenBSD-Commit-ID: e3dd6424b94685671fe84c9b9dbe352fb659f677 11208 11209commit 267cbc87b5b6e78973ac4d3c7a6f807ed226928c 11210Author: djm@openbsd.org <djm@openbsd.org> 11211Date: Fri Apr 17 03:34:42 2020 +0000 11212 11213 upstream: mention that /etc/hosts.equiv and /etc/shosts.equiv are 11214 11215 not considered for HostbasedAuthentication when the target user is root; 11216 bz3148 11217 11218 OpenBSD-Commit-ID: fe4c1256929e53f23af17068fbef47852f4bd752 11219 11220commit c90f72d29e84b4a2709078bf5546a72c29a65177 11221Author: djm@openbsd.org <djm@openbsd.org> 11222Date: Fri Apr 17 03:30:05 2020 +0000 11223 11224 upstream: make IgnoreRhosts a tri-state option: "yes" ignore 11225 11226 rhosts/shosts, "no" allow rhosts/shosts or (new) "shosts-only" to allow 11227 .shosts files but not .rhosts. ok dtucker@ 11228 11229 OpenBSD-Commit-ID: d08d6930ed06377a80cf53923c1955e9589342e9 11230 11231commit 321c7147079270f3a154f91b59e66219aac3d514 11232Author: djm@openbsd.org <djm@openbsd.org> 11233Date: Fri Apr 17 03:23:13 2020 +0000 11234 11235 upstream: allow the IgnoreRhosts directive to appear anywhere in a 11236 11237 sshd_config, not just before any Match blocks; bz3148, ok dtucker@ 11238 11239 OpenBSD-Commit-ID: e042467d703bce640b1f42c5d1a62bf3825736e8 11240 11241commit ca5403b085a735055ec7b7cdcd5b91f2662df94c 11242Author: jmc@openbsd.org <jmc@openbsd.org> 11243Date: Sat Apr 11 20:20:09 2020 +0000 11244 11245 upstream: add space between macro arg and punctuation; 11246 11247 OpenBSD-Commit-ID: e579e4d95eef13059c30931ea1f09ed8296b819c 11248 11249commit 8af0244d7b4a65eed2e62f9c89141c7c8e63f09d 11250Author: Darren Tucker <dtucker@dtucker.net> 11251Date: Wed Apr 15 10:58:02 2020 +1000 11252 11253 Add sys/syscall.h for syscall numbers. 11254 11255 In some architecture/libc configurations we need to explicitly include 11256 sys/syscall.h for the syscall number (__NR_xxx) definitions. bz#3085, 11257 patch from blowfist at xroutine.net. 11258 11259commit 3779b50ee952078018a5d9e1df20977f4355df17 11260Author: djm@openbsd.org <djm@openbsd.org> 11261Date: Sat Apr 11 10:16:11 2020 +0000 11262 11263 upstream: Refactor private key parsing. Eliminates a fair bit of 11264 11265 duplicated code and fixes oss-fuzz#20074 (NULL deref) caused by a missing key 11266 type check in the ECDSA_CERT parsing path. 11267 11268 feedback and ok markus@ 11269 11270 OpenBSD-Commit-ID: 4711981d88afb7196d228f7baad9be1d3b20f9c9 11271 11272commit b6a4013647db67ec622c144a9e05dd768f1966b3 11273Author: dtucker@openbsd.org <dtucker@openbsd.org> 11274Date: Fri Apr 10 00:54:03 2020 +0000 11275 11276 upstream: Add tests for TOKEN expansion of LocalForward and 11277 11278 RemoteForward. 11279 11280 OpenBSD-Regress-ID: 90fcbc60d510eb114a2b6eaf4a06ff87ecd80a89 11281 11282commit abc3e0a5179c13c0469a1b11fe17d832abc39999 11283Author: dtucker@openbsd.org <dtucker@openbsd.org> 11284Date: Mon Apr 6 09:43:55 2020 +0000 11285 11286 upstream: Add utf8.c for asmprintf used by krl.c 11287 11288 OpenBSD-Regress-ID: 433708d11165afdb189fe635151d21659dd37a37 11289 11290commit 990687a0336098566c3a854d23cce74a31ec6fe2 11291Author: dtucker@openbsd.org <dtucker@openbsd.org> 11292Date: Fri Apr 10 00:52:07 2020 +0000 11293 11294 upstream: Add TOKEN percent expansion to LocalFoward and RemoteForward 11295 11296 when used for Unix domain socket forwarding. Factor out the code for the 11297 config keywords that use the most common subset of TOKENS into its own 11298 function. bz#3014, ok jmc@ (man page bits) djm@ 11299 11300 OpenBSD-Commit-ID: bffc9f7e7b5cf420309a057408bef55171fd0b97 11301 11302commit 2b13d3934d5803703c04803ca3a93078ecb5b715 11303Author: djm@openbsd.org <djm@openbsd.org> 11304Date: Wed Apr 8 00:10:37 2020 +0000 11305 11306 upstream: let sshkey_try_load_public() load public keys from the 11307 11308 unencrypted envelope of private key files if not sidecar public key file is 11309 present. 11310 11311 ok markus@ 11312 11313 OpenBSD-Commit-ID: 252a0a580e10b9a6311632530d63b5ac76592040 11314 11315commit d01f39304eaab0352793b490a25e1ab5f59a5366 11316Author: djm@openbsd.org <djm@openbsd.org> 11317Date: Wed Apr 8 00:09:24 2020 +0000 11318 11319 upstream: simplify sshkey_try_load_public() 11320 11321 ok markus@ 11322 11323 OpenBSD-Commit-ID: 05a5d46562aafcd70736c792208b1856064f40ad 11324 11325commit f290ab0833e44355fc006e4e67b92446c14673ef 11326Author: djm@openbsd.org <djm@openbsd.org> 11327Date: Wed Apr 8 00:08:46 2020 +0000 11328 11329 upstream: add sshkey_parse_pubkey_from_private_fileblob_type() 11330 11331 Extracts a public key from the unencrypted envelope of a new-style 11332 OpenSSH private key. 11333 11334 ok markus@ 11335 11336 OpenBSD-Commit-ID: 44d7ab446e5e8c686aee96d5897b26b3939939aa 11337 11338commit 8d514eea4ae089626a55e11c7bc1745c8d9683e4 11339Author: djm@openbsd.org <djm@openbsd.org> 11340Date: Wed Apr 8 00:07:19 2020 +0000 11341 11342 upstream: simplify sshkey_parse_private_fileblob_type() 11343 11344 Try new format parser for all key types first, fall back to PEM 11345 parser only for invalid format errors. 11346 11347 ok markus@ 11348 11349 OpenBSD-Commit-ID: 0173bbb3a5cface77b0679d4dca0e15eb5600b77 11350 11351commit 421169d0e758351b105eabfcebf42378ebf17217 11352Author: djm@openbsd.org <djm@openbsd.org> 11353Date: Wed Apr 8 00:05:59 2020 +0000 11354 11355 upstream: check private key type against requested key type in 11356 11357 new-style private decoding; ok markus@ 11358 11359 OpenBSD-Commit-ID: 04d44b3a34ce12ce5187fb6f6e441a88c8c51662 11360 11361commit 6aabfb6d22b36d07f584cba97f4cdc4363a829da 11362Author: djm@openbsd.org <djm@openbsd.org> 11363Date: Wed Apr 8 00:04:32 2020 +0000 11364 11365 upstream: check that pubkey in private key envelope matches actual 11366 11367 private key 11368 11369 (this public key is currently unusued) 11370 11371 ok markus@ 11372 11373 OpenBSD-Commit-ID: 634a60b5e135d75f48249ccdf042f3555112049c 11374 11375commit c0f5b2294796451001fd328c44f0d00f1114eddf 11376Author: djm@openbsd.org <djm@openbsd.org> 11377Date: Wed Apr 8 00:01:52 2020 +0000 11378 11379 upstream: refactor private key parsing a little 11380 11381 Split out the base64 decoding and private section decryption steps in 11382 to separate functions. This will make the decryption step easier to fuzz 11383 as well as making it easier to write a "load public key from new-format 11384 private key" function. 11385 11386 ok markus@ 11387 11388 OpenBSD-Commit-ID: 7de31d80fb9062aa01901ddf040c286b64ff904e 11389 11390commit 8461a5b3db34ed0b5a4a18d82f64fd5ac8693ea8 11391Author: Darren Tucker <dtucker@dtucker.net> 11392Date: Mon Apr 6 20:54:34 2020 +1000 11393 11394 Include openssl-compat.h before checking ifdefs. 11395 11396 Fixes problem where unsuitable chacha20 code in libressl would be used 11397 unintentionally. 11398 11399commit 931c50c5883a9910ea1ae9a371e4e815ec56b035 11400Author: Damien Miller <djm@mindrot.org> 11401Date: Mon Apr 6 10:04:56 2020 +1000 11402 11403 fix inverted test for LibreSSL version 11404 11405commit d1d5f728511e2338b7c994968d301d8723012264 11406Author: dtucker@openbsd.org <dtucker@openbsd.org> 11407Date: Sat Apr 4 23:04:41 2020 +0000 11408 11409 upstream: Indicate if we're using a cached key in trace output. 11410 11411 OpenBSD-Regress-ID: 409a7b0e59d1272890fda507651c0c3d2d3c0d89 11412 11413commit a398251a4627367c78bc483c70c2ec973223f82c 11414Author: Darren Tucker <dtucker@dtucker.net> 11415Date: Sun Apr 5 08:43:57 2020 +1000 11416 11417 Use /usr/bin/xp4g/id if necessary. 11418 11419 Solaris' native "id" doesn't support the options we use but the one 11420 in /usr/bin/xp4g does, so use that instead. 11421 11422commit db0fdd48335b5b01114f78c1a73a195235910f81 11423Author: dtucker@openbsd.org <dtucker@openbsd.org> 11424Date: Sat Apr 4 22:14:26 2020 +0000 11425 11426 upstream: Some platforms don't have "hostname -s", so use cut to trim 11427 11428 short hostname instead. 11429 11430 OpenBSD-Regress-ID: ebcf36a6fdf287c9336b0d4f6fc9f793c05307a7 11431 11432commit e7e59a9cc8eb7fd5944ded28f4d7e3ae0a5fdecd 11433Author: dtucker@openbsd.org <dtucker@openbsd.org> 11434Date: Fri Apr 3 07:53:10 2020 +0000 11435 11436 upstream: Compute hash locally and re-enable %C tests. 11437 11438 OpenBSD-Regress-ID: 94d1366e8105274858b88a1f9ad2e62801e49770 11439 11440commit abe2b245b3ac6c4801e99bc0f13289cd28211e22 11441Author: Damien Miller <djm@mindrot.org> 11442Date: Fri Apr 3 17:25:46 2020 +1100 11443 11444 prefer libcrypto chacha20-poly1305 where possible 11445 11446commit bc5c5d01ad668981f9e554e62195383bc12e8528 11447Author: dtucker@openbsd.org <dtucker@openbsd.org> 11448Date: Fri Apr 3 05:43:11 2020 +0000 11449 11450 upstream: Temporarily remove tests for '%C' since the hash contains the 11451 11452 local hostname and it doesn't work on any machine except mine... spotted by 11453 djm@ 11454 11455 OpenBSD-Regress-ID: 2d4c3585b9fcbbff14f4a5a5fde51dbd0d690401 11456 11457commit 81624026989654955a657ebf2a1fe8b9994f3c87 11458Author: djm@openbsd.org <djm@openbsd.org> 11459Date: Fri Apr 3 06:07:57 2020 +0000 11460 11461 upstream: r1.522 deleted one too many lines; repair 11462 11463 OpenBSD-Commit-ID: 1af8851fd7a99e4a887b19aa8f4c41a6b3d25477 11464 11465commit 668cb3585ce829bd6e34d4a962c489bda1d16370 11466Author: jmc@openbsd.org <jmc@openbsd.org> 11467Date: Fri Apr 3 05:53:52 2020 +0000 11468 11469 upstream: sort -N and add it to usage(); 11470 11471 OpenBSD-Commit-ID: 5b00e8db37c2b0a54c7831fed9e5f4db53ada332 11472 11473commit 338ccee1e7fefa47f3d128c2541e94c5270abe0c 11474Author: djm@openbsd.org <djm@openbsd.org> 11475Date: Fri Apr 3 05:48:57 2020 +0000 11476 11477 upstream: avoid another compiler warning spotted in -portable 11478 11479 OpenBSD-Commit-ID: 1d29c51ac844b287c4c8bcaf04c63c7d9ba3b8c7 11480 11481commit 9f8a42340bd9af86a99cf554dc39ecdf89287544 11482Author: djm@openbsd.org <djm@openbsd.org> 11483Date: Fri Apr 3 04:07:48 2020 +0000 11484 11485 upstream: this needs utf8.c too 11486 11487 OpenBSD-Regress-ID: 445040036cec714d28069a20da25553a04a28451 11488 11489commit 92115ea7c3a834374720c350841fc729e7d5c8b2 11490Author: dtucker@openbsd.org <dtucker@openbsd.org> 11491Date: Fri Apr 3 03:14:03 2020 +0000 11492 11493 upstream: Add percent_expand test for 'Match Exec'. 11494 11495 OpenBSD-Regress-ID: a41c14fd6a0b54d66aa1e9eebfb9ec962b41232f 11496 11497commit de34a440276ae855c38deb20f926d46752c62c9d 11498Author: djm@openbsd.org <djm@openbsd.org> 11499Date: Fri Apr 3 04:43:24 2020 +0000 11500 11501 upstream: fix format string (use %llu for uint64, not %lld). spotted by 11502 11503 Darren and his tinderbox tests 11504 11505 OpenBSD-Commit-ID: 3b4587c3d9d46a7be9bdf028704201943fba96c2 11506 11507commit 9cd40b829a5295cc81fbea8c7d632b2478db6274 11508Author: djm@openbsd.org <djm@openbsd.org> 11509Date: Fri Apr 3 04:34:15 2020 +0000 11510 11511 upstream: Add a flag to re-enable verbose output when in batch 11512 11513 mode; requested in bz3135; ok dtucker 11514 11515 OpenBSD-Commit-ID: 5ad2ed0e6440562ba9c84b666a5bbddc1afe2e2b 11516 11517commit 6ce51a5da5d333a44e7c74c027f3571f70c39b24 11518Author: djm@openbsd.org <djm@openbsd.org> 11519Date: Fri Apr 3 04:32:21 2020 +0000 11520 11521 upstream: chacha20-poly1305 AEAD using libcrypto EVP_chacha20 11522 11523 Based on patch from Yuriy M. Kaminskiy. ok + lots of assistance along the 11524 way at a2k20 tb@ 11525 11526 OpenBSD-Commit-ID: 5e08754c13d31258bae6c5e318cc96219d6b10f0 11527 11528commit eba523f0a130f1cce829e6aecdcefa841f526a1a 11529Author: djm@openbsd.org <djm@openbsd.org> 11530Date: Fri Apr 3 04:27:03 2020 +0000 11531 11532 upstream: make Chacha20-POLY1305 context struct opaque; ok tb@ as 11533 11534 part of a larger diff at a2k20 11535 11536 OpenBSD-Commit-ID: a4609b7263284f95c9417ef60ed7cdbb7bf52cfd 11537 11538commit ebd29e90129cf18fedfcfe1de86e324228669295 11539Author: djm@openbsd.org <djm@openbsd.org> 11540Date: Fri Apr 3 04:06:26 2020 +0000 11541 11542 upstream: fix debug statement 11543 11544 OpenBSD-Commit-ID: 42c6edeeda5ce88b51a20d88c93be3729ce6b916 11545 11546commit 7b4d8999f2e1a0cb7b065e3efa83e6edccfc7d82 11547Author: djm@openbsd.org <djm@openbsd.org> 11548Date: Fri Apr 3 04:03:51 2020 +0000 11549 11550 upstream: the tunnel-forwarding vs ExitOnForwardFailure fix that I 11551 11552 committed earlier had an off-by-one. Fix this and add some debugging that 11553 would have made it apparent sooner. 11554 11555 OpenBSD-Commit-ID: 082f8f72b1423bd81bbdad750925b906e5ac6910 11556 11557commit eece243666d44ceb710d004624c5c7bdc05454bc 11558Author: dtucker@openbsd.org <dtucker@openbsd.org> 11559Date: Fri Apr 3 03:12:11 2020 +0000 11560 11561 upstream: %C expansion just added to Match Exec should include 11562 11563 remote user not local user. 11564 11565 OpenBSD-Commit-ID: 80f1d976938f2a55ee350c11d8b796836c8397e2 11566 11567commit d5318a784d016478fc8da90a38d9062c51c10432 11568Author: dtucker@openbsd.org <dtucker@openbsd.org> 11569Date: Fri Apr 3 02:33:31 2020 +0000 11570 11571 upstream: Add regression test for percent expansions where possible. 11572 11573 OpenBSD-Regress-ID: 7283be8b2733ac1cbefea3048a23d02594485288 11574 11575commit 663e84bb53de2a60e56a44d538d25b8152b5c1cc 11576Author: djm@openbsd.org <djm@openbsd.org> 11577Date: Fri Apr 3 02:40:32 2020 +0000 11578 11579 upstream: make failures when establishing "Tunnel" forwarding terminate 11580 11581 the connection when ExitOnForwardFailure is enabled; bz3116; ok dtucker 11582 11583 OpenBSD-Commit-ID: ef4b4808de0a419c17579b1081da768625c1d735 11584 11585commit ed833da176611a39d3376d62154eb88eb440d31c 11586Author: dtucker@openbsd.org <dtucker@openbsd.org> 11587Date: Fri Apr 3 02:27:12 2020 +0000 11588 11589 upstream: Make with config keywords support which 11590 11591 percent_expansions more consistent. - %C is moved into its own function and 11592 added to Match Exec. - move the common (global) options into a macro. This 11593 is ugly but it's the least-ugly way I could come up with. - move 11594 IdentityAgent and ForwardAgent percent expansion to before the config dump 11595 to make it regression-testable. - document all of the above 11596 11597 ok jmc@ for man page bits, "makes things less terrible" djm@ for the rest. 11598 11599 OpenBSD-Commit-ID: 4b65664bd6d8ae2a9afaf1a2438ddd1b614b1d75 11600 11601commit 6ec7457171468da2bbd908b8cd63d298b0e049ea 11602Author: djm@openbsd.org <djm@openbsd.org> 11603Date: Fri Apr 3 02:26:56 2020 +0000 11604 11605 upstream: give ssh-keygen the ability to dump the contents of a 11606 11607 binary key revocation list: ssh-keygen -lQf /path bz#3132; ok dtucker 11608 11609 OpenBSD-Commit-ID: b76afc4e3b74ab735dbde4e5f0cfa1f02356033b 11610 11611commit af628b8a6c3ef403644d83d205c80ff188c97f0c 11612Author: djm@openbsd.org <djm@openbsd.org> 11613Date: Fri Apr 3 02:25:21 2020 +0000 11614 11615 upstream: add allocating variant of the safe utf8 printer; ok 11616 11617 dtucker as part of a larger diff 11618 11619 OpenBSD-Commit-ID: 037e2965bd50eacc2ffb49889ecae41552744fa0 11620 11621commit d8ac9af645f5519ac5211e9e1e4dc1ed00e9cced 11622Author: dtucker@openbsd.org <dtucker@openbsd.org> 11623Date: Mon Mar 16 02:17:02 2020 +0000 11624 11625 upstream: Cast lifetime to u_long for comparison to prevent unsigned 11626 11627 comparison warning on 32bit arches. Spotted by deraadt, ok djm. 11628 11629 OpenBSD-Commit-ID: 7a75b2540bff5ab4fa00b4d595db1df13bb0515a 11630 11631commit 0eaca933ae08b0a515edfccd5cc4a6b667034813 11632Author: Darren Tucker <dtucker@dtucker.net> 11633Date: Sat Mar 14 20:58:46 2020 +1100 11634 11635 Include fido.h when checking for fido/credman.h. 11636 11637 It's required for fido_dev_t, otherwise configure fails with 11638 when given --with-security-key-builtin. 11639 11640commit c7c099060f82ffe6a36d8785ecf6052e12fd92f0 11641Author: djm@openbsd.org <djm@openbsd.org> 11642Date: Fri Mar 13 03:18:45 2020 +0000 11643 11644 upstream: some more speeling mistakes from 11645 11646 OpenBSD-Regress-ID: 02471c079805471c546b7a69d9ab1d34e9a57443 11647 11648commit 1d89232a4aa97fe935cd60b8d24d75c2f70d56c5 11649Author: djm@openbsd.org <djm@openbsd.org> 11650Date: Fri Mar 13 04:16:27 2020 +0000 11651 11652 upstream: improve error messages for some common PKCS#11 C_Login 11653 11654 failure cases; based on patch from Jacob Hoffman-Andrews in bz3130; ok 11655 dtucker 11656 11657 OpenBSD-Commit-ID: b8b849621b4a98e468942efd0a1c519c12ce089e 11658 11659commit 5becbec023f2037394987f85ed7f74b9a28699e0 11660Author: djm@openbsd.org <djm@openbsd.org> 11661Date: Fri Mar 13 04:01:56 2020 +0000 11662 11663 upstream: use sshpkt_fatal() for kex_exchange_identification() 11664 11665 errors. This ensures that the logged errors are consistent with other 11666 transport- layer errors and that the relevant IP addresses are logged. bz3129 11667 ok dtucker@ 11668 11669 OpenBSD-Commit-ID: 2c22891f0b9e1a6cd46771cedbb26ac96ec2e6ab 11670 11671commit eef88418f9e5e51910af3c5b23b5606ebc17af55 11672Author: dtucker@openbsd.org <dtucker@openbsd.org> 11673Date: Fri Mar 13 03:24:49 2020 +0000 11674 11675 upstream: Don't clear alarm timers in listening sshd. Previously 11676 11677 these timers were used for regenerating the SSH1 ephemeral host keys but 11678 those are now gone so there's no need to clear the timers either. ok 11679 deraadt@ 11680 11681 OpenBSD-Commit-ID: 280d2b885e4a1ce404632e8cc38fcb17be7dafc0 11682 11683commit d081f017c20a3564255873ed99fd7d024cac540f 11684Author: djm@openbsd.org <djm@openbsd.org> 11685Date: Fri Mar 13 03:17:07 2020 +0000 11686 11687 upstream: spelling errors in comments; no code change from 11688 11689 OpenBSD-Commit-ID: 166ea64f6d84f7bac5636dbd38968592cb5eb924 11690 11691commit c084a2d040f160bc2b83f13297e3e3ca3f5dbac6 11692Author: djm@openbsd.org <djm@openbsd.org> 11693Date: Fri Mar 13 03:12:17 2020 +0000 11694 11695 upstream: when downloading FIDO2 resident keys from a token, don't 11696 11697 prompt for a PIN until the token has told us that it needs one. Avoids 11698 double-prompting on devices that implement on-device authentication (e.g. a 11699 touchscreen PIN pad on the Trezor Model T). ok dtucker@ 11700 11701 OpenBSD-Commit-ID: 38b78903dd4422d7d3204095a31692fb69130817 11702 11703commit 955c4cf4c6a1417c28d4e1040702c4d9bf63645b 11704Author: Damien Miller <djm@mindrot.org> 11705Date: Fri Mar 13 14:30:16 2020 +1100 11706 11707 sync fnmatch.c with upstream to fix another typo 11708 11709commit 397f217e8640e75bb719a8e87111b4bd848fb3df 11710Author: Damien Miller <djm@mindrot.org> 11711Date: Fri Mar 13 14:24:23 2020 +1100 11712 11713 another spelling error in comment 11714 11715commit def31bc5427579ec3f7f2ce99f2da1338fdc0c9f 11716Author: Damien Miller <djm@mindrot.org> 11717Date: Fri Mar 13 14:23:07 2020 +1100 11718 11719 spelling mistakes 11720 11721 from https://fossies.org/linux/misc/openssh-8.2p1.tar.gz/codespell.html 11722 11723commit 8bdc3bb7cf4c82c3344cfcb82495a43406e87e83 11724Author: markus@openbsd.org <markus@openbsd.org> 11725Date: Fri Mar 6 18:29:54 2020 +0000 11726 11727 upstream: fix relative includes in sshd_config; ok djm 11728 11729 OpenBSD-Commit-ID: fa29b0da3c93cbc3a1d4c6bcd58af43c00ffeb5b 11730 11731commit e32ef97a56ae03febfe307688858badae3a70e5a 11732Author: markus@openbsd.org <markus@openbsd.org> 11733Date: Fri Mar 6 18:29:14 2020 +0000 11734 11735 upstream: fix use-after-free in do_download_sk; ok djm 11736 11737 OpenBSD-Commit-ID: 96b49623d297797d4fc069f1f09e13c8811f8863 11738 11739commit 5732d58020309364bf31fa125354e399361006db 11740Author: markus@openbsd.org <markus@openbsd.org> 11741Date: Fri Mar 6 18:28:50 2020 +0000 11742 11743 upstream: do not leak oprincipals; ok djm 11744 11745 OpenBSD-Commit-ID: 4691d9387eab36f8fda48f5d8009756ed13a7c4c 11746 11747commit 8fae395f34c2c52cdaf9919aa261d1848b4bb00b 11748Author: markus@openbsd.org <markus@openbsd.org> 11749Date: Fri Mar 6 18:28:27 2020 +0000 11750 11751 upstream: initialize seconds for debug message; ok djm 11752 11753 OpenBSD-Commit-ID: 293fbefe6d00b4812a180ba02e26170e4c855b81 11754 11755commit 46e5c4c8ffcd1569bcd5d04803abaa2ecf3e4cff 11756Author: markus@openbsd.org <markus@openbsd.org> 11757Date: Fri Mar 6 18:27:50 2020 +0000 11758 11759 upstream: correct return code; ok djm 11760 11761 OpenBSD-Commit-ID: 319d09e3b7f4b2bc920c67244d9ff6426b744810 11762 11763commit 31c39e7840893f1bfdcbe4f813b20d1d7e69ec3e 11764Author: markus@openbsd.org <markus@openbsd.org> 11765Date: Fri Mar 6 18:27:15 2020 +0000 11766 11767 upstream: principalsp is optional, pubkey required; ok djm 11768 11769 OpenBSD-Commit-ID: 2cc3ea5018c28ed97edaccd7f17d2cc796f01024 11770 11771commit e26a31757c5df2f58687cb9a4853d1418f39728e 11772Author: markus@openbsd.org <markus@openbsd.org> 11773Date: Fri Mar 6 18:26:21 2020 +0000 11774 11775 upstream: remove unused variables in ssh-pkcs11-helper; ok djm 11776 11777 OpenBSD-Commit-ID: 13e572846d0d1b28f1251ddd2165e9cf18135ae1 11778 11779commit 1b378c0d982d6ab522eda634b0e88cf1fca5e352 11780Author: markus@openbsd.org <markus@openbsd.org> 11781Date: Fri Mar 6 18:25:48 2020 +0000 11782 11783 upstream: return correct error in sshsk_ed25519_sig; ok djm 11784 11785 OpenBSD-Commit-ID: 52bf733df220303c260fee4f165ec64b4a977625 11786 11787commit fbff605e637b068061ab6784ff03e3874890c092 11788Author: markus@openbsd.org <markus@openbsd.org> 11789Date: Fri Mar 6 18:25:12 2020 +0000 11790 11791 upstream: fix possible null-deref in check_key_not_revoked; ok 11792 11793 djm 11794 11795 OpenBSD-Commit-ID: 80855e9d7af42bb6fcc16c074ba69876bfe5e3bf 11796 11797commit bc30b446841fc16e50ed6e75c56ccfbd37b9f281 11798Author: markus@openbsd.org <markus@openbsd.org> 11799Date: Fri Mar 6 18:24:39 2020 +0000 11800 11801 upstream: ssh_fetch_identitylist() returns the return value from 11802 11803 ssh_request_reply() so we should also check against != 0 ok djm 11804 11805 OpenBSD-Commit-ID: 28d0028769d03e665688c61bb5fd943e18614952 11806 11807commit 7b4f70ddeb59f35283d77d8d9c834ca58f8cf436 11808Author: markus@openbsd.org <markus@openbsd.org> 11809Date: Fri Mar 6 18:23:17 2020 +0000 11810 11811 upstream: sshkey_cert_check_authority requires reason to be set; 11812 11813 ok djm 11814 11815 OpenBSD-Commit-ID: 6f7a6f19540ed5749763c2f9530c0897c94aa552 11816 11817commit 05efe270df1e925db0af56a806d18b5063db4b6d 11818Author: markus@openbsd.org <markus@openbsd.org> 11819Date: Fri Mar 6 18:21:28 2020 +0000 11820 11821 upstream: passphrase depends on kdfname, not ciphername (possible 11822 11823 null-deref); ok djm 11824 11825 OpenBSD-Commit-ID: 0d39668edf5e790b5837df4926ee1141cec5471c 11826 11827commit 1ddf5682f3992bdacd29164891abb71a19c2cf61 11828Author: markus@openbsd.org <markus@openbsd.org> 11829Date: Fri Mar 6 18:20:44 2020 +0000 11830 11831 upstream: consistently check packet_timeout_ms against 0; ok djm 11832 11833 OpenBSD-Commit-ID: e8fb8cb2c96c980f075069302534eaf830929928 11834 11835commit 31f1ee54968ad84eb32375e4412e0318766b586b 11836Author: markus@openbsd.org <markus@openbsd.org> 11837Date: Fri Mar 6 18:20:02 2020 +0000 11838 11839 upstream: initialize cname in case ai_canonname is NULL or too 11840 11841 long; ok djm 11842 11843 OpenBSD-Commit-ID: c27984636fdb1035d1642283664193e91aab6e37 11844 11845commit a6134b02b5264b2611c8beae98bb392329452bba 11846Author: markus@openbsd.org <markus@openbsd.org> 11847Date: Fri Mar 6 18:19:21 2020 +0000 11848 11849 upstream: fix uninitialized pointers for forward_cancel; ok djm 11850 11851 OpenBSD-Commit-ID: 612778e6d87ee865d0ba97d0a335f141cee1aa37 11852 11853commit 16d4f9961c75680aab374dee762a5baa0ad507af 11854Author: markus@openbsd.org <markus@openbsd.org> 11855Date: Fri Mar 6 18:16:21 2020 +0000 11856 11857 upstream: exit on parse failures in input_service_request; ok djm 11858 11859 OpenBSD-Commit-ID: 6a7e1bfded26051d5aa893c030229b1ee6a0d5d2 11860 11861commit 5f25afe5216ba7f8921e04f79aa4ca0624eca820 11862Author: markus@openbsd.org <markus@openbsd.org> 11863Date: Fri Mar 6 18:15:38 2020 +0000 11864 11865 upstream: fix null-deref on calloc failure; ok djm 11866 11867 OpenBSD-Commit-ID: a313519579b392076b7831ec022dfdefbec8724a 11868 11869commit ff2acca039aef16a15fce409163df404858f7aa5 11870Author: markus@openbsd.org <markus@openbsd.org> 11871Date: Fri Mar 6 18:15:04 2020 +0000 11872 11873 upstream: exit if ssh_krl_revoke_key_sha256 fails; ok djm 11874 11875 OpenBSD-Commit-ID: 0864ad4fe8bf28ab21fd1df766e0365c11bbc0dc 11876 11877commit 31c860a0212af2d5b6a129e3e8fcead51392ee1d 11878Author: markus@openbsd.org <markus@openbsd.org> 11879Date: Fri Mar 6 18:14:13 2020 +0000 11880 11881 upstream: pkcs11_register_provider: return < 0 on error; ok djm 11882 11883 OpenBSD-Commit-ID: cfc8321315b787e4d40da4bdb2cbabd4154b0d97 11884 11885commit 15be29e1e3318737b0768ca37d5b4a3fbe868ef0 11886Author: markus@openbsd.org <markus@openbsd.org> 11887Date: Fri Mar 6 18:13:29 2020 +0000 11888 11889 upstream: sshsig: return correct error, fix null-deref; ok djm 11890 11891 OpenBSD-Commit-ID: 1d1af7cd538b8b23e621cf7ab84f11e7a923edcd 11892 11893commit 6fb6f186cb62a6370fba476b6a03478a1e95c30d 11894Author: markus@openbsd.org <markus@openbsd.org> 11895Date: Fri Mar 6 18:12:55 2020 +0000 11896 11897 upstream: vasnmprintf allocates str and returns -1; ok djm 11898 11899 OpenBSD-Commit-ID: dae4c9e83d88471bf3b3f89e3da7a107b44df11c 11900 11901commit 714e1cbca17daa13f4f98978cf9e0695d4b2e0a4 11902Author: markus@openbsd.org <markus@openbsd.org> 11903Date: Fri Mar 6 18:11:10 2020 +0000 11904 11905 upstream: sshpkt_fatal() does not return; ok djm 11906 11907 OpenBSD-Commit-ID: 7dfe847e28bd78208eb227b37f29f4a2a0929929 11908 11909commit 9b47bd7b09d191991ad9e0506bb66b74bbc93d34 11910Author: djm@openbsd.org <djm@openbsd.org> 11911Date: Fri Feb 28 01:07:28 2020 +0000 11912 11913 upstream: no-touch-required certificate option should be an 11914 11915 extension, not a critical option. 11916 11917 OpenBSD-Commit-ID: 626b22c5feb7be8a645e4b9a9bef89893b88600d 11918 11919commit dd992520bed35387fc010239abe1bdc0c2665e38 11920Author: djm@openbsd.org <djm@openbsd.org> 11921Date: Fri Feb 28 01:06:05 2020 +0000 11922 11923 upstream: better error message when trying to use a FIDO key 11924 11925 function and SecurityKeyProvider is empty 11926 11927 OpenBSD-Commit-ID: e56602c2ee8c82f835d30e4dc8ee2e4a7896be24 11928 11929commit b81e66dbe0345aef4717911abcb4f589fff33a0a 11930Author: dtucker@openbsd.org <dtucker@openbsd.org> 11931Date: Thu Feb 27 02:32:37 2020 +0000 11932 11933 upstream: Drop leading space from line count that was confusing 11934 11935 ssh-keygen's screen mode. 11936 11937 OpenBSD-Commit-ID: 3bcae7a754db3fc5ad3cab63dd46774edb35b8ae 11938 11939commit d5ba1c03278eb079438bb038266d80d7477d49cb 11940Author: jsg@openbsd.org <jsg@openbsd.org> 11941Date: Wed Feb 26 13:40:09 2020 +0000 11942 11943 upstream: change explicit_bzero();free() to freezero() 11944 11945 While freezero() returns early if the pointer is NULL the tests for 11946 NULL in callers are left to avoid warnings about passing an 11947 uninitialised size argument across a function boundry. 11948 11949 ok deraadt@ djm@ 11950 11951 OpenBSD-Commit-ID: 2660fa334fcc7cd05ec74dd99cb036f9ade6384a 11952 11953commit 9e3220b585c5be19a7431ea4ff8884c137b3a81c 11954Author: dtucker@openbsd.org <dtucker@openbsd.org> 11955Date: Wed Feb 26 11:46:51 2020 +0000 11956 11957 upstream: Have sftp reject "-1" in the same way as ssh(1) and 11958 11959 scp(1) do instead of accepting and silently ignoring it since protocol 1 11960 support has been removed. Spotted by shivakumar2696 at gmail.com, ok 11961 deraadt@ 11962 11963 OpenBSD-Commit-ID: b79f95559a1c993214f4ec9ae3c34caa87e9d5de 11964 11965commit ade8e67bb0f07b12e5e47e7baeafbdc898de639f 11966Author: dtucker@openbsd.org <dtucker@openbsd.org> 11967Date: Wed Feb 26 01:31:47 2020 +0000 11968 11969 upstream: Remove obsolete XXX comment. ok deraadt@ 11970 11971 OpenBSD-Commit-ID: bc462cc843947feea26a2e21c750b3a7469ff01b 11972 11973commit 7eb903f51eba051d7f65790bab92a28970ac1ccc 11974Author: dtucker@openbsd.org <dtucker@openbsd.org> 11975Date: Mon Feb 24 04:27:58 2020 +0000 11976 11977 upstream: Fix typo. Patch from itoama at live.jp via github PR#173. 11978 11979 OpenBSD-Commit-ID: 5cdaafab38bbdea0d07e24777d00bfe6f972568a 11980