1 commit d38f05dbdd291212bc95ea80648b72b7177e9f4e 2 Author: Darren Tucker <dtucker (a] zip.com.au> 3 Date: Mon Mar 20 13:38:27 2017 +1100 4 5 Add llabs() implementation. 6 7 commit 72536316a219b7394996a74691a5d4ec197480f7 8 Author: Damien Miller <djm (a] mindrot.org> 9 Date: Mon Mar 20 12:23:04 2017 +1100 10 11 crank version numbers 12 13 commit 3be52bc36bdfd24ded7e0f46999e7db520fb4e3f 14 Author: djm (a] openbsd.org <djm (a] openbsd.org> 15 Date: Mon Mar 20 01:18:59 2017 +0000 16 17 upstream commit 18 19 openssh-7.5 20 21 Upstream-ID: b8b9a4a949427c393cd868215e1724ceb3467ee5 22 23 commit db84e52fe9cfad57f22e7e23c5fbf00092385129 24 Author: Damien Miller <djm (a] mindrot.org> 25 Date: Mon Mar 20 12:07:20 2017 +1100 26 27 I'm a doofus. 28 29 Unbreak obvious syntax error. 30 31 commit 89f04852db27643717c9c3a2b0dde97ae50099ee 32 Author: Damien Miller <djm (a] mindrot.org> 33 Date: Mon Mar 20 11:53:34 2017 +1100 34 35 on Cygwin, check paths from server for backslashes 36 37 Pointed out by Jann Horn of Google Project Zero 38 39 commit 7ef1f9bafc2cc8d97ff2fbd4f280002b6e8ea5d9 40 Author: Damien Miller <djm (a] mindrot.org> 41 Date: Mon Mar 20 11:48:34 2017 +1100 42 43 Yet another synonym for ASCII: "646" 44 45 Used by NetBSD; this unbreaks mprintf() and friends there for the C 46 locale (caught by dtucker@ and his menagerie of test systems). 47 48 commit 9165abfea3f68a0c684a6ed2e575e59bc31a3a6b 49 Author: Damien Miller <djm (a] mindrot.org> 50 Date: Mon Mar 20 09:58:34 2017 +1100 51 52 create test mux socket in /tmp 53 54 Creating the socket in $OBJ could blow past the (quite limited) 55 path limit for Unix domain sockets. As a bandaid for bz#2660, 56 reported by Colin Watson; ok dtucker@ 57 58 commit 2adbe1e63bc313d03e8e84e652cc623af8ebb163 59 Author: markus (a] openbsd.org <markus (a] openbsd.org> 60 Date: Wed Mar 15 07:07:39 2017 +0000 61 62 upstream commit 63 64 disallow KEXINIT before NEWKEYS; ok djm; report by 65 vegard.nossum at oracle.com 66 67 Upstream-ID: 3668852d1f145050e62f1da08917de34cb0c5234 68 69 commit 2fbf91684d76d38b9cf06550b69c9e41bca5a71c 70 Author: Darren Tucker <dtucker (a] zip.com.au> 71 Date: Thu Mar 16 14:05:46 2017 +1100 72 73 Include includes.h for compat bits. 74 75 commit b55f634e96b9c5b0cd991e23a9ca181bec4bdbad 76 Author: Darren Tucker <dtucker (a] zip.com.au> 77 Date: Thu Mar 16 13:45:17 2017 +1100 78 79 Wrap stdint.h in #ifdef HAVE_STDINT_H 80 81 commit 55a1117d7342a0bf8b793250cf314bab6b482b99 82 Author: Damien Miller <djm (a] mindrot.org> 83 Date: Thu Mar 16 11:22:42 2017 +1100 84 85 Adapt Cygwin config script to privsep knob removal 86 87 Patch from Corinna Vinschen. 88 89 commit 1a321bfdb91defe3c4d9cca5651724ae167e5436 90 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 91 Date: Wed Mar 15 03:52:30 2017 +0000 92 93 upstream commit 94 95 accidents happen to the best of us; ok djm 96 97 Upstream-ID: b7a9dbd71011ffde95e06f6945fe7197dedd1604 98 99 commit 25f837646be8c2017c914d34be71ca435dfc0e07 100 Author: djm (a] openbsd.org <djm (a] openbsd.org> 101 Date: Wed Mar 15 02:25:09 2017 +0000 102 103 upstream commit 104 105 fix regression in 7.4: deletion of PKCS#11-hosted keys 106 would fail unless they were specified by full physical pathname. Report and 107 fix from Jakub Jelen via bz#2682; ok dtucker@ 108 109 Upstream-ID: 5b5bc20ca11cacb5d5eb29c3f93fd18425552268 110 111 commit a8c5eeacf032a7d3408957e45dd7603cc1baf55f 112 Author: djm (a] openbsd.org <djm (a] openbsd.org> 113 Date: Wed Mar 15 02:19:09 2017 +0000 114 115 upstream commit 116 117 Fix segfault when sshd attempts to load RSA1 keys (can 118 only happen when protocol v.1 support is enabled for the client). Reported by 119 Jakub Jelen in bz#2686; ok dtucker 120 121 Upstream-ID: 8fdaec2ba4b5f65db1d094f6714ce64b25d871d7 122 123 commit 66705948c0639a7061a0d0753266da7685badfec 124 Author: djm (a] openbsd.org <djm (a] openbsd.org> 125 Date: Tue Mar 14 07:19:07 2017 +0000 126 127 upstream commit 128 129 Mark the sshd_config UsePrivilegeSeparation option as 130 deprecated, effectively making privsep mandatory in sandboxing mode. ok 131 markus@ deraadt@ 132 133 (note: this doesn't remove the !privsep code paths, though that will 134 happen eventually). 135 136 Upstream-ID: b4c52666256c4dd865f8ce9431af5d6ce2d74a0a 137 138 commit f86586b03fe6cd8f595289bde200a94bc2c191af 139 Author: Damien Miller <djm (a] mindrot.org> 140 Date: Tue Mar 14 18:26:29 2017 +1100 141 142 Make seccomp-bpf sandbox work on Linux/X32 143 144 Allow clock_gettime syscall with X32 bit masked off. Apparently 145 this is required for at least some kernel versions. bz#2142 146 Patch mostly by Colin Watson. ok dtucker@ 147 148 commit 2429cf78dd2a9741ce27ba25ac41c535274a0af6 149 Author: Damien Miller <djm (a] mindrot.org> 150 Date: Tue Mar 14 18:01:52 2017 +1100 151 152 require OpenSSL >=1.0.1 153 154 commit e3ea335abeab731c68f2b2141bee85a4b0bf680f 155 Author: Damien Miller <djm (a] mindrot.org> 156 Date: Tue Mar 14 17:48:43 2017 +1100 157 158 Remove macro trickery; no binary change 159 160 This stops the SC_ALLOW(), SC_ALLOW_ARG() and SC_DENY() macros 161 prepending __NR_ to the syscall number parameter and just makes 162 them explicit in the macro invocations. 163 164 No binary change in stripped object file before/after. 165 166 commit 5f1596e11d55539678c41f68aed358628d33d86f 167 Author: Damien Miller <djm (a] mindrot.org> 168 Date: Tue Mar 14 13:15:18 2017 +1100 169 170 support ioctls for ICA crypto card on Linux/s390 171 172 Based on patch from Eduardo Barretto; ok dtucker@ 173 174 commit b1b22dd0df2668b322dda174e501dccba2cf5c44 175 Author: Darren Tucker <dtucker (a] zip.com.au> 176 Date: Tue Mar 14 14:19:36 2017 +1100 177 178 Plumb conversion test into makefile. 179 180 commit f57783f1ddfb4cdfbd612c6beb5ec01cb5b9a6b9 181 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 182 Date: Tue Mar 14 01:20:29 2017 +0000 183 184 upstream commit 185 186 Add unit test for convtime(). 187 188 Upstream-Regress-ID: 8717bc0ca4c21120f6dd3a1d3b7a363f707c31e1 189 190 commit 8884b7247d094cd11ff9e39c325ba928c5bdbc6c 191 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 192 Date: Tue Mar 14 01:10:07 2017 +0000 193 194 upstream commit 195 196 Add ASSERT_LONG_* helpers. 197 198 Upstream-Regress-ID: fe15beaea8f5063c7f21b0660c722648e3d76431 199 200 commit c6774d21185220c0ba11e8fd204bf0ad1a432071 201 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 202 Date: Tue Mar 14 00:55:37 2017 +0000 203 204 upstream commit 205 206 Fix convtime() overflow test on boundary condition, 207 spotted by & ok djm. 208 209 Upstream-ID: 51f14c507ea87a3022e63f574100613ab2ba5708 210 211 commit f5746b40cfe6d767c8e128fe50c43274b31cd594 212 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 213 Date: Tue Mar 14 00:25:03 2017 +0000 214 215 upstream commit 216 217 Check for integer overflow when parsing times in 218 convtime(). Reported by nicolas.iooss at m4x.org, ok djm@ 219 220 Upstream-ID: 35e6a4e98f6fa24df50bfb8ba1307cf70e966f13 221 222 commit f5907982f42a8d88a430b8a46752cbb7859ba979 223 Author: Darren Tucker <dtucker (a] zip.com.au> 224 Date: Tue Mar 14 13:38:15 2017 +1100 225 226 Add a "unit" target to run only unit tests. 227 228 commit 9e96b41682aed793fadbea5ccd472f862179fb02 229 Author: Damien Miller <djm (a] mindrot.org> 230 Date: Tue Mar 14 12:24:47 2017 +1100 231 232 Fix weakness in seccomp-bpf sandbox arg inspection 233 234 Syscall arguments are passed via an array of 64-bit values in struct 235 seccomp_data, but we were only inspecting the bottom 32 bits and not 236 even those correctly for BE systems. 237 238 Fortunately, the only case argument inspection was used was in the 239 socketcall filtering so using this for sandbox escape seems 240 impossible. 241 242 ok dtucker 243 244 commit 8ff3fc3f2f7c13e8968717bc2b895ee32c441275 245 Author: djm (a] openbsd.org <djm (a] openbsd.org> 246 Date: Sat Mar 11 23:44:16 2017 +0000 247 248 upstream commit 249 250 regress tests for loading certificates without public keys; 251 bz#2617 based on patch from Adam Eijdenberg; ok markus@ dtucker@ 252 253 Upstream-Regress-ID: 0145d19328ed995b73fe2d9da33596b17429d0d0 254 255 commit 1e24552716194db8f2f620587b876158a9ef56ad 256 Author: djm (a] openbsd.org <djm (a] openbsd.org> 257 Date: Sat Mar 11 23:40:26 2017 +0000 258 259 upstream commit 260 261 allow ssh to use certificates accompanied by a private 262 key file but no corresponding plain *.pub public key. bz#2617 based on patch 263 from Adam Eijdenberg; ok dtucker@ markus@ 264 265 Upstream-ID: 295668dca2c39505281577217583ddd2bd4b00b9 266 267 commit 0fb1a617a07b8df5de188dd5a0c8bf293d4bfc0e 268 Author: markus (a] openbsd.org <markus (a] openbsd.org> 269 Date: Sat Mar 11 13:07:35 2017 +0000 270 271 upstream commit 272 273 Don't count the initial block twice when computing how 274 many bytes to discard for the work around for the attacks against CBC-mode. 275 ok djm@; report from Jean Paul, Kenny, Martin and Torben @ RHUL 276 277 Upstream-ID: f445f509a4e0a7ba3b9c0dae7311cb42458dc1e2 278 279 commit ef653dd5bd5777132d9f9ee356225f9ee3379504 280 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 281 Date: Fri Mar 10 07:18:32 2017 +0000 282 283 upstream commit 284 285 krl.c 286 287 Upstream-ID: fc5e695d5d107d730182e2da7b23f00b489e0ee1 288 289 commit d94c1dfef2ea30ca67b1204ada7c3b537c54f4d0 290 Author: Damien Miller <djm (a] mindrot.org> 291 Date: Sun Mar 12 10:48:14 2017 +1100 292 293 sync fmt_scaled.c with OpenBSD 294 295 revision 1.13 296 date: 2017/03/11 23:37:23; author: djm; state: Exp; lines: +14 -1; commitid: jnFKyHkB3CEiEZ2R; 297 fix signed integer overflow in scan_scaled. Found by Nicolas Iooss 298 using AFL against ssh_config. ok deraadt@ millert@ 299 ---------------------------- 300 revision 1.12 301 date: 2013/11/29 19:00:51; author: deraadt; state: Exp; lines: +6 -5; 302 fairly simple unsigned char casts for ctype 303 ok krw 304 ---------------------------- 305 revision 1.11 306 date: 2012/11/12 14:07:20; author: halex; state: Exp; lines: +4 -2; 307 make scan_scaled set errno to EINVAL rather than ERANGE if it encounters 308 an invalid multiplier, like the man page says it should 309 310 "looks sensible" deraadt@, ok ian@ 311 ---------------------------- 312 revision 1.10 313 date: 2009/06/20 15:00:04; author: martynas; state: Exp; lines: +4 -4; 314 use llabs instead of the home-grown version; and some comment changes 315 ok ian@, millert@ 316 ---------------------------- 317 318 commit 894221a63fa061e52e414ca58d47edc5fe645968 319 Author: djm (a] openbsd.org <djm (a] openbsd.org> 320 Date: Fri Mar 10 05:01:13 2017 +0000 321 322 upstream commit 323 324 When updating hostkeys, accept RSA keys if 325 HostkeyAlgorithms contains any RSA keytype. Previously, ssh could ignore RSA 326 keys when any of the ssh-rsa-sha2-* methods was enabled in HostkeyAlgorithms 327 nit ssh-rsa (SHA1 signatures) was not. bz#2650 reported by Luis Ressel; ok 328 dtucker@ 329 330 Upstream-ID: c5e8cfee15c42f4a05d126158a0766ea06da79d2 331 332 commit dd3e2298663f4cc1a06bc69582d00dcfee27d73c 333 Author: djm (a] openbsd.org <djm (a] openbsd.org> 334 Date: Fri Mar 10 04:24:55 2017 +0000 335 336 upstream commit 337 338 make hostname matching really insensitive to case; 339 bz#2685, reported by Petr Cerny; ok dtucker@ 340 341 Upstream-ID: e467622ff154269e36ba8b6c9e3d105e1c4a9253 342 343 commit 77a9be9446697fe8b5499fe651f4a82a71a4b51f 344 Author: djm (a] openbsd.org <djm (a] openbsd.org> 345 Date: Fri Mar 10 03:52:48 2017 +0000 346 347 upstream commit 348 349 reword a comment to make it fit 80 columns 350 351 Upstream-ID: 4ef509a66b96c7314bbcc87027c2af71fa9d0ba4 352 353 commit 61b8ef6a66efaec07e023342cb94a10bdc2254dc 354 Author: djm (a] openbsd.org <djm (a] openbsd.org> 355 Date: Fri Mar 10 04:27:32 2017 +0000 356 357 upstream commit 358 359 better match sshd config parser behaviour: fatal() if 360 line is overlong, increase line buffer to match sshd's; bz#2651 reported by 361 Don Fong; ok dtucker@ 362 363 Upstream-ID: b175ae7e0ba403833f1ee566edf10f67443ccd18 364 365 commit db2597207e69912f2592cd86a1de8e948a9d7ffb 366 Author: djm (a] openbsd.org <djm (a] openbsd.org> 367 Date: Fri Mar 10 04:26:06 2017 +0000 368 369 upstream commit 370 371 ensure hostname is lower-case before hashing it; 372 bz#2591 reported by Griff Miller II; ok dtucker@ 373 374 Upstream-ID: c3b8b93804f376bd00d859b8bcd9fc0d86b4db17 375 376 commit df9936936c695f85c1038bd706d62edf752aca4b 377 Author: djm (a] openbsd.org <djm (a] openbsd.org> 378 Date: Fri Mar 10 04:24:55 2017 +0000 379 380 upstream commit 381 382 make hostname matching really insensitive to case; 383 bz#2685, reported by Petr Cerny; ok dtucker@ 384 385 Upstream-ID: e632b7a9bf0d0558d5ff56dab98b7cca6c3db549 386 387 commit 67eed24bfa7645d88fa0b883745fccb22a0e527e 388 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 389 Date: Fri Mar 10 04:11:00 2017 +0000 390 391 upstream commit 392 393 Remove old null check from config dumper. Patch from 394 jjelen at redhat.com vi bz#2687, ok djm@ 395 396 Upstream-ID: 824ab71467b78c4bab0dd1b3a38e8bc5f63dd528 397 398 commit 183ba55aaaecca0206184b854ad6155df237adbe 399 Author: djm (a] openbsd.org <djm (a] openbsd.org> 400 Date: Fri Mar 10 04:07:20 2017 +0000 401 402 upstream commit 403 404 fix regression in 7.4 server-sig-algs, where we were 405 accidentally excluding SHA2 RSA signature methods. bz#2680, patch from Nuno 406 Goncalves; ok dtucker@ 407 408 Upstream-ID: 81ac8bfb30960447740b9b8f6a214dcf322f12e8 409 410 commit 66be4fe8c4435af5bbc82998501a142a831f1181 411 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 412 Date: Fri Mar 10 03:53:11 2017 +0000 413 414 upstream commit 415 416 Check for NULL return value from key_new. Patch from 417 jjelen at redhat.com via bz#2687, ok djm@ 418 419 Upstream-ID: 059e33cd43cba88dc8caf0b1936fd4dd88fd5b8e 420 421 commit ec2892b5c7fea199914cb3a6afb3af38f84990bf 422 Author: djm (a] openbsd.org <djm (a] openbsd.org> 423 Date: Fri Mar 10 03:52:48 2017 +0000 424 425 upstream commit 426 427 reword a comment to make it fit 80 columns 428 429 Upstream-ID: b4b48b4487c0821d16e812c40c9b09f03b28e349 430 431 commit 7fadbb6da3f4122de689165651eb39985e1cba85 432 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 433 Date: Fri Mar 10 03:48:57 2017 +0000 434 435 upstream commit 436 437 Check for NULL argument to sshkey_read. Patch from 438 jjelen at redhat.com via bz#2687, ok djm@ 439 440 Upstream-ID: c2d00c2ea50c4861d271d0a586f925cc64a87e0e 441 442 commit 5a06b9e019e2b0b0f65a223422935b66f3749de3 443 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 444 Date: Fri Mar 10 03:45:40 2017 +0000 445 446 upstream commit 447 448 Plug some mem leaks mostly on error paths. From jjelen 449 at redhat.com via bz#2687, ok djm@ 450 451 Upstream-ID: 3fb030149598957a51b7c8beb32bf92cf30c96f2 452 453 commit f6edbe9febff8121f26835996b1229b5064d31b7 454 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 455 Date: Fri Mar 10 03:24:48 2017 +0000 456 457 upstream commit 458 459 Plug mem leak on GLOB_NOMATCH case. From jjelen at 460 redhat.com via bz#2687, ok djm@ 461 462 Upstream-ID: 8016a7ae97719d3aa55fb723fc2ad3200058340d 463 464 commit 566b3a46e89a2fda2db46f04f2639e92da64a120 465 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 466 Date: Fri Mar 10 03:22:40 2017 +0000 467 468 upstream commit 469 470 Plug descriptor leaks of auth_sock. From jjelen at 471 redhat.com via bz#2687, ok djm@ 472 473 Upstream-ID: 248acb99a5ed2fdca37d1aa33c0fcee7be286d88 474 475 commit 8a2834454c73dfc1eb96453c0e97690595f3f4c2 476 Author: djm (a] openbsd.org <djm (a] openbsd.org> 477 Date: Fri Mar 10 03:18:24 2017 +0000 478 479 upstream commit 480 481 correctly hash hosts with a port number. Reported by Josh 482 Powers in bz#2692; ok dtucker@ 483 484 Upstream-ID: 468e357ff143e00acc05bdd2803a696b3d4b6442 485 486 commit 9747b9c742de409633d4753bf1a752cbd211e2d3 487 Author: djm (a] openbsd.org <djm (a] openbsd.org> 488 Date: Fri Mar 10 03:15:58 2017 +0000 489 490 upstream commit 491 492 don't truncate off \r\n from long stderr lines; bz#2688, 493 reported by Brian Dyson; ok dtucker@ 494 495 Upstream-ID: cdfdc4ba90639af807397ce996153c88af046ca4 496 497 commit 4a4b75adac862029a1064577eb5af299b1580cdd 498 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 499 Date: Fri Mar 10 02:59:51 2017 +0000 500 501 upstream commit 502 503 Validate digest arg in ssh_digest_final; from jjelen at 504 redhat.com via bz#2687, ok djm@ 505 506 Upstream-ID: dbe5494dfddfe523fab341a3dab5a79e7338f878 507 508 commit bee0167be2340d8de4bdc1ab1064ec957c85a447 509 Author: Darren Tucker <dtucker (a] zip.com.au> 510 Date: Fri Mar 10 13:40:18 2017 +1100 511 512 Check for NULL from malloc. 513 514 Part of bz#2687, from jjelen at redhat.com. 515 516 commit da39b09d43b137a5a3d071b51589e3efb3701238 517 Author: Darren Tucker <dtucker (a] zip.com.au> 518 Date: Fri Mar 10 13:22:32 2017 +1100 519 520 If OSX is using launchd, remove screen no. 521 522 Check for socket with and without screen number. From Apple and Jakob 523 Schlyter via bz#2341, with contributions from Ron Frederick, ok djm@ 524 525 commit 8fb15311a011517eb2394bb95a467c209b8b336c 526 Author: djm (a] openbsd.org <djm (a] openbsd.org> 527 Date: Wed Mar 8 12:07:47 2017 +0000 528 529 upstream commit 530 531 quote [host]:port in generated ProxyJump commandline; the 532 [ / ] characters can confuse some shells (e.g. zsh). Reported by Lauri 533 Tirkkonen via bugs@ 534 535 Upstream-ID: 65cdd161460e1351c3d778e974c1c2a4fa4bc182 536 537 commit 18501151cf272a15b5f2c5e777f2e0933633c513 538 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 539 Date: Mon Mar 6 02:03:20 2017 +0000 540 541 upstream commit 542 543 Check l->hosts before dereferencing; fixes potential null 544 pointer deref. ok djm@ 545 546 Upstream-ID: 81c0327c6ec361da794b5c680601195cc23d1301 547 548 commit d072370793f1a20f01ad827ba8fcd3b8f2c46165 549 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 550 Date: Mon Mar 6 00:44:51 2017 +0000 551 552 upstream commit 553 554 linenum is unsigned long so use %lu in log formats. ok 555 deraadt@ 556 557 Upstream-ID: 9dc582d9bb887ebe0164e030d619fc20b1a4ea08 558 559 commit 12d3767ba4c84c32150cbe6ff6494498780f12c9 560 Author: djm (a] openbsd.org <djm (a] openbsd.org> 561 Date: Fri Mar 3 06:13:11 2017 +0000 562 563 upstream commit 564 565 fix ssh-keygen -H accidentally corrupting known_hosts that 566 contained already-hashed entries. HKF_MATCH_HOST_HASHED is only set by 567 hostkeys_foreach() when hostname matching is in use, so we need to look for 568 the hash marker explicitly. 569 570 Upstream-ID: da82ad653b93e8a753580d3cf5cd448bc2520528 571 572 commit d7abb771bd5a941b26144ba400a34563a1afa589 573 Author: djm (a] openbsd.org <djm (a] openbsd.org> 574 Date: Tue Feb 28 06:10:08 2017 +0000 575 576 upstream commit 577 578 small memleak: free fd_set on connection timeout (though 579 we are heading to exit anyway). From Tom Rix in bz#2683 580 581 Upstream-ID: 10e3dadbb8199845b66581473711642d9e6741c4 582 583 commit 78142e3ab3887e53a968d6e199bcb18daaf2436e 584 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 585 Date: Mon Feb 27 14:30:33 2017 +0000 586 587 upstream commit 588 589 errant dot; from klemens nanni 590 591 Upstream-ID: 83d93366a5acf47047298c5d3ebc5e7426f37921 592 593 commit 8071a6924c12bb51406a9a64a4b2892675112c87 594 Author: djm (a] openbsd.org <djm (a] openbsd.org> 595 Date: Fri Feb 24 03:16:34 2017 +0000 596 597 upstream commit 598 599 might as well set the listener socket CLOEXEC 600 601 Upstream-ID: 9c538433d6a0ca79f5f21decc5620e46fb68ab57 602 603 commit d5499190559ebe374bcdfa8805408646ceffad64 604 Author: djm (a] openbsd.org <djm (a] openbsd.org> 605 Date: Sun Feb 19 00:11:29 2017 +0000 606 607 upstream commit 608 609 add test cases for C locale; ok schwarze@ 610 611 Upstream-Regress-ID: 783d75de35fbc923d46e2a5e6cee30f8f381ba87 612 613 commit 011c8ffbb0275281a0cf330054cf21be10c43e37 614 Author: djm (a] openbsd.org <djm (a] openbsd.org> 615 Date: Sun Feb 19 00:10:57 2017 +0000 616 617 upstream commit 618 619 Add a common nl_langinfo(CODESET) alias for US-ASCII 620 "ANSI_X3.4-1968" that is used by Linux. Fixes mprintf output truncation for 621 non-UTF-8 locales on Linux spotted by dtucker@; ok deraadt@ schwarze@ 622 623 Upstream-ID: c6808956ebffd64066f9075d839f74ff0dd60719 624 625 commit 0c4430a19b73058a569573492f55e4c9eeaae67b 626 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 627 Date: Tue Feb 7 23:03:11 2017 +0000 628 629 upstream commit 630 631 Remove deprecated SSH1 options RSAAuthentication and 632 RhostsRSAAuthentication from regression test sshd_config. 633 634 Upstream-Regress-ID: 8066b753d9dce7cf02ff87af5c727ff680d99491 635 636 commit 3baa4cdd197c95d972ec3d07f1c0d08f2d7d9199 637 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 638 Date: Fri Feb 17 02:32:05 2017 +0000 639 640 upstream commit 641 642 Do not show rsa1 key type in usage when compiled without 643 SSH1 support. 644 645 Upstream-ID: 068b5c41357a02f319957746fa4e84ea73960f57 646 647 commit ecc35893715f969e98fee118481f404772de4132 648 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 649 Date: Fri Feb 17 02:31:14 2017 +0000 650 651 upstream commit 652 653 ifdef out "rsa1" from the list of supported keytypes when 654 compiled without SSH1 support. Found by kdunlop at guralp.com, ok djm@ 655 656 Upstream-ID: cea93a26433d235bb1d64b1d990f19a9c160a70f 657 658 commit 10577c6d96a55b877a960b2d0b75edef1b9945af 659 Author: djm (a] openbsd.org <djm (a] openbsd.org> 660 Date: Fri Feb 17 02:04:15 2017 +0000 661 662 upstream commit 663 664 For ProxyJump/-J, surround host name with brackets to 665 allow literal IPv6 addresses. From Dick Visser; ok dtucker@ 666 667 Upstream-ID: 3a5d3b0171250daf6a5235e91bce09c1d5746bf1 668 669 commit b2afdaf1b52231aa23d2153f4a8c5a60a694dda4 670 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 671 Date: Wed Feb 15 23:38:31 2017 +0000 672 673 upstream commit 674 675 Fix memory leaks in match_filter_list() error paths. 676 677 ok dtucker@ markus@ 678 679 Upstream-ID: c7f96ac0877f6dc9188bbc908100a8d246cc7f0e 680 681 commit 6d5a41b38b55258213ecfaae9df7a758caa752a1 682 Author: djm (a] openbsd.org <djm (a] openbsd.org> 683 Date: Wed Feb 15 01:46:47 2017 +0000 684 685 upstream commit 686 687 fix division by zero crash in "df" output when server 688 returns zero total filesystem blocks/inodes. Spotted by Guido Vranken; ok 689 dtucker@ 690 691 Upstream-ID: 6fb6c2ae6b289aa07b6232dbc0be54682ef5419f 692 693 commit bd5d7d239525d595ecea92765334af33a45d9d63 694 Author: Darren Tucker <dtucker (a] zip.com.au> 695 Date: Sun Feb 12 15:45:15 2017 +1100 696 697 ifdef out EVP_R_PRIVATE_KEY_DECODE_ERROR 698 699 EVP_R_PRIVATE_KEY_DECODE_ERROR was added in OpenSSL 1.0.0 so ifdef out 700 for the benefit of OpenSSL versions prior to that. 701 702 commit 155d540d00ff55f063421ec182ec8ff2b7ab6cbe 703 Author: djm (a] openbsd.org <djm (a] openbsd.org> 704 Date: Fri Feb 10 04:34:50 2017 +0000 705 706 upstream commit 707 708 bring back r1.34 that was backed out for problems loading 709 public keys: 710 711 translate OpenSSL error codes to something more 712 meaninful; bz#2522 reported by Jakub Jelen, ok dtucker@ 713 714 with additional fix from Jakub Jelen to solve the backout. 715 bz#2525 bz#2523 re-ok dtucker@ 716 717 Upstream-ID: a9d5bc0306f4473d9b4f4484f880e95f3c1cc031 718 719 commit a287c5ad1e0bf9811c7b9221979b969255076019 720 Author: djm (a] openbsd.org <djm (a] openbsd.org> 721 Date: Fri Feb 10 03:36:40 2017 +0000 722 723 upstream commit 724 725 Sanitise escape sequences in key comments sent to printf 726 but preserve valid UTF-8 when the locale supports it; bz#2520 ok dtucker@ 727 728 Upstream-ID: e8eed28712ba7b22d49be534237eed019875bd1e 729 730 commit e40269be388972848aafcca7060111c70aab5b87 731 Author: millert (a] openbsd.org <millert (a] openbsd.org> 732 Date: Wed Feb 8 20:32:43 2017 +0000 733 734 upstream commit 735 736 Avoid printf %s NULL. From semarie@, OK djm@ 737 738 Upstream-ID: 06beef7344da0208efa9275d504d60d2a5b9266c 739 740 commit 5b90709ab8704dafdb31e5651073b259d98352bc 741 Author: djm (a] openbsd.org <djm (a] openbsd.org> 742 Date: Mon Feb 6 09:22:51 2017 +0000 743 744 upstream commit 745 746 Restore \r\n newline sequence for server ident string. The CR 747 got lost in the flensing of SSHv1. Pointed out by Stef Bon 748 749 Upstream-ID: 5333fd43ce5396bf5999496096fac5536e678fac 750 751 commit 97c31c46ee2e6b46dfffdfc4f90bbbf188064cbc 752 Author: djm (a] openbsd.org <djm (a] openbsd.org> 753 Date: Fri Feb 3 23:01:42 2017 +0000 754 755 upstream commit 756 757 unit test for match_filter_list() function; still want a 758 better name for this... 759 760 Upstream-Regress-ID: 840ad6118552c35111f0a897af9c8d93ab8de92a 761 762 commit f1a193464a7b77646f0d0cedc929068e4a413ab4 763 Author: djm (a] openbsd.org <djm (a] openbsd.org> 764 Date: Fri Feb 3 23:05:57 2017 +0000 765 766 upstream commit 767 768 use ssh_packet_set_log_preamble() to include connection 769 username in packet log messages, e.g. 770 771 Connection closed by invalid user foo 10.1.1.1 port 44056 [preauth] 772 773 ok markus@ bz#113 774 775 Upstream-ID: 3591b88bdb5416d6066fb3d49d8fff2375bf1a15 776 777 commit 07edd7e9537ab32aa52abb5fb2a915c350fcf441 778 Author: djm (a] openbsd.org <djm (a] openbsd.org> 779 Date: Fri Feb 3 23:03:33 2017 +0000 780 781 upstream commit 782 783 add ssh_packet_set_log_preamble() to allow inclusion of a 784 preamble string in disconnect messages; ok markus@ 785 786 Upstream-ID: 34cb41182cd76d414c214ccb01c01707849afead 787 788 commit 68bc8cfa7642d3ccbf2cd64281c16b8b9205be59 789 Author: djm (a] openbsd.org <djm (a] openbsd.org> 790 Date: Fri Feb 3 23:01:19 2017 +0000 791 792 upstream commit 793 794 support =- for removing methods from algorithms lists, 795 e.g. Ciphers=-*cbc; suggested by Cristian Ionescu-Idbohrn in bz#2671 "I like 796 it" markus@ 797 798 Upstream-ID: c78c38f9f81a963b33d0eade559f6048add24a6d 799 800 commit c924b2ef941028a1f31e6e94f54dfeeeef462a4e 801 Author: djm (a] openbsd.org <djm (a] openbsd.org> 802 Date: Fri Feb 3 05:05:56 2017 +0000 803 804 upstream commit 805 806 allow form-feed characters at EOL; bz#2431 ok dtucker@ 807 808 Upstream-ID: 1f453afaba6da2ae69d6afdf1ae79a917552f1a2 809 810 commit 523db8540b720c4d21ab0ff6f928476c70c38aab 811 Author: Damien Miller <djm (a] mindrot.org> 812 Date: Fri Feb 3 16:01:22 2017 +1100 813 814 prefer to use ldns-config to find libldns 815 816 Should fix bz#2603 - "Build with ldns and without kerberos support 817 fails if ldns compiled with kerberos support" by including correct 818 cflags/libs 819 820 ok dtucker@ 821 822 commit c998bf0afa1a01257a53793eba57941182e9e0b7 823 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 824 Date: Fri Feb 3 02:56:00 2017 +0000 825 826 upstream commit 827 828 Make ssh_packet_set_rekey_limits take u32 for the number of 829 seconds until rekeying (negative values are rejected at config parse time). 830 This allows the removal of some casts and a signed vs unsigned comparison 831 warning. 832 833 rekey_time is cast to int64 for the comparison which is a no-op 834 on OpenBSD, but should also do the right thing in -portable on 835 anything still using 32bit time_t (until the system time actually 836 wraps, anyway). 837 838 some early guidance deraadt@, ok djm@ 839 840 Upstream-ID: c9f18613afb994a07e7622eb326f49de3d123b6c 841 842 commit 3ec5fa4ba97d4c4853620daea26a33b9f1fe3422 843 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 844 Date: Thu Feb 2 10:54:25 2017 +0000 845 846 upstream commit 847 848 In vasnmprintf() return an error if malloc fails and 849 don't set a function argument to the address of free'd memory. 850 851 ok djm@ 852 853 Upstream-ID: 1efffffff2f51d53c9141f245b90ac23d33b9779 854 855 commit 858252fb1d451ebb0969cf9749116c8f0ee42753 856 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 857 Date: Wed Feb 1 02:59:09 2017 +0000 858 859 upstream commit 860 861 Return true reason for port forwarding failures where 862 feasible rather than always "administratively prohibited". bz#2674, ok djm@ 863 864 Upstream-ID: d901d9887951774e604ca970e1827afaaef9e419 865 866 commit 6ba9f893838489add6ec4213c7a997b425e4a9e0 867 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 868 Date: Mon Jan 30 23:27:39 2017 +0000 869 870 upstream commit 871 872 Small correction to the known_hosts section on when it is 873 updated. Patch from lkppo at free.fr some time ago, pointed out by smallm at 874 sdf.org 875 876 Upstream-ID: 1834d7af179dea1a12ad2137f84566664af225d5 877 878 commit c61d5ec3c11e7ff9779b6127421d9f166cf10915 879 Author: Darren Tucker <dtucker (a] zip.com.au> 880 Date: Fri Feb 3 14:10:34 2017 +1100 881 882 Remove _XOPEN_SOURCE from wide char detection. 883 884 Having _XOPEN_SOURCE unconditionally causes problems on some platforms 885 and configurations, notably Solaris 64-bit binaries. It was there for 886 the benefit of Linux put the required bits in the *-*linux* section. 887 888 Patch from yvoinov at gmail.com. 889 890 commit f25ee13b3e81fd80efeb871dc150fe49d7fc8afd 891 Author: djm (a] openbsd.org <djm (a] openbsd.org> 892 Date: Mon Jan 30 05:22:14 2017 +0000 893 894 upstream commit 895 896 fully unbreak: some $SSH invocations did not have -F 897 specified and could pick up the ~/.ssh/config of the user running the tests 898 899 Upstream-Regress-ID: f362d1892c0d3e66212d5d3fc02d915c58ef6b89 900 901 commit 6956e21fb26652887475fe77ea40d2efcf25908b 902 Author: djm (a] openbsd.org <djm (a] openbsd.org> 903 Date: Mon Jan 30 04:54:07 2017 +0000 904 905 upstream commit 906 907 partially unbreak: was not specifying hostname on some 908 $SSH invocations 909 910 Upstream-Regress-ID: bc8a5e98e57bad0a92ef4f34ed91c1d18294e2cc 911 912 commit 52763dd3fe0a4678dafdf7aeb32286e514130afc 913 Author: djm (a] openbsd.org <djm (a] openbsd.org> 914 Date: Mon Jan 30 01:03:00 2017 +0000 915 916 upstream commit 917 918 revise keys/principals command hang fix (bz#2655) to 919 consume entire output, avoiding sending SIGPIPE to subprocesses early; ok 920 dtucker@ 921 922 Upstream-ID: 7cb04b31a61f8c78c4e48ceededcd2fd5c4ee1bc 923 924 commit 381a2615a154a82c4c53b787f4a564ef894fe9ac 925 Author: djm (a] openbsd.org <djm (a] openbsd.org> 926 Date: Mon Jan 30 00:38:50 2017 +0000 927 928 upstream commit 929 930 small cleanup post SSHv1 removal: 931 932 remove SSHv1-isms in commented examples 933 934 reorder token table to group deprecated and compile-time conditional tokens 935 better 936 937 fix config dumping code for some compile-time conditional options that 938 weren't being correctly skipped (SSHv1 and PKCS#11) 939 940 Upstream-ID: f2e96b3cb3158d857c5a91ad2e15925df3060105 941 942 commit 4833d01591b7eb049489d9558b65f5553387ed43 943 Author: djm (a] openbsd.org <djm (a] openbsd.org> 944 Date: Mon Jan 30 00:34:01 2017 +0000 945 946 upstream commit 947 948 some explicit NULL tests when dumping configured 949 forwardings; from Karsten Weiss 950 951 Upstream-ID: 40957b8dea69672b0e50df6b4a91a94e3e37f72d 952 953 commit 326e2fae9f2e3e067b5651365eba86b35ee5a6b2 954 Author: djm (a] openbsd.org <djm (a] openbsd.org> 955 Date: Mon Jan 30 00:32:28 2017 +0000 956 957 upstream commit 958 959 misplaced braces in test; from Karsten Weiss 960 961 Upstream-ID: f7b794074d3aae8e35b69a91d211c599c94afaae 962 963 commit 3e032a95e46bfaea9f9e857678ac8fa5f63997fb 964 Author: djm (a] openbsd.org <djm (a] openbsd.org> 965 Date: Mon Jan 30 00:32:03 2017 +0000 966 967 upstream commit 968 969 don't dereference authctxt before testing != NULL, it 970 causes compilers to make assumptions; from Karsten Weiss 971 972 Upstream-ID: 794243aad1e976ebc717885b7a97a25e00c031b2 973 974 commit 01cfaa2b1cfb84f3cdd32d1bf82b120a8d30e057 975 Author: djm (a] openbsd.org <djm (a] openbsd.org> 976 Date: Fri Jan 6 02:51:16 2017 +0000 977 978 upstream commit 979 980 use correct ssh-add program; bz#2654, from Colin Watson 981 982 Upstream-Regress-ID: 7042a36e1bdaec6562f6e57e9d047efe9c7a6030 983 984 commit e5c7ec67cdc42ae2584085e0fc5cc5ee91133cf5 985 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 986 Date: Fri Jan 6 02:26:10 2017 +0000 987 988 upstream commit 989 990 Account for timeouts in the integrity tests as failures. 991 992 If the first test in a series for a given MAC happens to modify the low 993 bytes of a packet length, then ssh will time out and this will be 994 interpreted as a test failure. Patch from cjwatson at debian.org via 995 bz#2658. 996 997 Upstream-Regress-ID: e7467613b0badedaa300bc6fc7495ec2f44e2fb9 998 999 commit dbaf599b61bd6e0f8469363a8c8e7f633b334018 1000 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1001 Date: Fri Jan 6 02:09:25 2017 +0000 1002 1003 upstream commit 1004 1005 Make forwarding test less racy by using unix domain 1006 sockets instead of TCP ports where possible. Patch from cjwatson at 1007 debian.org via bz#2659. 1008 1009 Upstream-Regress-ID: 4756375aac5916ef9d25452a1c1d5fa9e90299a9 1010 1011 commit 9390b0031ebd6eb5488d3bc4d4333c528dffc0a6 1012 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1013 Date: Sun Jan 29 21:35:23 2017 +0000 1014 1015 upstream commit 1016 1017 Fix typo in ~C error message for bad port forward 1018 cancellation. bz#2672, from Brad Marshall via Colin Watson and Ubuntu's 1019 bugtracker. 1020 1021 Upstream-ID: 0d4a7e5ead6cc59c9a44b4c1e5435ab3aada09af 1022 1023 commit 4ba15462ca38883b8a61a1eccc093c79462d5414 1024 Author: guenther (a] openbsd.org <guenther (a] openbsd.org> 1025 Date: Sat Jan 21 11:32:04 2017 +0000 1026 1027 upstream commit 1028 1029 The POSIX APIs that that sockaddrs all ignore the s*_len 1030 field in the incoming socket, so userspace doesn't need to set it unless it 1031 has its own reasons for tracking the size along with the sockaddr. 1032 1033 ok phessler@ deraadt@ florian@ 1034 1035 Upstream-ID: ca6e49e2f22f2b9e81d6d924b90ecd7e422e7437 1036 1037 commit a1187bd3ef3e4940af849ca953a1b849dae78445 1038 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 1039 Date: Fri Jan 6 16:28:12 2017 +0000 1040 1041 upstream commit 1042 1043 keep the tokens list sorted; 1044 1045 Upstream-ID: b96239dae4fb3aa94146bb381afabcc7740a1638 1046 1047 commit b64077f9767634715402014f509e58decf1e140d 1048 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1049 Date: Fri Jan 6 09:27:52 2017 +0000 1050 1051 upstream commit 1052 1053 fix previous 1054 1055 Upstream-ID: c107d6a69bc22325d79fbf78a2a62e04bcac6895 1056 1057 commit 5e820e9ea2e949aeb93071fe31c80b0c42f2b2de 1058 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1059 Date: Fri Jan 6 03:53:58 2017 +0000 1060 1061 upstream commit 1062 1063 show a useful error message when included config files 1064 can't be opened; bz#2653, ok dtucker@ 1065 1066 Upstream-ID: f598b73b5dfe497344cec9efc9386b4e5a3cb95b 1067 1068 commit 13bd2e2d622d01dc85d22b94520a5b243d006049 1069 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1070 Date: Fri Jan 6 03:45:41 2017 +0000 1071 1072 upstream commit 1073 1074 sshd_config is documented to set 1075 GSSAPIStrictAcceptorCheck=yes by default, so actually make it do this. 1076 bz#2637 ok dtucker 1077 1078 Upstream-ID: 99ef8ac51f17f0f7aec166cb2e34228d4d72a665 1079 1080 commit f89b928534c9e77f608806a217d39a2960cc7fd0 1081 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1082 Date: Fri Jan 6 03:41:58 2017 +0000 1083 1084 upstream commit 1085 1086 Avoid confusing error message when attempting to use 1087 ssh-keyscan built without SSH protocol v.1 to scan for v.1 keys; bz#2583 1088 1089 Upstream-ID: 5d214abd3a21337d67c6dcc5aa6f313298d0d165 1090 1091 commit 0999533014784579aa6f01c2d3a06e3e8804b680 1092 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1093 Date: Fri Jan 6 02:34:54 2017 +0000 1094 1095 upstream commit 1096 1097 Re-add '%k' token for AuthorizedKeysCommand which was 1098 lost during the re-org in rev 1.235. bz#2656, from jboning at gmail.com. 1099 1100 Upstream-ID: 2884e203c02764d7b3fe7472710d9c24bdc73e38 1101 1102 commit 51045869fa084cdd016fdd721ea760417c0a3bf3 1103 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1104 Date: Wed Jan 4 05:37:40 2017 +0000 1105 1106 upstream commit 1107 1108 unbreak Unix domain socket forwarding for root; ok 1109 markus@ 1110 1111 Upstream-ID: 6649c76eb7a3fa15409373295ca71badf56920a2 1112 1113 commit 58fca12ba967ea5c768653535604e1522d177e44 1114 Author: Darren Tucker <dtucker (a] zip.com.au> 1115 Date: Mon Jan 16 09:08:32 2017 +1100 1116 1117 Remove LOGIN_PROGRAM. 1118 1119 UseLogin is gone, remove leftover. bz#2665, from cjwatson at debian.org 1120 1121 commit b108ce92aae0ca0376dce9513d953be60e449ae1 1122 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1123 Date: Wed Jan 4 02:21:43 2017 +0000 1124 1125 upstream commit 1126 1127 relax PKCS#11 whitelist a bit to allow libexec as well as 1128 lib directories. 1129 1130 Upstream-ID: cf5617958e2e2d39f8285fd3bc63b557da484702 1131 1132 commit c7995f296b9222df2846f56ecf61e5ae13d7a53d 1133 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1134 Date: Tue Jan 3 05:46:51 2017 +0000 1135 1136 upstream commit 1137 1138 check number of entries in SSH2_FXP_NAME response; avoids 1139 unreachable overflow later. Reported by Jann Horn 1140 1141 Upstream-ID: b6b2b434a6d6035b1644ca44f24cd8104057420f 1142 1143 commit ddd3d34e5c7979ca6f4a3a98a7d219a4ed3d98c2 1144 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1145 Date: Fri Dec 30 22:08:02 2016 +0000 1146 1147 upstream commit 1148 1149 fix deadlock when keys/principals command produces a lot of 1150 output and a key is matched early; bz#2655, patch from jboning AT gmail.com 1151 1152 Upstream-ID: e19456429bf99087ea994432c16d00a642060afe 1153 1154 commit 30eee7d1b2fec33c14870cc11910610be5d2aa6f 1155 Author: Darren Tucker <dtucker (a] zip.com.au> 1156 Date: Tue Dec 20 12:16:11 2016 +1100 1157 1158 Re-add missing "Prerequisites" header and fix typo 1159 1160 Patch from HARUYAMA Seigo <haruyama at unixuser org>. 1161 1162 commit c8c60f3663165edd6a52632c6ddbfabfce1ca865 1163 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1164 Date: Mon Dec 19 22:35:23 2016 +0000 1165 1166 upstream commit 1167 1168 use standard /bin/sh equality test; from Mike Frysinger 1169 1170 Upstream-Regress-ID: 7b6f0b63525f399844c8ac211003acb8e4b0bec2 1171 1172 commit 4a354fc231174901f2629437c2a6e924a2dd6772 1173 Author: Damien Miller <djm (a] mindrot.org> 1174 Date: Mon Dec 19 15:59:26 2016 +1100 1175 1176 crank version numbers for release 1177 1178 commit 5f8d0bb8413d4d909cc7aa3c616fb0538224c3c9 1179 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1180 Date: Mon Dec 19 04:55:51 2016 +0000 1181 1182 upstream commit 1183 1184 openssh-7.4 1185 1186 Upstream-ID: 1ee404adba6bbe10ae9277cbae3a94abe2867b79 1187 1188 commit 3a8213ea0ed843523e34e55ab9c852332bab4c7b 1189 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1190 Date: Mon Dec 19 04:55:18 2016 +0000 1191 1192 upstream commit 1193 1194 remove testcase that depends on exact output and 1195 behaviour of snprintf(..., "%s", NULL) 1196 1197 Upstream-Regress-ID: cab4288531766bd9593cb556613b91a2eeefb56f 1198 1199 commit eae735a82d759054f6ec7b4e887fb7a5692c66d7 1200 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1201 Date: Mon Dec 19 03:32:57 2016 +0000 1202 1203 upstream commit 1204 1205 Use LOGNAME to get current user and fall back to whoami if 1206 not set. Mainly to benefit -portable since some platforms don't have whoami. 1207 1208 Upstream-Regress-ID: e3a16b7836a3ae24dc8f8a4e43fdf8127a60bdfa 1209 1210 commit 0d2f88428487518eea60602bd593989013831dcf 1211 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1212 Date: Fri Dec 16 03:51:19 2016 +0000 1213 1214 upstream commit 1215 1216 Add regression test for AllowUsers and DenyUsers. Patch from 1217 Zev Weiss <zev at bewilderbeest.net> 1218 1219 Upstream-Regress-ID: 8f1aac24d52728398871dac14ad26ea38b533fb9 1220 1221 commit 3bc8180a008929f6fe98af4a56fb37d04444b417 1222 Author: Darren Tucker <dtucker (a] zip.com.au> 1223 Date: Fri Dec 16 15:02:24 2016 +1100 1224 1225 Add missing monitor.h include. 1226 1227 Fixes warning pointed out by Zev Weiss <zev at bewilderbeest.net> 1228 1229 commit 410681f9015d76cc7b137dd90dac897f673244a0 1230 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1231 Date: Fri Dec 16 02:48:55 2016 +0000 1232 1233 upstream commit 1234 1235 revert to rev1.2; the new bits in this test depend on changes 1236 to ssh that aren't yet committed 1237 1238 Upstream-Regress-ID: 828ffc2c7afcf65d50ff2cf3dfc47a073ad39123 1239 1240 commit 2f2ffa4fbe4b671bbffa0611f15ba44cff64d58e 1241 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1242 Date: Fri Dec 16 01:06:27 2016 +0000 1243 1244 upstream commit 1245 1246 Move the "stop sshd" code into its own helper function. 1247 Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@ 1248 1249 Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329 1250 1251 commit e15e7152331e3976b35475fd4e9c72897ad0f074 1252 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1253 Date: Fri Dec 16 01:01:07 2016 +0000 1254 1255 upstream commit 1256 1257 regression test for certificates along with private key 1258 with no public half. bz#2617, mostly from Adam Eijdenberg 1259 1260 Upstream-Regress-ID: 2e74dc2c726f4dc839609b3ce045466b69f01115 1261 1262 commit 9a70ec085faf6e55db311cd1a329f1a35ad2a500 1263 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1264 Date: Thu Dec 15 23:50:37 2016 +0000 1265 1266 upstream commit 1267 1268 Use $SUDO to read pidfile in case root's umask is 1269 restricted. From portable. 1270 1271 Upstream-Regress-ID: f6b1c7ffbc5a0dfb7d430adb2883344899174a98 1272 1273 commit fe06b68f824f8f55670442fb31f2c03526dd326c 1274 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1275 Date: Thu Dec 15 21:29:05 2016 +0000 1276 1277 upstream commit 1278 1279 Add missing braces in DenyUsers code. Patch from zev at 1280 bewilderbeest.net, ok deraadt@ 1281 1282 Upstream-ID: d747ace338dcf943b077925f90f85f789714b54e 1283 1284 commit dcc7d74242a574fd5c4afbb4224795b1644321e7 1285 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1286 Date: Thu Dec 15 21:20:41 2016 +0000 1287 1288 upstream commit 1289 1290 Fix text in error message. Patch from zev at 1291 bewilderbeest.net. 1292 1293 Upstream-ID: deb0486e175e7282f98f9a15035d76c55c84f7f6 1294 1295 commit b737e4d7433577403a31cff6614f6a1b0b5e22f4 1296 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1297 Date: Wed Dec 14 00:36:34 2016 +0000 1298 1299 upstream commit 1300 1301 disable Unix-domain socket forwarding when privsep is 1302 disabled 1303 1304 Upstream-ID: ab61516ae0faadad407857808517efa900a0d6d0 1305 1306 commit 08a1e7014d65c5b59416a0e138c1f73f417496eb 1307 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1308 Date: Fri Dec 9 03:04:29 2016 +0000 1309 1310 upstream commit 1311 1312 log connections dropped in excess of MaxStartups at 1313 verbose LogLevel; bz#2613 based on diff from Tomas Kuthan; ok dtucker@ 1314 1315 Upstream-ID: 703ae690dbf9b56620a6018f8a3b2389ce76d92b 1316 1317 commit 10e290ec00964b2bf70faab15a10a5574bb80527 1318 Author: Darren Tucker <dtucker (a] zip.com.au> 1319 Date: Tue Dec 13 13:51:32 2016 +1100 1320 1321 Get default of TEST_SSH_UTF8 from environment. 1322 1323 commit b9b8ba3f9ed92c6220b58d70d1e6d8aa3eea1104 1324 Author: Darren Tucker <dtucker (a] zip.com.au> 1325 Date: Tue Dec 13 12:56:40 2016 +1100 1326 1327 Remove commented-out includes. 1328 1329 These commented-out includes have "Still needed?" comments. Since 1330 they've been commented out for ~13 years I assert that they're not. 1331 1332 commit 25275f1c9d5f01a0877d39444e8f90521a598ea0 1333 Author: Darren Tucker <dtucker (a] zip.com.au> 1334 Date: Tue Dec 13 12:54:23 2016 +1100 1335 1336 Add prototype for strcasestr in compat library. 1337 1338 commit afec07732aa2985142f3e0b9a01eb6391f523dec 1339 Author: Darren Tucker <dtucker (a] zip.com.au> 1340 Date: Tue Dec 13 10:23:03 2016 +1100 1341 1342 Add strcasestr to compat library. 1343 1344 Fixes build on (at least) Solaris 10. 1345 1346 commit dda78a03af32e7994f132d923c2046e98b7c56c8 1347 Author: Damien Miller <djm (a] mindrot.org> 1348 Date: Mon Dec 12 13:57:10 2016 +1100 1349 1350 Force Turkish locales back to C/POSIX; bz#2643 1351 1352 Turkish locales are unique in their handling of the letters 'i' and 1353 'I' (yes, they are different letters) and OpenSSH isn't remotely 1354 prepared to deal with that. For now, the best we can do is to force 1355 OpenSSH to use the C/POSIX locale and try to preserve the UTF-8 1356 encoding if possible. 1357 1358 ok dtucker@ 1359 1360 commit c35995048f41239fc8895aadc3374c5f75180554 1361 Author: Darren Tucker <dtucker (a] zip.com.au> 1362 Date: Fri Dec 9 12:52:02 2016 +1100 1363 1364 exit is in stdlib.h not unistd.h (that's _exit). 1365 1366 commit d399a8b914aace62418c0cfa20341aa37a192f98 1367 Author: Darren Tucker <dtucker (a] zip.com.au> 1368 Date: Fri Dec 9 12:33:25 2016 +1100 1369 1370 Include <unistd.h> for exit in utf8 locale test. 1371 1372 commit 47b8c99ab3221188ad3926108dd9d36da3b528ec 1373 Author: Darren Tucker <dtucker (a] zip.com.au> 1374 Date: Thu Dec 8 15:48:34 2016 +1100 1375 1376 Check for utf8 local support before testing it. 1377 1378 Check for utf8 local support and if not found, do not attempt to run the 1379 utf8 tests. Suggested by djm@ 1380 1381 commit 4089fc1885b3a2822204effbb02b74e3da58240d 1382 Author: Darren Tucker <dtucker (a] zip.com.au> 1383 Date: Thu Dec 8 12:57:24 2016 +1100 1384 1385 Use AC_PATH_TOOL for krb5-config. 1386 1387 This will use the host-prefixed version when cross compiling; patch from 1388 david.michael at coreos.com. 1389 1390 commit b4867e0712c89b93be905220c82f0a15e6865d1e 1391 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1392 Date: Tue Dec 6 07:48:01 2016 +0000 1393 1394 upstream commit 1395 1396 make IdentityFile successfully load and use certificates that 1397 have no corresponding bare public key. E.g. just a private id_rsa and 1398 certificate id_rsa-cert.pub (and no id_rsa.pub). 1399 1400 bz#2617 ok dtucker@ 1401 1402 Upstream-ID: c1e9699b8c0e3b63cc4189e6972e3522b6292604 1403 1404 commit c9792783a98881eb7ed295680013ca97a958f8ac 1405 Author: Damien Miller <djm (a] mindrot.org> 1406 Date: Fri Nov 25 14:04:21 2016 +1100 1407 1408 Add a gnome-ssh-askpass3 target for GTK+3 version 1409 1410 Based on patch from Colin Watson via bz#2640 1411 1412 commit 7be85ae02b9de0993ce0a1d1e978e11329f6e763 1413 Author: Damien Miller <djm (a] mindrot.org> 1414 Date: Fri Nov 25 14:03:53 2016 +1100 1415 1416 Make gnome-ssh-askpass2.c GTK+3-friendly 1417 1418 Patch from Colin Watson via bz#2640 1419 1420 commit b9844a45c7f0162fd1b5465683879793d4cc4aaa 1421 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1422 Date: Sun Dec 4 23:54:02 2016 +0000 1423 1424 upstream commit 1425 1426 Fix public key authentication when multiple 1427 authentication is in use. Instead of deleting and re-preparing the entire 1428 keys list, just reset the 'used' flags; the keys list is already in a good 1429 order (with already- tried keys at the back) 1430 1431 Analysis and patch from Vincent Brillault on bz#2642; ok dtucker@ 1432 1433 Upstream-ID: 7123f12dc2f3bcaae715853035a97923d7300176 1434 1435 commit f2398eb774075c687b13af5bc22009eb08889abe 1436 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1437 Date: Sun Dec 4 22:27:25 2016 +0000 1438 1439 upstream commit 1440 1441 Unlink PidFile on SIGHUP and always recreate it when the 1442 new sshd starts. Regression tests (and possibly other things) depend on the 1443 pidfile being recreated after SIGHUP, and unlinking it means it won't contain 1444 a stale pid if sshd fails to restart. ok djm@ markus@ 1445 1446 Upstream-ID: 132dd6dda0c77dd49d2f15b2573b5794f6160870 1447 1448 commit 85aa2efeba51a96bf6834f9accf2935d96150296 1449 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1450 Date: Wed Nov 30 03:01:33 2016 +0000 1451 1452 upstream commit 1453 1454 test new behaviour of cert force-command restriction vs. 1455 authorized_key/ principals 1456 1457 Upstream-Regress-ID: 399efa7469d40c404c0b0a295064ce75d495387c 1458 1459 commit 5d333131cd8519d022389cfd3236280818dae1bc 1460 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 1461 Date: Wed Nov 30 06:54:26 2016 +0000 1462 1463 upstream commit 1464 1465 tweak previous; while here fix up FILES and AUTHORS; 1466 1467 Upstream-ID: 93f6e54086145a75df8d8ec7d8689bdadbbac8fa 1468 1469 commit 786d5994da79151180cb14a6cf157ebbba61c0cc 1470 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1471 Date: Wed Nov 30 03:07:37 2016 +0000 1472 1473 upstream commit 1474 1475 add a whitelist of paths from which ssh-agent will load 1476 (via ssh-pkcs11-helper) a PKCS#11 module; ok markus@ 1477 1478 Upstream-ID: fe79769469d9cd6d26fe0dc15751b83ef2a06e8f 1479 1480 commit 7844f357cdd90530eec81340847783f1f1da010b 1481 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1482 Date: Wed Nov 30 03:00:05 2016 +0000 1483 1484 upstream commit 1485 1486 Add a sshd_config DisableForwaring option that disables 1487 X11, agent, TCP, tunnel and Unix domain socket forwarding, as well as 1488 anything else we might implement in the future. 1489 1490 This, like the 'restrict' authorized_keys flag, is intended to be a 1491 simple and future-proof way of restricting an account. Suggested as 1492 a complement to 'restrict' by Jann Horn; ok markus@ 1493 1494 Upstream-ID: 203803f66e533a474086b38a59ceb4cf2410fcf7 1495 1496 commit fd6dcef2030d23c43f986d26979f84619c10589d 1497 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1498 Date: Wed Nov 30 02:57:40 2016 +0000 1499 1500 upstream commit 1501 1502 When a forced-command appears in both a certificate and 1503 an authorized keys/principals command= restriction, refuse to accept the 1504 certificate unless they are identical. 1505 1506 The previous (documented) behaviour of having the certificate forced- 1507 command override the other could be a bit confused and more error-prone. 1508 1509 Pointed out by Jann Horn of Project Zero; ok dtucker@ 1510 1511 Upstream-ID: 79d811b6eb6bbe1221bf146dde6928f92d2cd05f 1512 1513 commit 7fc4766ac78abae81ee75b22b7550720bfa28a33 1514 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1515 Date: Wed Nov 30 00:28:31 2016 +0000 1516 1517 upstream commit 1518 1519 On startup, check to see if sshd is already daemonized 1520 and if so, skip the call to daemon() and do not rewrite the PidFile. This 1521 means that when sshd re-execs itself on SIGHUP the process ID will no longer 1522 change. Should address bz#2641. ok djm@ markus@. 1523 1524 Upstream-ID: 5ea0355580056fb3b25c1fd6364307d9638a37b9 1525 1526 commit c9f880c195c65f1dddcbc4ce9d6bfea7747debcc 1527 Author: Damien Miller <djm (a] mindrot.org> 1528 Date: Wed Nov 30 13:51:49 2016 +1100 1529 1530 factor out common PRNG reseed before privdrop 1531 1532 Add a call to RAND_poll() to ensure than more than pid+time gets 1533 stirred into child processes states. Prompted by analysis from Jann 1534 Horn at Project Zero. ok dtucker@ 1535 1536 commit 79e4829ec81dead1b30999e1626eca589319a47f 1537 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1538 Date: Fri Nov 25 03:02:01 2016 +0000 1539 1540 upstream commit 1541 1542 Allow PuTTY interop tests to run unattended. bz#2639, 1543 patch from cjwatson at debian.org. 1544 1545 Upstream-Regress-ID: 4345253558ac23b2082aebabccd48377433b6fe0 1546 1547 commit 504c3a9a1bf090f6b27260fc3e8ea7d984d163dc 1548 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1549 Date: Fri Nov 25 02:56:49 2016 +0000 1550 1551 upstream commit 1552 1553 Reverse args to sshd-log-wrapper. Matches change in 1554 portable, where it allows sshd do be optionally run under Valgrind. 1555 1556 Upstream-Regress-ID: b438d1c6726dc5caa2a45153e6103a0393faa906 1557 1558 commit bd13017736ec2f8f9ca498fe109fb0035f322733 1559 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1560 Date: Fri Nov 25 02:49:18 2016 +0000 1561 1562 upstream commit 1563 1564 Fix typo in trace message; from portable. 1565 1566 Upstream-Regress-ID: 4c4a2ba0d37faf5fd230a91b4c7edb5699fbd73a 1567 1568 commit 7da751d8b007c7f3e814fd5737c2351440d78b4c 1569 Author: tb (a] openbsd.org <tb (a] openbsd.org> 1570 Date: Tue Nov 1 13:43:27 2016 +0000 1571 1572 upstream commit 1573 1574 Clean up MALLOC_OPTIONS. For the unittests, move 1575 MALLOC_OPTIONS and TEST_ENV to unittets/Makefile.inc. 1576 1577 ok otto 1578 1579 Upstream-Regress-ID: 890d497e0a38eeddfebb11cc429098d76cf29f12 1580 1581 commit 36f58e68221bced35e06d1cca8d97c48807a8b71 1582 Author: tb (a] openbsd.org <tb (a] openbsd.org> 1583 Date: Mon Oct 31 23:45:08 2016 +0000 1584 1585 upstream commit 1586 1587 Remove the obsolete A and P flags from MALLOC_OPTIONS. 1588 1589 ok dtucker 1590 1591 Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59 1592 1593 commit b0899ee26a6630883c0f2350098b6a35e647f512 1594 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1595 Date: Tue Nov 29 03:54:50 2016 +0000 1596 1597 upstream commit 1598 1599 Factor out code to disconnect from controlling terminal 1600 into its own function. ok djm@ 1601 1602 Upstream-ID: 39fd9e8ebd7222615a837312face5cc7ae962885 1603 1604 commit 54d022026aae4f53fa74cc636e4a032d9689b64d 1605 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1606 Date: Fri Nov 25 23:24:45 2016 +0000 1607 1608 upstream commit 1609 1610 use sshbuf_allocate() to pre-allocate the buffer used for 1611 loading keys. This avoids implicit realloc inside the buffer code, which 1612 might theoretically leave fragments of the key on the heap. This doesn't 1613 appear to happen in practice for normal sized keys, but was observed for 1614 novelty oversize ones. 1615 1616 Pointed out by Jann Horn of Project Zero; ok markus@ 1617 1618 Upstream-ID: d620e1d46a29fdea56aeadeda120879eddc60ab1 1619 1620 commit a9c746088787549bb5b1ae3add7d06a1b6d93d5e 1621 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1622 Date: Fri Nov 25 23:22:04 2016 +0000 1623 1624 upstream commit 1625 1626 split allocation out of sshbuf_reserve() into a separate 1627 sshbuf_allocate() function; ok markus@ 1628 1629 Upstream-ID: 11b8a2795afeeb1418d508a2c8095b3355577ec2 1630 1631 commit f0ddedee460486fa0e32fefb2950548009e5026e 1632 Author: markus (a] openbsd.org <markus (a] openbsd.org> 1633 Date: Wed Nov 23 23:14:15 2016 +0000 1634 1635 upstream commit 1636 1637 allow ClientAlive{Interval,CountMax} in Match; ok dtucker, 1638 djm 1639 1640 Upstream-ID: 8beb4c1eadd588f1080b58932281983864979f55 1641 1642 commit 1a6f9d2e2493d445cd9ee496e6e3c2a2f283f66a 1643 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1644 Date: Tue Nov 8 22:04:34 2016 +0000 1645 1646 upstream commit 1647 1648 unbreak DenyUsers; reported by henning@ 1649 1650 Upstream-ID: 1c67d4148f5e953c35acdb62e7c08ae8e33f7cb2 1651 1652 commit 010359b32659f455fddd2bd85fd7cc4d7a3b994a 1653 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1654 Date: Sun Nov 6 05:46:37 2016 +0000 1655 1656 upstream commit 1657 1658 Validate address ranges for AllowUser/DenyUsers at 1659 configuration load time and refuse to accept bad ones. It was previously 1660 possible to specify invalid CIDR address ranges (e.g. djm (a] 127.1.2.3/55) and 1661 these would always match. 1662 1663 Thanks to Laurence Parry for a detailed bug report. ok markus (for 1664 a previous diff version) 1665 1666 Upstream-ID: 9dfcdd9672b06e65233ea4434c38226680d40bfb 1667 1668 commit efb494e81d1317209256b38b49f4280897c61e69 1669 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1670 Date: Fri Oct 28 03:33:52 2016 +0000 1671 1672 upstream commit 1673 1674 Improve pkcs11_add_provider() logging: demote some 1675 excessively verbose error()s to debug()s, include PKCS#11 provider name and 1676 slot in log messages where possible. bz#2610, based on patch from Jakub Jelen 1677 1678 Upstream-ID: 3223ef693cfcbff9079edfc7e89f55bf63e1973d 1679 1680 commit 5ee3fb5affd7646f141749483205ade5fc54adaf 1681 Author: Darren Tucker <dtucker (a] zip.com.au> 1682 Date: Tue Nov 1 08:12:33 2016 +1100 1683 1684 Use ptrace(PT_DENY_ATTACH, ..) on OS X. 1685 1686 commit 315d2a4e674d0b7115574645cb51f968420ebb34 1687 Author: Damien Miller <djm (a] mindrot.org> 1688 Date: Fri Oct 28 14:34:07 2016 +1100 1689 1690 Unbreak AES-CTR ciphers on old (~0.9.8) OpenSSL 1691 1692 ok dtucker@ 1693 1694 commit a9ff3950b8e80ff971b4d44bbce96df27aed28af 1695 Author: Darren Tucker <dtucker (a] zip.com.au> 1696 Date: Fri Oct 28 14:26:58 2016 +1100 1697 1698 Move OPENSSL_NO_RIPEMD160 to compat. 1699 1700 Move OPENSSL_NO_RIPEMD160 to compat and add ifdefs to mac.c around the 1701 ripemd160 MACs. 1702 1703 commit bce58885160e5db2adda3054c3b81fe770f7285a 1704 Author: Darren Tucker <dtucker (a] zip.com.au> 1705 Date: Fri Oct 28 13:52:31 2016 +1100 1706 1707 Check if RIPEMD160 is disabled in OpenSSL. 1708 1709 commit d924640d4c355d1b5eca1f4cc60146a9975dbbff 1710 Author: Darren Tucker <dtucker (a] zip.com.au> 1711 Date: Fri Oct 28 13:38:19 2016 +1100 1712 1713 Skip ssh1 specfic ciphers. 1714 1715 cipher-3des1.c and cipher-bf1.c are specific to sshv1 so don't even try 1716 to compile them when Protocol 1 is not enabled. 1717 1718 commit 79d078e7a49caef746516d9710ec369ba45feab6 1719 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 1720 Date: Tue Oct 25 04:08:13 2016 +0000 1721 1722 upstream commit 1723 1724 Fix logic in add_local_forward() that inverted a test 1725 when code was refactored out into bind_permitted(). This broke ssh port 1726 forwarding for non-priv ports as a non root user. 1727 1728 ok dtucker@ 'looks good' deraadt@ 1729 1730 Upstream-ID: ddb8156ca03cc99997de284ce7777536ff9570c9 1731 1732 commit a903e315dee483e555c8a3a02c2946937f9b4e5d 1733 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1734 Date: Mon Oct 24 01:09:17 2016 +0000 1735 1736 upstream commit 1737 1738 Remove dead breaks, found via opencoverage.net. ok 1739 deraadt@ 1740 1741 Upstream-ID: ad9cc655829d67fad219762810770787ba913069 1742 1743 commit b4e96b4c9bea4182846e4942ba2048e6d708ee54 1744 Author: Darren Tucker <dtucker (a] zip.com.au> 1745 Date: Wed Oct 26 08:43:25 2016 +1100 1746 1747 Use !=NULL instead of >0 for getdefaultproj. 1748 1749 getdefaultproj() returns a pointer so test it for NULL inequality 1750 instead of >0. Fixes compiler warning and is more correct. Patch from 1751 David Binderman. 1752 1753 commit 1c4ef0b808d3d38232aeeb1cebb7e9a43def42c5 1754 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1755 Date: Sun Oct 23 22:04:05 2016 +0000 1756 1757 upstream commit 1758 1759 Factor out "can bind to low ports" check into its own function. This will 1760 make it easier for Portable to support platforms with permissions models 1761 other than uid==0 (eg bz#2625). ok djm@, "doesn't offend me too much" 1762 deraadt@. 1763 1764 Upstream-ID: 86213df4183e92b8f189a6d2dac858c994bfface 1765 1766 commit 0b9ee623d57e5de7e83e66fd61a7ba9a5be98894 1767 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1768 Date: Wed Oct 19 23:21:56 2016 +0000 1769 1770 upstream commit 1771 1772 When tearing down ControlMaster connecctions, don't 1773 pollute stderr when LogLevel=quiet. Patch from Tim Kuijsten via tech@. 1774 1775 Upstream-ID: d9b3a68b2a7c2f2fc7f74678e29a4618d55ceced 1776 1777 commit 09e6a7d8354224933febc08ddcbc2010f542284e 1778 Author: Darren Tucker <dtucker (a] zip.com.au> 1779 Date: Mon Oct 24 09:06:18 2016 +1100 1780 1781 Wrap stdint.h include in ifdef. 1782 1783 commit 08d9e9516e587b25127545c029e5464b2e7f2919 1784 Author: Darren Tucker <dtucker (a] zip.com.au> 1785 Date: Fri Oct 21 09:46:46 2016 +1100 1786 1787 Fix formatting. 1788 1789 commit 461f50e7ab8751d3a55e9158c44c13031db7ba1d 1790 Author: Darren Tucker <dtucker (a] zip.com.au> 1791 Date: Fri Oct 21 06:55:58 2016 +1100 1792 1793 Update links to https. 1794 1795 www.openssh.com now supports https and ftp.openbsd.org no longer 1796 supports ftp. Make all links to these https. 1797 1798 commit dd4e7212a6141f37742de97795e79db51e4427ad 1799 Author: Darren Tucker <dtucker (a] zip.com.au> 1800 Date: Fri Oct 21 06:48:46 2016 +1100 1801 1802 Update host key generation examples. 1803 1804 Remove ssh1 host key generation, add ssh-keygen -A 1805 1806 commit 6d49ae82634c67e9a4d4af882bee20b40bb8c639 1807 Author: Darren Tucker <dtucker (a] zip.com.au> 1808 Date: Fri Oct 21 05:22:55 2016 +1100 1809 1810 Update links. 1811 1812 Make links to openssh.com HTTPS now that it's supported, point release 1813 notes link to the HTML release notes page, and update a couple of other 1814 links and bits of text. 1815 1816 commit fe0d1ca6ace06376625084b004ee533f2c2ea9d6 1817 Author: Darren Tucker <dtucker (a] zip.com.au> 1818 Date: Thu Oct 20 03:42:09 2016 +1100 1819 1820 Remote channels .orig and .rej files. 1821 1822 These files were incorrectly added during an OpenBSD sync. 1823 1824 commit 246aa842a4ad368d8ce030495e657ef3a0e1f95c 1825 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 1826 Date: Tue Oct 18 17:32:54 2016 +0000 1827 1828 upstream commit 1829 1830 Remove channel_input_port_forward_request(); the only caller 1831 was the recently-removed SSH1 server code so it's now dead code. ok markus@ 1832 1833 Upstream-ID: 05453983230a1f439562535fec2818f63f297af9 1834 1835 commit 2c6697c443d2c9c908260eed73eb9143223e3ec9 1836 Author: millert (a] openbsd.org <millert (a] openbsd.org> 1837 Date: Tue Oct 18 12:41:22 2016 +0000 1838 1839 upstream commit 1840 1841 Install a signal handler for tty-generated signals and 1842 wait for the ssh child to suspend before suspending sftp. This lets ssh 1843 restore the terminal mode as needed when it is suspended at the password 1844 prompt. OK dtucker@ 1845 1846 Upstream-ID: a31c1f42aa3e2985dcc91e46e6a17bd22e372d69 1847 1848 commit fd2a8f1033fa2316fff719fd5176968277560158 1849 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 1850 Date: Sat Oct 15 19:56:25 2016 +0000 1851 1852 upstream commit 1853 1854 various formatting fixes, specifically removing Dq; 1855 1856 Upstream-ID: 81e85df2b8e474f5f93d66e61d9a4419ce87347c 1857 1858 commit 8f866d8a57b9a2dc5dd04504e27f593b551618e3 1859 Author: Darren Tucker <dtucker (a] zip.com.au> 1860 Date: Wed Oct 19 03:26:09 2016 +1100 1861 1862 Import readpassphrase.c rev 1.26. 1863 1864 Author: miller (a] openbsd.org: 1865 Avoid generate SIGTTOU when restoring the terminal mode. If we get 1866 SIGTTOU it means the process is not in the foreground process group 1867 which, in most cases, means that the shell has taken control of the tty. 1868 Requiring the user the fg the process in this case doesn't make sense 1869 and can result in both SIGTSTP and SIGTTOU being sent which can lead to 1870 the process being suspended again immediately after being brought into 1871 the foreground. 1872 1873 commit f901440cc844062c9bab0183d133f7ccc58ac3a5 1874 Author: Darren Tucker <dtucker (a] zip.com.au> 1875 Date: Wed Oct 19 03:23:16 2016 +1100 1876 1877 Import readpassphrase.c rev 1.25. 1878 1879 Wrap <readpassphrase.h> so internal calls go direct and 1880 readpassphrase is weak. 1881 1882 (DEF_WEAK is a no-op in portable.) 1883 1884 commit 032147b69527e5448a511049b2d43dbcae582624 1885 Author: Darren Tucker <dtucker (a] zip.com.au> 1886 Date: Sat Oct 15 05:51:12 2016 +1100 1887 1888 Move DEF_WEAK into defines.h. 1889 1890 As well pull in more recent changes from OpenBSD these will start to 1891 arrive so put it where the definition is shared. 1892 1893 commit e0259a82ddd950cfb109ddee86fcebbc09c6bd04 1894 Author: Darren Tucker <dtucker (a] zip.com.au> 1895 Date: Sat Oct 15 04:34:46 2016 +1100 1896 1897 Remove do_pam_set_tty which is dead code. 1898 1899 The callers of do_pam_set_tty were removed in 2008, so this is now dead 1900 code. bz#2604, pointed out by jjelen at redhat.com. 1901 1902 commit ca04de83f210959ad2ed870a30ba1732c3ae00e3 1903 Author: Damien Miller <djm (a] mindrot.org> 1904 Date: Thu Oct 13 18:53:43 2016 +1100 1905 1906 unbreak principals-command test 1907 1908 Undo inconsistetly updated variable name. 1909 1910 commit 1723ec92eb485ce06b4cbf49712d21975d873909 1911 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1912 Date: Tue Oct 11 21:49:54 2016 +0000 1913 1914 upstream commit 1915 1916 fix the KEX fuzzer - the previous method of obtaining the 1917 packet contents was broken. This now uses the new per-packet input hook, so 1918 it sees exact post-decrypt packets and doesn't have to pass packet integrity 1919 checks. ok markus@ 1920 1921 Upstream-Regress-ID: 402fb6ffabd97de590e8e57b25788949dce8d2fd 1922 1923 commit 09f997893f109799cddbfce6d7e67f787045cbb2 1924 Author: natano (a] openbsd.org <natano (a] openbsd.org> 1925 Date: Thu Oct 6 09:31:38 2016 +0000 1926 1927 upstream commit 1928 1929 Move USER out of the way to unbreak the BUILDUSER 1930 mechanism. ok tb 1931 1932 Upstream-Regress-ID: 74ab9687417dd071d62316eaadd20ddad1d5af3c 1933 1934 commit 3049a012c482a7016f674db168f23fd524edce27 1935 Author: bluhm (a] openbsd.org <bluhm (a] openbsd.org> 1936 Date: Fri Sep 30 11:55:20 2016 +0000 1937 1938 upstream commit 1939 1940 In ssh tests set REGRESS_FAIL_EARLY with ?= so that the 1941 environment can change it. OK djm@ 1942 1943 Upstream-Regress-ID: 77bcb50e47b68c7209c7f0a5a020d73761e5143b 1944 1945 commit 39af7b444db28c1cb01b7ea468a4f574a44f375b 1946 Author: djm (a] openbsd.org <djm (a] openbsd.org> 1947 Date: Tue Oct 11 21:47:45 2016 +0000 1948 1949 upstream commit 1950 1951 Add a per-packet input hook that is called with the 1952 decrypted packet contents. This will be used for fuzzing; ok markus@ 1953 1954 Upstream-ID: a3221cee6b1725dd4ae1dd2c13841b4784cb75dc 1955 1956 commit ec165c392ca54317dbe3064a8c200de6531e89ad 1957 Author: markus (a] openbsd.org <markus (a] openbsd.org> 1958 Date: Mon Oct 10 19:28:48 2016 +0000 1959 1960 upstream commit 1961 1962 Unregister the KEXINIT handler after message has been 1963 received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause 1964 allocation of up to 128MB -- until the connection is closed. Reported by 1965 shilei-c at 360.cn 1966 1967 Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05 1968 1969 commit 29d40319392e6e19deeca9d45468aa1119846e50 1970 Author: Darren Tucker <dtucker (a] zip.com.au> 1971 Date: Thu Oct 13 04:07:20 2016 +1100 1972 1973 Import rev 1.24 from OpenBSD. 1974 1975 revision 1.24 1976 date: 2013/11/24 23:51:29; author: deraadt; state: Exp; lines: +4 -4; 1977 most obvious unsigned char casts for ctype 1978 ok jca krw ingo 1979 1980 commit 12069e56221de207ed666c2449dedb431a2a7ca2 1981 Author: Darren Tucker <dtucker (a] zip.com.au> 1982 Date: Thu Oct 13 04:04:44 2016 +1100 1983 1984 Import rev 1.23 from OpenBSD. Fixes bz#2619. 1985 1986 revision 1.23 1987 date: 2010/05/14 13:30:34; author: millert; state: Exp; lines: +41 -39; 1988 Defer installing signal handlers until echo is disabled so that we 1989 get suspended normally when not the foreground process. Fix potential 1990 infinite loop when restoring terminal settings if process is in the 1991 background when restore occurs. OK miod@ 1992 1993 commit 7508d83eff89af069760b4cc587305588a64e415 1994 Author: Darren Tucker <dtucker (a] zip.com.au> 1995 Date: Thu Oct 13 03:53:51 2016 +1100 1996 1997 If we don't have TCSASOFT, define it to zero. 1998 1999 This makes it a no-op when we use it below, which allows us to re-sync 2000 those lines with the upstream and make future updates easier. 2001 2002 commit aae4dbd4c058d3b1fe1eb5c4e6ddf35827271377 2003 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 2004 Date: Fri Oct 7 14:41:52 2016 +0000 2005 2006 upstream commit 2007 2008 tidy up the formatting in this file. more specifically, 2009 replace .Dq, which looks appalling, with .Cm, where appropriate; 2010 2011 Upstream-ID: ff8e90aa0343d9bb56f40a535e148607973cc738 2012 2013 commit a571dbcc7b7b25371174569b13df5159bc4c6c7a 2014 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2015 Date: Tue Oct 4 21:34:40 2016 +0000 2016 2017 upstream commit 2018 2019 add a comment about implicitly-expected checks to 2020 sshkey_ec_validate_public() 2021 2022 Upstream-ID: 74a7f71c28f7c13a50f89fc78e7863b9cd61713f 2023 2024 commit 2f78a2a698f4222f8e05cad57ac6e0c3d1faff00 2025 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2026 Date: Fri Sep 30 20:24:46 2016 +0000 2027 2028 upstream commit 2029 2030 fix some -Wpointer-sign warnings in the new mux proxy; ok 2031 markus@ 2032 2033 Upstream-ID: b1ba7b3769fbc6b7f526792a215b0197f5e55dfd 2034 2035 commit ca71c36645fc26fcd739a8cfdc702cec85607761 2036 Author: bluhm (a] openbsd.org <bluhm (a] openbsd.org> 2037 Date: Wed Sep 28 20:09:52 2016 +0000 2038 2039 upstream commit 2040 2041 Add a makefile rule to create the ssh library when 2042 regress needs it. This allows to run the ssh regression tests without doing 2043 a "make build" before. Discussed with dtucker@ and djm@; OK djm@ 2044 2045 Upstream-Regress-ID: ce489bd53afcd471225a125b4b94565d4717c025 2046 2047 commit ce44c970f913d2a047903dba8670554ac42fc479 2048 Author: bluhm (a] openbsd.org <bluhm (a] openbsd.org> 2049 Date: Mon Sep 26 21:34:38 2016 +0000 2050 2051 upstream commit 2052 2053 Allow to run ssh regression tests as root. If the user 2054 is already root, the test should not expect that SUDO is set. If ssh needs 2055 another user, use sudo or doas to switch from root if necessary. OK dtucker@ 2056 2057 Upstream-Regress-ID: b464e55185ac4303529e3e6927db41683aaeace2 2058 2059 commit 8d0578478586e283e751ca51e7b0690631da139a 2060 Author: markus (a] openbsd.org <markus (a] openbsd.org> 2061 Date: Fri Sep 30 09:19:13 2016 +0000 2062 2063 upstream commit 2064 2065 ssh proxy mux mode (-O proxy; idea from Simon Tatham): - mux 2066 client speaks the ssh-packet protocol directly over unix-domain socket. - mux 2067 server acts as a proxy, translates channel IDs and relays to the server. - no 2068 filedescriptor passing necessary. - combined with unix-domain forwarding it's 2069 even possible to run mux client and server on different machines. feedback 2070 & ok djm@ 2071 2072 Upstream-ID: 666a2fb79f58e5c50e246265fb2b9251e505c25b 2073 2074 commit b7689155f3f5c4999846c07a852b1c7a43b09cec 2075 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2076 Date: Wed Sep 28 21:44:52 2016 +0000 2077 2078 upstream commit 2079 2080 put back some pre-auth zlib bits that I shouldn't have 2081 removed - they are still used by the client. Spotted by naddy@ 2082 2083 Upstream-ID: 80919468056031037d56a1f5b261c164a6f90dc2 2084 2085 commit 4577adead6a7d600c8e764619d99477a08192c8f 2086 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2087 Date: Wed Sep 28 20:32:42 2016 +0000 2088 2089 upstream commit 2090 2091 restore pre-auth compression support in the client -- the 2092 previous commit was intended to remove it from the server only. 2093 2094 remove a few server-side pre-auth compression bits that escaped 2095 2096 adjust wording of Compression directive in sshd_config(5) 2097 2098 pointed out by naddy@ ok markus@ 2099 2100 Upstream-ID: d23696ed72a228dacd4839dd9f2dec424ba2016b 2101 2102 commit 80d1c963b4dc84ffd11d09617b39c4bffda08956 2103 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 2104 Date: Wed Sep 28 17:59:22 2016 +0000 2105 2106 upstream commit 2107 2108 use a separate TOKENS section, as we've done for 2109 sshd_config(5); help/ok djm 2110 2111 Upstream-ID: 640e32b5e4838e4363738cdec955084b3579481d 2112 2113 commit 1cfd5c06efb121e58e8b6671548fda77ef4b4455 2114 Author: Damien Miller <djm (a] mindrot.org> 2115 Date: Thu Sep 29 03:19:23 2016 +1000 2116 2117 Remove portability support for mmap 2118 2119 We no longer need to wrap/replace mmap for portability now that 2120 pre-auth compression has been removed from OpenSSH. 2121 2122 commit 0082fba4efdd492f765ed4c53f0d0fbd3bdbdf7f 2123 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2124 Date: Wed Sep 28 16:33:06 2016 +0000 2125 2126 upstream commit 2127 2128 Remove support for pre-authentication compression. Doing 2129 compression early in the protocol probably seemed reasonable in the 1990s, 2130 but today it's clearly a bad idea in terms of both cryptography (cf. multiple 2131 compression oracle attacks in TLS) and attack surface. 2132 2133 Moreover, to support it across privilege-separation zlib needed 2134 the assistance of a complex shared-memory manager that made the 2135 required attack surface considerably larger. 2136 2137 Prompted by Guido Vranken pointing out a compiler-elided security 2138 check in the shared memory manager found by Stack 2139 (http://css.csail.mit.edu/stack/); ok deraadt@ markus@ 2140 2141 NB. pre-auth authentication has been disabled by default in sshd 2142 for >10 years. 2143 2144 Upstream-ID: 32af9771788d45a0779693b41d06ec199d849caf 2145 2146 commit 27c3a9c2aede2184856b5de1e6eca414bb751c38 2147 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2148 Date: Mon Sep 26 21:16:11 2016 +0000 2149 2150 upstream commit 2151 2152 Avoid a theoretical signed integer overflow should 2153 BN_num_bytes() ever violate its manpage and return a negative value. Improve 2154 order of tests to avoid confusing increasingly pedantic compilers. 2155 2156 Reported by Guido Vranken from stack (css.csail.mit.edu/stack) 2157 unstable optimisation analyser output. ok deraadt@ 2158 2159 Upstream-ID: f8508c830c86d8f36c113985e52bf8eedae23505 2160 2161 commit 8663e51c80c6aa3d750c6d3bcff6ee05091922be 2162 Author: Damien Miller <djm (a] mindrot.org> 2163 Date: Wed Sep 28 07:40:33 2016 +1000 2164 2165 fix mdoc2man.awk formatting for top-level lists 2166 2167 Reported by Glenn Golden 2168 Diagnosis and fix from Ingo Schwarze 2169 2170 commit b97739dc21570209ed9d4e7beee0c669ed23b097 2171 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2172 Date: Thu Sep 22 21:15:41 2016 +0000 2173 2174 upstream commit 2175 2176 missing bit from previous commit 2177 2178 Upstream-ID: 438d5ed6338b28b46e822eb13eee448aca31df37 2179 2180 commit de6a175a99d22444e10d19ad3fffef39bc3ee3bb 2181 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 2182 Date: Thu Sep 22 19:19:01 2016 +0000 2183 2184 upstream commit 2185 2186 organise the token stuff into a separate section; ok 2187 markus for an earlier version of the diff ok/tweaks djm 2188 2189 Upstream-ID: 81a6daa506a4a5af985fce7cf9e59699156527c8 2190 2191 commit 16277fc45ffc95e4ffc3d45971ff8320b974de2b 2192 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2193 Date: Thu Sep 22 17:55:13 2016 +0000 2194 2195 upstream commit 2196 2197 mention curve25519-sha256 KEX 2198 2199 Upstream-ID: 33ae1f433ce4795ffa6203761fbdf86e0d7ffbaf 2200 2201 commit 0493766d5676c7ca358824ea8d3c90f6047953df 2202 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2203 Date: Thu Sep 22 17:52:53 2016 +0000 2204 2205 upstream commit 2206 2207 support plain curve25519-sha256 KEX algorithm now that it 2208 is approaching standardisation (same algorithm is currently supported as 2209 curve25519-sha256 (a] libssh.org) 2210 2211 Upstream-ID: 5e2b6db2e72667048cf426da43c0ee3fc777baa2 2212 2213 commit f31c654b30a6f02ce0b8ea8ab81791b675489628 2214 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 2215 Date: Thu Sep 22 02:29:57 2016 +0000 2216 2217 upstream commit 2218 2219 If ssh receives a PACKET_DISCONNECT during userauth it 2220 will cause ssh_dispatch_run(DISPATCH_BLOCK, ...) to return without the 2221 session being authenticated. Check for this and exit if necessary. ok djm@ 2222 2223 Upstream-ID: b3afe126c0839d2eae6cddd41ff2ba317eda0903 2224 2225 commit 1622649b7a829fc8dc313042a43a974f0f3e8a99 2226 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2227 Date: Wed Sep 21 19:53:12 2016 +0000 2228 2229 upstream commit 2230 2231 correctly return errors from kex_send_ext_info(). Fix from 2232 Sami Farin via https://github.com/openssh/openssh-portable/pull/50 2233 2234 Upstream-ID: c85999af28aaecbf92cfa2283381df81e839b42c 2235 2236 commit f83a0cfe16c7a73627b46a9a94e40087d60f32fb 2237 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2238 Date: Wed Sep 21 17:44:20 2016 +0000 2239 2240 upstream commit 2241 2242 cast uint64_t for printf 2243 2244 Upstream-ID: 76d23e89419ccbd2320f92792a6d878211666ac1 2245 2246 commit 5f63ab474f58834feca4f35c498be03b7dd38a16 2247 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2248 Date: Wed Sep 21 17:03:54 2016 +0000 2249 2250 upstream commit 2251 2252 disable tests for affirmative negated match after backout of 2253 match change 2254 2255 Upstream-Regress-ID: acebb8e5042f03d66d86a50405c46c4de0badcfd 2256 2257 commit a5ad3a9db5a48f350f257a67b62fafd719ecb7e0 2258 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2259 Date: Wed Sep 21 16:55:42 2016 +0000 2260 2261 upstream commit 2262 2263 Revert two recent changes to negated address matching. The 2264 new behaviour offers unintuitive surprises. We'll find a better way to deal 2265 with single negated matches. 2266 2267 match.c 1.31: 2268 > fix matching for pattern lists that contain a single negated match, 2269 > e.g. "Host !example" 2270 > 2271 > report and patch from Robin Becker. bz#1918 ok dtucker@ 2272 2273 addrmatch.c 1.11: 2274 > fix negated address matching where the address list consists of a 2275 > single negated match, e.g. "Match addr !192.20.0.1" 2276 > 2277 > Report and patch from Jakub Jelen. bz#2397 ok dtucker@ 2278 2279 Upstream-ID: ec96c770f0f5b9a54e5e72fda25387545e9c80c6 2280 2281 commit 119b7a2ca0ef2bf3f81897ae10301b8ca8cba844 2282 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2283 Date: Wed Sep 21 01:35:12 2016 +0000 2284 2285 upstream commit 2286 2287 test all the AuthorizedPrincipalsCommand % expansions 2288 2289 Upstream-Regress-ID: 0a79a84dfaa59f958e46b474c3db780b454d30e3 2290 2291 commit bfa9d969ab6235d4938ce069d4db7e5825c56a19 2292 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2293 Date: Wed Sep 21 01:34:45 2016 +0000 2294 2295 upstream commit 2296 2297 add a way for principals command to get see key ID and serial 2298 too 2299 2300 Upstream-ID: 0d30978bdcf7e8eaeee4eea1b030eb2eb1823fcb 2301 2302 commit 920585b826af1c639e4ed78b2eba01fd2337b127 2303 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2304 Date: Fri Sep 16 06:09:31 2016 +0000 2305 2306 upstream commit 2307 2308 add a note on kexfuzz' limitations 2309 2310 Upstream-Regress-ID: 03804d4a0dbc5163e1a285a4c8cc0a76a4e864ec 2311 2312 commit 0445ff184080b196e12321998b4ce80b0f33f8d1 2313 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2314 Date: Fri Sep 16 01:01:41 2016 +0000 2315 2316 upstream commit 2317 2318 fix for newer modp DH groups 2319 (diffie-hellman-group14-sha256 etc) 2320 2321 Upstream-Regress-ID: fe942c669959462b507516ae1634fde0725f1c68 2322 2323 commit 28652bca29046f62c7045e933e6b931de1d16737 2324 Author: markus (a] openbsd.org <markus (a] openbsd.org> 2325 Date: Mon Sep 19 19:02:19 2016 +0000 2326 2327 upstream commit 2328 2329 move inbound NEWKEYS handling to kex layer; otherwise 2330 early NEWKEYS causes NULL deref; found by Robert Swiecki/honggfuzz; fixed 2331 with & ok djm@ 2332 2333 Upstream-ID: 9a68b882892e9f51dc7bfa9f5a423858af358b2f 2334 2335 commit 492710894acfcc2f173d14d1d45bd2e688df605d 2336 Author: natano (a] openbsd.org <natano (a] openbsd.org> 2337 Date: Mon Sep 19 07:52:42 2016 +0000 2338 2339 upstream commit 2340 2341 Replace two more arc4random() loops with 2342 arc4random_buf(). 2343 2344 tweaks and ok dtucker 2345 ok deraadt 2346 2347 Upstream-ID: 738d3229130ccc7eac975c190276ca6fcf0208e4 2348 2349 commit 1036356324fecc13099ac6e986b549f6219327d7 2350 Author: tedu (a] openbsd.org <tedu (a] openbsd.org> 2351 Date: Sat Sep 17 18:00:27 2016 +0000 2352 2353 upstream commit 2354 2355 replace two arc4random loops with arc4random_buf ok 2356 deraadt natano 2357 2358 Upstream-ID: e18ede972d1737df54b49f011fa4f3917a403f48 2359 2360 commit 00df97ff68a49a756d4b977cd02283690f5dfa34 2361 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2362 Date: Wed Sep 14 20:11:26 2016 +0000 2363 2364 upstream commit 2365 2366 take fingerprint of correct key for 2367 AuthorizedPrincipalsCommand 2368 2369 Upstream-ID: 553581a549cd6a3e73ce9f57559a325cc2cb1f38 2370 2371 commit e7907c1cb938b96dd33d27c2fea72c4e08c6b2f6 2372 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2373 Date: Wed Sep 14 05:42:25 2016 +0000 2374 2375 upstream commit 2376 2377 add %-escapes to AuthorizedPrincipalsCommand to match those 2378 supported for AuthorizedKeysCommand (key, key type, fingerprint, etc) and a 2379 few more to provide access to the certificate's CA key; 'looks ok' dtucker@ 2380 2381 Upstream-ID: 6b00fd446dbebe67f4e4e146d2e492d650ae04eb 2382 2383 commit 2b939c272a81c4d0c47badeedbcb2ba7c128ccda 2384 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 2385 Date: Wed Sep 14 00:45:31 2016 +0000 2386 2387 upstream commit 2388 2389 Improve test coverage of ssh-keygen -T a bit. 2390 2391 Upstream-Regress-ID: 8851668c721bcc2b400600cfc5a87644cc024e72 2392 2393 commit 44d82fc83be6c5ccd70881c2dac1a73e5050398b 2394 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 2395 Date: Mon Sep 12 02:25:46 2016 +0000 2396 2397 upstream commit 2398 2399 Add testcase for ssh-keygen -j, -J and -K options for 2400 moduli screening. Does not currently test generation as that is extremely 2401 slow. 2402 2403 Upstream-Regress-ID: 9de6ce801377ed3ce0a63a1413f1cd5fd3c2d062 2404 2405 commit 44e5f756d286bc3a1a5272ea484ee276ba3ac5c2 2406 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2407 Date: Tue Aug 23 08:17:04 2016 +0000 2408 2409 upstream commit 2410 2411 add tests for addr_match_list() 2412 2413 Upstream-Regress-ID: fae2d1fef84687ece584738a924c7bf969616c8e 2414 2415 commit 445e218878035b59c704c18406e8aeaff4c8aa25 2416 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2417 Date: Mon Sep 12 23:39:34 2016 +0000 2418 2419 upstream commit 2420 2421 handle certs in rsa_hash_alg_from_ident(), saving an 2422 unnecessary special case elsewhere. 2423 2424 Upstream-ID: 901cb081c59d6d2698b57901c427f3f6dc7397d4 2425 2426 commit 130f5df4fa37cace8c079dccb690e5cafbf00751 2427 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2428 Date: Mon Sep 12 23:31:27 2016 +0000 2429 2430 upstream commit 2431 2432 list all supported signature algorithms in the 2433 server-sig-algs Reported by mb AT smartftp.com in bz#2547 and (independantly) 2434 Ron Frederick; ok markus@ 2435 2436 Upstream-ID: ddf702d721f54646b11ef2cee6d916666cb685cd 2437 2438 commit 8f750ccfc07acb8aa98be5a5dd935033a6468cfd 2439 Author: Darren Tucker <dtucker (a] zip.com.au> 2440 Date: Mon Sep 12 14:43:58 2016 +1000 2441 2442 Remove no-op brackets to resync with upstream. 2443 2444 commit 7050896e7395866278c19c2ff080c26152619d1d 2445 Author: Darren Tucker <dtucker (a] zip.com.au> 2446 Date: Mon Sep 12 13:57:28 2016 +1000 2447 2448 Resync ssh-keygen -W error message with upstream. 2449 2450 commit 43cceff82cc20413cce58ba3375e19684e62cec4 2451 Author: Darren Tucker <dtucker (a] zip.com.au> 2452 Date: Mon Sep 12 13:55:37 2016 +1000 2453 2454 Move ssh-keygen -W handling code to match upstream 2455 2456 commit af48d541360b1d7737b35740a4b1ca34e1652cd9 2457 Author: Darren Tucker <dtucker (a] zip.com.au> 2458 Date: Mon Sep 12 13:52:17 2016 +1000 2459 2460 Move ssh-keygen -T handling code to match upstream. 2461 2462 commit d8c3cfbb018825c6c86547165ddaf11924901c49 2463 Author: Darren Tucker <dtucker (a] zip.com.au> 2464 Date: Mon Sep 12 13:30:50 2016 +1000 2465 2466 Move -M handling code to match upstream. 2467 2468 commit 7b63cf6dbbfa841c003de57d1061acbf2ff22364 2469 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 2470 Date: Mon Sep 12 03:29:16 2016 +0000 2471 2472 upstream commit 2473 2474 Spaces->tabs. 2475 2476 Upstream-ID: f4829dfc3f36318273f6082b379ac562eead70b7 2477 2478 commit 11e5e644536821ceb3bb4dd8487fbf0588522887 2479 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 2480 Date: Mon Sep 12 03:25:20 2016 +0000 2481 2482 upstream commit 2483 2484 Style whitespace fix. Also happens to remove a no-op 2485 diff with portable. 2486 2487 Upstream-ID: 45d90f9a62ad56340913a433a9453eb30ceb8bf3 2488 2489 commit 9136ec134c97a8aff2917760c03134f52945ff3c 2490 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 2491 Date: Mon Sep 12 01:22:38 2016 +0000 2492 2493 upstream commit 2494 2495 Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then 2496 use those definitions rather than pulling <sys/param.h> and unknown namespace 2497 pollution. ok djm markus dtucker 2498 2499 Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8 2500 2501 commit f219fc8f03caca7ac82a38ed74bbd6432a1195e7 2502 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 2503 Date: Wed Sep 7 18:39:24 2016 +0000 2504 2505 upstream commit 2506 2507 sort; from matthew martin 2508 2509 Upstream-ID: 73cec7f7ecc82d37a4adffad7745e4684de67ce7 2510 2511 commit 06ce56b05def9460aecc7cdb40e861a346214793 2512 Author: markus (a] openbsd.org <markus (a] openbsd.org> 2513 Date: Tue Sep 6 09:22:56 2016 +0000 2514 2515 upstream commit 2516 2517 ssh_set_newkeys: print correct block counters on 2518 rekeying; ok djm@ 2519 2520 Upstream-ID: 32bb7a9cb9919ff5bab28d50ecef3a2b2045dd1e 2521 2522 commit e5e8d9114ac6837a038f4952994ca95a97fafe8d 2523 Author: markus (a] openbsd.org <markus (a] openbsd.org> 2524 Date: Tue Sep 6 09:14:05 2016 +0000 2525 2526 upstream commit 2527 2528 update ext_info_c every time we receive a kexinit msg; 2529 fixes sending of ext_info if privsep is disabled; report Aris Adamantiadis & 2530 Mancha; ok djm@ 2531 2532 Upstream-ID: 2ceaa1076e19dbd3542254b4fb8e42d608f28856 2533 2534 commit da95318dbedbaa1335323dba370975c2f251afd8 2535 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2536 Date: Mon Sep 5 14:02:42 2016 +0000 2537 2538 upstream commit 2539 2540 remove 3des-cbc from the client's default proposal; 2541 64-bit block ciphers are not safe in 2016 and we don't want to wait until 2542 attacks like sweet32 are extended to SSH. 2543 2544 As 3des-cbc was the only mandatory cipher in the SSH RFCs, this may 2545 cause problems connecting to older devices using the defaults, but 2546 it's highly likely that such devices already need explicit 2547 configuration for KEX and hostkeys anyway. 2548 2549 ok deraadt, markus, dtucker 2550 2551 Upstream-ID: a505dfe65c6733af0f751b64cbc4bb7e0761bc2f 2552 2553 commit b33ad6d997d36edfea65e243cd12ccd01f413549 2554 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2555 Date: Mon Sep 5 13:57:31 2016 +0000 2556 2557 upstream commit 2558 2559 enforce expected request flow for GSSAPI calls; thanks to 2560 Jakub Jelen for testing; ok markus@ 2561 2562 Upstream-ID: d4bc0e70e1be403735d3d9d7e176309b1fd626b9 2563 2564 commit 0bb2980260fb24e5e0b51adac471395781b66261 2565 Author: Darren Tucker <dtucker (a] zip.com.au> 2566 Date: Mon Sep 12 11:07:00 2016 +1000 2567 2568 Restore ssh-keygen's -J and -j option handling. 2569 2570 These were incorrectly removed in the 1d9a2e28 sync commit. 2571 2572 commit 775f8a23f2353f5869003c57a213d14b28e0736e 2573 Author: Damien Miller <djm (a] mindrot.org> 2574 Date: Wed Aug 31 10:48:07 2016 +1000 2575 2576 tighten PAM monitor calls 2577 2578 only allow kbd-interactive ones when that authentication method is 2579 enabled. Prompted by Solar Designer 2580 2581 commit 7fd0ea8a1db4bcfb3d8cd9df149e5d571ebea1f4 2582 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2583 Date: Tue Aug 30 07:50:21 2016 +0000 2584 2585 upstream commit 2586 2587 restrict monitor auth calls to be allowed only when their 2588 respective authentication methods are enabled in the configuration. 2589 2590 prompted by Solar Designer; ok markus dtucker 2591 2592 Upstream-ID: 6eb3f89332b3546d41d6dbf5a8e6ff920142b553 2593 2594 commit b38b95f5bcc52278feb839afda2987933f68ff96 2595 Author: Damien Miller <djm (a] mindrot.org> 2596 Date: Mon Aug 29 11:47:07 2016 +1000 2597 2598 Tighten monitor state-machine flow for PAM calls 2599 2600 (attack surface reduction) 2601 2602 commit dc664d1bd0fc91b24406a3e9575b81c285b8342b 2603 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2604 Date: Sun Aug 28 22:28:12 2016 +0000 2605 2606 upstream commit 2607 2608 fix uninitialised optlen in getsockopt() call; harmless 2609 on Unix/BSD but potentially crashy on Cygwin. Reported by James Slepicka ok 2610 deraadt@ 2611 2612 Upstream-ID: 1987ccee508ba5b18f016c85100d7ac3f70ff965 2613 2614 commit 5bcc1e2769f7d6927d41daf0719a9446ceab8dd7 2615 Author: guenther (a] openbsd.org <guenther (a] openbsd.org> 2616 Date: Sat Aug 27 04:05:12 2016 +0000 2617 2618 upstream commit 2619 2620 Pull in <sys/time.h> for struct timeval 2621 2622 ok deraadt@ 2623 2624 Upstream-ID: ae34525485a173bccd61ac8eefeb91c57e3b7df6 2625 2626 commit fa4a4c96b19127dc2fd4e92f20d99c0c7f34b538 2627 Author: guenther (a] openbsd.org <guenther (a] openbsd.org> 2628 Date: Sat Aug 27 04:04:56 2016 +0000 2629 2630 upstream commit 2631 2632 Pull in <stdlib.h> for NULL 2633 2634 ok deraadt@ 2635 2636 Upstream-ID: 7baa6a0f1e049bb3682522b4b95a26c866bfc043 2637 2638 commit ae363d74ccc1451185c0c8bd4631e28c67c7fd36 2639 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2640 Date: Thu Aug 25 23:57:54 2016 +0000 2641 2642 upstream commit 2643 2644 add a sIgnore opcode that silently ignores options and 2645 use it to suppress noisy deprecation warnings for the Protocol directive. 2646 2647 req henning, ok markus 2648 2649 Upstream-ID: 9fe040aca3d6ff393f6f7e60045cdd821dc4cbe0 2650 2651 commit a94c60306643ae904add6e8ed219e4be3494255c 2652 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2653 Date: Thu Aug 25 23:56:51 2016 +0000 2654 2655 upstream commit 2656 2657 remove superfluous NOTREACHED comment 2658 2659 Upstream-ID: a7485c1f1be618e8c9e38fd9be46c13b2d03b90c 2660 2661 commit fc041c47144ce28cf71353124a8a5d183cd6a251 2662 Author: otto (a] openbsd.org <otto (a] openbsd.org> 2663 Date: Tue Aug 23 16:21:45 2016 +0000 2664 2665 upstream commit 2666 2667 fix previous, a condition was modified incorrectly; ok 2668 markus@ deraadt@ 2669 2670 Upstream-ID: c443e339768e7ed396dff3bb55f693e7d3641453 2671 2672 commit 23555eb13a9b0550371a16dcf8beaab7a5806a64 2673 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2674 Date: Tue Aug 23 08:17:42 2016 +0000 2675 2676 upstream commit 2677 2678 downgrade an error() to a debug2() to match similar cases 2679 in addr_match_list() 2680 2681 Upstream-ID: 07c3d53e357214153d9d08f234411e0d1a3d6f5c 2682 2683 commit a39627134f6d90e7009eeb14e9582ecbc7a99192 2684 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2685 Date: Tue Aug 23 06:36:23 2016 +0000 2686 2687 upstream commit 2688 2689 remove Protocol directive from client/server configs that 2690 causes spammy deprecation warnings 2691 2692 hardcode SSH_PROTOCOLS=2, since that's all we support on the server 2693 now (the client still may support both, so it could get confused) 2694 2695 Upstream-Regress-ID: c16662c631af51633f9fd06aca552a70535de181 2696 2697 commit 6ee4f1c01ee31e65245881d49d4bccf014956066 2698 Author: Damien Miller <djm (a] mindrot.org> 2699 Date: Tue Aug 23 16:33:48 2016 +1000 2700 2701 hook match and utf8 unittests up to Makefile 2702 2703 commit 114efe2bc0dd2842d997940a833f115e6fc04854 2704 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2705 Date: Fri Aug 19 06:44:13 2016 +0000 2706 2707 upstream commit 2708 2709 add tests for matching functions 2710 2711 Upstream-Regress-ID: 0869d4f5c5d627c583c6a929d69c17d5dd65882c 2712 2713 commit 857568d2ac81c14bcfd625b27536c1e28c992b3c 2714 Author: Damien Miller <djm (a] mindrot.org> 2715 Date: Tue Aug 23 14:32:37 2016 +1000 2716 2717 removing UseLogin bits from configure.ac 2718 2719 commit cc182d01cef8ca35a1d25ea9bf4e2ff72e588208 2720 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2721 Date: Tue Aug 23 03:24:10 2016 +0000 2722 2723 upstream commit 2724 2725 fix negated address matching where the address list 2726 consists of a single negated match, e.g. "Match addr !192.20.0.1" 2727 2728 Report and patch from Jakub Jelen. bz#2397 ok dtucker@ 2729 2730 Upstream-ID: 01dcac3f3e6ca47518cf293e31c73597a4bb40d8 2731 2732 commit 4067ec8a4c64ccf16250c35ff577b4422767da64 2733 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2734 Date: Tue Aug 23 03:22:49 2016 +0000 2735 2736 upstream commit 2737 2738 fix matching for pattern lists that contain a single 2739 negated match, e.g. "Host !example" 2740 2741 report and patch from Robin Becker. bz#1918 ok dtucker@ 2742 2743 Upstream-ID: 05a0cb323ea4bc20e98db099b42c067bfb9ea1ea 2744 2745 commit 83b581862a1dbb06fc859959f829dde2654aef3c 2746 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2747 Date: Fri Aug 19 03:18:06 2016 +0000 2748 2749 upstream commit 2750 2751 remove UseLogin option and support for having /bin/login 2752 manage login sessions; ok deraadt markus dtucker 2753 2754 Upstream-ID: bea7213fbf158efab7e602d9d844fba4837d2712 2755 2756 commit ffe6549c2f7a999cc5264b873a60322e91862581 2757 Author: naddy (a] openbsd.org <naddy (a] openbsd.org> 2758 Date: Mon Aug 15 12:32:04 2016 +0000 2759 2760 upstream commit 2761 2762 Catch up with the SSH1 code removal and delete all 2763 mention of protocol 1 particularities, key files and formats, command line 2764 options, and configuration keywords from the server documentation and 2765 examples. ok jmc@ 2766 2767 Upstream-ID: 850328854675b4b6a0d4a90f0b4a9dd9ca4e905f 2768 2769 commit c38ea634893a1975dbbec798fb968c9488013f4a 2770 Author: naddy (a] openbsd.org <naddy (a] openbsd.org> 2771 Date: Mon Aug 15 12:27:56 2016 +0000 2772 2773 upstream commit 2774 2775 Remove more SSH1 server code: * Drop sshd's -k option. * 2776 Retire configuration keywords that only apply to protocol 1, as well as the 2777 "protocol" keyword. * Remove some related vestiges of protocol 1 support. 2778 2779 ok markus@ 2780 2781 Upstream-ID: 9402f82886de917779db12f8ee3f03d4decc244d 2782 2783 commit 33ba55d9e358c07f069e579bfab80eccaaad52cb 2784 Author: Darren Tucker <dtucker (a] zip.com.au> 2785 Date: Wed Aug 17 16:26:04 2016 +1000 2786 2787 Only check for prctl once. 2788 2789 commit 976ba8a8fd66a969bf658280c1e5adf694cc2fc6 2790 Author: Darren Tucker <dtucker (a] zip.com.au> 2791 Date: Wed Aug 17 15:33:10 2016 +1000 2792 2793 Fix typo. 2794 2795 commit 9abf84c25ff4448891edcde60533a6e7b2870de1 2796 Author: Darren Tucker <dtucker (a] zip.com.au> 2797 Date: Wed Aug 17 14:25:43 2016 +1000 2798 2799 Correct LDFLAGS for clang example. 2800 2801 --with-ldflags isn't used until after the -ftrapv test, so mention 2802 LDFLAGS instead for now. 2803 2804 commit 1e8013a17ff11e3c6bd0012fb1fc8d5f1330eb21 2805 Author: Darren Tucker <dtucker (a] zip.com.au> 2806 Date: Wed Aug 17 14:08:42 2016 +1000 2807 2808 Remove obsolete CVS $Id from source files. 2809 2810 Since -portable switched to git the CVS $Id tags are no longer being 2811 updated and are becoming increasingly misleading. Remove them. 2812 2813 commit adab758242121181700e48b4f6c60d6b660411fe 2814 Author: Darren Tucker <dtucker (a] zip.com.au> 2815 Date: Wed Aug 17 13:40:58 2016 +1000 2816 2817 Remove now-obsolete CVS $Id tags from text files. 2818 2819 Since -portable switched to git, the CVS $Id tags are no longer being 2820 updated and are becoming increasingly misleading. Remove them. 2821 2822 commit 560c0068541315002ec4c1c00a560bbd30f2d671 2823 Author: Darren Tucker <dtucker (a] zip.com.au> 2824 Date: Wed Aug 17 13:38:30 2016 +1000 2825 2826 Add a section for compiler specifics. 2827 2828 Add a section for compiler specifics and document the runtime requirements 2829 for clang's integer sanitization. 2830 2831 commit a8fc0f42e1eda2fa3393d1ea5e61322d5e07a9cd 2832 Author: Darren Tucker <dtucker (a] zip.com.au> 2833 Date: Wed Aug 17 13:35:43 2016 +1000 2834 2835 Test multiplying two long long ints. 2836 2837 When using clang with -ftrapv or -sanitize=integer the tests would pass 2838 but linking would fail with "undefined reference to __mulodi4". 2839 Explicitly test for this before enabling -trapv. 2840 2841 commit a1cc637e7e11778eb727559634a6ef1c19c619f6 2842 Author: Damien Miller <djm (a] mindrot.org> 2843 Date: Tue Aug 16 14:47:34 2016 +1000 2844 2845 add a --with-login-program configure argument 2846 2847 Saves messing around with LOGIN_PROGRAM env var, which come 2848 packaging environments make hard to do during configure phase. 2849 2850 commit 8bd81e1596ab1bab355146cb65e82fb96ade3b23 2851 Author: Damien Miller <djm (a] mindrot.org> 2852 Date: Tue Aug 16 13:30:56 2016 +1000 2853 2854 add --with-pam-service to specify PAM service name 2855 2856 Saves messing around with CFLAGS to do it. 2857 2858 commit 74433a19bb6f4cef607680fa4d1d7d81ca3826aa 2859 Author: Damien Miller <djm (a] mindrot.org> 2860 Date: Tue Aug 16 13:28:23 2016 +1000 2861 2862 fix false positives when compiled with msan 2863 2864 Our explicit_bzero successfully confused clang -fsanitize-memory 2865 in to thinking that memset is never called to initialise memory. 2866 Ensure that it is called in a way that the compiler recognises. 2867 2868 commit 6cb6dcffe1a2204ba9006de20f73255c268fcb6b 2869 Author: markus (a] openbsd.org <markus (a] openbsd.org> 2870 Date: Sat Aug 13 17:47:40 2016 +0000 2871 2872 upstream commit 2873 2874 remove ssh1 server code; ok djm@ 2875 2876 Upstream-ID: c24c0c32c49b91740d5a94ae914fb1898ea5f534 2877 2878 commit 42d47adc5ad1187f22c726cbc52e71d6b1767ca2 2879 Author: jca (a] openbsd.org <jca (a] openbsd.org> 2880 Date: Fri Aug 12 19:19:04 2016 +0000 2881 2882 upstream commit 2883 2884 Use 2001:db8::/32, the official IPv6 subnet for 2885 configuration examples. 2886 2887 This makes the IPv6 example consistent with IPv4, and removes a dubious 2888 mention of a 6bone subnet. 2889 2890 ok sthen@ millert@ 2891 2892 Upstream-ID: b027f3d0e0073419a132fd1bf002e8089b233634 2893 2894 commit b61f53c0c3b43c28e013d3b3696d64d1c0204821 2895 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 2896 Date: Thu Aug 11 01:42:11 2016 +0000 2897 2898 upstream commit 2899 2900 Update moduli file. 2901 2902 Upstream-ID: 6da9a37f74aef9f9cc639004345ad893cad582d8 2903 2904 commit f217d9bd42d306f69f56335231036b44502d8191 2905 Author: Darren Tucker <dtucker (a] zip.com.au> 2906 Date: Thu Aug 11 11:42:48 2016 +1000 2907 2908 Import updated moduli. 2909 2910 commit 67dca60fbb4923b7a11c1645b90a5ca57c03d8be 2911 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 2912 Date: Mon Aug 8 22:40:57 2016 +0000 2913 2914 upstream commit 2915 2916 Improve error message for overlong ControlPath. ok markus@ 2917 djm@ 2918 2919 Upstream-ID: aed374e2e88dd3eb41390003e5303d0089861eb5 2920 2921 commit 4706c1d8c15cd5565b59512853c2da9bd4ca26c9 2922 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2923 Date: Wed Aug 3 05:41:57 2016 +0000 2924 2925 upstream commit 2926 2927 small refactor of cipher.c: make ciphercontext opaque to 2928 callers feedback and ok markus@ 2929 2930 Upstream-ID: 094849f8be68c3bdad2c0f3dee551ecf7be87f6f 2931 2932 commit e600348a7afd6325cc5cd783cb424065cbc20434 2933 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 2934 Date: Wed Aug 3 04:23:55 2016 +0000 2935 2936 upstream commit 2937 2938 Fix bug introduced in rev 1.467 which causes 2939 "buffer_get_bignum_ret: incomplete message" errors when built with WITH_SSH1 2940 and run such that no Protocol 1 ephemeral host key is generated (eg "Protocol 2941 2", no SSH1 host key supplied). Reported by rainer.laatsch at t-online.de, 2942 ok deraadt@ 2943 2944 Upstream-ID: aa6b132da5c325523aed7989cc5a320497c919dc 2945 2946 commit d7e7348e72f9b203189e3fffb75605afecba4fda 2947 Author: djm (a] openbsd.org <djm (a] openbsd.org> 2948 Date: Wed Jul 27 23:18:12 2016 +0000 2949 2950 upstream commit 2951 2952 better bounds check on iovcnt (we only ever use fixed, 2953 positive values) 2954 2955 Upstream-ID: 9baa6eb5cd6e30c9dc7398e5fe853721a3a5bdee 2956 2957 commit 5faa52d295f764562ed6dd75c4a4ce9134ae71e3 2958 Author: Darren Tucker <dtucker (a] zip.com.au> 2959 Date: Tue Aug 2 15:22:40 2016 +1000 2960 2961 Use tabs consistently inside "case $host". 2962 2963 commit 20e5e8ba9c5d868d897896190542213a60fffbd2 2964 Author: Darren Tucker <dtucker (a] zip.com.au> 2965 Date: Tue Aug 2 12:16:34 2016 +1000 2966 2967 Explicitly test for broken strnvis. 2968 2969 NetBSD added an strnvis and unfortunately made it incompatible with the 2970 existing one in OpenBSD and Linux's libbsd (the former having existed 2971 for over ten years). Despite this incompatibility being reported during 2972 development (see http://gnats.netbsd.org/44977) they still shipped it. 2973 Even more unfortunately FreeBSD and later MacOS picked up this incompatible 2974 implementation. Try to detect this mess, and assume the only safe option 2975 if we're cross compiling. 2976 2977 OpenBSD 2.9 (2001): strnvis(char *dst, const char *src, size_t dlen, int flag); 2978 NetBSD 6.0 (2012): strnvis(char *dst, size_t dlen, const char *src, int flag); 2979 2980 ok djm@ 2981 2982 commit b0b48beab1b74100b61ecbadb9140c9ab4c2ea8c 2983 Author: Damien Miller <djm (a] mindrot.org> 2984 Date: Tue Aug 2 11:06:23 2016 +1000 2985 2986 update recommended autoconf version 2987 2988 commit 23902e31dfd18c6d7bb41ccd73de3b5358a377da 2989 Author: Damien Miller <djm (a] mindrot.org> 2990 Date: Tue Aug 2 10:48:04 2016 +1000 2991 2992 update config.guess and config.sub to current 2993 2994 upstream commit 562f3512b3911ba0c77a7f68214881d1f241f46e 2995 2996 commit dd1031b78b83083615b68d7163c44f4408635be2 2997 Author: Darren Tucker <dtucker (a] zip.com.au> 2998 Date: Tue Aug 2 10:01:52 2016 +1000 2999 3000 Replace spaces with tabs. 3001 3002 Mechanically replace spaces with tabs in compat files not synced with 3003 OpenBSD. 3004 3005 commit c20dccb5614c5714f4155dda01bcdebf97cfae7e 3006 Author: Darren Tucker <dtucker (a] zip.com.au> 3007 Date: Tue Aug 2 09:44:25 2016 +1000 3008 3009 Strip trailing whitespace. 3010 3011 Mechanically strip trailing whitespace on files not synced with OpenBSD 3012 (or in the case of bsd-snprint.c, rsync). 3013 3014 commit 30f9bd1c0963c23bfba8468dfd26aa17609ba42f 3015 Author: Darren Tucker <dtucker (a] zip.com.au> 3016 Date: Tue Aug 2 09:06:27 2016 +1000 3017 3018 Repair $OpenBSD markers. 3019 3020 commit 9715d4ad4b53877ec23dc8681dd7a405de9419a6 3021 Author: Darren Tucker <dtucker (a] zip.com.au> 3022 Date: Tue Aug 2 09:02:42 2016 +1000 3023 3024 Repair $OpenBSD marker. 3025 3026 commit cf3e0be7f5828a5e5f6c296a607d20be2f07d60c 3027 Author: Tim Rice <tim (a] multitalents.net> 3028 Date: Mon Aug 1 14:31:52 2016 -0700 3029 3030 modified: configure.ac opensshd.init.in 3031 Skip generating missing RSA1 key on startup unless ssh1 support is enabled. 3032 Spotted by Jean-Pierre Radley 3033 3034 commit 99522ba7ec6963a05c04a156bf20e3ba3605987c 3035 Author: Damien Miller <djm (a] mindrot.org> 3036 Date: Thu Jul 28 08:54:27 2016 +1000 3037 3038 define _OPENBSD_SOURCE for reallocarray on NetBSD 3039 3040 Report by and debugged with Hisashi T Fujinaka, dtucker nailed 3041 the problem (lack of prototype causing return type confusion). 3042 3043 commit 3e1e076550c27c6bbdddf36d8f42bd79fbaaa187 3044 Author: Damien Miller <djm (a] mindrot.org> 3045 Date: Wed Jul 27 08:25:42 2016 +1000 3046 3047 KNF 3048 3049 commit d99ee9c4e5e217e7d05eeec84e9ce641f4675331 3050 Author: Damien Miller <djm (a] mindrot.org> 3051 Date: Wed Jul 27 08:25:23 2016 +1000 3052 3053 Linux auditing also needs packet.h 3054 3055 commit 393bd381a45884b589baa9aed4394f1d250255ca 3056 Author: Damien Miller <djm (a] mindrot.org> 3057 Date: Wed Jul 27 08:18:05 2016 +1000 3058 3059 fix auditing on Linux 3060 3061 get_remote_ipaddr() was replaced with ssh_remote_ipaddr() 3062 3063 commit 80e766fb089de4f3c92b1600eb99e9495e37c992 3064 Author: Damien Miller <djm (a] mindrot.org> 3065 Date: Sun Jul 24 21:50:13 2016 +1000 3066 3067 crank version numbers 3068 3069 commit b1a478792d458f2e938a302e64bab2b520edc1b3 3070 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3071 Date: Sun Jul 24 11:45:36 2016 +0000 3072 3073 upstream commit 3074 3075 openssh-7.3 3076 3077 Upstream-ID: af106a7eb665f642648cf1993e162c899f358718 3078 3079 commit 353766e0881f069aeca30275ab706cd60a1a8fdd 3080 Author: Darren Tucker <dtucker (a] zip.com.au> 3081 Date: Sat Jul 23 16:14:42 2016 +1000 3082 3083 Move Cygwin IPPORT_RESERVED overrride to defines.h 3084 3085 Patch from vinschen at redhat.com. 3086 3087 commit 368dd977ae07afb93f4ecea23615128c95ab2b32 3088 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3089 Date: Sat Jul 23 02:54:08 2016 +0000 3090 3091 upstream commit 3092 3093 fix pledge violation with ssh -f; reported by Valentin 3094 Kozamernik ok dtucker@ 3095 3096 Upstream-ID: a61db7988db88d9dac3c4dd70e18876a8edf84aa 3097 3098 commit f00211e3c6d24d6ea2b64b4b1209f671f6c1d42e 3099 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3100 Date: Fri Jul 22 07:00:46 2016 +0000 3101 3102 upstream commit 3103 3104 improve wording; suggested by jmc@ 3105 3106 Upstream-ID: 55cb0a24c8e0618b3ceec80998dc82c85db2d2f8 3107 3108 commit 83cbca693c3b0719270e6a0f2efe3f9ee93a65b8 3109 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3110 Date: Fri Jul 22 05:46:11 2016 +0000 3111 3112 upstream commit 3113 3114 Lower loglevel for "Authenticated with partial success" 3115 message similar to other similar level. bz#2599, patch from cgallek at 3116 gmail.com, ok markus@ 3117 3118 Upstream-ID: 3faab814e947dc7b2e292edede23e94c608cb4dd 3119 3120 commit 10358abd087ab228b7ce2048efc4f3854a9ab9a6 3121 Author: Damien Miller <djm (a] mindrot.org> 3122 Date: Fri Jul 22 14:06:36 2016 +1000 3123 3124 retry waitpid on EINTR failure 3125 3126 patch from Jakub Jelen on bz#2581; ok dtucker@ 3127 3128 commit da88a70a89c800e74ea8e5661ffa127a3cc79a92 3129 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3130 Date: Fri Jul 22 03:47:36 2016 +0000 3131 3132 upstream commit 3133 3134 constify a few functions' arguments; patch from Jakub 3135 Jelen bz#2581 3136 3137 Upstream-ID: f2043f51454ea37830ff6ad60c8b32b4220f448d 3138 3139 commit c36d91bd4ebf767f310f7cea88d61d1c15f53ddf 3140 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3141 Date: Fri Jul 22 03:39:13 2016 +0000 3142 3143 upstream commit 3144 3145 move debug("%p", key) to before key is free'd; probable 3146 undefined behaviour on strict compilers; reported by Jakub Jelen bz#2581 3147 3148 Upstream-ID: 767f323e1f5819508a0e35e388ec241bac2f953a 3149 3150 commit 286f5a77c3bfec1e8892ca268087ac885ac871bf 3151 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3152 Date: Fri Jul 22 03:35:11 2016 +0000 3153 3154 upstream commit 3155 3156 reverse the order in which -J/JumpHost proxies are visited to 3157 be more intuitive and document 3158 3159 reported by and manpage bits naddy@ 3160 3161 Upstream-ID: 3a68fd6a841fd6cf8cedf6552a9607ba99df179a 3162 3163 commit fcd135c9df440bcd2d5870405ad3311743d78d97 3164 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3165 Date: Thu Jul 21 01:39:35 2016 +0000 3166 3167 upstream commit 3168 3169 Skip passwords longer than 1k in length so clients can't 3170 easily DoS sshd by sending very long passwords, causing it to spend CPU 3171 hashing them. feedback djm@, ok markus@. 3172 3173 Brought to our attention by tomas.kuthan at oracle.com, shilei-c at 3174 360.cn and coredump at autistici.org 3175 3176 Upstream-ID: d0af7d4a2190b63ba1d38eec502bc4be0be9e333 3177 3178 commit 324583e8fb3935690be58790425793df619c6d4d 3179 Author: naddy (a] openbsd.org <naddy (a] openbsd.org> 3180 Date: Wed Jul 20 10:45:27 2016 +0000 3181 3182 upstream commit 3183 3184 Do not clobber the global jump_host variables when 3185 parsing an inactive configuration. ok djm@ 3186 3187 Upstream-ID: 5362210944d91417d5976346d41ac0b244350d31 3188 3189 commit 32d921c323b989d28405e78d0a8923d12913d737 3190 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 3191 Date: Tue Jul 19 12:59:16 2016 +0000 3192 3193 upstream commit 3194 3195 tweak previous; 3196 3197 Upstream-ID: f3c1a5b3f05dff366f60c028728a2b43f15ff534 3198 3199 commit d7eabc86fa049a12ba2c3fb198bd1d51b37f7025 3200 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3201 Date: Tue Jul 19 11:38:53 2016 +0000 3202 3203 upstream commit 3204 3205 Allow wildcard for PermitOpen hosts as well as ports. 3206 bz#2582, patch from openssh at mzpqnxow.com and jjelen at redhat.com. ok 3207 markus@ 3208 3209 Upstream-ID: af0294e9b9394c4e16e991424ca0a47a7cc605f2 3210 3211 commit b98a2a8348e907b3d71caafd80f0be8fdd075943 3212 Author: markus (a] openbsd.org <markus (a] openbsd.org> 3213 Date: Mon Jul 18 11:35:33 2016 +0000 3214 3215 upstream commit 3216 3217 Reduce timing attack against obsolete CBC modes by always 3218 computing the MAC over a fixed size of data. Reported by Jean Paul 3219 Degabriele, Kenny Paterson, Torben Hansen and Martin Albrecht. ok djm@ 3220 3221 Upstream-ID: f20a13279b00ba0afbacbcc1f04e62e9d41c2912 3222 3223 commit dbf788b4d9d9490a5fff08a7b09888272bb10fcc 3224 Author: Darren Tucker <dtucker (a] zip.com.au> 3225 Date: Thu Jul 21 14:17:31 2016 +1000 3226 3227 Search users for one with a valid salt. 3228 3229 If the root account is locked (eg password "!!" or "*LK*") keep looking 3230 until we find a user with a valid salt to use for crypting passwords of 3231 invalid users. ok djm@ 3232 3233 commit e8b58f48fbb1b524fb4f0d4865fa0005d6a4b782 3234 Author: Darren Tucker <dtucker (a] zip.com.au> 3235 Date: Mon Jul 18 17:22:49 2016 +1000 3236 3237 Explicitly specify source files for regress tools. 3238 3239 Since adding $(REGRESSLIBS), $? is wrong because it includes only the 3240 changed source files. $< seems like it'd be right however it doesn't 3241 seem to work on some non-GNU makes, so do what works everywhere. 3242 3243 commit eac1bbd06872c273f16ac0f9976b0aef026b701b 3244 Author: Darren Tucker <dtucker (a] zip.com.au> 3245 Date: Mon Jul 18 17:12:22 2016 +1000 3246 3247 Conditionally include err.h. 3248 3249 commit 0a454147568746c503f669e1ba861f76a2e7a585 3250 Author: Darren Tucker <dtucker (a] zip.com.au> 3251 Date: Mon Jul 18 16:26:26 2016 +1000 3252 3253 Remove local implementation of err, errx. 3254 3255 We now have a shared implementation in libopenbsd-compat. 3256 3257 commit eb999a4590846ba4d56ddc90bd07c23abfbab7b1 3258 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3259 Date: Mon Jul 18 06:08:01 2016 +0000 3260 3261 upstream commit 3262 3263 Add some unsigned overflow checks for extra_pad. None of 3264 these are reachable with the amount of padding that we use internally. 3265 bz#2566, pointed out by Torben Hansen. ok markus@ 3266 3267 Upstream-ID: 4d4be8450ab2fc1b852d5884339f8e8c31c3fd76 3268 3269 commit c71ba790c304545464bb494de974cdf0f4b5cf1e 3270 Author: Darren Tucker <dtucker (a] zip.com.au> 3271 Date: Mon Jul 18 15:43:25 2016 +1000 3272 3273 Add dependency on libs for unit tests. 3274 3275 Makes "./configure && make tests" work again. ok djm@ 3276 3277 commit 8199d0311aea3e6fd0284c9025e7a83f4ece79e8 3278 Author: Darren Tucker <dtucker (a] zip.com.au> 3279 Date: Mon Jul 18 13:47:39 2016 +1000 3280 3281 Correct location for kexfuzz in clean target. 3282 3283 commit 01558b7b07af43da774d3a11a5c51fa9c310849d 3284 Author: Darren Tucker <dtucker (a] zip.com.au> 3285 Date: Mon Jul 18 09:33:25 2016 +1000 3286 3287 Handle PAM_MAXTRIES from modules. 3288 3289 bz#2249: handle the case where PAM returns PAM_MAXTRIES by ceasing to offer 3290 password and keyboard-interative authentication methods. Should prevent 3291 "sshd ignoring max retries" warnings in the log. ok djm@ 3292 3293 It probably won't trigger with keyboard-interactive in the default 3294 configuration because the retry counter is stored in module-private 3295 storage which goes away with the sshd PAM process (see bz#688). On the 3296 other hand, those cases probably won't log a warning either. 3297 3298 commit 65c6c6b567ab5ab12945a5ad8e0ab3a8c26119cc 3299 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3300 Date: Sun Jul 17 04:20:16 2016 +0000 3301 3302 upstream commit 3303 3304 support UTF-8 characters in ssh(1) banners using 3305 schwarze@'s safe fmprintf printer; bz#2058 3306 3307 feedback schwarze@ ok dtucker@ 3308 3309 Upstream-ID: a72ce4e3644c957643c9524eea2959e41b91eea7 3310 3311 commit e4eb7d910976fbfc7ce3e90c95c11b07b483d0d7 3312 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 3313 Date: Sat Jul 16 06:57:55 2016 +0000 3314 3315 upstream commit 3316 3317 - add proxyjump to the options list - formatting fixes - 3318 update usage() 3319 3320 ok djm 3321 3322 Upstream-ID: 43d318e14ce677a2eec8f21ef5ba2f9f68a59457 3323 3324 commit af1f084857621f14bd9391aba8033d35886c2455 3325 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3326 Date: Fri Jul 15 05:01:58 2016 +0000 3327 3328 upstream commit 3329 3330 Reduce the syslog level of some relatively common protocol 3331 events from LOG_CRIT by replacing fatal() calls with logdie(). Part of 3332 bz#2585, ok djm@ 3333 3334 Upstream-ID: 9005805227c94edf6ac02a160f0e199638d288e5 3335 3336 commit bd5f2b78b69cf38d6049a0de445a79c8595e4a1f 3337 Author: Damien Miller <djm (a] mindrot.org> 3338 Date: Fri Jul 15 19:14:48 2016 +1000 3339 3340 missing openssl/dh.h 3341 3342 commit 4a984fd342effe5f0aad874a0d538c4322d973c0 3343 Author: Damien Miller <djm (a] mindrot.org> 3344 Date: Fri Jul 15 18:47:07 2016 +1000 3345 3346 cast to avoid type warning in error message 3347 3348 commit 5abfb15ced985c340359ae7fb65a625ed3692b3e 3349 Author: Darren Tucker <dtucker (a] zip.com.au> 3350 Date: Fri Jul 15 14:48:30 2016 +1000 3351 3352 Move VA_COPY macro into compat header. 3353 3354 Some AIX compilers unconditionally undefine va_copy but don't set it back 3355 to an internal function, causing link errors. In some compat code we 3356 already use VA_COPY instead so move the two existing instances into the 3357 shared header and use for sshbuf-getput-basic.c too. Should fix building 3358 with at lease some versions of AIX's compiler. bz#2589, ok djm@ 3359 3360 commit 832b7443b7a8e181c95898bc5d73497b7190decd 3361 Author: Damien Miller <djm (a] mindrot.org> 3362 Date: Fri Jul 15 14:45:34 2016 +1000 3363 3364 disable ciphers not supported by OpenSSL 3365 3366 bz#2466 ok dtucker@ 3367 3368 commit 5fbe93fc6fbb2fe211e035703dec759d095e3dd8 3369 Author: Damien Miller <djm (a] mindrot.org> 3370 Date: Fri Jul 15 13:54:31 2016 +1000 3371 3372 add a --disable-pkcs11 knob 3373 3374 commit 679ce88ec2a8e2fe6515261c489e8c1449bb9da9 3375 Author: Damien Miller <djm (a] mindrot.org> 3376 Date: Fri Jul 15 13:44:38 2016 +1000 3377 3378 fix newline escaping for unsupported_algorithms 3379 3380 The hmac-ripemd160 was incorrect and could lead to broken 3381 Makefiles on systems that lacked support for it, but I made 3382 all the others consistent too. 3383 3384 commit ed877ef653847d056bb433975d731b7a1132a979 3385 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3386 Date: Fri Jul 15 00:24:30 2016 +0000 3387 3388 upstream commit 3389 3390 Add a ProxyJump ssh_config(5) option and corresponding -J 3391 ssh(1) command-line flag to allow simplified indirection through a SSH 3392 bastion or "jump host". 3393 3394 These options construct a proxy command that connects to the 3395 specified jump host(s) (more than one may be specified) and uses 3396 port-forwarding to establish a connection to the next destination. 3397 3398 This codifies the safest way of indirecting connections through SSH 3399 servers and makes it easy to use. 3400 3401 ok markus@ 3402 3403 Upstream-ID: fa899cb8b26d889da8f142eb9774c1ea36b04397 3404 3405 commit 5c02dd126206a26785379e80f2d3848e4470b711 3406 Author: Darren Tucker <dtucker (a] zip.com.au> 3407 Date: Fri Jul 15 12:56:39 2016 +1000 3408 3409 Map umac_ctx struct name too. 3410 3411 Prevents size mismatch linker warnings on Solaris 11. 3412 3413 commit 283b97ff33ea2c641161950849931bd578de6946 3414 Author: Darren Tucker <dtucker (a] zip.com.au> 3415 Date: Fri Jul 15 13:49:44 2016 +1000 3416 3417 Mitigate timing of disallowed users PAM logins. 3418 3419 When sshd decides to not allow a login (eg PermitRootLogin=no) and 3420 it's using PAM, it sends a fake password to PAM so that the timing for 3421 the failure is not noticeably different whether or not the password 3422 is correct. This behaviour can be detected by sending a very long 3423 password string which is slower to hash than the fake password. 3424 3425 Mitigate by constructing an invalid password that is the same length 3426 as the one from the client and thus takes the same time to hash. 3427 Diff from djm@ 3428 3429 commit 9286875a73b2de7736b5e50692739d314cd8d9dc 3430 Author: Darren Tucker <dtucker (a] zip.com.au> 3431 Date: Fri Jul 15 13:32:45 2016 +1000 3432 3433 Determine appropriate salt for invalid users. 3434 3435 When sshd is processing a non-PAM login for a non-existent user it uses 3436 the string from the fakepw structure as the salt for crypt(3)ing the 3437 password supplied by the client. That string has a Blowfish prefix, so on 3438 systems that don't understand that crypt will fail fast due to an invalid 3439 salt, and even on those that do it may have significantly different timing 3440 from the hash methods used for real accounts (eg sha512). This allows 3441 user enumeration by, eg, sending large password strings. This was noted 3442 by EddieEzra.Harari at verint.com (CVE-2016-6210). 3443 3444 To mitigate, use the same hash algorithm that root uses for hashing 3445 passwords for users that do not exist on the system. ok djm@ 3446 3447 commit a162dd5e58ca5b224d7500abe35e1ef32b5de071 3448 Author: Darren Tucker <dtucker (a] zip.com.au> 3449 Date: Thu Jul 14 21:19:59 2016 +1000 3450 3451 OpenSSL 1.1.x not currently supported. 3452 3453 commit 7df91b01fc558a33941c5c5f31abbcdc53a729fb 3454 Author: Darren Tucker <dtucker (a] zip.com.au> 3455 Date: Thu Jul 14 12:25:24 2016 +1000 3456 3457 Check for VIS_ALL. 3458 3459 If we don't have it, set BROKEN_STRNVIS to activate the compat replacement. 3460 3461 commit ee67716f61f1042d5e67f91c23707cca5dcdd7d0 3462 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3463 Date: Thu Jul 14 01:24:21 2016 +0000 3464 3465 upstream commit 3466 3467 Correct equal in test. 3468 3469 Upstream-Regress-ID: 4e32f7a5c57a619c4e8766cb193be2a1327ec37a 3470 3471 commit 372807c2065c8572fdc6478b25cc5ac363743073 3472 Author: tb (a] openbsd.org <tb (a] openbsd.org> 3473 Date: Mon Jul 11 21:38:13 2016 +0000 3474 3475 upstream commit 3476 3477 Add missing "recvfd" pledge promise: Raf Czlonka reported 3478 ssh coredumps when Control* keywords were set in ssh_config. This patch also 3479 fixes similar problems with scp and sftp. 3480 3481 ok deraadt, looks good to millert 3482 3483 Upstream-ID: ca2099eade1ef3e87a79614fefa26a0297ad8a3b 3484 3485 commit e0453f3df64bf485c61c7eb6bd12893eee9fe2cd 3486 Author: tedu (a] openbsd.org <tedu (a] openbsd.org> 3487 Date: Mon Jul 11 03:19:44 2016 +0000 3488 3489 upstream commit 3490 3491 obsolete note about fascistloggin is obsolete. ok djm 3492 dtucker 3493 3494 Upstream-ID: dae60df23b2bb0e89f42661ddd96a7b0d1b7215a 3495 3496 commit a2333584170a565adf4f209586772ef8053b10b8 3497 Author: Darren Tucker <dtucker (a] zip.com.au> 3498 Date: Thu Jul 14 10:59:09 2016 +1000 3499 3500 Add compat code for missing wcwidth. 3501 3502 If we don't have wcwidth force fallback implementations of nl_langinfo 3503 and mbtowc. Based on advice from Ingo Schwarze. 3504 3505 commit 8aaec7050614494014c47510b7e94daf6e644c62 3506 Author: Damien Miller <djm (a] mindrot.org> 3507 Date: Thu Jul 14 09:48:48 2016 +1000 3508 3509 fix missing include for systems with err.h 3510 3511 commit 6310ef27a2567cda66d6cf0c1ad290ee1167f243 3512 Author: Darren Tucker <dtucker (a] zip.com.au> 3513 Date: Wed Jul 13 14:42:35 2016 +1000 3514 3515 Move err.h replacements into compat lib. 3516 3517 Move implementations of err.h replacement functions into their own file 3518 in the libopenbsd-compat so we can use them in kexfuzz.c too. ok djm@ 3519 3520 commit f3f2cc8386868f51440c45210098f65f9787449a 3521 Author: Darren Tucker <dtucker (a] zip.com.au> 3522 Date: Mon Jul 11 17:23:38 2016 +1000 3523 3524 Check for wchar.h and langinfo.h 3525 3526 Wrap includes in the appropriate #ifdefs. 3527 3528 commit b9c50614eba9d90939b2b119b6e1b7e03b462278 3529 Author: Damien Miller <djm (a] mindrot.org> 3530 Date: Fri Jul 8 13:59:13 2016 +1000 3531 3532 whitelist more architectures for seccomp-bpf 3533 3534 bz#2590 - testing and patch from Jakub Jelen 3535 3536 commit 18813a32b6fd964037e0f5e1893cb4468ac6a758 3537 Author: guenther (a] openbsd.org <guenther (a] openbsd.org> 3538 Date: Mon Jul 4 18:01:44 2016 +0000 3539 3540 upstream commit 3541 3542 DEBUGLIBS has been broken since the gcc4 switch, so delete 3543 it. CFLAGS contains -g by default anyway 3544 3545 problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com) 3546 ok millert@ kettenis@ deraadt@ 3547 3548 Upstream-Regress-ID: 4a0bb72f95c63f2ae9daa8a040ac23914bddb542 3549 3550 commit 6d31193d0baa3da339c196ac49625b7ba1c2ecc7 3551 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3552 Date: Fri Jul 8 03:44:42 2016 +0000 3553 3554 upstream commit 3555 3556 Improve crypto ordering for Encrypt-then-MAC (EtM) mode 3557 MAC algorithms. 3558 3559 Previously we were computing the MAC, decrypting the packet and then 3560 checking the MAC. This gave rise to the possibility of creating a 3561 side-channel oracle in the decryption step, though no such oracle has 3562 been identified. 3563 3564 This adds a mac_check() function that computes and checks the MAC in 3565 one pass, and uses it to advance MAC checking for EtM algorithms to 3566 before payload decryption. 3567 3568 Reported by Jean Paul Degabriele, Kenny Paterson, Torben Hansen and 3569 Martin Albrecht. feedback and ok markus@ 3570 3571 Upstream-ID: 1999bb67cab47dda5b10b80d8155fe83d4a1867b 3572 3573 commit 71f5598f06941f645a451948c4a5125c83828e1c 3574 Author: guenther (a] openbsd.org <guenther (a] openbsd.org> 3575 Date: Mon Jul 4 18:01:44 2016 +0000 3576 3577 upstream commit 3578 3579 DEBUGLIBS has been broken since the gcc4 switch, so 3580 delete it. CFLAGS contains -g by default anyway 3581 3582 problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com) 3583 ok millert@ kettenis@ deraadt@ 3584 3585 Upstream-ID: 96c5054e3e1f170c6276902d5bc65bb3b87a2603 3586 3587 commit e683fc6f1c8c7295648dbda679df8307786ec1ce 3588 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3589 Date: Thu Jun 30 05:17:05 2016 +0000 3590 3591 upstream commit 3592 3593 Explicitly check for 100% completion to avoid potential 3594 floating point rounding error, which could cause progressmeter to report 99% 3595 on completion. While there invert the test so the 100% case is clearer. with 3596 & ok djm@ 3597 3598 Upstream-ID: a166870c5878e422f3c71ff802e2ccd7032f715d 3599 3600 commit 772e6cec0ed740fc7db618dc30b4134f5a358b43 3601 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 3602 Date: Wed Jun 29 17:14:28 2016 +0000 3603 3604 upstream commit 3605 3606 sort the -o list; 3607 3608 Upstream-ID: 1a97465ede8790b4d47cb618269978e07f41f8ac 3609 3610 commit 46ecd19e554ccca15a7309cd1b6b44bc8e6b84af 3611 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3612 Date: Thu Jun 23 05:17:51 2016 +0000 3613 3614 upstream commit 3615 3616 fix AuthenticationMethods during configuration re-parse; 3617 reported by Juan Francisco Cantero Hurtado 3618 3619 Upstream-ID: 8ffa1dac25c7577eca8238e825317ab20848f9b4 3620 3621 commit 3147e7595d0f2f842a666c844ac53e6c7a253d7e 3622 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3623 Date: Sun Jun 19 07:48:02 2016 +0000 3624 3625 upstream commit 3626 3627 revert 1.34; causes problems loading public keys 3628 3629 reported by semarie@ 3630 3631 Upstream-ID: b393794f8935c8b15d98a407fe7721c62d2ed179 3632 3633 commit ad23a75509f4320d43f628c50f0817e3ad12bfa7 3634 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 3635 Date: Fri Jun 17 06:33:30 2016 +0000 3636 3637 upstream commit 3638 3639 grammar fix; 3640 3641 Upstream-ID: 5d5b21c80f1e81db367333ce0bb3e5874fb3e463 3642 3643 commit 5e28b1a2a3757548b40018cc2493540a17c82e27 3644 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3645 Date: Fri Jun 17 05:06:23 2016 +0000 3646 3647 upstream commit 3648 3649 translate OpenSSL error codes to something more 3650 meaninful; bz#2522 reported by Jakub Jelen, ok dtucker@ 3651 3652 Upstream-ID: 4cb0795a366381724314e6515d57790c5930ffe5 3653 3654 commit b64faeb5eda7eff8210c754d00464f9fe9d23de5 3655 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3656 Date: Fri Jun 17 05:03:40 2016 +0000 3657 3658 upstream commit 3659 3660 ban AuthenticationMethods="" and accept 3661 AuthenticationMethods=any for the default behaviour of not requiring multiple 3662 authentication 3663 3664 bz#2398 from Jakub Jelen; ok dtucker@ 3665 3666 Upstream-ID: fabd7f44d59e4518d241d0d01e226435cc23cf27 3667 3668 commit 9816fc5daee5ca924dd5c4781825afbaab728877 3669 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3670 Date: Thu Jun 16 11:00:17 2016 +0000 3671 3672 upstream commit 3673 3674 Include stdarg.h for va_copy as per man page. 3675 3676 Upstream-ID: 105d6b2f1af2fbd9d91c893c436ab121434470bd 3677 3678 commit b6cf84b51bc0f5889db48bf29a0c771954ade283 3679 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 3680 Date: Thu Jun 16 06:10:45 2016 +0000 3681 3682 upstream commit 3683 3684 keys stored in openssh format can have comments too; diff 3685 from yonas yanfa, tweaked a bit; 3686 3687 ok djm 3688 3689 Upstream-ID: 03d48536da6e51510d73ade6fcd44ace731ceb27 3690 3691 commit aa37768f17d01974b6bfa481e5e83841b6c76f86 3692 Author: Darren Tucker <dtucker (a] zip.com.au> 3693 Date: Mon Jun 20 15:55:34 2016 +1000 3694 3695 get_remote_name_or_ip inside LOGIN_NEEDS_UTMPX 3696 3697 Apply the same get_remote_name_or_ip -> session_get_remote_name_or_ip 3698 change as commit 95767262 to the code inside #ifdef LOGIN_NEEDS_UTMPX. 3699 Fixes build on AIX. 3700 3701 commit 009891afc8df37bc2101e15d1e0b6433cfb90549 3702 Author: Darren Tucker <dtucker (a] zip.com.au> 3703 Date: Fri Jun 17 14:34:09 2016 +1000 3704 3705 Remove duplicate code from PAM. ok djm@ 3706 3707 commit e690fe85750e93fca1fb7c7c8587d4130a4f7aba 3708 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3709 Date: Wed Jun 15 00:40:40 2016 +0000 3710 3711 upstream commit 3712 3713 Remove "POSSIBLE BREAK-IN ATTEMPT!" from log message 3714 about forward and reverse DNS not matching. We haven't supported IP-based 3715 auth methods for a very long time so it's now misleading. part of bz#2585, 3716 ok markus@ 3717 3718 Upstream-ID: 5565ef0ee0599b27f0bd1d3bb1f8a323d8274e29 3719 3720 commit 57b4ee04cad0d3e0fec1194753b0c4d31e39a1cd 3721 Author: Darren Tucker <dtucker (a] zip.com.au> 3722 Date: Wed Jun 15 11:22:38 2016 +1000 3723 3724 Move platform_disable_tracing into its own file. 3725 3726 Prevents link errors resolving the extern "options" when platform.o 3727 gets linked into ssh-agent when building --with-pam. 3728 3729 commit 78dc8e3724e30ee3e1983ce013e80277dc6ca070 3730 Author: Darren Tucker <dtucker (a] zip.com.au> 3731 Date: Tue Jun 14 13:55:12 2016 +1000 3732 3733 Track skipped upstream commit IDs. 3734 3735 There are a small number of "upstream" commits that do not correspond to 3736 a file in -portable. This file tracks those so that we can reconcile 3737 OpenBSD and Portable to ensure that no commits are accidentally missed. 3738 3739 If you add something to .skipped-commit-ids please also add an upstream 3740 ID line in the following format when you commit it. 3741 3742 Upstream-ID: 321065a95a7ccebdd5fd08482a1e19afbf524e35 3743 Upstream-ID: d4f699a421504df35254cf1c6f1a7c304fb907ca 3744 Upstream-ID: aafe246655b53b52bc32c8a24002bc262f4230f7 3745 Upstream-ID: 8fa9cd1dee3c3339ae329cf20fb591db6d605120 3746 Upstream-ID: f31327a48dd4103333cc53315ec53fe65ed8a17a 3747 Upstream-ID: edbfde98c40007b7752a4ac106095e060c25c1ef 3748 Upstream-ID: 052fd565e3ff2d8cec3bc957d1788f50c827f8e2 3749 Upstream-ID: 7cf73737f357492776223da1c09179fa6ba74660 3750 Upstream-ID: 180d84674be1344e45a63990d60349988187c1ae 3751 Upstream-ID: f6ae971186ba68d066cd102e57d5b0b2c211a5ee 3752 3753 commit 9f919d1a3219d476d6a662d18df058e1c4f36a6f 3754 Author: Darren Tucker <dtucker (a] zip.com.au> 3755 Date: Tue Jun 14 13:51:01 2016 +1000 3756 3757 Remove now-defunct .cvsignore files. ok djm 3758 3759 commit 68777faf271efb2713960605c748f6c8a4b26d55 3760 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3761 Date: Wed Jun 8 02:13:01 2016 +0000 3762 3763 upstream commit 3764 3765 Back out rev 1.28 "Check min and max sizes sent by the 3766 client" change. It caused "key_verify failed for server_host_key" in clients 3767 that send a DH-GEX min value less that DH_GRP_MIN, eg old OpenSSH and PuTTY. 3768 ok djm@ 3769 3770 Upstream-ID: 452979d3ca5c1e9dff063287ea0a5314dd091f65 3771 3772 commit a86ec4d0737ac5879223e7cd9d68c448df46e169 3773 Author: Darren Tucker <dtucker (a] zip.com.au> 3774 Date: Tue Jun 14 10:48:27 2016 +1000 3775 3776 Use Solaris setpflags(__PROC_PROTECT, ...). 3777 3778 Where possible, use Solaris setpflags to disable process tracing on 3779 ssh-agent and sftp-server. bz#2584, based on a patch from huieying.lee 3780 at oracle.com, ok djm. 3781 3782 commit 0f916d39b039fdc0b5baf9b5ab0754c0f11ec573 3783 Author: Darren Tucker <dtucker (a] zip.com.au> 3784 Date: Tue Jun 14 10:43:53 2016 +1000 3785 3786 Shorten prctl code a tiny bit. 3787 3788 commit 0fb7f5985351fbbcd2613d8485482c538e5123be 3789 Author: Darren Tucker <dtucker (a] zip.com.au> 3790 Date: Thu Jun 9 16:23:07 2016 +1000 3791 3792 Move prctl PR_SET_DUMPABLE into platform.c. 3793 3794 This should make it easier to add additional platform support such as 3795 Solaris (bz#2584). 3796 3797 commit e6508898c3cd838324ecfe1abd0eb8cf802e7106 3798 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3799 Date: Fri Jun 3 04:10:41 2016 +0000 3800 3801 upstream commit 3802 3803 Add a test for ssh(1)'s config file parsing. 3804 3805 Upstream-Regress-ID: 558b7f4dc45cc3761cc3d3e889b9f3c5bc91e601 3806 3807 commit ab0a536066dfa32def0bd7272c096ebb5eb25b11 3808 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3809 Date: Fri Jun 3 03:47:59 2016 +0000 3810 3811 upstream commit 3812 3813 Add 'sshd' to the test ID as I'm about to add a similar 3814 set for ssh. 3815 3816 Upstream-Regress-ID: aea7a9c3bac638530165c801ce836875b228ae7a 3817 3818 commit a5577c1ed3ecdfe4b7b1107c526cae886fc91afb 3819 Author: schwarze (a] openbsd.org <schwarze (a] openbsd.org> 3820 Date: Mon May 30 12:14:08 2016 +0000 3821 3822 upstream commit 3823 3824 stricter malloc.conf(5) options for utf8 tests 3825 3826 Upstream-Regress-ID: 111efe20a0fb692fa1a987f6e823310f9b25abf6 3827 3828 commit 75f0844b4f29d62ec3a5e166d2ee94b02df819fc 3829 Author: schwarze (a] openbsd.org <schwarze (a] openbsd.org> 3830 Date: Mon May 30 12:05:56 2016 +0000 3831 3832 upstream commit 3833 3834 Fix two rare edge cases: 1. If vasprintf() returns < 0, 3835 do not access a NULL pointer in snmprintf(), and do not free() the pointer 3836 returned from vasprintf() because on some systems other than OpenBSD, it 3837 might be a bogus pointer. 2. If vasprintf() returns == 0, return 0 and "" 3838 rather than -1 and NULL. 3839 3840 Besides, free(dst) is pointless after failure (not a bug). 3841 3842 One half OK martijn@, the other half OK deraadt@; 3843 committing quickly before people get hurt. 3844 3845 Upstream-Regress-ID: b164f20923812c9bac69856dbc1385eb1522cba4 3846 3847 commit 016881eb33a7948028848c90f4c7ac42e3af0e87 3848 Author: schwarze (a] openbsd.org <schwarze (a] openbsd.org> 3849 Date: Thu May 26 19:14:25 2016 +0000 3850 3851 upstream commit 3852 3853 test the new utf8 module 3854 3855 Upstream-Regress-ID: c923d05a20e84e4ef152cbec947fdc4ce6eabbe3 3856 3857 commit d4219028bdef448e089376f3afe81ef6079da264 3858 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3859 Date: Tue May 3 15:30:46 2016 +0000 3860 3861 upstream commit 3862 3863 Set umask to prevent "Bad owner or permissions" errors. 3864 3865 Upstream-Regress-ID: 8fdf2fc4eb595ccd80c443f474d639f851145417 3866 3867 commit 07d5608bb237e9b3fe86a2aeaa429392230faebf 3868 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3869 Date: Tue May 3 14:41:04 2016 +0000 3870 3871 upstream commit 3872 3873 support doas 3874 3875 Upstream-Regress-ID: 8d5572b27ea810394eeda432d8b4e9e1064a7c38 3876 3877 commit 01cabf10adc7676cba5f40536a34d3b246edb73f 3878 Author: djm (a] openbsd.org <djm (a] openbsd.org> 3879 Date: Tue May 3 13:48:33 2016 +0000 3880 3881 upstream commit 3882 3883 unit tests for sshbuf_dup_string() 3884 3885 Upstream-Regress-ID: 7521ff150dc7f20511d1c2c48fd3318e5850a96d 3886 3887 commit 6915f1698e3d1dd4e22eac20f435e1dfc1d46372 3888 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 3889 Date: Fri Jun 3 06:44:12 2016 +0000 3890 3891 upstream commit 3892 3893 tweak previous; 3894 3895 Upstream-ID: 92979f1a0b63e041a0e5b08c9ed0ba9b683a3698 3896 3897 commit 0cb2f4c2494b115d0f346ed2d8b603ab3ba643f4 3898 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3899 Date: Fri Jun 3 04:09:38 2016 +0000 3900 3901 upstream commit 3902 3903 Allow ExitOnForwardFailure and ClearAllForwardings to be 3904 overridden when using ssh -W (but still default to yes in that case). 3905 bz#2577, ok djm@. 3906 3907 Upstream-ID: 4b20c419e93ca11a861c81c284090cfabc8c54d4 3908 3909 commit 8543ff3f5020fe659839b15f05b8c522bde6cee5 3910 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3911 Date: Fri Jun 3 03:14:41 2016 +0000 3912 3913 upstream commit 3914 3915 Move the host and port used by ssh -W into the Options 3916 struct. This will make future changes a bit easier. ok djm@ 3917 3918 Upstream-ID: 151bce5ecab2fbedf0d836250a27968d30389382 3919 3920 commit 6b87311d3acdc460f926b2c40f4c4f3fd345f368 3921 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3922 Date: Wed Jun 1 04:19:49 2016 +0000 3923 3924 upstream commit 3925 3926 Check min and max sizes sent by the client against what 3927 we support before passing them to the monitor. ok djm@ 3928 3929 Upstream-ID: 750627e8117084215412bff00a25b1586ab17ece 3930 3931 commit 564cd2a8926ccb1dca43a535073540935b5e0373 3932 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 3933 Date: Tue May 31 23:46:14 2016 +0000 3934 3935 upstream commit 3936 3937 Ensure that the client's proposed DH-GEX max value is at 3938 least as big as the minimum the server will accept. ok djm@ 3939 3940 Upstream-ID: b4b84fa04aab2de7e79a6fee4a6e1c189c0fe775 3941 3942 commit df820722e40309c9b3f360ea4ed47a584ed74333 3943 Author: Darren Tucker <dtucker (a] zip.com.au> 3944 Date: Mon Jun 6 11:36:13 2016 +1000 3945 3946 Add compat bits to utf8.c. 3947 3948 commit 05c6574652571becfe9d924226c967a3f4b3f879 3949 Author: Darren Tucker <dtucker (a] zip.com.au> 3950 Date: Mon Jun 6 11:33:43 2016 +1000 3951 3952 Fix utf->utf8 typo. 3953 3954 commit 6c1717190b4d5ddd729cd9e24e8ed71ed4f087ce 3955 Author: schwarze (a] openbsd.org <schwarze (a] openbsd.org> 3956 Date: Mon May 30 18:34:41 2016 +0000 3957 3958 upstream commit 3959 3960 Backout rev. 1.43 for now. 3961 3962 The function update_progress_meter() calls refresh_progress_meter() 3963 which calls snmprintf() which calls malloc(); but update_progress_meter() 3964 acts as the SIGALRM signal handler. 3965 3966 "malloc(): error: recursive call" reported by sobrado@. 3967 3968 Upstream-ID: aaae57989431e5239c101f8310f74ccc83aeb93e 3969 3970 commit cd9e1eabeb4137182200035ab6fa4522f8d24044 3971 Author: schwarze (a] openbsd.org <schwarze (a] openbsd.org> 3972 Date: Mon May 30 12:57:21 2016 +0000 3973 3974 upstream commit 3975 3976 Even when only writing an unescaped character, the dst 3977 buffer may need to grow, or it would be overrun; issue found by tb@ with 3978 malloc.conf(5) 'C'. 3979 3980 While here, reserve an additional byte for the terminating NUL 3981 up front such that we don't have to realloc() later just for that. 3982 3983 OK tb@ 3984 3985 Upstream-ID: 30ebcc0c097c4571b16f0a78b44969f170db0cff 3986 3987 commit ac284a355f8065eaef2a16f446f3c44cdd17371d 3988 Author: schwarze (a] openbsd.org <schwarze (a] openbsd.org> 3989 Date: Mon May 30 12:05:56 2016 +0000 3990 3991 upstream commit 3992 3993 Fix two rare edge cases: 1. If vasprintf() returns < 0, 3994 do not access a NULL pointer in snmprintf(), and do not free() the pointer 3995 returned from vasprintf() because on some systems other than OpenBSD, it 3996 might be a bogus pointer. 2. If vasprintf() returns == 0, return 0 and "" 3997 rather than -1 and NULL. 3998 3999 Besides, free(dst) is pointless after failure (not a bug). 4000 4001 One half OK martijn@, the other half OK deraadt@; 4002 committing quickly before people get hurt. 4003 4004 Upstream-ID: b7bcd2e82fc168a8eff94e41f5db336ed986fed0 4005 4006 commit 0e059cdf5fd86297546c63fa8607c24059118832 4007 Author: schwarze (a] openbsd.org <schwarze (a] openbsd.org> 4008 Date: Wed May 25 23:48:45 2016 +0000 4009 4010 upstream commit 4011 4012 To prevent screwing up terminal settings when printing to 4013 the terminal, for ASCII and UTF-8, escape bytes not forming characters and 4014 bytes forming non-printable characters with vis(3) VIS_OCTAL. For other 4015 character sets, abort printing of the current string in these cases. In 4016 particular, * let scp(1) respect the local user's LC_CTYPE locale(1); * 4017 sanitize data received from the remote host; * sanitize filenames, usernames, 4018 and similar data even locally; * take character display widths into account 4019 for the progressmeter. 4020 4021 This is believed to be sufficient to keep the local terminal safe 4022 on OpenBSD, but bad things can still happen on other systems with 4023 state-dependent locales because many places in the code print 4024 unencoded ASCII characters into the output stream. 4025 4026 Using feedback from djm@ and martijn@, 4027 various aspects discussed with many others. 4028 4029 deraadt@ says it should go in now, i probably already hesitated too long 4030 4031 Upstream-ID: e66afbc94ee396ddcaffd433b9a3b80f387647e0 4032 4033 commit 8c02e3639acefe1e447e293dbe23a0917abd3734 4034 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4035 Date: Tue May 24 04:43:45 2016 +0000 4036 4037 upstream commit 4038 4039 KNF compression proposal and simplify the client side a 4040 little. ok djm@ 4041 4042 Upstream-ID: aa814b694efe9e5af8a26e4c80a05526ae6d6605 4043 4044 commit 7ec4946fb686813eb5f8c57397e465f5485159f4 4045 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4046 Date: Tue May 24 02:31:57 2016 +0000 4047 4048 upstream commit 4049 4050 Back out 'plug memleak'. 4051 4052 Upstream-ID: 4faacdde136c24a961e24538de373660f869dbc0 4053 4054 commit 82f24c3ddc52053aeb7beb3332fa94c92014b0c5 4055 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4056 Date: Mon May 23 23:30:50 2016 +0000 4057 4058 upstream commit 4059 4060 prefer agent-hosted keys to keys from PKCS#11; ok markus 4061 4062 Upstream-ID: 7417f7653d58d6306d9f8c08d0263d050e2fd8f4 4063 4064 commit a0cb7778fbc9b43458f7072eb68dd858766384d1 4065 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4066 Date: Mon May 23 00:17:27 2016 +0000 4067 4068 upstream commit 4069 4070 Plug mem leak in filter_proposal. ok djm@ 4071 4072 Upstream-ID: bf968da7cfcea2a41902832e7d548356a4e2af34 4073 4074 commit ae9c0d4d5c581b3040d1f16b5c5f4b1cd1616743 4075 Author: Darren Tucker <dtucker (a] zip.com.au> 4076 Date: Fri Jun 3 16:03:44 2016 +1000 4077 4078 Update vis.h and vis.c from OpenBSD. 4079 4080 This will be needed for the upcoming utf8 changes. 4081 4082 commit e1d93705f8f48f519433d6ca9fc3d0abe92a1b77 4083 Author: Tim Rice <tim (a] multitalents.net> 4084 Date: Tue May 31 11:13:22 2016 -0700 4085 4086 modified: configure.ac 4087 whitspace clean up. No code changes. 4088 4089 commit 604a037d84e41e31f0aec9075df0b8740c130200 4090 Author: Damien Miller <djm (a] mindrot.org> 4091 Date: Tue May 31 16:45:28 2016 +1000 4092 4093 whitespace at EOL 4094 4095 commit 18424200160ff5c923113e0a37ebe21ab7bcd17c 4096 Author: Darren Tucker <dtucker (a] zip.com.au> 4097 Date: Mon May 30 19:35:28 2016 +1000 4098 4099 Add missing ssh-host-config --name option 4100 4101 Patch from vinschen (a] redhat.com. 4102 4103 commit 39c0cecaa188a37a2e134795caa68e03f3ced592 4104 Author: Darren Tucker <dtucker (a] zip.com.au> 4105 Date: Fri May 20 10:01:58 2016 +1000 4106 4107 Fix comment about sshpam_const and AIX. 4108 4109 From mschwager via github. 4110 4111 commit f64062b1f74ad5ee20a8a49aab2732efd0f7ce30 4112 Author: Damien Miller <djm (a] mindrot.org> 4113 Date: Fri May 20 09:56:53 2016 +1000 4114 4115 Deny lstat syscalls in seccomp sandbox 4116 4117 Avoids sandbox violations for some krb/gssapi libraries. 4118 4119 commit 531c135409b8d8810795b1f3692a4ebfd5c9cae0 4120 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4121 Date: Thu May 19 07:45:32 2016 +0000 4122 4123 upstream commit 4124 4125 fix type of ed25519 values 4126 4127 Upstream-ID: b32d0cb372bbe918ca2de56906901eae225a59b0 4128 4129 commit 75e21688f523799c9e0cc6601d76a9c5ca79f787 4130 Author: markus (a] openbsd.org <markus (a] openbsd.org> 4131 Date: Wed May 4 14:32:26 2016 +0000 4132 4133 upstream commit 4134 4135 add IdentityAgent; noticed & ok jmc@ 4136 4137 Upstream-ID: 4ba9034b00a4cf1beae627f0728da897802df88a 4138 4139 commit 1a75d14daf4b60db903e6103cf50e74e0cd0a76b 4140 Author: markus (a] openbsd.org <markus (a] openbsd.org> 4141 Date: Wed May 4 14:29:58 2016 +0000 4142 4143 upstream commit 4144 4145 allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@ 4146 4147 Upstream-ID: 20c508480d8db3eef18942c0fc39b1fcf25652ac 4148 4149 commit 0516454151ae722fc8256c3c56115c6baf24c5b0 4150 Author: markus (a] openbsd.org <markus (a] openbsd.org> 4151 Date: Wed May 4 14:22:33 2016 +0000 4152 4153 upstream commit 4154 4155 move SSH_MSG_NONE, so we don't have to include ssh1.h; 4156 ok deraadt@ 4157 4158 Upstream-ID: c2f97502efc761a41b18c17ddf460e138ca7994e 4159 4160 commit 332ff3d770631e7513fea38cf0d3689f673f0e3f 4161 Author: Damien Miller <djm (a] mindrot.org> 4162 Date: Tue May 10 09:51:06 2016 +1000 4163 4164 initialise salen in binresvport_sa 4165 4166 avoids failures with UsePrivilegedPort=yes 4167 4168 patch from Juan Gallego 4169 4170 commit c5c1d5d2f04ce00d2ddd6647e61b32f28be39804 4171 Author: markus (a] openbsd.org <markus (a] openbsd.org> 4172 Date: Wed May 4 14:04:40 2016 +0000 4173 4174 upstream commit 4175 4176 missing const in prototypes (ssh1) 4177 4178 Upstream-ID: 789c6ad4928b5fa557369b88c3a6a34926082c05 4179 4180 commit 9faae50e2e82ba42eb0cb2726bf6830fe7948f28 4181 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4182 Date: Wed May 4 14:00:09 2016 +0000 4183 4184 upstream commit 4185 4186 Fix inverted logic for updating StreamLocalBindMask which 4187 would cause the server to set an invalid mask. ok djm@ 4188 4189 Upstream-ID: 8a4404c8307a5ef9e07ee2169fc6d8106b527587 4190 4191 commit b02ad1ce9105bfa7394ac7590c0729dd52e26a81 4192 Author: markus (a] openbsd.org <markus (a] openbsd.org> 4193 Date: Wed May 4 12:21:53 2016 +0000 4194 4195 upstream commit 4196 4197 IdentityAgent for specifying specific agent sockets; ok 4198 djm@ 4199 4200 Upstream-ID: 3e6a15eb89ea0fd406f108826b7dc7dec4fbfac1 4201 4202 commit 910e59bba09ac309d78ce61e356da35292212935 4203 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4204 Date: Wed May 4 12:16:39 2016 +0000 4205 4206 upstream commit 4207 4208 fix junk characters after quotes 4209 4210 Upstream-ID: cc4d0cd32cb6b55a2ef98975d2f7ae857d0dc578 4211 4212 commit 9283884e647b8be50ccd2997537af0065672107d 4213 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 4214 Date: Tue May 3 18:38:12 2016 +0000 4215 4216 upstream commit 4217 4218 correct article; 4219 4220 Upstream-ID: 1fbd5b7ab16d2d9834ec79c3cedd4738fa42a168 4221 4222 commit cfefbcea1057c2623e76c579174a4107a0b6e6cd 4223 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4224 Date: Tue May 3 15:57:39 2016 +0000 4225 4226 upstream commit 4227 4228 fix overriding of StreamLocalBindMask and 4229 StreamLocalBindUnlink in Match blocks; found the hard way Rogan Dawes 4230 4231 Upstream-ID: 940bc69ec0249ab428d24ccd0722ce35cb932ee2 4232 4233 commit 771c2f51ffc0c9a2877b7892fada0c77bd1f6549 4234 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4235 Date: Tue May 3 15:25:06 2016 +0000 4236 4237 upstream commit 4238 4239 don't forget to include StreamLocalBindUnlink in the 4240 config dump output 4241 4242 Upstream-ID: 14a6d970b3b45c8e94272e3c661e9a0b2a0ee7cb 4243 4244 commit cdcd941994dc430f50d0a4e6a712d32b66e6199e 4245 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4246 Date: Tue May 3 14:54:08 2016 +0000 4247 4248 upstream commit 4249 4250 make nethack^wrandomart fingerprint flag more readily 4251 searchable pointed out by Matt Johnston 4252 4253 Upstream-ID: cb40d0235dc153c478c1aad3bc60b195422a54fb 4254 4255 commit 05855bf2ce7d5cd0a6db18bc0b4214ed5ef7516d 4256 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4257 Date: Tue May 3 13:10:24 2016 +0000 4258 4259 upstream commit 4260 4261 clarify ordering of subkeys; pointed out by ietf-ssh AT 4262 stbuehler.de 4263 4264 Upstream-ID: 05ebe9f949449a555ebce8e0aad7c8c9acaf8463 4265 4266 commit cca3b4395807bfb7aaeb83d2838f5c062ce30566 4267 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4268 Date: Tue May 3 12:15:49 2016 +0000 4269 4270 upstream commit 4271 4272 Use a subshell for constructing key types to work around 4273 different sed behaviours for -portable. 4274 4275 Upstream-Regress-ID: 0f6eb673162df229eda9a134a0f10da16151552d 4276 4277 commit fa58208c6502dcce3e0daac0ca991ee657daf1f5 4278 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4279 Date: Tue May 3 10:27:59 2016 +0000 4280 4281 upstream commit 4282 4283 correct some typos and remove a long-stale XXX note. 4284 4285 add specification for ed25519 certificates 4286 4287 mention no host certificate options/extensions are currently defined 4288 4289 pointed out by Simon Tatham 4290 4291 Upstream-ID: 7b535ab7dba3340b7d8210ede6791fdaefdf839a 4292 4293 commit b466f956c32cbaff4200bfcd5db6739fe4bc7d04 4294 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4295 Date: Tue May 3 10:24:27 2016 +0000 4296 4297 upstream commit 4298 4299 add ed25519 keys that are supported but missing from this 4300 documents; from Peter Moody 4301 4302 Upstream-ID: 8caac2d8e8cfd2fca6dc304877346e0a064b014b 4303 4304 commit 7f3d76319a69dab2efe3a520a8fef5b97e923636 4305 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4306 Date: Tue May 3 09:03:49 2016 +0000 4307 4308 upstream commit 4309 4310 Implement IUTF8 as per draft-sgtatham-secsh-iutf8-00. Patch 4311 from Simon Tatham, ok markus@ 4312 4313 Upstream-ID: 58268ebdf37d9d467f78216c681705a5e10c58e8 4314 4315 commit 31bc01c05d9f51bee3ebe33dc57c4fafb059fb62 4316 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4317 Date: Mon May 2 14:10:58 2016 +0000 4318 4319 upstream commit 4320 4321 unbreak config parsing on reexec from previous commit 4322 4323 Upstream-ID: bc69932638a291770955bd05ca55a32660a613ab 4324 4325 commit 67f1459efd2e85bf03d032539283fa8107218936 4326 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4327 Date: Mon May 2 09:52:00 2016 +0000 4328 4329 upstream commit 4330 4331 unit and regress tests for SHA256/512; ok markus 4332 4333 Upstream-Regress-ID: a0cd1a92dc824067076a5fcef83c18df9b0bf2c6 4334 4335 commit 0e8eeec8e75f6d0eaf33317376f773160018a9c7 4336 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4337 Date: Mon May 2 10:26:04 2016 +0000 4338 4339 upstream commit 4340 4341 add support for additional fixed DH groups from 4342 draft-ietf-curdle-ssh-kex-sha2-03 4343 4344 diffie-hellman-group14-sha256 (2K group) 4345 diffie-hellman-group16-sha512 (4K group) 4346 diffie-hellman-group18-sha512 (8K group) 4347 4348 based on patch from Mark D. Baushke and Darren Tucker 4349 ok markus@ 4350 4351 Upstream-ID: ac00406ada4f0dfec41585ca0839f039545bc46f 4352 4353 commit 57464e3934ba53ad8590ee3ccd840f693407fc1e 4354 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4355 Date: Mon May 2 09:36:42 2016 +0000 4356 4357 upstream commit 4358 4359 support SHA256 and SHA512 RSA signatures in certificates; 4360 ok markus@ 4361 4362 Upstream-ID: b45be2f2ce8cacd794dc5730edaabc90e5eb434a 4363 4364 commit 1a31d02b2411c4718de58ce796dbb7b5e14db93e 4365 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4366 Date: Mon May 2 08:49:03 2016 +0000 4367 4368 upstream commit 4369 4370 fix signed/unsigned errors reported by clang-3.7; add 4371 sshbuf_dup_string() to replace a common idiom of strdup(sshbuf_ptr()) with 4372 better safety checking; feedback and ok markus@ 4373 4374 Upstream-ID: 71f926d9bb3f1efed51319a6daf37e93d57c8820 4375 4376 commit d2d6bf864e52af8491a60dd507f85b74361f5da3 4377 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4378 Date: Fri Apr 29 08:07:53 2016 +0000 4379 4380 upstream commit 4381 4382 close ControlPersist background process stderr when not 4383 in debug mode or when logging to a file or syslog. bz#1988 ok dtucker 4384 4385 Upstream-ID: 4fb726f0fdcb155ad419913cea10dc4afd409d24 4386 4387 commit 9ee692fa1146e887e008a2b9a3d3ea81770c9fc8 4388 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4389 Date: Thu Apr 28 14:30:21 2016 +0000 4390 4391 upstream commit 4392 4393 fix comment 4394 4395 Upstream-ID: 313a385bd7b69a82f8e28ecbaf5789c774457b15 4396 4397 commit ee1e0a16ff2ba41a4d203c7670b54644b6c57fa6 4398 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 4399 Date: Wed Apr 27 13:53:48 2016 +0000 4400 4401 upstream commit 4402 4403 cidr permitted for {allow,deny}users; from lars nooden ok djm 4404 4405 Upstream-ID: 13e7327fe85f6c63f3f7f069e0fdc8c351515d11 4406 4407 commit b6e0140a5aa883c27b98415bd8aa9f65fc04ee22 4408 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4409 Date: Thu Apr 21 06:08:02 2016 +0000 4410 4411 upstream commit 4412 4413 make argument == NULL tests more consistent 4414 4415 Upstream-ID: dc4816678704aa5cbda3a702e0fa2033ff04581d 4416 4417 commit 6aaabc2b610e44bae473457ad9556ffb43d90ee3 4418 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 4419 Date: Sun Apr 17 14:34:46 2016 +0000 4420 4421 upstream commit 4422 4423 tweak previous; 4424 4425 Upstream-ID: 46c1bab91c164078edbccd5f7d06b9058edd814f 4426 4427 commit 0f839e5969efa3bda615991be8a9d9311554c573 4428 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4429 Date: Fri Apr 15 02:57:10 2016 +0000 4430 4431 upstream commit 4432 4433 missing bit of Include regress 4434 4435 Upstream-Regress-ID: 1063595f7f40f8489a1b7a27230b9e8acccea34f 4436 4437 commit 12e4ac46aed681da55c2bba3cd11dfcab23591be 4438 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4439 Date: Fri Apr 15 02:55:53 2016 +0000 4440 4441 upstream commit 4442 4443 remove redundant CLEANFILES section 4444 4445 Upstream-Regress-ID: 29ef1b267fa56daa60a1463396635e7d53afb587 4446 4447 commit b1d05aa653ae560c44baf8e8a9756e33f98ea75c 4448 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4449 Date: Fri Apr 15 00:48:01 2016 +0000 4450 4451 upstream commit 4452 4453 sync CLEANFILES with portable, sort 4454 4455 Upstream-Regress-ID: cb782f4f1ab3e079efbc335c6b64942f790766ed 4456 4457 commit 35f22dad263cce5c61d933ae439998cb965b8748 4458 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4459 Date: Fri Apr 15 00:31:10 2016 +0000 4460 4461 upstream commit 4462 4463 regression test for ssh_config Include directive 4464 4465 Upstream-Regress-ID: 46a38c8101f635461c506d1aac2d96af80f97f1e 4466 4467 commit 6b8a1a87005818d4700ce8b42faef746e82c1f51 4468 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4469 Date: Thu Apr 14 23:57:17 2016 +0000 4470 4471 upstream commit 4472 4473 unbreak test for recent ssh de-duplicated forwarding 4474 change 4475 4476 Upstream-Regress-ID: 6b2b115d99acd7cff13986e6739ea214cf2a3da3 4477 4478 commit 076787702418985a2cc6808212dc28ce7afc01f0 4479 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4480 Date: Thu Apr 14 23:21:42 2016 +0000 4481 4482 upstream commit 4483 4484 add test knob and warning for StrictModes 4485 4486 Upstream-Regress-ID: 8cd10952ce7898655ee58945904f2a0a3bdf7682 4487 4488 commit dc7990be865450574c7940c9880567f5d2555b37 4489 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4490 Date: Fri Apr 15 00:30:19 2016 +0000 4491 4492 upstream commit 4493 4494 Include directive for ssh_config(5); feedback & ok markus@ 4495 4496 Upstream-ID: ae3b76e2e343322b9f74acde6f1e1c5f027d5fff 4497 4498 commit 85bdcd7c92fe7ff133bbc4e10a65c91810f88755 4499 Author: Damien Miller <djm (a] mindrot.org> 4500 Date: Wed Apr 13 10:39:57 2016 +1000 4501 4502 ignore PAM environment vars when UseLogin=yes 4503 4504 If PAM is configured to read user-specified environment variables 4505 and UseLogin=yes in sshd_config, then a hostile local user may 4506 attack /bin/login via LD_PRELOAD or similar environment variables 4507 set via PAM. 4508 4509 CVE-2015-8325, found by Shayan Sadigh, via Colin Watson 4510 4511 commit dce19bf6e4a2a3d0b13a81224de63fc316461ab9 4512 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4513 Date: Sat Apr 9 12:39:30 2016 +0000 4514 4515 upstream commit 4516 4517 make private key loading functions consistently handle NULL 4518 key pointer arguments; ok markus@ 4519 4520 Upstream-ID: 92038726ef4a338169c35dacc9c5a07fcc7fa761 4521 4522 commit 5f41f030e2feb5295657285aa8c6602c7810bc4b 4523 Author: Darren Tucker <dtucker (a] zip.com.au> 4524 Date: Fri Apr 8 21:14:13 2016 +1000 4525 4526 Remove NO_IPPORT_RESERVED_CONCEPT 4527 4528 Replace by defining IPPORT_RESERVED to zero on Cygwin, which should have 4529 the same effect without causing problems syncing patches with OpenBSD. 4530 Resync the two affected functions with OpenBSD. ok djm, sanity checked 4531 by Corinna. 4532 4533 commit 34a01b2cf737d946ddb140618e28c3048ab7a229 4534 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4535 Date: Fri Apr 8 08:19:17 2016 +0000 4536 4537 upstream commit 4538 4539 whitespace at EOL 4540 4541 Upstream-ID: 5beffd4e001515da12851b974e2323ae4aa313b6 4542 4543 commit 90ee563fa6b54c59896c6c332c5188f866c5e75f 4544 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4545 Date: Fri Apr 8 06:35:54 2016 +0000 4546 4547 upstream commit 4548 4549 We accidentally send an empty string and a zero uint32 with 4550 every direct-streamlocal (a] openssh.com channel open, in contravention of our 4551 own spec. 4552 4553 Fixing this is too hard wrt existing versions that expect these 4554 fields to be present and fatal() if they aren't, so document them 4555 as "reserved" fields in the PROTOCOL spec as though we always 4556 intended this and let us never speak of it again. 4557 4558 bz#2529, reported by Ron Frederick 4559 4560 Upstream-ID: 34cd326a4d236ca6e39084c4ff796bd97ab833e7 4561 4562 commit 0ccbd5eca0f0dd78e71a4b69c66f03a66908d558 4563 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4564 Date: Wed Apr 6 06:42:17 2016 +0000 4565 4566 upstream commit 4567 4568 don't record duplicate LocalForward and RemoteForward 4569 entries; fixes failure with ExitOnForwardFailure+hostname canonicalisation 4570 where the same forwards are added on the second pass through the 4571 configuration file. bz#2562; ok dtucker@ 4572 4573 Upstream-ID: 40a51d68b6300f1cc61deecdb7d4847b8b7b0de1 4574 4575 commit 574def0eb493cd6efeffd4ff2e9257abcffee0c8 4576 Author: krw (a] openbsd.org <krw (a] openbsd.org> 4577 Date: Sat Apr 2 14:37:42 2016 +0000 4578 4579 upstream commit 4580 4581 Another use for fcntl() and thus of the superfluous 3rd 4582 parameter is when sanitising standard fd's before calling daemon(). 4583 4584 Use a tweaked version of the ssh(1) function in all three places 4585 found using fcntl() this way. 4586 4587 ok jca@ beck@ 4588 4589 Upstream-ID: f16811ffa19a1c5f4ef383c5f0fecb843c84e218 4590 4591 commit b3413534aa9d71a941005df2760d1eec2c2b0854 4592 Author: Darren Tucker <dtucker (a] zip.com.au> 4593 Date: Mon Apr 4 11:09:21 2016 +1000 4594 4595 Tidy up openssl header test. 4596 4597 commit 815bcac0b94bb448de5acdd6ba925b8725240b4f 4598 Author: Darren Tucker <dtucker (a] zip.com.au> 4599 Date: Mon Apr 4 11:07:59 2016 +1000 4600 4601 Fix configure-time warnings for openssl test. 4602 4603 commit 95687f5831ae680f7959446d8ae4b52452ee05dd 4604 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4605 Date: Fri Apr 1 02:34:10 2016 +0000 4606 4607 upstream commit 4608 4609 whitespace at EOL 4610 4611 Upstream-ID: 40ae2203d07cb14e0a89e1a0d4c6120ee8fd8c3a 4612 4613 commit fdfbf4580de09d84a974211715e14f88a5704b8e 4614 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4615 Date: Thu Mar 31 05:24:06 2016 +0000 4616 4617 upstream commit 4618 4619 Remove fallback from moduli to "primes" file that was 4620 deprecated in 2001 and fix log messages referring to primes file. Based on 4621 patch from xnox at ubuntu.com via bz#2559. "kill it" deraadt@ 4622 4623 Upstream-ID: 0d4f8c70e2fa7431a83b95f8ca81033147ba8713 4624 4625 commit 0235a5fa67fcac51adb564cba69011a535f86f6b 4626 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4627 Date: Thu Mar 17 17:19:43 2016 +0000 4628 4629 upstream commit 4630 4631 UseDNS affects ssh hostname processing in authorized_keys, 4632 not known_hosts; bz#2554 reported by jjelen AT redhat.com 4633 4634 Upstream-ID: c1c1bb895dde46095fc6d81d8653703928437591 4635 4636 commit 8c4739338f5e379d05b19d6e544540114965f07e 4637 Author: Darren Tucker <dtucker (a] zip.com.au> 4638 Date: Tue Mar 15 09:24:43 2016 +1100 4639 4640 Don't call Solaris setproject() with UsePAM=yes. 4641 4642 When Solaris Projects are enabled along with PAM setting the project 4643 is PAM's responsiblity. bz#2425, based on patch from 4644 brent.paulson at gmail.com. 4645 4646 commit cff26f373c58457a32cb263e212cfff53fca987b 4647 Author: Damien Miller <djm (a] mindrot.org> 4648 Date: Tue Mar 15 04:30:21 2016 +1100 4649 4650 remove slogin from *.spec 4651 4652 commit c38905ba391434834da86abfc988a2b8b9b62477 4653 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4654 Date: Mon Mar 14 16:20:54 2016 +0000 4655 4656 upstream commit 4657 4658 unbreak authentication using lone certificate keys in 4659 ssh-agent: when attempting pubkey auth with a certificate, if no separate 4660 private key is found among the keys then try with the certificate key itself. 4661 4662 bz#2550 reported by Peter Moody 4663 4664 Upstream-ID: f939cd76d68e6a9a3d1711b5a943d6ed1e623966 4665 4666 commit 4b4bfb01cd40b9ddb948e6026ddd287cc303d871 4667 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4668 Date: Thu Mar 10 11:47:57 2016 +0000 4669 4670 upstream commit 4671 4672 sanitise characters destined for xauth reported by 4673 github.com/tintinweb feedback and ok deraadt and markus 4674 4675 Upstream-ID: 18ad8d0d74cbd2ea3306a16595a306ee356aa261 4676 4677 commit 732b463d37221722b1206f43aa59563766a6a968 4678 Author: Darren Tucker <dtucker (a] zip.com.au> 4679 Date: Mon Mar 14 16:04:23 2016 +1100 4680 4681 Pass supported malloc options to connect-privsep. 4682 4683 This allows us to activate only the supported options during the malloc 4684 option portion of the connect-privsep test. 4685 4686 commit d29c5b9b3e9f27394ca97a364ed4bb4a55a59744 4687 Author: Darren Tucker <dtucker (a] zip.com.au> 4688 Date: Mon Mar 14 09:30:58 2016 +1100 4689 4690 Remove leftover roaming.h file. 4691 4692 Pointed out by des at des.no. 4693 4694 commit 8ff20ec95f4377021ed5e9b2331320f5c5a34cea 4695 Author: Darren Tucker <dtucker (a] zip.com.au> 4696 Date: Mon Mar 14 09:24:03 2016 +1100 4697 4698 Quote variables that may contain whitespace. 4699 4700 The variable $L_TMP_ID_FILE needs to be surrounded by quotes in order to 4701 survive paths containing whitespace. bz#2551, from Corinna Vinschen via 4702 Philip Hands. 4703 4704 commit 627824480c01f0b24541842c7206ab9009644d02 4705 Author: Darren Tucker <dtucker (a] zip.com.au> 4706 Date: Fri Mar 11 14:47:41 2016 +1100 4707 4708 Include priv.h for priv_set_t. 4709 4710 From alex at cooperi.net. 4711 4712 commit e960051f9a264f682c4d2fefbeecffcfc66b0ddf 4713 Author: Darren Tucker <dtucker (a] zip.com.au> 4714 Date: Wed Mar 9 13:14:18 2016 +1100 4715 4716 Wrap stdint.h inside #ifdef HAVE_STDINT_H. 4717 4718 commit 2c48bd344d2c4b5e08dae9aea5ff44fc19a5e363 4719 Author: Darren Tucker <dtucker (a] zip.com.au> 4720 Date: Wed Mar 9 12:46:50 2016 +1100 4721 4722 Add compat to monotime_double(). 4723 4724 Apply all of the portability changes in monotime() to monotime() double. 4725 Fixes build on at least older FreeBSD systems. 4726 4727 commit 7b40ef6c2eef40c339f6ea8920cb8a44838e10c9 4728 Author: Damien Miller <djm (a] mindrot.org> 4729 Date: Tue Mar 8 14:12:58 2016 -0800 4730 4731 make a regress-binaries target 4732 4733 Easier to build all the regression/unit test binaries in one pass 4734 than going through all of ${REGRESS_BINARIES} 4735 4736 commit c425494d6b6181beb54a1b3763ef9e944fd3c214 4737 Author: Damien Miller <djm (a] mindrot.org> 4738 Date: Tue Mar 8 14:03:54 2016 -0800 4739 4740 unbreak kexfuzz for -Werror without __bounded__ 4741 4742 commit 3ed9218c336607846563daea5d5ab4f701f4e042 4743 Author: Damien Miller <djm (a] mindrot.org> 4744 Date: Tue Mar 8 14:01:29 2016 -0800 4745 4746 unbreak PAM after canohost refactor 4747 4748 commit 885fb2a44ff694f01e4f6470f803629e11f62961 4749 Author: Darren Tucker <dtucker (a] zip.com.au> 4750 Date: Tue Mar 8 11:58:43 2016 +1100 4751 4752 auth_get_canonical_hostname in portable code. 4753 4754 "refactor canohost.c" replaced get_canonical_hostname, this makes the 4755 same change to some portable-specific code. 4756 4757 commit 95767262caa6692eff1e1565be1f5cb297949a89 4758 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4759 Date: Mon Mar 7 19:02:43 2016 +0000 4760 4761 upstream commit 4762 4763 refactor canohost.c: move functions that cache results closer 4764 to the places that use them (authn and session code). After this, no state is 4765 cached in canohost.c 4766 4767 feedback and ok markus@ 4768 4769 Upstream-ID: 5f2e4df88d4803fc8ec59ec53629105e23ce625e 4770 4771 commit af0bb38ffd1f2c4f9f43b0029be2efe922815255 4772 Author: Damien Miller <djm (a] mindrot.org> 4773 Date: Fri Mar 4 15:11:55 2016 +1100 4774 4775 hook unittests/misc/kexfuzz into build 4776 4777 commit 331b8e07ee5bcbdca12c11cc8f51a7e8de09b248 4778 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4779 Date: Fri Mar 4 02:48:06 2016 +0000 4780 4781 upstream commit 4782 4783 Filter debug messages out of log before picking the last 4784 two lines. Should prevent problems if any more debug output is added late in 4785 the connection. 4786 4787 Upstream-Regress-ID: 345d0a9589c381e7d640a4ead06cfaadf4db1363 4788 4789 commit 0892edaa3ce623381d3a7635544cbc69b31cf9cb 4790 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4791 Date: Fri Mar 4 02:30:36 2016 +0000 4792 4793 upstream commit 4794 4795 add KEX fuzzer harness; ok deraadt@ 4796 4797 Upstream-Regress-ID: 3df5242d30551b12b828aa9ba4a4cec0846be8d1 4798 4799 commit ae2562c47d41b68dbb00240fd6dd60bed205367a 4800 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4801 Date: Thu Mar 3 00:46:53 2016 +0000 4802 4803 upstream commit 4804 4805 Look back 3 lines for possible error messages. Changes 4806 to the code mean that "Bad packet length" errors are 3 lines back instead of 4807 the previous two, which meant we didn't skip some offsets that we intended 4808 to. 4809 4810 Upstream-Regress-ID: 24f36912740a634d509a3144ebc8eb7c09b9c684 4811 4812 commit 988e429d903acfb298bfddfd75e7994327adfed0 4813 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4814 Date: Fri Mar 4 03:35:44 2016 +0000 4815 4816 upstream commit 4817 4818 fix ClientAliveInterval when a time-based RekeyLimit is 4819 set; previously keepalive packets were not being sent. bz#2252 report and 4820 analysis by Christian Wittenhorst and Garrett Lee feedback and ok dtucker@ 4821 4822 Upstream-ID: d48f9deadd35fdacdd5106b41bb07630ddd4aa81 4823 4824 commit 8ef04d7a94bcdb8b0085fdd2a79a844b7d40792d 4825 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4826 Date: Wed Mar 2 22:43:52 2016 +0000 4827 4828 upstream commit 4829 4830 Improve accuracy of reported transfer speeds by waiting 4831 for the ack from the other end. Pointed out by mmcc@, ok deraadt@ markus@ 4832 4833 Upstream-ID: 99f1cf15c9a8f161086b814d414d862795ae153d 4834 4835 commit b8d4eafe29684fe4f5bb587f7eab948e6ed62723 4836 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 4837 Date: Wed Mar 2 22:42:40 2016 +0000 4838 4839 upstream commit 4840 4841 Improve precision of progressmeter for sftp and scp by 4842 storing sub-second timestamps. Pointed out by mmcc@, ok deraadt@ markus@ 4843 4844 Upstream-ID: 38fd83a3d83dbf81c8ff7b5d1302382fe54970ab 4845 4846 commit 18f64b969c70ed00e74b9d8e50359dbe698ce4c0 4847 Author: jca (a] openbsd.org <jca (a] openbsd.org> 4848 Date: Mon Feb 29 20:22:36 2016 +0000 4849 4850 upstream commit 4851 4852 Print ssize_t with %zd; ok deraadt@ mmcc@ 4853 4854 Upstream-ID: 0590313bbb013ff6692298c98f7e0be349d124bd 4855 4856 commit 6e7f68ce38130c794ec1fb8d2a6091fbe982628d 4857 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4858 Date: Sun Feb 28 22:27:00 2016 +0000 4859 4860 upstream commit 4861 4862 rearrange DH public value tests to be a little more clear 4863 4864 rearrange DH private value generation to explain rationale more 4865 clearly and include an extra sanity check. 4866 4867 ok deraadt 4868 4869 Upstream-ID: 9ad8a07e1a12684e1b329f9bd88941b249d4b2ad 4870 4871 commit 2ed17aa34008bdfc8db674315adc425a0712be11 4872 Author: Darren Tucker <dtucker (a] zip.com.au> 4873 Date: Tue Mar 1 15:24:20 2016 +1100 4874 4875 Import updated moduli file from OpenBSD. 4876 4877 Note that 1.5k bit groups have been removed. 4878 4879 commit 72b061d4ba0f909501c595d709ea76e06b01e5c9 4880 Author: Darren Tucker <dtucker (a] zip.com.au> 4881 Date: Fri Feb 26 14:40:04 2016 +1100 4882 4883 Add a note about using xlc on AIX. 4884 4885 commit fd4e4f2416baa2e6565ea49d52aade296bad3e28 4886 Author: Darren Tucker <dtucker (a] zip.com.au> 4887 Date: Wed Feb 24 10:44:25 2016 +1100 4888 4889 Skip PrintLastLog in config dump mode. 4890 4891 When DISABLE_LASTLOG is set, do not try to include PrintLastLog in the 4892 config dump since it'll be reported as UNKNOWN. 4893 4894 commit 99135c764fa250801da5ec3b8d06cbd0111caae8 4895 Author: Damien Miller <djm (a] mindrot.org> 4896 Date: Tue Feb 23 20:17:23 2016 +1100 4897 4898 update spec/README versions ahead of release 4899 4900 commit b86a334aaaa4d1e643eb1fd71f718573d6d948b5 4901 Author: Damien Miller <djm (a] mindrot.org> 4902 Date: Tue Feb 23 20:16:53 2016 +1100 4903 4904 put back portable patchlevel to p1 4905 4906 commit 555dd35ff176847e3c6bd068ba2e8db4022eb24f 4907 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4908 Date: Tue Feb 23 09:14:34 2016 +0000 4909 4910 upstream commit 4911 4912 openssh-7.2 4913 4914 Upstream-ID: 9db776b26014147fc907ece8460ef2bcb0f11e78 4915 4916 commit 1acc058d0a7913838c830ed998a1a1fb5b7864bf 4917 Author: Damien Miller <djm (a] mindrot.org> 4918 Date: Tue Feb 23 16:12:13 2016 +1100 4919 4920 Disable tests where fs perms are incorrect 4921 4922 Some tests have strict requirements on the filesystem permissions 4923 for certain files and directories. This adds a regress/check-perm 4924 tool that copies the relevant logic from sshd to exactly test 4925 the paths in question. This lets us skip tests when the local 4926 filesystem doesn't conform to our expectations rather than 4927 continuing and failing the test run. 4928 4929 ok dtucker@ 4930 4931 commit 39f303b1f36d934d8410b05625f25c7bcb75db4d 4932 Author: Damien Miller <djm (a] mindrot.org> 4933 Date: Tue Feb 23 12:56:59 2016 +1100 4934 4935 fix sandbox on OSX Lion 4936 4937 sshd was failing with: 4938 4939 ssh_sandbox_child: sandbox_init: dlopen(/usr/lib/libsandbox.1.dylib, 261):cw 4940 image not found [preauth] 4941 4942 caused by chroot before sandboxing. Avoid by explicitly linking libsandbox 4943 to sshd. Spotted by Darren. 4944 4945 commit 0d1451a32c7436e6d3d482351e776bc5e7824ce4 4946 Author: djm (a] openbsd.org <djm (a] openbsd.org> 4947 Date: Tue Feb 23 01:34:14 2016 +0000 4948 4949 upstream commit 4950 4951 fix spurious error message when incorrect passphrase 4952 entered for keys; reported by espie@ ok deraadt@ 4953 4954 Upstream-ID: 58b2e46e63ed6912ed1ee780bd3bd8560f9a5899 4955 4956 commit 09d87d79741beb85768b5e788d7dfdf4bc3543dc 4957 Author: sobrado (a] openbsd.org <sobrado (a] openbsd.org> 4958 Date: Sat Feb 20 23:06:23 2016 +0000 4959 4960 upstream commit 4961 4962 set ssh(1) protocol version to 2 only. 4963 4964 ok djm@ 4965 4966 Upstream-ID: e168daf9d27d7e392e3c9923826bd8e87b2b3a10 4967 4968 commit 9262e07826ba5eebf8423f7ac9e47ec488c47869 4969 Author: sobrado (a] openbsd.org <sobrado (a] openbsd.org> 4970 Date: Sat Feb 20 23:02:39 2016 +0000 4971 4972 upstream commit 4973 4974 add missing ~/.ssh/id_ecdsa and ~/.ssh/id_ed25519 to 4975 IdentityFile. 4976 4977 ok djm@ 4978 4979 Upstream-ID: 6ce99466312e4ae7708017c3665e3edb976f70cf 4980 4981 commit c12f0fdce8f985fca8d71829fd64c5b89dc777f5 4982 Author: sobrado (a] openbsd.org <sobrado (a] openbsd.org> 4983 Date: Sat Feb 20 23:01:46 2016 +0000 4984 4985 upstream commit 4986 4987 AddressFamily defaults to any. 4988 4989 ok djm@ 4990 4991 Upstream-ID: 0d94aa06a4b889bf57a7f631c45ba36d24c13e0c 4992 4993 commit 907091acb188b1057d50c2158f74c3ecf1c2302b 4994 Author: Darren Tucker <dtucker (a] zip.com.au> 4995 Date: Fri Feb 19 09:05:39 2016 +1100 4996 4997 Make Solaris privs code build on older systems. 4998 4999 Not all systems with Solaris privs have priv_basicset so factor that 5000 out and provide backward compatibility code. Similarly, not all have 5001 PRIV_NET_ACCESS so wrap that in #ifdef. Based on code from 5002 alex at cooperi.net and djm@ with help from carson at taltos.org and 5003 wieland at purdue.edu. 5004 5005 commit 292a8dee14e5e67dcd1b49ba5c7b9023e8420d59 5006 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5007 Date: Wed Feb 17 22:20:14 2016 +0000 5008 5009 upstream commit 5010 5011 rekey refactor broke SSH1; spotted by Tom G. Christensen 5012 5013 Upstream-ID: 43f0d57928cc077c949af0bfa71ef574dcb58243 5014 5015 commit 3a13cb543df9919aec2fc6b75f3dd3802facaeca 5016 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5017 Date: Wed Feb 17 08:57:34 2016 +0000 5018 5019 upstream commit 5020 5021 rsa-sha2-512,rsa-sha2-256 cannot be selected explicitly 5022 in *KeyTypes options yet. Remove them from the lists of algorithms for now. 5023 committing on behalf of markus@ ok djm@ 5024 5025 Upstream-ID: c6e8820eb8e610ac21551832c0c89684a9a51bb7 5026 5027 commit a685ae8d1c24fb7c712c55a4f3280ee76f5f1e4b 5028 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 5029 Date: Wed Feb 17 07:38:19 2016 +0000 5030 5031 upstream commit 5032 5033 since these pages now clearly tell folks to avoid v1, 5034 normalise the docs from a v2 perspective (i.e. stop pointing out which bits 5035 are v2 only); 5036 5037 ok/tweaks djm ok markus 5038 5039 Upstream-ID: eb474f8c36fb6a532dc05c282f7965e38dcfa129 5040 5041 commit c5c3f3279a0e4044b8de71b70d3570d692d0f29d 5042 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5043 Date: Wed Feb 17 05:29:04 2016 +0000 5044 5045 upstream commit 5046 5047 make sandboxed privilege separation the default, not just 5048 for new installs; "absolutely" deraadt@ 5049 5050 Upstream-ID: 5221ef3b927d2df044e9aa3f5db74ae91743f69b 5051 5052 commit eb3f7337a651aa01d5dec019025e6cdc124ed081 5053 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 5054 Date: Tue Feb 16 07:47:54 2016 +0000 5055 5056 upstream commit 5057 5058 no need to state that protocol 2 is the default twice; 5059 5060 Upstream-ID: b1e4c36b0c2e12e338e5b66e2978f2ac953b95eb 5061 5062 commit e7901efa9b24e5b0c7e74f2c5520d47eead4d005 5063 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5064 Date: Tue Feb 16 05:11:04 2016 +0000 5065 5066 upstream commit 5067 5068 Replace list of ciphers and MACs adjacent to -1/-2 flag 5069 descriptions in ssh(1) with a strong recommendation not to use protocol 1. 5070 Add a similar warning to the Protocol option descriptions in ssh_config(5) 5071 and sshd_config(5); 5072 5073 prompted by and ok mmcc@ 5074 5075 Upstream-ID: 961f99e5437d50e636feca023978950a232ead5e 5076 5077 commit 5a0fcb77287342e2fc2ba1cee79b6af108973dc2 5078 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5079 Date: Tue Feb 16 03:37:48 2016 +0000 5080 5081 upstream commit 5082 5083 add a "Close session" log entry (at loglevel=verbose) to 5084 correspond to the existing "Starting session" one. Also include the session 5085 id number to make multiplexed sessions more apparent. 5086 5087 feedback and ok dtucker@ 5088 5089 Upstream-ID: e72d2ac080e02774376325136e532cb24c2e617c 5090 5091 commit 624fd395b559820705171f460dd33d67743d13d6 5092 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5093 Date: Wed Feb 17 02:24:17 2016 +0000 5094 5095 upstream commit 5096 5097 include bad $SSH_CONNECTION in failure output 5098 5099 Upstream-Regress-ID: b22d72edfde78c403aaec2b9c9753ef633cc0529 5100 5101 commit 60d860e54b4f199e5e89963b1c086981309753cb 5102 Author: Darren Tucker <dtucker (a] zip.com.au> 5103 Date: Wed Feb 17 13:37:09 2016 +1100 5104 5105 Rollback addition of va_start. 5106 5107 va_start was added in 0f754e29dd3760fc0b172c1220f18b753fb0957e, however 5108 it has the wrong number of args and it's not usable in non-variadic 5109 functions anyway so it breaks things (for example Solaris 2.6 as 5110 reported by Tom G. Christensen).i ok djm@ 5111 5112 commit 2fee909c3cee2472a98b26eb82696297b81e0d38 5113 Author: Darren Tucker <dtucker (a] zip.com.au> 5114 Date: Wed Feb 17 09:48:15 2016 +1100 5115 5116 Look for gethostbyname in libresolv and libnsl. 5117 5118 Should fix build problem on Solaris 2.6 reported by Tom G. Christensen. 5119 5120 commit 5ac712d81a84396aab441a272ec429af5b738302 5121 Author: Damien Miller <djm (a] mindrot.org> 5122 Date: Tue Feb 16 10:45:02 2016 +1100 5123 5124 make existing ssh_malloc_init only for __OpenBSD__ 5125 5126 commit 24c9bded569d9f2449ded73f92fb6d12db7a9eec 5127 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5128 Date: Mon Feb 15 23:32:37 2016 +0000 5129 5130 upstream commit 5131 5132 memleak of algorithm name in mm_answer_sign; reported by 5133 Jakub Jelen 5134 5135 Upstream-ID: ccd742cd25952240ebd23d7d4d6b605862584d08 5136 5137 commit ffb1e7e896139a42ceb78676f637658f44612411 5138 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 5139 Date: Mon Feb 15 09:47:49 2016 +0000 5140 5141 upstream commit 5142 5143 Add a function to enable security-related malloc_options. 5144 With and ok deraadt@, something similar has been in the snaps for a while. 5145 5146 Upstream-ID: 43a95523b832b7f3b943d2908662191110c380ed 5147 5148 commit ef39e8c0497ff0564990a4f9e8b7338b3ba3507c 5149 Author: Damien Miller <djm (a] mindrot.org> 5150 Date: Tue Feb 16 10:34:39 2016 +1100 5151 5152 sync ssh-copy-id with upstream 783ef08b0a75 5153 5154 commit d2d772f55b19bb0e8d03c2fe1b9bb176d9779efd 5155 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5156 Date: Fri Feb 12 00:20:30 2016 +0000 5157 5158 upstream commit 5159 5160 avoid fatal() for PKCS11 tokens that present empty key IDs 5161 bz#1773, ok markus@ 5162 5163 Upstream-ID: 044a764fee526f2c4a9d530bd10695422d01fc54 5164 5165 commit e4c918a6c721410792b287c9fd21356a1bed5805 5166 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5167 Date: Thu Feb 11 02:56:32 2016 +0000 5168 5169 upstream commit 5170 5171 sync crypto algorithm lists in ssh_config(5) and 5172 sshd_config(5) with current reality. bz#2527 5173 5174 Upstream-ID: d7fd1b6c1ed848d866236bcb1d7049d2bb9b2ff6 5175 5176 commit e30cabfa4ab456a30b3224f7f545f1bdfc4a2517 5177 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5178 Date: Thu Feb 11 02:21:34 2016 +0000 5179 5180 upstream commit 5181 5182 fix regression in openssh-6.8 sftp client: existing 5183 destination directories would incorrectly terminate recursive uploads; 5184 bz#2528 5185 5186 Upstream-ID: 3306be469f41f26758e3d447987ac6d662623e18 5187 5188 commit 714e367226ded4dc3897078be48b961637350b05 5189 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5190 Date: Tue Feb 9 05:30:04 2016 +0000 5191 5192 upstream commit 5193 5194 turn off more old crypto in the client: hmac-md5, ripemd, 5195 truncated HMACs, RC4, blowfish. ok markus@ dtucker@ 5196 5197 Upstream-ID: 96aa11c2c082be45267a690c12f1d2aae6acd46e 5198 5199 commit 5a622844ff7f78dcb75e223399f9ef0977e8d0a3 5200 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5201 Date: Mon Feb 8 23:40:12 2016 +0000 5202 5203 upstream commit 5204 5205 don't attempt to percent_expand() already-canonicalised 5206 addresses, avoiding unnecessary failures when attempting to connect to scoped 5207 IPv6 addresses (that naturally contain '%' characters) 5208 5209 Upstream-ID: f24569cffa1a7cbde5f08dc739a72f4d78aa5c6a 5210 5211 commit 19bcf2ea2d17413f2d9730dd2a19575ff86b9b6a 5212 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5213 Date: Mon Feb 8 10:57:07 2016 +0000 5214 5215 upstream commit 5216 5217 refactor activation of rekeying 5218 5219 This makes automatic rekeying internal to the packet code (previously 5220 the server and client loops needed to assist). In doing to it makes 5221 application of rekey limits more accurate by accounting for packets 5222 about to be sent as well as packets queued during rekeying events 5223 themselves. 5224 5225 Based on a patch from dtucker@ which was in turn based on a patch 5226 Aleksander Adamowski in bz#2521; ok markus@ 5227 5228 Upstream-ID: a441227fd64f9739850ca97b4cf794202860fcd8 5229 5230 commit 603ba41179e4b53951c7b90ee95b6ef3faa3f15d 5231 Author: naddy (a] openbsd.org <naddy (a] openbsd.org> 5232 Date: Fri Feb 5 13:28:19 2016 +0000 5233 5234 upstream commit 5235 5236 Only check errno if read() has returned an error. EOF is 5237 not an error. This fixes a problem where the mux master would sporadically 5238 fail to notice that the client had exited. ok mikeb@ djm@ 5239 5240 Upstream-ID: 3c2dadc21fac6ef64665688aac8a75fffd57ae53 5241 5242 commit 56d7dac790693ce420d225119283bc355cff9185 5243 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 5244 Date: Fri Feb 5 04:31:21 2016 +0000 5245 5246 upstream commit 5247 5248 avoid an uninitialised value when NumberOfPasswordPrompts 5249 is 0 ok markus@ djm@ 5250 5251 Upstream-ID: 11b068d83c2865343aeb46acf1e9eec00f829b6b 5252 5253 commit deae7d52d59c5019c528f977360d87fdda15d20b 5254 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5255 Date: Fri Feb 5 03:07:06 2016 +0000 5256 5257 upstream commit 5258 5259 mention internal DH-GEX fallback groups; bz#2302 5260 5261 Upstream-ID: e7b395fcca3122cd825515f45a2e41c9a157e09e 5262 5263 commit cac3b6665f884d46192c0dc98a64112e8b11a766 5264 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5265 Date: Fri Feb 5 02:37:56 2016 +0000 5266 5267 upstream commit 5268 5269 better description for MaxSessions; bz#2531 5270 5271 Upstream-ID: e2c0d74ee185cd1a3e9d4ca1f1b939b745b354da 5272 5273 commit 5ef4b0fdcc7a239577a754829b50022b91ab4712 5274 Author: Damien Miller <djm (a] mindrot.org> 5275 Date: Wed Jan 27 17:45:56 2016 +1100 5276 5277 avoid FreeBSD RCS Id in comment 5278 5279 Change old $FreeBSD version string in comment so it doesn't 5280 become an RCS ident downstream; requested by des AT des.no 5281 5282 commit 696d12683c90d20a0a9c5f4275fc916b7011fb04 5283 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5284 Date: Thu Feb 4 23:43:48 2016 +0000 5285 5286 upstream commit 5287 5288 printf argument casts to avoid warnings on strict 5289 compilers 5290 5291 Upstream-ID: 7b9f6712cef01865ad29070262d366cf13587c9c 5292 5293 commit 5658ef2501e785fbbdf5de2dc33b1ff7a4dca73a 5294 Author: millert (a] openbsd.org <millert (a] openbsd.org> 5295 Date: Mon Feb 1 21:18:17 2016 +0000 5296 5297 upstream commit 5298 5299 Avoid ugly "DISPLAY "(null)" invalid; disabling X11 5300 forwarding" message when DISPLAY is not set. This could also result in a 5301 crash on systems with a printf that doesn't handle NULL. OK djm@ 5302 5303 Upstream-ID: 20ee0cfbda678a247264c20ed75362042b90b412 5304 5305 commit 537f88ec7bcf40bd444ac5584c707c5588c55c43 5306 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 5307 Date: Fri Jan 29 05:18:15 2016 +0000 5308 5309 upstream commit 5310 5311 Add regression test for RekeyLimit parsing of >32bit values 5312 (4G and 8G). 5313 5314 Upstream-Regress-ID: 548390350c62747b6234f522a99c319eee401328 5315 5316 commit 4c6cb8330460f94e6c7ae28a364236d4188156a3 5317 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 5318 Date: Fri Jan 29 23:04:46 2016 +0000 5319 5320 upstream commit 5321 5322 Remove leftover roaming dead code. ok djm markus. 5323 5324 Upstream-ID: 13d1f9c8b65a5109756bcfd3b74df949d53615be 5325 5326 commit 28136471809806d6246ef41e4341467a39fe2f91 5327 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5328 Date: Fri Jan 29 05:46:01 2016 +0000 5329 5330 upstream commit 5331 5332 include packet type of non-data packets in debug3 output; 5333 ok markus dtucker 5334 5335 Upstream-ID: 034eaf639acc96459b9c5ce782db9fcd8bd02d41 5336 5337 commit 6fd6e28daccafaa35f02741036abe64534c361a1 5338 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 5339 Date: Fri Jan 29 03:31:03 2016 +0000 5340 5341 upstream commit 5342 5343 Revert "account for packets buffered but not yet 5344 processed" change as it breaks for very small RekeyLimit values due to 5345 continuous rekeying. ok djm@ 5346 5347 Upstream-ID: 7e03f636cb45ab60db18850236ccf19079182a19 5348 5349 commit 921ff00b0ac429666fb361d2d6cb1c8fff0006cb 5350 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 5351 Date: Fri Jan 29 02:54:45 2016 +0000 5352 5353 upstream commit 5354 5355 Allow RekeyLimits in excess of 4G up to 2**63 bits 5356 (limited by the return type of scan_scaled). Part of bz#2521, ok djm. 5357 5358 Upstream-ID: 13bea82be566b9704821b1ea05bf7804335c7979 5359 5360 commit c0060a65296f01d4634f274eee184c0e93ba0f23 5361 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 5362 Date: Fri Jan 29 02:42:46 2016 +0000 5363 5364 upstream commit 5365 5366 Account for packets buffered but not yet processed when 5367 computing whether or not it is time to perform rekeying. bz#2521, based 5368 loosely on a patch from olo at fb.com, ok djm@ 5369 5370 Upstream-ID: 67e268b547f990ed220f3cb70a5624d9bda12b8c 5371 5372 commit 44cf930e670488c85c9efeb373fa5f4b455692ac 5373 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5374 Date: Wed Jan 27 06:44:58 2016 +0000 5375 5376 upstream commit 5377 5378 change old $FreeBSD version string in comment so it doesn't 5379 become an RCS ident downstream; requested by des AT des.no 5380 5381 Upstream-ID: 8ca558c01f184e596b45e4fc8885534b2c864722 5382 5383 commit ebacd377769ac07d1bf3c75169644336056b7060 5384 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5385 Date: Wed Jan 27 00:53:12 2016 +0000 5386 5387 upstream commit 5388 5389 make the debug messages a bit more useful here 5390 5391 Upstream-ID: 478ccd4e897e0af8486b294aa63aa3f90ab78d64 5392 5393 commit 458abc2934e82034c5c281336d8dc0f910aecad3 5394 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 5395 Date: Sat Jan 23 05:31:35 2016 +0000 5396 5397 upstream commit 5398 5399 Zero a stack buffer with explicit_bzero() instead of 5400 memset() when returning from client_loop() for consistency with 5401 buffer_free()/sshbuf_free(). 5402 5403 ok dtucker@ deraadt@ djm@ 5404 5405 Upstream-ID: bc9975b2095339811c3b954694d7d15ea5c58f66 5406 5407 commit 65a3c0dacbc7dbb75ddb6a70ebe22d8de084d0b0 5408 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 5409 Date: Wed Jan 20 09:22:39 2016 +0000 5410 5411 upstream commit 5412 5413 Include sys/time.h for gettimeofday. From sortie at 5414 maxsi.org. 5415 5416 Upstream-ID: 6ed0c33b836d9de0a664cd091e86523ecaa2fb3b 5417 5418 commit fc77ccdc2ce6d5d06628b8da5048a6a5f6ffca5a 5419 Author: markus (a] openbsd.org <markus (a] openbsd.org> 5420 Date: Thu Jan 14 22:56:56 2016 +0000 5421 5422 upstream commit 5423 5424 fd leaks; report Qualys Security Advisory team; ok 5425 deraadt@ 5426 5427 Upstream-ID: 4ec0f12b9d8fa202293c9effa115464185aa071d 5428 5429 commit a306863831c57ec5fad918687cc5d289ee8e2635 5430 Author: markus (a] openbsd.org <markus (a] openbsd.org> 5431 Date: Thu Jan 14 16:17:39 2016 +0000 5432 5433 upstream commit 5434 5435 remove roaming support; ok djm@ 5436 5437 Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56 5438 5439 commit 6ef49e83e30688504552ac10875feabd5521565f 5440 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 5441 Date: Thu Jan 14 14:34:34 2016 +0000 5442 5443 upstream commit 5444 5445 Disable experimental client-side roaming support. Server 5446 side was disabled/gutted for years already, but this aspect was surprisingly 5447 forgotten. Thanks for report from Qualys 5448 5449 Upstream-ID: 2328004b58f431a554d4c1bf67f5407eae3389df 5450 5451 commit 8d7b523b96d3be180572d9d338cedaafc0570f60 5452 Author: Damien Miller <djm (a] mindrot.org> 5453 Date: Thu Jan 14 11:08:19 2016 +1100 5454 5455 bump version numbers 5456 5457 commit 8c3d512a1fac8b9c83b4d0c9c3f2376290bd84ca 5458 Author: Damien Miller <djm (a] mindrot.org> 5459 Date: Thu Jan 14 11:04:04 2016 +1100 5460 5461 openssh-7.1p2 5462 5463 commit e6c85f8889c5c9eb04796fdb76d2807636b9eef5 5464 Author: Damien Miller <djm (a] mindrot.org> 5465 Date: Fri Jan 15 01:30:36 2016 +1100 5466 5467 forcibly disable roaming support in the client 5468 5469 commit ed4ce82dbfa8a3a3c8ea6fa0db113c71e234416c 5470 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5471 Date: Wed Jan 13 23:04:47 2016 +0000 5472 5473 upstream commit 5474 5475 eliminate fallback from untrusted X11 forwarding to trusted 5476 forwarding when the X server disables the SECURITY extension; Reported by 5477 Thomas Hoger; ok deraadt@ 5478 5479 Upstream-ID: f76195bd2064615a63ef9674a0e4096b0713f938 5480 5481 commit 9a728cc918fad67c8a9a71201088b1e150340ba4 5482 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5483 Date: Tue Jan 12 23:42:54 2016 +0000 5484 5485 upstream commit 5486 5487 use explicit_bzero() more liberally in the buffer code; ok 5488 deraadt 5489 5490 Upstream-ID: 0ece37069fd66bc6e4f55eb1321f93df372b65bf 5491 5492 commit 4626cbaf78767fc8e9c86dd04785386c59ae0839 5493 Author: Damien Miller <djm (a] mindrot.org> 5494 Date: Fri Jan 8 14:24:56 2016 +1100 5495 5496 Support Illumos/Solaris fine-grained privileges 5497 5498 Includes a pre-auth privsep sandbox and several pledge() 5499 emulations. bz#2511, patch by Alex Wilson. 5500 5501 ok dtucker@ 5502 5503 commit 422d1b3ee977ff4c724b597fb2e437d38fc8de9d 5504 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5505 Date: Thu Dec 31 00:33:52 2015 +0000 5506 5507 upstream commit 5508 5509 fix three bugs in KRL code related to (unused) signature 5510 support: verification length was being incorrectly calculated, multiple 5511 signatures were being incorrectly processed and a NULL dereference that 5512 occurred when signatures were verified. Reported by Carl Jackson 5513 5514 Upstream-ID: e705e97ad3ccce84291eaa651708dd1b9692576b 5515 5516 commit 6074c84bf95d00f29cc7d5d3cd3798737851aa1a 5517 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5518 Date: Wed Dec 30 23:46:14 2015 +0000 5519 5520 upstream commit 5521 5522 unused prototype 5523 5524 Upstream-ID: f3eef4389d53ed6c0d5c77dcdcca3060c745da97 5525 5526 commit 6213f0e180e54122bb1ba928e11c784e2b4e5380 5527 Author: guenther (a] openbsd.org <guenther (a] openbsd.org> 5528 Date: Sat Dec 26 20:51:35 2015 +0000 5529 5530 upstream commit 5531 5532 Use pread/pwrite instead separate lseek+read/write for 5533 lastlog. Cast to off_t before multiplication to avoid truncation on ILP32 5534 5535 ok kettenis@ mmcc@ 5536 5537 Upstream-ID: fc40092568cd195719ddf1a00aa0742340d616cf 5538 5539 commit d7d2bc95045a43dd56ea696cc1d030ac9d77e81f 5540 Author: semarie (a] openbsd.org <semarie (a] openbsd.org> 5541 Date: Sat Dec 26 07:46:03 2015 +0000 5542 5543 upstream commit 5544 5545 adjust pledge promises for ControlMaster: when using 5546 "ask" or "autoask", the process will use ssh-askpass for asking confirmation. 5547 5548 problem found by halex@ 5549 5550 ok halex@ 5551 5552 Upstream-ID: 38a58b30ae3eef85051c74d3c247216ec0735f80 5553 5554 commit 271df8185d9689b3fb0523f58514481b858f6843 5555 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5556 Date: Sun Dec 13 22:42:23 2015 +0000 5557 5558 upstream commit 5559 5560 unbreak connections with peers that set 5561 first_kex_follows; fix from Matt Johnston va bz#2515 5562 5563 Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b 5564 5565 commit 43849a47c5f8687699eafbcb5604f6b9c395179f 5566 Author: doug (a] openbsd.org <doug (a] openbsd.org> 5567 Date: Fri Dec 11 17:41:37 2015 +0000 5568 5569 upstream commit 5570 5571 Add "id" to ssh-agent pledge for subprocess support. 5572 5573 Found the hard way by Jan Johansson when using ssh-agent with X. Also, 5574 rearranged proc/exec and retval to match other pledge calls in the tree. 5575 5576 ok djm@ 5577 5578 Upstream-ID: 914255f6850e5e7fa830a2de6c38605333b584db 5579 5580 commit 52d7078421844b2f88329f5be3de370b0a938636 5581 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 5582 Date: Fri Dec 11 04:21:11 2015 +0000 5583 5584 upstream commit 5585 5586 Remove NULL-checks before sshbuf_free(). 5587 5588 ok djm@ 5589 5590 Upstream-ID: 5ebed00ed5f9f03b119a345085e8774565466917 5591 5592 commit a4b9e0f4e4a6980a0eb8072f76ea611cab5b77e7 5593 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5594 Date: Fri Dec 11 03:24:25 2015 +0000 5595 5596 upstream commit 5597 5598 include remote port number in a few more messages; makes 5599 tying log messages together into a session a bit easier; bz#2503 ok dtucker@ 5600 5601 Upstream-ID: 9300dc354015f7a7368d94a8ff4a4266a69d237e 5602 5603 commit 6091c362e89079397e68744ae30df121b0a72c07 5604 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5605 Date: Fri Dec 11 03:20:09 2015 +0000 5606 5607 upstream commit 5608 5609 don't try to load SSHv1 private key when compiled without 5610 SSHv1 support. From Iain Morgan bz#2505 5611 5612 Upstream-ID: 8b8e7b02a448cf5e5635979df2d83028f58868a7 5613 5614 commit cce6a36bb95e81fa8bfb46daf22eabcf13afc352 5615 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5616 Date: Fri Dec 11 03:19:09 2015 +0000 5617 5618 upstream commit 5619 5620 use SSH_MAX_PUBKEY_BYTES consistently as buffer size when 5621 reading key files. Increase it to match the size of the buffers already being 5622 used. 5623 5624 Upstream-ID: 1b60586b484b55a947d99a0b32bd25e0ced56fae 5625 5626 commit 89540b6de025b80404a0cb8418c06377f3f98848 5627 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 5628 Date: Fri Dec 11 02:31:47 2015 +0000 5629 5630 upstream commit 5631 5632 Remove NULL-checks before sshkey_free(). 5633 5634 ok djm@ 5635 5636 Upstream-ID: 3e35afe8a25e021216696b5d6cde7f5d2e5e3f52 5637 5638 commit 79394ed6d74572c2d2643d73937dad33727fc240 5639 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 5640 Date: Fri Dec 11 02:29:03 2015 +0000 5641 5642 upstream commit 5643 5644 fflush stdout so that output is seen even when running in 5645 debug mode when output may otherwise not be flushed. Patch from dustin at 5646 null-ptr.net. 5647 5648 Upstream-ID: b0c6b4cd2cdb01d7e9eefbffdc522e35b5bc4acc 5649 5650 commit ee607cccb6636eb543282ba90e0677b0604d8b7a 5651 Author: Darren Tucker <dtucker (a] zip.com.au> 5652 Date: Tue Dec 15 15:23:49 2015 +1100 5653 5654 Increase robustness of redhat/openssh.spec 5655 5656 - remove configure --with-rsh, because this option isn't supported anymore 5657 - replace last occurrence of BuildPreReq by BuildRequires 5658 - update grep statement to query the krb5 include directory 5659 5660 Patch from CarstenGrohmann via github, ok djm. 5661 5662 commit b5fa0cd73555b991a543145603658d7088ec6b60 5663 Author: Darren Tucker <dtucker (a] zip.com.au> 5664 Date: Tue Dec 15 15:10:32 2015 +1100 5665 5666 Allow --without-ssl-engine with --without-openssl 5667 5668 Patch from Mike Frysinger via github. 5669 5670 commit c1d7e546f6029024f3257cc25c92f2bddf163125 5671 Author: Darren Tucker <dtucker (a] zip.com.au> 5672 Date: Tue Dec 15 14:27:09 2015 +1100 5673 5674 Include openssl crypto.h for SSLeay. 5675 5676 Patch from doughdemon via github. 5677 5678 commit c6f5f01651526e88c00d988ce59d71f481ebac62 5679 Author: Darren Tucker <dtucker (a] zip.com.au> 5680 Date: Tue Dec 15 13:59:12 2015 +1100 5681 5682 Add sys/time.h for gettimeofday. 5683 5684 Should allow it it compile with MUSL libc. Based on patch from 5685 doughdemon via github. 5686 5687 commit 39736be06c7498ef57d6970f2d85cf066ae57c82 5688 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5689 Date: Fri Dec 11 02:20:28 2015 +0000 5690 5691 upstream commit 5692 5693 correct error messages; from Tomas Kuthan bz#2507 5694 5695 Upstream-ID: 7454a0affeab772398052954c79300aa82077093 5696 5697 commit 94141b7ade24afceeb6762a3f99e09e47a6c42b6 5698 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 5699 Date: Fri Dec 11 00:20:04 2015 +0000 5700 5701 upstream commit 5702 5703 Pass (char *)NULL rather than (char *)0 to execl and 5704 execlp. 5705 5706 ok dtucker@ 5707 5708 Upstream-ID: 56c955106cbddba86c3dd9bbf786ac0d1b361492 5709 5710 commit d59ce08811bf94111c2f442184cf7d1257ffae24 5711 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 5712 Date: Thu Dec 10 17:08:40 2015 +0000 5713 5714 upstream commit 5715 5716 Remove NULL-checks before free(). 5717 5718 ok dtucker@ 5719 5720 Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8 5721 5722 commit 8e56dd46cb37879c73bce2d6032cf5e7f82d5a71 5723 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 5724 Date: Thu Dec 10 07:01:35 2015 +0000 5725 5726 upstream commit 5727 5728 Fix a couple "the the" typos. ok dtucker@ 5729 5730 Upstream-ID: ec364c5af32031f013001fd28d1bd3dfacfe9a72 5731 5732 commit 6262a0522ddc2c0f2e9358dcb68d59b46e9c533e 5733 Author: markus (a] openbsd.org <markus (a] openbsd.org> 5734 Date: Mon Dec 7 20:04:09 2015 +0000 5735 5736 upstream commit 5737 5738 stricter encoding type checks for ssh-rsa; ok djm@ 5739 5740 Upstream-ID: 8cca7c787599a5e8391e184d0b4f36fdc3665650 5741 5742 commit d86a3ba7af160c13496102aed861ae48a4297072 5743 Author: Damien Miller <djm (a] mindrot.org> 5744 Date: Wed Dec 9 09:18:45 2015 +1100 5745 5746 Don't set IPV6_V6ONLY on OpenBSD 5747 5748 It isn't necessary and runs afoul of pledge(2) restrictions. 5749 5750 commit da98c11d03d819a15429d8fff9688acd7505439f 5751 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5752 Date: Mon Dec 7 02:20:46 2015 +0000 5753 5754 upstream commit 5755 5756 basic unit tests for rsa-sha2-* signature types 5757 5758 Upstream-Regress-ID: 7dc4b9db809d578ff104d591b4d86560c3598d3c 5759 5760 commit 3da893fdec9936dd2c23739cdb3c0c9d4c59fca0 5761 Author: markus (a] openbsd.org <markus (a] openbsd.org> 5762 Date: Sat Dec 5 20:53:21 2015 +0000 5763 5764 upstream commit 5765 5766 prefer rsa-sha2-512 over -256 for hostkeys, too; noticed 5767 by naddy@ 5768 5769 Upstream-ID: 685f55f7ec566a8caca587750672723a0faf3ffe 5770 5771 commit 8b56e59714d87181505e4678f0d6d39955caf10e 5772 Author: tobias (a] openbsd.org <tobias (a] openbsd.org> 5773 Date: Fri Dec 4 21:51:06 2015 +0000 5774 5775 upstream commit 5776 5777 Properly handle invalid %-format by calling fatal. 5778 5779 ok deraadt, djm 5780 5781 Upstream-ID: 5692bce7d9f6eaa9c488cb93d3b55e758bef1eac 5782 5783 commit 76c9fbbe35aabc1db977fb78e827644345e9442e 5784 Author: markus (a] openbsd.org <markus (a] openbsd.org> 5785 Date: Fri Dec 4 16:41:28 2015 +0000 5786 5787 upstream commit 5788 5789 implement SHA2-{256,512} for RSASSA-PKCS1-v1_5 signatures 5790 (user and host auth) based on draft-rsa-dsa-sha2-256-03.txt and 5791 draft-ssh-ext-info-04.txt; with & ok djm@ 5792 5793 Upstream-ID: cf82ce532b2733e5c4b34bb7b7c94835632db309 5794 5795 commit 6064a8b8295cb5a17b5ebcfade53053377714f40 5796 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5797 Date: Fri Dec 4 00:24:55 2015 +0000 5798 5799 upstream commit 5800 5801 clean up agent_fd handling; properly initialise it to -1 5802 and make tests consistent 5803 5804 ok markus@ 5805 5806 Upstream-ID: ac9554323d5065745caf17b5e37cb0f0d4825707 5807 5808 commit b91926a97620f3e51761c271ba57aa5db790f48d 5809 Author: semarie (a] openbsd.org <semarie (a] openbsd.org> 5810 Date: Thu Dec 3 17:00:18 2015 +0000 5811 5812 upstream commit 5813 5814 pledges ssh client: - mux client: which is used when 5815 ControlMaster is in use. will end with "stdio proc tty" (proc is to 5816 permit sending SIGWINCH to mux master on window resize) 5817 5818 - client loop: several levels of pledging depending of your used options 5819 5820 ok deraadt@ 5821 5822 Upstream-ID: 21676155a700e51f2ce911e33538e92a2cd1d94b 5823 5824 commit bcce47466bbc974636f588b5e4a9a18ae386f64a 5825 Author: doug (a] openbsd.org <doug (a] openbsd.org> 5826 Date: Wed Dec 2 08:30:50 2015 +0000 5827 5828 upstream commit 5829 5830 Add "cpath" to the ssh-agent pledge so the cleanup 5831 handler can unlink(). 5832 5833 ok djm@ 5834 5835 Upstream-ID: 9e632991d48241d56db645602d381253a3d8c29d 5836 5837 commit a90d001543f46716b6590c6dcc681d5f5322f8cf 5838 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5839 Date: Wed Dec 2 08:00:58 2015 +0000 5840 5841 upstream commit 5842 5843 ssh-agent pledge needs proc for askpass; spotted by todd@ 5844 5845 Upstream-ID: 349aa261b29cc0e7de47ef56167769c432630b2a 5846 5847 commit d952162b3c158a8f23220587bb6c8fcda75da551 5848 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5849 Date: Tue Dec 1 23:29:24 2015 +0000 5850 5851 upstream commit 5852 5853 basic pledge() for ssh-agent, more refinement needed 5854 5855 Upstream-ID: 5b5b03c88162fce549e45e1b6dd833f20bbb5e13 5856 5857 commit f0191d7c8e76e30551084b79341886d9bb38e453 5858 Author: Damien Miller <djm (a] mindrot.org> 5859 Date: Mon Nov 30 10:53:25 2015 +1100 5860 5861 Revert "stub for pledge(2) for systems that lack it" 5862 5863 This reverts commit 14c887c8393adde2d9fd437d498be30f8c98535c. 5864 5865 dtucker beat me to it :/ 5866 5867 commit 6283cc72eb0e49a3470d30e07ca99a1ba9e89676 5868 Author: Damien Miller <djm (a] mindrot.org> 5869 Date: Mon Nov 30 10:37:03 2015 +1100 5870 5871 revert 7d4c7513: bring back S/Key prototypes 5872 5873 (but leave RCSID changes) 5874 5875 commit 14c887c8393adde2d9fd437d498be30f8c98535c 5876 Author: Damien Miller <djm (a] mindrot.org> 5877 Date: Mon Nov 30 09:45:29 2015 +1100 5878 5879 stub for pledge(2) for systems that lack it 5880 5881 commit 452c0b6af5d14c37553e30059bf74456012493f3 5882 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5883 Date: Sun Nov 29 22:18:37 2015 +0000 5884 5885 upstream commit 5886 5887 pledge, better fatal() messages; feedback deraadt@ 5888 5889 Upstream-ID: 3e00f6ccfe2b9a7a2d1dbba5409586180801488f 5890 5891 commit 6da413c085dba37127687b2617a415602505729b 5892 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 5893 Date: Sat Nov 28 06:50:52 2015 +0000 5894 5895 upstream commit 5896 5897 do not leak temp file if there is no known_hosts file 5898 from craig leres, ok djm 5899 5900 Upstream-ID: c820497fd5574844c782e79405c55860f170e426 5901 5902 commit 3ddd15e1b63a4d4f06c8ab16fbdd8a5a61764f16 5903 Author: Darren Tucker <dtucker (a] zip.com.au> 5904 Date: Mon Nov 30 07:23:53 2015 +1100 5905 5906 Add a null implementation of pledge. 5907 5908 Fixes builds on almost everything. 5909 5910 commit b1d6b3971ef256a08692efc409fc9ada719111cc 5911 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5912 Date: Sat Nov 28 06:41:03 2015 +0000 5913 5914 upstream commit 5915 5916 don't include port number in tcpip-forward replies for 5917 requests that don't allocate a port; bz#2509 diagnosed by Ron Frederick ok 5918 markus 5919 5920 Upstream-ID: 77efad818addb61ec638b5a2362f1554e21a970a 5921 5922 commit 9080bd0b9cf10d0f13b1f642f20cb84285cb8d65 5923 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 5924 Date: Fri Nov 27 00:49:31 2015 +0000 5925 5926 upstream commit 5927 5928 pledge "stdio rpath wpath cpath fattr tty proc exec" 5929 except for the -p option (which sadly has insane semantics...) ok semarie 5930 dtucker 5931 5932 Upstream-ID: 8854bbd58279abe00f6c33f8094bdc02c8c65059 5933 5934 commit 4d90625b229cf6b3551d81550a9861897509a65f 5935 Author: halex (a] openbsd.org <halex (a] openbsd.org> 5936 Date: Fri Nov 20 23:04:01 2015 +0000 5937 5938 upstream commit 5939 5940 allow comment change for all supported formats 5941 5942 ok djm@ 5943 5944 Upstream-ID: 5fc477cf2f119b2d44aa9c683af16cb00bb3744b 5945 5946 commit 8ca915fc761519dd1f7766a550ec597a81db5646 5947 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5948 Date: Fri Nov 20 01:45:29 2015 +0000 5949 5950 upstream commit 5951 5952 add cast to make -Werror clean 5953 5954 Upstream-ID: 288db4f8f810bd475be01320c198250a04ff064d 5955 5956 commit ac9473580dcd401f8281305af98635cdaae9bf96 5957 Author: Damien Miller <djm (a] mindrot.org> 5958 Date: Fri Nov 20 12:35:41 2015 +1100 5959 5960 fix multiple authentication using S/Key w/ privsep 5961 5962 bz#2502, patch from Kevin Korb and feandil_ 5963 5964 commit 88b6fcdeb87a2fb76767854d9eb15006662dca57 5965 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5966 Date: Thu Nov 19 08:23:27 2015 +0000 5967 5968 upstream commit 5969 5970 ban ConnectionAttempts=0, it makes no sense and would cause 5971 ssh_connect_direct() to print an uninitialised stack variable; bz#2500 5972 reported by dvw AT phas.ubc.ca 5973 5974 Upstream-ID: 32b5134c608270583a90b93a07b3feb3cbd5f7d5 5975 5976 commit 964ab3ee7a8f96bdbc963d5b5a91933d6045ebe7 5977 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5978 Date: Thu Nov 19 01:12:32 2015 +0000 5979 5980 upstream commit 5981 5982 trailing whitespace 5983 5984 Upstream-ID: 31fe0ad7c4d08e87f1d69c79372f5e3c5cd79051 5985 5986 commit f96516d052dbe38561f6b92b0e4365d8e24bb686 5987 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5988 Date: Thu Nov 19 01:09:38 2015 +0000 5989 5990 upstream commit 5991 5992 print host certificate contents at debug level 5993 5994 Upstream-ID: 39354cdd8a2b32b308fd03f98645f877f540f00d 5995 5996 commit 499cf36fecd6040e30e2912dd25655bc574739a7 5997 Author: djm (a] openbsd.org <djm (a] openbsd.org> 5998 Date: Thu Nov 19 01:08:55 2015 +0000 5999 6000 upstream commit 6001 6002 move the certificate validity formatting code to 6003 sshkey.[ch] 6004 6005 Upstream-ID: f05f7c78fab20d02ff1d5ceeda533ef52e8fe523 6006 6007 commit bcb7bc77bbb1535d1008c7714085556f3065d99d 6008 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6009 Date: Wed Nov 18 08:37:28 2015 +0000 6010 6011 upstream commit 6012 6013 fix "ssh-keygen -l" of private key, broken in support for 6014 multiple plain keys on stdin 6015 6016 Upstream-ID: 6b3132d2c62d03d0bad6f2bcd7e2d8b7dab5cd9d 6017 6018 commit 259adb6179e23195c8f6913635ea71040d1ccd63 6019 Author: millert (a] openbsd.org <millert (a] openbsd.org> 6020 Date: Mon Nov 16 23:47:52 2015 +0000 6021 6022 upstream commit 6023 6024 Replace remaining calls to index(3) with strchr(3). OK 6025 jca@ krw@ 6026 6027 Upstream-ID: 33837d767a0cf1db1489b96055f9e330bc0bab6d 6028 6029 commit c56a255162c2166884539c0a1f7511575325b477 6030 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6031 Date: Mon Nov 16 22:53:07 2015 +0000 6032 6033 upstream commit 6034 6035 Allow fingerprinting from standard input "ssh-keygen -lf 6036 -" 6037 6038 Support fingerprinting multiple plain keys in a file and authorized_keys 6039 files too (bz#1319) 6040 6041 ok markus@ 6042 6043 Upstream-ID: 903f8b4502929d6ccf53509e4e07eae084574b77 6044 6045 commit 5b4010d9b923cf1b46c9c7b1887c013c2967e204 6046 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6047 Date: Mon Nov 16 22:51:05 2015 +0000 6048 6049 upstream commit 6050 6051 always call privsep_preauth_child() regardless of whether 6052 sshd was started by root; it does important priming before sandboxing and 6053 failing to call it could result in sandbox violations later; ok markus@ 6054 6055 Upstream-ID: c8a6d0d56c42f3faab38460dc917ca0d1705d383 6056 6057 commit 3a9f84b58b0534bbb485f1eeab75665e2d03371f 6058 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6059 Date: Mon Nov 16 22:50:01 2015 +0000 6060 6061 upstream commit 6062 6063 improve sshkey_read() semantics; only update *cpp when a 6064 key is successfully read; ok markus@ 6065 6066 Upstream-ID: f371e78e8f4fab366cf69a42bdecedaed5d1b089 6067 6068 commit db6f8dc5dd5655b59368efd074994d4568bc3556 6069 Author: logan (a] openbsd.org <logan (a] openbsd.org> 6070 Date: Mon Nov 16 06:13:04 2015 +0000 6071 6072 upstream commit 6073 6074 1) Use xcalloc() instead of xmalloc() to check for 6075 potential overflow. (Feedback from both mmcc@ and djm@) 2) move set_size 6076 just before the for loop. (suggested by djm@) 6077 6078 OK djm@ 6079 6080 Upstream-ID: 013534c308187284756c3141f11d2c0f33c47213 6081 6082 commit 383f10fb84a0fee3c01f9d97594f3e22aa3cd5e0 6083 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6084 Date: Mon Nov 16 00:30:02 2015 +0000 6085 6086 upstream commit 6087 6088 Add a new authorized_keys option "restrict" that 6089 includes all current and future key restrictions (no-*-forwarding, etc). Also 6090 add permissive versions of the existing restrictions, e.g. "no-pty" -> "pty". 6091 This simplifies the task of setting up restricted keys and ensures they are 6092 maximally-restricted, regardless of any permissions we might implement in the 6093 future. 6094 6095 Example: 6096 6097 restrict,pty,command="nethack" ssh-ed25519 AAAAC3NzaC1lZDI1... 6098 6099 Idea from Jann Horn; ok markus@ 6100 6101 Upstream-ID: 04ceb9d448e46e67e13887a7ae5ea45b4f1719d0 6102 6103 commit e41a071f7bda6af1fb3f081bed0151235fa61f15 6104 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 6105 Date: Sun Nov 15 23:58:04 2015 +0000 6106 6107 upstream commit 6108 6109 correct section number for ssh-agent; 6110 6111 Upstream-ID: 44be72fd8bcc167635c49b357b1beea8d5674bd6 6112 6113 commit 1a11670286acddcc19f5eff0966c380831fc4638 6114 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 6115 Date: Sun Nov 15 23:54:15 2015 +0000 6116 6117 upstream commit 6118 6119 do not confuse mandoc by presenting "Dd"; 6120 6121 Upstream-ID: 1470fce171c47b60bbc7ecd0fc717a442c2cfe65 6122 6123 commit f361df474c49a097bfcf16d1b7b5c36fcd844b4b 6124 Author: jcs (a] openbsd.org <jcs (a] openbsd.org> 6125 Date: Sun Nov 15 22:26:49 2015 +0000 6126 6127 upstream commit 6128 6129 Add an AddKeysToAgent client option which can be set to 6130 'yes', 'no', 'ask', or 'confirm', and defaults to 'no'. When enabled, a 6131 private key that is used during authentication will be added to ssh-agent if 6132 it is running (with confirmation enabled if set to 'confirm'). 6133 6134 Initial version from Joachim Schipper many years ago. 6135 6136 ok markus@ 6137 6138 Upstream-ID: a680db2248e8064ec55f8be72d539458c987d5f4 6139 6140 commit d87063d9baf5479b6e813d47dfb694a97df6f6f5 6141 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6142 Date: Fri Nov 13 04:39:35 2015 +0000 6143 6144 upstream commit 6145 6146 send SSH2_MSG_UNIMPLEMENTED replies to unexpected 6147 messages during KEX; bz#2949, ok dtucker@ 6148 6149 Upstream-ID: 2b3abdff344d53c8d505f45c83a7b12e84935786 6150 6151 commit 9fd04681a1e9b0af21e08ff82eb674cf0a499bfc 6152 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6153 Date: Fri Nov 13 04:38:06 2015 +0000 6154 6155 upstream commit 6156 6157 Support "none" as an argument for sshd_config 6158 ForceCommand and ChrootDirectory. Useful inside Match blocks to override a 6159 global default. bz#2486 ok dtucker@ 6160 6161 Upstream-ID: 7ef478d6592bc7db5c7376fc33b4443e63dccfa5 6162 6163 commit 94bc0b72c29e511cbbc5772190d43282e5acfdfe 6164 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6165 Date: Fri Nov 13 04:34:15 2015 +0000 6166 6167 upstream commit 6168 6169 support multiple certificates (one per line) and 6170 reading from standard input (using "-f -") for "ssh-keygen -L"; ok dtucker@ 6171 6172 Upstream-ID: ecbadeeef3926e5be6281689b7250a32a80e88db 6173 6174 commit b6b9108f5b561c83612cb97ece4134eb59fde071 6175 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6176 Date: Fri Nov 13 02:57:46 2015 +0000 6177 6178 upstream commit 6179 6180 list a couple more options usable in Match blocks; 6181 bz#2489 6182 6183 Upstream-ID: e4d03f39d254db4c0cc54101921bb89fbda19879 6184 6185 commit a7994b3f5a5a5a33b52b0a6065d08e888f0a99fb 6186 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6187 Date: Wed Nov 11 04:56:39 2015 +0000 6188 6189 upstream commit 6190 6191 improve PEEK/POKE macros: better casts, don't multiply 6192 evaluate arguments; ok deraadt@ 6193 6194 Upstream-ID: 9a1889e19647615ededbbabab89064843ba92d3e 6195 6196 commit 7d4c7513a7f209cb303a608ac6e46b3f1dfc11ec 6197 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6198 Date: Wed Nov 11 01:48:01 2015 +0000 6199 6200 upstream commit 6201 6202 remove prototypes for long-gone s/key support; ok 6203 dtucker@ 6204 6205 Upstream-ID: db5bed3c57118af986490ab23d399df807359a79 6206 6207 commit 07889c75926c040b8e095949c724e66af26441cb 6208 Author: Damien Miller <djm (a] mindrot.org> 6209 Date: Sat Nov 14 18:44:49 2015 +1100 6210 6211 read back from libcrypto RAND when privdropping 6212 6213 makes certain libcrypto implementations cache a /dev/urandom fd 6214 in preparation of sandboxing. Based on patch by Greg Hartman. 6215 6216 commit 1560596f44c01bb0cef977816410950ed17b8ecd 6217 Author: Darren Tucker <dtucker (a] zip.com.au> 6218 Date: Tue Nov 10 11:14:47 2015 +1100 6219 6220 Fix compiler warnings in the openssl header check. 6221 6222 Noted by Austin English. 6223 6224 commit e72a8575ffe1d8adff42c9abe9ca36938acc036b 6225 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 6226 Date: Sun Nov 8 23:24:03 2015 +0000 6227 6228 upstream commit 6229 6230 -c before -H, in SYNOPSIS and usage(); 6231 6232 Upstream-ID: 25e8c58a69e1f37fcd54ac2cd1699370acb5e404 6233 6234 commit 3a424cdd21db08c7b0ded902f97b8f02af5aa485 6235 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6236 Date: Sun Nov 8 22:30:20 2015 +0000 6237 6238 upstream commit 6239 6240 Add "ssh-keyscan -c ..." flag to allow fetching 6241 certificates instead of plain keys; ok markus@ 6242 6243 Upstream-ID: 0947e2177dba92339eced9e49d3c5bf7dda69f82 6244 6245 commit 69fead5d7cdaa73bdece9fcba80f8e8e70b90346 6246 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 6247 Date: Sun Nov 8 22:08:38 2015 +0000 6248 6249 upstream commit 6250 6251 remove slogin links; ok deraadt markus djm 6252 6253 Upstream-ID: 39ba08548acde4c54f2d4520c202c2a863a3c730 6254 6255 commit 2fecfd486bdba9f51b3a789277bb0733ca36e1c0 6256 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6257 Date: Sun Nov 8 21:59:11 2015 +0000 6258 6259 upstream commit 6260 6261 fix OOB read in packet code caused by missing return 6262 statement found by Ben Hawkes; ok markus@ deraadt@ 6263 6264 Upstream-ID: a3e3a85434ebfa0690d4879091959591f30efc62 6265 6266 commit 5e288923a303ca672b686908320bc5368ebec6e6 6267 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 6268 Date: Fri Nov 6 00:31:41 2015 +0000 6269 6270 upstream commit 6271 6272 1. rlogin and rsh are long gone 2. protocol version isn't 6273 of core relevance here, and v1 is going away 6274 6275 ok markus@, deraadt@ 6276 6277 Upstream-ID: 8b46bc94cf1ca7c8c1a75b1c958b2bb38d7579c8 6278 6279 commit 8b29008bbe97f33381d9b4b93fcfa304168d0286 6280 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 6281 Date: Thu Nov 5 09:48:05 2015 +0000 6282 6283 upstream commit 6284 6285 "commandline" -> "command line", since there are so few 6286 examples of the former in the pages, so many of the latter, and in some of 6287 these pages we had multiple spellings; 6288 6289 prompted by tj 6290 6291 Upstream-ID: 78459d59bff74223f8139d9001ccd56fc4310659 6292 6293 commit 996b24cebf20077fbe5db07b3a2c20c2d9db736e 6294 Author: Darren Tucker <dtucker (a] zip.com.au> 6295 Date: Thu Oct 29 20:57:34 2015 +1100 6296 6297 (re)wrap SYS_sendsyslog in ifdef. 6298 6299 Replace ifdef that went missing in commit 6300 c61b42f2678f21f05653ac2d3d241b48ab5d59ac. Fixes build on older 6301 OpenBSDs. 6302 6303 commit b67e2e76fcf1ae7c802eb27ca927e16c91a513ff 6304 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6305 Date: Thu Oct 29 08:05:17 2015 +0000 6306 6307 upstream commit 6308 6309 regress test for "PubkeyAcceptedKeyTypes +..." inside a 6310 Match block 6311 6312 Upstream-Regress-ID: 246c37ed64a2e5704d4c158ccdca1ff700e10647 6313 6314 commit abd9dbc3c0d8c8c7561347cfa22166156e78c077 6315 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 6316 Date: Mon Oct 26 02:50:58 2015 +0000 6317 6318 upstream commit 6319 6320 Fix typo certopt->certopts in shell variable. This would 6321 cause the test to hang at a host key prompt if you have an A or CNAME for 6322 "proxy" in your local domain. 6323 6324 Upstream-Regress-ID: 6ea03bcd39443a83c89e2c5606392ceb9585836a 6325 6326 commit ed08510d38aef930a061ae30d10f2a9cf233bafa 6327 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6328 Date: Thu Oct 29 08:05:01 2015 +0000 6329 6330 upstream commit 6331 6332 Fix "PubkeyAcceptedKeyTypes +..." inside a Match block; 6333 ok dtucker@ 6334 6335 Upstream-ID: 853662c4036730b966aab77684390c47b9738c69 6336 6337 commit a4aef3ed29071719b2af82fdf1ac3c2514f82bc5 6338 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6339 Date: Tue Oct 27 08:54:52 2015 +0000 6340 6341 upstream commit 6342 6343 fix execv arguments in a way less likely to cause grief 6344 for -portable; ok dtucker@ 6345 6346 Upstream-ID: 5902bf0ea0371f39f1300698dc3b8e4105fc0fc5 6347 6348 commit 63d188175accea83305e89fafa011136ff3d96ad 6349 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6350 Date: Tue Oct 27 01:44:45 2015 +0000 6351 6352 upstream commit 6353 6354 log certificate serial in verbose() messages to match the 6355 main auth success/fail message; ok dtucker@ 6356 6357 Upstream-ID: dfc48b417c320b97c36ff351d303c142f2186288 6358 6359 commit 2aaba0cfd560ecfe92aa50c00750e6143842cf1f 6360 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6361 Date: Tue Oct 27 00:49:53 2015 +0000 6362 6363 upstream commit 6364 6365 avoid de-const warning & shrink; ok dtucker@ 6366 6367 Upstream-ID: 69a85ef94832378952a22c172009cbf52aaa11db 6368 6369 commit 03239c18312b9bab7d1c3b03062c61e8bbc1ca6e 6370 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 6371 Date: Sun Oct 25 23:42:00 2015 +0000 6372 6373 upstream commit 6374 6375 Expand tildes in filenames passed to -i before checking 6376 whether or not the identity file exists. This means that if the shell 6377 doesn't do the expansion (eg because the option and filename were given as a 6378 single argument) then we'll still add the key. bz#2481, ok markus@ 6379 6380 Upstream-ID: db1757178a14ac519e9a3e1a2dbd21113cb3bfc6 6381 6382 commit 97e184e508dd33c37860c732c0eca3fc57698b40 6383 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 6384 Date: Sun Oct 25 23:14:03 2015 +0000 6385 6386 upstream commit 6387 6388 Do not prepend "exec" to the shell command run by "Match 6389 exec" in a config file. It's an unnecessary optimization from repurposed 6390 ProxyCommand code and prevents some things working with some shells. 6391 bz#2471, pointed out by res at qoxp.net. ok markus@ 6392 6393 Upstream-ID: a1ead25ae336bfa15fb58d8c6b5589f85b4c33a3 6394 6395 commit 8db134e7f457bcb069ec72bc4ee722e2af557c69 6396 Author: Darren Tucker <dtucker (a] zip.com.au> 6397 Date: Thu Oct 29 10:48:23 2015 +1100 6398 6399 Prevent name collisions with system glob (bz#2463) 6400 6401 Move glob.h from includes.h to the only caller (sftp) and override the 6402 names for the symbols. This prevents name collisions with the system glob 6403 in the case where something other than ssh uses it (eg kerberos). With 6404 jjelen at redhat.com, ok djm@ 6405 6406 commit 86c10dbbef6a5800d2431a66cf7f41a954bb62b5 6407 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 6408 Date: Fri Oct 23 02:22:01 2015 +0000 6409 6410 upstream commit 6411 6412 Update expected group sizes to match recent code changes. 6413 6414 Upstream-Regress-ID: 0004f0ea93428969fe75bcfff0d521c553977794 6415 6416 commit 9ada37d36003a77902e90a3214981e417457cf13 6417 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6418 Date: Sat Oct 24 22:56:19 2015 +0000 6419 6420 upstream commit 6421 6422 fix keyscan output for multiple hosts/addrs on one line 6423 when host hashing or a non standard port is in use; bz#2479 ok dtucker@ 6424 6425 Upstream-ID: 5321dabfaeceba343da3c8a8b5754c6f4a0a307b 6426 6427 commit 44fc7cd7dcef6c52c6b7e9ff830dfa32879bd319 6428 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6429 Date: Sat Oct 24 22:52:22 2015 +0000 6430 6431 upstream commit 6432 6433 skip "Could not chdir to home directory" message when 6434 chrooted 6435 6436 patch from Christian Hesse in bz#2485 ok dtucker@ 6437 6438 Upstream-ID: 86783c1953da426dff5b03b03ce46e699d9e5431 6439 6440 commit a820a8618ec44735dabc688fab96fba38ad66bb2 6441 Author: sthen (a] openbsd.org <sthen (a] openbsd.org> 6442 Date: Sat Oct 24 08:34:09 2015 +0000 6443 6444 upstream commit 6445 6446 Handle the split of tun(4) "link0" into tap(4) in ssh 6447 tun-forwarding. Adapted from portable (using separate devices for this is the 6448 normal case in most OS). ok djm@ 6449 6450 Upstream-ID: 90facf4c59ce73d6741db1bc926e578ef465cd39 6451 6452 commit 66d2e229baa9fe57b868c373b05f7ff3bb20055b 6453 Author: gsoares (a] openbsd.org <gsoares (a] openbsd.org> 6454 Date: Wed Oct 21 11:33:03 2015 +0000 6455 6456 upstream commit 6457 6458 fix memory leak in error path ok djm@ 6459 6460 Upstream-ID: dd2f402b0a0029b755df029fc7f0679e1365ce35 6461 6462 commit 7d6c0362039ceacdc1366b5df29ad5d2693c13e5 6463 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 6464 Date: Tue Oct 20 23:24:25 2015 +0000 6465 6466 upstream commit 6467 6468 Compare pointers to NULL rather than 0. 6469 6470 ok djm@ 6471 6472 Upstream-ID: 21616cfea27eda65a06e772cc887530b9a1a27f8 6473 6474 commit f98a09cacff7baad8748c9aa217afd155a4d493f 6475 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 6476 Date: Tue Oct 20 03:36:35 2015 +0000 6477 6478 upstream commit 6479 6480 Replace a function-local allocation with stack memory. 6481 6482 ok djm@ 6483 6484 Upstream-ID: c09fbbab637053a2ab9f33ca142b4e20a4c5a17e 6485 6486 commit ac908c1eeacccfa85659594d92428659320fd57e 6487 Author: Damien Miller <djm (a] mindrot.org> 6488 Date: Thu Oct 22 09:35:24 2015 +1100 6489 6490 turn off PrintLastLog when --disable-lastlog 6491 6492 bz#2278 from Brent Paulson 6493 6494 commit b56deb847f4a0115a8bf488bf6ee8524658162fd 6495 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6496 Date: Fri Oct 16 22:32:22 2015 +0000 6497 6498 upstream commit 6499 6500 increase the minimum modulus that we will send or accept in 6501 diffie-hellman-group-exchange to 2048 bits; ok markus@ 6502 6503 Upstream-ID: 06dce7a24c17b999a0f5fadfe95de1ed6a1a9b6a 6504 6505 commit 5ee0063f024bf5b3f3ffb275b8cd20055d62b4b9 6506 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6507 Date: Fri Oct 16 18:40:49 2015 +0000 6508 6509 upstream commit 6510 6511 better handle anchored FQDNs (e.g. 'cvs.openbsd.org.') in 6512 hostname canonicalisation - treat them as already canonical and remove the 6513 trailing '.' before matching ssh_config; ok markus@ 6514 6515 Upstream-ID: f7619652e074ac3febe8363f19622aa4853b679a 6516 6517 commit e92c499a75477ecfe94dd7b4aed89f20b1fac5a7 6518 Author: mmcc (a] openbsd.org <mmcc (a] openbsd.org> 6519 Date: Fri Oct 16 17:07:24 2015 +0000 6520 6521 upstream commit 6522 6523 0 -> NULL when comparing with a char*. 6524 6525 ok dtucker@, djm@. 6526 6527 Upstream-ID: a928e9c21c0a9020727d99738ff64027c1272300 6528 6529 commit b1d38a3cc6fe349feb8d16a5f520ef12d1de7cb2 6530 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6531 Date: Thu Oct 15 23:51:40 2015 +0000 6532 6533 upstream commit 6534 6535 fix some signed/unsigned integer type mismatches in 6536 format strings; reported by Nicholas Lemonias 6537 6538 Upstream-ID: 78cd55420a0eef68c4095bdfddd1af84afe5f95c 6539 6540 commit 1a2663a15d356bb188196b6414b4c50dc12fd42b 6541 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6542 Date: Thu Oct 15 23:08:23 2015 +0000 6543 6544 upstream commit 6545 6546 argument to sshkey_from_private() and sshkey_demote() 6547 can't be NULL 6548 6549 Upstream-ID: 0111245b1641d387977a9b38da15916820a5fd1f 6550 6551 commit 0f754e29dd3760fc0b172c1220f18b753fb0957e 6552 Author: Damien Miller <djm (a] mindrot.org> 6553 Date: Fri Oct 16 10:53:14 2015 +1100 6554 6555 need va_copy before va_start 6556 6557 reported by Nicholas Lemonias 6558 6559 commit eb6c50d82aa1f0d3fc95f5630ea69761e918bfcd 6560 Author: Damien Miller <djm (a] mindrot.org> 6561 Date: Thu Oct 15 15:48:28 2015 -0700 6562 6563 fix compilation on systems without SYMLOOP_MAX 6564 6565 commit fafe1d84a210fb3dae7744f268059cc583db8c12 6566 Author: Damien Miller <djm (a] mindrot.org> 6567 Date: Wed Oct 14 09:22:15 2015 -0700 6568 6569 s/SANDBOX_TAME/SANDBOX_PLEDGE/g 6570 6571 commit 8f22911027ff6c17d7226d232ccd20727f389310 6572 Author: Damien Miller <djm (a] mindrot.org> 6573 Date: Wed Oct 14 08:28:19 2015 +1100 6574 6575 upstream commit 6576 6577 revision 1.20 6578 date: 2015/10/13 20:55:37; author: millert; state: Exp; lines: +2 -2; commitid: X39sl5ay1czgFIgp; 6579 In rev 1.15 the sizeof argument was fixed in a strlcat() call but 6580 the truncation check immediately following it was not updated to 6581 match. Not an issue in practice since the buffers are the same 6582 size. OK deraadt@ 6583 6584 commit 23fa695bb735f54f04d46123662609edb6c76767 6585 Author: Damien Miller <djm (a] mindrot.org> 6586 Date: Wed Oct 14 08:27:51 2015 +1100 6587 6588 upstream commit 6589 6590 revision 1.19 6591 date: 2015/01/16 16:48:51; author: deraadt; state: Exp; lines: +3 -3; commitid: 0DYulI8hhujBHMcR; 6592 Move to the <limits.h> universe. 6593 review by millert, binary checking process with doug, concept with guenther 6594 6595 commit c71be375a69af00c2d0a0c24d8752bec12d8fd1b 6596 Author: Damien Miller <djm (a] mindrot.org> 6597 Date: Wed Oct 14 08:27:08 2015 +1100 6598 6599 upstream commit 6600 6601 revision 1.18 6602 date: 2014/10/19 03:56:28; author: doug; state: Exp; lines: +9 -9; commitid: U6QxmtbXrGoc02S5; 6603 Revert last commit due to changed semantics found by make release. 6604 6605 commit c39ad23b06e9aecc3ff788e92f787a08472905b1 6606 Author: Damien Miller <djm (a] mindrot.org> 6607 Date: Wed Oct 14 08:26:24 2015 +1100 6608 6609 upstream commit 6610 6611 revision 1.17 6612 date: 2014/10/18 20:43:52; author: doug; state: Exp; lines: +10 -10; commitid: I74hI1tVZtsspKEt; 6613 Better POSIX compliance in realpath(3). 6614 6615 millert@ made changes to realpath.c based on FreeBSD's version. I merged 6616 Todd's changes into dl_realpath.c. 6617 6618 ok millert@, guenther@ 6619 6620 commit e929a43f957dbd1254aca2aaf85c8c00cbfc25f4 6621 Author: Damien Miller <djm (a] mindrot.org> 6622 Date: Wed Oct 14 08:25:55 2015 +1100 6623 6624 upstream commit 6625 6626 revision 1.16 6627 date: 2013/04/05 12:59:54; author: kurt; state: Exp; lines: +3 -1; 6628 - Add comments regarding copies of these files also in libexec/ld.so 6629 okay guenther@ 6630 6631 commit 5225db68e58a1048cb17f0e36e0d33bc4a8fc410 6632 Author: Damien Miller <djm (a] mindrot.org> 6633 Date: Wed Oct 14 08:25:32 2015 +1100 6634 6635 upstream commit 6636 6637 revision 1.15 6638 date: 2012/09/13 15:39:05; author: deraadt; state: Exp; lines: +2 -2; 6639 specify the bounds of the dst to strlcat (both values were static and 6640 equal, but it is more correct) 6641 from Michal Mazurek 6642 6643 commit 7365fe5b4859de2305e40ea132da3823830fa710 6644 Author: Damien Miller <djm (a] mindrot.org> 6645 Date: Wed Oct 14 08:25:09 2015 +1100 6646 6647 upstream commit 6648 6649 revision 1.14 6650 date: 2011/07/24 21:03:00; author: miod; state: Exp; lines: +35 -13; 6651 Recent Single Unix will malloc memory if the second argument of realpath() 6652 is NULL, and third-party software is starting to rely upon this. 6653 Adapted from FreeBSD via Jona Joachim (jaj ; hcl-club , .lu), with minor 6654 tweaks from nicm@ and yours truly. 6655 6656 commit e679c09cd1951f963793aa3d9748d1c3fdcf808f 6657 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6658 Date: Tue Oct 13 16:15:21 2015 +0000 6659 6660 upstream commit 6661 6662 apply PubkeyAcceptedKeyTypes filtering earlier, so all 6663 skipped keys are noted before pubkey authentication starts. ok dtucker@ 6664 6665 Upstream-ID: ba4f52f54268a421a2a5f98bb375403f4cb044b8 6666 6667 commit 179c353f564ec7ada64b87730b25fb41107babd7 6668 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6669 Date: Tue Oct 13 00:21:27 2015 +0000 6670 6671 upstream commit 6672 6673 free the correct IV length, don't assume it's always the 6674 cipher blocksize; ok dtucker@ 6675 6676 Upstream-ID: c260d9e5ec73628d9ff4b067fbb060eff5a7d298 6677 6678 commit 2539dce2a049a8f6bb0d44cac51f07ad48e691d3 6679 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 6680 Date: Fri Oct 9 01:37:08 2015 +0000 6681 6682 upstream commit 6683 6684 Change all tame callers to namechange to pledge(2). 6685 6686 Upstream-ID: 17e654fc27ceaf523c60f4ffd9ec7ae4e7efc7f2 6687 6688 commit 9846a2f4067383bb76b4e31a9d2303e0a9c13a73 6689 Author: Damien Miller <djm (a] mindrot.org> 6690 Date: Thu Oct 8 04:30:48 2015 +1100 6691 6692 hook tame(2) sandbox up to build 6693 6694 OpenBSD only for now 6695 6696 commit 0c46bbe68b70bdf0d6d20588e5847e71f3739fe6 6697 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6698 Date: Wed Oct 7 15:59:12 2015 +0000 6699 6700 upstream commit 6701 6702 include PubkeyAcceptedKeyTypes in ssh -G config dump 6703 6704 Upstream-ID: 6c097ce6ffebf6fe393fb7988b5d152a5d6b36bb 6705 6706 commit bdcb73fb7641b1cf73c0065d1a0dd57b1e8b778e 6707 Author: sobrado (a] openbsd.org <sobrado (a] openbsd.org> 6708 Date: Wed Oct 7 14:45:30 2015 +0000 6709 6710 upstream commit 6711 6712 UsePrivilegeSeparation defaults to sandbox now. 6713 6714 ok djm@ 6715 6716 Upstream-ID: bff136c38bcae89df82e044d2f42de21e1ad914f 6717 6718 commit 2905d6f99c837bb699b6ebc61711b19acd030709 6719 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6720 Date: Wed Oct 7 00:54:06 2015 +0000 6721 6722 upstream commit 6723 6724 don't try to change tun device flags if they are already 6725 what we need; makes it possible to use tun/tap networking as non- root user 6726 if device permissions and interface flags are pre-established; based on patch 6727 by Ossi Herrala 6728 6729 Upstream-ID: 89099ac4634cd477b066865acf54cb230780fd21 6730 6731 commit 0dc74512bdb105b048883f07de538b37e5e024d4 6732 Author: Damien Miller <djm (a] mindrot.org> 6733 Date: Mon Oct 5 18:33:05 2015 -0700 6734 6735 unbreak merge botch 6736 6737 commit fdd020e86439afa7f537e2429d29d4b744c94331 6738 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6739 Date: Tue Oct 6 01:20:59 2015 +0000 6740 6741 upstream commit 6742 6743 adapt to recent sshkey_parse_private_fileblob() API 6744 change 6745 6746 Upstream-Regress-ID: 5c0d818da511e33e0abf6a92a31bd7163b7ad988 6747 6748 commit 21ae8ee3b630b0925f973db647a1b9aa5fcdd4c5 6749 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6750 Date: Thu Sep 24 07:15:39 2015 +0000 6751 6752 upstream commit 6753 6754 fix command-line option to match what was actually 6755 committed 6756 6757 Upstream-Regress-ID: 3e8c24a2044e8afd37e7ce17b69002ca817ac699 6758 6759 commit e14ac43b75e68f1ffbd3e1a5e44143c8ae578dcd 6760 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6761 Date: Thu Sep 24 06:16:53 2015 +0000 6762 6763 upstream commit 6764 6765 regress test for CertificateFile; patch from Meghana Bhat 6766 via bz#2436 6767 6768 Upstream-Regress-ID: e7a6e980cbe0f8081ba2e83de40d06c17be8bd25 6769 6770 commit 905b054ed24e0d5b4ef226ebf2c8bfc02ae6d4ad 6771 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6772 Date: Mon Oct 5 17:11:21 2015 +0000 6773 6774 upstream commit 6775 6776 some more bzero->explicit_bzero, from Michael McConville 6777 6778 Upstream-ID: 17f19545685c33327db2efdc357c1c9225ff00d0 6779 6780 commit b007159a0acdbcf65814b3ee05dbe2cf4ea46011 6781 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 6782 Date: Fri Oct 2 15:52:55 2015 +0000 6783 6784 upstream commit 6785 6786 fix email 6787 6788 Upstream-ID: 72150f2d54b94de14ebef1ea054ef974281bf834 6789 6790 commit b19e1b4ab11884c4f62aee9f8ab53127a4732658 6791 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 6792 Date: Fri Oct 2 01:39:52 2015 +0000 6793 6794 upstream commit 6795 6796 a sandbox using tame ok djm 6797 6798 Upstream-ID: 4ca24e47895e72f5daaa02f3e3d3e5ca2d820fa3 6799 6800 commit c61b42f2678f21f05653ac2d3d241b48ab5d59ac 6801 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 6802 Date: Fri Oct 2 01:39:26 2015 +0000 6803 6804 upstream commit 6805 6806 re-order system calls in order of risk, ok i'll be 6807 honest, ordered this way they look like tame... ok djm 6808 6809 Upstream-ID: 42a1e6d251fd8be13c8262bee026059ae6328813 6810 6811 commit c5f7c0843cb6e6074a93c8ac34e49ce33a6f5546 6812 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 6813 Date: Fri Sep 25 18:19:54 2015 +0000 6814 6815 upstream commit 6816 6817 some certificatefile tweaks; ok djm 6818 6819 Upstream-ID: 0e5a7852c28c05fc193419cc7e50e64c1c535af0 6820 6821 commit 4e44a79a07d4b88b6a4e5e8c1bed5f58c841b1b8 6822 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6823 Date: Thu Sep 24 06:15:11 2015 +0000 6824 6825 upstream commit 6826 6827 add ssh_config CertificateFile option to explicitly list 6828 a certificate; patch from Meghana Bhat on bz#2436; ok markus@ 6829 6830 Upstream-ID: 58648ec53c510b41c1f46d8fe293aadc87229ab8 6831 6832 commit e3cbb06ade83c72b640a53728d362bbefa0008e2 6833 Author: sobrado (a] openbsd.org <sobrado (a] openbsd.org> 6834 Date: Tue Sep 22 08:33:23 2015 +0000 6835 6836 upstream commit 6837 6838 fix two typos. 6839 6840 Upstream-ID: 424402c0d8863a11b51749bacd7f8d932083b709 6841 6842 commit 8408218c1ca88cb17d15278174a24a94a6f65fe1 6843 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6844 Date: Mon Sep 21 04:31:00 2015 +0000 6845 6846 upstream commit 6847 6848 fix possible hang on closed output; bz#2469 reported by Tomas 6849 Kuthan ok markus@ 6850 6851 Upstream-ID: f7afd41810f8540f524284f1be6b970859f94fe3 6852 6853 commit 0097248f90a00865082e8c146b905a6555cc146f 6854 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6855 Date: Fri Sep 11 04:55:01 2015 +0000 6856 6857 upstream commit 6858 6859 skip if running as root; many systems (inc OpenBSD) allow 6860 root to ptrace arbitrary processes 6861 6862 Upstream-Regress-ID: be2b925df89360dff36f972951fa0fa793769038 6863 6864 commit 9c06c814aff925e11a5cc592c06929c258a014f6 6865 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6866 Date: Fri Sep 11 03:44:21 2015 +0000 6867 6868 upstream commit 6869 6870 try all supported key types here; bz#2455 reported by 6871 Jakub Jelen 6872 6873 Upstream-Regress-ID: 188cb7d9031cdbac3a0fa58b428b8fa2b2482bba 6874 6875 commit 3c019a936b43f3e2773f3edbde7c114d73caaa4c 6876 Author: tim (a] openbsd.org <tim (a] openbsd.org> 6877 Date: Sun Sep 13 14:39:16 2015 +0000 6878 6879 upstream commit 6880 6881 - Fix error message: passphrase needs to be at least 5 6882 characters, not 4. - Remove unused function argument. - Remove two 6883 unnecessary variables. 6884 6885 OK djm@ 6886 6887 Upstream-ID: 13010c05bfa8b523da1c0dc19e81dd180662bc30 6888 6889 commit 2681cdb6e0de7c1af549dac37a9531af202b4434 6890 Author: tim (a] openbsd.org <tim (a] openbsd.org> 6891 Date: Sun Sep 13 13:48:19 2015 +0000 6892 6893 upstream commit 6894 6895 When adding keys to the agent, don't ignore the comment 6896 of keys for which the user is prompted for a passphrase. 6897 6898 Tweak and OK djm@ 6899 6900 Upstream-ID: dc737c620a5a8d282cc4f66e3b9b624e9abefbec 6901 6902 commit 14692f7b8251cdda847e648a82735eef8a4d2a33 6903 Author: guenther (a] openbsd.org <guenther (a] openbsd.org> 6904 Date: Fri Sep 11 08:50:04 2015 +0000 6905 6906 upstream commit 6907 6908 Use explicit_bzero() when zeroing before free() 6909 6910 from Michael McConville (mmcconv1 (at) sccs.swarthmore.edu) 6911 ok millert@ djm@ 6912 6913 Upstream-ID: 2e3337db046c3fe70c7369ee31515ac73ec00f50 6914 6915 commit 846f6fa4cfa8483a9195971dbdd162220f199d85 6916 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 6917 Date: Fri Sep 11 06:55:46 2015 +0000 6918 6919 upstream commit 6920 6921 sync -Q in usage() to SYNOPSIS; since it's drastically 6922 shorter, i've reformatted the block to sync with the man (80 cols) and saved 6923 a line; 6924 6925 Upstream-ID: 86e2c65c3989a0777a6258a77e589b9f6f354abd 6926 6927 commit 95923e0520a8647417ee6dcdff44694703dfeef0 6928 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 6929 Date: Fri Sep 11 06:51:39 2015 +0000 6930 6931 upstream commit 6932 6933 tweak previous; 6934 6935 Upstream-ID: f29b3cfcfd9aa31fa140c393e7bd48c1c74139d6 6936 6937 commit 86ac462f833b05d8ed9de9c50ccb295d7faa79ff 6938 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 6939 Date: Fri Sep 11 05:27:02 2015 +0000 6940 6941 upstream commit 6942 6943 Update usage to match man page. 6944 6945 Upstream-ID: 9e85aefaecfb6aaf34c7cfd0700cd21783a35675 6946 6947 commit 674b3b68c1d36b2562324927cd03857b565e05e8 6948 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6949 Date: Fri Sep 11 03:47:28 2015 +0000 6950 6951 upstream commit 6952 6953 expand %i in ControlPath to UID; bz#2449 6954 6955 patch from Christian Hesse w/ feedback from dtucker@ 6956 6957 Upstream-ID: 2ba8d303e555a84e2f2165ab4b324b41e80ab925 6958 6959 commit c0f55db7ee00c8202b05cb4b9ad4ce72cc45df41 6960 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6961 Date: Fri Sep 11 03:42:32 2015 +0000 6962 6963 upstream commit 6964 6965 mention -Q key-plain and -Q key-cert; bz#2455 pointed out 6966 by Jakub Jelen 6967 6968 Upstream-ID: c8f1f8169332e4fa73ac96b0043e3b84e01d4896 6969 6970 commit cfffbdb10fdf0f02d3f4232232eef7ec3876c383 6971 Author: Darren Tucker <dtucker (a] zip.com.au> 6972 Date: Mon Sep 14 16:24:21 2015 +1000 6973 6974 Use ssh-keygen -A when generating host keys. 6975 6976 Use ssh-keygen -A instead of per-keytype invocations when generating host 6977 keys. Add tests when doing host-key-force since we can't use ssh-keygen -A 6978 since it can't specify alternate locations. bz#2459, ok djm@ 6979 6980 commit 366bada1e9e124654aac55b72b6ccf878755b0dc 6981 Author: Darren Tucker <dtucker (a] zip.com.au> 6982 Date: Fri Sep 11 13:29:22 2015 +1000 6983 6984 Correct default value for --with-ssh1. 6985 6986 bz#2457, from konto-mindrot.org at walimnieto.com. 6987 6988 commit 2bca8a43e7dd9b04d7070824ffebb823c72587b2 6989 Author: djm (a] openbsd.org <djm (a] openbsd.org> 6990 Date: Fri Sep 11 03:13:36 2015 +0000 6991 6992 upstream commit 6993 6994 more clarity on what AuthorizedKeysFile=none does; based 6995 on diff by Thiebaud Weksteen 6996 6997 Upstream-ID: 78ab87f069080f0cc3bc353bb04eddd9e8ad3704 6998 6999 commit 61942ea4a01e6db4fdf37ad61de81312ffe310e9 7000 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7001 Date: Wed Sep 9 00:52:44 2015 +0000 7002 7003 upstream commit 7004 7005 openssh_RSA_verify return type is int, so don't make it 7006 size_t within the function itself with only negative numbers or zero assigned 7007 to it. bz#2460 7008 7009 Upstream-ID: b6e794b0c7fc4f9f329509263c8668d35f83ea55 7010 7011 commit 4f7cc2f8cc861a21e6dbd7f6c25652afb38b9b96 7012 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 7013 Date: Fri Sep 4 08:21:47 2015 +0000 7014 7015 upstream commit 7016 7017 Plug minor memory leaks when options are used more than 7018 once. bz#2182, patch from Tiago Cunha, ok deraadt djm 7019 7020 Upstream-ID: 5b84d0401e27fe1614c10997010cc55933adb48e 7021 7022 commit 7ad8b287c8453a3e61dbc0d34d467632b8b06fc8 7023 Author: Darren Tucker <dtucker (a] zip.com.au> 7024 Date: Fri Sep 11 13:11:02 2015 +1000 7025 7026 Force resolution of _res for correct detection. 7027 7028 bz#2259, from sconeu at yahoo.com. 7029 7030 commit 26ad18247213ff72b4438abe7fc660c958810fa2 7031 Author: Damien Miller <djm (a] mindrot.org> 7032 Date: Thu Sep 10 10:57:41 2015 +1000 7033 7034 allow getrandom syscall; from Felix von Leitner 7035 7036 commit 5245bc1e6b129a10a928f73f11c3aa32656c44b4 7037 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 7038 Date: Fri Sep 4 06:40:45 2015 +0000 7039 7040 upstream commit 7041 7042 full stop belongs outside the brackets, not inside; 7043 7044 Upstream-ID: 99d098287767799ac33d2442a05b5053fa5a551a 7045 7046 commit a85768a9321d74b41219eeb3c9be9f1702cbf6a5 7047 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7048 Date: Fri Sep 4 04:56:09 2015 +0000 7049 7050 upstream commit 7051 7052 add a debug2() right before DNS resolution; it's a place 7053 where ssh could previously silently hang for a while. bz#2433 7054 7055 Upstream-ID: 52a1a3e0748db66518e7598352c427145692a6a0 7056 7057 commit 46152af8d27aa34d5d26ed1c371dc8aa142d4730 7058 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7059 Date: Fri Sep 4 04:55:24 2015 +0000 7060 7061 upstream commit 7062 7063 correct function name in error messages 7064 7065 Upstream-ID: 92fb2798617ad9561370897f4ab60adef2ff4c0e 7066 7067 commit a954cdb799a4d83c2d40fbf3e7b9f187fbfd72fc 7068 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7069 Date: Fri Sep 4 04:47:50 2015 +0000 7070 7071 upstream commit 7072 7073 better document ExitOnForwardFailure; bz#2444, ok 7074 dtucker@ 7075 7076 Upstream-ID: a126209b5a6d9cb3117ac7ab5bc63d284538bfc2 7077 7078 commit f54d8ac2474b6fc3afa081cf759b48a6c89d3319 7079 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7080 Date: Fri Sep 4 04:44:08 2015 +0000 7081 7082 upstream commit 7083 7084 don't record hostbased authentication hostkeys as user 7085 keys in test for multiple authentication with the same key 7086 7087 Upstream-ID: 26b368fa2cff481f47f37e01b8da1ae5b57b1adc 7088 7089 commit ac3451dd65f27ecf85dc045c46d49e2bbcb8dddd 7090 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7091 Date: Fri Sep 4 03:57:38 2015 +0000 7092 7093 upstream commit 7094 7095 remove extra newline in nethack-mode hostkey; from 7096 Christian Hesse bz#2686 7097 7098 Upstream-ID: 4f56368b1cc47baeea0531912186f66007fd5b92 7099 7100 commit 9e3ed9ebb1a7e47c155c28399ddf09b306ea05df 7101 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7102 Date: Fri Sep 4 04:23:10 2015 +0000 7103 7104 upstream commit 7105 7106 trim junk from end of file; bz#2455 from Jakub Jelen 7107 7108 Upstream-Regress-ID: a4e64e8931e40d23874b047074444eff919cdfe6 7109 7110 commit f3a3ea180afff080bab82087ee0b60db9fd84f6c 7111 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 7112 Date: Wed Sep 2 07:51:12 2015 +0000 7113 7114 upstream commit 7115 7116 Fix occurrences of "r = func() != 0" which result in the 7117 wrong error codes being returned due to != having higher precedence than =. 7118 7119 ok deraadt@ markus@ 7120 7121 Upstream-ID: 5fc35c9fc0319cc6fca243632662d2f06b5fd840 7122 7123 commit f498a98cf83feeb7ea01c15cd1c98b3111361f3a 7124 Author: Damien Miller <djm (a] mindrot.org> 7125 Date: Thu Sep 3 09:11:22 2015 +1000 7126 7127 don't check for yp_match; ok tim@ 7128 7129 commit 9690b78b7848b0b376980a61d51b1613e187ddb5 7130 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7131 Date: Fri Aug 21 23:57:48 2015 +0000 7132 7133 upstream commit 7134 7135 Improve printing of KEX offers and decisions 7136 7137 The debug output now labels the client and server offers and the 7138 negotiated options. ok markus@ 7139 7140 Upstream-ID: 8db921b3f92a4565271b1c1fbce6e7f508e1a2cb 7141 7142 commit 60a92470e21340e1a3fc10f9c7140d8e1519dc55 7143 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7144 Date: Fri Aug 21 23:53:08 2015 +0000 7145 7146 upstream commit 7147 7148 Fix printing (ssh -G ...) of HostKeyAlgorithms=+... 7149 Reported by Bryan Drewery 7150 7151 Upstream-ID: 19ad20c41bd5971e006289b6f9af829dd46c1293 7152 7153 commit 6310f60fffca2d1e464168e7d1f7e3b6b0268897 7154 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7155 Date: Fri Aug 21 23:52:30 2015 +0000 7156 7157 upstream commit 7158 7159 Fix expansion of HostkeyAlgorithms=+... 7160 7161 Reported by Bryan Drewery 7162 7163 Upstream-ID: 70ca1deea39d758ba36d36428ae832e28566f78d 7164 7165 commit e774e5ea56237fd626a8161f9005023dff3e76c9 7166 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 7167 Date: Fri Aug 21 23:29:31 2015 +0000 7168 7169 upstream commit 7170 7171 Improve size == 0, count == 0 checking in mm_zalloc, 7172 which is "array" like. Discussed with tedu, millert, otto.... and ok djm 7173 7174 Upstream-ID: 899b021be43b913fad3eca1aef44efe710c53e29 7175 7176 commit 189de02d9ad6f3645417c0ddf359b923aae5f926 7177 Author: Damien Miller <djm (a] mindrot.org> 7178 Date: Fri Aug 21 15:45:02 2015 +1000 7179 7180 expose POLLHUP and POLLNVAL for netcat.c 7181 7182 commit e91346dc2bbf460246df2ab591b7613908c1b0ad 7183 Author: Damien Miller <djm (a] mindrot.org> 7184 Date: Fri Aug 21 14:49:03 2015 +1000 7185 7186 we don't use Github for issues/pull-requests 7187 7188 commit a4f5b507c708cc3dc2c8dd2d02e4416d7514dc23 7189 Author: Damien Miller <djm (a] mindrot.org> 7190 Date: Fri Aug 21 14:43:55 2015 +1000 7191 7192 fix URL for connect.c 7193 7194 commit d026a8d3da0f8186598442997c7d0a28e7275414 7195 Author: Damien Miller <djm (a] mindrot.org> 7196 Date: Fri Aug 21 13:47:10 2015 +1000 7197 7198 update version numbers for 7.1 7199 7200 commit 78f8f589f0ca1c9f41e5a9bae3cda5ce8a6b42ed 7201 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7202 Date: Fri Aug 21 03:45:26 2015 +0000 7203 7204 upstream commit 7205 7206 openssh-7.1 7207 7208 Upstream-ID: ff7b1ef4b06caddfb45e08ba998128c88be3d73f 7209 7210 commit 32a181980c62fce94f7f9ffaf6a79d90f0c309cf 7211 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7212 Date: Fri Aug 21 03:42:19 2015 +0000 7213 7214 upstream commit 7215 7216 fix inverted logic that broke PermitRootLogin; reported 7217 by Mantas Mikulenas; ok markus@ 7218 7219 Upstream-ID: 260dd6a904c1bb7e43267e394b1c9cf70bdd5ea5 7220 7221 commit ce445b0ed927e45bd5bdce8f836eb353998dd65c 7222 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 7223 Date: Thu Aug 20 22:32:42 2015 +0000 7224 7225 upstream commit 7226 7227 Do not cast result of malloc/calloc/realloc* if stdlib.h 7228 is in scope ok krw millert 7229 7230 Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667 7231 7232 commit 05291e5288704d1a98bacda269eb5a0153599146 7233 Author: naddy (a] openbsd.org <naddy (a] openbsd.org> 7234 Date: Thu Aug 20 19:20:06 2015 +0000 7235 7236 upstream commit 7237 7238 In the certificates section, be consistent about using 7239 "host_key" and "user_key" for the respective key types. ok sthen@ deraadt@ 7240 7241 Upstream-ID: 9e037ea3b15577b238604c5533e082a3947f13cb 7242 7243 commit 8543d4ef6f2e9f98c3e6b77c894ceec30c5e4ae4 7244 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7245 Date: Wed Aug 19 23:21:42 2015 +0000 7246 7247 upstream commit 7248 7249 Better compat matching for WinSCP, add compat matching 7250 for FuTTY (fork of PuTTY); ok markus@ deraadt@ 7251 7252 Upstream-ID: 24001d1ac115fa3260fbdc329a4b9aeb283c5389 7253 7254 commit ec6eda16ebab771aa3dfc90629b41953b999cb1e 7255 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7256 Date: Wed Aug 19 23:19:01 2015 +0000 7257 7258 upstream commit 7259 7260 fix double-free() in error path of DSA key generation 7261 reported by Mateusz Kocielski; ok markus@ 7262 7263 Upstream-ID: 4735d8f888b10599a935fa1b374787089116713c 7264 7265 commit 45b0eb752c94954a6de046bfaaf129e518ad4b5b 7266 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7267 Date: Wed Aug 19 23:18:26 2015 +0000 7268 7269 upstream commit 7270 7271 fix free() of uninitialised pointer reported by Mateusz 7272 Kocielski; ok markus@ 7273 7274 Upstream-ID: 519552b050618501a06b7b023de5cb104e2c5663 7275 7276 commit c837643b93509a3ef538cb6624b678c5fe32ff79 7277 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7278 Date: Wed Aug 19 23:17:51 2015 +0000 7279 7280 upstream commit 7281 7282 fixed unlink([uninitialised memory]) reported by Mateusz 7283 Kocielski; ok markus@ 7284 7285 Upstream-ID: 14a0c4e7d891f5a8dabc4b89d4f6b7c0d5a20109 7286 7287 commit 1f8d3d629cd553031021068eb9c646a5f1e50994 7288 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 7289 Date: Fri Aug 14 15:32:41 2015 +0000 7290 7291 upstream commit 7292 7293 match myproposal.h order; from brian conway (i snuck in a 7294 tweak while here) 7295 7296 ok dtucker 7297 7298 Upstream-ID: 35174a19b5237ea36aa3798f042bf5933b772c67 7299 7300 commit 1dc8d93ce69d6565747eb44446ed117187621b26 7301 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 7302 Date: Thu Aug 6 14:53:21 2015 +0000 7303 7304 upstream commit 7305 7306 add prohibit-password as a synonymn for without-password, 7307 since the without-password is causing too many questions. Harden it to ban 7308 all but pubkey, hostbased, and GSSAPI auth (when the latter is enabled) from 7309 djm, ok markus 7310 7311 Upstream-ID: d53317d7b28942153e6236d3fd6e12ceb482db7a 7312 7313 commit 90a95a4745a531b62b81ce3b025e892bdc434de5 7314 Author: Damien Miller <djm (a] mindrot.org> 7315 Date: Tue Aug 11 13:53:41 2015 +1000 7316 7317 update version in README 7318 7319 commit 318c37743534b58124f1bab37a8a0087a3a9bd2f 7320 Author: Damien Miller <djm (a] mindrot.org> 7321 Date: Tue Aug 11 13:53:09 2015 +1000 7322 7323 update versions in *.spec 7324 7325 commit 5e75f5198769056089fb06c4d738ab0e5abc66f7 7326 Author: Damien Miller <djm (a] mindrot.org> 7327 Date: Tue Aug 11 13:34:12 2015 +1000 7328 7329 set sshpam_ctxt to NULL after free 7330 7331 Avoids use-after-free in monitor when privsep child is compromised. 7332 Reported by Moritz Jodeit; ok dtucker@ 7333 7334 commit d4697fe9a28dab7255c60433e4dd23cf7fce8a8b 7335 Author: Damien Miller <djm (a] mindrot.org> 7336 Date: Tue Aug 11 13:33:24 2015 +1000 7337 7338 Don't resend username to PAM; it already has it. 7339 7340 Pointed out by Moritz Jodeit; ok dtucker@ 7341 7342 commit 88763a6c893bf3dfe951ba9271bf09715e8d91ca 7343 Author: Darren Tucker <dtucker (a] zip.com.au> 7344 Date: Mon Jul 27 12:14:25 2015 +1000 7345 7346 Import updated moduli file from OpenBSD. 7347 7348 commit 55b263fb7cfeacb81aaf1c2036e0394c881637da 7349 Author: Damien Miller <djm (a] mindrot.org> 7350 Date: Mon Aug 10 11:13:44 2015 +1000 7351 7352 let principals-command.sh work for noexec /var/run 7353 7354 commit 2651e34cd11b1aac3a0fe23b86d8c2ff35c07897 7355 Author: Damien Miller <djm (a] mindrot.org> 7356 Date: Thu Aug 6 11:43:42 2015 +1000 7357 7358 work around echo -n / sed behaviour in tests 7359 7360 commit d85dad81778c1aa8106acd46930b25fdf0d15b2a 7361 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7362 Date: Wed Aug 5 05:27:33 2015 +0000 7363 7364 upstream commit 7365 7366 adjust for RSA minimum modulus switch; ok deraadt@ 7367 7368 Upstream-Regress-ID: 5a72c83431b96224d583c573ca281cd3a3ebfdae 7369 7370 commit 57e8e229bad5fe6056b5f1199665f5f7008192c6 7371 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7372 Date: Tue Aug 4 05:23:06 2015 +0000 7373 7374 upstream commit 7375 7376 backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this 7377 release; problems spotted by sthen@ ok deraadt@ markus@ 7378 7379 Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822 7380 7381 commit f097d0ea1e0889ca0fa2e53a00214e43ab7fa22a 7382 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7383 Date: Sun Aug 2 09:56:42 2015 +0000 7384 7385 upstream commit 7386 7387 openssh 7.0; ok deraadt@ 7388 7389 Upstream-ID: c63afdef537f57f28ae84145c5a8e29e9250221f 7390 7391 commit 3d5728a0f6874ce4efb16913a12963595070f3a9 7392 Author: chris (a] openbsd.org <chris (a] openbsd.org> 7393 Date: Fri Jul 31 15:38:09 2015 +0000 7394 7395 upstream commit 7396 7397 Allow PermitRootLogin to be overridden by config 7398 7399 ok markus@ deeradt@ 7400 7401 Upstream-ID: 5cf3e26ed702888de84e2dc9d0054ccf4d9125b4 7402 7403 commit 6f941396b6835ad18018845f515b0c4fe20be21a 7404 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7405 Date: Thu Jul 30 23:09:15 2015 +0000 7406 7407 upstream commit 7408 7409 fix pty permissions; patch from Nikolay Edigaryev; ok 7410 deraadt 7411 7412 Upstream-ID: 40ff076d2878b916fbfd8e4f45dbe5bec019e550 7413 7414 commit f4373ed1e8fbc7c8ce3fc4ea97d0ba2e0c1d7ef0 7415 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 7416 Date: Thu Jul 30 19:23:02 2015 +0000 7417 7418 upstream commit 7419 7420 change default: PermitRootLogin without-password matching 7421 install script changes coming as well ok djm markus 7422 7423 Upstream-ID: 0e2a6c4441daf5498b47a61767382bead5eb8ea6 7424 7425 commit 0c30ba91f87fcda7e975e6ff8a057f624e87ea1c 7426 Author: Damien Miller <djm (a] mindrot.org> 7427 Date: Thu Jul 30 12:31:39 2015 +1000 7428 7429 downgrade OOM adjustment logging: verbose -> debug 7430 7431 commit f9eca249d4961f28ae4b09186d7dc91de74b5895 7432 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7433 Date: Thu Jul 30 00:01:34 2015 +0000 7434 7435 upstream commit 7436 7437 Allow ssh_config and sshd_config kex parameters options be 7438 prefixed by a '+' to indicate that the specified items be appended to the 7439 default rather than replacing it. 7440 7441 approach suggested by dtucker@, feedback dlg@, ok markus@ 7442 7443 Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a 7444 7445 commit 5cefe769105a2a2e3ca7479d28d9a325d5ef0163 7446 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7447 Date: Wed Jul 29 08:34:54 2015 +0000 7448 7449 upstream commit 7450 7451 fix bug in previous; was printing incorrect string for 7452 failed host key algorithms negotiation 7453 7454 Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e 7455 7456 commit f319912b0d0e1675b8bb051ed8213792c788bcb2 7457 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7458 Date: Wed Jul 29 04:43:06 2015 +0000 7459 7460 upstream commit 7461 7462 include the peer's offer when logging a failure to 7463 negotiate a mutual set of algorithms (kex, pubkey, ciphers, etc.) ok markus@ 7464 7465 Upstream-ID: bbb8caabf5c01790bb845f5ce135565248d7c796 7466 7467 commit b6ea0e573042eb85d84defb19227c89eb74cf05a 7468 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7469 Date: Tue Jul 28 23:20:42 2015 +0000 7470 7471 upstream commit 7472 7473 add Cisco to the list of clients that choke on the 7474 hostkeys update extension. Pointed out by Howard Kash 7475 7476 Upstream-ID: c9eadde28ecec056c73d09ee10ba4570dfba7e84 7477 7478 commit 3f628c7b537291c1019ce86af90756fb4e66d0fd 7479 Author: guenther (a] openbsd.org <guenther (a] openbsd.org> 7480 Date: Mon Jul 27 16:29:23 2015 +0000 7481 7482 upstream commit 7483 7484 Permit kbind(2) use in the sandbox now, to ease testing 7485 of ld.so work using it 7486 7487 reminded by miod@, ok deraadt@ 7488 7489 Upstream-ID: 523922e4d1ba7a091e3824e77a8a3c818ee97413 7490 7491 commit ebe27ebe520098bbc0fe58945a87ce8490121edb 7492 Author: millert (a] openbsd.org <millert (a] openbsd.org> 7493 Date: Mon Jul 20 18:44:12 2015 +0000 7494 7495 upstream commit 7496 7497 Move .Pp before .Bl, not after to quiet mandoc -Tlint. 7498 Noticed by jmc@ 7499 7500 Upstream-ID: 59fadbf8407cec4e6931e50c53cfa0214a848e23 7501 7502 commit d5d91d0da819611167782c66ab629159169d94d4 7503 Author: millert (a] openbsd.org <millert (a] openbsd.org> 7504 Date: Mon Jul 20 18:42:35 2015 +0000 7505 7506 upstream commit 7507 7508 Sync usage with SYNOPSIS 7509 7510 Upstream-ID: 7a321a170181a54f6450deabaccb6ef60cf3f0b7 7511 7512 commit 79ec2142fbc68dd2ed9688608da355fc0b1ed743 7513 Author: millert (a] openbsd.org <millert (a] openbsd.org> 7514 Date: Mon Jul 20 15:39:52 2015 +0000 7515 7516 upstream commit 7517 7518 Better desciption of Unix domain socket forwarding. 7519 bz#2423; ok jmc@ 7520 7521 Upstream-ID: 85e28874726897e3f26ae50dfa2e8d2de683805d 7522 7523 commit d56fd1828074a4031b18b8faa0bf949669eb18a0 7524 Author: Damien Miller <djm (a] mindrot.org> 7525 Date: Mon Jul 20 11:19:51 2015 +1000 7526 7527 make realpath.c compile -Wsign-compare clean 7528 7529 commit c63c9a691dca26bb7648827f5a13668832948929 7530 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7531 Date: Mon Jul 20 00:30:01 2015 +0000 7532 7533 upstream commit 7534 7535 mention that the default of UseDNS=no implies that 7536 hostnames cannot be used for host matching in sshd_config and 7537 authorized_keys; bz#2045, ok dtucker@ 7538 7539 Upstream-ID: 0812705d5f2dfa59aab01f2764ee800b1741c4e1 7540 7541 commit 63ebcd0005e9894fcd6871b7b80aeea1fec0ff76 7542 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7543 Date: Sat Jul 18 08:02:17 2015 +0000 7544 7545 upstream commit 7546 7547 don't ignore PKCS#11 hosted keys that return empty 7548 CKA_ID; patch by Jakub Jelen via bz#2429; ok markus 7549 7550 Upstream-ID: 2f7c94744eb0342f8ee8bf97b2351d4e00116485 7551 7552 commit b15fd989c8c62074397160147a8d5bc34b3f3c63 7553 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7554 Date: Sat Jul 18 08:00:21 2015 +0000 7555 7556 upstream commit 7557 7558 skip uninitialised PKCS#11 slots; patch from Jakub Jelen 7559 in bz#2427 ok markus@ 7560 7561 Upstream-ID: 744c1e7796e237ad32992d0d02148e8a18f27d29 7562 7563 commit 5b64f85bb811246c59ebab70aed331f26ba37b18 7564 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7565 Date: Sat Jul 18 07:57:14 2015 +0000 7566 7567 upstream commit 7568 7569 only query each keyboard-interactive device once per 7570 authentication request regardless of how many times it is listed; ok markus@ 7571 7572 Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1 7573 7574 commit cd7324d0667794eb5c236d8a4e0f236251babc2d 7575 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7576 Date: Fri Jul 17 03:34:27 2015 +0000 7577 7578 upstream commit 7579 7580 remove -u flag to diff (only used for error output) to make 7581 things easier for -portable 7582 7583 Upstream-Regress-ID: a5d6777d2909540d87afec3039d9bb2414ade548 7584 7585 commit deb8d99ecba70b67f4af7880b11ca8768df9ec3a 7586 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7587 Date: Fri Jul 17 03:09:19 2015 +0000 7588 7589 upstream commit 7590 7591 direct-streamlocal (a] openssh.com Unix domain foward 7592 messages do not contain a "reserved for future use" field and in fact, 7593 serverloop.c checks that there isn't one. Remove erroneous mention from 7594 PROTOCOL description. bz#2421 from Daniel Black 7595 7596 Upstream-ID: 3d51a19e64f72f764682f1b08f35a8aa810a43ac 7597 7598 commit 356b61f365405b5257f5b2ab446e5d7bd33a7b52 7599 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7600 Date: Fri Jul 17 03:04:27 2015 +0000 7601 7602 upstream commit 7603 7604 describe magic for setting up Unix domain socket fowards 7605 via the mux channel; bz#2422 patch from Daniel Black 7606 7607 Upstream-ID: 943080fe3864715c423bdeb7c920bb30c4eee861 7608 7609 commit d3e2aee41487d55b8d7d40f538b84ff1db7989bc 7610 Author: Darren Tucker <dtucker (a] zip.com.au> 7611 Date: Fri Jul 17 12:52:34 2015 +1000 7612 7613 Check if realpath works on nonexistent files. 7614 7615 On some platforms the native realpath doesn't work with non-existent 7616 files (this is actually specified in some versions of POSIX), however 7617 the sftp spec says its realpath with "canonicalize any given path name". 7618 On those platforms, use realpath from the compat library. 7619 7620 In addition, when compiling with -DFORTIFY_SOURCE, glibc redefines 7621 the realpath symbol to the checked version, so redefine ours to 7622 something else so we pick up the compat version we want. 7623 7624 bz#2428, ok djm@ 7625 7626 commit 25b14610dab655646a109db5ef8cb4c4bf2a48a0 7627 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7628 Date: Fri Jul 17 02:47:45 2015 +0000 7629 7630 upstream commit 7631 7632 fix incorrect test for SSH1 keys when compiled without SSH1 7633 support 7634 7635 Upstream-ID: 6004d720345b8e481c405e8ad05ce2271726e451 7636 7637 commit df56a8035d429b2184ee94aaa7e580c1ff67f73a 7638 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7639 Date: Wed Jul 15 08:00:11 2015 +0000 7640 7641 upstream commit 7642 7643 fix NULL-deref when SSH1 reenabled 7644 7645 Upstream-ID: f22fd805288c92b3e9646782d15b48894b2d5295 7646 7647 commit 41e38c4d49dd60908484e6703316651333f16b93 7648 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7649 Date: Wed Jul 15 07:19:50 2015 +0000 7650 7651 upstream commit 7652 7653 regen RSA1 test keys; the last batch was missing their 7654 private parts 7655 7656 Upstream-Regress-ID: 7ccf437305dd63ff0b48dd50c5fd0f4d4230c10a 7657 7658 commit 5bf0933184cb622ca3f96d224bf3299fd2285acc 7659 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7660 Date: Fri Jul 10 06:23:25 2015 +0000 7661 7662 upstream commit 7663 7664 Adapt tests, now that DSA if off by default; use 7665 PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA. 7666 7667 Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c 7668 7669 commit 7a6e3fd7b41dbd3756b6bf9acd67954c0b1564cc 7670 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7671 Date: Tue Jul 7 14:54:16 2015 +0000 7672 7673 upstream commit 7674 7675 regen test data after mktestdata.sh changes 7676 7677 Upstream-Regress-ID: 3495ecb082b9a7c048a2d7c5c845d3bf181d25a4 7678 7679 commit 7c8c174c69f681d4910fa41c37646763692b28e2 7680 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7681 Date: Tue Jul 7 14:53:30 2015 +0000 7682 7683 upstream commit 7684 7685 adapt tests to new minimum RSA size and default FP format 7686 7687 Upstream-Regress-ID: a4b30afd174ce82b96df14eb49fb0b81398ffd0e 7688 7689 commit 6a977a4b68747ade189e43d302f33403fd4a47ac 7690 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7691 Date: Fri Jul 3 04:39:23 2015 +0000 7692 7693 upstream commit 7694 7695 legacy v00 certificates are gone; adapt and don't try to 7696 test them; "sure" markus@ dtucker@ 7697 7698 Upstream-Regress-ID: c57321e69b3cd4a3b3396dfcc43f0803d047da12 7699 7700 commit 0c4123ad5e93fb90fee9c6635b13a6cdabaac385 7701 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7702 Date: Wed Jul 1 23:11:18 2015 +0000 7703 7704 upstream commit 7705 7706 don't expect SSH v.1 in unittests 7707 7708 Upstream-Regress-ID: f8812b16668ba78e6a698646b2a652b90b653397 7709 7710 commit 3c099845798a817cdde513c39074ec2063781f18 7711 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7712 Date: Mon Jun 15 06:38:50 2015 +0000 7713 7714 upstream commit 7715 7716 turn SSH1 back on to match src/usr.bin/ssh being tested 7717 7718 Upstream-Regress-ID: 6c4f763a2f0cc6893bf33983919e9030ae638333 7719 7720 commit b1dc2b33689668c75e95f873a42d5aea1f4af1db 7721 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 7722 Date: Mon Jul 13 04:57:14 2015 +0000 7723 7724 upstream commit 7725 7726 Add "PuTTY_Local:" to the clients to which we do not 7727 offer DH-GEX. This was the string that was used for development versions 7728 prior to September 2014 and they don't do RFC4419 DH-GEX, but unfortunately 7729 there are some extant products based on those versions. bx2424 from Jay 7730 Rouman, ok markus@ djm@ 7731 7732 Upstream-ID: be34d41e18b966832fe09ca243d275b81882e1d5 7733 7734 commit 3a1638dda19bbc73d0ae02b4c251ce08e564b4b9 7735 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7736 Date: Fri Jul 10 06:21:53 2015 +0000 7737 7738 upstream commit 7739 7740 Turn off DSA by default; add HostKeyAlgorithms to the 7741 server and PubkeyAcceptedKeyTypes to the client side, so it still can be 7742 tested or turned back on; feedback and ok djm@ 7743 7744 Upstream-ID: 8450a9e6d83f80c9bfed864ff061dfc9323cec21 7745 7746 commit 16db0a7ee9a87945cc594d13863cfcb86038db59 7747 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7748 Date: Thu Jul 9 09:49:46 2015 +0000 7749 7750 upstream commit 7751 7752 re-enable ed25519-certs if compiled w/o openssl; ok djm 7753 7754 Upstream-ID: e10c90808b001fd2c7a93778418e9b318f5c4c49 7755 7756 commit c355bf306ac33de6545ce9dac22b84a194601e2f 7757 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7758 Date: Wed Jul 8 20:24:02 2015 +0000 7759 7760 upstream commit 7761 7762 no need to include the old buffer/key API 7763 7764 Upstream-ID: fb13c9f7c0bba2545f3eb0a0e69cb0030819f52b 7765 7766 commit a3cc48cdf9853f1e832d78cb29bedfab7adce1ee 7767 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7768 Date: Wed Jul 8 19:09:25 2015 +0000 7769 7770 upstream commit 7771 7772 typedefs for Cipher&CipherContext are unused 7773 7774 Upstream-ID: 50e6a18ee92221d23ad173a96d5b6c42207cf9a7 7775 7776 commit a635bd06b5c427a57c3ae760d3a2730bb2c863c0 7777 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7778 Date: Wed Jul 8 19:04:21 2015 +0000 7779 7780 upstream commit 7781 7782 xmalloc.h is unused 7783 7784 Upstream-ID: afb532355b7fa7135a60d944ca1e644d1d63cb58 7785 7786 commit 2521cf0e36c7f3f6b19f206da0af134f535e4a31 7787 Author: markus (a] openbsd.org <markus (a] openbsd.org> 7788 Date: Wed Jul 8 19:01:15 2015 +0000 7789 7790 upstream commit 7791 7792 compress.c is gone 7793 7794 Upstream-ID: 174fa7faa9b9643cba06164b5e498591356fbced 7795 7796 commit c65a7aa6c43aa7a308ee1ab8a96f216169ae9615 7797 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7798 Date: Fri Jul 3 04:05:54 2015 +0000 7799 7800 upstream commit 7801 7802 another SSH_RSA_MINIMUM_MODULUS_SIZE that needed 7803 cranking 7804 7805 Upstream-ID: 9d8826cafe96aab4ae8e2f6fd22800874b7ffef1 7806 7807 commit b1f383da5cd3cb921fc7776f17a14f44b8a31757 7808 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7809 Date: Fri Jul 3 03:56:25 2015 +0000 7810 7811 upstream commit 7812 7813 add an XXX reminder for getting correct key paths from 7814 sshd_config 7815 7816 Upstream-ID: feae52b209d7782ad742df04a4260e9fe41741db 7817 7818 commit 933935ce8d093996c34d7efa4d59113163080680 7819 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7820 Date: Fri Jul 3 03:49:45 2015 +0000 7821 7822 upstream commit 7823 7824 refuse to generate or accept RSA keys smaller than 1024 7825 bits; feedback and ok dtucker@ 7826 7827 Upstream-ID: 7ea3d31271366ba264f06e34a3539bf1ac30f0ba 7828 7829 commit bdfd29f60b74f3e678297269dc6247a5699583c1 7830 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7831 Date: Fri Jul 3 03:47:00 2015 +0000 7832 7833 upstream commit 7834 7835 turn off 1024 bit diffie-hellman-group1-sha1 key 7836 exchange method (already off in server, this turns it off in the client by 7837 default too) ok dtucker@ 7838 7839 Upstream-ID: f59b88f449210ab7acf7d9d88f20f1daee97a4fa 7840 7841 commit c28fc62d789d860c75e23a9fa9fb250eb2beca57 7842 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7843 Date: Fri Jul 3 03:43:18 2015 +0000 7844 7845 upstream commit 7846 7847 delete support for legacy v00 certificates; "sure" 7848 markus@ dtucker@ 7849 7850 Upstream-ID: b5b9bb5f9202d09e88f912989d74928601b6636f 7851 7852 commit 564d63e1b4a9637a209d42a9d49646781fc9caef 7853 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7854 Date: Wed Jul 1 23:10:47 2015 +0000 7855 7856 upstream commit 7857 7858 Compile-time disable SSH v.1 again 7859 7860 Upstream-ID: 1d4b513a3a06232f02650b73bad25100d1b800af 7861 7862 commit 868109b650504dd9bcccdb1f51d0906f967c20ff 7863 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7864 Date: Wed Jul 1 02:39:06 2015 +0000 7865 7866 upstream commit 7867 7868 twiddle PermitRootLogin back 7869 7870 Upstream-ID: 2bd23976305d0512e9f84d054e1fc23cd70b89f2 7871 7872 commit 7de4b03a6e4071d454b72927ffaf52949fa34545 7873 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7874 Date: Wed Jul 1 02:32:17 2015 +0000 7875 7876 upstream commit 7877 7878 twiddle; (this commit marks the openssh-6.9 release) 7879 7880 Upstream-ID: 78500582819f61dd8adee36ec5cc9b9ac9351234 7881 7882 commit 1bf477d3cdf1a864646d59820878783d42357a1d 7883 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7884 Date: Wed Jul 1 02:26:31 2015 +0000 7885 7886 upstream commit 7887 7888 better refuse ForwardX11Trusted=no connections attempted 7889 after ForwardX11Timeout expires; reported by Jann Horn 7890 7891 Upstream-ID: bf0fddadc1b46a0334e26c080038313b4b6dea21 7892 7893 commit 47aa7a0f8551b471fcae0447c1d78464f6dba869 7894 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7895 Date: Wed Jul 1 01:56:13 2015 +0000 7896 7897 upstream commit 7898 7899 put back default PermitRootLogin=no 7900 7901 Upstream-ID: 7bdedd5cead99c57ed5571f3b6b7840922d5f728 7902 7903 commit 984b064fe2a23733733262f88d2e1b2a1a501662 7904 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7905 Date: Wed Jul 1 01:55:13 2015 +0000 7906 7907 upstream commit 7908 7909 openssh-6.9 7910 7911 Upstream-ID: 6cfe8e1904812531080e6ab6e752d7001b5b2d45 7912 7913 commit d921082ed670f516652eeba50705e1e9f6325346 7914 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7915 Date: Wed Jul 1 01:55:00 2015 +0000 7916 7917 upstream commit 7918 7919 reset default PermitRootLogin to 'yes' (momentarily, for 7920 release) 7921 7922 Upstream-ID: cad8513527066e65dd7a1c16363d6903e8cefa24 7923 7924 commit 66295e0e1ba860e527f191b6325d2d77dec4dbce 7925 Author: Damien Miller <djm (a] mindrot.org> 7926 Date: Wed Jul 1 11:49:12 2015 +1000 7927 7928 crank version numbers for release 7929 7930 commit 37035c07d4f26bb1fbe000d2acf78efdb008681d 7931 Author: Damien Miller <djm (a] mindrot.org> 7932 Date: Wed Jul 1 10:49:37 2015 +1000 7933 7934 s/--with-ssh1/--without-ssh1/ 7935 7936 commit 629df770dbadc2accfbe1c81b3f31f876d0acd84 7937 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7938 Date: Tue Jun 30 05:25:07 2015 +0000 7939 7940 upstream commit 7941 7942 fatal() when a remote window update causes the window 7943 value to overflow. Reported by Georg Wicherski, ok markus@ 7944 7945 Upstream-ID: ead397a9aceb3bf74ebfa5fcaf259d72e569f351 7946 7947 commit f715afebe735d61df3fd30ad72d9ac1c8bd3b5f2 7948 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7949 Date: Tue Jun 30 05:23:25 2015 +0000 7950 7951 upstream commit 7952 7953 Fix math error in remote window calculations that causes 7954 eventual stalls for datagram channels. Reported by Georg Wicherski, ok 7955 markus@ 7956 7957 Upstream-ID: be54059d11bf64e0d85061f7257f53067842e2ab 7958 7959 commit 52fb6b9b034fcfd24bf88cc7be313e9c31de9889 7960 Author: Damien Miller <djm (a] mindrot.org> 7961 Date: Tue Jun 30 16:05:40 2015 +1000 7962 7963 skip IPv6-related portions on hosts without IPv6 7964 7965 with Tim Rice 7966 7967 commit 512caddf590857af6aa12218461b5c0441028cf5 7968 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7969 Date: Mon Jun 29 22:35:12 2015 +0000 7970 7971 upstream commit 7972 7973 add getpid to sandbox, reachable by grace_alarm_handler 7974 7975 reported by Jakub Jelen; bz#2419 7976 7977 Upstream-ID: d0da1117c16d4c223954995d35b0f47c8f684cd8 7978 7979 commit 78c2a4f883ea9aba866358e2acd9793a7f42ca93 7980 Author: djm (a] openbsd.org <djm (a] openbsd.org> 7981 Date: Fri Jun 26 05:13:20 2015 +0000 7982 7983 upstream commit 7984 7985 Fix \-escaping bug that caused forward path parsing to skip 7986 two characters and skip past the end of the string. 7987 7988 Based on patch by Salvador Fandino; ok dtucker@ 7989 7990 Upstream-ID: 7b879dc446335677cbe4cb549495636a0535f3bd 7991 7992 commit bc20205c91c9920361d12b15d253d4997dba494a 7993 Author: Damien Miller <djm (a] mindrot.org> 7994 Date: Thu Jun 25 09:51:39 2015 +1000 7995 7996 add missing pselect6 7997 7998 patch from Jakub Jelen 7999 8000 commit 9d27fb73b4a4e5e99cb880af790d5b1ce44f720a 8001 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8002 Date: Wed Jun 24 23:47:23 2015 +0000 8003 8004 upstream commit 8005 8006 correct test to sshkey_sign(); spotted by Albert S. 8007 8008 Upstream-ID: 5f7347f40f0ca6abdaca2edb3bd62f4776518933 8009 8010 commit 7ed01a96a1911d8b4a9ef4f3d064e1923bfad7e3 8011 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8012 Date: Wed Jun 24 01:49:19 2015 +0000 8013 8014 upstream commit 8015 8016 Revert previous commit. We still want to call setgroups 8017 in the case where there are zero groups to remove any that we might otherwise 8018 inherit (as pointed out by grawity at gmail.com) and since the 2nd argument 8019 to setgroups is always a static global it's always valid to dereference in 8020 this case. ok deraadt@ djm@ 8021 8022 Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01 8023 8024 commit 882f8bf94f79528caa65b0ba71c185d705bb7195 8025 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8026 Date: Wed Jun 24 01:49:19 2015 +0000 8027 8028 upstream commit 8029 8030 Revert previous commit. We still want to call setgroups in 8031 the case where there are zero groups to remove any that we might otherwise 8032 inherit (as pointed out by grawity at gmail.com) and since the 2nd argument 8033 to setgroups is always a static global it's always valid to dereference in 8034 this case. ok deraadt@ djm@ 8035 8036 Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01 8037 8038 commit 9488538a726951e82b3a4374f3c558d72c80a89b 8039 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8040 Date: Mon Jun 22 23:42:16 2015 +0000 8041 8042 upstream commit 8043 8044 Don't count successful partial authentication as failures 8045 in monitor; this may have caused the monitor to refuse multiple 8046 authentications that would otherwise have successfully completed; ok markus@ 8047 8048 Upstream-ID: eb74b8e506714d0f649bd5c300f762a527af04a3 8049 8050 commit 63b78d003bd8ca111a736e6cea6333da50f5f09b 8051 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8052 Date: Mon Jun 22 12:29:57 2015 +0000 8053 8054 upstream commit 8055 8056 Don't call setgroups if we have zero groups; there's no 8057 guarantee that it won't try to deref the pointer. Based on a patch from mail 8058 at quitesimple.org, ok djm deraadt 8059 8060 Upstream-ID: 2fff85e11d7a9a387ef7fddf41fbfaf566708ab1 8061 8062 commit 5c15e22c691c79a47747bcf5490126656f97cecd 8063 Author: Damien Miller <djm (a] mindrot.org> 8064 Date: Thu Jun 18 15:07:56 2015 +1000 8065 8066 fix syntax error 8067 8068 commit 596dbca82f3f567fb3d2d69af4b4e1d3ba1e6403 8069 Author: jsing (a] openbsd.org <jsing (a] openbsd.org> 8070 Date: Mon Jun 15 18:44:22 2015 +0000 8071 8072 upstream commit 8073 8074 If AuthorizedPrincipalsCommand is specified, however 8075 AuthorizedPrincipalsFile is not (or is set to "none"), authentication will 8076 potentially fail due to key_cert_check_authority() failing to locate a 8077 principal that matches the username, even though an authorized principal has 8078 already been matched in the output of the subprocess. Fix this by using the 8079 same logic to determine if pw->pw_name should be passed, as is used to 8080 determine if a authorized principal must be matched earlier on. 8081 8082 ok djm@ 8083 8084 Upstream-ID: 43b42302ec846b0ea68aceb40677245391b9409d 8085 8086 commit aff3e94c0d75d0d0fa84ea392b50ab04f8c57905 8087 Author: jsing (a] openbsd.org <jsing (a] openbsd.org> 8088 Date: Mon Jun 15 18:42:19 2015 +0000 8089 8090 upstream commit 8091 8092 Make the arguments to match_principals_command() similar 8093 to match_principals_file(), by changing the last argument a struct 8094 sshkey_cert * and dereferencing key->cert in the caller. 8095 8096 No functional change. 8097 8098 ok djm@ 8099 8100 Upstream-ID: 533f99b844b21b47342b32b62e198dfffcf8651c 8101 8102 commit 97e2e1596c202a4693468378b16b2353fd2d6c5e 8103 Author: Damien Miller <djm (a] mindrot.org> 8104 Date: Wed Jun 17 14:36:54 2015 +1000 8105 8106 trivial optimisation for seccomp-bpf 8107 8108 When doing arg inspection and the syscall doesn't match, skip 8109 past the instruction that reloads the syscall into the accumulator, 8110 since the accumulator hasn't been modified at this point. 8111 8112 commit 99f33d7304893bd9fa04d227cb6e870171cded19 8113 Author: Damien Miller <djm (a] mindrot.org> 8114 Date: Wed Jun 17 10:50:51 2015 +1000 8115 8116 aarch64 support for seccomp-bpf sandbox 8117 8118 Also resort and tidy syscall list. Based on patches by Jakub Jelen 8119 bz#2361; ok dtucker@ 8120 8121 commit 4ef702e1244633c1025ec7cfe044b9ab267097bf 8122 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8123 Date: Mon Jun 15 01:32:50 2015 +0000 8124 8125 upstream commit 8126 8127 return failure on RSA signature error; reported by Albert S 8128 8129 Upstream-ID: e61bb93dbe0349625807b0810bc213a6822121fa 8130 8131 commit a170f22baf18af0b1acf2788b8b715605f41a1f9 8132 Author: Tim Rice <tim (a] multitalents.net> 8133 Date: Tue Jun 9 22:41:13 2015 -0700 8134 8135 Fix t12 rules for out of tree builds. 8136 8137 commit ec04dc4a5515c913121bc04ed261857e68fa5c18 8138 Author: millert (a] openbsd.org <millert (a] openbsd.org> 8139 Date: Fri Jun 5 15:13:13 2015 +0000 8140 8141 upstream commit 8142 8143 For "ssh -L 12345:/tmp/sock" don't fail with "No forward host 8144 name." (we have a path, not a host name). Based on a diff from Jared 8145 Yanovich. OK djm@ 8146 8147 Upstream-ID: 2846b0a8c7de037e33657f95afbd282837fc213f 8148 8149 commit 732d61f417a6aea0aa5308b59cb0f563bcd6edd6 8150 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8151 Date: Fri Jun 5 03:44:14 2015 +0000 8152 8153 upstream commit 8154 8155 typo: accidental repetition; bz#2386 8156 8157 Upstream-ID: 45e620d99f6bc301e5949d34a54027374991c88b 8158 8159 commit adfb24c69d1b6f5e758db200866c711e25a2ba73 8160 Author: Darren Tucker <dtucker (a] zip.com.au> 8161 Date: Fri Jun 5 14:51:40 2015 +1000 8162 8163 Add Linux powerpc64le and powerpcle entries. 8164 8165 Stopgap to resolve bz#2409 because we are so close to release and will 8166 update config.guess and friends shortly after the release. ok djm@ 8167 8168 commit a1195a0fdc9eddddb04d3e9e44c4775431cb77da 8169 Merge: 6397eed d2480bc 8170 Author: Tim Rice <tim (a] multitalents.net> 8171 Date: Wed Jun 3 21:43:13 2015 -0700 8172 8173 Merge branch 'master' of git.mindrot.org:/var/git/openssh 8174 8175 commit 6397eedf953b2b973d2d7cbb504ab501a07f8ddc 8176 Author: Tim Rice <tim (a] multitalents.net> 8177 Date: Wed Jun 3 21:41:11 2015 -0700 8178 8179 Remove unneeded backslashes. Patch from ngel Gonzlez 8180 8181 commit d2480bcac1caf31b03068de877a47d6e1027bf6d 8182 Author: Darren Tucker <dtucker (a] zip.com.au> 8183 Date: Thu Jun 4 14:10:55 2015 +1000 8184 8185 Remove redundant include of stdarg.h. bz#2410 8186 8187 commit 5e67859a623826ccdf2df284cbb37e2d8e2787eb 8188 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8189 Date: Tue Jun 2 09:10:40 2015 +0000 8190 8191 upstream commit 8192 8193 mention CheckHostIP adding addresses to known_hosts; 8194 bz#1993; ok dtucker@ 8195 8196 Upstream-ID: fd44b68440fd0dc29abf9f2d3f703d74a2396cb7 8197 8198 commit d7a58bbac6583e33fd5eca8e2c2cc70c57617818 8199 Author: Darren Tucker <dtucker (a] zip.com.au> 8200 Date: Tue Jun 2 20:15:26 2015 +1000 8201 8202 Replace strcpy with strlcpy. 8203 8204 ok djm, sanity check by Corinna Vinschen. 8205 8206 commit 51a1c2115265c6e80ede8a5c9dccada9aeed7143 8207 Author: Damien Miller <djm (a] mindrot.org> 8208 Date: Fri May 29 18:27:21 2015 +1000 8209 8210 skip, rather than fatal when run without SUDO set 8211 8212 commit 599f01142a376645b15cbc9349d7e8975e1cf245 8213 Author: Damien Miller <djm (a] mindrot.org> 8214 Date: Fri May 29 18:03:15 2015 +1000 8215 8216 fix merge botch that left ",," in KEX algs 8217 8218 commit 0c2a81dfc21822f2423edd30751e5ec53467b347 8219 Author: Damien Miller <djm (a] mindrot.org> 8220 Date: Fri May 29 17:08:28 2015 +1000 8221 8222 re-enable SSH protocol 1 at compile time 8223 8224 commit db438f9285d64282d3ac9e8c0944f59f037c0151 8225 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8226 Date: Fri May 29 03:05:13 2015 +0000 8227 8228 upstream commit 8229 8230 make this work without SUDO set; ok dtucker@ 8231 8232 Upstream-Regress-ID: bca88217b70bce2fe52b23b8e06bdeb82d98c715 8233 8234 commit 1d9a2e2849c9864fe75daabf433436341c968e14 8235 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8236 Date: Thu May 28 07:37:31 2015 +0000 8237 8238 upstream commit 8239 8240 wrap all moduli-related code in #ifdef WITH_OPENSSL. 8241 based on patch from Reuben Hawkins; bz#2388 feedback and ok dtucker@ 8242 8243 Upstream-ID: d80cfc8be3e6ec65b3fac9e87c4466533b31b7cf 8244 8245 commit 496aeb25bc2d6c434171292e4714771b594bd00e 8246 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8247 Date: Thu May 28 05:41:29 2015 +0000 8248 8249 upstream commit 8250 8251 Increase the allowed length of the known host file name 8252 in the log message to be consistent with other cases. Part of bz#1993, ok 8253 deraadt. 8254 8255 Upstream-ID: a9e97567be49f25daf286721450968251ff78397 8256 8257 commit dd2cfeb586c646ff8d70eb93567b2e559ace5b14 8258 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8259 Date: Thu May 28 05:09:45 2015 +0000 8260 8261 upstream commit 8262 8263 Fix typo (keywork->keyword) 8264 8265 Upstream-ID: 8aacd0f4089c0a244cf43417f4f9045dfaeab534 8266 8267 commit 9cc6842493fbf23025ccc1edab064869640d3bec 8268 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8269 Date: Thu May 28 04:50:53 2015 +0000 8270 8271 upstream commit 8272 8273 add error message on ftruncate failure; bz#2176 8274 8275 Upstream-ID: cbcc606e0b748520c74a210d8f3cc9718d3148cf 8276 8277 commit d1958793a0072c22be26d136dbda5ae263e717a0 8278 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8279 Date: Thu May 28 04:40:13 2015 +0000 8280 8281 upstream commit 8282 8283 make ssh-keygen default to ed25519 keys when compiled 8284 without OpenSSL; bz#2388, ok dtucker@ 8285 8286 Upstream-ID: 85a471fa6d3fa57a7b8e882d22cfbfc1d84cdc71 8287 8288 commit 3ecde664c9fc5fb3667aedf9e6671462600f6496 8289 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8290 Date: Wed May 27 23:51:10 2015 +0000 8291 8292 upstream commit 8293 8294 Reorder client proposal to prefer 8295 diffie-hellman-group-exchange-sha1 over diffie-hellman-group14-sha1. ok djm@ 8296 8297 Upstream-ID: 552c08d47347c3ee1a9a57d88441ab50abe17058 8298 8299 commit 40f64292b907afd0a674fdbf3e4c2356d17a7d68 8300 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8301 Date: Wed May 27 23:39:18 2015 +0000 8302 8303 upstream commit 8304 8305 Add a stronger (4k bit) fallback group that sshd can use 8306 when the moduli file is missing or broken, sourced from RFC3526. bz#2302, ok 8307 markus@ (earlier version), djm@ 8308 8309 Upstream-ID: b635215746a25a829d117673d5e5a76d4baee7f4 8310 8311 commit 5ab7d5fa03ad55bc438fab45dfb3aeb30a3c237a 8312 Author: Darren Tucker <dtucker (a] zip.com.au> 8313 Date: Thu May 28 10:03:40 2015 +1000 8314 8315 New moduli file from OpenBSD, removing 1k groups. 8316 8317 Remove 1k bit groups. ok deraadt@, markus@ 8318 8319 commit a71ba58adf34e599f30cdda6e9b93ae6e3937eea 8320 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8321 Date: Wed May 27 05:15:02 2015 +0000 8322 8323 upstream commit 8324 8325 support PKCS#11 devices with external PIN entry devices 8326 bz#2240, based on patch from Dirk-Willem van Gulik; feedback and ok dtucker@ 8327 8328 Upstream-ID: 504568992b55a8fc984375242b1bd505ced61b0d 8329 8330 commit b282fec1aa05246ed3482270eb70fc3ec5f39a00 8331 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8332 Date: Tue May 26 23:23:40 2015 +0000 8333 8334 upstream commit 8335 8336 Cap DH-GEX group size at 4kbits for Cisco implementations. 8337 Some of them will choke when asked for preferred sizes >4k instead of 8338 returning the 4k group that they do have. bz#2209, ok djm@ 8339 8340 Upstream-ID: 54b863a19713446b7431f9d06ad0532b4fcfef8d 8341 8342 commit 3e91b4e8b0dc2b4b7e7d42cf6e8994a32e4cb55e 8343 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8344 Date: Sun May 24 23:39:16 2015 +0000 8345 8346 upstream commit 8347 8348 add missing 'c' option to getopt(), case statement was 8349 already there; from Felix Bolte 8350 8351 Upstream-ID: 9b19b4e2e0b54d6fefa0dfac707c51cf4bae3081 8352 8353 commit 64a89ec07660abba4d0da7c0095b7371c98bab62 8354 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 8355 Date: Sat May 23 14:28:37 2015 +0000 8356 8357 upstream commit 8358 8359 fix a memory leak in an error path ok markus@ dtucker@ 8360 8361 Upstream-ID: bc1da0f205494944918533d8780fde65dff6c598 8362 8363 commit f948737449257d2cb83ffcfe7275eb79b677fd4a 8364 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8365 Date: Fri May 22 05:28:45 2015 +0000 8366 8367 upstream commit 8368 8369 mention ssh-keygen -E for comparing legacy MD5 8370 fingerprints; bz#2332 8371 8372 Upstream-ID: 079a3669549041dbf10dbc072d9563f0dc3b2859 8373 8374 commit 0882332616e4f0272c31cc47bf2018f9cb258a4e 8375 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8376 Date: Fri May 22 04:45:52 2015 +0000 8377 8378 upstream commit 8379 8380 Reorder EscapeChar option parsing to avoid a single-byte 8381 out- of-bounds read. bz#2396 from Jaak Ristioja; ok dtucker@ 8382 8383 Upstream-ID: 1dc6b5b63d1c8d9a88619da0b27ade461d79b060 8384 8385 commit d7c31da4d42c115843edee2074d7d501f8804420 8386 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8387 Date: Fri May 22 03:50:02 2015 +0000 8388 8389 upstream commit 8390 8391 add knob to relax GSSAPI host credential check for 8392 multihomed hosts bz#928, patch by Simon Wilkinson; ok dtucker 8393 (kerberos/GSSAPI is not compiled by default on OpenBSD) 8394 8395 Upstream-ID: 15ddf1c6f7fd9d98eea9962f480079ae3637285d 8396 8397 commit aa72196a00be6e0b666215edcffbc10af234cb0e 8398 Author: Darren Tucker <dtucker (a] zip.com.au> 8399 Date: Fri May 22 17:49:46 2015 +1000 8400 8401 Include signal.h for sig_atomic_t, used by kex.h. 8402 8403 bz#2402, from tomas.kuthan at oracle com. 8404 8405 commit 8b02481143d75e91c49d1bfae0876ac1fbf9511a 8406 Author: Darren Tucker <dtucker (a] zip.com.au> 8407 Date: Fri May 22 12:47:24 2015 +1000 8408 8409 Import updated moduli file from OpenBSD. 8410 8411 commit 4739e8d5e1c0be49624082bd9f6b077e9e758db9 8412 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8413 Date: Thu May 21 12:01:19 2015 +0000 8414 8415 upstream commit 8416 8417 Support "ssh-keygen -lF hostname" to find search known_hosts 8418 and print key hashes. Already advertised by ssh-keygen(1), but not delivered 8419 by code; ok dtucker@ 8420 8421 Upstream-ID: 459e0e2bf39825e41b0811c336db2d56a1c23387 8422 8423 commit e97201feca10b5196da35819ae516d0b87cf3a50 8424 Author: Damien Miller <djm (a] mindrot.org> 8425 Date: Thu May 21 17:55:15 2015 +1000 8426 8427 conditionalise util.h inclusion 8428 8429 commit 13640798c7dd011ece0a7d02841fe48e94cfa0e0 8430 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8431 Date: Thu May 21 06:44:25 2015 +0000 8432 8433 upstream commit 8434 8435 regress test for AuthorizedPrincipalsCommand 8436 8437 Upstream-Regress-ID: c658fbf1ab6b6011dc83b73402322e396f1e1219 8438 8439 commit 84452c5d03c21f9bfb28c234e0dc1dc67dd817b1 8440 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8441 Date: Thu May 21 06:40:02 2015 +0000 8442 8443 upstream commit 8444 8445 regress test for AuthorizedKeysCommand arguments 8446 8447 Upstream-Regress-ID: bbd65c13c6b3be9a442ec115800bff9625898f12 8448 8449 commit bcc50d816187fa9a03907ac1f3a52f04a52e10d1 8450 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8451 Date: Thu May 21 06:43:30 2015 +0000 8452 8453 upstream commit 8454 8455 add AuthorizedPrincipalsCommand that allows getting 8456 authorized_principals from a subprocess rather than a file, which is quite 8457 useful in deployments with large userbases 8458 8459 feedback and ok markus@ 8460 8461 Upstream-ID: aa1bdac7b16fc6d2fa3524ef08f04c7258d247f6 8462 8463 commit 24232a3e5ab467678a86aa67968bbb915caffed4 8464 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8465 Date: Thu May 21 06:38:35 2015 +0000 8466 8467 upstream commit 8468 8469 support arguments to AuthorizedKeysCommand 8470 8471 bz#2081 loosely based on patch by Sami Hartikainen 8472 feedback and ok markus@ 8473 8474 Upstream-ID: b080387a14aa67dddd8ece67c00f268d626541f7 8475 8476 commit d80fbe41a57c72420c87a628444da16d09d66ca7 8477 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8478 Date: Thu May 21 04:55:51 2015 +0000 8479 8480 upstream commit 8481 8482 refactor: split base64 encoding of pubkey into its own 8483 sshkey_to_base64() function and out of sshkey_write(); ok markus@ 8484 8485 Upstream-ID: 54fc38f5832e9b91028900819bda46c3959a0c1a 8486 8487 commit 7cc44ef74133a473734bbcbd3484f24d6a7328c5 8488 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 8489 Date: Mon May 18 15:06:05 2015 +0000 8490 8491 upstream commit 8492 8493 getentropy() and sendsyslog() have been around long 8494 enough. openssh-portable may want the #ifdef's but not base. discussed with 8495 djm few weeks back 8496 8497 Upstream-ID: 0506a4334de108e3fb6c66f8d6e0f9c112866926 8498 8499 commit 9173d0fbe44de7ebcad8a15618e13a8b8d78902e 8500 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8501 Date: Fri May 15 05:44:21 2015 +0000 8502 8503 upstream commit 8504 8505 Use a salted hash of the lock passphrase instead of plain 8506 text and do constant-time comparisons of it. Should prevent leaking any 8507 information about it via timing, pointed out by Ryan Castellucci. Add a 0.1s 8508 incrementing delay for each failed unlock attempt up to 10s. ok markus@ 8509 (earlier version), djm@ 8510 8511 Upstream-ID: c599fcc325aa1cc65496b25220b622d22208c85f 8512 8513 commit d028d5d3a697c71b21e4066d8672cacab3caa0a8 8514 Author: Damien Miller <djm (a] mindrot.org> 8515 Date: Tue May 5 19:10:58 2015 +1000 8516 8517 upstream commit 8518 8519 - tedu (a] cvs.openbsd.org 2015/01/12 03:20:04 8520 [bcrypt_pbkdf.c] 8521 rename blocks to words. bcrypt "blocks" are unrelated to blowfish blocks, 8522 nor are they the same size. 8523 8524 commit f6391d4e59b058984163ab28f4e317e7a72478f1 8525 Author: Damien Miller <djm (a] mindrot.org> 8526 Date: Tue May 5 19:10:23 2015 +1000 8527 8528 upstream commit 8529 8530 - deraadt (a] cvs.openbsd.org 2015/01/08 00:30:07 8531 [bcrypt_pbkdf.c] 8532 declare a local version of MIN(), call it MINIMUM() 8533 8534 commit 8ac6b13cc9113eb47cd9e86c97d7b26b4b71b77f 8535 Author: Damien Miller <djm (a] mindrot.org> 8536 Date: Tue May 5 19:09:46 2015 +1000 8537 8538 upstream commit 8539 8540 - djm (a] cvs.openbsd.org 2014/12/30 01:41:43 8541 [bcrypt_pbkdf.c] 8542 typo in comment: ouput => output 8543 8544 commit 1f792489d5cf86a4f4e3003e6e9177654033f0f2 8545 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8546 Date: Mon May 4 06:10:48 2015 +0000 8547 8548 upstream commit 8549 8550 Remove pattern length argument from match_pattern_list(), we 8551 only ever use it for strlen(pattern). 8552 8553 Prompted by hanno AT hboeck.de pointing an out-of-bound read 8554 error caused by an incorrect pattern length found using AFL 8555 and his own tools. 8556 8557 ok markus@ 8558 8559 commit 639d6bc57b1942393ed12fb48f00bc05d4e093e4 8560 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8561 Date: Fri May 1 07:10:01 2015 +0000 8562 8563 upstream commit 8564 8565 refactor ssh_dispatch_run_fatal() to use sshpkt_fatal() 8566 to better report error conditions. Teach sshpkt_fatal() about ECONNRESET. 8567 8568 Improves error messages on TCP connection resets. bz#2257 8569 8570 ok dtucker@ 8571 8572 commit 9559d7de34c572d4d3fd990ca211f8ec99f62c4d 8573 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8574 Date: Fri May 1 07:08:08 2015 +0000 8575 8576 upstream commit 8577 8578 a couple of parse targets were missing activep checks, 8579 causing them to be misapplied in match context; bz#2272 diagnosis and 8580 original patch from Sami Hartikainen ok dtucker@ 8581 8582 commit 7e8528cad04b2775c3b7db08abf8fb42e47e6b2a 8583 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8584 Date: Fri May 1 04:17:51 2015 +0000 8585 8586 upstream commit 8587 8588 make handling of AuthorizedPrincipalsFile=none more 8589 consistent with other =none options; bz#2288 from Jakub Jelen; ok dtucker@ 8590 8591 commit ca430d4d9cc0f62eca3b1fb1e2928395b7ce80f7 8592 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8593 Date: Fri May 1 04:03:20 2015 +0000 8594 8595 upstream commit 8596 8597 remove failed remote forwards established by muliplexing 8598 from the list of active forwards; bz#2363, patch mostly by Yoann Ricordel; ok 8599 dtucker@ 8600 8601 commit 8312cfb8ad88657517b3e23ac8c56c8e38eb9792 8602 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8603 Date: Fri May 1 04:01:58 2015 +0000 8604 8605 upstream commit 8606 8607 reduce stderr spam when using ssh -S /path/mux -O forward 8608 -R 0:... ok dtucker@ 8609 8610 commit 179be0f5e62f1f492462571944e45a3da660d82b 8611 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8612 Date: Fri May 1 03:23:51 2015 +0000 8613 8614 upstream commit 8615 8616 prevent authorized_keys options picked up on public key 8617 tests without a corresponding private key authentication being applied to 8618 other authentication methods. Reported by halex@, ok markus@ 8619 8620 commit a42d67be65b719a430b7fcaba2a4e4118382723a 8621 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8622 Date: Fri May 1 03:20:54 2015 +0000 8623 8624 upstream commit 8625 8626 Don't make parsing of authorized_keys' environment= 8627 option conditional on PermitUserEnv - always parse it, but only use the 8628 result if the option is enabled. This prevents the syntax of authorized_keys 8629 changing depending on which sshd_config options were enabled. 8630 8631 bz#2329; based on patch from coladict AT gmail.com, ok dtucker@ 8632 8633 commit e661a86353e11592c7ed6a847e19a83609f49e77 8634 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8635 Date: Mon May 4 06:10:48 2015 +0000 8636 8637 upstream commit 8638 8639 Remove pattern length argument from match_pattern_list(), we 8640 only ever use it for strlen(pattern). 8641 8642 Prompted by hanno AT hboeck.de pointing an out-of-bound read 8643 error caused by an incorrect pattern length found using AFL 8644 and his own tools. 8645 8646 ok markus@ 8647 8648 commit 0ef1de742be2ee4b10381193fe90730925b7f027 8649 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8650 Date: Thu Apr 23 05:01:19 2015 +0000 8651 8652 upstream commit 8653 8654 Add a simple regression test for sshd's configuration 8655 parser. Right now, all it does is run the output of sshd -T back through 8656 itself and ensure the output is valid and invariant. 8657 8658 commit 368f83c793275faa2c52f60eaa9bdac155c4254b 8659 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8660 Date: Wed Apr 22 01:38:36 2015 +0000 8661 8662 upstream commit 8663 8664 use correct key for nested certificate test 8665 8666 commit 8d4d1bfddbbd7d21f545dc6997081d1ea1fbc99a 8667 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8668 Date: Fri May 1 07:11:47 2015 +0000 8669 8670 upstream commit 8671 8672 mention that the user's shell from /etc/passwd is used 8673 for commands too; bz#1459 ok dtucker@ 8674 8675 commit 5ab283d0016bbc9d4d71e8e5284d011bc5a930cf 8676 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8677 Date: Fri May 8 07:29:00 2015 +0000 8678 8679 upstream commit 8680 8681 whitespace 8682 8683 Upstream-Regress-ID: 6b708a3e709d5b7fd37890f874bafdff1f597519 8684 8685 commit 8377d5008ad260048192e1e56ad7d15a56d103dd 8686 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8687 Date: Fri May 8 07:26:13 2015 +0000 8688 8689 upstream commit 8690 8691 whitespace at EOL 8692 8693 Upstream-Regress-ID: 9c48911643d5b05173b36a012041bed4080b8554 8694 8695 commit c28a3436fa8737709ea88e4437f8f23a6ab50359 8696 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8697 Date: Fri May 8 06:45:13 2015 +0000 8698 8699 upstream commit 8700 8701 moar whitespace at eol 8702 8703 Upstream-ID: 64eaf872a3ba52ed41e494287e80d40aaba4b515 8704 8705 commit 2b64c490468fd4ca35ac8d5cc31c0520dc1508bb 8706 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8707 Date: Fri May 8 06:41:56 2015 +0000 8708 8709 upstream commit 8710 8711 whitespace at EOL 8712 8713 Upstream-ID: 57bcf67d666c6fc1ad798aee448fdc3f70f7ec2c 8714 8715 commit 4e636cf201ce6e7e3b9088568218f9d4e2c51712 8716 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8717 Date: Fri May 8 03:56:51 2015 +0000 8718 8719 upstream commit 8720 8721 whitespace at EOL 8722 8723 commit 38b8272f823dc1dd4e29dbcee83943ed48bb12fa 8724 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8725 Date: Mon May 4 01:47:53 2015 +0000 8726 8727 upstream commit 8728 8729 Use diff w/out -u for better portability 8730 8731 commit 297060f42d5189a4065ea1b6f0afdf6371fb0507 8732 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8733 Date: Fri May 8 03:25:07 2015 +0000 8734 8735 upstream commit 8736 8737 Use xcalloc for permitted_adm_opens instead of xmalloc to 8738 ensure it's zeroed. Fixes post-auth crash with permitopen=none. bz#2355, ok 8739 djm@ 8740 8741 commit 63ebf019be863b2d90492a85e248cf55a6e87403 8742 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8743 Date: Fri May 8 03:17:49 2015 +0000 8744 8745 upstream commit 8746 8747 don't choke on new-format private keys encrypted with an 8748 AEAD cipher; bz#2366, patch from Ron Frederick; ok markus@ 8749 8750 commit f8484dac678ab3098ae522a5f03bb2530f822987 8751 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8752 Date: Wed May 6 05:45:17 2015 +0000 8753 8754 upstream commit 8755 8756 Clarify pseudo-terminal request behaviour and use 8757 "pseudo-terminal" consistently. bz#1716, ok jmc@ "I like it" deraadt@. 8758 8759 commit ea139507bef8bad26e86ed99a42c7233ad115c38 8760 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8761 Date: Wed May 6 04:07:18 2015 +0000 8762 8763 upstream commit 8764 8765 Blacklist DH-GEX for specific PuTTY versions known to 8766 send non-RFC4419 DH-GEX messages rather than all versions of PuTTY. 8767 According to Simon Tatham, 0.65 and newer versions will send RFC4419 DH-GEX 8768 messages. ok djm@ 8769 8770 commit b58234f00ee3872eb84f6e9e572a9a34e902e36e 8771 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8772 Date: Tue May 5 10:17:49 2015 +0000 8773 8774 upstream commit 8775 8776 WinSCP doesn't implement RFC4419 DH-GEX so flag it so we 8777 don't offer that KEX method. ok markus@ 8778 8779 commit d5b1507a207253b39e810e91e68f9598691b7a29 8780 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 8781 Date: Tue May 5 02:48:17 2015 +0000 8782 8783 upstream commit 8784 8785 use the sizeof the struct not the sizeof a pointer to the 8786 struct in ssh_digest_start() 8787 8788 This file is only used if ssh is built with OPENSSL=no 8789 8790 ok markus@ 8791 8792 commit a647b9b8e616c231594b2710c925d31b1b8afea3 8793 Author: Darren Tucker <dtucker (a] zip.com.au> 8794 Date: Fri May 8 11:07:27 2015 +1000 8795 8796 Put brackets around mblen() compat constant. 8797 8798 This might help with the reported problem cross compiling for Android 8799 ("error: expected identifier or '(' before numeric constant") but 8800 shouldn't hurt in any case. 8801 8802 commit d1680d36e17244d9af3843aeb5025cb8e40d6c07 8803 Author: Darren Tucker <dtucker (a] zip.com.au> 8804 Date: Thu Apr 30 09:18:11 2015 +1000 8805 8806 xrealloc -> xreallocarray in portable code too. 8807 8808 commit 531a57a3893f9fcd4aaaba8c312b612bbbcc021e 8809 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8810 Date: Wed Apr 29 03:48:56 2015 +0000 8811 8812 upstream commit 8813 8814 Allow ListenAddress, Port and AddressFamily in any 8815 order. bz#68, ok djm@, jmc@ (for the man page bit). 8816 8817 commit c1d5bcf1aaf1209af02f79e48ba1cbc76a87b56f 8818 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 8819 Date: Tue Apr 28 13:47:38 2015 +0000 8820 8821 upstream commit 8822 8823 enviroment -> environment: apologies to darren for not 8824 spotting that first time round... 8825 8826 commit 43beea053db191cac47c2cd8d3dc1930158aff1a 8827 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8828 Date: Tue Apr 28 10:25:15 2015 +0000 8829 8830 upstream commit 8831 8832 Fix typo in previous 8833 8834 commit 85b96ef41374f3ddc9139581f87da09b2cd9199e 8835 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8836 Date: Tue Apr 28 10:17:58 2015 +0000 8837 8838 upstream commit 8839 8840 Document that the TERM environment variable is not 8841 subject to SendEnv and AcceptEnv. bz#2386, based loosely on a patch from 8842 jjelen at redhat, help and ok jmc@ 8843 8844 commit 88a7c598a94ff53f76df228eeaae238d2d467565 8845 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8846 Date: Mon Apr 27 21:42:48 2015 +0000 8847 8848 upstream commit 8849 8850 Make sshd default to PermitRootLogin=no; ok deraadt@ 8851 rpe@ 8852 8853 commit 734226b4480a6c736096c729fcf6f391400599c7 8854 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8855 Date: Mon Apr 27 01:52:30 2015 +0000 8856 8857 upstream commit 8858 8859 fix compilation with OPENSSL=no; ok dtucker@ 8860 8861 commit a4b9d2ce1eb7703eaf0809b0c8a82ded8aa4f1c6 8862 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8863 Date: Mon Apr 27 00:37:53 2015 +0000 8864 8865 upstream commit 8866 8867 Include stdio.h for FILE (used in sshkey.h) so it 8868 compiles with OPENSSL=no. 8869 8870 commit dbcc652f4ca11fe04e5930c7ef18a219318c6cda 8871 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8872 Date: Mon Apr 27 00:21:21 2015 +0000 8873 8874 upstream commit 8875 8876 allow "sshd -f none" to skip reading the config file, 8877 much like "ssh -F none" does. ok dtucker 8878 8879 commit b7ca276fca316c952f0b90f5adb1448c8481eedc 8880 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 8881 Date: Fri Apr 24 06:26:49 2015 +0000 8882 8883 upstream commit 8884 8885 combine -Dd onto one line and update usage(); 8886 8887 commit 2ea974630d7017e4c7666d14d9dc939707613e96 8888 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8889 Date: Fri Apr 24 05:26:44 2015 +0000 8890 8891 upstream commit 8892 8893 add ssh-agent -D to leave ssh-agent in foreground 8894 without enabling debug mode; bz#2381 ok dtucker@ 8895 8896 commit 8ac2ffd7aa06042f6b924c87139f2fea5c5682f7 8897 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 8898 Date: Fri Apr 24 01:36:24 2015 +0000 8899 8900 upstream commit 8901 8902 2*len -> use xreallocarray() ok djm 8903 8904 commit 657a5fbc0d0aff309079ff8fb386f17e964963c2 8905 Author: deraadt (a] openbsd.org <deraadt (a] openbsd.org> 8906 Date: Fri Apr 24 01:36:00 2015 +0000 8907 8908 upstream commit 8909 8910 rename xrealloc() to xreallocarray() since it follows 8911 that form. ok djm 8912 8913 commit 1108ae242fdd2c304307b68ddf46aebe43ebffaa 8914 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8915 Date: Thu Apr 23 04:59:10 2015 +0000 8916 8917 upstream commit 8918 8919 Two small fixes for sshd -T: ListenAddress'es are added 8920 to a list head so reverse the order when printing them to ensure the 8921 behaviour remains the same, and print StreamLocalBindMask as octal with 8922 leading zero. ok deraadt@ 8923 8924 commit bd902b8473e1168f19378d5d0ae68d0c203525df 8925 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 8926 Date: Thu Apr 23 04:53:53 2015 +0000 8927 8928 upstream commit 8929 8930 Check for and reject missing arguments for 8931 VersionAddendum and ForceCommand. bz#2281, patch from plautrba at redhat com, 8932 ok djm@ 8933 8934 commit ca42c1758575e592239de1d5755140e054b91a0d 8935 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8936 Date: Wed Apr 22 01:24:01 2015 +0000 8937 8938 upstream commit 8939 8940 unknown certificate extensions are non-fatal, so don't 8941 fatal when they are encountered; bz#2387 reported by Bob Van Zant; ok 8942 dtucker@ 8943 8944 commit 39bfbf7caad231cc4bda6909fb1af0705bca04d8 8945 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 8946 Date: Tue Apr 21 07:01:00 2015 +0000 8947 8948 upstream commit 8949 8950 Add back a backslash removed in rev 1.42 so 8951 KEX_SERVER_ENCRYPT will include aes again. 8952 8953 ok deraadt@ 8954 8955 commit 6b0d576bb87eca3efd2b309fcfe4edfefc289f9c 8956 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8957 Date: Fri Apr 17 13:32:09 2015 +0000 8958 8959 upstream commit 8960 8961 s/recommended/required/ that private keys be og-r this 8962 wording change was made a while ago but got accidentally reverted 8963 8964 commit 44a8e7ce6f3ab4c2eb1ae49115c210b98e53c4df 8965 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8966 Date: Fri Apr 17 13:25:52 2015 +0000 8967 8968 upstream commit 8969 8970 don't try to cleanup NULL KEX proposals in 8971 kex_prop_free(); found by Jukka Taimisto and Markus Hietava 8972 8973 commit 3038a191872d2882052306098c1810d14835e704 8974 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8975 Date: Fri Apr 17 13:19:22 2015 +0000 8976 8977 upstream commit 8978 8979 use error/logit/fatal instead of fprintf(stderr, ...) 8980 and exit(0), fix a few errors that were being printed to stdout instead of 8981 stderr and a few non-errors that were going to stderr instead of stdout 8982 bz#2325; ok dtucker 8983 8984 commit a58be33cb6cd24441fa7e634db0e5babdd56f07f 8985 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8986 Date: Fri Apr 17 13:16:48 2015 +0000 8987 8988 upstream commit 8989 8990 debug log missing DISPLAY environment when X11 8991 forwarding requested; bz#1682 ok dtucker@ 8992 8993 commit 17d4d9d9fbc8fb80e322f94d95eecc604588a474 8994 Author: djm (a] openbsd.org <djm (a] openbsd.org> 8995 Date: Fri Apr 17 04:32:31 2015 +0000 8996 8997 upstream commit 8998 8999 don't call record_login() in monitor when UseLogin is 9000 enabled; bz#278 reported by drk AT sgi.com; ok dtucker 9001 9002 commit 40132ff87b6cbc3dc05fb5df2e9d8e3afa06aafd 9003 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 9004 Date: Fri Apr 17 04:12:35 2015 +0000 9005 9006 upstream commit 9007 9008 Add some missing options to sshd -T and fix the output 9009 of VersionAddendum HostCertificate. bz#2346, patch from jjelen at redhat 9010 com, ok djm. 9011 9012 commit 6cc7cfa936afde2d829e56ee6528c7ea47a42441 9013 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 9014 Date: Thu Apr 16 23:25:50 2015 +0000 9015 9016 upstream commit 9017 9018 Document "none" for PidFile XAuthLocation 9019 TrustedUserCAKeys and RevokedKeys. bz#2382, feedback from jmc@, ok djm@ 9020 9021 commit 15fdfc9b1c6808b26bc54d4d61a38b54541763ed 9022 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 9023 Date: Wed Apr 15 23:23:25 2015 +0000 9024 9025 upstream commit 9026 9027 Plug leak of address passed to logging. bz#2373, patch 9028 from jjelen at redhat, ok markus@ 9029 9030 commit bb2289e2a47d465eaaaeff3dee2a6b7777b4c291 9031 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 9032 Date: Tue Apr 14 04:17:03 2015 +0000 9033 9034 upstream commit 9035 9036 Output remote username in debug output since with Host 9037 and Match it's not always obvious what it will be. bz#2368, ok djm@ 9038 9039 commit 70860b6d07461906730632f9758ff1b7c98c695a 9040 Author: Darren Tucker <dtucker (a] zip.com.au> 9041 Date: Fri Apr 17 10:56:13 2015 +1000 9042 9043 Format UsePAM setting when using sshd -T. 9044 9045 Part of bz#2346, patch from jjelen at redhat com. 9046 9047 commit ee15d9c9f0720f5a8b0b34e4b10ecf21f9824814 9048 Author: Darren Tucker <dtucker (a] zip.com.au> 9049 Date: Fri Apr 17 10:40:23 2015 +1000 9050 9051 Wrap endian.h include inside ifdef (bz#2370). 9052 9053 commit 408f4c2ad4a4c41baa7b9b2b7423d875abbfa70b 9054 Author: Darren Tucker <dtucker (a] zip.com.au> 9055 Date: Fri Apr 17 09:39:58 2015 +1000 9056 9057 Look for '${host}-ar' before 'ar'. 9058 9059 This changes configure.ac to look for '${host}-ar' as set by 9060 AC_CANONICAL_HOST before looking for the unprefixed 'ar'. 9061 Useful when cross-compiling when all your binutils are prefixed. 9062 9063 Patch from moben at exherbo org via astrand at lysator liu se and 9064 bz#2352. 9065 9066 commit 673a1c16ad078d41558247ce739fe812c960acc8 9067 Author: Damien Miller <djm (a] google.com> 9068 Date: Thu Apr 16 11:40:20 2015 +1000 9069 9070 remove dependency on arpa/telnet.h 9071 9072 commit 202d443eeda1829d336595a3cfc07827e49f45ed 9073 Author: Darren Tucker <dtucker (a] zip.com.au> 9074 Date: Wed Apr 15 15:59:49 2015 +1000 9075 9076 Remove duplicate include of pwd.h. bz#2337, patch from Mordy Ovits. 9077 9078 commit 597986493412c499f2bc2209420cb195f97b3668 9079 Author: Damien Miller <djm (a] google.com> 9080 Date: Thu Apr 9 10:14:48 2015 +1000 9081 9082 platform's with openpty don't need pty_release 9083 9084 commit 318be28cda1fd9108f2e6f2f86b0b7589ba2aed0 9085 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9086 Date: Mon Apr 13 02:04:08 2015 +0000 9087 9088 upstream commit 9089 9090 deprecate ancient, pre-RFC4419 and undocumented 9091 SSH2_MSG_KEX_DH_GEX_REQUEST_OLD message; ok markus@ deraadt@ "seems 9092 reasonable" dtucker@ 9093 9094 commit d8f391caef62378463a0e6b36f940170dadfe605 9095 Author: dtucker (a] openbsd.org <dtucker (a] openbsd.org> 9096 Date: Fri Apr 10 05:16:50 2015 +0000 9097 9098 upstream commit 9099 9100 Don't send hostkey advertisments 9101 (hostkeys-00 (a] openssh.com) to current versions of Tera Term as they can't 9102 handle them. Newer versions should be OK. Patch from Bryan Drewery and 9103 IWAMOTO Kouichi, ok djm@ 9104 9105 commit 2c2cfe1a1c97eb9a08cc9817fd0678209680c636 9106 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9107 Date: Fri Apr 10 00:08:55 2015 +0000 9108 9109 upstream commit 9110 9111 include port number if a non-default one has been 9112 specified; based on patch from Michael Handler 9113 9114 commit 4492a4f222da4cf1e8eab12689196322e27b08c4 9115 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9116 Date: Tue Apr 7 23:00:42 2015 +0000 9117 9118 upstream commit 9119 9120 treat Protocol=1,2|2,1 as Protocol=2 when compiled 9121 without SSH1 support; ok dtucker@ millert@ 9122 9123 commit c265e2e6e932efc6d86f6cc885dea33637a67564 9124 Author: miod (a] openbsd.org <miod (a] openbsd.org> 9125 Date: Sun Apr 5 15:43:43 2015 +0000 9126 9127 upstream commit 9128 9129 Do not use int for sig_atomic_t; spotted by 9130 christos@netbsd; ok markus@ 9131 9132 commit e7bf3a5eda6a1b02bef6096fed78527ee11e54cc 9133 Author: Darren Tucker <dtucker (a] zip.com.au> 9134 Date: Tue Apr 7 10:48:04 2015 +1000 9135 9136 Use do{}while(0) for no-op functions. 9137 9138 From FreeBSD. 9139 9140 commit bb99844abae2b6447272f79e7fa84134802eb4df 9141 Author: Darren Tucker <dtucker (a] zip.com.au> 9142 Date: Tue Apr 7 10:47:15 2015 +1000 9143 9144 Wrap blf.h include in ifdef. From FreeBSD. 9145 9146 commit d9b9b43656091cf0ad55c122f08fadb07dad0abd 9147 Author: Darren Tucker <dtucker (a] zip.com.au> 9148 Date: Tue Apr 7 09:10:00 2015 +1000 9149 9150 Fix misspellings of regress CONFOPTS env variables. 9151 9152 Patch from Bryan Drewery. 9153 9154 commit 3f4ea3c9ab1d32d43c9222c4351f58ca11144156 9155 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9156 Date: Fri Apr 3 22:17:27 2015 +0000 9157 9158 upstream commit 9159 9160 correct return value in pubkey parsing, spotted by Ben Hawkes 9161 ok markus@ 9162 9163 commit 7da2be0cb9601ed25460c83aa4d44052b967ba0f 9164 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9165 Date: Tue Mar 31 22:59:01 2015 +0000 9166 9167 upstream commit 9168 9169 adapt to recent hostfile.c change: when parsing 9170 known_hosts without fully parsing the keys therein, hostkeys_foreach() will 9171 now correctly identify KEY_RSA1 keys; ok markus@ miod@ 9172 9173 commit 9e1777a0d1c706714b055811c12ab8cc21033e4a 9174 Author: markus (a] openbsd.org <markus (a] openbsd.org> 9175 Date: Tue Mar 24 20:19:15 2015 +0000 9176 9177 upstream commit 9178 9179 use ${SSH} for -Q instead of installed ssh 9180 9181 commit ce1b358ea414a2cc88e4430cd5a2ea7fecd9de57 9182 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9183 Date: Mon Mar 16 22:46:14 2015 +0000 9184 9185 upstream commit 9186 9187 make CLEANFILES clean up more of the tests' droppings 9188 9189 commit 398f9ef192d820b67beba01ec234d66faca65775 9190 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9191 Date: Tue Mar 31 22:57:06 2015 +0000 9192 9193 upstream commit 9194 9195 downgrade error() for known_hosts parse errors to debug() 9196 to quiet warnings from ssh1 keys present when compiled !ssh1. 9197 9198 also identify ssh1 keys when scanning, even when compiled !ssh1 9199 9200 ok markus@ miod@ 9201 9202 commit 9a47ab80030a31f2d122b8fd95bd48c408b9fcd9 9203 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9204 Date: Tue Mar 31 22:55:50 2015 +0000 9205 9206 upstream commit 9207 9208 fd leak for !ssh1 case; found by unittests; ok markus@ 9209 9210 commit c9a0805a6280681901c270755a7cd630d7c5280e 9211 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9212 Date: Tue Mar 31 22:55:24 2015 +0000 9213 9214 upstream commit 9215 9216 don't fatal when a !ssh1 sshd is reexeced from a w/ssh1 9217 listener; reported by miod@; ok miod@ markus@ 9218 9219 commit 704d8c88988cae38fb755a6243b119731d223222 9220 Author: tobias (a] openbsd.org <tobias (a] openbsd.org> 9221 Date: Tue Mar 31 11:06:49 2015 +0000 9222 9223 upstream commit 9224 9225 Comments are only supported for RSA1 keys. If a user 9226 tried to add one and entered his passphrase, explicitly clear it before exit. 9227 This is done in all other error paths, too. 9228 9229 ok djm 9230 9231 commit 78de1673c05ea2c33e0d4a4b64ecb5186b6ea2e9 9232 Author: jmc (a] openbsd.org <jmc (a] openbsd.org> 9233 Date: Mon Mar 30 18:28:37 2015 +0000 9234 9235 upstream commit 9236 9237 ssh-askpass(1) is the default, overridden by SSH_ASKPASS; 9238 diff originally from jiri b; 9239 9240 commit 26e0bcf766fadb4a44fb6199386fb1dcab65ad00 9241 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9242 Date: Mon Mar 30 00:00:29 2015 +0000 9243 9244 upstream commit 9245 9246 fix uninitialised memory read when parsing a config file 9247 consisting of a single nul byte. Found by hanno AT hboeck.de using AFL; ok 9248 dtucker 9249 9250 commit fecede00a76fbb33a349f5121c0b2f9fbc04a777 9251 Author: markus (a] openbsd.org <markus (a] openbsd.org> 9252 Date: Thu Mar 26 19:32:19 2015 +0000 9253 9254 upstream commit 9255 9256 sigp and lenp are not optional in ssh_agent_sign(); ok 9257 djm@ 9258 9259 commit 1b0ef3813244c78669e6d4d54c624f600945327d 9260 Author: naddy (a] openbsd.org <naddy (a] openbsd.org> 9261 Date: Thu Mar 26 12:32:38 2015 +0000 9262 9263 upstream commit 9264 9265 don't try to load .ssh/identity by default if SSH1 is 9266 disabled; ok markus@ 9267 9268 commit f9b78852379b74a2d14e6fc94fe52af30b7e9c31 9269 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9270 Date: Thu Mar 26 07:00:04 2015 +0000 9271 9272 upstream commit 9273 9274 ban all-zero curve25519 keys as recommended by latest 9275 CFRG curves draft; ok markus 9276 9277 commit b8afbe2c1aaf573565e4da775261dfafc8b1ba9c 9278 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9279 Date: Thu Mar 26 06:59:28 2015 +0000 9280 9281 upstream commit 9282 9283 relax bits needed check to allow 9284 diffie-hellman-group1-sha1 key exchange to complete for chacha20-poly1305 was 9285 selected as symmetric cipher; ok markus 9286 9287 commit 47842f71e31da130555353c1d57a1e5a8937f1c0 9288 Author: markus (a] openbsd.org <markus (a] openbsd.org> 9289 Date: Wed Mar 25 19:29:58 2015 +0000 9290 9291 upstream commit 9292 9293 ignore v1 errors on ssh-add -D; only try v2 keys on 9294 -l/-L (unless WITH_SSH1) ok djm@ 9295 9296 commit 5f57e77f91bf2230c09eca96eb5ecec39e5f2da6 9297 Author: markus (a] openbsd.org <markus (a] openbsd.org> 9298 Date: Wed Mar 25 19:21:48 2015 +0000 9299 9300 upstream commit 9301 9302 unbreak ssh_agent_sign (lenp vs *lenp) 9303 9304 commit 4daeb67181054f2a377677fac919ee8f9ed3490e 9305 Author: markus (a] openbsd.org <markus (a] openbsd.org> 9306 Date: Tue Mar 24 20:10:08 2015 +0000 9307 9308 upstream commit 9309 9310 don't leak 'setp' on error; noted by Nicholas Lemonias; 9311 ok djm@ 9312 9313 commit 7d4f96f9de2a18af0d9fa75ea89a4990de0344f5 9314 Author: markus (a] openbsd.org <markus (a] openbsd.org> 9315 Date: Tue Mar 24 20:09:11 2015 +0000 9316 9317 upstream commit 9318 9319 consistent check for NULL as noted by Nicholas 9320 Lemonias; ok djm@ 9321 9322 commit df100be51354e447d9345cf1ec22e6013c0eed50 9323 Author: markus (a] openbsd.org <markus (a] openbsd.org> 9324 Date: Tue Mar 24 20:03:44 2015 +0000 9325 9326 upstream commit 9327 9328 correct fmt-string for size_t as noted by Nicholas 9329 Lemonias; ok djm@ 9330 9331 commit a22b9ef21285e81775732436f7c84a27bd3f71e0 9332 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9333 Date: Tue Mar 24 09:17:21 2015 +0000 9334 9335 upstream commit 9336 9337 promote chacha20-poly1305 (a] openssh.com to be the default 9338 cipher; ok markus 9339 9340 commit 2aa9da1a3b360cf7b13e96fe1521534b91501fb5 9341 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9342 Date: Tue Mar 24 01:29:19 2015 +0000 9343 9344 upstream commit 9345 9346 Compile-time disable SSH protocol 1. You can turn it 9347 back on using the Makefile.inc knob if you need it to talk to ancient 9348 devices. 9349 9350 commit 53097b2022154edf96b4e8526af5666f979503f7 9351 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9352 Date: Tue Mar 24 01:11:12 2015 +0000 9353 9354 upstream commit 9355 9356 fix double-negative error message "ssh1 is not 9357 unsupported" 9358 9359 commit 5c27e3b6ec2db711dfcd40e6359c0bcdd0b62ea9 9360 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9361 Date: Mon Mar 23 06:06:38 2015 +0000 9362 9363 upstream commit 9364 9365 for ssh-keygen -A, don't try (and fail) to generate ssh 9366 v.1 keys when compiled without SSH1 support RSA/DSA/ECDSA keys when compiled 9367 without OpenSSL based on patch by Mike Frysinger; bz#2369 9368 9369 commit 725fd22a8c41db7de73a638539a5157b7e4424ae 9370 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9371 Date: Wed Mar 18 01:44:21 2015 +0000 9372 9373 upstream commit 9374 9375 KRL support doesn't need OpenSSL anymore, remove #ifdefs 9376 from around call 9377 9378 commit b07011c18e0b2e172c5fd09d21fb159a0bf5fcc7 9379 Author: djm (a] openbsd.org <djm (a] openbsd.org> 9380 Date: Mon Mar 16 11:09:52 2015 +0000 9381 9382 upstream commit 9383 9384 #if 0 some more arrays used only for decrypting (we don't 9385 use since we only need encrypt for AES-CTR) 9386 9387 commit 1cb3016635898d287e9d58b50c430995652d5358 9388 Author: jsg (a] openbsd.org <jsg (a] openbsd.org> 9389 Date: Wed Mar 11 00:48:39 2015 +0000 9390 9391 upstream commit 9392 9393 add back the changes from rev 1.206, djm reverted this by 9394 mistake in rev 1.207 9395
