1 commit 4a354fc231174901f2629437c2a6e924a2dd6772
2 Author: Damien Miller <djm@mindrot.org>
3 Date: Mon Dec 19 15:59:26 2016 +1100
5 crank version numbers for release
7 commit 5f8d0bb8413d4d909cc7aa3c616fb0538224c3c9
8 Author: djm@openbsd.org <djm@openbsd.org>
9 Date: Mon Dec 19 04:55:51 2016 +0000
15 Upstream-ID: 1ee404adba6bbe10ae9277cbae3a94abe2867b79
17 commit 3a8213ea0ed843523e34e55ab9c852332bab4c7b
18 Author: djm@openbsd.org <djm@openbsd.org>
19 Date: Mon Dec 19 04:55:18 2016 +0000
23 remove testcase that depends on exact output and
24 behaviour of snprintf(..., "%s", NULL)
26 Upstream-Regress-ID: cab4288531766bd9593cb556613b91a2eeefb56f
28 commit eae735a82d759054f6ec7b4e887fb7a5692c66d7
29 Author: dtucker@openbsd.org <dtucker@openbsd.org>
30 Date: Mon Dec 19 03:32:57 2016 +0000
34 Use LOGNAME to get current user and fall back to whoami if
35 not set. Mainly to benefit -portable since some platforms don't have whoami.
37 Upstream-Regress-ID: e3a16b7836a3ae24dc8f8a4e43fdf8127a60bdfa
39 commit 0d2f88428487518eea60602bd593989013831dcf
40 Author: dtucker@openbsd.org <dtucker@openbsd.org>
41 Date: Fri Dec 16 03:51:19 2016 +0000
45 Add regression test for AllowUsers and DenyUsers. Patch from
46 Zev Weiss <zev at bewilderbeest.net>
48 Upstream-Regress-ID: 8f1aac24d52728398871dac14ad26ea38b533fb9
50 commit 3bc8180a008929f6fe98af4a56fb37d04444b417
51 Author: Darren Tucker <dtucker@zip.com.au>
52 Date: Fri Dec 16 15:02:24 2016 +1100
54 Add missing monitor.h include.
56 Fixes warning pointed out by Zev Weiss <zev at bewilderbeest.net>
58 commit 410681f9015d76cc7b137dd90dac897f673244a0
59 Author: djm@openbsd.org <djm@openbsd.org>
60 Date: Fri Dec 16 02:48:55 2016 +0000
64 revert to rev1.2; the new bits in this test depend on changes
65 to ssh that aren't yet committed
67 Upstream-Regress-ID: 828ffc2c7afcf65d50ff2cf3dfc47a073ad39123
69 commit 2f2ffa4fbe4b671bbffa0611f15ba44cff64d58e
70 Author: dtucker@openbsd.org <dtucker@openbsd.org>
71 Date: Fri Dec 16 01:06:27 2016 +0000
75 Move the "stop sshd" code into its own helper function.
76 Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@
78 Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329
80 commit e15e7152331e3976b35475fd4e9c72897ad0f074
81 Author: djm@openbsd.org <djm@openbsd.org>
82 Date: Fri Dec 16 01:01:07 2016 +0000
86 regression test for certificates along with private key
87 with no public half. bz#2617, mostly from Adam Eijdenberg
89 Upstream-Regress-ID: 2e74dc2c726f4dc839609b3ce045466b69f01115
91 commit 9a70ec085faf6e55db311cd1a329f1a35ad2a500
92 Author: dtucker@openbsd.org <dtucker@openbsd.org>
93 Date: Thu Dec 15 23:50:37 2016 +0000
97 Use $SUDO to read pidfile in case root's umask is
98 restricted. From portable.
100 Upstream-Regress-ID: f6b1c7ffbc5a0dfb7d430adb2883344899174a98
102 commit fe06b68f824f8f55670442fb31f2c03526dd326c
103 Author: dtucker@openbsd.org <dtucker@openbsd.org>
104 Date: Thu Dec 15 21:29:05 2016 +0000
108 Add missing braces in DenyUsers code. Patch from zev at
109 bewilderbeest.net, ok deraadt@
111 Upstream-ID: d747ace338dcf943b077925f90f85f789714b54e
113 commit dcc7d74242a574fd5c4afbb4224795b1644321e7
114 Author: dtucker@openbsd.org <dtucker@openbsd.org>
115 Date: Thu Dec 15 21:20:41 2016 +0000
119 Fix text in error message. Patch from zev at
122 Upstream-ID: deb0486e175e7282f98f9a15035d76c55c84f7f6
124 commit b737e4d7433577403a31cff6614f6a1b0b5e22f4
125 Author: djm@openbsd.org <djm@openbsd.org>
126 Date: Wed Dec 14 00:36:34 2016 +0000
130 disable Unix-domain socket forwarding when privsep is
133 Upstream-ID: ab61516ae0faadad407857808517efa900a0d6d0
135 commit 08a1e7014d65c5b59416a0e138c1f73f417496eb
136 Author: djm@openbsd.org <djm@openbsd.org>
137 Date: Fri Dec 9 03:04:29 2016 +0000
141 log connections dropped in excess of MaxStartups at
142 verbose LogLevel; bz#2613 based on diff from Tomas Kuthan; ok dtucker@
144 Upstream-ID: 703ae690dbf9b56620a6018f8a3b2389ce76d92b
146 commit 10e290ec00964b2bf70faab15a10a5574bb80527
147 Author: Darren Tucker <dtucker@zip.com.au>
148 Date: Tue Dec 13 13:51:32 2016 +1100
150 Get default of TEST_SSH_UTF8 from environment.
152 commit b9b8ba3f9ed92c6220b58d70d1e6d8aa3eea1104
153 Author: Darren Tucker <dtucker@zip.com.au>
154 Date: Tue Dec 13 12:56:40 2016 +1100
156 Remove commented-out includes.
158 These commented-out includes have "Still needed?" comments. Since
159 they've been commented out for ~13 years I assert that they're not.
161 commit 25275f1c9d5f01a0877d39444e8f90521a598ea0
162 Author: Darren Tucker <dtucker@zip.com.au>
163 Date: Tue Dec 13 12:54:23 2016 +1100
165 Add prototype for strcasestr in compat library.
167 commit afec07732aa2985142f3e0b9a01eb6391f523dec
168 Author: Darren Tucker <dtucker@zip.com.au>
169 Date: Tue Dec 13 10:23:03 2016 +1100
171 Add strcasestr to compat library.
173 Fixes build on (at least) Solaris 10.
175 commit dda78a03af32e7994f132d923c2046e98b7c56c8
176 Author: Damien Miller <djm@mindrot.org>
177 Date: Mon Dec 12 13:57:10 2016 +1100
179 Force Turkish locales back to C/POSIX; bz#2643
181 Turkish locales are unique in their handling of the letters 'i' and
182 'I' (yes, they are different letters) and OpenSSH isn't remotely
183 prepared to deal with that. For now, the best we can do is to force
184 OpenSSH to use the C/POSIX locale and try to preserve the UTF-8
185 encoding if possible.
189 commit c35995048f41239fc8895aadc3374c5f75180554
190 Author: Darren Tucker <dtucker@zip.com.au>
191 Date: Fri Dec 9 12:52:02 2016 +1100
193 exit is in stdlib.h not unistd.h (that's _exit).
195 commit d399a8b914aace62418c0cfa20341aa37a192f98
196 Author: Darren Tucker <dtucker@zip.com.au>
197 Date: Fri Dec 9 12:33:25 2016 +1100
199 Include <unistd.h> for exit in utf8 locale test.
201 commit 47b8c99ab3221188ad3926108dd9d36da3b528ec
202 Author: Darren Tucker <dtucker@zip.com.au>
203 Date: Thu Dec 8 15:48:34 2016 +1100
205 Check for utf8 local support before testing it.
207 Check for utf8 local support and if not found, do not attempt to run the
208 utf8 tests. Suggested by djm@
210 commit 4089fc1885b3a2822204effbb02b74e3da58240d
211 Author: Darren Tucker <dtucker@zip.com.au>
212 Date: Thu Dec 8 12:57:24 2016 +1100
214 Use AC_PATH_TOOL for krb5-config.
216 This will use the host-prefixed version when cross compiling; patch from
217 david.michael at coreos.com.
219 commit b4867e0712c89b93be905220c82f0a15e6865d1e
220 Author: djm@openbsd.org <djm@openbsd.org>
221 Date: Tue Dec 6 07:48:01 2016 +0000
225 make IdentityFile successfully load and use certificates that
226 have no corresponding bare public key. E.g. just a private id_rsa and
227 certificate id_rsa-cert.pub (and no id_rsa.pub).
231 Upstream-ID: c1e9699b8c0e3b63cc4189e6972e3522b6292604
233 commit c9792783a98881eb7ed295680013ca97a958f8ac
234 Author: Damien Miller <djm@mindrot.org>
235 Date: Fri Nov 25 14:04:21 2016 +1100
237 Add a gnome-ssh-askpass3 target for GTK+3 version
239 Based on patch from Colin Watson via bz#2640
241 commit 7be85ae02b9de0993ce0a1d1e978e11329f6e763
242 Author: Damien Miller <djm@mindrot.org>
243 Date: Fri Nov 25 14:03:53 2016 +1100
245 Make gnome-ssh-askpass2.c GTK+3-friendly
247 Patch from Colin Watson via bz#2640
249 commit b9844a45c7f0162fd1b5465683879793d4cc4aaa
250 Author: djm@openbsd.org <djm@openbsd.org>
251 Date: Sun Dec 4 23:54:02 2016 +0000
255 Fix public key authentication when multiple
256 authentication is in use. Instead of deleting and re-preparing the entire
257 keys list, just reset the 'used' flags; the keys list is already in a good
258 order (with already- tried keys at the back)
260 Analysis and patch from Vincent Brillault on bz#2642; ok dtucker@
262 Upstream-ID: 7123f12dc2f3bcaae715853035a97923d7300176
264 commit f2398eb774075c687b13af5bc22009eb08889abe
265 Author: dtucker@openbsd.org <dtucker@openbsd.org>
266 Date: Sun Dec 4 22:27:25 2016 +0000
270 Unlink PidFile on SIGHUP and always recreate it when the
271 new sshd starts. Regression tests (and possibly other things) depend on the
272 pidfile being recreated after SIGHUP, and unlinking it means it won't contain
273 a stale pid if sshd fails to restart. ok djm@ markus@
275 Upstream-ID: 132dd6dda0c77dd49d2f15b2573b5794f6160870
277 commit 85aa2efeba51a96bf6834f9accf2935d96150296
278 Author: djm@openbsd.org <djm@openbsd.org>
279 Date: Wed Nov 30 03:01:33 2016 +0000
283 test new behaviour of cert force-command restriction vs.
284 authorized_key/ principals
286 Upstream-Regress-ID: 399efa7469d40c404c0b0a295064ce75d495387c
288 commit 5d333131cd8519d022389cfd3236280818dae1bc
289 Author: jmc@openbsd.org <jmc@openbsd.org>
290 Date: Wed Nov 30 06:54:26 2016 +0000
294 tweak previous; while here fix up FILES and AUTHORS;
296 Upstream-ID: 93f6e54086145a75df8d8ec7d8689bdadbbac8fa
298 commit 786d5994da79151180cb14a6cf157ebbba61c0cc
299 Author: djm@openbsd.org <djm@openbsd.org>
300 Date: Wed Nov 30 03:07:37 2016 +0000
304 add a whitelist of paths from which ssh-agent will load
305 (via ssh-pkcs11-helper) a PKCS#11 module; ok markus@
307 Upstream-ID: fe79769469d9cd6d26fe0dc15751b83ef2a06e8f
309 commit 7844f357cdd90530eec81340847783f1f1da010b
310 Author: djm@openbsd.org <djm@openbsd.org>
311 Date: Wed Nov 30 03:00:05 2016 +0000
315 Add a sshd_config DisableForwaring option that disables
316 X11, agent, TCP, tunnel and Unix domain socket forwarding, as well as
317 anything else we might implement in the future.
319 This, like the 'restrict' authorized_keys flag, is intended to be a
320 simple and future-proof way of restricting an account. Suggested as
321 a complement to 'restrict' by Jann Horn; ok markus@
323 Upstream-ID: 203803f66e533a474086b38a59ceb4cf2410fcf7
325 commit fd6dcef2030d23c43f986d26979f84619c10589d
326 Author: djm@openbsd.org <djm@openbsd.org>
327 Date: Wed Nov 30 02:57:40 2016 +0000
331 When a forced-command appears in both a certificate and
332 an authorized keys/principals command= restriction, refuse to accept the
333 certificate unless they are identical.
335 The previous (documented) behaviour of having the certificate forced-
336 command override the other could be a bit confused and more error-prone.
338 Pointed out by Jann Horn of Project Zero; ok dtucker@
340 Upstream-ID: 79d811b6eb6bbe1221bf146dde6928f92d2cd05f
342 commit 7fc4766ac78abae81ee75b22b7550720bfa28a33
343 Author: dtucker@openbsd.org <dtucker@openbsd.org>
344 Date: Wed Nov 30 00:28:31 2016 +0000
348 On startup, check to see if sshd is already daemonized
349 and if so, skip the call to daemon() and do not rewrite the PidFile. This
350 means that when sshd re-execs itself on SIGHUP the process ID will no longer
351 change. Should address bz#2641. ok djm@ markus@.
353 Upstream-ID: 5ea0355580056fb3b25c1fd6364307d9638a37b9
355 commit c9f880c195c65f1dddcbc4ce9d6bfea7747debcc
356 Author: Damien Miller <djm@mindrot.org>
357 Date: Wed Nov 30 13:51:49 2016 +1100
359 factor out common PRNG reseed before privdrop
361 Add a call to RAND_poll() to ensure than more than pid+time gets
362 stirred into child processes states. Prompted by analysis from Jann
363 Horn at Project Zero. ok dtucker@
365 commit 79e4829ec81dead1b30999e1626eca589319a47f
366 Author: dtucker@openbsd.org <dtucker@openbsd.org>
367 Date: Fri Nov 25 03:02:01 2016 +0000
371 Allow PuTTY interop tests to run unattended. bz#2639,
372 patch from cjwatson at debian.org.
374 Upstream-Regress-ID: 4345253558ac23b2082aebabccd48377433b6fe0
376 commit 504c3a9a1bf090f6b27260fc3e8ea7d984d163dc
377 Author: dtucker@openbsd.org <dtucker@openbsd.org>
378 Date: Fri Nov 25 02:56:49 2016 +0000
382 Reverse args to sshd-log-wrapper. Matches change in
383 portable, where it allows sshd do be optionally run under Valgrind.
385 Upstream-Regress-ID: b438d1c6726dc5caa2a45153e6103a0393faa906
387 commit bd13017736ec2f8f9ca498fe109fb0035f322733
388 Author: dtucker@openbsd.org <dtucker@openbsd.org>
389 Date: Fri Nov 25 02:49:18 2016 +0000
393 Fix typo in trace message; from portable.
395 Upstream-Regress-ID: 4c4a2ba0d37faf5fd230a91b4c7edb5699fbd73a
397 commit 7da751d8b007c7f3e814fd5737c2351440d78b4c
398 Author: tb@openbsd.org <tb@openbsd.org>
399 Date: Tue Nov 1 13:43:27 2016 +0000
403 Clean up MALLOC_OPTIONS. For the unittests, move
404 MALLOC_OPTIONS and TEST_ENV to unittets/Makefile.inc.
408 Upstream-Regress-ID: 890d497e0a38eeddfebb11cc429098d76cf29f12
410 commit 36f58e68221bced35e06d1cca8d97c48807a8b71
411 Author: tb@openbsd.org <tb@openbsd.org>
412 Date: Mon Oct 31 23:45:08 2016 +0000
416 Remove the obsolete A and P flags from MALLOC_OPTIONS.
420 Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59
422 commit b0899ee26a6630883c0f2350098b6a35e647f512
423 Author: dtucker@openbsd.org <dtucker@openbsd.org>
424 Date: Tue Nov 29 03:54:50 2016 +0000
428 Factor out code to disconnect from controlling terminal
429 into its own function. ok djm@
431 Upstream-ID: 39fd9e8ebd7222615a837312face5cc7ae962885
433 commit 54d022026aae4f53fa74cc636e4a032d9689b64d
434 Author: djm@openbsd.org <djm@openbsd.org>
435 Date: Fri Nov 25 23:24:45 2016 +0000
439 use sshbuf_allocate() to pre-allocate the buffer used for
440 loading keys. This avoids implicit realloc inside the buffer code, which
441 might theoretically leave fragments of the key on the heap. This doesn't
442 appear to happen in practice for normal sized keys, but was observed for
443 novelty oversize ones.
445 Pointed out by Jann Horn of Project Zero; ok markus@
447 Upstream-ID: d620e1d46a29fdea56aeadeda120879eddc60ab1
449 commit a9c746088787549bb5b1ae3add7d06a1b6d93d5e
450 Author: djm@openbsd.org <djm@openbsd.org>
451 Date: Fri Nov 25 23:22:04 2016 +0000
455 split allocation out of sshbuf_reserve() into a separate
456 sshbuf_allocate() function; ok markus@
458 Upstream-ID: 11b8a2795afeeb1418d508a2c8095b3355577ec2
460 commit f0ddedee460486fa0e32fefb2950548009e5026e
461 Author: markus@openbsd.org <markus@openbsd.org>
462 Date: Wed Nov 23 23:14:15 2016 +0000
466 allow ClientAlive{Interval,CountMax} in Match; ok dtucker,
469 Upstream-ID: 8beb4c1eadd588f1080b58932281983864979f55
471 commit 1a6f9d2e2493d445cd9ee496e6e3c2a2f283f66a
472 Author: djm@openbsd.org <djm@openbsd.org>
473 Date: Tue Nov 8 22:04:34 2016 +0000
477 unbreak DenyUsers; reported by henning@
479 Upstream-ID: 1c67d4148f5e953c35acdb62e7c08ae8e33f7cb2
481 commit 010359b32659f455fddd2bd85fd7cc4d7a3b994a
482 Author: djm@openbsd.org <djm@openbsd.org>
483 Date: Sun Nov 6 05:46:37 2016 +0000
487 Validate address ranges for AllowUser/DenyUsers at
488 configuration load time and refuse to accept bad ones. It was previously
489 possible to specify invalid CIDR address ranges (e.g. djm@127.1.2.3/55) and
490 these would always match.
492 Thanks to Laurence Parry for a detailed bug report. ok markus (for
493 a previous diff version)
495 Upstream-ID: 9dfcdd9672b06e65233ea4434c38226680d40bfb
497 commit efb494e81d1317209256b38b49f4280897c61e69
498 Author: djm@openbsd.org <djm@openbsd.org>
499 Date: Fri Oct 28 03:33:52 2016 +0000
503 Improve pkcs11_add_provider() logging: demote some
504 excessively verbose error()s to debug()s, include PKCS#11 provider name and
505 slot in log messages where possible. bz#2610, based on patch from Jakub Jelen
507 Upstream-ID: 3223ef693cfcbff9079edfc7e89f55bf63e1973d
509 commit 5ee3fb5affd7646f141749483205ade5fc54adaf
510 Author: Darren Tucker <dtucker@zip.com.au>
511 Date: Tue Nov 1 08:12:33 2016 +1100
513 Use ptrace(PT_DENY_ATTACH, ..) on OS X.
515 commit 315d2a4e674d0b7115574645cb51f968420ebb34
516 Author: Damien Miller <djm@mindrot.org>
517 Date: Fri Oct 28 14:34:07 2016 +1100
519 Unbreak AES-CTR ciphers on old (~0.9.8) OpenSSL
523 commit a9ff3950b8e80ff971b4d44bbce96df27aed28af
524 Author: Darren Tucker <dtucker@zip.com.au>
525 Date: Fri Oct 28 14:26:58 2016 +1100
527 Move OPENSSL_NO_RIPEMD160 to compat.
529 Move OPENSSL_NO_RIPEMD160 to compat and add ifdefs to mac.c around the
532 commit bce58885160e5db2adda3054c3b81fe770f7285a
533 Author: Darren Tucker <dtucker@zip.com.au>
534 Date: Fri Oct 28 13:52:31 2016 +1100
536 Check if RIPEMD160 is disabled in OpenSSL.
538 commit d924640d4c355d1b5eca1f4cc60146a9975dbbff
539 Author: Darren Tucker <dtucker@zip.com.au>
540 Date: Fri Oct 28 13:38:19 2016 +1100
542 Skip ssh1 specfic ciphers.
544 cipher-3des1.c and cipher-bf1.c are specific to sshv1 so don't even try
545 to compile them when Protocol 1 is not enabled.
547 commit 79d078e7a49caef746516d9710ec369ba45feab6
548 Author: jsg@openbsd.org <jsg@openbsd.org>
549 Date: Tue Oct 25 04:08:13 2016 +0000
553 Fix logic in add_local_forward() that inverted a test
554 when code was refactored out into bind_permitted(). This broke ssh port
555 forwarding for non-priv ports as a non root user.
557 ok dtucker@ 'looks good' deraadt@
559 Upstream-ID: ddb8156ca03cc99997de284ce7777536ff9570c9
561 commit a903e315dee483e555c8a3a02c2946937f9b4e5d
562 Author: dtucker@openbsd.org <dtucker@openbsd.org>
563 Date: Mon Oct 24 01:09:17 2016 +0000
567 Remove dead breaks, found via opencoverage.net. ok
570 Upstream-ID: ad9cc655829d67fad219762810770787ba913069
572 commit b4e96b4c9bea4182846e4942ba2048e6d708ee54
573 Author: Darren Tucker <dtucker@zip.com.au>
574 Date: Wed Oct 26 08:43:25 2016 +1100
576 Use !=NULL instead of >0 for getdefaultproj.
578 getdefaultproj() returns a pointer so test it for NULL inequality
579 instead of >0. Fixes compiler warning and is more correct. Patch from
582 commit 1c4ef0b808d3d38232aeeb1cebb7e9a43def42c5
583 Author: dtucker@openbsd.org <dtucker@openbsd.org>
584 Date: Sun Oct 23 22:04:05 2016 +0000
588 Factor out "can bind to low ports" check into its own function. This will
589 make it easier for Portable to support platforms with permissions models
590 other than uid==0 (eg bz#2625). ok djm@, "doesn't offend me too much"
593 Upstream-ID: 86213df4183e92b8f189a6d2dac858c994bfface
595 commit 0b9ee623d57e5de7e83e66fd61a7ba9a5be98894
596 Author: dtucker@openbsd.org <dtucker@openbsd.org>
597 Date: Wed Oct 19 23:21:56 2016 +0000
601 When tearing down ControlMaster connecctions, don't
602 pollute stderr when LogLevel=quiet. Patch from Tim Kuijsten via tech@.
604 Upstream-ID: d9b3a68b2a7c2f2fc7f74678e29a4618d55ceced
606 commit 09e6a7d8354224933febc08ddcbc2010f542284e
607 Author: Darren Tucker <dtucker@zip.com.au>
608 Date: Mon Oct 24 09:06:18 2016 +1100
610 Wrap stdint.h include in ifdef.
612 commit 08d9e9516e587b25127545c029e5464b2e7f2919
613 Author: Darren Tucker <dtucker@zip.com.au>
614 Date: Fri Oct 21 09:46:46 2016 +1100
618 commit 461f50e7ab8751d3a55e9158c44c13031db7ba1d
619 Author: Darren Tucker <dtucker@zip.com.au>
620 Date: Fri Oct 21 06:55:58 2016 +1100
622 Update links to https.
624 www.openssh.com now supports https and ftp.openbsd.org no longer
625 supports ftp. Make all links to these https.
627 commit dd4e7212a6141f37742de97795e79db51e4427ad
628 Author: Darren Tucker <dtucker@zip.com.au>
629 Date: Fri Oct 21 06:48:46 2016 +1100
631 Update host key generation examples.
633 Remove ssh1 host key generation, add ssh-keygen -A
635 commit 6d49ae82634c67e9a4d4af882bee20b40bb8c639
636 Author: Darren Tucker <dtucker@zip.com.au>
637 Date: Fri Oct 21 05:22:55 2016 +1100
641 Make links to openssh.com HTTPS now that it's supported, point release
642 notes link to the HTML release notes page, and update a couple of other
643 links and bits of text.
645 commit fe0d1ca6ace06376625084b004ee533f2c2ea9d6
646 Author: Darren Tucker <dtucker@zip.com.au>
647 Date: Thu Oct 20 03:42:09 2016 +1100
649 Remote channels .orig and .rej files.
651 These files were incorrectly added during an OpenBSD sync.
653 commit 246aa842a4ad368d8ce030495e657ef3a0e1f95c
654 Author: dtucker@openbsd.org <dtucker@openbsd.org>
655 Date: Tue Oct 18 17:32:54 2016 +0000
659 Remove channel_input_port_forward_request(); the only caller
660 was the recently-removed SSH1 server code so it's now dead code. ok markus@
662 Upstream-ID: 05453983230a1f439562535fec2818f63f297af9
664 commit 2c6697c443d2c9c908260eed73eb9143223e3ec9
665 Author: millert@openbsd.org <millert@openbsd.org>
666 Date: Tue Oct 18 12:41:22 2016 +0000
670 Install a signal handler for tty-generated signals and
671 wait for the ssh child to suspend before suspending sftp. This lets ssh
672 restore the terminal mode as needed when it is suspended at the password
675 Upstream-ID: a31c1f42aa3e2985dcc91e46e6a17bd22e372d69
677 commit fd2a8f1033fa2316fff719fd5176968277560158
678 Author: jmc@openbsd.org <jmc@openbsd.org>
679 Date: Sat Oct 15 19:56:25 2016 +0000
683 various formatting fixes, specifically removing Dq;
685 Upstream-ID: 81e85df2b8e474f5f93d66e61d9a4419ce87347c
687 commit 8f866d8a57b9a2dc5dd04504e27f593b551618e3
688 Author: Darren Tucker <dtucker@zip.com.au>
689 Date: Wed Oct 19 03:26:09 2016 +1100
691 Import readpassphrase.c rev 1.26.
693 Author: miller@openbsd.org:
694 Avoid generate SIGTTOU when restoring the terminal mode. If we get
695 SIGTTOU it means the process is not in the foreground process group
696 which, in most cases, means that the shell has taken control of the tty.
697 Requiring the user the fg the process in this case doesn't make sense
698 and can result in both SIGTSTP and SIGTTOU being sent which can lead to
699 the process being suspended again immediately after being brought into
702 commit f901440cc844062c9bab0183d133f7ccc58ac3a5
703 Author: Darren Tucker <dtucker@zip.com.au>
704 Date: Wed Oct 19 03:23:16 2016 +1100
706 Import readpassphrase.c rev 1.25.
708 Wrap <readpassphrase.h> so internal calls go direct and
709 readpassphrase is weak.
711 (DEF_WEAK is a no-op in portable.)
713 commit 032147b69527e5448a511049b2d43dbcae582624
714 Author: Darren Tucker <dtucker@zip.com.au>
715 Date: Sat Oct 15 05:51:12 2016 +1100
717 Move DEF_WEAK into defines.h.
719 As well pull in more recent changes from OpenBSD these will start to
720 arrive so put it where the definition is shared.
722 commit e0259a82ddd950cfb109ddee86fcebbc09c6bd04
723 Author: Darren Tucker <dtucker@zip.com.au>
724 Date: Sat Oct 15 04:34:46 2016 +1100
726 Remove do_pam_set_tty which is dead code.
728 The callers of do_pam_set_tty were removed in 2008, so this is now dead
729 code. bz#2604, pointed out by jjelen at redhat.com.
731 commit ca04de83f210959ad2ed870a30ba1732c3ae00e3
732 Author: Damien Miller <djm@mindrot.org>
733 Date: Thu Oct 13 18:53:43 2016 +1100
735 unbreak principals-command test
737 Undo inconsistetly updated variable name.
739 commit 1723ec92eb485ce06b4cbf49712d21975d873909
740 Author: djm@openbsd.org <djm@openbsd.org>
741 Date: Tue Oct 11 21:49:54 2016 +0000
745 fix the KEX fuzzer - the previous method of obtaining the
746 packet contents was broken. This now uses the new per-packet input hook, so
747 it sees exact post-decrypt packets and doesn't have to pass packet integrity
750 Upstream-Regress-ID: 402fb6ffabd97de590e8e57b25788949dce8d2fd
752 commit 09f997893f109799cddbfce6d7e67f787045cbb2
753 Author: natano@openbsd.org <natano@openbsd.org>
754 Date: Thu Oct 6 09:31:38 2016 +0000
758 Move USER out of the way to unbreak the BUILDUSER
761 Upstream-Regress-ID: 74ab9687417dd071d62316eaadd20ddad1d5af3c
763 commit 3049a012c482a7016f674db168f23fd524edce27
764 Author: bluhm@openbsd.org <bluhm@openbsd.org>
765 Date: Fri Sep 30 11:55:20 2016 +0000
769 In ssh tests set REGRESS_FAIL_EARLY with ?= so that the
770 environment can change it. OK djm@
772 Upstream-Regress-ID: 77bcb50e47b68c7209c7f0a5a020d73761e5143b
774 commit 39af7b444db28c1cb01b7ea468a4f574a44f375b
775 Author: djm@openbsd.org <djm@openbsd.org>
776 Date: Tue Oct 11 21:47:45 2016 +0000
780 Add a per-packet input hook that is called with the
781 decrypted packet contents. This will be used for fuzzing; ok markus@
783 Upstream-ID: a3221cee6b1725dd4ae1dd2c13841b4784cb75dc
785 commit ec165c392ca54317dbe3064a8c200de6531e89ad
786 Author: markus@openbsd.org <markus@openbsd.org>
787 Date: Mon Oct 10 19:28:48 2016 +0000
791 Unregister the KEXINIT handler after message has been
792 received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
793 allocation of up to 128MB -- until the connection is closed. Reported by
796 Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05
798 commit 29d40319392e6e19deeca9d45468aa1119846e50
799 Author: Darren Tucker <dtucker@zip.com.au>
800 Date: Thu Oct 13 04:07:20 2016 +1100
802 Import rev 1.24 from OpenBSD.
805 date: 2013/11/24 23:51:29; author: deraadt; state: Exp; lines: +4 -4;
806 most obvious unsigned char casts for ctype
809 commit 12069e56221de207ed666c2449dedb431a2a7ca2
810 Author: Darren Tucker <dtucker@zip.com.au>
811 Date: Thu Oct 13 04:04:44 2016 +1100
813 Import rev 1.23 from OpenBSD. Fixes bz#2619.
816 date: 2010/05/14 13:30:34; author: millert; state: Exp; lines: +41 -39;
817 Defer installing signal handlers until echo is disabled so that we
818 get suspended normally when not the foreground process. Fix potential
819 infinite loop when restoring terminal settings if process is in the
820 background when restore occurs. OK miod@
822 commit 7508d83eff89af069760b4cc587305588a64e415
823 Author: Darren Tucker <dtucker@zip.com.au>
824 Date: Thu Oct 13 03:53:51 2016 +1100
826 If we don't have TCSASOFT, define it to zero.
828 This makes it a no-op when we use it below, which allows us to re-sync
829 those lines with the upstream and make future updates easier.
831 commit aae4dbd4c058d3b1fe1eb5c4e6ddf35827271377
832 Author: jmc@openbsd.org <jmc@openbsd.org>
833 Date: Fri Oct 7 14:41:52 2016 +0000
837 tidy up the formatting in this file. more specifically,
838 replace .Dq, which looks appalling, with .Cm, where appropriate;
840 Upstream-ID: ff8e90aa0343d9bb56f40a535e148607973cc738
842 commit a571dbcc7b7b25371174569b13df5159bc4c6c7a
843 Author: djm@openbsd.org <djm@openbsd.org>
844 Date: Tue Oct 4 21:34:40 2016 +0000
848 add a comment about implicitly-expected checks to
849 sshkey_ec_validate_public()
851 Upstream-ID: 74a7f71c28f7c13a50f89fc78e7863b9cd61713f
853 commit 2f78a2a698f4222f8e05cad57ac6e0c3d1faff00
854 Author: djm@openbsd.org <djm@openbsd.org>
855 Date: Fri Sep 30 20:24:46 2016 +0000
859 fix some -Wpointer-sign warnings in the new mux proxy; ok
862 Upstream-ID: b1ba7b3769fbc6b7f526792a215b0197f5e55dfd
864 commit ca71c36645fc26fcd739a8cfdc702cec85607761
865 Author: bluhm@openbsd.org <bluhm@openbsd.org>
866 Date: Wed Sep 28 20:09:52 2016 +0000
870 Add a makefile rule to create the ssh library when
871 regress needs it. This allows to run the ssh regression tests without doing
872 a "make build" before. Discussed with dtucker@ and djm@; OK djm@
874 Upstream-Regress-ID: ce489bd53afcd471225a125b4b94565d4717c025
876 commit ce44c970f913d2a047903dba8670554ac42fc479
877 Author: bluhm@openbsd.org <bluhm@openbsd.org>
878 Date: Mon Sep 26 21:34:38 2016 +0000
882 Allow to run ssh regression tests as root. If the user
883 is already root, the test should not expect that SUDO is set. If ssh needs
884 another user, use sudo or doas to switch from root if necessary. OK dtucker@
886 Upstream-Regress-ID: b464e55185ac4303529e3e6927db41683aaeace2
888 commit 8d0578478586e283e751ca51e7b0690631da139a
889 Author: markus@openbsd.org <markus@openbsd.org>
890 Date: Fri Sep 30 09:19:13 2016 +0000
894 ssh proxy mux mode (-O proxy; idea from Simon Tatham): - mux
895 client speaks the ssh-packet protocol directly over unix-domain socket. - mux
896 server acts as a proxy, translates channel IDs and relays to the server. - no
897 filedescriptor passing necessary. - combined with unix-domain forwarding it's
898 even possible to run mux client and server on different machines. feedback
901 Upstream-ID: 666a2fb79f58e5c50e246265fb2b9251e505c25b
903 commit b7689155f3f5c4999846c07a852b1c7a43b09cec
904 Author: djm@openbsd.org <djm@openbsd.org>
905 Date: Wed Sep 28 21:44:52 2016 +0000
909 put back some pre-auth zlib bits that I shouldn't have
910 removed - they are still used by the client. Spotted by naddy@
912 Upstream-ID: 80919468056031037d56a1f5b261c164a6f90dc2
914 commit 4577adead6a7d600c8e764619d99477a08192c8f
915 Author: djm@openbsd.org <djm@openbsd.org>
916 Date: Wed Sep 28 20:32:42 2016 +0000
920 restore pre-auth compression support in the client -- the
921 previous commit was intended to remove it from the server only.
923 remove a few server-side pre-auth compression bits that escaped
925 adjust wording of Compression directive in sshd_config(5)
927 pointed out by naddy@ ok markus@
929 Upstream-ID: d23696ed72a228dacd4839dd9f2dec424ba2016b
931 commit 80d1c963b4dc84ffd11d09617b39c4bffda08956
932 Author: jmc@openbsd.org <jmc@openbsd.org>
933 Date: Wed Sep 28 17:59:22 2016 +0000
937 use a separate TOKENS section, as we've done for
938 sshd_config(5); help/ok djm
940 Upstream-ID: 640e32b5e4838e4363738cdec955084b3579481d
942 commit 1cfd5c06efb121e58e8b6671548fda77ef4b4455
943 Author: Damien Miller <djm@mindrot.org>
944 Date: Thu Sep 29 03:19:23 2016 +1000
946 Remove portability support for mmap
948 We no longer need to wrap/replace mmap for portability now that
949 pre-auth compression has been removed from OpenSSH.
951 commit 0082fba4efdd492f765ed4c53f0d0fbd3bdbdf7f
952 Author: djm@openbsd.org <djm@openbsd.org>
953 Date: Wed Sep 28 16:33:06 2016 +0000
957 Remove support for pre-authentication compression. Doing
958 compression early in the protocol probably seemed reasonable in the 1990s,
959 but today it's clearly a bad idea in terms of both cryptography (cf. multiple
960 compression oracle attacks in TLS) and attack surface.
962 Moreover, to support it across privilege-separation zlib needed
963 the assistance of a complex shared-memory manager that made the
964 required attack surface considerably larger.
966 Prompted by Guido Vranken pointing out a compiler-elided security
967 check in the shared memory manager found by Stack
968 (http://css.csail.mit.edu/stack/); ok deraadt@ markus@
970 NB. pre-auth authentication has been disabled by default in sshd
973 Upstream-ID: 32af9771788d45a0779693b41d06ec199d849caf
975 commit 27c3a9c2aede2184856b5de1e6eca414bb751c38
976 Author: djm@openbsd.org <djm@openbsd.org>
977 Date: Mon Sep 26 21:16:11 2016 +0000
981 Avoid a theoretical signed integer overflow should
982 BN_num_bytes() ever violate its manpage and return a negative value. Improve
983 order of tests to avoid confusing increasingly pedantic compilers.
985 Reported by Guido Vranken from stack (css.csail.mit.edu/stack)
986 unstable optimisation analyser output. ok deraadt@
988 Upstream-ID: f8508c830c86d8f36c113985e52bf8eedae23505
990 commit 8663e51c80c6aa3d750c6d3bcff6ee05091922be
991 Author: Damien Miller <djm@mindrot.org>
992 Date: Wed Sep 28 07:40:33 2016 +1000
994 fix mdoc2man.awk formatting for top-level lists
996 Reported by Glenn Golden
997 Diagnosis and fix from Ingo Schwarze
999 commit b97739dc21570209ed9d4e7beee0c669ed23b097
1000 Author: djm@openbsd.org <djm@openbsd.org>
1001 Date: Thu Sep 22 21:15:41 2016 +0000
1005 missing bit from previous commit
1007 Upstream-ID: 438d5ed6338b28b46e822eb13eee448aca31df37
1009 commit de6a175a99d22444e10d19ad3fffef39bc3ee3bb
1010 Author: jmc@openbsd.org <jmc@openbsd.org>
1011 Date: Thu Sep 22 19:19:01 2016 +0000
1015 organise the token stuff into a separate section; ok
1016 markus for an earlier version of the diff ok/tweaks djm
1018 Upstream-ID: 81a6daa506a4a5af985fce7cf9e59699156527c8
1020 commit 16277fc45ffc95e4ffc3d45971ff8320b974de2b
1021 Author: djm@openbsd.org <djm@openbsd.org>
1022 Date: Thu Sep 22 17:55:13 2016 +0000
1026 mention curve25519-sha256 KEX
1028 Upstream-ID: 33ae1f433ce4795ffa6203761fbdf86e0d7ffbaf
1030 commit 0493766d5676c7ca358824ea8d3c90f6047953df
1031 Author: djm@openbsd.org <djm@openbsd.org>
1032 Date: Thu Sep 22 17:52:53 2016 +0000
1036 support plain curve25519-sha256 KEX algorithm now that it
1037 is approaching standardisation (same algorithm is currently supported as
1038 curve25519-sha256@libssh.org)
1040 Upstream-ID: 5e2b6db2e72667048cf426da43c0ee3fc777baa2
1042 commit f31c654b30a6f02ce0b8ea8ab81791b675489628
1043 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1044 Date: Thu Sep 22 02:29:57 2016 +0000
1048 If ssh receives a PACKET_DISCONNECT during userauth it
1049 will cause ssh_dispatch_run(DISPATCH_BLOCK, ...) to return without the
1050 session being authenticated. Check for this and exit if necessary. ok djm@
1052 Upstream-ID: b3afe126c0839d2eae6cddd41ff2ba317eda0903
1054 commit 1622649b7a829fc8dc313042a43a974f0f3e8a99
1055 Author: djm@openbsd.org <djm@openbsd.org>
1056 Date: Wed Sep 21 19:53:12 2016 +0000
1060 correctly return errors from kex_send_ext_info(). Fix from
1061 Sami Farin via https://github.com/openssh/openssh-portable/pull/50
1063 Upstream-ID: c85999af28aaecbf92cfa2283381df81e839b42c
1065 commit f83a0cfe16c7a73627b46a9a94e40087d60f32fb
1066 Author: djm@openbsd.org <djm@openbsd.org>
1067 Date: Wed Sep 21 17:44:20 2016 +0000
1071 cast uint64_t for printf
1073 Upstream-ID: 76d23e89419ccbd2320f92792a6d878211666ac1
1075 commit 5f63ab474f58834feca4f35c498be03b7dd38a16
1076 Author: djm@openbsd.org <djm@openbsd.org>
1077 Date: Wed Sep 21 17:03:54 2016 +0000
1081 disable tests for affirmative negated match after backout of
1084 Upstream-Regress-ID: acebb8e5042f03d66d86a50405c46c4de0badcfd
1086 commit a5ad3a9db5a48f350f257a67b62fafd719ecb7e0
1087 Author: djm@openbsd.org <djm@openbsd.org>
1088 Date: Wed Sep 21 16:55:42 2016 +0000
1092 Revert two recent changes to negated address matching. The
1093 new behaviour offers unintuitive surprises. We'll find a better way to deal
1094 with single negated matches.
1097 > fix matching for pattern lists that contain a single negated match,
1098 > e.g. "Host !example"
1100 > report and patch from Robin Becker. bz#1918 ok dtucker@
1103 > fix negated address matching where the address list consists of a
1104 > single negated match, e.g. "Match addr !192.20.0.1"
1106 > Report and patch from Jakub Jelen. bz#2397 ok dtucker@
1108 Upstream-ID: ec96c770f0f5b9a54e5e72fda25387545e9c80c6
1110 commit 119b7a2ca0ef2bf3f81897ae10301b8ca8cba844
1111 Author: djm@openbsd.org <djm@openbsd.org>
1112 Date: Wed Sep 21 01:35:12 2016 +0000
1116 test all the AuthorizedPrincipalsCommand % expansions
1118 Upstream-Regress-ID: 0a79a84dfaa59f958e46b474c3db780b454d30e3
1120 commit bfa9d969ab6235d4938ce069d4db7e5825c56a19
1121 Author: djm@openbsd.org <djm@openbsd.org>
1122 Date: Wed Sep 21 01:34:45 2016 +0000
1126 add a way for principals command to get see key ID and serial
1129 Upstream-ID: 0d30978bdcf7e8eaeee4eea1b030eb2eb1823fcb
1131 commit 920585b826af1c639e4ed78b2eba01fd2337b127
1132 Author: djm@openbsd.org <djm@openbsd.org>
1133 Date: Fri Sep 16 06:09:31 2016 +0000
1137 add a note on kexfuzz' limitations
1139 Upstream-Regress-ID: 03804d4a0dbc5163e1a285a4c8cc0a76a4e864ec
1141 commit 0445ff184080b196e12321998b4ce80b0f33f8d1
1142 Author: djm@openbsd.org <djm@openbsd.org>
1143 Date: Fri Sep 16 01:01:41 2016 +0000
1147 fix for newer modp DH groups
1148 (diffie-hellman-group14-sha256 etc)
1150 Upstream-Regress-ID: fe942c669959462b507516ae1634fde0725f1c68
1152 commit 28652bca29046f62c7045e933e6b931de1d16737
1153 Author: markus@openbsd.org <markus@openbsd.org>
1154 Date: Mon Sep 19 19:02:19 2016 +0000
1158 move inbound NEWKEYS handling to kex layer; otherwise
1159 early NEWKEYS causes NULL deref; found by Robert Swiecki/honggfuzz; fixed
1162 Upstream-ID: 9a68b882892e9f51dc7bfa9f5a423858af358b2f
1164 commit 492710894acfcc2f173d14d1d45bd2e688df605d
1165 Author: natano@openbsd.org <natano@openbsd.org>
1166 Date: Mon Sep 19 07:52:42 2016 +0000
1170 Replace two more arc4random() loops with
1173 tweaks and ok dtucker
1176 Upstream-ID: 738d3229130ccc7eac975c190276ca6fcf0208e4
1178 commit 1036356324fecc13099ac6e986b549f6219327d7
1179 Author: tedu@openbsd.org <tedu@openbsd.org>
1180 Date: Sat Sep 17 18:00:27 2016 +0000
1184 replace two arc4random loops with arc4random_buf ok
1187 Upstream-ID: e18ede972d1737df54b49f011fa4f3917a403f48
1189 commit 00df97ff68a49a756d4b977cd02283690f5dfa34
1190 Author: djm@openbsd.org <djm@openbsd.org>
1191 Date: Wed Sep 14 20:11:26 2016 +0000
1195 take fingerprint of correct key for
1196 AuthorizedPrincipalsCommand
1198 Upstream-ID: 553581a549cd6a3e73ce9f57559a325cc2cb1f38
1200 commit e7907c1cb938b96dd33d27c2fea72c4e08c6b2f6
1201 Author: djm@openbsd.org <djm@openbsd.org>
1202 Date: Wed Sep 14 05:42:25 2016 +0000
1206 add %-escapes to AuthorizedPrincipalsCommand to match those
1207 supported for AuthorizedKeysCommand (key, key type, fingerprint, etc) and a
1208 few more to provide access to the certificate's CA key; 'looks ok' dtucker@
1210 Upstream-ID: 6b00fd446dbebe67f4e4e146d2e492d650ae04eb
1212 commit 2b939c272a81c4d0c47badeedbcb2ba7c128ccda
1213 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1214 Date: Wed Sep 14 00:45:31 2016 +0000
1218 Improve test coverage of ssh-keygen -T a bit.
1220 Upstream-Regress-ID: 8851668c721bcc2b400600cfc5a87644cc024e72
1222 commit 44d82fc83be6c5ccd70881c2dac1a73e5050398b
1223 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1224 Date: Mon Sep 12 02:25:46 2016 +0000
1228 Add testcase for ssh-keygen -j, -J and -K options for
1229 moduli screening. Does not currently test generation as that is extremely
1232 Upstream-Regress-ID: 9de6ce801377ed3ce0a63a1413f1cd5fd3c2d062
1234 commit 44e5f756d286bc3a1a5272ea484ee276ba3ac5c2
1235 Author: djm@openbsd.org <djm@openbsd.org>
1236 Date: Tue Aug 23 08:17:04 2016 +0000
1240 add tests for addr_match_list()
1242 Upstream-Regress-ID: fae2d1fef84687ece584738a924c7bf969616c8e
1244 commit 445e218878035b59c704c18406e8aeaff4c8aa25
1245 Author: djm@openbsd.org <djm@openbsd.org>
1246 Date: Mon Sep 12 23:39:34 2016 +0000
1250 handle certs in rsa_hash_alg_from_ident(), saving an
1251 unnecessary special case elsewhere.
1253 Upstream-ID: 901cb081c59d6d2698b57901c427f3f6dc7397d4
1255 commit 130f5df4fa37cace8c079dccb690e5cafbf00751
1256 Author: djm@openbsd.org <djm@openbsd.org>
1257 Date: Mon Sep 12 23:31:27 2016 +0000
1261 list all supported signature algorithms in the
1262 server-sig-algs Reported by mb AT smartftp.com in bz#2547 and (independantly)
1263 Ron Frederick; ok markus@
1265 Upstream-ID: ddf702d721f54646b11ef2cee6d916666cb685cd
1267 commit 8f750ccfc07acb8aa98be5a5dd935033a6468cfd
1268 Author: Darren Tucker <dtucker@zip.com.au>
1269 Date: Mon Sep 12 14:43:58 2016 +1000
1271 Remove no-op brackets to resync with upstream.
1273 commit 7050896e7395866278c19c2ff080c26152619d1d
1274 Author: Darren Tucker <dtucker@zip.com.au>
1275 Date: Mon Sep 12 13:57:28 2016 +1000
1277 Resync ssh-keygen -W error message with upstream.
1279 commit 43cceff82cc20413cce58ba3375e19684e62cec4
1280 Author: Darren Tucker <dtucker@zip.com.au>
1281 Date: Mon Sep 12 13:55:37 2016 +1000
1283 Move ssh-keygen -W handling code to match upstream
1285 commit af48d541360b1d7737b35740a4b1ca34e1652cd9
1286 Author: Darren Tucker <dtucker@zip.com.au>
1287 Date: Mon Sep 12 13:52:17 2016 +1000
1289 Move ssh-keygen -T handling code to match upstream.
1291 commit d8c3cfbb018825c6c86547165ddaf11924901c49
1292 Author: Darren Tucker <dtucker@zip.com.au>
1293 Date: Mon Sep 12 13:30:50 2016 +1000
1295 Move -M handling code to match upstream.
1297 commit 7b63cf6dbbfa841c003de57d1061acbf2ff22364
1298 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1299 Date: Mon Sep 12 03:29:16 2016 +0000
1305 Upstream-ID: f4829dfc3f36318273f6082b379ac562eead70b7
1307 commit 11e5e644536821ceb3bb4dd8487fbf0588522887
1308 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1309 Date: Mon Sep 12 03:25:20 2016 +0000
1313 Style whitespace fix. Also happens to remove a no-op
1316 Upstream-ID: 45d90f9a62ad56340913a433a9453eb30ceb8bf3
1318 commit 9136ec134c97a8aff2917760c03134f52945ff3c
1319 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1320 Date: Mon Sep 12 01:22:38 2016 +0000
1324 Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then
1325 use those definitions rather than pulling <sys/param.h> and unknown namespace
1326 pollution. ok djm markus dtucker
1328 Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8
1330 commit f219fc8f03caca7ac82a38ed74bbd6432a1195e7
1331 Author: jmc@openbsd.org <jmc@openbsd.org>
1332 Date: Wed Sep 7 18:39:24 2016 +0000
1336 sort; from matthew martin
1338 Upstream-ID: 73cec7f7ecc82d37a4adffad7745e4684de67ce7
1340 commit 06ce56b05def9460aecc7cdb40e861a346214793
1341 Author: markus@openbsd.org <markus@openbsd.org>
1342 Date: Tue Sep 6 09:22:56 2016 +0000
1346 ssh_set_newkeys: print correct block counters on
1349 Upstream-ID: 32bb7a9cb9919ff5bab28d50ecef3a2b2045dd1e
1351 commit e5e8d9114ac6837a038f4952994ca95a97fafe8d
1352 Author: markus@openbsd.org <markus@openbsd.org>
1353 Date: Tue Sep 6 09:14:05 2016 +0000
1357 update ext_info_c every time we receive a kexinit msg;
1358 fixes sending of ext_info if privsep is disabled; report Aris Adamantiadis &
1361 Upstream-ID: 2ceaa1076e19dbd3542254b4fb8e42d608f28856
1363 commit da95318dbedbaa1335323dba370975c2f251afd8
1364 Author: djm@openbsd.org <djm@openbsd.org>
1365 Date: Mon Sep 5 14:02:42 2016 +0000
1369 remove 3des-cbc from the client's default proposal;
1370 64-bit block ciphers are not safe in 2016 and we don't want to wait until
1371 attacks like sweet32 are extended to SSH.
1373 As 3des-cbc was the only mandatory cipher in the SSH RFCs, this may
1374 cause problems connecting to older devices using the defaults, but
1375 it's highly likely that such devices already need explicit
1376 configuration for KEX and hostkeys anyway.
1378 ok deraadt, markus, dtucker
1380 Upstream-ID: a505dfe65c6733af0f751b64cbc4bb7e0761bc2f
1382 commit b33ad6d997d36edfea65e243cd12ccd01f413549
1383 Author: djm@openbsd.org <djm@openbsd.org>
1384 Date: Mon Sep 5 13:57:31 2016 +0000
1388 enforce expected request flow for GSSAPI calls; thanks to
1389 Jakub Jelen for testing; ok markus@
1391 Upstream-ID: d4bc0e70e1be403735d3d9d7e176309b1fd626b9
1393 commit 0bb2980260fb24e5e0b51adac471395781b66261
1394 Author: Darren Tucker <dtucker@zip.com.au>
1395 Date: Mon Sep 12 11:07:00 2016 +1000
1397 Restore ssh-keygen's -J and -j option handling.
1399 These were incorrectly removed in the 1d9a2e28 sync commit.
1401 commit 775f8a23f2353f5869003c57a213d14b28e0736e
1402 Author: Damien Miller <djm@mindrot.org>
1403 Date: Wed Aug 31 10:48:07 2016 +1000
1405 tighten PAM monitor calls
1407 only allow kbd-interactive ones when that authentication method is
1408 enabled. Prompted by Solar Designer
1410 commit 7fd0ea8a1db4bcfb3d8cd9df149e5d571ebea1f4
1411 Author: djm@openbsd.org <djm@openbsd.org>
1412 Date: Tue Aug 30 07:50:21 2016 +0000
1416 restrict monitor auth calls to be allowed only when their
1417 respective authentication methods are enabled in the configuration.
1419 prompted by Solar Designer; ok markus dtucker
1421 Upstream-ID: 6eb3f89332b3546d41d6dbf5a8e6ff920142b553
1423 commit b38b95f5bcc52278feb839afda2987933f68ff96
1424 Author: Damien Miller <djm@mindrot.org>
1425 Date: Mon Aug 29 11:47:07 2016 +1000
1427 Tighten monitor state-machine flow for PAM calls
1429 (attack surface reduction)
1431 commit dc664d1bd0fc91b24406a3e9575b81c285b8342b
1432 Author: djm@openbsd.org <djm@openbsd.org>
1433 Date: Sun Aug 28 22:28:12 2016 +0000
1437 fix uninitialised optlen in getsockopt() call; harmless
1438 on Unix/BSD but potentially crashy on Cygwin. Reported by James Slepicka ok
1441 Upstream-ID: 1987ccee508ba5b18f016c85100d7ac3f70ff965
1443 commit 5bcc1e2769f7d6927d41daf0719a9446ceab8dd7
1444 Author: guenther@openbsd.org <guenther@openbsd.org>
1445 Date: Sat Aug 27 04:05:12 2016 +0000
1449 Pull in <sys/time.h> for struct timeval
1453 Upstream-ID: ae34525485a173bccd61ac8eefeb91c57e3b7df6
1455 commit fa4a4c96b19127dc2fd4e92f20d99c0c7f34b538
1456 Author: guenther@openbsd.org <guenther@openbsd.org>
1457 Date: Sat Aug 27 04:04:56 2016 +0000
1461 Pull in <stdlib.h> for NULL
1465 Upstream-ID: 7baa6a0f1e049bb3682522b4b95a26c866bfc043
1467 commit ae363d74ccc1451185c0c8bd4631e28c67c7fd36
1468 Author: djm@openbsd.org <djm@openbsd.org>
1469 Date: Thu Aug 25 23:57:54 2016 +0000
1473 add a sIgnore opcode that silently ignores options and
1474 use it to suppress noisy deprecation warnings for the Protocol directive.
1476 req henning, ok markus
1478 Upstream-ID: 9fe040aca3d6ff393f6f7e60045cdd821dc4cbe0
1480 commit a94c60306643ae904add6e8ed219e4be3494255c
1481 Author: djm@openbsd.org <djm@openbsd.org>
1482 Date: Thu Aug 25 23:56:51 2016 +0000
1486 remove superfluous NOTREACHED comment
1488 Upstream-ID: a7485c1f1be618e8c9e38fd9be46c13b2d03b90c
1490 commit fc041c47144ce28cf71353124a8a5d183cd6a251
1491 Author: otto@openbsd.org <otto@openbsd.org>
1492 Date: Tue Aug 23 16:21:45 2016 +0000
1496 fix previous, a condition was modified incorrectly; ok
1499 Upstream-ID: c443e339768e7ed396dff3bb55f693e7d3641453
1501 commit 23555eb13a9b0550371a16dcf8beaab7a5806a64
1502 Author: djm@openbsd.org <djm@openbsd.org>
1503 Date: Tue Aug 23 08:17:42 2016 +0000
1507 downgrade an error() to a debug2() to match similar cases
1508 in addr_match_list()
1510 Upstream-ID: 07c3d53e357214153d9d08f234411e0d1a3d6f5c
1512 commit a39627134f6d90e7009eeb14e9582ecbc7a99192
1513 Author: djm@openbsd.org <djm@openbsd.org>
1514 Date: Tue Aug 23 06:36:23 2016 +0000
1518 remove Protocol directive from client/server configs that
1519 causes spammy deprecation warnings
1521 hardcode SSH_PROTOCOLS=2, since that's all we support on the server
1522 now (the client still may support both, so it could get confused)
1524 Upstream-Regress-ID: c16662c631af51633f9fd06aca552a70535de181
1526 commit 6ee4f1c01ee31e65245881d49d4bccf014956066
1527 Author: Damien Miller <djm@mindrot.org>
1528 Date: Tue Aug 23 16:33:48 2016 +1000
1530 hook match and utf8 unittests up to Makefile
1532 commit 114efe2bc0dd2842d997940a833f115e6fc04854
1533 Author: djm@openbsd.org <djm@openbsd.org>
1534 Date: Fri Aug 19 06:44:13 2016 +0000
1538 add tests for matching functions
1540 Upstream-Regress-ID: 0869d4f5c5d627c583c6a929d69c17d5dd65882c
1542 commit 857568d2ac81c14bcfd625b27536c1e28c992b3c
1543 Author: Damien Miller <djm@mindrot.org>
1544 Date: Tue Aug 23 14:32:37 2016 +1000
1546 removing UseLogin bits from configure.ac
1548 commit cc182d01cef8ca35a1d25ea9bf4e2ff72e588208
1549 Author: djm@openbsd.org <djm@openbsd.org>
1550 Date: Tue Aug 23 03:24:10 2016 +0000
1554 fix negated address matching where the address list
1555 consists of a single negated match, e.g. "Match addr !192.20.0.1"
1557 Report and patch from Jakub Jelen. bz#2397 ok dtucker@
1559 Upstream-ID: 01dcac3f3e6ca47518cf293e31c73597a4bb40d8
1561 commit 4067ec8a4c64ccf16250c35ff577b4422767da64
1562 Author: djm@openbsd.org <djm@openbsd.org>
1563 Date: Tue Aug 23 03:22:49 2016 +0000
1567 fix matching for pattern lists that contain a single
1568 negated match, e.g. "Host !example"
1570 report and patch from Robin Becker. bz#1918 ok dtucker@
1572 Upstream-ID: 05a0cb323ea4bc20e98db099b42c067bfb9ea1ea
1574 commit 83b581862a1dbb06fc859959f829dde2654aef3c
1575 Author: djm@openbsd.org <djm@openbsd.org>
1576 Date: Fri Aug 19 03:18:06 2016 +0000
1580 remove UseLogin option and support for having /bin/login
1581 manage login sessions; ok deraadt markus dtucker
1583 Upstream-ID: bea7213fbf158efab7e602d9d844fba4837d2712
1585 commit ffe6549c2f7a999cc5264b873a60322e91862581
1586 Author: naddy@openbsd.org <naddy@openbsd.org>
1587 Date: Mon Aug 15 12:32:04 2016 +0000
1591 Catch up with the SSH1 code removal and delete all
1592 mention of protocol 1 particularities, key files and formats, command line
1593 options, and configuration keywords from the server documentation and
1596 Upstream-ID: 850328854675b4b6a0d4a90f0b4a9dd9ca4e905f
1598 commit c38ea634893a1975dbbec798fb968c9488013f4a
1599 Author: naddy@openbsd.org <naddy@openbsd.org>
1600 Date: Mon Aug 15 12:27:56 2016 +0000
1604 Remove more SSH1 server code: * Drop sshd's -k option. *
1605 Retire configuration keywords that only apply to protocol 1, as well as the
1606 "protocol" keyword. * Remove some related vestiges of protocol 1 support.
1610 Upstream-ID: 9402f82886de917779db12f8ee3f03d4decc244d
1612 commit 33ba55d9e358c07f069e579bfab80eccaaad52cb
1613 Author: Darren Tucker <dtucker@zip.com.au>
1614 Date: Wed Aug 17 16:26:04 2016 +1000
1616 Only check for prctl once.
1618 commit 976ba8a8fd66a969bf658280c1e5adf694cc2fc6
1619 Author: Darren Tucker <dtucker@zip.com.au>
1620 Date: Wed Aug 17 15:33:10 2016 +1000
1624 commit 9abf84c25ff4448891edcde60533a6e7b2870de1
1625 Author: Darren Tucker <dtucker@zip.com.au>
1626 Date: Wed Aug 17 14:25:43 2016 +1000
1628 Correct LDFLAGS for clang example.
1630 --with-ldflags isn't used until after the -ftrapv test, so mention
1631 LDFLAGS instead for now.
1633 commit 1e8013a17ff11e3c6bd0012fb1fc8d5f1330eb21
1634 Author: Darren Tucker <dtucker@zip.com.au>
1635 Date: Wed Aug 17 14:08:42 2016 +1000
1637 Remove obsolete CVS $Id from source files.
1639 Since -portable switched to git the CVS $Id tags are no longer being
1640 updated and are becoming increasingly misleading. Remove them.
1642 commit adab758242121181700e48b4f6c60d6b660411fe
1643 Author: Darren Tucker <dtucker@zip.com.au>
1644 Date: Wed Aug 17 13:40:58 2016 +1000
1646 Remove now-obsolete CVS $Id tags from text files.
1648 Since -portable switched to git, the CVS $Id tags are no longer being
1649 updated and are becoming increasingly misleading. Remove them.
1651 commit 560c0068541315002ec4c1c00a560bbd30f2d671
1652 Author: Darren Tucker <dtucker@zip.com.au>
1653 Date: Wed Aug 17 13:38:30 2016 +1000
1655 Add a section for compiler specifics.
1657 Add a section for compiler specifics and document the runtime requirements
1658 for clang's integer sanitization.
1660 commit a8fc0f42e1eda2fa3393d1ea5e61322d5e07a9cd
1661 Author: Darren Tucker <dtucker@zip.com.au>
1662 Date: Wed Aug 17 13:35:43 2016 +1000
1664 Test multiplying two long long ints.
1666 When using clang with -ftrapv or -sanitize=integer the tests would pass
1667 but linking would fail with "undefined reference to __mulodi4".
1668 Explicitly test for this before enabling -trapv.
1670 commit a1cc637e7e11778eb727559634a6ef1c19c619f6
1671 Author: Damien Miller <djm@mindrot.org>
1672 Date: Tue Aug 16 14:47:34 2016 +1000
1674 add a --with-login-program configure argument
1676 Saves messing around with LOGIN_PROGRAM env var, which come
1677 packaging environments make hard to do during configure phase.
1679 commit 8bd81e1596ab1bab355146cb65e82fb96ade3b23
1680 Author: Damien Miller <djm@mindrot.org>
1681 Date: Tue Aug 16 13:30:56 2016 +1000
1683 add --with-pam-service to specify PAM service name
1685 Saves messing around with CFLAGS to do it.
1687 commit 74433a19bb6f4cef607680fa4d1d7d81ca3826aa
1688 Author: Damien Miller <djm@mindrot.org>
1689 Date: Tue Aug 16 13:28:23 2016 +1000
1691 fix false positives when compiled with msan
1693 Our explicit_bzero successfully confused clang -fsanitize-memory
1694 in to thinking that memset is never called to initialise memory.
1695 Ensure that it is called in a way that the compiler recognises.
1697 commit 6cb6dcffe1a2204ba9006de20f73255c268fcb6b
1698 Author: markus@openbsd.org <markus@openbsd.org>
1699 Date: Sat Aug 13 17:47:40 2016 +0000
1703 remove ssh1 server code; ok djm@
1705 Upstream-ID: c24c0c32c49b91740d5a94ae914fb1898ea5f534
1707 commit 42d47adc5ad1187f22c726cbc52e71d6b1767ca2
1708 Author: jca@openbsd.org <jca@openbsd.org>
1709 Date: Fri Aug 12 19:19:04 2016 +0000
1713 Use 2001:db8::/32, the official IPv6 subnet for
1714 configuration examples.
1716 This makes the IPv6 example consistent with IPv4, and removes a dubious
1717 mention of a 6bone subnet.
1721 Upstream-ID: b027f3d0e0073419a132fd1bf002e8089b233634
1723 commit b61f53c0c3b43c28e013d3b3696d64d1c0204821
1724 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1725 Date: Thu Aug 11 01:42:11 2016 +0000
1731 Upstream-ID: 6da9a37f74aef9f9cc639004345ad893cad582d8
1733 commit f217d9bd42d306f69f56335231036b44502d8191
1734 Author: Darren Tucker <dtucker@zip.com.au>
1735 Date: Thu Aug 11 11:42:48 2016 +1000
1737 Import updated moduli.
1739 commit 67dca60fbb4923b7a11c1645b90a5ca57c03d8be
1740 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1741 Date: Mon Aug 8 22:40:57 2016 +0000
1745 Improve error message for overlong ControlPath. ok markus@
1748 Upstream-ID: aed374e2e88dd3eb41390003e5303d0089861eb5
1750 commit 4706c1d8c15cd5565b59512853c2da9bd4ca26c9
1751 Author: djm@openbsd.org <djm@openbsd.org>
1752 Date: Wed Aug 3 05:41:57 2016 +0000
1756 small refactor of cipher.c: make ciphercontext opaque to
1757 callers feedback and ok markus@
1759 Upstream-ID: 094849f8be68c3bdad2c0f3dee551ecf7be87f6f
1761 commit e600348a7afd6325cc5cd783cb424065cbc20434
1762 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1763 Date: Wed Aug 3 04:23:55 2016 +0000
1767 Fix bug introduced in rev 1.467 which causes
1768 "buffer_get_bignum_ret: incomplete message" errors when built with WITH_SSH1
1769 and run such that no Protocol 1 ephemeral host key is generated (eg "Protocol
1770 2", no SSH1 host key supplied). Reported by rainer.laatsch at t-online.de,
1773 Upstream-ID: aa6b132da5c325523aed7989cc5a320497c919dc
1775 commit d7e7348e72f9b203189e3fffb75605afecba4fda
1776 Author: djm@openbsd.org <djm@openbsd.org>
1777 Date: Wed Jul 27 23:18:12 2016 +0000
1781 better bounds check on iovcnt (we only ever use fixed,
1784 Upstream-ID: 9baa6eb5cd6e30c9dc7398e5fe853721a3a5bdee
1786 commit 5faa52d295f764562ed6dd75c4a4ce9134ae71e3
1787 Author: Darren Tucker <dtucker@zip.com.au>
1788 Date: Tue Aug 2 15:22:40 2016 +1000
1790 Use tabs consistently inside "case $host".
1792 commit 20e5e8ba9c5d868d897896190542213a60fffbd2
1793 Author: Darren Tucker <dtucker@zip.com.au>
1794 Date: Tue Aug 2 12:16:34 2016 +1000
1796 Explicitly test for broken strnvis.
1798 NetBSD added an strnvis and unfortunately made it incompatible with the
1799 existing one in OpenBSD and Linux's libbsd (the former having existed
1800 for over ten years). Despite this incompatibility being reported during
1801 development (see http://gnats.netbsd.org/44977) they still shipped it.
1802 Even more unfortunately FreeBSD and later MacOS picked up this incompatible
1803 implementation. Try to detect this mess, and assume the only safe option
1804 if we're cross compiling.
1806 OpenBSD 2.9 (2001): strnvis(char *dst, const char *src, size_t dlen, int flag);
1807 NetBSD 6.0 (2012): strnvis(char *dst, size_t dlen, const char *src, int flag);
1811 commit b0b48beab1b74100b61ecbadb9140c9ab4c2ea8c
1812 Author: Damien Miller <djm@mindrot.org>
1813 Date: Tue Aug 2 11:06:23 2016 +1000
1815 update recommended autoconf version
1817 commit 23902e31dfd18c6d7bb41ccd73de3b5358a377da
1818 Author: Damien Miller <djm@mindrot.org>
1819 Date: Tue Aug 2 10:48:04 2016 +1000
1821 update config.guess and config.sub to current
1823 upstream commit 562f3512b3911ba0c77a7f68214881d1f241f46e
1825 commit dd1031b78b83083615b68d7163c44f4408635be2
1826 Author: Darren Tucker <dtucker@zip.com.au>
1827 Date: Tue Aug 2 10:01:52 2016 +1000
1829 Replace spaces with tabs.
1831 Mechanically replace spaces with tabs in compat files not synced with
1834 commit c20dccb5614c5714f4155dda01bcdebf97cfae7e
1835 Author: Darren Tucker <dtucker@zip.com.au>
1836 Date: Tue Aug 2 09:44:25 2016 +1000
1838 Strip trailing whitespace.
1840 Mechanically strip trailing whitespace on files not synced with OpenBSD
1841 (or in the case of bsd-snprint.c, rsync).
1843 commit 30f9bd1c0963c23bfba8468dfd26aa17609ba42f
1844 Author: Darren Tucker <dtucker@zip.com.au>
1845 Date: Tue Aug 2 09:06:27 2016 +1000
1847 Repair $OpenBSD markers.
1849 commit 9715d4ad4b53877ec23dc8681dd7a405de9419a6
1850 Author: Darren Tucker <dtucker@zip.com.au>
1851 Date: Tue Aug 2 09:02:42 2016 +1000
1853 Repair $OpenBSD marker.
1855 commit cf3e0be7f5828a5e5f6c296a607d20be2f07d60c
1856 Author: Tim Rice <tim@multitalents.net>
1857 Date: Mon Aug 1 14:31:52 2016 -0700
1859 modified: configure.ac opensshd.init.in
1860 Skip generating missing RSA1 key on startup unless ssh1 support is enabled.
1861 Spotted by Jean-Pierre Radley
1863 commit 99522ba7ec6963a05c04a156bf20e3ba3605987c
1864 Author: Damien Miller <djm@mindrot.org>
1865 Date: Thu Jul 28 08:54:27 2016 +1000
1867 define _OPENBSD_SOURCE for reallocarray on NetBSD
1869 Report by and debugged with Hisashi T Fujinaka, dtucker nailed
1870 the problem (lack of prototype causing return type confusion).
1872 commit 3e1e076550c27c6bbdddf36d8f42bd79fbaaa187
1873 Author: Damien Miller <djm@mindrot.org>
1874 Date: Wed Jul 27 08:25:42 2016 +1000
1878 commit d99ee9c4e5e217e7d05eeec84e9ce641f4675331
1879 Author: Damien Miller <djm@mindrot.org>
1880 Date: Wed Jul 27 08:25:23 2016 +1000
1882 Linux auditing also needs packet.h
1884 commit 393bd381a45884b589baa9aed4394f1d250255ca
1885 Author: Damien Miller <djm@mindrot.org>
1886 Date: Wed Jul 27 08:18:05 2016 +1000
1888 fix auditing on Linux
1890 get_remote_ipaddr() was replaced with ssh_remote_ipaddr()
1892 commit 80e766fb089de4f3c92b1600eb99e9495e37c992
1893 Author: Damien Miller <djm@mindrot.org>
1894 Date: Sun Jul 24 21:50:13 2016 +1000
1896 crank version numbers
1898 commit b1a478792d458f2e938a302e64bab2b520edc1b3
1899 Author: djm@openbsd.org <djm@openbsd.org>
1900 Date: Sun Jul 24 11:45:36 2016 +0000
1906 Upstream-ID: af106a7eb665f642648cf1993e162c899f358718
1908 commit 353766e0881f069aeca30275ab706cd60a1a8fdd
1909 Author: Darren Tucker <dtucker@zip.com.au>
1910 Date: Sat Jul 23 16:14:42 2016 +1000
1912 Move Cygwin IPPORT_RESERVED overrride to defines.h
1914 Patch from vinschen at redhat.com.
1916 commit 368dd977ae07afb93f4ecea23615128c95ab2b32
1917 Author: djm@openbsd.org <djm@openbsd.org>
1918 Date: Sat Jul 23 02:54:08 2016 +0000
1922 fix pledge violation with ssh -f; reported by Valentin
1923 Kozamernik ok dtucker@
1925 Upstream-ID: a61db7988db88d9dac3c4dd70e18876a8edf84aa
1927 commit f00211e3c6d24d6ea2b64b4b1209f671f6c1d42e
1928 Author: djm@openbsd.org <djm@openbsd.org>
1929 Date: Fri Jul 22 07:00:46 2016 +0000
1933 improve wording; suggested by jmc@
1935 Upstream-ID: 55cb0a24c8e0618b3ceec80998dc82c85db2d2f8
1937 commit 83cbca693c3b0719270e6a0f2efe3f9ee93a65b8
1938 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1939 Date: Fri Jul 22 05:46:11 2016 +0000
1943 Lower loglevel for "Authenticated with partial success"
1944 message similar to other similar level. bz#2599, patch from cgallek at
1945 gmail.com, ok markus@
1947 Upstream-ID: 3faab814e947dc7b2e292edede23e94c608cb4dd
1949 commit 10358abd087ab228b7ce2048efc4f3854a9ab9a6
1950 Author: Damien Miller <djm@mindrot.org>
1951 Date: Fri Jul 22 14:06:36 2016 +1000
1953 retry waitpid on EINTR failure
1955 patch from Jakub Jelen on bz#2581; ok dtucker@
1957 commit da88a70a89c800e74ea8e5661ffa127a3cc79a92
1958 Author: djm@openbsd.org <djm@openbsd.org>
1959 Date: Fri Jul 22 03:47:36 2016 +0000
1963 constify a few functions' arguments; patch from Jakub
1966 Upstream-ID: f2043f51454ea37830ff6ad60c8b32b4220f448d
1968 commit c36d91bd4ebf767f310f7cea88d61d1c15f53ddf
1969 Author: djm@openbsd.org <djm@openbsd.org>
1970 Date: Fri Jul 22 03:39:13 2016 +0000
1974 move debug("%p", key) to before key is free'd; probable
1975 undefined behaviour on strict compilers; reported by Jakub Jelen bz#2581
1977 Upstream-ID: 767f323e1f5819508a0e35e388ec241bac2f953a
1979 commit 286f5a77c3bfec1e8892ca268087ac885ac871bf
1980 Author: djm@openbsd.org <djm@openbsd.org>
1981 Date: Fri Jul 22 03:35:11 2016 +0000
1985 reverse the order in which -J/JumpHost proxies are visited to
1986 be more intuitive and document
1988 reported by and manpage bits naddy@
1990 Upstream-ID: 3a68fd6a841fd6cf8cedf6552a9607ba99df179a
1992 commit fcd135c9df440bcd2d5870405ad3311743d78d97
1993 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1994 Date: Thu Jul 21 01:39:35 2016 +0000
1998 Skip passwords longer than 1k in length so clients can't
1999 easily DoS sshd by sending very long passwords, causing it to spend CPU
2000 hashing them. feedback djm@, ok markus@.
2002 Brought to our attention by tomas.kuthan at oracle.com, shilei-c at
2003 360.cn and coredump at autistici.org
2005 Upstream-ID: d0af7d4a2190b63ba1d38eec502bc4be0be9e333
2007 commit 324583e8fb3935690be58790425793df619c6d4d
2008 Author: naddy@openbsd.org <naddy@openbsd.org>
2009 Date: Wed Jul 20 10:45:27 2016 +0000
2013 Do not clobber the global jump_host variables when
2014 parsing an inactive configuration. ok djm@
2016 Upstream-ID: 5362210944d91417d5976346d41ac0b244350d31
2018 commit 32d921c323b989d28405e78d0a8923d12913d737
2019 Author: jmc@openbsd.org <jmc@openbsd.org>
2020 Date: Tue Jul 19 12:59:16 2016 +0000
2026 Upstream-ID: f3c1a5b3f05dff366f60c028728a2b43f15ff534
2028 commit d7eabc86fa049a12ba2c3fb198bd1d51b37f7025
2029 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2030 Date: Tue Jul 19 11:38:53 2016 +0000
2034 Allow wildcard for PermitOpen hosts as well as ports.
2035 bz#2582, patch from openssh at mzpqnxow.com and jjelen at redhat.com. ok
2038 Upstream-ID: af0294e9b9394c4e16e991424ca0a47a7cc605f2
2040 commit b98a2a8348e907b3d71caafd80f0be8fdd075943
2041 Author: markus@openbsd.org <markus@openbsd.org>
2042 Date: Mon Jul 18 11:35:33 2016 +0000
2046 Reduce timing attack against obsolete CBC modes by always
2047 computing the MAC over a fixed size of data. Reported by Jean Paul
2048 Degabriele, Kenny Paterson, Torben Hansen and Martin Albrecht. ok djm@
2050 Upstream-ID: f20a13279b00ba0afbacbcc1f04e62e9d41c2912
2052 commit dbf788b4d9d9490a5fff08a7b09888272bb10fcc
2053 Author: Darren Tucker <dtucker@zip.com.au>
2054 Date: Thu Jul 21 14:17:31 2016 +1000
2056 Search users for one with a valid salt.
2058 If the root account is locked (eg password "!!" or "*LK*") keep looking
2059 until we find a user with a valid salt to use for crypting passwords of
2060 invalid users. ok djm@
2062 commit e8b58f48fbb1b524fb4f0d4865fa0005d6a4b782
2063 Author: Darren Tucker <dtucker@zip.com.au>
2064 Date: Mon Jul 18 17:22:49 2016 +1000
2066 Explicitly specify source files for regress tools.
2068 Since adding $(REGRESSLIBS), $? is wrong because it includes only the
2069 changed source files. $< seems like it'd be right however it doesn't
2070 seem to work on some non-GNU makes, so do what works everywhere.
2072 commit eac1bbd06872c273f16ac0f9976b0aef026b701b
2073 Author: Darren Tucker <dtucker@zip.com.au>
2074 Date: Mon Jul 18 17:12:22 2016 +1000
2076 Conditionally include err.h.
2078 commit 0a454147568746c503f669e1ba861f76a2e7a585
2079 Author: Darren Tucker <dtucker@zip.com.au>
2080 Date: Mon Jul 18 16:26:26 2016 +1000
2082 Remove local implementation of err, errx.
2084 We now have a shared implementation in libopenbsd-compat.
2086 commit eb999a4590846ba4d56ddc90bd07c23abfbab7b1
2087 Author: djm@openbsd.org <djm@openbsd.org>
2088 Date: Mon Jul 18 06:08:01 2016 +0000
2092 Add some unsigned overflow checks for extra_pad. None of
2093 these are reachable with the amount of padding that we use internally.
2094 bz#2566, pointed out by Torben Hansen. ok markus@
2096 Upstream-ID: 4d4be8450ab2fc1b852d5884339f8e8c31c3fd76
2098 commit c71ba790c304545464bb494de974cdf0f4b5cf1e
2099 Author: Darren Tucker <dtucker@zip.com.au>
2100 Date: Mon Jul 18 15:43:25 2016 +1000
2102 Add dependency on libs for unit tests.
2104 Makes "./configure && make tests" work again. ok djm@
2106 commit 8199d0311aea3e6fd0284c9025e7a83f4ece79e8
2107 Author: Darren Tucker <dtucker@zip.com.au>
2108 Date: Mon Jul 18 13:47:39 2016 +1000
2110 Correct location for kexfuzz in clean target.
2112 commit 01558b7b07af43da774d3a11a5c51fa9c310849d
2113 Author: Darren Tucker <dtucker@zip.com.au>
2114 Date: Mon Jul 18 09:33:25 2016 +1000
2116 Handle PAM_MAXTRIES from modules.
2118 bz#2249: handle the case where PAM returns PAM_MAXTRIES by ceasing to offer
2119 password and keyboard-interative authentication methods. Should prevent
2120 "sshd ignoring max retries" warnings in the log. ok djm@
2122 It probably won't trigger with keyboard-interactive in the default
2123 configuration because the retry counter is stored in module-private
2124 storage which goes away with the sshd PAM process (see bz#688). On the
2125 other hand, those cases probably won't log a warning either.
2127 commit 65c6c6b567ab5ab12945a5ad8e0ab3a8c26119cc
2128 Author: djm@openbsd.org <djm@openbsd.org>
2129 Date: Sun Jul 17 04:20:16 2016 +0000
2133 support UTF-8 characters in ssh(1) banners using
2134 schwarze@'s safe fmprintf printer; bz#2058
2136 feedback schwarze@ ok dtucker@
2138 Upstream-ID: a72ce4e3644c957643c9524eea2959e41b91eea7
2140 commit e4eb7d910976fbfc7ce3e90c95c11b07b483d0d7
2141 Author: jmc@openbsd.org <jmc@openbsd.org>
2142 Date: Sat Jul 16 06:57:55 2016 +0000
2146 - add proxyjump to the options list - formatting fixes -
2151 Upstream-ID: 43d318e14ce677a2eec8f21ef5ba2f9f68a59457
2153 commit af1f084857621f14bd9391aba8033d35886c2455
2154 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2155 Date: Fri Jul 15 05:01:58 2016 +0000
2159 Reduce the syslog level of some relatively common protocol
2160 events from LOG_CRIT by replacing fatal() calls with logdie(). Part of
2163 Upstream-ID: 9005805227c94edf6ac02a160f0e199638d288e5
2165 commit bd5f2b78b69cf38d6049a0de445a79c8595e4a1f
2166 Author: Damien Miller <djm@mindrot.org>
2167 Date: Fri Jul 15 19:14:48 2016 +1000
2169 missing openssl/dh.h
2171 commit 4a984fd342effe5f0aad874a0d538c4322d973c0
2172 Author: Damien Miller <djm@mindrot.org>
2173 Date: Fri Jul 15 18:47:07 2016 +1000
2175 cast to avoid type warning in error message
2177 commit 5abfb15ced985c340359ae7fb65a625ed3692b3e
2178 Author: Darren Tucker <dtucker@zip.com.au>
2179 Date: Fri Jul 15 14:48:30 2016 +1000
2181 Move VA_COPY macro into compat header.
2183 Some AIX compilers unconditionally undefine va_copy but don't set it back
2184 to an internal function, causing link errors. In some compat code we
2185 already use VA_COPY instead so move the two existing instances into the
2186 shared header and use for sshbuf-getput-basic.c too. Should fix building
2187 with at lease some versions of AIX's compiler. bz#2589, ok djm@
2189 commit 832b7443b7a8e181c95898bc5d73497b7190decd
2190 Author: Damien Miller <djm@mindrot.org>
2191 Date: Fri Jul 15 14:45:34 2016 +1000
2193 disable ciphers not supported by OpenSSL
2197 commit 5fbe93fc6fbb2fe211e035703dec759d095e3dd8
2198 Author: Damien Miller <djm@mindrot.org>
2199 Date: Fri Jul 15 13:54:31 2016 +1000
2201 add a --disable-pkcs11 knob
2203 commit 679ce88ec2a8e2fe6515261c489e8c1449bb9da9
2204 Author: Damien Miller <djm@mindrot.org>
2205 Date: Fri Jul 15 13:44:38 2016 +1000
2207 fix newline escaping for unsupported_algorithms
2209 The hmac-ripemd160 was incorrect and could lead to broken
2210 Makefiles on systems that lacked support for it, but I made
2211 all the others consistent too.
2213 commit ed877ef653847d056bb433975d731b7a1132a979
2214 Author: djm@openbsd.org <djm@openbsd.org>
2215 Date: Fri Jul 15 00:24:30 2016 +0000
2219 Add a ProxyJump ssh_config(5) option and corresponding -J
2220 ssh(1) command-line flag to allow simplified indirection through a SSH
2221 bastion or "jump host".
2223 These options construct a proxy command that connects to the
2224 specified jump host(s) (more than one may be specified) and uses
2225 port-forwarding to establish a connection to the next destination.
2227 This codifies the safest way of indirecting connections through SSH
2228 servers and makes it easy to use.
2232 Upstream-ID: fa899cb8b26d889da8f142eb9774c1ea36b04397
2234 commit 5c02dd126206a26785379e80f2d3848e4470b711
2235 Author: Darren Tucker <dtucker@zip.com.au>
2236 Date: Fri Jul 15 12:56:39 2016 +1000
2238 Map umac_ctx struct name too.
2240 Prevents size mismatch linker warnings on Solaris 11.
2242 commit 283b97ff33ea2c641161950849931bd578de6946
2243 Author: Darren Tucker <dtucker@zip.com.au>
2244 Date: Fri Jul 15 13:49:44 2016 +1000
2246 Mitigate timing of disallowed users PAM logins.
2248 When sshd decides to not allow a login (eg PermitRootLogin=no) and
2249 it's using PAM, it sends a fake password to PAM so that the timing for
2250 the failure is not noticeably different whether or not the password
2251 is correct. This behaviour can be detected by sending a very long
2252 password string which is slower to hash than the fake password.
2254 Mitigate by constructing an invalid password that is the same length
2255 as the one from the client and thus takes the same time to hash.
2258 commit 9286875a73b2de7736b5e50692739d314cd8d9dc
2259 Author: Darren Tucker <dtucker@zip.com.au>
2260 Date: Fri Jul 15 13:32:45 2016 +1000
2262 Determine appropriate salt for invalid users.
2264 When sshd is processing a non-PAM login for a non-existent user it uses
2265 the string from the fakepw structure as the salt for crypt(3)ing the
2266 password supplied by the client. That string has a Blowfish prefix, so on
2267 systems that don't understand that crypt will fail fast due to an invalid
2268 salt, and even on those that do it may have significantly different timing
2269 from the hash methods used for real accounts (eg sha512). This allows
2270 user enumeration by, eg, sending large password strings. This was noted
2271 by EddieEzra.Harari at verint.com (CVE-2016-6210).
2273 To mitigate, use the same hash algorithm that root uses for hashing
2274 passwords for users that do not exist on the system. ok djm@
2276 commit a162dd5e58ca5b224d7500abe35e1ef32b5de071
2277 Author: Darren Tucker <dtucker@zip.com.au>
2278 Date: Thu Jul 14 21:19:59 2016 +1000
2280 OpenSSL 1.1.x not currently supported.
2282 commit 7df91b01fc558a33941c5c5f31abbcdc53a729fb
2283 Author: Darren Tucker <dtucker@zip.com.au>
2284 Date: Thu Jul 14 12:25:24 2016 +1000
2288 If we don't have it, set BROKEN_STRNVIS to activate the compat replacement.
2290 commit ee67716f61f1042d5e67f91c23707cca5dcdd7d0
2291 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2292 Date: Thu Jul 14 01:24:21 2016 +0000
2296 Correct equal in test.
2298 Upstream-Regress-ID: 4e32f7a5c57a619c4e8766cb193be2a1327ec37a
2300 commit 372807c2065c8572fdc6478b25cc5ac363743073
2301 Author: tb@openbsd.org <tb@openbsd.org>
2302 Date: Mon Jul 11 21:38:13 2016 +0000
2306 Add missing "recvfd" pledge promise: Raf Czlonka reported
2307 ssh coredumps when Control* keywords were set in ssh_config. This patch also
2308 fixes similar problems with scp and sftp.
2310 ok deraadt, looks good to millert
2312 Upstream-ID: ca2099eade1ef3e87a79614fefa26a0297ad8a3b
2314 commit e0453f3df64bf485c61c7eb6bd12893eee9fe2cd
2315 Author: tedu@openbsd.org <tedu@openbsd.org>
2316 Date: Mon Jul 11 03:19:44 2016 +0000
2320 obsolete note about fascistloggin is obsolete. ok djm
2323 Upstream-ID: dae60df23b2bb0e89f42661ddd96a7b0d1b7215a
2325 commit a2333584170a565adf4f209586772ef8053b10b8
2326 Author: Darren Tucker <dtucker@zip.com.au>
2327 Date: Thu Jul 14 10:59:09 2016 +1000
2329 Add compat code for missing wcwidth.
2331 If we don't have wcwidth force fallback implementations of nl_langinfo
2332 and mbtowc. Based on advice from Ingo Schwarze.
2334 commit 8aaec7050614494014c47510b7e94daf6e644c62
2335 Author: Damien Miller <djm@mindrot.org>
2336 Date: Thu Jul 14 09:48:48 2016 +1000
2338 fix missing include for systems with err.h
2340 commit 6310ef27a2567cda66d6cf0c1ad290ee1167f243
2341 Author: Darren Tucker <dtucker@zip.com.au>
2342 Date: Wed Jul 13 14:42:35 2016 +1000
2344 Move err.h replacements into compat lib.
2346 Move implementations of err.h replacement functions into their own file
2347 in the libopenbsd-compat so we can use them in kexfuzz.c too. ok djm@
2349 commit f3f2cc8386868f51440c45210098f65f9787449a
2350 Author: Darren Tucker <dtucker@zip.com.au>
2351 Date: Mon Jul 11 17:23:38 2016 +1000
2353 Check for wchar.h and langinfo.h
2355 Wrap includes in the appropriate #ifdefs.
2357 commit b9c50614eba9d90939b2b119b6e1b7e03b462278
2358 Author: Damien Miller <djm@mindrot.org>
2359 Date: Fri Jul 8 13:59:13 2016 +1000
2361 whitelist more architectures for seccomp-bpf
2363 bz#2590 - testing and patch from Jakub Jelen
2365 commit 18813a32b6fd964037e0f5e1893cb4468ac6a758
2366 Author: guenther@openbsd.org <guenther@openbsd.org>
2367 Date: Mon Jul 4 18:01:44 2016 +0000
2371 DEBUGLIBS has been broken since the gcc4 switch, so delete
2372 it. CFLAGS contains -g by default anyway
2374 problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com)
2375 ok millert@ kettenis@ deraadt@
2377 Upstream-Regress-ID: 4a0bb72f95c63f2ae9daa8a040ac23914bddb542
2379 commit 6d31193d0baa3da339c196ac49625b7ba1c2ecc7
2380 Author: djm@openbsd.org <djm@openbsd.org>
2381 Date: Fri Jul 8 03:44:42 2016 +0000
2385 Improve crypto ordering for Encrypt-then-MAC (EtM) mode
2388 Previously we were computing the MAC, decrypting the packet and then
2389 checking the MAC. This gave rise to the possibility of creating a
2390 side-channel oracle in the decryption step, though no such oracle has
2393 This adds a mac_check() function that computes and checks the MAC in
2394 one pass, and uses it to advance MAC checking for EtM algorithms to
2395 before payload decryption.
2397 Reported by Jean Paul Degabriele, Kenny Paterson, Torben Hansen and
2398 Martin Albrecht. feedback and ok markus@
2400 Upstream-ID: 1999bb67cab47dda5b10b80d8155fe83d4a1867b
2402 commit 71f5598f06941f645a451948c4a5125c83828e1c
2403 Author: guenther@openbsd.org <guenther@openbsd.org>
2404 Date: Mon Jul 4 18:01:44 2016 +0000
2408 DEBUGLIBS has been broken since the gcc4 switch, so
2409 delete it. CFLAGS contains -g by default anyway
2411 problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com)
2412 ok millert@ kettenis@ deraadt@
2414 Upstream-ID: 96c5054e3e1f170c6276902d5bc65bb3b87a2603
2416 commit e683fc6f1c8c7295648dbda679df8307786ec1ce
2417 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2418 Date: Thu Jun 30 05:17:05 2016 +0000
2422 Explicitly check for 100% completion to avoid potential
2423 floating point rounding error, which could cause progressmeter to report 99%
2424 on completion. While there invert the test so the 100% case is clearer. with
2427 Upstream-ID: a166870c5878e422f3c71ff802e2ccd7032f715d
2429 commit 772e6cec0ed740fc7db618dc30b4134f5a358b43
2430 Author: jmc@openbsd.org <jmc@openbsd.org>
2431 Date: Wed Jun 29 17:14:28 2016 +0000
2437 Upstream-ID: 1a97465ede8790b4d47cb618269978e07f41f8ac
2439 commit 46ecd19e554ccca15a7309cd1b6b44bc8e6b84af
2440 Author: djm@openbsd.org <djm@openbsd.org>
2441 Date: Thu Jun 23 05:17:51 2016 +0000
2445 fix AuthenticationMethods during configuration re-parse;
2446 reported by Juan Francisco Cantero Hurtado
2448 Upstream-ID: 8ffa1dac25c7577eca8238e825317ab20848f9b4
2450 commit 3147e7595d0f2f842a666c844ac53e6c7a253d7e
2451 Author: djm@openbsd.org <djm@openbsd.org>
2452 Date: Sun Jun 19 07:48:02 2016 +0000
2456 revert 1.34; causes problems loading public keys
2458 reported by semarie@
2460 Upstream-ID: b393794f8935c8b15d98a407fe7721c62d2ed179
2462 commit ad23a75509f4320d43f628c50f0817e3ad12bfa7
2463 Author: jmc@openbsd.org <jmc@openbsd.org>
2464 Date: Fri Jun 17 06:33:30 2016 +0000
2470 Upstream-ID: 5d5b21c80f1e81db367333ce0bb3e5874fb3e463
2472 commit 5e28b1a2a3757548b40018cc2493540a17c82e27
2473 Author: djm@openbsd.org <djm@openbsd.org>
2474 Date: Fri Jun 17 05:06:23 2016 +0000
2478 translate OpenSSL error codes to something more
2479 meaninful; bz#2522 reported by Jakub Jelen, ok dtucker@
2481 Upstream-ID: 4cb0795a366381724314e6515d57790c5930ffe5
2483 commit b64faeb5eda7eff8210c754d00464f9fe9d23de5
2484 Author: djm@openbsd.org <djm@openbsd.org>
2485 Date: Fri Jun 17 05:03:40 2016 +0000
2489 ban AuthenticationMethods="" and accept
2490 AuthenticationMethods=any for the default behaviour of not requiring multiple
2493 bz#2398 from Jakub Jelen; ok dtucker@
2495 Upstream-ID: fabd7f44d59e4518d241d0d01e226435cc23cf27
2497 commit 9816fc5daee5ca924dd5c4781825afbaab728877
2498 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2499 Date: Thu Jun 16 11:00:17 2016 +0000
2503 Include stdarg.h for va_copy as per man page.
2505 Upstream-ID: 105d6b2f1af2fbd9d91c893c436ab121434470bd
2507 commit b6cf84b51bc0f5889db48bf29a0c771954ade283
2508 Author: jmc@openbsd.org <jmc@openbsd.org>
2509 Date: Thu Jun 16 06:10:45 2016 +0000
2513 keys stored in openssh format can have comments too; diff
2514 from yonas yanfa, tweaked a bit;
2518 Upstream-ID: 03d48536da6e51510d73ade6fcd44ace731ceb27
2520 commit aa37768f17d01974b6bfa481e5e83841b6c76f86
2521 Author: Darren Tucker <dtucker@zip.com.au>
2522 Date: Mon Jun 20 15:55:34 2016 +1000
2524 get_remote_name_or_ip inside LOGIN_NEEDS_UTMPX
2526 Apply the same get_remote_name_or_ip -> session_get_remote_name_or_ip
2527 change as commit 95767262 to the code inside #ifdef LOGIN_NEEDS_UTMPX.
2530 commit 009891afc8df37bc2101e15d1e0b6433cfb90549
2531 Author: Darren Tucker <dtucker@zip.com.au>
2532 Date: Fri Jun 17 14:34:09 2016 +1000
2534 Remove duplicate code from PAM. ok djm@
2536 commit e690fe85750e93fca1fb7c7c8587d4130a4f7aba
2537 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2538 Date: Wed Jun 15 00:40:40 2016 +0000
2542 Remove "POSSIBLE BREAK-IN ATTEMPT!" from log message
2543 about forward and reverse DNS not matching. We haven't supported IP-based
2544 auth methods for a very long time so it's now misleading. part of bz#2585,
2547 Upstream-ID: 5565ef0ee0599b27f0bd1d3bb1f8a323d8274e29
2549 commit 57b4ee04cad0d3e0fec1194753b0c4d31e39a1cd
2550 Author: Darren Tucker <dtucker@zip.com.au>
2551 Date: Wed Jun 15 11:22:38 2016 +1000
2553 Move platform_disable_tracing into its own file.
2555 Prevents link errors resolving the extern "options" when platform.o
2556 gets linked into ssh-agent when building --with-pam.
2558 commit 78dc8e3724e30ee3e1983ce013e80277dc6ca070
2559 Author: Darren Tucker <dtucker@zip.com.au>
2560 Date: Tue Jun 14 13:55:12 2016 +1000
2562 Track skipped upstream commit IDs.
2564 There are a small number of "upstream" commits that do not correspond to
2565 a file in -portable. This file tracks those so that we can reconcile
2566 OpenBSD and Portable to ensure that no commits are accidentally missed.
2568 If you add something to .skipped-commit-ids please also add an upstream
2569 ID line in the following format when you commit it.
2571 Upstream-ID: 321065a95a7ccebdd5fd08482a1e19afbf524e35
2572 Upstream-ID: d4f699a421504df35254cf1c6f1a7c304fb907ca
2573 Upstream-ID: aafe246655b53b52bc32c8a24002bc262f4230f7
2574 Upstream-ID: 8fa9cd1dee3c3339ae329cf20fb591db6d605120
2575 Upstream-ID: f31327a48dd4103333cc53315ec53fe65ed8a17a
2576 Upstream-ID: edbfde98c40007b7752a4ac106095e060c25c1ef
2577 Upstream-ID: 052fd565e3ff2d8cec3bc957d1788f50c827f8e2
2578 Upstream-ID: 7cf73737f357492776223da1c09179fa6ba74660
2579 Upstream-ID: 180d84674be1344e45a63990d60349988187c1ae
2580 Upstream-ID: f6ae971186ba68d066cd102e57d5b0b2c211a5ee
2582 commit 9f919d1a3219d476d6a662d18df058e1c4f36a6f
2583 Author: Darren Tucker <dtucker@zip.com.au>
2584 Date: Tue Jun 14 13:51:01 2016 +1000
2586 Remove now-defunct .cvsignore files. ok djm
2588 commit 68777faf271efb2713960605c748f6c8a4b26d55
2589 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2590 Date: Wed Jun 8 02:13:01 2016 +0000
2594 Back out rev 1.28 "Check min and max sizes sent by the
2595 client" change. It caused "key_verify failed for server_host_key" in clients
2596 that send a DH-GEX min value less that DH_GRP_MIN, eg old OpenSSH and PuTTY.
2599 Upstream-ID: 452979d3ca5c1e9dff063287ea0a5314dd091f65
2601 commit a86ec4d0737ac5879223e7cd9d68c448df46e169
2602 Author: Darren Tucker <dtucker@zip.com.au>
2603 Date: Tue Jun 14 10:48:27 2016 +1000
2605 Use Solaris setpflags(__PROC_PROTECT, ...).
2607 Where possible, use Solaris setpflags to disable process tracing on
2608 ssh-agent and sftp-server. bz#2584, based on a patch from huieying.lee
2609 at oracle.com, ok djm.
2611 commit 0f916d39b039fdc0b5baf9b5ab0754c0f11ec573
2612 Author: Darren Tucker <dtucker@zip.com.au>
2613 Date: Tue Jun 14 10:43:53 2016 +1000
2615 Shorten prctl code a tiny bit.
2617 commit 0fb7f5985351fbbcd2613d8485482c538e5123be
2618 Author: Darren Tucker <dtucker@zip.com.au>
2619 Date: Thu Jun 9 16:23:07 2016 +1000
2621 Move prctl PR_SET_DUMPABLE into platform.c.
2623 This should make it easier to add additional platform support such as
2626 commit e6508898c3cd838324ecfe1abd0eb8cf802e7106
2627 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2628 Date: Fri Jun 3 04:10:41 2016 +0000
2632 Add a test for ssh(1)'s config file parsing.
2634 Upstream-Regress-ID: 558b7f4dc45cc3761cc3d3e889b9f3c5bc91e601
2636 commit ab0a536066dfa32def0bd7272c096ebb5eb25b11
2637 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2638 Date: Fri Jun 3 03:47:59 2016 +0000
2642 Add 'sshd' to the test ID as I'm about to add a similar
2645 Upstream-Regress-ID: aea7a9c3bac638530165c801ce836875b228ae7a
2647 commit a5577c1ed3ecdfe4b7b1107c526cae886fc91afb
2648 Author: schwarze@openbsd.org <schwarze@openbsd.org>
2649 Date: Mon May 30 12:14:08 2016 +0000
2653 stricter malloc.conf(5) options for utf8 tests
2655 Upstream-Regress-ID: 111efe20a0fb692fa1a987f6e823310f9b25abf6
2657 commit 75f0844b4f29d62ec3a5e166d2ee94b02df819fc
2658 Author: schwarze@openbsd.org <schwarze@openbsd.org>
2659 Date: Mon May 30 12:05:56 2016 +0000
2663 Fix two rare edge cases: 1. If vasprintf() returns < 0,
2664 do not access a NULL pointer in snmprintf(), and do not free() the pointer
2665 returned from vasprintf() because on some systems other than OpenBSD, it
2666 might be a bogus pointer. 2. If vasprintf() returns == 0, return 0 and ""
2667 rather than -1 and NULL.
2669 Besides, free(dst) is pointless after failure (not a bug).
2671 One half OK martijn@, the other half OK deraadt@;
2672 committing quickly before people get hurt.
2674 Upstream-Regress-ID: b164f20923812c9bac69856dbc1385eb1522cba4
2676 commit 016881eb33a7948028848c90f4c7ac42e3af0e87
2677 Author: schwarze@openbsd.org <schwarze@openbsd.org>
2678 Date: Thu May 26 19:14:25 2016 +0000
2682 test the new utf8 module
2684 Upstream-Regress-ID: c923d05a20e84e4ef152cbec947fdc4ce6eabbe3
2686 commit d4219028bdef448e089376f3afe81ef6079da264
2687 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2688 Date: Tue May 3 15:30:46 2016 +0000
2692 Set umask to prevent "Bad owner or permissions" errors.
2694 Upstream-Regress-ID: 8fdf2fc4eb595ccd80c443f474d639f851145417
2696 commit 07d5608bb237e9b3fe86a2aeaa429392230faebf
2697 Author: djm@openbsd.org <djm@openbsd.org>
2698 Date: Tue May 3 14:41:04 2016 +0000
2704 Upstream-Regress-ID: 8d5572b27ea810394eeda432d8b4e9e1064a7c38
2706 commit 01cabf10adc7676cba5f40536a34d3b246edb73f
2707 Author: djm@openbsd.org <djm@openbsd.org>
2708 Date: Tue May 3 13:48:33 2016 +0000
2712 unit tests for sshbuf_dup_string()
2714 Upstream-Regress-ID: 7521ff150dc7f20511d1c2c48fd3318e5850a96d
2716 commit 6915f1698e3d1dd4e22eac20f435e1dfc1d46372
2717 Author: jmc@openbsd.org <jmc@openbsd.org>
2718 Date: Fri Jun 3 06:44:12 2016 +0000
2724 Upstream-ID: 92979f1a0b63e041a0e5b08c9ed0ba9b683a3698
2726 commit 0cb2f4c2494b115d0f346ed2d8b603ab3ba643f4
2727 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2728 Date: Fri Jun 3 04:09:38 2016 +0000
2732 Allow ExitOnForwardFailure and ClearAllForwardings to be
2733 overridden when using ssh -W (but still default to yes in that case).
2736 Upstream-ID: 4b20c419e93ca11a861c81c284090cfabc8c54d4
2738 commit 8543ff3f5020fe659839b15f05b8c522bde6cee5
2739 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2740 Date: Fri Jun 3 03:14:41 2016 +0000
2744 Move the host and port used by ssh -W into the Options
2745 struct. This will make future changes a bit easier. ok djm@
2747 Upstream-ID: 151bce5ecab2fbedf0d836250a27968d30389382
2749 commit 6b87311d3acdc460f926b2c40f4c4f3fd345f368
2750 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2751 Date: Wed Jun 1 04:19:49 2016 +0000
2755 Check min and max sizes sent by the client against what
2756 we support before passing them to the monitor. ok djm@
2758 Upstream-ID: 750627e8117084215412bff00a25b1586ab17ece
2760 commit 564cd2a8926ccb1dca43a535073540935b5e0373
2761 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2762 Date: Tue May 31 23:46:14 2016 +0000
2766 Ensure that the client's proposed DH-GEX max value is at
2767 least as big as the minimum the server will accept. ok djm@
2769 Upstream-ID: b4b84fa04aab2de7e79a6fee4a6e1c189c0fe775
2771 commit df820722e40309c9b3f360ea4ed47a584ed74333
2772 Author: Darren Tucker <dtucker@zip.com.au>
2773 Date: Mon Jun 6 11:36:13 2016 +1000
2775 Add compat bits to utf8.c.
2777 commit 05c6574652571becfe9d924226c967a3f4b3f879
2778 Author: Darren Tucker <dtucker@zip.com.au>
2779 Date: Mon Jun 6 11:33:43 2016 +1000
2783 commit 6c1717190b4d5ddd729cd9e24e8ed71ed4f087ce
2784 Author: schwarze@openbsd.org <schwarze@openbsd.org>
2785 Date: Mon May 30 18:34:41 2016 +0000
2789 Backout rev. 1.43 for now.
2791 The function update_progress_meter() calls refresh_progress_meter()
2792 which calls snmprintf() which calls malloc(); but update_progress_meter()
2793 acts as the SIGALRM signal handler.
2795 "malloc(): error: recursive call" reported by sobrado@.
2797 Upstream-ID: aaae57989431e5239c101f8310f74ccc83aeb93e
2799 commit cd9e1eabeb4137182200035ab6fa4522f8d24044
2800 Author: schwarze@openbsd.org <schwarze@openbsd.org>
2801 Date: Mon May 30 12:57:21 2016 +0000
2805 Even when only writing an unescaped character, the dst
2806 buffer may need to grow, or it would be overrun; issue found by tb@ with
2809 While here, reserve an additional byte for the terminating NUL
2810 up front such that we don't have to realloc() later just for that.
2814 Upstream-ID: 30ebcc0c097c4571b16f0a78b44969f170db0cff
2816 commit ac284a355f8065eaef2a16f446f3c44cdd17371d
2817 Author: schwarze@openbsd.org <schwarze@openbsd.org>
2818 Date: Mon May 30 12:05:56 2016 +0000
2822 Fix two rare edge cases: 1. If vasprintf() returns < 0,
2823 do not access a NULL pointer in snmprintf(), and do not free() the pointer
2824 returned from vasprintf() because on some systems other than OpenBSD, it
2825 might be a bogus pointer. 2. If vasprintf() returns == 0, return 0 and ""
2826 rather than -1 and NULL.
2828 Besides, free(dst) is pointless after failure (not a bug).
2830 One half OK martijn@, the other half OK deraadt@;
2831 committing quickly before people get hurt.
2833 Upstream-ID: b7bcd2e82fc168a8eff94e41f5db336ed986fed0
2835 commit 0e059cdf5fd86297546c63fa8607c24059118832
2836 Author: schwarze@openbsd.org <schwarze@openbsd.org>
2837 Date: Wed May 25 23:48:45 2016 +0000
2841 To prevent screwing up terminal settings when printing to
2842 the terminal, for ASCII and UTF-8, escape bytes not forming characters and
2843 bytes forming non-printable characters with vis(3) VIS_OCTAL. For other
2844 character sets, abort printing of the current string in these cases. In
2845 particular, * let scp(1) respect the local user's LC_CTYPE locale(1); *
2846 sanitize data received from the remote host; * sanitize filenames, usernames,
2847 and similar data even locally; * take character display widths into account
2848 for the progressmeter.
2850 This is believed to be sufficient to keep the local terminal safe
2851 on OpenBSD, but bad things can still happen on other systems with
2852 state-dependent locales because many places in the code print
2853 unencoded ASCII characters into the output stream.
2855 Using feedback from djm@ and martijn@,
2856 various aspects discussed with many others.
2858 deraadt@ says it should go in now, i probably already hesitated too long
2860 Upstream-ID: e66afbc94ee396ddcaffd433b9a3b80f387647e0
2862 commit 8c02e3639acefe1e447e293dbe23a0917abd3734
2863 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2864 Date: Tue May 24 04:43:45 2016 +0000
2868 KNF compression proposal and simplify the client side a
2871 Upstream-ID: aa814b694efe9e5af8a26e4c80a05526ae6d6605
2873 commit 7ec4946fb686813eb5f8c57397e465f5485159f4
2874 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2875 Date: Tue May 24 02:31:57 2016 +0000
2879 Back out 'plug memleak'.
2881 Upstream-ID: 4faacdde136c24a961e24538de373660f869dbc0
2883 commit 82f24c3ddc52053aeb7beb3332fa94c92014b0c5
2884 Author: djm@openbsd.org <djm@openbsd.org>
2885 Date: Mon May 23 23:30:50 2016 +0000
2889 prefer agent-hosted keys to keys from PKCS#11; ok markus
2891 Upstream-ID: 7417f7653d58d6306d9f8c08d0263d050e2fd8f4
2893 commit a0cb7778fbc9b43458f7072eb68dd858766384d1
2894 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2895 Date: Mon May 23 00:17:27 2016 +0000
2899 Plug mem leak in filter_proposal. ok djm@
2901 Upstream-ID: bf968da7cfcea2a41902832e7d548356a4e2af34
2903 commit ae9c0d4d5c581b3040d1f16b5c5f4b1cd1616743
2904 Author: Darren Tucker <dtucker@zip.com.au>
2905 Date: Fri Jun 3 16:03:44 2016 +1000
2907 Update vis.h and vis.c from OpenBSD.
2909 This will be needed for the upcoming utf8 changes.
2911 commit e1d93705f8f48f519433d6ca9fc3d0abe92a1b77
2912 Author: Tim Rice <tim@multitalents.net>
2913 Date: Tue May 31 11:13:22 2016 -0700
2915 modified: configure.ac
2916 whitspace clean up. No code changes.
2918 commit 604a037d84e41e31f0aec9075df0b8740c130200
2919 Author: Damien Miller <djm@mindrot.org>
2920 Date: Tue May 31 16:45:28 2016 +1000
2924 commit 18424200160ff5c923113e0a37ebe21ab7bcd17c
2925 Author: Darren Tucker <dtucker@zip.com.au>
2926 Date: Mon May 30 19:35:28 2016 +1000
2928 Add missing ssh-host-config --name option
2930 Patch from vinschen@redhat.com.
2932 commit 39c0cecaa188a37a2e134795caa68e03f3ced592
2933 Author: Darren Tucker <dtucker@zip.com.au>
2934 Date: Fri May 20 10:01:58 2016 +1000
2936 Fix comment about sshpam_const and AIX.
2938 From mschwager via github.
2940 commit f64062b1f74ad5ee20a8a49aab2732efd0f7ce30
2941 Author: Damien Miller <djm@mindrot.org>
2942 Date: Fri May 20 09:56:53 2016 +1000
2944 Deny lstat syscalls in seccomp sandbox
2946 Avoids sandbox violations for some krb/gssapi libraries.
2948 commit 531c135409b8d8810795b1f3692a4ebfd5c9cae0
2949 Author: djm@openbsd.org <djm@openbsd.org>
2950 Date: Thu May 19 07:45:32 2016 +0000
2954 fix type of ed25519 values
2956 Upstream-ID: b32d0cb372bbe918ca2de56906901eae225a59b0
2958 commit 75e21688f523799c9e0cc6601d76a9c5ca79f787
2959 Author: markus@openbsd.org <markus@openbsd.org>
2960 Date: Wed May 4 14:32:26 2016 +0000
2964 add IdentityAgent; noticed & ok jmc@
2966 Upstream-ID: 4ba9034b00a4cf1beae627f0728da897802df88a
2968 commit 1a75d14daf4b60db903e6103cf50e74e0cd0a76b
2969 Author: markus@openbsd.org <markus@openbsd.org>
2970 Date: Wed May 4 14:29:58 2016 +0000
2974 allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@
2976 Upstream-ID: 20c508480d8db3eef18942c0fc39b1fcf25652ac
2978 commit 0516454151ae722fc8256c3c56115c6baf24c5b0
2979 Author: markus@openbsd.org <markus@openbsd.org>
2980 Date: Wed May 4 14:22:33 2016 +0000
2984 move SSH_MSG_NONE, so we don't have to include ssh1.h;
2987 Upstream-ID: c2f97502efc761a41b18c17ddf460e138ca7994e
2989 commit 332ff3d770631e7513fea38cf0d3689f673f0e3f
2990 Author: Damien Miller <djm@mindrot.org>
2991 Date: Tue May 10 09:51:06 2016 +1000
2993 initialise salen in binresvport_sa
2995 avoids failures with UsePrivilegedPort=yes
2997 patch from Juan Gallego
2999 commit c5c1d5d2f04ce00d2ddd6647e61b32f28be39804
3000 Author: markus@openbsd.org <markus@openbsd.org>
3001 Date: Wed May 4 14:04:40 2016 +0000
3005 missing const in prototypes (ssh1)
3007 Upstream-ID: 789c6ad4928b5fa557369b88c3a6a34926082c05
3009 commit 9faae50e2e82ba42eb0cb2726bf6830fe7948f28
3010 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3011 Date: Wed May 4 14:00:09 2016 +0000
3015 Fix inverted logic for updating StreamLocalBindMask which
3016 would cause the server to set an invalid mask. ok djm@
3018 Upstream-ID: 8a4404c8307a5ef9e07ee2169fc6d8106b527587
3020 commit b02ad1ce9105bfa7394ac7590c0729dd52e26a81
3021 Author: markus@openbsd.org <markus@openbsd.org>
3022 Date: Wed May 4 12:21:53 2016 +0000
3026 IdentityAgent for specifying specific agent sockets; ok
3029 Upstream-ID: 3e6a15eb89ea0fd406f108826b7dc7dec4fbfac1
3031 commit 910e59bba09ac309d78ce61e356da35292212935
3032 Author: djm@openbsd.org <djm@openbsd.org>
3033 Date: Wed May 4 12:16:39 2016 +0000
3037 fix junk characters after quotes
3039 Upstream-ID: cc4d0cd32cb6b55a2ef98975d2f7ae857d0dc578
3041 commit 9283884e647b8be50ccd2997537af0065672107d
3042 Author: jmc@openbsd.org <jmc@openbsd.org>
3043 Date: Tue May 3 18:38:12 2016 +0000
3049 Upstream-ID: 1fbd5b7ab16d2d9834ec79c3cedd4738fa42a168
3051 commit cfefbcea1057c2623e76c579174a4107a0b6e6cd
3052 Author: djm@openbsd.org <djm@openbsd.org>
3053 Date: Tue May 3 15:57:39 2016 +0000
3057 fix overriding of StreamLocalBindMask and
3058 StreamLocalBindUnlink in Match blocks; found the hard way Rogan Dawes
3060 Upstream-ID: 940bc69ec0249ab428d24ccd0722ce35cb932ee2
3062 commit 771c2f51ffc0c9a2877b7892fada0c77bd1f6549
3063 Author: djm@openbsd.org <djm@openbsd.org>
3064 Date: Tue May 3 15:25:06 2016 +0000
3068 don't forget to include StreamLocalBindUnlink in the
3071 Upstream-ID: 14a6d970b3b45c8e94272e3c661e9a0b2a0ee7cb
3073 commit cdcd941994dc430f50d0a4e6a712d32b66e6199e
3074 Author: djm@openbsd.org <djm@openbsd.org>
3075 Date: Tue May 3 14:54:08 2016 +0000
3079 make nethack^wrandomart fingerprint flag more readily
3080 searchable pointed out by Matt Johnston
3082 Upstream-ID: cb40d0235dc153c478c1aad3bc60b195422a54fb
3084 commit 05855bf2ce7d5cd0a6db18bc0b4214ed5ef7516d
3085 Author: djm@openbsd.org <djm@openbsd.org>
3086 Date: Tue May 3 13:10:24 2016 +0000
3090 clarify ordering of subkeys; pointed out by ietf-ssh AT
3093 Upstream-ID: 05ebe9f949449a555ebce8e0aad7c8c9acaf8463
3095 commit cca3b4395807bfb7aaeb83d2838f5c062ce30566
3096 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3097 Date: Tue May 3 12:15:49 2016 +0000
3101 Use a subshell for constructing key types to work around
3102 different sed behaviours for -portable.
3104 Upstream-Regress-ID: 0f6eb673162df229eda9a134a0f10da16151552d
3106 commit fa58208c6502dcce3e0daac0ca991ee657daf1f5
3107 Author: djm@openbsd.org <djm@openbsd.org>
3108 Date: Tue May 3 10:27:59 2016 +0000
3112 correct some typos and remove a long-stale XXX note.
3114 add specification for ed25519 certificates
3116 mention no host certificate options/extensions are currently defined
3118 pointed out by Simon Tatham
3120 Upstream-ID: 7b535ab7dba3340b7d8210ede6791fdaefdf839a
3122 commit b466f956c32cbaff4200bfcd5db6739fe4bc7d04
3123 Author: djm@openbsd.org <djm@openbsd.org>
3124 Date: Tue May 3 10:24:27 2016 +0000
3128 add ed25519 keys that are supported but missing from this
3129 documents; from Peter Moody
3131 Upstream-ID: 8caac2d8e8cfd2fca6dc304877346e0a064b014b
3133 commit 7f3d76319a69dab2efe3a520a8fef5b97e923636
3134 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3135 Date: Tue May 3 09:03:49 2016 +0000
3139 Implement IUTF8 as per draft-sgtatham-secsh-iutf8-00. Patch
3140 from Simon Tatham, ok markus@
3142 Upstream-ID: 58268ebdf37d9d467f78216c681705a5e10c58e8
3144 commit 31bc01c05d9f51bee3ebe33dc57c4fafb059fb62
3145 Author: djm@openbsd.org <djm@openbsd.org>
3146 Date: Mon May 2 14:10:58 2016 +0000
3150 unbreak config parsing on reexec from previous commit
3152 Upstream-ID: bc69932638a291770955bd05ca55a32660a613ab
3154 commit 67f1459efd2e85bf03d032539283fa8107218936
3155 Author: djm@openbsd.org <djm@openbsd.org>
3156 Date: Mon May 2 09:52:00 2016 +0000
3160 unit and regress tests for SHA256/512; ok markus
3162 Upstream-Regress-ID: a0cd1a92dc824067076a5fcef83c18df9b0bf2c6
3164 commit 0e8eeec8e75f6d0eaf33317376f773160018a9c7
3165 Author: djm@openbsd.org <djm@openbsd.org>
3166 Date: Mon May 2 10:26:04 2016 +0000
3170 add support for additional fixed DH groups from
3171 draft-ietf-curdle-ssh-kex-sha2-03
3173 diffie-hellman-group14-sha256 (2K group)
3174 diffie-hellman-group16-sha512 (4K group)
3175 diffie-hellman-group18-sha512 (8K group)
3177 based on patch from Mark D. Baushke and Darren Tucker
3180 Upstream-ID: ac00406ada4f0dfec41585ca0839f039545bc46f
3182 commit 57464e3934ba53ad8590ee3ccd840f693407fc1e
3183 Author: djm@openbsd.org <djm@openbsd.org>
3184 Date: Mon May 2 09:36:42 2016 +0000
3188 support SHA256 and SHA512 RSA signatures in certificates;
3191 Upstream-ID: b45be2f2ce8cacd794dc5730edaabc90e5eb434a
3193 commit 1a31d02b2411c4718de58ce796dbb7b5e14db93e
3194 Author: djm@openbsd.org <djm@openbsd.org>
3195 Date: Mon May 2 08:49:03 2016 +0000
3199 fix signed/unsigned errors reported by clang-3.7; add
3200 sshbuf_dup_string() to replace a common idiom of strdup(sshbuf_ptr()) with
3201 better safety checking; feedback and ok markus@
3203 Upstream-ID: 71f926d9bb3f1efed51319a6daf37e93d57c8820
3205 commit d2d6bf864e52af8491a60dd507f85b74361f5da3
3206 Author: djm@openbsd.org <djm@openbsd.org>
3207 Date: Fri Apr 29 08:07:53 2016 +0000
3211 close ControlPersist background process stderr when not
3212 in debug mode or when logging to a file or syslog. bz#1988 ok dtucker
3214 Upstream-ID: 4fb726f0fdcb155ad419913cea10dc4afd409d24
3216 commit 9ee692fa1146e887e008a2b9a3d3ea81770c9fc8
3217 Author: djm@openbsd.org <djm@openbsd.org>
3218 Date: Thu Apr 28 14:30:21 2016 +0000
3224 Upstream-ID: 313a385bd7b69a82f8e28ecbaf5789c774457b15
3226 commit ee1e0a16ff2ba41a4d203c7670b54644b6c57fa6
3227 Author: jmc@openbsd.org <jmc@openbsd.org>
3228 Date: Wed Apr 27 13:53:48 2016 +0000
3232 cidr permitted for {allow,deny}users; from lars nooden ok djm
3234 Upstream-ID: 13e7327fe85f6c63f3f7f069e0fdc8c351515d11
3236 commit b6e0140a5aa883c27b98415bd8aa9f65fc04ee22
3237 Author: djm@openbsd.org <djm@openbsd.org>
3238 Date: Thu Apr 21 06:08:02 2016 +0000
3242 make argument == NULL tests more consistent
3244 Upstream-ID: dc4816678704aa5cbda3a702e0fa2033ff04581d
3246 commit 6aaabc2b610e44bae473457ad9556ffb43d90ee3
3247 Author: jmc@openbsd.org <jmc@openbsd.org>
3248 Date: Sun Apr 17 14:34:46 2016 +0000
3254 Upstream-ID: 46c1bab91c164078edbccd5f7d06b9058edd814f
3256 commit 0f839e5969efa3bda615991be8a9d9311554c573
3257 Author: djm@openbsd.org <djm@openbsd.org>
3258 Date: Fri Apr 15 02:57:10 2016 +0000
3262 missing bit of Include regress
3264 Upstream-Regress-ID: 1063595f7f40f8489a1b7a27230b9e8acccea34f
3266 commit 12e4ac46aed681da55c2bba3cd11dfcab23591be
3267 Author: djm@openbsd.org <djm@openbsd.org>
3268 Date: Fri Apr 15 02:55:53 2016 +0000
3272 remove redundant CLEANFILES section
3274 Upstream-Regress-ID: 29ef1b267fa56daa60a1463396635e7d53afb587
3276 commit b1d05aa653ae560c44baf8e8a9756e33f98ea75c
3277 Author: djm@openbsd.org <djm@openbsd.org>
3278 Date: Fri Apr 15 00:48:01 2016 +0000
3282 sync CLEANFILES with portable, sort
3284 Upstream-Regress-ID: cb782f4f1ab3e079efbc335c6b64942f790766ed
3286 commit 35f22dad263cce5c61d933ae439998cb965b8748
3287 Author: djm@openbsd.org <djm@openbsd.org>
3288 Date: Fri Apr 15 00:31:10 2016 +0000
3292 regression test for ssh_config Include directive
3294 Upstream-Regress-ID: 46a38c8101f635461c506d1aac2d96af80f97f1e
3296 commit 6b8a1a87005818d4700ce8b42faef746e82c1f51
3297 Author: djm@openbsd.org <djm@openbsd.org>
3298 Date: Thu Apr 14 23:57:17 2016 +0000
3302 unbreak test for recent ssh de-duplicated forwarding
3305 Upstream-Regress-ID: 6b2b115d99acd7cff13986e6739ea214cf2a3da3
3307 commit 076787702418985a2cc6808212dc28ce7afc01f0
3308 Author: djm@openbsd.org <djm@openbsd.org>
3309 Date: Thu Apr 14 23:21:42 2016 +0000
3313 add test knob and warning for StrictModes
3315 Upstream-Regress-ID: 8cd10952ce7898655ee58945904f2a0a3bdf7682
3317 commit dc7990be865450574c7940c9880567f5d2555b37
3318 Author: djm@openbsd.org <djm@openbsd.org>
3319 Date: Fri Apr 15 00:30:19 2016 +0000
3323 Include directive for ssh_config(5); feedback & ok markus@
3325 Upstream-ID: ae3b76e2e343322b9f74acde6f1e1c5f027d5fff
3327 commit 85bdcd7c92fe7ff133bbc4e10a65c91810f88755
3328 Author: Damien Miller <djm@mindrot.org>
3329 Date: Wed Apr 13 10:39:57 2016 +1000
3331 ignore PAM environment vars when UseLogin=yes
3333 If PAM is configured to read user-specified environment variables
3334 and UseLogin=yes in sshd_config, then a hostile local user may
3335 attack /bin/login via LD_PRELOAD or similar environment variables
3338 CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
3340 commit dce19bf6e4a2a3d0b13a81224de63fc316461ab9
3341 Author: djm@openbsd.org <djm@openbsd.org>
3342 Date: Sat Apr 9 12:39:30 2016 +0000
3346 make private key loading functions consistently handle NULL
3347 key pointer arguments; ok markus@
3349 Upstream-ID: 92038726ef4a338169c35dacc9c5a07fcc7fa761
3351 commit 5f41f030e2feb5295657285aa8c6602c7810bc4b
3352 Author: Darren Tucker <dtucker@zip.com.au>
3353 Date: Fri Apr 8 21:14:13 2016 +1000
3355 Remove NO_IPPORT_RESERVED_CONCEPT
3357 Replace by defining IPPORT_RESERVED to zero on Cygwin, which should have
3358 the same effect without causing problems syncing patches with OpenBSD.
3359 Resync the two affected functions with OpenBSD. ok djm, sanity checked
3362 commit 34a01b2cf737d946ddb140618e28c3048ab7a229
3363 Author: djm@openbsd.org <djm@openbsd.org>
3364 Date: Fri Apr 8 08:19:17 2016 +0000
3370 Upstream-ID: 5beffd4e001515da12851b974e2323ae4aa313b6
3372 commit 90ee563fa6b54c59896c6c332c5188f866c5e75f
3373 Author: djm@openbsd.org <djm@openbsd.org>
3374 Date: Fri Apr 8 06:35:54 2016 +0000
3378 We accidentally send an empty string and a zero uint32 with
3379 every direct-streamlocal@openssh.com channel open, in contravention of our
3382 Fixing this is too hard wrt existing versions that expect these
3383 fields to be present and fatal() if they aren't, so document them
3384 as "reserved" fields in the PROTOCOL spec as though we always
3385 intended this and let us never speak of it again.
3387 bz#2529, reported by Ron Frederick
3389 Upstream-ID: 34cd326a4d236ca6e39084c4ff796bd97ab833e7
3391 commit 0ccbd5eca0f0dd78e71a4b69c66f03a66908d558
3392 Author: djm@openbsd.org <djm@openbsd.org>
3393 Date: Wed Apr 6 06:42:17 2016 +0000
3397 don't record duplicate LocalForward and RemoteForward
3398 entries; fixes failure with ExitOnForwardFailure+hostname canonicalisation
3399 where the same forwards are added on the second pass through the
3400 configuration file. bz#2562; ok dtucker@
3402 Upstream-ID: 40a51d68b6300f1cc61deecdb7d4847b8b7b0de1
3404 commit 574def0eb493cd6efeffd4ff2e9257abcffee0c8
3405 Author: krw@openbsd.org <krw@openbsd.org>
3406 Date: Sat Apr 2 14:37:42 2016 +0000
3410 Another use for fcntl() and thus of the superfluous 3rd
3411 parameter is when sanitising standard fd's before calling daemon().
3413 Use a tweaked version of the ssh(1) function in all three places
3414 found using fcntl() this way.
3418 Upstream-ID: f16811ffa19a1c5f4ef383c5f0fecb843c84e218
3420 commit b3413534aa9d71a941005df2760d1eec2c2b0854
3421 Author: Darren Tucker <dtucker@zip.com.au>
3422 Date: Mon Apr 4 11:09:21 2016 +1000
3424 Tidy up openssl header test.
3426 commit 815bcac0b94bb448de5acdd6ba925b8725240b4f
3427 Author: Darren Tucker <dtucker@zip.com.au>
3428 Date: Mon Apr 4 11:07:59 2016 +1000
3430 Fix configure-time warnings for openssl test.
3432 commit 95687f5831ae680f7959446d8ae4b52452ee05dd
3433 Author: djm@openbsd.org <djm@openbsd.org>
3434 Date: Fri Apr 1 02:34:10 2016 +0000
3440 Upstream-ID: 40ae2203d07cb14e0a89e1a0d4c6120ee8fd8c3a
3442 commit fdfbf4580de09d84a974211715e14f88a5704b8e
3443 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3444 Date: Thu Mar 31 05:24:06 2016 +0000
3448 Remove fallback from moduli to "primes" file that was
3449 deprecated in 2001 and fix log messages referring to primes file. Based on
3450 patch from xnox at ubuntu.com via bz#2559. "kill it" deraadt@
3452 Upstream-ID: 0d4f8c70e2fa7431a83b95f8ca81033147ba8713
3454 commit 0235a5fa67fcac51adb564cba69011a535f86f6b
3455 Author: djm@openbsd.org <djm@openbsd.org>
3456 Date: Thu Mar 17 17:19:43 2016 +0000
3460 UseDNS affects ssh hostname processing in authorized_keys,
3461 not known_hosts; bz#2554 reported by jjelen AT redhat.com
3463 Upstream-ID: c1c1bb895dde46095fc6d81d8653703928437591
3465 commit 8c4739338f5e379d05b19d6e544540114965f07e
3466 Author: Darren Tucker <dtucker@zip.com.au>
3467 Date: Tue Mar 15 09:24:43 2016 +1100
3469 Don't call Solaris setproject() with UsePAM=yes.
3471 When Solaris Projects are enabled along with PAM setting the project
3472 is PAM's responsiblity. bz#2425, based on patch from
3473 brent.paulson at gmail.com.
3475 commit cff26f373c58457a32cb263e212cfff53fca987b
3476 Author: Damien Miller <djm@mindrot.org>
3477 Date: Tue Mar 15 04:30:21 2016 +1100
3479 remove slogin from *.spec
3481 commit c38905ba391434834da86abfc988a2b8b9b62477
3482 Author: djm@openbsd.org <djm@openbsd.org>
3483 Date: Mon Mar 14 16:20:54 2016 +0000
3487 unbreak authentication using lone certificate keys in
3488 ssh-agent: when attempting pubkey auth with a certificate, if no separate
3489 private key is found among the keys then try with the certificate key itself.
3491 bz#2550 reported by Peter Moody
3493 Upstream-ID: f939cd76d68e6a9a3d1711b5a943d6ed1e623966
3495 commit 4b4bfb01cd40b9ddb948e6026ddd287cc303d871
3496 Author: djm@openbsd.org <djm@openbsd.org>
3497 Date: Thu Mar 10 11:47:57 2016 +0000
3501 sanitise characters destined for xauth reported by
3502 github.com/tintinweb feedback and ok deraadt and markus
3504 Upstream-ID: 18ad8d0d74cbd2ea3306a16595a306ee356aa261
3506 commit 732b463d37221722b1206f43aa59563766a6a968
3507 Author: Darren Tucker <dtucker@zip.com.au>
3508 Date: Mon Mar 14 16:04:23 2016 +1100
3510 Pass supported malloc options to connect-privsep.
3512 This allows us to activate only the supported options during the malloc
3513 option portion of the connect-privsep test.
3515 commit d29c5b9b3e9f27394ca97a364ed4bb4a55a59744
3516 Author: Darren Tucker <dtucker@zip.com.au>
3517 Date: Mon Mar 14 09:30:58 2016 +1100
3519 Remove leftover roaming.h file.
3521 Pointed out by des at des.no.
3523 commit 8ff20ec95f4377021ed5e9b2331320f5c5a34cea
3524 Author: Darren Tucker <dtucker@zip.com.au>
3525 Date: Mon Mar 14 09:24:03 2016 +1100
3527 Quote variables that may contain whitespace.
3529 The variable $L_TMP_ID_FILE needs to be surrounded by quotes in order to
3530 survive paths containing whitespace. bz#2551, from Corinna Vinschen via
3533 commit 627824480c01f0b24541842c7206ab9009644d02
3534 Author: Darren Tucker <dtucker@zip.com.au>
3535 Date: Fri Mar 11 14:47:41 2016 +1100
3537 Include priv.h for priv_set_t.
3539 From alex at cooperi.net.
3541 commit e960051f9a264f682c4d2fefbeecffcfc66b0ddf
3542 Author: Darren Tucker <dtucker@zip.com.au>
3543 Date: Wed Mar 9 13:14:18 2016 +1100
3545 Wrap stdint.h inside #ifdef HAVE_STDINT_H.
3547 commit 2c48bd344d2c4b5e08dae9aea5ff44fc19a5e363
3548 Author: Darren Tucker <dtucker@zip.com.au>
3549 Date: Wed Mar 9 12:46:50 2016 +1100
3551 Add compat to monotime_double().
3553 Apply all of the portability changes in monotime() to monotime() double.
3554 Fixes build on at least older FreeBSD systems.
3556 commit 7b40ef6c2eef40c339f6ea8920cb8a44838e10c9
3557 Author: Damien Miller <djm@mindrot.org>
3558 Date: Tue Mar 8 14:12:58 2016 -0800
3560 make a regress-binaries target
3562 Easier to build all the regression/unit test binaries in one pass
3563 than going through all of ${REGRESS_BINARIES}
3565 commit c425494d6b6181beb54a1b3763ef9e944fd3c214
3566 Author: Damien Miller <djm@mindrot.org>
3567 Date: Tue Mar 8 14:03:54 2016 -0800
3569 unbreak kexfuzz for -Werror without __bounded__
3571 commit 3ed9218c336607846563daea5d5ab4f701f4e042
3572 Author: Damien Miller <djm@mindrot.org>
3573 Date: Tue Mar 8 14:01:29 2016 -0800
3575 unbreak PAM after canohost refactor
3577 commit 885fb2a44ff694f01e4f6470f803629e11f62961
3578 Author: Darren Tucker <dtucker@zip.com.au>
3579 Date: Tue Mar 8 11:58:43 2016 +1100
3581 auth_get_canonical_hostname in portable code.
3583 "refactor canohost.c" replaced get_canonical_hostname, this makes the
3584 same change to some portable-specific code.
3586 commit 95767262caa6692eff1e1565be1f5cb297949a89
3587 Author: djm@openbsd.org <djm@openbsd.org>
3588 Date: Mon Mar 7 19:02:43 2016 +0000
3592 refactor canohost.c: move functions that cache results closer
3593 to the places that use them (authn and session code). After this, no state is
3594 cached in canohost.c
3596 feedback and ok markus@
3598 Upstream-ID: 5f2e4df88d4803fc8ec59ec53629105e23ce625e
3600 commit af0bb38ffd1f2c4f9f43b0029be2efe922815255
3601 Author: Damien Miller <djm@mindrot.org>
3602 Date: Fri Mar 4 15:11:55 2016 +1100
3604 hook unittests/misc/kexfuzz into build
3606 commit 331b8e07ee5bcbdca12c11cc8f51a7e8de09b248
3607 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3608 Date: Fri Mar 4 02:48:06 2016 +0000
3612 Filter debug messages out of log before picking the last
3613 two lines. Should prevent problems if any more debug output is added late in
3616 Upstream-Regress-ID: 345d0a9589c381e7d640a4ead06cfaadf4db1363
3618 commit 0892edaa3ce623381d3a7635544cbc69b31cf9cb
3619 Author: djm@openbsd.org <djm@openbsd.org>
3620 Date: Fri Mar 4 02:30:36 2016 +0000
3624 add KEX fuzzer harness; ok deraadt@
3626 Upstream-Regress-ID: 3df5242d30551b12b828aa9ba4a4cec0846be8d1
3628 commit ae2562c47d41b68dbb00240fd6dd60bed205367a
3629 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3630 Date: Thu Mar 3 00:46:53 2016 +0000
3634 Look back 3 lines for possible error messages. Changes
3635 to the code mean that "Bad packet length" errors are 3 lines back instead of
3636 the previous two, which meant we didn't skip some offsets that we intended
3639 Upstream-Regress-ID: 24f36912740a634d509a3144ebc8eb7c09b9c684
3641 commit 988e429d903acfb298bfddfd75e7994327adfed0
3642 Author: djm@openbsd.org <djm@openbsd.org>
3643 Date: Fri Mar 4 03:35:44 2016 +0000
3647 fix ClientAliveInterval when a time-based RekeyLimit is
3648 set; previously keepalive packets were not being sent. bz#2252 report and
3649 analysis by Christian Wittenhorst and Garrett Lee feedback and ok dtucker@
3651 Upstream-ID: d48f9deadd35fdacdd5106b41bb07630ddd4aa81
3653 commit 8ef04d7a94bcdb8b0085fdd2a79a844b7d40792d
3654 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3655 Date: Wed Mar 2 22:43:52 2016 +0000
3659 Improve accuracy of reported transfer speeds by waiting
3660 for the ack from the other end. Pointed out by mmcc@, ok deraadt@ markus@
3662 Upstream-ID: 99f1cf15c9a8f161086b814d414d862795ae153d
3664 commit b8d4eafe29684fe4f5bb587f7eab948e6ed62723
3665 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3666 Date: Wed Mar 2 22:42:40 2016 +0000
3670 Improve precision of progressmeter for sftp and scp by
3671 storing sub-second timestamps. Pointed out by mmcc@, ok deraadt@ markus@
3673 Upstream-ID: 38fd83a3d83dbf81c8ff7b5d1302382fe54970ab
3675 commit 18f64b969c70ed00e74b9d8e50359dbe698ce4c0
3676 Author: jca@openbsd.org <jca@openbsd.org>
3677 Date: Mon Feb 29 20:22:36 2016 +0000
3681 Print ssize_t with %zd; ok deraadt@ mmcc@
3683 Upstream-ID: 0590313bbb013ff6692298c98f7e0be349d124bd
3685 commit 6e7f68ce38130c794ec1fb8d2a6091fbe982628d
3686 Author: djm@openbsd.org <djm@openbsd.org>
3687 Date: Sun Feb 28 22:27:00 2016 +0000
3691 rearrange DH public value tests to be a little more clear
3693 rearrange DH private value generation to explain rationale more
3694 clearly and include an extra sanity check.
3698 Upstream-ID: 9ad8a07e1a12684e1b329f9bd88941b249d4b2ad
3700 commit 2ed17aa34008bdfc8db674315adc425a0712be11
3701 Author: Darren Tucker <dtucker@zip.com.au>
3702 Date: Tue Mar 1 15:24:20 2016 +1100
3704 Import updated moduli file from OpenBSD.
3706 Note that 1.5k bit groups have been removed.
3708 commit 72b061d4ba0f909501c595d709ea76e06b01e5c9
3709 Author: Darren Tucker <dtucker@zip.com.au>
3710 Date: Fri Feb 26 14:40:04 2016 +1100
3712 Add a note about using xlc on AIX.
3714 commit fd4e4f2416baa2e6565ea49d52aade296bad3e28
3715 Author: Darren Tucker <dtucker@zip.com.au>
3716 Date: Wed Feb 24 10:44:25 2016 +1100
3718 Skip PrintLastLog in config dump mode.
3720 When DISABLE_LASTLOG is set, do not try to include PrintLastLog in the
3721 config dump since it'll be reported as UNKNOWN.
3723 commit 99135c764fa250801da5ec3b8d06cbd0111caae8
3724 Author: Damien Miller <djm@mindrot.org>
3725 Date: Tue Feb 23 20:17:23 2016 +1100
3727 update spec/README versions ahead of release
3729 commit b86a334aaaa4d1e643eb1fd71f718573d6d948b5
3730 Author: Damien Miller <djm@mindrot.org>
3731 Date: Tue Feb 23 20:16:53 2016 +1100
3733 put back portable patchlevel to p1
3735 commit 555dd35ff176847e3c6bd068ba2e8db4022eb24f
3736 Author: djm@openbsd.org <djm@openbsd.org>
3737 Date: Tue Feb 23 09:14:34 2016 +0000
3743 Upstream-ID: 9db776b26014147fc907ece8460ef2bcb0f11e78
3745 commit 1acc058d0a7913838c830ed998a1a1fb5b7864bf
3746 Author: Damien Miller <djm@mindrot.org>
3747 Date: Tue Feb 23 16:12:13 2016 +1100
3749 Disable tests where fs perms are incorrect
3751 Some tests have strict requirements on the filesystem permissions
3752 for certain files and directories. This adds a regress/check-perm
3753 tool that copies the relevant logic from sshd to exactly test
3754 the paths in question. This lets us skip tests when the local
3755 filesystem doesn't conform to our expectations rather than
3756 continuing and failing the test run.
3760 commit 39f303b1f36d934d8410b05625f25c7bcb75db4d
3761 Author: Damien Miller <djm@mindrot.org>
3762 Date: Tue Feb 23 12:56:59 2016 +1100
3764 fix sandbox on OSX Lion
3766 sshd was failing with:
3768 ssh_sandbox_child: sandbox_init: dlopen(/usr/lib/libsandbox.1.dylib, 261):cw
3769 image not found [preauth]
3771 caused by chroot before sandboxing. Avoid by explicitly linking libsandbox
3772 to sshd. Spotted by Darren.
3774 commit 0d1451a32c7436e6d3d482351e776bc5e7824ce4
3775 Author: djm@openbsd.org <djm@openbsd.org>
3776 Date: Tue Feb 23 01:34:14 2016 +0000
3780 fix spurious error message when incorrect passphrase
3781 entered for keys; reported by espie@ ok deraadt@
3783 Upstream-ID: 58b2e46e63ed6912ed1ee780bd3bd8560f9a5899
3785 commit 09d87d79741beb85768b5e788d7dfdf4bc3543dc
3786 Author: sobrado@openbsd.org <sobrado@openbsd.org>
3787 Date: Sat Feb 20 23:06:23 2016 +0000
3791 set ssh(1) protocol version to 2 only.
3795 Upstream-ID: e168daf9d27d7e392e3c9923826bd8e87b2b3a10
3797 commit 9262e07826ba5eebf8423f7ac9e47ec488c47869
3798 Author: sobrado@openbsd.org <sobrado@openbsd.org>
3799 Date: Sat Feb 20 23:02:39 2016 +0000
3803 add missing ~/.ssh/id_ecdsa and ~/.ssh/id_ed25519 to
3808 Upstream-ID: 6ce99466312e4ae7708017c3665e3edb976f70cf
3810 commit c12f0fdce8f985fca8d71829fd64c5b89dc777f5
3811 Author: sobrado@openbsd.org <sobrado@openbsd.org>
3812 Date: Sat Feb 20 23:01:46 2016 +0000
3816 AddressFamily defaults to any.
3820 Upstream-ID: 0d94aa06a4b889bf57a7f631c45ba36d24c13e0c
3822 commit 907091acb188b1057d50c2158f74c3ecf1c2302b
3823 Author: Darren Tucker <dtucker@zip.com.au>
3824 Date: Fri Feb 19 09:05:39 2016 +1100
3826 Make Solaris privs code build on older systems.
3828 Not all systems with Solaris privs have priv_basicset so factor that
3829 out and provide backward compatibility code. Similarly, not all have
3830 PRIV_NET_ACCESS so wrap that in #ifdef. Based on code from
3831 alex at cooperi.net and djm@ with help from carson at taltos.org and
3832 wieland at purdue.edu.
3834 commit 292a8dee14e5e67dcd1b49ba5c7b9023e8420d59
3835 Author: djm@openbsd.org <djm@openbsd.org>
3836 Date: Wed Feb 17 22:20:14 2016 +0000
3840 rekey refactor broke SSH1; spotted by Tom G. Christensen
3842 Upstream-ID: 43f0d57928cc077c949af0bfa71ef574dcb58243
3844 commit 3a13cb543df9919aec2fc6b75f3dd3802facaeca
3845 Author: djm@openbsd.org <djm@openbsd.org>
3846 Date: Wed Feb 17 08:57:34 2016 +0000
3850 rsa-sha2-512,rsa-sha2-256 cannot be selected explicitly
3851 in *KeyTypes options yet. Remove them from the lists of algorithms for now.
3852 committing on behalf of markus@ ok djm@
3854 Upstream-ID: c6e8820eb8e610ac21551832c0c89684a9a51bb7
3856 commit a685ae8d1c24fb7c712c55a4f3280ee76f5f1e4b
3857 Author: jmc@openbsd.org <jmc@openbsd.org>
3858 Date: Wed Feb 17 07:38:19 2016 +0000
3862 since these pages now clearly tell folks to avoid v1,
3863 normalise the docs from a v2 perspective (i.e. stop pointing out which bits
3866 ok/tweaks djm ok markus
3868 Upstream-ID: eb474f8c36fb6a532dc05c282f7965e38dcfa129
3870 commit c5c3f3279a0e4044b8de71b70d3570d692d0f29d
3871 Author: djm@openbsd.org <djm@openbsd.org>
3872 Date: Wed Feb 17 05:29:04 2016 +0000
3876 make sandboxed privilege separation the default, not just
3877 for new installs; "absolutely" deraadt@
3879 Upstream-ID: 5221ef3b927d2df044e9aa3f5db74ae91743f69b
3881 commit eb3f7337a651aa01d5dec019025e6cdc124ed081
3882 Author: jmc@openbsd.org <jmc@openbsd.org>
3883 Date: Tue Feb 16 07:47:54 2016 +0000
3887 no need to state that protocol 2 is the default twice;
3889 Upstream-ID: b1e4c36b0c2e12e338e5b66e2978f2ac953b95eb
3891 commit e7901efa9b24e5b0c7e74f2c5520d47eead4d005
3892 Author: djm@openbsd.org <djm@openbsd.org>
3893 Date: Tue Feb 16 05:11:04 2016 +0000
3897 Replace list of ciphers and MACs adjacent to -1/-2 flag
3898 descriptions in ssh(1) with a strong recommendation not to use protocol 1.
3899 Add a similar warning to the Protocol option descriptions in ssh_config(5)
3902 prompted by and ok mmcc@
3904 Upstream-ID: 961f99e5437d50e636feca023978950a232ead5e
3906 commit 5a0fcb77287342e2fc2ba1cee79b6af108973dc2
3907 Author: djm@openbsd.org <djm@openbsd.org>
3908 Date: Tue Feb 16 03:37:48 2016 +0000
3912 add a "Close session" log entry (at loglevel=verbose) to
3913 correspond to the existing "Starting session" one. Also include the session
3914 id number to make multiplexed sessions more apparent.
3916 feedback and ok dtucker@
3918 Upstream-ID: e72d2ac080e02774376325136e532cb24c2e617c
3920 commit 624fd395b559820705171f460dd33d67743d13d6
3921 Author: djm@openbsd.org <djm@openbsd.org>
3922 Date: Wed Feb 17 02:24:17 2016 +0000
3926 include bad $SSH_CONNECTION in failure output
3928 Upstream-Regress-ID: b22d72edfde78c403aaec2b9c9753ef633cc0529
3930 commit 60d860e54b4f199e5e89963b1c086981309753cb
3931 Author: Darren Tucker <dtucker@zip.com.au>
3932 Date: Wed Feb 17 13:37:09 2016 +1100
3934 Rollback addition of va_start.
3936 va_start was added in 0f754e29dd3760fc0b172c1220f18b753fb0957e, however
3937 it has the wrong number of args and it's not usable in non-variadic
3938 functions anyway so it breaks things (for example Solaris 2.6 as
3939 reported by Tom G. Christensen).i ok djm@
3941 commit 2fee909c3cee2472a98b26eb82696297b81e0d38
3942 Author: Darren Tucker <dtucker@zip.com.au>
3943 Date: Wed Feb 17 09:48:15 2016 +1100
3945 Look for gethostbyname in libresolv and libnsl.
3947 Should fix build problem on Solaris 2.6 reported by Tom G. Christensen.
3949 commit 5ac712d81a84396aab441a272ec429af5b738302
3950 Author: Damien Miller <djm@mindrot.org>
3951 Date: Tue Feb 16 10:45:02 2016 +1100
3953 make existing ssh_malloc_init only for __OpenBSD__
3955 commit 24c9bded569d9f2449ded73f92fb6d12db7a9eec
3956 Author: djm@openbsd.org <djm@openbsd.org>
3957 Date: Mon Feb 15 23:32:37 2016 +0000
3961 memleak of algorithm name in mm_answer_sign; reported by
3964 Upstream-ID: ccd742cd25952240ebd23d7d4d6b605862584d08
3966 commit ffb1e7e896139a42ceb78676f637658f44612411
3967 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3968 Date: Mon Feb 15 09:47:49 2016 +0000
3972 Add a function to enable security-related malloc_options.
3973 With and ok deraadt@, something similar has been in the snaps for a while.
3975 Upstream-ID: 43a95523b832b7f3b943d2908662191110c380ed
3977 commit ef39e8c0497ff0564990a4f9e8b7338b3ba3507c
3978 Author: Damien Miller <djm@mindrot.org>
3979 Date: Tue Feb 16 10:34:39 2016 +1100
3981 sync ssh-copy-id with upstream 783ef08b0a75
3983 commit d2d772f55b19bb0e8d03c2fe1b9bb176d9779efd
3984 Author: djm@openbsd.org <djm@openbsd.org>
3985 Date: Fri Feb 12 00:20:30 2016 +0000
3989 avoid fatal() for PKCS11 tokens that present empty key IDs
3992 Upstream-ID: 044a764fee526f2c4a9d530bd10695422d01fc54
3994 commit e4c918a6c721410792b287c9fd21356a1bed5805
3995 Author: djm@openbsd.org <djm@openbsd.org>
3996 Date: Thu Feb 11 02:56:32 2016 +0000
4000 sync crypto algorithm lists in ssh_config(5) and
4001 sshd_config(5) with current reality. bz#2527
4003 Upstream-ID: d7fd1b6c1ed848d866236bcb1d7049d2bb9b2ff6
4005 commit e30cabfa4ab456a30b3224f7f545f1bdfc4a2517
4006 Author: djm@openbsd.org <djm@openbsd.org>
4007 Date: Thu Feb 11 02:21:34 2016 +0000
4011 fix regression in openssh-6.8 sftp client: existing
4012 destination directories would incorrectly terminate recursive uploads;
4015 Upstream-ID: 3306be469f41f26758e3d447987ac6d662623e18
4017 commit 714e367226ded4dc3897078be48b961637350b05
4018 Author: djm@openbsd.org <djm@openbsd.org>
4019 Date: Tue Feb 9 05:30:04 2016 +0000
4023 turn off more old crypto in the client: hmac-md5, ripemd,
4024 truncated HMACs, RC4, blowfish. ok markus@ dtucker@
4026 Upstream-ID: 96aa11c2c082be45267a690c12f1d2aae6acd46e
4028 commit 5a622844ff7f78dcb75e223399f9ef0977e8d0a3
4029 Author: djm@openbsd.org <djm@openbsd.org>
4030 Date: Mon Feb 8 23:40:12 2016 +0000
4034 don't attempt to percent_expand() already-canonicalised
4035 addresses, avoiding unnecessary failures when attempting to connect to scoped
4036 IPv6 addresses (that naturally contain '%' characters)
4038 Upstream-ID: f24569cffa1a7cbde5f08dc739a72f4d78aa5c6a
4040 commit 19bcf2ea2d17413f2d9730dd2a19575ff86b9b6a
4041 Author: djm@openbsd.org <djm@openbsd.org>
4042 Date: Mon Feb 8 10:57:07 2016 +0000
4046 refactor activation of rekeying
4048 This makes automatic rekeying internal to the packet code (previously
4049 the server and client loops needed to assist). In doing to it makes
4050 application of rekey limits more accurate by accounting for packets
4051 about to be sent as well as packets queued during rekeying events
4054 Based on a patch from dtucker@ which was in turn based on a patch
4055 Aleksander Adamowski in bz#2521; ok markus@
4057 Upstream-ID: a441227fd64f9739850ca97b4cf794202860fcd8
4059 commit 603ba41179e4b53951c7b90ee95b6ef3faa3f15d
4060 Author: naddy@openbsd.org <naddy@openbsd.org>
4061 Date: Fri Feb 5 13:28:19 2016 +0000
4065 Only check errno if read() has returned an error. EOF is
4066 not an error. This fixes a problem where the mux master would sporadically
4067 fail to notice that the client had exited. ok mikeb@ djm@
4069 Upstream-ID: 3c2dadc21fac6ef64665688aac8a75fffd57ae53
4071 commit 56d7dac790693ce420d225119283bc355cff9185
4072 Author: jsg@openbsd.org <jsg@openbsd.org>
4073 Date: Fri Feb 5 04:31:21 2016 +0000
4077 avoid an uninitialised value when NumberOfPasswordPrompts
4078 is 0 ok markus@ djm@
4080 Upstream-ID: 11b068d83c2865343aeb46acf1e9eec00f829b6b
4082 commit deae7d52d59c5019c528f977360d87fdda15d20b
4083 Author: djm@openbsd.org <djm@openbsd.org>
4084 Date: Fri Feb 5 03:07:06 2016 +0000
4088 mention internal DH-GEX fallback groups; bz#2302
4090 Upstream-ID: e7b395fcca3122cd825515f45a2e41c9a157e09e
4092 commit cac3b6665f884d46192c0dc98a64112e8b11a766
4093 Author: djm@openbsd.org <djm@openbsd.org>
4094 Date: Fri Feb 5 02:37:56 2016 +0000
4098 better description for MaxSessions; bz#2531
4100 Upstream-ID: e2c0d74ee185cd1a3e9d4ca1f1b939b745b354da
4102 commit 5ef4b0fdcc7a239577a754829b50022b91ab4712
4103 Author: Damien Miller <djm@mindrot.org>
4104 Date: Wed Jan 27 17:45:56 2016 +1100
4106 avoid FreeBSD RCS Id in comment
4108 Change old $FreeBSD version string in comment so it doesn't
4109 become an RCS ident downstream; requested by des AT des.no
4111 commit 696d12683c90d20a0a9c5f4275fc916b7011fb04
4112 Author: djm@openbsd.org <djm@openbsd.org>
4113 Date: Thu Feb 4 23:43:48 2016 +0000
4117 printf argument casts to avoid warnings on strict
4120 Upstream-ID: 7b9f6712cef01865ad29070262d366cf13587c9c
4122 commit 5658ef2501e785fbbdf5de2dc33b1ff7a4dca73a
4123 Author: millert@openbsd.org <millert@openbsd.org>
4124 Date: Mon Feb 1 21:18:17 2016 +0000
4128 Avoid ugly "DISPLAY "(null)" invalid; disabling X11
4129 forwarding" message when DISPLAY is not set. This could also result in a
4130 crash on systems with a printf that doesn't handle NULL. OK djm@
4132 Upstream-ID: 20ee0cfbda678a247264c20ed75362042b90b412
4134 commit 537f88ec7bcf40bd444ac5584c707c5588c55c43
4135 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4136 Date: Fri Jan 29 05:18:15 2016 +0000
4140 Add regression test for RekeyLimit parsing of >32bit values
4143 Upstream-Regress-ID: 548390350c62747b6234f522a99c319eee401328
4145 commit 4c6cb8330460f94e6c7ae28a364236d4188156a3
4146 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4147 Date: Fri Jan 29 23:04:46 2016 +0000
4151 Remove leftover roaming dead code. ok djm markus.
4153 Upstream-ID: 13d1f9c8b65a5109756bcfd3b74df949d53615be
4155 commit 28136471809806d6246ef41e4341467a39fe2f91
4156 Author: djm@openbsd.org <djm@openbsd.org>
4157 Date: Fri Jan 29 05:46:01 2016 +0000
4161 include packet type of non-data packets in debug3 output;
4164 Upstream-ID: 034eaf639acc96459b9c5ce782db9fcd8bd02d41
4166 commit 6fd6e28daccafaa35f02741036abe64534c361a1
4167 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4168 Date: Fri Jan 29 03:31:03 2016 +0000
4172 Revert "account for packets buffered but not yet
4173 processed" change as it breaks for very small RekeyLimit values due to
4174 continuous rekeying. ok djm@
4176 Upstream-ID: 7e03f636cb45ab60db18850236ccf19079182a19
4178 commit 921ff00b0ac429666fb361d2d6cb1c8fff0006cb
4179 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4180 Date: Fri Jan 29 02:54:45 2016 +0000
4184 Allow RekeyLimits in excess of 4G up to 2**63 bits
4185 (limited by the return type of scan_scaled). Part of bz#2521, ok djm.
4187 Upstream-ID: 13bea82be566b9704821b1ea05bf7804335c7979
4189 commit c0060a65296f01d4634f274eee184c0e93ba0f23
4190 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4191 Date: Fri Jan 29 02:42:46 2016 +0000
4195 Account for packets buffered but not yet processed when
4196 computing whether or not it is time to perform rekeying. bz#2521, based
4197 loosely on a patch from olo at fb.com, ok djm@
4199 Upstream-ID: 67e268b547f990ed220f3cb70a5624d9bda12b8c
4201 commit 44cf930e670488c85c9efeb373fa5f4b455692ac
4202 Author: djm@openbsd.org <djm@openbsd.org>
4203 Date: Wed Jan 27 06:44:58 2016 +0000
4207 change old $FreeBSD version string in comment so it doesn't
4208 become an RCS ident downstream; requested by des AT des.no
4210 Upstream-ID: 8ca558c01f184e596b45e4fc8885534b2c864722
4212 commit ebacd377769ac07d1bf3c75169644336056b7060
4213 Author: djm@openbsd.org <djm@openbsd.org>
4214 Date: Wed Jan 27 00:53:12 2016 +0000
4218 make the debug messages a bit more useful here
4220 Upstream-ID: 478ccd4e897e0af8486b294aa63aa3f90ab78d64
4222 commit 458abc2934e82034c5c281336d8dc0f910aecad3
4223 Author: jsg@openbsd.org <jsg@openbsd.org>
4224 Date: Sat Jan 23 05:31:35 2016 +0000
4228 Zero a stack buffer with explicit_bzero() instead of
4229 memset() when returning from client_loop() for consistency with
4230 buffer_free()/sshbuf_free().
4232 ok dtucker@ deraadt@ djm@
4234 Upstream-ID: bc9975b2095339811c3b954694d7d15ea5c58f66
4236 commit 65a3c0dacbc7dbb75ddb6a70ebe22d8de084d0b0
4237 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4238 Date: Wed Jan 20 09:22:39 2016 +0000
4242 Include sys/time.h for gettimeofday. From sortie at
4245 Upstream-ID: 6ed0c33b836d9de0a664cd091e86523ecaa2fb3b
4247 commit fc77ccdc2ce6d5d06628b8da5048a6a5f6ffca5a
4248 Author: markus@openbsd.org <markus@openbsd.org>
4249 Date: Thu Jan 14 22:56:56 2016 +0000
4253 fd leaks; report Qualys Security Advisory team; ok
4256 Upstream-ID: 4ec0f12b9d8fa202293c9effa115464185aa071d
4258 commit a306863831c57ec5fad918687cc5d289ee8e2635
4259 Author: markus@openbsd.org <markus@openbsd.org>
4260 Date: Thu Jan 14 16:17:39 2016 +0000
4264 remove roaming support; ok djm@
4266 Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56
4268 commit 6ef49e83e30688504552ac10875feabd5521565f
4269 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4270 Date: Thu Jan 14 14:34:34 2016 +0000
4274 Disable experimental client-side roaming support. Server
4275 side was disabled/gutted for years already, but this aspect was surprisingly
4276 forgotten. Thanks for report from Qualys
4278 Upstream-ID: 2328004b58f431a554d4c1bf67f5407eae3389df
4280 commit 8d7b523b96d3be180572d9d338cedaafc0570f60
4281 Author: Damien Miller <djm@mindrot.org>
4282 Date: Thu Jan 14 11:08:19 2016 +1100
4284 bump version numbers
4286 commit 8c3d512a1fac8b9c83b4d0c9c3f2376290bd84ca
4287 Author: Damien Miller <djm@mindrot.org>
4288 Date: Thu Jan 14 11:04:04 2016 +1100
4292 commit e6c85f8889c5c9eb04796fdb76d2807636b9eef5
4293 Author: Damien Miller <djm@mindrot.org>
4294 Date: Fri Jan 15 01:30:36 2016 +1100
4296 forcibly disable roaming support in the client
4298 commit ed4ce82dbfa8a3a3c8ea6fa0db113c71e234416c
4299 Author: djm@openbsd.org <djm@openbsd.org>
4300 Date: Wed Jan 13 23:04:47 2016 +0000
4304 eliminate fallback from untrusted X11 forwarding to trusted
4305 forwarding when the X server disables the SECURITY extension; Reported by
4306 Thomas Hoger; ok deraadt@
4308 Upstream-ID: f76195bd2064615a63ef9674a0e4096b0713f938
4310 commit 9a728cc918fad67c8a9a71201088b1e150340ba4
4311 Author: djm@openbsd.org <djm@openbsd.org>
4312 Date: Tue Jan 12 23:42:54 2016 +0000
4316 use explicit_bzero() more liberally in the buffer code; ok
4319 Upstream-ID: 0ece37069fd66bc6e4f55eb1321f93df372b65bf
4321 commit 4626cbaf78767fc8e9c86dd04785386c59ae0839
4322 Author: Damien Miller <djm@mindrot.org>
4323 Date: Fri Jan 8 14:24:56 2016 +1100
4325 Support Illumos/Solaris fine-grained privileges
4327 Includes a pre-auth privsep sandbox and several pledge()
4328 emulations. bz#2511, patch by Alex Wilson.
4332 commit 422d1b3ee977ff4c724b597fb2e437d38fc8de9d
4333 Author: djm@openbsd.org <djm@openbsd.org>
4334 Date: Thu Dec 31 00:33:52 2015 +0000
4338 fix three bugs in KRL code related to (unused) signature
4339 support: verification length was being incorrectly calculated, multiple
4340 signatures were being incorrectly processed and a NULL dereference that
4341 occurred when signatures were verified. Reported by Carl Jackson
4343 Upstream-ID: e705e97ad3ccce84291eaa651708dd1b9692576b
4345 commit 6074c84bf95d00f29cc7d5d3cd3798737851aa1a
4346 Author: djm@openbsd.org <djm@openbsd.org>
4347 Date: Wed Dec 30 23:46:14 2015 +0000
4353 Upstream-ID: f3eef4389d53ed6c0d5c77dcdcca3060c745da97
4355 commit 6213f0e180e54122bb1ba928e11c784e2b4e5380
4356 Author: guenther@openbsd.org <guenther@openbsd.org>
4357 Date: Sat Dec 26 20:51:35 2015 +0000
4361 Use pread/pwrite instead separate lseek+read/write for
4362 lastlog. Cast to off_t before multiplication to avoid truncation on ILP32
4366 Upstream-ID: fc40092568cd195719ddf1a00aa0742340d616cf
4368 commit d7d2bc95045a43dd56ea696cc1d030ac9d77e81f
4369 Author: semarie@openbsd.org <semarie@openbsd.org>
4370 Date: Sat Dec 26 07:46:03 2015 +0000
4374 adjust pledge promises for ControlMaster: when using
4375 "ask" or "autoask", the process will use ssh-askpass for asking confirmation.
4377 problem found by halex@
4381 Upstream-ID: 38a58b30ae3eef85051c74d3c247216ec0735f80
4383 commit 271df8185d9689b3fb0523f58514481b858f6843
4384 Author: djm@openbsd.org <djm@openbsd.org>
4385 Date: Sun Dec 13 22:42:23 2015 +0000
4389 unbreak connections with peers that set
4390 first_kex_follows; fix from Matt Johnston va bz#2515
4392 Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b
4394 commit 43849a47c5f8687699eafbcb5604f6b9c395179f
4395 Author: doug@openbsd.org <doug@openbsd.org>
4396 Date: Fri Dec 11 17:41:37 2015 +0000
4400 Add "id" to ssh-agent pledge for subprocess support.
4402 Found the hard way by Jan Johansson when using ssh-agent with X. Also,
4403 rearranged proc/exec and retval to match other pledge calls in the tree.
4407 Upstream-ID: 914255f6850e5e7fa830a2de6c38605333b584db
4409 commit 52d7078421844b2f88329f5be3de370b0a938636
4410 Author: mmcc@openbsd.org <mmcc@openbsd.org>
4411 Date: Fri Dec 11 04:21:11 2015 +0000
4415 Remove NULL-checks before sshbuf_free().
4419 Upstream-ID: 5ebed00ed5f9f03b119a345085e8774565466917
4421 commit a4b9e0f4e4a6980a0eb8072f76ea611cab5b77e7
4422 Author: djm@openbsd.org <djm@openbsd.org>
4423 Date: Fri Dec 11 03:24:25 2015 +0000
4427 include remote port number in a few more messages; makes
4428 tying log messages together into a session a bit easier; bz#2503 ok dtucker@
4430 Upstream-ID: 9300dc354015f7a7368d94a8ff4a4266a69d237e
4432 commit 6091c362e89079397e68744ae30df121b0a72c07
4433 Author: djm@openbsd.org <djm@openbsd.org>
4434 Date: Fri Dec 11 03:20:09 2015 +0000
4438 don't try to load SSHv1 private key when compiled without
4439 SSHv1 support. From Iain Morgan bz#2505
4441 Upstream-ID: 8b8e7b02a448cf5e5635979df2d83028f58868a7
4443 commit cce6a36bb95e81fa8bfb46daf22eabcf13afc352
4444 Author: djm@openbsd.org <djm@openbsd.org>
4445 Date: Fri Dec 11 03:19:09 2015 +0000
4449 use SSH_MAX_PUBKEY_BYTES consistently as buffer size when
4450 reading key files. Increase it to match the size of the buffers already being
4453 Upstream-ID: 1b60586b484b55a947d99a0b32bd25e0ced56fae
4455 commit 89540b6de025b80404a0cb8418c06377f3f98848
4456 Author: mmcc@openbsd.org <mmcc@openbsd.org>
4457 Date: Fri Dec 11 02:31:47 2015 +0000
4461 Remove NULL-checks before sshkey_free().
4465 Upstream-ID: 3e35afe8a25e021216696b5d6cde7f5d2e5e3f52
4467 commit 79394ed6d74572c2d2643d73937dad33727fc240
4468 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4469 Date: Fri Dec 11 02:29:03 2015 +0000
4473 fflush stdout so that output is seen even when running in
4474 debug mode when output may otherwise not be flushed. Patch from dustin at
4477 Upstream-ID: b0c6b4cd2cdb01d7e9eefbffdc522e35b5bc4acc
4479 commit ee607cccb6636eb543282ba90e0677b0604d8b7a
4480 Author: Darren Tucker <dtucker@zip.com.au>
4481 Date: Tue Dec 15 15:23:49 2015 +1100
4483 Increase robustness of redhat/openssh.spec
4485 - remove configure --with-rsh, because this option isn't supported anymore
4486 - replace last occurrence of BuildPreReq by BuildRequires
4487 - update grep statement to query the krb5 include directory
4489 Patch from CarstenGrohmann via github, ok djm.
4491 commit b5fa0cd73555b991a543145603658d7088ec6b60
4492 Author: Darren Tucker <dtucker@zip.com.au>
4493 Date: Tue Dec 15 15:10:32 2015 +1100
4495 Allow --without-ssl-engine with --without-openssl
4497 Patch from Mike Frysinger via github.
4499 commit c1d7e546f6029024f3257cc25c92f2bddf163125
4500 Author: Darren Tucker <dtucker@zip.com.au>
4501 Date: Tue Dec 15 14:27:09 2015 +1100
4503 Include openssl crypto.h for SSLeay.
4505 Patch from doughdemon via github.
4507 commit c6f5f01651526e88c00d988ce59d71f481ebac62
4508 Author: Darren Tucker <dtucker@zip.com.au>
4509 Date: Tue Dec 15 13:59:12 2015 +1100
4511 Add sys/time.h for gettimeofday.
4513 Should allow it it compile with MUSL libc. Based on patch from
4514 doughdemon via github.
4516 commit 39736be06c7498ef57d6970f2d85cf066ae57c82
4517 Author: djm@openbsd.org <djm@openbsd.org>
4518 Date: Fri Dec 11 02:20:28 2015 +0000
4522 correct error messages; from Tomas Kuthan bz#2507
4524 Upstream-ID: 7454a0affeab772398052954c79300aa82077093
4526 commit 94141b7ade24afceeb6762a3f99e09e47a6c42b6
4527 Author: mmcc@openbsd.org <mmcc@openbsd.org>
4528 Date: Fri Dec 11 00:20:04 2015 +0000
4532 Pass (char *)NULL rather than (char *)0 to execl and
4537 Upstream-ID: 56c955106cbddba86c3dd9bbf786ac0d1b361492
4539 commit d59ce08811bf94111c2f442184cf7d1257ffae24
4540 Author: mmcc@openbsd.org <mmcc@openbsd.org>
4541 Date: Thu Dec 10 17:08:40 2015 +0000
4545 Remove NULL-checks before free().
4549 Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8
4551 commit 8e56dd46cb37879c73bce2d6032cf5e7f82d5a71
4552 Author: mmcc@openbsd.org <mmcc@openbsd.org>
4553 Date: Thu Dec 10 07:01:35 2015 +0000
4557 Fix a couple "the the" typos. ok dtucker@
4559 Upstream-ID: ec364c5af32031f013001fd28d1bd3dfacfe9a72
4561 commit 6262a0522ddc2c0f2e9358dcb68d59b46e9c533e
4562 Author: markus@openbsd.org <markus@openbsd.org>
4563 Date: Mon Dec 7 20:04:09 2015 +0000
4567 stricter encoding type checks for ssh-rsa; ok djm@
4569 Upstream-ID: 8cca7c787599a5e8391e184d0b4f36fdc3665650
4571 commit d86a3ba7af160c13496102aed861ae48a4297072
4572 Author: Damien Miller <djm@mindrot.org>
4573 Date: Wed Dec 9 09:18:45 2015 +1100
4575 Don't set IPV6_V6ONLY on OpenBSD
4577 It isn't necessary and runs afoul of pledge(2) restrictions.
4579 commit da98c11d03d819a15429d8fff9688acd7505439f
4580 Author: djm@openbsd.org <djm@openbsd.org>
4581 Date: Mon Dec 7 02:20:46 2015 +0000
4585 basic unit tests for rsa-sha2-* signature types
4587 Upstream-Regress-ID: 7dc4b9db809d578ff104d591b4d86560c3598d3c
4589 commit 3da893fdec9936dd2c23739cdb3c0c9d4c59fca0
4590 Author: markus@openbsd.org <markus@openbsd.org>
4591 Date: Sat Dec 5 20:53:21 2015 +0000
4595 prefer rsa-sha2-512 over -256 for hostkeys, too; noticed
4598 Upstream-ID: 685f55f7ec566a8caca587750672723a0faf3ffe
4600 commit 8b56e59714d87181505e4678f0d6d39955caf10e
4601 Author: tobias@openbsd.org <tobias@openbsd.org>
4602 Date: Fri Dec 4 21:51:06 2015 +0000
4606 Properly handle invalid %-format by calling fatal.
4610 Upstream-ID: 5692bce7d9f6eaa9c488cb93d3b55e758bef1eac
4612 commit 76c9fbbe35aabc1db977fb78e827644345e9442e
4613 Author: markus@openbsd.org <markus@openbsd.org>
4614 Date: Fri Dec 4 16:41:28 2015 +0000
4618 implement SHA2-{256,512} for RSASSA-PKCS1-v1_5 signatures
4619 (user and host auth) based on draft-rsa-dsa-sha2-256-03.txt and
4620 draft-ssh-ext-info-04.txt; with & ok djm@
4622 Upstream-ID: cf82ce532b2733e5c4b34bb7b7c94835632db309
4624 commit 6064a8b8295cb5a17b5ebcfade53053377714f40
4625 Author: djm@openbsd.org <djm@openbsd.org>
4626 Date: Fri Dec 4 00:24:55 2015 +0000
4630 clean up agent_fd handling; properly initialise it to -1
4631 and make tests consistent
4635 Upstream-ID: ac9554323d5065745caf17b5e37cb0f0d4825707
4637 commit b91926a97620f3e51761c271ba57aa5db790f48d
4638 Author: semarie@openbsd.org <semarie@openbsd.org>
4639 Date: Thu Dec 3 17:00:18 2015 +0000
4643 pledges ssh client: - mux client: which is used when
4644 ControlMaster is in use. will end with "stdio proc tty" (proc is to
4645 permit sending SIGWINCH to mux master on window resize)
4647 - client loop: several levels of pledging depending of your used options
4651 Upstream-ID: 21676155a700e51f2ce911e33538e92a2cd1d94b
4653 commit bcce47466bbc974636f588b5e4a9a18ae386f64a
4654 Author: doug@openbsd.org <doug@openbsd.org>
4655 Date: Wed Dec 2 08:30:50 2015 +0000
4659 Add "cpath" to the ssh-agent pledge so the cleanup
4660 handler can unlink().
4664 Upstream-ID: 9e632991d48241d56db645602d381253a3d8c29d
4666 commit a90d001543f46716b6590c6dcc681d5f5322f8cf
4667 Author: djm@openbsd.org <djm@openbsd.org>
4668 Date: Wed Dec 2 08:00:58 2015 +0000
4672 ssh-agent pledge needs proc for askpass; spotted by todd@
4674 Upstream-ID: 349aa261b29cc0e7de47ef56167769c432630b2a
4676 commit d952162b3c158a8f23220587bb6c8fcda75da551
4677 Author: djm@openbsd.org <djm@openbsd.org>
4678 Date: Tue Dec 1 23:29:24 2015 +0000
4682 basic pledge() for ssh-agent, more refinement needed
4684 Upstream-ID: 5b5b03c88162fce549e45e1b6dd833f20bbb5e13
4686 commit f0191d7c8e76e30551084b79341886d9bb38e453
4687 Author: Damien Miller <djm@mindrot.org>
4688 Date: Mon Nov 30 10:53:25 2015 +1100
4690 Revert "stub for pledge(2) for systems that lack it"
4692 This reverts commit 14c887c8393adde2d9fd437d498be30f8c98535c.
4694 dtucker beat me to it :/
4696 commit 6283cc72eb0e49a3470d30e07ca99a1ba9e89676
4697 Author: Damien Miller <djm@mindrot.org>
4698 Date: Mon Nov 30 10:37:03 2015 +1100
4700 revert 7d4c7513: bring back S/Key prototypes
4702 (but leave RCSID changes)
4704 commit 14c887c8393adde2d9fd437d498be30f8c98535c
4705 Author: Damien Miller <djm@mindrot.org>
4706 Date: Mon Nov 30 09:45:29 2015 +1100
4708 stub for pledge(2) for systems that lack it
4710 commit 452c0b6af5d14c37553e30059bf74456012493f3
4711 Author: djm@openbsd.org <djm@openbsd.org>
4712 Date: Sun Nov 29 22:18:37 2015 +0000
4716 pledge, better fatal() messages; feedback deraadt@
4718 Upstream-ID: 3e00f6ccfe2b9a7a2d1dbba5409586180801488f
4720 commit 6da413c085dba37127687b2617a415602505729b
4721 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4722 Date: Sat Nov 28 06:50:52 2015 +0000
4726 do not leak temp file if there is no known_hosts file
4727 from craig leres, ok djm
4729 Upstream-ID: c820497fd5574844c782e79405c55860f170e426
4731 commit 3ddd15e1b63a4d4f06c8ab16fbdd8a5a61764f16
4732 Author: Darren Tucker <dtucker@zip.com.au>
4733 Date: Mon Nov 30 07:23:53 2015 +1100
4735 Add a null implementation of pledge.
4737 Fixes builds on almost everything.
4739 commit b1d6b3971ef256a08692efc409fc9ada719111cc
4740 Author: djm@openbsd.org <djm@openbsd.org>
4741 Date: Sat Nov 28 06:41:03 2015 +0000
4745 don't include port number in tcpip-forward replies for
4746 requests that don't allocate a port; bz#2509 diagnosed by Ron Frederick ok
4749 Upstream-ID: 77efad818addb61ec638b5a2362f1554e21a970a
4751 commit 9080bd0b9cf10d0f13b1f642f20cb84285cb8d65
4752 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4753 Date: Fri Nov 27 00:49:31 2015 +0000
4757 pledge "stdio rpath wpath cpath fattr tty proc exec"
4758 except for the -p option (which sadly has insane semantics...) ok semarie
4761 Upstream-ID: 8854bbd58279abe00f6c33f8094bdc02c8c65059
4763 commit 4d90625b229cf6b3551d81550a9861897509a65f
4764 Author: halex@openbsd.org <halex@openbsd.org>
4765 Date: Fri Nov 20 23:04:01 2015 +0000
4769 allow comment change for all supported formats
4773 Upstream-ID: 5fc477cf2f119b2d44aa9c683af16cb00bb3744b
4775 commit 8ca915fc761519dd1f7766a550ec597a81db5646
4776 Author: djm@openbsd.org <djm@openbsd.org>
4777 Date: Fri Nov 20 01:45:29 2015 +0000
4781 add cast to make -Werror clean
4783 Upstream-ID: 288db4f8f810bd475be01320c198250a04ff064d
4785 commit ac9473580dcd401f8281305af98635cdaae9bf96
4786 Author: Damien Miller <djm@mindrot.org>
4787 Date: Fri Nov 20 12:35:41 2015 +1100
4789 fix multiple authentication using S/Key w/ privsep
4791 bz#2502, patch from Kevin Korb and feandil_
4793 commit 88b6fcdeb87a2fb76767854d9eb15006662dca57
4794 Author: djm@openbsd.org <djm@openbsd.org>
4795 Date: Thu Nov 19 08:23:27 2015 +0000
4799 ban ConnectionAttempts=0, it makes no sense and would cause
4800 ssh_connect_direct() to print an uninitialised stack variable; bz#2500
4801 reported by dvw AT phas.ubc.ca
4803 Upstream-ID: 32b5134c608270583a90b93a07b3feb3cbd5f7d5
4805 commit 964ab3ee7a8f96bdbc963d5b5a91933d6045ebe7
4806 Author: djm@openbsd.org <djm@openbsd.org>
4807 Date: Thu Nov 19 01:12:32 2015 +0000
4813 Upstream-ID: 31fe0ad7c4d08e87f1d69c79372f5e3c5cd79051
4815 commit f96516d052dbe38561f6b92b0e4365d8e24bb686
4816 Author: djm@openbsd.org <djm@openbsd.org>
4817 Date: Thu Nov 19 01:09:38 2015 +0000
4821 print host certificate contents at debug level
4823 Upstream-ID: 39354cdd8a2b32b308fd03f98645f877f540f00d
4825 commit 499cf36fecd6040e30e2912dd25655bc574739a7
4826 Author: djm@openbsd.org <djm@openbsd.org>
4827 Date: Thu Nov 19 01:08:55 2015 +0000
4831 move the certificate validity formatting code to
4834 Upstream-ID: f05f7c78fab20d02ff1d5ceeda533ef52e8fe523
4836 commit bcb7bc77bbb1535d1008c7714085556f3065d99d
4837 Author: djm@openbsd.org <djm@openbsd.org>
4838 Date: Wed Nov 18 08:37:28 2015 +0000
4842 fix "ssh-keygen -l" of private key, broken in support for
4843 multiple plain keys on stdin
4845 Upstream-ID: 6b3132d2c62d03d0bad6f2bcd7e2d8b7dab5cd9d
4847 commit 259adb6179e23195c8f6913635ea71040d1ccd63
4848 Author: millert@openbsd.org <millert@openbsd.org>
4849 Date: Mon Nov 16 23:47:52 2015 +0000
4853 Replace remaining calls to index(3) with strchr(3). OK
4856 Upstream-ID: 33837d767a0cf1db1489b96055f9e330bc0bab6d
4858 commit c56a255162c2166884539c0a1f7511575325b477
4859 Author: djm@openbsd.org <djm@openbsd.org>
4860 Date: Mon Nov 16 22:53:07 2015 +0000
4864 Allow fingerprinting from standard input "ssh-keygen -lf
4867 Support fingerprinting multiple plain keys in a file and authorized_keys
4872 Upstream-ID: 903f8b4502929d6ccf53509e4e07eae084574b77
4874 commit 5b4010d9b923cf1b46c9c7b1887c013c2967e204
4875 Author: djm@openbsd.org <djm@openbsd.org>
4876 Date: Mon Nov 16 22:51:05 2015 +0000
4880 always call privsep_preauth_child() regardless of whether
4881 sshd was started by root; it does important priming before sandboxing and
4882 failing to call it could result in sandbox violations later; ok markus@
4884 Upstream-ID: c8a6d0d56c42f3faab38460dc917ca0d1705d383
4886 commit 3a9f84b58b0534bbb485f1eeab75665e2d03371f
4887 Author: djm@openbsd.org <djm@openbsd.org>
4888 Date: Mon Nov 16 22:50:01 2015 +0000
4892 improve sshkey_read() semantics; only update *cpp when a
4893 key is successfully read; ok markus@
4895 Upstream-ID: f371e78e8f4fab366cf69a42bdecedaed5d1b089
4897 commit db6f8dc5dd5655b59368efd074994d4568bc3556
4898 Author: logan@openbsd.org <logan@openbsd.org>
4899 Date: Mon Nov 16 06:13:04 2015 +0000
4903 1) Use xcalloc() instead of xmalloc() to check for
4904 potential overflow. (Feedback from both mmcc@ and djm@) 2) move set_size
4905 just before the for loop. (suggested by djm@)
4909 Upstream-ID: 013534c308187284756c3141f11d2c0f33c47213
4911 commit 383f10fb84a0fee3c01f9d97594f3e22aa3cd5e0
4912 Author: djm@openbsd.org <djm@openbsd.org>
4913 Date: Mon Nov 16 00:30:02 2015 +0000
4917 Add a new authorized_keys option "restrict" that
4918 includes all current and future key restrictions (no-*-forwarding, etc). Also
4919 add permissive versions of the existing restrictions, e.g. "no-pty" -> "pty".
4920 This simplifies the task of setting up restricted keys and ensures they are
4921 maximally-restricted, regardless of any permissions we might implement in the
4926 restrict,pty,command="nethack" ssh-ed25519 AAAAC3NzaC1lZDI1...
4928 Idea from Jann Horn; ok markus@
4930 Upstream-ID: 04ceb9d448e46e67e13887a7ae5ea45b4f1719d0
4932 commit e41a071f7bda6af1fb3f081bed0151235fa61f15
4933 Author: jmc@openbsd.org <jmc@openbsd.org>
4934 Date: Sun Nov 15 23:58:04 2015 +0000
4938 correct section number for ssh-agent;
4940 Upstream-ID: 44be72fd8bcc167635c49b357b1beea8d5674bd6
4942 commit 1a11670286acddcc19f5eff0966c380831fc4638
4943 Author: jmc@openbsd.org <jmc@openbsd.org>
4944 Date: Sun Nov 15 23:54:15 2015 +0000
4948 do not confuse mandoc by presenting "Dd";
4950 Upstream-ID: 1470fce171c47b60bbc7ecd0fc717a442c2cfe65
4952 commit f361df474c49a097bfcf16d1b7b5c36fcd844b4b
4953 Author: jcs@openbsd.org <jcs@openbsd.org>
4954 Date: Sun Nov 15 22:26:49 2015 +0000
4958 Add an AddKeysToAgent client option which can be set to
4959 'yes', 'no', 'ask', or 'confirm', and defaults to 'no'. When enabled, a
4960 private key that is used during authentication will be added to ssh-agent if
4961 it is running (with confirmation enabled if set to 'confirm').
4963 Initial version from Joachim Schipper many years ago.
4967 Upstream-ID: a680db2248e8064ec55f8be72d539458c987d5f4
4969 commit d87063d9baf5479b6e813d47dfb694a97df6f6f5
4970 Author: djm@openbsd.org <djm@openbsd.org>
4971 Date: Fri Nov 13 04:39:35 2015 +0000
4975 send SSH2_MSG_UNIMPLEMENTED replies to unexpected
4976 messages during KEX; bz#2949, ok dtucker@
4978 Upstream-ID: 2b3abdff344d53c8d505f45c83a7b12e84935786
4980 commit 9fd04681a1e9b0af21e08ff82eb674cf0a499bfc
4981 Author: djm@openbsd.org <djm@openbsd.org>
4982 Date: Fri Nov 13 04:38:06 2015 +0000
4986 Support "none" as an argument for sshd_config
4987 ForceCommand and ChrootDirectory. Useful inside Match blocks to override a
4988 global default. bz#2486 ok dtucker@
4990 Upstream-ID: 7ef478d6592bc7db5c7376fc33b4443e63dccfa5
4992 commit 94bc0b72c29e511cbbc5772190d43282e5acfdfe
4993 Author: djm@openbsd.org <djm@openbsd.org>
4994 Date: Fri Nov 13 04:34:15 2015 +0000
4998 support multiple certificates (one per line) and
4999 reading from standard input (using "-f -") for "ssh-keygen -L"; ok dtucker@
5001 Upstream-ID: ecbadeeef3926e5be6281689b7250a32a80e88db
5003 commit b6b9108f5b561c83612cb97ece4134eb59fde071
5004 Author: djm@openbsd.org <djm@openbsd.org>
5005 Date: Fri Nov 13 02:57:46 2015 +0000
5009 list a couple more options usable in Match blocks;
5012 Upstream-ID: e4d03f39d254db4c0cc54101921bb89fbda19879
5014 commit a7994b3f5a5a5a33b52b0a6065d08e888f0a99fb
5015 Author: djm@openbsd.org <djm@openbsd.org>
5016 Date: Wed Nov 11 04:56:39 2015 +0000
5020 improve PEEK/POKE macros: better casts, don't multiply
5021 evaluate arguments; ok deraadt@
5023 Upstream-ID: 9a1889e19647615ededbbabab89064843ba92d3e
5025 commit 7d4c7513a7f209cb303a608ac6e46b3f1dfc11ec
5026 Author: djm@openbsd.org <djm@openbsd.org>
5027 Date: Wed Nov 11 01:48:01 2015 +0000
5031 remove prototypes for long-gone s/key support; ok
5034 Upstream-ID: db5bed3c57118af986490ab23d399df807359a79
5036 commit 07889c75926c040b8e095949c724e66af26441cb
5037 Author: Damien Miller <djm@mindrot.org>
5038 Date: Sat Nov 14 18:44:49 2015 +1100
5040 read back from libcrypto RAND when privdropping
5042 makes certain libcrypto implementations cache a /dev/urandom fd
5043 in preparation of sandboxing. Based on patch by Greg Hartman.
5045 commit 1560596f44c01bb0cef977816410950ed17b8ecd
5046 Author: Darren Tucker <dtucker@zip.com.au>
5047 Date: Tue Nov 10 11:14:47 2015 +1100
5049 Fix compiler warnings in the openssl header check.
5051 Noted by Austin English.
5053 commit e72a8575ffe1d8adff42c9abe9ca36938acc036b
5054 Author: jmc@openbsd.org <jmc@openbsd.org>
5055 Date: Sun Nov 8 23:24:03 2015 +0000
5059 -c before -H, in SYNOPSIS and usage();
5061 Upstream-ID: 25e8c58a69e1f37fcd54ac2cd1699370acb5e404
5063 commit 3a424cdd21db08c7b0ded902f97b8f02af5aa485
5064 Author: djm@openbsd.org <djm@openbsd.org>
5065 Date: Sun Nov 8 22:30:20 2015 +0000
5069 Add "ssh-keyscan -c ..." flag to allow fetching
5070 certificates instead of plain keys; ok markus@
5072 Upstream-ID: 0947e2177dba92339eced9e49d3c5bf7dda69f82
5074 commit 69fead5d7cdaa73bdece9fcba80f8e8e70b90346
5075 Author: jmc@openbsd.org <jmc@openbsd.org>
5076 Date: Sun Nov 8 22:08:38 2015 +0000
5080 remove slogin links; ok deraadt markus djm
5082 Upstream-ID: 39ba08548acde4c54f2d4520c202c2a863a3c730
5084 commit 2fecfd486bdba9f51b3a789277bb0733ca36e1c0
5085 Author: djm@openbsd.org <djm@openbsd.org>
5086 Date: Sun Nov 8 21:59:11 2015 +0000
5090 fix OOB read in packet code caused by missing return
5091 statement found by Ben Hawkes; ok markus@ deraadt@
5093 Upstream-ID: a3e3a85434ebfa0690d4879091959591f30efc62
5095 commit 5e288923a303ca672b686908320bc5368ebec6e6
5096 Author: mmcc@openbsd.org <mmcc@openbsd.org>
5097 Date: Fri Nov 6 00:31:41 2015 +0000
5101 1. rlogin and rsh are long gone 2. protocol version isn't
5102 of core relevance here, and v1 is going away
5104 ok markus@, deraadt@
5106 Upstream-ID: 8b46bc94cf1ca7c8c1a75b1c958b2bb38d7579c8
5108 commit 8b29008bbe97f33381d9b4b93fcfa304168d0286
5109 Author: jmc@openbsd.org <jmc@openbsd.org>
5110 Date: Thu Nov 5 09:48:05 2015 +0000
5114 "commandline" -> "command line", since there are so few
5115 examples of the former in the pages, so many of the latter, and in some of
5116 these pages we had multiple spellings;
5120 Upstream-ID: 78459d59bff74223f8139d9001ccd56fc4310659
5122 commit 996b24cebf20077fbe5db07b3a2c20c2d9db736e
5123 Author: Darren Tucker <dtucker@zip.com.au>
5124 Date: Thu Oct 29 20:57:34 2015 +1100
5126 (re)wrap SYS_sendsyslog in ifdef.
5128 Replace ifdef that went missing in commit
5129 c61b42f2678f21f05653ac2d3d241b48ab5d59ac. Fixes build on older
5132 commit b67e2e76fcf1ae7c802eb27ca927e16c91a513ff
5133 Author: djm@openbsd.org <djm@openbsd.org>
5134 Date: Thu Oct 29 08:05:17 2015 +0000
5138 regress test for "PubkeyAcceptedKeyTypes +..." inside a
5141 Upstream-Regress-ID: 246c37ed64a2e5704d4c158ccdca1ff700e10647
5143 commit abd9dbc3c0d8c8c7561347cfa22166156e78c077
5144 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5145 Date: Mon Oct 26 02:50:58 2015 +0000
5149 Fix typo certopt->certopts in shell variable. This would
5150 cause the test to hang at a host key prompt if you have an A or CNAME for
5151 "proxy" in your local domain.
5153 Upstream-Regress-ID: 6ea03bcd39443a83c89e2c5606392ceb9585836a
5155 commit ed08510d38aef930a061ae30d10f2a9cf233bafa
5156 Author: djm@openbsd.org <djm@openbsd.org>
5157 Date: Thu Oct 29 08:05:01 2015 +0000
5161 Fix "PubkeyAcceptedKeyTypes +..." inside a Match block;
5164 Upstream-ID: 853662c4036730b966aab77684390c47b9738c69
5166 commit a4aef3ed29071719b2af82fdf1ac3c2514f82bc5
5167 Author: djm@openbsd.org <djm@openbsd.org>
5168 Date: Tue Oct 27 08:54:52 2015 +0000
5172 fix execv arguments in a way less likely to cause grief
5173 for -portable; ok dtucker@
5175 Upstream-ID: 5902bf0ea0371f39f1300698dc3b8e4105fc0fc5
5177 commit 63d188175accea83305e89fafa011136ff3d96ad
5178 Author: djm@openbsd.org <djm@openbsd.org>
5179 Date: Tue Oct 27 01:44:45 2015 +0000
5183 log certificate serial in verbose() messages to match the
5184 main auth success/fail message; ok dtucker@
5186 Upstream-ID: dfc48b417c320b97c36ff351d303c142f2186288
5188 commit 2aaba0cfd560ecfe92aa50c00750e6143842cf1f
5189 Author: djm@openbsd.org <djm@openbsd.org>
5190 Date: Tue Oct 27 00:49:53 2015 +0000
5194 avoid de-const warning & shrink; ok dtucker@
5196 Upstream-ID: 69a85ef94832378952a22c172009cbf52aaa11db
5198 commit 03239c18312b9bab7d1c3b03062c61e8bbc1ca6e
5199 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5200 Date: Sun Oct 25 23:42:00 2015 +0000
5204 Expand tildes in filenames passed to -i before checking
5205 whether or not the identity file exists. This means that if the shell
5206 doesn't do the expansion (eg because the option and filename were given as a
5207 single argument) then we'll still add the key. bz#2481, ok markus@
5209 Upstream-ID: db1757178a14ac519e9a3e1a2dbd21113cb3bfc6
5211 commit 97e184e508dd33c37860c732c0eca3fc57698b40
5212 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5213 Date: Sun Oct 25 23:14:03 2015 +0000
5217 Do not prepend "exec" to the shell command run by "Match
5218 exec" in a config file. It's an unnecessary optimization from repurposed
5219 ProxyCommand code and prevents some things working with some shells.
5220 bz#2471, pointed out by res at qoxp.net. ok markus@
5222 Upstream-ID: a1ead25ae336bfa15fb58d8c6b5589f85b4c33a3
5224 commit 8db134e7f457bcb069ec72bc4ee722e2af557c69
5225 Author: Darren Tucker <dtucker@zip.com.au>
5226 Date: Thu Oct 29 10:48:23 2015 +1100
5228 Prevent name collisions with system glob (bz#2463)
5230 Move glob.h from includes.h to the only caller (sftp) and override the
5231 names for the symbols. This prevents name collisions with the system glob
5232 in the case where something other than ssh uses it (eg kerberos). With
5233 jjelen at redhat.com, ok djm@
5235 commit 86c10dbbef6a5800d2431a66cf7f41a954bb62b5
5236 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5237 Date: Fri Oct 23 02:22:01 2015 +0000
5241 Update expected group sizes to match recent code changes.
5243 Upstream-Regress-ID: 0004f0ea93428969fe75bcfff0d521c553977794
5245 commit 9ada37d36003a77902e90a3214981e417457cf13
5246 Author: djm@openbsd.org <djm@openbsd.org>
5247 Date: Sat Oct 24 22:56:19 2015 +0000
5251 fix keyscan output for multiple hosts/addrs on one line
5252 when host hashing or a non standard port is in use; bz#2479 ok dtucker@
5254 Upstream-ID: 5321dabfaeceba343da3c8a8b5754c6f4a0a307b
5256 commit 44fc7cd7dcef6c52c6b7e9ff830dfa32879bd319
5257 Author: djm@openbsd.org <djm@openbsd.org>
5258 Date: Sat Oct 24 22:52:22 2015 +0000
5262 skip "Could not chdir to home directory" message when
5265 patch from Christian Hesse in bz#2485 ok dtucker@
5267 Upstream-ID: 86783c1953da426dff5b03b03ce46e699d9e5431
5269 commit a820a8618ec44735dabc688fab96fba38ad66bb2
5270 Author: sthen@openbsd.org <sthen@openbsd.org>
5271 Date: Sat Oct 24 08:34:09 2015 +0000
5275 Handle the split of tun(4) "link0" into tap(4) in ssh
5276 tun-forwarding. Adapted from portable (using separate devices for this is the
5277 normal case in most OS). ok djm@
5279 Upstream-ID: 90facf4c59ce73d6741db1bc926e578ef465cd39
5281 commit 66d2e229baa9fe57b868c373b05f7ff3bb20055b
5282 Author: gsoares@openbsd.org <gsoares@openbsd.org>
5283 Date: Wed Oct 21 11:33:03 2015 +0000
5287 fix memory leak in error path ok djm@
5289 Upstream-ID: dd2f402b0a0029b755df029fc7f0679e1365ce35
5291 commit 7d6c0362039ceacdc1366b5df29ad5d2693c13e5
5292 Author: mmcc@openbsd.org <mmcc@openbsd.org>
5293 Date: Tue Oct 20 23:24:25 2015 +0000
5297 Compare pointers to NULL rather than 0.
5301 Upstream-ID: 21616cfea27eda65a06e772cc887530b9a1a27f8
5303 commit f98a09cacff7baad8748c9aa217afd155a4d493f
5304 Author: mmcc@openbsd.org <mmcc@openbsd.org>
5305 Date: Tue Oct 20 03:36:35 2015 +0000
5309 Replace a function-local allocation with stack memory.
5313 Upstream-ID: c09fbbab637053a2ab9f33ca142b4e20a4c5a17e
5315 commit ac908c1eeacccfa85659594d92428659320fd57e
5316 Author: Damien Miller <djm@mindrot.org>
5317 Date: Thu Oct 22 09:35:24 2015 +1100
5319 turn off PrintLastLog when --disable-lastlog
5321 bz#2278 from Brent Paulson
5323 commit b56deb847f4a0115a8bf488bf6ee8524658162fd
5324 Author: djm@openbsd.org <djm@openbsd.org>
5325 Date: Fri Oct 16 22:32:22 2015 +0000
5329 increase the minimum modulus that we will send or accept in
5330 diffie-hellman-group-exchange to 2048 bits; ok markus@
5332 Upstream-ID: 06dce7a24c17b999a0f5fadfe95de1ed6a1a9b6a
5334 commit 5ee0063f024bf5b3f3ffb275b8cd20055d62b4b9
5335 Author: djm@openbsd.org <djm@openbsd.org>
5336 Date: Fri Oct 16 18:40:49 2015 +0000
5340 better handle anchored FQDNs (e.g. 'cvs.openbsd.org.') in
5341 hostname canonicalisation - treat them as already canonical and remove the
5342 trailing '.' before matching ssh_config; ok markus@
5344 Upstream-ID: f7619652e074ac3febe8363f19622aa4853b679a
5346 commit e92c499a75477ecfe94dd7b4aed89f20b1fac5a7
5347 Author: mmcc@openbsd.org <mmcc@openbsd.org>
5348 Date: Fri Oct 16 17:07:24 2015 +0000
5352 0 -> NULL when comparing with a char*.
5356 Upstream-ID: a928e9c21c0a9020727d99738ff64027c1272300
5358 commit b1d38a3cc6fe349feb8d16a5f520ef12d1de7cb2
5359 Author: djm@openbsd.org <djm@openbsd.org>
5360 Date: Thu Oct 15 23:51:40 2015 +0000
5364 fix some signed/unsigned integer type mismatches in
5365 format strings; reported by Nicholas Lemonias
5367 Upstream-ID: 78cd55420a0eef68c4095bdfddd1af84afe5f95c
5369 commit 1a2663a15d356bb188196b6414b4c50dc12fd42b
5370 Author: djm@openbsd.org <djm@openbsd.org>
5371 Date: Thu Oct 15 23:08:23 2015 +0000
5375 argument to sshkey_from_private() and sshkey_demote()
5378 Upstream-ID: 0111245b1641d387977a9b38da15916820a5fd1f
5380 commit 0f754e29dd3760fc0b172c1220f18b753fb0957e
5381 Author: Damien Miller <djm@mindrot.org>
5382 Date: Fri Oct 16 10:53:14 2015 +1100
5384 need va_copy before va_start
5386 reported by Nicholas Lemonias
5388 commit eb6c50d82aa1f0d3fc95f5630ea69761e918bfcd
5389 Author: Damien Miller <djm@mindrot.org>
5390 Date: Thu Oct 15 15:48:28 2015 -0700
5392 fix compilation on systems without SYMLOOP_MAX
5394 commit fafe1d84a210fb3dae7744f268059cc583db8c12
5395 Author: Damien Miller <djm@mindrot.org>
5396 Date: Wed Oct 14 09:22:15 2015 -0700
5398 s/SANDBOX_TAME/SANDBOX_PLEDGE/g
5400 commit 8f22911027ff6c17d7226d232ccd20727f389310
5401 Author: Damien Miller <djm@mindrot.org>
5402 Date: Wed Oct 14 08:28:19 2015 +1100
5407 date: 2015/10/13 20:55:37; author: millert; state: Exp; lines: +2 -2; commitid: X39sl5ay1czgFIgp;
5408 In rev 1.15 the sizeof argument was fixed in a strlcat() call but
5409 the truncation check immediately following it was not updated to
5410 match. Not an issue in practice since the buffers are the same
5413 commit 23fa695bb735f54f04d46123662609edb6c76767
5414 Author: Damien Miller <djm@mindrot.org>
5415 Date: Wed Oct 14 08:27:51 2015 +1100
5420 date: 2015/01/16 16:48:51; author: deraadt; state: Exp; lines: +3 -3; commitid: 0DYulI8hhujBHMcR;
5421 Move to the <limits.h> universe.
5422 review by millert, binary checking process with doug, concept with guenther
5424 commit c71be375a69af00c2d0a0c24d8752bec12d8fd1b
5425 Author: Damien Miller <djm@mindrot.org>
5426 Date: Wed Oct 14 08:27:08 2015 +1100
5431 date: 2014/10/19 03:56:28; author: doug; state: Exp; lines: +9 -9; commitid: U6QxmtbXrGoc02S5;
5432 Revert last commit due to changed semantics found by make release.
5434 commit c39ad23b06e9aecc3ff788e92f787a08472905b1
5435 Author: Damien Miller <djm@mindrot.org>
5436 Date: Wed Oct 14 08:26:24 2015 +1100
5441 date: 2014/10/18 20:43:52; author: doug; state: Exp; lines: +10 -10; commitid: I74hI1tVZtsspKEt;
5442 Better POSIX compliance in realpath(3).
5444 millert@ made changes to realpath.c based on FreeBSD's version. I merged
5445 Todd's changes into dl_realpath.c.
5447 ok millert@, guenther@
5449 commit e929a43f957dbd1254aca2aaf85c8c00cbfc25f4
5450 Author: Damien Miller <djm@mindrot.org>
5451 Date: Wed Oct 14 08:25:55 2015 +1100
5456 date: 2013/04/05 12:59:54; author: kurt; state: Exp; lines: +3 -1;
5457 - Add comments regarding copies of these files also in libexec/ld.so
5460 commit 5225db68e58a1048cb17f0e36e0d33bc4a8fc410
5461 Author: Damien Miller <djm@mindrot.org>
5462 Date: Wed Oct 14 08:25:32 2015 +1100
5467 date: 2012/09/13 15:39:05; author: deraadt; state: Exp; lines: +2 -2;
5468 specify the bounds of the dst to strlcat (both values were static and
5469 equal, but it is more correct)
5472 commit 7365fe5b4859de2305e40ea132da3823830fa710
5473 Author: Damien Miller <djm@mindrot.org>
5474 Date: Wed Oct 14 08:25:09 2015 +1100
5479 date: 2011/07/24 21:03:00; author: miod; state: Exp; lines: +35 -13;
5480 Recent Single Unix will malloc memory if the second argument of realpath()
5481 is NULL, and third-party software is starting to rely upon this.
5482 Adapted from FreeBSD via Jona Joachim (jaj ; hcl-club , .lu), with minor
5483 tweaks from nicm@ and yours truly.
5485 commit e679c09cd1951f963793aa3d9748d1c3fdcf808f
5486 Author: djm@openbsd.org <djm@openbsd.org>
5487 Date: Tue Oct 13 16:15:21 2015 +0000
5491 apply PubkeyAcceptedKeyTypes filtering earlier, so all
5492 skipped keys are noted before pubkey authentication starts. ok dtucker@
5494 Upstream-ID: ba4f52f54268a421a2a5f98bb375403f4cb044b8
5496 commit 179c353f564ec7ada64b87730b25fb41107babd7
5497 Author: djm@openbsd.org <djm@openbsd.org>
5498 Date: Tue Oct 13 00:21:27 2015 +0000
5502 free the correct IV length, don't assume it's always the
5503 cipher blocksize; ok dtucker@
5505 Upstream-ID: c260d9e5ec73628d9ff4b067fbb060eff5a7d298
5507 commit 2539dce2a049a8f6bb0d44cac51f07ad48e691d3
5508 Author: deraadt@openbsd.org <deraadt@openbsd.org>
5509 Date: Fri Oct 9 01:37:08 2015 +0000
5513 Change all tame callers to namechange to pledge(2).
5515 Upstream-ID: 17e654fc27ceaf523c60f4ffd9ec7ae4e7efc7f2
5517 commit 9846a2f4067383bb76b4e31a9d2303e0a9c13a73
5518 Author: Damien Miller <djm@mindrot.org>
5519 Date: Thu Oct 8 04:30:48 2015 +1100
5521 hook tame(2) sandbox up to build
5523 OpenBSD only for now
5525 commit 0c46bbe68b70bdf0d6d20588e5847e71f3739fe6
5526 Author: djm@openbsd.org <djm@openbsd.org>
5527 Date: Wed Oct 7 15:59:12 2015 +0000
5531 include PubkeyAcceptedKeyTypes in ssh -G config dump
5533 Upstream-ID: 6c097ce6ffebf6fe393fb7988b5d152a5d6b36bb
5535 commit bdcb73fb7641b1cf73c0065d1a0dd57b1e8b778e
5536 Author: sobrado@openbsd.org <sobrado@openbsd.org>
5537 Date: Wed Oct 7 14:45:30 2015 +0000
5541 UsePrivilegeSeparation defaults to sandbox now.
5545 Upstream-ID: bff136c38bcae89df82e044d2f42de21e1ad914f
5547 commit 2905d6f99c837bb699b6ebc61711b19acd030709
5548 Author: djm@openbsd.org <djm@openbsd.org>
5549 Date: Wed Oct 7 00:54:06 2015 +0000
5553 don't try to change tun device flags if they are already
5554 what we need; makes it possible to use tun/tap networking as non- root user
5555 if device permissions and interface flags are pre-established; based on patch
5558 Upstream-ID: 89099ac4634cd477b066865acf54cb230780fd21
5560 commit 0dc74512bdb105b048883f07de538b37e5e024d4
5561 Author: Damien Miller <djm@mindrot.org>
5562 Date: Mon Oct 5 18:33:05 2015 -0700
5566 commit fdd020e86439afa7f537e2429d29d4b744c94331
5567 Author: djm@openbsd.org <djm@openbsd.org>
5568 Date: Tue Oct 6 01:20:59 2015 +0000
5572 adapt to recent sshkey_parse_private_fileblob() API
5575 Upstream-Regress-ID: 5c0d818da511e33e0abf6a92a31bd7163b7ad988
5577 commit 21ae8ee3b630b0925f973db647a1b9aa5fcdd4c5
5578 Author: djm@openbsd.org <djm@openbsd.org>
5579 Date: Thu Sep 24 07:15:39 2015 +0000
5583 fix command-line option to match what was actually
5586 Upstream-Regress-ID: 3e8c24a2044e8afd37e7ce17b69002ca817ac699
5588 commit e14ac43b75e68f1ffbd3e1a5e44143c8ae578dcd
5589 Author: djm@openbsd.org <djm@openbsd.org>
5590 Date: Thu Sep 24 06:16:53 2015 +0000
5594 regress test for CertificateFile; patch from Meghana Bhat
5597 Upstream-Regress-ID: e7a6e980cbe0f8081ba2e83de40d06c17be8bd25
5599 commit 905b054ed24e0d5b4ef226ebf2c8bfc02ae6d4ad
5600 Author: djm@openbsd.org <djm@openbsd.org>
5601 Date: Mon Oct 5 17:11:21 2015 +0000
5605 some more bzero->explicit_bzero, from Michael McConville
5607 Upstream-ID: 17f19545685c33327db2efdc357c1c9225ff00d0
5609 commit b007159a0acdbcf65814b3ee05dbe2cf4ea46011
5610 Author: deraadt@openbsd.org <deraadt@openbsd.org>
5611 Date: Fri Oct 2 15:52:55 2015 +0000
5617 Upstream-ID: 72150f2d54b94de14ebef1ea054ef974281bf834
5619 commit b19e1b4ab11884c4f62aee9f8ab53127a4732658
5620 Author: deraadt@openbsd.org <deraadt@openbsd.org>
5621 Date: Fri Oct 2 01:39:52 2015 +0000
5625 a sandbox using tame ok djm
5627 Upstream-ID: 4ca24e47895e72f5daaa02f3e3d3e5ca2d820fa3
5629 commit c61b42f2678f21f05653ac2d3d241b48ab5d59ac
5630 Author: deraadt@openbsd.org <deraadt@openbsd.org>
5631 Date: Fri Oct 2 01:39:26 2015 +0000
5635 re-order system calls in order of risk, ok i'll be
5636 honest, ordered this way they look like tame... ok djm
5638 Upstream-ID: 42a1e6d251fd8be13c8262bee026059ae6328813
5640 commit c5f7c0843cb6e6074a93c8ac34e49ce33a6f5546
5641 Author: jmc@openbsd.org <jmc@openbsd.org>
5642 Date: Fri Sep 25 18:19:54 2015 +0000
5646 some certificatefile tweaks; ok djm
5648 Upstream-ID: 0e5a7852c28c05fc193419cc7e50e64c1c535af0
5650 commit 4e44a79a07d4b88b6a4e5e8c1bed5f58c841b1b8
5651 Author: djm@openbsd.org <djm@openbsd.org>
5652 Date: Thu Sep 24 06:15:11 2015 +0000
5656 add ssh_config CertificateFile option to explicitly list
5657 a certificate; patch from Meghana Bhat on bz#2436; ok markus@
5659 Upstream-ID: 58648ec53c510b41c1f46d8fe293aadc87229ab8
5661 commit e3cbb06ade83c72b640a53728d362bbefa0008e2
5662 Author: sobrado@openbsd.org <sobrado@openbsd.org>
5663 Date: Tue Sep 22 08:33:23 2015 +0000
5669 Upstream-ID: 424402c0d8863a11b51749bacd7f8d932083b709
5671 commit 8408218c1ca88cb17d15278174a24a94a6f65fe1
5672 Author: djm@openbsd.org <djm@openbsd.org>
5673 Date: Mon Sep 21 04:31:00 2015 +0000
5677 fix possible hang on closed output; bz#2469 reported by Tomas
5680 Upstream-ID: f7afd41810f8540f524284f1be6b970859f94fe3
5682 commit 0097248f90a00865082e8c146b905a6555cc146f
5683 Author: djm@openbsd.org <djm@openbsd.org>
5684 Date: Fri Sep 11 04:55:01 2015 +0000
5688 skip if running as root; many systems (inc OpenBSD) allow
5689 root to ptrace arbitrary processes
5691 Upstream-Regress-ID: be2b925df89360dff36f972951fa0fa793769038
5693 commit 9c06c814aff925e11a5cc592c06929c258a014f6
5694 Author: djm@openbsd.org <djm@openbsd.org>
5695 Date: Fri Sep 11 03:44:21 2015 +0000
5699 try all supported key types here; bz#2455 reported by
5702 Upstream-Regress-ID: 188cb7d9031cdbac3a0fa58b428b8fa2b2482bba
5704 commit 3c019a936b43f3e2773f3edbde7c114d73caaa4c
5705 Author: tim@openbsd.org <tim@openbsd.org>
5706 Date: Sun Sep 13 14:39:16 2015 +0000
5710 - Fix error message: passphrase needs to be at least 5
5711 characters, not 4. - Remove unused function argument. - Remove two
5712 unnecessary variables.
5716 Upstream-ID: 13010c05bfa8b523da1c0dc19e81dd180662bc30
5718 commit 2681cdb6e0de7c1af549dac37a9531af202b4434
5719 Author: tim@openbsd.org <tim@openbsd.org>
5720 Date: Sun Sep 13 13:48:19 2015 +0000
5724 When adding keys to the agent, don't ignore the comment
5725 of keys for which the user is prompted for a passphrase.
5729 Upstream-ID: dc737c620a5a8d282cc4f66e3b9b624e9abefbec
5731 commit 14692f7b8251cdda847e648a82735eef8a4d2a33
5732 Author: guenther@openbsd.org <guenther@openbsd.org>
5733 Date: Fri Sep 11 08:50:04 2015 +0000
5737 Use explicit_bzero() when zeroing before free()
5739 from Michael McConville (mmcconv1 (at) sccs.swarthmore.edu)
5742 Upstream-ID: 2e3337db046c3fe70c7369ee31515ac73ec00f50
5744 commit 846f6fa4cfa8483a9195971dbdd162220f199d85
5745 Author: jmc@openbsd.org <jmc@openbsd.org>
5746 Date: Fri Sep 11 06:55:46 2015 +0000
5750 sync -Q in usage() to SYNOPSIS; since it's drastically
5751 shorter, i've reformatted the block to sync with the man (80 cols) and saved
5754 Upstream-ID: 86e2c65c3989a0777a6258a77e589b9f6f354abd
5756 commit 95923e0520a8647417ee6dcdff44694703dfeef0
5757 Author: jmc@openbsd.org <jmc@openbsd.org>
5758 Date: Fri Sep 11 06:51:39 2015 +0000
5764 Upstream-ID: f29b3cfcfd9aa31fa140c393e7bd48c1c74139d6
5766 commit 86ac462f833b05d8ed9de9c50ccb295d7faa79ff
5767 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5768 Date: Fri Sep 11 05:27:02 2015 +0000
5772 Update usage to match man page.
5774 Upstream-ID: 9e85aefaecfb6aaf34c7cfd0700cd21783a35675
5776 commit 674b3b68c1d36b2562324927cd03857b565e05e8
5777 Author: djm@openbsd.org <djm@openbsd.org>
5778 Date: Fri Sep 11 03:47:28 2015 +0000
5782 expand %i in ControlPath to UID; bz#2449
5784 patch from Christian Hesse w/ feedback from dtucker@
5786 Upstream-ID: 2ba8d303e555a84e2f2165ab4b324b41e80ab925
5788 commit c0f55db7ee00c8202b05cb4b9ad4ce72cc45df41
5789 Author: djm@openbsd.org <djm@openbsd.org>
5790 Date: Fri Sep 11 03:42:32 2015 +0000
5794 mention -Q key-plain and -Q key-cert; bz#2455 pointed out
5797 Upstream-ID: c8f1f8169332e4fa73ac96b0043e3b84e01d4896
5799 commit cfffbdb10fdf0f02d3f4232232eef7ec3876c383
5800 Author: Darren Tucker <dtucker@zip.com.au>
5801 Date: Mon Sep 14 16:24:21 2015 +1000
5803 Use ssh-keygen -A when generating host keys.
5805 Use ssh-keygen -A instead of per-keytype invocations when generating host
5806 keys. Add tests when doing host-key-force since we can't use ssh-keygen -A
5807 since it can't specify alternate locations. bz#2459, ok djm@
5809 commit 366bada1e9e124654aac55b72b6ccf878755b0dc
5810 Author: Darren Tucker <dtucker@zip.com.au>
5811 Date: Fri Sep 11 13:29:22 2015 +1000
5813 Correct default value for --with-ssh1.
5815 bz#2457, from konto-mindrot.org at walimnieto.com.
5817 commit 2bca8a43e7dd9b04d7070824ffebb823c72587b2
5818 Author: djm@openbsd.org <djm@openbsd.org>
5819 Date: Fri Sep 11 03:13:36 2015 +0000
5823 more clarity on what AuthorizedKeysFile=none does; based
5824 on diff by Thiebaud Weksteen
5826 Upstream-ID: 78ab87f069080f0cc3bc353bb04eddd9e8ad3704
5828 commit 61942ea4a01e6db4fdf37ad61de81312ffe310e9
5829 Author: djm@openbsd.org <djm@openbsd.org>
5830 Date: Wed Sep 9 00:52:44 2015 +0000
5834 openssh_RSA_verify return type is int, so don't make it
5835 size_t within the function itself with only negative numbers or zero assigned
5838 Upstream-ID: b6e794b0c7fc4f9f329509263c8668d35f83ea55
5840 commit 4f7cc2f8cc861a21e6dbd7f6c25652afb38b9b96
5841 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5842 Date: Fri Sep 4 08:21:47 2015 +0000
5846 Plug minor memory leaks when options are used more than
5847 once. bz#2182, patch from Tiago Cunha, ok deraadt djm
5849 Upstream-ID: 5b84d0401e27fe1614c10997010cc55933adb48e
5851 commit 7ad8b287c8453a3e61dbc0d34d467632b8b06fc8
5852 Author: Darren Tucker <dtucker@zip.com.au>
5853 Date: Fri Sep 11 13:11:02 2015 +1000
5855 Force resolution of _res for correct detection.
5857 bz#2259, from sconeu at yahoo.com.
5859 commit 26ad18247213ff72b4438abe7fc660c958810fa2
5860 Author: Damien Miller <djm@mindrot.org>
5861 Date: Thu Sep 10 10:57:41 2015 +1000
5863 allow getrandom syscall; from Felix von Leitner
5865 commit 5245bc1e6b129a10a928f73f11c3aa32656c44b4
5866 Author: jmc@openbsd.org <jmc@openbsd.org>
5867 Date: Fri Sep 4 06:40:45 2015 +0000
5871 full stop belongs outside the brackets, not inside;
5873 Upstream-ID: 99d098287767799ac33d2442a05b5053fa5a551a
5875 commit a85768a9321d74b41219eeb3c9be9f1702cbf6a5
5876 Author: djm@openbsd.org <djm@openbsd.org>
5877 Date: Fri Sep 4 04:56:09 2015 +0000
5881 add a debug2() right before DNS resolution; it's a place
5882 where ssh could previously silently hang for a while. bz#2433
5884 Upstream-ID: 52a1a3e0748db66518e7598352c427145692a6a0
5886 commit 46152af8d27aa34d5d26ed1c371dc8aa142d4730
5887 Author: djm@openbsd.org <djm@openbsd.org>
5888 Date: Fri Sep 4 04:55:24 2015 +0000
5892 correct function name in error messages
5894 Upstream-ID: 92fb2798617ad9561370897f4ab60adef2ff4c0e
5896 commit a954cdb799a4d83c2d40fbf3e7b9f187fbfd72fc
5897 Author: djm@openbsd.org <djm@openbsd.org>
5898 Date: Fri Sep 4 04:47:50 2015 +0000
5902 better document ExitOnForwardFailure; bz#2444, ok
5905 Upstream-ID: a126209b5a6d9cb3117ac7ab5bc63d284538bfc2
5907 commit f54d8ac2474b6fc3afa081cf759b48a6c89d3319
5908 Author: djm@openbsd.org <djm@openbsd.org>
5909 Date: Fri Sep 4 04:44:08 2015 +0000
5913 don't record hostbased authentication hostkeys as user
5914 keys in test for multiple authentication with the same key
5916 Upstream-ID: 26b368fa2cff481f47f37e01b8da1ae5b57b1adc
5918 commit ac3451dd65f27ecf85dc045c46d49e2bbcb8dddd
5919 Author: djm@openbsd.org <djm@openbsd.org>
5920 Date: Fri Sep 4 03:57:38 2015 +0000
5924 remove extra newline in nethack-mode hostkey; from
5925 Christian Hesse bz#2686
5927 Upstream-ID: 4f56368b1cc47baeea0531912186f66007fd5b92
5929 commit 9e3ed9ebb1a7e47c155c28399ddf09b306ea05df
5930 Author: djm@openbsd.org <djm@openbsd.org>
5931 Date: Fri Sep 4 04:23:10 2015 +0000
5935 trim junk from end of file; bz#2455 from Jakub Jelen
5937 Upstream-Regress-ID: a4e64e8931e40d23874b047074444eff919cdfe6
5939 commit f3a3ea180afff080bab82087ee0b60db9fd84f6c
5940 Author: jsg@openbsd.org <jsg@openbsd.org>
5941 Date: Wed Sep 2 07:51:12 2015 +0000
5945 Fix occurrences of "r = func() != 0" which result in the
5946 wrong error codes being returned due to != having higher precedence than =.
5950 Upstream-ID: 5fc35c9fc0319cc6fca243632662d2f06b5fd840
5952 commit f498a98cf83feeb7ea01c15cd1c98b3111361f3a
5953 Author: Damien Miller <djm@mindrot.org>
5954 Date: Thu Sep 3 09:11:22 2015 +1000
5956 don't check for yp_match; ok tim@
5958 commit 9690b78b7848b0b376980a61d51b1613e187ddb5
5959 Author: djm@openbsd.org <djm@openbsd.org>
5960 Date: Fri Aug 21 23:57:48 2015 +0000
5964 Improve printing of KEX offers and decisions
5966 The debug output now labels the client and server offers and the
5967 negotiated options. ok markus@
5969 Upstream-ID: 8db921b3f92a4565271b1c1fbce6e7f508e1a2cb
5971 commit 60a92470e21340e1a3fc10f9c7140d8e1519dc55
5972 Author: djm@openbsd.org <djm@openbsd.org>
5973 Date: Fri Aug 21 23:53:08 2015 +0000
5977 Fix printing (ssh -G ...) of HostKeyAlgorithms=+...
5978 Reported by Bryan Drewery
5980 Upstream-ID: 19ad20c41bd5971e006289b6f9af829dd46c1293
5982 commit 6310f60fffca2d1e464168e7d1f7e3b6b0268897
5983 Author: djm@openbsd.org <djm@openbsd.org>
5984 Date: Fri Aug 21 23:52:30 2015 +0000
5988 Fix expansion of HostkeyAlgorithms=+...
5990 Reported by Bryan Drewery
5992 Upstream-ID: 70ca1deea39d758ba36d36428ae832e28566f78d
5994 commit e774e5ea56237fd626a8161f9005023dff3e76c9
5995 Author: deraadt@openbsd.org <deraadt@openbsd.org>
5996 Date: Fri Aug 21 23:29:31 2015 +0000
6000 Improve size == 0, count == 0 checking in mm_zalloc,
6001 which is "array" like. Discussed with tedu, millert, otto.... and ok djm
6003 Upstream-ID: 899b021be43b913fad3eca1aef44efe710c53e29
6005 commit 189de02d9ad6f3645417c0ddf359b923aae5f926
6006 Author: Damien Miller <djm@mindrot.org>
6007 Date: Fri Aug 21 15:45:02 2015 +1000
6009 expose POLLHUP and POLLNVAL for netcat.c
6011 commit e91346dc2bbf460246df2ab591b7613908c1b0ad
6012 Author: Damien Miller <djm@mindrot.org>
6013 Date: Fri Aug 21 14:49:03 2015 +1000
6015 we don't use Github for issues/pull-requests
6017 commit a4f5b507c708cc3dc2c8dd2d02e4416d7514dc23
6018 Author: Damien Miller <djm@mindrot.org>
6019 Date: Fri Aug 21 14:43:55 2015 +1000
6021 fix URL for connect.c
6023 commit d026a8d3da0f8186598442997c7d0a28e7275414
6024 Author: Damien Miller <djm@mindrot.org>
6025 Date: Fri Aug 21 13:47:10 2015 +1000
6027 update version numbers for 7.1
6029 commit 78f8f589f0ca1c9f41e5a9bae3cda5ce8a6b42ed
6030 Author: djm@openbsd.org <djm@openbsd.org>
6031 Date: Fri Aug 21 03:45:26 2015 +0000
6037 Upstream-ID: ff7b1ef4b06caddfb45e08ba998128c88be3d73f
6039 commit 32a181980c62fce94f7f9ffaf6a79d90f0c309cf
6040 Author: djm@openbsd.org <djm@openbsd.org>
6041 Date: Fri Aug 21 03:42:19 2015 +0000
6045 fix inverted logic that broke PermitRootLogin; reported
6046 by Mantas Mikulenas; ok markus@
6048 Upstream-ID: 260dd6a904c1bb7e43267e394b1c9cf70bdd5ea5
6050 commit ce445b0ed927e45bd5bdce8f836eb353998dd65c
6051 Author: deraadt@openbsd.org <deraadt@openbsd.org>
6052 Date: Thu Aug 20 22:32:42 2015 +0000
6056 Do not cast result of malloc/calloc/realloc* if stdlib.h
6057 is in scope ok krw millert
6059 Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667
6061 commit 05291e5288704d1a98bacda269eb5a0153599146
6062 Author: naddy@openbsd.org <naddy@openbsd.org>
6063 Date: Thu Aug 20 19:20:06 2015 +0000
6067 In the certificates section, be consistent about using
6068 "host_key" and "user_key" for the respective key types. ok sthen@ deraadt@
6070 Upstream-ID: 9e037ea3b15577b238604c5533e082a3947f13cb
6072 commit 8543d4ef6f2e9f98c3e6b77c894ceec30c5e4ae4
6073 Author: djm@openbsd.org <djm@openbsd.org>
6074 Date: Wed Aug 19 23:21:42 2015 +0000
6078 Better compat matching for WinSCP, add compat matching
6079 for FuTTY (fork of PuTTY); ok markus@ deraadt@
6081 Upstream-ID: 24001d1ac115fa3260fbdc329a4b9aeb283c5389
6083 commit ec6eda16ebab771aa3dfc90629b41953b999cb1e
6084 Author: djm@openbsd.org <djm@openbsd.org>
6085 Date: Wed Aug 19 23:19:01 2015 +0000
6089 fix double-free() in error path of DSA key generation
6090 reported by Mateusz Kocielski; ok markus@
6092 Upstream-ID: 4735d8f888b10599a935fa1b374787089116713c
6094 commit 45b0eb752c94954a6de046bfaaf129e518ad4b5b
6095 Author: djm@openbsd.org <djm@openbsd.org>
6096 Date: Wed Aug 19 23:18:26 2015 +0000
6100 fix free() of uninitialised pointer reported by Mateusz
6101 Kocielski; ok markus@
6103 Upstream-ID: 519552b050618501a06b7b023de5cb104e2c5663
6105 commit c837643b93509a3ef538cb6624b678c5fe32ff79
6106 Author: djm@openbsd.org <djm@openbsd.org>
6107 Date: Wed Aug 19 23:17:51 2015 +0000
6111 fixed unlink([uninitialised memory]) reported by Mateusz
6112 Kocielski; ok markus@
6114 Upstream-ID: 14a0c4e7d891f5a8dabc4b89d4f6b7c0d5a20109
6116 commit 1f8d3d629cd553031021068eb9c646a5f1e50994
6117 Author: jmc@openbsd.org <jmc@openbsd.org>
6118 Date: Fri Aug 14 15:32:41 2015 +0000
6122 match myproposal.h order; from brian conway (i snuck in a
6127 Upstream-ID: 35174a19b5237ea36aa3798f042bf5933b772c67
6129 commit 1dc8d93ce69d6565747eb44446ed117187621b26
6130 Author: deraadt@openbsd.org <deraadt@openbsd.org>
6131 Date: Thu Aug 6 14:53:21 2015 +0000
6135 add prohibit-password as a synonymn for without-password,
6136 since the without-password is causing too many questions. Harden it to ban
6137 all but pubkey, hostbased, and GSSAPI auth (when the latter is enabled) from
6140 Upstream-ID: d53317d7b28942153e6236d3fd6e12ceb482db7a
6142 commit 90a95a4745a531b62b81ce3b025e892bdc434de5
6143 Author: Damien Miller <djm@mindrot.org>
6144 Date: Tue Aug 11 13:53:41 2015 +1000
6146 update version in README
6148 commit 318c37743534b58124f1bab37a8a0087a3a9bd2f
6149 Author: Damien Miller <djm@mindrot.org>
6150 Date: Tue Aug 11 13:53:09 2015 +1000
6152 update versions in *.spec
6154 commit 5e75f5198769056089fb06c4d738ab0e5abc66f7
6155 Author: Damien Miller <djm@mindrot.org>
6156 Date: Tue Aug 11 13:34:12 2015 +1000
6158 set sshpam_ctxt to NULL after free
6160 Avoids use-after-free in monitor when privsep child is compromised.
6161 Reported by Moritz Jodeit; ok dtucker@
6163 commit d4697fe9a28dab7255c60433e4dd23cf7fce8a8b
6164 Author: Damien Miller <djm@mindrot.org>
6165 Date: Tue Aug 11 13:33:24 2015 +1000
6167 Don't resend username to PAM; it already has it.
6169 Pointed out by Moritz Jodeit; ok dtucker@
6171 commit 88763a6c893bf3dfe951ba9271bf09715e8d91ca
6172 Author: Darren Tucker <dtucker@zip.com.au>
6173 Date: Mon Jul 27 12:14:25 2015 +1000
6175 Import updated moduli file from OpenBSD.
6177 commit 55b263fb7cfeacb81aaf1c2036e0394c881637da
6178 Author: Damien Miller <djm@mindrot.org>
6179 Date: Mon Aug 10 11:13:44 2015 +1000
6181 let principals-command.sh work for noexec /var/run
6183 commit 2651e34cd11b1aac3a0fe23b86d8c2ff35c07897
6184 Author: Damien Miller <djm@mindrot.org>
6185 Date: Thu Aug 6 11:43:42 2015 +1000
6187 work around echo -n / sed behaviour in tests
6189 commit d85dad81778c1aa8106acd46930b25fdf0d15b2a
6190 Author: djm@openbsd.org <djm@openbsd.org>
6191 Date: Wed Aug 5 05:27:33 2015 +0000
6195 adjust for RSA minimum modulus switch; ok deraadt@
6197 Upstream-Regress-ID: 5a72c83431b96224d583c573ca281cd3a3ebfdae
6199 commit 57e8e229bad5fe6056b5f1199665f5f7008192c6
6200 Author: djm@openbsd.org <djm@openbsd.org>
6201 Date: Tue Aug 4 05:23:06 2015 +0000
6205 backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this
6206 release; problems spotted by sthen@ ok deraadt@ markus@
6208 Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822
6210 commit f097d0ea1e0889ca0fa2e53a00214e43ab7fa22a
6211 Author: djm@openbsd.org <djm@openbsd.org>
6212 Date: Sun Aug 2 09:56:42 2015 +0000
6216 openssh 7.0; ok deraadt@
6218 Upstream-ID: c63afdef537f57f28ae84145c5a8e29e9250221f
6220 commit 3d5728a0f6874ce4efb16913a12963595070f3a9
6221 Author: chris@openbsd.org <chris@openbsd.org>
6222 Date: Fri Jul 31 15:38:09 2015 +0000
6226 Allow PermitRootLogin to be overridden by config
6230 Upstream-ID: 5cf3e26ed702888de84e2dc9d0054ccf4d9125b4
6232 commit 6f941396b6835ad18018845f515b0c4fe20be21a
6233 Author: djm@openbsd.org <djm@openbsd.org>
6234 Date: Thu Jul 30 23:09:15 2015 +0000
6238 fix pty permissions; patch from Nikolay Edigaryev; ok
6241 Upstream-ID: 40ff076d2878b916fbfd8e4f45dbe5bec019e550
6243 commit f4373ed1e8fbc7c8ce3fc4ea97d0ba2e0c1d7ef0
6244 Author: deraadt@openbsd.org <deraadt@openbsd.org>
6245 Date: Thu Jul 30 19:23:02 2015 +0000
6249 change default: PermitRootLogin without-password matching
6250 install script changes coming as well ok djm markus
6252 Upstream-ID: 0e2a6c4441daf5498b47a61767382bead5eb8ea6
6254 commit 0c30ba91f87fcda7e975e6ff8a057f624e87ea1c
6255 Author: Damien Miller <djm@mindrot.org>
6256 Date: Thu Jul 30 12:31:39 2015 +1000
6258 downgrade OOM adjustment logging: verbose -> debug
6260 commit f9eca249d4961f28ae4b09186d7dc91de74b5895
6261 Author: djm@openbsd.org <djm@openbsd.org>
6262 Date: Thu Jul 30 00:01:34 2015 +0000
6266 Allow ssh_config and sshd_config kex parameters options be
6267 prefixed by a '+' to indicate that the specified items be appended to the
6268 default rather than replacing it.
6270 approach suggested by dtucker@, feedback dlg@, ok markus@
6272 Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a
6274 commit 5cefe769105a2a2e3ca7479d28d9a325d5ef0163
6275 Author: djm@openbsd.org <djm@openbsd.org>
6276 Date: Wed Jul 29 08:34:54 2015 +0000
6280 fix bug in previous; was printing incorrect string for
6281 failed host key algorithms negotiation
6283 Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e
6285 commit f319912b0d0e1675b8bb051ed8213792c788bcb2
6286 Author: djm@openbsd.org <djm@openbsd.org>
6287 Date: Wed Jul 29 04:43:06 2015 +0000
6291 include the peer's offer when logging a failure to
6292 negotiate a mutual set of algorithms (kex, pubkey, ciphers, etc.) ok markus@
6294 Upstream-ID: bbb8caabf5c01790bb845f5ce135565248d7c796
6296 commit b6ea0e573042eb85d84defb19227c89eb74cf05a
6297 Author: djm@openbsd.org <djm@openbsd.org>
6298 Date: Tue Jul 28 23:20:42 2015 +0000
6302 add Cisco to the list of clients that choke on the
6303 hostkeys update extension. Pointed out by Howard Kash
6305 Upstream-ID: c9eadde28ecec056c73d09ee10ba4570dfba7e84
6307 commit 3f628c7b537291c1019ce86af90756fb4e66d0fd
6308 Author: guenther@openbsd.org <guenther@openbsd.org>
6309 Date: Mon Jul 27 16:29:23 2015 +0000
6313 Permit kbind(2) use in the sandbox now, to ease testing
6314 of ld.so work using it
6316 reminded by miod@, ok deraadt@
6318 Upstream-ID: 523922e4d1ba7a091e3824e77a8a3c818ee97413
6320 commit ebe27ebe520098bbc0fe58945a87ce8490121edb
6321 Author: millert@openbsd.org <millert@openbsd.org>
6322 Date: Mon Jul 20 18:44:12 2015 +0000
6326 Move .Pp before .Bl, not after to quiet mandoc -Tlint.
6329 Upstream-ID: 59fadbf8407cec4e6931e50c53cfa0214a848e23
6331 commit d5d91d0da819611167782c66ab629159169d94d4
6332 Author: millert@openbsd.org <millert@openbsd.org>
6333 Date: Mon Jul 20 18:42:35 2015 +0000
6337 Sync usage with SYNOPSIS
6339 Upstream-ID: 7a321a170181a54f6450deabaccb6ef60cf3f0b7
6341 commit 79ec2142fbc68dd2ed9688608da355fc0b1ed743
6342 Author: millert@openbsd.org <millert@openbsd.org>
6343 Date: Mon Jul 20 15:39:52 2015 +0000
6347 Better desciption of Unix domain socket forwarding.
6350 Upstream-ID: 85e28874726897e3f26ae50dfa2e8d2de683805d
6352 commit d56fd1828074a4031b18b8faa0bf949669eb18a0
6353 Author: Damien Miller <djm@mindrot.org>
6354 Date: Mon Jul 20 11:19:51 2015 +1000
6356 make realpath.c compile -Wsign-compare clean
6358 commit c63c9a691dca26bb7648827f5a13668832948929
6359 Author: djm@openbsd.org <djm@openbsd.org>
6360 Date: Mon Jul 20 00:30:01 2015 +0000
6364 mention that the default of UseDNS=no implies that
6365 hostnames cannot be used for host matching in sshd_config and
6366 authorized_keys; bz#2045, ok dtucker@
6368 Upstream-ID: 0812705d5f2dfa59aab01f2764ee800b1741c4e1
6370 commit 63ebcd0005e9894fcd6871b7b80aeea1fec0ff76
6371 Author: djm@openbsd.org <djm@openbsd.org>
6372 Date: Sat Jul 18 08:02:17 2015 +0000
6376 don't ignore PKCS#11 hosted keys that return empty
6377 CKA_ID; patch by Jakub Jelen via bz#2429; ok markus
6379 Upstream-ID: 2f7c94744eb0342f8ee8bf97b2351d4e00116485
6381 commit b15fd989c8c62074397160147a8d5bc34b3f3c63
6382 Author: djm@openbsd.org <djm@openbsd.org>
6383 Date: Sat Jul 18 08:00:21 2015 +0000
6387 skip uninitialised PKCS#11 slots; patch from Jakub Jelen
6388 in bz#2427 ok markus@
6390 Upstream-ID: 744c1e7796e237ad32992d0d02148e8a18f27d29
6392 commit 5b64f85bb811246c59ebab70aed331f26ba37b18
6393 Author: djm@openbsd.org <djm@openbsd.org>
6394 Date: Sat Jul 18 07:57:14 2015 +0000
6398 only query each keyboard-interactive device once per
6399 authentication request regardless of how many times it is listed; ok markus@
6401 Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1
6403 commit cd7324d0667794eb5c236d8a4e0f236251babc2d
6404 Author: djm@openbsd.org <djm@openbsd.org>
6405 Date: Fri Jul 17 03:34:27 2015 +0000
6409 remove -u flag to diff (only used for error output) to make
6410 things easier for -portable
6412 Upstream-Regress-ID: a5d6777d2909540d87afec3039d9bb2414ade548
6414 commit deb8d99ecba70b67f4af7880b11ca8768df9ec3a
6415 Author: djm@openbsd.org <djm@openbsd.org>
6416 Date: Fri Jul 17 03:09:19 2015 +0000
6420 direct-streamlocal@openssh.com Unix domain foward
6421 messages do not contain a "reserved for future use" field and in fact,
6422 serverloop.c checks that there isn't one. Remove erroneous mention from
6423 PROTOCOL description. bz#2421 from Daniel Black
6425 Upstream-ID: 3d51a19e64f72f764682f1b08f35a8aa810a43ac
6427 commit 356b61f365405b5257f5b2ab446e5d7bd33a7b52
6428 Author: djm@openbsd.org <djm@openbsd.org>
6429 Date: Fri Jul 17 03:04:27 2015 +0000
6433 describe magic for setting up Unix domain socket fowards
6434 via the mux channel; bz#2422 patch from Daniel Black
6436 Upstream-ID: 943080fe3864715c423bdeb7c920bb30c4eee861
6438 commit d3e2aee41487d55b8d7d40f538b84ff1db7989bc
6439 Author: Darren Tucker <dtucker@zip.com.au>
6440 Date: Fri Jul 17 12:52:34 2015 +1000
6442 Check if realpath works on nonexistent files.
6444 On some platforms the native realpath doesn't work with non-existent
6445 files (this is actually specified in some versions of POSIX), however
6446 the sftp spec says its realpath with "canonicalize any given path name".
6447 On those platforms, use realpath from the compat library.
6449 In addition, when compiling with -DFORTIFY_SOURCE, glibc redefines
6450 the realpath symbol to the checked version, so redefine ours to
6451 something else so we pick up the compat version we want.
6455 commit 25b14610dab655646a109db5ef8cb4c4bf2a48a0
6456 Author: djm@openbsd.org <djm@openbsd.org>
6457 Date: Fri Jul 17 02:47:45 2015 +0000
6461 fix incorrect test for SSH1 keys when compiled without SSH1
6464 Upstream-ID: 6004d720345b8e481c405e8ad05ce2271726e451
6466 commit df56a8035d429b2184ee94aaa7e580c1ff67f73a
6467 Author: djm@openbsd.org <djm@openbsd.org>
6468 Date: Wed Jul 15 08:00:11 2015 +0000
6472 fix NULL-deref when SSH1 reenabled
6474 Upstream-ID: f22fd805288c92b3e9646782d15b48894b2d5295
6476 commit 41e38c4d49dd60908484e6703316651333f16b93
6477 Author: djm@openbsd.org <djm@openbsd.org>
6478 Date: Wed Jul 15 07:19:50 2015 +0000
6482 regen RSA1 test keys; the last batch was missing their
6485 Upstream-Regress-ID: 7ccf437305dd63ff0b48dd50c5fd0f4d4230c10a
6487 commit 5bf0933184cb622ca3f96d224bf3299fd2285acc
6488 Author: markus@openbsd.org <markus@openbsd.org>
6489 Date: Fri Jul 10 06:23:25 2015 +0000
6493 Adapt tests, now that DSA if off by default; use
6494 PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA.
6496 Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c
6498 commit 7a6e3fd7b41dbd3756b6bf9acd67954c0b1564cc
6499 Author: markus@openbsd.org <markus@openbsd.org>
6500 Date: Tue Jul 7 14:54:16 2015 +0000
6504 regen test data after mktestdata.sh changes
6506 Upstream-Regress-ID: 3495ecb082b9a7c048a2d7c5c845d3bf181d25a4
6508 commit 7c8c174c69f681d4910fa41c37646763692b28e2
6509 Author: markus@openbsd.org <markus@openbsd.org>
6510 Date: Tue Jul 7 14:53:30 2015 +0000
6514 adapt tests to new minimum RSA size and default FP format
6516 Upstream-Regress-ID: a4b30afd174ce82b96df14eb49fb0b81398ffd0e
6518 commit 6a977a4b68747ade189e43d302f33403fd4a47ac
6519 Author: djm@openbsd.org <djm@openbsd.org>
6520 Date: Fri Jul 3 04:39:23 2015 +0000
6524 legacy v00 certificates are gone; adapt and don't try to
6525 test them; "sure" markus@ dtucker@
6527 Upstream-Regress-ID: c57321e69b3cd4a3b3396dfcc43f0803d047da12
6529 commit 0c4123ad5e93fb90fee9c6635b13a6cdabaac385
6530 Author: djm@openbsd.org <djm@openbsd.org>
6531 Date: Wed Jul 1 23:11:18 2015 +0000
6535 don't expect SSH v.1 in unittests
6537 Upstream-Regress-ID: f8812b16668ba78e6a698646b2a652b90b653397
6539 commit 3c099845798a817cdde513c39074ec2063781f18
6540 Author: djm@openbsd.org <djm@openbsd.org>
6541 Date: Mon Jun 15 06:38:50 2015 +0000
6545 turn SSH1 back on to match src/usr.bin/ssh being tested
6547 Upstream-Regress-ID: 6c4f763a2f0cc6893bf33983919e9030ae638333
6549 commit b1dc2b33689668c75e95f873a42d5aea1f4af1db
6550 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6551 Date: Mon Jul 13 04:57:14 2015 +0000
6555 Add "PuTTY_Local:" to the clients to which we do not
6556 offer DH-GEX. This was the string that was used for development versions
6557 prior to September 2014 and they don't do RFC4419 DH-GEX, but unfortunately
6558 there are some extant products based on those versions. bx2424 from Jay
6559 Rouman, ok markus@ djm@
6561 Upstream-ID: be34d41e18b966832fe09ca243d275b81882e1d5
6563 commit 3a1638dda19bbc73d0ae02b4c251ce08e564b4b9
6564 Author: markus@openbsd.org <markus@openbsd.org>
6565 Date: Fri Jul 10 06:21:53 2015 +0000
6569 Turn off DSA by default; add HostKeyAlgorithms to the
6570 server and PubkeyAcceptedKeyTypes to the client side, so it still can be
6571 tested or turned back on; feedback and ok djm@
6573 Upstream-ID: 8450a9e6d83f80c9bfed864ff061dfc9323cec21
6575 commit 16db0a7ee9a87945cc594d13863cfcb86038db59
6576 Author: markus@openbsd.org <markus@openbsd.org>
6577 Date: Thu Jul 9 09:49:46 2015 +0000
6581 re-enable ed25519-certs if compiled w/o openssl; ok djm
6583 Upstream-ID: e10c90808b001fd2c7a93778418e9b318f5c4c49
6585 commit c355bf306ac33de6545ce9dac22b84a194601e2f
6586 Author: markus@openbsd.org <markus@openbsd.org>
6587 Date: Wed Jul 8 20:24:02 2015 +0000
6591 no need to include the old buffer/key API
6593 Upstream-ID: fb13c9f7c0bba2545f3eb0a0e69cb0030819f52b
6595 commit a3cc48cdf9853f1e832d78cb29bedfab7adce1ee
6596 Author: markus@openbsd.org <markus@openbsd.org>
6597 Date: Wed Jul 8 19:09:25 2015 +0000
6601 typedefs for Cipher&CipherContext are unused
6603 Upstream-ID: 50e6a18ee92221d23ad173a96d5b6c42207cf9a7
6605 commit a635bd06b5c427a57c3ae760d3a2730bb2c863c0
6606 Author: markus@openbsd.org <markus@openbsd.org>
6607 Date: Wed Jul 8 19:04:21 2015 +0000
6613 Upstream-ID: afb532355b7fa7135a60d944ca1e644d1d63cb58
6615 commit 2521cf0e36c7f3f6b19f206da0af134f535e4a31
6616 Author: markus@openbsd.org <markus@openbsd.org>
6617 Date: Wed Jul 8 19:01:15 2015 +0000
6623 Upstream-ID: 174fa7faa9b9643cba06164b5e498591356fbced
6625 commit c65a7aa6c43aa7a308ee1ab8a96f216169ae9615
6626 Author: djm@openbsd.org <djm@openbsd.org>
6627 Date: Fri Jul 3 04:05:54 2015 +0000
6631 another SSH_RSA_MINIMUM_MODULUS_SIZE that needed
6634 Upstream-ID: 9d8826cafe96aab4ae8e2f6fd22800874b7ffef1
6636 commit b1f383da5cd3cb921fc7776f17a14f44b8a31757
6637 Author: djm@openbsd.org <djm@openbsd.org>
6638 Date: Fri Jul 3 03:56:25 2015 +0000
6642 add an XXX reminder for getting correct key paths from
6645 Upstream-ID: feae52b209d7782ad742df04a4260e9fe41741db
6647 commit 933935ce8d093996c34d7efa4d59113163080680
6648 Author: djm@openbsd.org <djm@openbsd.org>
6649 Date: Fri Jul 3 03:49:45 2015 +0000
6653 refuse to generate or accept RSA keys smaller than 1024
6654 bits; feedback and ok dtucker@
6656 Upstream-ID: 7ea3d31271366ba264f06e34a3539bf1ac30f0ba
6658 commit bdfd29f60b74f3e678297269dc6247a5699583c1
6659 Author: djm@openbsd.org <djm@openbsd.org>
6660 Date: Fri Jul 3 03:47:00 2015 +0000
6664 turn off 1024 bit diffie-hellman-group1-sha1 key
6665 exchange method (already off in server, this turns it off in the client by
6666 default too) ok dtucker@
6668 Upstream-ID: f59b88f449210ab7acf7d9d88f20f1daee97a4fa
6670 commit c28fc62d789d860c75e23a9fa9fb250eb2beca57
6671 Author: djm@openbsd.org <djm@openbsd.org>
6672 Date: Fri Jul 3 03:43:18 2015 +0000
6676 delete support for legacy v00 certificates; "sure"
6679 Upstream-ID: b5b9bb5f9202d09e88f912989d74928601b6636f
6681 commit 564d63e1b4a9637a209d42a9d49646781fc9caef
6682 Author: djm@openbsd.org <djm@openbsd.org>
6683 Date: Wed Jul 1 23:10:47 2015 +0000
6687 Compile-time disable SSH v.1 again
6689 Upstream-ID: 1d4b513a3a06232f02650b73bad25100d1b800af
6691 commit 868109b650504dd9bcccdb1f51d0906f967c20ff
6692 Author: djm@openbsd.org <djm@openbsd.org>
6693 Date: Wed Jul 1 02:39:06 2015 +0000
6697 twiddle PermitRootLogin back
6699 Upstream-ID: 2bd23976305d0512e9f84d054e1fc23cd70b89f2
6701 commit 7de4b03a6e4071d454b72927ffaf52949fa34545
6702 Author: djm@openbsd.org <djm@openbsd.org>
6703 Date: Wed Jul 1 02:32:17 2015 +0000
6707 twiddle; (this commit marks the openssh-6.9 release)
6709 Upstream-ID: 78500582819f61dd8adee36ec5cc9b9ac9351234
6711 commit 1bf477d3cdf1a864646d59820878783d42357a1d
6712 Author: djm@openbsd.org <djm@openbsd.org>
6713 Date: Wed Jul 1 02:26:31 2015 +0000
6717 better refuse ForwardX11Trusted=no connections attempted
6718 after ForwardX11Timeout expires; reported by Jann Horn
6720 Upstream-ID: bf0fddadc1b46a0334e26c080038313b4b6dea21
6722 commit 47aa7a0f8551b471fcae0447c1d78464f6dba869
6723 Author: djm@openbsd.org <djm@openbsd.org>
6724 Date: Wed Jul 1 01:56:13 2015 +0000
6728 put back default PermitRootLogin=no
6730 Upstream-ID: 7bdedd5cead99c57ed5571f3b6b7840922d5f728
6732 commit 984b064fe2a23733733262f88d2e1b2a1a501662
6733 Author: djm@openbsd.org <djm@openbsd.org>
6734 Date: Wed Jul 1 01:55:13 2015 +0000
6740 Upstream-ID: 6cfe8e1904812531080e6ab6e752d7001b5b2d45
6742 commit d921082ed670f516652eeba50705e1e9f6325346
6743 Author: djm@openbsd.org <djm@openbsd.org>
6744 Date: Wed Jul 1 01:55:00 2015 +0000
6748 reset default PermitRootLogin to 'yes' (momentarily, for
6751 Upstream-ID: cad8513527066e65dd7a1c16363d6903e8cefa24
6753 commit 66295e0e1ba860e527f191b6325d2d77dec4dbce
6754 Author: Damien Miller <djm@mindrot.org>
6755 Date: Wed Jul 1 11:49:12 2015 +1000
6757 crank version numbers for release
6759 commit 37035c07d4f26bb1fbe000d2acf78efdb008681d
6760 Author: Damien Miller <djm@mindrot.org>
6761 Date: Wed Jul 1 10:49:37 2015 +1000
6763 s/--with-ssh1/--without-ssh1/
6765 commit 629df770dbadc2accfbe1c81b3f31f876d0acd84
6766 Author: djm@openbsd.org <djm@openbsd.org>
6767 Date: Tue Jun 30 05:25:07 2015 +0000
6771 fatal() when a remote window update causes the window
6772 value to overflow. Reported by Georg Wicherski, ok markus@
6774 Upstream-ID: ead397a9aceb3bf74ebfa5fcaf259d72e569f351
6776 commit f715afebe735d61df3fd30ad72d9ac1c8bd3b5f2
6777 Author: djm@openbsd.org <djm@openbsd.org>
6778 Date: Tue Jun 30 05:23:25 2015 +0000
6782 Fix math error in remote window calculations that causes
6783 eventual stalls for datagram channels. Reported by Georg Wicherski, ok
6786 Upstream-ID: be54059d11bf64e0d85061f7257f53067842e2ab
6788 commit 52fb6b9b034fcfd24bf88cc7be313e9c31de9889
6789 Author: Damien Miller <djm@mindrot.org>
6790 Date: Tue Jun 30 16:05:40 2015 +1000
6792 skip IPv6-related portions on hosts without IPv6
6796 commit 512caddf590857af6aa12218461b5c0441028cf5
6797 Author: djm@openbsd.org <djm@openbsd.org>
6798 Date: Mon Jun 29 22:35:12 2015 +0000
6802 add getpid to sandbox, reachable by grace_alarm_handler
6804 reported by Jakub Jelen; bz#2419
6806 Upstream-ID: d0da1117c16d4c223954995d35b0f47c8f684cd8
6808 commit 78c2a4f883ea9aba866358e2acd9793a7f42ca93
6809 Author: djm@openbsd.org <djm@openbsd.org>
6810 Date: Fri Jun 26 05:13:20 2015 +0000
6814 Fix \-escaping bug that caused forward path parsing to skip
6815 two characters and skip past the end of the string.
6817 Based on patch by Salvador Fandino; ok dtucker@
6819 Upstream-ID: 7b879dc446335677cbe4cb549495636a0535f3bd
6821 commit bc20205c91c9920361d12b15d253d4997dba494a
6822 Author: Damien Miller <djm@mindrot.org>
6823 Date: Thu Jun 25 09:51:39 2015 +1000
6825 add missing pselect6
6827 patch from Jakub Jelen
6829 commit 9d27fb73b4a4e5e99cb880af790d5b1ce44f720a
6830 Author: djm@openbsd.org <djm@openbsd.org>
6831 Date: Wed Jun 24 23:47:23 2015 +0000
6835 correct test to sshkey_sign(); spotted by Albert S.
6837 Upstream-ID: 5f7347f40f0ca6abdaca2edb3bd62f4776518933
6839 commit 7ed01a96a1911d8b4a9ef4f3d064e1923bfad7e3
6840 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6841 Date: Wed Jun 24 01:49:19 2015 +0000
6845 Revert previous commit. We still want to call setgroups
6846 in the case where there are zero groups to remove any that we might otherwise
6847 inherit (as pointed out by grawity at gmail.com) and since the 2nd argument
6848 to setgroups is always a static global it's always valid to dereference in
6849 this case. ok deraadt@ djm@
6851 Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01
6853 commit 882f8bf94f79528caa65b0ba71c185d705bb7195
6854 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6855 Date: Wed Jun 24 01:49:19 2015 +0000
6859 Revert previous commit. We still want to call setgroups in
6860 the case where there are zero groups to remove any that we might otherwise
6861 inherit (as pointed out by grawity at gmail.com) and since the 2nd argument
6862 to setgroups is always a static global it's always valid to dereference in
6863 this case. ok deraadt@ djm@
6865 Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01
6867 commit 9488538a726951e82b3a4374f3c558d72c80a89b
6868 Author: djm@openbsd.org <djm@openbsd.org>
6869 Date: Mon Jun 22 23:42:16 2015 +0000
6873 Don't count successful partial authentication as failures
6874 in monitor; this may have caused the monitor to refuse multiple
6875 authentications that would otherwise have successfully completed; ok markus@
6877 Upstream-ID: eb74b8e506714d0f649bd5c300f762a527af04a3
6879 commit 63b78d003bd8ca111a736e6cea6333da50f5f09b
6880 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6881 Date: Mon Jun 22 12:29:57 2015 +0000
6885 Don't call setgroups if we have zero groups; there's no
6886 guarantee that it won't try to deref the pointer. Based on a patch from mail
6887 at quitesimple.org, ok djm deraadt
6889 Upstream-ID: 2fff85e11d7a9a387ef7fddf41fbfaf566708ab1
6891 commit 5c15e22c691c79a47747bcf5490126656f97cecd
6892 Author: Damien Miller <djm@mindrot.org>
6893 Date: Thu Jun 18 15:07:56 2015 +1000
6897 commit 596dbca82f3f567fb3d2d69af4b4e1d3ba1e6403
6898 Author: jsing@openbsd.org <jsing@openbsd.org>
6899 Date: Mon Jun 15 18:44:22 2015 +0000
6903 If AuthorizedPrincipalsCommand is specified, however
6904 AuthorizedPrincipalsFile is not (or is set to "none"), authentication will
6905 potentially fail due to key_cert_check_authority() failing to locate a
6906 principal that matches the username, even though an authorized principal has
6907 already been matched in the output of the subprocess. Fix this by using the
6908 same logic to determine if pw->pw_name should be passed, as is used to
6909 determine if a authorized principal must be matched earlier on.
6913 Upstream-ID: 43b42302ec846b0ea68aceb40677245391b9409d
6915 commit aff3e94c0d75d0d0fa84ea392b50ab04f8c57905
6916 Author: jsing@openbsd.org <jsing@openbsd.org>
6917 Date: Mon Jun 15 18:42:19 2015 +0000
6921 Make the arguments to match_principals_command() similar
6922 to match_principals_file(), by changing the last argument a struct
6923 sshkey_cert * and dereferencing key->cert in the caller.
6925 No functional change.
6929 Upstream-ID: 533f99b844b21b47342b32b62e198dfffcf8651c
6931 commit 97e2e1596c202a4693468378b16b2353fd2d6c5e
6932 Author: Damien Miller <djm@mindrot.org>
6933 Date: Wed Jun 17 14:36:54 2015 +1000
6935 trivial optimisation for seccomp-bpf
6937 When doing arg inspection and the syscall doesn't match, skip
6938 past the instruction that reloads the syscall into the accumulator,
6939 since the accumulator hasn't been modified at this point.
6941 commit 99f33d7304893bd9fa04d227cb6e870171cded19
6942 Author: Damien Miller <djm@mindrot.org>
6943 Date: Wed Jun 17 10:50:51 2015 +1000
6945 aarch64 support for seccomp-bpf sandbox
6947 Also resort and tidy syscall list. Based on patches by Jakub Jelen
6948 bz#2361; ok dtucker@
6950 commit 4ef702e1244633c1025ec7cfe044b9ab267097bf
6951 Author: djm@openbsd.org <djm@openbsd.org>
6952 Date: Mon Jun 15 01:32:50 2015 +0000
6956 return failure on RSA signature error; reported by Albert S
6958 Upstream-ID: e61bb93dbe0349625807b0810bc213a6822121fa
6960 commit a170f22baf18af0b1acf2788b8b715605f41a1f9
6961 Author: Tim Rice <tim@multitalents.net>
6962 Date: Tue Jun 9 22:41:13 2015 -0700
6964 Fix t12 rules for out of tree builds.
6966 commit ec04dc4a5515c913121bc04ed261857e68fa5c18
6967 Author: millert@openbsd.org <millert@openbsd.org>
6968 Date: Fri Jun 5 15:13:13 2015 +0000
6972 For "ssh -L 12345:/tmp/sock" don't fail with "No forward host
6973 name." (we have a path, not a host name). Based on a diff from Jared
6976 Upstream-ID: 2846b0a8c7de037e33657f95afbd282837fc213f
6978 commit 732d61f417a6aea0aa5308b59cb0f563bcd6edd6
6979 Author: djm@openbsd.org <djm@openbsd.org>
6980 Date: Fri Jun 5 03:44:14 2015 +0000
6984 typo: accidental repetition; bz#2386
6986 Upstream-ID: 45e620d99f6bc301e5949d34a54027374991c88b
6988 commit adfb24c69d1b6f5e758db200866c711e25a2ba73
6989 Author: Darren Tucker <dtucker@zip.com.au>
6990 Date: Fri Jun 5 14:51:40 2015 +1000
6992 Add Linux powerpc64le and powerpcle entries.
6994 Stopgap to resolve bz#2409 because we are so close to release and will
6995 update config.guess and friends shortly after the release. ok djm@
6997 commit a1195a0fdc9eddddb04d3e9e44c4775431cb77da
6998 Merge: 6397eed d2480bc
6999 Author: Tim Rice <tim@multitalents.net>
7000 Date: Wed Jun 3 21:43:13 2015 -0700
7002 Merge branch 'master' of git.mindrot.org:/var/git/openssh
7004 commit 6397eedf953b2b973d2d7cbb504ab501a07f8ddc
7005 Author: Tim Rice <tim@multitalents.net>
7006 Date: Wed Jun 3 21:41:11 2015 -0700
7008 Remove unneeded backslashes. Patch from Ángel González
7010 commit d2480bcac1caf31b03068de877a47d6e1027bf6d
7011 Author: Darren Tucker <dtucker@zip.com.au>
7012 Date: Thu Jun 4 14:10:55 2015 +1000
7014 Remove redundant include of stdarg.h. bz#2410
7016 commit 5e67859a623826ccdf2df284cbb37e2d8e2787eb
7017 Author: djm@openbsd.org <djm@openbsd.org>
7018 Date: Tue Jun 2 09:10:40 2015 +0000
7022 mention CheckHostIP adding addresses to known_hosts;
7023 bz#1993; ok dtucker@
7025 Upstream-ID: fd44b68440fd0dc29abf9f2d3f703d74a2396cb7
7027 commit d7a58bbac6583e33fd5eca8e2c2cc70c57617818
7028 Author: Darren Tucker <dtucker@zip.com.au>
7029 Date: Tue Jun 2 20:15:26 2015 +1000
7031 Replace strcpy with strlcpy.
7033 ok djm, sanity check by Corinna Vinschen.
7035 commit 51a1c2115265c6e80ede8a5c9dccada9aeed7143
7036 Author: Damien Miller <djm@mindrot.org>
7037 Date: Fri May 29 18:27:21 2015 +1000
7039 skip, rather than fatal when run without SUDO set
7041 commit 599f01142a376645b15cbc9349d7e8975e1cf245
7042 Author: Damien Miller <djm@mindrot.org>
7043 Date: Fri May 29 18:03:15 2015 +1000
7045 fix merge botch that left ",," in KEX algs
7047 commit 0c2a81dfc21822f2423edd30751e5ec53467b347
7048 Author: Damien Miller <djm@mindrot.org>
7049 Date: Fri May 29 17:08:28 2015 +1000
7051 re-enable SSH protocol 1 at compile time
7053 commit db438f9285d64282d3ac9e8c0944f59f037c0151
7054 Author: djm@openbsd.org <djm@openbsd.org>
7055 Date: Fri May 29 03:05:13 2015 +0000
7059 make this work without SUDO set; ok dtucker@
7061 Upstream-Regress-ID: bca88217b70bce2fe52b23b8e06bdeb82d98c715
7063 commit 1d9a2e2849c9864fe75daabf433436341c968e14
7064 Author: djm@openbsd.org <djm@openbsd.org>
7065 Date: Thu May 28 07:37:31 2015 +0000
7069 wrap all moduli-related code in #ifdef WITH_OPENSSL.
7070 based on patch from Reuben Hawkins; bz#2388 feedback and ok dtucker@
7072 Upstream-ID: d80cfc8be3e6ec65b3fac9e87c4466533b31b7cf
7074 commit 496aeb25bc2d6c434171292e4714771b594bd00e
7075 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7076 Date: Thu May 28 05:41:29 2015 +0000
7080 Increase the allowed length of the known host file name
7081 in the log message to be consistent with other cases. Part of bz#1993, ok
7084 Upstream-ID: a9e97567be49f25daf286721450968251ff78397
7086 commit dd2cfeb586c646ff8d70eb93567b2e559ace5b14
7087 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7088 Date: Thu May 28 05:09:45 2015 +0000
7092 Fix typo (keywork->keyword)
7094 Upstream-ID: 8aacd0f4089c0a244cf43417f4f9045dfaeab534
7096 commit 9cc6842493fbf23025ccc1edab064869640d3bec
7097 Author: djm@openbsd.org <djm@openbsd.org>
7098 Date: Thu May 28 04:50:53 2015 +0000
7102 add error message on ftruncate failure; bz#2176
7104 Upstream-ID: cbcc606e0b748520c74a210d8f3cc9718d3148cf
7106 commit d1958793a0072c22be26d136dbda5ae263e717a0
7107 Author: djm@openbsd.org <djm@openbsd.org>
7108 Date: Thu May 28 04:40:13 2015 +0000
7112 make ssh-keygen default to ed25519 keys when compiled
7113 without OpenSSL; bz#2388, ok dtucker@
7115 Upstream-ID: 85a471fa6d3fa57a7b8e882d22cfbfc1d84cdc71
7117 commit 3ecde664c9fc5fb3667aedf9e6671462600f6496
7118 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7119 Date: Wed May 27 23:51:10 2015 +0000
7123 Reorder client proposal to prefer
7124 diffie-hellman-group-exchange-sha1 over diffie-hellman-group14-sha1. ok djm@
7126 Upstream-ID: 552c08d47347c3ee1a9a57d88441ab50abe17058
7128 commit 40f64292b907afd0a674fdbf3e4c2356d17a7d68
7129 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7130 Date: Wed May 27 23:39:18 2015 +0000
7134 Add a stronger (4k bit) fallback group that sshd can use
7135 when the moduli file is missing or broken, sourced from RFC3526. bz#2302, ok
7136 markus@ (earlier version), djm@
7138 Upstream-ID: b635215746a25a829d117673d5e5a76d4baee7f4
7140 commit 5ab7d5fa03ad55bc438fab45dfb3aeb30a3c237a
7141 Author: Darren Tucker <dtucker@zip.com.au>
7142 Date: Thu May 28 10:03:40 2015 +1000
7144 New moduli file from OpenBSD, removing 1k groups.
7146 Remove 1k bit groups. ok deraadt@, markus@
7148 commit a71ba58adf34e599f30cdda6e9b93ae6e3937eea
7149 Author: djm@openbsd.org <djm@openbsd.org>
7150 Date: Wed May 27 05:15:02 2015 +0000
7154 support PKCS#11 devices with external PIN entry devices
7155 bz#2240, based on patch from Dirk-Willem van Gulik; feedback and ok dtucker@
7157 Upstream-ID: 504568992b55a8fc984375242b1bd505ced61b0d
7159 commit b282fec1aa05246ed3482270eb70fc3ec5f39a00
7160 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7161 Date: Tue May 26 23:23:40 2015 +0000
7165 Cap DH-GEX group size at 4kbits for Cisco implementations.
7166 Some of them will choke when asked for preferred sizes >4k instead of
7167 returning the 4k group that they do have. bz#2209, ok djm@
7169 Upstream-ID: 54b863a19713446b7431f9d06ad0532b4fcfef8d
7171 commit 3e91b4e8b0dc2b4b7e7d42cf6e8994a32e4cb55e
7172 Author: djm@openbsd.org <djm@openbsd.org>
7173 Date: Sun May 24 23:39:16 2015 +0000
7177 add missing 'c' option to getopt(), case statement was
7178 already there; from Felix Bolte
7180 Upstream-ID: 9b19b4e2e0b54d6fefa0dfac707c51cf4bae3081
7182 commit 64a89ec07660abba4d0da7c0095b7371c98bab62
7183 Author: jsg@openbsd.org <jsg@openbsd.org>
7184 Date: Sat May 23 14:28:37 2015 +0000
7188 fix a memory leak in an error path ok markus@ dtucker@
7190 Upstream-ID: bc1da0f205494944918533d8780fde65dff6c598
7192 commit f948737449257d2cb83ffcfe7275eb79b677fd4a
7193 Author: djm@openbsd.org <djm@openbsd.org>
7194 Date: Fri May 22 05:28:45 2015 +0000
7198 mention ssh-keygen -E for comparing legacy MD5
7199 fingerprints; bz#2332
7201 Upstream-ID: 079a3669549041dbf10dbc072d9563f0dc3b2859
7203 commit 0882332616e4f0272c31cc47bf2018f9cb258a4e
7204 Author: djm@openbsd.org <djm@openbsd.org>
7205 Date: Fri May 22 04:45:52 2015 +0000
7209 Reorder EscapeChar option parsing to avoid a single-byte
7210 out- of-bounds read. bz#2396 from Jaak Ristioja; ok dtucker@
7212 Upstream-ID: 1dc6b5b63d1c8d9a88619da0b27ade461d79b060
7214 commit d7c31da4d42c115843edee2074d7d501f8804420
7215 Author: djm@openbsd.org <djm@openbsd.org>
7216 Date: Fri May 22 03:50:02 2015 +0000
7220 add knob to relax GSSAPI host credential check for
7221 multihomed hosts bz#928, patch by Simon Wilkinson; ok dtucker
7222 (kerberos/GSSAPI is not compiled by default on OpenBSD)
7224 Upstream-ID: 15ddf1c6f7fd9d98eea9962f480079ae3637285d
7226 commit aa72196a00be6e0b666215edcffbc10af234cb0e
7227 Author: Darren Tucker <dtucker@zip.com.au>
7228 Date: Fri May 22 17:49:46 2015 +1000
7230 Include signal.h for sig_atomic_t, used by kex.h.
7232 bz#2402, from tomas.kuthan at oracle com.
7234 commit 8b02481143d75e91c49d1bfae0876ac1fbf9511a
7235 Author: Darren Tucker <dtucker@zip.com.au>
7236 Date: Fri May 22 12:47:24 2015 +1000
7238 Import updated moduli file from OpenBSD.
7240 commit 4739e8d5e1c0be49624082bd9f6b077e9e758db9
7241 Author: djm@openbsd.org <djm@openbsd.org>
7242 Date: Thu May 21 12:01:19 2015 +0000
7246 Support "ssh-keygen -lF hostname" to find search known_hosts
7247 and print key hashes. Already advertised by ssh-keygen(1), but not delivered
7248 by code; ok dtucker@
7250 Upstream-ID: 459e0e2bf39825e41b0811c336db2d56a1c23387
7252 commit e97201feca10b5196da35819ae516d0b87cf3a50
7253 Author: Damien Miller <djm@mindrot.org>
7254 Date: Thu May 21 17:55:15 2015 +1000
7256 conditionalise util.h inclusion
7258 commit 13640798c7dd011ece0a7d02841fe48e94cfa0e0
7259 Author: djm@openbsd.org <djm@openbsd.org>
7260 Date: Thu May 21 06:44:25 2015 +0000
7264 regress test for AuthorizedPrincipalsCommand
7266 Upstream-Regress-ID: c658fbf1ab6b6011dc83b73402322e396f1e1219
7268 commit 84452c5d03c21f9bfb28c234e0dc1dc67dd817b1
7269 Author: djm@openbsd.org <djm@openbsd.org>
7270 Date: Thu May 21 06:40:02 2015 +0000
7274 regress test for AuthorizedKeysCommand arguments
7276 Upstream-Regress-ID: bbd65c13c6b3be9a442ec115800bff9625898f12
7278 commit bcc50d816187fa9a03907ac1f3a52f04a52e10d1
7279 Author: djm@openbsd.org <djm@openbsd.org>
7280 Date: Thu May 21 06:43:30 2015 +0000
7284 add AuthorizedPrincipalsCommand that allows getting
7285 authorized_principals from a subprocess rather than a file, which is quite
7286 useful in deployments with large userbases
7288 feedback and ok markus@
7290 Upstream-ID: aa1bdac7b16fc6d2fa3524ef08f04c7258d247f6
7292 commit 24232a3e5ab467678a86aa67968bbb915caffed4
7293 Author: djm@openbsd.org <djm@openbsd.org>
7294 Date: Thu May 21 06:38:35 2015 +0000
7298 support arguments to AuthorizedKeysCommand
7300 bz#2081 loosely based on patch by Sami Hartikainen
7301 feedback and ok markus@
7303 Upstream-ID: b080387a14aa67dddd8ece67c00f268d626541f7
7305 commit d80fbe41a57c72420c87a628444da16d09d66ca7
7306 Author: djm@openbsd.org <djm@openbsd.org>
7307 Date: Thu May 21 04:55:51 2015 +0000
7311 refactor: split base64 encoding of pubkey into its own
7312 sshkey_to_base64() function and out of sshkey_write(); ok markus@
7314 Upstream-ID: 54fc38f5832e9b91028900819bda46c3959a0c1a
7316 commit 7cc44ef74133a473734bbcbd3484f24d6a7328c5
7317 Author: deraadt@openbsd.org <deraadt@openbsd.org>
7318 Date: Mon May 18 15:06:05 2015 +0000
7322 getentropy() and sendsyslog() have been around long
7323 enough. openssh-portable may want the #ifdef's but not base. discussed with
7326 Upstream-ID: 0506a4334de108e3fb6c66f8d6e0f9c112866926
7328 commit 9173d0fbe44de7ebcad8a15618e13a8b8d78902e
7329 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7330 Date: Fri May 15 05:44:21 2015 +0000
7334 Use a salted hash of the lock passphrase instead of plain
7335 text and do constant-time comparisons of it. Should prevent leaking any
7336 information about it via timing, pointed out by Ryan Castellucci. Add a 0.1s
7337 incrementing delay for each failed unlock attempt up to 10s. ok markus@
7338 (earlier version), djm@
7340 Upstream-ID: c599fcc325aa1cc65496b25220b622d22208c85f
7342 commit d028d5d3a697c71b21e4066d8672cacab3caa0a8
7343 Author: Damien Miller <djm@mindrot.org>
7344 Date: Tue May 5 19:10:58 2015 +1000
7348 - tedu@cvs.openbsd.org 2015/01/12 03:20:04
7350 rename blocks to words. bcrypt "blocks" are unrelated to blowfish blocks,
7351 nor are they the same size.
7353 commit f6391d4e59b058984163ab28f4e317e7a72478f1
7354 Author: Damien Miller <djm@mindrot.org>
7355 Date: Tue May 5 19:10:23 2015 +1000
7359 - deraadt@cvs.openbsd.org 2015/01/08 00:30:07
7361 declare a local version of MIN(), call it MINIMUM()
7363 commit 8ac6b13cc9113eb47cd9e86c97d7b26b4b71b77f
7364 Author: Damien Miller <djm@mindrot.org>
7365 Date: Tue May 5 19:09:46 2015 +1000
7369 - djm@cvs.openbsd.org 2014/12/30 01:41:43
7371 typo in comment: ouput => output
7373 commit 1f792489d5cf86a4f4e3003e6e9177654033f0f2
7374 Author: djm@openbsd.org <djm@openbsd.org>
7375 Date: Mon May 4 06:10:48 2015 +0000
7379 Remove pattern length argument from match_pattern_list(), we
7380 only ever use it for strlen(pattern).
7382 Prompted by hanno AT hboeck.de pointing an out-of-bound read
7383 error caused by an incorrect pattern length found using AFL
7388 commit 639d6bc57b1942393ed12fb48f00bc05d4e093e4
7389 Author: djm@openbsd.org <djm@openbsd.org>
7390 Date: Fri May 1 07:10:01 2015 +0000
7394 refactor ssh_dispatch_run_fatal() to use sshpkt_fatal()
7395 to better report error conditions. Teach sshpkt_fatal() about ECONNRESET.
7397 Improves error messages on TCP connection resets. bz#2257
7401 commit 9559d7de34c572d4d3fd990ca211f8ec99f62c4d
7402 Author: djm@openbsd.org <djm@openbsd.org>
7403 Date: Fri May 1 07:08:08 2015 +0000
7407 a couple of parse targets were missing activep checks,
7408 causing them to be misapplied in match context; bz#2272 diagnosis and
7409 original patch from Sami Hartikainen ok dtucker@
7411 commit 7e8528cad04b2775c3b7db08abf8fb42e47e6b2a
7412 Author: djm@openbsd.org <djm@openbsd.org>
7413 Date: Fri May 1 04:17:51 2015 +0000
7417 make handling of AuthorizedPrincipalsFile=none more
7418 consistent with other =none options; bz#2288 from Jakub Jelen; ok dtucker@
7420 commit ca430d4d9cc0f62eca3b1fb1e2928395b7ce80f7
7421 Author: djm@openbsd.org <djm@openbsd.org>
7422 Date: Fri May 1 04:03:20 2015 +0000
7426 remove failed remote forwards established by muliplexing
7427 from the list of active forwards; bz#2363, patch mostly by Yoann Ricordel; ok
7430 commit 8312cfb8ad88657517b3e23ac8c56c8e38eb9792
7431 Author: djm@openbsd.org <djm@openbsd.org>
7432 Date: Fri May 1 04:01:58 2015 +0000
7436 reduce stderr spam when using ssh -S /path/mux -O forward
7437 -R 0:... ok dtucker@
7439 commit 179be0f5e62f1f492462571944e45a3da660d82b
7440 Author: djm@openbsd.org <djm@openbsd.org>
7441 Date: Fri May 1 03:23:51 2015 +0000
7445 prevent authorized_keys options picked up on public key
7446 tests without a corresponding private key authentication being applied to
7447 other authentication methods. Reported by halex@, ok markus@
7449 commit a42d67be65b719a430b7fcaba2a4e4118382723a
7450 Author: djm@openbsd.org <djm@openbsd.org>
7451 Date: Fri May 1 03:20:54 2015 +0000
7455 Don't make parsing of authorized_keys' environment=
7456 option conditional on PermitUserEnv - always parse it, but only use the
7457 result if the option is enabled. This prevents the syntax of authorized_keys
7458 changing depending on which sshd_config options were enabled.
7460 bz#2329; based on patch from coladict AT gmail.com, ok dtucker@
7462 commit e661a86353e11592c7ed6a847e19a83609f49e77
7463 Author: djm@openbsd.org <djm@openbsd.org>
7464 Date: Mon May 4 06:10:48 2015 +0000
7468 Remove pattern length argument from match_pattern_list(), we
7469 only ever use it for strlen(pattern).
7471 Prompted by hanno AT hboeck.de pointing an out-of-bound read
7472 error caused by an incorrect pattern length found using AFL
7477 commit 0ef1de742be2ee4b10381193fe90730925b7f027
7478 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7479 Date: Thu Apr 23 05:01:19 2015 +0000
7483 Add a simple regression test for sshd's configuration
7484 parser. Right now, all it does is run the output of sshd -T back through
7485 itself and ensure the output is valid and invariant.
7487 commit 368f83c793275faa2c52f60eaa9bdac155c4254b
7488 Author: djm@openbsd.org <djm@openbsd.org>
7489 Date: Wed Apr 22 01:38:36 2015 +0000
7493 use correct key for nested certificate test
7495 commit 8d4d1bfddbbd7d21f545dc6997081d1ea1fbc99a
7496 Author: djm@openbsd.org <djm@openbsd.org>
7497 Date: Fri May 1 07:11:47 2015 +0000
7501 mention that the user's shell from /etc/passwd is used
7502 for commands too; bz#1459 ok dtucker@
7504 commit 5ab283d0016bbc9d4d71e8e5284d011bc5a930cf
7505 Author: djm@openbsd.org <djm@openbsd.org>
7506 Date: Fri May 8 07:29:00 2015 +0000
7512 Upstream-Regress-ID: 6b708a3e709d5b7fd37890f874bafdff1f597519
7514 commit 8377d5008ad260048192e1e56ad7d15a56d103dd
7515 Author: djm@openbsd.org <djm@openbsd.org>
7516 Date: Fri May 8 07:26:13 2015 +0000
7522 Upstream-Regress-ID: 9c48911643d5b05173b36a012041bed4080b8554
7524 commit c28a3436fa8737709ea88e4437f8f23a6ab50359
7525 Author: djm@openbsd.org <djm@openbsd.org>
7526 Date: Fri May 8 06:45:13 2015 +0000
7530 moar whitespace at eol
7532 Upstream-ID: 64eaf872a3ba52ed41e494287e80d40aaba4b515
7534 commit 2b64c490468fd4ca35ac8d5cc31c0520dc1508bb
7535 Author: djm@openbsd.org <djm@openbsd.org>
7536 Date: Fri May 8 06:41:56 2015 +0000
7542 Upstream-ID: 57bcf67d666c6fc1ad798aee448fdc3f70f7ec2c
7544 commit 4e636cf201ce6e7e3b9088568218f9d4e2c51712
7545 Author: djm@openbsd.org <djm@openbsd.org>
7546 Date: Fri May 8 03:56:51 2015 +0000
7552 commit 38b8272f823dc1dd4e29dbcee83943ed48bb12fa
7553 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7554 Date: Mon May 4 01:47:53 2015 +0000
7558 Use diff w/out -u for better portability
7560 commit 297060f42d5189a4065ea1b6f0afdf6371fb0507
7561 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7562 Date: Fri May 8 03:25:07 2015 +0000
7566 Use xcalloc for permitted_adm_opens instead of xmalloc to
7567 ensure it's zeroed. Fixes post-auth crash with permitopen=none. bz#2355, ok
7570 commit 63ebf019be863b2d90492a85e248cf55a6e87403
7571 Author: djm@openbsd.org <djm@openbsd.org>
7572 Date: Fri May 8 03:17:49 2015 +0000
7576 don't choke on new-format private keys encrypted with an
7577 AEAD cipher; bz#2366, patch from Ron Frederick; ok markus@
7579 commit f8484dac678ab3098ae522a5f03bb2530f822987
7580 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7581 Date: Wed May 6 05:45:17 2015 +0000
7585 Clarify pseudo-terminal request behaviour and use
7586 "pseudo-terminal" consistently. bz#1716, ok jmc@ "I like it" deraadt@.
7588 commit ea139507bef8bad26e86ed99a42c7233ad115c38
7589 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7590 Date: Wed May 6 04:07:18 2015 +0000
7594 Blacklist DH-GEX for specific PuTTY versions known to
7595 send non-RFC4419 DH-GEX messages rather than all versions of PuTTY.
7596 According to Simon Tatham, 0.65 and newer versions will send RFC4419 DH-GEX
7599 commit b58234f00ee3872eb84f6e9e572a9a34e902e36e
7600 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7601 Date: Tue May 5 10:17:49 2015 +0000
7605 WinSCP doesn't implement RFC4419 DH-GEX so flag it so we
7606 don't offer that KEX method. ok markus@
7608 commit d5b1507a207253b39e810e91e68f9598691b7a29
7609 Author: jsg@openbsd.org <jsg@openbsd.org>
7610 Date: Tue May 5 02:48:17 2015 +0000
7614 use the sizeof the struct not the sizeof a pointer to the
7615 struct in ssh_digest_start()
7617 This file is only used if ssh is built with OPENSSL=no
7621 commit a647b9b8e616c231594b2710c925d31b1b8afea3
7622 Author: Darren Tucker <dtucker@zip.com.au>
7623 Date: Fri May 8 11:07:27 2015 +1000
7625 Put brackets around mblen() compat constant.
7627 This might help with the reported problem cross compiling for Android
7628 ("error: expected identifier or '(' before numeric constant") but
7629 shouldn't hurt in any case.
7631 commit d1680d36e17244d9af3843aeb5025cb8e40d6c07
7632 Author: Darren Tucker <dtucker@zip.com.au>
7633 Date: Thu Apr 30 09:18:11 2015 +1000
7635 xrealloc -> xreallocarray in portable code too.
7637 commit 531a57a3893f9fcd4aaaba8c312b612bbbcc021e
7638 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7639 Date: Wed Apr 29 03:48:56 2015 +0000
7643 Allow ListenAddress, Port and AddressFamily in any
7644 order. bz#68, ok djm@, jmc@ (for the man page bit).
7646 commit c1d5bcf1aaf1209af02f79e48ba1cbc76a87b56f
7647 Author: jmc@openbsd.org <jmc@openbsd.org>
7648 Date: Tue Apr 28 13:47:38 2015 +0000
7652 enviroment -> environment: apologies to darren for not
7653 spotting that first time round...
7655 commit 43beea053db191cac47c2cd8d3dc1930158aff1a
7656 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7657 Date: Tue Apr 28 10:25:15 2015 +0000
7661 Fix typo in previous
7663 commit 85b96ef41374f3ddc9139581f87da09b2cd9199e
7664 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7665 Date: Tue Apr 28 10:17:58 2015 +0000
7669 Document that the TERM environment variable is not
7670 subject to SendEnv and AcceptEnv. bz#2386, based loosely on a patch from
7671 jjelen at redhat, help and ok jmc@
7673 commit 88a7c598a94ff53f76df228eeaae238d2d467565
7674 Author: djm@openbsd.org <djm@openbsd.org>
7675 Date: Mon Apr 27 21:42:48 2015 +0000
7679 Make sshd default to PermitRootLogin=no; ok deraadt@
7682 commit 734226b4480a6c736096c729fcf6f391400599c7
7683 Author: djm@openbsd.org <djm@openbsd.org>
7684 Date: Mon Apr 27 01:52:30 2015 +0000
7688 fix compilation with OPENSSL=no; ok dtucker@
7690 commit a4b9d2ce1eb7703eaf0809b0c8a82ded8aa4f1c6
7691 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7692 Date: Mon Apr 27 00:37:53 2015 +0000
7696 Include stdio.h for FILE (used in sshkey.h) so it
7697 compiles with OPENSSL=no.
7699 commit dbcc652f4ca11fe04e5930c7ef18a219318c6cda
7700 Author: djm@openbsd.org <djm@openbsd.org>
7701 Date: Mon Apr 27 00:21:21 2015 +0000
7705 allow "sshd -f none" to skip reading the config file,
7706 much like "ssh -F none" does. ok dtucker
7708 commit b7ca276fca316c952f0b90f5adb1448c8481eedc
7709 Author: jmc@openbsd.org <jmc@openbsd.org>
7710 Date: Fri Apr 24 06:26:49 2015 +0000
7714 combine -Dd onto one line and update usage();
7716 commit 2ea974630d7017e4c7666d14d9dc939707613e96
7717 Author: djm@openbsd.org <djm@openbsd.org>
7718 Date: Fri Apr 24 05:26:44 2015 +0000
7722 add ssh-agent -D to leave ssh-agent in foreground
7723 without enabling debug mode; bz#2381 ok dtucker@
7725 commit 8ac2ffd7aa06042f6b924c87139f2fea5c5682f7
7726 Author: deraadt@openbsd.org <deraadt@openbsd.org>
7727 Date: Fri Apr 24 01:36:24 2015 +0000
7731 2*len -> use xreallocarray() ok djm
7733 commit 657a5fbc0d0aff309079ff8fb386f17e964963c2
7734 Author: deraadt@openbsd.org <deraadt@openbsd.org>
7735 Date: Fri Apr 24 01:36:00 2015 +0000
7739 rename xrealloc() to xreallocarray() since it follows
7742 commit 1108ae242fdd2c304307b68ddf46aebe43ebffaa
7743 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7744 Date: Thu Apr 23 04:59:10 2015 +0000
7748 Two small fixes for sshd -T: ListenAddress'es are added
7749 to a list head so reverse the order when printing them to ensure the
7750 behaviour remains the same, and print StreamLocalBindMask as octal with
7751 leading zero. ok deraadt@
7753 commit bd902b8473e1168f19378d5d0ae68d0c203525df
7754 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7755 Date: Thu Apr 23 04:53:53 2015 +0000
7759 Check for and reject missing arguments for
7760 VersionAddendum and ForceCommand. bz#2281, patch from plautrba at redhat com,
7763 commit ca42c1758575e592239de1d5755140e054b91a0d
7764 Author: djm@openbsd.org <djm@openbsd.org>
7765 Date: Wed Apr 22 01:24:01 2015 +0000
7769 unknown certificate extensions are non-fatal, so don't
7770 fatal when they are encountered; bz#2387 reported by Bob Van Zant; ok
7773 commit 39bfbf7caad231cc4bda6909fb1af0705bca04d8
7774 Author: jsg@openbsd.org <jsg@openbsd.org>
7775 Date: Tue Apr 21 07:01:00 2015 +0000
7779 Add back a backslash removed in rev 1.42 so
7780 KEX_SERVER_ENCRYPT will include aes again.
7784 commit 6b0d576bb87eca3efd2b309fcfe4edfefc289f9c
7785 Author: djm@openbsd.org <djm@openbsd.org>
7786 Date: Fri Apr 17 13:32:09 2015 +0000
7790 s/recommended/required/ that private keys be og-r this
7791 wording change was made a while ago but got accidentally reverted
7793 commit 44a8e7ce6f3ab4c2eb1ae49115c210b98e53c4df
7794 Author: djm@openbsd.org <djm@openbsd.org>
7795 Date: Fri Apr 17 13:25:52 2015 +0000
7799 don't try to cleanup NULL KEX proposals in
7800 kex_prop_free(); found by Jukka Taimisto and Markus Hietava
7802 commit 3038a191872d2882052306098c1810d14835e704
7803 Author: djm@openbsd.org <djm@openbsd.org>
7804 Date: Fri Apr 17 13:19:22 2015 +0000
7808 use error/logit/fatal instead of fprintf(stderr, ...)
7809 and exit(0), fix a few errors that were being printed to stdout instead of
7810 stderr and a few non-errors that were going to stderr instead of stdout
7813 commit a58be33cb6cd24441fa7e634db0e5babdd56f07f
7814 Author: djm@openbsd.org <djm@openbsd.org>
7815 Date: Fri Apr 17 13:16:48 2015 +0000
7819 debug log missing DISPLAY environment when X11
7820 forwarding requested; bz#1682 ok dtucker@
7822 commit 17d4d9d9fbc8fb80e322f94d95eecc604588a474
7823 Author: djm@openbsd.org <djm@openbsd.org>
7824 Date: Fri Apr 17 04:32:31 2015 +0000
7828 don't call record_login() in monitor when UseLogin is
7829 enabled; bz#278 reported by drk AT sgi.com; ok dtucker
7831 commit 40132ff87b6cbc3dc05fb5df2e9d8e3afa06aafd
7832 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7833 Date: Fri Apr 17 04:12:35 2015 +0000
7837 Add some missing options to sshd -T and fix the output
7838 of VersionAddendum HostCertificate. bz#2346, patch from jjelen at redhat
7841 commit 6cc7cfa936afde2d829e56ee6528c7ea47a42441
7842 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7843 Date: Thu Apr 16 23:25:50 2015 +0000
7847 Document "none" for PidFile XAuthLocation
7848 TrustedUserCAKeys and RevokedKeys. bz#2382, feedback from jmc@, ok djm@
7850 commit 15fdfc9b1c6808b26bc54d4d61a38b54541763ed
7851 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7852 Date: Wed Apr 15 23:23:25 2015 +0000
7856 Plug leak of address passed to logging. bz#2373, patch
7857 from jjelen at redhat, ok markus@
7859 commit bb2289e2a47d465eaaaeff3dee2a6b7777b4c291
7860 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7861 Date: Tue Apr 14 04:17:03 2015 +0000
7865 Output remote username in debug output since with Host
7866 and Match it's not always obvious what it will be. bz#2368, ok djm@
7868 commit 70860b6d07461906730632f9758ff1b7c98c695a
7869 Author: Darren Tucker <dtucker@zip.com.au>
7870 Date: Fri Apr 17 10:56:13 2015 +1000
7872 Format UsePAM setting when using sshd -T.
7874 Part of bz#2346, patch from jjelen at redhat com.
7876 commit ee15d9c9f0720f5a8b0b34e4b10ecf21f9824814
7877 Author: Darren Tucker <dtucker@zip.com.au>
7878 Date: Fri Apr 17 10:40:23 2015 +1000
7880 Wrap endian.h include inside ifdef (bz#2370).
7882 commit 408f4c2ad4a4c41baa7b9b2b7423d875abbfa70b
7883 Author: Darren Tucker <dtucker@zip.com.au>
7884 Date: Fri Apr 17 09:39:58 2015 +1000
7886 Look for '${host}-ar' before 'ar'.
7888 This changes configure.ac to look for '${host}-ar' as set by
7889 AC_CANONICAL_HOST before looking for the unprefixed 'ar'.
7890 Useful when cross-compiling when all your binutils are prefixed.
7892 Patch from moben at exherbo org via astrand at lysator liu se and
7895 commit 673a1c16ad078d41558247ce739fe812c960acc8
7896 Author: Damien Miller <djm@google.com>
7897 Date: Thu Apr 16 11:40:20 2015 +1000
7899 remove dependency on arpa/telnet.h
7901 commit 202d443eeda1829d336595a3cfc07827e49f45ed
7902 Author: Darren Tucker <dtucker@zip.com.au>
7903 Date: Wed Apr 15 15:59:49 2015 +1000
7905 Remove duplicate include of pwd.h. bz#2337, patch from Mordy Ovits.
7907 commit 597986493412c499f2bc2209420cb195f97b3668
7908 Author: Damien Miller <djm@google.com>
7909 Date: Thu Apr 9 10:14:48 2015 +1000
7911 platform's with openpty don't need pty_release
7913 commit 318be28cda1fd9108f2e6f2f86b0b7589ba2aed0
7914 Author: djm@openbsd.org <djm@openbsd.org>
7915 Date: Mon Apr 13 02:04:08 2015 +0000
7919 deprecate ancient, pre-RFC4419 and undocumented
7920 SSH2_MSG_KEX_DH_GEX_REQUEST_OLD message; ok markus@ deraadt@ "seems
7921 reasonable" dtucker@
7923 commit d8f391caef62378463a0e6b36f940170dadfe605
7924 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7925 Date: Fri Apr 10 05:16:50 2015 +0000
7929 Don't send hostkey advertisments
7930 (hostkeys-00@openssh.com) to current versions of Tera Term as they can't
7931 handle them. Newer versions should be OK. Patch from Bryan Drewery and
7932 IWAMOTO Kouichi, ok djm@
7934 commit 2c2cfe1a1c97eb9a08cc9817fd0678209680c636
7935 Author: djm@openbsd.org <djm@openbsd.org>
7936 Date: Fri Apr 10 00:08:55 2015 +0000
7940 include port number if a non-default one has been
7941 specified; based on patch from Michael Handler
7943 commit 4492a4f222da4cf1e8eab12689196322e27b08c4
7944 Author: djm@openbsd.org <djm@openbsd.org>
7945 Date: Tue Apr 7 23:00:42 2015 +0000
7949 treat Protocol=1,2|2,1 as Protocol=2 when compiled
7950 without SSH1 support; ok dtucker@ millert@
7952 commit c265e2e6e932efc6d86f6cc885dea33637a67564
7953 Author: miod@openbsd.org <miod@openbsd.org>
7954 Date: Sun Apr 5 15:43:43 2015 +0000
7958 Do not use int for sig_atomic_t; spotted by
7959 christos@netbsd; ok markus@
7961 commit e7bf3a5eda6a1b02bef6096fed78527ee11e54cc
7962 Author: Darren Tucker <dtucker@zip.com.au>
7963 Date: Tue Apr 7 10:48:04 2015 +1000
7965 Use do{}while(0) for no-op functions.
7969 commit bb99844abae2b6447272f79e7fa84134802eb4df
7970 Author: Darren Tucker <dtucker@zip.com.au>
7971 Date: Tue Apr 7 10:47:15 2015 +1000
7973 Wrap blf.h include in ifdef. From FreeBSD.
7975 commit d9b9b43656091cf0ad55c122f08fadb07dad0abd
7976 Author: Darren Tucker <dtucker@zip.com.au>
7977 Date: Tue Apr 7 09:10:00 2015 +1000
7979 Fix misspellings of regress CONFOPTS env variables.
7981 Patch from Bryan Drewery.
7983 commit 3f4ea3c9ab1d32d43c9222c4351f58ca11144156
7984 Author: djm@openbsd.org <djm@openbsd.org>
7985 Date: Fri Apr 3 22:17:27 2015 +0000
7989 correct return value in pubkey parsing, spotted by Ben Hawkes
7992 commit 7da2be0cb9601ed25460c83aa4d44052b967ba0f
7993 Author: djm@openbsd.org <djm@openbsd.org>
7994 Date: Tue Mar 31 22:59:01 2015 +0000
7998 adapt to recent hostfile.c change: when parsing
7999 known_hosts without fully parsing the keys therein, hostkeys_foreach() will
8000 now correctly identify KEY_RSA1 keys; ok markus@ miod@
8002 commit 9e1777a0d1c706714b055811c12ab8cc21033e4a
8003 Author: markus@openbsd.org <markus@openbsd.org>
8004 Date: Tue Mar 24 20:19:15 2015 +0000
8008 use ${SSH} for -Q instead of installed ssh
8010 commit ce1b358ea414a2cc88e4430cd5a2ea7fecd9de57
8011 Author: djm@openbsd.org <djm@openbsd.org>
8012 Date: Mon Mar 16 22:46:14 2015 +0000
8016 make CLEANFILES clean up more of the tests' droppings
8018 commit 398f9ef192d820b67beba01ec234d66faca65775
8019 Author: djm@openbsd.org <djm@openbsd.org>
8020 Date: Tue Mar 31 22:57:06 2015 +0000
8024 downgrade error() for known_hosts parse errors to debug()
8025 to quiet warnings from ssh1 keys present when compiled !ssh1.
8027 also identify ssh1 keys when scanning, even when compiled !ssh1
8031 commit 9a47ab80030a31f2d122b8fd95bd48c408b9fcd9
8032 Author: djm@openbsd.org <djm@openbsd.org>
8033 Date: Tue Mar 31 22:55:50 2015 +0000
8037 fd leak for !ssh1 case; found by unittests; ok markus@
8039 commit c9a0805a6280681901c270755a7cd630d7c5280e
8040 Author: djm@openbsd.org <djm@openbsd.org>
8041 Date: Tue Mar 31 22:55:24 2015 +0000
8045 don't fatal when a !ssh1 sshd is reexeced from a w/ssh1
8046 listener; reported by miod@; ok miod@ markus@
8048 commit 704d8c88988cae38fb755a6243b119731d223222
8049 Author: tobias@openbsd.org <tobias@openbsd.org>
8050 Date: Tue Mar 31 11:06:49 2015 +0000
8054 Comments are only supported for RSA1 keys. If a user
8055 tried to add one and entered his passphrase, explicitly clear it before exit.
8056 This is done in all other error paths, too.
8060 commit 78de1673c05ea2c33e0d4a4b64ecb5186b6ea2e9
8061 Author: jmc@openbsd.org <jmc@openbsd.org>
8062 Date: Mon Mar 30 18:28:37 2015 +0000
8066 ssh-askpass(1) is the default, overridden by SSH_ASKPASS;
8067 diff originally from jiri b;
8069 commit 26e0bcf766fadb4a44fb6199386fb1dcab65ad00
8070 Author: djm@openbsd.org <djm@openbsd.org>
8071 Date: Mon Mar 30 00:00:29 2015 +0000
8075 fix uninitialised memory read when parsing a config file
8076 consisting of a single nul byte. Found by hanno AT hboeck.de using AFL; ok
8079 commit fecede00a76fbb33a349f5121c0b2f9fbc04a777
8080 Author: markus@openbsd.org <markus@openbsd.org>
8081 Date: Thu Mar 26 19:32:19 2015 +0000
8085 sigp and lenp are not optional in ssh_agent_sign(); ok
8088 commit 1b0ef3813244c78669e6d4d54c624f600945327d
8089 Author: naddy@openbsd.org <naddy@openbsd.org>
8090 Date: Thu Mar 26 12:32:38 2015 +0000
8094 don't try to load .ssh/identity by default if SSH1 is
8095 disabled; ok markus@
8097 commit f9b78852379b74a2d14e6fc94fe52af30b7e9c31
8098 Author: djm@openbsd.org <djm@openbsd.org>
8099 Date: Thu Mar 26 07:00:04 2015 +0000
8103 ban all-zero curve25519 keys as recommended by latest
8104 CFRG curves draft; ok markus
8106 commit b8afbe2c1aaf573565e4da775261dfafc8b1ba9c
8107 Author: djm@openbsd.org <djm@openbsd.org>
8108 Date: Thu Mar 26 06:59:28 2015 +0000
8112 relax bits needed check to allow
8113 diffie-hellman-group1-sha1 key exchange to complete for chacha20-poly1305 was
8114 selected as symmetric cipher; ok markus
8116 commit 47842f71e31da130555353c1d57a1e5a8937f1c0
8117 Author: markus@openbsd.org <markus@openbsd.org>
8118 Date: Wed Mar 25 19:29:58 2015 +0000
8122 ignore v1 errors on ssh-add -D; only try v2 keys on
8123 -l/-L (unless WITH_SSH1) ok djm@
8125 commit 5f57e77f91bf2230c09eca96eb5ecec39e5f2da6
8126 Author: markus@openbsd.org <markus@openbsd.org>
8127 Date: Wed Mar 25 19:21:48 2015 +0000
8131 unbreak ssh_agent_sign (lenp vs *lenp)
8133 commit 4daeb67181054f2a377677fac919ee8f9ed3490e
8134 Author: markus@openbsd.org <markus@openbsd.org>
8135 Date: Tue Mar 24 20:10:08 2015 +0000
8139 don't leak 'setp' on error; noted by Nicholas Lemonias;
8142 commit 7d4f96f9de2a18af0d9fa75ea89a4990de0344f5
8143 Author: markus@openbsd.org <markus@openbsd.org>
8144 Date: Tue Mar 24 20:09:11 2015 +0000
8148 consistent check for NULL as noted by Nicholas
8151 commit df100be51354e447d9345cf1ec22e6013c0eed50
8152 Author: markus@openbsd.org <markus@openbsd.org>
8153 Date: Tue Mar 24 20:03:44 2015 +0000
8157 correct fmt-string for size_t as noted by Nicholas
8160 commit a22b9ef21285e81775732436f7c84a27bd3f71e0
8161 Author: djm@openbsd.org <djm@openbsd.org>
8162 Date: Tue Mar 24 09:17:21 2015 +0000
8166 promote chacha20-poly1305@openssh.com to be the default
8169 commit 2aa9da1a3b360cf7b13e96fe1521534b91501fb5
8170 Author: djm@openbsd.org <djm@openbsd.org>
8171 Date: Tue Mar 24 01:29:19 2015 +0000
8175 Compile-time disable SSH protocol 1. You can turn it
8176 back on using the Makefile.inc knob if you need it to talk to ancient
8179 commit 53097b2022154edf96b4e8526af5666f979503f7
8180 Author: djm@openbsd.org <djm@openbsd.org>
8181 Date: Tue Mar 24 01:11:12 2015 +0000
8185 fix double-negative error message "ssh1 is not
8188 commit 5c27e3b6ec2db711dfcd40e6359c0bcdd0b62ea9
8189 Author: djm@openbsd.org <djm@openbsd.org>
8190 Date: Mon Mar 23 06:06:38 2015 +0000
8194 for ssh-keygen -A, don't try (and fail) to generate ssh
8195 v.1 keys when compiled without SSH1 support RSA/DSA/ECDSA keys when compiled
8196 without OpenSSL based on patch by Mike Frysinger; bz#2369
8198 commit 725fd22a8c41db7de73a638539a5157b7e4424ae
8199 Author: djm@openbsd.org <djm@openbsd.org>
8200 Date: Wed Mar 18 01:44:21 2015 +0000
8204 KRL support doesn't need OpenSSL anymore, remove #ifdefs
8207 commit b07011c18e0b2e172c5fd09d21fb159a0bf5fcc7
8208 Author: djm@openbsd.org <djm@openbsd.org>
8209 Date: Mon Mar 16 11:09:52 2015 +0000
8213 #if 0 some more arrays used only for decrypting (we don't
8214 use since we only need encrypt for AES-CTR)
8216 commit 1cb3016635898d287e9d58b50c430995652d5358
8217 Author: jsg@openbsd.org <jsg@openbsd.org>
8218 Date: Wed Mar 11 00:48:39 2015 +0000
8222 add back the changes from rev 1.206, djm reverted this by
8223 mistake in rev 1.207
8225 commit 4d24b3b6a4a6383e05e7da26d183b79fa8663697
8226 Author: Damien Miller <djm@mindrot.org>
8227 Date: Fri Mar 20 09:11:59 2015 +1100
8229 remove error() accidentally inserted for debugging
8231 pointed out by Christian Hesse
8233 commit 9f82e5a9042f2d872e98f48a876fcab3e25dd9bb
8234 Author: Tim Rice <tim@multitalents.net>
8235 Date: Mon Mar 16 22:49:20 2015 -0700
8237 portability fix: Solaris systems may not have a grep that understands -q
8239 commit 8ef691f7d9ef500257a549d0906d78187490668f
8240 Author: Damien Miller <djm@google.com>
8241 Date: Wed Mar 11 10:35:26 2015 +1100
8243 fix compile with clang
8245 commit 4df590cf8dc799e8986268d62019b487a8ed63ad
8246 Author: Damien Miller <djm@google.com>
8247 Date: Wed Mar 11 10:02:39 2015 +1100
8249 make unit tests work for !OPENSSH_HAS_ECC
8251 commit 307bb40277ca2c32e97e61d70d1ed74b571fd6ba
8252 Author: djm@openbsd.org <djm@openbsd.org>
8253 Date: Sat Mar 7 04:41:48 2015 +0000
8257 unbreak for w/SSH1 (default) case; ok markus@ deraadt@
8259 commit b44ee0c998fb4c5f3c3281f2398af5ce42840b6f
8260 Author: Damien Miller <djm@mindrot.org>
8261 Date: Thu Mar 5 18:39:20 2015 -0800
8263 unbreak hostkeys test for w/ SSH1 case
8265 commit 55e5bdeb519cb60cc18b7ba0545be581fb8598b4
8266 Author: djm@openbsd.org <djm@openbsd.org>
8267 Date: Fri Mar 6 01:40:56 2015 +0000
8271 fix sshkey_certify() return value for unsupported key types;
8274 commit be8f658e550a434eac04256bfbc4289457a24e99
8275 Author: Damien Miller <djm@mindrot.org>
8276 Date: Wed Mar 4 15:38:03 2015 -0800
8278 update version numbers to match version.h
8280 commit ac5e8acefa253eb5e5ba186e34236c0e8007afdc
8281 Author: djm@openbsd.org <djm@openbsd.org>
8282 Date: Wed Mar 4 23:22:35 2015 +0000
8286 make these work with !SSH1; ok markus@ deraadt@
8288 commit 2f04af92f036b0c87a23efb259c37da98cd81fe6
8289 Author: djm@openbsd.org <djm@openbsd.org>
8290 Date: Wed Mar 4 21:12:59 2015 +0000
8294 make ssh-add -D work with !SSH1 agent
8296 commit a05adf95d2af6abb2b7826ddaa7a0ec0cdc1726b
8297 Author: Damien Miller <djm@mindrot.org>
8298 Date: Wed Mar 4 00:55:48 2015 -0800
8300 netcat needs poll.h portability goop
8302 commit dad2b1892b4c1b7e58df483a8c5b983c4454e099
8303 Author: markus@openbsd.org <markus@openbsd.org>
8304 Date: Tue Mar 3 22:35:19 2015 +0000
8308 make it possible to run tests w/o ssh1 support; ok djm@
8310 commit d48a22601bdd3eec054794c535f4ae8d8ae4c6e2
8311 Author: djm@openbsd.org <djm@openbsd.org>
8312 Date: Wed Mar 4 18:53:53 2015 +0000
8316 crank; ok markus, deraadt
8318 commit bbffb23daa0b002dd9f296e396a9ab8a5866b339
8319 Author: Damien Miller <djm@mindrot.org>
8320 Date: Tue Mar 3 13:50:27 2015 -0800
8322 more --without-ssh1 fixes
8324 commit 6c2039286f503e2012a58a1d109e389016e7a99b
8325 Author: Damien Miller <djm@mindrot.org>
8326 Date: Tue Mar 3 13:48:48 2015 -0800
8328 fix merge both that broke --without-ssh1 compile
8330 commit 111dfb225478a76f89ecbcd31e96eaf1311b59d3
8331 Author: djm@openbsd.org <djm@openbsd.org>
8332 Date: Tue Mar 3 21:21:13 2015 +0000
8336 add SSH1 Makefile knob to make it easier to build without
8337 SSH1 support; ok markus@
8339 commit 3f7f5e6c5d2aa3f6710289c1a30119e534e56c5c
8340 Author: djm@openbsd.org <djm@openbsd.org>
8341 Date: Tue Mar 3 20:42:49 2015 +0000
8345 expand __unused to full __attribute__ for better portability
8347 commit 2fab9b0f8720baf990c931e3f68babb0bf9949c6
8348 Author: Damien Miller <djm@mindrot.org>
8349 Date: Wed Mar 4 07:41:27 2015 +1100
8353 commit d1bc844322461f882b4fd2277ba9a8d4966573d2
8354 Author: Damien Miller <djm@mindrot.org>
8355 Date: Wed Mar 4 06:31:45 2015 +1100
8357 Revert "define __unused to nothing if not already defined"
8359 This reverts commit 1598419e38afbaa8aa5df8dd6b0af98301e2c908.
8361 Some system headers have objects named __unused
8363 commit 00797e86b2d98334d1bb808f65fa1fd47f328ff1
8364 Author: Damien Miller <djm@mindrot.org>
8365 Date: Wed Mar 4 05:02:45 2015 +1100
8367 check for crypt and DES_crypt in openssl block
8369 fixes builds on systems that use DES_crypt; based on patch
8372 commit 1598419e38afbaa8aa5df8dd6b0af98301e2c908
8373 Author: Damien Miller <djm@mindrot.org>
8374 Date: Wed Mar 4 04:59:13 2015 +1100
8376 define __unused to nothing if not already defined
8378 fixes builds on BSD/OS
8380 commit d608a51daad4f14ad6ab43d7cf74ef4801cc3fe9
8381 Author: djm@openbsd.org <djm@openbsd.org>
8382 Date: Tue Mar 3 17:53:40 2015 +0000
8386 reorder logic for better portability; patch from Roumen
8389 commit 68d2dfc464fbcdf8d6387884260f9801f4352393
8390 Author: djm@openbsd.org <djm@openbsd.org>
8391 Date: Tue Mar 3 06:48:58 2015 +0000
8395 Allow "ssh -Q protocol-version" to list supported SSH
8396 protocol versions. Useful for detecting builds without SSH v.1 support; idea
8399 commit 39e2f1229562e1195169905607bc12290d21f021
8400 Author: millert@openbsd.org <millert@openbsd.org>
8401 Date: Sun Mar 1 15:44:40 2015 +0000
8405 Make sure we only call getnameinfo() for AF_INET or AF_INET6
8406 sockets. getpeername() of a Unix domain socket may return without error on
8407 some systems without actually setting ss_family so getnameinfo() was getting
8408 called with ss_family set to AF_UNSPEC. OK djm@
8410 commit e47536ba9692d271b8ad89078abdecf0a1c11707
8411 Author: Damien Miller <djm@mindrot.org>
8412 Date: Sat Feb 28 08:20:11 2015 -0800
8414 portability fixes for regress/netcat.c
8416 Mostly avoiding "err(1, NULL)"
8418 commit 02973ad5f6f49d8420e50a392331432b0396c100
8419 Author: Damien Miller <djm@mindrot.org>
8420 Date: Sat Feb 28 08:05:27 2015 -0800
8422 twiddle another test for portability
8424 from Tom G. Christensen
8426 commit f7f3116abf2a6e2f309ab096b08c58d19613e5d0
8427 Author: Damien Miller <djm@mindrot.org>
8428 Date: Fri Feb 27 15:52:49 2015 -0800
8430 twiddle test for portability
8432 commit 1ad3a77cc9d5568f5437ff99d377aa7a41859b83
8433 Author: Damien Miller <djm@mindrot.org>
8434 Date: Thu Feb 26 20:33:22 2015 -0800
8436 make regress/netcat.c fd passing (more) portable
8438 commit 9e1cfca7e1fe9cf8edb634fc894e43993e4da1ea
8439 Author: Damien Miller <djm@mindrot.org>
8440 Date: Thu Feb 26 20:32:58 2015 -0800
8442 create OBJ/valgrind-out before running unittests
8444 commit bd58853102cee739f0e115e6d4b5334332ab1442
8445 Author: Damien Miller <djm@mindrot.org>
8446 Date: Wed Feb 25 16:58:22 2015 -0800
8450 commit f43d17269194761eded9e89f17456332f4c83824
8451 Author: djm@openbsd.org <djm@openbsd.org>
8452 Date: Thu Feb 26 20:45:47 2015 +0000
8456 don't printf NULL key comments; reported by Tom Christensen
8458 commit 6e6458b476ec854db33e3e68ebf4f489d0ab3df8
8459 Author: djm@openbsd.org <djm@openbsd.org>
8460 Date: Wed Feb 25 23:05:47 2015 +0000
8464 zero cmsgbuf before use; we initialise the bits we use
8465 but valgrind still spams warning on it
8467 commit a63cfa26864b93ab6afefad0b630e5358ed8edfa
8468 Author: djm@openbsd.org <djm@openbsd.org>
8469 Date: Wed Feb 25 19:54:02 2015 +0000
8473 fix small memory leak when UpdateHostkeys=no
8475 commit e6b950341dd75baa8526f1862bca39e52f5b879b
8476 Author: Tim Rice <tim@multitalents.net>
8477 Date: Wed Feb 25 09:56:48 2015 -0800
8479 Revert "Work around finicky USL linker so netcat will build."
8481 This reverts commit d1db656021d0cd8c001a6692f772f1de29b67c8b.
8483 No longer needed with commit 678e473e2af2e4802f24dd913985864d9ead7fb3
8485 commit 6f621603f9cff2a5d6016a404c96cb2f8ac2dec0
8486 Author: djm@openbsd.org <djm@openbsd.org>
8487 Date: Wed Feb 25 17:29:38 2015 +0000
8491 don't leak validity of user in "too many authentication
8492 failures" disconnect message; reported by Sebastian Reitenbach
8494 commit 6288e3a935494df12519164f52ca5c8c65fc3ca5
8495 Author: naddy@openbsd.org <naddy@openbsd.org>
8496 Date: Tue Feb 24 15:24:05 2015 +0000
8500 add -v (show ASCII art) to -l's synopsis; ok djm@
8502 commit 678e473e2af2e4802f24dd913985864d9ead7fb3
8503 Author: Darren Tucker <dtucker@zip.com.au>
8504 Date: Thu Feb 26 04:12:58 2015 +1100
8506 Remove dependency on xmalloc.
8508 Remove ssh_get_progname's dependency on xmalloc, which should reduce
8509 link order problems. ok djm@
8511 commit 5d5ec165c5b614b03678afdad881f10e25832e46
8512 Author: Darren Tucker <dtucker@zip.com.au>
8513 Date: Wed Feb 25 15:32:49 2015 +1100
8515 Restrict ECDSA and ECDH tests.
8517 ifdef out some more ECDSA and ECDH tests when built against an OpenSSL
8518 that does not have eliptic curve functionality.
8520 commit 1734e276d99b17e92d4233fac7aef3a3180aaca7
8521 Author: Darren Tucker <dtucker@zip.com.au>
8522 Date: Wed Feb 25 13:40:45 2015 +1100
8524 Move definition of _NSIG.
8526 _NSIG is only unsed in one file, so move it there prevent redefinition
8527 warnings reported by Kevin Brott.
8529 commit a47ead7c95cfbeb72721066c4da2312e5b1b9f3d
8530 Author: Darren Tucker <dtucker@zip.com.au>
8531 Date: Wed Feb 25 13:17:40 2015 +1100
8533 Add includes.h for compatibility stuff.
8535 commit 38806bda6d2e48ad32812b461eebe17672ada771
8536 Author: Damien Miller <djm@mindrot.org>
8537 Date: Tue Feb 24 16:50:06 2015 -0800
8539 include netdb.h to look for MAXHOSTNAMELEN; ok tim
8541 commit d1db656021d0cd8c001a6692f772f1de29b67c8b
8542 Author: Tim Rice <tim@multitalents.net>
8543 Date: Tue Feb 24 10:42:08 2015 -0800
8545 Work around finicky USL linker so netcat will build.
8547 commit cb030ce25f555737e8ba97bdd7883ac43f3ff2a3
8548 Author: Damien Miller <djm@mindrot.org>
8549 Date: Tue Feb 24 09:23:04 2015 -0800
8551 include includes.h to avoid build failure on AIX
8553 commit 13af342458f5064144abbb07e5ac9bbd4eb42567
8554 Author: Tim Rice <tim@multitalents.net>
8555 Date: Tue Feb 24 07:56:47 2015 -0800
8557 Original portability patch from djm@ for platforms missing err.h.
8558 Fix name space clash on Solaris 10. Still more to do for Solaris 10
8559 to deal with msghdr structure differences. ok djm@
8561 commit 910209203d0cd60c5083901cbcc0b7b44d9f48d2
8562 Author: Tim Rice <tim@multitalents.net>
8563 Date: Mon Feb 23 22:06:56 2015 -0800
8565 cleaner way fix dispatch.h portion of commit
8566 a88dd1da119052870bb2654c1a32c51971eade16
8567 (some systems have sig_atomic_t in signal.h, some in sys/signal.h)
8568 Sounds good to me djm@
8570 commit 676c38d7cbe65b76bbfff796861bb6615cc6a596
8571 Author: Tim Rice <tim@multitalents.net>
8572 Date: Mon Feb 23 21:51:33 2015 -0800
8574 portability fix: if we can't dind a better define for HOST_NAME_MAX, use 255
8576 commit 1221b22023dce38cbc90ba77eae4c5d78c77a5e6
8577 Author: Tim Rice <tim@multitalents.net>
8578 Date: Mon Feb 23 21:50:34 2015 -0800
8580 portablity fix: s/__inline__/inline/
8582 commit 4c356308a88d309c796325bb75dce90ca16591d5
8583 Author: Darren Tucker <dtucker@zip.com.au>
8584 Date: Tue Feb 24 13:49:31 2015 +1100
8586 Wrap stdint.h includes in HAVE_STDINT_H.
8588 commit c9c88355c6a27a908e7d1e5003a2b35ea99c1614
8589 Author: Darren Tucker <dtucker@zip.com.au>
8590 Date: Tue Feb 24 13:43:57 2015 +1100
8592 Add AI_NUMERICSERV to fake-rfc2553.
8594 Our getaddrinfo implementation always returns numeric values already.
8596 commit ef342ab1ce6fb9a4b30186c89c309d0ae9d0eeb4
8597 Author: Darren Tucker <dtucker@zip.com.au>
8598 Date: Tue Feb 24 13:39:57 2015 +1100
8600 Include OpenSSL's objects.h before bn.h.
8602 Prevents compile errors on some platforms (at least old GCCs and AIX's
8605 commit dcc8997d116f615195aa7c9ec019fb36c28c6228
8606 Author: Darren Tucker <dtucker@zip.com.au>
8607 Date: Tue Feb 24 12:30:59 2015 +1100
8609 Convert two macros into functions.
8611 Convert packet_send_debug and packet_disconnect from macros to
8612 functions. Some older GCCs (2.7.x, 2.95.x) see to have problems with
8613 variadic macros with only one argument so we convert these two into
8616 commit 2285c30d51b7e2052c6526445abe7e7cc7e170a1
8617 Author: djm@openbsd.org <djm@openbsd.org>
8618 Date: Mon Feb 23 22:21:21 2015 +0000
8622 further silence spurious error message even when -v is
8623 specified (e.g. to get visual host keys); reported by naddy@
8625 commit 9af21979c00652029e160295e988dea40758ece2
8626 Author: Damien Miller <djm@mindrot.org>
8627 Date: Tue Feb 24 09:04:32 2015 +1100
8629 don't include stdint.h unless HAVE_STDINT_H set
8631 commit 62f678dd51660d6f8aee1da33d3222c5de10a89e
8632 Author: Damien Miller <djm@mindrot.org>
8633 Date: Tue Feb 24 09:02:54 2015 +1100
8635 nother sys/queue.h -> sys-queue.h fix
8637 spotted by Tom Christensen
8639 commit b3c19151cba2c0ed01b27f55de0d723ad07ca98f
8640 Author: djm@openbsd.org <djm@openbsd.org>
8641 Date: Mon Feb 23 20:32:15 2015 +0000
8645 fix a race condition by using a mux socket rather than an
8646 ineffectual wait statement
8648 commit a88dd1da119052870bb2654c1a32c51971eade16
8649 Author: Damien Miller <djm@mindrot.org>
8650 Date: Tue Feb 24 06:30:29 2015 +1100
8652 various include fixes for portable
8654 commit 5248429b5ec524d0a65507cff0cdd6e0cb99effd
8655 Author: djm@openbsd.org <djm@openbsd.org>
8656 Date: Mon Feb 23 16:55:51 2015 +0000
8660 add an XXX to remind me to improve sshkey_load_public
8662 commit e94e4b07ef2eaead38b085a60535df9981cdbcdb
8663 Author: djm@openbsd.org <djm@openbsd.org>
8664 Date: Mon Feb 23 16:55:31 2015 +0000
8668 silence a spurious error message when listing
8669 fingerprints for known_hosts; bz#2342
8671 commit f2293a65392b54ac721f66bc0b44462e8d1d81f8
8672 Author: djm@openbsd.org <djm@openbsd.org>
8673 Date: Mon Feb 23 16:33:25 2015 +0000
8677 fix setting/clearing of TTY raw mode around
8678 UpdateHostKeys=ask confirmation question; reported by Herb Goldman
8680 commit f2004cd1adf34492eae0a44b1ef84e0e31b06088
8681 Author: Darren Tucker <dtucker@zip.com.au>
8682 Date: Mon Feb 23 05:04:21 2015 +1100
8684 Repair for non-ECC OpenSSL.
8686 Ifdef out the ECC parts when building with an OpenSSL that doesn't have
8689 commit 37f9220db8d1a52c75894c3de1e5f2ae5bd71b6f
8690 Author: Darren Tucker <dtucker@zip.com.au>
8691 Date: Mon Feb 23 03:07:24 2015 +1100
8693 Wrap stdint.h includes in ifdefs.
8695 commit f81f1bbc5b892c8614ea740b1f92735652eb43f0
8696 Author: Tim Rice <tim@multitalents.net>
8697 Date: Sat Feb 21 18:12:10 2015 -0800
8699 out of tree build fix
8701 commit 2e13a1e4d22f3b503c3bfc878562cc7386a1d1ae
8702 Author: Tim Rice <tim@multitalents.net>
8703 Date: Sat Feb 21 18:08:51 2015 -0800
8705 mkdir kex unit test directory so testing out of tree builds works
8707 commit 1797f49b1ba31e8700231cd6b1d512d80bb50d2c
8708 Author: halex@openbsd.org <halex@openbsd.org>
8709 Date: Sat Feb 21 21:46:57 2015 +0000
8713 make "ssh-add -d" properly remove a corresponding
8714 certificate, and also not whine and fail if there is none
8718 commit 7faaa32da83a609059d95dbfcb0649fdb04caaf6
8719 Author: Damien Miller <djm@mindrot.org>
8720 Date: Sun Feb 22 07:57:27 2015 +1100
8722 mkdir hostkey and bitmap unit test directories
8724 commit bd49da2ef197efac5e38f5399263a8b47990c538
8725 Author: djm@openbsd.org <djm@openbsd.org>
8726 Date: Fri Feb 20 23:46:01 2015 +0000
8730 sort options useable under Match case-insensitively; prodded
8733 commit 1a779a0dd6cd8b4a1a40ea33b5415ab8408128ac
8734 Author: djm@openbsd.org <djm@openbsd.org>
8735 Date: Sat Feb 21 20:51:02 2015 +0000
8739 correct paths to configuration files being written/updated;
8740 they live in $OBJ not cwd; some by Roumen Petrov
8742 commit 28ba006c1acddff992ae946d0bc0b500b531ba6b
8743 Author: Darren Tucker <dtucker@zip.com.au>
8744 Date: Sat Feb 21 15:41:07 2015 +1100
8746 More correct checking of HAVE_DECL_AI_NUMERICSERV.
8748 commit e50e8c97a9cecae1f28febccaa6ca5ab3bc10f54
8749 Author: Darren Tucker <dtucker@zip.com.au>
8750 Date: Sat Feb 21 15:10:33 2015 +1100
8752 Add null declaration of AI_NUMERICINFO.
8754 Some platforms (older FreeBSD and DragonFly versions) do have
8755 getaddrinfo() but do not have AI_NUMERICINFO. so define it to zero
8758 commit 18a208d6a460d707a45916db63a571e805f5db46
8759 Author: djm@openbsd.org <djm@openbsd.org>
8760 Date: Fri Feb 20 22:40:32 2015 +0000
8764 more options that are available under Match; bz#2353 reported
8765 by calestyo AT scientia.net
8767 commit 44732de06884238049f285f1455b2181baa7dc82
8768 Author: djm@openbsd.org <djm@openbsd.org>
8769 Date: Fri Feb 20 22:17:21 2015 +0000
8773 UpdateHostKeys fixes:
8775 I accidentally changed the format of the hostkeys@openssh.com messages
8776 last week without changing the extension name, and this has been causing
8777 connection failures for people who are running -current. First reported
8780 s/hostkeys@openssh.com/hostkeys-00@openssh.com/
8781 Change the name of the proof message too, and reorder it a little.
8783 Also, UpdateHostKeys=ask is incompatible with ControlPersist (no TTY
8784 available to read the response) so disable UpdateHostKeys if it is in
8785 ask mode and ControlPersist is active (and document this)
8787 commit 13a39414d25646f93e6d355521d832a03aaaffe2
8788 Author: djm@openbsd.org <djm@openbsd.org>
8789 Date: Tue Feb 17 00:14:05 2015 +0000
8793 Regression: I broke logging of public key fingerprints in
8794 1.46. Pointed out by Pontus Lundkvist
8796 commit 773dda25e828c4c9a52f7bdce6e1e5924157beab
8797 Author: Damien Miller <djm@mindrot.org>
8798 Date: Fri Jan 30 23:10:17 2015 +1100
8800 repair --without-openssl; broken in refactor
8802 commit e89c780886b23600de1e1c8d74aabd1ff61f43f0
8803 Author: Damien Miller <djm@google.com>
8804 Date: Tue Feb 17 10:04:55 2015 +1100
8806 hook up hostkeys unittest to portable Makefiles
8808 commit 0abf41f99aa16ff09b263bead242d6cb2dbbcf99
8809 Author: djm@openbsd.org <djm@openbsd.org>
8810 Date: Mon Feb 16 22:21:03 2015 +0000
8814 enable hostkeys unit tests
8816 commit 68a5d647ccf0fb6782b2f749433a1eee5bc9044b
8817 Author: djm@openbsd.org <djm@openbsd.org>
8818 Date: Mon Feb 16 22:20:50 2015 +0000
8822 check string/memory compare arguments aren't NULL
8824 commit ef575ef20d09f20722e26b45dab80b3620469687
8825 Author: djm@openbsd.org <djm@openbsd.org>
8826 Date: Mon Feb 16 22:18:34 2015 +0000
8830 unit tests for hostfile.c code, just hostkeys_foreach so
8833 commit 8ea3365e6aa2759ccf5c76eaea62cbc8a280b0e7
8834 Author: markus@openbsd.org <markus@openbsd.org>
8835 Date: Sat Feb 14 12:43:16 2015 +0000
8839 test server rekey limit
8841 commit ce63c4b063c39b2b22d4ada449c9e3fbde788cb3
8842 Author: djm@openbsd.org <djm@openbsd.org>
8843 Date: Mon Feb 16 22:30:03 2015 +0000
8850 date: 2015/01/31 20:30:05; author: djm; state: Exp; lines: +17 -10; commitid
8852 Let sshd load public host keys even when private keys are missing.
8853 Allows sshd to advertise additional keys for future key rotation.
8854 Also log fingerprint of hostkeys loaded; ok markus@
8856 hostkey updates now require access to the private key, so we can't
8857 load public keys only. The improved log messages (fingerprints of keys
8860 commit 523463a3a2a9bfc6cfc5afa01bae9147f76a37cc
8861 Author: djm@openbsd.org <djm@openbsd.org>
8862 Date: Mon Feb 16 22:13:32 2015 +0000
8866 Revise hostkeys@openssh.com hostkey learning extension.
8868 The client will not ask the server to prove ownership of the private
8869 halves of any hitherto-unseen hostkeys it offers to the client.
8871 Allow UpdateHostKeys option to take an 'ask' argument to let the
8872 user manually review keys offered.
8876 commit 6c5c949782d86a6e7d58006599c7685bfcd01685
8877 Author: djm@openbsd.org <djm@openbsd.org>
8878 Date: Mon Feb 16 22:08:57 2015 +0000
8882 Refactor hostkeys_foreach() and dependent code Deal with
8883 IP addresses (i.e. CheckHostIP) Don't clobber known_hosts when nothing
8884 changed ok markus@ as part of larger commit
8886 commit 51b082ccbe633dc970df1d1f4c9c0497115fe721
8887 Author: miod@openbsd.org <miod@openbsd.org>
8888 Date: Mon Feb 16 18:26:26 2015 +0000
8892 Declare ge25519_base as extern, to prevent it from
8893 becoming a common. Gets us rid of ``lignment 4 of symbol
8894 `crypto_sign_ed25519_ref_ge25519_base' in mod_ge25519.o is smaller than 16 in
8895 mod_ed25519.o'' warnings at link time.
8897 commit 02db468bf7e3281a8e3c058ced571b38b6407c34
8898 Author: markus@openbsd.org <markus@openbsd.org>
8899 Date: Fri Feb 13 18:57:00 2015 +0000
8903 make rekey_limit for sshd w/privsep work; ok djm@
8906 commit 8ec67d505bd23c8bf9e17b7a364b563a07a58ec8
8907 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8908 Date: Thu Feb 12 20:34:19 2015 +0000
8912 Prevent sshd spamming syslog with
8913 "ssh_dispatch_run_fatal: disconnected". ok markus@
8915 commit d4c0295d1afc342057ba358237acad6be8af480b
8916 Author: djm@openbsd.org <djm@openbsd.org>
8917 Date: Wed Feb 11 01:20:38 2015 +0000
8921 Some packet error messages show the address of the peer,
8922 but might be generated after the socket to the peer has suffered a TCP reset.
8923 In these cases, getpeername() won't work so cache the address earlier.
8925 spotted in the wild via deraadt@ and tedu@
8927 commit 4af1709cf774475ce5d1bc3ddcc165f6c222897d
8928 Author: jsg@openbsd.org <jsg@openbsd.org>
8929 Date: Mon Feb 9 23:22:37 2015 +0000
8933 fix some leaks in error paths ok markus@
8935 commit fd36834871d06a03e1ff8d69e41992efa1bbf85f
8936 Author: millert@openbsd.org <millert@openbsd.org>
8937 Date: Fri Feb 6 23:21:59 2015 +0000
8941 SIZE_MAX is standard, we should be using it in preference to
8942 the obsolete SIZE_T_MAX. OK miod@ beck@
8944 commit 1910a286d7771eab84c0b047f31c0a17505236fa
8945 Author: millert@openbsd.org <millert@openbsd.org>
8946 Date: Thu Feb 5 12:59:57 2015 +0000
8950 Include stdint.h, not limits.h to get SIZE_MAX. OK guenther@
8952 commit ce4f59b2405845584f45e0b3214760eb0008c06c
8953 Author: deraadt@openbsd.org <deraadt@openbsd.org>
8954 Date: Tue Feb 3 08:07:20 2015 +0000
8958 missing ; djm and mlarkin really having great
8959 interactions recently
8961 commit 5d34aa94938abb12b877a25be51862757f25d54b
8962 Author: halex@openbsd.org <halex@openbsd.org>
8963 Date: Tue Feb 3 00:34:14 2015 +0000
8967 slightly extend the passphrase prompt if running with -c
8968 in order to give the user a chance to notice if unintentionally running
8971 wording tweak and ok djm@
8973 commit cb3bde373e80902c7d5d0db429f85068d19b2918
8974 Author: djm@openbsd.org <djm@openbsd.org>
8975 Date: Mon Feb 2 22:48:53 2015 +0000
8979 handle PKCS#11 C_Login returning
8980 CKR_USER_ALREADY_LOGGED_IN; based on patch from Yuri Samoilenko; ok markus@
8982 commit 15ad750e5ec3cc69765b7eba1ce90060e7083399
8983 Author: djm@openbsd.org <djm@openbsd.org>
8984 Date: Mon Feb 2 07:41:40 2015 +0000
8988 turn UpdateHostkeys off by default until I figure out
8989 mlarkin@'s warning message; requested by deraadt@
8991 commit 3cd5103c1e1aaa59bd66f7f52f6ebbcd5deb12f9
8992 Author: deraadt@openbsd.org <deraadt@openbsd.org>
8993 Date: Mon Feb 2 01:57:44 2015 +0000
8997 increasing encounters with difficult DNS setups in
8998 darknets has convinced me UseDNS off by default is better ok djm
9000 commit 6049a548a8a68ff0bbe581ab1748ea6a59ecdc38
9001 Author: djm@openbsd.org <djm@openbsd.org>
9002 Date: Sat Jan 31 20:30:05 2015 +0000
9006 Let sshd load public host keys even when private keys are
9007 missing. Allows sshd to advertise additional keys for future key rotation.
9008 Also log fingerprint of hostkeys loaded; ok markus@
9010 commit 46347ed5968f582661e8a70a45f448e0179ca0ab
9011 Author: djm@openbsd.org <djm@openbsd.org>
9012 Date: Fri Jan 30 11:43:14 2015 +0000
9016 Add a ssh_config HostbasedKeyType option to control which
9017 host public key types are tried during hostbased authentication.
9019 This may be used to prevent too many keys being sent to the server,
9020 and blowing past its MaxAuthTries limit.
9022 bz#2211 based on patch by Iain Morgan; ok markus@
9024 commit 802660cb70453fa4d230cb0233bc1bbdf8328de1
9025 Author: djm@openbsd.org <djm@openbsd.org>
9026 Date: Fri Jan 30 10:44:49 2015 +0000
9030 set a timeout to prevent hangs when talking to busted
9033 commit 86936ec245a15c7abe71a0722610998b0a28b194
9034 Author: djm@openbsd.org <djm@openbsd.org>
9035 Date: Fri Jan 30 01:11:39 2015 +0000
9039 regression test for 'wildcard CA' serial/key ID revocations
9041 commit 4509b5d4a4fa645a022635bfa7e86d09b285001f
9042 Author: djm@openbsd.org <djm@openbsd.org>
9043 Date: Fri Jan 30 01:13:33 2015 +0000
9047 avoid more fatal/exit in the packet.c paths that
9048 ssh-keyscan uses; feedback and "looks good" markus@
9050 commit 669aee994348468af8b4b2ebd29b602cf2860b22
9051 Author: djm@openbsd.org <djm@openbsd.org>
9052 Date: Fri Jan 30 01:10:33 2015 +0000
9056 permit KRLs that revoke certificates by serial number or
9057 key ID without scoping to a particular CA; ok markus@
9059 commit 7a2c368477e26575d0866247d3313da4256cb2b5
9060 Author: djm@openbsd.org <djm@openbsd.org>
9061 Date: Fri Jan 30 00:59:19 2015 +0000
9065 missing parentheses after if in do_convert_from() broke
9066 private key conversion from other formats some time in 2010; bz#2345 reported
9067 by jjelen AT redhat.com
9069 commit 25f5f78d8bf5c22d9cea8b49de24ebeee648a355
9070 Author: djm@openbsd.org <djm@openbsd.org>
9071 Date: Fri Jan 30 00:22:25 2015 +0000
9075 fix ssh protocol 1, spotted by miod@
9077 commit 9ce86c926dfa6e0635161b035e3944e611cbccf0
9078 Author: djm@openbsd.org <djm@openbsd.org>
9079 Date: Wed Jan 28 22:36:00 2015 +0000
9083 update to new API (key_fingerprint => sshkey_fingerprint)
9084 check sshkey_fingerprint return values; ok markus
9086 commit 9125525c37bf73ad3ee4025520889d2ce9d10f29
9087 Author: djm@openbsd.org <djm@openbsd.org>
9088 Date: Wed Jan 28 22:05:31 2015 +0000
9092 avoid fatal() calls in packet code makes ssh-keyscan more
9093 reliable against server failures ok dtucker@ markus@
9095 commit fae7bbe544cba7a9e5e4ab47ff6faa3d978646eb
9096 Author: djm@openbsd.org <djm@openbsd.org>
9097 Date: Wed Jan 28 21:15:47 2015 +0000
9101 avoid fatal() calls in packet code makes ssh-keyscan more
9102 reliable against server failures ok dtucker@ markus@
9104 commit 1a3d14f6b44a494037c7deab485abe6496bf2c60
9105 Author: djm@openbsd.org <djm@openbsd.org>
9106 Date: Wed Jan 28 11:07:25 2015 +0000
9110 remove obsolete comment
9112 commit 80c25b7bc0a71d75c43a4575d9a1336f589eb639
9113 Author: okan@openbsd.org <okan@openbsd.org>
9114 Date: Tue Jan 27 12:54:06 2015 +0000
9118 Since r1.2 removed the use of PRI* macros, inttypes.h is
9123 commit 69ff64f69615c2a21c97cb5878a0996c21423257
9124 Author: Damien Miller <djm@mindrot.org>
9125 Date: Tue Jan 27 23:07:43 2015 +1100
9127 compile on systems without TCP_MD5SIG (e.g. OSX)
9129 commit 358964f3082fb90b2ae15bcab07b6105cfad5a43
9130 Author: Damien Miller <djm@mindrot.org>
9131 Date: Tue Jan 27 23:07:25 2015 +1100
9133 use ssh-keygen under test rather than system's
9135 commit a2c95c1bf33ea53038324d1fdd774bc953f98236
9136 Author: Damien Miller <djm@mindrot.org>
9137 Date: Tue Jan 27 23:06:59 2015 +1100
9139 OSX lacks HOST_NAME_MAX, has _POSIX_HOST_NAME_MAX
9141 commit ade31d7b6f608a19b85bee29a7a00b1e636a2919
9142 Author: Damien Miller <djm@mindrot.org>
9143 Date: Tue Jan 27 23:06:23 2015 +1100
9145 these need active_state defined to link on OSX
9147 temporary measure until active_state goes away entirely
9149 commit e56aa87502f22c5844918c10190e8b4f785f067b
9150 Author: djm@openbsd.org <djm@openbsd.org>
9151 Date: Tue Jan 27 12:01:36 2015 +0000
9155 use printf instead of echo -n to reduce diff against
9158 commit 9f7637f56eddfaf62ce3c0af89c25480f2cf1068
9159 Author: jmc@openbsd.org <jmc@openbsd.org>
9160 Date: Mon Jan 26 13:55:29 2015 +0000
9166 commit 3076ee7d530d5b16842fac7a6229706c7e5acd26
9167 Author: djm@openbsd.org <djm@openbsd.org>
9168 Date: Mon Jan 26 13:36:53 2015 +0000
9172 properly restore umask
9174 commit d411d395556b73ba1b9e451516a0bd6697c4b03d
9175 Author: djm@openbsd.org <djm@openbsd.org>
9176 Date: Mon Jan 26 06:12:18 2015 +0000
9180 regression test for host key rotation
9182 commit fe8a3a51699afbc6407a8fae59b73349d01e49f8
9183 Author: djm@openbsd.org <djm@openbsd.org>
9184 Date: Mon Jan 26 06:11:28 2015 +0000
9188 adapt to sshkey API tweaks
9190 commit 7dd355fb1f0038a3d5cdca57ebab4356c7a5b434
9191 Author: miod@openbsd.org <miod@openbsd.org>
9192 Date: Sat Jan 24 10:39:21 2015 +0000
9196 Move -lz late in the linker commandline for things to
9197 build on static arches.
9199 commit 0dad3b806fddb93c475b30853b9be1a25d673a33
9200 Author: miod@openbsd.org <miod@openbsd.org>
9201 Date: Fri Jan 23 21:21:23 2015 +0000
9205 -Wpointer-sign is supported by gcc 4 only.
9207 commit 2b3b1c1e4bd9577b6e780c255c278542ea66c098
9208 Author: djm@openbsd.org <djm@openbsd.org>
9209 Date: Tue Jan 20 22:58:57 2015 +0000
9213 use SUBDIR to recuse into unit tests; makes "make obj"
9216 commit 1d1092bff8db27080155541212b420703f8b9c92
9217 Author: djm@openbsd.org <djm@openbsd.org>
9218 Date: Mon Jan 26 12:16:36 2015 +0000
9222 correct description of UpdateHostKeys in ssh_config.5 and
9223 add it to -o lists for ssh, scp and sftp; pointed out by jmc@
9225 commit 5104db7cbd6cdd9c5971f4358e74414862fc1022
9226 Author: djm@openbsd.org <djm@openbsd.org>
9227 Date: Mon Jan 26 06:10:03 2015 +0000
9231 correctly match ECDSA subtype (== curve) for
9232 offered/recevied host keys. Fixes connection-killing host key mismatches when
9233 a server offers multiple ECDSA keys with different curve type (an extremely
9234 unlikely configuration).
9236 ok markus, "looks mechanical" deraadt@
9238 commit 8d4f87258f31cb6def9b3b55b6a7321d84728ff2
9239 Author: djm@openbsd.org <djm@openbsd.org>
9240 Date: Mon Jan 26 03:04:45 2015 +0000
9244 Host key rotation support.
9246 Add a hostkeys@openssh.com protocol extension (global request) for
9247 a server to inform a client of all its available host key after
9248 authentication has completed. The client may record the keys in
9249 known_hosts, allowing it to upgrade to better host key algorithms
9250 and a server to gracefully rotate its keys.
9252 The client side of this is controlled by a UpdateHostkeys config
9253 option (default on).
9257 commit 60b1825262b1f1e24fc72050b907189c92daf18e
9258 Author: djm@openbsd.org <djm@openbsd.org>
9259 Date: Mon Jan 26 02:59:11 2015 +0000
9263 small refactor and add some convenience functions; ok
9266 commit a5a3e3328ddce91e76f71ff479022d53e35c60c9
9267 Author: jmc@openbsd.org <jmc@openbsd.org>
9268 Date: Thu Jan 22 21:00:42 2015 +0000
9272 heirarchy -> hierarchy;
9274 commit dcff5810a11195c57e1b3343c0d6b6f2b9974c11
9275 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9276 Date: Thu Jan 22 20:24:41 2015 +0000
9280 Provide a warning about chroot misuses (which sadly, seem
9281 to have become quite popular because shiny). sshd cannot detect/manage/do
9282 anything about these cases, best we can do is warn in the right spot in the
9285 commit 087266ec33c76fc8d54ac5a19efacf2f4a4ca076
9286 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9287 Date: Tue Jan 20 23:14:00 2015 +0000
9291 Reduce use of <sys/param.h> and transition to <limits.h>
9292 throughout. ok djm markus
9294 commit 57e783c8ba2c0797f93977e83b2a8644a03065d8
9295 Author: markus@openbsd.org <markus@openbsd.org>
9296 Date: Tue Jan 20 20:16:21 2015 +0000
9300 kex_setup errors are fatal()
9302 commit 1d6424a6ff94633c221297ae8f42d54e12a20912
9303 Author: djm@openbsd.org <djm@openbsd.org>
9304 Date: Tue Jan 20 08:02:33 2015 +0000
9308 this test would accidentally delete agent.sh if run without
9311 commit 12b5f50777203e12575f1b08568281e447249ed3
9312 Author: djm@openbsd.org <djm@openbsd.org>
9313 Date: Tue Jan 20 07:56:44 2015 +0000
9317 make this compile with KERBEROS5 enabled
9319 commit e2cc6bef08941256817d44d146115b3478586ad4
9320 Author: djm@openbsd.org <djm@openbsd.org>
9321 Date: Tue Jan 20 07:55:33 2015 +0000
9325 fix hostkeys in agent; ok markus@
9327 commit 1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1
9328 Author: Damien Miller <djm@mindrot.org>
9329 Date: Tue Jan 20 10:11:31 2015 +1100
9333 commit c78a578107c7e6dcf5d30a2f34cb6581bef14029
9334 Author: markus@openbsd.org <markus@openbsd.org>
9335 Date: Mon Jan 19 20:45:25 2015 +0000
9339 finally enable the KEX tests I wrote some years ago...
9341 commit 31821d7217e686667d04935aeec99e1fc4a46e7e
9342 Author: markus@openbsd.org <markus@openbsd.org>
9343 Date: Mon Jan 19 20:42:31 2015 +0000
9347 adapt to new error message (SSH_ERR_MAC_INVALID)
9349 commit d3716ca19e510e95d956ae14d5b367e364bff7f1
9350 Author: djm@openbsd.org <djm@openbsd.org>
9351 Date: Mon Jan 19 17:31:13 2015 +0000
9355 this test was broken in at least two ways, such that it
9356 wasn't checking that a KRL was not excluding valid keys
9358 commit 3f797653748e7c2b037dacb57574c01d9ef3b4d3
9359 Author: markus@openbsd.org <markus@openbsd.org>
9360 Date: Mon Jan 19 20:32:39 2015 +0000
9364 switch ssh-keyscan from setjmp to multiple ssh transport
9365 layer instances ok djm@
9367 commit f582f0e917bb0017b00944783cd5f408bf4b0b5e
9368 Author: markus@openbsd.org <markus@openbsd.org>
9369 Date: Mon Jan 19 20:30:23 2015 +0000
9373 add experimental api for packet layer; ok djm@
9375 commit 48b3b2ba75181f11fca7f327058a591f4426cade
9376 Author: markus@openbsd.org <markus@openbsd.org>
9377 Date: Mon Jan 19 20:20:20 2015 +0000
9381 store compat flags in struct ssh; ok djm@
9383 commit 57d10cbe861a235dd269c74fb2fe248469ecee9d
9384 Author: markus@openbsd.org <markus@openbsd.org>
9385 Date: Mon Jan 19 20:16:15 2015 +0000
9389 adapt kex to sshbuf and struct ssh; ok djm@
9391 commit 3fdc88a0def4f86aa88a5846ac079dc964c0546a
9392 Author: markus@openbsd.org <markus@openbsd.org>
9393 Date: Mon Jan 19 20:07:45 2015 +0000
9397 move dispatch to struct ssh; ok djm@
9399 commit 091c302829210c41e7f57c3f094c7b9c054306f0
9400 Author: markus@openbsd.org <markus@openbsd.org>
9401 Date: Mon Jan 19 19:52:16 2015 +0000
9405 update packet.c & isolate, introduce struct ssh a) switch
9406 packet.c to buffer api and isolate per-connection info into struct ssh b)
9407 (de)serialization of the state is moved from monitor to packet.c c) the old
9408 packet.c API is implemented in opacket.[ch] d) compress.c/h is removed and
9409 integrated into packet.c with and ok djm@
9411 commit 4e62cc68ce4ba20245d208b252e74e91d3785b74
9412 Author: djm@openbsd.org <djm@openbsd.org>
9413 Date: Mon Jan 19 17:35:48 2015 +0000
9417 fix format strings in (disabled) debugging
9419 commit d85e06245907d49a2cd0cfa0abf59150ad616f42
9420 Author: djm@openbsd.org <djm@openbsd.org>
9421 Date: Mon Jan 19 06:01:32 2015 +0000
9425 be a bit more careful in these tests to ensure that
9426 known_hosts is clean
9428 commit 7947810eab5fe0ad311f32a48f4d4eb1f71be6cf
9429 Author: djm@openbsd.org <djm@openbsd.org>
9430 Date: Sun Jan 18 22:00:18 2015 +0000
9434 regression test for known_host file editing using
9435 ssh-keygen (-H / -R / -F) after hostkeys_foreach() change; feedback and ok
9438 commit 3a2b09d147a565d8a47edf37491e149a02c0d3a3
9439 Author: djm@openbsd.org <djm@openbsd.org>
9440 Date: Sun Jan 18 19:54:46 2015 +0000
9444 more and better key tests
9446 test signatures and verification
9447 test certificate generation
9448 flesh out nested cert test
9450 removes most of the XXX todo markers
9452 commit 589e69fd82724cfc9738f128e4771da2e6405d0d
9453 Author: djm@openbsd.org <djm@openbsd.org>
9454 Date: Sun Jan 18 19:53:58 2015 +0000
9458 make the signature fuzzing test much more rigorous:
9459 ensure that the fuzzed input cases do not match the original (using new
9460 fuzz_matches_original() function) and check that the verification fails in
9463 commit 80603c0daa2538c349c1c152405580b164d5475f
9464 Author: djm@openbsd.org <djm@openbsd.org>
9465 Date: Sun Jan 18 19:52:44 2015 +0000
9469 add a fuzz_matches_original() function to the fuzzer to
9470 detect fuzz cases that are identical to the original data. Hacky
9471 implementation, but very useful when you need the fuzz to be different, e.g.
9472 when verifying signature
9474 commit 87d5495bd337e358ad69c524fcb9495208c0750b
9475 Author: djm@openbsd.org <djm@openbsd.org>
9476 Date: Sun Jan 18 19:50:55 2015 +0000
9480 better dumps from the fuzzer (shown on errors) -
9481 include the original data as well as the fuzzed copy.
9483 commit d59ec478c453a3fff05badbbfd96aa856364f2c2
9484 Author: djm@openbsd.org <djm@openbsd.org>
9485 Date: Sun Jan 18 19:47:55 2015 +0000
9489 enable hostkey-agent.sh test
9491 commit 26b3425170bf840e4b095e1c10bf25a0a3e3a105
9492 Author: djm@openbsd.org <djm@openbsd.org>
9493 Date: Sat Jan 17 18:54:30 2015 +0000
9497 unit test for hostkeys in ssh-agent
9499 commit 9e06a0fb23ec55d9223b26a45bb63c7649e2f2f2
9500 Author: markus@openbsd.org <markus@openbsd.org>
9501 Date: Thu Jan 15 23:41:29 2015 +0000
9507 commit d2099dec6da21ae627f6289aedae6bc1d41a22ce
9508 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9509 Date: Mon Jan 19 00:32:54 2015 +0000
9513 djm, your /usr/include tree is old
9515 commit 2b3c3c76c30dc5076fe09d590f5b26880f148a54
9516 Author: djm@openbsd.org <djm@openbsd.org>
9517 Date: Sun Jan 18 21:51:19 2015 +0000
9521 some feedback from markus@: comment hostkeys_foreach()
9522 context and avoid a member in it.
9524 commit cecb30bc2ba6d594366e657d664d5c494b6c8a7f
9525 Author: djm@openbsd.org <djm@openbsd.org>
9526 Date: Sun Jan 18 21:49:42 2015 +0000
9530 make ssh-keygen use hostkeys_foreach(). Removes some
9531 horrendous code; ok markus@
9533 commit ec3d065df3a9557ea96b02d061fd821a18c1a0b9
9534 Author: djm@openbsd.org <djm@openbsd.org>
9535 Date: Sun Jan 18 21:48:09 2015 +0000
9539 convert load_hostkeys() (hostkey ordering and
9540 known_host matching) to use the new hostkey_foreach() iterator; ok markus
9542 commit c29811cc480a260e42fd88849fc86a80c1e91038
9543 Author: djm@openbsd.org <djm@openbsd.org>
9544 Date: Sun Jan 18 21:40:23 2015 +0000
9548 introduce hostkeys_foreach() to allow iteration over a
9549 known_hosts file or controlled subset thereof. This will allow us to pull out
9550 some ugly and duplicated code, and will be used to implement hostkey rotation
9553 feedback and ok markus
9555 commit f101d8291da01bbbfd6fb8c569cfd0cc61c0d346
9556 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9557 Date: Sun Jan 18 14:01:00 2015 +0000
9561 string truncation due to sizeof(size) ok djm markus
9563 commit 35d6022b55b7969fc10c261cb6aa78cc4a5fcc41
9564 Author: djm@openbsd.org <djm@openbsd.org>
9565 Date: Sun Jan 18 13:33:34 2015 +0000
9569 avoid trailing ',' in host key algorithms
9571 commit 7efb455789a0cb76bdcdee91c6060a3dc8f5c007
9572 Author: djm@openbsd.org <djm@openbsd.org>
9573 Date: Sun Jan 18 13:22:28 2015 +0000
9577 infer key length correctly when user specified a fully-
9578 qualified key name instead of using the -b bits option; ok markus@
9580 commit 83f8ffa6a55ccd0ce9d8a205e3e7439ec18fedf5
9581 Author: djm@openbsd.org <djm@openbsd.org>
9582 Date: Sat Jan 17 18:53:34 2015 +0000
9586 fix hostkeys on ssh agent; found by unit test I'm about
9589 commit 369d61f17657b814124268f99c033e4dc6e436c1
9590 Author: schwarze@openbsd.org <schwarze@openbsd.org>
9591 Date: Fri Jan 16 16:20:23 2015 +0000
9595 garbage collect empty .No macros mandoc warns about
9597 commit bb8b442d32dbdb8521d610e10d8b248d938bd747
9598 Author: djm@openbsd.org <djm@openbsd.org>
9599 Date: Fri Jan 16 15:55:07 2015 +0000
9603 regression: incorrect error message on
9604 otherwise-successful ssh-keygen -A. Reported by Dmitry Orlov, via deraadt@
9606 commit 9010902954a40b59d0bf3df3ccbc3140a653e2bc
9607 Author: djm@openbsd.org <djm@openbsd.org>
9608 Date: Fri Jan 16 07:19:48 2015 +0000
9612 when hostname canonicalisation is enabled, try to parse
9613 hostnames as addresses before looking them up for canonicalisation. fixes
9614 bz#2074 and avoids needless DNS lookups in some cases; ok markus
9616 commit 2ae4f337b2a5fb2841b6b0053b49496fef844d1c
9617 Author: deraadt@openbsd.org <deraadt@openbsd.org>
9618 Date: Fri Jan 16 06:40:12 2015 +0000
9622 Replace <sys/param.h> with <limits.h> and other less
9623 dirty headers where possible. Annotate <sys/param.h> lines with their
9624 current reasons. Switch to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1,
9625 LOGIN_NAME_MAX, etc. Change MIN() and MAX() to local definitions of
9626 MINIMUM() and MAXIMUM() where sensible to avoid pulling in the pollution.
9627 These are the files confirmed through binary verification. ok guenther,
9628 millert, doug (helped with the verification protocol)
9630 commit 3c4726f4c24118e8f1bb80bf75f1456c76df072c
9631 Author: markus@openbsd.org <markus@openbsd.org>
9632 Date: Thu Jan 15 21:38:50 2015 +0000
9636 remove xmalloc, switch to sshbuf
9638 commit e17ac01f8b763e4b83976b9e521e90a280acc097
9639 Author: markus@openbsd.org <markus@openbsd.org>
9640 Date: Thu Jan 15 21:37:14 2015 +0000
9646 commit ddef9995a1fa6c7a8ff3b38bfe6cf724bebf13d0
9647 Author: naddy@openbsd.org <naddy@openbsd.org>
9648 Date: Thu Jan 15 18:32:54 2015 +0000
9652 handle UMAC128 initialization like UMAC; ok djm@ markus@
9654 commit f14564c1f7792446bca143580aef0e7ac25dcdae
9655 Author: djm@openbsd.org <djm@openbsd.org>
9656 Date: Thu Jan 15 11:04:36 2015 +0000
9660 fix regression reported by brad@ for passworded keys without
9663 commit 45c0fd70bb2a88061319dfff20cb12ef7b1bc47e
9664 Author: Damien Miller <djm@mindrot.org>
9665 Date: Thu Jan 15 22:08:23 2015 +1100
9667 make bitmap test compile
9669 commit d333f89abf7179021e5c3f28673f469abe032062
9670 Author: djm@openbsd.org <djm@openbsd.org>
9671 Date: Thu Jan 15 07:36:28 2015 +0000
9675 unit tests for KRL bitmap
9677 commit 7613f828f49c55ff356007ae9645038ab6682556
9678 Author: markus@openbsd.org <markus@openbsd.org>
9679 Date: Wed Jan 14 09:58:21 2015 +0000
9683 re-add comment about full path
9685 commit 6c43b48b307c41cd656b415621a644074579a578
9686 Author: markus@openbsd.org <markus@openbsd.org>
9687 Date: Wed Jan 14 09:54:38 2015 +0000
9691 don't reset to the installed sshd; connect before
9694 commit 771bb47a1df8b69061f09462e78aa0b66cd594bf
9695 Author: djm@openbsd.org <djm@openbsd.org>
9696 Date: Tue Jan 13 14:51:51 2015 +0000
9700 implement a SIGINFO handler so we can discern a stuck
9701 fuzz test from a merely glacial one; prompted by and ok markus
9703 commit cfaa57962f8536f3cf0fd7daf4d6a55d6f6de45f
9704 Author: djm@openbsd.org <djm@openbsd.org>
9705 Date: Tue Jan 13 08:23:26 2015 +0000
9709 use $SSH instead of installed ssh to allow override;
9712 commit 0920553d0aee117a596b03ed5b49b280d34a32c5
9713 Author: djm@openbsd.org <djm@openbsd.org>
9714 Date: Tue Jan 13 07:49:49 2015 +0000
9718 regress test for PubkeyAcceptedKeyTypes; ok markus@
9720 commit 27ca1a5c0095eda151934bca39a77e391f875d17
9721 Author: markus@openbsd.org <markus@openbsd.org>
9722 Date: Mon Jan 12 20:13:27 2015 +0000
9726 unbreak parsing of pubkey comments; with gerhard; ok
9729 commit 55358f0b4e0b83bc0df81c5f854c91b11e0bb4dc
9730 Author: djm@openbsd.org <djm@openbsd.org>
9731 Date: Mon Jan 12 11:46:32 2015 +0000
9735 fatal if soft-PKCS11 library is missing rather (rather
9736 than continue and fail with a more cryptic error)
9738 commit c3554cdd2a1a62434b8161017aa76fa09718a003
9739 Author: djm@openbsd.org <djm@openbsd.org>
9740 Date: Mon Jan 12 11:12:38 2015 +0000
9744 let this test all supporte key types; pointed out/ok
9747 commit 1129dcfc5a3e508635004bcc05a3574cb7687167
9748 Author: djm@openbsd.org <djm@openbsd.org>
9749 Date: Thu Jan 15 09:40:00 2015 +0000
9753 sync ssh-keysign, ssh-keygen and some dependencies to the
9754 new buffer/key API; mostly mechanical, ok markus@
9756 commit e4ebf5586452bf512da662ac277aaf6ecf0efe7c
9757 Author: djm@openbsd.org <djm@openbsd.org>
9758 Date: Thu Jan 15 07:57:08 2015 +0000
9762 remove commented-out test code now that it has moved to a
9765 commit e81cba066c1e9eb70aba0f6e7c0ff220611b370f
9766 Author: djm@openbsd.org <djm@openbsd.org>
9767 Date: Wed Jan 14 20:54:29 2015 +0000
9773 commit 141efe49542f7156cdbc2e4cd0a041d8b1aab622
9774 Author: djm@openbsd.org <djm@openbsd.org>
9775 Date: Wed Jan 14 20:05:27 2015 +0000
9779 move authfd.c and its tentacles to the new buffer/key
9782 commit 0088c57af302cda278bd26d8c3ae81d5b6f7c289
9783 Author: djm@openbsd.org <djm@openbsd.org>
9784 Date: Wed Jan 14 19:33:41 2015 +0000
9788 fix small regression: ssh-agent would return a success
9789 message but an empty signature if asked to sign using an unknown key; ok
9792 commit b03ebe2c22b8166e4f64c37737f4278676e3488d
9793 Author: Damien Miller <djm@mindrot.org>
9794 Date: Thu Jan 15 03:08:58 2015 +1100
9796 more --without-openssl
9798 fix some regressions caused by upstream merges
9800 enable KRLs now that they no longer require BIGNUMs
9802 commit bc42cc6fe784f36df225c44c93b74830027cb5a2
9803 Author: Damien Miller <djm@mindrot.org>
9804 Date: Thu Jan 15 03:08:29 2015 +1100
9806 kludge around tun API mismatch betterer
9808 commit c332110291089b624fa0951fbf2d1ee6de525b9f
9809 Author: Damien Miller <djm@mindrot.org>
9810 Date: Thu Jan 15 02:59:51 2015 +1100
9812 some systems lack SO_REUSEPORT
9814 commit 83b9678a62cbdc74eb2031cf1e1e4ffd58e233ae
9815 Author: Damien Miller <djm@mindrot.org>
9816 Date: Thu Jan 15 02:35:50 2015 +1100
9820 commit 0cdc5a3eb6fb383569a4da2a30705d9b90428d6b
9821 Author: Damien Miller <djm@mindrot.org>
9822 Date: Thu Jan 15 02:35:33 2015 +1100
9824 unbreak across API change
9826 commit 6e2549ac2b5e7f96cbc2d83a6e0784b120444b47
9827 Author: Damien Miller <djm@mindrot.org>
9828 Date: Thu Jan 15 02:30:18 2015 +1100
9830 need includes.h for portable OpenSSH
9832 commit 72ef7c148c42db7d5632a29f137f8b87b579f2d9
9833 Author: Damien Miller <djm@mindrot.org>
9834 Date: Thu Jan 15 02:21:31 2015 +1100
9836 support --without-openssl at configure time
9838 Disables and removes dependency on OpenSSL. Many features don't
9839 work and the set of crypto options is greatly restricted. This
9840 will only work on system with native arc4random or /dev/urandom.
9842 Considered highly experimental for now.
9844 commit 4f38c61c68ae7e3f9ee4b3c38bc86cd39f65ece9
9845 Author: Damien Miller <djm@mindrot.org>
9846 Date: Thu Jan 15 02:28:00 2015 +1100
9848 add files missed in last commit
9850 commit a165bab605f7be55940bb8fae977398e8c96a46d
9851 Author: djm@openbsd.org <djm@openbsd.org>
9852 Date: Wed Jan 14 15:02:39 2015 +0000
9856 avoid BIGNUM in KRL code by using a simple bitmap;
9857 feedback and ok markus
9859 commit 7d845f4a0b7ec97887be204c3760e44de8bf1f32
9860 Author: djm@openbsd.org <djm@openbsd.org>
9861 Date: Wed Jan 14 13:54:13 2015 +0000
9865 update sftp client and server to new buffer API. pretty
9866 much just mechanical changes; with & ok markus
9868 commit 139ca81866ec1b219c717d17061e5e7ad1059e2a
9869 Author: markus@openbsd.org <markus@openbsd.org>
9870 Date: Wed Jan 14 13:09:09 2015 +0000
9874 switch to sshbuf/sshkey; with & ok djm@
9876 commit 81bfbd0bd35683de5d7f2238b985e5f8150a9180
9877 Author: Damien Miller <djm@mindrot.org>
9878 Date: Wed Jan 14 21:48:18 2015 +1100
9880 support --without-openssl at configure time
9882 Disables and removes dependency on OpenSSL. Many features don't
9883 work and the set of crypto options is greatly restricted. This
9884 will only work on system with native arc4random or /dev/urandom.
9886 Considered highly experimental for now.
9888 commit 54924b53af15ccdcbb9f89984512b5efef641a31
9889 Author: djm@openbsd.org <djm@openbsd.org>
9890 Date: Wed Jan 14 10:46:28 2015 +0000
9894 avoid an warning for the !OPENSSL case
9896 commit ae8b463217f7c9b66655bfc3945c050ffdaeb861
9897 Author: markus@openbsd.org <markus@openbsd.org>
9898 Date: Wed Jan 14 10:30:34 2015 +0000
9902 swith auth-options to new sshbuf/sshkey; ok djm@
9904 commit 540e891191b98b89ee90aacf5b14a4a68635e763
9905 Author: djm@openbsd.org <djm@openbsd.org>
9906 Date: Wed Jan 14 10:29:45 2015 +0000
9910 make non-OpenSSL aes-ctr work on sshd w/ privsep; ok
9913 commit 60c2c4ea5e1ad0ddfe8b2877b78ed5143be79c53
9914 Author: markus@openbsd.org <markus@openbsd.org>
9915 Date: Wed Jan 14 10:24:42 2015 +0000
9919 remove unneeded includes, sync my copyright across files
9920 & whitespace; ok djm@
9922 commit 128343bcdb0b60fc826f2733df8cf979ec1627b4
9923 Author: markus@openbsd.org <markus@openbsd.org>
9924 Date: Tue Jan 13 19:31:40 2015 +0000
9928 adapt mac.c to ssherr.h return codes (de-fatal) and
9929 simplify dependencies ok djm@
9931 commit e7fd952f4ea01f09ceb068721a5431ac2fd416ed
9932 Author: djm@openbsd.org <djm@openbsd.org>
9933 Date: Tue Jan 13 19:04:35 2015 +0000
9937 sync changes from libopenssh; prepared by markus@ mostly
9938 debug output tweaks, a couple of error return value changes and some other
9941 commit 76c0480a85675f03a1376167cb686abed01a3583
9942 Author: Damien Miller <djm@mindrot.org>
9943 Date: Tue Jan 13 19:38:18 2015 +1100
9945 add --without-ssh1 option to configure
9947 Allows disabling support for SSH protocol 1.
9949 commit 1f729f0614d1376c3332fa1edb6a5e5cec7e9e03
9950 Author: djm@openbsd.org <djm@openbsd.org>
9951 Date: Tue Jan 13 07:39:19 2015 +0000
9955 add sshd_config HostbasedAcceptedKeyTypes and
9956 PubkeyAcceptedKeyTypes options to allow sshd to control what public key types
9957 will be accepted. Currently defaults to all. Feedback & ok markus@
9959 commit 816d1538c24209a93ba0560b27c4fda57c3fff65
9960 Author: markus@openbsd.org <markus@openbsd.org>
9961 Date: Mon Jan 12 20:13:27 2015 +0000
9965 unbreak parsing of pubkey comments; with gerhard; ok
9968 commit 0097565f849851812df610b7b6b3c4bd414f6c62
9969 Author: markus@openbsd.org <markus@openbsd.org>
9970 Date: Mon Jan 12 19:22:46 2015 +0000
9974 missing error assigment on sshbuf_put_string()
9976 commit a7f49dcb527dd17877fcb8d5c3a9a6f550e0bba5
9977 Author: djm@openbsd.org <djm@openbsd.org>
9978 Date: Mon Jan 12 15:18:07 2015 +0000
9982 apparently memcpy(x, NULL, 0) is undefined behaviour
9983 according to C99 (cf. sections 7.21.1 and 7.1.4), so check skip memcpy calls
9984 when length==0; ok markus@
9986 commit 905fe30fca82f38213763616d0d26eb6790bde33
9987 Author: markus@openbsd.org <markus@openbsd.org>
9988 Date: Mon Jan 12 14:05:19 2015 +0000
9992 free->sshkey_free; ok djm@
9994 commit f067cca2bc20c86b110174c3fef04086a7f57b13
9995 Author: markus@openbsd.org <markus@openbsd.org>
9996 Date: Mon Jan 12 13:29:27 2015 +0000
10000 allow WITH_OPENSSL w/o WITH_SSH1; ok djm@
10002 commit c4bfafcc2a9300d9cfb3c15e75572d3a7d74670d
10003 Author: djm@openbsd.org <djm@openbsd.org>
10004 Date: Thu Jan 8 13:10:58 2015 +0000
10008 adjust for sshkey_load_file() API change
10010 commit e752c6d547036c602b89e9e704851463bd160e32
10011 Author: djm@openbsd.org <djm@openbsd.org>
10012 Date: Thu Jan 8 13:44:36 2015 +0000
10016 fix ssh_config FingerprintHash evaluation order; from Petr
10019 commit ab24ab847b0fc94c8d5e419feecff0bcb6d6d1bf
10020 Author: djm@openbsd.org <djm@openbsd.org>
10021 Date: Thu Jan 8 10:15:45 2015 +0000
10025 reorder hostbased key attempts to better match the
10026 default hostkey algorithms order in myproposal.h; ok markus@
10028 commit 1195f4cb07ef4b0405c839293c38600b3e9bdb46
10029 Author: djm@openbsd.org <djm@openbsd.org>
10030 Date: Thu Jan 8 10:14:08 2015 +0000
10034 deprecate key_load_private_pem() and
10035 sshkey_load_private_pem() interfaces. Refactor the generic key loading API to
10036 not require pathnames to be specified (they weren't really used).
10038 Fixes a few other things en passant:
10040 Makes ed25519 keys work for hostbased authentication (ssh-keysign
10041 previously used the PEM-only routines).
10043 Fixes key comment regression bz#2306: key pathnames were being lost as
10048 commit febbe09e4e9aff579b0c5cc1623f756862e4757d
10049 Author: tedu@openbsd.org <tedu@openbsd.org>
10050 Date: Wed Jan 7 18:15:07 2015 +0000
10054 workaround for the Meyer, et al, Bleichenbacher Side
10055 Channel Attack. fake up a bignum key before RSA decryption. discussed/ok djm
10058 commit 5191df927db282d3123ca2f34a04d8d96153911a
10059 Author: djm@openbsd.org <djm@openbsd.org>
10060 Date: Tue Dec 23 22:42:48 2014 +0000
10064 KNF and add a little more debug()
10066 commit 8abd80315d3419b20e6938f74d37e2e2b547f0b7
10067 Author: jmc@openbsd.org <jmc@openbsd.org>
10068 Date: Mon Dec 22 09:26:31 2014 +0000
10072 add fingerprinthash to the options list;
10074 commit 296ef0560f60980da01d83b9f0e1a5257826536f
10075 Author: jmc@openbsd.org <jmc@openbsd.org>
10076 Date: Mon Dec 22 09:24:59 2014 +0000
10082 commit 462082eacbd37778a173afb6b84c6f4d898a18b5
10083 Author: Damien Miller <djm@google.com>
10084 Date: Tue Dec 30 08:16:11 2014 +1100
10086 avoid uninitialised free of ldns_res
10088 If an invalid rdclass was passed to getrrsetbyname() then
10089 this would execute a free on an uninitialised pointer.
10090 OpenSSH only ever calls this with a fixed and valid rdclass.
10092 Reported by Joshua Rogers
10094 commit 01b63498801053f131a0740eb9d13faf35d636c8
10095 Author: Damien Miller <djm@google.com>
10096 Date: Mon Dec 29 18:10:18 2014 +1100
10098 pull updated OpenBSD BCrypt PBKDF implementation
10100 Includes fix for 1 byte output overflow for large key length
10101 requests (not reachable in OpenSSH).
10103 Pointed out by Joshua Rogers
10105 commit c528c1b4af2f06712177b3de9b30705752f7cbcb
10106 Author: Damien Miller <djm@google.com>
10107 Date: Tue Dec 23 15:26:13 2014 +1100
10109 fix variable name for IPv6 case in construct_utmpx
10111 patch from writeonce AT midipix.org via bz#2296
10113 commit 293cac52dcda123244b2e594d15592e5e481c55e
10114 Author: Damien Miller <djm@google.com>
10115 Date: Mon Dec 22 16:30:42 2014 +1100
10117 include and use OpenBSD netcat in regress/
10119 commit 8f6784f0cb56dc4fd00af3e81a10050a5785228d
10120 Author: djm@openbsd.org <djm@openbsd.org>
10121 Date: Mon Dec 22 09:05:17 2014 +0000
10125 mention ssh -Q feature to list supported { MAC, cipher,
10126 KEX, key } algorithms in more places and include the query string used to
10127 list the relevant information; bz#2288
10129 commit 449e11b4d7847079bd0a2daa6e3e7ea03d8ef700
10130 Author: jmc@openbsd.org <jmc@openbsd.org>
10131 Date: Mon Dec 22 08:24:17 2014 +0000
10137 commit 4bea0ab3290c0b9dd2aa199e932de8e7e18062d6
10138 Author: djm@openbsd.org <djm@openbsd.org>
10139 Date: Mon Dec 22 08:06:03 2014 +0000
10143 regression test for multiple required pubkey authentication;
10146 commit f1c4d8ec52158b6f57834b8cd839605b0a33e7f2
10147 Author: djm@openbsd.org <djm@openbsd.org>
10148 Date: Mon Dec 22 08:04:23 2014 +0000
10152 correct description of what will happen when a
10153 AuthorizedKeysCommand is specified but AuthorizedKeysCommandUser is not (sshd
10154 will refuse to start)
10156 commit 161cf419f412446635013ac49e8c660cadc36080
10157 Author: djm@openbsd.org <djm@openbsd.org>
10158 Date: Mon Dec 22 07:55:51 2014 +0000
10162 make internal handling of filename arguments of "none"
10163 more consistent with ssh. "none" arguments are now replaced with NULL when
10164 the configuration is finalised.
10166 Simplifies checking later on (just need to test not-NULL rather than
10167 that + strcmp) and cleans up some inconsistencies. ok markus@
10169 commit f69b69b8625be447b8826b21d87713874dac25a6
10170 Author: djm@openbsd.org <djm@openbsd.org>
10171 Date: Mon Dec 22 07:51:30 2014 +0000
10175 remember which public keys have been used for
10176 authentication and refuse to accept previously-used keys.
10178 This allows AuthenticationMethods=publickey,publickey to require
10179 that users authenticate using two _different_ pubkeys.
10183 commit 46ac2ed4677968224c4ca825bc98fc68dae183f0
10184 Author: djm@openbsd.org <djm@openbsd.org>
10185 Date: Mon Dec 22 07:24:11 2014 +0000
10189 fix passing of wildcard forward bind addresses when
10190 connection multiplexing is in use; patch from Sami Hartikainen via bz#2324;
10193 commit 0d1b241a262e4d0a6bbfdd595489ab1b853c43a1
10194 Author: djm@openbsd.org <djm@openbsd.org>
10195 Date: Mon Dec 22 06:14:29 2014 +0000
10199 make this slightly easier to diff against portable
10201 commit 0715bcdddbf68953964058f17255bf54734b8737
10202 Author: Damien Miller <djm@mindrot.org>
10203 Date: Mon Dec 22 13:47:07 2014 +1100
10205 add missing regress output file
10207 commit 1e30483c8ad2c2f39445d4a4b6ab20c241e40593
10208 Author: djm@openbsd.org <djm@openbsd.org>
10209 Date: Mon Dec 22 02:15:52 2014 +0000
10213 adjust for new SHA256 key fingerprints and
10214 slightly-different MD5 hex fingerprint format
10216 commit 6b40567ed722df98593ad8e6a2d2448fc2b4b151
10217 Author: djm@openbsd.org <djm@openbsd.org>
10218 Date: Mon Dec 22 01:14:49 2014 +0000
10222 poll changes to netcat (usr.bin/netcat.c r1.125) broke
10223 this test; fix it by ensuring more stdio fds are sent to devnull
10225 commit a5375ccb970f49dddf7d0ef63c9b713ede9e7260
10226 Author: jmc@openbsd.org <jmc@openbsd.org>
10227 Date: Sun Dec 21 23:35:14 2014 +0000
10233 commit b79efde5c3badf5ce4312fe608d8307eade533c5
10234 Author: djm@openbsd.org <djm@openbsd.org>
10235 Date: Sun Dec 21 23:12:42 2014 +0000
10239 document FingerprintHash here too
10241 commit d16bdd8027dd116afa01324bb071a4016cdc1a75
10242 Author: Damien Miller <djm@mindrot.org>
10243 Date: Mon Dec 22 10:18:09 2014 +1100
10245 missing include for base64 encoding
10247 commit 56d1c83cdd1ac76f1c6bd41e01e80dad834f3994
10248 Author: djm@openbsd.org <djm@openbsd.org>
10249 Date: Sun Dec 21 22:27:55 2014 +0000
10253 Add FingerprintHash option to control algorithm used for
10254 key fingerprints. Default changes from MD5 to SHA256 and format from hex to
10257 Feedback and ok naddy@ markus@
10259 commit 058f839fe15c51be8b3a844a76ab9a8db550be4f
10260 Author: djm@openbsd.org <djm@openbsd.org>
10261 Date: Thu Dec 18 23:58:04 2014 +0000
10265 don't count partial authentication success as a failure
10266 against MaxAuthTries; ok deraadt@