1commit aede1c34243a6f7feae2fb2cb686ade5f9be6f3d 2Author: Damien Miller <djm@mindrot.org> 3Date: Wed Oct 17 11:01:20 2018 +1100 4 5 Require OpenSSL 1.1.x series 1.1.0g or greater 6 7 Previous versions have a bug with EVP_CipherInit() when passed a 8 NULL EVP_CIPHER, per https://github.com/openssl/openssl/pull/4613 9 10 ok dtucker@ 11 12commit 08300c211409c212e010fe2e2f2883e573a04ce2 13Author: Damien Miller <djm@mindrot.org> 14Date: Wed Oct 17 08:12:02 2018 +1100 15 16 unbreak compilation with --with-ssl-engine 17 18 Missing last argument to OPENSSL_init_crypto() 19 20commit 1673274aee67ce0eb6f00578b6f3d2bcbd58f937 21Author: Darren Tucker <dtucker@dtucker.net> 22Date: Tue Oct 16 14:45:57 2018 +1100 23 24 Remove gcc spectre mitigation flags. 25 26 Current impementions of the gcc spectre mitigation flags cause 27 miscompilations when combined with other flags and do not provide much 28 protection. Found by fweimer at redhat.com, ok djm@ 29 30commit 4e23deefd7959ef83c73ed9cce574423438f6133 31Author: Damien Miller <djm@mindrot.org> 32Date: Tue Oct 16 10:51:52 2018 +1100 33 34 Avoid deprecated OPENSSL_config when using 1.1.x 35 36 OpenSSL 1.1.x soft-deprecated OPENSSL_config in favour of 37 OPENSSL_init_crypto; pointed out by Jakub Jelen 38 39commit 797cdd9c8468ed1125ce60d590ae3f1397866af4 40Author: Darren Tucker <dtucker@dtucker.net> 41Date: Fri Oct 12 16:58:47 2018 +1100 42 43 Don't avoid our *sprintf replacements. 44 45 Don't let systems with broken printf(3) avoid our replacements 46 via asprintf(3)/vasprintf(3) calling libc internally. From djm@ 47 48commit e526127cbd2f8ad88fb41229df0c9b850c722830 49Author: Darren Tucker <dtucker@dtucker.net> 50Date: Fri Oct 12 16:43:35 2018 +1100 51 52 Check if snprintf understands %zu. 53 54 If the platforms snprintf and friends don't understand %zu, use the 55 compat replacement. Prevents segfaults on those platforms. 56 57commit cf39f875191708c5f2f1a3c1c9019f106e74aea3 58Author: Damien Miller <djm@mindrot.org> 59Date: Fri Oct 12 09:48:05 2018 +1100 60 61 remove stale link, tweak 62 63commit a7205e68decf7de2005810853b4ce6b222b65e2a 64Author: Damien Miller <djm@mindrot.org> 65Date: Fri Oct 12 09:47:20 2018 +1100 66 67 update version numbers ahead of release 68 69commit 1a4a9cf80f5b92b9d1dadd0bfa8867c04d195391 70Author: djm@openbsd.org <djm@openbsd.org> 71Date: Thu Oct 11 03:48:04 2018 +0000 72 73 upstream: don't send new-style rsa-sha2-*-cert-v01@openssh.com names to 74 75 older OpenSSH that can't handle them. spotted by Adam Eijdenberg; ok dtucker 76 77 OpenBSD-Commit-ID: 662bbc402e3d7c9b6c322806269698106a6ae631 78 79commit dc8ddcdf1a95e011c263486c25869bb5bf4e30ec 80Author: Damien Miller <djm@mindrot.org> 81Date: Thu Oct 11 13:08:59 2018 +1100 82 83 update depends 84 85commit 26841ac265603fd2253e6832e03602823dbb4022 86Author: Damien Miller <djm@mindrot.org> 87Date: Thu Oct 11 13:02:11 2018 +1100 88 89 some more duplicated key algorithm lines 90 91 From Adam Eijdenberg 92 93commit 5d9d17603bfbb620195a4581025052832b4c4adc 94Author: Damien Miller <djm@mindrot.org> 95Date: Thu Oct 11 11:56:36 2018 +1100 96 97 fix duplicated algorithm specification lines 98 99 Spotted by Adam Eijdenberg 100 101commit ebfafd9c7a5b2a7fb515ee95dbe0e44e11d0a663 102Author: djm@openbsd.org <djm@openbsd.org> 103Date: Thu Oct 11 00:52:46 2018 +0000 104 105 upstream: typo in plain RSA algorithm counterpart names for 106 107 certificates; spotted by Adam Eijdenberg; ok dtucker@ 108 109 OpenBSD-Commit-ID: bfcdeb6f4fc9e7607f5096574c8f118f2e709e00 110 111commit c29b111e7d87c2324ff71c80653dd8da168c13b9 112Author: Damien Miller <djm@mindrot.org> 113Date: Thu Oct 11 11:29:35 2018 +1100 114 115 check pw_passwd != NULL here too 116 117 Again, for systems with broken NIS implementations. 118 119 Prompted by coolbugcheckers AT gmail.com 120 121commit fe8e8f349a553ef4c567acd418aac769a82b7729 122Author: Damien Miller <djm@mindrot.org> 123Date: Thu Oct 11 11:03:15 2018 +1100 124 125 check for NULL return from shadow_pw() 126 127 probably unreachable on this platform; pointed out by 128 coolbugcheckers AT gmail.com 129 130commit acc59cbe7a1fb169e1c3caba65a39bd74d6e030d 131Author: deraadt@openbsd.org <deraadt@openbsd.org> 132Date: Wed Oct 10 16:43:49 2018 +0000 133 134 upstream: introducing openssh 7.9 135 136 OpenBSD-Commit-ID: 42d526a9fe01a40dd299ac58014d3349adf40e25 137 138commit 12731158c75c8760a8bea06350eeb3e763fe1a07 139Author: Damien Miller <djm@mindrot.org> 140Date: Thu Oct 11 10:29:29 2018 +1100 141 142 supply callback to PEM_read_bio_PrivateKey 143 144 OpenSSL 1.1.0i has changed the behaviour of their PEM APIs, 145 so that empty passphrases are interpreted differently. This 146 probabalistically breaks loading some keys, because the PEM format 147 is terrible and doesn't include a proper MAC. 148 149 Avoid this by providing a basic callback to avoid passing empty 150 passphrases to OpenSSL in cases where one is required. 151 152 Based on patch from Jakub Jelen in bz#2913; ok dtucker@ 153 154commit d1d301a1dd5d6cc3a9ed93ab7ab09dda4cb456e0 155Author: Damien Miller <djm@mindrot.org> 156Date: Wed Oct 10 14:57:00 2018 +1100 157 158 in pick_salt() avoid dereference of NULL passwords 159 160 Apparently some NIS implementations can leave pw->pw_passwd (or the 161 shadow equivalent) NULL. 162 163 bz#2909; based on patch from Todd Eigenschink 164 165commit edbb6febccee084d212fdc0cb05b40cb1c646ab1 166Author: djm@openbsd.org <djm@openbsd.org> 167Date: Tue Oct 9 05:42:23 2018 +0000 168 169 upstream: Treat all PEM_read_bio_PrivateKey() errors when a passphrase 170 171 is specified as "incorrect passphrase" instead of trying to choose between 172 that and "invalid format". 173 174 libcrypto can return ASN1 parsing errors rather than the expected 175 decrypt error in certain infrequent cases when trying to decrypt/parse 176 PEM private keys when supplied with an invalid passphrase. 177 178 Report and repro recipe from Thomas Deutschmann in bz#2901 179 180 ok markus@ 181 182 OpenBSD-Commit-ID: b1d4cd92395f9743f81c0d23aab2524109580870 183 184commit 2581333d564d8697837729b3d07d45738eaf5a54 185Author: naddy@openbsd.org <naddy@openbsd.org> 186Date: Fri Oct 5 14:26:09 2018 +0000 187 188 upstream: Support using service names for port numbers. 189 190 * Try to resolve a port specification with getservbyname(3) if a 191 numeric conversion fails. 192 * Make the "Port" option in ssh_config handle its argument as a 193 port rather than a plain integer. 194 195 ok dtucker@ deraadt@ 196 197 OpenBSD-Commit-ID: e7f03633133205ab3dfbc67f9df7475fabae660d 198 199commit e0d6501e86734c48c8c503f81e1c0926e98c5c4c 200Author: djm@openbsd.org <djm@openbsd.org> 201Date: Thu Oct 4 07:47:35 2018 +0000 202 203 upstream: when the peer sends a channel-close message, make sure we 204 205 close the local extended read fd (stderr) along with the regular read fd 206 (stdout). Avoids weird stuck processed in multiplexing mode. 207 208 Report and analysis by Nelson Elhage and Geoffrey Thomas in bz#2863 209 210 ok dtucker@ markus@ 211 212 OpenBSD-Commit-ID: a48a2467fe938de4de69d2e7193d5fa701f12ae9 213 214commit 6f1aabb128246f445e33b8844fad3de9cb1d18cb 215Author: djm@openbsd.org <djm@openbsd.org> 216Date: Thu Oct 4 01:04:52 2018 +0000 217 218 upstream: factor out channel status formatting from 219 220 channel_open_message() so we can use it in other debug messages 221 222 OpenBSD-Commit-ID: 9c3903ca28fcabad57f566c9d0045b41ab7d52ba 223 224commit f1dd179e122bdfdb7ca3072d9603607740efda05 225Author: djm@openbsd.org <djm@openbsd.org> 226Date: Thu Oct 4 00:10:11 2018 +0000 227 228 upstream: include a little more information about the status and 229 230 disposition of channel's extended (stderr) fd; makes debugging some things a 231 bit easier. No behaviour change. 232 233 OpenBSD-Commit-ID: 483eb6467dc7d5dbca8eb109c453e7a43075f7ce 234 235commit 2d1428b11c8b6f616f070f2ecedce12328526944 236Author: djm@openbsd.org <djm@openbsd.org> 237Date: Thu Oct 4 00:04:41 2018 +0000 238 239 upstream: explicit_bzero here to be consistent with other kex*.c; 240 241 report from coolbugcheckers AT gmail.com 242 243 OpenBSD-Commit-ID: a90f146c5b5f5b1408700395e394f70b440856cb 244 245commit 5eff5b858e717e901e6af6596306a114de9f79f2 246Author: djm@openbsd.org <djm@openbsd.org> 247Date: Wed Oct 3 06:38:35 2018 +0000 248 249 upstream: Allow ssh_config IdentityAgent directive to accept 250 251 environment variable names as well as explicit paths. ok dtucker@ 252 253 OpenBSD-Commit-ID: 2f0996e103876c53d8c9dd51dcce9889d700767b 254 255commit a46ac4d86b25414d78b632e8173578b37e5f8a83 256Author: djm@openbsd.org <djm@openbsd.org> 257Date: Tue Oct 2 12:51:58 2018 +0000 258 259 upstream: mention INFO@openssh.com for sending SIGINFO 260 261 OpenBSD-Commit-ID: 132471eeb0df658210afd27852fe65131b26e900 262 263commit ff3a411cae0b484274b7900ef52ff4dad3e12876 264Author: Damien Miller <djm@mindrot.org> 265Date: Tue Oct 2 22:49:40 2018 +1000 266 267 only support SIGINFO on systems with SIGINFO 268 269commit cd98925c6405e972dc9f211afc7e75e838abe81c 270Author: djm@openbsd.org <djm@openbsd.org> 271Date: Tue Oct 2 12:40:07 2018 +0000 272 273 upstream: Add server support for signalling sessions via the SSH 274 275 channel/ session protocol. Signalling is only supported to sesssions that are 276 not subsystems and were not started with a forced command. 277 278 Long requested in bz#1424 279 280 Based on a patch from markus@ and reworked by dtucker@; 281 ok markus@ dtucker@ 282 283 OpenBSD-Commit-ID: 4bea826f575862eaac569c4bedd1056a268be1c3 284 285commit dba50258333f2604a87848762af07ba2cc40407a 286Author: djm@openbsd.org <djm@openbsd.org> 287Date: Wed Sep 26 07:32:44 2018 +0000 288 289 upstream: remove big ugly TODO comment from start of file. Some of 290 291 the mentioned tasks are obsolete and, of the remainder, most are already 292 captured in PROTOCOL.mux where they better belong 293 294 OpenBSD-Commit-ID: 16d9d76dee42a5bb651c9d6740f7f0ef68aeb407 295 296commit 92b61a38ee9b765f5049f03cd1143e13f3878905 297Author: djm@openbsd.org <djm@openbsd.org> 298Date: Wed Sep 26 07:30:05 2018 +0000 299 300 upstream: Document mux proxy mode; added by Markus in openssh-7.4 301 302 Also add a little bit of information about the overall packet format 303 304 OpenBSD-Commit-ID: bdb6f6ea8580ef96792e270cae7857786ad84a95 305 306commit 9d883a1ce4f89b175fd77405ff32674620703fb2 307Author: djm@openbsd.org <djm@openbsd.org> 308Date: Wed Sep 26 01:48:57 2018 +0000 309 310 upstream: s/process_mux_master/mux_master_process/ in mux master 311 312 function names, 313 314 Gives better symmetry with the existing mux_client_*() names and makes 315 it more obvious when a message comes from the master vs client (they 316 are interleved in ControlMaster=auto mode). 317 318 no functional change beyond prefixing a could of log messages with 319 __func__ where they were previously lacking. 320 321 OpenBSD-Commit-ID: b01f7c3fdf92692e1713a822a89dc499333daf75 322 323commit c2fa53cd6462da82d3a851dc3a4a3f6b920337c8 324Author: Darren Tucker <dtucker@dtucker.net> 325Date: Sat Sep 22 14:41:24 2018 +1000 326 327 Remove unused variable in _ssh_compat_fflush. 328 329commit d1b3540c21212624af907488960d703c7d987b42 330Author: Darren Tucker <dtucker@dtucker.net> 331Date: Thu Sep 20 18:08:43 2018 +1000 332 333 Import updated moduli. 334 335commit b5e412a8993ad17b9e1141c78408df15d3d987e1 336Author: djm@openbsd.org <djm@openbsd.org> 337Date: Fri Sep 21 12:46:22 2018 +0000 338 339 upstream: Allow ssh_config ForwardX11Timeout=0 to disable the 340 341 timeout and allow X11 connections in untrusted mode indefinitely. ok dtucker@ 342 343 OpenBSD-Commit-ID: ea1ceed3f540b48e5803f933e59a03b20db10c69 344 345commit cb24d9fcc901429d77211f274031653476864ec6 346Author: djm@openbsd.org <djm@openbsd.org> 347Date: Fri Sep 21 12:23:17 2018 +0000 348 349 upstream: when compiled with GSSAPI support, cache supported method 350 351 OIDs by calling ssh_gssapi_prepare_supported_oids() regardless of whether 352 GSSAPI authentication is enabled in the main config. 353 354 This avoids sandbox violations for configurations that enable GSSAPI 355 auth later, e.g. 356 357 Match user djm 358 GSSAPIAuthentication yes 359 360 bz#2107; ok dtucker@ 361 362 OpenBSD-Commit-ID: a5dd42d87c74e27cfb712b15b0f97ab20e0afd1d 363 364commit bbc8af72ba68da014d4de6e21a85eb5123384226 365Author: djm@openbsd.org <djm@openbsd.org> 366Date: Fri Sep 21 12:20:12 2018 +0000 367 368 upstream: In sshkey_in_file(), ignore keys that are considered for 369 370 being too short (i.e. SSH_ERR_KEY_LENGTH). These keys will not be considered 371 to be "in the file". This allows key revocation lists to contain short keys 372 without the entire revocation list being considered invalid. 373 374 bz#2897; ok dtucker 375 376 OpenBSD-Commit-ID: d9f3d857d07194a42ad7e62889a74dc3f9d9924b 377 378commit 383a33d160cefbfd1b40fef81f72eadbf9303a66 379Author: djm@openbsd.org <djm@openbsd.org> 380Date: Fri Sep 21 03:11:36 2018 +0000 381 382 upstream: Treat connections with ProxyJump specified the same as ones 383 384 with a ProxyCommand set with regards to hostname canonicalisation (i.e. don't 385 try to canonicalise the hostname unless CanonicalizeHostname is set to 386 'always'). 387 388 Patch from Sven Wegener via bz#2896 389 390 OpenBSD-Commit-ID: 527ff501cf98bf65fb4b29ed0cb847dda10f4d37 391 392commit 0cbed248ed81584129b67c348dbb801660f25a6a 393Author: djm@openbsd.org <djm@openbsd.org> 394Date: Thu Sep 20 23:40:16 2018 +0000 395 396 upstream: actually make CASignatureAlgorithms available as a config 397 398 option 399 400 OpenBSD-Commit-ID: 93fa7ff58314ed7b1ab7744090a6a91232e6ae52 401 402commit 62528870c0ec48cd86a37dd7320fb85886c3e6ee 403Author: dtucker@openbsd.org <dtucker@openbsd.org> 404Date: Thu Sep 20 08:07:03 2018 +0000 405 406 upstream: Import updated moduli. 407 408 OpenBSD-Commit-ID: 04431e8e7872f49a2129bf080a6b73c19d576d40 409 410commit e6933a2ffa0659d57f3c7b7c457b2c62b2a84613 411Author: jmc@openbsd.org <jmc@openbsd.org> 412Date: Thu Sep 20 06:58:48 2018 +0000 413 414 upstream: reorder CASignatureAlgorithms, and add them to the 415 416 various -o lists; ok djm 417 418 OpenBSD-Commit-ID: ecb88baecc3c54988b4d1654446ea033da359288 419 420commit aa083aa9624ea7b764d5a81c4c676719a1a3e42b 421Author: djm@openbsd.org <djm@openbsd.org> 422Date: Thu Sep 20 03:31:49 2018 +0000 423 424 upstream: fix "ssh -Q sig" to show correct signature algorithm list 425 426 (it was erroneously showing certificate algorithms); prompted by markus@ 427 428 OpenBSD-Commit-ID: 1cdee002f2f0c21456979deeb887fc889afb154d 429 430commit ecac7e1f7add6b28874959a11f2238d149dc2c07 431Author: djm@openbsd.org <djm@openbsd.org> 432Date: Thu Sep 20 03:30:44 2018 +0000 433 434 upstream: add CASignatureAlgorithms option for the client, allowing 435 436 it to specify which signature algorithms may be used by CAs when signing 437 certificates. Useful if you want to ban RSA/SHA1; ok markus@ 438 439 OpenBSD-Commit-ID: 9159e5e9f67504829bf53ff222057307a6e3230f 440 441commit 86e5737c39153af134158f24d0cab5827cbd5852 442Author: djm@openbsd.org <djm@openbsd.org> 443Date: Thu Sep 20 03:28:06 2018 +0000 444 445 upstream: Add sshd_config CASignatureAlgorithms option to allow 446 447 control over which signature algorithms a CA may use when signing 448 certificates. In particular, this allows a sshd to ban certificates signed 449 with RSA/SHA1. 450 451 ok markus@ 452 453 OpenBSD-Commit-ID: b05c86ef8b52b913ed48d54a9b9c1a7714d96bac 454 455commit f80e68ea7d62e2dfafc12f1a60ab544ae4033a0f 456Author: djm@openbsd.org <djm@openbsd.org> 457Date: Wed Sep 19 02:03:02 2018 +0000 458 459 upstream: Make "ssh-add -q" do what it says on the tin: silence 460 461 output from successful operations. 462 463 Based on patch from Thijs van Dijk; ok dtucker@ deraadt@ 464 465 OpenBSD-Commit-ID: c4f754ecc055c10af166116ce7515104aa8522e1 466 467commit 5e532320e9e51de720d5f3cc2596e95d29f6e98f 468Author: millert@openbsd.org <millert@openbsd.org> 469Date: Mon Sep 17 15:40:14 2018 +0000 470 471 upstream: When choosing a prime from the moduli file, avoid 472 473 re-using the linenum variable for something that is not a line number to 474 avoid the confusion that resulted in the bug in rev. 1.64. This also lets us 475 pass the actual linenum to parse_prime() so the error messages include the 476 correct line number. OK markus@ some time ago. 477 478 OpenBSD-Commit-ID: 4d8e5d3e924d6e8eb70053e3defa23c151a00084 479 480commit cce8cbe0ed7d1ba3a575310e0b63c193326ae616 481Author: Darren Tucker <dtucker@dtucker.net> 482Date: Sat Sep 15 19:44:06 2018 +1000 483 484 Fix openssl-1.1 fallout for --without-openssl. 485 486 ok djm@ 487 488commit 149519b9f201dac755f3cba4789f4d76fecf0ee1 489Author: Damien Miller <djm@mindrot.org> 490Date: Sat Sep 15 19:37:48 2018 +1000 491 492 add futex(2) syscall to seccomp sandbox 493 494 Apparently needed for some glibc/openssl combinations. 495 496 Patch from Arkadiusz Miśkiewicz 497 498commit 4488ae1a6940af704c4dbf70f55bf2f756a16536 499Author: Damien Miller <djm@mindrot.org> 500Date: Sat Sep 15 19:36:55 2018 +1000 501 502 really add source for authopt_fuzz this time 503 504commit 9201784b4a257c8345fbd740bcbdd70054885707 505Author: Damien Miller <djm@mindrot.org> 506Date: Sat Sep 15 19:35:40 2018 +1000 507 508 remove accidentally checked-in authopt_fuzz binary 509 510commit beb9e522dc7717df08179f9e59f36b361bfa14ab 511Author: djm@openbsd.org <djm@openbsd.org> 512Date: Fri Sep 14 05:26:27 2018 +0000 513 514 upstream: second try, deals properly with missing and private-only 515 516 Use consistent format in debug log for keys readied, offered and 517 received during public key authentication. 518 519 This makes it a little easier to see what is going on, as each message 520 now contains (where available) the key filename, its type and fingerprint, 521 and whether the key is hosted in an agent or a token. 522 523 OpenBSD-Commit-ID: f1c6a8e9cfc4e108c359db77f24f9a40e1e25ea7 524 525commit 6bc5a24ac867bfdc3ed615589d69ac640f51674b 526Author: Damien Miller <djm@mindrot.org> 527Date: Fri Sep 14 15:16:34 2018 +1000 528 529 fuzzer harness for authorized_keys option parsing 530 531commit 6c8b82fc6929b6a9a3f645151b6ec26c5507d9ef 532Author: djm@openbsd.org <djm@openbsd.org> 533Date: Fri Sep 14 04:44:04 2018 +0000 534 535 upstream: revert following; deals badly with agent keys 536 537 revision 1.285 538 date: 2018/09/14 04:17:12; author: djm; state: Exp; lines: +47 -26; commitid: lflGFcNb2X2HebaK; 539 Use consistent format in debug log for keys readied, offered and 540 received during public key authentication. 541 542 This makes it a little easier to see what is going on, as each message 543 now contains the key filename, its type and fingerprint, and whether 544 the key is hosted in an agent or a token. 545 546 OpenBSD-Commit-ID: e496bd004e452d4b051f33ed9ae6a54ab918f56d 547 548commit 6da046f9c3374ce7e269ded15d8ff8bc45017301 549Author: djm@openbsd.org <djm@openbsd.org> 550Date: Fri Sep 14 04:17:44 2018 +0000 551 552 upstream: garbage-collect moribund ssh_new_private() API. 553 554 OpenBSD-Commit-ID: 7c05bf13b094093dfa01848a9306c82eb6e95f6c 555 556commit 1f24ac5fc05252ceb1c1d0e8cab6a283b883c780 557Author: djm@openbsd.org <djm@openbsd.org> 558Date: Fri Sep 14 04:17:12 2018 +0000 559 560 upstream: Use consistent format in debug log for keys readied, 561 562 offered and received during public key authentication. 563 564 This makes it a little easier to see what is going on, as each message 565 now contains the key filename, its type and fingerprint, and whether 566 the key is hosted in an agent or a token. 567 568 OpenBSD-Commit-ID: 2a01d59285a8a7e01185bb0a43316084b4f06a1f 569 570commit 488c9325bb7233e975dbfbf89fa055edc3d3eddc 571Author: millert@openbsd.org <millert@openbsd.org> 572Date: Thu Sep 13 15:23:32 2018 +0000 573 574 upstream: Fix warnings caused by user_from_uid() and group_from_gid() 575 576 now returning const char *. 577 578 OpenBSD-Commit-ID: b5fe571ea77cfa7b9035062829ab05eb87d7cc6f 579 580commit 0aa1f230846ebce698e52051a107f3127024a05a 581Author: Damien Miller <djm@mindrot.org> 582Date: Fri Sep 14 10:31:47 2018 +1000 583 584 allow SIGUSR1 as synonym for SIGINFO 585 586 Lets users on those unfortunate operating systems that lack SIGINFO 587 still be able to obtain progress information from unit tests :) 588 589commit d64e78526596f098096113fcf148216798c327ff 590Author: Damien Miller <djm@mindrot.org> 591Date: Thu Sep 13 19:05:48 2018 +1000 592 593 add compat header 594 595commit a3fd8074e2e2f06602e25618721f9556c731312c 596Author: djm@openbsd.org <djm@openbsd.org> 597Date: Thu Sep 13 09:03:20 2018 +0000 598 599 upstream: missed a bit of openssl-1.0.x API in this unittest 600 601 OpenBSD-Regress-ID: a73a54d7f7381856a3f3a2d25947bee7a9a5dbc9 602 603commit 86e0a9f3d249d5580390daf58e015e68b01cef10 604Author: djm@openbsd.org <djm@openbsd.org> 605Date: Thu Sep 13 05:06:51 2018 +0000 606 607 upstream: use only openssl-1.1.x API here too 608 609 OpenBSD-Regress-ID: ae877064597c349954b1b443769723563cecbc8f 610 611commit 48f54b9d12c1c79fba333bc86d455d8f4cda8cfc 612Author: Damien Miller <djm@mindrot.org> 613Date: Thu Sep 13 12:13:50 2018 +1000 614 615 adapt -portable to OpenSSL 1.1x API 616 617 Polyfill missing API with replacement functions extracted from LibreSSL 618 619commit 86112951d63d48839f035b5795be62635a463f99 620Author: Damien Miller <djm@mindrot.org> 621Date: Thu Sep 13 12:12:42 2018 +1000 622 623 forgot to stage these test files in commit d70d061 624 625commit 482d23bcacdd3664f21cc82a5135f66fc598275f 626Author: djm@openbsd.org <djm@openbsd.org> 627Date: Thu Sep 13 02:08:33 2018 +0000 628 629 upstream: hold our collective noses and use the openssl-1.1.x API in 630 631 OpenSSH; feedback and ok tb@ jsing@ markus@ 632 633 OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417 634 635commit d70d061828730a56636ab6f1f24fe4a8ccefcfc1 636Author: djm@openbsd.org <djm@openbsd.org> 637Date: Wed Sep 12 01:36:45 2018 +0000 638 639 upstream: Include certs with multiple RSA signature variants in 640 641 test data Ensure that cert->signature_key is populated correctly 642 643 OpenBSD-Regress-ID: 56e68f70fe46cb3a193ca207385bdb301fd6603a 644 645commit f803b2682992cfededd40c91818b653b5d923ef5 646Author: djm@openbsd.org <djm@openbsd.org> 647Date: Wed Sep 12 01:23:48 2018 +0000 648 649 upstream: test revocation by explicit hash and by fingerprint 650 651 OpenBSD-Regress-ID: 079c18a9ab9663f4af419327c759fc1e2bc78fd8 652 653commit 2de78bc7da70e1338b32feeefcc6045cf49efcd4 654Author: djm@openbsd.org <djm@openbsd.org> 655Date: Wed Sep 12 01:22:43 2018 +0000 656 657 upstream: s/sshkey_demote/sshkey_from_private/g 658 659 OpenBSD-Regress-ID: 782bde7407d94a87aa8d1db7c23750e09d4443c4 660 661commit 41c115a5ea1cb79a6a3182773c58a23f760e8076 662Author: Damien Miller <djm@mindrot.org> 663Date: Wed Sep 12 16:50:01 2018 +1000 664 665 delete the correct thing; kexfuzz binary 666 667commit f0fcd7e65087db8c2496f13ed39d772f8e38b088 668Author: djm@openbsd.org <djm@openbsd.org> 669Date: Wed Sep 12 06:18:59 2018 +0000 670 671 upstream: fix edit mistake; spotted by jmc@ 672 673 OpenBSD-Commit-ID: dd724e1c52c9d6084f4cd260ec7e1b2b138261c6 674 675commit 4cc259bac699f4d2a5c52b92230f9e488c88a223 676Author: djm@openbsd.org <djm@openbsd.org> 677Date: Wed Sep 12 01:34:02 2018 +0000 678 679 upstream: add SSH_ALLOWED_CA_SIGALGS - the default list of 680 681 signature algorithms that are allowed for CA signatures. Notably excludes 682 ssh-dsa. 683 684 ok markus@ 685 686 OpenBSD-Commit-ID: 1628e4181dc8ab71909378eafe5d06159a22deb4 687 688commit ba9e788315b1f6a350f910cb2a9e95b2ce584e89 689Author: djm@openbsd.org <djm@openbsd.org> 690Date: Wed Sep 12 01:32:54 2018 +0000 691 692 upstream: add sshkey_check_cert_sigtype() that checks a 693 694 cert->signature_type against a supplied whitelist; ok markus 695 696 OpenBSD-Commit-ID: caadb8073292ed7a9535e5adc067d11d356d9302 697 698commit a70fd4ad7bd9f2ed223ff635a3d41e483057f23b 699Author: djm@openbsd.org <djm@openbsd.org> 700Date: Wed Sep 12 01:31:30 2018 +0000 701 702 upstream: add cert->signature_type field and keep it in sync with 703 704 certificate signature wrt loading and certification operations; ok markus@ 705 706 OpenBSD-Commit-ID: e8b8b9f76b66707a0cd926109c4383db8f664df3 707 708commit 357128ac48630a9970e3af0e6ff820300a28da47 709Author: djm@openbsd.org <djm@openbsd.org> 710Date: Wed Sep 12 01:30:10 2018 +0000 711 712 upstream: Add "ssh -Q sig" to allow listing supported signature 713 714 algorithms ok markus@ 715 716 OpenBSD-Commit-ID: 7a8c6eb6c249dc37823ba5081fce64876d10fe2b 717 718commit 9405c6214f667be604a820c6823b27d0ea77937d 719Author: djm@openbsd.org <djm@openbsd.org> 720Date: Wed Sep 12 01:21:34 2018 +0000 721 722 upstream: allow key revocation by SHA256 hash and allow ssh-keygen 723 724 to create KRLs using SHA256/base64 key fingerprints; ok markus@ 725 726 OpenBSD-Commit-ID: a0590fd34e7f1141f2873ab3acc57442560e6a94 727 728commit 50e2687ee0941c0ea216d6ffea370ffd2c1f14b9 729Author: djm@openbsd.org <djm@openbsd.org> 730Date: Wed Sep 12 01:19:12 2018 +0000 731 732 upstream: log certificate fingerprint in authentication 733 734 success/failure message (previously we logged only key ID and CA key 735 fingerprint). 736 737 ok markus@ 738 739 OpenBSD-Commit-ID: a8ef2d172b7f1ddbcce26d6434b2de6d94f6c05d 740 741commit de37ca909487d23e5844aca289b3f5e75d3f1e1f 742Author: dtucker@openbsd.org <dtucker@openbsd.org> 743Date: Fri Sep 7 04:26:56 2018 +0000 744 745 upstream: Add FALLTHROUGH comments where appropriate. Patch from 746 747 jjelen at redhat via bz#2687. 748 749 OpenBSD-Commit-ID: c48eb457be697a19d6d2950c6d0879f3ccc851d3 750 751commit 247766cd3111d5d8c6ea39833a3257ca8fb820f2 752Author: djm@openbsd.org <djm@openbsd.org> 753Date: Fri Sep 7 01:42:54 2018 +0000 754 755 upstream: ssh -MM requires confirmation for all operations that 756 757 change the multiplexing state, not just new sessions. 758 759 mention that confirmation is checked via ssh-askpass 760 761 OpenBSD-Commit-ID: 0f1b45551ebb9cc5c9a4fe54ad3b23ce90f1f5c2 762 763commit db8bb80e3ac1bcb3e1305d846cd98c6b869bf03f 764Author: mestre@openbsd.org <mestre@openbsd.org> 765Date: Tue Aug 28 12:25:53 2018 +0000 766 767 upstream: fix misplaced parenthesis inside if-clause. it's harmless 768 769 and the only issue is showing an unknown error (since it's not defined) 770 during fatal(), if it ever an error occurs inside that condition. 771 772 OK deraadt@ markus@ djm@ 773 774 OpenBSD-Commit-ID: acb0a8e6936bfbe590504752d01d1d251a7101d8 775 776commit 086cc614f550b7d4f100c95e472a6b6b823938ab 777Author: mestre@openbsd.org <mestre@openbsd.org> 778Date: Tue Aug 28 12:17:45 2018 +0000 779 780 upstream: fix build with DEBUG_PK enabled 781 782 OK dtucker@ 783 784 OpenBSD-Commit-ID: ec1568cf27726e9638a0415481c20c406e7b441c 785 786commit 2678833013e97f8b18f09779b7f70bcbf5eb2ab2 787Author: Darren Tucker <dtucker@dtucker.net> 788Date: Fri Sep 7 14:41:53 2018 +1000 789 790 Handle ngroups>_SC_NGROUPS_MAX. 791 792 Based on github pull request #99 from Darren Maffat at Oracle: Solaris' 793 getgrouplist considers _SC_NGROUPS_MAX more of a guideline and can return 794 a larger number of groups. In this case, retry getgrouplist with a 795 larger array and defer allocating groups_byname. ok djm@ 796 797commit 039bf2a81797b8f3af6058d34005a4896a363221 798Author: Darren Tucker <dtucker@dtucker.net> 799Date: Fri Sep 7 14:06:57 2018 +1000 800 801 Initial len for the fmt=NULL case. 802 803 Patch from jjelen at redhat via bz#2687. (OpenSSH never calls 804 setproctitle with a null format so len is always initialized). 805 806commit ea9c06e11d2e8fb2f4d5e02f8a41e23d2bd31ca9 807Author: Darren Tucker <dtucker@dtucker.net> 808Date: Fri Sep 7 14:01:39 2018 +1000 809 810 Include stdlib.h. 811 812 Patch from jjelen at redhat via bz#2687. 813 814commit 9617816dbe73ec4d65075f4d897443f63a97c87f 815Author: Damien Miller <djm@mindrot.org> 816Date: Mon Aug 27 13:08:01 2018 +1000 817 818 document some more regress control env variables 819 820 Specifically SKIP_UNIT, USE_VALGRING and LTESTS. Sort the list of 821 environment variables. 822 823 Based on patch from Jakub Jelen 824 825commit 71508e06fab14bc415a79a08f5535ad7bffa93d9 826Author: Damien Miller <djm@mindrot.org> 827Date: Thu Aug 23 15:41:42 2018 +1000 828 829 shorten temporary SSH_REGRESS_TMP path 830 831 Previous path was exceeding max socket length on at least one platform (OSX) 832 833commit 26739cf5bdc9030a583b41ae5261dedd862060f0 834Author: Damien Miller <djm@mindrot.org> 835Date: Thu Aug 23 13:06:02 2018 +1000 836 837 rebuild dependencies 838 839commit ff729025c7463cf5d0a8d1ca1823306e48c6d4cf 840Author: Damien Miller <djm@mindrot.org> 841Date: Thu Aug 23 13:03:32 2018 +1000 842 843 fix path in distclean target 844 845 Patch from Jakub Jelen 846 847commit 7fef173c28f7462dcd8ee017fdf12b5073f54c02 848Author: djm@openbsd.org <djm@openbsd.org> 849Date: Thu Aug 23 03:01:08 2018 +0000 850 851 upstream: memleak introduced in r1.83; from Colin Watson 852 853 OpenBSD-Commit-ID: 5c019104c280cbd549a264a7217b67665e5732dc 854 855commit b8ae02a2896778b8984c7f51566c7f0f56fa8b56 856Author: schwarze@openbsd.org <schwarze@openbsd.org> 857Date: Tue Aug 21 13:56:27 2018 +0000 858 859 upstream: AIX reports the CODESET as "ISO8859-1" in the POSIX locale. 860 861 Treating that as a safe encoding is OK because even when other systems return 862 that string for real ISO8859-1, it is still safe in the sense that it is 863 ASCII-compatible and stateless. 864 865 Issue reported by Val dot Baranov at duke dot edu. Additional 866 information provided by Michael dot Felt at felt dot demon dot nl. 867 Tested by Michael Felt on AIX 6.1 and by Val Baranov on AIX 7.1. 868 Tweak and OK djm@. 869 870 OpenBSD-Commit-ID: 36f1210e0b229817d10eb490d6038f507b8256a7 871 872commit bc44ee088ad269d232e514f037c87ada4c2fd3f0 873Author: Tim Rice <tim@multitalents.net> 874Date: Tue Aug 21 08:57:24 2018 -0700 875 876 modified: openbsd-compat/port-uw.c 877 remove obsolete and un-needed include 878 879commit 829fc28a9c54e3f812ee7248c7a3e31eeb4f0b3a 880Author: Damien Miller <djm@mindrot.org> 881Date: Mon Aug 20 15:57:29 2018 +1000 882 883 Missing unistd.h for regress/mkdtemp.c 884 885commit c8313e492355a368a91799131520d92743d8d16c 886Author: Damien Miller <djm@mindrot.org> 887Date: Fri Aug 17 05:45:20 2018 +1000 888 889 update version numbers in anticipation of release 890 891commit 477b49a34b89f506f4794b35e3c70b3e2e83cd38 892Author: Corinna Vinschen <vinschen@redhat.com> 893Date: Mon Aug 13 17:08:51 2018 +0200 894 895 configure: work around GCC shortcoming on Cygwin 896 897 Cygwin's latest 7.x GCC allows to specify -mfunction-return=thunk 898 as well as -mindirect-branch=thunk on the command line, albeit 899 producing invalid code, leading to an error at link stage. 900 901 The check in configure.ac only checks if the option is present, 902 but not if it produces valid code. 903 904 This patch fixes it by special-casing Cygwin. Another solution 905 may be to change these to linker checks. 906 907 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 908 909commit b0917945efa374be7648d67dbbaaff323ab39edc 910Author: Corinna Vinschen <vinschen@redhat.com> 911Date: Mon Aug 13 17:05:05 2018 +0200 912 913 cygwin: add missing stdarg.h include 914 915 Further header file standarization in Cygwin uncovered a lazy 916 indirect include in bsd-cygwin_util.c 917 918 Signed-off-by: Corinna Vinschen <vinschen@redhat.com> 919 920commit c3903c38b0fd168ab3d925c2b129d1a599593426 921Author: djm@openbsd.org <djm@openbsd.org> 922Date: Mon Aug 13 02:41:05 2018 +0000 923 924 upstream: revert compat.[ch] section of the following change. It 925 926 causes double-free under some circumstances. 927 928 -- 929 930 date: 2018/07/31 03:07:24; author: djm; state: Exp; lines: +33 -18; commitid: f7g4UI8eeOXReTPh; 931 fix some memory leaks spotted by Coverity via Jakub Jelen in bz#2366 932 feedback and ok dtucker@ 933 934 OpenBSD-Commit-ID: 1e77547f60fdb5e2ffe23e2e4733c54d8d2d1137 935 936commit 1b9dd4aa15208100fbc3650f33ea052255578282 937Author: djm@openbsd.org <djm@openbsd.org> 938Date: Sun Aug 12 20:19:13 2018 +0000 939 940 upstream: better diagnosics on alg list assembly errors; ok 941 942 deraadt@ markus@ 943 944 OpenBSD-Commit-ID: 5a557e74b839daf13cc105924d2af06a1560faee 945 946commit e36a5f61b0f5bebf6d49c215d228cd99dfe86e28 947Author: Damien Miller <djm@mindrot.org> 948Date: Sat Aug 11 18:08:45 2018 -0700 949 950 Some AIX fixes; report from Michael Felt 951 952commit 2f4766ceefe6657c5ad5fe92d13c411872acae0e 953Author: dtucker@openbsd.org <dtucker@openbsd.org> 954Date: Fri Aug 10 01:35:49 2018 +0000 955 956 upstream: The script that cooks up PuTTY format host keys does not 957 958 understand the new key format so convert back to old format to create the 959 PuTTY key and remove it once done. 960 961 OpenBSD-Regress-ID: 2a449a18846c3a144bc645135b551ba6177e38d3 962 963commit e1b26ce504662a5d5b991091228984ccfd25f280 964Author: djm@openbsd.org <djm@openbsd.org> 965Date: Fri Aug 10 00:44:01 2018 +0000 966 967 upstream: improve 968 969 OpenBSD-Commit-ID: 40d839db0977b4e7ac8b647b16d5411d4faf2f60 970 971commit 7c712966a3139622f7fb55045368d05de4e6782c 972Author: djm@openbsd.org <djm@openbsd.org> 973Date: Fri Aug 10 00:42:29 2018 +0000 974 975 upstream: Describe pubkey format, prompted by bz#2853 976 977 While I'm here, describe and link to the remaining local PROTOCOL.* 978 docs that weren't already mentioned (PROTOCOL.key, PROTOCOL.krl and 979 PROTOCOL.mux) 980 981 OpenBSD-Commit-ID: 2a900f9b994ba4d53e7aeb467d44d75829fd1231 982 983commit ef100a2c5a8ed83afac0b8f36520815803da227a 984Author: djm@openbsd.org <djm@openbsd.org> 985Date: Fri Aug 10 00:27:15 2018 +0000 986 987 upstream: fix numbering 988 989 OpenBSD-Commit-ID: bc7a1764dff23fa4c5ff0e3379c9c4d5b63c9596 990 991commit ed7bd5d93fe14c7bd90febd29b858ea985d14d45 992Author: djm@openbsd.org <djm@openbsd.org> 993Date: Wed Aug 8 01:16:01 2018 +0000 994 995 upstream: Use new private key format by default. This format is 996 997 suported by OpenSSH >= 6.5 (released January 2014), so it should be supported 998 by most OpenSSH versions in active use. 999 1000 It is possible to convert new-format private keys to the older 1001 format using "ssh-keygen -f /path/key -pm PEM". 1002 1003 ok deraadt dtucker 1004 1005 OpenBSD-Commit-ID: e3bd4f2509a2103bfa2f710733426af3ad6d8ab8 1006 1007commit 967226a1bdde59ea137e8f0df871854ff7b91366 1008Author: djm@openbsd.org <djm@openbsd.org> 1009Date: Sat Aug 4 00:55:06 2018 +0000 1010 1011 upstream: invalidate dh->priv_key after freeing it in error path; 1012 1013 avoids unlikely double-free later. Reported by Viktor Dukhovni via 1014 https://github.com/openssh/openssh-portable/pull/96 feedback jsing@ tb@ 1015 1016 OpenBSD-Commit-ID: e317eb17c3e05500ae851f279ef6486f0457c805 1017 1018commit 74287f5df9966a0648b4a68417451dd18f079ab8 1019Author: djm@openbsd.org <djm@openbsd.org> 1020Date: Tue Jul 31 03:10:27 2018 +0000 1021 1022 upstream: delay bailout for invalid authentic 1023 1024 =?UTF-8?q?ating=20user=20until=20after=20the=20packet=20containing=20the?= 1025 =?UTF-8?q?=20request=20has=20been=20fully=20parsed.=20Reported=20by=20Dar?= 1026 =?UTF-8?q?iusz=20Tytko=20and=20Micha=C5=82=20Sajdak;=20ok=20deraadt?= 1027 MIME-Version: 1.0 1028 Content-Type: text/plain; charset=UTF-8 1029 Content-Transfer-Encoding: 8bit 1030 1031 OpenBSD-Commit-ID: b4891882fbe413f230fe8ac8a37349b03bd0b70d 1032 1033commit 1a66079c0669813306cc69e5776a4acd9fb49015 1034Author: djm@openbsd.org <djm@openbsd.org> 1035Date: Tue Jul 31 03:07:24 2018 +0000 1036 1037 upstream: fix some memory leaks spotted by Coverity via Jakub Jelen 1038 1039 in bz#2366 feedback and ok dtucker@ 1040 1041 OpenBSD-Commit-ID: 8402bbae67d578bedbadb0ce68ff7c5a136ef563 1042 1043commit 87f08be054b7eeadbb9cdeb3fb4872be79ccf218 1044Author: Damien Miller <djm@mindrot.org> 1045Date: Fri Jul 20 13:18:28 2018 +1000 1046 1047 Remove support for S/Key 1048 1049 Most people will 1) be using modern multi-factor authentication methods 1050 like TOTP/OATH etc and 2) be getting support for multi-factor 1051 authentication via PAM or BSD Auth. 1052 1053commit 5d14019ba2ff54acbfd20a6b9b96bb860a8c7c31 1054Author: markus@openbsd.org <markus@openbsd.org> 1055Date: Fri Jul 27 12:03:17 2018 +0000 1056 1057 upstream: avoid expensive channel_open_message() calls; ok djm@ 1058 1059 OpenBSD-Commit-ID: aea3b5512ad681cd8710367d743e8a753d4425d9 1060 1061commit e655ee04a3cb7999dbf9641b25192353e2b69418 1062Author: dtucker@openbsd.org <dtucker@openbsd.org> 1063Date: Fri Jul 27 05:34:42 2018 +0000 1064 1065 upstream: Now that ssh can't be setuid, remove the 1066 1067 original_real_uid and original_effective_uid globals and replace with calls 1068 to plain getuid(). ok djm@ 1069 1070 OpenBSD-Commit-ID: 92561c0cd418d34e6841e20ba09160583e27b68c 1071 1072commit 73ddb25bae4c33a0db361ac13f2e3a60d7c6c4a5 1073Author: dtucker@openbsd.org <dtucker@openbsd.org> 1074Date: Fri Jul 27 05:13:02 2018 +0000 1075 1076 upstream: Remove uid checks from low port binds. Now that ssh 1077 1078 cannot be setuid and sshd always has privsep on, we can remove the uid checks 1079 for low port binds and just let the system do the check. We leave a sanity 1080 check for the !privsep case so long as the code is stil there. with & ok 1081 djm@ 1082 1083 OpenBSD-Commit-ID: 9535cfdbd1cd54486fdbedfaee44ce4367ec7ca0 1084 1085commit c12033e102760d043bc5c98e6c8180e4d331b0df 1086Author: dtucker@openbsd.org <dtucker@openbsd.org> 1087Date: Fri Jul 27 03:55:22 2018 +0000 1088 1089 upstream: ssh(1) no longer supports being setuid root. Remove reference 1090 1091 to crc32 which went with protocol 1. Pointed out by deraadt@. 1092 1093 OpenBSD-Commit-ID: f8763c25fd96ed91dd1abdab5667fd2e27e377b6 1094 1095commit 4492e2ec4e1956a277ef507f51d66e5c2aafaaf8 1096Author: Damien Miller <djm@mindrot.org> 1097Date: Fri Jul 27 14:15:28 2018 +1000 1098 1099 correct snprintf truncation check in closefrom() 1100 1101 Truncation cannot happen unless the system has set PATH_MAX to some 1102 nonsensically low value. 1103 1104 bz#2862, patch from Daniel Le 1105 1106commit 149cab325a8599a003364ed833f878449c15f259 1107Author: Darren Tucker <dtucker@dtucker.net> 1108Date: Fri Jul 27 13:46:06 2018 +1000 1109 1110 Include stdarg.h in mkdtemp for va_list. 1111 1112commit 6728f31bdfdc864d192773c32465b1860e23f556 1113Author: deraadt@openbsd.org <deraadt@openbsd.org> 1114Date: Wed Jul 25 17:12:35 2018 +0000 1115 1116 upstream: Don't redefine Makefile choices which come correct from 1117 1118 bsd.*.mk ok markus 1119 1120 OpenBSD-Commit-ID: 814b2f670df75759e1581ecef530980b2b3d7e0f 1121 1122commit 21fd477a855753c1a8e450963669e28e39c3b5d2 1123Author: deraadt@openbsd.org <deraadt@openbsd.org> 1124Date: Wed Jul 25 13:56:23 2018 +0000 1125 1126 upstream: fix indent; Clemens Goessnitzer 1127 1128 OpenBSD-Commit-ID: b5149a6d92b264d35f879d24608087b254857a83 1129 1130commit 8e433c2083db8664c41499ee146448ea7ebe7dbf 1131Author: beck@openbsd.org <beck@openbsd.org> 1132Date: Wed Jul 25 13:10:56 2018 +0000 1133 1134 upstream: Use the caller provided (copied) pwent struct in 1135 1136 load_public_identity_files instead of calling getpwuid() again and discarding 1137 the argument. This prevents a client crash where tilde_expand_filename calls 1138 getpwuid() again before the pwent pointer is used. Issue noticed and reported 1139 by Pierre-Olivier Martel <pom@apple.com> ok djm@ deraadt@ 1140 1141 OpenBSD-Commit-ID: a067d74b5b098763736c94cc1368de8ea3f0b157 1142 1143commit e2127abb105ae72b6fda64fff150e6b24b3f1317 1144Author: jmc@openbsd.org <jmc@openbsd.org> 1145Date: Mon Jul 23 19:53:55 2018 +0000 1146 1147 upstream: oops, failed to notice that SEE ALSO got messed up; 1148 1149 OpenBSD-Commit-ID: 61c1306542cefdc6e59ac331751afe961557427d 1150 1151commit ddf1b797c2d26bbbc9d410aa4f484cbe94673587 1152Author: kn@openbsd.org <kn@openbsd.org> 1153Date: Mon Jul 23 19:02:49 2018 +0000 1154 1155 upstream: Point to glob in section 7 for the actual list of special 1156 1157 characters instead the C API in section 3. 1158 1159 OK millert jmc nicm, "the right idea" deraadt 1160 1161 OpenBSD-Commit-ID: a74fd215488c382809e4d041613aeba4a4b1ffc6 1162 1163commit 01c98d9661d0ed6156e8602b650f72eed9fc4d12 1164Author: dtucker@openbsd.org <dtucker@openbsd.org> 1165Date: Sun Jul 22 12:16:59 2018 +0000 1166 1167 upstream: Switch authorized_keys example from ssh-dss to ssh-rsa 1168 1169 since the former is no longer enabled by default. Pointed out by Daniel A. 1170 Maierhofer, ok jmc 1171 1172 OpenBSD-Commit-ID: 6a196cef53d7524e0c9b58cdbc1b5609debaf8c7 1173 1174commit 472269f8fe19343971c2d08f504ab5cbb8234b33 1175Author: djm@openbsd.org <djm@openbsd.org> 1176Date: Fri Jul 20 05:01:10 2018 +0000 1177 1178 upstream: slightly-clearer description for AuthenticationMethods - the 1179 1180 lists have comma-separated elements; bz#2663 from Hans Meier 1181 1182 OpenBSD-Commit-ID: 931c983d0fde4764d0942fb2c2b5017635993b5a 1183 1184commit c59aca8adbdf7f5597084ad360a19bedb3f80970 1185Author: Damien Miller <djm@mindrot.org> 1186Date: Fri Jul 20 14:53:42 2018 +1000 1187 1188 Create control sockets in clean temp directories 1189 1190 Adds a regress/mkdtemp tool and uses it to create empty temp 1191 directories for tests needing control sockets. 1192 1193 Patch from Colin Watson via bz#2660; ok dtucker 1194 1195commit 6ad8648e83e4f4ace37b742a05c2a6b6b872514e 1196Author: djm@openbsd.org <djm@openbsd.org> 1197Date: Fri Jul 20 03:46:34 2018 +0000 1198 1199 upstream: remove unused zlib.h 1200 1201 OpenBSD-Commit-ID: 8d274a9b467c7958df12668b49144056819f79f1 1202 1203commit 3ba6e6883527fe517b6e4a824876e2fe62af22fc 1204Author: dtucker@openbsd.org <dtucker@openbsd.org> 1205Date: Thu Jul 19 23:03:16 2018 +0000 1206 1207 upstream: Fix typo in comment. From Alexandru Iacob via github. 1208 1209 OpenBSD-Commit-ID: eff4ec07c6c8c5483533da43a4dda37d72ef7f1d 1210 1211commit c77bc73c91bc656e343a1961756e09dd1b170820 1212Author: Darren Tucker <dtucker@dtucker.net> 1213Date: Fri Jul 20 13:48:51 2018 +1000 1214 1215 Explicitly include openssl before zlib. 1216 1217 Some versions of OpenSSL have "free_func" in their headers, which zlib 1218 typedefs. Including openssl after zlib (eg via sshkey.h) results in 1219 "syntax error before `free_func'", which this fixes. 1220 1221commit 95d41e90eafcd1286a901e8e361e4a37b98aeb52 1222Author: dtucker@openbsd.org <dtucker@openbsd.org> 1223Date: Thu Jul 19 10:28:47 2018 +0000 1224 1225 upstream: Deprecate UsePrivilegedPort now that support for running 1226 1227 ssh(1) setuid has been removed, remove supporting code and clean up 1228 references to it in the man pages 1229 1230 We have not shipped ssh(1) the setuid bit since 2002. If ayone 1231 really needs to make connections from a low port number this can 1232 be implemented via a small setuid ProxyCommand. 1233 1234 ok markus@ jmc@ djm@ 1235 1236 OpenBSD-Commit-ID: d03364610b7123ae4c6792f5274bd147b6de717e 1237 1238commit 258dc8bb07dfb35a46e52b0822a2c5b7027df60a 1239Author: dtucker@openbsd.org <dtucker@openbsd.org> 1240Date: Wed Jul 18 11:34:04 2018 +0000 1241 1242 upstream: Remove support for running ssh(1) setuid and fatal if 1243 1244 attempted. Do not link uidwap.c into ssh any more. Neuters 1245 UsePrivilegedPort, which will be marked as deprecated shortly. ok markus@ 1246 djm@ 1247 1248 OpenBSD-Commit-ID: c4ba5bf9c096f57a6ed15b713a1d7e9e2e373c42 1249 1250commit ac590760b251506b0a152551abbf8e8d6dc2f527 1251Author: dtucker@openbsd.org <dtucker@openbsd.org> 1252Date: Mon Jul 16 22:25:01 2018 +0000 1253 1254 upstream: Slot 0 in the hostbased key array was previously RSA1, 1255 1256 but that is now gone and the slot is unused so remove it. Remove two 1257 now-unused macros, and add an array bounds check to the two remaining ones 1258 (array is statically sized, so mostly a safety check on future changes). ok 1259 markus@ 1260 1261 OpenBSD-Commit-ID: 2e4c0ca6cc1d8daeccead2aa56192a3f9d5e1e7a 1262 1263commit 26efc2f5df0e3bcf6a6bbdd0506fd682d60c2145 1264Author: dtucker@openbsd.org <dtucker@openbsd.org> 1265Date: Mon Jul 16 11:05:41 2018 +0000 1266 1267 upstream: Remove support for loading HostBasedAuthentication keys 1268 1269 directly in ssh(1) and always use ssh-keysign. This removes one of the few 1270 remaining reasons why ssh(1) might be setuid. ok markus@ 1271 1272 OpenBSD-Commit-ID: 97f01e1448707129a20d75f86bad5d27c3cf0b7d 1273 1274commit 3eb7f1038d17af7aea3c2c62d1e30cd545607640 1275Author: djm@openbsd.org <djm@openbsd.org> 1276Date: Mon Jul 16 07:06:50 2018 +0000 1277 1278 upstream: keep options.identity_file_userprovided array in sync when we 1279 1280 load keys, fixing some spurious error messages; ok markus 1281 1282 OpenBSD-Commit-ID: c63e3d5200ee2cf9e35bda98de847302566c6a00 1283 1284commit 2f131e1b34502aa19f345e89cabf6fa3fc097f09 1285Author: djm@openbsd.org <djm@openbsd.org> 1286Date: Mon Jul 16 03:09:59 2018 +0000 1287 1288 upstream: memleak in unittest; found by valgrind 1289 1290 OpenBSD-Regress-ID: 168c23b0fb09fc3d0b438628990d3fd9260a8a5e 1291 1292commit de2997a4cf22ca0a524f0e5b451693c583e2fd89 1293Author: djm@openbsd.org <djm@openbsd.org> 1294Date: Mon Jul 16 03:09:13 2018 +0000 1295 1296 upstream: memleaks; found by valgrind 1297 1298 OpenBSD-Commit-ID: 6c3ba22be53e753c899545f771e8399fc93cd844 1299 1300commit 61cc0003eb37fa07603c969c12b7c795caa498f3 1301Author: Darren Tucker <dtucker@dtucker.net> 1302Date: Sat Jul 14 16:49:01 2018 +1000 1303 1304 Undef a few new macros in sys-queue.h. 1305 1306 Prevents macro redefinition warnings on OSX. 1307 1308commit 30a2c213877a54a44dfdffb6ca8db70be5b457e0 1309Author: Darren Tucker <dtucker@dtucker.net> 1310Date: Fri Jul 13 13:40:20 2018 +1000 1311 1312 Include unistd.h for geteuid declaration. 1313 1314commit 1dd32c23f2a85714dfafe2a9cc516971d187caa4 1315Author: Darren Tucker <dtucker@dtucker.net> 1316Date: Fri Jul 13 13:38:10 2018 +1000 1317 1318 Fallout from buffer conversion in AUDIT_EVENTS. 1319 1320 Supply missing "int r" and fix error path for sshbuf_new(). 1321 1322commit 7449c178e943e5c4f6c8416a4e41d93b70c11c9e 1323Author: djm@openbsd.org <djm@openbsd.org> 1324Date: Fri Jul 13 02:13:50 2018 +0000 1325 1326 upstream: make this use ssh_proxy rather than starting/stopping a 1327 1328 daemon for each testcase 1329 1330 OpenBSD-Regress-ID: 608b7655ea65b1ba8fff5a13ce9caa60ef0c8166 1331 1332commit dbab02f9208d9baa134cec1d007054ec82b96ca9 1333Author: djm@openbsd.org <djm@openbsd.org> 1334Date: Fri Jul 13 02:13:19 2018 +0000 1335 1336 upstream: fix leaks in unit test; with this, all unit tests are 1337 1338 leak free (as far as valgrind can spot anyway) 1339 1340 OpenBSD-Regress-ID: b824d8b27998365379963440e5d18b95ca03aa17 1341 1342commit 2f6accff5085eb79b0dbe262d8b85ed017d1a51c 1343Author: Damien Miller <djm@mindrot.org> 1344Date: Fri Jul 13 11:39:25 2018 +1000 1345 1346 Enable leak checks for unit tests with valgrind 1347 1348 Leave the leak checking on unconditionally when running with valgrind. 1349 The unit tests are leak-free and I want them to stay that way. 1350 1351commit e46cfbd9db5e907b821bf4fd0184d4dab99815ee 1352Author: Damien Miller <djm@mindrot.org> 1353Date: Fri Jul 13 11:38:59 2018 +1000 1354 1355 increase timeout to match cfgmatch.sh 1356 1357 lets test pass under valgrind (on my workstation at least) 1358 1359commit 6aa1bf475cf3e7a2149acc5a1e80e904749f064c 1360Author: Damien Miller <djm@mindrot.org> 1361Date: Thu Jul 12 14:54:18 2018 +1000 1362 1363 rm regress/misc/kexfuzz/*.o in distclean target 1364 1365commit eef1447ddb559c03725a23d4aa6d03f40e8b0049 1366Author: Damien Miller <djm@mindrot.org> 1367Date: Thu Jul 12 14:49:26 2018 +1000 1368 1369 repair !WITH_OPENSSL build 1370 1371commit 4d3b2f36fd831941d1627ac587faae37b6d3570f 1372Author: Damien Miller <djm@mindrot.org> 1373Date: Thu Jul 12 14:49:14 2018 +1000 1374 1375 missing headers 1376 1377commit 3f420a692b293921216549c1099c2e46ff284eae 1378Author: Darren Tucker <dtucker@dtucker.net> 1379Date: Thu Jul 12 14:57:46 2018 +1000 1380 1381 Remove key.h from portable files too. 1382 1383 Commit 5467fbcb removed key.h so stop including it in portable files 1384 too. Fixes builds on lots of platforms. 1385 1386commit e2c4af311543093f16005c10044f7e06af0426f0 1387Author: djm@openbsd.org <djm@openbsd.org> 1388Date: Thu Jul 12 04:35:25 2018 +0000 1389 1390 upstream: remove prototype to long-gone function 1391 1392 OpenBSD-Commit-ID: 0414642ac7ce01d176b9f359091a66a8bbb640bd 1393 1394commit 394a842e60674bf8ee5130b9f15b01452a0b0285 1395Author: markus@openbsd.org <markus@openbsd.org> 1396Date: Wed Jul 11 18:55:11 2018 +0000 1397 1398 upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@ 1399 1400 OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3 1401 1402commit 5467fbcb09528ecdcb914f4f2452216c24796790 1403Author: markus@openbsd.org <markus@openbsd.org> 1404Date: Wed Jul 11 18:53:29 2018 +0000 1405 1406 upstream: remove legacy key emulation layer; ok djm@ 1407 1408 OpenBSD-Commit-ID: 2b1f9619259e222bbd4fe9a8d3a0973eafb9dd8d 1409 1410commit 5dc4c59d5441a19c99e7945779f7ec9051126c25 1411Author: martijn@openbsd.org <martijn@openbsd.org> 1412Date: Wed Jul 11 08:19:35 2018 +0000 1413 1414 upstream: s/wuth/with/ in comment 1415 1416 OpenBSD-Commit-ID: 9de41468afd75f54a7f47809d2ad664aa577902c 1417 1418commit 1c688801e9dd7f9889fb2a29bc2b6fbfbc35a11f 1419Author: Darren Tucker <dtucker@dtucker.net> 1420Date: Wed Jul 11 12:12:38 2018 +1000 1421 1422 Include stdlib.h for declaration of free. 1423 1424 Fixes build with -Werror on at least Fedora and probably others. 1425 1426commit fccfa239def497615f92ed28acc57cfe63da3666 1427Author: Damien Miller <djm@mindrot.org> 1428Date: Wed Jul 11 10:19:56 2018 +1000 1429 1430 VALGRIND_CHECK_LEAKS logic was backwards :( 1431 1432commit 416287d45fcde0a8e66eee8b99aa73bd58607588 1433Author: Darren Tucker <dtucker@dtucker.net> 1434Date: Wed Jul 11 10:10:26 2018 +1000 1435 1436 Fix sshbuf_new error path in skey. 1437 1438commit 7aab109b8b90a353c1af780524f1ac0d3af47bab 1439Author: Darren Tucker <dtucker@dtucker.net> 1440Date: Wed Jul 11 10:06:18 2018 +1000 1441 1442 Supply missing third arg in skey. 1443 1444 During the change to the new buffer api the third arg to 1445 sshbuf_get_cstring was ommitted. Fixes build when configured with skey. 1446 1447commit 380320bb72cc353a901790ab04b6287fd335dc4a 1448Author: Darren Tucker <dtucker@dtucker.net> 1449Date: Wed Jul 11 10:03:34 2018 +1000 1450 1451 Supply some more missing "int r" in skey 1452 1453commit d20720d373d8563ee737d1a45dc5e0804d622dbc 1454Author: Damien Miller <djm@mindrot.org> 1455Date: Wed Jul 11 09:56:36 2018 +1000 1456 1457 disable valgrind memleak checking by default 1458 1459 Add VALGRIND_CHECK_LEAKS knob to turn it back on. 1460 1461commit 79c9d35018f3a5e30ae437880b669aa8636cd3cd 1462Author: Darren Tucker <dtucker@dtucker.net> 1463Date: Wed Jul 11 09:54:00 2018 +1000 1464 1465 Supply missing "int r" in skey code. 1466 1467commit 984bacfaacbbe31c35191b828fb5b5b2f0362c36 1468Author: sf@openbsd.org <sf@openbsd.org> 1469Date: Tue Jul 10 09:36:58 2018 +0000 1470 1471 upstream: re-remove some pre-auth compression bits 1472 1473 This time, make sure to not remove things that are necessary for 1474 pre-auth compression on the client. Add a comment that pre-auth 1475 compression is still supported in the client. 1476 1477 ok markus@ 1478 1479 OpenBSD-Commit-ID: 282c6fec7201f18a5c333bbb68d9339734d2f784 1480 1481commit 120a1ec74e8d9d29f4eb9a27972ddd22351ddef9 1482Author: Damien Miller <djm@mindrot.org> 1483Date: Tue Jul 10 19:39:52 2018 +1000 1484 1485 Adapt portable to legacy buffer API removal 1486 1487commit 0f3958c1e6ffb8ea4ba27e2a97a00326fce23246 1488Author: djm@openbsd.org <djm@openbsd.org> 1489Date: Tue Jul 10 09:13:30 2018 +0000 1490 1491 upstream: kerberos/gssapi fixes for buffer removal 1492 1493 OpenBSD-Commit-ID: 1cdf56fec95801e4563c47f21696f04cd8b60c4c 1494 1495commit c74ae8e7c45f325f3387abd48fa7dfef07a08069 1496Author: djm@openbsd.org <djm@openbsd.org> 1497Date: Tue Jul 10 06:45:29 2018 +0000 1498 1499 upstream: buffer.[ch] and bufaux.c are no more 1500 1501 OpenBSD-Commit-ID: d1a1852284e554f39525eb4d4891b207cfb3d3a0 1502 1503commit a881e5a133d661eca923fb0633a03152ab2b70b2 1504Author: djm@openbsd.org <djm@openbsd.org> 1505Date: Tue Jul 10 06:43:52 2018 +0000 1506 1507 upstream: one mention of Buffer that almost got away :) 1508 1509 OpenBSD-Commit-ID: 30d7c27a90b4544ad5dfacf654595710cd499f02 1510 1511commit 49f47e656b60bcd1d1db98d88105295f4b4e600d 1512Author: markus@openbsd.org <markus@openbsd.org> 1513Date: Mon Jul 9 21:59:10 2018 +0000 1514 1515 upstream: replace cast with call to sshbuf_mutable_ptr(); ok djm@ 1516 1517 OpenBSD-Commit-ID: 4dfe9d29fa93d9231645c89084f7217304f7ba29 1518 1519commit cb30cd47041edb03476be1c8ef7bc1f4b69d1555 1520Author: markus@openbsd.org <markus@openbsd.org> 1521Date: Mon Jul 9 21:56:06 2018 +0000 1522 1523 upstream: remove legacy buffer API emulation layer; ok djm@ 1524 1525 OpenBSD-Commit-ID: 2dd5dc17cbc23195be4299fa93be2707a0e08ad9 1526 1527commit 235c7c4e3bf046982c2d8242f30aacffa01073d1 1528Author: markus@openbsd.org <markus@openbsd.org> 1529Date: Mon Jul 9 21:53:45 2018 +0000 1530 1531 upstream: sshd: switch monitor to sshbuf API; lots of help & ok 1532 1533 djm@ 1534 1535 OpenBSD-Commit-ID: d89bd02d33974fd35ca0b8940d88572227b34a48 1536 1537commit b8d9214d969775e409e1408ecdf0d58fad99b344 1538Author: markus@openbsd.org <markus@openbsd.org> 1539Date: Mon Jul 9 21:37:55 2018 +0000 1540 1541 upstream: sshd: switch GSSAPI to sshbuf API; ok djm@ 1542 1543 OpenBSD-Commit-ID: e48449ab4be3f006f7ba33c66241b7d652973e30 1544 1545commit c7d39ac8dc3587c5f05bdd5bcd098eb5c201c0c8 1546Author: markus@openbsd.org <markus@openbsd.org> 1547Date: Mon Jul 9 21:35:50 2018 +0000 1548 1549 upstream: sshd: switch authentication to sshbuf API; ok djm@ 1550 1551 OpenBSD-Commit-ID: 880aa06bce4b140781e836bb56bec34873290641 1552 1553commit c3cb7790e9efb14ba74b2d9f543ad593b3d55b31 1554Author: markus@openbsd.org <markus@openbsd.org> 1555Date: Mon Jul 9 21:29:36 2018 +0000 1556 1557 upstream: sshd: switch config to sshbuf API; ok djm@ 1558 1559 OpenBSD-Commit-ID: 72b02017bac7feac48c9dceff8355056bea300bd 1560 1561commit 2808d18ca47ad3d251836c555f0e22aaca03d15c 1562Author: markus@openbsd.org <markus@openbsd.org> 1563Date: Mon Jul 9 21:26:02 2018 +0000 1564 1565 upstream: sshd: switch loginmsg to sshbuf API; ok djm@ 1566 1567 OpenBSD-Commit-ID: f3cb4e54bff15c593602d95cc43e32ee1a4bac42 1568 1569commit 89dd615b8b531979be63f05f9d5624367c9b28e6 1570Author: markus@openbsd.org <markus@openbsd.org> 1571Date: Mon Jul 9 21:20:26 2018 +0000 1572 1573 upstream: ttymodes: switch to sshbuf API; ok djm@ 1574 1575 OpenBSD-Commit-ID: 5df340c5965e822c9da21e19579d08dea3cbe429 1576 1577commit f4608a7065480516ab46214f554e5f853fb7870f 1578Author: markus@openbsd.org <markus@openbsd.org> 1579Date: Mon Jul 9 21:18:10 2018 +0000 1580 1581 upstream: client: switch mux to sshbuf API; with & ok djm@ 1582 1583 OpenBSD-Commit-ID: 5948fb98d704f9c4e075b92edda64e0290b5feb2 1584 1585commit cecee2d607099a7bba0a84803e2325d15be4277b 1586Author: markus@openbsd.org <markus@openbsd.org> 1587Date: Mon Jul 9 21:03:30 2018 +0000 1588 1589 upstream: client: switch to sshbuf API; ok djm@ 1590 1591 OpenBSD-Commit-ID: 60cb0356114acc7625ab85105f6f6a7cd44a8d05 1592 1593commit ff55f4ad898137d4703e7a2bcc81167dfe8e9324 1594Author: markus@openbsd.org <markus@openbsd.org> 1595Date: Mon Jul 9 20:39:28 2018 +0000 1596 1597 upstream: pkcs11: switch to sshbuf API; ok djm@ 1598 1599 OpenBSD-Commit-ID: 98cc4e800f1617c51caf59a6cb3006f14492db79 1600 1601commit 168b46f405d6736960ba7930389eecb9b6710b7e 1602Author: sf@openbsd.org <sf@openbsd.org> 1603Date: Mon Jul 9 13:37:10 2018 +0000 1604 1605 upstream: Revert previous two commits 1606 1607 It turns out we still support pre-auth compression on the client. 1608 Therefore revert the previous two commits: 1609 1610 date: 2018/07/06 09:06:14; author: sf; commitid: yZVYKIRtUZWD9CmE; 1611 Rename COMP_DELAYED to COMP_ZLIB 1612 1613 Only delayed compression is supported nowadays. 1614 1615 ok markus@ 1616 1617 date: 2018/07/06 09:05:01; author: sf; commitid: rEGuT5UgI9f6kddP; 1618 Remove leftovers from pre-authentication compression 1619 1620 Support for this has been removed in 2016. 1621 COMP_DELAYED will be renamed in a later commit. 1622 1623 ok markus@ 1624 1625 OpenBSD-Commit-ID: cdfef526357e4e1483c86cf599491b2dafb77772 1626 1627commit ab39267fa1243d02b6c330615539fc4b21e17dc4 1628Author: sf@openbsd.org <sf@openbsd.org> 1629Date: Fri Jul 6 09:06:14 2018 +0000 1630 1631 upstream: Rename COMP_DELAYED to COMP_ZLIB 1632 1633 Only delayed compression is supported nowadays. 1634 1635 ok markus@ 1636 1637 OpenBSD-Commit-ID: 5b1dbaf3d9a4085aaa10fec0b7a4364396561821 1638 1639commit 95db395d2e56a6f868193aead6cadb2493f036c6 1640Author: sf@openbsd.org <sf@openbsd.org> 1641Date: Fri Jul 6 09:05:01 2018 +0000 1642 1643 upstream: Remove leftovers from pre-authentication compression 1644 1645 Support for this has been removed in 2016. 1646 COMP_DELAYED will be renamed in a later commit. 1647 1648 ok markus@ 1649 1650 OpenBSD-Commit-ID: 6a99616c832627157113fcb0cf5a752daf2e6b58 1651 1652commit f28a4d5cd24c4aa177e96b4f96957991e552cb70 1653Author: sf@openbsd.org <sf@openbsd.org> 1654Date: Fri Jul 6 09:03:02 2018 +0000 1655 1656 upstream: Remove unused ssh_packet_start_compression() 1657 1658 ok markus@ 1659 1660 OpenBSD-Commit-ID: 9d34cf2f59aca5422021ae2857190578187dc2b4 1661 1662commit 872517ddbb72deaff31d4760f28f2b0a1c16358f 1663Author: Darren Tucker <dtucker@dtucker.net> 1664Date: Fri Jul 6 13:32:02 2018 +1000 1665 1666 Defer setting bufsiz in getdelim. 1667 1668 Do not write to bufsiz until we are sure the malloc has succeeded, 1669 in case any callers rely on it (which they shouldn't). ok djm@ 1670 1671commit 3deb56f7190a414dc264e21e087a934fa1847283 1672Author: Darren Tucker <dtucker@dtucker.net> 1673Date: Thu Jul 5 13:32:01 2018 +1000 1674 1675 Fix other callers of read_environment_file. 1676 1677 read_environment_file recently gained an extra argument Some platform 1678 specific code also calls it so add the argument to those too. Fixes 1679 build on Solaris and AIX. 1680 1681commit 314908f451e6b2d4ccf6212ad246fa4619c721d3 1682Author: djm@openbsd.org <djm@openbsd.org> 1683Date: Wed Jul 4 13:51:45 2018 +0000 1684 1685 upstream: deal with API rename: match_filter_list() => 1686 1687 match_filter_blacklist() 1688 1689 OpenBSD-Regress-ID: 2da342be913efeb51806351af906fab01ba4367f 1690 1691commit 89f54cdf6b9cf1cf5528fd33897f1443913ddfb4 1692Author: djm@openbsd.org <djm@openbsd.org> 1693Date: Wed Jul 4 13:51:12 2018 +0000 1694 1695 upstream: exercise new expansion behaviour of 1696 1697 PubkeyAcceptedKeyTypes and, by proxy, test kex_assemble_names() 1698 1699 ok markus@ 1700 1701 OpenBSD-Regress-ID: 292978902e14d5729aa87e492dd166c842f72736 1702 1703commit 187633f24c71564e970681c8906df5a6017dcccf 1704Author: djm@openbsd.org <djm@openbsd.org> 1705Date: Tue Jul 3 13:53:26 2018 +0000 1706 1707 upstream: add a comment that could have saved me 45 minutes of wild 1708 1709 goose chasing 1710 1711 OpenBSD-Regress-ID: d469b29ffadd3402c090e21b792d627d46fa5297 1712 1713commit 312d2f2861a2598ed08587cb6c45c0e98a85408f 1714Author: djm@openbsd.org <djm@openbsd.org> 1715Date: Wed Jul 4 13:49:31 2018 +0000 1716 1717 upstream: repair PubkeyAcceptedKeyTypes (and friends) after RSA 1718 1719 signature work - returns ability to add/remove/specify algorithms by 1720 wildcard. 1721 1722 Algorithm lists are now fully expanded when the server/client configs 1723 are finalised, so errors are reported early and the config dumps 1724 (e.g. "ssh -G ...") now list the actual algorithms selected. 1725 1726 Clarify that, while wildcards are accepted in algorithm lists, they 1727 aren't full pattern-lists that support negation. 1728 1729 (lots of) feedback, ok markus@ 1730 1731 OpenBSD-Commit-ID: a8894c5c81f399a002f02ff4fe6b4fa46b1f3207 1732 1733commit 303af5803bd74bf05d375c04e1a83b40c30b2be5 1734Author: djm@openbsd.org <djm@openbsd.org> 1735Date: Tue Jul 3 11:43:49 2018 +0000 1736 1737 upstream: some magic for RSA-SHA2 checks 1738 1739 OpenBSD-Regress-ID: e5a9b11368ff6d86e7b25ad10ebe43359b471cd4 1740 1741commit 7d68e262944c1fff1574600fe0e5e92ec8b398f5 1742Author: Damien Miller <djm@mindrot.org> 1743Date: Tue Jul 3 23:27:11 2018 +1000 1744 1745 depend 1746 1747commit b4d4eda633af433d20232cbf7e855ceac8b83fe5 1748Author: djm@openbsd.org <djm@openbsd.org> 1749Date: Tue Jul 3 13:20:25 2018 +0000 1750 1751 upstream: some finesse to fix RSA-SHA2 certificate authentication 1752 1753 for certs hosted in ssh-agent 1754 1755 OpenBSD-Commit-ID: e5fd5edd726137dda2d020e1cdebc464110a010f 1756 1757commit d78b75df4a57e0f92295f24298e5f2930e71c172 1758Author: djm@openbsd.org <djm@openbsd.org> 1759Date: Tue Jul 3 13:07:58 2018 +0000 1760 1761 upstream: check correct variable; unbreak agent keys 1762 1763 OpenBSD-Commit-ID: c36981fdf1f3ce04966d3310826a3e1e6233d93e 1764 1765commit 2f30300c5e15929d0e34013f38d73e857f445e12 1766Author: djm@openbsd.org <djm@openbsd.org> 1767Date: Tue Jul 3 11:42:12 2018 +0000 1768 1769 upstream: crank version number to 7.8; needed for new compat flag 1770 1771 for prior version; part of RSA-SHA2 strictification, ok markus@ 1772 1773 OpenBSD-Commit-ID: 84a11fc0efd2674c050712336b5093f5d408e32b 1774 1775commit 4ba0d54794814ec0de1ec87987d0c3b89379b436 1776Author: djm@openbsd.org <djm@openbsd.org> 1777Date: Tue Jul 3 11:39:54 2018 +0000 1778 1779 upstream: Improve strictness and control over RSA-SHA2 signature 1780 1781 In ssh, when an agent fails to return a RSA-SHA2 signature when 1782 requested and falls back to RSA-SHA1 instead, retry the signature to 1783 ensure that the public key algorithm sent in the SSH_MSG_USERAUTH 1784 matches the one in the signature itself. 1785 1786 In sshd, strictly enforce that the public key algorithm sent in the 1787 SSH_MSG_USERAUTH message matches what appears in the signature. 1788 1789 Make the sshd_config PubkeyAcceptedKeyTypes and 1790 HostbasedAcceptedKeyTypes options control accepted signature algorithms 1791 (previously they selected supported key types). This allows these 1792 options to ban RSA-SHA1 in favour of RSA-SHA2. 1793 1794 Add new signature algorithms "rsa-sha2-256-cert-v01@openssh.com" and 1795 "rsa-sha2-512-cert-v01@openssh.com" to force use of RSA-SHA2 signatures 1796 with certificate keys. 1797 1798 feedback and ok markus@ 1799 1800 OpenBSD-Commit-ID: c6e9f6d45eed8962ad502d315d7eaef32c419dde 1801 1802commit 95344c257412b51199ead18d54eaed5bafb75617 1803Author: djm@openbsd.org <djm@openbsd.org> 1804Date: Tue Jul 3 10:59:35 2018 +0000 1805 1806 upstream: allow sshd_config PermitUserEnvironment to accept a 1807 1808 pattern-list of whitelisted environment variable names in addition to yes|no. 1809 1810 bz#1800, feedback and ok markus@ 1811 1812 OpenBSD-Commit-ID: 77dc2b468e0bf04b53f333434ba257008a1fdf24 1813 1814commit 6f56fe4b9578b0627667f8bce69d4d938a88324c 1815Author: millert@openbsd.org <millert@openbsd.org> 1816Date: Tue Jun 26 11:23:59 2018 +0000 1817 1818 upstream: Fix "WARNING: line 6 disappeared in /etc/moduli, giving up" 1819 1820 when choosing a prime. An extra increment of linenum snuck in as part of the 1821 conversion to getline(). OK djm@ markus@ 1822 1823 OpenBSD-Commit-ID: 0019225cb52ed621b71cd9f19ee2e78e57e3dd38 1824 1825commit 1eee79a11c1b3594f055b01e387c49c9a6e80005 1826Author: dtucker@openbsd.org <dtucker@openbsd.org> 1827Date: Mon Jul 2 14:13:30 2018 +0000 1828 1829 upstream: One ampersand is enough to backgroud an process. OpenBSD 1830 1831 doesn't seem to mind, but some platforms in -portable object to the second. 1832 1833 OpenBSD-Regress-ID: d6c3e404871764343761dc25c3bbe29c2621ff74 1834 1835commit 6301e6c787d4e26bfae1119ab4f747bbcaa94e44 1836Author: Darren Tucker <dtucker@dtucker.net> 1837Date: Mon Jul 2 21:16:58 2018 +1000 1838 1839 Add implementation of getline. 1840 1841 Add getline for the benefit of platforms that don't have it. Sourced 1842 from NetBSD (OpenBSD's implementation is a little too chummy with the 1843 internals of FILE). 1844 1845commit 84623e0037628f9992839063151f7a9f5f13099a 1846Author: djm@openbsd.org <djm@openbsd.org> 1847Date: Tue Jun 26 02:02:36 2018 +0000 1848 1849 upstream: whitespace 1850 1851 OpenBSD-Commit-ID: 9276951caf4daf555f6d262e95720e7f79244572 1852 1853commit 90e51d672711c19a36573be1785caf35019ae7a8 1854Author: djm@openbsd.org <djm@openbsd.org> 1855Date: Mon Jun 25 22:28:33 2018 +0000 1856 1857 upstream: fix NULL dereference in open_listen_match_tcpip() 1858 1859 OpenBSD-Commit-ID: c968c1d29e392352383c0f9681fcc1e93620c4a9 1860 1861commit f535ff922a67d9fcc5ee69d060d1b21c8bb01d14 1862Author: jmc@openbsd.org <jmc@openbsd.org> 1863Date: Tue Jun 19 05:36:57 2018 +0000 1864 1865 upstream: spelling; 1866 1867 OpenBSD-Commit-ID: db542918185243bea17202383a581851736553cc 1868 1869commit 80e199d6175904152aafc5c297096c3e18297691 1870Author: djm@openbsd.org <djm@openbsd.org> 1871Date: Tue Jun 19 03:02:17 2018 +0000 1872 1873 upstream: test PermitListen with bare port numbers 1874 1875 OpenBSD-Regress-ID: 4b50a02dfb0ccaca08247f3877c444126ba901b3 1876 1877commit 87ddd676da0f3abd08b778b12b53b91b670dc93c 1878Author: djm@openbsd.org <djm@openbsd.org> 1879Date: Tue Jun 19 02:59:41 2018 +0000 1880 1881 upstream: allow bare port numbers to appear in PermitListen directives, 1882 1883 e.g. 1884 1885 PermitListen 2222 8080 1886 1887 is equivalent to: 1888 1889 PermitListen *:2222 *:8080 1890 1891 Some bonus manpage improvements, mostly from markus@ 1892 1893 "looks fine" markus@ 1894 1895 OpenBSD-Commit-ID: 6546b0cc5aab7f53d65ad0a348ca0ae591d6dd24 1896 1897commit 26f96ca10ad0ec5da9b05b99de1e1ccea15a11be 1898Author: djm@openbsd.org <djm@openbsd.org> 1899Date: Fri Jun 15 07:01:11 2018 +0000 1900 1901 upstream: invalidate supplemental group cache used by 1902 1903 temporarily_use_uid() when the target uid differs; could cause failure to 1904 read authorized_keys under some configurations. patch by Jakub Jelen via 1905 bz2873; ok dtucker, markus 1906 1907 OpenBSD-Commit-ID: 48a345f0ee90f6c465a078eb5e89566b23abd8a1 1908 1909commit 89a85d724765b6b82e0135ee5a1181fdcccea9c6 1910Author: djm@openbsd.org <djm@openbsd.org> 1911Date: Sun Jun 10 23:45:41 2018 +0000 1912 1913 upstream: unbreak SendEnv; patch from tb@ 1914 1915 OpenBSD-Commit-ID: fc808daced813242563b80976e1478de95940056 1916 1917commit acf4260f0951f89c64e1ebbc4c92f451768871ad 1918Author: jmc@openbsd.org <jmc@openbsd.org> 1919Date: Sat Jun 9 06:36:31 2018 +0000 1920 1921 upstream: sort previous; 1922 1923 OpenBSD-Commit-ID: 27d80d8b8ca99bc33971dee905e8ffd0053ec411 1924 1925commit 1678d4236451060b735cb242d2e26e1ac99f0947 1926Author: djm@openbsd.org <djm@openbsd.org> 1927Date: Sat Jun 9 03:18:11 2018 +0000 1928 1929 upstream: slightly better wording re handing of $TERM, from Jakub 1930 1931 Jelen via bz2386 1932 1933 OpenBSD-Commit-ID: 14bea3f069a93c8be66a7b97794255a91fece964 1934 1935commit 28013759f09ed3ebf7e8335e83a62936bd7a7f47 1936Author: djm@openbsd.org <djm@openbsd.org> 1937Date: Sat Jun 9 03:03:10 2018 +0000 1938 1939 upstream: add a SetEnv directive for sshd_config to allow an 1940 1941 administrator to explicitly specify environment variables set in sessions 1942 started by sshd. These override the default environment and any variables set 1943 by user configuration (PermitUserEnvironment, etc), but not the SSH_* 1944 variables set by sshd itself. 1945 1946 ok markus@ 1947 1948 OpenBSD-Commit-ID: b6a96c0001ccd7dd211df6cae9e961c20fd718c0 1949 1950commit 7082bb58a2eb878d23ec674587c742e5e9673c36 1951Author: djm@openbsd.org <djm@openbsd.org> 1952Date: Sat Jun 9 03:01:12 2018 +0000 1953 1954 upstream: add a SetEnv directive to ssh_config that allows setting 1955 1956 environment variables for the remote session (subject to the server accepting 1957 them) 1958 1959 refactor SendEnv to remove the arbitrary limit of variable names. 1960 1961 ok markus@ 1962 1963 OpenBSD-Commit-ID: cfbb00d9b0e10c1ffff1d83424351fd961d1f2be 1964 1965commit 3b9798bda15bd3f598f5ef07595d64e23504da91 1966Author: djm@openbsd.org <djm@openbsd.org> 1967Date: Sat Jun 9 02:58:02 2018 +0000 1968 1969 upstream: reorder child environment preparation so that variables 1970 1971 read from ~/.ssh/environment (if enabled) do not override SSH_* variables set 1972 by the server. 1973 1974 OpenBSD-Commit-ID: 59f9d4c213cdcef2ef21f4b4ae006594dcf2aa7a 1975 1976commit 0368889f82f63c82ff8db9f8c944d89e7c657db4 1977Author: djm@openbsd.org <djm@openbsd.org> 1978Date: Fri Jun 8 03:35:36 2018 +0000 1979 1980 upstream: fix incorrect expansion of %i in 1981 1982 load_public_identity_files(); reported by Roumen Petrov 1983 1984 OpenBSD-Commit-ID: a827289e77149b5e0850d72a350c8b0300e7ef25 1985 1986commit 027607fc2db6a0475a3380f8d95c635482714cb0 1987Author: djm@openbsd.org <djm@openbsd.org> 1988Date: Fri Jun 8 01:55:40 2018 +0000 1989 1990 upstream: fix some over-long lines and __func__ up some debug 1991 1992 messages 1993 1994 OpenBSD-Commit-ID: c70a60b4c8207d9f242fc2351941ba50916bb267 1995 1996commit 6ff6fda705bc204456a5fa12518dde6e8790bb02 1997Author: jmc@openbsd.org <jmc@openbsd.org> 1998Date: Thu Jun 7 11:26:14 2018 +0000 1999 2000 upstream: tweak previous; 2001 2002 OpenBSD-Commit-ID: f98f16af10b28e24bcecb806cb71ea994b648fd6 2003 2004commit f2c06ab8dd90582030991f631a2715216bf45e5a 2005Author: Darren Tucker <dtucker@dtucker.net> 2006Date: Fri Jun 8 17:43:36 2018 +1000 2007 2008 Remove ability to override $LD. 2009 2010 Since autoconf always uses $CC to link C programs, allowing users to 2011 override LD caused mismatches between what LD_LINK_IFELSE thought worked 2012 and what ld thought worked. If you do need to do this kind of thing you 2013 need to set a compiler flag such as gcc's -fuse-ld in LDFLAGS. 2014 2015commit e1542a80797b4ea40a91d2896efdcc76a57056d2 2016Author: Darren Tucker <dtucker@dtucker.net> 2017Date: Fri Jun 8 13:55:59 2018 +1000 2018 2019 Better detection of unsupported compiler options. 2020 2021 Should prevent "unsupported -Wl,-z,retpoline" warnings during linking. 2022 ok djm@ 2023 2024commit 57379dbd013ad32ee3f9989bf5f5741065428360 2025Author: djm@openbsd.org <djm@openbsd.org> 2026Date: Thu Jun 7 14:29:43 2018 +0000 2027 2028 upstream: test the correct configuration option name 2029 2030 OpenBSD-Regress-ID: 492279ea9f65657f97a970e0e7c7fd0b339fee23 2031 2032commit 6d41815e202fbd6182c79780b6cc90e1ec1c9981 2033Author: djm@openbsd.org <djm@openbsd.org> 2034Date: Thu Jun 7 09:26:42 2018 +0000 2035 2036 upstream: some permitlisten fixes from markus@ that I missed in my 2037 2038 insomnia-fueled commits last night 2039 2040 OpenBSD-Commit-ID: 26f23622e928996086e85b1419cc1c0f136e359c 2041 2042commit 4319f7a868d86d435fa07112fcb6153895d03a7f 2043Author: djm@openbsd.org <djm@openbsd.org> 2044Date: Thu Jun 7 04:46:34 2018 +0000 2045 2046 upstream: permitlisten/PermitListen unit test from Markus 2047 2048 OpenBSD-Regress-ID: ab12eb42f0e14926980441cf7c058a6d1d832ea5 2049 2050commit fa09076410ffc2d34d454145af23c790d728921e 2051Author: djm@openbsd.org <djm@openbsd.org> 2052Date: Thu Jun 7 04:31:51 2018 +0000 2053 2054 upstream: fix regression caused by recent permitlisten option commit: 2055 2056 authorized_keys lines that contained permitopen/permitlisten were being 2057 treated as invalid. 2058 2059 OpenBSD-Commit-ID: 7ef41d63a5a477b405d142dc925b67d9e7aaa31b 2060 2061commit 7f90635216851f6cb4bf3999e98b825f85d604f8 2062Author: markus@openbsd.org <markus@openbsd.org> 2063Date: Wed Jun 6 18:29:18 2018 +0000 2064 2065 upstream: switch config file parsing to getline(3) as this avoids 2066 2067 static limits noted by gerhard@; ok dtucker@, djm@ 2068 2069 OpenBSD-Commit-ID: 6d702eabef0fa12e5a1d75c334a8c8b325298b5c 2070 2071commit 392db2bc83215986a91c0b65feb0e40e7619ce7e 2072Author: djm@openbsd.org <djm@openbsd.org> 2073Date: Wed Jun 6 18:25:33 2018 +0000 2074 2075 upstream: regress test for PermitOpen 2076 2077 OpenBSD-Regress-ID: ce8b5f28fc039f09bb297fc4a92319e65982ddaf 2078 2079commit 803d896ef30758135e2f438bdd1a0be27989e018 2080Author: djm@openbsd.org <djm@openbsd.org> 2081Date: Wed Jun 6 18:24:15 2018 +0000 2082 2083 upstream: man bits for permitlisten authorized_keys option 2084 2085 OpenBSD-Commit-ID: 86910af8f781a4ac5980fea125442eb25466dd78 2086 2087commit 04df43208b5b460d7360e1598f876b92a32f5922 2088Author: djm@openbsd.org <djm@openbsd.org> 2089Date: Wed Jun 6 18:24:00 2018 +0000 2090 2091 upstream: man bits for PermitListen 2092 2093 OpenBSD-Commit-ID: 35b200cba4e46a16a4db6a80ef11838ab0fad67c 2094 2095commit 93c06ab6b77514e0447fe4f1d822afcbb2a9be08 2096Author: djm@openbsd.org <djm@openbsd.org> 2097Date: Wed Jun 6 18:23:32 2018 +0000 2098 2099 upstream: permitlisten option for authorized_keys; ok markus@ 2100 2101 OpenBSD-Commit-ID: 8650883018d7aa893173d703379e4456a222c672 2102 2103commit 115063a6647007286cc8ca70abfd2a7585f26ccc 2104Author: djm@openbsd.org <djm@openbsd.org> 2105Date: Wed Jun 6 18:22:41 2018 +0000 2106 2107 upstream: Add a PermitListen directive to control which server-side 2108 2109 addresses may be listened on when the client requests remote forwarding (ssh 2110 -R). 2111 2112 This is the converse of the existing PermitOpen directive and this 2113 includes some refactoring to share much of its implementation. 2114 2115 feedback and ok markus@ 2116 2117 OpenBSD-Commit-ID: 15a931238c61a3f2ac74ea18a98c933e358e277f 2118 2119commit 7703ae5f5d42eb302ded51705166ff6e19c92892 2120Author: Darren Tucker <dtucker@dtucker.net> 2121Date: Wed Jun 6 16:04:29 2018 +1000 2122 2123 Use ssh-keygen -A to generate missing host keys. 2124 2125 Instead of testing for each specific key type, use ssh-keygen -A to 2126 generate any missing host key types. 2127 2128commit e8d59fef1098e24f408248dc64e5c8efa5d01f3c 2129Author: jmc@openbsd.org <jmc@openbsd.org> 2130Date: Fri Jun 1 06:23:10 2018 +0000 2131 2132 upstream: add missing punctuation after %i in ssh_config.5, and 2133 2134 make the grammatical format in sshd_config.5 match that in ssh_config.5; 2135 2136 OpenBSD-Commit-ID: e325663b9342f3d556e223e5306e0d5fa1a74fa0 2137 2138commit a1f737d6a99314e291a87856122cb4dbaf64c641 2139Author: jmc@openbsd.org <jmc@openbsd.org> 2140Date: Fri Jun 1 05:52:26 2018 +0000 2141 2142 upstream: oops - further adjustment to text neccessary; 2143 2144 OpenBSD-Commit-ID: 23585576c807743112ab956be0fb3c786bdef025 2145 2146commit 294028493471e0bd0c7ffe55dc0c0a67cba6ec41 2147Author: jmc@openbsd.org <jmc@openbsd.org> 2148Date: Fri Jun 1 05:50:18 2018 +0000 2149 2150 upstream: %U needs to be escaped; tweak text; 2151 2152 OpenBSD-Commit-ID: 30887b73ece257273fb619ab6f4e86dc92ddc15e 2153 2154commit e5019da3c5a31e6e729a565f2b886a80c4be96cc 2155Author: dtucker@openbsd.org <dtucker@openbsd.org> 2156Date: Fri Jun 1 04:31:48 2018 +0000 2157 2158 upstream: Apply umask to all incoming files and directories not 2159 2160 just files. This makes sure it gets applied to directories too, and prevents 2161 a race where files get chmodded after creation. bz#2839, ok djm@ 2162 2163 OpenBSD-Commit-ID: 3168ee6c7c39093adac4fd71039600cfa296203b 2164 2165commit a1dcafc41c376332493b9385ee39f9754dc145ec 2166Author: djm@openbsd.org <djm@openbsd.org> 2167Date: Fri Jun 1 03:52:37 2018 +0000 2168 2169 upstream: Adapt to extra default verboisity from ssh-keygen when 2170 2171 searching for and hashing known_hosts entries in a single operation 2172 (ssh-keygen -HF ...) Patch from Anton Kremenetsky 2173 2174 OpenBSD-Regress-ID: 519585a4de35c4611285bd6a7272766c229b19dd 2175 2176commit 76f314c75dffd4a55839d50ee23622edad52c168 2177Author: djm@openbsd.org <djm@openbsd.org> 2178Date: Tue May 22 00:22:49 2018 +0000 2179 2180 upstream: Add TEST_SSH_FAIL_FATAL variable, to force all failures 2181 2182 to instantly abort the test. Useful in capturing clean logs for individual 2183 failure cases. 2184 2185 OpenBSD-Regress-ID: feba18cf338c2328b9601bd4093cabdd9baa3af1 2186 2187commit 065c8c055df8d83ae7c92e5e524a579d87668aab 2188Author: dtucker@openbsd.org <dtucker@openbsd.org> 2189Date: Fri May 11 03:51:06 2018 +0000 2190 2191 upstream: Clean up comment. 2192 2193 OpenBSD-Regress-ID: 6adb35f384d447e7dcb9f170d4f0d546d3973e10 2194 2195commit 01b048c8eba3b021701bd0ab26257fc82903cba8 2196Author: djm@openbsd.org <djm@openbsd.org> 2197Date: Fri Jun 1 04:21:29 2018 +0000 2198 2199 upstream: whitespace 2200 2201 OpenBSD-Commit-ID: e5edb5e843ddc9b73a8e46518899be41d5709add 2202 2203commit 854ae209f992465a276de0b5f10ef770510c2418 2204Author: djm@openbsd.org <djm@openbsd.org> 2205Date: Fri Jun 1 04:05:29 2018 +0000 2206 2207 upstream: make ssh_remote_ipaddr() capable of being called after 2208 2209 the ssh->state has been torn down; bz#2773 2210 2211 OpenBSD-Commit-ID: 167f12523613ca3d16d7716a690e7afa307dc7eb 2212 2213commit 3e088aaf236ef35beeef3c9be93fd53700df5861 2214Author: djm@openbsd.org <djm@openbsd.org> 2215Date: Fri Jun 1 03:51:34 2018 +0000 2216 2217 upstream: return correct exit code when searching for and hashing 2218 2219 known_hosts entries in a single operation (ssh-keygen -HF hostname); bz2772 2220 Report and fix from Anton Kremenetsky 2221 2222 OpenBSD-Commit-ID: ac10ca13eb9bb0bc50fcd42ad11c56c317437b58 2223 2224commit 9c935dd9bf05628826ad2495d3e8bdf3d3271c21 2225Author: djm@openbsd.org <djm@openbsd.org> 2226Date: Fri Jun 1 03:33:53 2018 +0000 2227 2228 upstream: make UID available as a %-expansion everywhere that the 2229 2230 username is available currently. In the client this is via %i, in the server 2231 %U (since %i was already used in the client in some places for this, but used 2232 for something different in the server); bz#2870, ok dtucker@ 2233 2234 OpenBSD-Commit-ID: c7e912b0213713316cb55db194b3a6415b3d4b95 2235 2236commit d8748b91d1d6c108c0c260ed41fa55f37b9ef34b 2237Author: djm@openbsd.org <djm@openbsd.org> 2238Date: Fri Jun 1 03:11:49 2018 +0000 2239 2240 upstream: prefer argv0 to "ssh" when re-executing ssh for ProxyJump 2241 2242 directive; bz2831, feedback and ok dtucker@ 2243 2244 OpenBSD-Commit-ID: 3cec709a131499fbb0c1ea8a0a9e0b0915ce769e 2245 2246commit fbb4b5fd4f8e0bb89732670a01954e18b69e15ba 2247Author: djm@openbsd.org <djm@openbsd.org> 2248Date: Fri May 25 07:11:01 2018 +0000 2249 2250 upstream: Do not ban PTY allocation when a sshd session is restricted 2251 2252 because the user password is expired as it breaks password change dialog. 2253 2254 regression in openssh-7.7 reported by Daniel Wagner 2255 2256 OpenBSD-Commit-ID: 9fc09c584c6f1964b00595e3abe7f83db4d90d73 2257 2258commit f6a59a22b0c157c4c4e5fd7232f868138223be64 2259Author: djm@openbsd.org <djm@openbsd.org> 2260Date: Fri May 25 04:25:46 2018 +0000 2261 2262 upstream: Fix return value confusion in several functions (readdir, 2263 2264 download and fsync). These should return -1 on error, not a sftp status code. 2265 2266 patch from Petr Cerny in bz#2871 2267 2268 OpenBSD-Commit-ID: 651aa0220ad23c9167d9297a436162d741f97a09 2269 2270commit 1da5934b860ac0378d52d3035b22b6670f6a967e 2271Author: dtucker@openbsd.org <dtucker@openbsd.org> 2272Date: Fri May 25 03:20:59 2018 +0000 2273 2274 upstream: If select() fails in ssh_packet_read_seqnr go directly to 2275 2276 the error path instead of trying to read from the socket on the way out, 2277 which resets errno and causes the true error to be misreported. ok djm@ 2278 2279 OpenBSD-Commit-ID: 2614edaadbd05a957aa977728aa7a030af7c6f0a 2280 2281commit 4ef75926ef517d539f2c7aac3188b09f315c86a7 2282Author: Damien Miller <djm@mindrot.org> 2283Date: Fri May 25 13:36:58 2018 +1000 2284 2285 Permit getuid()/geteuid() syscalls. 2286 2287 Requested for Linux/s390; patch from Eduardo Barretto via bz#2752; 2288 ok dtucker 2289 2290commit 4b22fd8ecefd059a66140be67f352eb6145a9d88 2291Author: djm@openbsd.org <djm@openbsd.org> 2292Date: Tue May 22 00:13:26 2018 +0000 2293 2294 upstream: support ProxyJump=none to disable ProxyJump 2295 2296 functionality; bz#2869 ok dtucker@ 2297 2298 OpenBSD-Commit-ID: 1c06ee08eb78451b5837fcfd8cbebc5ff3a67a01 2299 2300commit f41bcd70f55b4f0fc4d8e1039cb361ac922b23fb 2301Author: jmc@openbsd.org <jmc@openbsd.org> 2302Date: Tue May 15 05:40:11 2018 +0000 2303 2304 upstream: correct keyowrd name (permitemptypasswords); from brendan 2305 2306 macdonell 2307 2308 OpenBSD-Commit-ID: ef1bdbc936b2ea693ee37a4c20a94d4d43f5fda3 2309 2310commit f18bc97151340127859634d20d79fd39ec8a7f39 2311Author: djm@openbsd.org <djm@openbsd.org> 2312Date: Fri May 11 04:01:11 2018 +0000 2313 2314 upstream: Emphasise that -w implicitly sets Tunnel=point-to-point 2315 2316 and that users should specify an explicit Tunnel directive if they don't want 2317 this. bz#2365. 2318 2319 OpenBSD-Commit-ID: 1a8d9c67ae213ead180481900dbbb3e04864560d 2320 2321commit 32e4e94e1511fe0020fbfbb62399d31b2d22a801 2322Author: Damien Miller <djm@mindrot.org> 2323Date: Mon May 14 14:40:08 2018 +1000 2324 2325 sync fmt_scaled.c 2326 2327 revision 1.17 2328 date: 2018/05/14 04:39:04; author: djm; state: Exp; lines: +5 -2; 2329 commitid: 53zY8GjViUBnWo8Z; 2330 constrain fractional part to [0-9] (less confusing to static analysis); ok ian@ 2331 2332commit 54268d589e85ecc43d3eba8d83f327bdada9d696 2333Author: Damien Miller <djm@mindrot.org> 2334Date: Fri May 11 14:04:40 2018 +1000 2335 2336 fix key-options.sh on platforms without openpty(3) 2337 2338 Skip the pty tests if the platform lacks openpty(3) and has to chown(2) 2339 the pty device explicitly. This typically requires root permissions that 2340 this test lacks. 2341 2342 bz#2856 ok dtucker@ 2343 2344commit b2140a739be4c3b43cc1dc08322dca39a1e39d20 2345Author: djm@openbsd.org <djm@openbsd.org> 2346Date: Fri May 11 03:38:51 2018 +0000 2347 2348 upstream: implement EMFILE mitigation for ssh-agent: remember the 2349 2350 fd rlimit and stop accepting new connections when it is exceeded (with some 2351 grace). Accept is resumed when enough connections are closed. 2352 2353 bz#2576. feedback deraadt; ok dtucker@ 2354 2355 OpenBSD-Commit-ID: 6a85d9cec7b85741961e7116a49f8dae777911ea 2356 2357commit fdba503fdfc647ee8a244002f1581e869c1f3d90 2358Author: dtucker@openbsd.org <dtucker@openbsd.org> 2359Date: Fri May 11 03:22:55 2018 +0000 2360 2361 upstream: Explicit cast when snprintf'ing an uint64. Prevents 2362 2363 warnings on platforms where int64 is long not long long. ok djm@ 2364 2365 OpenBSD-Commit-ID: 9c5359e2fbfce11dea2d93f7bc257e84419bd001 2366 2367commit e7751aa4094d51a9bc00778aa8d07e22934c55ee 2368Author: bluhm@openbsd.org <bluhm@openbsd.org> 2369Date: Thu Apr 26 14:47:03 2018 +0000 2370 2371 upstream: Since the previous commit, ssh regress test sftp-chroot was 2372 2373 failing. The sftp program terminated with the wrong exit code as sftp called 2374 fatal() instad of exit(0). So when the sigchld handler waits for the child, 2375 remember that it was found. Then don't expect that main() can wait again. OK 2376 dtucker@ 2377 2378 OpenBSD-Commit-ID: bfafd940c0de5297940c71ddf362053db0232266 2379 2380commit 7c15301841e2e9d37cae732400de63ae9c0961d6 2381Author: Darren Tucker <dtucker@dtucker.net> 2382Date: Sun Apr 29 17:54:12 2018 +1000 2383 2384 Use includes.h instead of config.h. 2385 2386 This ensures it picks up the definition of DEF_WEAK, the lack of which 2387 can cause compile errors in some cases (eg modern AIX). From 2388 michael at felt.demon.nl. 2389 2390commit cec338967a666b7c8ad8b88175f2faeddf268116 2391Author: Darren Tucker <dtucker@dtucker.net> 2392Date: Thu Apr 19 09:53:14 2018 +1000 2393 2394 Omit 3des-cbc if OpenSSL built without DES. 2395 2396 Patch from hongxu.jia at windriver.com, ok djm@ 2397 2398commit a575ddd58835759393d2dddd16ebe5abdb56485e 2399Author: djm@openbsd.org <djm@openbsd.org> 2400Date: Mon Apr 16 22:50:44 2018 +0000 2401 2402 upstream: Disable SSH2_MSG_DEBUG messages for Twisted Conch clients 2403 2404 without version numbers since they choke on them under some circumstances. 2405 https://twistedmatrix.com/trac/ticket/9422 via Colin Watson 2406 2407 Newer Conch versions have a version number in their ident string and 2408 handle debug messages okay. https://twistedmatrix.com/trac/ticket/9424 2409 2410 OpenBSD-Commit-ID: 6cf7be262af0419c58ddae11324d9c0dc1577539 2411 2412commit 390c7000a8946db565b66eab9e52fb11948711fa 2413Author: djm@openbsd.org <djm@openbsd.org> 2414Date: Sat Apr 14 21:50:41 2018 +0000 2415 2416 upstream: don't free the %C expansion, it's used later for 2417 2418 LocalCommand 2419 2420 OpenBSD-Commit-ID: 857b5cb37b2d856bfdfce61289a415257a487fb1 2421 2422commit 3455f1e7c48e2e549192998d330214975b9b1dc7 2423Author: djm@openbsd.org <djm@openbsd.org> 2424Date: Fri Apr 13 05:04:12 2018 +0000 2425 2426 upstream: notify user immediately when underlying ssh process dies; 2427 2428 patch from Thomas Kuthan in bz2719; ok dtucker@ 2429 2430 OpenBSD-Commit-ID: 78fac88c2f08054d1fc5162c43c24162b131cf78 2431 2432commit 1c5b4bc827f4abc3e65888cda061ad5edf1b8c7c 2433Author: Darren Tucker <dtucker@dtucker.net> 2434Date: Fri Apr 13 16:23:57 2018 +1000 2435 2436 Allow nanosleep in preauth privsep child. 2437 2438 The new timing attack mitigation code uses nanosleep in the preauth 2439 codepath, allow in systrace andbox too. 2440 2441commit 0e73428038d5ecfa5d2a28cff26661502a7aff4e 2442Author: Darren Tucker <dtucker@dtucker.net> 2443Date: Fri Apr 13 16:06:29 2018 +1000 2444 2445 Allow nanosleep in preauth privsep child. 2446 2447 The new timing attack mitigation code uses nanosleep in the preauth 2448 codepath, allow in sandbox. 2449 2450commit e9d910b0289c820852f7afa67f584cef1c05fe95 2451Author: dtucker@openbsd.org <dtucker@openbsd.org> 2452Date: Fri Apr 13 03:57:26 2018 +0000 2453 2454 upstream: Defend against user enumeration timing attacks. This 2455 2456 establishes a minimum time for each failed authentication attempt (5ms) and 2457 adds a per-user constant derived from a host secret (0-4ms). Based on work 2458 by joona.kannisto at tut.fi, ok markus@ djm@. 2459 2460 OpenBSD-Commit-ID: b7845b355bb7381703339c8fb0e57e81a20ae5ca 2461 2462commit d97874cbd909eb706886cd0cdd418f812c119ef9 2463Author: Darren Tucker <dtucker@dtucker.net> 2464Date: Fri Apr 13 13:43:55 2018 +1000 2465 2466 Using "==" in shell tests is not portable. 2467 2468 Patch from rsbecker at nexbridge.com. 2469 2470commit cfb1d9bc76734681e3dea532a1504fcd466fbe91 2471Author: Damien Miller <djm@mindrot.org> 2472Date: Fri Apr 13 13:38:06 2018 +1000 2473 2474 Fix tunnel forwarding broken in 7.7p1 2475 2476 bz2855, ok dtucker@ 2477 2478commit afa6e79b76fb52a0c09a29688b5c0d125eb08302 2479Author: Damien Miller <djm@mindrot.org> 2480Date: Fri Apr 13 13:31:42 2018 +1000 2481 2482 prefer to use getrandom() for PRNG seeding 2483 2484 Only applies when built --without-openssl. Thanks Jann Horn for 2485 reminder. 2486 2487commit 575fac34a97f69bc217b235f81de9f8f433eceed 2488Author: Darren Tucker <dtucker@dtucker.net> 2489Date: Fri Apr 13 13:13:33 2018 +1000 2490 2491 Revert $REGRESSTMP changes. 2492 2493 Revert 3fd2d229 and subsequent changes as they turned out to be a 2494 portability hassle. 2495 2496commit 10479cc2a4acd6faaf643eb305233b49d70c31c1 2497Author: Damien Miller <djm@mindrot.org> 2498Date: Tue Apr 10 10:19:02 2018 +1000 2499 2500 Many typo fixes from Karsten Weiss 2501 2502 Spotted using https://github.com/lucasdemarchi/codespell 2503 2504commit 907da2f88519b34189fd03fac96de0c52d448233 2505Author: djm@openbsd.org <djm@openbsd.org> 2506Date: Tue Apr 10 00:14:10 2018 +0000 2507 2508 upstream: more typos spotted by Karsten Weiss using codespell 2509 2510 OpenBSD-Regress-ID: d906a2aea0663810a658b7d0bc61a1d2907d4d69 2511 2512commit 37e5f4a7ab9a8026e5fc2f47dafb0f1b123d39e9 2513Author: djm@openbsd.org <djm@openbsd.org> 2514Date: Tue Apr 10 00:13:27 2018 +0000 2515 2516 upstream: make this a bit more portable-friendly 2517 2518 OpenBSD-Regress-ID: 62f7b9e055e8dfaab92b3825f158beeb4ca3f963 2519 2520commit 001aa55484852370488786bd40e9fdad4b465811 2521Author: djm@openbsd.org <djm@openbsd.org> 2522Date: Tue Apr 10 00:10:49 2018 +0000 2523 2524 upstream: lots of typos in comments/docs. Patch from Karsten Weiss 2525 2526 after checking with codespell tool 2527 (https://github.com/lucasdemarchi/codespell) 2528 2529 OpenBSD-Commit-ID: 373222f12d7ab606598a2d36840c60be93568528 2530 2531commit 260ede2787fe80b18b8d5920455b4fb268519c7d 2532Author: djm@openbsd.org <djm@openbsd.org> 2533Date: Mon Apr 9 23:54:49 2018 +0000 2534 2535 upstream: don't kill ssh-agent's listening socket entriely if we 2536 2537 fail to accept a connection; bz#2837, patch from Lukas Kuster 2538 2539 OpenBSD-Commit-ID: 52413f5069179bebf30d38f524afe1a2133c738f 2540 2541commit ebc8b4656f9b0f834a642a9fb3c9fbca86a61838 2542Author: tj@openbsd.org <tj@openbsd.org> 2543Date: Mon Apr 9 20:41:22 2018 +0000 2544 2545 upstream: the UseLogin option was removed, so remove it here too. 2546 2547 ok dtucker 2548 2549 OpenBSD-Commit-ID: 7080be73a64d68e21f22f5408a67a0ba8b1b6b06 2550 2551commit 3e36f281851fc8e9c996b33f108b2ae167314fbe 2552Author: jmc@openbsd.org <jmc@openbsd.org> 2553Date: Sun Apr 8 07:36:02 2018 +0000 2554 2555 upstream: tweak previous; 2556 2557 OpenBSD-Commit-ID: 2b9c23022ea7b9dddb62864de4e906000f9d7474 2558 2559commit 8368571efd6693c5c57f850e23a2372acf3f865f 2560Author: jmc@openbsd.org <jmc@openbsd.org> 2561Date: Sat Apr 7 13:50:10 2018 +0000 2562 2563 upstream: tweak previous; 2564 2565 OpenBSD-Commit-ID: 38e347b6f8e888f5e0700d01abb1eba7caa154f9 2566 2567commit 555294a7279914ae6795b71bedf4e6011b7636df 2568Author: djm@openbsd.org <djm@openbsd.org> 2569Date: Fri Apr 6 13:02:39 2018 +0000 2570 2571 upstream: Allow "SendEnv -PATTERN" to clear environment variables 2572 2573 previously labeled for sendind. bz#1285 ok dtucker@ 2574 2575 OpenBSD-Commit-ID: f6fec9e3d0f366f15903094fbe1754cb359a0df9 2576 2577commit 40f5f03544a07ebd2003b443d42e85cb51d94d59 2578Author: djm@openbsd.org <djm@openbsd.org> 2579Date: Fri Apr 6 04:15:45 2018 +0000 2580 2581 upstream: relax checking of authorized_keys environment="..." 2582 2583 options to allow underscores in variable names (regression introduced in 2584 7.7). bz2851, ok deraadt@ 2585 2586 OpenBSD-Commit-ID: 69690ffe0c97ff393f2c76d25b4b3d2ed4e4ac9c 2587 2588commit 30fd7f9af0f553aaa2eeda5a1f53f26cfc222b5e 2589Author: djm@openbsd.org <djm@openbsd.org> 2590Date: Fri Apr 6 03:51:27 2018 +0000 2591 2592 upstream: add a couple of missed options to the config dump; patch 2593 2594 from Jakub Jelen via bz2835 2595 2596 OpenBSD-Commit-ID: 5970adadf6ef206bee0dddfc75d24c2019861446 2597 2598commit 8d6829be324452d2acd282d5f8ceb0adaa89a4de 2599Author: djm@openbsd.org <djm@openbsd.org> 2600Date: Fri Apr 6 03:34:27 2018 +0000 2601 2602 upstream: ssh does not accept -oInclude=... on the commandline, the 2603 2604 Include keyword is for configuration files only. bz#2840, patch from Jakub 2605 Jelen 2606 2607 OpenBSD-Commit-ID: 32d052b4a7a7f22df35fe3f71c368c02b02cacb0 2608 2609commit 00c5222ddc0c8edcaa4ea45ac03befdc8013d137 2610Author: djm@openbsd.org <djm@openbsd.org> 2611Date: Thu Apr 5 22:54:28 2018 +0000 2612 2613 upstream: We don't offer CBC cipher by default any more. Spotted by 2614 2615 Renaud Allard (via otto@) 2616 2617 OpenBSD-Commit-ID: a559b1eef741557dd959ae378b665a2977d92dca 2618 2619commit 5ee8448ad7c306f05a9f56769f95336a8269f379 2620Author: job@openbsd.org <job@openbsd.org> 2621Date: Wed Apr 4 15:12:17 2018 +0000 2622 2623 upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP AF21 for 2624 2625 interactive and CS1 for bulk 2626 2627 AF21 was selected as this is the highest priority within the low-latency 2628 service class (and it is higher than what we have today). SSH is elastic 2629 and time-sensitive data, where a user is waiting for a response via the 2630 network in order to continue with a task at hand. As such, these flows 2631 should be considered foreground traffic, with delays or drops to such 2632 traffic directly impacting user-productivity. 2633 2634 For bulk SSH traffic, the CS1 "Lower Effort" marker was chosen to enable 2635 networks implementing a scavanger/lower-than-best effort class to 2636 discriminate scp(1) below normal activities, such as web surfing. In 2637 general this type of bulk SSH traffic is a background activity. 2638 2639 An advantage of using "AF21" for interactive SSH and "CS1" for bulk SSH 2640 is that they are recognisable values on all common platforms (IANA 2641 https://www.iana.org/assignments/dscp-registry/dscp-registry.xml), and 2642 for AF21 specifically a definition of the intended behavior exists 2643 https://tools.ietf.org/html/rfc4594#section-4.7 in addition to the definition 2644 of the Assured Forwarding PHB group https://tools.ietf.org/html/rfc2597, and 2645 for CS1 (Lower Effort) there is https://tools.ietf.org/html/rfc3662 2646 2647 The first three bits of "AF21" map to the equivalent IEEEE 802.1D PCP, IEEE 2648 802.11e, MPLS EXP/CoS and IP Precedence value of 2 (also known as "Immediate", 2649 or "AC_BE"), and CS1's first 3 bits map to IEEEE 802.1D PCP, IEEE 802.11e, 2650 MPLS/CoS and IP Precedence value 1 ("Background" or "AC_BK"). 2651 2652 OK deraadt@, "no objection" djm@ 2653 2654 OpenBSD-Commit-ID: d11d2a4484f461524ef0c20870523dfcdeb52181 2655 2656commit 424b544fbda963f973da80f884717c3e0a513288 2657Author: dtucker@openbsd.org <dtucker@openbsd.org> 2658Date: Tue Apr 3 02:14:08 2018 +0000 2659 2660 upstream: Import regenerated moduli file. 2661 2662 OpenBSD-Commit-ID: 1de0e85522051eb2ffa00437e1885e9d7b3e0c2e 2663 2664commit 323f66ce934df2da551f256f37d69822428e1ca1 2665Author: dtucker@openbsd.org <dtucker@openbsd.org> 2666Date: Fri Apr 6 04:18:35 2018 +0000 2667 2668 upstream: Add test for username options parsing order, prompted by 2669 2670 bz#2849. 2671 2672 OpenBSD-Regress-ID: 6985cd32f38596882a3ac172ff8c510693b65283 2673 2674commit e8f474554e3bda102a797a2fbab0594ccc66f097 2675Author: Damien Miller <djm@mindrot.org> 2676Date: Fri Apr 6 14:11:44 2018 +1000 2677 2678 Expose SSH_AUTH_INFO_0 to PAM auth modules 2679 2680 bz#2408, patch from Radoslaw Ejsmont; ok dtucker@ 2681 2682commit 014ba209cf4c6a159baa30ecebbaddfa97da7100 2683Author: Darren Tucker <dtucker@dtucker.net> 2684Date: Tue Apr 3 12:18:00 2018 +1000 2685 2686 Import regenerated moduli file. 2687 2688commit a0349a1cc4a18967ad1dbff5389bcdf9da098814 2689Author: Damien Miller <djm@mindrot.org> 2690Date: Mon Apr 2 15:38:28 2018 +1000 2691 2692 update versions in .spec files 2693 2694commit 816ad38f79792f5617e3913be306ddb27e91091c 2695Author: Damien Miller <djm@mindrot.org> 2696Date: Mon Apr 2 15:38:20 2018 +1000 2697 2698 update version number 2699 2700commit 2c71ca1dd1efe458cb7dee3f8a1a566f913182c2 2701Author: Darren Tucker <dtucker@dtucker.net> 2702Date: Fri Mar 30 18:23:07 2018 +1100 2703 2704 Disable native strndup and strnlen on AIX. 2705 2706 On at least some revisions of AIX, strndup returns unterminated strings 2707 under some conditions, apparently because strnlen returns incorrect 2708 values in those cases. Disable both on AIX and use the replacements 2709 from openbsd-compat. Fixes problem with ECDSA keys there, ok djm. 2710 2711commit 6b5a17bc14e896e3904dc58d889b58934cfacd24 2712Author: Darren Tucker <dtucker@dtucker.net> 2713Date: Mon Mar 26 13:12:44 2018 +1100 2714 2715 Include ssh_api.h for struct ssh. 2716 2717 struct ssh is needed by implementations of sys_auth_passwd() that were 2718 converted in commit bba02a50. Needed to fix build on AIX, I assume for 2719 the other platforms too (although it should be harmless if not needed). 2720 2721commit bc3f80e4d191b8e48650045dfa8a682cd3aabd4d 2722Author: Darren Tucker <dtucker@dtucker.net> 2723Date: Mon Mar 26 12:58:09 2018 +1100 2724 2725 Remove UNICOS code missed during removal. 2726 2727 Fixes compile error on AIX. 2728 2729commit 9d57762c24882e2f000a21a0ffc8c5908a1fa738 2730Author: markus@openbsd.org <markus@openbsd.org> 2731Date: Sat Mar 24 19:29:03 2018 +0000 2732 2733 upstream: openssh-7.7 2734 2735 OpenBSD-Commit-ID: 274e614352460b9802c905f38fb5ea7ed5db3d41 2736 2737commit 4b7d8acdbbceef247dc035e611e577174ed8a87e 2738Author: Damien Miller <djm@mindrot.org> 2739Date: Mon Mar 26 09:37:02 2018 +1100 2740 2741 Remove authinfo.sh test dependency on printenv 2742 2743 Some platforms lack printenv in the default $PATH. 2744 Reported by Tom G. Christensen 2745 2746commit 4afeaf3dcb7dc70efd98fcfcb0ed28a6b40b820e 2747Author: Tim Rice <tim@multitalents.net> 2748Date: Sun Mar 25 10:00:21 2018 -0700 2749 2750 Use libiaf on all sysv5 systems 2751 2752commit bba02a5094b3db228ceac41cb4bfca165d0735f3 2753Author: Tim Rice <tim@multitalents.net> 2754Date: Sun Mar 25 09:17:33 2018 -0700 2755 2756 modified: auth-sia.c 2757 modified: openbsd-compat/port-aix.c 2758 modified: openbsd-compat/port-uw.c 2759 2760 propogate changes to auth-passwd.c in commit 2761 7c856857607112a3dfe6414696bf4c7ab7fb0cb3 to other providers 2762 of sys_auth_passwd() 2763 2764commit d7a7a39168bdfe273587bf85d779d60569100a3f 2765Author: markus@openbsd.org <markus@openbsd.org> 2766Date: Sat Mar 24 19:29:03 2018 +0000 2767 2768 upstream: openssh-7.7 2769 2770 OpenBSD-Commit-ID: 274e614352460b9802c905f38fb5ea7ed5db3d41 2771 2772commit 9efcaaac314c611c6c0326e8bac5b486c424bbd2 2773Author: markus@openbsd.org <markus@openbsd.org> 2774Date: Sat Mar 24 19:28:43 2018 +0000 2775 2776 upstream: fix bogus warning when signing cert keys using agent; 2777 2778 from djm; ok deraadt dtucker 2779 2780 OpenBSD-Commit-ID: 12e50836ba2040042383a8b71e12d7ea06e9633d 2781 2782commit 393436024d2e4b4c7a01f9cfa5854e7437896d11 2783Author: Darren Tucker <dtucker@dtucker.net> 2784Date: Sun Mar 25 09:40:46 2018 +1100 2785 2786 Replace /dev/stdin with "-". 2787 2788 For some reason sftp -b doesn't work with /dev/stdin on Cygwin, as noted 2789 and suggested by vinschen at redhat.com. 2790 2791commit b5974de1a1d419e316ffb6524b1b277dda2f3b49 2792Author: Darren Tucker <dtucker@dtucker.net> 2793Date: Fri Mar 23 13:21:14 2018 +1100 2794 2795 Provide $OBJ to paths in PuTTY interop tests. 2796 2797commit dc31e79454e9b9140b33ad380565fdb59b9c4f33 2798Author: dtucker@openbsd.org <dtucker@openbsd.org> 2799Date: Fri Mar 16 09:06:31 2018 +0000 2800 2801 upstream: Tell puttygen to use /dev/urandom instead of /dev/random. On 2802 2803 OpenBSD they are both non-blocking, but on many other -portable platforms it 2804 blocks, stalling tests. 2805 2806 OpenBSD-Regress-ID: 397d0d4c719c353f24d79f5b14775e0cfdf0e1cc 2807 2808commit cb1f94431ef319cd48618b8b771b58739a8210cf 2809Author: markus@openbsd.org <markus@openbsd.org> 2810Date: Thu Mar 22 07:06:11 2018 +0000 2811 2812 upstream: ssh/xmss: fix build; ok djm@ 2813 2814 OpenBSD-Commit-ID: c9374ca41d4497f1c673ab681cc33f6e7c5dd186 2815 2816commit 27979da9e4074322611355598f69175b9ff10d39 2817Author: markus@openbsd.org <markus@openbsd.org> 2818Date: Thu Mar 22 07:05:48 2018 +0000 2819 2820 upstream: ssh/xmss: fix deserialize for certs; ok djm@ 2821 2822 OpenBSD-Commit-ID: f44c41636c16ec83502039828beaf521c057dddc 2823 2824commit c6cb2565c9285eb54fa9dfbb3890f5464aff410f 2825Author: Darren Tucker <dtucker@dtucker.net> 2826Date: Thu Mar 22 17:00:28 2018 +1100 2827 2828 Save $? before case statement. 2829 2830 In some shells (FreeBSD 9, ash) the case statement resets $?, so save 2831 for later testing. 2832 2833commit 4c4e7f783b43b264c247233acb887ee10ed4ce4d 2834Author: djm@openbsd.org <djm@openbsd.org> 2835Date: Wed Mar 14 05:35:40 2018 +0000 2836 2837 upstream: rename recently-added "valid-before" key restriction to 2838 2839 "expiry-time" as the former is confusing wrt similar terminology in X.509; 2840 pointed out by jsing@ 2841 2842 OpenBSD-Regress-ID: ac8b41dbfd90cffd525d58350c327195b0937793 2843 2844commit 500396b204c58e78ad9d081516a365a9f28dc3fd 2845Author: djm@openbsd.org <djm@openbsd.org> 2846Date: Mon Mar 12 00:56:03 2018 +0000 2847 2848 upstream: check valid-before option in authorized_keys 2849 2850 OpenBSD-Regress-ID: 7e1e4a84f7f099a290e5a4cbf4196f90ff2d7e11 2851 2852commit a76b5d26c2a51d7dd7a5164e683ab3f4419be215 2853Author: djm@openbsd.org <djm@openbsd.org> 2854Date: Mon Mar 12 00:54:04 2018 +0000 2855 2856 upstream: explicitly specify RSA/SHA-2 keytype here too 2857 2858 OpenBSD-Regress-ID: 74d7b24e8c72c27af6b481198344eb077e993a62 2859 2860commit 3a43297ce29d37c64e37c7e21282cb219e28d3d1 2861Author: djm@openbsd.org <djm@openbsd.org> 2862Date: Mon Mar 12 00:52:57 2018 +0000 2863 2864 upstream: exlicitly include RSA/SHA-2 keytypes in 2865 2866 PubkeyAcceptedKeyTypes here 2867 2868 OpenBSD-Regress-ID: 954d19e0032a74e31697fb1dc7e7d3d1b2d65fe9 2869 2870commit 037fdc1dc2d68e1d43f9c9e2586c02cabc8f7cc8 2871Author: jmc@openbsd.org <jmc@openbsd.org> 2872Date: Wed Mar 14 06:56:20 2018 +0000 2873 2874 upstream: sort expiry-time; 2875 2876 OpenBSD-Commit-ID: 8c7d82ee1e63e26ceb2b3d3a16514019f984f6bf 2877 2878commit abc0fa38c9bc136871f28e452c3465c3051fc785 2879Author: djm@openbsd.org <djm@openbsd.org> 2880Date: Wed Mar 14 05:35:40 2018 +0000 2881 2882 upstream: rename recently-added "valid-before" key restriction to 2883 2884 "expiry-time" as the former is confusing wrt similar terminology in X.509; 2885 pointed out by jsing@ 2886 2887 OpenBSD-Commit-ID: 376939466a1f562f3950a22314bc6505733aaae6 2888 2889commit bf0fbf2b11a44f06a64b620af7d01ff171c28e13 2890Author: djm@openbsd.org <djm@openbsd.org> 2891Date: Mon Mar 12 00:52:01 2018 +0000 2892 2893 upstream: add valid-before="[time]" authorized_keys option. A 2894 2895 simple way of giving a key an expiry date. ok markus@ 2896 2897 OpenBSD-Commit-ID: 1793b4dd5184fa87f42ed33c7b0f4f02bc877947 2898 2899commit fbd733ab7adc907118a6cf56c08ed90c7000043f 2900Author: Darren Tucker <dtucker@dtucker.net> 2901Date: Mon Mar 12 19:17:26 2018 +1100 2902 2903 Add AC_LANG_PROGRAM to AC_COMPILE_IFELSE. 2904 2905 The recently added MIPS ABI tests need AC_LANG_PROGRAM to prevent 2906 warnings from autoconf. Pointed out by klausz at haus-gisela.de. 2907 2908commit c7c458e8261b04d161763cd333d74e7a5842e917 2909Author: djm@openbsd.org <djm@openbsd.org> 2910Date: Wed Mar 7 23:53:08 2018 +0000 2911 2912 upstream: revert recent strdelim() change, it causes problems with 2913 2914 some configs. 2915 2916 revision 1.124 2917 date: 2018/03/02 03:02:11; author: djm; state: Exp; lines: +19 -8; commitid: nNRsCijZiGG6SUTT; 2918 Allow escaped quotes \" and \' in ssh_config and sshd_config quotes 2919 option strings. bz#1596 ok markus@ 2920 2921 OpenBSD-Commit-ID: 59c40b1b81206d713c06b49d8477402c86babda5 2922 2923commit 0bcd871ccdf3baf2b642509ba4773d5be067cfa2 2924Author: jmc@openbsd.org <jmc@openbsd.org> 2925Date: Mon Mar 5 07:03:18 2018 +0000 2926 2927 upstream: move the input format details to -f; remove the output 2928 2929 format details and point to sshd(8), where it is documented; 2930 2931 ok dtucker 2932 2933 OpenBSD-Commit-ID: 95f17e47dae02a6ac7329708c8c893d4cad0004a 2934 2935commit 45011511a09e03493568506ce32f4891a174a3bd 2936Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 2937Date: Tue Jun 20 16:42:28 2017 +0100 2938 2939 configure.ac: properly set seccomp_audit_arch for MIPS64 2940 2941 Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or 2942 AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built 2943 for MIPS64. However, that's only valid for n64 ABI. The right macros for 2944 n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and 2945 AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively. 2946 2947 Because of that an sshd built for MIPS64 n32 rejects connection attempts 2948 and the output of strace reveals that the problem is related to seccomp 2949 audit: 2950 2951 [pid 194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57, 2952 filter=0x555d5da0}) = 0 2953 [pid 194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ? 2954 [pid 193] <... poll resumed> ) = 2 ([{fd=5, revents=POLLIN|POLLHUP}, 2955 {fd=6, revents=POLLHUP}]) 2956 [pid 194] +++ killed by SIGSYS +++ 2957 2958 This patch fixes that problem by setting the right value to 2959 seccomp_audit_arch taking into account the MIPS64 ABI. 2960 2961 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 2962 2963commit 580086704c31de91dc7ba040a28e416bf1fefbca 2964Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 2965Date: Tue Jun 20 16:42:11 2017 +0100 2966 2967 configure.ac: detect MIPS ABI 2968 2969 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 2970 2971commit cd4e937aa701f70366cd5b5969af525dff6fdf15 2972Author: Alan Yee <alyee@ucsd.edu> 2973Date: Wed Mar 7 15:12:14 2018 -0800 2974 2975 Use https URLs for links that support it. 2976 2977commit c0a0c3fc4a76b682db22146b28ddc46566db1ce9 2978Author: Darren Tucker <dtucker@dtucker.net> 2979Date: Mon Mar 5 20:03:07 2018 +1100 2980 2981 Disable UTMPX on SunOS4. 2982 2983commit 58fd4c5c0140f6636227ca7acbb149ab0c2509b9 2984Author: Darren Tucker <dtucker@dtucker.net> 2985Date: Mon Mar 5 19:28:08 2018 +1100 2986 2987 Check for and work around buggy fflush(NULL). 2988 2989 Some really old platforms (eg SunOS4) segfault on fflush(NULL) so check 2990 for and work around. With klausz at haus-gisela.de. 2991 2992commit 71e48bc7945f867029e50e06c665c66aed6d3c64 2993Author: Darren Tucker <dtucker@dtucker.net> 2994Date: Mon Mar 5 10:22:32 2018 +1100 2995 2996 Remove extra XMSS #endif 2997 2998 Extra #endif breaks compile with -DWITH_XMSS. Pointed out by Jack 2999 Schmidt via github. 3000 3001commit 055e09e2212ff52067786bf6d794ca9512ff7f0c 3002Author: dtucker@openbsd.org <dtucker@openbsd.org> 3003Date: Sat Mar 3 06:37:53 2018 +0000 3004 3005 upstream: Update RSA minimum modulus size to 1024. sshkey.h rev 1.18 3006 3007 bumped the minimum from 768 to 1024, update man page accordingly. 3008 3009 OpenBSD-Commit-ID: 27563ab4e866cd2aac40a5247876f6787c08a338 3010 3011commit 7e4fadd3248d6bb7d39d6688c76a613d35d2efc1 3012Author: djm@openbsd.org <djm@openbsd.org> 3013Date: Sun Mar 4 01:46:48 2018 +0000 3014 3015 upstream: for the pty control tests, just check that the PTY path 3016 3017 points to something in /dev (rather than checking the device node itself); 3018 makes life easier for portable, where systems with dynamic ptys can delete 3019 nodes before we get around to testing their existence. 3020 3021 OpenBSD-Regress-ID: b1e455b821e62572bccd98102f8dd9d09bb94994 3022 3023commit 13ef4cf53f24753fe920832b990b25c9c9cd0530 3024Author: Darren Tucker <dtucker@dtucker.net> 3025Date: Sat Mar 3 16:21:20 2018 +1100 3026 3027 Update PAM password change to new opts API. 3028 3029commit 33561e68e0b27366cb769295a077aabc6a49d2a1 3030Author: Darren Tucker <dtucker@dtucker.net> 3031Date: Sat Mar 3 14:56:09 2018 +1100 3032 3033 Add strndup for platforms that need it. 3034 3035 Some platforms don't have strndup, which includes Solaris 10, NetBSD 3 3036 and FreeBSD 6. 3037 3038commit e8a17feba95eef424303fb94441008f6c5347aaf 3039Author: Darren Tucker <dtucker@dtucker.net> 3040Date: Sat Mar 3 14:49:07 2018 +1100 3041 3042 Flatten and alphabetize object file lists. 3043 3044 This will make maintenance and changes easier. "no objection" tim@ 3045 3046commit de1920d743d295f50e6905e5957c4172c038e8eb 3047Author: djm@openbsd.org <djm@openbsd.org> 3048Date: Sat Mar 3 03:16:17 2018 +0000 3049 3050 upstream: unit tests for new authorized_keys options API 3051 3052 OpenBSD-Regress-ID: 820f9ec9c6301f6ca330ad4052d85f0e67d0bdc1 3053 3054commit dc3e92df17556dc5b0ab19cee8dcb2a6ba348717 3055Author: djm@openbsd.org <djm@openbsd.org> 3056Date: Fri Mar 2 02:53:27 2018 +0000 3057 3058 upstream: fix testing of pty option, include positive test and 3059 3060 testing of restrict keyword 3061 3062 OpenBSD-Regress-ID: 4268f27c2706a0a95e725d9518c5bcbec9814c6d 3063 3064commit 3d1edd1ebbc0aabea8bbe61903060f37137f7c61 3065Author: djm@openbsd.org <djm@openbsd.org> 3066Date: Fri Mar 2 02:51:55 2018 +0000 3067 3068 upstream: better testing for port-forwarding and restrict flags in 3069 3070 authorized_keys 3071 3072 OpenBSD-Regress-ID: ee771df8955f2735df54746872c6228aff381daa 3073 3074commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3 3075Author: djm@openbsd.org <djm@openbsd.org> 3076Date: Sat Mar 3 03:15:51 2018 +0000 3077 3078 upstream: switch over to the new authorized_keys options API and 3079 3080 remove the legacy one. 3081 3082 Includes a fairly big refactor of auth2-pubkey.c to retain less state 3083 between key file lines. 3084 3085 feedback and ok markus@ 3086 3087 OpenBSD-Commit-ID: dece6cae0f47751b9892080eb13d6625599573df 3088 3089commit 90c4bec8b5f9ec4c003ae4abdf13fc7766f00c8b 3090Author: djm@openbsd.org <djm@openbsd.org> 3091Date: Sat Mar 3 03:06:02 2018 +0000 3092 3093 upstream: Introduce a new API for handling authorized_keys options. 3094 3095 This API parses options to a dedicated structure rather than the old API's 3096 approach of setting global state. It also includes support for merging 3097 options, e.g. from authorized_keys, authorized_principals and/or 3098 certificates. 3099 3100 feedback and ok markus@ 3101 3102 OpenBSD-Commit-ID: 98badda102cd575210d7802943e93a34232c80a2 3103 3104commit 26074380767e639ef89321610e146ae11016b385 3105Author: djm@openbsd.org <djm@openbsd.org> 3106Date: Sat Mar 3 03:01:50 2018 +0000 3107 3108 upstream: warn when the agent returns a signature type that was 3109 3110 different to what was requested. This might happen when an old/non-OpenSSH 3111 agent is asked to make a rsa-sha2-256/512 signature but only supports 3112 ssh-rsa. bz#2799 feedback and ok markus@ 3113 3114 OpenBSD-Commit-ID: 760c0f9438c5c58abc16b5f98008ff2d95cb13ce 3115 3116commit f493d2b0b66fb003ed29f31dd66ff1aeb64be1fc 3117Author: jmc@openbsd.org <jmc@openbsd.org> 3118Date: Fri Mar 2 21:40:15 2018 +0000 3119 3120 upstream: apply a lick of paint; tweaks/ok dtucker 3121 3122 OpenBSD-Commit-ID: 518a6736338045e0037f503c21027d958d05e703 3123 3124commit 713d9cb510e0e7759398716cbe6dcf43e574be71 3125Author: djm@openbsd.org <djm@openbsd.org> 3126Date: Fri Mar 2 03:02:11 2018 +0000 3127 3128 upstream: Allow escaped quotes \" and \' in ssh_config and 3129 3130 sshd_config quotes option strings. bz#1596 ok markus@ 3131 3132 OpenBSD-Commit-ID: dd3a29fc2dc905e8780198e5a6a30b096de1a1cb 3133 3134commit 94b4e2d29afaaaef89a95289b16c18bf5627f7cd 3135Author: djm@openbsd.org <djm@openbsd.org> 3136Date: Fri Mar 2 02:08:03 2018 +0000 3137 3138 upstream: refactor sshkey_read() to make it a little more, err, 3139 3140 readable. ok markus 3141 3142 OpenBSD-Commit-ID: 2e9247b5762fdac3b6335dc606d3822121714c28 3143 3144commit 5886b92968b360623491699247caddfb77a74d80 3145Author: markus@openbsd.org <markus@openbsd.org> 3146Date: Thu Mar 1 20:32:16 2018 +0000 3147 3148 upstream: missing #ifdef for _PATH_HOST_XMSS_KEY_FILE; report by 3149 3150 jmc@ 3151 3152 OpenBSD-Commit-ID: 9039cb69a3f9886bfef096891a9e7fcbd620280b 3153 3154commit 3b36bed3d26f17f6a2b7e036e01777770fe1bcd4 3155Author: dtucker@openbsd.org <dtucker@openbsd.org> 3156Date: Mon Feb 26 12:14:53 2018 +0000 3157 3158 upstream: Remove unneeded (local) include. ok markus@ 3159 3160 OpenBSD-Commit-ID: 132812dd2296b1caa8cb07d2408afc28e4e60f93 3161 3162commit 27b9f3950e0289e225b57b7b880a8f1859dcd70b 3163Author: dtucker@openbsd.org <dtucker@openbsd.org> 3164Date: Mon Feb 26 03:56:44 2018 +0000 3165 3166 upstream: Add $OpenBSD$ markers to xmss files to help keep synced 3167 3168 with portable. ok djm@. 3169 3170 OpenBSD-Commit-ID: 5233a27aafd1dfadad4b957225f95ae51eb365c1 3171 3172commit afd830847a82ebbd5aeab05bad6d2c8ce74df1cd 3173Author: dtucker@openbsd.org <dtucker@openbsd.org> 3174Date: Mon Feb 26 03:03:05 2018 +0000 3175 3176 upstream: Add newline at end of file to prevent compiler warnings. 3177 3178 OpenBSD-Commit-ID: 52f247d4eafe840c7c14c8befa71a760a8eeb063 3179 3180commit 941e0d3e9bb8d5e4eb70cc694441445faf037c84 3181Author: Darren Tucker <dtucker@dtucker.net> 3182Date: Wed Feb 28 19:59:35 2018 +1100 3183 3184 Add WITH_XMSS, move to prevent conflicts. 3185 3186 Add #ifdef WITH_XMSS to ssh-xmss.c, move it in the other files to after 3187 includes.h so it's less likely to conflict and will pick up WITH_XMSS if 3188 added to config.h. 3189 3190commit a10d8552d0d2438da4ed539275abcbf557d1e7a8 3191Author: Darren Tucker <dtucker@dtucker.net> 3192Date: Tue Feb 27 14:45:17 2018 +1100 3193 3194 Conditionally compile XMSS code. 3195 3196 The XMSS code is currently experimental and, unlike the rest of OpenSSH 3197 cannot currently be compiled with a c89 compiler. 3198 3199commit 146c3bd28c8dbee9c4b06465d9c9facab96b1e9b 3200Author: Darren Tucker <dtucker@dtucker.net> 3201Date: Mon Feb 26 12:51:29 2018 +1100 3202 3203 Check dlopen has RTLD_NOW before enabling pkcs11. 3204 3205commit 1323f120d06a26074c4d154fcbe7f49bcad3d741 3206Author: Darren Tucker <dtucker@dtucker.net> 3207Date: Tue Feb 27 08:41:25 2018 +1100 3208 3209 Check for attributes on prototype args. 3210 3211 Some compilers (gcc 2.9.53, 3.0 and probably others, see gcc bug #3481) 3212 do not accept __attribute__ on function pointer prototype args. Check for 3213 this and hide them if they're not accepted. 3214 3215commit f0b245b0439e600fab782d19e97980e9f2c2533c 3216Author: Darren Tucker <dtucker@dtucker.net> 3217Date: Mon Feb 26 11:43:48 2018 +1100 3218 3219 Check if HAVE_DECL_BZERO correctly. 3220 3221commit c7ef4a399155e1621a532cc5e08e6fa773658dd4 3222Author: Darren Tucker <dtucker@dtucker.net> 3223Date: Mon Feb 26 17:42:56 2018 +1100 3224 3225 Wrap <stdint.h> in #ifdef HAVE_STDINT_H. 3226 3227commit ac53ce46cf8165cbda7f57ee045f9f32e1e92b31 3228Author: Darren Tucker <dtucker@dtucker.net> 3229Date: Mon Feb 26 16:24:23 2018 +1100 3230 3231 Replace $(CURDIR) with $(PWD). 3232 3233 The former doesn't work on Solaris or BSDs. 3234 3235commit 534b2680a15d14e7e60274d5b29b812d44cc5a44 3236Author: Darren Tucker <dtucker@dtucker.net> 3237Date: Mon Feb 26 14:51:59 2018 +1100 3238 3239 Comment out hexdump(). 3240 3241 Nothing currently uses them but they cause conflicts on at least 3242 FreeBSD, possibly others. ok djm@ 3243 3244commit 5aea4aa522f61bb2f34c3055a7de203909dfae77 3245Author: Darren Tucker <dtucker@dtucker.net> 3246Date: Mon Feb 26 14:39:14 2018 +1100 3247 3248 typo: missing ; 3249 3250commit cd3ab57f9b388f8b1abf601dc4d78ff82d83b75e 3251Author: Darren Tucker <dtucker@dtucker.net> 3252Date: Mon Feb 26 14:37:06 2018 +1100 3253 3254 Hook up flock() compat code. 3255 3256 Also a couple of minor changes: fail if we can't lock instead of 3257 silently succeeding, and apply a couple of minor style fixes. 3258 3259commit b087998d1ba90dd1ddb6bfdb17873dc3e7392798 3260Author: Darren Tucker <dtucker@dtucker.net> 3261Date: Mon Feb 26 14:27:02 2018 +1100 3262 3263 Import flock() compat from NetBSD. 3264 3265 From NetBSD's src/trunk/tools/compat/flock.c, no OpenSSH changes yet. 3266 3267commit 89212533dde6798324e835b1499084658df4579e 3268Author: Darren Tucker <dtucker@dtucker.net> 3269Date: Mon Feb 26 12:32:14 2018 +1100 3270 3271 Fix breakage when REGRESSTMP not set. 3272 3273 BUILDDIR is not set where used for REGRESSTMP, use make's CURDIR 3274 instead. Pointed out by djm@. 3275 3276commit f885474137df4b89498c0b8834c2ac72c47aa4bd 3277Author: Damien Miller <djm@mindrot.org> 3278Date: Mon Feb 26 12:18:14 2018 +1100 3279 3280 XMSS-related files get includes.h 3281 3282commit 612faa34c72e421cdc9e63f624526bae62d557cc 3283Author: Damien Miller <djm@mindrot.org> 3284Date: Mon Feb 26 12:17:55 2018 +1100 3285 3286 object files end with .o - not .c 3287 3288commit bda709b8e13d3eef19e69c2d1684139e3af728f5 3289Author: Damien Miller <djm@mindrot.org> 3290Date: Mon Feb 26 12:17:22 2018 +1100 3291 3292 avoid inclusion of deprecated selinux/flask.h 3293 3294 Use string_to_security_class() instead. 3295 3296commit 2e396439365c4ca352cac222717d09b14f8a0dfd 3297Author: Damien Miller <djm@mindrot.org> 3298Date: Mon Feb 26 11:48:27 2018 +1100 3299 3300 updatedepend 3301 3302commit 1b11ea7c58cd5c59838b5fa574cd456d6047b2d4 3303Author: markus@openbsd.org <markus@openbsd.org> 3304Date: Fri Feb 23 15:58:37 2018 +0000 3305 3306 upstream: Add experimental support for PQC XMSS keys (Extended 3307 3308 Hash-Based Signatures) The code is not compiled in by default (see WITH_XMSS 3309 in Makefile.inc) Joint work with stefan-lukas_gazdag at genua.eu See 3310 https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12 ok 3311 djm@ 3312 3313 OpenBSD-Commit-ID: ef3eccb96762a5d6f135d7daeef608df7776a7ac 3314 3315commit 7d330a1ac02076de98cfc8fda05353d57b603755 3316Author: jmc@openbsd.org <jmc@openbsd.org> 3317Date: Fri Feb 23 07:38:09 2018 +0000 3318 3319 upstream: some cleanup for BindInterface and ssh-keyscan; 3320 3321 OpenBSD-Commit-ID: 1a719ebeae22a166adf05bea5009add7075acc8c 3322 3323commit c7b5a47e3b9db9a0f0198f9c90c705f6307afc2b 3324Author: Darren Tucker <dtucker@dtucker.net> 3325Date: Sun Feb 25 23:55:41 2018 +1100 3326 3327 Invert sense of getpgrp test. 3328 3329 AC_FUNC_GETPGRP tests if getpgrp(0) works, which it does if it's not 3330 declared. Instead, test if the zero-arg version we want to use works. 3331 3332commit b39593a6de5290650a01adf8699c6460570403c2 3333Author: Darren Tucker <dtucker@dtucker.net> 3334Date: Sun Feb 25 13:25:15 2018 +1100 3335 3336 Add no-op getsid implmentation. 3337 3338commit 11057564eb6ab8fd987de50c3d7f394c6f6632b7 3339Author: Darren Tucker <dtucker@dtucker.net> 3340Date: Sun Feb 25 11:22:57 2018 +1100 3341 3342 bsd-statvfs: include sys/vfs.h, check for f_flags. 3343 3344commit e9dede06e5bc582a4aeb5b1cd5a7a640d7de3609 3345Author: Darren Tucker <dtucker@dtucker.net> 3346Date: Sun Feb 25 10:20:31 2018 +1100 3347 3348 Handle calloc(0,x) where different from malloc. 3349 3350 Configure assumes that if malloc(0) returns null then calloc(0,n) 3351 also does. On some old platforms (SunOS4) malloc behaves as expected 3352 (as determined by AC_FUNC_MALLOC) but calloc doesn't. Test for this 3353 at configure time and activate the replacement function if found, plus 3354 handle this case in rpl_calloc. 3355 3356commit 2eb4041493fd2635ffdc64a852d02b38c4955e0b 3357Author: Darren Tucker <dtucker@dtucker.net> 3358Date: Sat Feb 24 21:06:48 2018 +1100 3359 3360 Add prototype for readv if needed. 3361 3362commit 6c8c9a615b6d31db8a87bc25033f053d5b0a831e 3363Author: Darren Tucker <dtucker@dtucker.net> 3364Date: Sat Feb 24 20:46:37 2018 +1100 3365 3366 Check for raise and supply if needed. 3367 3368commit a9004425a032d7a7141a5437cfabfd02431e2a74 3369Author: Darren Tucker <dtucker@dtucker.net> 3370Date: Sat Feb 24 20:25:22 2018 +1100 3371 3372 Check for bzero and supply if needed. 3373 3374 Since explicit_bzero uses it via an indirect it needs to be a function 3375 not just a macro. 3376 3377commit 1a348359e4d2876203b5255941bae348557f4f54 3378Author: djm@openbsd.org <djm@openbsd.org> 3379Date: Fri Feb 23 05:14:05 2018 +0000 3380 3381 upstream: Add ssh-keyscan -D option to make it print its results in 3382 3383 SSHFP format bz#2821, ok dtucker@ 3384 3385 OpenBSD-Commit-ID: 831446b582e0f298ca15c9d99c415c899e392221 3386 3387commit 3e19fb976a47b44b3d7c4f8355269f7f2c5dd82c 3388Author: dtucker@openbsd.org <dtucker@openbsd.org> 3389Date: Fri Feb 23 04:18:46 2018 +0000 3390 3391 upstream: Add missing braces. 3392 3393 Caught by the tinderbox's -Werror=misleading-indentation, ok djm@ 3394 3395 OpenBSD-Commit-ID: d44656af594c3b2366eb87d6abcef83e1c88a6ca 3396 3397commit b59162da99399d89bd57f71c170c0003c55b1583 3398Author: Darren Tucker <dtucker@dtucker.net> 3399Date: Fri Feb 23 15:20:42 2018 +1100 3400 3401 Check for ifaddrs.h for BindInterface. 3402 3403 BindInterface required getifaddr and friends so disable if not available 3404 (eg Solaris 10). We should be able to add support for some systems with 3405 a bit more work but this gets the building again. 3406 3407commit a8dd6fe0aa10b6866830b4688a73ef966f0aed88 3408Author: Damien Miller <djm@mindrot.org> 3409Date: Fri Feb 23 14:19:11 2018 +1100 3410 3411 space before tab in previous 3412 3413commit b5e9263c7704247f9624c8f5c458e9181fcdbc09 3414Author: dtucker@openbsd.org <dtucker@openbsd.org> 3415Date: Fri Feb 9 03:40:22 2018 +0000 3416 3417 upstream: Replace fatal with exit in the case that we do not have 3418 3419 $SUDO set. Prevents test failures when neither sudo nor doas are configured. 3420 3421 OpenBSD-Regress-ID: 6a0464decc4f8ac7d6eded556a032b0fc521bc7b 3422 3423commit 3e9d3192ad43758ef761c5b0aa3ac5ccf8121ef2 3424Author: Darren Tucker <dtucker@dtucker.net> 3425Date: Fri Feb 23 14:10:53 2018 +1100 3426 3427 Use portable syntax for REGRESSTMP. 3428 3429commit 73282b61187883a2b2bb48e087fdda1d751d6059 3430Author: djm@openbsd.org <djm@openbsd.org> 3431Date: Fri Feb 23 03:03:00 2018 +0000 3432 3433 upstream: unbreak interop test after SSHv1 purge; patch from Colin 3434 3435 Watson via bz#2823 3436 3437 OpenBSD-Regress-ID: 807d30a597756ed6612bdf46dfebca74f49cb31a 3438 3439commit f8985dde5f46aedade0373365cbf86ed3f1aead2 3440Author: dtucker@openbsd.org <dtucker@openbsd.org> 3441Date: Fri Feb 9 03:42:57 2018 +0000 3442 3443 upstream: Skip sftp-chroot test when SUDO not set instead of 3444 3445 fatal(). 3446 3447 OpenBSD-Regress-ID: cd4b5f1109b0dc09af4e5ea7d4968c43fbcbde88 3448 3449commit df88551c02d4e3445c44ff67ba8757cff718609a 3450Author: dtucker@openbsd.org <dtucker@openbsd.org> 3451Date: Fri Feb 9 03:40:22 2018 +0000 3452 3453 upstream: Replace fatal with exit in the case that we do not have 3454 3455 $SUDO set. Prevents test failures when neither sudo nor doas are configured. 3456 3457 OpenBSD-Regress-ID: 6a0464decc4f8ac7d6eded556a032b0fc521bc7b 3458 3459commit 3b252c20b19f093e87363de197f1100b79705dd3 3460Author: djm@openbsd.org <djm@openbsd.org> 3461Date: Thu Feb 8 08:46:20 2018 +0000 3462 3463 upstream: some helpers to check verbose/quiet mode 3464 3465 OpenBSD-Regress-ID: e736aac39e563f5360a0935080a71d5fdcb976de 3466 3467commit ac2e3026bbee1367e4cda34765d1106099be3287 3468Author: djm@openbsd.org <djm@openbsd.org> 3469Date: Fri Feb 23 02:34:33 2018 +0000 3470 3471 upstream: Add BindInterface ssh_config directive and -B 3472 3473 command-line argument to ssh(1) that directs it to bind its outgoing 3474 connection to the address of the specified network interface. 3475 3476 BindInterface prefers to use addresses that aren't loopback or link- 3477 local, but will fall back to those if no other addresses of the 3478 required family are available on that interface. 3479 3480 Based on patch by Mike Manning in bz#2820, ok dtucker@ 3481 3482 OpenBSD-Commit-ID: c5064d285c2851f773dd736a2c342aa384fbf713 3483 3484commit fcdb9d777839a3fa034b3bc3067ba8c1f6886679 3485Author: djm@openbsd.org <djm@openbsd.org> 3486Date: Mon Feb 19 00:55:02 2018 +0000 3487 3488 upstream: emphasise that the hostkey rotation may send key types 3489 3490 that the client may not support, and that the client should simply disregard 3491 such keys (this is what ssh does already). 3492 3493 OpenBSD-Commit-ID: 65f8ffbc32ac8d12be8f913d7c0ea55bef8622bf 3494 3495commit ce066f688dc166506c082dac41ca686066e3de5f 3496Author: Darren Tucker <dtucker@dtucker.net> 3497Date: Thu Feb 22 20:45:09 2018 +1100 3498 3499 Add headers for sys/audit.h. 3500 3501 On some older platforms (at least sunos4, probably others) sys/audit.h 3502 requires some other headers. Patch from klausz at haus-gisela.de. 3503 3504commit 3fd2d2291a695c96a54269deae079bacce6e3fb9 3505Author: Darren Tucker <dtucker@dtucker.net> 3506Date: Mon Feb 19 18:37:40 2018 +1100 3507 3508 Add REGRESSTMP make var override. 3509 3510 Defaults to original location ($srcdir/regress) but allows overriding 3511 if desired, eg a directory in /tmp. 3512 3513commit f8338428588f3ecb5243c86336eccaa28809f97e 3514Author: Darren Tucker <dtucker@dtucker.net> 3515Date: Sun Feb 18 15:53:15 2018 +1100 3516 3517 Remove now-unused check for getrusage. 3518 3519 getrusage was used in ssh-rand-helper but that's now long gone. 3520 Patch from klauszh at haus-gisela.de. 3521 3522commit 8570177195f6a4b3173c0a25484a83641ee3faa6 3523Author: dtucker@openbsd.org <dtucker@openbsd.org> 3524Date: Fri Feb 16 04:43:11 2018 +0000 3525 3526 upstream: Don't send IUTF8 to servers that don't like them. 3527 3528 Some SSH servers eg "ConfD" drop the connection if the client sends the 3529 new IUTF8 (RFC8160) terminal mode even if it's not set. Add a bug bit 3530 for such servers and avoid sending IUTF8 to them. ok djm@ 3531 3532 OpenBSD-Commit-ID: 26425855402d870c3c0a90491e72e2a8a342ceda 3533 3534commit f6dc2ba3c9d12be53057b9371f5109ec553a399f 3535Author: Darren Tucker <dtucker@dtucker.net> 3536Date: Fri Feb 16 17:32:28 2018 +1100 3537 3538 freezero should check for NULL. 3539 3540commit 680321f3eb46773883111e234b3c262142ff7c5b 3541Author: djm@openbsd.org <djm@openbsd.org> 3542Date: Fri Feb 16 02:40:45 2018 +0000 3543 3544 upstream: Mention recent DH KEX methods: 3545 3546 diffie-hellman-group14-sha256 3547 diffie-hellman-group16-sha512 3548 diffie-hellman-group18-sha512 3549 3550 From Jakub Jelen via bz#2826 3551 3552 OpenBSD-Commit-ID: 51bf769f06e55447f4bfa7306949e62d2401907a 3553 3554commit 88c50a5ae20902715f0fca306bb9c38514f71679 3555Author: djm@openbsd.org <djm@openbsd.org> 3556Date: Fri Feb 16 02:32:40 2018 +0000 3557 3558 upstream: stop loading DSA keys by default, remove sshd_config 3559 3560 stanza and manpage bits; from Colin Watson via bz#2662, ok dtucker@ 3561 3562 OpenBSD-Commit-ID: d33a849f481684ff655c140f5eb1b4acda8c5c09 3563 3564commit d2b3db2860c962927def39a52f67f1c23f7b201a 3565Author: jsing@openbsd.org <jsing@openbsd.org> 3566Date: Wed Feb 14 16:27:24 2018 +0000 3567 3568 upstream: Ensure that D mod (P-1) and D mod (Q-1) are calculated in 3569 3570 constant time. 3571 3572 This avoids a potential side channel timing leak. 3573 3574 ok djm@ markus@ 3575 3576 OpenBSD-Commit-ID: 71ff3c16be03290e63d8edab8fac053d8a82968c 3577 3578commit 4270efad7048535b4f250f493d70f9acfb201593 3579Author: jsing@openbsd.org <jsing@openbsd.org> 3580Date: Wed Feb 14 16:03:32 2018 +0000 3581 3582 upstream: Some obvious freezero() conversions. 3583 3584 This also zeros an ed25519_pk when it was not being zeroed previously. 3585 3586 ok djm@ dtucker@ 3587 3588 OpenBSD-Commit-ID: 5c196a3c85c23ac0bd9b11bcadaedd90b7a2ce82 3589 3590commit affa6ba67ffccc30b85d6e98f36eb5afd9386882 3591Author: Darren Tucker <dtucker@dtucker.net> 3592Date: Thu Feb 15 22:32:04 2018 +1100 3593 3594 Remove execute bit from modpipe.c. 3595 3596commit 9879dca438526ae6dfd656fecb26b0558c29c731 3597Author: Darren Tucker <dtucker@dtucker.net> 3598Date: Thu Feb 15 22:26:16 2018 +1100 3599 3600 Update prngd link to point to sourceforge. 3601 3602commit b6973fa5152b1a0bafd2417b7c3ad96f6e87d014 3603Author: Darren Tucker <dtucker@dtucker.net> 3604Date: Thu Feb 15 22:22:38 2018 +1100 3605 3606 Remove references to UNICOS. 3607 3608commit f1ca487940449f0b64f38f1da575078257609966 3609Author: Darren Tucker <dtucker@dtucker.net> 3610Date: Thu Feb 15 22:18:37 2018 +1100 3611 3612 Remove extra newline. 3613 3614commit 6d4e980f3cf27f409489cf89cd46c21501b13731 3615Author: Darren Tucker <dtucker@dtucker.net> 3616Date: Thu Feb 15 22:16:54 2018 +1100 3617 3618 OpenSSH's builtin entropy gathering is long gone. 3619 3620commit 389125b25d1a1d7f22e907463b7e8eca74af79ea 3621Author: Darren Tucker <dtucker@dtucker.net> 3622Date: Thu Feb 15 21:43:01 2018 +1100 3623 3624 Replace remaining mysignal() with signal(). 3625 3626 These seem to have been missed during the replacement of mysignal 3627 with #define signal in commit 5ade9ab. Both include the requisite 3628 headers to pick up the #define. 3629 3630commit 265d88d4e61e352de6791733c8b29fa3d7d0c26d 3631Author: Darren Tucker <dtucker@dtucker.net> 3632Date: Thu Feb 15 20:06:19 2018 +1100 3633 3634 Remove remaining now-obsolete cvs $Ids. 3635 3636commit 015749e9b1d2f6e14733466d19ba72f014d0845c 3637Author: Darren Tucker <dtucker@dtucker.net> 3638Date: Thu Feb 15 17:01:54 2018 +1100 3639 3640 Regenerate dependencies after UNICOS removal. 3641 3642commit ddc0f3814881ea279a6b6d4d98e03afc60ae1ed7 3643Author: Darren Tucker <dtucker@dtucker.net> 3644Date: Tue Feb 13 09:10:46 2018 +1100 3645 3646 Remove UNICOS support. 3647 3648 The code required to support it is quite invasive to the mainline 3649 code that is synced with upstream and is an ongoing maintenance burden. 3650 Both the hardware and software are literal museum pieces these days and 3651 we could not find anyone still running OpenSSH on one. 3652 3653commit 174bed686968494723e6db881208cc4dac0d020f 3654Author: Darren Tucker <dtucker@dtucker.net> 3655Date: Tue Feb 13 18:12:47 2018 +1100 3656 3657 Retpoline linker flag only needed for linking. 3658 3659commit 075e258c2cc41e1d7f3ea2d292c5342091728d40 3660Author: Darren Tucker <dtucker@dtucker.net> 3661Date: Tue Feb 13 17:36:43 2018 +1100 3662 3663 Default PidFile is sshd.pid not ssh.pid. 3664 3665commit 49f3c0ec47730ea264e2bd1e6ece11167d6384df 3666Author: Darren Tucker <dtucker@dtucker.net> 3667Date: Tue Feb 13 16:27:09 2018 +1100 3668 3669 Remove assigned-to-but-never-used variable. 3670 3671 'p' was removed in previous change but I neglected to remove the 3672 otherwise-unused assignment to it. 3673 3674commit b8bbff3b3fc823bf80c5ab226c94f13cb887d5b1 3675Author: djm@openbsd.org <djm@openbsd.org> 3676Date: Tue Feb 13 03:36:56 2018 +0000 3677 3678 upstream: remove space before tab 3679 3680 OpenBSD-Commit-ID: 674edd214d0a7332dd4623c9cf8117301b012890 3681 3682commit 05046d907c211cb9b4cd21b8eff9e7a46cd6c5ab 3683Author: dtucker@openbsd.org <dtucker@openbsd.org> 3684Date: Sun Feb 11 21:16:56 2018 +0000 3685 3686 upstream Don't reset signal handlers inside handlers. 3687 3688 The signal handlers from the original ssh1 code on which OpenSSH 3689 is based assume unreliable signals and reinstall their handlers. 3690 Since OpenBSD (and pretty much every current system) has reliable 3691 signals this is not needed. In the unlikely even that -portable 3692 is still being used on such systems we will deal with it in the 3693 compat layer. ok deraadt@ 3694 3695 OpenBSD-Commit-ID: f53a1015cb6908431b92116130d285d71589612c 3696 3697commit 3c51143c639ac686687c7acf9b373b8c08195ffb 3698Author: Darren Tucker <dtucker@dtucker.net> 3699Date: Tue Feb 13 09:07:29 2018 +1100 3700 3701 Whitespace sync with upstream. 3702 3703commit 19edfd4af746bedf0df17f01953ba8c6d3186eb7 3704Author: Darren Tucker <dtucker@dtucker.net> 3705Date: Tue Feb 13 08:25:46 2018 +1100 3706 3707 Whitespace sync with upstream. 3708 3709commit fbfa6f980d7460b3e12b0ce88ed3b6018edf4711 3710Author: Darren Tucker <dtucker@dtucker.net> 3711Date: Sun Feb 11 21:25:11 2018 +1300 3712 3713 Move signal compat code into bsd-signal.{c,h} 3714 3715commit 24d2a33bd3bf5170700bfdd8675498aa09a79eab 3716Author: Darren Tucker <dtucker@dtucker.net> 3717Date: Sun Feb 11 21:20:39 2018 +1300 3718 3719 Include headers for linux/if.h. 3720 3721 Prevents configure-time "present but cannot be compiled" warning. 3722 3723commit bc02181c24fc551aab85eb2cff0f90380928ef43 3724Author: Darren Tucker <dtucker@dtucker.net> 3725Date: Sun Feb 11 19:45:47 2018 +1300 3726 3727 Fix test for -z,retpolineplt linker flag. 3728 3729commit 3377df00ea3fece5293db85fe63baef33bf5152e 3730Author: Darren Tucker <dtucker@dtucker.net> 3731Date: Sun Feb 11 09:32:37 2018 +1100 3732 3733 Add checks for Spectre v2 mitigation (retpoline) 3734 3735 This adds checks for gcc and clang flags for mitigations for Spectre 3736 variant 2, ie "retpoline". It'll automatically enabled if the compiler 3737 supports it as part of toolchain hardening flag. ok djm@ 3738 3739commit d9e5cf078ea5380da6df767bb1773802ec557ef0 3740Author: djm@openbsd.org <djm@openbsd.org> 3741Date: Sat Feb 10 09:25:34 2018 +0000 3742 3743 upstream commit 3744 3745 constify some private key-related functions; based on 3746 https://github.com/openssh/openssh-portable/pull/56 by Vincent Brillault 3747 3748 OpenBSD-Commit-ID: dcb94a41834a15f4d00275cb5051616fdc4c988c 3749 3750commit a7c38215d564bf98e8e9eb40c1079e3adf686f15 3751Author: djm@openbsd.org <djm@openbsd.org> 3752Date: Sat Feb 10 09:03:54 2018 +0000 3753 3754 upstream commit 3755 3756 Mention ServerAliveTimeout in context of TCPKeepAlives; 3757 prompted by Christoph Anton Mitterer via github 3758 3759 OpenBSD-Commit-ID: f0cf1b5bd3f1fbf41d71c88d75d93afc1c880ca2 3760 3761commit 62562ceae61e4f7cf896566592bb840216e71061 3762Author: djm@openbsd.org <djm@openbsd.org> 3763Date: Sat Feb 10 06:54:38 2018 +0000 3764 3765 upstream commit 3766 3767 clarify IgnoreUserKnownHosts; based on github PR from 3768 Christoph Anton Mitterer. 3769 3770 OpenBSD-Commit-ID: 4fff2c17620c342fb2f1f9c2d2e679aab3e589c3 3771 3772commit 4f011daa4cada6450fa810f7563b8968639bb562 3773Author: djm@openbsd.org <djm@openbsd.org> 3774Date: Sat Feb 10 06:40:28 2018 +0000 3775 3776 upstream commit 3777 3778 Shorter, more accurate explanation of 3779 NoHostAuthenticationForLocalhost without the confusing example. Prompted by 3780 Christoph Anton Mitterer via github and bz#2293. 3781 3782 OpenBSD-Commit-ID: 19dc96bea25b80d78d416b581fb8506f1e7b76df 3783 3784commit 77e05394af21d3f5faa0c09ed3855e4505a5cf9f 3785Author: djm@openbsd.org <djm@openbsd.org> 3786Date: Sat Feb 10 06:15:12 2018 +0000 3787 3788 upstream commit 3789 3790 Disable RemoteCommand and RequestTTY in the ssh session 3791 started by scp. sftp is already doing this. From Camden Narzt via github; ok 3792 dtucker 3793 3794 OpenBSD-Commit-ID: 59e2611141c0b2ee579c6866e8eb9d7d8217bc6b 3795 3796commit ca613249a00b64b2eea9f52d3834b55c28cf2862 3797Author: djm@openbsd.org <djm@openbsd.org> 3798Date: Sat Feb 10 05:48:46 2018 +0000 3799 3800 upstream commit 3801 3802 Refuse to create a certificate with an unusable number of 3803 principals; Prompted by gdestuynder via github 3804 3805 OpenBSD-Commit-ID: 8cfae2451e8f07810e3e2546dfdcce66984cbd29 3806 3807commit b56ac069d46b6f800de34e1e935f98d050731d14 3808Author: djm@openbsd.org <djm@openbsd.org> 3809Date: Sat Feb 10 05:43:26 2018 +0000 3810 3811 upstream commit 3812 3813 fatal if we're unable to write all the public key; previously 3814 we would silently ignore errors writing the comment and terminating newline. 3815 Prompted by github PR from WillerZ; ok dtucker 3816 3817 OpenBSD-Commit-ID: 18fbfcfd4e8c6adbc84820039b64d70906e49831 3818 3819commit cdb10bd431f9f6833475c27e9a82ebb36fdb12db 3820Author: Darren Tucker <dtucker@dtucker.net> 3821Date: Sat Feb 10 11:18:38 2018 +1100 3822 3823 Add changelog entry for binary strip change. 3824 3825commit fbddd91897cfaf456bfc2081f39fb4a2208a0ebf 3826Author: Darren Tucker <dtucker@dtucker.net> 3827Date: Sat Feb 10 11:14:54 2018 +1100 3828 3829 Remove unused variables. 3830 3831commit 937d96587df99c16c611d828cded292fa474a32b 3832Author: Darren Tucker <dtucker@dtucker.net> 3833Date: Sat Feb 10 11:12:45 2018 +1100 3834 3835 Don't strip binaries so debuginfo gets built. 3836 3837 Tell install not to strip binaries during package creation so that the 3838 debuginfo package can be built. 3839 3840commit eb0865f330f59c889ec92696b97bd397090e720c 3841Author: Darren Tucker <dtucker@dtucker.net> 3842Date: Sat Feb 10 10:33:11 2018 +1100 3843 3844 Fix bogus dates in changelog. 3845 3846commit 7fbde1b34c1f6c9ca9e9d10805ba1e5e4538e165 3847Author: Darren Tucker <dtucker@dtucker.net> 3848Date: Sat Feb 10 10:25:15 2018 +1100 3849 3850 Remove SSH1 from description. 3851 3852commit 9c34a76f099c4e0634bf6ecc2f40ce93925402c4 3853Author: Darren Tucker <dtucker@dtucker.net> 3854Date: Sat Feb 10 10:19:16 2018 +1100 3855 3856 Add support for compat-openssl10 build dep. 3857 3858commit 04f4e8193cb5a5a751fcc356bd6656291fec539e 3859Author: Darren Tucker <dtucker@dtucker.net> 3860Date: Sat Feb 10 09:57:04 2018 +1100 3861 3862 Add leading zero so it'll work when rhel not set. 3863 3864 When rhel is not set it will error out with "bad if". Add leading zero 3865 as per https://fedoraproject.org/wiki/Packaging:DistTag so it'll work 3866 on non-RHEL. 3867 3868commit 12abd67a6af28476550807a443b38def2076bb92 3869Author: Darren Tucker <dtucker@dtucker.net> 3870Date: Sat Feb 10 09:56:34 2018 +1100 3871 3872 Update openssl-devel dependency. 3873 3874commit b33e7645f8813719d7f9173fef24463c8833ebb3 3875Author: nkadel <nkadel@gmail.com> 3876Date: Sun Nov 16 18:19:58 2014 -0500 3877 3878 Add mandir with-mandir' for RHEL 5 compatibility. 3879 3880 Activate '--mandir' and '--with-mandir' settings in setup for RHEL 3881 5 compatibility. 3882 3883commit 94f8bf360eb0162e39ddf39d69925c2e93511e40 3884Author: nkadel <nkadel@gmail.com> 3885Date: Sun Nov 16 18:18:51 2014 -0500 3886 3887 Discard 'K5DIR' reporting. 3888 3889 It does not work inside 'mock' build environment. 3890 3891commit bb7e54dbaf34b70b3e57acf7982f3a2136c94ee5 3892Author: nkadel <nkadel@gmail.com> 3893Date: Sun Nov 16 18:17:15 2014 -0500 3894 3895 Add 'dist' to 'rel' for OS specific RPM names. 3896 3897commit 87346f1f57f71150a9b8c7029d8c210e27027716 3898Author: nkadel <nkadel@gmail.com> 3899Date: Sun Nov 16 14:17:38 2014 -0500 3900 3901 Add openssh-devel >= 0.9.8f for redhat spec file. 3902 3903commit bec1478d710866d3c1b119343a35567a8fc71ec3 3904Author: nkadel <nkadel@gmail.com> 3905Date: Sun Nov 16 13:10:24 2014 -0500 3906 3907 Enhance BuildRequires for openssh-x11-askpass. 3908 3909commit 3104fcbdd3c70aefcb0cdc3ee24948907db8dc8f 3910Author: nkadel <nkadel@gmail.com> 3911Date: Sun Nov 16 13:04:14 2014 -0500 3912 3913 Always include x11-ssh-askpass SRPM. 3914 3915 Always include x11-ssh-askpass tarball in redhat SRPM, even if unused. 3916 3917commit c61d0d038d58eebc365f31830be6e04ce373ad1b 3918Author: Damien Miller <djm@mindrot.org> 3919Date: Sat Feb 10 09:43:12 2018 +1100 3920 3921 this is long unused; prompted by dtucker@ 3922 3923commit 745771fb788e41bb7cdad34e5555bf82da3af7ed 3924Author: dtucker@openbsd.org <dtucker@openbsd.org> 3925Date: Fri Feb 9 02:37:36 2018 +0000 3926 3927 upstream commit 3928 3929 Remove unused sKerberosTgtPassing from enum. From 3930 calestyo via github pull req #11, ok djm@ 3931 3932 OpenBSD-Commit-ID: 1008f8870865a7c4968b7aed402a0a9e3e5b9540 3933 3934commit 1f385f55332db830b0ae22a7663b98279ca2d657 3935Author: dtucker@openbsd.org <dtucker@openbsd.org> 3936Date: Thu Feb 8 04:12:32 2018 +0000 3937 3938 upstream commit 3939 3940 Rename struct umac_ctx to umac128_ctx too. In portable 3941 some linkers complain about two symbols with the same name having differing 3942 sizes. ok djm@ 3943 3944 OpenBSD-Commit-ID: cbebf8bdd3310a9795b4939a1e112cfe24061ca3 3945 3946commit f1f047fb031c0081dbc8738f05bf5d4cc47acadf 3947Author: dtucker@openbsd.org <dtucker@openbsd.org> 3948Date: Wed Feb 7 22:52:45 2018 +0000 3949 3950 upstream commit 3951 3952 ssh_free checks for and handles NULL args, remove NULL 3953 checks from remaining callers. ok djm@ 3954 3955 OpenBSD-Commit-ID: bb926825c53724c069df68a93a2597f9192f7e7b 3956 3957commit aee49b2a89b6b323c80dd3b431bd486e51f94c8c 3958Author: Darren Tucker <dtucker@dtucker.net> 3959Date: Thu Feb 8 12:36:22 2018 +1100 3960 3961 Set SO_REUSEADDR in regression test netcat. 3962 3963 Sometimes multiplex tests fail on Solaris with "netcat: local_listen: 3964 Address already in use" which is likely due to previous invocations 3965 leaving the port in TIME_WAIT. Set SO_REUSEADDR (in addition to 3966 SO_REUSEPORT which is alread set on platforms that support it). ok djm@ 3967 3968commit 1749991c55bab716877b7c687cbfbf19189ac6f1 3969Author: jsing@openbsd.org <jsing@openbsd.org> 3970Date: Wed Feb 7 05:17:56 2018 +0000 3971 3972 upstream commit 3973 3974 Convert some explicit_bzero()/free() calls to freezero(). 3975 3976 ok deraadt@ dtucker@ 3977 3978 OpenBSD-Commit-ID: f566ab99149650ebe58b1d4b946ea726c3829609 3979 3980commit 94ec2b69d403f4318b7a0d9b17f8bc3efbf4d0d2 3981Author: jsing@openbsd.org <jsing@openbsd.org> 3982Date: Wed Feb 7 05:15:49 2018 +0000 3983 3984 upstream commit 3985 3986 Remove some #ifdef notyet code from OpenSSL 0.9.8 days. 3987 3988 These functions have never appeared in OpenSSL and are likely never to do 3989 so. 3990 3991 "kill it with fire" djm@ 3992 3993 OpenBSD-Commit-ID: fee9560e283fd836efc2631ef381658cc673d23e 3994 3995commit 7cd31632e3a6607170ed0c9ed413a7ded5b9b377 3996Author: jsing@openbsd.org <jsing@openbsd.org> 3997Date: Wed Feb 7 02:06:50 2018 +0000 3998 3999 upstream commit 4000 4001 Remove all guards for calls to OpenSSL free functions - 4002 all of these functions handle NULL, from at least OpenSSL 1.0.1g onwards. 4003 4004 Prompted by dtucker@ asking about guards for RSA_free(), when looking at 4005 openssh-portable pr#84 on github. 4006 4007 ok deraadt@ dtucker@ 4008 4009 OpenBSD-Commit-ID: 954f1c51b94297d0ae1f749271e184141e0cadae 4010 4011commit 3c000d57d46882eb736c6563edfc4995915c24a2 4012Author: Darren Tucker <dtucker@dtucker.net> 4013Date: Wed Feb 7 09:19:38 2018 +1100 4014 4015 Remove obsolete "Smartcard support" message 4016 4017 The configure checks that populated $SCARD_MSG were removed in commits 4018 7ea845e4 and d8f60022 when the smartcard support was replaced with 4019 PKCS#11. 4020 4021commit 3e615090de0ce36a833d811e01c28aec531247c4 4022Author: dtucker@openbsd.org <dtucker@openbsd.org> 4023Date: Tue Feb 6 06:01:54 2018 +0000 4024 4025 upstream commit 4026 4027 Replace "trojan horse" with the correct term (MITM). 4028 From maikel at predikkta.com via bz#2822, ok markus@ 4029 4030 OpenBSD-Commit-ID: e86ac64c512057c89edfadb43302ac0aa81a6c53 4031 4032commit 3484380110d437c50e17f87d18544286328c75cb 4033Author: tb@openbsd.org <tb@openbsd.org> 4034Date: Mon Feb 5 05:37:46 2018 +0000 4035 4036 upstream commit 4037 4038 Add a couple of non-negativity checks to avoid close(-1). 4039 4040 ok djm 4041 4042 OpenBSD-Commit-ID: 4701ce0b37161c891c838d0931305f1d37a50880 4043 4044commit 5069320be93c8b2a6584b9f944c86f60c2b04e48 4045Author: tb@openbsd.org <tb@openbsd.org> 4046Date: Mon Feb 5 05:36:49 2018 +0000 4047 4048 upstream commit 4049 4050 The file descriptors for socket, stdin, stdout and stderr 4051 aren't necessarily distinct, so check if they are the same to avoid closing 4052 the same fd several times. 4053 4054 ok djm 4055 4056 OpenBSD-Commit-ID: 60d71fd22e9a32f5639d4ba6e25a2f417fc36ac1 4057 4058commit 2b428f90ea1b21d7a7c68ec1ee334253b3f9324d 4059Author: djm@openbsd.org <djm@openbsd.org> 4060Date: Mon Feb 5 04:02:53 2018 +0000 4061 4062 upstream commit 4063 4064 I accidentially a word 4065 4066 OpenBSD-Commit-ID: 4547ee713fa941da861e83ae7a3e6432f915e14a 4067 4068commit 130283d5c2545ff017c2162dc1258c5354e29399 4069Author: djm@openbsd.org <djm@openbsd.org> 4070Date: Thu Jan 25 03:34:43 2018 +0000 4071 4072 upstream commit 4073 4074 certificate options are case-sensitive; fix case on one 4075 that had it wrong. 4076 4077 move a badly-place sentence to a less bad place 4078 4079 OpenBSD-Commit-ID: 231e516bba860699a1eece6d48532d825f5f747b 4080 4081commit 89f09ee68730337015bf0c3f138504494a34e9a6 4082Author: Damien Miller <djm@mindrot.org> 4083Date: Wed Jan 24 12:20:44 2018 +1100 4084 4085 crypto_api.h needs includes.h 4086 4087commit c9c1bba06ad1c7cad8548549a68c071bd807af60 4088Author: stsp@openbsd.org <stsp@openbsd.org> 4089Date: Tue Jan 23 20:00:58 2018 +0000 4090 4091 upstream commit 4092 4093 Fix a logic bug in sshd_exchange_identification which 4094 prevented clients using major protocol version 2 from connecting to the 4095 server. ok millert@ 4096 4097 OpenBSD-Commit-ID: 8668dec04586e27f1c0eb039ef1feb93d80a5ee9 4098 4099commit a60c5dcfa2538ffc94dc5b5adb3db5b6ed905bdb 4100Author: stsp@openbsd.org <stsp@openbsd.org> 4101Date: Tue Jan 23 18:33:49 2018 +0000 4102 4103 upstream commit 4104 4105 Add missing braces; fixes 'write: Socket is not 4106 connected' error in ssh. ok deraadt@ 4107 4108 OpenBSD-Commit-ID: db73a3a9e147722d410866cac34d43ed52e1ad24 4109 4110commit 20d53ac283e1c60245ea464bdedd015ed9b38f4a 4111Author: Damien Miller <djm@mindrot.org> 4112Date: Tue Jan 23 16:49:43 2018 +1100 4113 4114 rebuild depends 4115 4116commit 552ea155be44f9c439c1f9f0c38f9e593428f838 4117Author: Damien Miller <djm@mindrot.org> 4118Date: Tue Jan 23 16:49:22 2018 +1100 4119 4120 one SSH_BUG_BANNER instance that got away 4121 4122commit 14b5c635d1190633b23ac3372379517fb645b0c2 4123Author: djm@openbsd.org <djm@openbsd.org> 4124Date: Tue Jan 23 05:27:21 2018 +0000 4125 4126 upstream commit 4127 4128 Drop compatibility hacks for some ancient SSH 4129 implementations, including ssh.com <=2.* and OpenSSH <= 3.*. 4130 4131 These versions were all released in or before 2001 and predate the 4132 final SSH RFCs. The hacks in question aren't necessary for RFC- 4133 compliant SSH implementations. 4134 4135 ok markus@ 4136 4137 OpenBSD-Commit-ID: 4be81c67db57647f907f4e881fb9341448606138 4138 4139commit 7c77991f5de5d8475cbeb7cbb06d0c7d1611d7bb 4140Author: djm@openbsd.org <djm@openbsd.org> 4141Date: Tue Jan 23 05:17:04 2018 +0000 4142 4143 upstream commit 4144 4145 try harder to preserve errno during 4146 ssh_connect_direct() to make the final error message possibly accurate; 4147 bz#2814, ok dtucker@ 4148 4149 OpenBSD-Commit-ID: 57de882cb47381c319b04499fef845dd0c2b46ca 4150 4151commit 9e9c4a7e57b96ab29fe6d7545ed09d2e5bddbdec 4152Author: djm@openbsd.org <djm@openbsd.org> 4153Date: Tue Jan 23 05:12:12 2018 +0000 4154 4155 upstream commit 4156 4157 unbreak support for clients that advertise a protocol 4158 version of "1.99" (indicating both v2 and v1 support). Busted by me during 4159 SSHv1 purge in r1.358; bz2810, ok dtucker 4160 4161 OpenBSD-Commit-ID: e8f9c2bee11afc16c872bb79d6abe9c555bd0e4b 4162 4163commit fc21ea97968264ad9bb86b13fedaaec8fd3bf97d 4164Author: djm@openbsd.org <djm@openbsd.org> 4165Date: Tue Jan 23 05:06:25 2018 +0000 4166 4167 upstream commit 4168 4169 don't attempt to force hostnames that are addresses to 4170 lowercase, but instead canonicalise them through getnameinfo/getaddrinfo to 4171 remove ambiguities (e.g. ::0001 => ::1) before they are matched against 4172 known_hosts; bz#2763, ok dtucker@ 4173 4174 OpenBSD-Commit-ID: ba0863ff087e61e5c65efdbe53be3cb92c9aefa0 4175 4176commit d6364f6fb1a3d753d7ca9bf15b2adce961324513 4177Author: djm@openbsd.org <djm@openbsd.org> 4178Date: Tue Jan 23 05:01:15 2018 +0000 4179 4180 upstream commit 4181 4182 avoid modifying pw->pw_passwd; let endpwent() clean up 4183 for us, but keep a scrubbed copy; bz2777, ok dtucker@ 4184 4185 OpenBSD-Commit-ID: 715afc0f59c6b82c4929a73279199ed241ce0752 4186 4187commit a69bbb07cd6fb4dfb9bdcacd370ab26d0a2b4215 4188Author: naddy@openbsd.org <naddy@openbsd.org> 4189Date: Sat Jan 13 00:24:09 2018 +0000 4190 4191 upstream commit 4192 4193 clarify authorship; prodded by and ok markus@ 4194 4195 OpenBSD-Commit-ID: e1938eee58c89b064befdabe232835fa83bb378c 4196 4197commit 04214b30be3d3e73a01584db4e040d5ccbaaddd4 4198Author: markus@openbsd.org <markus@openbsd.org> 4199Date: Mon Jan 8 15:37:21 2018 +0000 4200 4201 upstream commit 4202 4203 group shared source files (e.g. SRCS_KEX) and allow 4204 compilation w/o OPENSSL ok djm@ 4205 4206 OpenBSD-Commit-ID: fa728823ba21c4b45212750e1d3a4b2086fd1a62 4207 4208commit 25cf9105b849932fc3b141590c009e704f2eeba6 4209Author: markus@openbsd.org <markus@openbsd.org> 4210Date: Mon Jan 8 15:21:49 2018 +0000 4211 4212 upstream commit 4213 4214 move subprocess() so scp/sftp do not need uidswap.o; ok 4215 djm@ 4216 4217 OpenBSD-Commit-ID: 6601b8360388542c2e5fef0f4085f8e54750bea8 4218 4219commit b0d34132b3ca26fe94013f01d7b92101e70b68bb 4220Author: markus@openbsd.org <markus@openbsd.org> 4221Date: Mon Jan 8 15:18:46 2018 +0000 4222 4223 upstream commit 4224 4225 switch ssh-pkcs11-helper to new API; ok djm@ 4226 4227 OpenBSD-Commit-ID: e0c0ed2a568e25b1d2024f3e630f3fea837c2a42 4228 4229commit ec4a9831184c0c6ed5f7f0cfff01ede5455465a3 4230Author: markus@openbsd.org <markus@openbsd.org> 4231Date: Mon Jan 8 15:15:36 2018 +0000 4232 4233 upstream commit 4234 4235 split client/server kex; only ssh-keygen needs 4236 uuencode.o; only scp/sftp use progressmeter.o; ok djm@ 4237 4238 OpenBSD-Commit-ID: f2c9feb26963615c4fece921906cf72e248b61ee 4239 4240commit ec77efeea06ac62ee1d76fe0b3225f3000775a9e 4241Author: markus@openbsd.org <markus@openbsd.org> 4242Date: Mon Jan 8 15:15:17 2018 +0000 4243 4244 upstream commit 4245 4246 only ssh-keygen needs uuencode.o; only scp/sftp use 4247 progressmeter.o 4248 4249 OpenBSD-Commit-ID: a337e886a49f96701ccbc4832bed086a68abfa85 4250 4251commit 25aae35d3d6ee86a8c4c0b1896acafc1eab30172 4252Author: markus@openbsd.org <markus@openbsd.org> 4253Date: Mon Jan 8 15:14:44 2018 +0000 4254 4255 upstream commit 4256 4257 uuencode.h is not used 4258 4259 OpenBSD-Commit-ID: 238eb4659f3c119904326b9e94a5e507a912796c 4260 4261commit 4f29309c4cb19bcb1774931db84cacc414f17d29 4262Author: Damien Miller <djm@mindrot.org> 4263Date: Wed Jan 3 19:50:43 2018 +1100 4264 4265 unbreak fuzz harness 4266 4267commit f6b50bf84dc0b61f22c887c00423e0ea7644e844 4268Author: djm@openbsd.org <djm@openbsd.org> 4269Date: Thu Dec 21 05:46:35 2017 +0000 4270 4271 upstream commit 4272 4273 another libssh casualty 4274 4275 OpenBSD-Regress-ID: 839b970560246de23e7c50215095fb527a5a83ec 4276 4277commit 5fb4fb5a0158318fb8ed7dbb32f3869bbf221f13 4278Author: djm@openbsd.org <djm@openbsd.org> 4279Date: Thu Dec 21 03:01:49 2017 +0000 4280 4281 upstream commit 4282 4283 missed one (unbreak after ssh/lib removal) 4284 4285 OpenBSD-Regress-ID: cfdd132143131769e2d2455e7892b5d55854c322 4286 4287commit e6c4134165d05447009437a96e7201276688807f 4288Author: djm@openbsd.org <djm@openbsd.org> 4289Date: Thu Dec 21 00:41:22 2017 +0000 4290 4291 upstream commit 4292 4293 unbreak unit tests after removal of src/usr.bin/ssh/lib 4294 4295 OpenBSD-Regress-ID: 3a79760494147b20761cbd2bd5c20e86c63dc8f9 4296 4297commit d45d69f2a937cea215c7f0424e5a4677b6d8c7fe 4298Author: djm@openbsd.org <djm@openbsd.org> 4299Date: Thu Dec 21 00:00:28 2017 +0000 4300 4301 upstream commit 4302 4303 revert stricter key type / signature type checking in 4304 userauth path; too much software generates inconsistent messages, so we need 4305 a better plan. 4306 4307 OpenBSD-Commit-ID: 4a44ddc991c803c4ecc8f1ad40e0ab4d22e1c519 4308 4309commit c5a6cbdb79752f7e761074abdb487953ea6db671 4310Author: djm@openbsd.org <djm@openbsd.org> 4311Date: Tue Dec 19 00:49:30 2017 +0000 4312 4313 upstream commit 4314 4315 explicitly test all key types and their certificate 4316 counterparts 4317 4318 refactor a little 4319 4320 OpenBSD-Regress-ID: e9ecd5580821b9ef8b7106919c6980d8e45ca8c4 4321 4322commit f689adb7a370b5572612d88be9837ca9aea75447 4323Author: dtucker@openbsd.org <dtucker@openbsd.org> 4324Date: Mon Dec 11 11:41:56 2017 +0000 4325 4326 upstream commit 4327 4328 use cmp in a loop instead of diff -N to compare 4329 directories. The former works on more platforms for Portable. 4330 4331 OpenBSD-Regress-ID: c3aa72807f9c488e8829a26ae50fe5bcc5b57099 4332 4333commit 748dd8e5de332b24c40f4b3bbedb902acb048c98 4334Author: Damien Miller <djm@mindrot.org> 4335Date: Tue Dec 19 16:17:59 2017 +1100 4336 4337 remove blocks.c from Makefile 4338 4339commit 278856320520e851063b06cef6ef1c60d4c5d652 4340Author: djm@openbsd.org <djm@openbsd.org> 4341Date: Tue Dec 19 00:24:34 2017 +0000 4342 4343 upstream commit 4344 4345 include signature type and CA key (if applicable) in some 4346 debug messages 4347 4348 OpenBSD-Commit-ID: b71615cc20e78cec7105bb6e940c03ce9ae414a5 4349 4350commit 7860731ef190b52119fa480f8064ab03c44a120a 4351Author: djm@openbsd.org <djm@openbsd.org> 4352Date: Mon Dec 18 23:16:23 2017 +0000 4353 4354 upstream commit 4355 4356 unbreak hostkey rotation; attempting to sign with a 4357 desired signature algorithm of kex->hostkey_alg is incorrect when the key 4358 type isn't capable of making those signatures. ok markus@ 4359 4360 OpenBSD-Commit-ID: 35ae46864e1f5859831ec0d115ee5ea50953a906 4361 4362commit 966ef478339ad5e631fb684d2a8effe846ce3fd4 4363Author: djm@openbsd.org <djm@openbsd.org> 4364Date: Mon Dec 18 23:14:34 2017 +0000 4365 4366 upstream commit 4367 4368 log mismatched RSA signature types; ok markus@ 4369 4370 OpenBSD-Commit-ID: 381bddfcc1e297a42292222f3bcb5ac2b7ea2418 4371 4372commit 349ecd4da3a985359694a74635748009be6baca6 4373Author: djm@openbsd.org <djm@openbsd.org> 4374Date: Mon Dec 18 23:13:42 2017 +0000 4375 4376 upstream commit 4377 4378 pass kex->hostkey_alg and kex->hostkey_nid from pre-auth 4379 to post-auth unpriviledged child processes; ok markus@ 4380 4381 OpenBSD-Commit-ID: 4a35bc7af0a5f8a232d1361f79f4ebc376137302 4382 4383commit c9e37a8725c083441dd34a8a53768aa45c3c53fe 4384Author: millert@openbsd.org <millert@openbsd.org> 4385Date: Mon Dec 18 17:28:54 2017 +0000 4386 4387 upstream commit 4388 4389 Add helper function for uri handing in scp where a 4390 missing path simply means ".". Also fix exit code and add warnings when an 4391 invalid uri is encountered. OK otto@ 4392 4393 OpenBSD-Commit-ID: 47dcf872380586dabf7fcc6e7baf5f8ad508ae1a 4394 4395commit 04c7e28f83062dc42f2380d1bb3a6bf0190852c0 4396Author: djm@openbsd.org <djm@openbsd.org> 4397Date: Mon Dec 18 02:25:15 2017 +0000 4398 4399 upstream commit 4400 4401 pass negotiated signing algorithm though to 4402 sshkey_verify() and check that the negotiated algorithm matches the type in 4403 the signature (only matters for RSA SHA1/SHA2 sigs). ok markus@ 4404 4405 OpenBSD-Commit-ID: 735fb15bf4adc060d3bee9d047a4bcaaa81b1af9 4406 4407commit 931c78dfd7fe30669681a59e536bbe66535f3ee9 4408Author: djm@openbsd.org <djm@openbsd.org> 4409Date: Mon Dec 18 02:22:29 2017 +0000 4410 4411 upstream commit 4412 4413 sshkey_sigtype() function to return the type of a 4414 signature; ok markus@ 4415 4416 OpenBSD-Commit-ID: d3772b065ad6eed97285589bfb544befed9032e8 4417 4418commit 4cdc5956f2fcc9e9078938db833142dc07d8f523 4419Author: naddy@openbsd.org <naddy@openbsd.org> 4420Date: Thu Dec 14 21:07:39 2017 +0000 4421 4422 upstream commit 4423 4424 Replace ED25519's private SHA-512 implementation with a 4425 call to the regular digest code. This speeds up compilation considerably. ok 4426 markus@ 4427 4428 OpenBSD-Commit-ID: fcce8c3bcfe7389462a28228f63c823e80ade41c 4429 4430commit 012e5cb839faf76549e3b6101b192fe1a74d367e 4431Author: naddy@openbsd.org <naddy@openbsd.org> 4432Date: Tue Dec 12 15:06:12 2017 +0000 4433 4434 upstream commit 4435 4436 Create a persistent umac128.c source file: #define the 4437 output size and the name of the entry points for UMAC-128 before including 4438 umac.c. Idea from FreeBSD. ok dtucker@ 4439 4440 OpenBSD-Commit-ID: 463cfacfa07cb8060a4d4961e63dca307bf3f4b1 4441 4442commit b35addfb4cd3b5cdb56a2a489d38e940ada926c7 4443Author: Darren Tucker <dtucker@zip.com.au> 4444Date: Mon Dec 11 16:23:28 2017 +1100 4445 4446 Update .depend with empty config.h 4447 4448commit 2d96f28246938e0ca474a939d8ac82ecd0de27e3 4449Author: Darren Tucker <dtucker@zip.com.au> 4450Date: Mon Dec 11 16:21:55 2017 +1100 4451 4452 Ensure config.h is always in dependencies. 4453 4454 Put an empty config.h into the dependency list to ensure that it's 4455 always listed and consistent. 4456 4457commit ac4987a55ee5d4dcc8e87f7ae7c1f87be7257d71 4458Author: deraadt@openbsd.org <deraadt@openbsd.org> 4459Date: Sun Dec 10 19:37:57 2017 +0000 4460 4461 upstream commit 4462 4463 ssh/lib hasn't worked towards our code-sharing goals for 4464 a quit while, perhaps it is too verbose? Change each */Makefile to 4465 specifying exactly what sources that program requires, compiling it seperate. 4466 Maybe we'll iterate by sorting those into seperatable chunks, splitting up 4467 files which contain common code + server/client specific code, or whatnot. 4468 But this isn't one step, or we'd have done it a long time ago.. ok dtucker 4469 markus djm 4470 4471 OpenBSD-Commit-ID: 5317f294d63a876bfc861e19773b1575f96f027d 4472 4473commit 48c23a39a8f1069a57264dd826f6c90aa12778d5 4474Author: dtucker@openbsd.org <dtucker@openbsd.org> 4475Date: Sun Dec 10 05:55:29 2017 +0000 4476 4477 upstream commit 4478 4479 Put remote client info back into the ClientAlive 4480 connection termination message. Based in part on diff from lars.nooden at 4481 gmail, ok djm 4482 4483 OpenBSD-Commit-ID: 80a0f619a29bbf2f32eb5297a69978a0e05d0ee0 4484 4485commit aabd75ec76575c1b17232e6526a644097cd798e5 4486Author: deraadt@openbsd.org <deraadt@openbsd.org> 4487Date: Fri Dec 8 03:45:52 2017 +0000 4488 4489 upstream commit 4490 4491 time_t printing needs %lld and (long long) casts ok djm 4492 4493 OpenBSD-Commit-ID: 4a93bc2b0d42a39b8f8de8bb74d07ad2e5e83ef7 4494 4495commit fd4eeeec16537870bd40d04836c7906ec141c17d 4496Author: djm@openbsd.org <djm@openbsd.org> 4497Date: Fri Dec 8 02:14:33 2017 +0000 4498 4499 upstream commit 4500 4501 fix ordering in previous to ensure errno isn't clobbered 4502 before logging. 4503 4504 OpenBSD-Commit-ID: e260bc1e145a9690dcb0d5aa9460c7b96a0c8ab2 4505 4506commit 155072fdb0d938015df828836beb2f18a294ab8a 4507Author: djm@openbsd.org <djm@openbsd.org> 4508Date: Fri Dec 8 02:13:02 2017 +0000 4509 4510 upstream commit 4511 4512 for some reason unix_listener() logged most errors twice 4513 with each message containing only some of the useful information; merge these 4514 4515 OpenBSD-Commit-ID: 1978a7594a9470c0dddcd719586066311b7c9a4a 4516 4517commit 79c0e1d29959304e5a49af1dbc58b144628c09f3 4518Author: Darren Tucker <dtucker@zip.com.au> 4519Date: Mon Dec 11 14:38:33 2017 +1100 4520 4521 Add autogenerated dependency info to Makefile. 4522 4523 Adds a .depend file containing dependency information generated by 4524 makedepend, which is appended to the generated Makefile by configure. 4525 4526 You can regen the file with "make -f Makefile.in depend" if necessary, 4527 but we'll be looking at some way to automatically keep this up to date. 4528 4529 "no objection" djm@ 4530 4531commit f001de8fbf7f3faddddd8efd03df18e57601f7eb 4532Author: Darren Tucker <dtucker@zip.com.au> 4533Date: Mon Dec 11 13:42:51 2017 +1100 4534 4535 Fix pasto in ldns handling. 4536 4537 When ldns-config is not found, configure would check the wrong variable. 4538 ok djm@ 4539 4540commit c5bfe83f67cb64e71cf2fe0d1500f6904b0099ee 4541Author: Darren Tucker <dtucker@zip.com.au> 4542Date: Sat Dec 9 10:12:23 2017 +1100 4543 4544 Portable switched to git so s/CVS/git/. 4545 4546commit bb82e61a40a4ee52e4eb904caaee2c27b763ab5b 4547Author: Darren Tucker <dtucker@zip.com.au> 4548Date: Sat Dec 9 08:06:00 2017 +1100 4549 4550 Remove now-used check for perl. 4551 4552commit e0ce54c0b9ca3a9388f9c50f4fa6cc25c28a3240 4553Author: djm@openbsd.org <djm@openbsd.org> 4554Date: Wed Dec 6 05:06:21 2017 +0000 4555 4556 upstream commit 4557 4558 don't accept junk after "yes" or "no" responses to 4559 hostkey prompts. bz#2803 reported by Maksim Derbasov; ok dtucker@ 4560 4561 OpenBSD-Commit-ID: e1b159fb2253be973ce25eb7a7be26e6f967717c 4562 4563commit 609d96b3d58475a15b2eb6b3d463f2c5d8e510c0 4564Author: dtucker@openbsd.org <dtucker@openbsd.org> 4565Date: Tue Dec 5 23:59:47 2017 +0000 4566 4567 upstream commit 4568 4569 Replace atoi and strtol conversions for integer arguments 4570 to config keywords with a checking wrapper around strtonum. This will 4571 prevent and flag invalid and negative arguments to these keywords. ok djm@ 4572 4573 OpenBSD-Commit-ID: 99ae3981f3d608a219ccb8d2fff635ae52c17998 4574 4575commit 168ecec13f9d7cb80c07df3bf7d414f4e4165e84 4576Author: dtucker@openbsd.org <dtucker@openbsd.org> 4577Date: Tue Dec 5 23:56:07 2017 +0000 4578 4579 upstream commit 4580 4581 Add missing break for rdomain. Prevents spurious 4582 "Deprecated option" warnings. ok djm@ 4583 4584 OpenBSD-Commit-ID: ba28a675d39bb04a974586241c3cba71a9c6099a 4585 4586commit 927f8514ceffb1af380a5f63ab4d3f7709b1b198 4587Author: djm@openbsd.org <djm@openbsd.org> 4588Date: Tue Dec 5 01:30:19 2017 +0000 4589 4590 upstream commit 4591 4592 include the addr:port in bind/listen failure messages 4593 4594 OpenBSD-Commit-ID: fdadb69fe1b38692608809cf0376b71c2c28e58e 4595 4596commit a8c89499543e2d889629c4e5e8dcf47a655cf889 4597Author: dtucker@openbsd.org <dtucker@openbsd.org> 4598Date: Wed Nov 29 05:49:54 2017 +0000 4599 4600 upstream commit 4601 4602 Import updated moduli. 4603 4604 OpenBSD-Commit-ID: 524d210f982af6007aa936ca7f4c977f4d32f38a 4605 4606commit 3dde09ab38c8e1cfc28252be473541a81bc57097 4607Author: dtucker@openbsd.org <dtucker@openbsd.org> 4608Date: Tue Nov 28 21:10:22 2017 +0000 4609 4610 upstream commit 4611 4612 Have sftp print a warning about shell cleanliness when 4613 decoding the first packet fails, which is usually caused by shells polluting 4614 stdout of non-interactive starups. bz#2800, ok markus@ deraadt@. 4615 4616 OpenBSD-Commit-ID: 88d6a9bf3470f9324b76ba1cbd53e50120f685b5 4617 4618commit 6c8a246437f612ada8541076be2414846d767319 4619Author: Darren Tucker <dtucker@zip.com.au> 4620Date: Fri Dec 1 17:11:47 2017 +1100 4621 4622 Replace mkinstalldirs with mkdir -p. 4623 4624 Check for MIKDIR_P and use it instead of mkinstalldirs. Should fix "mkdir: 4625 cannot create directory:... File exists" during "make install". 4626 Patch from eb at emlix.com. 4627 4628commit 3058dd78d2e43ed0f82ad8eab8bb04b043a72023 4629Author: Darren Tucker <dtucker@zip.com.au> 4630Date: Fri Dec 1 17:07:08 2017 +1100 4631 4632 Pull in newer install-sh from autoconf-2.69. 4633 4634 Suggested by eb at emlix.com 4635 4636commit 79226e5413c5b0fda3511351a8511ff457e306d8 4637Author: Darren Tucker <dtucker@zip.com.au> 4638Date: Fri Dec 1 16:55:35 2017 +1100 4639 4640 Remove RSA1 host key generation. 4641 4642 SSH1 support is now gone, remove SSH1 key generation. 4643 Patch from eb at emlix.com. 4644 4645commit 2937dd02c572a12f33d5c334d518f6cbe0b645eb 4646Author: djm@openbsd.org <djm@openbsd.org> 4647Date: Tue Nov 28 06:09:38 2017 +0000 4648 4649 upstream commit 4650 4651 more whitespace errors 4652 4653 OpenBSD-Commit-ID: 5e11c125378327b648940b90145e0d98beb05abb 4654 4655commit 7f257bf3fd3a759f31098960cbbd1453fafc4164 4656Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4657Date: Tue Nov 28 06:04:51 2017 +0000 4658 4659 upstream commit 4660 4661 whitespace at EOL 4662 4663 OpenBSD-Commit-ID: 76d3965202b22d59c2784a8df3a8bfa5ee67b96a 4664 4665commit 5db6fbf1438b108e5df3e79a1b4de544373bc2d4 4666Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org> 4667Date: Sat Nov 25 06:46:22 2017 +0000 4668 4669 upstream commit 4670 4671 Add monotime_ts and monotime_tv that return monotonic 4672 timespec and timeval respectively. Replace calls to gettimeofday() in packet 4673 timing with monotime_tv so that the callers will work over a clock step. 4674 Should prevent integer overflow during clock steps reported by wangle6 at 4675 huawei.com. "I like" markus@ 4676 4677 OpenBSD-Commit-ID: 74d684264814ff806f197948b87aa732cb1b0b8a 4678 4679commit 2d638e986085bdf1a40310ed6e2307463db96ea0 4680Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org> 4681Date: Sat Nov 25 05:58:47 2017 +0000 4682 4683 upstream commit 4684 4685 Remove get_current_time() and replace with calls to 4686 monotime_double() which uses CLOCK_MONOTONIC and works over clock steps. "I 4687 like" markus@ 4688 4689 OpenBSD-Commit-ID: 3ad2f7d2414e2cfcaef99877a7a5b0baf2242952 4690 4691commit ba460acae48a36ef749cb23068f968f4d5d90a24 4692Author: Darren Tucker <dtucker@zip.com.au> 4693Date: Fri Nov 24 16:24:31 2017 +1100 4694 4695 Include string.h for explicit_bzero. 4696 4697commit a65655fb1a12b77fb22f9e71559b9d73030ec8ff 4698Author: Damien Miller <djm@mindrot.org> 4699Date: Fri Nov 24 10:23:47 2017 +1100 4700 4701 fix incorrect range of OpenSSL versions supported 4702 4703 Pointed out by Solar Designer 4704 4705commit 83a1e5dbec52d05775174f368e0c44b08619a308 4706Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4707Date: Wed Nov 15 02:10:16 2017 +0000 4708 4709 upstream commit 4710 4711 downgrade a couple more request parsing errors from 4712 process-fatal to just returning failure, making them consistent with the 4713 others that were already like that. 4714 4715 OpenBSD-Commit-ID: c111461f7a626690a2d53018ef26557b34652918 4716 4717commit 93c68a8f3da8e5e6acdc3396f54d73919165e242 4718Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4719Date: Wed Nov 15 00:13:40 2017 +0000 4720 4721 upstream commit 4722 4723 fix regression in 7.6: failure to parse a signature request 4724 message shouldn't be fatal to the process, just the request. Reported by Ron 4725 Frederick 4726 4727 OpenBSD-Commit-ID: e5d01b3819caa1a2ad51fc57d6ded43f48bbcc05 4728 4729commit 548d3a66feb64c405733932a6b1abeaf7198fa71 4730Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4731Date: Tue Nov 14 00:45:29 2017 +0000 4732 4733 upstream commit 4734 4735 fix problem in configuration parsing when in config dump mode 4736 (sshd -T) without providing a full connection specification (sshd -T -C ...) 4737 4738 spotted by bluhm@ 4739 4740 OpenBSD-Commit-ID: 7125faf5740eaa9d3a2f25400a0bc85e94e28b8f 4741 4742commit 33edb6ebdc2f81ebed1bceadacdfb8910b64fb88 4743Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4744Date: Fri Nov 3 05:18:44 2017 +0000 4745 4746 upstream commit 4747 4748 reuse parse_multistate for parse_flag (yes/no arguments). 4749 Saves a few lines of code and makes the parser more consistent wrt case- 4750 sensitivity. bz#2664 ok dtucker@ 4751 4752 OpenBSD-Commit-ID: b2ad1b6086858d5db71c7b11e5a74dba6d60efef 4753 4754commit d52131a98316e76c0caa348f09bf6f7b9b01a1b9 4755Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4756Date: Fri Nov 3 05:14:04 2017 +0000 4757 4758 upstream commit 4759 4760 allow certificate validity intervals that specify only a 4761 start or stop time (we already support specifying both or neither) 4762 4763 OpenBSD-Commit-ID: 9be486545603c003030bdb5c467d1318b46b4e42 4764 4765commit fbe8e7ac94c2fa380421a9205a8bc966549c2f91 4766Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4767Date: Fri Nov 3 03:46:52 2017 +0000 4768 4769 upstream commit 4770 4771 allow "cd" and "lcd" commands with no explicit path 4772 argument. lcd will change to the local user's home directory as usual. cd 4773 will change to the starting directory for session (because the protocol 4774 offers no way to obtain the remote user's home directory). bz#2760 ok 4775 dtucker@ 4776 4777 OpenBSD-Commit-ID: 15333f5087cee8c1ed1330cac1bd0a3e6a767393 4778 4779commit 0208a48517b5e8e8b091f32fa4addcd67c31ca9e 4780Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org> 4781Date: Fri Nov 3 03:18:53 2017 +0000 4782 4783 upstream commit 4784 4785 When doing a config test with sshd -T, only require the 4786 attributes that are actually used in Match criteria rather than (an 4787 incomplete list of) all criteria. ok djm@, man page help jmc@ 4788 4789 OpenBSD-Commit-ID: b4e773c4212d3dea486d0259ae977551aab2c1fc 4790 4791commit c357eed5a52cd2f4ff358b17e30e3f9a800644da 4792Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4793Date: Fri Nov 3 02:32:19 2017 +0000 4794 4795 upstream commit 4796 4797 typos in ECDSA certificate names; bz#2787 reported by 4798 Mike Gerow 4799 4800 OpenBSD-Commit-ID: 824938b6aba1b31321324ba1f56c05f84834b163 4801 4802commit ecbf005b8fd80b81d0c61dfc1e96fe3da6099395 4803Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4804Date: Fri Nov 3 02:29:17 2017 +0000 4805 4806 upstream commit 4807 4808 Private keys in PEM format have been encrypted by AES-128 for 4809 a while (not 3DES). bz#2788 reported by Calum Mackay 4810 4811 OpenBSD-Commit-ID: bd33da7acbbb3c882f0a0ee56007a35ce0d8a11a 4812 4813commit 81c9ccdbf6ddbf9bfbd6f1f775a5a7c13e47e185 4814Author: Darren Tucker <dtucker@zip.com.au> 4815Date: Fri Nov 3 14:52:51 2017 +1100 4816 4817 Check for linux/if.h when enabling rdomain. 4818 4819 musl libc doesn't seem to have linux/if.h, so check for its presence 4820 before enabling rdomain support on Linux. 4821 4822commit fa1b834cce41a1ce3e6a8d57fb67ef18c9dd803f 4823Author: Darren Tucker <dtucker@zip.com.au> 4824Date: Fri Nov 3 14:09:45 2017 +1100 4825 4826 Add headers for sys/sysctl.h and net/route.h 4827 4828 On at least older OpenBSDs, sys/sysctl.h and net/route.h require 4829 sys/types and, in the case of sys/sysctl.h, sys/param.h for MAXLOGNAME. 4830 4831commit 41bff4da21fcd8a7c6a83a7e0f92b018f904f6fb 4832Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4833Date: Fri Nov 3 02:22:41 2017 +0000 4834 4835 upstream commit 4836 4837 avoid unused variable warnings for !WITH_OPENSSL; patch from 4838 Marcus Folkesson 4839 4840 OpenBSD-Commit-ID: c01d27a3f907acdc3dd4ea48170fac3ba236d229 4841 4842commit 6b373e4635a7470baa94253dd1dc8953663da9e8 4843Author: Marcus Folkesson <marcus.folkesson@gmail.com> 4844Date: Sat Oct 28 19:48:39 2017 +0200 4845 4846 only enable functions in dh.c when openssl is used 4847 4848 Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> 4849 4850commit 939b30ba23848b572e15bf92f0f1a3d9cf3acc2b 4851Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4852Date: Wed Nov 1 00:04:15 2017 +0000 4853 4854 upstream commit 4855 4856 fix broken stdout in ControlPersist mode, introduced by me in 4857 r1.467 and reported by Alf Schlichting 4858 4859 OpenBSD-Commit-ID: 3750a16e02108fc25f747e4ebcedb7123c1ef509 4860 4861commit f21455a084f9cc3942cf1bde64055a4916849fed 4862Author: Darren Tucker <dtucker@zip.com.au> 4863Date: Tue Oct 31 10:09:33 2017 +1100 4864 4865 Include includes.h for HAVE_GETPAGESIZE. 4866 4867 The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in 4868 config.h, but bsd-getpagesize.c forgot to include includes.h (which 4869 indirectly includes config.h) so the checks always fails, causing linker 4870 issues when linking statically on systems with getpagesize(). 4871 4872 Patch from Peter Korsgaard <peter at korsgaard.com> 4873 4874commit f2ad63c0718b93ac1d1e85f53fee33b06eef86b5 4875Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4876Date: Mon Oct 30 22:01:52 2017 +0000 4877 4878 upstream commit 4879 4880 whitespace at EOL 4881 4882 OpenBSD-Regress-ID: f4b5df99b28c6f63478deb916c6ed0e794685f07 4883 4884commit c6415b1f8f1d0c2735564371647fd6a177fb9a3e 4885Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4886Date: Mon Oct 30 21:59:43 2017 +0000 4887 4888 upstream commit 4889 4890 whitespace at EOL 4891 4892 OpenBSD-Regress-ID: 19b1394393deee4c8a2114a3b7d18189f27a15cd 4893 4894commit e4d4ddbbba0e585ca3ec3a455430750b4622a6d3 4895Author: millert@openbsd.org@openbsd.org <millert@openbsd.org@openbsd.org> 4896Date: Wed Oct 25 20:08:36 2017 +0000 4897 4898 upstream commit 4899 4900 Use printenv to test whether an SSH_USER_AUTH is set 4901 instead of using $SSH_USER_AUTH. The latter won't work with csh which treats 4902 unknown variables as an error when expanding them. OK markus@ 4903 4904 OpenBSD-Regress-ID: f601e878dd8b71aa40381573dde3a8f567e6f2d1 4905 4906commit 116b1b439413a724ebb3320633a64dd0f3ee1fe7 4907Author: millert@openbsd.org@openbsd.org <millert@openbsd.org@openbsd.org> 4908Date: Tue Oct 24 19:33:32 2017 +0000 4909 4910 upstream commit 4911 4912 Add tests for URI parsing. OK markus@ 4913 4914 OpenBSD-Regress-ID: 5d1df19874f3b916d1a2256a905526e17a98bd3b 4915 4916commit dbe0662e9cd482593a4a8bf58c6481bfe8a747a4 4917Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4918Date: Fri Oct 27 01:57:06 2017 +0000 4919 4920 upstream commit 4921 4922 whitespace at EOL 4923 4924 OpenBSD-Commit-ID: c95549cf5a07d56ea11aaff818415118720214f6 4925 4926commit d2135474344335a7c6ee643b6ade6db400fa76ee 4927Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4928Date: Fri Oct 27 01:01:17 2017 +0000 4929 4930 upstream commit 4931 4932 whitespace at EOL (lots) 4933 4934 OpenBSD-Commit-ID: 757257dd44116794ee1b5a45c6724973de181747 4935 4936commit b77c29a07f5a02c7c1998701c73d92bde7ae1608 4937Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> 4938Date: Fri Oct 27 00:18:41 2017 +0000 4939 4940 upstream commit 4941 4942 improve printing of rdomain on accept() a little 4943 4944 OpenBSD-Commit-ID: 5da58db2243606899cedaa646c70201b2d12247a 4945 4946commit 68d3bbb2e6dfbf117c46e942142795b2cdd0274b 4947Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org> 4948Date: Thu Oct 26 06:44:01 2017 +0000 4949 4950 upstream commit 4951 4952 mark up the rdomain keyword; 4953 4954 OpenBSD-Commit-ID: 1b597d0ad0ad20e94dbd61ca066057e6f6313b8a 4955 4956commit 0b2e2896b9d0d6cfb59e9ec8271085296bd4e99b 4957Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org> 4958Date: Wed Oct 25 06:19:46 2017 +0000 4959 4960 upstream commit 4961 4962 tweak the uri text, specifically removing some markup to 4963 make it a bit more readable; 4964 4965 issue reported by - and diff ok - millert 4966 4967 OpenBSD-Commit-ID: 8b56a20208040b2d0633536fd926e992de37ef3f 4968 4969commit 7530e77bdc9415386d2a8ea3d086e8b611b2ba40 4970Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org> 4971Date: Wed Oct 25 06:18:06 2017 +0000 4972 4973 upstream commit 4974 4975 simplify macros in previous, and some minor tweaks; 4976 4977 OpenBSD-Commit-ID: 6efeca3d8b095b76e21b484607d9cc67ac9a11ca 4978 4979commit eb9c582b710dc48976b48eb2204218f6863bae9a 4980Author: Damien Miller <djm@mindrot.org> 4981Date: Tue Oct 31 00:46:29 2017 +1100 4982 4983 Switch upstream git repository. 4984 4985 Previously portable OpenSSH has synced against a conversion of OpenBSD's 4986 CVS repository made using the git cvsimport tool, but this has become 4987 increasingly unreliable. 4988 4989 As of this commit, portable OpenSSH now tracks a conversion of the 4990 OpenBSD CVS upstream made using the excellent cvs2gitdump tool from 4991 YASUOKA Masahiko: https://github.com/yasuoka/cvs2gitdump 4992 4993 cvs2gitdump is considerably more reliable than gitcvsimport and the old 4994 version of cvsps that it uses under the hood, and is the same tool used 4995 to export the entire OpenBSD repository to git (so we know it can cope 4996 with future growth). 4997 4998 These new conversions are mirrored at github, so interested parties can 4999 match portable OpenSSH commits to their upstream counterparts. 5000 5001 https://github.com/djmdjm/openbsd-openssh-src 5002 https://github.com/djmdjm/openbsd-openssh-regress 5003 5004 An unfortunate side effect of switching upstreams is that we must have 5005 a flag day, across which the upstream commit IDs will be inconsistent. 5006 The old commit IDs are recorded with the tags "Upstream-ID" for main 5007 directory commits and "Upstream-Regress-ID" for regress commits. 5008 5009 To make it clear that the commit IDs do not refer to the same 5010 things, the new repository will instead use "OpenBSD-ID" and 5011 "OpenBSD-Regress-ID" tags instead. 5012 5013 Apart from being a longwinded explanation of what is going on, this 5014 commit message also serves to synchronise our tools with the state of 5015 the tree, which happens to be: 5016 5017 OpenBSD-ID: 9c43a9968c7929613284ea18e9fb92e4e2a8e4c1 5018 OpenBSD-Regress-ID: b33b385719420bf3bc57d664feda6f699c147fef 5019 5020commit 2de5c6b53bf063ac698596ef4e23d8e3099656ea 5021Author: Damien Miller <djm@mindrot.org> 5022Date: Fri Oct 27 08:42:33 2017 +1100 5023 5024 fix rdomain compilation errors 5025 5026commit 6bd5b569fd6dfd5e8c8af20bbc41e45c2d6462ab 5027Author: Damien Miller <djm@mindrot.org> 5028Date: Wed Oct 25 14:15:42 2017 +1100 5029 5030 autoconf glue to enable Linux VRF 5031 5032commit 97c5aaf925d61641d599071abb56012cde265978 5033Author: Damien Miller <djm@mindrot.org> 5034Date: Wed Oct 25 14:09:56 2017 +1100 5035 5036 basic valid_rdomain() implementation for Linux 5037 5038commit ce1cca39d7935dd394080ce2df62f5ce5b51f485 5039Author: Damien Miller <djm@mindrot.org> 5040Date: Wed Oct 25 13:47:59 2017 +1100 5041 5042 implement get/set_rdomain() for Linux 5043 5044 Not enabled, pending implementation of valid_rdomain() and autoconf glue 5045 5046commit 6eee79f9b8d4a3b113b698383948a119acb82415 5047Author: Damien Miller <djm@mindrot.org> 5048Date: Wed Oct 25 13:22:29 2017 +1100 5049 5050 stubs for rdomain replacement functions 5051 5052commit f5594f939f844bbb688313697d6676238da355b3 5053Author: Damien Miller <djm@mindrot.org> 5054Date: Wed Oct 25 13:13:57 2017 +1100 5055 5056 rename port-tun.[ch] => port-net.[ch] 5057 5058 Ahead of adding rdomain support 5059 5060commit d685e5a31feea35fb99e1a31a70b3c60a7f2a0eb 5061Author: djm@openbsd.org <djm@openbsd.org> 5062Date: Wed Oct 25 02:10:39 2017 +0000 5063 5064 upstream commit 5065 5066 uninitialised variable in PermitTunnel printing code 5067 5068 Upstream-ID: f04dc33e42855704e116b8da61095ecc71bc9e9a 5069 5070commit 43c29bb7cfd46bbbc61e0ffa61a11e74d49a712f 5071Author: Damien Miller <djm@mindrot.org> 5072Date: Wed Oct 25 13:10:59 2017 +1100 5073 5074 provide hooks and fallbacks for rdomain support 5075 5076commit 3235473bc8e075fad7216b7cd62fcd2b0320ea04 5077Author: Damien Miller <djm@mindrot.org> 5078Date: Wed Oct 25 11:25:43 2017 +1100 5079 5080 check for net/route.h and sys/sysctl.h 5081 5082commit 4d5456c7de108e17603a0920c4d15bca87244921 5083Author: djm@openbsd.org <djm@openbsd.org> 5084Date: Wed Oct 25 00:21:37 2017 +0000 5085 5086 upstream commit 5087 5088 transfer ownership of stdout to the session channel by 5089 dup2'ing /dev/null to fd 1. This allows propagation of remote stdout close to 5090 the local side; reported by David Newall, ok markus@ 5091 5092 Upstream-ID: 8d9ac18a11d89e6b0415f0cbf67b928ac67f0e79 5093 5094commit 68af80e6fdeaeb79432209db614386ff0f37e75f 5095Author: djm@openbsd.org <djm@openbsd.org> 5096Date: Wed Oct 25 00:19:47 2017 +0000 5097 5098 upstream commit 5099 5100 add a "rdomain" criteria for the sshd_config Match 5101 keyword to allow conditional configuration that depends on which rdomain(4) a 5102 connection was recevied on. ok markus@ 5103 5104 Upstream-ID: 27d8fd5a3f1bae18c9c6e533afdf99bff887a4fb 5105 5106commit 35eb33fb957979e3fcbe6ea0eaee8bf4a217421a 5107Author: djm@openbsd.org <djm@openbsd.org> 5108Date: Wed Oct 25 00:17:08 2017 +0000 5109 5110 upstream commit 5111 5112 add sshd_config RDomain keyword to place sshd and the 5113 subsequent user session (including the shell and any TCP/IP forwardings) into 5114 the specified rdomain(4) 5115 5116 ok markus@ 5117 5118 Upstream-ID: be2358e86346b5cacf20d90f59f980b87d1af0f5 5119 5120commit acf559e1cffbd1d6167cc1742729fc381069f06b 5121Author: djm@openbsd.org <djm@openbsd.org> 5122Date: Wed Oct 25 00:15:35 2017 +0000 5123 5124 upstream commit 5125 5126 Add optional rdomain qualifier to sshd_config's 5127 ListenAddress option to allow listening on a different rdomain(4), e.g. 5128 5129 ListenAddress 0.0.0.0 rdomain 4 5130 5131 Upstream-ID: 24b6622c376feeed9e9be8b9605e593695ac9091 5132 5133commit b9903ee8ee8671b447fc260c2bee3761e26c7227 5134Author: millert@openbsd.org <millert@openbsd.org> 5135Date: Tue Oct 24 19:41:45 2017 +0000 5136 5137 upstream commit 5138 5139 Kill dead store and some spaces vs. tabs indent in 5140 parse_user_host_path(). Noticed by markus@ 5141 5142 Upstream-ID: 114fec91dadf9af46c7c94fd40fc630ea2de8200 5143 5144commit 0869627e00f4ee2a038cb62d7bd9ffad405e1800 5145Author: jmc@openbsd.org <jmc@openbsd.org> 5146Date: Tue Oct 24 06:27:42 2017 +0000 5147 5148 upstream commit 5149 5150 tweak previous; ok djm 5151 5152 Upstream-ID: 7d913981ab315296be1f759c67b6e17aea38fca9 5153 5154commit e3fa20e2e58fdc88a0e842358778f2de448b771b 5155Author: Damien Miller <djm@mindrot.org> 5156Date: Mon Oct 23 16:25:24 2017 +1100 5157 5158 avoid -Wsign-compare warning in argv copying 5159 5160commit b7548b12a6b2b4abf4d057192c353147e0abba08 5161Author: djm@openbsd.org <djm@openbsd.org> 5162Date: Mon Oct 23 05:08:00 2017 +0000 5163 5164 upstream commit 5165 5166 Expose devices allocated for tun/tap forwarding. 5167 5168 At the client, the device may be obtained from a new %T expansion 5169 for LocalCommand. 5170 5171 At the server, the allocated devices will be listed in a 5172 SSH_TUNNEL variable exposed to the environment of any user sessions 5173 started after the tunnel forwarding was established. 5174 5175 ok markus 5176 5177 Upstream-ID: e61e53f8ae80566e9ddc0d67a5df5bdf2f3c9f9e 5178 5179commit 887669ef032d63cf07f53cada216fa8a0c9a7d72 5180Author: millert@openbsd.org <millert@openbsd.org> 5181Date: Sat Oct 21 23:06:24 2017 +0000 5182 5183 upstream commit 5184 5185 Add URI support to ssh, sftp and scp. For example 5186 ssh://user@host or sftp://user@host/path. The connection parameters 5187 described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since 5188 the ssh fingerprint format in the draft uses md5 with no way to specify the 5189 hash function type. OK djm@ 5190 5191 Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc 5192 5193commit d27bff293cfeb2252f4c7a58babe5ad3262c6c98 5194Author: Damien Miller <djm@mindrot.org> 5195Date: Fri Oct 20 13:22:00 2017 +1100 5196 5197 Fix missed RCSID merges 5198 5199commit d3b6aeb546242c9e61721225ac4387d416dd3d5e 5200Author: djm@openbsd.org <djm@openbsd.org> 5201Date: Fri Oct 20 02:13:41 2017 +0000 5202 5203 upstream commit 5204 5205 more RCSIDs 5206 5207 Upstream-Regress-ID: 1aecbe3f8224793f0ec56741a86d619830eb33be 5208 5209commit b011edbb32e41aaab01386ce4c0efcc9ff681c4a 5210Author: djm@openbsd.org <djm@openbsd.org> 5211Date: Fri Oct 20 01:56:39 2017 +0000 5212 5213 upstream commit 5214 5215 add RCSIDs to these; they make syncing portable a bit 5216 easier 5217 5218 Upstream-ID: 56cb7021faea599736dd7e7f09c2e714425b1e68 5219 5220commit 6eb27597781dccaf0ec2b80107a9f0592a0cb464 5221Author: Damien Miller <djm@mindrot.org> 5222Date: Fri Oct 20 12:54:15 2017 +1100 5223 5224 upstream commit 5225 5226 Apply missing commit 1.11 to kexc25519s.c 5227 5228 Upstream-ID: 5f020e23a1ee6c3597af1f91511e68552cdf15e8 5229 5230commit 6f72280553cb6918859ebcacc717f2d2fafc1a27 5231Author: Damien Miller <djm@mindrot.org> 5232Date: Fri Oct 20 12:52:50 2017 +1100 5233 5234 upstream commit 5235 5236 Apply missing commit 1.127 to servconf.h 5237 5238 Upstream-ID: f14c4bac74a2b7cf1e3cff6bea5c447f192a7d15 5239 5240commit bb3e16ab25cb911238c2eb7455f9cf490cb143cc 5241Author: jmc@openbsd.org <jmc@openbsd.org> 5242Date: Wed Oct 18 05:36:59 2017 +0000 5243 5244 upstream commit 5245 5246 remove unused Pp; 5247 5248 Upstream-ID: 8ad26467f1f6a40be887234085a8e01a61a00550 5249 5250commit 05b69e99570553c8e1eafb895b1fbf1d098d2e14 5251Author: djm@openbsd.org <djm@openbsd.org> 5252Date: Wed Oct 18 02:49:44 2017 +0000 5253 5254 upstream commit 5255 5256 In the description of pattern-lists, clarify negated 5257 matches by explicitly stating that a negated match will never yield a 5258 positive result, and that at least one positive term in the pattern-list must 5259 match. bz#1918 5260 5261 Upstream-ID: 652d2f9d993f158fc5f83cef4a95cd9d95ae6a14 5262 5263commit eb80e26a15c10bc65fed8b8cdb476819a713c0fd 5264Author: djm@openbsd.org <djm@openbsd.org> 5265Date: Fri Oct 13 21:13:54 2017 +0000 5266 5267 upstream commit 5268 5269 log debug messages sent to peer; ok deraadt markus 5270 5271 Upstream-ID: 3b4fdc0a06ea5083f61d96e20043000f477103d9 5272 5273commit 071325f458d615d7740da5c1c1d5a8b68a0b4605 5274Author: jmc@openbsd.org <jmc@openbsd.org> 5275Date: Fri Oct 13 16:50:45 2017 +0000 5276 5277 upstream commit 5278 5279 trim permitrootlogin description somewhat, to avoid 5280 ambiguity; original diff from walter alejandro iglesias, tweaked by sthen and 5281 myself 5282 5283 ok sthen schwarze deraadt 5284 5285 Upstream-ID: 1749418b2bc073f3fdd25fe21f8263c3637fe5d2 5286 5287commit 10727487becb897a15f658e0cb2d05466236e622 5288Author: djm@openbsd.org <djm@openbsd.org> 5289Date: Fri Oct 13 06:45:18 2017 +0000 5290 5291 upstream commit 5292 5293 mention SSH_USER_AUTH in the list of environment 5294 variables 5295 5296 Upstream-ID: 1083397c3ee54b4933121ab058c70a0fc6383691 5297 5298commit 224f193d6a4b57e7a0cb2b9ecd3b6c54d721d8c2 5299Author: djm@openbsd.org <djm@openbsd.org> 5300Date: Fri Oct 13 06:24:51 2017 +0000 5301 5302 upstream commit 5303 5304 BIO_get_mem_data() is supposed to take a char* as pointer 5305 argument, so don't pass it a const char* 5306 5307 Upstream-ID: 1ccd91eb7f4dd4f0fa812d4f956987cd00b5f6ec 5308 5309commit cfa46825b5ef7097373ed8e31b01a4538a8db565 5310Author: benno@openbsd.org <benno@openbsd.org> 5311Date: Mon Oct 9 20:12:51 2017 +0000 5312 5313 upstream commit 5314 5315 clarify the order in which config statements are used. ok 5316 jmc@ djm@ 5317 5318 Upstream-ID: e37e27bb6bbac71315e22cb9690fd8a556a501ed 5319 5320commit dceabc7ad7ebc7769c8214a1647af64c9a1d92e5 5321Author: djm@openbsd.org <djm@openbsd.org> 5322Date: Thu Oct 5 15:52:03 2017 +0000 5323 5324 upstream commit 5325 5326 replace statically-sized arrays in ServerOptions with 5327 dynamic ones managed by xrecallocarray, removing some arbitrary (though 5328 large) limits and saving a bit of memory; "much nicer" markus@ 5329 5330 Upstream-ID: 1732720b2f478fe929d6687ac7b0a97ff2efe9d2 5331 5332commit 2b4f3ab050c2aaf6977604dd037041372615178d 5333Author: jmc@openbsd.org <jmc@openbsd.org> 5334Date: Thu Oct 5 12:56:50 2017 +0000 5335 5336 upstream commit 5337 5338 %C is hashed; from klemens nanni ok markus 5339 5340 Upstream-ID: 6ebed7b2e1b6ee5402a67875d74f5e2859d8f998 5341 5342commit a66714508b86d6814e9055fefe362d9fe4d49ab3 5343Author: djm@openbsd.org <djm@openbsd.org> 5344Date: Wed Oct 4 18:50:23 2017 +0000 5345 5346 upstream commit 5347 5348 exercise PermitOpen a little more thoroughly 5349 5350 Upstream-Regress-ID: f41592334e227a4c1f9a983044522de4502d5eac 5351 5352commit 609ecc8e57eb88e2eac976bd3cae7f7889aaeff6 5353Author: dtucker@openbsd.org <dtucker@openbsd.org> 5354Date: Tue Sep 26 22:39:25 2017 +0000 5355 5356 upstream commit 5357 5358 UsePrivilegeSeparation is gone, stop trying to test it. 5359 5360 Upstream-Regress-ID: 796a5057cfd79456a20ea935cc53f6eb80ace191 5361 5362commit 69bda0228861f3dacd4fb3d28b60ce9d103d254b 5363Author: djm@openbsd.org <djm@openbsd.org> 5364Date: Wed Oct 4 18:49:30 2017 +0000 5365 5366 upstream commit 5367 5368 fix (another) problem in PermitOpen introduced during the 5369 channels.c refactor: the third and subsequent arguments to PermitOpen were 5370 being silently ignored; ok markus@ 5371 5372 Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd 5373 5374commit 66bf74a92131b7effe49fb0eefe5225151869dc5 5375Author: djm@openbsd.org <djm@openbsd.org> 5376Date: Mon Oct 2 19:33:20 2017 +0000 5377 5378 upstream commit 5379 5380 Fix PermitOpen crash; spotted by benno@, ok dtucker@ deraadt@ 5381 5382 Upstream-ID: c2cc84ffac070d2e1ff76182c70ca230a387983c 5383 5384commit d63b38160a59039708fd952adc75a0b3da141560 5385Author: Damien Miller <djm@mindrot.org> 5386Date: Sun Oct 1 10:32:25 2017 +1100 5387 5388 update URL again 5389 5390 I spotted a typo in the draft so uploaded a new version... 5391 5392commit 6f64f596430cd3576c529f07acaaf2800aa17d58 5393Author: Damien Miller <djm@mindrot.org> 5394Date: Sun Oct 1 10:01:56 2017 +1100 5395 5396 sync release notes URL 5397 5398commit 35ff70a04dd71663a5ac1e73b90d16d270a06e0d 5399Author: Damien Miller <djm@mindrot.org> 5400Date: Sun Oct 1 10:01:25 2017 +1100 5401 5402 sync contrib/ssh-copy-id with upstream 5403 5404commit 290843b8ede85f8b30bf29cd7dceb805c3ea5b66 5405Author: Damien Miller <djm@mindrot.org> 5406Date: Sun Oct 1 09:59:19 2017 +1100 5407 5408 update version in RPM spec files 5409 5410commit 4e4e0bb223c5be88d87d5798c75cc6b0d4fef31d 5411Author: Damien Miller <djm@mindrot.org> 5412Date: Sun Oct 1 09:58:24 2017 +1100 5413 5414 update agent draft URL 5415 5416commit e4a798f001d2ecd8bf025c1d07658079f27cc604 5417Author: djm@openbsd.org <djm@openbsd.org> 5418Date: Sat Sep 30 22:26:33 2017 +0000 5419 5420 upstream commit 5421 5422 openssh-7.6; ok deraadt@ 5423 5424 Upstream-ID: a39c3a5b63a1baae109ae1ae4c7c34c2a59acde0 5425 5426commit 5fa1407e16e7e5fda9769d53b626ce39d5588d4d 5427Author: jmc@openbsd.org <jmc@openbsd.org> 5428Date: Wed Sep 27 06:45:53 2017 +0000 5429 5430 upstream commit 5431 5432 tweak EposeAuthinfo; diff from lars nooden 5433 5434 tweaked by sthen; ok djm dtucker 5435 5436 Upstream-ID: 8f2ea5d2065184363e8be7a0ba24d98a3b259748 5437 5438commit bba69c246f0331f657fd6ec97724df99fc1ad174 5439Author: Damien Miller <djm@mindrot.org> 5440Date: Thu Sep 28 16:06:21 2017 -0700 5441 5442 don't fatal ./configure for LibreSSL 5443 5444commit 04dc070e8b4507d9d829f910b29be7e3b2414913 5445Author: Damien Miller <djm@mindrot.org> 5446Date: Thu Sep 28 14:54:34 2017 -0700 5447 5448 abort in configure when only openssl-1.1.x found 5449 5450 We don't support openssl-1.1.x yet (see multiple threads on the 5451 openssh-unix-dev@ mailing list for the reason), but previously 5452 ./configure would accept it and the compilation would subsequently 5453 fail. This makes ./configure display an explicit error message and 5454 abort. 5455 5456 ok dtucker@ 5457 5458commit 74c1c3660acf996d9dc329e819179418dc115f2c 5459Author: Darren Tucker <dtucker@zip.com.au> 5460Date: Wed Sep 27 07:44:41 2017 +1000 5461 5462 Check for and handle calloc(p, 0) = NULL. 5463 5464 On some platforms (AIX, maybe others) allocating zero bytes of memory 5465 via the various *alloc functions returns NULL, which is permitted 5466 by the standards. Autoconf has some macros for detecting this (with 5467 the exception of calloc for some reason) so use these and if necessary 5468 activate shims for them. ok djm@ 5469 5470commit 6a9481258a77b0b54b2a313d1761c87360c5f1f5 5471Author: markus@openbsd.org <markus@openbsd.org> 5472Date: Thu Sep 21 19:18:12 2017 +0000 5473 5474 upstream commit 5475 5476 test reverse dynamic forwarding with SOCKS 5477 5478 Upstream-Regress-ID: 95cf290470f7e5e2f691e4bc6ba19b91eced2f79 5479 5480commit 1b9f321605733754df60fac8c1d3283c89b74455 5481Author: Damien Miller <djm@mindrot.org> 5482Date: Tue Sep 26 16:55:55 2017 +1000 5483 5484 sync missing changes in dynamic-forward.sh 5485 5486commit 44fc334c7a9ebdd08addb6d5fa005369897fddeb 5487Author: Darren Tucker <dtucker@zip.com.au> 5488Date: Mon Sep 25 09:48:10 2017 +1000 5489 5490 Add minimal strsignal for platforms without it. 5491 5492commit 218e6f98df566fb9bd363f6aa47018cb65ede196 5493Author: djm@openbsd.org <djm@openbsd.org> 5494Date: Sun Sep 24 13:45:34 2017 +0000 5495 5496 upstream commit 5497 5498 fix inverted test on channel open failure path that 5499 "upgraded" a transient failure into a fatal error; reported by sthen and also 5500 seen by benno@; ok sthen@ 5501 5502 Upstream-ID: b58b3fbb79ba224599c6cd6b60c934fc46c68472 5503 5504commit c704f641f7b8777497dc82e81f2ac89afec7e401 5505Author: djm@openbsd.org <djm@openbsd.org> 5506Date: Sun Sep 24 09:50:01 2017 +0000 5507 5508 upstream commit 5509 5510 write the correct buffer when tunnel forwarding; doesn't 5511 matter on OpenBSD (they are the same) but does matter on portable where we 5512 use an output filter to translate os-specific tun/tap headers 5513 5514 Upstream-ID: f1ca94eff48404827b12e1d12f6139ee99a72284 5515 5516commit 55486f5cef117354f0c64f991895835077b7c7f7 5517Author: djm@openbsd.org <djm@openbsd.org> 5518Date: Sat Sep 23 22:04:07 2017 +0000 5519 5520 upstream commit 5521 5522 fix tunnel forwarding problem introduced in refactor; 5523 reported by stsp@ ok markus@ 5524 5525 Upstream-ID: 81a731cdae1122c8522134095d1a8b60fa9dcd04 5526 5527commit 609d7a66ce578abf259da2d5f6f68795c2bda731 5528Author: markus@openbsd.org <markus@openbsd.org> 5529Date: Thu Sep 21 19:16:53 2017 +0000 5530 5531 upstream commit 5532 5533 Add 'reverse' dynamic forwarding which combines dynamic 5534 forwarding (-D) with remote forwarding (-R) where the remote-forwarded port 5535 expects SOCKS-requests. 5536 5537 The SSH server code is unchanged and the parsing happens at the SSH 5538 clients side. Thus the full SOCKS-request is sent over the forwarded 5539 channel and the client parses c->output. Parsing happens in 5540 channel_before_prepare_select(), _before_ the select bitmask is 5541 computed in the pre[] handlers, but after network input processing 5542 in the post[] handlers. 5543 5544 help and ok djm@ 5545 5546 Upstream-ID: aa25a6a3851064f34fe719e0bf15656ad5a64b89 5547 5548commit 36945fa103176c00b39731e1fc1919a0d0808b81 5549Author: dtucker@openbsd.org <dtucker@openbsd.org> 5550Date: Wed Sep 20 05:19:00 2017 +0000 5551 5552 upstream commit 5553 5554 Use strsignal in debug message instead of casting for the 5555 benefit of portable where sig_atomic_t might not be int. "much nicer" 5556 deraadt@ 5557 5558 Upstream-ID: 2dac6c1e40511c700bd90664cd263ed2299dcf79 5559 5560commit 3e8d185af326bf183b6f78597d5e3d2eeb2dc40e 5561Author: millert@openbsd.org <millert@openbsd.org> 5562Date: Tue Sep 19 12:10:30 2017 +0000 5563 5564 upstream commit 5565 5566 Use explicit_bzero() instead of bzero() before free() to 5567 prevent the compiler from optimizing away the bzero() call. OK djm@ 5568 5569 Upstream-ID: cdc6197e64c9684c7250e23d60863ee1b53cef1d 5570 5571commit 5b8da1f53854c0923ec6e927e86709e4d72737b6 5572Author: djm@openbsd.org <djm@openbsd.org> 5573Date: Tue Sep 19 04:24:22 2017 +0000 5574 5575 upstream commit 5576 5577 fix use-after-free in ~^Z escape handler path, introduced 5578 in channels.c refactor; spotted by millert@ "makes sense" deraadt@ 5579 5580 Upstream-ID: 8fa2cdc65c23ad6420c1e59444b0c955b0589b22 5581 5582commit a3839d8d2b89ff1a80cadd4dd654336710de2c9e 5583Author: dtucker@openbsd.org <dtucker@openbsd.org> 5584Date: Mon Sep 18 12:03:24 2017 +0000 5585 5586 upstream commit 5587 5588 Prevent type mismatch warning in debug on platforms where 5589 sig_atomic_t != int. ok djm@ 5590 5591 Upstream-ID: 306e2375eb0364a4c68e48f091739bea4f4892ed 5592 5593commit 30484e5e5f0b63d2c6ba32c6b85f06b6c6fa55fc 5594Author: dtucker@openbsd.org <dtucker@openbsd.org> 5595Date: Mon Sep 18 09:41:52 2017 +0000 5596 5597 upstream commit 5598 5599 Add braces missing after channels refactor. ok markus@ 5600 5601 Upstream-ID: 72ab325c84e010680dbc88f226e2aa96b11a3980 5602 5603commit b79569190b9b76dfacc6d996faa482f16e8fc026 5604Author: Damien Miller <djm@mindrot.org> 5605Date: Tue Sep 19 12:29:23 2017 +1000 5606 5607 add freezero(3) replacement 5608 5609 ok dtucker@ 5610 5611commit 161af8f5ec0961b10cc032efb5cc1b44ced5a92e 5612Author: Damien Miller <djm@mindrot.org> 5613Date: Tue Sep 19 10:18:56 2017 +1000 5614 5615 move FORTIFY_SOURCE into hardening options group 5616 5617 It's still on by default, but now it's possible to turn it off using 5618 --without-hardening. This is useful since it's known to cause problems 5619 with some -fsanitize options. ok dtucker@ 5620 5621commit 09eacf856e0fe1a6e3fe597ec8032b7046292914 5622Author: bluhm@openbsd.org <bluhm@openbsd.org> 5623Date: Wed Sep 13 14:58:26 2017 +0000 5624 5625 upstream commit 5626 5627 Print SKIPPED if sudo and doas configuration is missing. 5628 Prevents that running the regression test with wrong environment is reported 5629 as failure. Keep the fatal there to avoid interfering with other setups for 5630 portable ssh. OK dtucker@ 5631 5632 Upstream-Regress-ID: f0dc60023caef496ded341ac5aade2a606fa234e 5633 5634commit cdede10899892f25f1ccdccd7a3fe5e5ef0aa49a 5635Author: dtucker@openbsd.org <dtucker@openbsd.org> 5636Date: Mon Aug 7 03:52:55 2017 +0000 5637 5638 upstream commit 5639 5640 Remove obsolete privsep=no fallback test. 5641 5642 Upstream-Regress-ID: 7d6e1baa1678ac6be50c2a1555662eb1047638df 5643 5644commit ec218c105daa9f5b192f7aa890fdb2d4fdc4e9d8 5645Author: dtucker@openbsd.org <dtucker@openbsd.org> 5646Date: Mon Aug 7 00:53:51 2017 +0000 5647 5648 upstream commit 5649 5650 Remove non-privsep test since disabling privsep is now 5651 deprecated. 5652 5653 Upstream-Regress-ID: 77ad3f3d8d52e87f514a80f285c6c1229b108ce8 5654 5655commit 239c57d5bc2253e27e3e6ad7ac52ec8c377ee24e 5656Author: dtucker@openbsd.org <dtucker@openbsd.org> 5657Date: Fri Jul 28 10:32:08 2017 +0000 5658 5659 upstream commit 5660 5661 Don't call fatal from stop_sshd since it calls cleanup 5662 which calls stop_sshd which will probably fail in the same way. Instead, 5663 just bail. Differentiate between sshd dying without cleanup and not shutting 5664 down. 5665 5666 Upstream-Regress-ID: f97315f538618b349e2b0bea02d6b0c9196c6bc4 5667 5668commit aea59a0d9f120f2a87c7f494a0d9c51eaa79b8ba 5669Author: djm@openbsd.org <djm@openbsd.org> 5670Date: Thu Sep 14 04:32:21 2017 +0000 5671 5672 upstream commit 5673 5674 Revert commitid: gJtIN6rRTS3CHy9b. 5675 5676 ------------- 5677 identify the case where SSHFP records are missing but other DNS RR 5678 types are present and display a more useful error message for this 5679 case; patch by Thordur Bjornsson; bz#2501; ok dtucker@ 5680 ------------- 5681 5682 This caused unexpected failures when VerifyHostKeyDNS=yes, SSHFP results 5683 are missing but the user already has the key in known_hosts 5684 5685 Spotted by dtucker@ 5686 5687 Upstream-ID: 97e31742fddaf72046f6ffef091ec0d823299920 5688 5689commit 871f1e4374420b07550041b329627c474abc3010 5690Author: Damien Miller <djm@mindrot.org> 5691Date: Tue Sep 12 18:01:35 2017 +1000 5692 5693 adapt portable to channels API changes 5694 5695commit 4ec0bb9f9ad7b4eb0af110fa8eddf8fa199e46bb 5696Author: djm@openbsd.org <djm@openbsd.org> 5697Date: Tue Sep 12 07:55:48 2017 +0000 5698 5699 upstream commit 5700 5701 unused variable 5702 5703 Upstream-ID: 2f9ba09f2708993d35eac5aa71df910dcc52bac1 5704 5705commit 9145a73ce2ba30c82bbf91d7205bfd112529449f 5706Author: djm@openbsd.org <djm@openbsd.org> 5707Date: Tue Sep 12 07:32:04 2017 +0000 5708 5709 upstream commit 5710 5711 fix tun/tap forwarding case in previous 5712 5713 Upstream-ID: 43ebe37a930320e24bca6900dccc39857840bc53 5714 5715commit 9f53229c2ac97dbc6f5a03657de08a1150a9ac7e 5716Author: djm@openbsd.org <djm@openbsd.org> 5717Date: Tue Sep 12 06:35:31 2017 +0000 5718 5719 upstream commit 5720 5721 Make remote channel ID a u_int 5722 5723 Previously we tracked the remote channel IDs in an int, but this is 5724 strictly incorrect: the wire protocol uses uint32 and there is nothing 5725 in-principle stopping a SSH implementation from sending, say, 0xffff0000. 5726 5727 In practice everyone numbers their channels sequentially, so this has 5728 never been a problem. 5729 5730 ok markus@ 5731 5732 Upstream-ID: b9f4cd3dc53155b4a5c995c0adba7da760d03e73 5733 5734commit dbee4119b502e3f8b6cd3282c69c537fd01d8e16 5735Author: djm@openbsd.org <djm@openbsd.org> 5736Date: Tue Sep 12 06:32:07 2017 +0000 5737 5738 upstream commit 5739 5740 refactor channels.c 5741 5742 Move static state to a "struct ssh_channels" that is allocated at 5743 runtime and tracked as a member of struct ssh. 5744 5745 Explicitly pass "struct ssh" to all channels functions. 5746 5747 Replace use of the legacy packet APIs in channels.c. 5748 5749 Rework sshd_config PermitOpen handling: previously the configuration 5750 parser would call directly into the channels layer. After the refactor 5751 this is not possible, as the channels structures are allocated at 5752 connection time and aren't available when the configuration is parsed. 5753 The server config parser now tracks PermitOpen itself and explicitly 5754 configures the channels code later. 5755 5756 ok markus@ 5757 5758 Upstream-ID: 11828f161656b965cc306576422613614bea2d8f 5759 5760commit abd59663df37a42152e37980113ccaa405b9a282 5761Author: djm@openbsd.org <djm@openbsd.org> 5762Date: Thu Sep 7 23:48:09 2017 +0000 5763 5764 upstream commit 5765 5766 typo in comment 5767 5768 Upstream-ID: a93b1e6f30f1f9b854b5b964b9fd092d0c422c47 5769 5770commit 149a8cd24ce9dd47c36f571738681df5f31a326c 5771Author: jmc@openbsd.org <jmc@openbsd.org> 5772Date: Mon Sep 4 06:34:43 2017 +0000 5773 5774 upstream commit 5775 5776 tweak previous; 5777 5778 Upstream-ID: bb8cc40b61b15f6a13d81da465ac5bfc65cbfc4b 5779 5780commit ec9d22cc251cc5acfe7b2bcef9cc7a1fe0e949d8 5781Author: Damien Miller <djm@mindrot.org> 5782Date: Fri Sep 8 12:44:13 2017 +1000 5783 5784 Fuzzer harnesses for sig verify and pubkey parsing 5785 5786 These are some basic clang libfuzzer harnesses for signature 5787 verification and public key parsing. Some assembly (metaphorical) 5788 required. 5789 5790commit de35c382894964a896a63ecd5607d3a3b93af75d 5791Author: Damien Miller <djm@mindrot.org> 5792Date: Fri Sep 8 12:38:31 2017 +1000 5793 5794 Give configure ability to set CFLAGS/LDFLAGS later 5795 5796 Some CFLAGS/LDFLAGS may disrupt the configure script's operation, 5797 in particular santization and fuzzer options that break assumptions 5798 about memory and file descriptor dispositions. 5799 5800 This adds two flags to configure --with-cflags-after and 5801 --with-ldflags-after that allow specifying additional compiler and 5802 linker options that are added to the resultant Makefiles but not 5803 used in the configure run itself. 5804 5805 E.g. 5806 5807 env CC=clang-3.9 ./configure \ 5808 --with-cflags-after=-fsantize=address \ 5809 --with-ldflags-after="-g -fsanitize=address" 5810 5811commit 22376d27a349f62c502fec3396dfe0fdcb2a40b7 5812Author: djm@openbsd.org <djm@openbsd.org> 5813Date: Sun Sep 3 23:33:13 2017 +0000 5814 5815 upstream commit 5816 5817 Expand ssh_config's StrictModes option with two new 5818 settings: 5819 5820 StrictModes=accept-new will automatically accept hitherto-unseen keys 5821 but will refuse connections for changed or invalid hostkeys. 5822 5823 StrictModes=off is the same as StrictModes=no 5824 5825 Motivation: 5826 5827 StrictModes=no combines two behaviours for host key processing: 5828 automatically learning new hostkeys and continuing to connect to hosts 5829 with invalid/changed hostkeys. The latter behaviour is quite dangerous 5830 since it removes most of the protections the SSH protocol is supposed to 5831 provide. 5832 5833 Quite a few users want to automatically learn hostkeys however, so 5834 this makes that feature available with less danger. 5835 5836 At some point in the future, StrictModes=no will change to be a synonym 5837 for accept-new, with its current behaviour remaining available via 5838 StrictModes=off. 5839 5840 bz#2400, suggested by Michael Samuel; ok markus 5841 5842 Upstream-ID: 0f55502bf75fc93a74fb9853264a8276b9680b64 5843 5844commit ff3c42384033514e248ba5d7376aa033f4a2b99a 5845Author: jmc@openbsd.org <jmc@openbsd.org> 5846Date: Fri Sep 1 15:41:26 2017 +0000 5847 5848 upstream commit 5849 5850 remove blank line; 5851 5852 Upstream-ID: 2f46b51a0ddb3730020791719e94d3e418e9f423 5853 5854commit b828605d51f57851316d7ba402b4ae06cf37c55d 5855Author: djm@openbsd.org <djm@openbsd.org> 5856Date: Fri Sep 1 05:53:56 2017 +0000 5857 5858 upstream commit 5859 5860 identify the case where SSHFP records are missing but 5861 other DNS RR types are present and display a more useful error message for 5862 this case; patch by Thordur Bjornsson; bz#2501; ok dtucker@ 5863 5864 Upstream-ID: 8f7a5a8344f684823d8317a9708b63e75be2c244 5865 5866commit 8042bad97e2789a50e8f742c3bcd665ebf0add32 5867Author: djm@openbsd.org <djm@openbsd.org> 5868Date: Fri Sep 1 05:50:48 2017 +0000 5869 5870 upstream commit 5871 5872 document available AuthenticationMethods; bz#2453 ok 5873 dtucker@ 5874 5875 Upstream-ID: 2c70576f237bb699aff59889dbf2acba4276d3d0 5876 5877commit 71e5a536ec815d542b199f2ae6d646c0db9f1b58 5878Author: djm@openbsd.org <djm@openbsd.org> 5879Date: Wed Aug 30 03:59:08 2017 +0000 5880 5881 upstream commit 5882 5883 pass packet state down to some of the channels function 5884 (more to come...); ok markus@ 5885 5886 Upstream-ID: d8ce7a94f4059d7ac1e01fb0eb01de0c4b36c81b 5887 5888commit 6227fe5b362239c872b91bbdee4bf63cf85aebc5 5889Author: jmc@openbsd.org <jmc@openbsd.org> 5890Date: Tue Aug 29 13:05:58 2017 +0000 5891 5892 upstream commit 5893 5894 sort options; 5895 5896 Upstream-ID: cf21d68cf54e81968bca629aaeddc87f0c684f3c 5897 5898commit 530591a5795a02d01c78877d58604723918aac87 5899Author: dlg@openbsd.org <dlg@openbsd.org> 5900Date: Tue Aug 29 09:42:29 2017 +0000 5901 5902 upstream commit 5903 5904 add a -q option to ssh-add to make it quiet on success. 5905 5906 if you want to silence ssh-add without this you generally redirect 5907 the output to /dev/null, but that can hide error output which you 5908 should see. 5909 5910 ok djm@ 5911 5912 Upstream-ID: 2f31b9b13f99dcf587e9a8ba443458e6c0d8997c 5913 5914commit a54eb27dd64b5eca3ba94e15cec3535124bd5029 5915Author: dtucker@openbsd.org <dtucker@openbsd.org> 5916Date: Sun Aug 27 00:38:41 2017 +0000 5917 5918 upstream commit 5919 5920 Increase the buffer sizes for user prompts to ensure that 5921 they won't be truncated by snprintf. Based on patch from cjwatson at 5922 debian.org via bz#2768, ok djm@ 5923 5924 Upstream-ID: 6ffacf1abec8f40b469de5b94bfb29997d96af3e 5925 5926commit dd9d9b3381a4597b840d480b043823112039327e 5927Author: Darren Tucker <dtucker@zip.com.au> 5928Date: Mon Aug 28 16:48:27 2017 +1000 5929 5930 Switch Capsicum header to sys/capsicum.h. 5931 5932 FreeBSD's <sys/capability.h> was renamed to <sys/capsicum.h> in 2014 to 5933 avoid future conflicts with POSIX capabilities (the last release that 5934 didn't have it was 9.3) so switch to that. Patch from des at des.no. 5935 5936commit f5e917ab105af5dd6429348d9bc463e52b263f92 5937Author: Darren Tucker <dtucker@zip.com.au> 5938Date: Sun Aug 27 08:55:40 2017 +1000 5939 5940 Add missing includes for bsd-err.c. 5941 5942 Patch from cjwatson at debian.org via bz#2767. 5943 5944commit 878e029797cfc9754771d6f6ea17f8c89e11d225 5945Author: Damien Miller <djm@mindrot.org> 5946Date: Fri Aug 25 13:25:01 2017 +1000 5947 5948 Split platform_sys_dir_uid into its own file 5949 5950 platform.o is too heavy for libssh.a use; it calls into the server on 5951 many platforms. Move just the function needed by misc.c into its own 5952 file. 5953 5954commit 07949bfe9133234eddd01715592aa0dde67745f0 5955Author: Damien Miller <djm@mindrot.org> 5956Date: Wed Aug 23 20:13:18 2017 +1000 5957 5958 misc.c needs functions from platform.c now 5959 5960commit b074c3c3f820000a21953441cea7699c4b17d72f 5961Author: djm@openbsd.org <djm@openbsd.org> 5962Date: Fri Aug 18 05:48:04 2017 +0000 5963 5964 upstream commit 5965 5966 add a "quiet" flag to exited_cleanly() that supresses 5967 errors about exit status (failure due to signal is still reported) 5968 5969 Upstream-ID: db85c39c3aa08e6ff67fc1fb4ffa89f807a9d2f0 5970 5971commit de4ae07f12dabf8815ecede54235fce5d22e3f63 5972Author: djm@openbsd.org <djm@openbsd.org> 5973Date: Fri Aug 18 05:36:45 2017 +0000 5974 5975 upstream commit 5976 5977 Move several subprocess-related functions from various 5978 locations to misc.c. Extend subprocess() to offer a little more control over 5979 stdio disposition. 5980 5981 feedback & ok dtucker@ 5982 5983 Upstream-ID: 3573dd7109d13ef9bd3bed93a3deb170fbfce049 5984 5985commit 643c2ad82910691b2240551ea8b14472f60b5078 5986Author: djm@openbsd.org <djm@openbsd.org> 5987Date: Sat Aug 12 06:46:01 2017 +0000 5988 5989 upstream commit 5990 5991 make "--" before the hostname terminate command-line 5992 option processing completely; previous behaviour would not prevent further 5993 options appearing after the hostname (ssh has a supported options after the 5994 hostname for >20 years, so that's too late to change). 5995 5996 ok deraadt@ 5997 5998 Upstream-ID: ef5ee50571b98ad94dcdf8282204e877ec88ad89 5999 6000commit 0f3455356bc284d7c6f4d3c1614d31161bd5dcc2 6001Author: djm@openbsd.org <djm@openbsd.org> 6002Date: Sat Aug 12 06:42:52 2017 +0000 6003 6004 upstream commit 6005 6006 Switch from aes256-cbc to aes256-ctr for encrypting 6007 new-style private keys. The latter having the advantage of being supported 6008 for no-OpenSSL builds; bz#2754 ok markus@ 6009 6010 Upstream-ID: 54179a2afd28f93470471030567ac40431e56909 6011 6012commit c4972d0a9bd6f898462906b4827e09b7caea2d9b 6013Author: djm@openbsd.org <djm@openbsd.org> 6014Date: Fri Aug 11 04:47:12 2017 +0000 6015 6016 upstream commit 6017 6018 refuse to a private keys when its corresponding .pub key 6019 does not match. bz#2737 ok dtucker@ 6020 6021 Upstream-ID: 54ff5e2db00037f9db8d61690f26ef8f16e0d913 6022 6023commit 4b3ecbb663c919132dddb3758e17a23089413519 6024Author: djm@openbsd.org <djm@openbsd.org> 6025Date: Fri Aug 11 04:41:08 2017 +0000 6026 6027 upstream commit 6028 6029 don't print verbose error message when ssh disconnects 6030 under sftp; bz#2750; ok dtucker@ 6031 6032 Upstream-ID: 6d83708aed77b933c47cf155a87dc753ec01f370 6033 6034commit 42a8f8bc288ef8cac504c5c73f09ed610bc74a34 6035Author: dtucker@openbsd.org <dtucker@openbsd.org> 6036Date: Fri Aug 11 04:16:35 2017 +0000 6037 6038 upstream commit 6039 6040 Tweak previous keepalive commit: if last_time + keepalive 6041 <= now instead of just "<" so client_alive_check will fire if the select 6042 happens to return on exact second of the timeout. ok djm@ 6043 6044 Upstream-ID: e02756bd6038d11bb8522bfd75a4761c3a684fcc 6045 6046commit b60ff20051ef96dfb207b6bfa45c0ad6c34a542a 6047Author: dtucker@openbsd.org <dtucker@openbsd.org> 6048Date: Fri Aug 11 03:58:36 2017 +0000 6049 6050 upstream commit 6051 6052 Keep track of the last time we actually heard from the 6053 client and use this to also schedule a client_alive_check(). Prevents 6054 activity on a forwarded port from indefinitely preventing the select timeout 6055 so that client_alive_check() will eventually (although not optimally) be 6056 called. 6057 6058 Analysis by willchan at google com via bz#2756, feedback & ok djm@ 6059 6060 Upstream-ID: c08721e0bbda55c6d18e2760f3fe1b17fb71169e 6061 6062commit 94bc1e7ffba3cbdea8c7dcdab8376bf29283128f 6063Author: Damien Miller <djm@mindrot.org> 6064Date: Fri Jul 28 14:50:59 2017 +1000 6065 6066 Expose list of completed auth methods to PAM 6067 6068 bz#2408; ok dtucker@ 6069 6070commit c78e6eec78c88acf8d51db90ae05a3e39458603d 6071Author: Damien Miller <djm@mindrot.org> 6072Date: Fri Jul 21 14:38:16 2017 +1000 6073 6074 fix problems in tunnel forwarding portability code 6075 6076 This fixes a few problems in the tun forwarding code, mostly to do 6077 with host/network byte order confusion. 6078 6079 Based on a report and patch by stepe AT centaurus.uberspace.de; 6080 bz#2735; ok dtucker@ 6081 6082commit 2985d4062ebf4204bbd373456a810d558698f9f5 6083Author: dtucker@openbsd.org <dtucker@openbsd.org> 6084Date: Tue Jul 25 09:22:25 2017 +0000 6085 6086 upstream commit 6087 6088 Make WinSCP patterns for SSH_OLD_DHGEX more specific to 6089 exclude WinSCP 5.10.x and up. bz#2748, from martin at winscp.net, ok djm@ 6090 6091 Upstream-ID: 6fd7c32e99af3952db007aa180e73142ddbc741a 6092 6093commit 9f0e44e1a0439ff4646495d5735baa61138930a9 6094Author: djm@openbsd.org <djm@openbsd.org> 6095Date: Mon Jul 24 04:34:28 2017 +0000 6096 6097 upstream commit 6098 6099 g/c unused variable; make a little more portable 6100 6101 Upstream-ID: 3f5980481551cb823c6fb2858900f93fa9217dea 6102 6103commit 51676ec61491ec6d7cbd06082034e29b377b3bf6 6104Author: djm@openbsd.org <djm@openbsd.org> 6105Date: Sun Jul 23 23:37:02 2017 +0000 6106 6107 upstream commit 6108 6109 Allow IPQoS=none in ssh/sshd to not set an explicit 6110 ToS/DSCP value and just use the operating system default; ok dtucker@ 6111 6112 Upstream-ID: 77906ff8c7b660b02ba7cb1e47b17d66f54f1f7e 6113 6114commit 6c1fbd5a50d8d2415f06c920dd3b1279b741072d 6115Author: Damien Miller <djm@mindrot.org> 6116Date: Fri Jul 21 14:24:26 2017 +1000 6117 6118 mention libedit 6119 6120commit dc2bd308768386b02c7337120203ca477e67ba62 6121Author: markus@openbsd.org <markus@openbsd.org> 6122Date: Wed Jul 19 08:30:41 2017 +0000 6123 6124 upstream commit 6125 6126 fix support for unknown key types; ok djm@ 6127 6128 Upstream-ID: 53fb29394ed04d616d65b3748dee5aa06b07ab48 6129 6130commit fd0e8fa5f89d21290b1fb5f9d110ca4f113d81d9 6131Author: djm@openbsd.org <djm@openbsd.org> 6132Date: Wed Jul 19 01:15:02 2017 +0000 6133 6134 upstream commit 6135 6136 switch from select() to poll() for the ssh-agent 6137 mainloop; ok markus 6138 6139 Upstream-ID: 4a94888ee67b3fd948fd10693973beb12f802448 6140 6141commit b1e72df2b813ecc15bd0152167bf4af5f91c36d3 6142Author: dtucker@openbsd.org <dtucker@openbsd.org> 6143Date: Fri Jul 14 03:18:21 2017 +0000 6144 6145 upstream commit 6146 6147 Make ""Killed by signal 1" LogLevel verbose so it's not 6148 shown at the default level. Prevents it from appearing during ssh -J and 6149 equivalent ProxyCommand configs. bz#1906, bz#2744, feedback&ok markus@ 6150 6151 Upstream-ID: debfaa7e859b272246c2f2633335d288d2e2ae28 6152 6153commit 1f3d202770a08ee6752ed2a234b7ca6f180eb498 6154Author: jmc@openbsd.org <jmc@openbsd.org> 6155Date: Thu Jul 13 19:16:33 2017 +0000 6156 6157 upstream commit 6158 6159 man pages with pseudo synopses which list filenames end 6160 up creating very ugly output in man -k; after some discussion with ingo, we 6161 feel the simplest fix is to remove such SYNOPSIS sections: the info is hardly 6162 helpful at page top, is contained already in FILES, and there are 6163 sufficiently few that just zapping them is simple; 6164 6165 ok schwarze, who also helpfully ran things through a build to check 6166 output; 6167 6168 Upstream-ID: 3e211b99457e2f4c925c5927d608e6f97431336c 6169 6170commit 7f13a4827fb28957161de4249bd6d71954f1f2ed 6171Author: espie@openbsd.org <espie@openbsd.org> 6172Date: Mon Jul 10 14:09:59 2017 +0000 6173 6174 upstream commit 6175 6176 zap redundant Makefile variables. okay djm@ 6177 6178 Upstream-ID: e39b3902fe1d6c4a7ba6a3c58e072219f3c1e604 6179 6180commit dc44dd3a9e2c9795394e6a7e1e71c929cbc70ce0 6181Author: jmc@openbsd.org <jmc@openbsd.org> 6182Date: Sat Jul 8 18:32:54 2017 +0000 6183 6184 upstream commit 6185 6186 slightly rework previous, to avoid an article issue; 6187 6188 Upstream-ID: 15a315f0460ddd3d4e2ade1f16d6c640a8c41b30 6189 6190commit 853edbe057a84ebd0024c8003e4da21bf2b469f7 6191Author: djm@openbsd.org <djm@openbsd.org> 6192Date: Fri Jul 7 03:53:12 2017 +0000 6193 6194 upstream commit 6195 6196 When generating all hostkeys (ssh-keygen -A), clobber 6197 existing keys if they exist but are zero length. zero-length keys could 6198 previously be made if ssh-keygen failed part way through generating them, so 6199 avoid that case too. bz#2561 reported by Krzysztof Cieplucha; ok dtucker@ 6200 6201 Upstream-ID: f662201c28ab8e1f086b5d43c59cddab5ade4044 6202 6203commit 43616876ba68a2ffaece6a6c792def4b039f2d6e 6204Author: djm@openbsd.org <djm@openbsd.org> 6205Date: Sat Jul 1 22:55:44 2017 +0000 6206 6207 upstream commit 6208 6209 actually remove these files 6210 6211 Upstream-ID: 1bd41cba06a7752de4df304305a8153ebfb6b0ac 6212 6213commit 83fa3a044891887369ce8b487ce88d713a04df48 6214Author: djm@openbsd.org <djm@openbsd.org> 6215Date: Sat Jul 1 13:50:45 2017 +0000 6216 6217 upstream commit 6218 6219 remove post-SSHv1 removal dead code from rsa.c and merge 6220 the remaining bit that it still used into ssh-rsa.c; ok markus 6221 6222 Upstream-ID: ac8a048d24dcd89594b0052ea5e3404b473bfa2f 6223 6224commit 738c73dca2c99ee78c531b4cbeefc2008fe438f0 6225Author: Damien Miller <djm@mindrot.org> 6226Date: Fri Jul 14 14:26:36 2017 +1000 6227 6228 make explicit_bzero/memset safe for sz=0 6229 6230commit 8433d51e067e0829f5521c0c646b6fd3fe17e732 6231Author: Tim Rice <tim@multitalents.net> 6232Date: Tue Jul 11 18:47:56 2017 -0700 6233 6234 modified: configure.ac 6235 UnixWare needs BROKEN_TCGETATTR_ICANON like Solaris 6236 Analysis by Robbie Zhang 6237 6238commit ff3507aea9c7d30cd098e7801e156c68faff7cc7 6239Author: Damien Miller <djm@mindrot.org> 6240Date: Fri Jul 7 11:21:27 2017 +1000 6241 6242 typo 6243 6244commit d79bceb9311a9c137d268f5bc481705db4151810 6245Author: dtucker@openbsd.org <dtucker@openbsd.org> 6246Date: Fri Jun 30 04:17:23 2017 +0000 6247 6248 upstream commit 6249 6250 Only call close once in confree(). ssh_packet_close will 6251 close the FD so only explicitly close non-SSH channels. bz#2734, from 6252 bagajjal at microsoft.com, ok djm@ 6253 6254 Upstream-ID: a81ce0c8b023527167739fccf1732b154718ab02 6255 6256commit 197dc9728f062e23ce374f44c95a2b5f9ffa4075 6257Author: Darren Tucker <dtucker@zip.com.au> 6258Date: Thu Jun 29 15:40:25 2017 +1000 6259 6260 Update link for my patches. 6261 6262commit a98339edbc1fc21342a390f345179a9c3031bef7 6263Author: djm@openbsd.org <djm@openbsd.org> 6264Date: Wed Jun 28 01:09:22 2017 +0000 6265 6266 upstream commit 6267 6268 Allow ssh-keygen to use a key held in ssh-agent as a CA when 6269 signing certificates. bz#2377 ok markus 6270 6271 Upstream-ID: fb42e920b592edcbb5b50465739a867c09329c8f 6272 6273commit c9cdef35524bd59007e17d5bd2502dade69e2dfb 6274Author: djm@openbsd.org <djm@openbsd.org> 6275Date: Sat Jun 24 06:35:24 2017 +0000 6276 6277 upstream commit 6278 6279 regress test for ExposeAuthInfo 6280 6281 Upstream-Regress-ID: 190e5b6866376f4061c411ab157ca4d4e7ae86fd 6282 6283commit f17ee61cad25d210edab69d04ed447ad55fe80c1 6284Author: djm@openbsd.org <djm@openbsd.org> 6285Date: Sat Jun 24 07:08:57 2017 +0000 6286 6287 upstream commit 6288 6289 correct env var name 6290 6291 Upstream-ID: 721e761c2b1d6a4dcf700179f16fd53a1dadb313 6292 6293commit 40962198e3b132cecdb32e9350acd4294e6a1082 6294Author: jmc@openbsd.org <jmc@openbsd.org> 6295Date: Sat Jun 24 06:57:04 2017 +0000 6296 6297 upstream commit 6298 6299 spelling; 6300 6301 Upstream-ID: 606f933c8e2d0be902ea663946bc15e3eee40b25 6302 6303commit 33f86265d7e8a0e88d3a81745d746efbdd397370 6304Author: djm@openbsd.org <djm@openbsd.org> 6305Date: Sat Jun 24 06:38:11 2017 +0000 6306 6307 upstream commit 6308 6309 don't pass pointer to struct sshcipher between privsep 6310 processes, just redo the lookup in each using the already-passed cipher name. 6311 bz#2704 based on patch from Brooks Davis; ok markus dtucker 6312 6313 Upstream-ID: 2eab434c09bdf549dafd7da3e32a0d2d540adbe0 6314 6315commit 8f574959272ac7fe9239c4f5d10fd913f8920ab0 6316Author: djm@openbsd.org <djm@openbsd.org> 6317Date: Sat Jun 24 06:34:38 2017 +0000 6318 6319 upstream commit 6320 6321 refactor authentication logging 6322 6323 optionally record successful auth methods and public credentials 6324 used in a file accessible to user sessions 6325 6326 feedback and ok markus@ 6327 6328 Upstream-ID: 090b93036967015717b9a54fd0467875ae9d32fb 6329 6330commit e2004d4bb7eb01c663dd3a3e7eb224f1ccdc9bba 6331Author: jmc@openbsd.org <jmc@openbsd.org> 6332Date: Sat Jun 24 06:28:50 2017 +0000 6333 6334 upstream commit 6335 6336 word fix; 6337 6338 Upstream-ID: 8539bdaf2366603a34a9b2f034527ca13bb795c5 6339 6340commit 4540428cd0adf039bcf5a8a27f2d5cdf09191513 6341Author: djm@openbsd.org <djm@openbsd.org> 6342Date: Sat Jun 24 05:37:44 2017 +0000 6343 6344 upstream commit 6345 6346 switch sshconnect.c from (slightly abused) select() to 6347 poll(); ok deraadt@ a while back 6348 6349 Upstream-ID: efc1937fc591bbe70ac9e9542bb984f354c8c175 6350 6351commit 6f8ca3b92540fa1a9b91670edc98d15448e3d765 6352Author: djm@openbsd.org <djm@openbsd.org> 6353Date: Sat Jun 24 05:35:05 2017 +0000 6354 6355 upstream commit 6356 6357 use HostKeyAlias if specified instead of hostname for 6358 matching host certificate principal names; bz#2728; ok dtucker@ 6359 6360 Upstream-ID: dc2e11c83ae9201bbe74872a0c895ae9725536dd 6361 6362commit 8904ffce057b80a7472955f1ec00d7d5c250076c 6363Author: djm@openbsd.org <djm@openbsd.org> 6364Date: Sat Jun 24 05:24:11 2017 +0000 6365 6366 upstream commit 6367 6368 no need to call log_init to reinitialise logged PID in 6369 child sessions, since we haven't called openlog() in log_init() since 1999; 6370 ok markus@ 6371 6372 Upstream-ID: 0906e4002af5d83d3d544df75e1187c932a3cf2e 6373 6374commit e238645d789cd7eb47541b66aea2a887ea122c9b 6375Author: mestre@openbsd.org <mestre@openbsd.org> 6376Date: Fri Jun 23 07:24:48 2017 +0000 6377 6378 upstream commit 6379 6380 When using the escape sequence &~ the code path is 6381 client_loop() -> client_simple_escape_filter() -> process_escapes() -> fork() 6382 and the pledge for this path lacks the proc promise and therefore aborts the 6383 process. The solution is to just add proc the promise to this specific 6384 pledge. 6385 6386 Reported by Gregoire Jadi gjadi ! omecha.info 6387 Insight with tb@, OK jca@ 6388 6389 Upstream-ID: 63c05e30c28209519f476023b65b0b1b0387a05b 6390 6391commit 5abbb31c4e7a6caa922cc1cbb14e87a77f9d19d3 6392Author: dtucker@openbsd.org <dtucker@openbsd.org> 6393Date: Fri Jun 23 03:30:42 2017 +0000 6394 6395 upstream commit 6396 6397 Import regenerated moduli. 6398 6399 Upstream-ID: b25bf747544265b39af74fe0716dc8d9f5b63b95 6400 6401commit 849c5468b6d9b4365784c5dd88e3f1fb568ba38f 6402Author: dtucker@openbsd.org <dtucker@openbsd.org> 6403Date: Fri Jun 23 03:25:53 2017 +0000 6404 6405 upstream commit 6406 6407 Run the screen twice so we end up with more candidate 6408 groups. ok djm@ 6409 6410 Upstream-ID: b92c93266d8234d493857bb822260dacf4366157 6411 6412commit 4626e39c7053c6486c1c8b708ec757e464623f5f 6413Author: dtucker@openbsd.org <dtucker@openbsd.org> 6414Date: Wed Jun 14 00:31:38 2017 +0000 6415 6416 upstream commit 6417 6418 Add user@host prefix to client's "Permisison denied" 6419 messages, useful in particular when using "stacked" connections where it's 6420 not clear which host is denying. bz#2720, ok djm@ markus@ 6421 6422 Upstream-ID: de88e1e9dcb050c98e85377482d1287a9fe0d2be 6423 6424commit c948030d54911b2d3cddb96a7a8e9269e15d11cd 6425Author: djm@openbsd.org <djm@openbsd.org> 6426Date: Tue Jun 13 12:13:59 2017 +0000 6427 6428 upstream commit 6429 6430 Do not require that unknown EXT_INFO extension values not 6431 contain \0 characters. This would cause fatal connection errors if an 6432 implementation sent e.g. string-encoded sub-values inside a value. 6433 6434 Reported by Denis Bider; ok markus@ 6435 6436 Upstream-ID: 030e10fdc605563c040244c4b4f1d8ae75811a5c 6437 6438commit 6026f48dfca78b713e4a7f681ffa42a0afe0929e 6439Author: djm@openbsd.org <djm@openbsd.org> 6440Date: Tue Jun 13 11:22:15 2017 +0000 6441 6442 upstream commit 6443 6444 missing prototype. 6445 6446 Upstream-ID: f443d2be9910fd2165a0667956d03343c46f66c9 6447 6448commit bcd1485075aa72ba9418003f5cc27af2b049c51b 6449Author: Damien Miller <djm@mindrot.org> 6450Date: Sat Jun 10 23:41:25 2017 +1000 6451 6452 portability for sftp globbed ls sort by mtime 6453 6454 Include replacement timespeccmp() for systems that lack it. 6455 Support time_t struct stat->st_mtime in addition to 6456 timespec stat->st_mtim, as well as unsorted fallback. 6457 6458commit 072e172f1d302d2a2c6043ecbfb4004406717b96 6459Author: djm@openbsd.org <djm@openbsd.org> 6460Date: Sat Jun 10 06:36:46 2017 +0000 6461 6462 upstream commit 6463 6464 print '?' instead of incorrect link count (that the 6465 protocol doesn't provide) for remote listings. bz#2710 ok dtucker@ 6466 6467 Upstream-ID: c611f98a66302cea452ef10f13fff8cf0385242e 6468 6469commit 72be5b2f8e7dc37235e8c4b8d0bc7b5ee1301505 6470Author: djm@openbsd.org <djm@openbsd.org> 6471Date: Sat Jun 10 06:33:34 2017 +0000 6472 6473 upstream commit 6474 6475 implement sorting for globbed ls; bz#2649 ok dtucker@ 6476 6477 Upstream-ID: ed3110f351cc9703411bf847ba864041fb7216a8 6478 6479commit 5b2f34a74aa6a524cd57e856b23e1b7b25007721 6480Author: djm@openbsd.org <djm@openbsd.org> 6481Date: Fri Jun 9 06:47:13 2017 +0000 6482 6483 upstream commit 6484 6485 return failure rather than fatal() for more cases during 6486 mux negotiations. Causes the session to fall back to a non-mux connection if 6487 they occur. bz#2707 ok dtucker@ 6488 6489 Upstream-ID: d2a7892f464d434e1f615334a1c9d0cdb83b29ab 6490 6491commit 7f5637c4a67a49ef256cb4eedf14e8590ac30976 6492Author: djm@openbsd.org <djm@openbsd.org> 6493Date: Fri Jun 9 06:43:01 2017 +0000 6494 6495 upstream commit 6496 6497 in description of public key authentication, mention that 6498 the server will send debug messages to the client for some error conditions 6499 after authentication has completed. bz#2709 ok dtucker 6500 6501 Upstream-ID: 750127dbd58c5a2672c2d28bc35fe221fcc8d1dd 6502 6503commit 2076e4adb986512ce8c415dd194fd4e52136c4b4 6504Author: djm@openbsd.org <djm@openbsd.org> 6505Date: Fri Jun 9 06:40:24 2017 +0000 6506 6507 upstream commit 6508 6509 better translate libcrypto errors by looking deeper in 6510 the accursed error stack for codes that indicate the wrong passphrase was 6511 supplied for a PEM key. bz#2699 ok dtucker@ 6512 6513 Upstream-ID: 4da4286326d570f4f0489459bb71f6297e54b681 6514 6515commit ad0531614cbe8ec424af3c0fa90c34a8e1ebee4c 6516Author: dtucker@openbsd.org <dtucker@openbsd.org> 6517Date: Fri Jun 9 04:40:04 2017 +0000 6518 6519 upstream commit 6520 6521 Add comments referring to the relevant RFC sections for 6522 rekeying behaviour. 6523 6524 Upstream-ID: 6fc8e82485757a27633f9175ad00468f49a07d40 6525 6526commit ce9134260b9b1247e2385a1afed00c26112ba479 6527Author: Damien Miller <djm@mindrot.org> 6528Date: Fri Jun 9 14:43:47 2017 +1000 6529 6530 drop two more privileges in the Solaris sandbox 6531 6532 Drop PRIV_DAX_ACCESS and PRIV_SYS_IB_INFO. 6533 Patch from huieying.lee AT oracle.com via bz#2723 6534 6535commit e0f609c8a2ab940374689ab8c854199c3c285a76 6536Author: Darren Tucker <dtucker@zip.com.au> 6537Date: Fri Jun 9 13:36:29 2017 +1000 6538 6539 Wrap stdint.h include in #ifdef. 6540 6541commit 1de5e47a85850526a4fdaf77185134046c050f75 6542Author: djm@openbsd.org <djm@openbsd.org> 6543Date: Wed Jun 7 01:48:15 2017 +0000 6544 6545 upstream commit 6546 6547 unbreak after sshv1 purge 6548 6549 Upstream-Regress-ID: 8ea01a92d5f571b9fba88c1463a4254a7552d51b 6550 6551commit 550c053168123fcc0791f9952abad684704b5760 6552Author: dtucker@openbsd.org <dtucker@openbsd.org> 6553Date: Tue Jun 6 09:12:17 2017 +0000 6554 6555 upstream commit 6556 6557 Fix compression output stats broken in rev 1.201. Patch 6558 originally by Russell Coker via Debian bug #797964 and Christoph Biedl. ok 6559 djm@ 6560 6561 Upstream-ID: 83a1903b95ec2e4ed100703debb4b4a313b01016 6562 6563commit 55d06c6e72a9abf1c06a7ac2749ba733134a1f39 6564Author: djm@openbsd.org <djm@openbsd.org> 6565Date: Fri Jun 2 06:06:10 2017 +0000 6566 6567 upstream commit 6568 6569 rationalise the long list of manual CDIAGFLAGS that we 6570 add; most of these were redundant to -Wall -Wextra 6571 6572 Upstream-ID: ea80f445e819719ccdcb237022cacfac990fdc5c 6573 6574commit 1527d9f61e6d50f6c2b4a3fa5b45829034b1b0b1 6575Author: djm@openbsd.org <djm@openbsd.org> 6576Date: Thu Jun 1 06:59:21 2017 +0000 6577 6578 upstream commit 6579 6580 no need to bzero allocated space now that we use use 6581 recallocarray; ok deraadt@ 6582 6583 Upstream-ID: 53333c62ccf97de60b8cb570608c1ba5ca5803c8 6584 6585commit cc812baf39b93d5355565da98648d8c31f955990 6586Author: djm@openbsd.org <djm@openbsd.org> 6587Date: Thu Jun 1 06:58:25 2017 +0000 6588 6589 upstream commit 6590 6591 unconditionally zero init size of buffer; ok markus@ 6592 deraadt@ 6593 6594 Upstream-ID: 218963e846d8f26763ba25afe79294547b99da29 6595 6596commit 65eb8fae0d7ba45ef4483a3cf0ae7fd0dbc7c226 6597Author: Damien Miller <djm@mindrot.org> 6598Date: Thu Jun 1 16:25:09 2017 +1000 6599 6600 avoid compiler warning 6601 6602commit 2d75d74272dc2a0521fce13cfe6388800c9a2406 6603Author: djm@openbsd.org <djm@openbsd.org> 6604Date: Thu Jun 1 06:16:43 2017 +0000 6605 6606 upstream commit 6607 6608 some warnings spotted by clang; ok markus@ 6609 6610 Upstream-ID: 24381d68ca249c5cee4388ceb0f383fa5b43991b 6611 6612commit 151c6e433a5f5af761c78de87d7b5d30a453cf5e 6613Author: Damien Miller <djm@mindrot.org> 6614Date: Thu Jun 1 15:25:13 2017 +1000 6615 6616 add recallocarray replacement and dependency 6617 6618 recallocarray() needs getpagesize() so add a tiny replacement for that. 6619 6620commit 01e6f78924da308447e71e9a32c8a6104ef4e888 6621Author: Damien Miller <djm@mindrot.org> 6622Date: Thu Jun 1 15:16:24 2017 +1000 6623 6624 add *.0 manpage droppings 6625 6626commit 4b2e2d3fd9dccff357e1e26ce9a5f2e103837a36 6627Author: djm@openbsd.org <djm@openbsd.org> 6628Date: Thu Jun 1 04:51:58 2017 +0000 6629 6630 upstream commit 6631 6632 fix casts re constness 6633 6634 Upstream-ID: e38f2bac162b37dbaf784d349c8327a6626fa266 6635 6636commit 75b8af8de805c0694b37fcf80ce82783b2acc86f 6637Author: markus@openbsd.org <markus@openbsd.org> 6638Date: Wed May 31 10:54:00 2017 +0000 6639 6640 upstream commit 6641 6642 make sure we don't pass a NULL string to vfprintf 6643 (triggered by the principals-command regress test); ok bluhm 6644 6645 Upstream-ID: eb49854f274ab37a0b57056a6af379a0b7111990 6646 6647commit 84008608c9ee944d9f72f5100f31ccff743b10f2 6648Author: markus@openbsd.org <markus@openbsd.org> 6649Date: Wed May 31 10:04:29 2017 +0000 6650 6651 upstream commit 6652 6653 use SO_ZEROIZE for privsep communication (if available) 6654 6655 Upstream-ID: abcbb6d2f8039fc4367a6a78096e5d5c39de4a62 6656 6657commit 9e509d4ec97cb3d71696f1a2f1fdad254cbbce11 6658Author: deraadt@openbsd.org <deraadt@openbsd.org> 6659Date: Wed May 31 09:15:42 2017 +0000 6660 6661 upstream commit 6662 6663 Switch to recallocarray() for a few operations. Both 6664 growth and shrinkage are handled safely, and there also is no need for 6665 preallocation dances. Future changes in this area will be less error prone. 6666 Review and one bug found by markus 6667 6668 Upstream-ID: 822d664d6a5a1d10eccb23acdd53578a679d5065 6669 6670commit dc5dc45662773c0f7745c29cf77ae2d52723e55e 6671Author: deraadt@openbsd.org <deraadt@openbsd.org> 6672Date: Wed May 31 08:58:52 2017 +0000 6673 6674 upstream commit 6675 6676 These shutdown() SHUT_RDWR are not needed before close() 6677 ok djm markus claudio 6678 6679 Upstream-ID: 36f13ae4ba10f5618cb9347933101eb4a98dbcb5 6680 6681commit 1e0cdf8efb745d0d1116e1aa22bdc99ee731695e 6682Author: markus@openbsd.org <markus@openbsd.org> 6683Date: Wed May 31 08:09:45 2017 +0000 6684 6685 upstream commit 6686 6687 clear session keys from memory; ok djm@ 6688 6689 Upstream-ID: ecd178819868975affd5fd6637458b7c712b6a0f 6690 6691commit 92e9fe633130376a95dd533df6e5e6a578c1e6b8 6692Author: markus@openbsd.org <markus@openbsd.org> 6693Date: Wed May 31 07:00:13 2017 +0000 6694 6695 upstream commit 6696 6697 remove now obsolete ctx from ssh_dispatch_run; ok djm@ 6698 6699 Upstream-ID: 9870aabf7f4d71660c31fda91b942b19a8e68d29 6700 6701commit 17ad5b346043c5bbc5befa864d0dbeb76be39390 6702Author: markus@openbsd.org <markus@openbsd.org> 6703Date: Wed May 31 05:34:14 2017 +0000 6704 6705 upstream commit 6706 6707 use the ssh_dispatch_run_fatal variant 6708 6709 Upstream-ID: 28c5b364e37c755d1b22652b8cd6735a05c625d8 6710 6711commit 39896b777320a6574dd06707aebac5fb98e666da 6712Author: djm@openbsd.org <djm@openbsd.org> 6713Date: Wed May 31 05:08:46 2017 +0000 6714 6715 upstream commit 6716 6717 another ctx => ssh conversion (in GSSAPI code) 6718 6719 Upstream-ID: 4d6574c3948075c60608d8e045af42fe5b5d8ae0 6720 6721commit 6116bd4ed354a71a733c8fd0f0467ce612f12911 6722Author: Damien Miller <djm@mindrot.org> 6723Date: Wed May 31 14:56:07 2017 +1000 6724 6725 fix conversion of kexc25519s.c to struct ssh too 6726 6727 git cvsimport missed this commit for some reason 6728 6729commit d40dbdc85b6fb2fd78485ba02225511b8cbf20d7 6730Author: djm@openbsd.org <djm@openbsd.org> 6731Date: Wed May 31 04:29:44 2017 +0000 6732 6733 upstream commit 6734 6735 spell out that custom options/extensions should follow the 6736 usual SSH naming rules, e.g. "extension@example.com" 6737 6738 Upstream-ID: ab326666d2fad40769ec96b5a6de4015ffd97b8d 6739 6740commit 2a108277f976e8d0955c8b29d1dfde04dcbb3d5b 6741Author: djm@openbsd.org <djm@openbsd.org> 6742Date: Wed May 31 04:17:12 2017 +0000 6743 6744 upstream commit 6745 6746 one more void *ctx => struct ssh *ssh conversion 6747 6748 Upstream-ID: d299d043471c10214cf52c03daa10f1c232759e2 6749 6750commit c04e979503e97f52b750d3b98caa6fe004ab2ab9 6751Author: djm@openbsd.org <djm@openbsd.org> 6752Date: Wed May 31 00:43:04 2017 +0000 6753 6754 upstream commit 6755 6756 fix possible OOB strlen() in SOCKS4A hostname parsing; 6757 ok markus@ 6758 6759 Upstream-ID: c67297cbeb0e5a19d81752aa18ec44d31270cd11 6760 6761commit a3bb250c93bfe556838c46ed965066afce61cffa 6762Author: jmc@openbsd.org <jmc@openbsd.org> 6763Date: Tue May 30 19:38:17 2017 +0000 6764 6765 upstream commit 6766 6767 tweak previous; 6768 6769 Upstream-ID: 66987651046c42d142f7318c9695fb81a6d14031 6770 6771commit 1112b534a6a7a07190e497e6bf86b0d5c5fb02dc 6772Author: bluhm@openbsd.org <bluhm@openbsd.org> 6773Date: Tue May 30 18:58:37 2017 +0000 6774 6775 upstream commit 6776 6777 Add RemoteCommand option to specify a command in the 6778 ssh config file instead of giving it on the client's command line. This 6779 command will be executed on the remote host. The feature allows to automate 6780 tasks using ssh config. OK markus@ 6781 6782 Upstream-ID: 5d982fc17adea373a9c68cae1021ce0a0904a5ee 6783 6784commit eb272ea4099fd6157846f15c129ac5727933aa69 6785Author: markus@openbsd.org <markus@openbsd.org> 6786Date: Tue May 30 14:29:59 2017 +0000 6787 6788 upstream commit 6789 6790 switch auth2 to ssh_dispatch API; ok djm@ 6791 6792 Upstream-ID: a752ca19e2782900dd83060b5c6344008106215f 6793 6794commit 5a146bbd4fdf5c571f9fb438e5210d28cead76d9 6795Author: markus@openbsd.org <markus@openbsd.org> 6796Date: Tue May 30 14:27:22 2017 +0000 6797 6798 upstream commit 6799 6800 switch auth2-none.c to modern APIs; ok djm@ 6801 6802 Upstream-ID: 07252b58e064d332214bcabbeae8e08c44b2001b 6803 6804commit 60306b2d2f029f91927c6aa7c8e08068519a0fa2 6805Author: markus@openbsd.org <markus@openbsd.org> 6806Date: Tue May 30 14:26:49 2017 +0000 6807 6808 upstream commit 6809 6810 switch auth2-passwd.c to modern APIs; ok djm@ 6811 6812 Upstream-ID: cba0a8b72b4f97adfb7e3b3fd2f8ba3159981fc7 6813 6814commit eb76698b91338bd798c978d4db2d6af624d185e4 6815Author: markus@openbsd.org <markus@openbsd.org> 6816Date: Tue May 30 14:25:42 2017 +0000 6817 6818 upstream commit 6819 6820 switch auth2-hostbased.c to modern APIs; ok djm@ 6821 6822 Upstream-ID: 146af25c36daeeb83d5dbbb8ca52b5d25de88f4e 6823 6824commit 2ae666a8fc20b3b871b2f1b90ad65cc027336ccd 6825Author: markus@openbsd.org <markus@openbsd.org> 6826Date: Tue May 30 14:23:52 2017 +0000 6827 6828 upstream commit 6829 6830 protocol handlers all get struct ssh passed; ok djm@ 6831 6832 Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d 6833 6834commit 94583beb24a6c5fd19cedb9104ab2d2d5cd052b6 6835Author: markus@openbsd.org <markus@openbsd.org> 6836Date: Tue May 30 14:19:15 2017 +0000 6837 6838 upstream commit 6839 6840 ssh: pass struct ssh to auth functions, too; ok djm@ 6841 6842 Upstream-ID: d13c509cc782f8f19728fbea47ac7cf36f6e85dd 6843 6844commit 5f4082d886c6173b9e90b9768c9a38a3bfd92c2b 6845Author: markus@openbsd.org <markus@openbsd.org> 6846Date: Tue May 30 14:18:15 2017 +0000 6847 6848 upstream commit 6849 6850 sshd: pass struct ssh to auth functions; ok djm@ 6851 6852 Upstream-ID: b00a80c3460884ebcdd14ef550154c761aebe488 6853 6854commit 7da5df11ac788bc1133d8d598d298e33500524cc 6855Author: markus@openbsd.org <markus@openbsd.org> 6856Date: Tue May 30 14:16:41 2017 +0000 6857 6858 upstream commit 6859 6860 remove unused wrapper functions from key.[ch]; ok djm@ 6861 6862 Upstream-ID: ea0f4016666a6817fc11f439dd4be06bab69707e 6863 6864commit ff7371afd08ac0bbd957d90451d4dcd0da087ef5 6865Author: markus@openbsd.org <markus@openbsd.org> 6866Date: Tue May 30 14:15:17 2017 +0000 6867 6868 upstream commit 6869 6870 sshkey_new() might return NULL (pkcs#11 code only); ok 6871 djm@ 6872 6873 Upstream-ID: de9f2ad4a42c0b430caaa7d08dea7bac943075dd 6874 6875commit beb965bbc5a984fa69fb1e2b45ebe766ae09d1ef 6876Author: markus@openbsd.org <markus@openbsd.org> 6877Date: Tue May 30 14:13:40 2017 +0000 6878 6879 upstream commit 6880 6881 switch sshconnect.c to modern APIs; ok djm@ 6882 6883 Upstream-ID: 27be17f84b950d5e139b7a9b281aa487187945ad 6884 6885commit 00ed75c92d1f95fe50032835106c368fa22f0f02 6886Author: markus@openbsd.org <markus@openbsd.org> 6887Date: Tue May 30 14:10:53 2017 +0000 6888 6889 upstream commit 6890 6891 switch auth2-pubkey.c to modern APIs; with & ok djm@ 6892 6893 Upstream-ID: 8f08d4316eb1b0c4ffe4a206c05cdd45ed1daf07 6894 6895commit 54d90ace1d3535b44d92a8611952dc109a74a031 6896Author: markus@openbsd.org <markus@openbsd.org> 6897Date: Tue May 30 08:52:19 2017 +0000 6898 6899 upstream commit 6900 6901 switch from Key typedef with struct sshkey; ok djm@ 6902 6903 Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f 6904 6905commit c221219b1fbee47028dcaf66613f4f8d6b7640e9 6906Author: markus@openbsd.org <markus@openbsd.org> 6907Date: Tue May 30 08:49:58 2017 +0000 6908 6909 upstream commit 6910 6911 remove ssh1 references; ok djm@ 6912 6913 Upstream-ID: fc23b7578e7b0a8daaec72946d7f5e58ffff5a3d 6914 6915commit afbfa68fa18081ef05a9cd294958509a5d3cda8b 6916Author: markus@openbsd.org <markus@openbsd.org> 6917Date: Tue May 30 08:49:32 2017 +0000 6918 6919 upstream commit 6920 6921 revise sshkey_load_public(): remove ssh1 related 6922 comments, remove extra open()/close() on keyfile, prevent leak of 'pub' if 6923 'keyp' is NULL, replace strlcpy+cat with asprintf; ok djm@ 6924 6925 Upstream-ID: 6175e47cab5b4794dcd99c1175549a483ec673ca 6926 6927commit 813f55336a24fdfc45e7ed655fccc7d792e8f859 6928Author: markus@openbsd.org <markus@openbsd.org> 6929Date: Fri May 26 20:34:49 2017 +0000 6930 6931 upstream commit 6932 6933 sshbuf_consume: reset empty buffer; ok djm@ 6934 6935 Upstream-ID: 0d4583ba57f69e369d38bbd7843d85cac37fa821 6936 6937commit 6cf711752cc2a7ffaad1fb4de18cae65715ed8bb 6938Author: markus@openbsd.org <markus@openbsd.org> 6939Date: Fri May 26 19:35:50 2017 +0000 6940 6941 upstream commit 6942 6943 remove SSH_CHANNEL_XXX_DRAINING (ssh1 only); ok djm@ 6944 6945 Upstream-ID: e2e225b6ac67b84dd024f38819afff2554fafe42 6946 6947commit 364f0d5edea27767fb0f915ea7fc61aded88d3e8 6948Author: markus@openbsd.org <markus@openbsd.org> 6949Date: Fri May 26 19:34:12 2017 +0000 6950 6951 upstream commit 6952 6953 remove channel_input_close_confirmation (ssh1 only); ok 6954 djm@ 6955 6956 Upstream-ID: 8e7c8c38f322d255bb0294a5c0ebef53fdf576f1 6957 6958commit 8ba0fd40082751dbbc23a830433488bbfb1abdca 6959Author: djm@openbsd.org <djm@openbsd.org> 6960Date: Fri May 26 01:40:07 2017 +0000 6961 6962 upstream commit 6963 6964 fix references to obsolete v00 cert format; spotted by 6965 Jakub Jelen 6966 6967 Upstream-ID: 7600ce193ab8fd19451acfe24fc2eb39d46b2c4f 6968 6969commit dcc714c65cfb81eb6903095b4590719e8690f3da 6970Author: Mike Frysinger <vapier@chromium.org> 6971Date: Wed May 24 23:21:19 2017 -0400 6972 6973 configure: actually set cache vars when cross-compiling 6974 6975 The cross-compiling fallback message says it's assuming the test 6976 passed, but it didn't actually set the cache var which causes 6977 later tests to fail. 6978 6979commit 947a3e829a5b8832a4768fd764283709a4ca7955 6980Author: djm@openbsd.org <djm@openbsd.org> 6981Date: Sat May 20 02:35:47 2017 +0000 6982 6983 upstream commit 6984 6985 there's no reason to artificially limit the key path 6986 here, just check that it fits PATH_MAX; spotted by Matthew Patton 6987 6988 Upstream-ID: 858addaf2009c9cf04d80164a41b2088edb30b58 6989 6990commit 773224802d7cb250bb8b461546fcce10567b4b2e 6991Author: djm@openbsd.org <djm@openbsd.org> 6992Date: Fri May 19 21:07:17 2017 +0000 6993 6994 upstream commit 6995 6996 Now that we no longer support SSHv1, replace the contents 6997 of this file with a pointer to 6998 https://tools.ietf.org/html/draft-miller-ssh-agent-00 It's better edited, 6999 doesn't need to document stuff we no longer implement and does document stuff 7000 that we do implement (RSA SHA256/512 signature flags) 7001 7002 Upstream-ID: da8cdc46bbcc266efabd565ddddd0d8e556f846e 7003 7004commit 54cd41a4663fad66406dd3c8fe0e4760ccd8a899 7005Author: djm@openbsd.org <djm@openbsd.org> 7006Date: Wed May 17 01:24:17 2017 +0000 7007 7008 upstream commit 7009 7010 allow LogLevel in sshd_config Match blocks; ok dtucker 7011 bz#2717 7012 7013 Upstream-ID: 662e303be63148f47db1aa78ab81c5c2e732baa8 7014 7015commit 277abcda3f1b08d2376686f0ef20320160d4c8ab 7016Author: djm@openbsd.org <djm@openbsd.org> 7017Date: Tue May 16 16:56:15 2017 +0000 7018 7019 upstream commit 7020 7021 remove duplicate check; spotted by Jakub Jelen 7022 7023 Upstream-ID: 30c2996c1767616a8fdc49d4cee088efac69c3b0 7024 7025commit adb47ce839c977fa197e770c1be8f852508d65aa 7026Author: djm@openbsd.org <djm@openbsd.org> 7027Date: Tue May 16 16:54:05 2017 +0000 7028 7029 upstream commit 7030 7031 mention that Ed25519 keys are valid as CA keys; spotted 7032 by Jakub Jelen 7033 7034 Upstream-ID: d3f6db58b30418cb1c3058211b893a1ffed3dfd4 7035 7036commit 6bdf70f01e700348bb4d8c064c31a0ab90896df6 7037Author: Damien Miller <djm@mindrot.org> 7038Date: Tue May 9 14:35:03 2017 +1000 7039 7040 clean up regress files and add a .gitignore 7041 7042commit 7bdb2eeb1d3c26acdc409bd94532eefa252e440b 7043Author: djm@openbsd.org <djm@openbsd.org> 7044Date: Mon May 8 22:57:38 2017 +0000 7045 7046 upstream commit 7047 7048 remove hmac-ripemd160; ok dtucker 7049 7050 Upstream-ID: 896e737ea0bad6e23327d1c127e02d5e9e9c654d 7051 7052commit 5f02bb1f99f70bb422be8a5c2b77ef853f1db554 7053Author: djm@openbsd.org <djm@openbsd.org> 7054Date: Mon May 8 06:11:06 2017 +0000 7055 7056 upstream commit 7057 7058 make requesting bad ECDSA bits yield the same error 7059 (SSH_ERR_KEY_LENGTH) as the same mistake for RSA/DSA 7060 7061 Upstream-ID: bf40d3fee567c271e33f05ef8e4e0fa0b6f0ece6 7062 7063commit d757a4b633e8874629a1442c7c2e7b1b55d28c19 7064Author: djm@openbsd.org <djm@openbsd.org> 7065Date: Mon May 8 06:08:42 2017 +0000 7066 7067 upstream commit 7068 7069 fix for new SSH_ERR_KEY_LENGTH error value 7070 7071 Upstream-Regress-ID: c38a6e6174d4c3feca3518df150d4fbae0dca8dc 7072 7073commit 2e58a69508ac49c02d1bb6057300fa6a76db1045 7074Author: djm@openbsd.org <djm@openbsd.org> 7075Date: Mon May 8 06:03:39 2017 +0000 7076 7077 upstream commit 7078 7079 helps if I commit the correct version of the file. fix 7080 missing return statement. 7081 7082 Upstream-ID: c86394a3beeb1ec6611e659bfa830254f325546c 7083 7084commit effaf526bfa57c0ac9056ca236becf52385ce8af 7085Author: djm@openbsd.org <djm@openbsd.org> 7086Date: Mon May 8 01:52:49 2017 +0000 7087 7088 upstream commit 7089 7090 remove arcfour, blowfish and CAST here too 7091 7092 Upstream-Regress-ID: c613b3bcbef75df1fe84ca4dc2d3ef253dc5e920 7093 7094commit 7461a5bc571696273252df28a1f1578968cae506 7095Author: djm@openbsd.org <djm@openbsd.org> 7096Date: Mon May 8 00:21:36 2017 +0000 7097 7098 upstream commit 7099 7100 I was too aggressive with the scalpel in the last commit; 7101 unbreak sshd, spotted quickly by naddy@ 7102 7103 Upstream-ID: fb7e75d2b2c7e6ca57dee00ca645e322dd49adbf 7104 7105commit bd636f40911094a39c2920bf87d2ec340533c152 7106Author: djm@openbsd.org <djm@openbsd.org> 7107Date: Sun May 7 23:15:59 2017 +0000 7108 7109 upstream commit 7110 7111 Refuse RSA keys <1024 bits in length. Improve reporting 7112 for keys that do not meet this requirement. ok markus@ 7113 7114 Upstream-ID: b385e2a7b13b1484792ee681daaf79e1e203df6c 7115 7116commit 70c1218fc45757a030285051eb4d209403f54785 7117Author: djm@openbsd.org <djm@openbsd.org> 7118Date: Sun May 7 23:13:42 2017 +0000 7119 7120 upstream commit 7121 7122 Don't offer CBC ciphers by default in the client. ok 7123 markus@ 7124 7125 Upstream-ID: 94c9ce8d0d1a085052e11c7f3307950fdc0901ef 7126 7127commit acaf34fd823235d549c633c0146ee03ac5956e82 7128Author: djm@openbsd.org <djm@openbsd.org> 7129Date: Sun May 7 23:12:57 2017 +0000 7130 7131 upstream commit 7132 7133 As promised in last release announcement: remove 7134 support for Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@ 7135 7136 Upstream-ID: 21f8facdba3fd8da248df6417000867cec6ba222 7137 7138commit 3e371bd2124427403971db853fb2e36ce789b6fd 7139Author: naddy@openbsd.org <naddy@openbsd.org> 7140Date: Fri May 5 10:42:49 2017 +0000 7141 7142 upstream commit 7143 7144 more simplification and removal of SSHv1-related code; 7145 ok djm@ 7146 7147 Upstream-ID: d2f041aa0b79c0ebd98c68a01e5a0bfab2cf3b55 7148 7149commit 2e9c324b3a7f15c092d118c2ac9490939f6228fd 7150Author: naddy@openbsd.org <naddy@openbsd.org> 7151Date: Fri May 5 10:41:58 2017 +0000 7152 7153 upstream commit 7154 7155 remove superfluous protocol 2 mentions; ok jmc@ 7156 7157 Upstream-ID: 0aaf7567c9f2e50fac5906b6a500a39c33c4664d 7158 7159commit 744bde79c3361e2153cb395a2ecdcee6c713585d 7160Author: djm@openbsd.org <djm@openbsd.org> 7161Date: Thu May 4 06:10:57 2017 +0000 7162 7163 upstream commit 7164 7165 since a couple of people have asked, leave a comment 7166 explaining why we retain SSH v.1 support in the "delete all keys from agent" 7167 path. 7168 7169 Upstream-ID: 4b42dcfa339813c15fe9248a2c1b7ed41c21bbb4 7170 7171commit 0c378ff6d98d80bc465a4a6a787670fb9cc701ee 7172Author: djm@openbsd.org <djm@openbsd.org> 7173Date: Thu May 4 01:33:21 2017 +0000 7174 7175 upstream commit 7176 7177 another tentacle: cipher_set_key_string() was only ever 7178 used for SSHv1 7179 7180 Upstream-ID: 7fd31eb6c48946f7e7cc12af0699fe8eb637e94a 7181 7182commit 9a82e24b986e3e0dc70849dbb2c19aa6c707b37f 7183Author: naddy@openbsd.org <naddy@openbsd.org> 7184Date: Wed May 3 21:49:18 2017 +0000 7185 7186 upstream commit 7187 7188 restore mistakenly deleted description of the 7189 ConnectionAttempts option ok markus@ 7190 7191 Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348 7192 7193commit 768405fddf64ff83aa6ef701ebb3c1f82d98a2f3 7194Author: naddy@openbsd.org <naddy@openbsd.org> 7195Date: Wed May 3 21:08:09 2017 +0000 7196 7197 upstream commit 7198 7199 remove miscellaneous SSH1 leftovers; ok markus@ 7200 7201 Upstream-ID: af23696022ae4d45a1abc2fb8b490d8d9dd63b7c 7202 7203commit 1a1b24f8229bf7a21f89df21987433283265527a 7204Author: jmc@openbsd.org <jmc@openbsd.org> 7205Date: Wed May 3 10:01:44 2017 +0000 7206 7207 upstream commit 7208 7209 more protocol 1 bits removed; ok djm 7210 7211 Upstream-ID: b5b977eaf756915acb56aef3604a650e27f7c2b9 7212 7213commit 2b6f799e9b230cf13a7eefc05ecead7d8569d6b5 7214Author: jmc@openbsd.org <jmc@openbsd.org> 7215Date: Wed May 3 06:32:02 2017 +0000 7216 7217 upstream commit 7218 7219 more protocol 1 stuff to go; ok djm 7220 7221 Upstream-ID: 307a30441d2edda480fd1661d998d36665671e47 7222 7223commit f10c0d32cde2084d2a0b19bc47d80cb93e85a093 7224Author: jmc@openbsd.org <jmc@openbsd.org> 7225Date: Tue May 2 17:04:09 2017 +0000 7226 7227 upstream commit 7228 7229 rsa1 is no longer valid; 7230 7231 Upstream-ID: 9953d09ed9841c44b7dcf7019fa874783a709d89 7232 7233commit 42b690b4fd0faef78c4d68225948b6e5c46c5163 7234Author: jmc@openbsd.org <jmc@openbsd.org> 7235Date: Tue May 2 14:06:37 2017 +0000 7236 7237 upstream commit 7238 7239 add PubKeyAcceptedKeyTypes to the -o list: scp(1) has 7240 it, so i guess this should too; 7241 7242 Upstream-ID: 7fab32e869ca5831d09ab0c40d210b461d527a2c 7243 7244commit d852603214defd93e054de2877b20cc79c19d0c6 7245Author: jmc@openbsd.org <jmc@openbsd.org> 7246Date: Tue May 2 13:44:51 2017 +0000 7247 7248 upstream commit 7249 7250 remove now obsolete protocol1 options from the -o 7251 lists; 7252 7253 Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd 7254 7255commit 8b60ce8d8111e604c711c4cdd9579ffe0edced74 7256Author: jmc@openbsd.org <jmc@openbsd.org> 7257Date: Tue May 2 09:05:58 2017 +0000 7258 7259 upstream commit 7260 7261 more -O shuffle; ok djm 7262 7263 Upstream-ID: c239991a3a025cdbb030b73e990188dd9bfbeceb 7264 7265commit 3575f0b12afe6b561681582fd3c34067d1196231 7266Author: djm@openbsd.org <djm@openbsd.org> 7267Date: Tue May 2 08:54:19 2017 +0000 7268 7269 upstream commit 7270 7271 remove -1 / -2 options; pointed out by jmc@ 7272 7273 Upstream-ID: 65d2a816000741a95df1c7cfdb5fa8469fcc7daa 7274 7275commit 4f1ca823bad12e4f9614895eefe0d0073b84a28f 7276Author: jmc@openbsd.org <jmc@openbsd.org> 7277Date: Tue May 2 08:06:33 2017 +0000 7278 7279 upstream commit 7280 7281 remove options -12 from usage(); 7282 7283 Upstream-ID: db7ceef25132e63b50ed05289bf447fece1d1270 7284 7285commit 6b84897f7fd39956b849eac7810319d8a9958568 7286Author: jmc@openbsd.org <jmc@openbsd.org> 7287Date: Tue May 2 07:13:31 2017 +0000 7288 7289 upstream commit 7290 7291 tidy up -O somewhat; ok djm 7292 7293 Upstream-ID: 804405f716bf7ef15c1f36ab48581ca16aeb4d52 7294 7295commit d1c6b7fdbdfe4a7a37ecd48a97f0796b061c2868 7296Author: djm@openbsd.org <djm@openbsd.org> 7297Date: Mon May 1 22:09:48 2017 +0000 7298 7299 upstream commit 7300 7301 when freeing a bitmap, zero all it bytes; spotted by Ilya 7302 Kaliman 7303 7304 Upstream-ID: 834ac024f2c82389d6ea6b1c7d6701b3836e28e4 7305 7306commit 0f163983016c2988a92e039d18a7569f9ea8e071 7307Author: djm@openbsd.org <djm@openbsd.org> 7308Date: Mon May 1 14:08:26 2017 +0000 7309 7310 upstream commit 7311 7312 this one I did forget to "cvs rm" 7313 7314 Upstream-ID: 5781670c0578fe89663c9085ed3ba477cf7e7913 7315 7316commit 21ed00a8e26fe8a772bcca782175fafc2b0890ed 7317Author: djm@openbsd.org <djm@openbsd.org> 7318Date: Mon May 1 09:27:45 2017 +0000 7319 7320 upstream commit 7321 7322 don't know why cvs didn't exterminate these the first 7323 time around, I use rm -f and everuthing... 7324 7325 pointed out by sobrado@ 7326 7327 Upstream-ID: a6c44a0c2885330d322ee01fcfd7f6f209b1e15d 7328 7329commit d29ba6f45086703fdcb894532848ada3427dfde6 7330Author: Darren Tucker <dtucker@zip.com.au> 7331Date: Mon May 1 13:53:07 2017 +1000 7332 7333 Define INT32_MAX and INT64_MAX if needed. 7334 7335commit 329037e389f02ec95c8e16bf93ffede94d3d44ce 7336Author: Darren Tucker <dtucker@zip.com.au> 7337Date: Mon May 1 13:19:41 2017 +1000 7338 7339 Wrap stdint.h in HAVE_STDINT_H 7340 7341commit f382362e8dfb6b277f16779ab1936399d7f2af78 7342Author: djm@openbsd.org <djm@openbsd.org> 7343Date: Mon May 1 02:27:11 2017 +0000 7344 7345 upstream commit 7346 7347 remove unused variable 7348 7349 Upstream-ID: 66011f00819d0e71b14700449a98414033284516 7350 7351commit dd369320d2435b630a5974ab270d686dcd92d024 7352Author: djm@openbsd.org <djm@openbsd.org> 7353Date: Sun Apr 30 23:34:55 2017 +0000 7354 7355 upstream commit 7356 7357 eliminate explicit specification of protocol in tests and 7358 loops over protocol. We only support SSHv2 now. 7359 7360 Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd 7361 7362commit 557f921aad004be15805e09fd9572969eb3d9321 7363Author: djm@openbsd.org <djm@openbsd.org> 7364Date: Sun Apr 30 23:33:48 2017 +0000 7365 7366 upstream commit 7367 7368 remove SSHv1 support from unit tests 7369 7370 Upstream-Regress-ID: 395ca2aa48f1f7d23eefff6cb849ea733ca8bbfe 7371 7372commit e77e1562716fb3da413e4c2397811017b762f5e3 7373Author: djm@openbsd.org <djm@openbsd.org> 7374Date: Mon May 1 00:03:18 2017 +0000 7375 7376 upstream commit 7377 7378 fixup setting ciphercontext->plaintext (lost in SSHv1 purge), 7379 though it isn't really used for much anymore. 7380 7381 Upstream-ID: 859b8bce84ff4865b32097db5430349d04b9b747 7382 7383commit f7849e6c83a4e0f602dea6c834a24091c622d68e 7384Author: Damien Miller <djm@mindrot.org> 7385Date: Mon May 1 09:55:56 2017 +1000 7386 7387 remove configure --with-ssh1 7388 7389commit f4a6a88ddb6dba6d2f7bfb9e2c9879fcc9633043 7390Author: djm@openbsd.org <djm@openbsd.org> 7391Date: Sun Apr 30 23:29:10 2017 +0000 7392 7393 upstream commit 7394 7395 flense SSHv1 support from ssh-agent, considerably 7396 simplifying it 7397 7398 ok markus 7399 7400 Upstream-ID: 71d772cdcefcb29f76e01252e8361e6fc2dfc365 7401 7402commit 930e8d2827853bc2e196c20c3e000263cc87fb75 7403Author: djm@openbsd.org <djm@openbsd.org> 7404Date: Sun Apr 30 23:28:41 2017 +0000 7405 7406 upstream commit 7407 7408 obliterate ssh1.h and some dead code that used it 7409 7410 ok markus@ 7411 7412 Upstream-ID: 1ca9159a9fb95618f9d51e069ac8e1131a087343 7413 7414commit a3710d5d529a34b8f56aa62db798c70e85d576a0 7415Author: djm@openbsd.org <djm@openbsd.org> 7416Date: Sun Apr 30 23:28:12 2017 +0000 7417 7418 upstream commit 7419 7420 exterminate the -1 flag from scp 7421 7422 ok markus@ 7423 7424 Upstream-ID: 26d247f7065da15056b209cef5f594ff591b89db 7425 7426commit aebd0abfaa8a41e75d50f9f7934267b0a2d9acb4 7427Author: djm@openbsd.org <djm@openbsd.org> 7428Date: Sun Apr 30 23:26:54 2017 +0000 7429 7430 upstream commit 7431 7432 purge the last traces of SSHv1 from the TTY modes 7433 handling code 7434 7435 ok markus 7436 7437 Upstream-ID: 963a19f1e06577377c38a3b7ce468f121b966195 7438 7439commit dfa641f758d4b8b2608ab1b00abaf88df0a8e36a 7440Author: djm@openbsd.org <djm@openbsd.org> 7441Date: Sun Apr 30 23:26:16 2017 +0000 7442 7443 upstream commit 7444 7445 remove the (in)famous SSHv1 CRC compensation attack 7446 detector. 7447 7448 Despite your cameo in The Matrix movies, you will not be missed. 7449 7450 ok markus 7451 7452 Upstream-ID: 44261fce51a56d93cdb2af7b6e184be629f667e0 7453 7454commit e5d3bd36ef67d82092861f39b5bf422cb12b31a6 7455Author: djm@openbsd.org <djm@openbsd.org> 7456Date: Sun Apr 30 23:25:03 2017 +0000 7457 7458 upstream commit 7459 7460 undo some local debugging stuff that I committed by 7461 accident 7462 7463 Upstream-ID: fe5b31f69a60d47171836911f144acff77810217 7464 7465commit 3d6d09f2e90f4ad650ebda6520bf2da446f37f14 7466Author: djm@openbsd.org <djm@openbsd.org> 7467Date: Sun Apr 30 23:23:54 2017 +0000 7468 7469 upstream commit 7470 7471 remove SSHv1 support from packet and buffer APIs 7472 7473 ok markus@ 7474 7475 Upstream-ID: bfc290053d40b806ecac46317d300677d80e1dc9 7476 7477commit 05164358577c82de18ed7373196bc7dbd8a3f79c 7478Author: djm@openbsd.org <djm@openbsd.org> 7479Date: Sun Apr 30 23:21:54 2017 +0000 7480 7481 upstream commit 7482 7483 remove SSHv1-related buffers from client code 7484 7485 Upstream-ID: dca5d01108f891861ceaf7ba1c0f2eb274e0c7dd 7486 7487commit 873d3e7d9a4707d0934fb4c4299354418f91b541 7488Author: djm@openbsd.org <djm@openbsd.org> 7489Date: Sun Apr 30 23:18:44 2017 +0000 7490 7491 upstream commit 7492 7493 remove KEY_RSA1 7494 7495 ok markus@ 7496 7497 Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133 7498 7499commit 788ac799a6efa40517f2ac0d895a610394298ffc 7500Author: djm@openbsd.org <djm@openbsd.org> 7501Date: Sun Apr 30 23:18:22 2017 +0000 7502 7503 upstream commit 7504 7505 remove SSHv1 configuration options and man pages bits 7506 7507 ok markus@ 7508 7509 Upstream-ID: 84638c23546c056727b7a7d653c72574e0f19424 7510 7511commit e6882463a8ae0594aacb6d6575a6318a41973d84 7512Author: djm@openbsd.org <djm@openbsd.org> 7513Date: Sun Apr 30 23:17:37 2017 +0000 7514 7515 upstream commit 7516 7517 remove SSH1 make flag and associated files ok markus@ 7518 7519 Upstream-ID: ba9feacc5787337c413db7cf26ea3d53f854cfef 7520 7521commit cdccebdf85204bf7542b7fcc1aa2ea3f36661833 7522Author: djm@openbsd.org <djm@openbsd.org> 7523Date: Sun Apr 30 23:15:04 2017 +0000 7524 7525 upstream commit 7526 7527 remove SSHv1 ciphers; ok markus@ 7528 7529 Upstream-ID: e5ebc5e540d7f23a8c1266db1839794d4d177890 7530 7531commit 97f4d3083b036ce3e68d6346a6140a22123d5864 7532Author: djm@openbsd.org <djm@openbsd.org> 7533Date: Sun Apr 30 23:13:25 2017 +0000 7534 7535 upstream commit 7536 7537 remove compat20/compat13/compat15 variables 7538 7539 ok markus@ 7540 7541 Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c 7542 7543commit 99f95ba82673d33215dce17bfa1512b57f54ec09 7544Author: djm@openbsd.org <djm@openbsd.org> 7545Date: Sun Apr 30 23:11:45 2017 +0000 7546 7547 upstream commit 7548 7549 remove options.protocol and client Protocol 7550 configuration knob 7551 7552 ok markus@ 7553 7554 Upstream-ID: 5a967f5d06e2d004b0235457b6de3a9a314e9366 7555 7556commit 56912dea6ef63dae4eb1194e5d88973a7c6c5740 7557Author: djm@openbsd.org <djm@openbsd.org> 7558Date: Sun Apr 30 23:10:43 2017 +0000 7559 7560 upstream commit 7561 7562 unifdef WITH_SSH1 ok markus@ 7563 7564 Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7 7565 7566commit d4084cd230f7319056559b00db8b99296dad49d5 7567Author: jmc@openbsd.org <jmc@openbsd.org> 7568Date: Sat Apr 29 06:06:01 2017 +0000 7569 7570 upstream commit 7571 7572 tweak previous; 7573 7574 Upstream-ID: a3abc6857455299aa42a046d232b7984568bceb9 7575 7576commit 249516e428e8461b46340a5df5d5ed1fbad2ccce 7577Author: djm@openbsd.org <djm@openbsd.org> 7578Date: Sat Apr 29 04:12:25 2017 +0000 7579 7580 upstream commit 7581 7582 allow ssh-keygen to include arbitrary string or flag 7583 certificate extensions and critical options. ok markus@ dtucker@ 7584 7585 Upstream-ID: 2cf28dd6c5489eb9fc136e0b667ac3ea10241646 7586 7587commit 47a287bb6ac936c26b4f3ae63279c02902ded3b9 7588Author: jmc@openbsd.org <jmc@openbsd.org> 7589Date: Fri Apr 28 06:15:03 2017 +0000 7590 7591 upstream commit 7592 7593 sort; 7594 7595 Upstream-ID: 7e6b56e52b039cf44d0418e9de9aca20a2d2d15a 7596 7597commit 36465a76a79ad5040800711b41cf5f32249d5120 7598Author: Darren Tucker <dtucker@zip.com.au> 7599Date: Fri Apr 28 14:44:28 2017 +1000 7600 7601 Typo. 7602 7603 Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308 7604 7605commit 9d18cb7bdeb00b20205fd13d412aae8c0e0457ed 7606Author: Darren Tucker <dtucker@zip.com.au> 7607Date: Fri Apr 28 14:41:17 2017 +1000 7608 7609 Add 2 regress commits I applied by hand. 7610 7611 Upstream-Regress-ID: 30c20180c87cbc99fa1020489fe7fd8245b6420c 7612 Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308 7613 7614commit 9504ea6b27f9f0ece64e88582ebb9235e664a100 7615Author: Darren Tucker <dtucker@zip.com.au> 7616Date: Fri Apr 28 14:33:43 2017 +1000 7617 7618 Merge integrity.sh rev 1.22. 7619 7620 Merge missing bits from Colin Watson's patch in bz#2658 which make integrity 7621 tests more robust against timeouts. ok djm@ 7622 7623commit 06ec837a34542627e2183a412d6a9d2236f22140 7624Author: Darren Tucker <dtucker@zip.com.au> 7625Date: Fri Apr 28 14:30:03 2017 +1000 7626 7627 Id sync for integrity.sh rev 1.21 which pulls in some shell portability fixes 7628 7629commit e0194b471efe7d3daedc9cc66686cb1ab69d3be8 7630Author: jsg@openbsd.org <jsg@openbsd.org> 7631Date: Mon Apr 17 11:02:31 2017 +0000 7632 7633 upstream commit 7634 7635 Change COMPILER_VERSION tests which limited additional 7636 warnings to gcc4 to instead skip them on gcc3 as clang can handle 7637 -Wpointer-sign and -Wold-style-definition. 7638 7639 Upstream-Regress-ID: e48d7dc13e48d9334b8195ef884dfbc51316012f 7640 7641commit 6830be90e71f46bcd182a9202b151eaf2b299434 7642Author: djm@openbsd.org <djm@openbsd.org> 7643Date: Fri Apr 28 03:24:53 2017 +0000 7644 7645 upstream commit 7646 7647 include key fingerprint in "Offering public key" debug 7648 message 7649 7650 Upstream-ID: 964749f820c2ed4cf6a866268b1a05e907315c52 7651 7652commit 066437187e16dcafcbc19f9402ef0e6575899b1d 7653Author: millert@openbsd.org <millert@openbsd.org> 7654Date: Fri Apr 28 03:21:12 2017 +0000 7655 7656 upstream commit 7657 7658 Avoid relying on implementation-specific behavior when 7659 detecting whether the timestamp or file size overflowed. If time_t and off_t 7660 are not either 32-bit or 64-bit scp will exit with an error. OK djm@ 7661 7662 Upstream-ID: f31caae73ddab6df496b7bbbf7da431e267ad135 7663 7664commit 68d3a2a059183ebd83b15e54984ffaced04d2742 7665Author: dtucker@openbsd.org <dtucker@openbsd.org> 7666Date: Fri Apr 28 03:20:27 2017 +0000 7667 7668 upstream commit 7669 7670 Add SyslogFacility option to ssh(1) matching the 7671 equivalent option in sshd(8). bz#2705, patch from erahn at arista.com, ok 7672 djm@ 7673 7674 Upstream-ID: d5115c2c0193ceb056ed857813b2a7222abda9ed 7675 7676commit e13aad66e73a14b062d13aee4e98f1e21a3f6a14 7677Author: jsg@openbsd.org <jsg@openbsd.org> 7678Date: Thu Apr 27 13:40:05 2017 +0000 7679 7680 upstream commit 7681 7682 remove a static array unused since rev 1.306 spotted by 7683 clang ok djm@ 7684 7685 Upstream-ID: 249b3eed2446f6074ba2219ccc46919dd235a7b8 7686 7687commit 91bd2181866659f00714903e78e1c3edd4c45f3d 7688Author: millert@openbsd.org <millert@openbsd.org> 7689Date: Thu Apr 27 11:53:12 2017 +0000 7690 7691 upstream commit 7692 7693 Avoid potential signed int overflow when parsing the file 7694 size. Use strtoul() instead of parsing manually. OK djm@ 7695 7696 Upstream-ID: 1f82640861c7d905bbb05e7d935d46b0419ced02 7697 7698commit 17a54a03f5a1d35e33cc24e22cd7a9d0f6865dc4 7699Author: Darren Tucker <dtucker@zip.com.au> 7700Date: Tue Apr 25 08:32:27 2017 +1000 7701 7702 Fix typo in "socketcall". 7703 7704 Pointed out by jjelen at redhat.com. 7705 7706commit 8b0eee148f7cf8b248c30d1bae57300f2cc5aafd 7707Author: Darren Tucker <dtucker@zip.com.au> 7708Date: Mon Apr 24 19:40:31 2017 +1000 7709 7710 Deny socketcall in seccomp filter on ppc64le. 7711 7712 OpenSSL is using socket() calls (in FIPS mode) when handling ECDSA keys 7713 in privsep child. The socket() syscall is already denied in the seccomp 7714 filter, but in ppc64le kernel, it is implemented using socketcall() 7715 syscall, which is not denied yet (only SYS_SHUTDOWN is allowed) and 7716 therefore fails hard. 7717 7718 Patch from jjelen at redhat.com. 7719 7720commit f8500b2be599053daa05248a86a743232ec6a536 7721Author: schwarze@openbsd.org <schwarze@openbsd.org> 7722Date: Mon Apr 17 14:31:23 2017 +0000 7723 7724 upstream commit 7725 7726 Recognize nl_langinfo(CODESET) return values "646" and "" 7727 as aliases for "US-ASCII", useful for different versions of NetBSD and 7728 Solaris. Found by dtucker@ and by Tom G. Christensen <tgc at jupiterrise dot 7729 com>. OK dtucker@ deraadt@ 7730 7731 Upstream-ID: 38c2133817cbcae75c88c63599ac54228f0fa384 7732 7733commit 7480dfedf8c5c93baaabef444b3def9331e86ad5 7734Author: jsg@openbsd.org <jsg@openbsd.org> 7735Date: Mon Apr 17 11:02:31 2017 +0000 7736 7737 upstream commit 7738 7739 Change COMPILER_VERSION tests which limited additional 7740 warnings to gcc4 to instead skip them on gcc3 as clang can handle 7741 -Wpointer-sign and -Wold-style-definition. 7742 7743 Upstream-ID: 5cbe348aa76dc1adf55be6c0e388fafaa945439a 7744 7745commit 4d827f0d75a53d3952288ab882efbddea7ffadfe 7746Author: djm@openbsd.org <djm@openbsd.org> 7747Date: Tue Apr 4 00:24:56 2017 +0000 7748 7749 upstream commit 7750 7751 disallow creation (of empty files) in read-only mode; 7752 reported by Michal Zalewski, feedback & ok deraadt@ 7753 7754 Upstream-ID: 5d9c8f2fa8511d4ecf95322994ffe73e9283899b 7755 7756commit ef47843af0a904a21c920e619c5aec97b65dd9ac 7757Author: deraadt@openbsd.org <deraadt@openbsd.org> 7758Date: Sun Mar 26 00:18:52 2017 +0000 7759 7760 upstream commit 7761 7762 incorrect renditions of this quote bother me 7763 7764 Upstream-ID: 1662be3ebb7a71d543da088119c31d4d463a9e49 7765 7766commit d9048861bea842c4eba9c2dbbf97064cc2a5ef02 7767Author: Darren Tucker <dtucker@zip.com.au> 7768Date: Fri Mar 31 11:04:43 2017 +1100 7769 7770 Check for and use gcc's -pipe. 7771 7772 Speeds up configure and build by a couple of percent. ok djm@ 7773 7774commit 282cad2240c4fbc104c2f2df86d688192cbbe4bb 7775Author: Darren Tucker <dtucker@zip.com.au> 7776Date: Wed Mar 29 16:34:44 2017 +1100 7777 7778 Import fmt_scaled.c rev 1.16 from OpenBSD. 7779 7780 Fix overly-conservative overflow checks on mulitplications and add checks 7781 on additions. This allows scan_scaled to work up to +/-LLONG_MAX (LLONG_MIN 7782 will still be flagged as a range error). ok millert@ 7783 7784commit c73a229e4edf98920f395e19fd310684fc6bb951 7785Author: Darren Tucker <dtucker@zip.com.au> 7786Date: Wed Mar 29 16:34:02 2017 +1100 7787 7788 Import fmt_scaled.c rev 1.15 from OpenBSD. 7789 7790 Collapse underflow and overflow checks into a single block. 7791 ok djm@ millert@ 7792 7793commit d427b73bf5a564f663d16546dbcbd84ba8b9d4af 7794Author: Darren Tucker <dtucker@zip.com.au> 7795Date: Wed Mar 29 16:32:57 2017 +1100 7796 7797 Import fmt_scaled.c rev 1.14 from OpenBSD. 7798 7799 Catch integer underflow in scan_scaled reported by Nicolas Iooss. 7800 ok deraadt@ djm@ 7801 7802commit d13281f2964abc5f2e535e1613c77fc61b0c53e7 7803Author: Darren Tucker <dtucker@zip.com.au> 7804Date: Wed Mar 29 12:39:39 2017 +1100 7805 7806 Don't check privsep user or path when unprivileged 7807 7808 If running with privsep (mandatory now) as a non-privileged user, we 7809 don't chroot or change to an unprivileged user however we still checked 7810 the existence of the user and directory. Don't do those checks if we're 7811 not going to use them. Based in part on a patch from Lionel Fourquaux 7812 via Corinna Vinschen, ok djm@ 7813 7814commit f2742a481fe151e493765a3fbdef200df2ea7037 7815Author: Darren Tucker <dtucker@zip.com.au> 7816Date: Wed Mar 29 10:50:31 2017 +1100 7817 7818 Remove SHA256 EVP wrapper implementation. 7819 7820 All supported versions of OpenSSL should now have SHA256 so remove our 7821 EVP wrapper implementaion. ok djm@ 7822 7823commit 5346f271fc76549caf4a8e65b5fba319be422fe9 7824Author: Darren Tucker <dtucker@zip.com.au> 7825Date: Wed Mar 29 10:23:58 2017 +1100 7826 7827 Remove check for OpenSSL < 0.9.8g. 7828 7829 We no longer support OpenSSL < 1.0.1 so remove check for unreliable ECC 7830 in OpenSSL < 0.9.8g. 7831 7832commit 8fed0a5fe7b4e78a6810b133d8e91be9742ee0a1 7833Author: Darren Tucker <dtucker@zip.com.au> 7834Date: Wed Mar 29 10:16:15 2017 +1100 7835 7836 Remove compat code for OpenSSL < 0.9.7. 7837 7838 Resyncs that code with OpenBSD upstream. 7839 7840commit 608ec1f62ff22fdccc3952e51463d79c43cbd0d3 7841Author: Darren Tucker <dtucker@zip.com.au> 7842Date: Wed Mar 29 09:50:54 2017 +1100 7843 7844 Remove SSHv1 code path. 7845 7846 Server-side support for Protocol 1 has been removed so remove !compat20 7847 PAM code path. 7848 7849commit 7af27bf538cbc493d609753f9a6d43168d438f1b 7850Author: Darren Tucker <dtucker@zip.com.au> 7851Date: Fri Mar 24 09:44:56 2017 +1100 7852 7853 Enable ldns when using ldns-config. 7854 7855 Actually enable ldns when attempting to use ldns-config. bz#2697, patch 7856 from fredrik at fornwall.net. 7857 7858commit 58b8cfa2a062b72139d7229ae8de567f55776f24 7859Author: Damien Miller <djm@mindrot.org> 7860Date: Wed Mar 22 12:43:02 2017 +1100 7861 7862 Missing header on Linux/s390 7863 7864 Patch from Jakub Jelen 7865 7866commit 096fb65084593f9f3c1fc91b6d9052759a272a00 7867Author: djm@openbsd.org <djm@openbsd.org> 7868Date: Mon Mar 20 22:08:06 2017 +0000 7869 7870 upstream commit 7871 7872 remove /usr/bin/time calls around tests, makes diffing test 7873 runs harder. Based on patch from Mike Frysinger 7874 7875 Upstream-Regress-ID: 81c1083b14dcf473b23d2817882f40b346ebc95c 7876 7877commit 6b853c6f8ba5eecc50f3b57af8e63f8184eb0fa6 7878Author: Damien Miller <djm@mindrot.org> 7879Date: Tue Mar 21 08:47:55 2017 +1100 7880 7881 Fix syntax error on Linux/X32 7882 7883 Patch from Mike Frysinger 7884 7885commit d38f05dbdd291212bc95ea80648b72b7177e9f4e 7886Author: Darren Tucker <dtucker@zip.com.au> 7887Date: Mon Mar 20 13:38:27 2017 +1100 7888 7889 Add llabs() implementation. 7890 7891commit 72536316a219b7394996a74691a5d4ec197480f7 7892Author: Damien Miller <djm@mindrot.org> 7893Date: Mon Mar 20 12:23:04 2017 +1100 7894 7895 crank version numbers 7896 7897commit 3be52bc36bdfd24ded7e0f46999e7db520fb4e3f 7898Author: djm@openbsd.org <djm@openbsd.org> 7899Date: Mon Mar 20 01:18:59 2017 +0000 7900 7901 upstream commit 7902 7903 openssh-7.5 7904 7905 Upstream-ID: b8b9a4a949427c393cd868215e1724ceb3467ee5 7906 7907commit db84e52fe9cfad57f22e7e23c5fbf00092385129 7908Author: Damien Miller <djm@mindrot.org> 7909Date: Mon Mar 20 12:07:20 2017 +1100 7910 7911 I'm a doofus. 7912 7913 Unbreak obvious syntax error. 7914 7915commit 89f04852db27643717c9c3a2b0dde97ae50099ee 7916Author: Damien Miller <djm@mindrot.org> 7917Date: Mon Mar 20 11:53:34 2017 +1100 7918 7919 on Cygwin, check paths from server for backslashes 7920 7921 Pointed out by Jann Horn of Google Project Zero 7922 7923commit 7ef1f9bafc2cc8d97ff2fbd4f280002b6e8ea5d9 7924Author: Damien Miller <djm@mindrot.org> 7925Date: Mon Mar 20 11:48:34 2017 +1100 7926 7927 Yet another synonym for ASCII: "646" 7928 7929 Used by NetBSD; this unbreaks mprintf() and friends there for the C 7930 locale (caught by dtucker@ and his menagerie of test systems). 7931 7932commit 9165abfea3f68a0c684a6ed2e575e59bc31a3a6b 7933Author: Damien Miller <djm@mindrot.org> 7934Date: Mon Mar 20 09:58:34 2017 +1100 7935 7936 create test mux socket in /tmp 7937 7938 Creating the socket in $OBJ could blow past the (quite limited) 7939 path limit for Unix domain sockets. As a bandaid for bz#2660, 7940 reported by Colin Watson; ok dtucker@ 7941 7942commit 2adbe1e63bc313d03e8e84e652cc623af8ebb163 7943Author: markus@openbsd.org <markus@openbsd.org> 7944Date: Wed Mar 15 07:07:39 2017 +0000 7945 7946 upstream commit 7947 7948 disallow KEXINIT before NEWKEYS; ok djm; report by 7949 vegard.nossum at oracle.com 7950 7951 Upstream-ID: 3668852d1f145050e62f1da08917de34cb0c5234 7952 7953commit 2fbf91684d76d38b9cf06550b69c9e41bca5a71c 7954Author: Darren Tucker <dtucker@zip.com.au> 7955Date: Thu Mar 16 14:05:46 2017 +1100 7956 7957 Include includes.h for compat bits. 7958 7959commit b55f634e96b9c5b0cd991e23a9ca181bec4bdbad 7960Author: Darren Tucker <dtucker@zip.com.au> 7961Date: Thu Mar 16 13:45:17 2017 +1100 7962 7963 Wrap stdint.h in #ifdef HAVE_STDINT_H 7964 7965commit 55a1117d7342a0bf8b793250cf314bab6b482b99 7966Author: Damien Miller <djm@mindrot.org> 7967Date: Thu Mar 16 11:22:42 2017 +1100 7968 7969 Adapt Cygwin config script to privsep knob removal 7970 7971 Patch from Corinna Vinschen. 7972 7973commit 1a321bfdb91defe3c4d9cca5651724ae167e5436 7974Author: deraadt@openbsd.org <deraadt@openbsd.org> 7975Date: Wed Mar 15 03:52:30 2017 +0000 7976 7977 upstream commit 7978 7979 accidents happen to the best of us; ok djm 7980 7981 Upstream-ID: b7a9dbd71011ffde95e06f6945fe7197dedd1604 7982 7983commit 25f837646be8c2017c914d34be71ca435dfc0e07 7984Author: djm@openbsd.org <djm@openbsd.org> 7985Date: Wed Mar 15 02:25:09 2017 +0000 7986 7987 upstream commit 7988 7989 fix regression in 7.4: deletion of PKCS#11-hosted keys 7990 would fail unless they were specified by full physical pathname. Report and 7991 fix from Jakub Jelen via bz#2682; ok dtucker@ 7992 7993 Upstream-ID: 5b5bc20ca11cacb5d5eb29c3f93fd18425552268 7994 7995commit a8c5eeacf032a7d3408957e45dd7603cc1baf55f 7996Author: djm@openbsd.org <djm@openbsd.org> 7997Date: Wed Mar 15 02:19:09 2017 +0000 7998 7999 upstream commit 8000 8001 Fix segfault when sshd attempts to load RSA1 keys (can 8002 only happen when protocol v.1 support is enabled for the client). Reported by 8003 Jakub Jelen in bz#2686; ok dtucker 8004 8005 Upstream-ID: 8fdaec2ba4b5f65db1d094f6714ce64b25d871d7 8006 8007commit 66705948c0639a7061a0d0753266da7685badfec 8008Author: djm@openbsd.org <djm@openbsd.org> 8009Date: Tue Mar 14 07:19:07 2017 +0000 8010 8011 upstream commit 8012 8013 Mark the sshd_config UsePrivilegeSeparation option as 8014 deprecated, effectively making privsep mandatory in sandboxing mode. ok 8015 markus@ deraadt@ 8016 8017 (note: this doesn't remove the !privsep code paths, though that will 8018 happen eventually). 8019 8020 Upstream-ID: b4c52666256c4dd865f8ce9431af5d6ce2d74a0a 8021 8022commit f86586b03fe6cd8f595289bde200a94bc2c191af 8023Author: Damien Miller <djm@mindrot.org> 8024Date: Tue Mar 14 18:26:29 2017 +1100 8025 8026 Make seccomp-bpf sandbox work on Linux/X32 8027 8028 Allow clock_gettime syscall with X32 bit masked off. Apparently 8029 this is required for at least some kernel versions. bz#2142 8030 Patch mostly by Colin Watson. ok dtucker@ 8031 8032commit 2429cf78dd2a9741ce27ba25ac41c535274a0af6 8033Author: Damien Miller <djm@mindrot.org> 8034Date: Tue Mar 14 18:01:52 2017 +1100 8035 8036 require OpenSSL >=1.0.1 8037 8038commit e3ea335abeab731c68f2b2141bee85a4b0bf680f 8039Author: Damien Miller <djm@mindrot.org> 8040Date: Tue Mar 14 17:48:43 2017 +1100 8041 8042 Remove macro trickery; no binary change 8043 8044 This stops the SC_ALLOW(), SC_ALLOW_ARG() and SC_DENY() macros 8045 prepending __NR_ to the syscall number parameter and just makes 8046 them explicit in the macro invocations. 8047 8048 No binary change in stripped object file before/after. 8049 8050commit 5f1596e11d55539678c41f68aed358628d33d86f 8051Author: Damien Miller <djm@mindrot.org> 8052Date: Tue Mar 14 13:15:18 2017 +1100 8053 8054 support ioctls for ICA crypto card on Linux/s390 8055 8056 Based on patch from Eduardo Barretto; ok dtucker@ 8057 8058commit b1b22dd0df2668b322dda174e501dccba2cf5c44 8059Author: Darren Tucker <dtucker@zip.com.au> 8060Date: Tue Mar 14 14:19:36 2017 +1100 8061 8062 Plumb conversion test into makefile. 8063 8064commit f57783f1ddfb4cdfbd612c6beb5ec01cb5b9a6b9 8065Author: dtucker@openbsd.org <dtucker@openbsd.org> 8066Date: Tue Mar 14 01:20:29 2017 +0000 8067 8068 upstream commit 8069 8070 Add unit test for convtime(). 8071 8072 Upstream-Regress-ID: 8717bc0ca4c21120f6dd3a1d3b7a363f707c31e1 8073 8074commit 8884b7247d094cd11ff9e39c325ba928c5bdbc6c 8075Author: dtucker@openbsd.org <dtucker@openbsd.org> 8076Date: Tue Mar 14 01:10:07 2017 +0000 8077 8078 upstream commit 8079 8080 Add ASSERT_LONG_* helpers. 8081 8082 Upstream-Regress-ID: fe15beaea8f5063c7f21b0660c722648e3d76431 8083 8084commit c6774d21185220c0ba11e8fd204bf0ad1a432071 8085Author: dtucker@openbsd.org <dtucker@openbsd.org> 8086Date: Tue Mar 14 00:55:37 2017 +0000 8087 8088 upstream commit 8089 8090 Fix convtime() overflow test on boundary condition, 8091 spotted by & ok djm. 8092 8093 Upstream-ID: 51f14c507ea87a3022e63f574100613ab2ba5708 8094 8095commit f5746b40cfe6d767c8e128fe50c43274b31cd594 8096Author: dtucker@openbsd.org <dtucker@openbsd.org> 8097Date: Tue Mar 14 00:25:03 2017 +0000 8098 8099 upstream commit 8100 8101 Check for integer overflow when parsing times in 8102 convtime(). Reported by nicolas.iooss at m4x.org, ok djm@ 8103 8104 Upstream-ID: 35e6a4e98f6fa24df50bfb8ba1307cf70e966f13 8105 8106commit f5907982f42a8d88a430b8a46752cbb7859ba979 8107Author: Darren Tucker <dtucker@zip.com.au> 8108Date: Tue Mar 14 13:38:15 2017 +1100 8109 8110 Add a "unit" target to run only unit tests. 8111 8112commit 9e96b41682aed793fadbea5ccd472f862179fb02 8113Author: Damien Miller <djm@mindrot.org> 8114Date: Tue Mar 14 12:24:47 2017 +1100 8115 8116 Fix weakness in seccomp-bpf sandbox arg inspection 8117 8118 Syscall arguments are passed via an array of 64-bit values in struct 8119 seccomp_data, but we were only inspecting the bottom 32 bits and not 8120 even those correctly for BE systems. 8121 8122 Fortunately, the only case argument inspection was used was in the 8123 socketcall filtering so using this for sandbox escape seems 8124 impossible. 8125 8126 ok dtucker 8127 8128commit 8ff3fc3f2f7c13e8968717bc2b895ee32c441275 8129Author: djm@openbsd.org <djm@openbsd.org> 8130Date: Sat Mar 11 23:44:16 2017 +0000 8131 8132 upstream commit 8133 8134 regress tests for loading certificates without public keys; 8135 bz#2617 based on patch from Adam Eijdenberg; ok markus@ dtucker@ 8136 8137 Upstream-Regress-ID: 0145d19328ed995b73fe2d9da33596b17429d0d0 8138 8139commit 1e24552716194db8f2f620587b876158a9ef56ad 8140Author: djm@openbsd.org <djm@openbsd.org> 8141Date: Sat Mar 11 23:40:26 2017 +0000 8142 8143 upstream commit 8144 8145 allow ssh to use certificates accompanied by a private 8146 key file but no corresponding plain *.pub public key. bz#2617 based on patch 8147 from Adam Eijdenberg; ok dtucker@ markus@ 8148 8149 Upstream-ID: 295668dca2c39505281577217583ddd2bd4b00b9 8150 8151commit 0fb1a617a07b8df5de188dd5a0c8bf293d4bfc0e 8152Author: markus@openbsd.org <markus@openbsd.org> 8153Date: Sat Mar 11 13:07:35 2017 +0000 8154 8155 upstream commit 8156 8157 Don't count the initial block twice when computing how 8158 many bytes to discard for the work around for the attacks against CBC-mode. 8159 ok djm@; report from Jean Paul, Kenny, Martin and Torben @ RHUL 8160 8161 Upstream-ID: f445f509a4e0a7ba3b9c0dae7311cb42458dc1e2 8162 8163commit ef653dd5bd5777132d9f9ee356225f9ee3379504 8164Author: dtucker@openbsd.org <dtucker@openbsd.org> 8165Date: Fri Mar 10 07:18:32 2017 +0000 8166 8167 upstream commit 8168 8169 krl.c 8170 8171 Upstream-ID: fc5e695d5d107d730182e2da7b23f00b489e0ee1 8172 8173commit d94c1dfef2ea30ca67b1204ada7c3b537c54f4d0 8174Author: Damien Miller <djm@mindrot.org> 8175Date: Sun Mar 12 10:48:14 2017 +1100 8176 8177 sync fmt_scaled.c with OpenBSD 8178 8179 revision 1.13 8180 date: 2017/03/11 23:37:23; author: djm; state: Exp; lines: +14 -1; commitid: jnFKyHkB3CEiEZ2R; 8181 fix signed integer overflow in scan_scaled. Found by Nicolas Iooss 8182 using AFL against ssh_config. ok deraadt@ millert@ 8183 ---------------------------- 8184 revision 1.12 8185 date: 2013/11/29 19:00:51; author: deraadt; state: Exp; lines: +6 -5; 8186 fairly simple unsigned char casts for ctype 8187 ok krw 8188 ---------------------------- 8189 revision 1.11 8190 date: 2012/11/12 14:07:20; author: halex; state: Exp; lines: +4 -2; 8191 make scan_scaled set errno to EINVAL rather than ERANGE if it encounters 8192 an invalid multiplier, like the man page says it should 8193 8194 "looks sensible" deraadt@, ok ian@ 8195 ---------------------------- 8196 revision 1.10 8197 date: 2009/06/20 15:00:04; author: martynas; state: Exp; lines: +4 -4; 8198 use llabs instead of the home-grown version; and some comment changes 8199 ok ian@, millert@ 8200 ---------------------------- 8201 8202commit 894221a63fa061e52e414ca58d47edc5fe645968 8203Author: djm@openbsd.org <djm@openbsd.org> 8204Date: Fri Mar 10 05:01:13 2017 +0000 8205 8206 upstream commit 8207 8208 When updating hostkeys, accept RSA keys if 8209 HostkeyAlgorithms contains any RSA keytype. Previously, ssh could ignore RSA 8210 keys when any of the ssh-rsa-sha2-* methods was enabled in HostkeyAlgorithms 8211 nit ssh-rsa (SHA1 signatures) was not. bz#2650 reported by Luis Ressel; ok 8212 dtucker@ 8213 8214 Upstream-ID: c5e8cfee15c42f4a05d126158a0766ea06da79d2 8215 8216commit dd3e2298663f4cc1a06bc69582d00dcfee27d73c 8217Author: djm@openbsd.org <djm@openbsd.org> 8218Date: Fri Mar 10 04:24:55 2017 +0000 8219 8220 upstream commit 8221 8222 make hostname matching really insensitive to case; 8223 bz#2685, reported by Petr Cerny; ok dtucker@ 8224 8225 Upstream-ID: e467622ff154269e36ba8b6c9e3d105e1c4a9253 8226 8227commit 77a9be9446697fe8b5499fe651f4a82a71a4b51f 8228Author: djm@openbsd.org <djm@openbsd.org> 8229Date: Fri Mar 10 03:52:48 2017 +0000 8230 8231 upstream commit 8232 8233 reword a comment to make it fit 80 columns 8234 8235 Upstream-ID: 4ef509a66b96c7314bbcc87027c2af71fa9d0ba4 8236 8237commit 61b8ef6a66efaec07e023342cb94a10bdc2254dc 8238Author: djm@openbsd.org <djm@openbsd.org> 8239Date: Fri Mar 10 04:27:32 2017 +0000 8240 8241 upstream commit 8242 8243 better match sshd config parser behaviour: fatal() if 8244 line is overlong, increase line buffer to match sshd's; bz#2651 reported by 8245 Don Fong; ok dtucker@ 8246 8247 Upstream-ID: b175ae7e0ba403833f1ee566edf10f67443ccd18 8248 8249commit db2597207e69912f2592cd86a1de8e948a9d7ffb 8250Author: djm@openbsd.org <djm@openbsd.org> 8251Date: Fri Mar 10 04:26:06 2017 +0000 8252 8253 upstream commit 8254 8255 ensure hostname is lower-case before hashing it; 8256 bz#2591 reported by Griff Miller II; ok dtucker@ 8257 8258 Upstream-ID: c3b8b93804f376bd00d859b8bcd9fc0d86b4db17 8259 8260commit df9936936c695f85c1038bd706d62edf752aca4b 8261Author: djm@openbsd.org <djm@openbsd.org> 8262Date: Fri Mar 10 04:24:55 2017 +0000 8263 8264 upstream commit 8265 8266 make hostname matching really insensitive to case; 8267 bz#2685, reported by Petr Cerny; ok dtucker@ 8268 8269 Upstream-ID: e632b7a9bf0d0558d5ff56dab98b7cca6c3db549 8270 8271commit 67eed24bfa7645d88fa0b883745fccb22a0e527e 8272Author: dtucker@openbsd.org <dtucker@openbsd.org> 8273Date: Fri Mar 10 04:11:00 2017 +0000 8274 8275 upstream commit 8276 8277 Remove old null check from config dumper. Patch from 8278 jjelen at redhat.com vi bz#2687, ok djm@ 8279 8280 Upstream-ID: 824ab71467b78c4bab0dd1b3a38e8bc5f63dd528 8281 8282commit 183ba55aaaecca0206184b854ad6155df237adbe 8283Author: djm@openbsd.org <djm@openbsd.org> 8284Date: Fri Mar 10 04:07:20 2017 +0000 8285 8286 upstream commit 8287 8288 fix regression in 7.4 server-sig-algs, where we were 8289 accidentally excluding SHA2 RSA signature methods. bz#2680, patch from Nuno 8290 Goncalves; ok dtucker@ 8291 8292 Upstream-ID: 81ac8bfb30960447740b9b8f6a214dcf322f12e8 8293 8294commit 66be4fe8c4435af5bbc82998501a142a831f1181 8295Author: dtucker@openbsd.org <dtucker@openbsd.org> 8296Date: Fri Mar 10 03:53:11 2017 +0000 8297 8298 upstream commit 8299 8300 Check for NULL return value from key_new. Patch from 8301 jjelen at redhat.com via bz#2687, ok djm@ 8302 8303 Upstream-ID: 059e33cd43cba88dc8caf0b1936fd4dd88fd5b8e 8304 8305commit ec2892b5c7fea199914cb3a6afb3af38f84990bf 8306Author: djm@openbsd.org <djm@openbsd.org> 8307Date: Fri Mar 10 03:52:48 2017 +0000 8308 8309 upstream commit 8310 8311 reword a comment to make it fit 80 columns 8312 8313 Upstream-ID: b4b48b4487c0821d16e812c40c9b09f03b28e349 8314 8315commit 7fadbb6da3f4122de689165651eb39985e1cba85 8316Author: dtucker@openbsd.org <dtucker@openbsd.org> 8317Date: Fri Mar 10 03:48:57 2017 +0000 8318 8319 upstream commit 8320 8321 Check for NULL argument to sshkey_read. Patch from 8322 jjelen at redhat.com via bz#2687, ok djm@ 8323 8324 Upstream-ID: c2d00c2ea50c4861d271d0a586f925cc64a87e0e 8325 8326commit 5a06b9e019e2b0b0f65a223422935b66f3749de3 8327Author: dtucker@openbsd.org <dtucker@openbsd.org> 8328Date: Fri Mar 10 03:45:40 2017 +0000 8329 8330 upstream commit 8331 8332 Plug some mem leaks mostly on error paths. From jjelen 8333 at redhat.com via bz#2687, ok djm@ 8334 8335 Upstream-ID: 3fb030149598957a51b7c8beb32bf92cf30c96f2 8336 8337commit f6edbe9febff8121f26835996b1229b5064d31b7 8338Author: dtucker@openbsd.org <dtucker@openbsd.org> 8339Date: Fri Mar 10 03:24:48 2017 +0000 8340 8341 upstream commit 8342 8343 Plug mem leak on GLOB_NOMATCH case. From jjelen at 8344 redhat.com via bz#2687, ok djm@ 8345 8346 Upstream-ID: 8016a7ae97719d3aa55fb723fc2ad3200058340d 8347 8348commit 566b3a46e89a2fda2db46f04f2639e92da64a120 8349Author: dtucker@openbsd.org <dtucker@openbsd.org> 8350Date: Fri Mar 10 03:22:40 2017 +0000 8351 8352 upstream commit 8353 8354 Plug descriptor leaks of auth_sock. From jjelen at 8355 redhat.com via bz#2687, ok djm@ 8356 8357 Upstream-ID: 248acb99a5ed2fdca37d1aa33c0fcee7be286d88 8358 8359commit 8a2834454c73dfc1eb96453c0e97690595f3f4c2 8360Author: djm@openbsd.org <djm@openbsd.org> 8361Date: Fri Mar 10 03:18:24 2017 +0000 8362 8363 upstream commit 8364 8365 correctly hash hosts with a port number. Reported by Josh 8366 Powers in bz#2692; ok dtucker@ 8367 8368 Upstream-ID: 468e357ff143e00acc05bdd2803a696b3d4b6442 8369 8370commit 9747b9c742de409633d4753bf1a752cbd211e2d3 8371Author: djm@openbsd.org <djm@openbsd.org> 8372Date: Fri Mar 10 03:15:58 2017 +0000 8373 8374 upstream commit 8375 8376 don't truncate off \r\n from long stderr lines; bz#2688, 8377 reported by Brian Dyson; ok dtucker@ 8378 8379 Upstream-ID: cdfdc4ba90639af807397ce996153c88af046ca4 8380 8381commit 4a4b75adac862029a1064577eb5af299b1580cdd 8382Author: dtucker@openbsd.org <dtucker@openbsd.org> 8383Date: Fri Mar 10 02:59:51 2017 +0000 8384 8385 upstream commit 8386 8387 Validate digest arg in ssh_digest_final; from jjelen at 8388 redhat.com via bz#2687, ok djm@ 8389 8390 Upstream-ID: dbe5494dfddfe523fab341a3dab5a79e7338f878 8391 8392commit bee0167be2340d8de4bdc1ab1064ec957c85a447 8393Author: Darren Tucker <dtucker@zip.com.au> 8394Date: Fri Mar 10 13:40:18 2017 +1100 8395 8396 Check for NULL from malloc. 8397 8398 Part of bz#2687, from jjelen at redhat.com. 8399 8400commit da39b09d43b137a5a3d071b51589e3efb3701238 8401Author: Darren Tucker <dtucker@zip.com.au> 8402Date: Fri Mar 10 13:22:32 2017 +1100 8403 8404 If OSX is using launchd, remove screen no. 8405 8406 Check for socket with and without screen number. From Apple and Jakob 8407 Schlyter via bz#2341, with contributions from Ron Frederick, ok djm@ 8408 8409commit 8fb15311a011517eb2394bb95a467c209b8b336c 8410Author: djm@openbsd.org <djm@openbsd.org> 8411Date: Wed Mar 8 12:07:47 2017 +0000 8412 8413 upstream commit 8414 8415 quote [host]:port in generated ProxyJump commandline; the 8416 [ / ] characters can confuse some shells (e.g. zsh). Reported by Lauri 8417 Tirkkonen via bugs@ 8418 8419 Upstream-ID: 65cdd161460e1351c3d778e974c1c2a4fa4bc182 8420 8421commit 18501151cf272a15b5f2c5e777f2e0933633c513 8422Author: dtucker@openbsd.org <dtucker@openbsd.org> 8423Date: Mon Mar 6 02:03:20 2017 +0000 8424 8425 upstream commit 8426 8427 Check l->hosts before dereferencing; fixes potential null 8428 pointer deref. ok djm@ 8429 8430 Upstream-ID: 81c0327c6ec361da794b5c680601195cc23d1301 8431 8432commit d072370793f1a20f01ad827ba8fcd3b8f2c46165 8433Author: dtucker@openbsd.org <dtucker@openbsd.org> 8434Date: Mon Mar 6 00:44:51 2017 +0000 8435 8436 upstream commit 8437 8438 linenum is unsigned long so use %lu in log formats. ok 8439 deraadt@ 8440 8441 Upstream-ID: 9dc582d9bb887ebe0164e030d619fc20b1a4ea08 8442 8443commit 12d3767ba4c84c32150cbe6ff6494498780f12c9 8444Author: djm@openbsd.org <djm@openbsd.org> 8445Date: Fri Mar 3 06:13:11 2017 +0000 8446 8447 upstream commit 8448 8449 fix ssh-keygen -H accidentally corrupting known_hosts that 8450 contained already-hashed entries. HKF_MATCH_HOST_HASHED is only set by 8451 hostkeys_foreach() when hostname matching is in use, so we need to look for 8452 the hash marker explicitly. 8453 8454 Upstream-ID: da82ad653b93e8a753580d3cf5cd448bc2520528 8455 8456commit d7abb771bd5a941b26144ba400a34563a1afa589 8457Author: djm@openbsd.org <djm@openbsd.org> 8458Date: Tue Feb 28 06:10:08 2017 +0000 8459 8460 upstream commit 8461 8462 small memleak: free fd_set on connection timeout (though 8463 we are heading to exit anyway). From Tom Rix in bz#2683 8464 8465 Upstream-ID: 10e3dadbb8199845b66581473711642d9e6741c4 8466 8467commit 78142e3ab3887e53a968d6e199bcb18daaf2436e 8468Author: jmc@openbsd.org <jmc@openbsd.org> 8469Date: Mon Feb 27 14:30:33 2017 +0000 8470 8471 upstream commit 8472 8473 errant dot; from klemens nanni 8474 8475 Upstream-ID: 83d93366a5acf47047298c5d3ebc5e7426f37921 8476 8477commit 8071a6924c12bb51406a9a64a4b2892675112c87 8478Author: djm@openbsd.org <djm@openbsd.org> 8479Date: Fri Feb 24 03:16:34 2017 +0000 8480 8481 upstream commit 8482 8483 might as well set the listener socket CLOEXEC 8484 8485 Upstream-ID: 9c538433d6a0ca79f5f21decc5620e46fb68ab57 8486 8487commit d5499190559ebe374bcdfa8805408646ceffad64 8488Author: djm@openbsd.org <djm@openbsd.org> 8489Date: Sun Feb 19 00:11:29 2017 +0000 8490 8491 upstream commit 8492 8493 add test cases for C locale; ok schwarze@ 8494 8495 Upstream-Regress-ID: 783d75de35fbc923d46e2a5e6cee30f8f381ba87 8496 8497commit 011c8ffbb0275281a0cf330054cf21be10c43e37 8498Author: djm@openbsd.org <djm@openbsd.org> 8499Date: Sun Feb 19 00:10:57 2017 +0000 8500 8501 upstream commit 8502 8503 Add a common nl_langinfo(CODESET) alias for US-ASCII 8504 "ANSI_X3.4-1968" that is used by Linux. Fixes mprintf output truncation for 8505 non-UTF-8 locales on Linux spotted by dtucker@; ok deraadt@ schwarze@ 8506 8507 Upstream-ID: c6808956ebffd64066f9075d839f74ff0dd60719 8508 8509commit 0c4430a19b73058a569573492f55e4c9eeaae67b 8510Author: dtucker@openbsd.org <dtucker@openbsd.org> 8511Date: Tue Feb 7 23:03:11 2017 +0000 8512 8513 upstream commit 8514 8515 Remove deprecated SSH1 options RSAAuthentication and 8516 RhostsRSAAuthentication from regression test sshd_config. 8517 8518 Upstream-Regress-ID: 8066b753d9dce7cf02ff87af5c727ff680d99491 8519 8520commit 3baa4cdd197c95d972ec3d07f1c0d08f2d7d9199 8521Author: dtucker@openbsd.org <dtucker@openbsd.org> 8522Date: Fri Feb 17 02:32:05 2017 +0000 8523 8524 upstream commit 8525 8526 Do not show rsa1 key type in usage when compiled without 8527 SSH1 support. 8528 8529 Upstream-ID: 068b5c41357a02f319957746fa4e84ea73960f57 8530 8531commit ecc35893715f969e98fee118481f404772de4132 8532Author: dtucker@openbsd.org <dtucker@openbsd.org> 8533Date: Fri Feb 17 02:31:14 2017 +0000 8534 8535 upstream commit 8536 8537 ifdef out "rsa1" from the list of supported keytypes when 8538 compiled without SSH1 support. Found by kdunlop at guralp.com, ok djm@ 8539 8540 Upstream-ID: cea93a26433d235bb1d64b1d990f19a9c160a70f 8541 8542commit 10577c6d96a55b877a960b2d0b75edef1b9945af 8543Author: djm@openbsd.org <djm@openbsd.org> 8544Date: Fri Feb 17 02:04:15 2017 +0000 8545 8546 upstream commit 8547 8548 For ProxyJump/-J, surround host name with brackets to 8549 allow literal IPv6 addresses. From Dick Visser; ok dtucker@ 8550 8551 Upstream-ID: 3a5d3b0171250daf6a5235e91bce09c1d5746bf1 8552 8553commit b2afdaf1b52231aa23d2153f4a8c5a60a694dda4 8554Author: jsg@openbsd.org <jsg@openbsd.org> 8555Date: Wed Feb 15 23:38:31 2017 +0000 8556 8557 upstream commit 8558 8559 Fix memory leaks in match_filter_list() error paths. 8560 8561 ok dtucker@ markus@ 8562 8563 Upstream-ID: c7f96ac0877f6dc9188bbc908100a8d246cc7f0e 8564 8565commit 6d5a41b38b55258213ecfaae9df7a758caa752a1 8566Author: djm@openbsd.org <djm@openbsd.org> 8567Date: Wed Feb 15 01:46:47 2017 +0000 8568 8569 upstream commit 8570 8571 fix division by zero crash in "df" output when server 8572 returns zero total filesystem blocks/inodes. Spotted by Guido Vranken; ok 8573 dtucker@ 8574 8575 Upstream-ID: 6fb6c2ae6b289aa07b6232dbc0be54682ef5419f 8576 8577commit bd5d7d239525d595ecea92765334af33a45d9d63 8578Author: Darren Tucker <dtucker@zip.com.au> 8579Date: Sun Feb 12 15:45:15 2017 +1100 8580 8581 ifdef out EVP_R_PRIVATE_KEY_DECODE_ERROR 8582 8583 EVP_R_PRIVATE_KEY_DECODE_ERROR was added in OpenSSL 1.0.0 so ifdef out 8584 for the benefit of OpenSSL versions prior to that. 8585 8586commit 155d540d00ff55f063421ec182ec8ff2b7ab6cbe 8587Author: djm@openbsd.org <djm@openbsd.org> 8588Date: Fri Feb 10 04:34:50 2017 +0000 8589 8590 upstream commit 8591 8592 bring back r1.34 that was backed out for problems loading 8593 public keys: 8594 8595 translate OpenSSL error codes to something more 8596 meaninful; bz#2522 reported by Jakub Jelen, ok dtucker@ 8597 8598 with additional fix from Jakub Jelen to solve the backout. 8599 bz#2525 bz#2523 re-ok dtucker@ 8600 8601 Upstream-ID: a9d5bc0306f4473d9b4f4484f880e95f3c1cc031 8602 8603commit a287c5ad1e0bf9811c7b9221979b969255076019 8604Author: djm@openbsd.org <djm@openbsd.org> 8605Date: Fri Feb 10 03:36:40 2017 +0000 8606 8607 upstream commit 8608 8609 Sanitise escape sequences in key comments sent to printf 8610 but preserve valid UTF-8 when the locale supports it; bz#2520 ok dtucker@ 8611 8612 Upstream-ID: e8eed28712ba7b22d49be534237eed019875bd1e 8613 8614commit e40269be388972848aafcca7060111c70aab5b87 8615Author: millert@openbsd.org <millert@openbsd.org> 8616Date: Wed Feb 8 20:32:43 2017 +0000 8617 8618 upstream commit 8619 8620 Avoid printf %s NULL. From semarie@, OK djm@ 8621 8622 Upstream-ID: 06beef7344da0208efa9275d504d60d2a5b9266c 8623 8624commit 5b90709ab8704dafdb31e5651073b259d98352bc 8625Author: djm@openbsd.org <djm@openbsd.org> 8626Date: Mon Feb 6 09:22:51 2017 +0000 8627 8628 upstream commit 8629 8630 Restore \r\n newline sequence for server ident string. The CR 8631 got lost in the flensing of SSHv1. Pointed out by Stef Bon 8632 8633 Upstream-ID: 5333fd43ce5396bf5999496096fac5536e678fac 8634 8635commit 97c31c46ee2e6b46dfffdfc4f90bbbf188064cbc 8636Author: djm@openbsd.org <djm@openbsd.org> 8637Date: Fri Feb 3 23:01:42 2017 +0000 8638 8639 upstream commit 8640 8641 unit test for match_filter_list() function; still want a 8642 better name for this... 8643 8644 Upstream-Regress-ID: 840ad6118552c35111f0a897af9c8d93ab8de92a 8645 8646commit f1a193464a7b77646f0d0cedc929068e4a413ab4 8647Author: djm@openbsd.org <djm@openbsd.org> 8648Date: Fri Feb 3 23:05:57 2017 +0000 8649 8650 upstream commit 8651 8652 use ssh_packet_set_log_preamble() to include connection 8653 username in packet log messages, e.g. 8654 8655 Connection closed by invalid user foo 10.1.1.1 port 44056 [preauth] 8656 8657 ok markus@ bz#113 8658 8659 Upstream-ID: 3591b88bdb5416d6066fb3d49d8fff2375bf1a15 8660 8661commit 07edd7e9537ab32aa52abb5fb2a915c350fcf441 8662Author: djm@openbsd.org <djm@openbsd.org> 8663Date: Fri Feb 3 23:03:33 2017 +0000 8664 8665 upstream commit 8666 8667 add ssh_packet_set_log_preamble() to allow inclusion of a 8668 preamble string in disconnect messages; ok markus@ 8669 8670 Upstream-ID: 34cb41182cd76d414c214ccb01c01707849afead 8671 8672commit 68bc8cfa7642d3ccbf2cd64281c16b8b9205be59 8673Author: djm@openbsd.org <djm@openbsd.org> 8674Date: Fri Feb 3 23:01:19 2017 +0000 8675 8676 upstream commit 8677 8678 support =- for removing methods from algorithms lists, 8679 e.g. Ciphers=-*cbc; suggested by Cristian Ionescu-Idbohrn in bz#2671 "I like 8680 it" markus@ 8681 8682 Upstream-ID: c78c38f9f81a963b33d0eade559f6048add24a6d 8683 8684commit c924b2ef941028a1f31e6e94f54dfeeeef462a4e 8685Author: djm@openbsd.org <djm@openbsd.org> 8686Date: Fri Feb 3 05:05:56 2017 +0000 8687 8688 upstream commit 8689 8690 allow form-feed characters at EOL; bz#2431 ok dtucker@ 8691 8692 Upstream-ID: 1f453afaba6da2ae69d6afdf1ae79a917552f1a2 8693 8694commit 523db8540b720c4d21ab0ff6f928476c70c38aab 8695Author: Damien Miller <djm@mindrot.org> 8696Date: Fri Feb 3 16:01:22 2017 +1100 8697 8698 prefer to use ldns-config to find libldns 8699 8700 Should fix bz#2603 - "Build with ldns and without kerberos support 8701 fails if ldns compiled with kerberos support" by including correct 8702 cflags/libs 8703 8704 ok dtucker@ 8705 8706commit c998bf0afa1a01257a53793eba57941182e9e0b7 8707Author: dtucker@openbsd.org <dtucker@openbsd.org> 8708Date: Fri Feb 3 02:56:00 2017 +0000 8709 8710 upstream commit 8711 8712 Make ssh_packet_set_rekey_limits take u32 for the number of 8713 seconds until rekeying (negative values are rejected at config parse time). 8714 This allows the removal of some casts and a signed vs unsigned comparison 8715 warning. 8716 8717 rekey_time is cast to int64 for the comparison which is a no-op 8718 on OpenBSD, but should also do the right thing in -portable on 8719 anything still using 32bit time_t (until the system time actually 8720 wraps, anyway). 8721 8722 some early guidance deraadt@, ok djm@ 8723 8724 Upstream-ID: c9f18613afb994a07e7622eb326f49de3d123b6c 8725 8726commit 3ec5fa4ba97d4c4853620daea26a33b9f1fe3422 8727Author: jsg@openbsd.org <jsg@openbsd.org> 8728Date: Thu Feb 2 10:54:25 2017 +0000 8729 8730 upstream commit 8731 8732 In vasnmprintf() return an error if malloc fails and 8733 don't set a function argument to the address of free'd memory. 8734 8735 ok djm@ 8736 8737 Upstream-ID: 1efffffff2f51d53c9141f245b90ac23d33b9779 8738 8739commit 858252fb1d451ebb0969cf9749116c8f0ee42753 8740Author: dtucker@openbsd.org <dtucker@openbsd.org> 8741Date: Wed Feb 1 02:59:09 2017 +0000 8742 8743 upstream commit 8744 8745 Return true reason for port forwarding failures where 8746 feasible rather than always "administratively prohibited". bz#2674, ok djm@ 8747 8748 Upstream-ID: d901d9887951774e604ca970e1827afaaef9e419 8749 8750commit 6ba9f893838489add6ec4213c7a997b425e4a9e0 8751Author: dtucker@openbsd.org <dtucker@openbsd.org> 8752Date: Mon Jan 30 23:27:39 2017 +0000 8753 8754 upstream commit 8755 8756 Small correction to the known_hosts section on when it is 8757 updated. Patch from lkppo at free.fr some time ago, pointed out by smallm at 8758 sdf.org 8759 8760 Upstream-ID: 1834d7af179dea1a12ad2137f84566664af225d5 8761 8762commit c61d5ec3c11e7ff9779b6127421d9f166cf10915 8763Author: Darren Tucker <dtucker@zip.com.au> 8764Date: Fri Feb 3 14:10:34 2017 +1100 8765 8766 Remove _XOPEN_SOURCE from wide char detection. 8767 8768 Having _XOPEN_SOURCE unconditionally causes problems on some platforms 8769 and configurations, notably Solaris 64-bit binaries. It was there for 8770 the benefit of Linux put the required bits in the *-*linux* section. 8771 8772 Patch from yvoinov at gmail.com. 8773 8774commit f25ee13b3e81fd80efeb871dc150fe49d7fc8afd 8775Author: djm@openbsd.org <djm@openbsd.org> 8776Date: Mon Jan 30 05:22:14 2017 +0000 8777 8778 upstream commit 8779 8780 fully unbreak: some $SSH invocations did not have -F 8781 specified and could pick up the ~/.ssh/config of the user running the tests 8782 8783 Upstream-Regress-ID: f362d1892c0d3e66212d5d3fc02d915c58ef6b89 8784 8785commit 6956e21fb26652887475fe77ea40d2efcf25908b 8786Author: djm@openbsd.org <djm@openbsd.org> 8787Date: Mon Jan 30 04:54:07 2017 +0000 8788 8789 upstream commit 8790 8791 partially unbreak: was not specifying hostname on some 8792 $SSH invocations 8793 8794 Upstream-Regress-ID: bc8a5e98e57bad0a92ef4f34ed91c1d18294e2cc 8795 8796commit 52763dd3fe0a4678dafdf7aeb32286e514130afc 8797Author: djm@openbsd.org <djm@openbsd.org> 8798Date: Mon Jan 30 01:03:00 2017 +0000 8799 8800 upstream commit 8801 8802 revise keys/principals command hang fix (bz#2655) to 8803 consume entire output, avoiding sending SIGPIPE to subprocesses early; ok 8804 dtucker@ 8805 8806 Upstream-ID: 7cb04b31a61f8c78c4e48ceededcd2fd5c4ee1bc 8807 8808commit 381a2615a154a82c4c53b787f4a564ef894fe9ac 8809Author: djm@openbsd.org <djm@openbsd.org> 8810Date: Mon Jan 30 00:38:50 2017 +0000 8811 8812 upstream commit 8813 8814 small cleanup post SSHv1 removal: 8815 8816 remove SSHv1-isms in commented examples 8817 8818 reorder token table to group deprecated and compile-time conditional tokens 8819 better 8820 8821 fix config dumping code for some compile-time conditional options that 8822 weren't being correctly skipped (SSHv1 and PKCS#11) 8823 8824 Upstream-ID: f2e96b3cb3158d857c5a91ad2e15925df3060105 8825 8826commit 4833d01591b7eb049489d9558b65f5553387ed43 8827Author: djm@openbsd.org <djm@openbsd.org> 8828Date: Mon Jan 30 00:34:01 2017 +0000 8829 8830 upstream commit 8831 8832 some explicit NULL tests when dumping configured 8833 forwardings; from Karsten Weiss 8834 8835 Upstream-ID: 40957b8dea69672b0e50df6b4a91a94e3e37f72d 8836 8837commit 326e2fae9f2e3e067b5651365eba86b35ee5a6b2 8838Author: djm@openbsd.org <djm@openbsd.org> 8839Date: Mon Jan 30 00:32:28 2017 +0000 8840 8841 upstream commit 8842 8843 misplaced braces in test; from Karsten Weiss 8844 8845 Upstream-ID: f7b794074d3aae8e35b69a91d211c599c94afaae 8846 8847commit 3e032a95e46bfaea9f9e857678ac8fa5f63997fb 8848Author: djm@openbsd.org <djm@openbsd.org> 8849Date: Mon Jan 30 00:32:03 2017 +0000 8850 8851 upstream commit 8852 8853 don't dereference authctxt before testing != NULL, it 8854 causes compilers to make assumptions; from Karsten Weiss 8855 8856 Upstream-ID: 794243aad1e976ebc717885b7a97a25e00c031b2 8857 8858commit 01cfaa2b1cfb84f3cdd32d1bf82b120a8d30e057 8859Author: djm@openbsd.org <djm@openbsd.org> 8860Date: Fri Jan 6 02:51:16 2017 +0000 8861 8862 upstream commit 8863 8864 use correct ssh-add program; bz#2654, from Colin Watson 8865 8866 Upstream-Regress-ID: 7042a36e1bdaec6562f6e57e9d047efe9c7a6030 8867 8868commit e5c7ec67cdc42ae2584085e0fc5cc5ee91133cf5 8869Author: dtucker@openbsd.org <dtucker@openbsd.org> 8870Date: Fri Jan 6 02:26:10 2017 +0000 8871 8872 upstream commit 8873 8874 Account for timeouts in the integrity tests as failures. 8875 8876 If the first test in a series for a given MAC happens to modify the low 8877 bytes of a packet length, then ssh will time out and this will be 8878 interpreted as a test failure. Patch from cjwatson at debian.org via 8879 bz#2658. 8880 8881 Upstream-Regress-ID: e7467613b0badedaa300bc6fc7495ec2f44e2fb9 8882 8883commit dbaf599b61bd6e0f8469363a8c8e7f633b334018 8884Author: dtucker@openbsd.org <dtucker@openbsd.org> 8885Date: Fri Jan 6 02:09:25 2017 +0000 8886 8887 upstream commit 8888 8889 Make forwarding test less racy by using unix domain 8890 sockets instead of TCP ports where possible. Patch from cjwatson at 8891 debian.org via bz#2659. 8892 8893 Upstream-Regress-ID: 4756375aac5916ef9d25452a1c1d5fa9e90299a9 8894 8895commit 9390b0031ebd6eb5488d3bc4d4333c528dffc0a6 8896Author: dtucker@openbsd.org <dtucker@openbsd.org> 8897Date: Sun Jan 29 21:35:23 2017 +0000 8898 8899 upstream commit 8900 8901 Fix typo in ~C error message for bad port forward 8902 cancellation. bz#2672, from Brad Marshall via Colin Watson and Ubuntu's 8903 bugtracker. 8904 8905 Upstream-ID: 0d4a7e5ead6cc59c9a44b4c1e5435ab3aada09af 8906 8907commit 4ba15462ca38883b8a61a1eccc093c79462d5414 8908Author: guenther@openbsd.org <guenther@openbsd.org> 8909Date: Sat Jan 21 11:32:04 2017 +0000 8910 8911 upstream commit 8912 8913 The POSIX APIs that that sockaddrs all ignore the s*_len 8914 field in the incoming socket, so userspace doesn't need to set it unless it 8915 has its own reasons for tracking the size along with the sockaddr. 8916 8917 ok phessler@ deraadt@ florian@ 8918 8919 Upstream-ID: ca6e49e2f22f2b9e81d6d924b90ecd7e422e7437 8920 8921commit a1187bd3ef3e4940af849ca953a1b849dae78445 8922Author: jmc@openbsd.org <jmc@openbsd.org> 8923Date: Fri Jan 6 16:28:12 2017 +0000 8924 8925 upstream commit 8926 8927 keep the tokens list sorted; 8928 8929 Upstream-ID: b96239dae4fb3aa94146bb381afabcc7740a1638 8930 8931commit b64077f9767634715402014f509e58decf1e140d 8932Author: djm@openbsd.org <djm@openbsd.org> 8933Date: Fri Jan 6 09:27:52 2017 +0000 8934 8935 upstream commit 8936 8937 fix previous 8938 8939 Upstream-ID: c107d6a69bc22325d79fbf78a2a62e04bcac6895 8940 8941commit 5e820e9ea2e949aeb93071fe31c80b0c42f2b2de 8942Author: djm@openbsd.org <djm@openbsd.org> 8943Date: Fri Jan 6 03:53:58 2017 +0000 8944 8945 upstream commit 8946 8947 show a useful error message when included config files 8948 can't be opened; bz#2653, ok dtucker@ 8949 8950 Upstream-ID: f598b73b5dfe497344cec9efc9386b4e5a3cb95b 8951 8952commit 13bd2e2d622d01dc85d22b94520a5b243d006049 8953Author: djm@openbsd.org <djm@openbsd.org> 8954Date: Fri Jan 6 03:45:41 2017 +0000 8955 8956 upstream commit 8957 8958 sshd_config is documented to set 8959 GSSAPIStrictAcceptorCheck=yes by default, so actually make it do this. 8960 bz#2637 ok dtucker 8961 8962 Upstream-ID: 99ef8ac51f17f0f7aec166cb2e34228d4d72a665 8963 8964commit f89b928534c9e77f608806a217d39a2960cc7fd0 8965Author: djm@openbsd.org <djm@openbsd.org> 8966Date: Fri Jan 6 03:41:58 2017 +0000 8967 8968 upstream commit 8969 8970 Avoid confusing error message when attempting to use 8971 ssh-keyscan built without SSH protocol v.1 to scan for v.1 keys; bz#2583 8972 8973 Upstream-ID: 5d214abd3a21337d67c6dcc5aa6f313298d0d165 8974 8975commit 0999533014784579aa6f01c2d3a06e3e8804b680 8976Author: dtucker@openbsd.org <dtucker@openbsd.org> 8977Date: Fri Jan 6 02:34:54 2017 +0000 8978 8979 upstream commit 8980 8981 Re-add '%k' token for AuthorizedKeysCommand which was 8982 lost during the re-org in rev 1.235. bz#2656, from jboning at gmail.com. 8983 8984 Upstream-ID: 2884e203c02764d7b3fe7472710d9c24bdc73e38 8985 8986commit 51045869fa084cdd016fdd721ea760417c0a3bf3 8987Author: djm@openbsd.org <djm@openbsd.org> 8988Date: Wed Jan 4 05:37:40 2017 +0000 8989 8990 upstream commit 8991 8992 unbreak Unix domain socket forwarding for root; ok 8993 markus@ 8994 8995 Upstream-ID: 6649c76eb7a3fa15409373295ca71badf56920a2 8996 8997commit 58fca12ba967ea5c768653535604e1522d177e44 8998Author: Darren Tucker <dtucker@zip.com.au> 8999Date: Mon Jan 16 09:08:32 2017 +1100 9000 9001 Remove LOGIN_PROGRAM. 9002 9003 UseLogin is gone, remove leftover. bz#2665, from cjwatson at debian.org 9004 9005commit b108ce92aae0ca0376dce9513d953be60e449ae1 9006Author: djm@openbsd.org <djm@openbsd.org> 9007Date: Wed Jan 4 02:21:43 2017 +0000 9008 9009 upstream commit 9010 9011 relax PKCS#11 whitelist a bit to allow libexec as well as 9012 lib directories. 9013 9014 Upstream-ID: cf5617958e2e2d39f8285fd3bc63b557da484702 9015 9016commit c7995f296b9222df2846f56ecf61e5ae13d7a53d 9017Author: djm@openbsd.org <djm@openbsd.org> 9018Date: Tue Jan 3 05:46:51 2017 +0000 9019 9020 upstream commit 9021 9022 check number of entries in SSH2_FXP_NAME response; avoids 9023 unreachable overflow later. Reported by Jann Horn 9024 9025 Upstream-ID: b6b2b434a6d6035b1644ca44f24cd8104057420f 9026 9027commit ddd3d34e5c7979ca6f4a3a98a7d219a4ed3d98c2 9028Author: djm@openbsd.org <djm@openbsd.org> 9029Date: Fri Dec 30 22:08:02 2016 +0000 9030 9031 upstream commit 9032 9033 fix deadlock when keys/principals command produces a lot of 9034 output and a key is matched early; bz#2655, patch from jboning AT gmail.com 9035 9036 Upstream-ID: e19456429bf99087ea994432c16d00a642060afe 9037 9038commit 30eee7d1b2fec33c14870cc11910610be5d2aa6f 9039Author: Darren Tucker <dtucker@zip.com.au> 9040Date: Tue Dec 20 12:16:11 2016 +1100 9041 9042 Re-add missing "Prerequisites" header and fix typo 9043 9044 Patch from HARUYAMA Seigo <haruyama at unixuser org>. 9045 9046commit c8c60f3663165edd6a52632c6ddbfabfce1ca865 9047Author: djm@openbsd.org <djm@openbsd.org> 9048Date: Mon Dec 19 22:35:23 2016 +0000 9049 9050 upstream commit 9051 9052 use standard /bin/sh equality test; from Mike Frysinger 9053 9054 Upstream-Regress-ID: 7b6f0b63525f399844c8ac211003acb8e4b0bec2 9055 9056commit 4a354fc231174901f2629437c2a6e924a2dd6772 9057Author: Damien Miller <djm@mindrot.org> 9058Date: Mon Dec 19 15:59:26 2016 +1100 9059 9060 crank version numbers for release 9061 9062commit 5f8d0bb8413d4d909cc7aa3c616fb0538224c3c9 9063Author: djm@openbsd.org <djm@openbsd.org> 9064Date: Mon Dec 19 04:55:51 2016 +0000 9065 9066 upstream commit 9067 9068 openssh-7.4 9069 9070 Upstream-ID: 1ee404adba6bbe10ae9277cbae3a94abe2867b79 9071 9072commit 3a8213ea0ed843523e34e55ab9c852332bab4c7b 9073Author: djm@openbsd.org <djm@openbsd.org> 9074Date: Mon Dec 19 04:55:18 2016 +0000 9075 9076 upstream commit 9077 9078 remove testcase that depends on exact output and 9079 behaviour of snprintf(..., "%s", NULL) 9080 9081 Upstream-Regress-ID: cab4288531766bd9593cb556613b91a2eeefb56f 9082 9083commit eae735a82d759054f6ec7b4e887fb7a5692c66d7 9084Author: dtucker@openbsd.org <dtucker@openbsd.org> 9085Date: Mon Dec 19 03:32:57 2016 +0000 9086 9087 upstream commit 9088 9089 Use LOGNAME to get current user and fall back to whoami if 9090 not set. Mainly to benefit -portable since some platforms don't have whoami. 9091 9092 Upstream-Regress-ID: e3a16b7836a3ae24dc8f8a4e43fdf8127a60bdfa 9093 9094commit 0d2f88428487518eea60602bd593989013831dcf 9095Author: dtucker@openbsd.org <dtucker@openbsd.org> 9096Date: Fri Dec 16 03:51:19 2016 +0000 9097 9098 upstream commit 9099 9100 Add regression test for AllowUsers and DenyUsers. Patch from 9101 Zev Weiss <zev at bewilderbeest.net> 9102 9103 Upstream-Regress-ID: 8f1aac24d52728398871dac14ad26ea38b533fb9 9104 9105commit 3bc8180a008929f6fe98af4a56fb37d04444b417 9106Author: Darren Tucker <dtucker@zip.com.au> 9107Date: Fri Dec 16 15:02:24 2016 +1100 9108 9109 Add missing monitor.h include. 9110 9111 Fixes warning pointed out by Zev Weiss <zev at bewilderbeest.net> 9112 9113commit 410681f9015d76cc7b137dd90dac897f673244a0 9114Author: djm@openbsd.org <djm@openbsd.org> 9115Date: Fri Dec 16 02:48:55 2016 +0000 9116 9117 upstream commit 9118 9119 revert to rev1.2; the new bits in this test depend on changes 9120 to ssh that aren't yet committed 9121 9122 Upstream-Regress-ID: 828ffc2c7afcf65d50ff2cf3dfc47a073ad39123 9123 9124commit 2f2ffa4fbe4b671bbffa0611f15ba44cff64d58e 9125Author: dtucker@openbsd.org <dtucker@openbsd.org> 9126Date: Fri Dec 16 01:06:27 2016 +0000 9127 9128 upstream commit 9129 9130 Move the "stop sshd" code into its own helper function. 9131 Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@ 9132 9133 Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329 9134 9135commit e15e7152331e3976b35475fd4e9c72897ad0f074 9136Author: djm@openbsd.org <djm@openbsd.org> 9137Date: Fri Dec 16 01:01:07 2016 +0000 9138 9139 upstream commit 9140 9141 regression test for certificates along with private key 9142 with no public half. bz#2617, mostly from Adam Eijdenberg 9143 9144 Upstream-Regress-ID: 2e74dc2c726f4dc839609b3ce045466b69f01115 9145 9146commit 9a70ec085faf6e55db311cd1a329f1a35ad2a500 9147Author: dtucker@openbsd.org <dtucker@openbsd.org> 9148Date: Thu Dec 15 23:50:37 2016 +0000 9149 9150 upstream commit 9151 9152 Use $SUDO to read pidfile in case root's umask is 9153 restricted. From portable. 9154 9155 Upstream-Regress-ID: f6b1c7ffbc5a0dfb7d430adb2883344899174a98 9156 9157commit fe06b68f824f8f55670442fb31f2c03526dd326c 9158Author: dtucker@openbsd.org <dtucker@openbsd.org> 9159Date: Thu Dec 15 21:29:05 2016 +0000 9160 9161 upstream commit 9162 9163 Add missing braces in DenyUsers code. Patch from zev at 9164 bewilderbeest.net, ok deraadt@ 9165 9166 Upstream-ID: d747ace338dcf943b077925f90f85f789714b54e 9167 9168commit dcc7d74242a574fd5c4afbb4224795b1644321e7 9169Author: dtucker@openbsd.org <dtucker@openbsd.org> 9170Date: Thu Dec 15 21:20:41 2016 +0000 9171 9172 upstream commit 9173 9174 Fix text in error message. Patch from zev at 9175 bewilderbeest.net. 9176 9177 Upstream-ID: deb0486e175e7282f98f9a15035d76c55c84f7f6 9178 9179commit b737e4d7433577403a31cff6614f6a1b0b5e22f4 9180Author: djm@openbsd.org <djm@openbsd.org> 9181Date: Wed Dec 14 00:36:34 2016 +0000 9182 9183 upstream commit 9184 9185 disable Unix-domain socket forwarding when privsep is 9186 disabled 9187 9188 Upstream-ID: ab61516ae0faadad407857808517efa900a0d6d0 9189 9190commit 08a1e7014d65c5b59416a0e138c1f73f417496eb 9191Author: djm@openbsd.org <djm@openbsd.org> 9192Date: Fri Dec 9 03:04:29 2016 +0000 9193 9194 upstream commit 9195 9196 log connections dropped in excess of MaxStartups at 9197 verbose LogLevel; bz#2613 based on diff from Tomas Kuthan; ok dtucker@ 9198 9199 Upstream-ID: 703ae690dbf9b56620a6018f8a3b2389ce76d92b 9200 9201commit 10e290ec00964b2bf70faab15a10a5574bb80527 9202Author: Darren Tucker <dtucker@zip.com.au> 9203Date: Tue Dec 13 13:51:32 2016 +1100 9204 9205 Get default of TEST_SSH_UTF8 from environment. 9206 9207commit b9b8ba3f9ed92c6220b58d70d1e6d8aa3eea1104 9208Author: Darren Tucker <dtucker@zip.com.au> 9209Date: Tue Dec 13 12:56:40 2016 +1100 9210 9211 Remove commented-out includes. 9212 9213 These commented-out includes have "Still needed?" comments. Since 9214 they've been commented out for ~13 years I assert that they're not. 9215 9216commit 25275f1c9d5f01a0877d39444e8f90521a598ea0 9217Author: Darren Tucker <dtucker@zip.com.au> 9218Date: Tue Dec 13 12:54:23 2016 +1100 9219 9220 Add prototype for strcasestr in compat library. 9221 9222commit afec07732aa2985142f3e0b9a01eb6391f523dec 9223Author: Darren Tucker <dtucker@zip.com.au> 9224Date: Tue Dec 13 10:23:03 2016 +1100 9225 9226 Add strcasestr to compat library. 9227 9228 Fixes build on (at least) Solaris 10. 9229 9230commit dda78a03af32e7994f132d923c2046e98b7c56c8 9231Author: Damien Miller <djm@mindrot.org> 9232Date: Mon Dec 12 13:57:10 2016 +1100 9233 9234 Force Turkish locales back to C/POSIX; bz#2643 9235 9236 Turkish locales are unique in their handling of the letters 'i' and 9237 'I' (yes, they are different letters) and OpenSSH isn't remotely 9238 prepared to deal with that. For now, the best we can do is to force 9239 OpenSSH to use the C/POSIX locale and try to preserve the UTF-8 9240 encoding if possible. 9241 9242 ok dtucker@ 9243 9244commit c35995048f41239fc8895aadc3374c5f75180554 9245Author: Darren Tucker <dtucker@zip.com.au> 9246Date: Fri Dec 9 12:52:02 2016 +1100 9247 9248 exit is in stdlib.h not unistd.h (that's _exit). 9249 9250commit d399a8b914aace62418c0cfa20341aa37a192f98 9251Author: Darren Tucker <dtucker@zip.com.au> 9252Date: Fri Dec 9 12:33:25 2016 +1100 9253 9254 Include <unistd.h> for exit in utf8 locale test. 9255 9256commit 47b8c99ab3221188ad3926108dd9d36da3b528ec 9257Author: Darren Tucker <dtucker@zip.com.au> 9258Date: Thu Dec 8 15:48:34 2016 +1100 9259 9260 Check for utf8 local support before testing it. 9261 9262 Check for utf8 local support and if not found, do not attempt to run the 9263 utf8 tests. Suggested by djm@ 9264 9265commit 4089fc1885b3a2822204effbb02b74e3da58240d 9266Author: Darren Tucker <dtucker@zip.com.au> 9267Date: Thu Dec 8 12:57:24 2016 +1100 9268 9269 Use AC_PATH_TOOL for krb5-config. 9270 9271 This will use the host-prefixed version when cross compiling; patch from 9272 david.michael at coreos.com. 9273 9274commit b4867e0712c89b93be905220c82f0a15e6865d1e 9275Author: djm@openbsd.org <djm@openbsd.org> 9276Date: Tue Dec 6 07:48:01 2016 +0000 9277 9278 upstream commit 9279 9280 make IdentityFile successfully load and use certificates that 9281 have no corresponding bare public key. E.g. just a private id_rsa and 9282 certificate id_rsa-cert.pub (and no id_rsa.pub). 9283 9284 bz#2617 ok dtucker@ 9285 9286 Upstream-ID: c1e9699b8c0e3b63cc4189e6972e3522b6292604 9287 9288commit c9792783a98881eb7ed295680013ca97a958f8ac 9289Author: Damien Miller <djm@mindrot.org> 9290Date: Fri Nov 25 14:04:21 2016 +1100 9291 9292 Add a gnome-ssh-askpass3 target for GTK+3 version 9293 9294 Based on patch from Colin Watson via bz#2640 9295 9296commit 7be85ae02b9de0993ce0a1d1e978e11329f6e763 9297Author: Damien Miller <djm@mindrot.org> 9298Date: Fri Nov 25 14:03:53 2016 +1100 9299 9300 Make gnome-ssh-askpass2.c GTK+3-friendly 9301 9302 Patch from Colin Watson via bz#2640 9303 9304commit b9844a45c7f0162fd1b5465683879793d4cc4aaa 9305Author: djm@openbsd.org <djm@openbsd.org> 9306Date: Sun Dec 4 23:54:02 2016 +0000 9307 9308 upstream commit 9309 9310 Fix public key authentication when multiple 9311 authentication is in use. Instead of deleting and re-preparing the entire 9312 keys list, just reset the 'used' flags; the keys list is already in a good 9313 order (with already- tried keys at the back) 9314 9315 Analysis and patch from Vincent Brillault on bz#2642; ok dtucker@ 9316 9317 Upstream-ID: 7123f12dc2f3bcaae715853035a97923d7300176 9318 9319commit f2398eb774075c687b13af5bc22009eb08889abe 9320Author: dtucker@openbsd.org <dtucker@openbsd.org> 9321Date: Sun Dec 4 22:27:25 2016 +0000 9322 9323 upstream commit 9324 9325 Unlink PidFile on SIGHUP and always recreate it when the 9326 new sshd starts. Regression tests (and possibly other things) depend on the 9327 pidfile being recreated after SIGHUP, and unlinking it means it won't contain 9328 a stale pid if sshd fails to restart. ok djm@ markus@ 9329 9330 Upstream-ID: 132dd6dda0c77dd49d2f15b2573b5794f6160870 9331 9332commit 85aa2efeba51a96bf6834f9accf2935d96150296 9333Author: djm@openbsd.org <djm@openbsd.org> 9334Date: Wed Nov 30 03:01:33 2016 +0000 9335 9336 upstream commit 9337 9338 test new behaviour of cert force-command restriction vs. 9339 authorized_key/ principals 9340 9341 Upstream-Regress-ID: 399efa7469d40c404c0b0a295064ce75d495387c 9342 9343commit 5d333131cd8519d022389cfd3236280818dae1bc 9344Author: jmc@openbsd.org <jmc@openbsd.org> 9345Date: Wed Nov 30 06:54:26 2016 +0000 9346 9347 upstream commit 9348 9349 tweak previous; while here fix up FILES and AUTHORS; 9350 9351 Upstream-ID: 93f6e54086145a75df8d8ec7d8689bdadbbac8fa 9352 9353commit 786d5994da79151180cb14a6cf157ebbba61c0cc 9354Author: djm@openbsd.org <djm@openbsd.org> 9355Date: Wed Nov 30 03:07:37 2016 +0000 9356 9357 upstream commit 9358 9359 add a whitelist of paths from which ssh-agent will load 9360 (via ssh-pkcs11-helper) a PKCS#11 module; ok markus@ 9361 9362 Upstream-ID: fe79769469d9cd6d26fe0dc15751b83ef2a06e8f 9363 9364commit 7844f357cdd90530eec81340847783f1f1da010b 9365Author: djm@openbsd.org <djm@openbsd.org> 9366Date: Wed Nov 30 03:00:05 2016 +0000 9367 9368 upstream commit 9369 9370 Add a sshd_config DisableForwaring option that disables 9371 X11, agent, TCP, tunnel and Unix domain socket forwarding, as well as 9372 anything else we might implement in the future. 9373 9374 This, like the 'restrict' authorized_keys flag, is intended to be a 9375 simple and future-proof way of restricting an account. Suggested as 9376 a complement to 'restrict' by Jann Horn; ok markus@ 9377 9378 Upstream-ID: 203803f66e533a474086b38a59ceb4cf2410fcf7 9379 9380commit fd6dcef2030d23c43f986d26979f84619c10589d 9381Author: djm@openbsd.org <djm@openbsd.org> 9382Date: Wed Nov 30 02:57:40 2016 +0000 9383 9384 upstream commit 9385 9386 When a forced-command appears in both a certificate and 9387 an authorized keys/principals command= restriction, refuse to accept the 9388 certificate unless they are identical. 9389 9390 The previous (documented) behaviour of having the certificate forced- 9391 command override the other could be a bit confused and more error-prone. 9392 9393 Pointed out by Jann Horn of Project Zero; ok dtucker@ 9394 9395 Upstream-ID: 79d811b6eb6bbe1221bf146dde6928f92d2cd05f 9396 9397commit 7fc4766ac78abae81ee75b22b7550720bfa28a33 9398Author: dtucker@openbsd.org <dtucker@openbsd.org> 9399Date: Wed Nov 30 00:28:31 2016 +0000 9400 9401 upstream commit 9402 9403 On startup, check to see if sshd is already daemonized 9404 and if so, skip the call to daemon() and do not rewrite the PidFile. This 9405 means that when sshd re-execs itself on SIGHUP the process ID will no longer 9406 change. Should address bz#2641. ok djm@ markus@. 9407 9408 Upstream-ID: 5ea0355580056fb3b25c1fd6364307d9638a37b9 9409 9410commit c9f880c195c65f1dddcbc4ce9d6bfea7747debcc 9411Author: Damien Miller <djm@mindrot.org> 9412Date: Wed Nov 30 13:51:49 2016 +1100 9413 9414 factor out common PRNG reseed before privdrop 9415 9416 Add a call to RAND_poll() to ensure than more than pid+time gets 9417 stirred into child processes states. Prompted by analysis from Jann 9418 Horn at Project Zero. ok dtucker@ 9419 9420commit 79e4829ec81dead1b30999e1626eca589319a47f 9421Author: dtucker@openbsd.org <dtucker@openbsd.org> 9422Date: Fri Nov 25 03:02:01 2016 +0000 9423 9424 upstream commit 9425 9426 Allow PuTTY interop tests to run unattended. bz#2639, 9427 patch from cjwatson at debian.org. 9428 9429 Upstream-Regress-ID: 4345253558ac23b2082aebabccd48377433b6fe0 9430 9431commit 504c3a9a1bf090f6b27260fc3e8ea7d984d163dc 9432Author: dtucker@openbsd.org <dtucker@openbsd.org> 9433Date: Fri Nov 25 02:56:49 2016 +0000 9434 9435 upstream commit 9436 9437 Reverse args to sshd-log-wrapper. Matches change in 9438 portable, where it allows sshd do be optionally run under Valgrind. 9439 9440 Upstream-Regress-ID: b438d1c6726dc5caa2a45153e6103a0393faa906 9441 9442commit bd13017736ec2f8f9ca498fe109fb0035f322733 9443Author: dtucker@openbsd.org <dtucker@openbsd.org> 9444Date: Fri Nov 25 02:49:18 2016 +0000 9445 9446 upstream commit 9447 9448 Fix typo in trace message; from portable. 9449 9450 Upstream-Regress-ID: 4c4a2ba0d37faf5fd230a91b4c7edb5699fbd73a 9451 9452commit 7da751d8b007c7f3e814fd5737c2351440d78b4c 9453Author: tb@openbsd.org <tb@openbsd.org> 9454Date: Tue Nov 1 13:43:27 2016 +0000 9455 9456 upstream commit 9457 9458 Clean up MALLOC_OPTIONS. For the unittests, move 9459 MALLOC_OPTIONS and TEST_ENV to unittets/Makefile.inc. 9460 9461 ok otto 9462 9463 Upstream-Regress-ID: 890d497e0a38eeddfebb11cc429098d76cf29f12 9464 9465commit 36f58e68221bced35e06d1cca8d97c48807a8b71 9466Author: tb@openbsd.org <tb@openbsd.org> 9467Date: Mon Oct 31 23:45:08 2016 +0000 9468 9469 upstream commit 9470 9471 Remove the obsolete A and P flags from MALLOC_OPTIONS. 9472 9473 ok dtucker 9474 9475 Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59 9476 9477commit b0899ee26a6630883c0f2350098b6a35e647f512 9478Author: dtucker@openbsd.org <dtucker@openbsd.org> 9479Date: Tue Nov 29 03:54:50 2016 +0000 9480 9481 upstream commit 9482 9483 Factor out code to disconnect from controlling terminal 9484 into its own function. ok djm@ 9485 9486 Upstream-ID: 39fd9e8ebd7222615a837312face5cc7ae962885 9487 9488commit 54d022026aae4f53fa74cc636e4a032d9689b64d 9489Author: djm@openbsd.org <djm@openbsd.org> 9490Date: Fri Nov 25 23:24:45 2016 +0000 9491 9492 upstream commit 9493 9494 use sshbuf_allocate() to pre-allocate the buffer used for 9495 loading keys. This avoids implicit realloc inside the buffer code, which 9496 might theoretically leave fragments of the key on the heap. This doesn't 9497 appear to happen in practice for normal sized keys, but was observed for 9498 novelty oversize ones. 9499 9500 Pointed out by Jann Horn of Project Zero; ok markus@ 9501 9502 Upstream-ID: d620e1d46a29fdea56aeadeda120879eddc60ab1 9503 9504commit a9c746088787549bb5b1ae3add7d06a1b6d93d5e 9505Author: djm@openbsd.org <djm@openbsd.org> 9506Date: Fri Nov 25 23:22:04 2016 +0000 9507 9508 upstream commit 9509 9510 split allocation out of sshbuf_reserve() into a separate 9511 sshbuf_allocate() function; ok markus@ 9512 9513 Upstream-ID: 11b8a2795afeeb1418d508a2c8095b3355577ec2 9514 9515commit f0ddedee460486fa0e32fefb2950548009e5026e 9516Author: markus@openbsd.org <markus@openbsd.org> 9517Date: Wed Nov 23 23:14:15 2016 +0000 9518 9519 upstream commit 9520 9521 allow ClientAlive{Interval,CountMax} in Match; ok dtucker, 9522 djm 9523 9524 Upstream-ID: 8beb4c1eadd588f1080b58932281983864979f55 9525 9526commit 1a6f9d2e2493d445cd9ee496e6e3c2a2f283f66a 9527Author: djm@openbsd.org <djm@openbsd.org> 9528Date: Tue Nov 8 22:04:34 2016 +0000 9529 9530 upstream commit 9531 9532 unbreak DenyUsers; reported by henning@ 9533 9534 Upstream-ID: 1c67d4148f5e953c35acdb62e7c08ae8e33f7cb2 9535 9536commit 010359b32659f455fddd2bd85fd7cc4d7a3b994a 9537Author: djm@openbsd.org <djm@openbsd.org> 9538Date: Sun Nov 6 05:46:37 2016 +0000 9539 9540 upstream commit 9541 9542 Validate address ranges for AllowUser/DenyUsers at 9543 configuration load time and refuse to accept bad ones. It was previously 9544 possible to specify invalid CIDR address ranges (e.g. djm@127.1.2.3/55) and 9545 these would always match. 9546 9547 Thanks to Laurence Parry for a detailed bug report. ok markus (for 9548 a previous diff version) 9549 9550 Upstream-ID: 9dfcdd9672b06e65233ea4434c38226680d40bfb 9551 9552commit efb494e81d1317209256b38b49f4280897c61e69 9553Author: djm@openbsd.org <djm@openbsd.org> 9554Date: Fri Oct 28 03:33:52 2016 +0000 9555 9556 upstream commit 9557 9558 Improve pkcs11_add_provider() logging: demote some 9559 excessively verbose error()s to debug()s, include PKCS#11 provider name and 9560 slot in log messages where possible. bz#2610, based on patch from Jakub Jelen 9561 9562 Upstream-ID: 3223ef693cfcbff9079edfc7e89f55bf63e1973d 9563 9564commit 5ee3fb5affd7646f141749483205ade5fc54adaf 9565Author: Darren Tucker <dtucker@zip.com.au> 9566Date: Tue Nov 1 08:12:33 2016 +1100 9567 9568 Use ptrace(PT_DENY_ATTACH, ..) on OS X. 9569 9570commit 315d2a4e674d0b7115574645cb51f968420ebb34 9571Author: Damien Miller <djm@mindrot.org> 9572Date: Fri Oct 28 14:34:07 2016 +1100 9573 9574 Unbreak AES-CTR ciphers on old (~0.9.8) OpenSSL 9575 9576 ok dtucker@ 9577 9578commit a9ff3950b8e80ff971b4d44bbce96df27aed28af 9579Author: Darren Tucker <dtucker@zip.com.au> 9580Date: Fri Oct 28 14:26:58 2016 +1100 9581 9582 Move OPENSSL_NO_RIPEMD160 to compat. 9583 9584 Move OPENSSL_NO_RIPEMD160 to compat and add ifdefs to mac.c around the 9585 ripemd160 MACs. 9586 9587commit bce58885160e5db2adda3054c3b81fe770f7285a 9588Author: Darren Tucker <dtucker@zip.com.au> 9589Date: Fri Oct 28 13:52:31 2016 +1100 9590 9591 Check if RIPEMD160 is disabled in OpenSSL. 9592 9593commit d924640d4c355d1b5eca1f4cc60146a9975dbbff 9594Author: Darren Tucker <dtucker@zip.com.au> 9595Date: Fri Oct 28 13:38:19 2016 +1100 9596 9597 Skip ssh1 specfic ciphers. 9598 9599 cipher-3des1.c and cipher-bf1.c are specific to sshv1 so don't even try 9600 to compile them when Protocol 1 is not enabled. 9601 9602commit 79d078e7a49caef746516d9710ec369ba45feab6 9603Author: jsg@openbsd.org <jsg@openbsd.org> 9604Date: Tue Oct 25 04:08:13 2016 +0000 9605 9606 upstream commit 9607 9608 Fix logic in add_local_forward() that inverted a test 9609 when code was refactored out into bind_permitted(). This broke ssh port 9610 forwarding for non-priv ports as a non root user. 9611 9612 ok dtucker@ 'looks good' deraadt@ 9613 9614 Upstream-ID: ddb8156ca03cc99997de284ce7777536ff9570c9 9615 9616commit a903e315dee483e555c8a3a02c2946937f9b4e5d 9617Author: dtucker@openbsd.org <dtucker@openbsd.org> 9618Date: Mon Oct 24 01:09:17 2016 +0000 9619 9620 upstream commit 9621 9622 Remove dead breaks, found via opencoverage.net. ok 9623 deraadt@ 9624 9625 Upstream-ID: ad9cc655829d67fad219762810770787ba913069 9626 9627commit b4e96b4c9bea4182846e4942ba2048e6d708ee54 9628Author: Darren Tucker <dtucker@zip.com.au> 9629Date: Wed Oct 26 08:43:25 2016 +1100 9630 9631 Use !=NULL instead of >0 for getdefaultproj. 9632 9633 getdefaultproj() returns a pointer so test it for NULL inequality 9634 instead of >0. Fixes compiler warning and is more correct. Patch from 9635 David Binderman. 9636 9637commit 1c4ef0b808d3d38232aeeb1cebb7e9a43def42c5 9638Author: dtucker@openbsd.org <dtucker@openbsd.org> 9639Date: Sun Oct 23 22:04:05 2016 +0000 9640 9641 upstream commit 9642 9643 Factor out "can bind to low ports" check into its own function. This will 9644 make it easier for Portable to support platforms with permissions models 9645 other than uid==0 (eg bz#2625). ok djm@, "doesn't offend me too much" 9646 deraadt@. 9647 9648 Upstream-ID: 86213df4183e92b8f189a6d2dac858c994bfface 9649 9650commit 0b9ee623d57e5de7e83e66fd61a7ba9a5be98894 9651Author: dtucker@openbsd.org <dtucker@openbsd.org> 9652Date: Wed Oct 19 23:21:56 2016 +0000 9653 9654 upstream commit 9655 9656 When tearing down ControlMaster connecctions, don't 9657 pollute stderr when LogLevel=quiet. Patch from Tim Kuijsten via tech@. 9658 9659 Upstream-ID: d9b3a68b2a7c2f2fc7f74678e29a4618d55ceced 9660 9661commit 09e6a7d8354224933febc08ddcbc2010f542284e 9662Author: Darren Tucker <dtucker@zip.com.au> 9663Date: Mon Oct 24 09:06:18 2016 +1100 9664 9665 Wrap stdint.h include in ifdef. 9666 9667commit 08d9e9516e587b25127545c029e5464b2e7f2919 9668Author: Darren Tucker <dtucker@zip.com.au> 9669Date: Fri Oct 21 09:46:46 2016 +1100 9670 9671 Fix formatting. 9672 9673commit 461f50e7ab8751d3a55e9158c44c13031db7ba1d 9674Author: Darren Tucker <dtucker@zip.com.au> 9675Date: Fri Oct 21 06:55:58 2016 +1100 9676 9677 Update links to https. 9678 9679 www.openssh.com now supports https and ftp.openbsd.org no longer 9680 supports ftp. Make all links to these https. 9681 9682commit dd4e7212a6141f37742de97795e79db51e4427ad 9683Author: Darren Tucker <dtucker@zip.com.au> 9684Date: Fri Oct 21 06:48:46 2016 +1100 9685 9686 Update host key generation examples. 9687 9688 Remove ssh1 host key generation, add ssh-keygen -A 9689 9690commit 6d49ae82634c67e9a4d4af882bee20b40bb8c639 9691Author: Darren Tucker <dtucker@zip.com.au> 9692Date: Fri Oct 21 05:22:55 2016 +1100 9693 9694 Update links. 9695 9696 Make links to openssh.com HTTPS now that it's supported, point release 9697 notes link to the HTML release notes page, and update a couple of other 9698 links and bits of text. 9699 9700commit fe0d1ca6ace06376625084b004ee533f2c2ea9d6 9701Author: Darren Tucker <dtucker@zip.com.au> 9702Date: Thu Oct 20 03:42:09 2016 +1100 9703 9704 Remote channels .orig and .rej files. 9705 9706 These files were incorrectly added during an OpenBSD sync. 9707