1 commit aede1c34243a6f7feae2fb2cb686ade5f9be6f3d
2 Author: Damien Miller <djm@mindrot.org>
3 Date: Wed Oct 17 11:01:20 2018 +1100
5 Require OpenSSL 1.1.x series 1.1.0g or greater
7 Previous versions have a bug with EVP_CipherInit() when passed a
8 NULL EVP_CIPHER, per https://github.com/openssl/openssl/pull/4613
12 commit 08300c211409c212e010fe2e2f2883e573a04ce2
13 Author: Damien Miller <djm@mindrot.org>
14 Date: Wed Oct 17 08:12:02 2018 +1100
16 unbreak compilation with --with-ssl-engine
18 Missing last argument to OPENSSL_init_crypto()
20 commit 1673274aee67ce0eb6f00578b6f3d2bcbd58f937
21 Author: Darren Tucker <dtucker@dtucker.net>
22 Date: Tue Oct 16 14:45:57 2018 +1100
24 Remove gcc spectre mitigation flags.
26 Current impementions of the gcc spectre mitigation flags cause
27 miscompilations when combined with other flags and do not provide much
28 protection. Found by fweimer at redhat.com, ok djm@
30 commit 4e23deefd7959ef83c73ed9cce574423438f6133
31 Author: Damien Miller <djm@mindrot.org>
32 Date: Tue Oct 16 10:51:52 2018 +1100
34 Avoid deprecated OPENSSL_config when using 1.1.x
36 OpenSSL 1.1.x soft-deprecated OPENSSL_config in favour of
37 OPENSSL_init_crypto; pointed out by Jakub Jelen
39 commit 797cdd9c8468ed1125ce60d590ae3f1397866af4
40 Author: Darren Tucker <dtucker@dtucker.net>
41 Date: Fri Oct 12 16:58:47 2018 +1100
43 Don't avoid our *sprintf replacements.
45 Don't let systems with broken printf(3) avoid our replacements
46 via asprintf(3)/vasprintf(3) calling libc internally. From djm@
48 commit e526127cbd2f8ad88fb41229df0c9b850c722830
49 Author: Darren Tucker <dtucker@dtucker.net>
50 Date: Fri Oct 12 16:43:35 2018 +1100
52 Check if snprintf understands %zu.
54 If the platforms snprintf and friends don't understand %zu, use the
55 compat replacement. Prevents segfaults on those platforms.
57 commit cf39f875191708c5f2f1a3c1c9019f106e74aea3
58 Author: Damien Miller <djm@mindrot.org>
59 Date: Fri Oct 12 09:48:05 2018 +1100
61 remove stale link, tweak
63 commit a7205e68decf7de2005810853b4ce6b222b65e2a
64 Author: Damien Miller <djm@mindrot.org>
65 Date: Fri Oct 12 09:47:20 2018 +1100
67 update version numbers ahead of release
69 commit 1a4a9cf80f5b92b9d1dadd0bfa8867c04d195391
70 Author: djm@openbsd.org <djm@openbsd.org>
71 Date: Thu Oct 11 03:48:04 2018 +0000
73 upstream: don't send new-style rsa-sha2-*-cert-v01@openssh.com names to
75 older OpenSSH that can't handle them. spotted by Adam Eijdenberg; ok dtucker
77 OpenBSD-Commit-ID: 662bbc402e3d7c9b6c322806269698106a6ae631
79 commit dc8ddcdf1a95e011c263486c25869bb5bf4e30ec
80 Author: Damien Miller <djm@mindrot.org>
81 Date: Thu Oct 11 13:08:59 2018 +1100
85 commit 26841ac265603fd2253e6832e03602823dbb4022
86 Author: Damien Miller <djm@mindrot.org>
87 Date: Thu Oct 11 13:02:11 2018 +1100
89 some more duplicated key algorithm lines
93 commit 5d9d17603bfbb620195a4581025052832b4c4adc
94 Author: Damien Miller <djm@mindrot.org>
95 Date: Thu Oct 11 11:56:36 2018 +1100
97 fix duplicated algorithm specification lines
99 Spotted by Adam Eijdenberg
101 commit ebfafd9c7a5b2a7fb515ee95dbe0e44e11d0a663
102 Author: djm@openbsd.org <djm@openbsd.org>
103 Date: Thu Oct 11 00:52:46 2018 +0000
105 upstream: typo in plain RSA algorithm counterpart names for
107 certificates; spotted by Adam Eijdenberg; ok dtucker@
109 OpenBSD-Commit-ID: bfcdeb6f4fc9e7607f5096574c8f118f2e709e00
111 commit c29b111e7d87c2324ff71c80653dd8da168c13b9
112 Author: Damien Miller <djm@mindrot.org>
113 Date: Thu Oct 11 11:29:35 2018 +1100
115 check pw_passwd != NULL here too
117 Again, for systems with broken NIS implementations.
119 Prompted by coolbugcheckers AT gmail.com
121 commit fe8e8f349a553ef4c567acd418aac769a82b7729
122 Author: Damien Miller <djm@mindrot.org>
123 Date: Thu Oct 11 11:03:15 2018 +1100
125 check for NULL return from shadow_pw()
127 probably unreachable on this platform; pointed out by
128 coolbugcheckers AT gmail.com
130 commit acc59cbe7a1fb169e1c3caba65a39bd74d6e030d
131 Author: deraadt@openbsd.org <deraadt@openbsd.org>
132 Date: Wed Oct 10 16:43:49 2018 +0000
134 upstream: introducing openssh 7.9
136 OpenBSD-Commit-ID: 42d526a9fe01a40dd299ac58014d3349adf40e25
138 commit 12731158c75c8760a8bea06350eeb3e763fe1a07
139 Author: Damien Miller <djm@mindrot.org>
140 Date: Thu Oct 11 10:29:29 2018 +1100
142 supply callback to PEM_read_bio_PrivateKey
144 OpenSSL 1.1.0i has changed the behaviour of their PEM APIs,
145 so that empty passphrases are interpreted differently. This
146 probabalistically breaks loading some keys, because the PEM format
147 is terrible and doesn't include a proper MAC.
149 Avoid this by providing a basic callback to avoid passing empty
150 passphrases to OpenSSL in cases where one is required.
152 Based on patch from Jakub Jelen in bz#2913; ok dtucker@
154 commit d1d301a1dd5d6cc3a9ed93ab7ab09dda4cb456e0
155 Author: Damien Miller <djm@mindrot.org>
156 Date: Wed Oct 10 14:57:00 2018 +1100
158 in pick_salt() avoid dereference of NULL passwords
160 Apparently some NIS implementations can leave pw->pw_passwd (or the
161 shadow equivalent) NULL.
163 bz#2909; based on patch from Todd Eigenschink
165 commit edbb6febccee084d212fdc0cb05b40cb1c646ab1
166 Author: djm@openbsd.org <djm@openbsd.org>
167 Date: Tue Oct 9 05:42:23 2018 +0000
169 upstream: Treat all PEM_read_bio_PrivateKey() errors when a passphrase
171 is specified as "incorrect passphrase" instead of trying to choose between
172 that and "invalid format".
174 libcrypto can return ASN1 parsing errors rather than the expected
175 decrypt error in certain infrequent cases when trying to decrypt/parse
176 PEM private keys when supplied with an invalid passphrase.
178 Report and repro recipe from Thomas Deutschmann in bz#2901
182 OpenBSD-Commit-ID: b1d4cd92395f9743f81c0d23aab2524109580870
184 commit 2581333d564d8697837729b3d07d45738eaf5a54
185 Author: naddy@openbsd.org <naddy@openbsd.org>
186 Date: Fri Oct 5 14:26:09 2018 +0000
188 upstream: Support using service names for port numbers.
190 * Try to resolve a port specification with getservbyname(3) if a
191 numeric conversion fails.
192 * Make the "Port" option in ssh_config handle its argument as a
193 port rather than a plain integer.
197 OpenBSD-Commit-ID: e7f03633133205ab3dfbc67f9df7475fabae660d
199 commit e0d6501e86734c48c8c503f81e1c0926e98c5c4c
200 Author: djm@openbsd.org <djm@openbsd.org>
201 Date: Thu Oct 4 07:47:35 2018 +0000
203 upstream: when the peer sends a channel-close message, make sure we
205 close the local extended read fd (stderr) along with the regular read fd
206 (stdout). Avoids weird stuck processed in multiplexing mode.
208 Report and analysis by Nelson Elhage and Geoffrey Thomas in bz#2863
212 OpenBSD-Commit-ID: a48a2467fe938de4de69d2e7193d5fa701f12ae9
214 commit 6f1aabb128246f445e33b8844fad3de9cb1d18cb
215 Author: djm@openbsd.org <djm@openbsd.org>
216 Date: Thu Oct 4 01:04:52 2018 +0000
218 upstream: factor out channel status formatting from
220 channel_open_message() so we can use it in other debug messages
222 OpenBSD-Commit-ID: 9c3903ca28fcabad57f566c9d0045b41ab7d52ba
224 commit f1dd179e122bdfdb7ca3072d9603607740efda05
225 Author: djm@openbsd.org <djm@openbsd.org>
226 Date: Thu Oct 4 00:10:11 2018 +0000
228 upstream: include a little more information about the status and
230 disposition of channel's extended (stderr) fd; makes debugging some things a
231 bit easier. No behaviour change.
233 OpenBSD-Commit-ID: 483eb6467dc7d5dbca8eb109c453e7a43075f7ce
235 commit 2d1428b11c8b6f616f070f2ecedce12328526944
236 Author: djm@openbsd.org <djm@openbsd.org>
237 Date: Thu Oct 4 00:04:41 2018 +0000
239 upstream: explicit_bzero here to be consistent with other kex*.c;
241 report from coolbugcheckers AT gmail.com
243 OpenBSD-Commit-ID: a90f146c5b5f5b1408700395e394f70b440856cb
245 commit 5eff5b858e717e901e6af6596306a114de9f79f2
246 Author: djm@openbsd.org <djm@openbsd.org>
247 Date: Wed Oct 3 06:38:35 2018 +0000
249 upstream: Allow ssh_config IdentityAgent directive to accept
251 environment variable names as well as explicit paths. ok dtucker@
253 OpenBSD-Commit-ID: 2f0996e103876c53d8c9dd51dcce9889d700767b
255 commit a46ac4d86b25414d78b632e8173578b37e5f8a83
256 Author: djm@openbsd.org <djm@openbsd.org>
257 Date: Tue Oct 2 12:51:58 2018 +0000
259 upstream: mention INFO@openssh.com for sending SIGINFO
261 OpenBSD-Commit-ID: 132471eeb0df658210afd27852fe65131b26e900
263 commit ff3a411cae0b484274b7900ef52ff4dad3e12876
264 Author: Damien Miller <djm@mindrot.org>
265 Date: Tue Oct 2 22:49:40 2018 +1000
267 only support SIGINFO on systems with SIGINFO
269 commit cd98925c6405e972dc9f211afc7e75e838abe81c
270 Author: djm@openbsd.org <djm@openbsd.org>
271 Date: Tue Oct 2 12:40:07 2018 +0000
273 upstream: Add server support for signalling sessions via the SSH
275 channel/ session protocol. Signalling is only supported to sesssions that are
276 not subsystems and were not started with a forced command.
278 Long requested in bz#1424
280 Based on a patch from markus@ and reworked by dtucker@;
283 OpenBSD-Commit-ID: 4bea826f575862eaac569c4bedd1056a268be1c3
285 commit dba50258333f2604a87848762af07ba2cc40407a
286 Author: djm@openbsd.org <djm@openbsd.org>
287 Date: Wed Sep 26 07:32:44 2018 +0000
289 upstream: remove big ugly TODO comment from start of file. Some of
291 the mentioned tasks are obsolete and, of the remainder, most are already
292 captured in PROTOCOL.mux where they better belong
294 OpenBSD-Commit-ID: 16d9d76dee42a5bb651c9d6740f7f0ef68aeb407
296 commit 92b61a38ee9b765f5049f03cd1143e13f3878905
297 Author: djm@openbsd.org <djm@openbsd.org>
298 Date: Wed Sep 26 07:30:05 2018 +0000
300 upstream: Document mux proxy mode; added by Markus in openssh-7.4
302 Also add a little bit of information about the overall packet format
304 OpenBSD-Commit-ID: bdb6f6ea8580ef96792e270cae7857786ad84a95
306 commit 9d883a1ce4f89b175fd77405ff32674620703fb2
307 Author: djm@openbsd.org <djm@openbsd.org>
308 Date: Wed Sep 26 01:48:57 2018 +0000
310 upstream: s/process_mux_master/mux_master_process/ in mux master
314 Gives better symmetry with the existing mux_client_*() names and makes
315 it more obvious when a message comes from the master vs client (they
316 are interleved in ControlMaster=auto mode).
318 no functional change beyond prefixing a could of log messages with
319 __func__ where they were previously lacking.
321 OpenBSD-Commit-ID: b01f7c3fdf92692e1713a822a89dc499333daf75
323 commit c2fa53cd6462da82d3a851dc3a4a3f6b920337c8
324 Author: Darren Tucker <dtucker@dtucker.net>
325 Date: Sat Sep 22 14:41:24 2018 +1000
327 Remove unused variable in _ssh_compat_fflush.
329 commit d1b3540c21212624af907488960d703c7d987b42
330 Author: Darren Tucker <dtucker@dtucker.net>
331 Date: Thu Sep 20 18:08:43 2018 +1000
333 Import updated moduli.
335 commit b5e412a8993ad17b9e1141c78408df15d3d987e1
336 Author: djm@openbsd.org <djm@openbsd.org>
337 Date: Fri Sep 21 12:46:22 2018 +0000
339 upstream: Allow ssh_config ForwardX11Timeout=0 to disable the
341 timeout and allow X11 connections in untrusted mode indefinitely. ok dtucker@
343 OpenBSD-Commit-ID: ea1ceed3f540b48e5803f933e59a03b20db10c69
345 commit cb24d9fcc901429d77211f274031653476864ec6
346 Author: djm@openbsd.org <djm@openbsd.org>
347 Date: Fri Sep 21 12:23:17 2018 +0000
349 upstream: when compiled with GSSAPI support, cache supported method
351 OIDs by calling ssh_gssapi_prepare_supported_oids() regardless of whether
352 GSSAPI authentication is enabled in the main config.
354 This avoids sandbox violations for configurations that enable GSSAPI
358 GSSAPIAuthentication yes
362 OpenBSD-Commit-ID: a5dd42d87c74e27cfb712b15b0f97ab20e0afd1d
364 commit bbc8af72ba68da014d4de6e21a85eb5123384226
365 Author: djm@openbsd.org <djm@openbsd.org>
366 Date: Fri Sep 21 12:20:12 2018 +0000
368 upstream: In sshkey_in_file(), ignore keys that are considered for
370 being too short (i.e. SSH_ERR_KEY_LENGTH). These keys will not be considered
371 to be "in the file". This allows key revocation lists to contain short keys
372 without the entire revocation list being considered invalid.
376 OpenBSD-Commit-ID: d9f3d857d07194a42ad7e62889a74dc3f9d9924b
378 commit 383a33d160cefbfd1b40fef81f72eadbf9303a66
379 Author: djm@openbsd.org <djm@openbsd.org>
380 Date: Fri Sep 21 03:11:36 2018 +0000
382 upstream: Treat connections with ProxyJump specified the same as ones
384 with a ProxyCommand set with regards to hostname canonicalisation (i.e. don't
385 try to canonicalise the hostname unless CanonicalizeHostname is set to
388 Patch from Sven Wegener via bz#2896
390 OpenBSD-Commit-ID: 527ff501cf98bf65fb4b29ed0cb847dda10f4d37
392 commit 0cbed248ed81584129b67c348dbb801660f25a6a
393 Author: djm@openbsd.org <djm@openbsd.org>
394 Date: Thu Sep 20 23:40:16 2018 +0000
396 upstream: actually make CASignatureAlgorithms available as a config
400 OpenBSD-Commit-ID: 93fa7ff58314ed7b1ab7744090a6a91232e6ae52
402 commit 62528870c0ec48cd86a37dd7320fb85886c3e6ee
403 Author: dtucker@openbsd.org <dtucker@openbsd.org>
404 Date: Thu Sep 20 08:07:03 2018 +0000
406 upstream: Import updated moduli.
408 OpenBSD-Commit-ID: 04431e8e7872f49a2129bf080a6b73c19d576d40
410 commit e6933a2ffa0659d57f3c7b7c457b2c62b2a84613
411 Author: jmc@openbsd.org <jmc@openbsd.org>
412 Date: Thu Sep 20 06:58:48 2018 +0000
414 upstream: reorder CASignatureAlgorithms, and add them to the
416 various -o lists; ok djm
418 OpenBSD-Commit-ID: ecb88baecc3c54988b4d1654446ea033da359288
420 commit aa083aa9624ea7b764d5a81c4c676719a1a3e42b
421 Author: djm@openbsd.org <djm@openbsd.org>
422 Date: Thu Sep 20 03:31:49 2018 +0000
424 upstream: fix "ssh -Q sig" to show correct signature algorithm list
426 (it was erroneously showing certificate algorithms); prompted by markus@
428 OpenBSD-Commit-ID: 1cdee002f2f0c21456979deeb887fc889afb154d
430 commit ecac7e1f7add6b28874959a11f2238d149dc2c07
431 Author: djm@openbsd.org <djm@openbsd.org>
432 Date: Thu Sep 20 03:30:44 2018 +0000
434 upstream: add CASignatureAlgorithms option for the client, allowing
436 it to specify which signature algorithms may be used by CAs when signing
437 certificates. Useful if you want to ban RSA/SHA1; ok markus@
439 OpenBSD-Commit-ID: 9159e5e9f67504829bf53ff222057307a6e3230f
441 commit 86e5737c39153af134158f24d0cab5827cbd5852
442 Author: djm@openbsd.org <djm@openbsd.org>
443 Date: Thu Sep 20 03:28:06 2018 +0000
445 upstream: Add sshd_config CASignatureAlgorithms option to allow
447 control over which signature algorithms a CA may use when signing
448 certificates. In particular, this allows a sshd to ban certificates signed
453 OpenBSD-Commit-ID: b05c86ef8b52b913ed48d54a9b9c1a7714d96bac
455 commit f80e68ea7d62e2dfafc12f1a60ab544ae4033a0f
456 Author: djm@openbsd.org <djm@openbsd.org>
457 Date: Wed Sep 19 02:03:02 2018 +0000
459 upstream: Make "ssh-add -q" do what it says on the tin: silence
461 output from successful operations.
463 Based on patch from Thijs van Dijk; ok dtucker@ deraadt@
465 OpenBSD-Commit-ID: c4f754ecc055c10af166116ce7515104aa8522e1
467 commit 5e532320e9e51de720d5f3cc2596e95d29f6e98f
468 Author: millert@openbsd.org <millert@openbsd.org>
469 Date: Mon Sep 17 15:40:14 2018 +0000
471 upstream: When choosing a prime from the moduli file, avoid
473 re-using the linenum variable for something that is not a line number to
474 avoid the confusion that resulted in the bug in rev. 1.64. This also lets us
475 pass the actual linenum to parse_prime() so the error messages include the
476 correct line number. OK markus@ some time ago.
478 OpenBSD-Commit-ID: 4d8e5d3e924d6e8eb70053e3defa23c151a00084
480 commit cce8cbe0ed7d1ba3a575310e0b63c193326ae616
481 Author: Darren Tucker <dtucker@dtucker.net>
482 Date: Sat Sep 15 19:44:06 2018 +1000
484 Fix openssl-1.1 fallout for --without-openssl.
488 commit 149519b9f201dac755f3cba4789f4d76fecf0ee1
489 Author: Damien Miller <djm@mindrot.org>
490 Date: Sat Sep 15 19:37:48 2018 +1000
492 add futex(2) syscall to seccomp sandbox
494 Apparently needed for some glibc/openssl combinations.
496 Patch from Arkadiusz Miśkiewicz
498 commit 4488ae1a6940af704c4dbf70f55bf2f756a16536
499 Author: Damien Miller <djm@mindrot.org>
500 Date: Sat Sep 15 19:36:55 2018 +1000
502 really add source for authopt_fuzz this time
504 commit 9201784b4a257c8345fbd740bcbdd70054885707
505 Author: Damien Miller <djm@mindrot.org>
506 Date: Sat Sep 15 19:35:40 2018 +1000
508 remove accidentally checked-in authopt_fuzz binary
510 commit beb9e522dc7717df08179f9e59f36b361bfa14ab
511 Author: djm@openbsd.org <djm@openbsd.org>
512 Date: Fri Sep 14 05:26:27 2018 +0000
514 upstream: second try, deals properly with missing and private-only
516 Use consistent format in debug log for keys readied, offered and
517 received during public key authentication.
519 This makes it a little easier to see what is going on, as each message
520 now contains (where available) the key filename, its type and fingerprint,
521 and whether the key is hosted in an agent or a token.
523 OpenBSD-Commit-ID: f1c6a8e9cfc4e108c359db77f24f9a40e1e25ea7
525 commit 6bc5a24ac867bfdc3ed615589d69ac640f51674b
526 Author: Damien Miller <djm@mindrot.org>
527 Date: Fri Sep 14 15:16:34 2018 +1000
529 fuzzer harness for authorized_keys option parsing
531 commit 6c8b82fc6929b6a9a3f645151b6ec26c5507d9ef
532 Author: djm@openbsd.org <djm@openbsd.org>
533 Date: Fri Sep 14 04:44:04 2018 +0000
535 upstream: revert following; deals badly with agent keys
538 date: 2018/09/14 04:17:12; author: djm; state: Exp; lines: +47 -26; commitid: lflGFcNb2X2HebaK;
539 Use consistent format in debug log for keys readied, offered and
540 received during public key authentication.
542 This makes it a little easier to see what is going on, as each message
543 now contains the key filename, its type and fingerprint, and whether
544 the key is hosted in an agent or a token.
546 OpenBSD-Commit-ID: e496bd004e452d4b051f33ed9ae6a54ab918f56d
548 commit 6da046f9c3374ce7e269ded15d8ff8bc45017301
549 Author: djm@openbsd.org <djm@openbsd.org>
550 Date: Fri Sep 14 04:17:44 2018 +0000
552 upstream: garbage-collect moribund ssh_new_private() API.
554 OpenBSD-Commit-ID: 7c05bf13b094093dfa01848a9306c82eb6e95f6c
556 commit 1f24ac5fc05252ceb1c1d0e8cab6a283b883c780
557 Author: djm@openbsd.org <djm@openbsd.org>
558 Date: Fri Sep 14 04:17:12 2018 +0000
560 upstream: Use consistent format in debug log for keys readied,
562 offered and received during public key authentication.
564 This makes it a little easier to see what is going on, as each message
565 now contains the key filename, its type and fingerprint, and whether
566 the key is hosted in an agent or a token.
568 OpenBSD-Commit-ID: 2a01d59285a8a7e01185bb0a43316084b4f06a1f
570 commit 488c9325bb7233e975dbfbf89fa055edc3d3eddc
571 Author: millert@openbsd.org <millert@openbsd.org>
572 Date: Thu Sep 13 15:23:32 2018 +0000
574 upstream: Fix warnings caused by user_from_uid() and group_from_gid()
576 now returning const char *.
578 OpenBSD-Commit-ID: b5fe571ea77cfa7b9035062829ab05eb87d7cc6f
580 commit 0aa1f230846ebce698e52051a107f3127024a05a
581 Author: Damien Miller <djm@mindrot.org>
582 Date: Fri Sep 14 10:31:47 2018 +1000
584 allow SIGUSR1 as synonym for SIGINFO
586 Lets users on those unfortunate operating systems that lack SIGINFO
587 still be able to obtain progress information from unit tests :)
589 commit d64e78526596f098096113fcf148216798c327ff
590 Author: Damien Miller <djm@mindrot.org>
591 Date: Thu Sep 13 19:05:48 2018 +1000
595 commit a3fd8074e2e2f06602e25618721f9556c731312c
596 Author: djm@openbsd.org <djm@openbsd.org>
597 Date: Thu Sep 13 09:03:20 2018 +0000
599 upstream: missed a bit of openssl-1.0.x API in this unittest
601 OpenBSD-Regress-ID: a73a54d7f7381856a3f3a2d25947bee7a9a5dbc9
603 commit 86e0a9f3d249d5580390daf58e015e68b01cef10
604 Author: djm@openbsd.org <djm@openbsd.org>
605 Date: Thu Sep 13 05:06:51 2018 +0000
607 upstream: use only openssl-1.1.x API here too
609 OpenBSD-Regress-ID: ae877064597c349954b1b443769723563cecbc8f
611 commit 48f54b9d12c1c79fba333bc86d455d8f4cda8cfc
612 Author: Damien Miller <djm@mindrot.org>
613 Date: Thu Sep 13 12:13:50 2018 +1000
615 adapt -portable to OpenSSL 1.1x API
617 Polyfill missing API with replacement functions extracted from LibreSSL
619 commit 86112951d63d48839f035b5795be62635a463f99
620 Author: Damien Miller <djm@mindrot.org>
621 Date: Thu Sep 13 12:12:42 2018 +1000
623 forgot to stage these test files in commit d70d061
625 commit 482d23bcacdd3664f21cc82a5135f66fc598275f
626 Author: djm@openbsd.org <djm@openbsd.org>
627 Date: Thu Sep 13 02:08:33 2018 +0000
629 upstream: hold our collective noses and use the openssl-1.1.x API in
631 OpenSSH; feedback and ok tb@ jsing@ markus@
633 OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417
635 commit d70d061828730a56636ab6f1f24fe4a8ccefcfc1
636 Author: djm@openbsd.org <djm@openbsd.org>
637 Date: Wed Sep 12 01:36:45 2018 +0000
639 upstream: Include certs with multiple RSA signature variants in
641 test data Ensure that cert->signature_key is populated correctly
643 OpenBSD-Regress-ID: 56e68f70fe46cb3a193ca207385bdb301fd6603a
645 commit f803b2682992cfededd40c91818b653b5d923ef5
646 Author: djm@openbsd.org <djm@openbsd.org>
647 Date: Wed Sep 12 01:23:48 2018 +0000
649 upstream: test revocation by explicit hash and by fingerprint
651 OpenBSD-Regress-ID: 079c18a9ab9663f4af419327c759fc1e2bc78fd8
653 commit 2de78bc7da70e1338b32feeefcc6045cf49efcd4
654 Author: djm@openbsd.org <djm@openbsd.org>
655 Date: Wed Sep 12 01:22:43 2018 +0000
657 upstream: s/sshkey_demote/sshkey_from_private/g
659 OpenBSD-Regress-ID: 782bde7407d94a87aa8d1db7c23750e09d4443c4
661 commit 41c115a5ea1cb79a6a3182773c58a23f760e8076
662 Author: Damien Miller <djm@mindrot.org>
663 Date: Wed Sep 12 16:50:01 2018 +1000
665 delete the correct thing; kexfuzz binary
667 commit f0fcd7e65087db8c2496f13ed39d772f8e38b088
668 Author: djm@openbsd.org <djm@openbsd.org>
669 Date: Wed Sep 12 06:18:59 2018 +0000
671 upstream: fix edit mistake; spotted by jmc@
673 OpenBSD-Commit-ID: dd724e1c52c9d6084f4cd260ec7e1b2b138261c6
675 commit 4cc259bac699f4d2a5c52b92230f9e488c88a223
676 Author: djm@openbsd.org <djm@openbsd.org>
677 Date: Wed Sep 12 01:34:02 2018 +0000
679 upstream: add SSH_ALLOWED_CA_SIGALGS - the default list of
681 signature algorithms that are allowed for CA signatures. Notably excludes
686 OpenBSD-Commit-ID: 1628e4181dc8ab71909378eafe5d06159a22deb4
688 commit ba9e788315b1f6a350f910cb2a9e95b2ce584e89
689 Author: djm@openbsd.org <djm@openbsd.org>
690 Date: Wed Sep 12 01:32:54 2018 +0000
692 upstream: add sshkey_check_cert_sigtype() that checks a
694 cert->signature_type against a supplied whitelist; ok markus
696 OpenBSD-Commit-ID: caadb8073292ed7a9535e5adc067d11d356d9302
698 commit a70fd4ad7bd9f2ed223ff635a3d41e483057f23b
699 Author: djm@openbsd.org <djm@openbsd.org>
700 Date: Wed Sep 12 01:31:30 2018 +0000
702 upstream: add cert->signature_type field and keep it in sync with
704 certificate signature wrt loading and certification operations; ok markus@
706 OpenBSD-Commit-ID: e8b8b9f76b66707a0cd926109c4383db8f664df3
708 commit 357128ac48630a9970e3af0e6ff820300a28da47
709 Author: djm@openbsd.org <djm@openbsd.org>
710 Date: Wed Sep 12 01:30:10 2018 +0000
712 upstream: Add "ssh -Q sig" to allow listing supported signature
714 algorithms ok markus@
716 OpenBSD-Commit-ID: 7a8c6eb6c249dc37823ba5081fce64876d10fe2b
718 commit 9405c6214f667be604a820c6823b27d0ea77937d
719 Author: djm@openbsd.org <djm@openbsd.org>
720 Date: Wed Sep 12 01:21:34 2018 +0000
722 upstream: allow key revocation by SHA256 hash and allow ssh-keygen
724 to create KRLs using SHA256/base64 key fingerprints; ok markus@
726 OpenBSD-Commit-ID: a0590fd34e7f1141f2873ab3acc57442560e6a94
728 commit 50e2687ee0941c0ea216d6ffea370ffd2c1f14b9
729 Author: djm@openbsd.org <djm@openbsd.org>
730 Date: Wed Sep 12 01:19:12 2018 +0000
732 upstream: log certificate fingerprint in authentication
734 success/failure message (previously we logged only key ID and CA key
739 OpenBSD-Commit-ID: a8ef2d172b7f1ddbcce26d6434b2de6d94f6c05d
741 commit de37ca909487d23e5844aca289b3f5e75d3f1e1f
742 Author: dtucker@openbsd.org <dtucker@openbsd.org>
743 Date: Fri Sep 7 04:26:56 2018 +0000
745 upstream: Add FALLTHROUGH comments where appropriate. Patch from
747 jjelen at redhat via bz#2687.
749 OpenBSD-Commit-ID: c48eb457be697a19d6d2950c6d0879f3ccc851d3
751 commit 247766cd3111d5d8c6ea39833a3257ca8fb820f2
752 Author: djm@openbsd.org <djm@openbsd.org>
753 Date: Fri Sep 7 01:42:54 2018 +0000
755 upstream: ssh -MM requires confirmation for all operations that
757 change the multiplexing state, not just new sessions.
759 mention that confirmation is checked via ssh-askpass
761 OpenBSD-Commit-ID: 0f1b45551ebb9cc5c9a4fe54ad3b23ce90f1f5c2
763 commit db8bb80e3ac1bcb3e1305d846cd98c6b869bf03f
764 Author: mestre@openbsd.org <mestre@openbsd.org>
765 Date: Tue Aug 28 12:25:53 2018 +0000
767 upstream: fix misplaced parenthesis inside if-clause. it's harmless
769 and the only issue is showing an unknown error (since it's not defined)
770 during fatal(), if it ever an error occurs inside that condition.
772 OK deraadt@ markus@ djm@
774 OpenBSD-Commit-ID: acb0a8e6936bfbe590504752d01d1d251a7101d8
776 commit 086cc614f550b7d4f100c95e472a6b6b823938ab
777 Author: mestre@openbsd.org <mestre@openbsd.org>
778 Date: Tue Aug 28 12:17:45 2018 +0000
780 upstream: fix build with DEBUG_PK enabled
784 OpenBSD-Commit-ID: ec1568cf27726e9638a0415481c20c406e7b441c
786 commit 2678833013e97f8b18f09779b7f70bcbf5eb2ab2
787 Author: Darren Tucker <dtucker@dtucker.net>
788 Date: Fri Sep 7 14:41:53 2018 +1000
790 Handle ngroups>_SC_NGROUPS_MAX.
792 Based on github pull request #99 from Darren Maffat at Oracle: Solaris'
793 getgrouplist considers _SC_NGROUPS_MAX more of a guideline and can return
794 a larger number of groups. In this case, retry getgrouplist with a
795 larger array and defer allocating groups_byname. ok djm@
797 commit 039bf2a81797b8f3af6058d34005a4896a363221
798 Author: Darren Tucker <dtucker@dtucker.net>
799 Date: Fri Sep 7 14:06:57 2018 +1000
801 Initial len for the fmt=NULL case.
803 Patch from jjelen at redhat via bz#2687. (OpenSSH never calls
804 setproctitle with a null format so len is always initialized).
806 commit ea9c06e11d2e8fb2f4d5e02f8a41e23d2bd31ca9
807 Author: Darren Tucker <dtucker@dtucker.net>
808 Date: Fri Sep 7 14:01:39 2018 +1000
812 Patch from jjelen at redhat via bz#2687.
814 commit 9617816dbe73ec4d65075f4d897443f63a97c87f
815 Author: Damien Miller <djm@mindrot.org>
816 Date: Mon Aug 27 13:08:01 2018 +1000
818 document some more regress control env variables
820 Specifically SKIP_UNIT, USE_VALGRING and LTESTS. Sort the list of
821 environment variables.
823 Based on patch from Jakub Jelen
825 commit 71508e06fab14bc415a79a08f5535ad7bffa93d9
826 Author: Damien Miller <djm@mindrot.org>
827 Date: Thu Aug 23 15:41:42 2018 +1000
829 shorten temporary SSH_REGRESS_TMP path
831 Previous path was exceeding max socket length on at least one platform (OSX)
833 commit 26739cf5bdc9030a583b41ae5261dedd862060f0
834 Author: Damien Miller <djm@mindrot.org>
835 Date: Thu Aug 23 13:06:02 2018 +1000
839 commit ff729025c7463cf5d0a8d1ca1823306e48c6d4cf
840 Author: Damien Miller <djm@mindrot.org>
841 Date: Thu Aug 23 13:03:32 2018 +1000
843 fix path in distclean target
845 Patch from Jakub Jelen
847 commit 7fef173c28f7462dcd8ee017fdf12b5073f54c02
848 Author: djm@openbsd.org <djm@openbsd.org>
849 Date: Thu Aug 23 03:01:08 2018 +0000
851 upstream: memleak introduced in r1.83; from Colin Watson
853 OpenBSD-Commit-ID: 5c019104c280cbd549a264a7217b67665e5732dc
855 commit b8ae02a2896778b8984c7f51566c7f0f56fa8b56
856 Author: schwarze@openbsd.org <schwarze@openbsd.org>
857 Date: Tue Aug 21 13:56:27 2018 +0000
859 upstream: AIX reports the CODESET as "ISO8859-1" in the POSIX locale.
861 Treating that as a safe encoding is OK because even when other systems return
862 that string for real ISO8859-1, it is still safe in the sense that it is
863 ASCII-compatible and stateless.
865 Issue reported by Val dot Baranov at duke dot edu. Additional
866 information provided by Michael dot Felt at felt dot demon dot nl.
867 Tested by Michael Felt on AIX 6.1 and by Val Baranov on AIX 7.1.
870 OpenBSD-Commit-ID: 36f1210e0b229817d10eb490d6038f507b8256a7
872 commit bc44ee088ad269d232e514f037c87ada4c2fd3f0
873 Author: Tim Rice <tim@multitalents.net>
874 Date: Tue Aug 21 08:57:24 2018 -0700
876 modified: openbsd-compat/port-uw.c
877 remove obsolete and un-needed include
879 commit 829fc28a9c54e3f812ee7248c7a3e31eeb4f0b3a
880 Author: Damien Miller <djm@mindrot.org>
881 Date: Mon Aug 20 15:57:29 2018 +1000
883 Missing unistd.h for regress/mkdtemp.c
885 commit c8313e492355a368a91799131520d92743d8d16c
886 Author: Damien Miller <djm@mindrot.org>
887 Date: Fri Aug 17 05:45:20 2018 +1000
889 update version numbers in anticipation of release
891 commit 477b49a34b89f506f4794b35e3c70b3e2e83cd38
892 Author: Corinna Vinschen <vinschen@redhat.com>
893 Date: Mon Aug 13 17:08:51 2018 +0200
895 configure: work around GCC shortcoming on Cygwin
897 Cygwin's latest 7.x GCC allows to specify -mfunction-return=thunk
898 as well as -mindirect-branch=thunk on the command line, albeit
899 producing invalid code, leading to an error at link stage.
901 The check in configure.ac only checks if the option is present,
902 but not if it produces valid code.
904 This patch fixes it by special-casing Cygwin. Another solution
905 may be to change these to linker checks.
907 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
909 commit b0917945efa374be7648d67dbbaaff323ab39edc
910 Author: Corinna Vinschen <vinschen@redhat.com>
911 Date: Mon Aug 13 17:05:05 2018 +0200
913 cygwin: add missing stdarg.h include
915 Further header file standarization in Cygwin uncovered a lazy
916 indirect include in bsd-cygwin_util.c
918 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
920 commit c3903c38b0fd168ab3d925c2b129d1a599593426
921 Author: djm@openbsd.org <djm@openbsd.org>
922 Date: Mon Aug 13 02:41:05 2018 +0000
924 upstream: revert compat.[ch] section of the following change. It
926 causes double-free under some circumstances.
930 date: 2018/07/31 03:07:24; author: djm; state: Exp; lines: +33 -18; commitid: f7g4UI8eeOXReTPh;
931 fix some memory leaks spotted by Coverity via Jakub Jelen in bz#2366
932 feedback and ok dtucker@
934 OpenBSD-Commit-ID: 1e77547f60fdb5e2ffe23e2e4733c54d8d2d1137
936 commit 1b9dd4aa15208100fbc3650f33ea052255578282
937 Author: djm@openbsd.org <djm@openbsd.org>
938 Date: Sun Aug 12 20:19:13 2018 +0000
940 upstream: better diagnosics on alg list assembly errors; ok
944 OpenBSD-Commit-ID: 5a557e74b839daf13cc105924d2af06a1560faee
946 commit e36a5f61b0f5bebf6d49c215d228cd99dfe86e28
947 Author: Damien Miller <djm@mindrot.org>
948 Date: Sat Aug 11 18:08:45 2018 -0700
950 Some AIX fixes; report from Michael Felt
952 commit 2f4766ceefe6657c5ad5fe92d13c411872acae0e
953 Author: dtucker@openbsd.org <dtucker@openbsd.org>
954 Date: Fri Aug 10 01:35:49 2018 +0000
956 upstream: The script that cooks up PuTTY format host keys does not
958 understand the new key format so convert back to old format to create the
959 PuTTY key and remove it once done.
961 OpenBSD-Regress-ID: 2a449a18846c3a144bc645135b551ba6177e38d3
963 commit e1b26ce504662a5d5b991091228984ccfd25f280
964 Author: djm@openbsd.org <djm@openbsd.org>
965 Date: Fri Aug 10 00:44:01 2018 +0000
969 OpenBSD-Commit-ID: 40d839db0977b4e7ac8b647b16d5411d4faf2f60
971 commit 7c712966a3139622f7fb55045368d05de4e6782c
972 Author: djm@openbsd.org <djm@openbsd.org>
973 Date: Fri Aug 10 00:42:29 2018 +0000
975 upstream: Describe pubkey format, prompted by bz#2853
977 While I'm here, describe and link to the remaining local PROTOCOL.*
978 docs that weren't already mentioned (PROTOCOL.key, PROTOCOL.krl and
981 OpenBSD-Commit-ID: 2a900f9b994ba4d53e7aeb467d44d75829fd1231
983 commit ef100a2c5a8ed83afac0b8f36520815803da227a
984 Author: djm@openbsd.org <djm@openbsd.org>
985 Date: Fri Aug 10 00:27:15 2018 +0000
987 upstream: fix numbering
989 OpenBSD-Commit-ID: bc7a1764dff23fa4c5ff0e3379c9c4d5b63c9596
991 commit ed7bd5d93fe14c7bd90febd29b858ea985d14d45
992 Author: djm@openbsd.org <djm@openbsd.org>
993 Date: Wed Aug 8 01:16:01 2018 +0000
995 upstream: Use new private key format by default. This format is
997 suported by OpenSSH >= 6.5 (released January 2014), so it should be supported
998 by most OpenSSH versions in active use.
1000 It is possible to convert new-format private keys to the older
1001 format using "ssh-keygen -f /path/key -pm PEM".
1005 OpenBSD-Commit-ID: e3bd4f2509a2103bfa2f710733426af3ad6d8ab8
1007 commit 967226a1bdde59ea137e8f0df871854ff7b91366
1008 Author: djm@openbsd.org <djm@openbsd.org>
1009 Date: Sat Aug 4 00:55:06 2018 +0000
1011 upstream: invalidate dh->priv_key after freeing it in error path;
1013 avoids unlikely double-free later. Reported by Viktor Dukhovni via
1014 https://github.com/openssh/openssh-portable/pull/96 feedback jsing@ tb@
1016 OpenBSD-Commit-ID: e317eb17c3e05500ae851f279ef6486f0457c805
1018 commit 74287f5df9966a0648b4a68417451dd18f079ab8
1019 Author: djm@openbsd.org <djm@openbsd.org>
1020 Date: Tue Jul 31 03:10:27 2018 +0000
1022 upstream: delay bailout for invalid authentic
1024 =?UTF-8?q?ating=20user=20until=20after=20the=20packet=20containing=20the?=
1025 =?UTF-8?q?=20request=20has=20been=20fully=20parsed.=20Reported=20by=20Dar?=
1026 =?UTF-8?q?iusz=20Tytko=20and=20Micha=C5=82=20Sajdak;=20ok=20deraadt?=
1028 Content-Type: text/plain; charset=UTF-8
1029 Content-Transfer-Encoding: 8bit
1031 OpenBSD-Commit-ID: b4891882fbe413f230fe8ac8a37349b03bd0b70d
1033 commit 1a66079c0669813306cc69e5776a4acd9fb49015
1034 Author: djm@openbsd.org <djm@openbsd.org>
1035 Date: Tue Jul 31 03:07:24 2018 +0000
1037 upstream: fix some memory leaks spotted by Coverity via Jakub Jelen
1039 in bz#2366 feedback and ok dtucker@
1041 OpenBSD-Commit-ID: 8402bbae67d578bedbadb0ce68ff7c5a136ef563
1043 commit 87f08be054b7eeadbb9cdeb3fb4872be79ccf218
1044 Author: Damien Miller <djm@mindrot.org>
1045 Date: Fri Jul 20 13:18:28 2018 +1000
1047 Remove support for S/Key
1049 Most people will 1) be using modern multi-factor authentication methods
1050 like TOTP/OATH etc and 2) be getting support for multi-factor
1051 authentication via PAM or BSD Auth.
1053 commit 5d14019ba2ff54acbfd20a6b9b96bb860a8c7c31
1054 Author: markus@openbsd.org <markus@openbsd.org>
1055 Date: Fri Jul 27 12:03:17 2018 +0000
1057 upstream: avoid expensive channel_open_message() calls; ok djm@
1059 OpenBSD-Commit-ID: aea3b5512ad681cd8710367d743e8a753d4425d9
1061 commit e655ee04a3cb7999dbf9641b25192353e2b69418
1062 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1063 Date: Fri Jul 27 05:34:42 2018 +0000
1065 upstream: Now that ssh can't be setuid, remove the
1067 original_real_uid and original_effective_uid globals and replace with calls
1068 to plain getuid(). ok djm@
1070 OpenBSD-Commit-ID: 92561c0cd418d34e6841e20ba09160583e27b68c
1072 commit 73ddb25bae4c33a0db361ac13f2e3a60d7c6c4a5
1073 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1074 Date: Fri Jul 27 05:13:02 2018 +0000
1076 upstream: Remove uid checks from low port binds. Now that ssh
1078 cannot be setuid and sshd always has privsep on, we can remove the uid checks
1079 for low port binds and just let the system do the check. We leave a sanity
1080 check for the !privsep case so long as the code is stil there. with & ok
1083 OpenBSD-Commit-ID: 9535cfdbd1cd54486fdbedfaee44ce4367ec7ca0
1085 commit c12033e102760d043bc5c98e6c8180e4d331b0df
1086 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1087 Date: Fri Jul 27 03:55:22 2018 +0000
1089 upstream: ssh(1) no longer supports being setuid root. Remove reference
1091 to crc32 which went with protocol 1. Pointed out by deraadt@.
1093 OpenBSD-Commit-ID: f8763c25fd96ed91dd1abdab5667fd2e27e377b6
1095 commit 4492e2ec4e1956a277ef507f51d66e5c2aafaaf8
1096 Author: Damien Miller <djm@mindrot.org>
1097 Date: Fri Jul 27 14:15:28 2018 +1000
1099 correct snprintf truncation check in closefrom()
1101 Truncation cannot happen unless the system has set PATH_MAX to some
1102 nonsensically low value.
1104 bz#2862, patch from Daniel Le
1106 commit 149cab325a8599a003364ed833f878449c15f259
1107 Author: Darren Tucker <dtucker@dtucker.net>
1108 Date: Fri Jul 27 13:46:06 2018 +1000
1110 Include stdarg.h in mkdtemp for va_list.
1112 commit 6728f31bdfdc864d192773c32465b1860e23f556
1113 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1114 Date: Wed Jul 25 17:12:35 2018 +0000
1116 upstream: Don't redefine Makefile choices which come correct from
1120 OpenBSD-Commit-ID: 814b2f670df75759e1581ecef530980b2b3d7e0f
1122 commit 21fd477a855753c1a8e450963669e28e39c3b5d2
1123 Author: deraadt@openbsd.org <deraadt@openbsd.org>
1124 Date: Wed Jul 25 13:56:23 2018 +0000
1126 upstream: fix indent; Clemens Goessnitzer
1128 OpenBSD-Commit-ID: b5149a6d92b264d35f879d24608087b254857a83
1130 commit 8e433c2083db8664c41499ee146448ea7ebe7dbf
1131 Author: beck@openbsd.org <beck@openbsd.org>
1132 Date: Wed Jul 25 13:10:56 2018 +0000
1134 upstream: Use the caller provided (copied) pwent struct in
1136 load_public_identity_files instead of calling getpwuid() again and discarding
1137 the argument. This prevents a client crash where tilde_expand_filename calls
1138 getpwuid() again before the pwent pointer is used. Issue noticed and reported
1139 by Pierre-Olivier Martel <pom@apple.com> ok djm@ deraadt@
1141 OpenBSD-Commit-ID: a067d74b5b098763736c94cc1368de8ea3f0b157
1143 commit e2127abb105ae72b6fda64fff150e6b24b3f1317
1144 Author: jmc@openbsd.org <jmc@openbsd.org>
1145 Date: Mon Jul 23 19:53:55 2018 +0000
1147 upstream: oops, failed to notice that SEE ALSO got messed up;
1149 OpenBSD-Commit-ID: 61c1306542cefdc6e59ac331751afe961557427d
1151 commit ddf1b797c2d26bbbc9d410aa4f484cbe94673587
1152 Author: kn@openbsd.org <kn@openbsd.org>
1153 Date: Mon Jul 23 19:02:49 2018 +0000
1155 upstream: Point to glob in section 7 for the actual list of special
1157 characters instead the C API in section 3.
1159 OK millert jmc nicm, "the right idea" deraadt
1161 OpenBSD-Commit-ID: a74fd215488c382809e4d041613aeba4a4b1ffc6
1163 commit 01c98d9661d0ed6156e8602b650f72eed9fc4d12
1164 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1165 Date: Sun Jul 22 12:16:59 2018 +0000
1167 upstream: Switch authorized_keys example from ssh-dss to ssh-rsa
1169 since the former is no longer enabled by default. Pointed out by Daniel A.
1172 OpenBSD-Commit-ID: 6a196cef53d7524e0c9b58cdbc1b5609debaf8c7
1174 commit 472269f8fe19343971c2d08f504ab5cbb8234b33
1175 Author: djm@openbsd.org <djm@openbsd.org>
1176 Date: Fri Jul 20 05:01:10 2018 +0000
1178 upstream: slightly-clearer description for AuthenticationMethods - the
1180 lists have comma-separated elements; bz#2663 from Hans Meier
1182 OpenBSD-Commit-ID: 931c983d0fde4764d0942fb2c2b5017635993b5a
1184 commit c59aca8adbdf7f5597084ad360a19bedb3f80970
1185 Author: Damien Miller <djm@mindrot.org>
1186 Date: Fri Jul 20 14:53:42 2018 +1000
1188 Create control sockets in clean temp directories
1190 Adds a regress/mkdtemp tool and uses it to create empty temp
1191 directories for tests needing control sockets.
1193 Patch from Colin Watson via bz#2660; ok dtucker
1195 commit 6ad8648e83e4f4ace37b742a05c2a6b6b872514e
1196 Author: djm@openbsd.org <djm@openbsd.org>
1197 Date: Fri Jul 20 03:46:34 2018 +0000
1199 upstream: remove unused zlib.h
1201 OpenBSD-Commit-ID: 8d274a9b467c7958df12668b49144056819f79f1
1203 commit 3ba6e6883527fe517b6e4a824876e2fe62af22fc
1204 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1205 Date: Thu Jul 19 23:03:16 2018 +0000
1207 upstream: Fix typo in comment. From Alexandru Iacob via github.
1209 OpenBSD-Commit-ID: eff4ec07c6c8c5483533da43a4dda37d72ef7f1d
1211 commit c77bc73c91bc656e343a1961756e09dd1b170820
1212 Author: Darren Tucker <dtucker@dtucker.net>
1213 Date: Fri Jul 20 13:48:51 2018 +1000
1215 Explicitly include openssl before zlib.
1217 Some versions of OpenSSL have "free_func" in their headers, which zlib
1218 typedefs. Including openssl after zlib (eg via sshkey.h) results in
1219 "syntax error before `free_func'", which this fixes.
1221 commit 95d41e90eafcd1286a901e8e361e4a37b98aeb52
1222 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1223 Date: Thu Jul 19 10:28:47 2018 +0000
1225 upstream: Deprecate UsePrivilegedPort now that support for running
1227 ssh(1) setuid has been removed, remove supporting code and clean up
1228 references to it in the man pages
1230 We have not shipped ssh(1) the setuid bit since 2002. If ayone
1231 really needs to make connections from a low port number this can
1232 be implemented via a small setuid ProxyCommand.
1234 ok markus@ jmc@ djm@
1236 OpenBSD-Commit-ID: d03364610b7123ae4c6792f5274bd147b6de717e
1238 commit 258dc8bb07dfb35a46e52b0822a2c5b7027df60a
1239 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1240 Date: Wed Jul 18 11:34:04 2018 +0000
1242 upstream: Remove support for running ssh(1) setuid and fatal if
1244 attempted. Do not link uidwap.c into ssh any more. Neuters
1245 UsePrivilegedPort, which will be marked as deprecated shortly. ok markus@
1248 OpenBSD-Commit-ID: c4ba5bf9c096f57a6ed15b713a1d7e9e2e373c42
1250 commit ac590760b251506b0a152551abbf8e8d6dc2f527
1251 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1252 Date: Mon Jul 16 22:25:01 2018 +0000
1254 upstream: Slot 0 in the hostbased key array was previously RSA1,
1256 but that is now gone and the slot is unused so remove it. Remove two
1257 now-unused macros, and add an array bounds check to the two remaining ones
1258 (array is statically sized, so mostly a safety check on future changes). ok
1261 OpenBSD-Commit-ID: 2e4c0ca6cc1d8daeccead2aa56192a3f9d5e1e7a
1263 commit 26efc2f5df0e3bcf6a6bbdd0506fd682d60c2145
1264 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1265 Date: Mon Jul 16 11:05:41 2018 +0000
1267 upstream: Remove support for loading HostBasedAuthentication keys
1269 directly in ssh(1) and always use ssh-keysign. This removes one of the few
1270 remaining reasons why ssh(1) might be setuid. ok markus@
1272 OpenBSD-Commit-ID: 97f01e1448707129a20d75f86bad5d27c3cf0b7d
1274 commit 3eb7f1038d17af7aea3c2c62d1e30cd545607640
1275 Author: djm@openbsd.org <djm@openbsd.org>
1276 Date: Mon Jul 16 07:06:50 2018 +0000
1278 upstream: keep options.identity_file_userprovided array in sync when we
1280 load keys, fixing some spurious error messages; ok markus
1282 OpenBSD-Commit-ID: c63e3d5200ee2cf9e35bda98de847302566c6a00
1284 commit 2f131e1b34502aa19f345e89cabf6fa3fc097f09
1285 Author: djm@openbsd.org <djm@openbsd.org>
1286 Date: Mon Jul 16 03:09:59 2018 +0000
1288 upstream: memleak in unittest; found by valgrind
1290 OpenBSD-Regress-ID: 168c23b0fb09fc3d0b438628990d3fd9260a8a5e
1292 commit de2997a4cf22ca0a524f0e5b451693c583e2fd89
1293 Author: djm@openbsd.org <djm@openbsd.org>
1294 Date: Mon Jul 16 03:09:13 2018 +0000
1296 upstream: memleaks; found by valgrind
1298 OpenBSD-Commit-ID: 6c3ba22be53e753c899545f771e8399fc93cd844
1300 commit 61cc0003eb37fa07603c969c12b7c795caa498f3
1301 Author: Darren Tucker <dtucker@dtucker.net>
1302 Date: Sat Jul 14 16:49:01 2018 +1000
1304 Undef a few new macros in sys-queue.h.
1306 Prevents macro redefinition warnings on OSX.
1308 commit 30a2c213877a54a44dfdffb6ca8db70be5b457e0
1309 Author: Darren Tucker <dtucker@dtucker.net>
1310 Date: Fri Jul 13 13:40:20 2018 +1000
1312 Include unistd.h for geteuid declaration.
1314 commit 1dd32c23f2a85714dfafe2a9cc516971d187caa4
1315 Author: Darren Tucker <dtucker@dtucker.net>
1316 Date: Fri Jul 13 13:38:10 2018 +1000
1318 Fallout from buffer conversion in AUDIT_EVENTS.
1320 Supply missing "int r" and fix error path for sshbuf_new().
1322 commit 7449c178e943e5c4f6c8416a4e41d93b70c11c9e
1323 Author: djm@openbsd.org <djm@openbsd.org>
1324 Date: Fri Jul 13 02:13:50 2018 +0000
1326 upstream: make this use ssh_proxy rather than starting/stopping a
1328 daemon for each testcase
1330 OpenBSD-Regress-ID: 608b7655ea65b1ba8fff5a13ce9caa60ef0c8166
1332 commit dbab02f9208d9baa134cec1d007054ec82b96ca9
1333 Author: djm@openbsd.org <djm@openbsd.org>
1334 Date: Fri Jul 13 02:13:19 2018 +0000
1336 upstream: fix leaks in unit test; with this, all unit tests are
1338 leak free (as far as valgrind can spot anyway)
1340 OpenBSD-Regress-ID: b824d8b27998365379963440e5d18b95ca03aa17
1342 commit 2f6accff5085eb79b0dbe262d8b85ed017d1a51c
1343 Author: Damien Miller <djm@mindrot.org>
1344 Date: Fri Jul 13 11:39:25 2018 +1000
1346 Enable leak checks for unit tests with valgrind
1348 Leave the leak checking on unconditionally when running with valgrind.
1349 The unit tests are leak-free and I want them to stay that way.
1351 commit e46cfbd9db5e907b821bf4fd0184d4dab99815ee
1352 Author: Damien Miller <djm@mindrot.org>
1353 Date: Fri Jul 13 11:38:59 2018 +1000
1355 increase timeout to match cfgmatch.sh
1357 lets test pass under valgrind (on my workstation at least)
1359 commit 6aa1bf475cf3e7a2149acc5a1e80e904749f064c
1360 Author: Damien Miller <djm@mindrot.org>
1361 Date: Thu Jul 12 14:54:18 2018 +1000
1363 rm regress/misc/kexfuzz/*.o in distclean target
1365 commit eef1447ddb559c03725a23d4aa6d03f40e8b0049
1366 Author: Damien Miller <djm@mindrot.org>
1367 Date: Thu Jul 12 14:49:26 2018 +1000
1369 repair !WITH_OPENSSL build
1371 commit 4d3b2f36fd831941d1627ac587faae37b6d3570f
1372 Author: Damien Miller <djm@mindrot.org>
1373 Date: Thu Jul 12 14:49:14 2018 +1000
1377 commit 3f420a692b293921216549c1099c2e46ff284eae
1378 Author: Darren Tucker <dtucker@dtucker.net>
1379 Date: Thu Jul 12 14:57:46 2018 +1000
1381 Remove key.h from portable files too.
1383 Commit 5467fbcb removed key.h so stop including it in portable files
1384 too. Fixes builds on lots of platforms.
1386 commit e2c4af311543093f16005c10044f7e06af0426f0
1387 Author: djm@openbsd.org <djm@openbsd.org>
1388 Date: Thu Jul 12 04:35:25 2018 +0000
1390 upstream: remove prototype to long-gone function
1392 OpenBSD-Commit-ID: 0414642ac7ce01d176b9f359091a66a8bbb640bd
1394 commit 394a842e60674bf8ee5130b9f15b01452a0b0285
1395 Author: markus@openbsd.org <markus@openbsd.org>
1396 Date: Wed Jul 11 18:55:11 2018 +0000
1398 upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@
1400 OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3
1402 commit 5467fbcb09528ecdcb914f4f2452216c24796790
1403 Author: markus@openbsd.org <markus@openbsd.org>
1404 Date: Wed Jul 11 18:53:29 2018 +0000
1406 upstream: remove legacy key emulation layer; ok djm@
1408 OpenBSD-Commit-ID: 2b1f9619259e222bbd4fe9a8d3a0973eafb9dd8d
1410 commit 5dc4c59d5441a19c99e7945779f7ec9051126c25
1411 Author: martijn@openbsd.org <martijn@openbsd.org>
1412 Date: Wed Jul 11 08:19:35 2018 +0000
1414 upstream: s/wuth/with/ in comment
1416 OpenBSD-Commit-ID: 9de41468afd75f54a7f47809d2ad664aa577902c
1418 commit 1c688801e9dd7f9889fb2a29bc2b6fbfbc35a11f
1419 Author: Darren Tucker <dtucker@dtucker.net>
1420 Date: Wed Jul 11 12:12:38 2018 +1000
1422 Include stdlib.h for declaration of free.
1424 Fixes build with -Werror on at least Fedora and probably others.
1426 commit fccfa239def497615f92ed28acc57cfe63da3666
1427 Author: Damien Miller <djm@mindrot.org>
1428 Date: Wed Jul 11 10:19:56 2018 +1000
1430 VALGRIND_CHECK_LEAKS logic was backwards :(
1432 commit 416287d45fcde0a8e66eee8b99aa73bd58607588
1433 Author: Darren Tucker <dtucker@dtucker.net>
1434 Date: Wed Jul 11 10:10:26 2018 +1000
1436 Fix sshbuf_new error path in skey.
1438 commit 7aab109b8b90a353c1af780524f1ac0d3af47bab
1439 Author: Darren Tucker <dtucker@dtucker.net>
1440 Date: Wed Jul 11 10:06:18 2018 +1000
1442 Supply missing third arg in skey.
1444 During the change to the new buffer api the third arg to
1445 sshbuf_get_cstring was ommitted. Fixes build when configured with skey.
1447 commit 380320bb72cc353a901790ab04b6287fd335dc4a
1448 Author: Darren Tucker <dtucker@dtucker.net>
1449 Date: Wed Jul 11 10:03:34 2018 +1000
1451 Supply some more missing "int r" in skey
1453 commit d20720d373d8563ee737d1a45dc5e0804d622dbc
1454 Author: Damien Miller <djm@mindrot.org>
1455 Date: Wed Jul 11 09:56:36 2018 +1000
1457 disable valgrind memleak checking by default
1459 Add VALGRIND_CHECK_LEAKS knob to turn it back on.
1461 commit 79c9d35018f3a5e30ae437880b669aa8636cd3cd
1462 Author: Darren Tucker <dtucker@dtucker.net>
1463 Date: Wed Jul 11 09:54:00 2018 +1000
1465 Supply missing "int r" in skey code.
1467 commit 984bacfaacbbe31c35191b828fb5b5b2f0362c36
1468 Author: sf@openbsd.org <sf@openbsd.org>
1469 Date: Tue Jul 10 09:36:58 2018 +0000
1471 upstream: re-remove some pre-auth compression bits
1473 This time, make sure to not remove things that are necessary for
1474 pre-auth compression on the client. Add a comment that pre-auth
1475 compression is still supported in the client.
1479 OpenBSD-Commit-ID: 282c6fec7201f18a5c333bbb68d9339734d2f784
1481 commit 120a1ec74e8d9d29f4eb9a27972ddd22351ddef9
1482 Author: Damien Miller <djm@mindrot.org>
1483 Date: Tue Jul 10 19:39:52 2018 +1000
1485 Adapt portable to legacy buffer API removal
1487 commit 0f3958c1e6ffb8ea4ba27e2a97a00326fce23246
1488 Author: djm@openbsd.org <djm@openbsd.org>
1489 Date: Tue Jul 10 09:13:30 2018 +0000
1491 upstream: kerberos/gssapi fixes for buffer removal
1493 OpenBSD-Commit-ID: 1cdf56fec95801e4563c47f21696f04cd8b60c4c
1495 commit c74ae8e7c45f325f3387abd48fa7dfef07a08069
1496 Author: djm@openbsd.org <djm@openbsd.org>
1497 Date: Tue Jul 10 06:45:29 2018 +0000
1499 upstream: buffer.[ch] and bufaux.c are no more
1501 OpenBSD-Commit-ID: d1a1852284e554f39525eb4d4891b207cfb3d3a0
1503 commit a881e5a133d661eca923fb0633a03152ab2b70b2
1504 Author: djm@openbsd.org <djm@openbsd.org>
1505 Date: Tue Jul 10 06:43:52 2018 +0000
1507 upstream: one mention of Buffer that almost got away :)
1509 OpenBSD-Commit-ID: 30d7c27a90b4544ad5dfacf654595710cd499f02
1511 commit 49f47e656b60bcd1d1db98d88105295f4b4e600d
1512 Author: markus@openbsd.org <markus@openbsd.org>
1513 Date: Mon Jul 9 21:59:10 2018 +0000
1515 upstream: replace cast with call to sshbuf_mutable_ptr(); ok djm@
1517 OpenBSD-Commit-ID: 4dfe9d29fa93d9231645c89084f7217304f7ba29
1519 commit cb30cd47041edb03476be1c8ef7bc1f4b69d1555
1520 Author: markus@openbsd.org <markus@openbsd.org>
1521 Date: Mon Jul 9 21:56:06 2018 +0000
1523 upstream: remove legacy buffer API emulation layer; ok djm@
1525 OpenBSD-Commit-ID: 2dd5dc17cbc23195be4299fa93be2707a0e08ad9
1527 commit 235c7c4e3bf046982c2d8242f30aacffa01073d1
1528 Author: markus@openbsd.org <markus@openbsd.org>
1529 Date: Mon Jul 9 21:53:45 2018 +0000
1531 upstream: sshd: switch monitor to sshbuf API; lots of help & ok
1535 OpenBSD-Commit-ID: d89bd02d33974fd35ca0b8940d88572227b34a48
1537 commit b8d9214d969775e409e1408ecdf0d58fad99b344
1538 Author: markus@openbsd.org <markus@openbsd.org>
1539 Date: Mon Jul 9 21:37:55 2018 +0000
1541 upstream: sshd: switch GSSAPI to sshbuf API; ok djm@
1543 OpenBSD-Commit-ID: e48449ab4be3f006f7ba33c66241b7d652973e30
1545 commit c7d39ac8dc3587c5f05bdd5bcd098eb5c201c0c8
1546 Author: markus@openbsd.org <markus@openbsd.org>
1547 Date: Mon Jul 9 21:35:50 2018 +0000
1549 upstream: sshd: switch authentication to sshbuf API; ok djm@
1551 OpenBSD-Commit-ID: 880aa06bce4b140781e836bb56bec34873290641
1553 commit c3cb7790e9efb14ba74b2d9f543ad593b3d55b31
1554 Author: markus@openbsd.org <markus@openbsd.org>
1555 Date: Mon Jul 9 21:29:36 2018 +0000
1557 upstream: sshd: switch config to sshbuf API; ok djm@
1559 OpenBSD-Commit-ID: 72b02017bac7feac48c9dceff8355056bea300bd
1561 commit 2808d18ca47ad3d251836c555f0e22aaca03d15c
1562 Author: markus@openbsd.org <markus@openbsd.org>
1563 Date: Mon Jul 9 21:26:02 2018 +0000
1565 upstream: sshd: switch loginmsg to sshbuf API; ok djm@
1567 OpenBSD-Commit-ID: f3cb4e54bff15c593602d95cc43e32ee1a4bac42
1569 commit 89dd615b8b531979be63f05f9d5624367c9b28e6
1570 Author: markus@openbsd.org <markus@openbsd.org>
1571 Date: Mon Jul 9 21:20:26 2018 +0000
1573 upstream: ttymodes: switch to sshbuf API; ok djm@
1575 OpenBSD-Commit-ID: 5df340c5965e822c9da21e19579d08dea3cbe429
1577 commit f4608a7065480516ab46214f554e5f853fb7870f
1578 Author: markus@openbsd.org <markus@openbsd.org>
1579 Date: Mon Jul 9 21:18:10 2018 +0000
1581 upstream: client: switch mux to sshbuf API; with & ok djm@
1583 OpenBSD-Commit-ID: 5948fb98d704f9c4e075b92edda64e0290b5feb2
1585 commit cecee2d607099a7bba0a84803e2325d15be4277b
1586 Author: markus@openbsd.org <markus@openbsd.org>
1587 Date: Mon Jul 9 21:03:30 2018 +0000
1589 upstream: client: switch to sshbuf API; ok djm@
1591 OpenBSD-Commit-ID: 60cb0356114acc7625ab85105f6f6a7cd44a8d05
1593 commit ff55f4ad898137d4703e7a2bcc81167dfe8e9324
1594 Author: markus@openbsd.org <markus@openbsd.org>
1595 Date: Mon Jul 9 20:39:28 2018 +0000
1597 upstream: pkcs11: switch to sshbuf API; ok djm@
1599 OpenBSD-Commit-ID: 98cc4e800f1617c51caf59a6cb3006f14492db79
1601 commit 168b46f405d6736960ba7930389eecb9b6710b7e
1602 Author: sf@openbsd.org <sf@openbsd.org>
1603 Date: Mon Jul 9 13:37:10 2018 +0000
1605 upstream: Revert previous two commits
1607 It turns out we still support pre-auth compression on the client.
1608 Therefore revert the previous two commits:
1610 date: 2018/07/06 09:06:14; author: sf; commitid: yZVYKIRtUZWD9CmE;
1611 Rename COMP_DELAYED to COMP_ZLIB
1613 Only delayed compression is supported nowadays.
1617 date: 2018/07/06 09:05:01; author: sf; commitid: rEGuT5UgI9f6kddP;
1618 Remove leftovers from pre-authentication compression
1620 Support for this has been removed in 2016.
1621 COMP_DELAYED will be renamed in a later commit.
1625 OpenBSD-Commit-ID: cdfef526357e4e1483c86cf599491b2dafb77772
1627 commit ab39267fa1243d02b6c330615539fc4b21e17dc4
1628 Author: sf@openbsd.org <sf@openbsd.org>
1629 Date: Fri Jul 6 09:06:14 2018 +0000
1631 upstream: Rename COMP_DELAYED to COMP_ZLIB
1633 Only delayed compression is supported nowadays.
1637 OpenBSD-Commit-ID: 5b1dbaf3d9a4085aaa10fec0b7a4364396561821
1639 commit 95db395d2e56a6f868193aead6cadb2493f036c6
1640 Author: sf@openbsd.org <sf@openbsd.org>
1641 Date: Fri Jul 6 09:05:01 2018 +0000
1643 upstream: Remove leftovers from pre-authentication compression
1645 Support for this has been removed in 2016.
1646 COMP_DELAYED will be renamed in a later commit.
1650 OpenBSD-Commit-ID: 6a99616c832627157113fcb0cf5a752daf2e6b58
1652 commit f28a4d5cd24c4aa177e96b4f96957991e552cb70
1653 Author: sf@openbsd.org <sf@openbsd.org>
1654 Date: Fri Jul 6 09:03:02 2018 +0000
1656 upstream: Remove unused ssh_packet_start_compression()
1660 OpenBSD-Commit-ID: 9d34cf2f59aca5422021ae2857190578187dc2b4
1662 commit 872517ddbb72deaff31d4760f28f2b0a1c16358f
1663 Author: Darren Tucker <dtucker@dtucker.net>
1664 Date: Fri Jul 6 13:32:02 2018 +1000
1666 Defer setting bufsiz in getdelim.
1668 Do not write to bufsiz until we are sure the malloc has succeeded,
1669 in case any callers rely on it (which they shouldn't). ok djm@
1671 commit 3deb56f7190a414dc264e21e087a934fa1847283
1672 Author: Darren Tucker <dtucker@dtucker.net>
1673 Date: Thu Jul 5 13:32:01 2018 +1000
1675 Fix other callers of read_environment_file.
1677 read_environment_file recently gained an extra argument Some platform
1678 specific code also calls it so add the argument to those too. Fixes
1679 build on Solaris and AIX.
1681 commit 314908f451e6b2d4ccf6212ad246fa4619c721d3
1682 Author: djm@openbsd.org <djm@openbsd.org>
1683 Date: Wed Jul 4 13:51:45 2018 +0000
1685 upstream: deal with API rename: match_filter_list() =>
1687 match_filter_blacklist()
1689 OpenBSD-Regress-ID: 2da342be913efeb51806351af906fab01ba4367f
1691 commit 89f54cdf6b9cf1cf5528fd33897f1443913ddfb4
1692 Author: djm@openbsd.org <djm@openbsd.org>
1693 Date: Wed Jul 4 13:51:12 2018 +0000
1695 upstream: exercise new expansion behaviour of
1697 PubkeyAcceptedKeyTypes and, by proxy, test kex_assemble_names()
1701 OpenBSD-Regress-ID: 292978902e14d5729aa87e492dd166c842f72736
1703 commit 187633f24c71564e970681c8906df5a6017dcccf
1704 Author: djm@openbsd.org <djm@openbsd.org>
1705 Date: Tue Jul 3 13:53:26 2018 +0000
1707 upstream: add a comment that could have saved me 45 minutes of wild
1711 OpenBSD-Regress-ID: d469b29ffadd3402c090e21b792d627d46fa5297
1713 commit 312d2f2861a2598ed08587cb6c45c0e98a85408f
1714 Author: djm@openbsd.org <djm@openbsd.org>
1715 Date: Wed Jul 4 13:49:31 2018 +0000
1717 upstream: repair PubkeyAcceptedKeyTypes (and friends) after RSA
1719 signature work - returns ability to add/remove/specify algorithms by
1722 Algorithm lists are now fully expanded when the server/client configs
1723 are finalised, so errors are reported early and the config dumps
1724 (e.g. "ssh -G ...") now list the actual algorithms selected.
1726 Clarify that, while wildcards are accepted in algorithm lists, they
1727 aren't full pattern-lists that support negation.
1729 (lots of) feedback, ok markus@
1731 OpenBSD-Commit-ID: a8894c5c81f399a002f02ff4fe6b4fa46b1f3207
1733 commit 303af5803bd74bf05d375c04e1a83b40c30b2be5
1734 Author: djm@openbsd.org <djm@openbsd.org>
1735 Date: Tue Jul 3 11:43:49 2018 +0000
1737 upstream: some magic for RSA-SHA2 checks
1739 OpenBSD-Regress-ID: e5a9b11368ff6d86e7b25ad10ebe43359b471cd4
1741 commit 7d68e262944c1fff1574600fe0e5e92ec8b398f5
1742 Author: Damien Miller <djm@mindrot.org>
1743 Date: Tue Jul 3 23:27:11 2018 +1000
1747 commit b4d4eda633af433d20232cbf7e855ceac8b83fe5
1748 Author: djm@openbsd.org <djm@openbsd.org>
1749 Date: Tue Jul 3 13:20:25 2018 +0000
1751 upstream: some finesse to fix RSA-SHA2 certificate authentication
1753 for certs hosted in ssh-agent
1755 OpenBSD-Commit-ID: e5fd5edd726137dda2d020e1cdebc464110a010f
1757 commit d78b75df4a57e0f92295f24298e5f2930e71c172
1758 Author: djm@openbsd.org <djm@openbsd.org>
1759 Date: Tue Jul 3 13:07:58 2018 +0000
1761 upstream: check correct variable; unbreak agent keys
1763 OpenBSD-Commit-ID: c36981fdf1f3ce04966d3310826a3e1e6233d93e
1765 commit 2f30300c5e15929d0e34013f38d73e857f445e12
1766 Author: djm@openbsd.org <djm@openbsd.org>
1767 Date: Tue Jul 3 11:42:12 2018 +0000
1769 upstream: crank version number to 7.8; needed for new compat flag
1771 for prior version; part of RSA-SHA2 strictification, ok markus@
1773 OpenBSD-Commit-ID: 84a11fc0efd2674c050712336b5093f5d408e32b
1775 commit 4ba0d54794814ec0de1ec87987d0c3b89379b436
1776 Author: djm@openbsd.org <djm@openbsd.org>
1777 Date: Tue Jul 3 11:39:54 2018 +0000
1779 upstream: Improve strictness and control over RSA-SHA2 signature
1781 In ssh, when an agent fails to return a RSA-SHA2 signature when
1782 requested and falls back to RSA-SHA1 instead, retry the signature to
1783 ensure that the public key algorithm sent in the SSH_MSG_USERAUTH
1784 matches the one in the signature itself.
1786 In sshd, strictly enforce that the public key algorithm sent in the
1787 SSH_MSG_USERAUTH message matches what appears in the signature.
1789 Make the sshd_config PubkeyAcceptedKeyTypes and
1790 HostbasedAcceptedKeyTypes options control accepted signature algorithms
1791 (previously they selected supported key types). This allows these
1792 options to ban RSA-SHA1 in favour of RSA-SHA2.
1794 Add new signature algorithms "rsa-sha2-256-cert-v01@openssh.com" and
1795 "rsa-sha2-512-cert-v01@openssh.com" to force use of RSA-SHA2 signatures
1796 with certificate keys.
1798 feedback and ok markus@
1800 OpenBSD-Commit-ID: c6e9f6d45eed8962ad502d315d7eaef32c419dde
1802 commit 95344c257412b51199ead18d54eaed5bafb75617
1803 Author: djm@openbsd.org <djm@openbsd.org>
1804 Date: Tue Jul 3 10:59:35 2018 +0000
1806 upstream: allow sshd_config PermitUserEnvironment to accept a
1808 pattern-list of whitelisted environment variable names in addition to yes|no.
1810 bz#1800, feedback and ok markus@
1812 OpenBSD-Commit-ID: 77dc2b468e0bf04b53f333434ba257008a1fdf24
1814 commit 6f56fe4b9578b0627667f8bce69d4d938a88324c
1815 Author: millert@openbsd.org <millert@openbsd.org>
1816 Date: Tue Jun 26 11:23:59 2018 +0000
1818 upstream: Fix "WARNING: line 6 disappeared in /etc/moduli, giving up"
1820 when choosing a prime. An extra increment of linenum snuck in as part of the
1821 conversion to getline(). OK djm@ markus@
1823 OpenBSD-Commit-ID: 0019225cb52ed621b71cd9f19ee2e78e57e3dd38
1825 commit 1eee79a11c1b3594f055b01e387c49c9a6e80005
1826 Author: dtucker@openbsd.org <dtucker@openbsd.org>
1827 Date: Mon Jul 2 14:13:30 2018 +0000
1829 upstream: One ampersand is enough to backgroud an process. OpenBSD
1831 doesn't seem to mind, but some platforms in -portable object to the second.
1833 OpenBSD-Regress-ID: d6c3e404871764343761dc25c3bbe29c2621ff74
1835 commit 6301e6c787d4e26bfae1119ab4f747bbcaa94e44
1836 Author: Darren Tucker <dtucker@dtucker.net>
1837 Date: Mon Jul 2 21:16:58 2018 +1000
1839 Add implementation of getline.
1841 Add getline for the benefit of platforms that don't have it. Sourced
1842 from NetBSD (OpenBSD's implementation is a little too chummy with the
1845 commit 84623e0037628f9992839063151f7a9f5f13099a
1846 Author: djm@openbsd.org <djm@openbsd.org>
1847 Date: Tue Jun 26 02:02:36 2018 +0000
1849 upstream: whitespace
1851 OpenBSD-Commit-ID: 9276951caf4daf555f6d262e95720e7f79244572
1853 commit 90e51d672711c19a36573be1785caf35019ae7a8
1854 Author: djm@openbsd.org <djm@openbsd.org>
1855 Date: Mon Jun 25 22:28:33 2018 +0000
1857 upstream: fix NULL dereference in open_listen_match_tcpip()
1859 OpenBSD-Commit-ID: c968c1d29e392352383c0f9681fcc1e93620c4a9
1861 commit f535ff922a67d9fcc5ee69d060d1b21c8bb01d14
1862 Author: jmc@openbsd.org <jmc@openbsd.org>
1863 Date: Tue Jun 19 05:36:57 2018 +0000
1867 OpenBSD-Commit-ID: db542918185243bea17202383a581851736553cc
1869 commit 80e199d6175904152aafc5c297096c3e18297691
1870 Author: djm@openbsd.org <djm@openbsd.org>
1871 Date: Tue Jun 19 03:02:17 2018 +0000
1873 upstream: test PermitListen with bare port numbers
1875 OpenBSD-Regress-ID: 4b50a02dfb0ccaca08247f3877c444126ba901b3
1877 commit 87ddd676da0f3abd08b778b12b53b91b670dc93c
1878 Author: djm@openbsd.org <djm@openbsd.org>
1879 Date: Tue Jun 19 02:59:41 2018 +0000
1881 upstream: allow bare port numbers to appear in PermitListen directives,
1885 PermitListen 2222 8080
1889 PermitListen *:2222 *:8080
1891 Some bonus manpage improvements, mostly from markus@
1893 "looks fine" markus@
1895 OpenBSD-Commit-ID: 6546b0cc5aab7f53d65ad0a348ca0ae591d6dd24
1897 commit 26f96ca10ad0ec5da9b05b99de1e1ccea15a11be
1898 Author: djm@openbsd.org <djm@openbsd.org>
1899 Date: Fri Jun 15 07:01:11 2018 +0000
1901 upstream: invalidate supplemental group cache used by
1903 temporarily_use_uid() when the target uid differs; could cause failure to
1904 read authorized_keys under some configurations. patch by Jakub Jelen via
1905 bz2873; ok dtucker, markus
1907 OpenBSD-Commit-ID: 48a345f0ee90f6c465a078eb5e89566b23abd8a1
1909 commit 89a85d724765b6b82e0135ee5a1181fdcccea9c6
1910 Author: djm@openbsd.org <djm@openbsd.org>
1911 Date: Sun Jun 10 23:45:41 2018 +0000
1913 upstream: unbreak SendEnv; patch from tb@
1915 OpenBSD-Commit-ID: fc808daced813242563b80976e1478de95940056
1917 commit acf4260f0951f89c64e1ebbc4c92f451768871ad
1918 Author: jmc@openbsd.org <jmc@openbsd.org>
1919 Date: Sat Jun 9 06:36:31 2018 +0000
1921 upstream: sort previous;
1923 OpenBSD-Commit-ID: 27d80d8b8ca99bc33971dee905e8ffd0053ec411
1925 commit 1678d4236451060b735cb242d2e26e1ac99f0947
1926 Author: djm@openbsd.org <djm@openbsd.org>
1927 Date: Sat Jun 9 03:18:11 2018 +0000
1929 upstream: slightly better wording re handing of $TERM, from Jakub
1933 OpenBSD-Commit-ID: 14bea3f069a93c8be66a7b97794255a91fece964
1935 commit 28013759f09ed3ebf7e8335e83a62936bd7a7f47
1936 Author: djm@openbsd.org <djm@openbsd.org>
1937 Date: Sat Jun 9 03:03:10 2018 +0000
1939 upstream: add a SetEnv directive for sshd_config to allow an
1941 administrator to explicitly specify environment variables set in sessions
1942 started by sshd. These override the default environment and any variables set
1943 by user configuration (PermitUserEnvironment, etc), but not the SSH_*
1944 variables set by sshd itself.
1948 OpenBSD-Commit-ID: b6a96c0001ccd7dd211df6cae9e961c20fd718c0
1950 commit 7082bb58a2eb878d23ec674587c742e5e9673c36
1951 Author: djm@openbsd.org <djm@openbsd.org>
1952 Date: Sat Jun 9 03:01:12 2018 +0000
1954 upstream: add a SetEnv directive to ssh_config that allows setting
1956 environment variables for the remote session (subject to the server accepting
1959 refactor SendEnv to remove the arbitrary limit of variable names.
1963 OpenBSD-Commit-ID: cfbb00d9b0e10c1ffff1d83424351fd961d1f2be
1965 commit 3b9798bda15bd3f598f5ef07595d64e23504da91
1966 Author: djm@openbsd.org <djm@openbsd.org>
1967 Date: Sat Jun 9 02:58:02 2018 +0000
1969 upstream: reorder child environment preparation so that variables
1971 read from ~/.ssh/environment (if enabled) do not override SSH_* variables set
1974 OpenBSD-Commit-ID: 59f9d4c213cdcef2ef21f4b4ae006594dcf2aa7a
1976 commit 0368889f82f63c82ff8db9f8c944d89e7c657db4
1977 Author: djm@openbsd.org <djm@openbsd.org>
1978 Date: Fri Jun 8 03:35:36 2018 +0000
1980 upstream: fix incorrect expansion of %i in
1982 load_public_identity_files(); reported by Roumen Petrov
1984 OpenBSD-Commit-ID: a827289e77149b5e0850d72a350c8b0300e7ef25
1986 commit 027607fc2db6a0475a3380f8d95c635482714cb0
1987 Author: djm@openbsd.org <djm@openbsd.org>
1988 Date: Fri Jun 8 01:55:40 2018 +0000
1990 upstream: fix some over-long lines and __func__ up some debug
1994 OpenBSD-Commit-ID: c70a60b4c8207d9f242fc2351941ba50916bb267
1996 commit 6ff6fda705bc204456a5fa12518dde6e8790bb02
1997 Author: jmc@openbsd.org <jmc@openbsd.org>
1998 Date: Thu Jun 7 11:26:14 2018 +0000
2000 upstream: tweak previous;
2002 OpenBSD-Commit-ID: f98f16af10b28e24bcecb806cb71ea994b648fd6
2004 commit f2c06ab8dd90582030991f631a2715216bf45e5a
2005 Author: Darren Tucker <dtucker@dtucker.net>
2006 Date: Fri Jun 8 17:43:36 2018 +1000
2008 Remove ability to override $LD.
2010 Since autoconf always uses $CC to link C programs, allowing users to
2011 override LD caused mismatches between what LD_LINK_IFELSE thought worked
2012 and what ld thought worked. If you do need to do this kind of thing you
2013 need to set a compiler flag such as gcc's -fuse-ld in LDFLAGS.
2015 commit e1542a80797b4ea40a91d2896efdcc76a57056d2
2016 Author: Darren Tucker <dtucker@dtucker.net>
2017 Date: Fri Jun 8 13:55:59 2018 +1000
2019 Better detection of unsupported compiler options.
2021 Should prevent "unsupported -Wl,-z,retpoline" warnings during linking.
2024 commit 57379dbd013ad32ee3f9989bf5f5741065428360
2025 Author: djm@openbsd.org <djm@openbsd.org>
2026 Date: Thu Jun 7 14:29:43 2018 +0000
2028 upstream: test the correct configuration option name
2030 OpenBSD-Regress-ID: 492279ea9f65657f97a970e0e7c7fd0b339fee23
2032 commit 6d41815e202fbd6182c79780b6cc90e1ec1c9981
2033 Author: djm@openbsd.org <djm@openbsd.org>
2034 Date: Thu Jun 7 09:26:42 2018 +0000
2036 upstream: some permitlisten fixes from markus@ that I missed in my
2038 insomnia-fueled commits last night
2040 OpenBSD-Commit-ID: 26f23622e928996086e85b1419cc1c0f136e359c
2042 commit 4319f7a868d86d435fa07112fcb6153895d03a7f
2043 Author: djm@openbsd.org <djm@openbsd.org>
2044 Date: Thu Jun 7 04:46:34 2018 +0000
2046 upstream: permitlisten/PermitListen unit test from Markus
2048 OpenBSD-Regress-ID: ab12eb42f0e14926980441cf7c058a6d1d832ea5
2050 commit fa09076410ffc2d34d454145af23c790d728921e
2051 Author: djm@openbsd.org <djm@openbsd.org>
2052 Date: Thu Jun 7 04:31:51 2018 +0000
2054 upstream: fix regression caused by recent permitlisten option commit:
2056 authorized_keys lines that contained permitopen/permitlisten were being
2059 OpenBSD-Commit-ID: 7ef41d63a5a477b405d142dc925b67d9e7aaa31b
2061 commit 7f90635216851f6cb4bf3999e98b825f85d604f8
2062 Author: markus@openbsd.org <markus@openbsd.org>
2063 Date: Wed Jun 6 18:29:18 2018 +0000
2065 upstream: switch config file parsing to getline(3) as this avoids
2067 static limits noted by gerhard@; ok dtucker@, djm@
2069 OpenBSD-Commit-ID: 6d702eabef0fa12e5a1d75c334a8c8b325298b5c
2071 commit 392db2bc83215986a91c0b65feb0e40e7619ce7e
2072 Author: djm@openbsd.org <djm@openbsd.org>
2073 Date: Wed Jun 6 18:25:33 2018 +0000
2075 upstream: regress test for PermitOpen
2077 OpenBSD-Regress-ID: ce8b5f28fc039f09bb297fc4a92319e65982ddaf
2079 commit 803d896ef30758135e2f438bdd1a0be27989e018
2080 Author: djm@openbsd.org <djm@openbsd.org>
2081 Date: Wed Jun 6 18:24:15 2018 +0000
2083 upstream: man bits for permitlisten authorized_keys option
2085 OpenBSD-Commit-ID: 86910af8f781a4ac5980fea125442eb25466dd78
2087 commit 04df43208b5b460d7360e1598f876b92a32f5922
2088 Author: djm@openbsd.org <djm@openbsd.org>
2089 Date: Wed Jun 6 18:24:00 2018 +0000
2091 upstream: man bits for PermitListen
2093 OpenBSD-Commit-ID: 35b200cba4e46a16a4db6a80ef11838ab0fad67c
2095 commit 93c06ab6b77514e0447fe4f1d822afcbb2a9be08
2096 Author: djm@openbsd.org <djm@openbsd.org>
2097 Date: Wed Jun 6 18:23:32 2018 +0000
2099 upstream: permitlisten option for authorized_keys; ok markus@
2101 OpenBSD-Commit-ID: 8650883018d7aa893173d703379e4456a222c672
2103 commit 115063a6647007286cc8ca70abfd2a7585f26ccc
2104 Author: djm@openbsd.org <djm@openbsd.org>
2105 Date: Wed Jun 6 18:22:41 2018 +0000
2107 upstream: Add a PermitListen directive to control which server-side
2109 addresses may be listened on when the client requests remote forwarding (ssh
2112 This is the converse of the existing PermitOpen directive and this
2113 includes some refactoring to share much of its implementation.
2115 feedback and ok markus@
2117 OpenBSD-Commit-ID: 15a931238c61a3f2ac74ea18a98c933e358e277f
2119 commit 7703ae5f5d42eb302ded51705166ff6e19c92892
2120 Author: Darren Tucker <dtucker@dtucker.net>
2121 Date: Wed Jun 6 16:04:29 2018 +1000
2123 Use ssh-keygen -A to generate missing host keys.
2125 Instead of testing for each specific key type, use ssh-keygen -A to
2126 generate any missing host key types.
2128 commit e8d59fef1098e24f408248dc64e5c8efa5d01f3c
2129 Author: jmc@openbsd.org <jmc@openbsd.org>
2130 Date: Fri Jun 1 06:23:10 2018 +0000
2132 upstream: add missing punctuation after %i in ssh_config.5, and
2134 make the grammatical format in sshd_config.5 match that in ssh_config.5;
2136 OpenBSD-Commit-ID: e325663b9342f3d556e223e5306e0d5fa1a74fa0
2138 commit a1f737d6a99314e291a87856122cb4dbaf64c641
2139 Author: jmc@openbsd.org <jmc@openbsd.org>
2140 Date: Fri Jun 1 05:52:26 2018 +0000
2142 upstream: oops - further adjustment to text neccessary;
2144 OpenBSD-Commit-ID: 23585576c807743112ab956be0fb3c786bdef025
2146 commit 294028493471e0bd0c7ffe55dc0c0a67cba6ec41
2147 Author: jmc@openbsd.org <jmc@openbsd.org>
2148 Date: Fri Jun 1 05:50:18 2018 +0000
2150 upstream: %U needs to be escaped; tweak text;
2152 OpenBSD-Commit-ID: 30887b73ece257273fb619ab6f4e86dc92ddc15e
2154 commit e5019da3c5a31e6e729a565f2b886a80c4be96cc
2155 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2156 Date: Fri Jun 1 04:31:48 2018 +0000
2158 upstream: Apply umask to all incoming files and directories not
2160 just files. This makes sure it gets applied to directories too, and prevents
2161 a race where files get chmodded after creation. bz#2839, ok djm@
2163 OpenBSD-Commit-ID: 3168ee6c7c39093adac4fd71039600cfa296203b
2165 commit a1dcafc41c376332493b9385ee39f9754dc145ec
2166 Author: djm@openbsd.org <djm@openbsd.org>
2167 Date: Fri Jun 1 03:52:37 2018 +0000
2169 upstream: Adapt to extra default verboisity from ssh-keygen when
2171 searching for and hashing known_hosts entries in a single operation
2172 (ssh-keygen -HF ...) Patch from Anton Kremenetsky
2174 OpenBSD-Regress-ID: 519585a4de35c4611285bd6a7272766c229b19dd
2176 commit 76f314c75dffd4a55839d50ee23622edad52c168
2177 Author: djm@openbsd.org <djm@openbsd.org>
2178 Date: Tue May 22 00:22:49 2018 +0000
2180 upstream: Add TEST_SSH_FAIL_FATAL variable, to force all failures
2182 to instantly abort the test. Useful in capturing clean logs for individual
2185 OpenBSD-Regress-ID: feba18cf338c2328b9601bd4093cabdd9baa3af1
2187 commit 065c8c055df8d83ae7c92e5e524a579d87668aab
2188 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2189 Date: Fri May 11 03:51:06 2018 +0000
2191 upstream: Clean up comment.
2193 OpenBSD-Regress-ID: 6adb35f384d447e7dcb9f170d4f0d546d3973e10
2195 commit 01b048c8eba3b021701bd0ab26257fc82903cba8
2196 Author: djm@openbsd.org <djm@openbsd.org>
2197 Date: Fri Jun 1 04:21:29 2018 +0000
2199 upstream: whitespace
2201 OpenBSD-Commit-ID: e5edb5e843ddc9b73a8e46518899be41d5709add
2203 commit 854ae209f992465a276de0b5f10ef770510c2418
2204 Author: djm@openbsd.org <djm@openbsd.org>
2205 Date: Fri Jun 1 04:05:29 2018 +0000
2207 upstream: make ssh_remote_ipaddr() capable of being called after
2209 the ssh->state has been torn down; bz#2773
2211 OpenBSD-Commit-ID: 167f12523613ca3d16d7716a690e7afa307dc7eb
2213 commit 3e088aaf236ef35beeef3c9be93fd53700df5861
2214 Author: djm@openbsd.org <djm@openbsd.org>
2215 Date: Fri Jun 1 03:51:34 2018 +0000
2217 upstream: return correct exit code when searching for and hashing
2219 known_hosts entries in a single operation (ssh-keygen -HF hostname); bz2772
2220 Report and fix from Anton Kremenetsky
2222 OpenBSD-Commit-ID: ac10ca13eb9bb0bc50fcd42ad11c56c317437b58
2224 commit 9c935dd9bf05628826ad2495d3e8bdf3d3271c21
2225 Author: djm@openbsd.org <djm@openbsd.org>
2226 Date: Fri Jun 1 03:33:53 2018 +0000
2228 upstream: make UID available as a %-expansion everywhere that the
2230 username is available currently. In the client this is via %i, in the server
2231 %U (since %i was already used in the client in some places for this, but used
2232 for something different in the server); bz#2870, ok dtucker@
2234 OpenBSD-Commit-ID: c7e912b0213713316cb55db194b3a6415b3d4b95
2236 commit d8748b91d1d6c108c0c260ed41fa55f37b9ef34b
2237 Author: djm@openbsd.org <djm@openbsd.org>
2238 Date: Fri Jun 1 03:11:49 2018 +0000
2240 upstream: prefer argv0 to "ssh" when re-executing ssh for ProxyJump
2242 directive; bz2831, feedback and ok dtucker@
2244 OpenBSD-Commit-ID: 3cec709a131499fbb0c1ea8a0a9e0b0915ce769e
2246 commit fbb4b5fd4f8e0bb89732670a01954e18b69e15ba
2247 Author: djm@openbsd.org <djm@openbsd.org>
2248 Date: Fri May 25 07:11:01 2018 +0000
2250 upstream: Do not ban PTY allocation when a sshd session is restricted
2252 because the user password is expired as it breaks password change dialog.
2254 regression in openssh-7.7 reported by Daniel Wagner
2256 OpenBSD-Commit-ID: 9fc09c584c6f1964b00595e3abe7f83db4d90d73
2258 commit f6a59a22b0c157c4c4e5fd7232f868138223be64
2259 Author: djm@openbsd.org <djm@openbsd.org>
2260 Date: Fri May 25 04:25:46 2018 +0000
2262 upstream: Fix return value confusion in several functions (readdir,
2264 download and fsync). These should return -1 on error, not a sftp status code.
2266 patch from Petr Cerny in bz#2871
2268 OpenBSD-Commit-ID: 651aa0220ad23c9167d9297a436162d741f97a09
2270 commit 1da5934b860ac0378d52d3035b22b6670f6a967e
2271 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2272 Date: Fri May 25 03:20:59 2018 +0000
2274 upstream: If select() fails in ssh_packet_read_seqnr go directly to
2276 the error path instead of trying to read from the socket on the way out,
2277 which resets errno and causes the true error to be misreported. ok djm@
2279 OpenBSD-Commit-ID: 2614edaadbd05a957aa977728aa7a030af7c6f0a
2281 commit 4ef75926ef517d539f2c7aac3188b09f315c86a7
2282 Author: Damien Miller <djm@mindrot.org>
2283 Date: Fri May 25 13:36:58 2018 +1000
2285 Permit getuid()/geteuid() syscalls.
2287 Requested for Linux/s390; patch from Eduardo Barretto via bz#2752;
2290 commit 4b22fd8ecefd059a66140be67f352eb6145a9d88
2291 Author: djm@openbsd.org <djm@openbsd.org>
2292 Date: Tue May 22 00:13:26 2018 +0000
2294 upstream: support ProxyJump=none to disable ProxyJump
2296 functionality; bz#2869 ok dtucker@
2298 OpenBSD-Commit-ID: 1c06ee08eb78451b5837fcfd8cbebc5ff3a67a01
2300 commit f41bcd70f55b4f0fc4d8e1039cb361ac922b23fb
2301 Author: jmc@openbsd.org <jmc@openbsd.org>
2302 Date: Tue May 15 05:40:11 2018 +0000
2304 upstream: correct keyowrd name (permitemptypasswords); from brendan
2308 OpenBSD-Commit-ID: ef1bdbc936b2ea693ee37a4c20a94d4d43f5fda3
2310 commit f18bc97151340127859634d20d79fd39ec8a7f39
2311 Author: djm@openbsd.org <djm@openbsd.org>
2312 Date: Fri May 11 04:01:11 2018 +0000
2314 upstream: Emphasise that -w implicitly sets Tunnel=point-to-point
2316 and that users should specify an explicit Tunnel directive if they don't want
2319 OpenBSD-Commit-ID: 1a8d9c67ae213ead180481900dbbb3e04864560d
2321 commit 32e4e94e1511fe0020fbfbb62399d31b2d22a801
2322 Author: Damien Miller <djm@mindrot.org>
2323 Date: Mon May 14 14:40:08 2018 +1000
2328 date: 2018/05/14 04:39:04; author: djm; state: Exp; lines: +5 -2;
2329 commitid: 53zY8GjViUBnWo8Z;
2330 constrain fractional part to [0-9] (less confusing to static analysis); ok ian@
2332 commit 54268d589e85ecc43d3eba8d83f327bdada9d696
2333 Author: Damien Miller <djm@mindrot.org>
2334 Date: Fri May 11 14:04:40 2018 +1000
2336 fix key-options.sh on platforms without openpty(3)
2338 Skip the pty tests if the platform lacks openpty(3) and has to chown(2)
2339 the pty device explicitly. This typically requires root permissions that
2344 commit b2140a739be4c3b43cc1dc08322dca39a1e39d20
2345 Author: djm@openbsd.org <djm@openbsd.org>
2346 Date: Fri May 11 03:38:51 2018 +0000
2348 upstream: implement EMFILE mitigation for ssh-agent: remember the
2350 fd rlimit and stop accepting new connections when it is exceeded (with some
2351 grace). Accept is resumed when enough connections are closed.
2353 bz#2576. feedback deraadt; ok dtucker@
2355 OpenBSD-Commit-ID: 6a85d9cec7b85741961e7116a49f8dae777911ea
2357 commit fdba503fdfc647ee8a244002f1581e869c1f3d90
2358 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2359 Date: Fri May 11 03:22:55 2018 +0000
2361 upstream: Explicit cast when snprintf'ing an uint64. Prevents
2363 warnings on platforms where int64 is long not long long. ok djm@
2365 OpenBSD-Commit-ID: 9c5359e2fbfce11dea2d93f7bc257e84419bd001
2367 commit e7751aa4094d51a9bc00778aa8d07e22934c55ee
2368 Author: bluhm@openbsd.org <bluhm@openbsd.org>
2369 Date: Thu Apr 26 14:47:03 2018 +0000
2371 upstream: Since the previous commit, ssh regress test sftp-chroot was
2373 failing. The sftp program terminated with the wrong exit code as sftp called
2374 fatal() instad of exit(0). So when the sigchld handler waits for the child,
2375 remember that it was found. Then don't expect that main() can wait again. OK
2378 OpenBSD-Commit-ID: bfafd940c0de5297940c71ddf362053db0232266
2380 commit 7c15301841e2e9d37cae732400de63ae9c0961d6
2381 Author: Darren Tucker <dtucker@dtucker.net>
2382 Date: Sun Apr 29 17:54:12 2018 +1000
2384 Use includes.h instead of config.h.
2386 This ensures it picks up the definition of DEF_WEAK, the lack of which
2387 can cause compile errors in some cases (eg modern AIX). From
2388 michael at felt.demon.nl.
2390 commit cec338967a666b7c8ad8b88175f2faeddf268116
2391 Author: Darren Tucker <dtucker@dtucker.net>
2392 Date: Thu Apr 19 09:53:14 2018 +1000
2394 Omit 3des-cbc if OpenSSL built without DES.
2396 Patch from hongxu.jia at windriver.com, ok djm@
2398 commit a575ddd58835759393d2dddd16ebe5abdb56485e
2399 Author: djm@openbsd.org <djm@openbsd.org>
2400 Date: Mon Apr 16 22:50:44 2018 +0000
2402 upstream: Disable SSH2_MSG_DEBUG messages for Twisted Conch clients
2404 without version numbers since they choke on them under some circumstances.
2405 https://twistedmatrix.com/trac/ticket/9422 via Colin Watson
2407 Newer Conch versions have a version number in their ident string and
2408 handle debug messages okay. https://twistedmatrix.com/trac/ticket/9424
2410 OpenBSD-Commit-ID: 6cf7be262af0419c58ddae11324d9c0dc1577539
2412 commit 390c7000a8946db565b66eab9e52fb11948711fa
2413 Author: djm@openbsd.org <djm@openbsd.org>
2414 Date: Sat Apr 14 21:50:41 2018 +0000
2416 upstream: don't free the %C expansion, it's used later for
2420 OpenBSD-Commit-ID: 857b5cb37b2d856bfdfce61289a415257a487fb1
2422 commit 3455f1e7c48e2e549192998d330214975b9b1dc7
2423 Author: djm@openbsd.org <djm@openbsd.org>
2424 Date: Fri Apr 13 05:04:12 2018 +0000
2426 upstream: notify user immediately when underlying ssh process dies;
2428 patch from Thomas Kuthan in bz2719; ok dtucker@
2430 OpenBSD-Commit-ID: 78fac88c2f08054d1fc5162c43c24162b131cf78
2432 commit 1c5b4bc827f4abc3e65888cda061ad5edf1b8c7c
2433 Author: Darren Tucker <dtucker@dtucker.net>
2434 Date: Fri Apr 13 16:23:57 2018 +1000
2436 Allow nanosleep in preauth privsep child.
2438 The new timing attack mitigation code uses nanosleep in the preauth
2439 codepath, allow in systrace andbox too.
2441 commit 0e73428038d5ecfa5d2a28cff26661502a7aff4e
2442 Author: Darren Tucker <dtucker@dtucker.net>
2443 Date: Fri Apr 13 16:06:29 2018 +1000
2445 Allow nanosleep in preauth privsep child.
2447 The new timing attack mitigation code uses nanosleep in the preauth
2448 codepath, allow in sandbox.
2450 commit e9d910b0289c820852f7afa67f584cef1c05fe95
2451 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2452 Date: Fri Apr 13 03:57:26 2018 +0000
2454 upstream: Defend against user enumeration timing attacks. This
2456 establishes a minimum time for each failed authentication attempt (5ms) and
2457 adds a per-user constant derived from a host secret (0-4ms). Based on work
2458 by joona.kannisto at tut.fi, ok markus@ djm@.
2460 OpenBSD-Commit-ID: b7845b355bb7381703339c8fb0e57e81a20ae5ca
2462 commit d97874cbd909eb706886cd0cdd418f812c119ef9
2463 Author: Darren Tucker <dtucker@dtucker.net>
2464 Date: Fri Apr 13 13:43:55 2018 +1000
2466 Using "==" in shell tests is not portable.
2468 Patch from rsbecker at nexbridge.com.
2470 commit cfb1d9bc76734681e3dea532a1504fcd466fbe91
2471 Author: Damien Miller <djm@mindrot.org>
2472 Date: Fri Apr 13 13:38:06 2018 +1000
2474 Fix tunnel forwarding broken in 7.7p1
2478 commit afa6e79b76fb52a0c09a29688b5c0d125eb08302
2479 Author: Damien Miller <djm@mindrot.org>
2480 Date: Fri Apr 13 13:31:42 2018 +1000
2482 prefer to use getrandom() for PRNG seeding
2484 Only applies when built --without-openssl. Thanks Jann Horn for
2487 commit 575fac34a97f69bc217b235f81de9f8f433eceed
2488 Author: Darren Tucker <dtucker@dtucker.net>
2489 Date: Fri Apr 13 13:13:33 2018 +1000
2491 Revert $REGRESSTMP changes.
2493 Revert 3fd2d229 and subsequent changes as they turned out to be a
2496 commit 10479cc2a4acd6faaf643eb305233b49d70c31c1
2497 Author: Damien Miller <djm@mindrot.org>
2498 Date: Tue Apr 10 10:19:02 2018 +1000
2500 Many typo fixes from Karsten Weiss
2502 Spotted using https://github.com/lucasdemarchi/codespell
2504 commit 907da2f88519b34189fd03fac96de0c52d448233
2505 Author: djm@openbsd.org <djm@openbsd.org>
2506 Date: Tue Apr 10 00:14:10 2018 +0000
2508 upstream: more typos spotted by Karsten Weiss using codespell
2510 OpenBSD-Regress-ID: d906a2aea0663810a658b7d0bc61a1d2907d4d69
2512 commit 37e5f4a7ab9a8026e5fc2f47dafb0f1b123d39e9
2513 Author: djm@openbsd.org <djm@openbsd.org>
2514 Date: Tue Apr 10 00:13:27 2018 +0000
2516 upstream: make this a bit more portable-friendly
2518 OpenBSD-Regress-ID: 62f7b9e055e8dfaab92b3825f158beeb4ca3f963
2520 commit 001aa55484852370488786bd40e9fdad4b465811
2521 Author: djm@openbsd.org <djm@openbsd.org>
2522 Date: Tue Apr 10 00:10:49 2018 +0000
2524 upstream: lots of typos in comments/docs. Patch from Karsten Weiss
2526 after checking with codespell tool
2527 (https://github.com/lucasdemarchi/codespell)
2529 OpenBSD-Commit-ID: 373222f12d7ab606598a2d36840c60be93568528
2531 commit 260ede2787fe80b18b8d5920455b4fb268519c7d
2532 Author: djm@openbsd.org <djm@openbsd.org>
2533 Date: Mon Apr 9 23:54:49 2018 +0000
2535 upstream: don't kill ssh-agent's listening socket entriely if we
2537 fail to accept a connection; bz#2837, patch from Lukas Kuster
2539 OpenBSD-Commit-ID: 52413f5069179bebf30d38f524afe1a2133c738f
2541 commit ebc8b4656f9b0f834a642a9fb3c9fbca86a61838
2542 Author: tj@openbsd.org <tj@openbsd.org>
2543 Date: Mon Apr 9 20:41:22 2018 +0000
2545 upstream: the UseLogin option was removed, so remove it here too.
2549 OpenBSD-Commit-ID: 7080be73a64d68e21f22f5408a67a0ba8b1b6b06
2551 commit 3e36f281851fc8e9c996b33f108b2ae167314fbe
2552 Author: jmc@openbsd.org <jmc@openbsd.org>
2553 Date: Sun Apr 8 07:36:02 2018 +0000
2555 upstream: tweak previous;
2557 OpenBSD-Commit-ID: 2b9c23022ea7b9dddb62864de4e906000f9d7474
2559 commit 8368571efd6693c5c57f850e23a2372acf3f865f
2560 Author: jmc@openbsd.org <jmc@openbsd.org>
2561 Date: Sat Apr 7 13:50:10 2018 +0000
2563 upstream: tweak previous;
2565 OpenBSD-Commit-ID: 38e347b6f8e888f5e0700d01abb1eba7caa154f9
2567 commit 555294a7279914ae6795b71bedf4e6011b7636df
2568 Author: djm@openbsd.org <djm@openbsd.org>
2569 Date: Fri Apr 6 13:02:39 2018 +0000
2571 upstream: Allow "SendEnv -PATTERN" to clear environment variables
2573 previously labeled for sendind. bz#1285 ok dtucker@
2575 OpenBSD-Commit-ID: f6fec9e3d0f366f15903094fbe1754cb359a0df9
2577 commit 40f5f03544a07ebd2003b443d42e85cb51d94d59
2578 Author: djm@openbsd.org <djm@openbsd.org>
2579 Date: Fri Apr 6 04:15:45 2018 +0000
2581 upstream: relax checking of authorized_keys environment="..."
2583 options to allow underscores in variable names (regression introduced in
2584 7.7). bz2851, ok deraadt@
2586 OpenBSD-Commit-ID: 69690ffe0c97ff393f2c76d25b4b3d2ed4e4ac9c
2588 commit 30fd7f9af0f553aaa2eeda5a1f53f26cfc222b5e
2589 Author: djm@openbsd.org <djm@openbsd.org>
2590 Date: Fri Apr 6 03:51:27 2018 +0000
2592 upstream: add a couple of missed options to the config dump; patch
2594 from Jakub Jelen via bz2835
2596 OpenBSD-Commit-ID: 5970adadf6ef206bee0dddfc75d24c2019861446
2598 commit 8d6829be324452d2acd282d5f8ceb0adaa89a4de
2599 Author: djm@openbsd.org <djm@openbsd.org>
2600 Date: Fri Apr 6 03:34:27 2018 +0000
2602 upstream: ssh does not accept -oInclude=... on the commandline, the
2604 Include keyword is for configuration files only. bz#2840, patch from Jakub
2607 OpenBSD-Commit-ID: 32d052b4a7a7f22df35fe3f71c368c02b02cacb0
2609 commit 00c5222ddc0c8edcaa4ea45ac03befdc8013d137
2610 Author: djm@openbsd.org <djm@openbsd.org>
2611 Date: Thu Apr 5 22:54:28 2018 +0000
2613 upstream: We don't offer CBC cipher by default any more. Spotted by
2615 Renaud Allard (via otto@)
2617 OpenBSD-Commit-ID: a559b1eef741557dd959ae378b665a2977d92dca
2619 commit 5ee8448ad7c306f05a9f56769f95336a8269f379
2620 Author: job@openbsd.org <job@openbsd.org>
2621 Date: Wed Apr 4 15:12:17 2018 +0000
2623 upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP AF21 for
2625 interactive and CS1 for bulk
2627 AF21 was selected as this is the highest priority within the low-latency
2628 service class (and it is higher than what we have today). SSH is elastic
2629 and time-sensitive data, where a user is waiting for a response via the
2630 network in order to continue with a task at hand. As such, these flows
2631 should be considered foreground traffic, with delays or drops to such
2632 traffic directly impacting user-productivity.
2634 For bulk SSH traffic, the CS1 "Lower Effort" marker was chosen to enable
2635 networks implementing a scavanger/lower-than-best effort class to
2636 discriminate scp(1) below normal activities, such as web surfing. In
2637 general this type of bulk SSH traffic is a background activity.
2639 An advantage of using "AF21" for interactive SSH and "CS1" for bulk SSH
2640 is that they are recognisable values on all common platforms (IANA
2641 https://www.iana.org/assignments/dscp-registry/dscp-registry.xml), and
2642 for AF21 specifically a definition of the intended behavior exists
2643 https://tools.ietf.org/html/rfc4594#section-4.7 in addition to the definition
2644 of the Assured Forwarding PHB group https://tools.ietf.org/html/rfc2597, and
2645 for CS1 (Lower Effort) there is https://tools.ietf.org/html/rfc3662
2647 The first three bits of "AF21" map to the equivalent IEEEE 802.1D PCP, IEEE
2648 802.11e, MPLS EXP/CoS and IP Precedence value of 2 (also known as "Immediate",
2649 or "AC_BE"), and CS1's first 3 bits map to IEEEE 802.1D PCP, IEEE 802.11e,
2650 MPLS/CoS and IP Precedence value 1 ("Background" or "AC_BK").
2652 OK deraadt@, "no objection" djm@
2654 OpenBSD-Commit-ID: d11d2a4484f461524ef0c20870523dfcdeb52181
2656 commit 424b544fbda963f973da80f884717c3e0a513288
2657 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2658 Date: Tue Apr 3 02:14:08 2018 +0000
2660 upstream: Import regenerated moduli file.
2662 OpenBSD-Commit-ID: 1de0e85522051eb2ffa00437e1885e9d7b3e0c2e
2664 commit 323f66ce934df2da551f256f37d69822428e1ca1
2665 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2666 Date: Fri Apr 6 04:18:35 2018 +0000
2668 upstream: Add test for username options parsing order, prompted by
2672 OpenBSD-Regress-ID: 6985cd32f38596882a3ac172ff8c510693b65283
2674 commit e8f474554e3bda102a797a2fbab0594ccc66f097
2675 Author: Damien Miller <djm@mindrot.org>
2676 Date: Fri Apr 6 14:11:44 2018 +1000
2678 Expose SSH_AUTH_INFO_0 to PAM auth modules
2680 bz#2408, patch from Radoslaw Ejsmont; ok dtucker@
2682 commit 014ba209cf4c6a159baa30ecebbaddfa97da7100
2683 Author: Darren Tucker <dtucker@dtucker.net>
2684 Date: Tue Apr 3 12:18:00 2018 +1000
2686 Import regenerated moduli file.
2688 commit a0349a1cc4a18967ad1dbff5389bcdf9da098814
2689 Author: Damien Miller <djm@mindrot.org>
2690 Date: Mon Apr 2 15:38:28 2018 +1000
2692 update versions in .spec files
2694 commit 816ad38f79792f5617e3913be306ddb27e91091c
2695 Author: Damien Miller <djm@mindrot.org>
2696 Date: Mon Apr 2 15:38:20 2018 +1000
2698 update version number
2700 commit 2c71ca1dd1efe458cb7dee3f8a1a566f913182c2
2701 Author: Darren Tucker <dtucker@dtucker.net>
2702 Date: Fri Mar 30 18:23:07 2018 +1100
2704 Disable native strndup and strnlen on AIX.
2706 On at least some revisions of AIX, strndup returns unterminated strings
2707 under some conditions, apparently because strnlen returns incorrect
2708 values in those cases. Disable both on AIX and use the replacements
2709 from openbsd-compat. Fixes problem with ECDSA keys there, ok djm.
2711 commit 6b5a17bc14e896e3904dc58d889b58934cfacd24
2712 Author: Darren Tucker <dtucker@dtucker.net>
2713 Date: Mon Mar 26 13:12:44 2018 +1100
2715 Include ssh_api.h for struct ssh.
2717 struct ssh is needed by implementations of sys_auth_passwd() that were
2718 converted in commit bba02a50. Needed to fix build on AIX, I assume for
2719 the other platforms too (although it should be harmless if not needed).
2721 commit bc3f80e4d191b8e48650045dfa8a682cd3aabd4d
2722 Author: Darren Tucker <dtucker@dtucker.net>
2723 Date: Mon Mar 26 12:58:09 2018 +1100
2725 Remove UNICOS code missed during removal.
2727 Fixes compile error on AIX.
2729 commit 9d57762c24882e2f000a21a0ffc8c5908a1fa738
2730 Author: markus@openbsd.org <markus@openbsd.org>
2731 Date: Sat Mar 24 19:29:03 2018 +0000
2733 upstream: openssh-7.7
2735 OpenBSD-Commit-ID: 274e614352460b9802c905f38fb5ea7ed5db3d41
2737 commit 4b7d8acdbbceef247dc035e611e577174ed8a87e
2738 Author: Damien Miller <djm@mindrot.org>
2739 Date: Mon Mar 26 09:37:02 2018 +1100
2741 Remove authinfo.sh test dependency on printenv
2743 Some platforms lack printenv in the default $PATH.
2744 Reported by Tom G. Christensen
2746 commit 4afeaf3dcb7dc70efd98fcfcb0ed28a6b40b820e
2747 Author: Tim Rice <tim@multitalents.net>
2748 Date: Sun Mar 25 10:00:21 2018 -0700
2750 Use libiaf on all sysv5 systems
2752 commit bba02a5094b3db228ceac41cb4bfca165d0735f3
2753 Author: Tim Rice <tim@multitalents.net>
2754 Date: Sun Mar 25 09:17:33 2018 -0700
2756 modified: auth-sia.c
2757 modified: openbsd-compat/port-aix.c
2758 modified: openbsd-compat/port-uw.c
2760 propogate changes to auth-passwd.c in commit
2761 7c856857607112a3dfe6414696bf4c7ab7fb0cb3 to other providers
2762 of sys_auth_passwd()
2764 commit d7a7a39168bdfe273587bf85d779d60569100a3f
2765 Author: markus@openbsd.org <markus@openbsd.org>
2766 Date: Sat Mar 24 19:29:03 2018 +0000
2768 upstream: openssh-7.7
2770 OpenBSD-Commit-ID: 274e614352460b9802c905f38fb5ea7ed5db3d41
2772 commit 9efcaaac314c611c6c0326e8bac5b486c424bbd2
2773 Author: markus@openbsd.org <markus@openbsd.org>
2774 Date: Sat Mar 24 19:28:43 2018 +0000
2776 upstream: fix bogus warning when signing cert keys using agent;
2778 from djm; ok deraadt dtucker
2780 OpenBSD-Commit-ID: 12e50836ba2040042383a8b71e12d7ea06e9633d
2782 commit 393436024d2e4b4c7a01f9cfa5854e7437896d11
2783 Author: Darren Tucker <dtucker@dtucker.net>
2784 Date: Sun Mar 25 09:40:46 2018 +1100
2786 Replace /dev/stdin with "-".
2788 For some reason sftp -b doesn't work with /dev/stdin on Cygwin, as noted
2789 and suggested by vinschen at redhat.com.
2791 commit b5974de1a1d419e316ffb6524b1b277dda2f3b49
2792 Author: Darren Tucker <dtucker@dtucker.net>
2793 Date: Fri Mar 23 13:21:14 2018 +1100
2795 Provide $OBJ to paths in PuTTY interop tests.
2797 commit dc31e79454e9b9140b33ad380565fdb59b9c4f33
2798 Author: dtucker@openbsd.org <dtucker@openbsd.org>
2799 Date: Fri Mar 16 09:06:31 2018 +0000
2801 upstream: Tell puttygen to use /dev/urandom instead of /dev/random. On
2803 OpenBSD they are both non-blocking, but on many other -portable platforms it
2804 blocks, stalling tests.
2806 OpenBSD-Regress-ID: 397d0d4c719c353f24d79f5b14775e0cfdf0e1cc
2808 commit cb1f94431ef319cd48618b8b771b58739a8210cf
2809 Author: markus@openbsd.org <markus@openbsd.org>
2810 Date: Thu Mar 22 07:06:11 2018 +0000
2812 upstream: ssh/xmss: fix build; ok djm@
2814 OpenBSD-Commit-ID: c9374ca41d4497f1c673ab681cc33f6e7c5dd186
2816 commit 27979da9e4074322611355598f69175b9ff10d39
2817 Author: markus@openbsd.org <markus@openbsd.org>
2818 Date: Thu Mar 22 07:05:48 2018 +0000
2820 upstream: ssh/xmss: fix deserialize for certs; ok djm@
2822 OpenBSD-Commit-ID: f44c41636c16ec83502039828beaf521c057dddc
2824 commit c6cb2565c9285eb54fa9dfbb3890f5464aff410f
2825 Author: Darren Tucker <dtucker@dtucker.net>
2826 Date: Thu Mar 22 17:00:28 2018 +1100
2828 Save $? before case statement.
2830 In some shells (FreeBSD 9, ash) the case statement resets $?, so save
2833 commit 4c4e7f783b43b264c247233acb887ee10ed4ce4d
2834 Author: djm@openbsd.org <djm@openbsd.org>
2835 Date: Wed Mar 14 05:35:40 2018 +0000
2837 upstream: rename recently-added "valid-before" key restriction to
2839 "expiry-time" as the former is confusing wrt similar terminology in X.509;
2840 pointed out by jsing@
2842 OpenBSD-Regress-ID: ac8b41dbfd90cffd525d58350c327195b0937793
2844 commit 500396b204c58e78ad9d081516a365a9f28dc3fd
2845 Author: djm@openbsd.org <djm@openbsd.org>
2846 Date: Mon Mar 12 00:56:03 2018 +0000
2848 upstream: check valid-before option in authorized_keys
2850 OpenBSD-Regress-ID: 7e1e4a84f7f099a290e5a4cbf4196f90ff2d7e11
2852 commit a76b5d26c2a51d7dd7a5164e683ab3f4419be215
2853 Author: djm@openbsd.org <djm@openbsd.org>
2854 Date: Mon Mar 12 00:54:04 2018 +0000
2856 upstream: explicitly specify RSA/SHA-2 keytype here too
2858 OpenBSD-Regress-ID: 74d7b24e8c72c27af6b481198344eb077e993a62
2860 commit 3a43297ce29d37c64e37c7e21282cb219e28d3d1
2861 Author: djm@openbsd.org <djm@openbsd.org>
2862 Date: Mon Mar 12 00:52:57 2018 +0000
2864 upstream: exlicitly include RSA/SHA-2 keytypes in
2866 PubkeyAcceptedKeyTypes here
2868 OpenBSD-Regress-ID: 954d19e0032a74e31697fb1dc7e7d3d1b2d65fe9
2870 commit 037fdc1dc2d68e1d43f9c9e2586c02cabc8f7cc8
2871 Author: jmc@openbsd.org <jmc@openbsd.org>
2872 Date: Wed Mar 14 06:56:20 2018 +0000
2874 upstream: sort expiry-time;
2876 OpenBSD-Commit-ID: 8c7d82ee1e63e26ceb2b3d3a16514019f984f6bf
2878 commit abc0fa38c9bc136871f28e452c3465c3051fc785
2879 Author: djm@openbsd.org <djm@openbsd.org>
2880 Date: Wed Mar 14 05:35:40 2018 +0000
2882 upstream: rename recently-added "valid-before" key restriction to
2884 "expiry-time" as the former is confusing wrt similar terminology in X.509;
2885 pointed out by jsing@
2887 OpenBSD-Commit-ID: 376939466a1f562f3950a22314bc6505733aaae6
2889 commit bf0fbf2b11a44f06a64b620af7d01ff171c28e13
2890 Author: djm@openbsd.org <djm@openbsd.org>
2891 Date: Mon Mar 12 00:52:01 2018 +0000
2893 upstream: add valid-before="[time]" authorized_keys option. A
2895 simple way of giving a key an expiry date. ok markus@
2897 OpenBSD-Commit-ID: 1793b4dd5184fa87f42ed33c7b0f4f02bc877947
2899 commit fbd733ab7adc907118a6cf56c08ed90c7000043f
2900 Author: Darren Tucker <dtucker@dtucker.net>
2901 Date: Mon Mar 12 19:17:26 2018 +1100
2903 Add AC_LANG_PROGRAM to AC_COMPILE_IFELSE.
2905 The recently added MIPS ABI tests need AC_LANG_PROGRAM to prevent
2906 warnings from autoconf. Pointed out by klausz at haus-gisela.de.
2908 commit c7c458e8261b04d161763cd333d74e7a5842e917
2909 Author: djm@openbsd.org <djm@openbsd.org>
2910 Date: Wed Mar 7 23:53:08 2018 +0000
2912 upstream: revert recent strdelim() change, it causes problems with
2917 date: 2018/03/02 03:02:11; author: djm; state: Exp; lines: +19 -8; commitid: nNRsCijZiGG6SUTT;
2918 Allow escaped quotes \" and \' in ssh_config and sshd_config quotes
2919 option strings. bz#1596 ok markus@
2921 OpenBSD-Commit-ID: 59c40b1b81206d713c06b49d8477402c86babda5
2923 commit 0bcd871ccdf3baf2b642509ba4773d5be067cfa2
2924 Author: jmc@openbsd.org <jmc@openbsd.org>
2925 Date: Mon Mar 5 07:03:18 2018 +0000
2927 upstream: move the input format details to -f; remove the output
2929 format details and point to sshd(8), where it is documented;
2933 OpenBSD-Commit-ID: 95f17e47dae02a6ac7329708c8c893d4cad0004a
2935 commit 45011511a09e03493568506ce32f4891a174a3bd
2936 Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
2937 Date: Tue Jun 20 16:42:28 2017 +0100
2939 configure.ac: properly set seccomp_audit_arch for MIPS64
2941 Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or
2942 AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built
2943 for MIPS64. However, that's only valid for n64 ABI. The right macros for
2944 n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and
2945 AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively.
2947 Because of that an sshd built for MIPS64 n32 rejects connection attempts
2948 and the output of strace reveals that the problem is related to seccomp
2951 [pid 194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57,
2952 filter=0x555d5da0}) = 0
2953 [pid 194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ?
2954 [pid 193] <... poll resumed> ) = 2 ([{fd=5, revents=POLLIN|POLLHUP},
2955 {fd=6, revents=POLLHUP}])
2956 [pid 194] +++ killed by SIGSYS +++
2958 This patch fixes that problem by setting the right value to
2959 seccomp_audit_arch taking into account the MIPS64 ABI.
2961 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
2963 commit 580086704c31de91dc7ba040a28e416bf1fefbca
2964 Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
2965 Date: Tue Jun 20 16:42:11 2017 +0100
2967 configure.ac: detect MIPS ABI
2969 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
2971 commit cd4e937aa701f70366cd5b5969af525dff6fdf15
2972 Author: Alan Yee <alyee@ucsd.edu>
2973 Date: Wed Mar 7 15:12:14 2018 -0800
2975 Use https URLs for links that support it.
2977 commit c0a0c3fc4a76b682db22146b28ddc46566db1ce9
2978 Author: Darren Tucker <dtucker@dtucker.net>
2979 Date: Mon Mar 5 20:03:07 2018 +1100
2981 Disable UTMPX on SunOS4.
2983 commit 58fd4c5c0140f6636227ca7acbb149ab0c2509b9
2984 Author: Darren Tucker <dtucker@dtucker.net>
2985 Date: Mon Mar 5 19:28:08 2018 +1100
2987 Check for and work around buggy fflush(NULL).
2989 Some really old platforms (eg SunOS4) segfault on fflush(NULL) so check
2990 for and work around. With klausz at haus-gisela.de.
2992 commit 71e48bc7945f867029e50e06c665c66aed6d3c64
2993 Author: Darren Tucker <dtucker@dtucker.net>
2994 Date: Mon Mar 5 10:22:32 2018 +1100
2996 Remove extra XMSS #endif
2998 Extra #endif breaks compile with -DWITH_XMSS. Pointed out by Jack
3001 commit 055e09e2212ff52067786bf6d794ca9512ff7f0c
3002 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3003 Date: Sat Mar 3 06:37:53 2018 +0000
3005 upstream: Update RSA minimum modulus size to 1024. sshkey.h rev 1.18
3007 bumped the minimum from 768 to 1024, update man page accordingly.
3009 OpenBSD-Commit-ID: 27563ab4e866cd2aac40a5247876f6787c08a338
3011 commit 7e4fadd3248d6bb7d39d6688c76a613d35d2efc1
3012 Author: djm@openbsd.org <djm@openbsd.org>
3013 Date: Sun Mar 4 01:46:48 2018 +0000
3015 upstream: for the pty control tests, just check that the PTY path
3017 points to something in /dev (rather than checking the device node itself);
3018 makes life easier for portable, where systems with dynamic ptys can delete
3019 nodes before we get around to testing their existence.
3021 OpenBSD-Regress-ID: b1e455b821e62572bccd98102f8dd9d09bb94994
3023 commit 13ef4cf53f24753fe920832b990b25c9c9cd0530
3024 Author: Darren Tucker <dtucker@dtucker.net>
3025 Date: Sat Mar 3 16:21:20 2018 +1100
3027 Update PAM password change to new opts API.
3029 commit 33561e68e0b27366cb769295a077aabc6a49d2a1
3030 Author: Darren Tucker <dtucker@dtucker.net>
3031 Date: Sat Mar 3 14:56:09 2018 +1100
3033 Add strndup for platforms that need it.
3035 Some platforms don't have strndup, which includes Solaris 10, NetBSD 3
3038 commit e8a17feba95eef424303fb94441008f6c5347aaf
3039 Author: Darren Tucker <dtucker@dtucker.net>
3040 Date: Sat Mar 3 14:49:07 2018 +1100
3042 Flatten and alphabetize object file lists.
3044 This will make maintenance and changes easier. "no objection" tim@
3046 commit de1920d743d295f50e6905e5957c4172c038e8eb
3047 Author: djm@openbsd.org <djm@openbsd.org>
3048 Date: Sat Mar 3 03:16:17 2018 +0000
3050 upstream: unit tests for new authorized_keys options API
3052 OpenBSD-Regress-ID: 820f9ec9c6301f6ca330ad4052d85f0e67d0bdc1
3054 commit dc3e92df17556dc5b0ab19cee8dcb2a6ba348717
3055 Author: djm@openbsd.org <djm@openbsd.org>
3056 Date: Fri Mar 2 02:53:27 2018 +0000
3058 upstream: fix testing of pty option, include positive test and
3060 testing of restrict keyword
3062 OpenBSD-Regress-ID: 4268f27c2706a0a95e725d9518c5bcbec9814c6d
3064 commit 3d1edd1ebbc0aabea8bbe61903060f37137f7c61
3065 Author: djm@openbsd.org <djm@openbsd.org>
3066 Date: Fri Mar 2 02:51:55 2018 +0000
3068 upstream: better testing for port-forwarding and restrict flags in
3072 OpenBSD-Regress-ID: ee771df8955f2735df54746872c6228aff381daa
3074 commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
3075 Author: djm@openbsd.org <djm@openbsd.org>
3076 Date: Sat Mar 3 03:15:51 2018 +0000
3078 upstream: switch over to the new authorized_keys options API and
3080 remove the legacy one.
3082 Includes a fairly big refactor of auth2-pubkey.c to retain less state
3083 between key file lines.
3085 feedback and ok markus@
3087 OpenBSD-Commit-ID: dece6cae0f47751b9892080eb13d6625599573df
3089 commit 90c4bec8b5f9ec4c003ae4abdf13fc7766f00c8b
3090 Author: djm@openbsd.org <djm@openbsd.org>
3091 Date: Sat Mar 3 03:06:02 2018 +0000
3093 upstream: Introduce a new API for handling authorized_keys options.
3095 This API parses options to a dedicated structure rather than the old API's
3096 approach of setting global state. It also includes support for merging
3097 options, e.g. from authorized_keys, authorized_principals and/or
3100 feedback and ok markus@
3102 OpenBSD-Commit-ID: 98badda102cd575210d7802943e93a34232c80a2
3104 commit 26074380767e639ef89321610e146ae11016b385
3105 Author: djm@openbsd.org <djm@openbsd.org>
3106 Date: Sat Mar 3 03:01:50 2018 +0000
3108 upstream: warn when the agent returns a signature type that was
3110 different to what was requested. This might happen when an old/non-OpenSSH
3111 agent is asked to make a rsa-sha2-256/512 signature but only supports
3112 ssh-rsa. bz#2799 feedback and ok markus@
3114 OpenBSD-Commit-ID: 760c0f9438c5c58abc16b5f98008ff2d95cb13ce
3116 commit f493d2b0b66fb003ed29f31dd66ff1aeb64be1fc
3117 Author: jmc@openbsd.org <jmc@openbsd.org>
3118 Date: Fri Mar 2 21:40:15 2018 +0000
3120 upstream: apply a lick of paint; tweaks/ok dtucker
3122 OpenBSD-Commit-ID: 518a6736338045e0037f503c21027d958d05e703
3124 commit 713d9cb510e0e7759398716cbe6dcf43e574be71
3125 Author: djm@openbsd.org <djm@openbsd.org>
3126 Date: Fri Mar 2 03:02:11 2018 +0000
3128 upstream: Allow escaped quotes \" and \' in ssh_config and
3130 sshd_config quotes option strings. bz#1596 ok markus@
3132 OpenBSD-Commit-ID: dd3a29fc2dc905e8780198e5a6a30b096de1a1cb
3134 commit 94b4e2d29afaaaef89a95289b16c18bf5627f7cd
3135 Author: djm@openbsd.org <djm@openbsd.org>
3136 Date: Fri Mar 2 02:08:03 2018 +0000
3138 upstream: refactor sshkey_read() to make it a little more, err,
3142 OpenBSD-Commit-ID: 2e9247b5762fdac3b6335dc606d3822121714c28
3144 commit 5886b92968b360623491699247caddfb77a74d80
3145 Author: markus@openbsd.org <markus@openbsd.org>
3146 Date: Thu Mar 1 20:32:16 2018 +0000
3148 upstream: missing #ifdef for _PATH_HOST_XMSS_KEY_FILE; report by
3152 OpenBSD-Commit-ID: 9039cb69a3f9886bfef096891a9e7fcbd620280b
3154 commit 3b36bed3d26f17f6a2b7e036e01777770fe1bcd4
3155 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3156 Date: Mon Feb 26 12:14:53 2018 +0000
3158 upstream: Remove unneeded (local) include. ok markus@
3160 OpenBSD-Commit-ID: 132812dd2296b1caa8cb07d2408afc28e4e60f93
3162 commit 27b9f3950e0289e225b57b7b880a8f1859dcd70b
3163 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3164 Date: Mon Feb 26 03:56:44 2018 +0000
3166 upstream: Add $OpenBSD$ markers to xmss files to help keep synced
3168 with portable. ok djm@.
3170 OpenBSD-Commit-ID: 5233a27aafd1dfadad4b957225f95ae51eb365c1
3172 commit afd830847a82ebbd5aeab05bad6d2c8ce74df1cd
3173 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3174 Date: Mon Feb 26 03:03:05 2018 +0000
3176 upstream: Add newline at end of file to prevent compiler warnings.
3178 OpenBSD-Commit-ID: 52f247d4eafe840c7c14c8befa71a760a8eeb063
3180 commit 941e0d3e9bb8d5e4eb70cc694441445faf037c84
3181 Author: Darren Tucker <dtucker@dtucker.net>
3182 Date: Wed Feb 28 19:59:35 2018 +1100
3184 Add WITH_XMSS, move to prevent conflicts.
3186 Add #ifdef WITH_XMSS to ssh-xmss.c, move it in the other files to after
3187 includes.h so it's less likely to conflict and will pick up WITH_XMSS if
3190 commit a10d8552d0d2438da4ed539275abcbf557d1e7a8
3191 Author: Darren Tucker <dtucker@dtucker.net>
3192 Date: Tue Feb 27 14:45:17 2018 +1100
3194 Conditionally compile XMSS code.
3196 The XMSS code is currently experimental and, unlike the rest of OpenSSH
3197 cannot currently be compiled with a c89 compiler.
3199 commit 146c3bd28c8dbee9c4b06465d9c9facab96b1e9b
3200 Author: Darren Tucker <dtucker@dtucker.net>
3201 Date: Mon Feb 26 12:51:29 2018 +1100
3203 Check dlopen has RTLD_NOW before enabling pkcs11.
3205 commit 1323f120d06a26074c4d154fcbe7f49bcad3d741
3206 Author: Darren Tucker <dtucker@dtucker.net>
3207 Date: Tue Feb 27 08:41:25 2018 +1100
3209 Check for attributes on prototype args.
3211 Some compilers (gcc 2.9.53, 3.0 and probably others, see gcc bug #3481)
3212 do not accept __attribute__ on function pointer prototype args. Check for
3213 this and hide them if they're not accepted.
3215 commit f0b245b0439e600fab782d19e97980e9f2c2533c
3216 Author: Darren Tucker <dtucker@dtucker.net>
3217 Date: Mon Feb 26 11:43:48 2018 +1100
3219 Check if HAVE_DECL_BZERO correctly.
3221 commit c7ef4a399155e1621a532cc5e08e6fa773658dd4
3222 Author: Darren Tucker <dtucker@dtucker.net>
3223 Date: Mon Feb 26 17:42:56 2018 +1100
3225 Wrap <stdint.h> in #ifdef HAVE_STDINT_H.
3227 commit ac53ce46cf8165cbda7f57ee045f9f32e1e92b31
3228 Author: Darren Tucker <dtucker@dtucker.net>
3229 Date: Mon Feb 26 16:24:23 2018 +1100
3231 Replace $(CURDIR) with $(PWD).
3233 The former doesn't work on Solaris or BSDs.
3235 commit 534b2680a15d14e7e60274d5b29b812d44cc5a44
3236 Author: Darren Tucker <dtucker@dtucker.net>
3237 Date: Mon Feb 26 14:51:59 2018 +1100
3239 Comment out hexdump().
3241 Nothing currently uses them but they cause conflicts on at least
3242 FreeBSD, possibly others. ok djm@
3244 commit 5aea4aa522f61bb2f34c3055a7de203909dfae77
3245 Author: Darren Tucker <dtucker@dtucker.net>
3246 Date: Mon Feb 26 14:39:14 2018 +1100
3250 commit cd3ab57f9b388f8b1abf601dc4d78ff82d83b75e
3251 Author: Darren Tucker <dtucker@dtucker.net>
3252 Date: Mon Feb 26 14:37:06 2018 +1100
3254 Hook up flock() compat code.
3256 Also a couple of minor changes: fail if we can't lock instead of
3257 silently succeeding, and apply a couple of minor style fixes.
3259 commit b087998d1ba90dd1ddb6bfdb17873dc3e7392798
3260 Author: Darren Tucker <dtucker@dtucker.net>
3261 Date: Mon Feb 26 14:27:02 2018 +1100
3263 Import flock() compat from NetBSD.
3265 From NetBSD's src/trunk/tools/compat/flock.c, no OpenSSH changes yet.
3267 commit 89212533dde6798324e835b1499084658df4579e
3268 Author: Darren Tucker <dtucker@dtucker.net>
3269 Date: Mon Feb 26 12:32:14 2018 +1100
3271 Fix breakage when REGRESSTMP not set.
3273 BUILDDIR is not set where used for REGRESSTMP, use make's CURDIR
3274 instead. Pointed out by djm@.
3276 commit f885474137df4b89498c0b8834c2ac72c47aa4bd
3277 Author: Damien Miller <djm@mindrot.org>
3278 Date: Mon Feb 26 12:18:14 2018 +1100
3280 XMSS-related files get includes.h
3282 commit 612faa34c72e421cdc9e63f624526bae62d557cc
3283 Author: Damien Miller <djm@mindrot.org>
3284 Date: Mon Feb 26 12:17:55 2018 +1100
3286 object files end with .o - not .c
3288 commit bda709b8e13d3eef19e69c2d1684139e3af728f5
3289 Author: Damien Miller <djm@mindrot.org>
3290 Date: Mon Feb 26 12:17:22 2018 +1100
3292 avoid inclusion of deprecated selinux/flask.h
3294 Use string_to_security_class() instead.
3296 commit 2e396439365c4ca352cac222717d09b14f8a0dfd
3297 Author: Damien Miller <djm@mindrot.org>
3298 Date: Mon Feb 26 11:48:27 2018 +1100
3302 commit 1b11ea7c58cd5c59838b5fa574cd456d6047b2d4
3303 Author: markus@openbsd.org <markus@openbsd.org>
3304 Date: Fri Feb 23 15:58:37 2018 +0000
3306 upstream: Add experimental support for PQC XMSS keys (Extended
3308 Hash-Based Signatures) The code is not compiled in by default (see WITH_XMSS
3309 in Makefile.inc) Joint work with stefan-lukas_gazdag at genua.eu See
3310 https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12 ok
3313 OpenBSD-Commit-ID: ef3eccb96762a5d6f135d7daeef608df7776a7ac
3315 commit 7d330a1ac02076de98cfc8fda05353d57b603755
3316 Author: jmc@openbsd.org <jmc@openbsd.org>
3317 Date: Fri Feb 23 07:38:09 2018 +0000
3319 upstream: some cleanup for BindInterface and ssh-keyscan;
3321 OpenBSD-Commit-ID: 1a719ebeae22a166adf05bea5009add7075acc8c
3323 commit c7b5a47e3b9db9a0f0198f9c90c705f6307afc2b
3324 Author: Darren Tucker <dtucker@dtucker.net>
3325 Date: Sun Feb 25 23:55:41 2018 +1100
3327 Invert sense of getpgrp test.
3329 AC_FUNC_GETPGRP tests if getpgrp(0) works, which it does if it's not
3330 declared. Instead, test if the zero-arg version we want to use works.
3332 commit b39593a6de5290650a01adf8699c6460570403c2
3333 Author: Darren Tucker <dtucker@dtucker.net>
3334 Date: Sun Feb 25 13:25:15 2018 +1100
3336 Add no-op getsid implmentation.
3338 commit 11057564eb6ab8fd987de50c3d7f394c6f6632b7
3339 Author: Darren Tucker <dtucker@dtucker.net>
3340 Date: Sun Feb 25 11:22:57 2018 +1100
3342 bsd-statvfs: include sys/vfs.h, check for f_flags.
3344 commit e9dede06e5bc582a4aeb5b1cd5a7a640d7de3609
3345 Author: Darren Tucker <dtucker@dtucker.net>
3346 Date: Sun Feb 25 10:20:31 2018 +1100
3348 Handle calloc(0,x) where different from malloc.
3350 Configure assumes that if malloc(0) returns null then calloc(0,n)
3351 also does. On some old platforms (SunOS4) malloc behaves as expected
3352 (as determined by AC_FUNC_MALLOC) but calloc doesn't. Test for this
3353 at configure time and activate the replacement function if found, plus
3354 handle this case in rpl_calloc.
3356 commit 2eb4041493fd2635ffdc64a852d02b38c4955e0b
3357 Author: Darren Tucker <dtucker@dtucker.net>
3358 Date: Sat Feb 24 21:06:48 2018 +1100
3360 Add prototype for readv if needed.
3362 commit 6c8c9a615b6d31db8a87bc25033f053d5b0a831e
3363 Author: Darren Tucker <dtucker@dtucker.net>
3364 Date: Sat Feb 24 20:46:37 2018 +1100
3366 Check for raise and supply if needed.
3368 commit a9004425a032d7a7141a5437cfabfd02431e2a74
3369 Author: Darren Tucker <dtucker@dtucker.net>
3370 Date: Sat Feb 24 20:25:22 2018 +1100
3372 Check for bzero and supply if needed.
3374 Since explicit_bzero uses it via an indirect it needs to be a function
3377 commit 1a348359e4d2876203b5255941bae348557f4f54
3378 Author: djm@openbsd.org <djm@openbsd.org>
3379 Date: Fri Feb 23 05:14:05 2018 +0000
3381 upstream: Add ssh-keyscan -D option to make it print its results in
3383 SSHFP format bz#2821, ok dtucker@
3385 OpenBSD-Commit-ID: 831446b582e0f298ca15c9d99c415c899e392221
3387 commit 3e19fb976a47b44b3d7c4f8355269f7f2c5dd82c
3388 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3389 Date: Fri Feb 23 04:18:46 2018 +0000
3391 upstream: Add missing braces.
3393 Caught by the tinderbox's -Werror=misleading-indentation, ok djm@
3395 OpenBSD-Commit-ID: d44656af594c3b2366eb87d6abcef83e1c88a6ca
3397 commit b59162da99399d89bd57f71c170c0003c55b1583
3398 Author: Darren Tucker <dtucker@dtucker.net>
3399 Date: Fri Feb 23 15:20:42 2018 +1100
3401 Check for ifaddrs.h for BindInterface.
3403 BindInterface required getifaddr and friends so disable if not available
3404 (eg Solaris 10). We should be able to add support for some systems with
3405 a bit more work but this gets the building again.
3407 commit a8dd6fe0aa10b6866830b4688a73ef966f0aed88
3408 Author: Damien Miller <djm@mindrot.org>
3409 Date: Fri Feb 23 14:19:11 2018 +1100
3411 space before tab in previous
3413 commit b5e9263c7704247f9624c8f5c458e9181fcdbc09
3414 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3415 Date: Fri Feb 9 03:40:22 2018 +0000
3417 upstream: Replace fatal with exit in the case that we do not have
3419 $SUDO set. Prevents test failures when neither sudo nor doas are configured.
3421 OpenBSD-Regress-ID: 6a0464decc4f8ac7d6eded556a032b0fc521bc7b
3423 commit 3e9d3192ad43758ef761c5b0aa3ac5ccf8121ef2
3424 Author: Darren Tucker <dtucker@dtucker.net>
3425 Date: Fri Feb 23 14:10:53 2018 +1100
3427 Use portable syntax for REGRESSTMP.
3429 commit 73282b61187883a2b2bb48e087fdda1d751d6059
3430 Author: djm@openbsd.org <djm@openbsd.org>
3431 Date: Fri Feb 23 03:03:00 2018 +0000
3433 upstream: unbreak interop test after SSHv1 purge; patch from Colin
3437 OpenBSD-Regress-ID: 807d30a597756ed6612bdf46dfebca74f49cb31a
3439 commit f8985dde5f46aedade0373365cbf86ed3f1aead2
3440 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3441 Date: Fri Feb 9 03:42:57 2018 +0000
3443 upstream: Skip sftp-chroot test when SUDO not set instead of
3447 OpenBSD-Regress-ID: cd4b5f1109b0dc09af4e5ea7d4968c43fbcbde88
3449 commit df88551c02d4e3445c44ff67ba8757cff718609a
3450 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3451 Date: Fri Feb 9 03:40:22 2018 +0000
3453 upstream: Replace fatal with exit in the case that we do not have
3455 $SUDO set. Prevents test failures when neither sudo nor doas are configured.
3457 OpenBSD-Regress-ID: 6a0464decc4f8ac7d6eded556a032b0fc521bc7b
3459 commit 3b252c20b19f093e87363de197f1100b79705dd3
3460 Author: djm@openbsd.org <djm@openbsd.org>
3461 Date: Thu Feb 8 08:46:20 2018 +0000
3463 upstream: some helpers to check verbose/quiet mode
3465 OpenBSD-Regress-ID: e736aac39e563f5360a0935080a71d5fdcb976de
3467 commit ac2e3026bbee1367e4cda34765d1106099be3287
3468 Author: djm@openbsd.org <djm@openbsd.org>
3469 Date: Fri Feb 23 02:34:33 2018 +0000
3471 upstream: Add BindInterface ssh_config directive and -B
3473 command-line argument to ssh(1) that directs it to bind its outgoing
3474 connection to the address of the specified network interface.
3476 BindInterface prefers to use addresses that aren't loopback or link-
3477 local, but will fall back to those if no other addresses of the
3478 required family are available on that interface.
3480 Based on patch by Mike Manning in bz#2820, ok dtucker@
3482 OpenBSD-Commit-ID: c5064d285c2851f773dd736a2c342aa384fbf713
3484 commit fcdb9d777839a3fa034b3bc3067ba8c1f6886679
3485 Author: djm@openbsd.org <djm@openbsd.org>
3486 Date: Mon Feb 19 00:55:02 2018 +0000
3488 upstream: emphasise that the hostkey rotation may send key types
3490 that the client may not support, and that the client should simply disregard
3491 such keys (this is what ssh does already).
3493 OpenBSD-Commit-ID: 65f8ffbc32ac8d12be8f913d7c0ea55bef8622bf
3495 commit ce066f688dc166506c082dac41ca686066e3de5f
3496 Author: Darren Tucker <dtucker@dtucker.net>
3497 Date: Thu Feb 22 20:45:09 2018 +1100
3499 Add headers for sys/audit.h.
3501 On some older platforms (at least sunos4, probably others) sys/audit.h
3502 requires some other headers. Patch from klausz at haus-gisela.de.
3504 commit 3fd2d2291a695c96a54269deae079bacce6e3fb9
3505 Author: Darren Tucker <dtucker@dtucker.net>
3506 Date: Mon Feb 19 18:37:40 2018 +1100
3508 Add REGRESSTMP make var override.
3510 Defaults to original location ($srcdir/regress) but allows overriding
3511 if desired, eg a directory in /tmp.
3513 commit f8338428588f3ecb5243c86336eccaa28809f97e
3514 Author: Darren Tucker <dtucker@dtucker.net>
3515 Date: Sun Feb 18 15:53:15 2018 +1100
3517 Remove now-unused check for getrusage.
3519 getrusage was used in ssh-rand-helper but that's now long gone.
3520 Patch from klauszh at haus-gisela.de.
3522 commit 8570177195f6a4b3173c0a25484a83641ee3faa6
3523 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3524 Date: Fri Feb 16 04:43:11 2018 +0000
3526 upstream: Don't send IUTF8 to servers that don't like them.
3528 Some SSH servers eg "ConfD" drop the connection if the client sends the
3529 new IUTF8 (RFC8160) terminal mode even if it's not set. Add a bug bit
3530 for such servers and avoid sending IUTF8 to them. ok djm@
3532 OpenBSD-Commit-ID: 26425855402d870c3c0a90491e72e2a8a342ceda
3534 commit f6dc2ba3c9d12be53057b9371f5109ec553a399f
3535 Author: Darren Tucker <dtucker@dtucker.net>
3536 Date: Fri Feb 16 17:32:28 2018 +1100
3538 freezero should check for NULL.
3540 commit 680321f3eb46773883111e234b3c262142ff7c5b
3541 Author: djm@openbsd.org <djm@openbsd.org>
3542 Date: Fri Feb 16 02:40:45 2018 +0000
3544 upstream: Mention recent DH KEX methods:
3546 diffie-hellman-group14-sha256
3547 diffie-hellman-group16-sha512
3548 diffie-hellman-group18-sha512
3550 From Jakub Jelen via bz#2826
3552 OpenBSD-Commit-ID: 51bf769f06e55447f4bfa7306949e62d2401907a
3554 commit 88c50a5ae20902715f0fca306bb9c38514f71679
3555 Author: djm@openbsd.org <djm@openbsd.org>
3556 Date: Fri Feb 16 02:32:40 2018 +0000
3558 upstream: stop loading DSA keys by default, remove sshd_config
3560 stanza and manpage bits; from Colin Watson via bz#2662, ok dtucker@
3562 OpenBSD-Commit-ID: d33a849f481684ff655c140f5eb1b4acda8c5c09
3564 commit d2b3db2860c962927def39a52f67f1c23f7b201a
3565 Author: jsing@openbsd.org <jsing@openbsd.org>
3566 Date: Wed Feb 14 16:27:24 2018 +0000
3568 upstream: Ensure that D mod (P-1) and D mod (Q-1) are calculated in
3572 This avoids a potential side channel timing leak.
3576 OpenBSD-Commit-ID: 71ff3c16be03290e63d8edab8fac053d8a82968c
3578 commit 4270efad7048535b4f250f493d70f9acfb201593
3579 Author: jsing@openbsd.org <jsing@openbsd.org>
3580 Date: Wed Feb 14 16:03:32 2018 +0000
3582 upstream: Some obvious freezero() conversions.
3584 This also zeros an ed25519_pk when it was not being zeroed previously.
3588 OpenBSD-Commit-ID: 5c196a3c85c23ac0bd9b11bcadaedd90b7a2ce82
3590 commit affa6ba67ffccc30b85d6e98f36eb5afd9386882
3591 Author: Darren Tucker <dtucker@dtucker.net>
3592 Date: Thu Feb 15 22:32:04 2018 +1100
3594 Remove execute bit from modpipe.c.
3596 commit 9879dca438526ae6dfd656fecb26b0558c29c731
3597 Author: Darren Tucker <dtucker@dtucker.net>
3598 Date: Thu Feb 15 22:26:16 2018 +1100
3600 Update prngd link to point to sourceforge.
3602 commit b6973fa5152b1a0bafd2417b7c3ad96f6e87d014
3603 Author: Darren Tucker <dtucker@dtucker.net>
3604 Date: Thu Feb 15 22:22:38 2018 +1100
3606 Remove references to UNICOS.
3608 commit f1ca487940449f0b64f38f1da575078257609966
3609 Author: Darren Tucker <dtucker@dtucker.net>
3610 Date: Thu Feb 15 22:18:37 2018 +1100
3612 Remove extra newline.
3614 commit 6d4e980f3cf27f409489cf89cd46c21501b13731
3615 Author: Darren Tucker <dtucker@dtucker.net>
3616 Date: Thu Feb 15 22:16:54 2018 +1100
3618 OpenSSH's builtin entropy gathering is long gone.
3620 commit 389125b25d1a1d7f22e907463b7e8eca74af79ea
3621 Author: Darren Tucker <dtucker@dtucker.net>
3622 Date: Thu Feb 15 21:43:01 2018 +1100
3624 Replace remaining mysignal() with signal().
3626 These seem to have been missed during the replacement of mysignal
3627 with #define signal in commit 5ade9ab. Both include the requisite
3628 headers to pick up the #define.
3630 commit 265d88d4e61e352de6791733c8b29fa3d7d0c26d
3631 Author: Darren Tucker <dtucker@dtucker.net>
3632 Date: Thu Feb 15 20:06:19 2018 +1100
3634 Remove remaining now-obsolete cvs $Ids.
3636 commit 015749e9b1d2f6e14733466d19ba72f014d0845c
3637 Author: Darren Tucker <dtucker@dtucker.net>
3638 Date: Thu Feb 15 17:01:54 2018 +1100
3640 Regenerate dependencies after UNICOS removal.
3642 commit ddc0f3814881ea279a6b6d4d98e03afc60ae1ed7
3643 Author: Darren Tucker <dtucker@dtucker.net>
3644 Date: Tue Feb 13 09:10:46 2018 +1100
3646 Remove UNICOS support.
3648 The code required to support it is quite invasive to the mainline
3649 code that is synced with upstream and is an ongoing maintenance burden.
3650 Both the hardware and software are literal museum pieces these days and
3651 we could not find anyone still running OpenSSH on one.
3653 commit 174bed686968494723e6db881208cc4dac0d020f
3654 Author: Darren Tucker <dtucker@dtucker.net>
3655 Date: Tue Feb 13 18:12:47 2018 +1100
3657 Retpoline linker flag only needed for linking.
3659 commit 075e258c2cc41e1d7f3ea2d292c5342091728d40
3660 Author: Darren Tucker <dtucker@dtucker.net>
3661 Date: Tue Feb 13 17:36:43 2018 +1100
3663 Default PidFile is sshd.pid not ssh.pid.
3665 commit 49f3c0ec47730ea264e2bd1e6ece11167d6384df
3666 Author: Darren Tucker <dtucker@dtucker.net>
3667 Date: Tue Feb 13 16:27:09 2018 +1100
3669 Remove assigned-to-but-never-used variable.
3671 'p' was removed in previous change but I neglected to remove the
3672 otherwise-unused assignment to it.
3674 commit b8bbff3b3fc823bf80c5ab226c94f13cb887d5b1
3675 Author: djm@openbsd.org <djm@openbsd.org>
3676 Date: Tue Feb 13 03:36:56 2018 +0000
3678 upstream: remove space before tab
3680 OpenBSD-Commit-ID: 674edd214d0a7332dd4623c9cf8117301b012890
3682 commit 05046d907c211cb9b4cd21b8eff9e7a46cd6c5ab
3683 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3684 Date: Sun Feb 11 21:16:56 2018 +0000
3686 upstream Don't reset signal handlers inside handlers.
3688 The signal handlers from the original ssh1 code on which OpenSSH
3689 is based assume unreliable signals and reinstall their handlers.
3690 Since OpenBSD (and pretty much every current system) has reliable
3691 signals this is not needed. In the unlikely even that -portable
3692 is still being used on such systems we will deal with it in the
3693 compat layer. ok deraadt@
3695 OpenBSD-Commit-ID: f53a1015cb6908431b92116130d285d71589612c
3697 commit 3c51143c639ac686687c7acf9b373b8c08195ffb
3698 Author: Darren Tucker <dtucker@dtucker.net>
3699 Date: Tue Feb 13 09:07:29 2018 +1100
3701 Whitespace sync with upstream.
3703 commit 19edfd4af746bedf0df17f01953ba8c6d3186eb7
3704 Author: Darren Tucker <dtucker@dtucker.net>
3705 Date: Tue Feb 13 08:25:46 2018 +1100
3707 Whitespace sync with upstream.
3709 commit fbfa6f980d7460b3e12b0ce88ed3b6018edf4711
3710 Author: Darren Tucker <dtucker@dtucker.net>
3711 Date: Sun Feb 11 21:25:11 2018 +1300
3713 Move signal compat code into bsd-signal.{c,h}
3715 commit 24d2a33bd3bf5170700bfdd8675498aa09a79eab
3716 Author: Darren Tucker <dtucker@dtucker.net>
3717 Date: Sun Feb 11 21:20:39 2018 +1300
3719 Include headers for linux/if.h.
3721 Prevents configure-time "present but cannot be compiled" warning.
3723 commit bc02181c24fc551aab85eb2cff0f90380928ef43
3724 Author: Darren Tucker <dtucker@dtucker.net>
3725 Date: Sun Feb 11 19:45:47 2018 +1300
3727 Fix test for -z,retpolineplt linker flag.
3729 commit 3377df00ea3fece5293db85fe63baef33bf5152e
3730 Author: Darren Tucker <dtucker@dtucker.net>
3731 Date: Sun Feb 11 09:32:37 2018 +1100
3733 Add checks for Spectre v2 mitigation (retpoline)
3735 This adds checks for gcc and clang flags for mitigations for Spectre
3736 variant 2, ie "retpoline". It'll automatically enabled if the compiler
3737 supports it as part of toolchain hardening flag. ok djm@
3739 commit d9e5cf078ea5380da6df767bb1773802ec557ef0
3740 Author: djm@openbsd.org <djm@openbsd.org>
3741 Date: Sat Feb 10 09:25:34 2018 +0000
3745 constify some private key-related functions; based on
3746 https://github.com/openssh/openssh-portable/pull/56 by Vincent Brillault
3748 OpenBSD-Commit-ID: dcb94a41834a15f4d00275cb5051616fdc4c988c
3750 commit a7c38215d564bf98e8e9eb40c1079e3adf686f15
3751 Author: djm@openbsd.org <djm@openbsd.org>
3752 Date: Sat Feb 10 09:03:54 2018 +0000
3756 Mention ServerAliveTimeout in context of TCPKeepAlives;
3757 prompted by Christoph Anton Mitterer via github
3759 OpenBSD-Commit-ID: f0cf1b5bd3f1fbf41d71c88d75d93afc1c880ca2
3761 commit 62562ceae61e4f7cf896566592bb840216e71061
3762 Author: djm@openbsd.org <djm@openbsd.org>
3763 Date: Sat Feb 10 06:54:38 2018 +0000
3767 clarify IgnoreUserKnownHosts; based on github PR from
3768 Christoph Anton Mitterer.
3770 OpenBSD-Commit-ID: 4fff2c17620c342fb2f1f9c2d2e679aab3e589c3
3772 commit 4f011daa4cada6450fa810f7563b8968639bb562
3773 Author: djm@openbsd.org <djm@openbsd.org>
3774 Date: Sat Feb 10 06:40:28 2018 +0000
3778 Shorter, more accurate explanation of
3779 NoHostAuthenticationForLocalhost without the confusing example. Prompted by
3780 Christoph Anton Mitterer via github and bz#2293.
3782 OpenBSD-Commit-ID: 19dc96bea25b80d78d416b581fb8506f1e7b76df
3784 commit 77e05394af21d3f5faa0c09ed3855e4505a5cf9f
3785 Author: djm@openbsd.org <djm@openbsd.org>
3786 Date: Sat Feb 10 06:15:12 2018 +0000
3790 Disable RemoteCommand and RequestTTY in the ssh session
3791 started by scp. sftp is already doing this. From Camden Narzt via github; ok
3794 OpenBSD-Commit-ID: 59e2611141c0b2ee579c6866e8eb9d7d8217bc6b
3796 commit ca613249a00b64b2eea9f52d3834b55c28cf2862
3797 Author: djm@openbsd.org <djm@openbsd.org>
3798 Date: Sat Feb 10 05:48:46 2018 +0000
3802 Refuse to create a certificate with an unusable number of
3803 principals; Prompted by gdestuynder via github
3805 OpenBSD-Commit-ID: 8cfae2451e8f07810e3e2546dfdcce66984cbd29
3807 commit b56ac069d46b6f800de34e1e935f98d050731d14
3808 Author: djm@openbsd.org <djm@openbsd.org>
3809 Date: Sat Feb 10 05:43:26 2018 +0000
3813 fatal if we're unable to write all the public key; previously
3814 we would silently ignore errors writing the comment and terminating newline.
3815 Prompted by github PR from WillerZ; ok dtucker
3817 OpenBSD-Commit-ID: 18fbfcfd4e8c6adbc84820039b64d70906e49831
3819 commit cdb10bd431f9f6833475c27e9a82ebb36fdb12db
3820 Author: Darren Tucker <dtucker@dtucker.net>
3821 Date: Sat Feb 10 11:18:38 2018 +1100
3823 Add changelog entry for binary strip change.
3825 commit fbddd91897cfaf456bfc2081f39fb4a2208a0ebf
3826 Author: Darren Tucker <dtucker@dtucker.net>
3827 Date: Sat Feb 10 11:14:54 2018 +1100
3829 Remove unused variables.
3831 commit 937d96587df99c16c611d828cded292fa474a32b
3832 Author: Darren Tucker <dtucker@dtucker.net>
3833 Date: Sat Feb 10 11:12:45 2018 +1100
3835 Don't strip binaries so debuginfo gets built.
3837 Tell install not to strip binaries during package creation so that the
3838 debuginfo package can be built.
3840 commit eb0865f330f59c889ec92696b97bd397090e720c
3841 Author: Darren Tucker <dtucker@dtucker.net>
3842 Date: Sat Feb 10 10:33:11 2018 +1100
3844 Fix bogus dates in changelog.
3846 commit 7fbde1b34c1f6c9ca9e9d10805ba1e5e4538e165
3847 Author: Darren Tucker <dtucker@dtucker.net>
3848 Date: Sat Feb 10 10:25:15 2018 +1100
3850 Remove SSH1 from description.
3852 commit 9c34a76f099c4e0634bf6ecc2f40ce93925402c4
3853 Author: Darren Tucker <dtucker@dtucker.net>
3854 Date: Sat Feb 10 10:19:16 2018 +1100
3856 Add support for compat-openssl10 build dep.
3858 commit 04f4e8193cb5a5a751fcc356bd6656291fec539e
3859 Author: Darren Tucker <dtucker@dtucker.net>
3860 Date: Sat Feb 10 09:57:04 2018 +1100
3862 Add leading zero so it'll work when rhel not set.
3864 When rhel is not set it will error out with "bad if". Add leading zero
3865 as per https://fedoraproject.org/wiki/Packaging:DistTag so it'll work
3868 commit 12abd67a6af28476550807a443b38def2076bb92
3869 Author: Darren Tucker <dtucker@dtucker.net>
3870 Date: Sat Feb 10 09:56:34 2018 +1100
3872 Update openssl-devel dependency.
3874 commit b33e7645f8813719d7f9173fef24463c8833ebb3
3875 Author: nkadel <nkadel@gmail.com>
3876 Date: Sun Nov 16 18:19:58 2014 -0500
3878 Add mandir with-mandir' for RHEL 5 compatibility.
3880 Activate '--mandir' and '--with-mandir' settings in setup for RHEL
3883 commit 94f8bf360eb0162e39ddf39d69925c2e93511e40
3884 Author: nkadel <nkadel@gmail.com>
3885 Date: Sun Nov 16 18:18:51 2014 -0500
3887 Discard 'K5DIR' reporting.
3889 It does not work inside 'mock' build environment.
3891 commit bb7e54dbaf34b70b3e57acf7982f3a2136c94ee5
3892 Author: nkadel <nkadel@gmail.com>
3893 Date: Sun Nov 16 18:17:15 2014 -0500
3895 Add 'dist' to 'rel' for OS specific RPM names.
3897 commit 87346f1f57f71150a9b8c7029d8c210e27027716
3898 Author: nkadel <nkadel@gmail.com>
3899 Date: Sun Nov 16 14:17:38 2014 -0500
3901 Add openssh-devel >= 0.9.8f for redhat spec file.
3903 commit bec1478d710866d3c1b119343a35567a8fc71ec3
3904 Author: nkadel <nkadel@gmail.com>
3905 Date: Sun Nov 16 13:10:24 2014 -0500
3907 Enhance BuildRequires for openssh-x11-askpass.
3909 commit 3104fcbdd3c70aefcb0cdc3ee24948907db8dc8f
3910 Author: nkadel <nkadel@gmail.com>
3911 Date: Sun Nov 16 13:04:14 2014 -0500
3913 Always include x11-ssh-askpass SRPM.
3915 Always include x11-ssh-askpass tarball in redhat SRPM, even if unused.
3917 commit c61d0d038d58eebc365f31830be6e04ce373ad1b
3918 Author: Damien Miller <djm@mindrot.org>
3919 Date: Sat Feb 10 09:43:12 2018 +1100
3921 this is long unused; prompted by dtucker@
3923 commit 745771fb788e41bb7cdad34e5555bf82da3af7ed
3924 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3925 Date: Fri Feb 9 02:37:36 2018 +0000
3929 Remove unused sKerberosTgtPassing from enum. From
3930 calestyo via github pull req #11, ok djm@
3932 OpenBSD-Commit-ID: 1008f8870865a7c4968b7aed402a0a9e3e5b9540
3934 commit 1f385f55332db830b0ae22a7663b98279ca2d657
3935 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3936 Date: Thu Feb 8 04:12:32 2018 +0000
3940 Rename struct umac_ctx to umac128_ctx too. In portable
3941 some linkers complain about two symbols with the same name having differing
3944 OpenBSD-Commit-ID: cbebf8bdd3310a9795b4939a1e112cfe24061ca3
3946 commit f1f047fb031c0081dbc8738f05bf5d4cc47acadf
3947 Author: dtucker@openbsd.org <dtucker@openbsd.org>
3948 Date: Wed Feb 7 22:52:45 2018 +0000
3952 ssh_free checks for and handles NULL args, remove NULL
3953 checks from remaining callers. ok djm@
3955 OpenBSD-Commit-ID: bb926825c53724c069df68a93a2597f9192f7e7b
3957 commit aee49b2a89b6b323c80dd3b431bd486e51f94c8c
3958 Author: Darren Tucker <dtucker@dtucker.net>
3959 Date: Thu Feb 8 12:36:22 2018 +1100
3961 Set SO_REUSEADDR in regression test netcat.
3963 Sometimes multiplex tests fail on Solaris with "netcat: local_listen:
3964 Address already in use" which is likely due to previous invocations
3965 leaving the port in TIME_WAIT. Set SO_REUSEADDR (in addition to
3966 SO_REUSEPORT which is alread set on platforms that support it). ok djm@
3968 commit 1749991c55bab716877b7c687cbfbf19189ac6f1
3969 Author: jsing@openbsd.org <jsing@openbsd.org>
3970 Date: Wed Feb 7 05:17:56 2018 +0000
3974 Convert some explicit_bzero()/free() calls to freezero().
3976 ok deraadt@ dtucker@
3978 OpenBSD-Commit-ID: f566ab99149650ebe58b1d4b946ea726c3829609
3980 commit 94ec2b69d403f4318b7a0d9b17f8bc3efbf4d0d2
3981 Author: jsing@openbsd.org <jsing@openbsd.org>
3982 Date: Wed Feb 7 05:15:49 2018 +0000
3986 Remove some #ifdef notyet code from OpenSSL 0.9.8 days.
3988 These functions have never appeared in OpenSSL and are likely never to do
3991 "kill it with fire" djm@
3993 OpenBSD-Commit-ID: fee9560e283fd836efc2631ef381658cc673d23e
3995 commit 7cd31632e3a6607170ed0c9ed413a7ded5b9b377
3996 Author: jsing@openbsd.org <jsing@openbsd.org>
3997 Date: Wed Feb 7 02:06:50 2018 +0000
4001 Remove all guards for calls to OpenSSL free functions -
4002 all of these functions handle NULL, from at least OpenSSL 1.0.1g onwards.
4004 Prompted by dtucker@ asking about guards for RSA_free(), when looking at
4005 openssh-portable pr#84 on github.
4007 ok deraadt@ dtucker@
4009 OpenBSD-Commit-ID: 954f1c51b94297d0ae1f749271e184141e0cadae
4011 commit 3c000d57d46882eb736c6563edfc4995915c24a2
4012 Author: Darren Tucker <dtucker@dtucker.net>
4013 Date: Wed Feb 7 09:19:38 2018 +1100
4015 Remove obsolete "Smartcard support" message
4017 The configure checks that populated $SCARD_MSG were removed in commits
4018 7ea845e4 and d8f60022 when the smartcard support was replaced with
4021 commit 3e615090de0ce36a833d811e01c28aec531247c4
4022 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4023 Date: Tue Feb 6 06:01:54 2018 +0000
4027 Replace "trojan horse" with the correct term (MITM).
4028 From maikel at predikkta.com via bz#2822, ok markus@
4030 OpenBSD-Commit-ID: e86ac64c512057c89edfadb43302ac0aa81a6c53
4032 commit 3484380110d437c50e17f87d18544286328c75cb
4033 Author: tb@openbsd.org <tb@openbsd.org>
4034 Date: Mon Feb 5 05:37:46 2018 +0000
4038 Add a couple of non-negativity checks to avoid close(-1).
4042 OpenBSD-Commit-ID: 4701ce0b37161c891c838d0931305f1d37a50880
4044 commit 5069320be93c8b2a6584b9f944c86f60c2b04e48
4045 Author: tb@openbsd.org <tb@openbsd.org>
4046 Date: Mon Feb 5 05:36:49 2018 +0000
4050 The file descriptors for socket, stdin, stdout and stderr
4051 aren't necessarily distinct, so check if they are the same to avoid closing
4052 the same fd several times.
4056 OpenBSD-Commit-ID: 60d71fd22e9a32f5639d4ba6e25a2f417fc36ac1
4058 commit 2b428f90ea1b21d7a7c68ec1ee334253b3f9324d
4059 Author: djm@openbsd.org <djm@openbsd.org>
4060 Date: Mon Feb 5 04:02:53 2018 +0000
4064 I accidentially a word
4066 OpenBSD-Commit-ID: 4547ee713fa941da861e83ae7a3e6432f915e14a
4068 commit 130283d5c2545ff017c2162dc1258c5354e29399
4069 Author: djm@openbsd.org <djm@openbsd.org>
4070 Date: Thu Jan 25 03:34:43 2018 +0000
4074 certificate options are case-sensitive; fix case on one
4077 move a badly-place sentence to a less bad place
4079 OpenBSD-Commit-ID: 231e516bba860699a1eece6d48532d825f5f747b
4081 commit 89f09ee68730337015bf0c3f138504494a34e9a6
4082 Author: Damien Miller <djm@mindrot.org>
4083 Date: Wed Jan 24 12:20:44 2018 +1100
4085 crypto_api.h needs includes.h
4087 commit c9c1bba06ad1c7cad8548549a68c071bd807af60
4088 Author: stsp@openbsd.org <stsp@openbsd.org>
4089 Date: Tue Jan 23 20:00:58 2018 +0000
4093 Fix a logic bug in sshd_exchange_identification which
4094 prevented clients using major protocol version 2 from connecting to the
4097 OpenBSD-Commit-ID: 8668dec04586e27f1c0eb039ef1feb93d80a5ee9
4099 commit a60c5dcfa2538ffc94dc5b5adb3db5b6ed905bdb
4100 Author: stsp@openbsd.org <stsp@openbsd.org>
4101 Date: Tue Jan 23 18:33:49 2018 +0000
4105 Add missing braces; fixes 'write: Socket is not
4106 connected' error in ssh. ok deraadt@
4108 OpenBSD-Commit-ID: db73a3a9e147722d410866cac34d43ed52e1ad24
4110 commit 20d53ac283e1c60245ea464bdedd015ed9b38f4a
4111 Author: Damien Miller <djm@mindrot.org>
4112 Date: Tue Jan 23 16:49:43 2018 +1100
4116 commit 552ea155be44f9c439c1f9f0c38f9e593428f838
4117 Author: Damien Miller <djm@mindrot.org>
4118 Date: Tue Jan 23 16:49:22 2018 +1100
4120 one SSH_BUG_BANNER instance that got away
4122 commit 14b5c635d1190633b23ac3372379517fb645b0c2
4123 Author: djm@openbsd.org <djm@openbsd.org>
4124 Date: Tue Jan 23 05:27:21 2018 +0000
4128 Drop compatibility hacks for some ancient SSH
4129 implementations, including ssh.com <=2.* and OpenSSH <= 3.*.
4131 These versions were all released in or before 2001 and predate the
4132 final SSH RFCs. The hacks in question aren't necessary for RFC-
4133 compliant SSH implementations.
4137 OpenBSD-Commit-ID: 4be81c67db57647f907f4e881fb9341448606138
4139 commit 7c77991f5de5d8475cbeb7cbb06d0c7d1611d7bb
4140 Author: djm@openbsd.org <djm@openbsd.org>
4141 Date: Tue Jan 23 05:17:04 2018 +0000
4145 try harder to preserve errno during
4146 ssh_connect_direct() to make the final error message possibly accurate;
4147 bz#2814, ok dtucker@
4149 OpenBSD-Commit-ID: 57de882cb47381c319b04499fef845dd0c2b46ca
4151 commit 9e9c4a7e57b96ab29fe6d7545ed09d2e5bddbdec
4152 Author: djm@openbsd.org <djm@openbsd.org>
4153 Date: Tue Jan 23 05:12:12 2018 +0000
4157 unbreak support for clients that advertise a protocol
4158 version of "1.99" (indicating both v2 and v1 support). Busted by me during
4159 SSHv1 purge in r1.358; bz2810, ok dtucker
4161 OpenBSD-Commit-ID: e8f9c2bee11afc16c872bb79d6abe9c555bd0e4b
4163 commit fc21ea97968264ad9bb86b13fedaaec8fd3bf97d
4164 Author: djm@openbsd.org <djm@openbsd.org>
4165 Date: Tue Jan 23 05:06:25 2018 +0000
4169 don't attempt to force hostnames that are addresses to
4170 lowercase, but instead canonicalise them through getnameinfo/getaddrinfo to
4171 remove ambiguities (e.g. ::0001 => ::1) before they are matched against
4172 known_hosts; bz#2763, ok dtucker@
4174 OpenBSD-Commit-ID: ba0863ff087e61e5c65efdbe53be3cb92c9aefa0
4176 commit d6364f6fb1a3d753d7ca9bf15b2adce961324513
4177 Author: djm@openbsd.org <djm@openbsd.org>
4178 Date: Tue Jan 23 05:01:15 2018 +0000
4182 avoid modifying pw->pw_passwd; let endpwent() clean up
4183 for us, but keep a scrubbed copy; bz2777, ok dtucker@
4185 OpenBSD-Commit-ID: 715afc0f59c6b82c4929a73279199ed241ce0752
4187 commit a69bbb07cd6fb4dfb9bdcacd370ab26d0a2b4215
4188 Author: naddy@openbsd.org <naddy@openbsd.org>
4189 Date: Sat Jan 13 00:24:09 2018 +0000
4193 clarify authorship; prodded by and ok markus@
4195 OpenBSD-Commit-ID: e1938eee58c89b064befdabe232835fa83bb378c
4197 commit 04214b30be3d3e73a01584db4e040d5ccbaaddd4
4198 Author: markus@openbsd.org <markus@openbsd.org>
4199 Date: Mon Jan 8 15:37:21 2018 +0000
4203 group shared source files (e.g. SRCS_KEX) and allow
4204 compilation w/o OPENSSL ok djm@
4206 OpenBSD-Commit-ID: fa728823ba21c4b45212750e1d3a4b2086fd1a62
4208 commit 25cf9105b849932fc3b141590c009e704f2eeba6
4209 Author: markus@openbsd.org <markus@openbsd.org>
4210 Date: Mon Jan 8 15:21:49 2018 +0000
4214 move subprocess() so scp/sftp do not need uidswap.o; ok
4217 OpenBSD-Commit-ID: 6601b8360388542c2e5fef0f4085f8e54750bea8
4219 commit b0d34132b3ca26fe94013f01d7b92101e70b68bb
4220 Author: markus@openbsd.org <markus@openbsd.org>
4221 Date: Mon Jan 8 15:18:46 2018 +0000
4225 switch ssh-pkcs11-helper to new API; ok djm@
4227 OpenBSD-Commit-ID: e0c0ed2a568e25b1d2024f3e630f3fea837c2a42
4229 commit ec4a9831184c0c6ed5f7f0cfff01ede5455465a3
4230 Author: markus@openbsd.org <markus@openbsd.org>
4231 Date: Mon Jan 8 15:15:36 2018 +0000
4235 split client/server kex; only ssh-keygen needs
4236 uuencode.o; only scp/sftp use progressmeter.o; ok djm@
4238 OpenBSD-Commit-ID: f2c9feb26963615c4fece921906cf72e248b61ee
4240 commit ec77efeea06ac62ee1d76fe0b3225f3000775a9e
4241 Author: markus@openbsd.org <markus@openbsd.org>
4242 Date: Mon Jan 8 15:15:17 2018 +0000
4246 only ssh-keygen needs uuencode.o; only scp/sftp use
4249 OpenBSD-Commit-ID: a337e886a49f96701ccbc4832bed086a68abfa85
4251 commit 25aae35d3d6ee86a8c4c0b1896acafc1eab30172
4252 Author: markus@openbsd.org <markus@openbsd.org>
4253 Date: Mon Jan 8 15:14:44 2018 +0000
4257 uuencode.h is not used
4259 OpenBSD-Commit-ID: 238eb4659f3c119904326b9e94a5e507a912796c
4261 commit 4f29309c4cb19bcb1774931db84cacc414f17d29
4262 Author: Damien Miller <djm@mindrot.org>
4263 Date: Wed Jan 3 19:50:43 2018 +1100
4265 unbreak fuzz harness
4267 commit f6b50bf84dc0b61f22c887c00423e0ea7644e844
4268 Author: djm@openbsd.org <djm@openbsd.org>
4269 Date: Thu Dec 21 05:46:35 2017 +0000
4273 another libssh casualty
4275 OpenBSD-Regress-ID: 839b970560246de23e7c50215095fb527a5a83ec
4277 commit 5fb4fb5a0158318fb8ed7dbb32f3869bbf221f13
4278 Author: djm@openbsd.org <djm@openbsd.org>
4279 Date: Thu Dec 21 03:01:49 2017 +0000
4283 missed one (unbreak after ssh/lib removal)
4285 OpenBSD-Regress-ID: cfdd132143131769e2d2455e7892b5d55854c322
4287 commit e6c4134165d05447009437a96e7201276688807f
4288 Author: djm@openbsd.org <djm@openbsd.org>
4289 Date: Thu Dec 21 00:41:22 2017 +0000
4293 unbreak unit tests after removal of src/usr.bin/ssh/lib
4295 OpenBSD-Regress-ID: 3a79760494147b20761cbd2bd5c20e86c63dc8f9
4297 commit d45d69f2a937cea215c7f0424e5a4677b6d8c7fe
4298 Author: djm@openbsd.org <djm@openbsd.org>
4299 Date: Thu Dec 21 00:00:28 2017 +0000
4303 revert stricter key type / signature type checking in
4304 userauth path; too much software generates inconsistent messages, so we need
4307 OpenBSD-Commit-ID: 4a44ddc991c803c4ecc8f1ad40e0ab4d22e1c519
4309 commit c5a6cbdb79752f7e761074abdb487953ea6db671
4310 Author: djm@openbsd.org <djm@openbsd.org>
4311 Date: Tue Dec 19 00:49:30 2017 +0000
4315 explicitly test all key types and their certificate
4320 OpenBSD-Regress-ID: e9ecd5580821b9ef8b7106919c6980d8e45ca8c4
4322 commit f689adb7a370b5572612d88be9837ca9aea75447
4323 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4324 Date: Mon Dec 11 11:41:56 2017 +0000
4328 use cmp in a loop instead of diff -N to compare
4329 directories. The former works on more platforms for Portable.
4331 OpenBSD-Regress-ID: c3aa72807f9c488e8829a26ae50fe5bcc5b57099
4333 commit 748dd8e5de332b24c40f4b3bbedb902acb048c98
4334 Author: Damien Miller <djm@mindrot.org>
4335 Date: Tue Dec 19 16:17:59 2017 +1100
4337 remove blocks.c from Makefile
4339 commit 278856320520e851063b06cef6ef1c60d4c5d652
4340 Author: djm@openbsd.org <djm@openbsd.org>
4341 Date: Tue Dec 19 00:24:34 2017 +0000
4345 include signature type and CA key (if applicable) in some
4348 OpenBSD-Commit-ID: b71615cc20e78cec7105bb6e940c03ce9ae414a5
4350 commit 7860731ef190b52119fa480f8064ab03c44a120a
4351 Author: djm@openbsd.org <djm@openbsd.org>
4352 Date: Mon Dec 18 23:16:23 2017 +0000
4356 unbreak hostkey rotation; attempting to sign with a
4357 desired signature algorithm of kex->hostkey_alg is incorrect when the key
4358 type isn't capable of making those signatures. ok markus@
4360 OpenBSD-Commit-ID: 35ae46864e1f5859831ec0d115ee5ea50953a906
4362 commit 966ef478339ad5e631fb684d2a8effe846ce3fd4
4363 Author: djm@openbsd.org <djm@openbsd.org>
4364 Date: Mon Dec 18 23:14:34 2017 +0000
4368 log mismatched RSA signature types; ok markus@
4370 OpenBSD-Commit-ID: 381bddfcc1e297a42292222f3bcb5ac2b7ea2418
4372 commit 349ecd4da3a985359694a74635748009be6baca6
4373 Author: djm@openbsd.org <djm@openbsd.org>
4374 Date: Mon Dec 18 23:13:42 2017 +0000
4378 pass kex->hostkey_alg and kex->hostkey_nid from pre-auth
4379 to post-auth unpriviledged child processes; ok markus@
4381 OpenBSD-Commit-ID: 4a35bc7af0a5f8a232d1361f79f4ebc376137302
4383 commit c9e37a8725c083441dd34a8a53768aa45c3c53fe
4384 Author: millert@openbsd.org <millert@openbsd.org>
4385 Date: Mon Dec 18 17:28:54 2017 +0000
4389 Add helper function for uri handing in scp where a
4390 missing path simply means ".". Also fix exit code and add warnings when an
4391 invalid uri is encountered. OK otto@
4393 OpenBSD-Commit-ID: 47dcf872380586dabf7fcc6e7baf5f8ad508ae1a
4395 commit 04c7e28f83062dc42f2380d1bb3a6bf0190852c0
4396 Author: djm@openbsd.org <djm@openbsd.org>
4397 Date: Mon Dec 18 02:25:15 2017 +0000
4401 pass negotiated signing algorithm though to
4402 sshkey_verify() and check that the negotiated algorithm matches the type in
4403 the signature (only matters for RSA SHA1/SHA2 sigs). ok markus@
4405 OpenBSD-Commit-ID: 735fb15bf4adc060d3bee9d047a4bcaaa81b1af9
4407 commit 931c78dfd7fe30669681a59e536bbe66535f3ee9
4408 Author: djm@openbsd.org <djm@openbsd.org>
4409 Date: Mon Dec 18 02:22:29 2017 +0000
4413 sshkey_sigtype() function to return the type of a
4414 signature; ok markus@
4416 OpenBSD-Commit-ID: d3772b065ad6eed97285589bfb544befed9032e8
4418 commit 4cdc5956f2fcc9e9078938db833142dc07d8f523
4419 Author: naddy@openbsd.org <naddy@openbsd.org>
4420 Date: Thu Dec 14 21:07:39 2017 +0000
4424 Replace ED25519's private SHA-512 implementation with a
4425 call to the regular digest code. This speeds up compilation considerably. ok
4428 OpenBSD-Commit-ID: fcce8c3bcfe7389462a28228f63c823e80ade41c
4430 commit 012e5cb839faf76549e3b6101b192fe1a74d367e
4431 Author: naddy@openbsd.org <naddy@openbsd.org>
4432 Date: Tue Dec 12 15:06:12 2017 +0000
4436 Create a persistent umac128.c source file: #define the
4437 output size and the name of the entry points for UMAC-128 before including
4438 umac.c. Idea from FreeBSD. ok dtucker@
4440 OpenBSD-Commit-ID: 463cfacfa07cb8060a4d4961e63dca307bf3f4b1
4442 commit b35addfb4cd3b5cdb56a2a489d38e940ada926c7
4443 Author: Darren Tucker <dtucker@zip.com.au>
4444 Date: Mon Dec 11 16:23:28 2017 +1100
4446 Update .depend with empty config.h
4448 commit 2d96f28246938e0ca474a939d8ac82ecd0de27e3
4449 Author: Darren Tucker <dtucker@zip.com.au>
4450 Date: Mon Dec 11 16:21:55 2017 +1100
4452 Ensure config.h is always in dependencies.
4454 Put an empty config.h into the dependency list to ensure that it's
4455 always listed and consistent.
4457 commit ac4987a55ee5d4dcc8e87f7ae7c1f87be7257d71
4458 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4459 Date: Sun Dec 10 19:37:57 2017 +0000
4463 ssh/lib hasn't worked towards our code-sharing goals for
4464 a quit while, perhaps it is too verbose? Change each */Makefile to
4465 specifying exactly what sources that program requires, compiling it seperate.
4466 Maybe we'll iterate by sorting those into seperatable chunks, splitting up
4467 files which contain common code + server/client specific code, or whatnot.
4468 But this isn't one step, or we'd have done it a long time ago.. ok dtucker
4471 OpenBSD-Commit-ID: 5317f294d63a876bfc861e19773b1575f96f027d
4473 commit 48c23a39a8f1069a57264dd826f6c90aa12778d5
4474 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4475 Date: Sun Dec 10 05:55:29 2017 +0000
4479 Put remote client info back into the ClientAlive
4480 connection termination message. Based in part on diff from lars.nooden at
4483 OpenBSD-Commit-ID: 80a0f619a29bbf2f32eb5297a69978a0e05d0ee0
4485 commit aabd75ec76575c1b17232e6526a644097cd798e5
4486 Author: deraadt@openbsd.org <deraadt@openbsd.org>
4487 Date: Fri Dec 8 03:45:52 2017 +0000
4491 time_t printing needs %lld and (long long) casts ok djm
4493 OpenBSD-Commit-ID: 4a93bc2b0d42a39b8f8de8bb74d07ad2e5e83ef7
4495 commit fd4eeeec16537870bd40d04836c7906ec141c17d
4496 Author: djm@openbsd.org <djm@openbsd.org>
4497 Date: Fri Dec 8 02:14:33 2017 +0000
4501 fix ordering in previous to ensure errno isn't clobbered
4504 OpenBSD-Commit-ID: e260bc1e145a9690dcb0d5aa9460c7b96a0c8ab2
4506 commit 155072fdb0d938015df828836beb2f18a294ab8a
4507 Author: djm@openbsd.org <djm@openbsd.org>
4508 Date: Fri Dec 8 02:13:02 2017 +0000
4512 for some reason unix_listener() logged most errors twice
4513 with each message containing only some of the useful information; merge these
4515 OpenBSD-Commit-ID: 1978a7594a9470c0dddcd719586066311b7c9a4a
4517 commit 79c0e1d29959304e5a49af1dbc58b144628c09f3
4518 Author: Darren Tucker <dtucker@zip.com.au>
4519 Date: Mon Dec 11 14:38:33 2017 +1100
4521 Add autogenerated dependency info to Makefile.
4523 Adds a .depend file containing dependency information generated by
4524 makedepend, which is appended to the generated Makefile by configure.
4526 You can regen the file with "make -f Makefile.in depend" if necessary,
4527 but we'll be looking at some way to automatically keep this up to date.
4531 commit f001de8fbf7f3faddddd8efd03df18e57601f7eb
4532 Author: Darren Tucker <dtucker@zip.com.au>
4533 Date: Mon Dec 11 13:42:51 2017 +1100
4535 Fix pasto in ldns handling.
4537 When ldns-config is not found, configure would check the wrong variable.
4540 commit c5bfe83f67cb64e71cf2fe0d1500f6904b0099ee
4541 Author: Darren Tucker <dtucker@zip.com.au>
4542 Date: Sat Dec 9 10:12:23 2017 +1100
4544 Portable switched to git so s/CVS/git/.
4546 commit bb82e61a40a4ee52e4eb904caaee2c27b763ab5b
4547 Author: Darren Tucker <dtucker@zip.com.au>
4548 Date: Sat Dec 9 08:06:00 2017 +1100
4550 Remove now-used check for perl.
4552 commit e0ce54c0b9ca3a9388f9c50f4fa6cc25c28a3240
4553 Author: djm@openbsd.org <djm@openbsd.org>
4554 Date: Wed Dec 6 05:06:21 2017 +0000
4558 don't accept junk after "yes" or "no" responses to
4559 hostkey prompts. bz#2803 reported by Maksim Derbasov; ok dtucker@
4561 OpenBSD-Commit-ID: e1b159fb2253be973ce25eb7a7be26e6f967717c
4563 commit 609d96b3d58475a15b2eb6b3d463f2c5d8e510c0
4564 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4565 Date: Tue Dec 5 23:59:47 2017 +0000
4569 Replace atoi and strtol conversions for integer arguments
4570 to config keywords with a checking wrapper around strtonum. This will
4571 prevent and flag invalid and negative arguments to these keywords. ok djm@
4573 OpenBSD-Commit-ID: 99ae3981f3d608a219ccb8d2fff635ae52c17998
4575 commit 168ecec13f9d7cb80c07df3bf7d414f4e4165e84
4576 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4577 Date: Tue Dec 5 23:56:07 2017 +0000
4581 Add missing break for rdomain. Prevents spurious
4582 "Deprecated option" warnings. ok djm@
4584 OpenBSD-Commit-ID: ba28a675d39bb04a974586241c3cba71a9c6099a
4586 commit 927f8514ceffb1af380a5f63ab4d3f7709b1b198
4587 Author: djm@openbsd.org <djm@openbsd.org>
4588 Date: Tue Dec 5 01:30:19 2017 +0000
4592 include the addr:port in bind/listen failure messages
4594 OpenBSD-Commit-ID: fdadb69fe1b38692608809cf0376b71c2c28e58e
4596 commit a8c89499543e2d889629c4e5e8dcf47a655cf889
4597 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4598 Date: Wed Nov 29 05:49:54 2017 +0000
4602 Import updated moduli.
4604 OpenBSD-Commit-ID: 524d210f982af6007aa936ca7f4c977f4d32f38a
4606 commit 3dde09ab38c8e1cfc28252be473541a81bc57097
4607 Author: dtucker@openbsd.org <dtucker@openbsd.org>
4608 Date: Tue Nov 28 21:10:22 2017 +0000
4612 Have sftp print a warning about shell cleanliness when
4613 decoding the first packet fails, which is usually caused by shells polluting
4614 stdout of non-interactive starups. bz#2800, ok markus@ deraadt@.
4616 OpenBSD-Commit-ID: 88d6a9bf3470f9324b76ba1cbd53e50120f685b5
4618 commit 6c8a246437f612ada8541076be2414846d767319
4619 Author: Darren Tucker <dtucker@zip.com.au>
4620 Date: Fri Dec 1 17:11:47 2017 +1100
4622 Replace mkinstalldirs with mkdir -p.
4624 Check for MIKDIR_P and use it instead of mkinstalldirs. Should fix "mkdir:
4625 cannot create directory:... File exists" during "make install".
4626 Patch from eb at emlix.com.
4628 commit 3058dd78d2e43ed0f82ad8eab8bb04b043a72023
4629 Author: Darren Tucker <dtucker@zip.com.au>
4630 Date: Fri Dec 1 17:07:08 2017 +1100
4632 Pull in newer install-sh from autoconf-2.69.
4634 Suggested by eb at emlix.com
4636 commit 79226e5413c5b0fda3511351a8511ff457e306d8
4637 Author: Darren Tucker <dtucker@zip.com.au>
4638 Date: Fri Dec 1 16:55:35 2017 +1100
4640 Remove RSA1 host key generation.
4642 SSH1 support is now gone, remove SSH1 key generation.
4643 Patch from eb at emlix.com.
4645 commit 2937dd02c572a12f33d5c334d518f6cbe0b645eb
4646 Author: djm@openbsd.org <djm@openbsd.org>
4647 Date: Tue Nov 28 06:09:38 2017 +0000
4651 more whitespace errors
4653 OpenBSD-Commit-ID: 5e11c125378327b648940b90145e0d98beb05abb
4655 commit 7f257bf3fd3a759f31098960cbbd1453fafc4164
4656 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4657 Date: Tue Nov 28 06:04:51 2017 +0000
4663 OpenBSD-Commit-ID: 76d3965202b22d59c2784a8df3a8bfa5ee67b96a
4665 commit 5db6fbf1438b108e5df3e79a1b4de544373bc2d4
4666 Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org>
4667 Date: Sat Nov 25 06:46:22 2017 +0000
4671 Add monotime_ts and monotime_tv that return monotonic
4672 timespec and timeval respectively. Replace calls to gettimeofday() in packet
4673 timing with monotime_tv so that the callers will work over a clock step.
4674 Should prevent integer overflow during clock steps reported by wangle6 at
4675 huawei.com. "I like" markus@
4677 OpenBSD-Commit-ID: 74d684264814ff806f197948b87aa732cb1b0b8a
4679 commit 2d638e986085bdf1a40310ed6e2307463db96ea0
4680 Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org>
4681 Date: Sat Nov 25 05:58:47 2017 +0000
4685 Remove get_current_time() and replace with calls to
4686 monotime_double() which uses CLOCK_MONOTONIC and works over clock steps. "I
4689 OpenBSD-Commit-ID: 3ad2f7d2414e2cfcaef99877a7a5b0baf2242952
4691 commit ba460acae48a36ef749cb23068f968f4d5d90a24
4692 Author: Darren Tucker <dtucker@zip.com.au>
4693 Date: Fri Nov 24 16:24:31 2017 +1100
4695 Include string.h for explicit_bzero.
4697 commit a65655fb1a12b77fb22f9e71559b9d73030ec8ff
4698 Author: Damien Miller <djm@mindrot.org>
4699 Date: Fri Nov 24 10:23:47 2017 +1100
4701 fix incorrect range of OpenSSL versions supported
4703 Pointed out by Solar Designer
4705 commit 83a1e5dbec52d05775174f368e0c44b08619a308
4706 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4707 Date: Wed Nov 15 02:10:16 2017 +0000
4711 downgrade a couple more request parsing errors from
4712 process-fatal to just returning failure, making them consistent with the
4713 others that were already like that.
4715 OpenBSD-Commit-ID: c111461f7a626690a2d53018ef26557b34652918
4717 commit 93c68a8f3da8e5e6acdc3396f54d73919165e242
4718 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4719 Date: Wed Nov 15 00:13:40 2017 +0000
4723 fix regression in 7.6: failure to parse a signature request
4724 message shouldn't be fatal to the process, just the request. Reported by Ron
4727 OpenBSD-Commit-ID: e5d01b3819caa1a2ad51fc57d6ded43f48bbcc05
4729 commit 548d3a66feb64c405733932a6b1abeaf7198fa71
4730 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4731 Date: Tue Nov 14 00:45:29 2017 +0000
4735 fix problem in configuration parsing when in config dump mode
4736 (sshd -T) without providing a full connection specification (sshd -T -C ...)
4740 OpenBSD-Commit-ID: 7125faf5740eaa9d3a2f25400a0bc85e94e28b8f
4742 commit 33edb6ebdc2f81ebed1bceadacdfb8910b64fb88
4743 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4744 Date: Fri Nov 3 05:18:44 2017 +0000
4748 reuse parse_multistate for parse_flag (yes/no arguments).
4749 Saves a few lines of code and makes the parser more consistent wrt case-
4750 sensitivity. bz#2664 ok dtucker@
4752 OpenBSD-Commit-ID: b2ad1b6086858d5db71c7b11e5a74dba6d60efef
4754 commit d52131a98316e76c0caa348f09bf6f7b9b01a1b9
4755 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4756 Date: Fri Nov 3 05:14:04 2017 +0000
4760 allow certificate validity intervals that specify only a
4761 start or stop time (we already support specifying both or neither)
4763 OpenBSD-Commit-ID: 9be486545603c003030bdb5c467d1318b46b4e42
4765 commit fbe8e7ac94c2fa380421a9205a8bc966549c2f91
4766 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4767 Date: Fri Nov 3 03:46:52 2017 +0000
4771 allow "cd" and "lcd" commands with no explicit path
4772 argument. lcd will change to the local user's home directory as usual. cd
4773 will change to the starting directory for session (because the protocol
4774 offers no way to obtain the remote user's home directory). bz#2760 ok
4777 OpenBSD-Commit-ID: 15333f5087cee8c1ed1330cac1bd0a3e6a767393
4779 commit 0208a48517b5e8e8b091f32fa4addcd67c31ca9e
4780 Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org>
4781 Date: Fri Nov 3 03:18:53 2017 +0000
4785 When doing a config test with sshd -T, only require the
4786 attributes that are actually used in Match criteria rather than (an
4787 incomplete list of) all criteria. ok djm@, man page help jmc@
4789 OpenBSD-Commit-ID: b4e773c4212d3dea486d0259ae977551aab2c1fc
4791 commit c357eed5a52cd2f4ff358b17e30e3f9a800644da
4792 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4793 Date: Fri Nov 3 02:32:19 2017 +0000
4797 typos in ECDSA certificate names; bz#2787 reported by
4800 OpenBSD-Commit-ID: 824938b6aba1b31321324ba1f56c05f84834b163
4802 commit ecbf005b8fd80b81d0c61dfc1e96fe3da6099395
4803 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4804 Date: Fri Nov 3 02:29:17 2017 +0000
4808 Private keys in PEM format have been encrypted by AES-128 for
4809 a while (not 3DES). bz#2788 reported by Calum Mackay
4811 OpenBSD-Commit-ID: bd33da7acbbb3c882f0a0ee56007a35ce0d8a11a
4813 commit 81c9ccdbf6ddbf9bfbd6f1f775a5a7c13e47e185
4814 Author: Darren Tucker <dtucker@zip.com.au>
4815 Date: Fri Nov 3 14:52:51 2017 +1100
4817 Check for linux/if.h when enabling rdomain.
4819 musl libc doesn't seem to have linux/if.h, so check for its presence
4820 before enabling rdomain support on Linux.
4822 commit fa1b834cce41a1ce3e6a8d57fb67ef18c9dd803f
4823 Author: Darren Tucker <dtucker@zip.com.au>
4824 Date: Fri Nov 3 14:09:45 2017 +1100
4826 Add headers for sys/sysctl.h and net/route.h
4828 On at least older OpenBSDs, sys/sysctl.h and net/route.h require
4829 sys/types and, in the case of sys/sysctl.h, sys/param.h for MAXLOGNAME.
4831 commit 41bff4da21fcd8a7c6a83a7e0f92b018f904f6fb
4832 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4833 Date: Fri Nov 3 02:22:41 2017 +0000
4837 avoid unused variable warnings for !WITH_OPENSSL; patch from
4840 OpenBSD-Commit-ID: c01d27a3f907acdc3dd4ea48170fac3ba236d229
4842 commit 6b373e4635a7470baa94253dd1dc8953663da9e8
4843 Author: Marcus Folkesson <marcus.folkesson@gmail.com>
4844 Date: Sat Oct 28 19:48:39 2017 +0200
4846 only enable functions in dh.c when openssl is used
4848 Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
4850 commit 939b30ba23848b572e15bf92f0f1a3d9cf3acc2b
4851 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4852 Date: Wed Nov 1 00:04:15 2017 +0000
4856 fix broken stdout in ControlPersist mode, introduced by me in
4857 r1.467 and reported by Alf Schlichting
4859 OpenBSD-Commit-ID: 3750a16e02108fc25f747e4ebcedb7123c1ef509
4861 commit f21455a084f9cc3942cf1bde64055a4916849fed
4862 Author: Darren Tucker <dtucker@zip.com.au>
4863 Date: Tue Oct 31 10:09:33 2017 +1100
4865 Include includes.h for HAVE_GETPAGESIZE.
4867 The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in
4868 config.h, but bsd-getpagesize.c forgot to include includes.h (which
4869 indirectly includes config.h) so the checks always fails, causing linker
4870 issues when linking statically on systems with getpagesize().
4872 Patch from Peter Korsgaard <peter at korsgaard.com>
4874 commit f2ad63c0718b93ac1d1e85f53fee33b06eef86b5
4875 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4876 Date: Mon Oct 30 22:01:52 2017 +0000
4882 OpenBSD-Regress-ID: f4b5df99b28c6f63478deb916c6ed0e794685f07
4884 commit c6415b1f8f1d0c2735564371647fd6a177fb9a3e
4885 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4886 Date: Mon Oct 30 21:59:43 2017 +0000
4892 OpenBSD-Regress-ID: 19b1394393deee4c8a2114a3b7d18189f27a15cd
4894 commit e4d4ddbbba0e585ca3ec3a455430750b4622a6d3
4895 Author: millert@openbsd.org@openbsd.org <millert@openbsd.org@openbsd.org>
4896 Date: Wed Oct 25 20:08:36 2017 +0000
4900 Use printenv to test whether an SSH_USER_AUTH is set
4901 instead of using $SSH_USER_AUTH. The latter won't work with csh which treats
4902 unknown variables as an error when expanding them. OK markus@
4904 OpenBSD-Regress-ID: f601e878dd8b71aa40381573dde3a8f567e6f2d1
4906 commit 116b1b439413a724ebb3320633a64dd0f3ee1fe7
4907 Author: millert@openbsd.org@openbsd.org <millert@openbsd.org@openbsd.org>
4908 Date: Tue Oct 24 19:33:32 2017 +0000
4912 Add tests for URI parsing. OK markus@
4914 OpenBSD-Regress-ID: 5d1df19874f3b916d1a2256a905526e17a98bd3b
4916 commit dbe0662e9cd482593a4a8bf58c6481bfe8a747a4
4917 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4918 Date: Fri Oct 27 01:57:06 2017 +0000
4924 OpenBSD-Commit-ID: c95549cf5a07d56ea11aaff818415118720214f6
4926 commit d2135474344335a7c6ee643b6ade6db400fa76ee
4927 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4928 Date: Fri Oct 27 01:01:17 2017 +0000
4932 whitespace at EOL (lots)
4934 OpenBSD-Commit-ID: 757257dd44116794ee1b5a45c6724973de181747
4936 commit b77c29a07f5a02c7c1998701c73d92bde7ae1608
4937 Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
4938 Date: Fri Oct 27 00:18:41 2017 +0000
4942 improve printing of rdomain on accept() a little
4944 OpenBSD-Commit-ID: 5da58db2243606899cedaa646c70201b2d12247a
4946 commit 68d3bbb2e6dfbf117c46e942142795b2cdd0274b
4947 Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org>
4948 Date: Thu Oct 26 06:44:01 2017 +0000
4952 mark up the rdomain keyword;
4954 OpenBSD-Commit-ID: 1b597d0ad0ad20e94dbd61ca066057e6f6313b8a
4956 commit 0b2e2896b9d0d6cfb59e9ec8271085296bd4e99b
4957 Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org>
4958 Date: Wed Oct 25 06:19:46 2017 +0000
4962 tweak the uri text, specifically removing some markup to
4963 make it a bit more readable;
4965 issue reported by - and diff ok - millert
4967 OpenBSD-Commit-ID: 8b56a20208040b2d0633536fd926e992de37ef3f
4969 commit 7530e77bdc9415386d2a8ea3d086e8b611b2ba40
4970 Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org>
4971 Date: Wed Oct 25 06:18:06 2017 +0000
4975 simplify macros in previous, and some minor tweaks;
4977 OpenBSD-Commit-ID: 6efeca3d8b095b76e21b484607d9cc67ac9a11ca
4979 commit eb9c582b710dc48976b48eb2204218f6863bae9a
4980 Author: Damien Miller <djm@mindrot.org>
4981 Date: Tue Oct 31 00:46:29 2017 +1100
4983 Switch upstream git repository.
4985 Previously portable OpenSSH has synced against a conversion of OpenBSD's
4986 CVS repository made using the git cvsimport tool, but this has become
4987 increasingly unreliable.
4989 As of this commit, portable OpenSSH now tracks a conversion of the
4990 OpenBSD CVS upstream made using the excellent cvs2gitdump tool from
4991 YASUOKA Masahiko: https://github.com/yasuoka/cvs2gitdump
4993 cvs2gitdump is considerably more reliable than gitcvsimport and the old
4994 version of cvsps that it uses under the hood, and is the same tool used
4995 to export the entire OpenBSD repository to git (so we know it can cope
4996 with future growth).
4998 These new conversions are mirrored at github, so interested parties can
4999 match portable OpenSSH commits to their upstream counterparts.
5001 https://github.com/djmdjm/openbsd-openssh-src
5002 https://github.com/djmdjm/openbsd-openssh-regress
5004 An unfortunate side effect of switching upstreams is that we must have
5005 a flag day, across which the upstream commit IDs will be inconsistent.
5006 The old commit IDs are recorded with the tags "Upstream-ID" for main
5007 directory commits and "Upstream-Regress-ID" for regress commits.
5009 To make it clear that the commit IDs do not refer to the same
5010 things, the new repository will instead use "OpenBSD-ID" and
5011 "OpenBSD-Regress-ID" tags instead.
5013 Apart from being a longwinded explanation of what is going on, this
5014 commit message also serves to synchronise our tools with the state of
5015 the tree, which happens to be:
5017 OpenBSD-ID: 9c43a9968c7929613284ea18e9fb92e4e2a8e4c1
5018 OpenBSD-Regress-ID: b33b385719420bf3bc57d664feda6f699c147fef
5020 commit 2de5c6b53bf063ac698596ef4e23d8e3099656ea
5021 Author: Damien Miller <djm@mindrot.org>
5022 Date: Fri Oct 27 08:42:33 2017 +1100
5024 fix rdomain compilation errors
5026 commit 6bd5b569fd6dfd5e8c8af20bbc41e45c2d6462ab
5027 Author: Damien Miller <djm@mindrot.org>
5028 Date: Wed Oct 25 14:15:42 2017 +1100
5030 autoconf glue to enable Linux VRF
5032 commit 97c5aaf925d61641d599071abb56012cde265978
5033 Author: Damien Miller <djm@mindrot.org>
5034 Date: Wed Oct 25 14:09:56 2017 +1100
5036 basic valid_rdomain() implementation for Linux
5038 commit ce1cca39d7935dd394080ce2df62f5ce5b51f485
5039 Author: Damien Miller <djm@mindrot.org>
5040 Date: Wed Oct 25 13:47:59 2017 +1100
5042 implement get/set_rdomain() for Linux
5044 Not enabled, pending implementation of valid_rdomain() and autoconf glue
5046 commit 6eee79f9b8d4a3b113b698383948a119acb82415
5047 Author: Damien Miller <djm@mindrot.org>
5048 Date: Wed Oct 25 13:22:29 2017 +1100
5050 stubs for rdomain replacement functions
5052 commit f5594f939f844bbb688313697d6676238da355b3
5053 Author: Damien Miller <djm@mindrot.org>
5054 Date: Wed Oct 25 13:13:57 2017 +1100
5056 rename port-tun.[ch] => port-net.[ch]
5058 Ahead of adding rdomain support
5060 commit d685e5a31feea35fb99e1a31a70b3c60a7f2a0eb
5061 Author: djm@openbsd.org <djm@openbsd.org>
5062 Date: Wed Oct 25 02:10:39 2017 +0000
5066 uninitialised variable in PermitTunnel printing code
5068 Upstream-ID: f04dc33e42855704e116b8da61095ecc71bc9e9a
5070 commit 43c29bb7cfd46bbbc61e0ffa61a11e74d49a712f
5071 Author: Damien Miller <djm@mindrot.org>
5072 Date: Wed Oct 25 13:10:59 2017 +1100
5074 provide hooks and fallbacks for rdomain support
5076 commit 3235473bc8e075fad7216b7cd62fcd2b0320ea04
5077 Author: Damien Miller <djm@mindrot.org>
5078 Date: Wed Oct 25 11:25:43 2017 +1100
5080 check for net/route.h and sys/sysctl.h
5082 commit 4d5456c7de108e17603a0920c4d15bca87244921
5083 Author: djm@openbsd.org <djm@openbsd.org>
5084 Date: Wed Oct 25 00:21:37 2017 +0000
5088 transfer ownership of stdout to the session channel by
5089 dup2'ing /dev/null to fd 1. This allows propagation of remote stdout close to
5090 the local side; reported by David Newall, ok markus@
5092 Upstream-ID: 8d9ac18a11d89e6b0415f0cbf67b928ac67f0e79
5094 commit 68af80e6fdeaeb79432209db614386ff0f37e75f
5095 Author: djm@openbsd.org <djm@openbsd.org>
5096 Date: Wed Oct 25 00:19:47 2017 +0000
5100 add a "rdomain" criteria for the sshd_config Match
5101 keyword to allow conditional configuration that depends on which rdomain(4) a
5102 connection was recevied on. ok markus@
5104 Upstream-ID: 27d8fd5a3f1bae18c9c6e533afdf99bff887a4fb
5106 commit 35eb33fb957979e3fcbe6ea0eaee8bf4a217421a
5107 Author: djm@openbsd.org <djm@openbsd.org>
5108 Date: Wed Oct 25 00:17:08 2017 +0000
5112 add sshd_config RDomain keyword to place sshd and the
5113 subsequent user session (including the shell and any TCP/IP forwardings) into
5114 the specified rdomain(4)
5118 Upstream-ID: be2358e86346b5cacf20d90f59f980b87d1af0f5
5120 commit acf559e1cffbd1d6167cc1742729fc381069f06b
5121 Author: djm@openbsd.org <djm@openbsd.org>
5122 Date: Wed Oct 25 00:15:35 2017 +0000
5126 Add optional rdomain qualifier to sshd_config's
5127 ListenAddress option to allow listening on a different rdomain(4), e.g.
5129 ListenAddress 0.0.0.0 rdomain 4
5131 Upstream-ID: 24b6622c376feeed9e9be8b9605e593695ac9091
5133 commit b9903ee8ee8671b447fc260c2bee3761e26c7227
5134 Author: millert@openbsd.org <millert@openbsd.org>
5135 Date: Tue Oct 24 19:41:45 2017 +0000
5139 Kill dead store and some spaces vs. tabs indent in
5140 parse_user_host_path(). Noticed by markus@
5142 Upstream-ID: 114fec91dadf9af46c7c94fd40fc630ea2de8200
5144 commit 0869627e00f4ee2a038cb62d7bd9ffad405e1800
5145 Author: jmc@openbsd.org <jmc@openbsd.org>
5146 Date: Tue Oct 24 06:27:42 2017 +0000
5150 tweak previous; ok djm
5152 Upstream-ID: 7d913981ab315296be1f759c67b6e17aea38fca9
5154 commit e3fa20e2e58fdc88a0e842358778f2de448b771b
5155 Author: Damien Miller <djm@mindrot.org>
5156 Date: Mon Oct 23 16:25:24 2017 +1100
5158 avoid -Wsign-compare warning in argv copying
5160 commit b7548b12a6b2b4abf4d057192c353147e0abba08
5161 Author: djm@openbsd.org <djm@openbsd.org>
5162 Date: Mon Oct 23 05:08:00 2017 +0000
5166 Expose devices allocated for tun/tap forwarding.
5168 At the client, the device may be obtained from a new %T expansion
5171 At the server, the allocated devices will be listed in a
5172 SSH_TUNNEL variable exposed to the environment of any user sessions
5173 started after the tunnel forwarding was established.
5177 Upstream-ID: e61e53f8ae80566e9ddc0d67a5df5bdf2f3c9f9e
5179 commit 887669ef032d63cf07f53cada216fa8a0c9a7d72
5180 Author: millert@openbsd.org <millert@openbsd.org>
5181 Date: Sat Oct 21 23:06:24 2017 +0000
5185 Add URI support to ssh, sftp and scp. For example
5186 ssh://user@host or sftp://user@host/path. The connection parameters
5187 described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since
5188 the ssh fingerprint format in the draft uses md5 with no way to specify the
5189 hash function type. OK djm@
5191 Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc
5193 commit d27bff293cfeb2252f4c7a58babe5ad3262c6c98
5194 Author: Damien Miller <djm@mindrot.org>
5195 Date: Fri Oct 20 13:22:00 2017 +1100
5197 Fix missed RCSID merges
5199 commit d3b6aeb546242c9e61721225ac4387d416dd3d5e
5200 Author: djm@openbsd.org <djm@openbsd.org>
5201 Date: Fri Oct 20 02:13:41 2017 +0000
5207 Upstream-Regress-ID: 1aecbe3f8224793f0ec56741a86d619830eb33be
5209 commit b011edbb32e41aaab01386ce4c0efcc9ff681c4a
5210 Author: djm@openbsd.org <djm@openbsd.org>
5211 Date: Fri Oct 20 01:56:39 2017 +0000
5215 add RCSIDs to these; they make syncing portable a bit
5218 Upstream-ID: 56cb7021faea599736dd7e7f09c2e714425b1e68
5220 commit 6eb27597781dccaf0ec2b80107a9f0592a0cb464
5221 Author: Damien Miller <djm@mindrot.org>
5222 Date: Fri Oct 20 12:54:15 2017 +1100
5226 Apply missing commit 1.11 to kexc25519s.c
5228 Upstream-ID: 5f020e23a1ee6c3597af1f91511e68552cdf15e8
5230 commit 6f72280553cb6918859ebcacc717f2d2fafc1a27
5231 Author: Damien Miller <djm@mindrot.org>
5232 Date: Fri Oct 20 12:52:50 2017 +1100
5236 Apply missing commit 1.127 to servconf.h
5238 Upstream-ID: f14c4bac74a2b7cf1e3cff6bea5c447f192a7d15
5240 commit bb3e16ab25cb911238c2eb7455f9cf490cb143cc
5241 Author: jmc@openbsd.org <jmc@openbsd.org>
5242 Date: Wed Oct 18 05:36:59 2017 +0000
5248 Upstream-ID: 8ad26467f1f6a40be887234085a8e01a61a00550
5250 commit 05b69e99570553c8e1eafb895b1fbf1d098d2e14
5251 Author: djm@openbsd.org <djm@openbsd.org>
5252 Date: Wed Oct 18 02:49:44 2017 +0000
5256 In the description of pattern-lists, clarify negated
5257 matches by explicitly stating that a negated match will never yield a
5258 positive result, and that at least one positive term in the pattern-list must
5261 Upstream-ID: 652d2f9d993f158fc5f83cef4a95cd9d95ae6a14
5263 commit eb80e26a15c10bc65fed8b8cdb476819a713c0fd
5264 Author: djm@openbsd.org <djm@openbsd.org>
5265 Date: Fri Oct 13 21:13:54 2017 +0000
5269 log debug messages sent to peer; ok deraadt markus
5271 Upstream-ID: 3b4fdc0a06ea5083f61d96e20043000f477103d9
5273 commit 071325f458d615d7740da5c1c1d5a8b68a0b4605
5274 Author: jmc@openbsd.org <jmc@openbsd.org>
5275 Date: Fri Oct 13 16:50:45 2017 +0000
5279 trim permitrootlogin description somewhat, to avoid
5280 ambiguity; original diff from walter alejandro iglesias, tweaked by sthen and
5283 ok sthen schwarze deraadt
5285 Upstream-ID: 1749418b2bc073f3fdd25fe21f8263c3637fe5d2
5287 commit 10727487becb897a15f658e0cb2d05466236e622
5288 Author: djm@openbsd.org <djm@openbsd.org>
5289 Date: Fri Oct 13 06:45:18 2017 +0000
5293 mention SSH_USER_AUTH in the list of environment
5296 Upstream-ID: 1083397c3ee54b4933121ab058c70a0fc6383691
5298 commit 224f193d6a4b57e7a0cb2b9ecd3b6c54d721d8c2
5299 Author: djm@openbsd.org <djm@openbsd.org>
5300 Date: Fri Oct 13 06:24:51 2017 +0000
5304 BIO_get_mem_data() is supposed to take a char* as pointer
5305 argument, so don't pass it a const char*
5307 Upstream-ID: 1ccd91eb7f4dd4f0fa812d4f956987cd00b5f6ec
5309 commit cfa46825b5ef7097373ed8e31b01a4538a8db565
5310 Author: benno@openbsd.org <benno@openbsd.org>
5311 Date: Mon Oct 9 20:12:51 2017 +0000
5315 clarify the order in which config statements are used. ok
5318 Upstream-ID: e37e27bb6bbac71315e22cb9690fd8a556a501ed
5320 commit dceabc7ad7ebc7769c8214a1647af64c9a1d92e5
5321 Author: djm@openbsd.org <djm@openbsd.org>
5322 Date: Thu Oct 5 15:52:03 2017 +0000
5326 replace statically-sized arrays in ServerOptions with
5327 dynamic ones managed by xrecallocarray, removing some arbitrary (though
5328 large) limits and saving a bit of memory; "much nicer" markus@
5330 Upstream-ID: 1732720b2f478fe929d6687ac7b0a97ff2efe9d2
5332 commit 2b4f3ab050c2aaf6977604dd037041372615178d
5333 Author: jmc@openbsd.org <jmc@openbsd.org>
5334 Date: Thu Oct 5 12:56:50 2017 +0000
5338 %C is hashed; from klemens nanni ok markus
5340 Upstream-ID: 6ebed7b2e1b6ee5402a67875d74f5e2859d8f998
5342 commit a66714508b86d6814e9055fefe362d9fe4d49ab3
5343 Author: djm@openbsd.org <djm@openbsd.org>
5344 Date: Wed Oct 4 18:50:23 2017 +0000
5348 exercise PermitOpen a little more thoroughly
5350 Upstream-Regress-ID: f41592334e227a4c1f9a983044522de4502d5eac
5352 commit 609ecc8e57eb88e2eac976bd3cae7f7889aaeff6
5353 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5354 Date: Tue Sep 26 22:39:25 2017 +0000
5358 UsePrivilegeSeparation is gone, stop trying to test it.
5360 Upstream-Regress-ID: 796a5057cfd79456a20ea935cc53f6eb80ace191
5362 commit 69bda0228861f3dacd4fb3d28b60ce9d103d254b
5363 Author: djm@openbsd.org <djm@openbsd.org>
5364 Date: Wed Oct 4 18:49:30 2017 +0000
5368 fix (another) problem in PermitOpen introduced during the
5369 channels.c refactor: the third and subsequent arguments to PermitOpen were
5370 being silently ignored; ok markus@
5372 Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd
5374 commit 66bf74a92131b7effe49fb0eefe5225151869dc5
5375 Author: djm@openbsd.org <djm@openbsd.org>
5376 Date: Mon Oct 2 19:33:20 2017 +0000
5380 Fix PermitOpen crash; spotted by benno@, ok dtucker@ deraadt@
5382 Upstream-ID: c2cc84ffac070d2e1ff76182c70ca230a387983c
5384 commit d63b38160a59039708fd952adc75a0b3da141560
5385 Author: Damien Miller <djm@mindrot.org>
5386 Date: Sun Oct 1 10:32:25 2017 +1100
5390 I spotted a typo in the draft so uploaded a new version...
5392 commit 6f64f596430cd3576c529f07acaaf2800aa17d58
5393 Author: Damien Miller <djm@mindrot.org>
5394 Date: Sun Oct 1 10:01:56 2017 +1100
5396 sync release notes URL
5398 commit 35ff70a04dd71663a5ac1e73b90d16d270a06e0d
5399 Author: Damien Miller <djm@mindrot.org>
5400 Date: Sun Oct 1 10:01:25 2017 +1100
5402 sync contrib/ssh-copy-id with upstream
5404 commit 290843b8ede85f8b30bf29cd7dceb805c3ea5b66
5405 Author: Damien Miller <djm@mindrot.org>
5406 Date: Sun Oct 1 09:59:19 2017 +1100
5408 update version in RPM spec files
5410 commit 4e4e0bb223c5be88d87d5798c75cc6b0d4fef31d
5411 Author: Damien Miller <djm@mindrot.org>
5412 Date: Sun Oct 1 09:58:24 2017 +1100
5414 update agent draft URL
5416 commit e4a798f001d2ecd8bf025c1d07658079f27cc604
5417 Author: djm@openbsd.org <djm@openbsd.org>
5418 Date: Sat Sep 30 22:26:33 2017 +0000
5422 openssh-7.6; ok deraadt@
5424 Upstream-ID: a39c3a5b63a1baae109ae1ae4c7c34c2a59acde0
5426 commit 5fa1407e16e7e5fda9769d53b626ce39d5588d4d
5427 Author: jmc@openbsd.org <jmc@openbsd.org>
5428 Date: Wed Sep 27 06:45:53 2017 +0000
5432 tweak EposeAuthinfo; diff from lars nooden
5434 tweaked by sthen; ok djm dtucker
5436 Upstream-ID: 8f2ea5d2065184363e8be7a0ba24d98a3b259748
5438 commit bba69c246f0331f657fd6ec97724df99fc1ad174
5439 Author: Damien Miller <djm@mindrot.org>
5440 Date: Thu Sep 28 16:06:21 2017 -0700
5442 don't fatal ./configure for LibreSSL
5444 commit 04dc070e8b4507d9d829f910b29be7e3b2414913
5445 Author: Damien Miller <djm@mindrot.org>
5446 Date: Thu Sep 28 14:54:34 2017 -0700
5448 abort in configure when only openssl-1.1.x found
5450 We don't support openssl-1.1.x yet (see multiple threads on the
5451 openssh-unix-dev@ mailing list for the reason), but previously
5452 ./configure would accept it and the compilation would subsequently
5453 fail. This makes ./configure display an explicit error message and
5458 commit 74c1c3660acf996d9dc329e819179418dc115f2c
5459 Author: Darren Tucker <dtucker@zip.com.au>
5460 Date: Wed Sep 27 07:44:41 2017 +1000
5462 Check for and handle calloc(p, 0) = NULL.
5464 On some platforms (AIX, maybe others) allocating zero bytes of memory
5465 via the various *alloc functions returns NULL, which is permitted
5466 by the standards. Autoconf has some macros for detecting this (with
5467 the exception of calloc for some reason) so use these and if necessary
5468 activate shims for them. ok djm@
5470 commit 6a9481258a77b0b54b2a313d1761c87360c5f1f5
5471 Author: markus@openbsd.org <markus@openbsd.org>
5472 Date: Thu Sep 21 19:18:12 2017 +0000
5476 test reverse dynamic forwarding with SOCKS
5478 Upstream-Regress-ID: 95cf290470f7e5e2f691e4bc6ba19b91eced2f79
5480 commit 1b9f321605733754df60fac8c1d3283c89b74455
5481 Author: Damien Miller <djm@mindrot.org>
5482 Date: Tue Sep 26 16:55:55 2017 +1000
5484 sync missing changes in dynamic-forward.sh
5486 commit 44fc334c7a9ebdd08addb6d5fa005369897fddeb
5487 Author: Darren Tucker <dtucker@zip.com.au>
5488 Date: Mon Sep 25 09:48:10 2017 +1000
5490 Add minimal strsignal for platforms without it.
5492 commit 218e6f98df566fb9bd363f6aa47018cb65ede196
5493 Author: djm@openbsd.org <djm@openbsd.org>
5494 Date: Sun Sep 24 13:45:34 2017 +0000
5498 fix inverted test on channel open failure path that
5499 "upgraded" a transient failure into a fatal error; reported by sthen and also
5500 seen by benno@; ok sthen@
5502 Upstream-ID: b58b3fbb79ba224599c6cd6b60c934fc46c68472
5504 commit c704f641f7b8777497dc82e81f2ac89afec7e401
5505 Author: djm@openbsd.org <djm@openbsd.org>
5506 Date: Sun Sep 24 09:50:01 2017 +0000
5510 write the correct buffer when tunnel forwarding; doesn't
5511 matter on OpenBSD (they are the same) but does matter on portable where we
5512 use an output filter to translate os-specific tun/tap headers
5514 Upstream-ID: f1ca94eff48404827b12e1d12f6139ee99a72284
5516 commit 55486f5cef117354f0c64f991895835077b7c7f7
5517 Author: djm@openbsd.org <djm@openbsd.org>
5518 Date: Sat Sep 23 22:04:07 2017 +0000
5522 fix tunnel forwarding problem introduced in refactor;
5523 reported by stsp@ ok markus@
5525 Upstream-ID: 81a731cdae1122c8522134095d1a8b60fa9dcd04
5527 commit 609d7a66ce578abf259da2d5f6f68795c2bda731
5528 Author: markus@openbsd.org <markus@openbsd.org>
5529 Date: Thu Sep 21 19:16:53 2017 +0000
5533 Add 'reverse' dynamic forwarding which combines dynamic
5534 forwarding (-D) with remote forwarding (-R) where the remote-forwarded port
5535 expects SOCKS-requests.
5537 The SSH server code is unchanged and the parsing happens at the SSH
5538 clients side. Thus the full SOCKS-request is sent over the forwarded
5539 channel and the client parses c->output. Parsing happens in
5540 channel_before_prepare_select(), _before_ the select bitmask is
5541 computed in the pre[] handlers, but after network input processing
5542 in the post[] handlers.
5546 Upstream-ID: aa25a6a3851064f34fe719e0bf15656ad5a64b89
5548 commit 36945fa103176c00b39731e1fc1919a0d0808b81
5549 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5550 Date: Wed Sep 20 05:19:00 2017 +0000
5554 Use strsignal in debug message instead of casting for the
5555 benefit of portable where sig_atomic_t might not be int. "much nicer"
5558 Upstream-ID: 2dac6c1e40511c700bd90664cd263ed2299dcf79
5560 commit 3e8d185af326bf183b6f78597d5e3d2eeb2dc40e
5561 Author: millert@openbsd.org <millert@openbsd.org>
5562 Date: Tue Sep 19 12:10:30 2017 +0000
5566 Use explicit_bzero() instead of bzero() before free() to
5567 prevent the compiler from optimizing away the bzero() call. OK djm@
5569 Upstream-ID: cdc6197e64c9684c7250e23d60863ee1b53cef1d
5571 commit 5b8da1f53854c0923ec6e927e86709e4d72737b6
5572 Author: djm@openbsd.org <djm@openbsd.org>
5573 Date: Tue Sep 19 04:24:22 2017 +0000
5577 fix use-after-free in ~^Z escape handler path, introduced
5578 in channels.c refactor; spotted by millert@ "makes sense" deraadt@
5580 Upstream-ID: 8fa2cdc65c23ad6420c1e59444b0c955b0589b22
5582 commit a3839d8d2b89ff1a80cadd4dd654336710de2c9e
5583 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5584 Date: Mon Sep 18 12:03:24 2017 +0000
5588 Prevent type mismatch warning in debug on platforms where
5589 sig_atomic_t != int. ok djm@
5591 Upstream-ID: 306e2375eb0364a4c68e48f091739bea4f4892ed
5593 commit 30484e5e5f0b63d2c6ba32c6b85f06b6c6fa55fc
5594 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5595 Date: Mon Sep 18 09:41:52 2017 +0000
5599 Add braces missing after channels refactor. ok markus@
5601 Upstream-ID: 72ab325c84e010680dbc88f226e2aa96b11a3980
5603 commit b79569190b9b76dfacc6d996faa482f16e8fc026
5604 Author: Damien Miller <djm@mindrot.org>
5605 Date: Tue Sep 19 12:29:23 2017 +1000
5607 add freezero(3) replacement
5611 commit 161af8f5ec0961b10cc032efb5cc1b44ced5a92e
5612 Author: Damien Miller <djm@mindrot.org>
5613 Date: Tue Sep 19 10:18:56 2017 +1000
5615 move FORTIFY_SOURCE into hardening options group
5617 It's still on by default, but now it's possible to turn it off using
5618 --without-hardening. This is useful since it's known to cause problems
5619 with some -fsanitize options. ok dtucker@
5621 commit 09eacf856e0fe1a6e3fe597ec8032b7046292914
5622 Author: bluhm@openbsd.org <bluhm@openbsd.org>
5623 Date: Wed Sep 13 14:58:26 2017 +0000
5627 Print SKIPPED if sudo and doas configuration is missing.
5628 Prevents that running the regression test with wrong environment is reported
5629 as failure. Keep the fatal there to avoid interfering with other setups for
5630 portable ssh. OK dtucker@
5632 Upstream-Regress-ID: f0dc60023caef496ded341ac5aade2a606fa234e
5634 commit cdede10899892f25f1ccdccd7a3fe5e5ef0aa49a
5635 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5636 Date: Mon Aug 7 03:52:55 2017 +0000
5640 Remove obsolete privsep=no fallback test.
5642 Upstream-Regress-ID: 7d6e1baa1678ac6be50c2a1555662eb1047638df
5644 commit ec218c105daa9f5b192f7aa890fdb2d4fdc4e9d8
5645 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5646 Date: Mon Aug 7 00:53:51 2017 +0000
5650 Remove non-privsep test since disabling privsep is now
5653 Upstream-Regress-ID: 77ad3f3d8d52e87f514a80f285c6c1229b108ce8
5655 commit 239c57d5bc2253e27e3e6ad7ac52ec8c377ee24e
5656 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5657 Date: Fri Jul 28 10:32:08 2017 +0000
5661 Don't call fatal from stop_sshd since it calls cleanup
5662 which calls stop_sshd which will probably fail in the same way. Instead,
5663 just bail. Differentiate between sshd dying without cleanup and not shutting
5666 Upstream-Regress-ID: f97315f538618b349e2b0bea02d6b0c9196c6bc4
5668 commit aea59a0d9f120f2a87c7f494a0d9c51eaa79b8ba
5669 Author: djm@openbsd.org <djm@openbsd.org>
5670 Date: Thu Sep 14 04:32:21 2017 +0000
5674 Revert commitid: gJtIN6rRTS3CHy9b.
5677 identify the case where SSHFP records are missing but other DNS RR
5678 types are present and display a more useful error message for this
5679 case; patch by Thordur Bjornsson; bz#2501; ok dtucker@
5682 This caused unexpected failures when VerifyHostKeyDNS=yes, SSHFP results
5683 are missing but the user already has the key in known_hosts
5687 Upstream-ID: 97e31742fddaf72046f6ffef091ec0d823299920
5689 commit 871f1e4374420b07550041b329627c474abc3010
5690 Author: Damien Miller <djm@mindrot.org>
5691 Date: Tue Sep 12 18:01:35 2017 +1000
5693 adapt portable to channels API changes
5695 commit 4ec0bb9f9ad7b4eb0af110fa8eddf8fa199e46bb
5696 Author: djm@openbsd.org <djm@openbsd.org>
5697 Date: Tue Sep 12 07:55:48 2017 +0000
5703 Upstream-ID: 2f9ba09f2708993d35eac5aa71df910dcc52bac1
5705 commit 9145a73ce2ba30c82bbf91d7205bfd112529449f
5706 Author: djm@openbsd.org <djm@openbsd.org>
5707 Date: Tue Sep 12 07:32:04 2017 +0000
5711 fix tun/tap forwarding case in previous
5713 Upstream-ID: 43ebe37a930320e24bca6900dccc39857840bc53
5715 commit 9f53229c2ac97dbc6f5a03657de08a1150a9ac7e
5716 Author: djm@openbsd.org <djm@openbsd.org>
5717 Date: Tue Sep 12 06:35:31 2017 +0000
5721 Make remote channel ID a u_int
5723 Previously we tracked the remote channel IDs in an int, but this is
5724 strictly incorrect: the wire protocol uses uint32 and there is nothing
5725 in-principle stopping a SSH implementation from sending, say, 0xffff0000.
5727 In practice everyone numbers their channels sequentially, so this has
5728 never been a problem.
5732 Upstream-ID: b9f4cd3dc53155b4a5c995c0adba7da760d03e73
5734 commit dbee4119b502e3f8b6cd3282c69c537fd01d8e16
5735 Author: djm@openbsd.org <djm@openbsd.org>
5736 Date: Tue Sep 12 06:32:07 2017 +0000
5742 Move static state to a "struct ssh_channels" that is allocated at
5743 runtime and tracked as a member of struct ssh.
5745 Explicitly pass "struct ssh" to all channels functions.
5747 Replace use of the legacy packet APIs in channels.c.
5749 Rework sshd_config PermitOpen handling: previously the configuration
5750 parser would call directly into the channels layer. After the refactor
5751 this is not possible, as the channels structures are allocated at
5752 connection time and aren't available when the configuration is parsed.
5753 The server config parser now tracks PermitOpen itself and explicitly
5754 configures the channels code later.
5758 Upstream-ID: 11828f161656b965cc306576422613614bea2d8f
5760 commit abd59663df37a42152e37980113ccaa405b9a282
5761 Author: djm@openbsd.org <djm@openbsd.org>
5762 Date: Thu Sep 7 23:48:09 2017 +0000
5768 Upstream-ID: a93b1e6f30f1f9b854b5b964b9fd092d0c422c47
5770 commit 149a8cd24ce9dd47c36f571738681df5f31a326c
5771 Author: jmc@openbsd.org <jmc@openbsd.org>
5772 Date: Mon Sep 4 06:34:43 2017 +0000
5778 Upstream-ID: bb8cc40b61b15f6a13d81da465ac5bfc65cbfc4b
5780 commit ec9d22cc251cc5acfe7b2bcef9cc7a1fe0e949d8
5781 Author: Damien Miller <djm@mindrot.org>
5782 Date: Fri Sep 8 12:44:13 2017 +1000
5784 Fuzzer harnesses for sig verify and pubkey parsing
5786 These are some basic clang libfuzzer harnesses for signature
5787 verification and public key parsing. Some assembly (metaphorical)
5790 commit de35c382894964a896a63ecd5607d3a3b93af75d
5791 Author: Damien Miller <djm@mindrot.org>
5792 Date: Fri Sep 8 12:38:31 2017 +1000
5794 Give configure ability to set CFLAGS/LDFLAGS later
5796 Some CFLAGS/LDFLAGS may disrupt the configure script's operation,
5797 in particular santization and fuzzer options that break assumptions
5798 about memory and file descriptor dispositions.
5800 This adds two flags to configure --with-cflags-after and
5801 --with-ldflags-after that allow specifying additional compiler and
5802 linker options that are added to the resultant Makefiles but not
5803 used in the configure run itself.
5807 env CC=clang-3.9 ./configure \
5808 --with-cflags-after=-fsantize=address \
5809 --with-ldflags-after="-g -fsanitize=address"
5811 commit 22376d27a349f62c502fec3396dfe0fdcb2a40b7
5812 Author: djm@openbsd.org <djm@openbsd.org>
5813 Date: Sun Sep 3 23:33:13 2017 +0000
5817 Expand ssh_config's StrictModes option with two new
5820 StrictModes=accept-new will automatically accept hitherto-unseen keys
5821 but will refuse connections for changed or invalid hostkeys.
5823 StrictModes=off is the same as StrictModes=no
5827 StrictModes=no combines two behaviours for host key processing:
5828 automatically learning new hostkeys and continuing to connect to hosts
5829 with invalid/changed hostkeys. The latter behaviour is quite dangerous
5830 since it removes most of the protections the SSH protocol is supposed to
5833 Quite a few users want to automatically learn hostkeys however, so
5834 this makes that feature available with less danger.
5836 At some point in the future, StrictModes=no will change to be a synonym
5837 for accept-new, with its current behaviour remaining available via
5840 bz#2400, suggested by Michael Samuel; ok markus
5842 Upstream-ID: 0f55502bf75fc93a74fb9853264a8276b9680b64
5844 commit ff3c42384033514e248ba5d7376aa033f4a2b99a
5845 Author: jmc@openbsd.org <jmc@openbsd.org>
5846 Date: Fri Sep 1 15:41:26 2017 +0000
5852 Upstream-ID: 2f46b51a0ddb3730020791719e94d3e418e9f423
5854 commit b828605d51f57851316d7ba402b4ae06cf37c55d
5855 Author: djm@openbsd.org <djm@openbsd.org>
5856 Date: Fri Sep 1 05:53:56 2017 +0000
5860 identify the case where SSHFP records are missing but
5861 other DNS RR types are present and display a more useful error message for
5862 this case; patch by Thordur Bjornsson; bz#2501; ok dtucker@
5864 Upstream-ID: 8f7a5a8344f684823d8317a9708b63e75be2c244
5866 commit 8042bad97e2789a50e8f742c3bcd665ebf0add32
5867 Author: djm@openbsd.org <djm@openbsd.org>
5868 Date: Fri Sep 1 05:50:48 2017 +0000
5872 document available AuthenticationMethods; bz#2453 ok
5875 Upstream-ID: 2c70576f237bb699aff59889dbf2acba4276d3d0
5877 commit 71e5a536ec815d542b199f2ae6d646c0db9f1b58
5878 Author: djm@openbsd.org <djm@openbsd.org>
5879 Date: Wed Aug 30 03:59:08 2017 +0000
5883 pass packet state down to some of the channels function
5884 (more to come...); ok markus@
5886 Upstream-ID: d8ce7a94f4059d7ac1e01fb0eb01de0c4b36c81b
5888 commit 6227fe5b362239c872b91bbdee4bf63cf85aebc5
5889 Author: jmc@openbsd.org <jmc@openbsd.org>
5890 Date: Tue Aug 29 13:05:58 2017 +0000
5896 Upstream-ID: cf21d68cf54e81968bca629aaeddc87f0c684f3c
5898 commit 530591a5795a02d01c78877d58604723918aac87
5899 Author: dlg@openbsd.org <dlg@openbsd.org>
5900 Date: Tue Aug 29 09:42:29 2017 +0000
5904 add a -q option to ssh-add to make it quiet on success.
5906 if you want to silence ssh-add without this you generally redirect
5907 the output to /dev/null, but that can hide error output which you
5912 Upstream-ID: 2f31b9b13f99dcf587e9a8ba443458e6c0d8997c
5914 commit a54eb27dd64b5eca3ba94e15cec3535124bd5029
5915 Author: dtucker@openbsd.org <dtucker@openbsd.org>
5916 Date: Sun Aug 27 00:38:41 2017 +0000
5920 Increase the buffer sizes for user prompts to ensure that
5921 they won't be truncated by snprintf. Based on patch from cjwatson at
5922 debian.org via bz#2768, ok djm@
5924 Upstream-ID: 6ffacf1abec8f40b469de5b94bfb29997d96af3e
5926 commit dd9d9b3381a4597b840d480b043823112039327e
5927 Author: Darren Tucker <dtucker@zip.com.au>
5928 Date: Mon Aug 28 16:48:27 2017 +1000
5930 Switch Capsicum header to sys/capsicum.h.
5932 FreeBSD's <sys/capability.h> was renamed to <sys/capsicum.h> in 2014 to
5933 avoid future conflicts with POSIX capabilities (the last release that
5934 didn't have it was 9.3) so switch to that. Patch from des at des.no.
5936 commit f5e917ab105af5dd6429348d9bc463e52b263f92
5937 Author: Darren Tucker <dtucker@zip.com.au>
5938 Date: Sun Aug 27 08:55:40 2017 +1000
5940 Add missing includes for bsd-err.c.
5942 Patch from cjwatson at debian.org via bz#2767.
5944 commit 878e029797cfc9754771d6f6ea17f8c89e11d225
5945 Author: Damien Miller <djm@mindrot.org>
5946 Date: Fri Aug 25 13:25:01 2017 +1000
5948 Split platform_sys_dir_uid into its own file
5950 platform.o is too heavy for libssh.a use; it calls into the server on
5951 many platforms. Move just the function needed by misc.c into its own
5954 commit 07949bfe9133234eddd01715592aa0dde67745f0
5955 Author: Damien Miller <djm@mindrot.org>
5956 Date: Wed Aug 23 20:13:18 2017 +1000
5958 misc.c needs functions from platform.c now
5960 commit b074c3c3f820000a21953441cea7699c4b17d72f
5961 Author: djm@openbsd.org <djm@openbsd.org>
5962 Date: Fri Aug 18 05:48:04 2017 +0000
5966 add a "quiet" flag to exited_cleanly() that supresses
5967 errors about exit status (failure due to signal is still reported)
5969 Upstream-ID: db85c39c3aa08e6ff67fc1fb4ffa89f807a9d2f0
5971 commit de4ae07f12dabf8815ecede54235fce5d22e3f63
5972 Author: djm@openbsd.org <djm@openbsd.org>
5973 Date: Fri Aug 18 05:36:45 2017 +0000
5977 Move several subprocess-related functions from various
5978 locations to misc.c. Extend subprocess() to offer a little more control over
5981 feedback & ok dtucker@
5983 Upstream-ID: 3573dd7109d13ef9bd3bed93a3deb170fbfce049
5985 commit 643c2ad82910691b2240551ea8b14472f60b5078
5986 Author: djm@openbsd.org <djm@openbsd.org>
5987 Date: Sat Aug 12 06:46:01 2017 +0000
5991 make "--" before the hostname terminate command-line
5992 option processing completely; previous behaviour would not prevent further
5993 options appearing after the hostname (ssh has a supported options after the
5994 hostname for >20 years, so that's too late to change).
5998 Upstream-ID: ef5ee50571b98ad94dcdf8282204e877ec88ad89
6000 commit 0f3455356bc284d7c6f4d3c1614d31161bd5dcc2
6001 Author: djm@openbsd.org <djm@openbsd.org>
6002 Date: Sat Aug 12 06:42:52 2017 +0000
6006 Switch from aes256-cbc to aes256-ctr for encrypting
6007 new-style private keys. The latter having the advantage of being supported
6008 for no-OpenSSL builds; bz#2754 ok markus@
6010 Upstream-ID: 54179a2afd28f93470471030567ac40431e56909
6012 commit c4972d0a9bd6f898462906b4827e09b7caea2d9b
6013 Author: djm@openbsd.org <djm@openbsd.org>
6014 Date: Fri Aug 11 04:47:12 2017 +0000
6018 refuse to a private keys when its corresponding .pub key
6019 does not match. bz#2737 ok dtucker@
6021 Upstream-ID: 54ff5e2db00037f9db8d61690f26ef8f16e0d913
6023 commit 4b3ecbb663c919132dddb3758e17a23089413519
6024 Author: djm@openbsd.org <djm@openbsd.org>
6025 Date: Fri Aug 11 04:41:08 2017 +0000
6029 don't print verbose error message when ssh disconnects
6030 under sftp; bz#2750; ok dtucker@
6032 Upstream-ID: 6d83708aed77b933c47cf155a87dc753ec01f370
6034 commit 42a8f8bc288ef8cac504c5c73f09ed610bc74a34
6035 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6036 Date: Fri Aug 11 04:16:35 2017 +0000
6040 Tweak previous keepalive commit: if last_time + keepalive
6041 <= now instead of just "<" so client_alive_check will fire if the select
6042 happens to return on exact second of the timeout. ok djm@
6044 Upstream-ID: e02756bd6038d11bb8522bfd75a4761c3a684fcc
6046 commit b60ff20051ef96dfb207b6bfa45c0ad6c34a542a
6047 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6048 Date: Fri Aug 11 03:58:36 2017 +0000
6052 Keep track of the last time we actually heard from the
6053 client and use this to also schedule a client_alive_check(). Prevents
6054 activity on a forwarded port from indefinitely preventing the select timeout
6055 so that client_alive_check() will eventually (although not optimally) be
6058 Analysis by willchan at google com via bz#2756, feedback & ok djm@
6060 Upstream-ID: c08721e0bbda55c6d18e2760f3fe1b17fb71169e
6062 commit 94bc1e7ffba3cbdea8c7dcdab8376bf29283128f
6063 Author: Damien Miller <djm@mindrot.org>
6064 Date: Fri Jul 28 14:50:59 2017 +1000
6066 Expose list of completed auth methods to PAM
6068 bz#2408; ok dtucker@
6070 commit c78e6eec78c88acf8d51db90ae05a3e39458603d
6071 Author: Damien Miller <djm@mindrot.org>
6072 Date: Fri Jul 21 14:38:16 2017 +1000
6074 fix problems in tunnel forwarding portability code
6076 This fixes a few problems in the tun forwarding code, mostly to do
6077 with host/network byte order confusion.
6079 Based on a report and patch by stepe AT centaurus.uberspace.de;
6080 bz#2735; ok dtucker@
6082 commit 2985d4062ebf4204bbd373456a810d558698f9f5
6083 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6084 Date: Tue Jul 25 09:22:25 2017 +0000
6088 Make WinSCP patterns for SSH_OLD_DHGEX more specific to
6089 exclude WinSCP 5.10.x and up. bz#2748, from martin at winscp.net, ok djm@
6091 Upstream-ID: 6fd7c32e99af3952db007aa180e73142ddbc741a
6093 commit 9f0e44e1a0439ff4646495d5735baa61138930a9
6094 Author: djm@openbsd.org <djm@openbsd.org>
6095 Date: Mon Jul 24 04:34:28 2017 +0000
6099 g/c unused variable; make a little more portable
6101 Upstream-ID: 3f5980481551cb823c6fb2858900f93fa9217dea
6103 commit 51676ec61491ec6d7cbd06082034e29b377b3bf6
6104 Author: djm@openbsd.org <djm@openbsd.org>
6105 Date: Sun Jul 23 23:37:02 2017 +0000
6109 Allow IPQoS=none in ssh/sshd to not set an explicit
6110 ToS/DSCP value and just use the operating system default; ok dtucker@
6112 Upstream-ID: 77906ff8c7b660b02ba7cb1e47b17d66f54f1f7e
6114 commit 6c1fbd5a50d8d2415f06c920dd3b1279b741072d
6115 Author: Damien Miller <djm@mindrot.org>
6116 Date: Fri Jul 21 14:24:26 2017 +1000
6120 commit dc2bd308768386b02c7337120203ca477e67ba62
6121 Author: markus@openbsd.org <markus@openbsd.org>
6122 Date: Wed Jul 19 08:30:41 2017 +0000
6126 fix support for unknown key types; ok djm@
6128 Upstream-ID: 53fb29394ed04d616d65b3748dee5aa06b07ab48
6130 commit fd0e8fa5f89d21290b1fb5f9d110ca4f113d81d9
6131 Author: djm@openbsd.org <djm@openbsd.org>
6132 Date: Wed Jul 19 01:15:02 2017 +0000
6136 switch from select() to poll() for the ssh-agent
6139 Upstream-ID: 4a94888ee67b3fd948fd10693973beb12f802448
6141 commit b1e72df2b813ecc15bd0152167bf4af5f91c36d3
6142 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6143 Date: Fri Jul 14 03:18:21 2017 +0000
6147 Make ""Killed by signal 1" LogLevel verbose so it's not
6148 shown at the default level. Prevents it from appearing during ssh -J and
6149 equivalent ProxyCommand configs. bz#1906, bz#2744, feedback&ok markus@
6151 Upstream-ID: debfaa7e859b272246c2f2633335d288d2e2ae28
6153 commit 1f3d202770a08ee6752ed2a234b7ca6f180eb498
6154 Author: jmc@openbsd.org <jmc@openbsd.org>
6155 Date: Thu Jul 13 19:16:33 2017 +0000
6159 man pages with pseudo synopses which list filenames end
6160 up creating very ugly output in man -k; after some discussion with ingo, we
6161 feel the simplest fix is to remove such SYNOPSIS sections: the info is hardly
6162 helpful at page top, is contained already in FILES, and there are
6163 sufficiently few that just zapping them is simple;
6165 ok schwarze, who also helpfully ran things through a build to check
6168 Upstream-ID: 3e211b99457e2f4c925c5927d608e6f97431336c
6170 commit 7f13a4827fb28957161de4249bd6d71954f1f2ed
6171 Author: espie@openbsd.org <espie@openbsd.org>
6172 Date: Mon Jul 10 14:09:59 2017 +0000
6176 zap redundant Makefile variables. okay djm@
6178 Upstream-ID: e39b3902fe1d6c4a7ba6a3c58e072219f3c1e604
6180 commit dc44dd3a9e2c9795394e6a7e1e71c929cbc70ce0
6181 Author: jmc@openbsd.org <jmc@openbsd.org>
6182 Date: Sat Jul 8 18:32:54 2017 +0000
6186 slightly rework previous, to avoid an article issue;
6188 Upstream-ID: 15a315f0460ddd3d4e2ade1f16d6c640a8c41b30
6190 commit 853edbe057a84ebd0024c8003e4da21bf2b469f7
6191 Author: djm@openbsd.org <djm@openbsd.org>
6192 Date: Fri Jul 7 03:53:12 2017 +0000
6196 When generating all hostkeys (ssh-keygen -A), clobber
6197 existing keys if they exist but are zero length. zero-length keys could
6198 previously be made if ssh-keygen failed part way through generating them, so
6199 avoid that case too. bz#2561 reported by Krzysztof Cieplucha; ok dtucker@
6201 Upstream-ID: f662201c28ab8e1f086b5d43c59cddab5ade4044
6203 commit 43616876ba68a2ffaece6a6c792def4b039f2d6e
6204 Author: djm@openbsd.org <djm@openbsd.org>
6205 Date: Sat Jul 1 22:55:44 2017 +0000
6209 actually remove these files
6211 Upstream-ID: 1bd41cba06a7752de4df304305a8153ebfb6b0ac
6213 commit 83fa3a044891887369ce8b487ce88d713a04df48
6214 Author: djm@openbsd.org <djm@openbsd.org>
6215 Date: Sat Jul 1 13:50:45 2017 +0000
6219 remove post-SSHv1 removal dead code from rsa.c and merge
6220 the remaining bit that it still used into ssh-rsa.c; ok markus
6222 Upstream-ID: ac8a048d24dcd89594b0052ea5e3404b473bfa2f
6224 commit 738c73dca2c99ee78c531b4cbeefc2008fe438f0
6225 Author: Damien Miller <djm@mindrot.org>
6226 Date: Fri Jul 14 14:26:36 2017 +1000
6228 make explicit_bzero/memset safe for sz=0
6230 commit 8433d51e067e0829f5521c0c646b6fd3fe17e732
6231 Author: Tim Rice <tim@multitalents.net>
6232 Date: Tue Jul 11 18:47:56 2017 -0700
6234 modified: configure.ac
6235 UnixWare needs BROKEN_TCGETATTR_ICANON like Solaris
6236 Analysis by Robbie Zhang
6238 commit ff3507aea9c7d30cd098e7801e156c68faff7cc7
6239 Author: Damien Miller <djm@mindrot.org>
6240 Date: Fri Jul 7 11:21:27 2017 +1000
6244 commit d79bceb9311a9c137d268f5bc481705db4151810
6245 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6246 Date: Fri Jun 30 04:17:23 2017 +0000
6250 Only call close once in confree(). ssh_packet_close will
6251 close the FD so only explicitly close non-SSH channels. bz#2734, from
6252 bagajjal at microsoft.com, ok djm@
6254 Upstream-ID: a81ce0c8b023527167739fccf1732b154718ab02
6256 commit 197dc9728f062e23ce374f44c95a2b5f9ffa4075
6257 Author: Darren Tucker <dtucker@zip.com.au>
6258 Date: Thu Jun 29 15:40:25 2017 +1000
6260 Update link for my patches.
6262 commit a98339edbc1fc21342a390f345179a9c3031bef7
6263 Author: djm@openbsd.org <djm@openbsd.org>
6264 Date: Wed Jun 28 01:09:22 2017 +0000
6268 Allow ssh-keygen to use a key held in ssh-agent as a CA when
6269 signing certificates. bz#2377 ok markus
6271 Upstream-ID: fb42e920b592edcbb5b50465739a867c09329c8f
6273 commit c9cdef35524bd59007e17d5bd2502dade69e2dfb
6274 Author: djm@openbsd.org <djm@openbsd.org>
6275 Date: Sat Jun 24 06:35:24 2017 +0000
6279 regress test for ExposeAuthInfo
6281 Upstream-Regress-ID: 190e5b6866376f4061c411ab157ca4d4e7ae86fd
6283 commit f17ee61cad25d210edab69d04ed447ad55fe80c1
6284 Author: djm@openbsd.org <djm@openbsd.org>
6285 Date: Sat Jun 24 07:08:57 2017 +0000
6289 correct env var name
6291 Upstream-ID: 721e761c2b1d6a4dcf700179f16fd53a1dadb313
6293 commit 40962198e3b132cecdb32e9350acd4294e6a1082
6294 Author: jmc@openbsd.org <jmc@openbsd.org>
6295 Date: Sat Jun 24 06:57:04 2017 +0000
6301 Upstream-ID: 606f933c8e2d0be902ea663946bc15e3eee40b25
6303 commit 33f86265d7e8a0e88d3a81745d746efbdd397370
6304 Author: djm@openbsd.org <djm@openbsd.org>
6305 Date: Sat Jun 24 06:38:11 2017 +0000
6309 don't pass pointer to struct sshcipher between privsep
6310 processes, just redo the lookup in each using the already-passed cipher name.
6311 bz#2704 based on patch from Brooks Davis; ok markus dtucker
6313 Upstream-ID: 2eab434c09bdf549dafd7da3e32a0d2d540adbe0
6315 commit 8f574959272ac7fe9239c4f5d10fd913f8920ab0
6316 Author: djm@openbsd.org <djm@openbsd.org>
6317 Date: Sat Jun 24 06:34:38 2017 +0000
6321 refactor authentication logging
6323 optionally record successful auth methods and public credentials
6324 used in a file accessible to user sessions
6326 feedback and ok markus@
6328 Upstream-ID: 090b93036967015717b9a54fd0467875ae9d32fb
6330 commit e2004d4bb7eb01c663dd3a3e7eb224f1ccdc9bba
6331 Author: jmc@openbsd.org <jmc@openbsd.org>
6332 Date: Sat Jun 24 06:28:50 2017 +0000
6338 Upstream-ID: 8539bdaf2366603a34a9b2f034527ca13bb795c5
6340 commit 4540428cd0adf039bcf5a8a27f2d5cdf09191513
6341 Author: djm@openbsd.org <djm@openbsd.org>
6342 Date: Sat Jun 24 05:37:44 2017 +0000
6346 switch sshconnect.c from (slightly abused) select() to
6347 poll(); ok deraadt@ a while back
6349 Upstream-ID: efc1937fc591bbe70ac9e9542bb984f354c8c175
6351 commit 6f8ca3b92540fa1a9b91670edc98d15448e3d765
6352 Author: djm@openbsd.org <djm@openbsd.org>
6353 Date: Sat Jun 24 05:35:05 2017 +0000
6357 use HostKeyAlias if specified instead of hostname for
6358 matching host certificate principal names; bz#2728; ok dtucker@
6360 Upstream-ID: dc2e11c83ae9201bbe74872a0c895ae9725536dd
6362 commit 8904ffce057b80a7472955f1ec00d7d5c250076c
6363 Author: djm@openbsd.org <djm@openbsd.org>
6364 Date: Sat Jun 24 05:24:11 2017 +0000
6368 no need to call log_init to reinitialise logged PID in
6369 child sessions, since we haven't called openlog() in log_init() since 1999;
6372 Upstream-ID: 0906e4002af5d83d3d544df75e1187c932a3cf2e
6374 commit e238645d789cd7eb47541b66aea2a887ea122c9b
6375 Author: mestre@openbsd.org <mestre@openbsd.org>
6376 Date: Fri Jun 23 07:24:48 2017 +0000
6380 When using the escape sequence &~ the code path is
6381 client_loop() -> client_simple_escape_filter() -> process_escapes() -> fork()
6382 and the pledge for this path lacks the proc promise and therefore aborts the
6383 process. The solution is to just add proc the promise to this specific
6386 Reported by Gregoire Jadi gjadi ! omecha.info
6387 Insight with tb@, OK jca@
6389 Upstream-ID: 63c05e30c28209519f476023b65b0b1b0387a05b
6391 commit 5abbb31c4e7a6caa922cc1cbb14e87a77f9d19d3
6392 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6393 Date: Fri Jun 23 03:30:42 2017 +0000
6397 Import regenerated moduli.
6399 Upstream-ID: b25bf747544265b39af74fe0716dc8d9f5b63b95
6401 commit 849c5468b6d9b4365784c5dd88e3f1fb568ba38f
6402 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6403 Date: Fri Jun 23 03:25:53 2017 +0000
6407 Run the screen twice so we end up with more candidate
6410 Upstream-ID: b92c93266d8234d493857bb822260dacf4366157
6412 commit 4626e39c7053c6486c1c8b708ec757e464623f5f
6413 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6414 Date: Wed Jun 14 00:31:38 2017 +0000
6418 Add user@host prefix to client's "Permisison denied"
6419 messages, useful in particular when using "stacked" connections where it's
6420 not clear which host is denying. bz#2720, ok djm@ markus@
6422 Upstream-ID: de88e1e9dcb050c98e85377482d1287a9fe0d2be
6424 commit c948030d54911b2d3cddb96a7a8e9269e15d11cd
6425 Author: djm@openbsd.org <djm@openbsd.org>
6426 Date: Tue Jun 13 12:13:59 2017 +0000
6430 Do not require that unknown EXT_INFO extension values not
6431 contain \0 characters. This would cause fatal connection errors if an
6432 implementation sent e.g. string-encoded sub-values inside a value.
6434 Reported by Denis Bider; ok markus@
6436 Upstream-ID: 030e10fdc605563c040244c4b4f1d8ae75811a5c
6438 commit 6026f48dfca78b713e4a7f681ffa42a0afe0929e
6439 Author: djm@openbsd.org <djm@openbsd.org>
6440 Date: Tue Jun 13 11:22:15 2017 +0000
6446 Upstream-ID: f443d2be9910fd2165a0667956d03343c46f66c9
6448 commit bcd1485075aa72ba9418003f5cc27af2b049c51b
6449 Author: Damien Miller <djm@mindrot.org>
6450 Date: Sat Jun 10 23:41:25 2017 +1000
6452 portability for sftp globbed ls sort by mtime
6454 Include replacement timespeccmp() for systems that lack it.
6455 Support time_t struct stat->st_mtime in addition to
6456 timespec stat->st_mtim, as well as unsorted fallback.
6458 commit 072e172f1d302d2a2c6043ecbfb4004406717b96
6459 Author: djm@openbsd.org <djm@openbsd.org>
6460 Date: Sat Jun 10 06:36:46 2017 +0000
6464 print '?' instead of incorrect link count (that the
6465 protocol doesn't provide) for remote listings. bz#2710 ok dtucker@
6467 Upstream-ID: c611f98a66302cea452ef10f13fff8cf0385242e
6469 commit 72be5b2f8e7dc37235e8c4b8d0bc7b5ee1301505
6470 Author: djm@openbsd.org <djm@openbsd.org>
6471 Date: Sat Jun 10 06:33:34 2017 +0000
6475 implement sorting for globbed ls; bz#2649 ok dtucker@
6477 Upstream-ID: ed3110f351cc9703411bf847ba864041fb7216a8
6479 commit 5b2f34a74aa6a524cd57e856b23e1b7b25007721
6480 Author: djm@openbsd.org <djm@openbsd.org>
6481 Date: Fri Jun 9 06:47:13 2017 +0000
6485 return failure rather than fatal() for more cases during
6486 mux negotiations. Causes the session to fall back to a non-mux connection if
6487 they occur. bz#2707 ok dtucker@
6489 Upstream-ID: d2a7892f464d434e1f615334a1c9d0cdb83b29ab
6491 commit 7f5637c4a67a49ef256cb4eedf14e8590ac30976
6492 Author: djm@openbsd.org <djm@openbsd.org>
6493 Date: Fri Jun 9 06:43:01 2017 +0000
6497 in description of public key authentication, mention that
6498 the server will send debug messages to the client for some error conditions
6499 after authentication has completed. bz#2709 ok dtucker
6501 Upstream-ID: 750127dbd58c5a2672c2d28bc35fe221fcc8d1dd
6503 commit 2076e4adb986512ce8c415dd194fd4e52136c4b4
6504 Author: djm@openbsd.org <djm@openbsd.org>
6505 Date: Fri Jun 9 06:40:24 2017 +0000
6509 better translate libcrypto errors by looking deeper in
6510 the accursed error stack for codes that indicate the wrong passphrase was
6511 supplied for a PEM key. bz#2699 ok dtucker@
6513 Upstream-ID: 4da4286326d570f4f0489459bb71f6297e54b681
6515 commit ad0531614cbe8ec424af3c0fa90c34a8e1ebee4c
6516 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6517 Date: Fri Jun 9 04:40:04 2017 +0000
6521 Add comments referring to the relevant RFC sections for
6524 Upstream-ID: 6fc8e82485757a27633f9175ad00468f49a07d40
6526 commit ce9134260b9b1247e2385a1afed00c26112ba479
6527 Author: Damien Miller <djm@mindrot.org>
6528 Date: Fri Jun 9 14:43:47 2017 +1000
6530 drop two more privileges in the Solaris sandbox
6532 Drop PRIV_DAX_ACCESS and PRIV_SYS_IB_INFO.
6533 Patch from huieying.lee AT oracle.com via bz#2723
6535 commit e0f609c8a2ab940374689ab8c854199c3c285a76
6536 Author: Darren Tucker <dtucker@zip.com.au>
6537 Date: Fri Jun 9 13:36:29 2017 +1000
6539 Wrap stdint.h include in #ifdef.
6541 commit 1de5e47a85850526a4fdaf77185134046c050f75
6542 Author: djm@openbsd.org <djm@openbsd.org>
6543 Date: Wed Jun 7 01:48:15 2017 +0000
6547 unbreak after sshv1 purge
6549 Upstream-Regress-ID: 8ea01a92d5f571b9fba88c1463a4254a7552d51b
6551 commit 550c053168123fcc0791f9952abad684704b5760
6552 Author: dtucker@openbsd.org <dtucker@openbsd.org>
6553 Date: Tue Jun 6 09:12:17 2017 +0000
6557 Fix compression output stats broken in rev 1.201. Patch
6558 originally by Russell Coker via Debian bug #797964 and Christoph Biedl. ok
6561 Upstream-ID: 83a1903b95ec2e4ed100703debb4b4a313b01016
6563 commit 55d06c6e72a9abf1c06a7ac2749ba733134a1f39
6564 Author: djm@openbsd.org <djm@openbsd.org>
6565 Date: Fri Jun 2 06:06:10 2017 +0000
6569 rationalise the long list of manual CDIAGFLAGS that we
6570 add; most of these were redundant to -Wall -Wextra
6572 Upstream-ID: ea80f445e819719ccdcb237022cacfac990fdc5c
6574 commit 1527d9f61e6d50f6c2b4a3fa5b45829034b1b0b1
6575 Author: djm@openbsd.org <djm@openbsd.org>
6576 Date: Thu Jun 1 06:59:21 2017 +0000
6580 no need to bzero allocated space now that we use use
6581 recallocarray; ok deraadt@
6583 Upstream-ID: 53333c62ccf97de60b8cb570608c1ba5ca5803c8
6585 commit cc812baf39b93d5355565da98648d8c31f955990
6586 Author: djm@openbsd.org <djm@openbsd.org>
6587 Date: Thu Jun 1 06:58:25 2017 +0000
6591 unconditionally zero init size of buffer; ok markus@
6594 Upstream-ID: 218963e846d8f26763ba25afe79294547b99da29
6596 commit 65eb8fae0d7ba45ef4483a3cf0ae7fd0dbc7c226
6597 Author: Damien Miller <djm@mindrot.org>
6598 Date: Thu Jun 1 16:25:09 2017 +1000
6600 avoid compiler warning
6602 commit 2d75d74272dc2a0521fce13cfe6388800c9a2406
6603 Author: djm@openbsd.org <djm@openbsd.org>
6604 Date: Thu Jun 1 06:16:43 2017 +0000
6608 some warnings spotted by clang; ok markus@
6610 Upstream-ID: 24381d68ca249c5cee4388ceb0f383fa5b43991b
6612 commit 151c6e433a5f5af761c78de87d7b5d30a453cf5e
6613 Author: Damien Miller <djm@mindrot.org>
6614 Date: Thu Jun 1 15:25:13 2017 +1000
6616 add recallocarray replacement and dependency
6618 recallocarray() needs getpagesize() so add a tiny replacement for that.
6620 commit 01e6f78924da308447e71e9a32c8a6104ef4e888
6621 Author: Damien Miller <djm@mindrot.org>
6622 Date: Thu Jun 1 15:16:24 2017 +1000
6624 add *.0 manpage droppings
6626 commit 4b2e2d3fd9dccff357e1e26ce9a5f2e103837a36
6627 Author: djm@openbsd.org <djm@openbsd.org>
6628 Date: Thu Jun 1 04:51:58 2017 +0000
6632 fix casts re constness
6634 Upstream-ID: e38f2bac162b37dbaf784d349c8327a6626fa266
6636 commit 75b8af8de805c0694b37fcf80ce82783b2acc86f
6637 Author: markus@openbsd.org <markus@openbsd.org>
6638 Date: Wed May 31 10:54:00 2017 +0000
6642 make sure we don't pass a NULL string to vfprintf
6643 (triggered by the principals-command regress test); ok bluhm
6645 Upstream-ID: eb49854f274ab37a0b57056a6af379a0b7111990
6647 commit 84008608c9ee944d9f72f5100f31ccff743b10f2
6648 Author: markus@openbsd.org <markus@openbsd.org>
6649 Date: Wed May 31 10:04:29 2017 +0000
6653 use SO_ZEROIZE for privsep communication (if available)
6655 Upstream-ID: abcbb6d2f8039fc4367a6a78096e5d5c39de4a62
6657 commit 9e509d4ec97cb3d71696f1a2f1fdad254cbbce11
6658 Author: deraadt@openbsd.org <deraadt@openbsd.org>
6659 Date: Wed May 31 09:15:42 2017 +0000
6663 Switch to recallocarray() for a few operations. Both
6664 growth and shrinkage are handled safely, and there also is no need for
6665 preallocation dances. Future changes in this area will be less error prone.
6666 Review and one bug found by markus
6668 Upstream-ID: 822d664d6a5a1d10eccb23acdd53578a679d5065
6670 commit dc5dc45662773c0f7745c29cf77ae2d52723e55e
6671 Author: deraadt@openbsd.org <deraadt@openbsd.org>
6672 Date: Wed May 31 08:58:52 2017 +0000
6676 These shutdown() SHUT_RDWR are not needed before close()
6677 ok djm markus claudio
6679 Upstream-ID: 36f13ae4ba10f5618cb9347933101eb4a98dbcb5
6681 commit 1e0cdf8efb745d0d1116e1aa22bdc99ee731695e
6682 Author: markus@openbsd.org <markus@openbsd.org>
6683 Date: Wed May 31 08:09:45 2017 +0000
6687 clear session keys from memory; ok djm@
6689 Upstream-ID: ecd178819868975affd5fd6637458b7c712b6a0f
6691 commit 92e9fe633130376a95dd533df6e5e6a578c1e6b8
6692 Author: markus@openbsd.org <markus@openbsd.org>
6693 Date: Wed May 31 07:00:13 2017 +0000
6697 remove now obsolete ctx from ssh_dispatch_run; ok djm@
6699 Upstream-ID: 9870aabf7f4d71660c31fda91b942b19a8e68d29
6701 commit 17ad5b346043c5bbc5befa864d0dbeb76be39390
6702 Author: markus@openbsd.org <markus@openbsd.org>
6703 Date: Wed May 31 05:34:14 2017 +0000
6707 use the ssh_dispatch_run_fatal variant
6709 Upstream-ID: 28c5b364e37c755d1b22652b8cd6735a05c625d8
6711 commit 39896b777320a6574dd06707aebac5fb98e666da
6712 Author: djm@openbsd.org <djm@openbsd.org>
6713 Date: Wed May 31 05:08:46 2017 +0000
6717 another ctx => ssh conversion (in GSSAPI code)
6719 Upstream-ID: 4d6574c3948075c60608d8e045af42fe5b5d8ae0
6721 commit 6116bd4ed354a71a733c8fd0f0467ce612f12911
6722 Author: Damien Miller <djm@mindrot.org>
6723 Date: Wed May 31 14:56:07 2017 +1000
6725 fix conversion of kexc25519s.c to struct ssh too
6727 git cvsimport missed this commit for some reason
6729 commit d40dbdc85b6fb2fd78485ba02225511b8cbf20d7
6730 Author: djm@openbsd.org <djm@openbsd.org>
6731 Date: Wed May 31 04:29:44 2017 +0000
6735 spell out that custom options/extensions should follow the
6736 usual SSH naming rules, e.g. "extension@example.com"
6738 Upstream-ID: ab326666d2fad40769ec96b5a6de4015ffd97b8d
6740 commit 2a108277f976e8d0955c8b29d1dfde04dcbb3d5b
6741 Author: djm@openbsd.org <djm@openbsd.org>
6742 Date: Wed May 31 04:17:12 2017 +0000
6746 one more void *ctx => struct ssh *ssh conversion
6748 Upstream-ID: d299d043471c10214cf52c03daa10f1c232759e2
6750 commit c04e979503e97f52b750d3b98caa6fe004ab2ab9
6751 Author: djm@openbsd.org <djm@openbsd.org>
6752 Date: Wed May 31 00:43:04 2017 +0000
6756 fix possible OOB strlen() in SOCKS4A hostname parsing;
6759 Upstream-ID: c67297cbeb0e5a19d81752aa18ec44d31270cd11
6761 commit a3bb250c93bfe556838c46ed965066afce61cffa
6762 Author: jmc@openbsd.org <jmc@openbsd.org>
6763 Date: Tue May 30 19:38:17 2017 +0000
6769 Upstream-ID: 66987651046c42d142f7318c9695fb81a6d14031
6771 commit 1112b534a6a7a07190e497e6bf86b0d5c5fb02dc
6772 Author: bluhm@openbsd.org <bluhm@openbsd.org>
6773 Date: Tue May 30 18:58:37 2017 +0000
6777 Add RemoteCommand option to specify a command in the
6778 ssh config file instead of giving it on the client's command line. This
6779 command will be executed on the remote host. The feature allows to automate
6780 tasks using ssh config. OK markus@
6782 Upstream-ID: 5d982fc17adea373a9c68cae1021ce0a0904a5ee
6784 commit eb272ea4099fd6157846f15c129ac5727933aa69
6785 Author: markus@openbsd.org <markus@openbsd.org>
6786 Date: Tue May 30 14:29:59 2017 +0000
6790 switch auth2 to ssh_dispatch API; ok djm@
6792 Upstream-ID: a752ca19e2782900dd83060b5c6344008106215f
6794 commit 5a146bbd4fdf5c571f9fb438e5210d28cead76d9
6795 Author: markus@openbsd.org <markus@openbsd.org>
6796 Date: Tue May 30 14:27:22 2017 +0000
6800 switch auth2-none.c to modern APIs; ok djm@
6802 Upstream-ID: 07252b58e064d332214bcabbeae8e08c44b2001b
6804 commit 60306b2d2f029f91927c6aa7c8e08068519a0fa2
6805 Author: markus@openbsd.org <markus@openbsd.org>
6806 Date: Tue May 30 14:26:49 2017 +0000
6810 switch auth2-passwd.c to modern APIs; ok djm@
6812 Upstream-ID: cba0a8b72b4f97adfb7e3b3fd2f8ba3159981fc7
6814 commit eb76698b91338bd798c978d4db2d6af624d185e4
6815 Author: markus@openbsd.org <markus@openbsd.org>
6816 Date: Tue May 30 14:25:42 2017 +0000
6820 switch auth2-hostbased.c to modern APIs; ok djm@
6822 Upstream-ID: 146af25c36daeeb83d5dbbb8ca52b5d25de88f4e
6824 commit 2ae666a8fc20b3b871b2f1b90ad65cc027336ccd
6825 Author: markus@openbsd.org <markus@openbsd.org>
6826 Date: Tue May 30 14:23:52 2017 +0000
6830 protocol handlers all get struct ssh passed; ok djm@
6832 Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d
6834 commit 94583beb24a6c5fd19cedb9104ab2d2d5cd052b6
6835 Author: markus@openbsd.org <markus@openbsd.org>
6836 Date: Tue May 30 14:19:15 2017 +0000
6840 ssh: pass struct ssh to auth functions, too; ok djm@
6842 Upstream-ID: d13c509cc782f8f19728fbea47ac7cf36f6e85dd
6844 commit 5f4082d886c6173b9e90b9768c9a38a3bfd92c2b
6845 Author: markus@openbsd.org <markus@openbsd.org>
6846 Date: Tue May 30 14:18:15 2017 +0000
6850 sshd: pass struct ssh to auth functions; ok djm@
6852 Upstream-ID: b00a80c3460884ebcdd14ef550154c761aebe488
6854 commit 7da5df11ac788bc1133d8d598d298e33500524cc
6855 Author: markus@openbsd.org <markus@openbsd.org>
6856 Date: Tue May 30 14:16:41 2017 +0000
6860 remove unused wrapper functions from key.[ch]; ok djm@
6862 Upstream-ID: ea0f4016666a6817fc11f439dd4be06bab69707e
6864 commit ff7371afd08ac0bbd957d90451d4dcd0da087ef5
6865 Author: markus@openbsd.org <markus@openbsd.org>
6866 Date: Tue May 30 14:15:17 2017 +0000
6870 sshkey_new() might return NULL (pkcs#11 code only); ok
6873 Upstream-ID: de9f2ad4a42c0b430caaa7d08dea7bac943075dd
6875 commit beb965bbc5a984fa69fb1e2b45ebe766ae09d1ef
6876 Author: markus@openbsd.org <markus@openbsd.org>
6877 Date: Tue May 30 14:13:40 2017 +0000
6881 switch sshconnect.c to modern APIs; ok djm@
6883 Upstream-ID: 27be17f84b950d5e139b7a9b281aa487187945ad
6885 commit 00ed75c92d1f95fe50032835106c368fa22f0f02
6886 Author: markus@openbsd.org <markus@openbsd.org>
6887 Date: Tue May 30 14:10:53 2017 +0000
6891 switch auth2-pubkey.c to modern APIs; with & ok djm@
6893 Upstream-ID: 8f08d4316eb1b0c4ffe4a206c05cdd45ed1daf07
6895 commit 54d90ace1d3535b44d92a8611952dc109a74a031
6896 Author: markus@openbsd.org <markus@openbsd.org>
6897 Date: Tue May 30 08:52:19 2017 +0000
6901 switch from Key typedef with struct sshkey; ok djm@
6903 Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f
6905 commit c221219b1fbee47028dcaf66613f4f8d6b7640e9
6906 Author: markus@openbsd.org <markus@openbsd.org>
6907 Date: Tue May 30 08:49:58 2017 +0000
6911 remove ssh1 references; ok djm@
6913 Upstream-ID: fc23b7578e7b0a8daaec72946d7f5e58ffff5a3d
6915 commit afbfa68fa18081ef05a9cd294958509a5d3cda8b
6916 Author: markus@openbsd.org <markus@openbsd.org>
6917 Date: Tue May 30 08:49:32 2017 +0000
6921 revise sshkey_load_public(): remove ssh1 related
6922 comments, remove extra open()/close() on keyfile, prevent leak of 'pub' if
6923 'keyp' is NULL, replace strlcpy+cat with asprintf; ok djm@
6925 Upstream-ID: 6175e47cab5b4794dcd99c1175549a483ec673ca
6927 commit 813f55336a24fdfc45e7ed655fccc7d792e8f859
6928 Author: markus@openbsd.org <markus@openbsd.org>
6929 Date: Fri May 26 20:34:49 2017 +0000
6933 sshbuf_consume: reset empty buffer; ok djm@
6935 Upstream-ID: 0d4583ba57f69e369d38bbd7843d85cac37fa821
6937 commit 6cf711752cc2a7ffaad1fb4de18cae65715ed8bb
6938 Author: markus@openbsd.org <markus@openbsd.org>
6939 Date: Fri May 26 19:35:50 2017 +0000
6943 remove SSH_CHANNEL_XXX_DRAINING (ssh1 only); ok djm@
6945 Upstream-ID: e2e225b6ac67b84dd024f38819afff2554fafe42
6947 commit 364f0d5edea27767fb0f915ea7fc61aded88d3e8
6948 Author: markus@openbsd.org <markus@openbsd.org>
6949 Date: Fri May 26 19:34:12 2017 +0000
6953 remove channel_input_close_confirmation (ssh1 only); ok
6956 Upstream-ID: 8e7c8c38f322d255bb0294a5c0ebef53fdf576f1
6958 commit 8ba0fd40082751dbbc23a830433488bbfb1abdca
6959 Author: djm@openbsd.org <djm@openbsd.org>
6960 Date: Fri May 26 01:40:07 2017 +0000
6964 fix references to obsolete v00 cert format; spotted by
6967 Upstream-ID: 7600ce193ab8fd19451acfe24fc2eb39d46b2c4f
6969 commit dcc714c65cfb81eb6903095b4590719e8690f3da
6970 Author: Mike Frysinger <vapier@chromium.org>
6971 Date: Wed May 24 23:21:19 2017 -0400
6973 configure: actually set cache vars when cross-compiling
6975 The cross-compiling fallback message says it's assuming the test
6976 passed, but it didn't actually set the cache var which causes
6977 later tests to fail.
6979 commit 947a3e829a5b8832a4768fd764283709a4ca7955
6980 Author: djm@openbsd.org <djm@openbsd.org>
6981 Date: Sat May 20 02:35:47 2017 +0000
6985 there's no reason to artificially limit the key path
6986 here, just check that it fits PATH_MAX; spotted by Matthew Patton
6988 Upstream-ID: 858addaf2009c9cf04d80164a41b2088edb30b58
6990 commit 773224802d7cb250bb8b461546fcce10567b4b2e
6991 Author: djm@openbsd.org <djm@openbsd.org>
6992 Date: Fri May 19 21:07:17 2017 +0000
6996 Now that we no longer support SSHv1, replace the contents
6997 of this file with a pointer to
6998 https://tools.ietf.org/html/draft-miller-ssh-agent-00 It's better edited,
6999 doesn't need to document stuff we no longer implement and does document stuff
7000 that we do implement (RSA SHA256/512 signature flags)
7002 Upstream-ID: da8cdc46bbcc266efabd565ddddd0d8e556f846e
7004 commit 54cd41a4663fad66406dd3c8fe0e4760ccd8a899
7005 Author: djm@openbsd.org <djm@openbsd.org>
7006 Date: Wed May 17 01:24:17 2017 +0000
7010 allow LogLevel in sshd_config Match blocks; ok dtucker
7013 Upstream-ID: 662e303be63148f47db1aa78ab81c5c2e732baa8
7015 commit 277abcda3f1b08d2376686f0ef20320160d4c8ab
7016 Author: djm@openbsd.org <djm@openbsd.org>
7017 Date: Tue May 16 16:56:15 2017 +0000
7021 remove duplicate check; spotted by Jakub Jelen
7023 Upstream-ID: 30c2996c1767616a8fdc49d4cee088efac69c3b0
7025 commit adb47ce839c977fa197e770c1be8f852508d65aa
7026 Author: djm@openbsd.org <djm@openbsd.org>
7027 Date: Tue May 16 16:54:05 2017 +0000
7031 mention that Ed25519 keys are valid as CA keys; spotted
7034 Upstream-ID: d3f6db58b30418cb1c3058211b893a1ffed3dfd4
7036 commit 6bdf70f01e700348bb4d8c064c31a0ab90896df6
7037 Author: Damien Miller <djm@mindrot.org>
7038 Date: Tue May 9 14:35:03 2017 +1000
7040 clean up regress files and add a .gitignore
7042 commit 7bdb2eeb1d3c26acdc409bd94532eefa252e440b
7043 Author: djm@openbsd.org <djm@openbsd.org>
7044 Date: Mon May 8 22:57:38 2017 +0000
7048 remove hmac-ripemd160; ok dtucker
7050 Upstream-ID: 896e737ea0bad6e23327d1c127e02d5e9e9c654d
7052 commit 5f02bb1f99f70bb422be8a5c2b77ef853f1db554
7053 Author: djm@openbsd.org <djm@openbsd.org>
7054 Date: Mon May 8 06:11:06 2017 +0000
7058 make requesting bad ECDSA bits yield the same error
7059 (SSH_ERR_KEY_LENGTH) as the same mistake for RSA/DSA
7061 Upstream-ID: bf40d3fee567c271e33f05ef8e4e0fa0b6f0ece6
7063 commit d757a4b633e8874629a1442c7c2e7b1b55d28c19
7064 Author: djm@openbsd.org <djm@openbsd.org>
7065 Date: Mon May 8 06:08:42 2017 +0000
7069 fix for new SSH_ERR_KEY_LENGTH error value
7071 Upstream-Regress-ID: c38a6e6174d4c3feca3518df150d4fbae0dca8dc
7073 commit 2e58a69508ac49c02d1bb6057300fa6a76db1045
7074 Author: djm@openbsd.org <djm@openbsd.org>
7075 Date: Mon May 8 06:03:39 2017 +0000
7079 helps if I commit the correct version of the file. fix
7080 missing return statement.
7082 Upstream-ID: c86394a3beeb1ec6611e659bfa830254f325546c
7084 commit effaf526bfa57c0ac9056ca236becf52385ce8af
7085 Author: djm@openbsd.org <djm@openbsd.org>
7086 Date: Mon May 8 01:52:49 2017 +0000
7090 remove arcfour, blowfish and CAST here too
7092 Upstream-Regress-ID: c613b3bcbef75df1fe84ca4dc2d3ef253dc5e920
7094 commit 7461a5bc571696273252df28a1f1578968cae506
7095 Author: djm@openbsd.org <djm@openbsd.org>
7096 Date: Mon May 8 00:21:36 2017 +0000
7100 I was too aggressive with the scalpel in the last commit;
7101 unbreak sshd, spotted quickly by naddy@
7103 Upstream-ID: fb7e75d2b2c7e6ca57dee00ca645e322dd49adbf
7105 commit bd636f40911094a39c2920bf87d2ec340533c152
7106 Author: djm@openbsd.org <djm@openbsd.org>
7107 Date: Sun May 7 23:15:59 2017 +0000
7111 Refuse RSA keys <1024 bits in length. Improve reporting
7112 for keys that do not meet this requirement. ok markus@
7114 Upstream-ID: b385e2a7b13b1484792ee681daaf79e1e203df6c
7116 commit 70c1218fc45757a030285051eb4d209403f54785
7117 Author: djm@openbsd.org <djm@openbsd.org>
7118 Date: Sun May 7 23:13:42 2017 +0000
7122 Don't offer CBC ciphers by default in the client. ok
7125 Upstream-ID: 94c9ce8d0d1a085052e11c7f3307950fdc0901ef
7127 commit acaf34fd823235d549c633c0146ee03ac5956e82
7128 Author: djm@openbsd.org <djm@openbsd.org>
7129 Date: Sun May 7 23:12:57 2017 +0000
7133 As promised in last release announcement: remove
7134 support for Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@
7136 Upstream-ID: 21f8facdba3fd8da248df6417000867cec6ba222
7138 commit 3e371bd2124427403971db853fb2e36ce789b6fd
7139 Author: naddy@openbsd.org <naddy@openbsd.org>
7140 Date: Fri May 5 10:42:49 2017 +0000
7144 more simplification and removal of SSHv1-related code;
7147 Upstream-ID: d2f041aa0b79c0ebd98c68a01e5a0bfab2cf3b55
7149 commit 2e9c324b3a7f15c092d118c2ac9490939f6228fd
7150 Author: naddy@openbsd.org <naddy@openbsd.org>
7151 Date: Fri May 5 10:41:58 2017 +0000
7155 remove superfluous protocol 2 mentions; ok jmc@
7157 Upstream-ID: 0aaf7567c9f2e50fac5906b6a500a39c33c4664d
7159 commit 744bde79c3361e2153cb395a2ecdcee6c713585d
7160 Author: djm@openbsd.org <djm@openbsd.org>
7161 Date: Thu May 4 06:10:57 2017 +0000
7165 since a couple of people have asked, leave a comment
7166 explaining why we retain SSH v.1 support in the "delete all keys from agent"
7169 Upstream-ID: 4b42dcfa339813c15fe9248a2c1b7ed41c21bbb4
7171 commit 0c378ff6d98d80bc465a4a6a787670fb9cc701ee
7172 Author: djm@openbsd.org <djm@openbsd.org>
7173 Date: Thu May 4 01:33:21 2017 +0000
7177 another tentacle: cipher_set_key_string() was only ever
7180 Upstream-ID: 7fd31eb6c48946f7e7cc12af0699fe8eb637e94a
7182 commit 9a82e24b986e3e0dc70849dbb2c19aa6c707b37f
7183 Author: naddy@openbsd.org <naddy@openbsd.org>
7184 Date: Wed May 3 21:49:18 2017 +0000
7188 restore mistakenly deleted description of the
7189 ConnectionAttempts option ok markus@
7191 Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348
7193 commit 768405fddf64ff83aa6ef701ebb3c1f82d98a2f3
7194 Author: naddy@openbsd.org <naddy@openbsd.org>
7195 Date: Wed May 3 21:08:09 2017 +0000
7199 remove miscellaneous SSH1 leftovers; ok markus@
7201 Upstream-ID: af23696022ae4d45a1abc2fb8b490d8d9dd63b7c
7203 commit 1a1b24f8229bf7a21f89df21987433283265527a
7204 Author: jmc@openbsd.org <jmc@openbsd.org>
7205 Date: Wed May 3 10:01:44 2017 +0000
7209 more protocol 1 bits removed; ok djm
7211 Upstream-ID: b5b977eaf756915acb56aef3604a650e27f7c2b9
7213 commit 2b6f799e9b230cf13a7eefc05ecead7d8569d6b5
7214 Author: jmc@openbsd.org <jmc@openbsd.org>
7215 Date: Wed May 3 06:32:02 2017 +0000
7219 more protocol 1 stuff to go; ok djm
7221 Upstream-ID: 307a30441d2edda480fd1661d998d36665671e47
7223 commit f10c0d32cde2084d2a0b19bc47d80cb93e85a093
7224 Author: jmc@openbsd.org <jmc@openbsd.org>
7225 Date: Tue May 2 17:04:09 2017 +0000
7229 rsa1 is no longer valid;
7231 Upstream-ID: 9953d09ed9841c44b7dcf7019fa874783a709d89
7233 commit 42b690b4fd0faef78c4d68225948b6e5c46c5163
7234 Author: jmc@openbsd.org <jmc@openbsd.org>
7235 Date: Tue May 2 14:06:37 2017 +0000
7239 add PubKeyAcceptedKeyTypes to the -o list: scp(1) has
7240 it, so i guess this should too;
7242 Upstream-ID: 7fab32e869ca5831d09ab0c40d210b461d527a2c
7244 commit d852603214defd93e054de2877b20cc79c19d0c6
7245 Author: jmc@openbsd.org <jmc@openbsd.org>
7246 Date: Tue May 2 13:44:51 2017 +0000
7250 remove now obsolete protocol1 options from the -o
7253 Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd
7255 commit 8b60ce8d8111e604c711c4cdd9579ffe0edced74
7256 Author: jmc@openbsd.org <jmc@openbsd.org>
7257 Date: Tue May 2 09:05:58 2017 +0000
7261 more -O shuffle; ok djm
7263 Upstream-ID: c239991a3a025cdbb030b73e990188dd9bfbeceb
7265 commit 3575f0b12afe6b561681582fd3c34067d1196231
7266 Author: djm@openbsd.org <djm@openbsd.org>
7267 Date: Tue May 2 08:54:19 2017 +0000
7271 remove -1 / -2 options; pointed out by jmc@
7273 Upstream-ID: 65d2a816000741a95df1c7cfdb5fa8469fcc7daa
7275 commit 4f1ca823bad12e4f9614895eefe0d0073b84a28f
7276 Author: jmc@openbsd.org <jmc@openbsd.org>
7277 Date: Tue May 2 08:06:33 2017 +0000
7281 remove options -12 from usage();
7283 Upstream-ID: db7ceef25132e63b50ed05289bf447fece1d1270
7285 commit 6b84897f7fd39956b849eac7810319d8a9958568
7286 Author: jmc@openbsd.org <jmc@openbsd.org>
7287 Date: Tue May 2 07:13:31 2017 +0000
7291 tidy up -O somewhat; ok djm
7293 Upstream-ID: 804405f716bf7ef15c1f36ab48581ca16aeb4d52
7295 commit d1c6b7fdbdfe4a7a37ecd48a97f0796b061c2868
7296 Author: djm@openbsd.org <djm@openbsd.org>
7297 Date: Mon May 1 22:09:48 2017 +0000
7301 when freeing a bitmap, zero all it bytes; spotted by Ilya
7304 Upstream-ID: 834ac024f2c82389d6ea6b1c7d6701b3836e28e4
7306 commit 0f163983016c2988a92e039d18a7569f9ea8e071
7307 Author: djm@openbsd.org <djm@openbsd.org>
7308 Date: Mon May 1 14:08:26 2017 +0000
7312 this one I did forget to "cvs rm"
7314 Upstream-ID: 5781670c0578fe89663c9085ed3ba477cf7e7913
7316 commit 21ed00a8e26fe8a772bcca782175fafc2b0890ed
7317 Author: djm@openbsd.org <djm@openbsd.org>
7318 Date: Mon May 1 09:27:45 2017 +0000
7322 don't know why cvs didn't exterminate these the first
7323 time around, I use rm -f and everuthing...
7325 pointed out by sobrado@
7327 Upstream-ID: a6c44a0c2885330d322ee01fcfd7f6f209b1e15d
7329 commit d29ba6f45086703fdcb894532848ada3427dfde6
7330 Author: Darren Tucker <dtucker@zip.com.au>
7331 Date: Mon May 1 13:53:07 2017 +1000
7333 Define INT32_MAX and INT64_MAX if needed.
7335 commit 329037e389f02ec95c8e16bf93ffede94d3d44ce
7336 Author: Darren Tucker <dtucker@zip.com.au>
7337 Date: Mon May 1 13:19:41 2017 +1000
7339 Wrap stdint.h in HAVE_STDINT_H
7341 commit f382362e8dfb6b277f16779ab1936399d7f2af78
7342 Author: djm@openbsd.org <djm@openbsd.org>
7343 Date: Mon May 1 02:27:11 2017 +0000
7347 remove unused variable
7349 Upstream-ID: 66011f00819d0e71b14700449a98414033284516
7351 commit dd369320d2435b630a5974ab270d686dcd92d024
7352 Author: djm@openbsd.org <djm@openbsd.org>
7353 Date: Sun Apr 30 23:34:55 2017 +0000
7357 eliminate explicit specification of protocol in tests and
7358 loops over protocol. We only support SSHv2 now.
7360 Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd
7362 commit 557f921aad004be15805e09fd9572969eb3d9321
7363 Author: djm@openbsd.org <djm@openbsd.org>
7364 Date: Sun Apr 30 23:33:48 2017 +0000
7368 remove SSHv1 support from unit tests
7370 Upstream-Regress-ID: 395ca2aa48f1f7d23eefff6cb849ea733ca8bbfe
7372 commit e77e1562716fb3da413e4c2397811017b762f5e3
7373 Author: djm@openbsd.org <djm@openbsd.org>
7374 Date: Mon May 1 00:03:18 2017 +0000
7378 fixup setting ciphercontext->plaintext (lost in SSHv1 purge),
7379 though it isn't really used for much anymore.
7381 Upstream-ID: 859b8bce84ff4865b32097db5430349d04b9b747
7383 commit f7849e6c83a4e0f602dea6c834a24091c622d68e
7384 Author: Damien Miller <djm@mindrot.org>
7385 Date: Mon May 1 09:55:56 2017 +1000
7387 remove configure --with-ssh1
7389 commit f4a6a88ddb6dba6d2f7bfb9e2c9879fcc9633043
7390 Author: djm@openbsd.org <djm@openbsd.org>
7391 Date: Sun Apr 30 23:29:10 2017 +0000
7395 flense SSHv1 support from ssh-agent, considerably
7400 Upstream-ID: 71d772cdcefcb29f76e01252e8361e6fc2dfc365
7402 commit 930e8d2827853bc2e196c20c3e000263cc87fb75
7403 Author: djm@openbsd.org <djm@openbsd.org>
7404 Date: Sun Apr 30 23:28:41 2017 +0000
7408 obliterate ssh1.h and some dead code that used it
7412 Upstream-ID: 1ca9159a9fb95618f9d51e069ac8e1131a087343
7414 commit a3710d5d529a34b8f56aa62db798c70e85d576a0
7415 Author: djm@openbsd.org <djm@openbsd.org>
7416 Date: Sun Apr 30 23:28:12 2017 +0000
7420 exterminate the -1 flag from scp
7424 Upstream-ID: 26d247f7065da15056b209cef5f594ff591b89db
7426 commit aebd0abfaa8a41e75d50f9f7934267b0a2d9acb4
7427 Author: djm@openbsd.org <djm@openbsd.org>
7428 Date: Sun Apr 30 23:26:54 2017 +0000
7432 purge the last traces of SSHv1 from the TTY modes
7437 Upstream-ID: 963a19f1e06577377c38a3b7ce468f121b966195
7439 commit dfa641f758d4b8b2608ab1b00abaf88df0a8e36a
7440 Author: djm@openbsd.org <djm@openbsd.org>
7441 Date: Sun Apr 30 23:26:16 2017 +0000
7445 remove the (in)famous SSHv1 CRC compensation attack
7448 Despite your cameo in The Matrix movies, you will not be missed.
7452 Upstream-ID: 44261fce51a56d93cdb2af7b6e184be629f667e0
7454 commit e5d3bd36ef67d82092861f39b5bf422cb12b31a6
7455 Author: djm@openbsd.org <djm@openbsd.org>
7456 Date: Sun Apr 30 23:25:03 2017 +0000
7460 undo some local debugging stuff that I committed by
7463 Upstream-ID: fe5b31f69a60d47171836911f144acff77810217
7465 commit 3d6d09f2e90f4ad650ebda6520bf2da446f37f14
7466 Author: djm@openbsd.org <djm@openbsd.org>
7467 Date: Sun Apr 30 23:23:54 2017 +0000
7471 remove SSHv1 support from packet and buffer APIs
7475 Upstream-ID: bfc290053d40b806ecac46317d300677d80e1dc9
7477 commit 05164358577c82de18ed7373196bc7dbd8a3f79c
7478 Author: djm@openbsd.org <djm@openbsd.org>
7479 Date: Sun Apr 30 23:21:54 2017 +0000
7483 remove SSHv1-related buffers from client code
7485 Upstream-ID: dca5d01108f891861ceaf7ba1c0f2eb274e0c7dd
7487 commit 873d3e7d9a4707d0934fb4c4299354418f91b541
7488 Author: djm@openbsd.org <djm@openbsd.org>
7489 Date: Sun Apr 30 23:18:44 2017 +0000
7497 Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133
7499 commit 788ac799a6efa40517f2ac0d895a610394298ffc
7500 Author: djm@openbsd.org <djm@openbsd.org>
7501 Date: Sun Apr 30 23:18:22 2017 +0000
7505 remove SSHv1 configuration options and man pages bits
7509 Upstream-ID: 84638c23546c056727b7a7d653c72574e0f19424
7511 commit e6882463a8ae0594aacb6d6575a6318a41973d84
7512 Author: djm@openbsd.org <djm@openbsd.org>
7513 Date: Sun Apr 30 23:17:37 2017 +0000
7517 remove SSH1 make flag and associated files ok markus@
7519 Upstream-ID: ba9feacc5787337c413db7cf26ea3d53f854cfef
7521 commit cdccebdf85204bf7542b7fcc1aa2ea3f36661833
7522 Author: djm@openbsd.org <djm@openbsd.org>
7523 Date: Sun Apr 30 23:15:04 2017 +0000
7527 remove SSHv1 ciphers; ok markus@
7529 Upstream-ID: e5ebc5e540d7f23a8c1266db1839794d4d177890
7531 commit 97f4d3083b036ce3e68d6346a6140a22123d5864
7532 Author: djm@openbsd.org <djm@openbsd.org>
7533 Date: Sun Apr 30 23:13:25 2017 +0000
7537 remove compat20/compat13/compat15 variables
7541 Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c
7543 commit 99f95ba82673d33215dce17bfa1512b57f54ec09
7544 Author: djm@openbsd.org <djm@openbsd.org>
7545 Date: Sun Apr 30 23:11:45 2017 +0000
7549 remove options.protocol and client Protocol
7554 Upstream-ID: 5a967f5d06e2d004b0235457b6de3a9a314e9366
7556 commit 56912dea6ef63dae4eb1194e5d88973a7c6c5740
7557 Author: djm@openbsd.org <djm@openbsd.org>
7558 Date: Sun Apr 30 23:10:43 2017 +0000
7562 unifdef WITH_SSH1 ok markus@
7564 Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7
7566 commit d4084cd230f7319056559b00db8b99296dad49d5
7567 Author: jmc@openbsd.org <jmc@openbsd.org>
7568 Date: Sat Apr 29 06:06:01 2017 +0000
7574 Upstream-ID: a3abc6857455299aa42a046d232b7984568bceb9
7576 commit 249516e428e8461b46340a5df5d5ed1fbad2ccce
7577 Author: djm@openbsd.org <djm@openbsd.org>
7578 Date: Sat Apr 29 04:12:25 2017 +0000
7582 allow ssh-keygen to include arbitrary string or flag
7583 certificate extensions and critical options. ok markus@ dtucker@
7585 Upstream-ID: 2cf28dd6c5489eb9fc136e0b667ac3ea10241646
7587 commit 47a287bb6ac936c26b4f3ae63279c02902ded3b9
7588 Author: jmc@openbsd.org <jmc@openbsd.org>
7589 Date: Fri Apr 28 06:15:03 2017 +0000
7595 Upstream-ID: 7e6b56e52b039cf44d0418e9de9aca20a2d2d15a
7597 commit 36465a76a79ad5040800711b41cf5f32249d5120
7598 Author: Darren Tucker <dtucker@zip.com.au>
7599 Date: Fri Apr 28 14:44:28 2017 +1000
7603 Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308
7605 commit 9d18cb7bdeb00b20205fd13d412aae8c0e0457ed
7606 Author: Darren Tucker <dtucker@zip.com.au>
7607 Date: Fri Apr 28 14:41:17 2017 +1000
7609 Add 2 regress commits I applied by hand.
7611 Upstream-Regress-ID: 30c20180c87cbc99fa1020489fe7fd8245b6420c
7612 Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308
7614 commit 9504ea6b27f9f0ece64e88582ebb9235e664a100
7615 Author: Darren Tucker <dtucker@zip.com.au>
7616 Date: Fri Apr 28 14:33:43 2017 +1000
7618 Merge integrity.sh rev 1.22.
7620 Merge missing bits from Colin Watson's patch in bz#2658 which make integrity
7621 tests more robust against timeouts. ok djm@
7623 commit 06ec837a34542627e2183a412d6a9d2236f22140
7624 Author: Darren Tucker <dtucker@zip.com.au>
7625 Date: Fri Apr 28 14:30:03 2017 +1000
7627 Id sync for integrity.sh rev 1.21 which pulls in some shell portability fixes
7629 commit e0194b471efe7d3daedc9cc66686cb1ab69d3be8
7630 Author: jsg@openbsd.org <jsg@openbsd.org>
7631 Date: Mon Apr 17 11:02:31 2017 +0000
7635 Change COMPILER_VERSION tests which limited additional
7636 warnings to gcc4 to instead skip them on gcc3 as clang can handle
7637 -Wpointer-sign and -Wold-style-definition.
7639 Upstream-Regress-ID: e48d7dc13e48d9334b8195ef884dfbc51316012f
7641 commit 6830be90e71f46bcd182a9202b151eaf2b299434
7642 Author: djm@openbsd.org <djm@openbsd.org>
7643 Date: Fri Apr 28 03:24:53 2017 +0000
7647 include key fingerprint in "Offering public key" debug
7650 Upstream-ID: 964749f820c2ed4cf6a866268b1a05e907315c52
7652 commit 066437187e16dcafcbc19f9402ef0e6575899b1d
7653 Author: millert@openbsd.org <millert@openbsd.org>
7654 Date: Fri Apr 28 03:21:12 2017 +0000
7658 Avoid relying on implementation-specific behavior when
7659 detecting whether the timestamp or file size overflowed. If time_t and off_t
7660 are not either 32-bit or 64-bit scp will exit with an error. OK djm@
7662 Upstream-ID: f31caae73ddab6df496b7bbbf7da431e267ad135
7664 commit 68d3a2a059183ebd83b15e54984ffaced04d2742
7665 Author: dtucker@openbsd.org <dtucker@openbsd.org>
7666 Date: Fri Apr 28 03:20:27 2017 +0000
7670 Add SyslogFacility option to ssh(1) matching the
7671 equivalent option in sshd(8). bz#2705, patch from erahn at arista.com, ok
7674 Upstream-ID: d5115c2c0193ceb056ed857813b2a7222abda9ed
7676 commit e13aad66e73a14b062d13aee4e98f1e21a3f6a14
7677 Author: jsg@openbsd.org <jsg@openbsd.org>
7678 Date: Thu Apr 27 13:40:05 2017 +0000
7682 remove a static array unused since rev 1.306 spotted by
7685 Upstream-ID: 249b3eed2446f6074ba2219ccc46919dd235a7b8
7687 commit 91bd2181866659f00714903e78e1c3edd4c45f3d
7688 Author: millert@openbsd.org <millert@openbsd.org>
7689 Date: Thu Apr 27 11:53:12 2017 +0000
7693 Avoid potential signed int overflow when parsing the file
7694 size. Use strtoul() instead of parsing manually. OK djm@
7696 Upstream-ID: 1f82640861c7d905bbb05e7d935d46b0419ced02
7698 commit 17a54a03f5a1d35e33cc24e22cd7a9d0f6865dc4
7699 Author: Darren Tucker <dtucker@zip.com.au>
7700 Date: Tue Apr 25 08:32:27 2017 +1000
7702 Fix typo in "socketcall".
7704 Pointed out by jjelen at redhat.com.
7706 commit 8b0eee148f7cf8b248c30d1bae57300f2cc5aafd
7707 Author: Darren Tucker <dtucker@zip.com.au>
7708 Date: Mon Apr 24 19:40:31 2017 +1000
7710 Deny socketcall in seccomp filter on ppc64le.
7712 OpenSSL is using socket() calls (in FIPS mode) when handling ECDSA keys
7713 in privsep child. The socket() syscall is already denied in the seccomp
7714 filter, but in ppc64le kernel, it is implemented using socketcall()
7715 syscall, which is not denied yet (only SYS_SHUTDOWN is allowed) and
7716 therefore fails hard.
7718 Patch from jjelen at redhat.com.
7720 commit f8500b2be599053daa05248a86a743232ec6a536
7721 Author: schwarze@openbsd.org <schwarze@openbsd.org>
7722 Date: Mon Apr 17 14:31:23 2017 +0000
7726 Recognize nl_langinfo(CODESET) return values "646" and ""
7727 as aliases for "US-ASCII", useful for different versions of NetBSD and
7728 Solaris. Found by dtucker@ and by Tom G. Christensen <tgc at jupiterrise dot
7729 com>. OK dtucker@ deraadt@
7731 Upstream-ID: 38c2133817cbcae75c88c63599ac54228f0fa384
7733 commit 7480dfedf8c5c93baaabef444b3def9331e86ad5
7734 Author: jsg@openbsd.org <jsg@openbsd.org>
7735 Date: Mon Apr 17 11:02:31 2017 +0000
7739 Change COMPILER_VERSION tests which limited additional
7740 warnings to gcc4 to instead skip them on gcc3 as clang can handle
7741 -Wpointer-sign and -Wold-style-definition.
7743 Upstream-ID: 5cbe348aa76dc1adf55be6c0e388fafaa945439a
7745 commit 4d827f0d75a53d3952288ab882efbddea7ffadfe
7746 Author: djm@openbsd.org <djm@openbsd.org>
7747 Date: Tue Apr 4 00:24:56 2017 +0000
7751 disallow creation (of empty files) in read-only mode;
7752 reported by Michal Zalewski, feedback & ok deraadt@
7754 Upstream-ID: 5d9c8f2fa8511d4ecf95322994ffe73e9283899b
7756 commit ef47843af0a904a21c920e619c5aec97b65dd9ac
7757 Author: deraadt@openbsd.org <deraadt@openbsd.org>
7758 Date: Sun Mar 26 00:18:52 2017 +0000
7762 incorrect renditions of this quote bother me
7764 Upstream-ID: 1662be3ebb7a71d543da088119c31d4d463a9e49
7766 commit d9048861bea842c4eba9c2dbbf97064cc2a5ef02
7767 Author: Darren Tucker <dtucker@zip.com.au>
7768 Date: Fri Mar 31 11:04:43 2017 +1100
7770 Check for and use gcc's -pipe.
7772 Speeds up configure and build by a couple of percent. ok djm@
7774 commit 282cad2240c4fbc104c2f2df86d688192cbbe4bb
7775 Author: Darren Tucker <dtucker@zip.com.au>
7776 Date: Wed Mar 29 16:34:44 2017 +1100
7778 Import fmt_scaled.c rev 1.16 from OpenBSD.
7780 Fix overly-conservative overflow checks on mulitplications and add checks
7781 on additions. This allows scan_scaled to work up to +/-LLONG_MAX (LLONG_MIN
7782 will still be flagged as a range error). ok millert@
7784 commit c73a229e4edf98920f395e19fd310684fc6bb951
7785 Author: Darren Tucker <dtucker@zip.com.au>
7786 Date: Wed Mar 29 16:34:02 2017 +1100
7788 Import fmt_scaled.c rev 1.15 from OpenBSD.
7790 Collapse underflow and overflow checks into a single block.
7793 commit d427b73bf5a564f663d16546dbcbd84ba8b9d4af
7794 Author: Darren Tucker <dtucker@zip.com.au>
7795 Date: Wed Mar 29 16:32:57 2017 +1100
7797 Import fmt_scaled.c rev 1.14 from OpenBSD.
7799 Catch integer underflow in scan_scaled reported by Nicolas Iooss.
7802 commit d13281f2964abc5f2e535e1613c77fc61b0c53e7
7803 Author: Darren Tucker <dtucker@zip.com.au>
7804 Date: Wed Mar 29 12:39:39 2017 +1100
7806 Don't check privsep user or path when unprivileged
7808 If running with privsep (mandatory now) as a non-privileged user, we
7809 don't chroot or change to an unprivileged user however we still checked
7810 the existence of the user and directory. Don't do those checks if we're
7811 not going to use them. Based in part on a patch from Lionel Fourquaux
7812 via Corinna Vinschen, ok djm@
7814 commit f2742a481fe151e493765a3fbdef200df2ea7037
7815 Author: Darren Tucker <dtucker@zip.com.au>
7816 Date: Wed Mar 29 10:50:31 2017 +1100
7818 Remove SHA256 EVP wrapper implementation.
7820 All supported versions of OpenSSL should now have SHA256 so remove our
7821 EVP wrapper implementaion. ok djm@
7823 commit 5346f271fc76549caf4a8e65b5fba319be422fe9
7824 Author: Darren Tucker <dtucker@zip.com.au>
7825 Date: Wed Mar 29 10:23:58 2017 +1100
7827 Remove check for OpenSSL < 0.9.8g.
7829 We no longer support OpenSSL < 1.0.1 so remove check for unreliable ECC
7830 in OpenSSL < 0.9.8g.
7832 commit 8fed0a5fe7b4e78a6810b133d8e91be9742ee0a1
7833 Author: Darren Tucker <dtucker@zip.com.au>
7834 Date: Wed Mar 29 10:16:15 2017 +1100
7836 Remove compat code for OpenSSL < 0.9.7.
7838 Resyncs that code with OpenBSD upstream.
7840 commit 608ec1f62ff22fdccc3952e51463d79c43cbd0d3
7841 Author: Darren Tucker <dtucker@zip.com.au>
7842 Date: Wed Mar 29 09:50:54 2017 +1100
7844 Remove SSHv1 code path.
7846 Server-side support for Protocol 1 has been removed so remove !compat20
7849 commit 7af27bf538cbc493d609753f9a6d43168d438f1b
7850 Author: Darren Tucker <dtucker@zip.com.au>
7851 Date: Fri Mar 24 09:44:56 2017 +1100
7853 Enable ldns when using ldns-config.
7855 Actually enable ldns when attempting to use ldns-config. bz#2697, patch
7856 from fredrik at fornwall.net.
7858 commit 58b8cfa2a062b72139d7229ae8de567f55776f24
7859 Author: Damien Miller <djm@mindrot.org>
7860 Date: Wed Mar 22 12:43:02 2017 +1100
7862 Missing header on Linux/s390
7864 Patch from Jakub Jelen
7866 commit 096fb65084593f9f3c1fc91b6d9052759a272a00
7867 Author: djm@openbsd.org <djm@openbsd.org>
7868 Date: Mon Mar 20 22:08:06 2017 +0000
7872 remove /usr/bin/time calls around tests, makes diffing test
7873 runs harder. Based on patch from Mike Frysinger
7875 Upstream-Regress-ID: 81c1083b14dcf473b23d2817882f40b346ebc95c
7877 commit 6b853c6f8ba5eecc50f3b57af8e63f8184eb0fa6
7878 Author: Damien Miller <djm@mindrot.org>
7879 Date: Tue Mar 21 08:47:55 2017 +1100
7881 Fix syntax error on Linux/X32
7883 Patch from Mike Frysinger
7885 commit d38f05dbdd291212bc95ea80648b72b7177e9f4e
7886 Author: Darren Tucker <dtucker@zip.com.au>
7887 Date: Mon Mar 20 13:38:27 2017 +1100
7889 Add llabs() implementation.
7891 commit 72536316a219b7394996a74691a5d4ec197480f7
7892 Author: Damien Miller <djm@mindrot.org>
7893 Date: Mon Mar 20 12:23:04 2017 +1100
7895 crank version numbers
7897 commit 3be52bc36bdfd24ded7e0f46999e7db520fb4e3f
7898 Author: djm@openbsd.org <djm@openbsd.org>
7899 Date: Mon Mar 20 01:18:59 2017 +0000
7905 Upstream-ID: b8b9a4a949427c393cd868215e1724ceb3467ee5
7907 commit db84e52fe9cfad57f22e7e23c5fbf00092385129
7908 Author: Damien Miller <djm@mindrot.org>
7909 Date: Mon Mar 20 12:07:20 2017 +1100
7913 Unbreak obvious syntax error.
7915 commit 89f04852db27643717c9c3a2b0dde97ae50099ee
7916 Author: Damien Miller <djm@mindrot.org>
7917 Date: Mon Mar 20 11:53:34 2017 +1100
7919 on Cygwin, check paths from server for backslashes
7921 Pointed out by Jann Horn of Google Project Zero
7923 commit 7ef1f9bafc2cc8d97ff2fbd4f280002b6e8ea5d9
7924 Author: Damien Miller <djm@mindrot.org>
7925 Date: Mon Mar 20 11:48:34 2017 +1100
7927 Yet another synonym for ASCII: "646"
7929 Used by NetBSD; this unbreaks mprintf() and friends there for the C
7930 locale (caught by dtucker@ and his menagerie of test systems).
7932 commit 9165abfea3f68a0c684a6ed2e575e59bc31a3a6b
7933 Author: Damien Miller <djm@mindrot.org>
7934 Date: Mon Mar 20 09:58:34 2017 +1100
7936 create test mux socket in /tmp
7938 Creating the socket in $OBJ could blow past the (quite limited)
7939 path limit for Unix domain sockets. As a bandaid for bz#2660,
7940 reported by Colin Watson; ok dtucker@
7942 commit 2adbe1e63bc313d03e8e84e652cc623af8ebb163
7943 Author: markus@openbsd.org <markus@openbsd.org>
7944 Date: Wed Mar 15 07:07:39 2017 +0000
7948 disallow KEXINIT before NEWKEYS; ok djm; report by
7949 vegard.nossum at oracle.com
7951 Upstream-ID: 3668852d1f145050e62f1da08917de34cb0c5234
7953 commit 2fbf91684d76d38b9cf06550b69c9e41bca5a71c
7954 Author: Darren Tucker <dtucker@zip.com.au>
7955 Date: Thu Mar 16 14:05:46 2017 +1100
7957 Include includes.h for compat bits.
7959 commit b55f634e96b9c5b0cd991e23a9ca181bec4bdbad
7960 Author: Darren Tucker <dtucker@zip.com.au>
7961 Date: Thu Mar 16 13:45:17 2017 +1100
7963 Wrap stdint.h in #ifdef HAVE_STDINT_H
7965 commit 55a1117d7342a0bf8b793250cf314bab6b482b99
7966 Author: Damien Miller <djm@mindrot.org>
7967 Date: Thu Mar 16 11:22:42 2017 +1100
7969 Adapt Cygwin config script to privsep knob removal
7971 Patch from Corinna Vinschen.
7973 commit 1a321bfdb91defe3c4d9cca5651724ae167e5436
7974 Author: deraadt@openbsd.org <deraadt@openbsd.org>
7975 Date: Wed Mar 15 03:52:30 2017 +0000
7979 accidents happen to the best of us; ok djm
7981 Upstream-ID: b7a9dbd71011ffde95e06f6945fe7197dedd1604
7983 commit 25f837646be8c2017c914d34be71ca435dfc0e07
7984 Author: djm@openbsd.org <djm@openbsd.org>
7985 Date: Wed Mar 15 02:25:09 2017 +0000
7989 fix regression in 7.4: deletion of PKCS#11-hosted keys
7990 would fail unless they were specified by full physical pathname. Report and
7991 fix from Jakub Jelen via bz#2682; ok dtucker@
7993 Upstream-ID: 5b5bc20ca11cacb5d5eb29c3f93fd18425552268
7995 commit a8c5eeacf032a7d3408957e45dd7603cc1baf55f
7996 Author: djm@openbsd.org <djm@openbsd.org>
7997 Date: Wed Mar 15 02:19:09 2017 +0000
8001 Fix segfault when sshd attempts to load RSA1 keys (can
8002 only happen when protocol v.1 support is enabled for the client). Reported by
8003 Jakub Jelen in bz#2686; ok dtucker
8005 Upstream-ID: 8fdaec2ba4b5f65db1d094f6714ce64b25d871d7
8007 commit 66705948c0639a7061a0d0753266da7685badfec
8008 Author: djm@openbsd.org <djm@openbsd.org>
8009 Date: Tue Mar 14 07:19:07 2017 +0000
8013 Mark the sshd_config UsePrivilegeSeparation option as
8014 deprecated, effectively making privsep mandatory in sandboxing mode. ok
8017 (note: this doesn't remove the !privsep code paths, though that will
8020 Upstream-ID: b4c52666256c4dd865f8ce9431af5d6ce2d74a0a
8022 commit f86586b03fe6cd8f595289bde200a94bc2c191af
8023 Author: Damien Miller <djm@mindrot.org>
8024 Date: Tue Mar 14 18:26:29 2017 +1100
8026 Make seccomp-bpf sandbox work on Linux/X32
8028 Allow clock_gettime syscall with X32 bit masked off. Apparently
8029 this is required for at least some kernel versions. bz#2142
8030 Patch mostly by Colin Watson. ok dtucker@
8032 commit 2429cf78dd2a9741ce27ba25ac41c535274a0af6
8033 Author: Damien Miller <djm@mindrot.org>
8034 Date: Tue Mar 14 18:01:52 2017 +1100
8036 require OpenSSL >=1.0.1
8038 commit e3ea335abeab731c68f2b2141bee85a4b0bf680f
8039 Author: Damien Miller <djm@mindrot.org>
8040 Date: Tue Mar 14 17:48:43 2017 +1100
8042 Remove macro trickery; no binary change
8044 This stops the SC_ALLOW(), SC_ALLOW_ARG() and SC_DENY() macros
8045 prepending __NR_ to the syscall number parameter and just makes
8046 them explicit in the macro invocations.
8048 No binary change in stripped object file before/after.
8050 commit 5f1596e11d55539678c41f68aed358628d33d86f
8051 Author: Damien Miller <djm@mindrot.org>
8052 Date: Tue Mar 14 13:15:18 2017 +1100
8054 support ioctls for ICA crypto card on Linux/s390
8056 Based on patch from Eduardo Barretto; ok dtucker@
8058 commit b1b22dd0df2668b322dda174e501dccba2cf5c44
8059 Author: Darren Tucker <dtucker@zip.com.au>
8060 Date: Tue Mar 14 14:19:36 2017 +1100
8062 Plumb conversion test into makefile.
8064 commit f57783f1ddfb4cdfbd612c6beb5ec01cb5b9a6b9
8065 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8066 Date: Tue Mar 14 01:20:29 2017 +0000
8070 Add unit test for convtime().
8072 Upstream-Regress-ID: 8717bc0ca4c21120f6dd3a1d3b7a363f707c31e1
8074 commit 8884b7247d094cd11ff9e39c325ba928c5bdbc6c
8075 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8076 Date: Tue Mar 14 01:10:07 2017 +0000
8080 Add ASSERT_LONG_* helpers.
8082 Upstream-Regress-ID: fe15beaea8f5063c7f21b0660c722648e3d76431
8084 commit c6774d21185220c0ba11e8fd204bf0ad1a432071
8085 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8086 Date: Tue Mar 14 00:55:37 2017 +0000
8090 Fix convtime() overflow test on boundary condition,
8091 spotted by & ok djm.
8093 Upstream-ID: 51f14c507ea87a3022e63f574100613ab2ba5708
8095 commit f5746b40cfe6d767c8e128fe50c43274b31cd594
8096 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8097 Date: Tue Mar 14 00:25:03 2017 +0000
8101 Check for integer overflow when parsing times in
8102 convtime(). Reported by nicolas.iooss at m4x.org, ok djm@
8104 Upstream-ID: 35e6a4e98f6fa24df50bfb8ba1307cf70e966f13
8106 commit f5907982f42a8d88a430b8a46752cbb7859ba979
8107 Author: Darren Tucker <dtucker@zip.com.au>
8108 Date: Tue Mar 14 13:38:15 2017 +1100
8110 Add a "unit" target to run only unit tests.
8112 commit 9e96b41682aed793fadbea5ccd472f862179fb02
8113 Author: Damien Miller <djm@mindrot.org>
8114 Date: Tue Mar 14 12:24:47 2017 +1100
8116 Fix weakness in seccomp-bpf sandbox arg inspection
8118 Syscall arguments are passed via an array of 64-bit values in struct
8119 seccomp_data, but we were only inspecting the bottom 32 bits and not
8120 even those correctly for BE systems.
8122 Fortunately, the only case argument inspection was used was in the
8123 socketcall filtering so using this for sandbox escape seems
8128 commit 8ff3fc3f2f7c13e8968717bc2b895ee32c441275
8129 Author: djm@openbsd.org <djm@openbsd.org>
8130 Date: Sat Mar 11 23:44:16 2017 +0000
8134 regress tests for loading certificates without public keys;
8135 bz#2617 based on patch from Adam Eijdenberg; ok markus@ dtucker@
8137 Upstream-Regress-ID: 0145d19328ed995b73fe2d9da33596b17429d0d0
8139 commit 1e24552716194db8f2f620587b876158a9ef56ad
8140 Author: djm@openbsd.org <djm@openbsd.org>
8141 Date: Sat Mar 11 23:40:26 2017 +0000
8145 allow ssh to use certificates accompanied by a private
8146 key file but no corresponding plain *.pub public key. bz#2617 based on patch
8147 from Adam Eijdenberg; ok dtucker@ markus@
8149 Upstream-ID: 295668dca2c39505281577217583ddd2bd4b00b9
8151 commit 0fb1a617a07b8df5de188dd5a0c8bf293d4bfc0e
8152 Author: markus@openbsd.org <markus@openbsd.org>
8153 Date: Sat Mar 11 13:07:35 2017 +0000
8157 Don't count the initial block twice when computing how
8158 many bytes to discard for the work around for the attacks against CBC-mode.
8159 ok djm@; report from Jean Paul, Kenny, Martin and Torben @ RHUL
8161 Upstream-ID: f445f509a4e0a7ba3b9c0dae7311cb42458dc1e2
8163 commit ef653dd5bd5777132d9f9ee356225f9ee3379504
8164 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8165 Date: Fri Mar 10 07:18:32 2017 +0000
8171 Upstream-ID: fc5e695d5d107d730182e2da7b23f00b489e0ee1
8173 commit d94c1dfef2ea30ca67b1204ada7c3b537c54f4d0
8174 Author: Damien Miller <djm@mindrot.org>
8175 Date: Sun Mar 12 10:48:14 2017 +1100
8177 sync fmt_scaled.c with OpenBSD
8180 date: 2017/03/11 23:37:23; author: djm; state: Exp; lines: +14 -1; commitid: jnFKyHkB3CEiEZ2R;
8181 fix signed integer overflow in scan_scaled. Found by Nicolas Iooss
8182 using AFL against ssh_config. ok deraadt@ millert@
8183 ----------------------------
8185 date: 2013/11/29 19:00:51; author: deraadt; state: Exp; lines: +6 -5;
8186 fairly simple unsigned char casts for ctype
8188 ----------------------------
8190 date: 2012/11/12 14:07:20; author: halex; state: Exp; lines: +4 -2;
8191 make scan_scaled set errno to EINVAL rather than ERANGE if it encounters
8192 an invalid multiplier, like the man page says it should
8194 "looks sensible" deraadt@, ok ian@
8195 ----------------------------
8197 date: 2009/06/20 15:00:04; author: martynas; state: Exp; lines: +4 -4;
8198 use llabs instead of the home-grown version; and some comment changes
8200 ----------------------------
8202 commit 894221a63fa061e52e414ca58d47edc5fe645968
8203 Author: djm@openbsd.org <djm@openbsd.org>
8204 Date: Fri Mar 10 05:01:13 2017 +0000
8208 When updating hostkeys, accept RSA keys if
8209 HostkeyAlgorithms contains any RSA keytype. Previously, ssh could ignore RSA
8210 keys when any of the ssh-rsa-sha2-* methods was enabled in HostkeyAlgorithms
8211 nit ssh-rsa (SHA1 signatures) was not. bz#2650 reported by Luis Ressel; ok
8214 Upstream-ID: c5e8cfee15c42f4a05d126158a0766ea06da79d2
8216 commit dd3e2298663f4cc1a06bc69582d00dcfee27d73c
8217 Author: djm@openbsd.org <djm@openbsd.org>
8218 Date: Fri Mar 10 04:24:55 2017 +0000
8222 make hostname matching really insensitive to case;
8223 bz#2685, reported by Petr Cerny; ok dtucker@
8225 Upstream-ID: e467622ff154269e36ba8b6c9e3d105e1c4a9253
8227 commit 77a9be9446697fe8b5499fe651f4a82a71a4b51f
8228 Author: djm@openbsd.org <djm@openbsd.org>
8229 Date: Fri Mar 10 03:52:48 2017 +0000
8233 reword a comment to make it fit 80 columns
8235 Upstream-ID: 4ef509a66b96c7314bbcc87027c2af71fa9d0ba4
8237 commit 61b8ef6a66efaec07e023342cb94a10bdc2254dc
8238 Author: djm@openbsd.org <djm@openbsd.org>
8239 Date: Fri Mar 10 04:27:32 2017 +0000
8243 better match sshd config parser behaviour: fatal() if
8244 line is overlong, increase line buffer to match sshd's; bz#2651 reported by
8245 Don Fong; ok dtucker@
8247 Upstream-ID: b175ae7e0ba403833f1ee566edf10f67443ccd18
8249 commit db2597207e69912f2592cd86a1de8e948a9d7ffb
8250 Author: djm@openbsd.org <djm@openbsd.org>
8251 Date: Fri Mar 10 04:26:06 2017 +0000
8255 ensure hostname is lower-case before hashing it;
8256 bz#2591 reported by Griff Miller II; ok dtucker@
8258 Upstream-ID: c3b8b93804f376bd00d859b8bcd9fc0d86b4db17
8260 commit df9936936c695f85c1038bd706d62edf752aca4b
8261 Author: djm@openbsd.org <djm@openbsd.org>
8262 Date: Fri Mar 10 04:24:55 2017 +0000
8266 make hostname matching really insensitive to case;
8267 bz#2685, reported by Petr Cerny; ok dtucker@
8269 Upstream-ID: e632b7a9bf0d0558d5ff56dab98b7cca6c3db549
8271 commit 67eed24bfa7645d88fa0b883745fccb22a0e527e
8272 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8273 Date: Fri Mar 10 04:11:00 2017 +0000
8277 Remove old null check from config dumper. Patch from
8278 jjelen at redhat.com vi bz#2687, ok djm@
8280 Upstream-ID: 824ab71467b78c4bab0dd1b3a38e8bc5f63dd528
8282 commit 183ba55aaaecca0206184b854ad6155df237adbe
8283 Author: djm@openbsd.org <djm@openbsd.org>
8284 Date: Fri Mar 10 04:07:20 2017 +0000
8288 fix regression in 7.4 server-sig-algs, where we were
8289 accidentally excluding SHA2 RSA signature methods. bz#2680, patch from Nuno
8290 Goncalves; ok dtucker@
8292 Upstream-ID: 81ac8bfb30960447740b9b8f6a214dcf322f12e8
8294 commit 66be4fe8c4435af5bbc82998501a142a831f1181
8295 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8296 Date: Fri Mar 10 03:53:11 2017 +0000
8300 Check for NULL return value from key_new. Patch from
8301 jjelen at redhat.com via bz#2687, ok djm@
8303 Upstream-ID: 059e33cd43cba88dc8caf0b1936fd4dd88fd5b8e
8305 commit ec2892b5c7fea199914cb3a6afb3af38f84990bf
8306 Author: djm@openbsd.org <djm@openbsd.org>
8307 Date: Fri Mar 10 03:52:48 2017 +0000
8311 reword a comment to make it fit 80 columns
8313 Upstream-ID: b4b48b4487c0821d16e812c40c9b09f03b28e349
8315 commit 7fadbb6da3f4122de689165651eb39985e1cba85
8316 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8317 Date: Fri Mar 10 03:48:57 2017 +0000
8321 Check for NULL argument to sshkey_read. Patch from
8322 jjelen at redhat.com via bz#2687, ok djm@
8324 Upstream-ID: c2d00c2ea50c4861d271d0a586f925cc64a87e0e
8326 commit 5a06b9e019e2b0b0f65a223422935b66f3749de3
8327 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8328 Date: Fri Mar 10 03:45:40 2017 +0000
8332 Plug some mem leaks mostly on error paths. From jjelen
8333 at redhat.com via bz#2687, ok djm@
8335 Upstream-ID: 3fb030149598957a51b7c8beb32bf92cf30c96f2
8337 commit f6edbe9febff8121f26835996b1229b5064d31b7
8338 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8339 Date: Fri Mar 10 03:24:48 2017 +0000
8343 Plug mem leak on GLOB_NOMATCH case. From jjelen at
8344 redhat.com via bz#2687, ok djm@
8346 Upstream-ID: 8016a7ae97719d3aa55fb723fc2ad3200058340d
8348 commit 566b3a46e89a2fda2db46f04f2639e92da64a120
8349 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8350 Date: Fri Mar 10 03:22:40 2017 +0000
8354 Plug descriptor leaks of auth_sock. From jjelen at
8355 redhat.com via bz#2687, ok djm@
8357 Upstream-ID: 248acb99a5ed2fdca37d1aa33c0fcee7be286d88
8359 commit 8a2834454c73dfc1eb96453c0e97690595f3f4c2
8360 Author: djm@openbsd.org <djm@openbsd.org>
8361 Date: Fri Mar 10 03:18:24 2017 +0000
8365 correctly hash hosts with a port number. Reported by Josh
8366 Powers in bz#2692; ok dtucker@
8368 Upstream-ID: 468e357ff143e00acc05bdd2803a696b3d4b6442
8370 commit 9747b9c742de409633d4753bf1a752cbd211e2d3
8371 Author: djm@openbsd.org <djm@openbsd.org>
8372 Date: Fri Mar 10 03:15:58 2017 +0000
8376 don't truncate off \r\n from long stderr lines; bz#2688,
8377 reported by Brian Dyson; ok dtucker@
8379 Upstream-ID: cdfdc4ba90639af807397ce996153c88af046ca4
8381 commit 4a4b75adac862029a1064577eb5af299b1580cdd
8382 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8383 Date: Fri Mar 10 02:59:51 2017 +0000
8387 Validate digest arg in ssh_digest_final; from jjelen at
8388 redhat.com via bz#2687, ok djm@
8390 Upstream-ID: dbe5494dfddfe523fab341a3dab5a79e7338f878
8392 commit bee0167be2340d8de4bdc1ab1064ec957c85a447
8393 Author: Darren Tucker <dtucker@zip.com.au>
8394 Date: Fri Mar 10 13:40:18 2017 +1100
8396 Check for NULL from malloc.
8398 Part of bz#2687, from jjelen at redhat.com.
8400 commit da39b09d43b137a5a3d071b51589e3efb3701238
8401 Author: Darren Tucker <dtucker@zip.com.au>
8402 Date: Fri Mar 10 13:22:32 2017 +1100
8404 If OSX is using launchd, remove screen no.
8406 Check for socket with and without screen number. From Apple and Jakob
8407 Schlyter via bz#2341, with contributions from Ron Frederick, ok djm@
8409 commit 8fb15311a011517eb2394bb95a467c209b8b336c
8410 Author: djm@openbsd.org <djm@openbsd.org>
8411 Date: Wed Mar 8 12:07:47 2017 +0000
8415 quote [host]:port in generated ProxyJump commandline; the
8416 [ / ] characters can confuse some shells (e.g. zsh). Reported by Lauri
8419 Upstream-ID: 65cdd161460e1351c3d778e974c1c2a4fa4bc182
8421 commit 18501151cf272a15b5f2c5e777f2e0933633c513
8422 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8423 Date: Mon Mar 6 02:03:20 2017 +0000
8427 Check l->hosts before dereferencing; fixes potential null
8428 pointer deref. ok djm@
8430 Upstream-ID: 81c0327c6ec361da794b5c680601195cc23d1301
8432 commit d072370793f1a20f01ad827ba8fcd3b8f2c46165
8433 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8434 Date: Mon Mar 6 00:44:51 2017 +0000
8438 linenum is unsigned long so use %lu in log formats. ok
8441 Upstream-ID: 9dc582d9bb887ebe0164e030d619fc20b1a4ea08
8443 commit 12d3767ba4c84c32150cbe6ff6494498780f12c9
8444 Author: djm@openbsd.org <djm@openbsd.org>
8445 Date: Fri Mar 3 06:13:11 2017 +0000
8449 fix ssh-keygen -H accidentally corrupting known_hosts that
8450 contained already-hashed entries. HKF_MATCH_HOST_HASHED is only set by
8451 hostkeys_foreach() when hostname matching is in use, so we need to look for
8452 the hash marker explicitly.
8454 Upstream-ID: da82ad653b93e8a753580d3cf5cd448bc2520528
8456 commit d7abb771bd5a941b26144ba400a34563a1afa589
8457 Author: djm@openbsd.org <djm@openbsd.org>
8458 Date: Tue Feb 28 06:10:08 2017 +0000
8462 small memleak: free fd_set on connection timeout (though
8463 we are heading to exit anyway). From Tom Rix in bz#2683
8465 Upstream-ID: 10e3dadbb8199845b66581473711642d9e6741c4
8467 commit 78142e3ab3887e53a968d6e199bcb18daaf2436e
8468 Author: jmc@openbsd.org <jmc@openbsd.org>
8469 Date: Mon Feb 27 14:30:33 2017 +0000
8473 errant dot; from klemens nanni
8475 Upstream-ID: 83d93366a5acf47047298c5d3ebc5e7426f37921
8477 commit 8071a6924c12bb51406a9a64a4b2892675112c87
8478 Author: djm@openbsd.org <djm@openbsd.org>
8479 Date: Fri Feb 24 03:16:34 2017 +0000
8483 might as well set the listener socket CLOEXEC
8485 Upstream-ID: 9c538433d6a0ca79f5f21decc5620e46fb68ab57
8487 commit d5499190559ebe374bcdfa8805408646ceffad64
8488 Author: djm@openbsd.org <djm@openbsd.org>
8489 Date: Sun Feb 19 00:11:29 2017 +0000
8493 add test cases for C locale; ok schwarze@
8495 Upstream-Regress-ID: 783d75de35fbc923d46e2a5e6cee30f8f381ba87
8497 commit 011c8ffbb0275281a0cf330054cf21be10c43e37
8498 Author: djm@openbsd.org <djm@openbsd.org>
8499 Date: Sun Feb 19 00:10:57 2017 +0000
8503 Add a common nl_langinfo(CODESET) alias for US-ASCII
8504 "ANSI_X3.4-1968" that is used by Linux. Fixes mprintf output truncation for
8505 non-UTF-8 locales on Linux spotted by dtucker@; ok deraadt@ schwarze@
8507 Upstream-ID: c6808956ebffd64066f9075d839f74ff0dd60719
8509 commit 0c4430a19b73058a569573492f55e4c9eeaae67b
8510 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8511 Date: Tue Feb 7 23:03:11 2017 +0000
8515 Remove deprecated SSH1 options RSAAuthentication and
8516 RhostsRSAAuthentication from regression test sshd_config.
8518 Upstream-Regress-ID: 8066b753d9dce7cf02ff87af5c727ff680d99491
8520 commit 3baa4cdd197c95d972ec3d07f1c0d08f2d7d9199
8521 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8522 Date: Fri Feb 17 02:32:05 2017 +0000
8526 Do not show rsa1 key type in usage when compiled without
8529 Upstream-ID: 068b5c41357a02f319957746fa4e84ea73960f57
8531 commit ecc35893715f969e98fee118481f404772de4132
8532 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8533 Date: Fri Feb 17 02:31:14 2017 +0000
8537 ifdef out "rsa1" from the list of supported keytypes when
8538 compiled without SSH1 support. Found by kdunlop at guralp.com, ok djm@
8540 Upstream-ID: cea93a26433d235bb1d64b1d990f19a9c160a70f
8542 commit 10577c6d96a55b877a960b2d0b75edef1b9945af
8543 Author: djm@openbsd.org <djm@openbsd.org>
8544 Date: Fri Feb 17 02:04:15 2017 +0000
8548 For ProxyJump/-J, surround host name with brackets to
8549 allow literal IPv6 addresses. From Dick Visser; ok dtucker@
8551 Upstream-ID: 3a5d3b0171250daf6a5235e91bce09c1d5746bf1
8553 commit b2afdaf1b52231aa23d2153f4a8c5a60a694dda4
8554 Author: jsg@openbsd.org <jsg@openbsd.org>
8555 Date: Wed Feb 15 23:38:31 2017 +0000
8559 Fix memory leaks in match_filter_list() error paths.
8563 Upstream-ID: c7f96ac0877f6dc9188bbc908100a8d246cc7f0e
8565 commit 6d5a41b38b55258213ecfaae9df7a758caa752a1
8566 Author: djm@openbsd.org <djm@openbsd.org>
8567 Date: Wed Feb 15 01:46:47 2017 +0000
8571 fix division by zero crash in "df" output when server
8572 returns zero total filesystem blocks/inodes. Spotted by Guido Vranken; ok
8575 Upstream-ID: 6fb6c2ae6b289aa07b6232dbc0be54682ef5419f
8577 commit bd5d7d239525d595ecea92765334af33a45d9d63
8578 Author: Darren Tucker <dtucker@zip.com.au>
8579 Date: Sun Feb 12 15:45:15 2017 +1100
8581 ifdef out EVP_R_PRIVATE_KEY_DECODE_ERROR
8583 EVP_R_PRIVATE_KEY_DECODE_ERROR was added in OpenSSL 1.0.0 so ifdef out
8584 for the benefit of OpenSSL versions prior to that.
8586 commit 155d540d00ff55f063421ec182ec8ff2b7ab6cbe
8587 Author: djm@openbsd.org <djm@openbsd.org>
8588 Date: Fri Feb 10 04:34:50 2017 +0000
8592 bring back r1.34 that was backed out for problems loading
8595 translate OpenSSL error codes to something more
8596 meaninful; bz#2522 reported by Jakub Jelen, ok dtucker@
8598 with additional fix from Jakub Jelen to solve the backout.
8599 bz#2525 bz#2523 re-ok dtucker@
8601 Upstream-ID: a9d5bc0306f4473d9b4f4484f880e95f3c1cc031
8603 commit a287c5ad1e0bf9811c7b9221979b969255076019
8604 Author: djm@openbsd.org <djm@openbsd.org>
8605 Date: Fri Feb 10 03:36:40 2017 +0000
8609 Sanitise escape sequences in key comments sent to printf
8610 but preserve valid UTF-8 when the locale supports it; bz#2520 ok dtucker@
8612 Upstream-ID: e8eed28712ba7b22d49be534237eed019875bd1e
8614 commit e40269be388972848aafcca7060111c70aab5b87
8615 Author: millert@openbsd.org <millert@openbsd.org>
8616 Date: Wed Feb 8 20:32:43 2017 +0000
8620 Avoid printf %s NULL. From semarie@, OK djm@
8622 Upstream-ID: 06beef7344da0208efa9275d504d60d2a5b9266c
8624 commit 5b90709ab8704dafdb31e5651073b259d98352bc
8625 Author: djm@openbsd.org <djm@openbsd.org>
8626 Date: Mon Feb 6 09:22:51 2017 +0000
8630 Restore \r\n newline sequence for server ident string. The CR
8631 got lost in the flensing of SSHv1. Pointed out by Stef Bon
8633 Upstream-ID: 5333fd43ce5396bf5999496096fac5536e678fac
8635 commit 97c31c46ee2e6b46dfffdfc4f90bbbf188064cbc
8636 Author: djm@openbsd.org <djm@openbsd.org>
8637 Date: Fri Feb 3 23:01:42 2017 +0000
8641 unit test for match_filter_list() function; still want a
8642 better name for this...
8644 Upstream-Regress-ID: 840ad6118552c35111f0a897af9c8d93ab8de92a
8646 commit f1a193464a7b77646f0d0cedc929068e4a413ab4
8647 Author: djm@openbsd.org <djm@openbsd.org>
8648 Date: Fri Feb 3 23:05:57 2017 +0000
8652 use ssh_packet_set_log_preamble() to include connection
8653 username in packet log messages, e.g.
8655 Connection closed by invalid user foo 10.1.1.1 port 44056 [preauth]
8659 Upstream-ID: 3591b88bdb5416d6066fb3d49d8fff2375bf1a15
8661 commit 07edd7e9537ab32aa52abb5fb2a915c350fcf441
8662 Author: djm@openbsd.org <djm@openbsd.org>
8663 Date: Fri Feb 3 23:03:33 2017 +0000
8667 add ssh_packet_set_log_preamble() to allow inclusion of a
8668 preamble string in disconnect messages; ok markus@
8670 Upstream-ID: 34cb41182cd76d414c214ccb01c01707849afead
8672 commit 68bc8cfa7642d3ccbf2cd64281c16b8b9205be59
8673 Author: djm@openbsd.org <djm@openbsd.org>
8674 Date: Fri Feb 3 23:01:19 2017 +0000
8678 support =- for removing methods from algorithms lists,
8679 e.g. Ciphers=-*cbc; suggested by Cristian Ionescu-Idbohrn in bz#2671 "I like
8682 Upstream-ID: c78c38f9f81a963b33d0eade559f6048add24a6d
8684 commit c924b2ef941028a1f31e6e94f54dfeeeef462a4e
8685 Author: djm@openbsd.org <djm@openbsd.org>
8686 Date: Fri Feb 3 05:05:56 2017 +0000
8690 allow form-feed characters at EOL; bz#2431 ok dtucker@
8692 Upstream-ID: 1f453afaba6da2ae69d6afdf1ae79a917552f1a2
8694 commit 523db8540b720c4d21ab0ff6f928476c70c38aab
8695 Author: Damien Miller <djm@mindrot.org>
8696 Date: Fri Feb 3 16:01:22 2017 +1100
8698 prefer to use ldns-config to find libldns
8700 Should fix bz#2603 - "Build with ldns and without kerberos support
8701 fails if ldns compiled with kerberos support" by including correct
8706 commit c998bf0afa1a01257a53793eba57941182e9e0b7
8707 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8708 Date: Fri Feb 3 02:56:00 2017 +0000
8712 Make ssh_packet_set_rekey_limits take u32 for the number of
8713 seconds until rekeying (negative values are rejected at config parse time).
8714 This allows the removal of some casts and a signed vs unsigned comparison
8717 rekey_time is cast to int64 for the comparison which is a no-op
8718 on OpenBSD, but should also do the right thing in -portable on
8719 anything still using 32bit time_t (until the system time actually
8722 some early guidance deraadt@, ok djm@
8724 Upstream-ID: c9f18613afb994a07e7622eb326f49de3d123b6c
8726 commit 3ec5fa4ba97d4c4853620daea26a33b9f1fe3422
8727 Author: jsg@openbsd.org <jsg@openbsd.org>
8728 Date: Thu Feb 2 10:54:25 2017 +0000
8732 In vasnmprintf() return an error if malloc fails and
8733 don't set a function argument to the address of free'd memory.
8737 Upstream-ID: 1efffffff2f51d53c9141f245b90ac23d33b9779
8739 commit 858252fb1d451ebb0969cf9749116c8f0ee42753
8740 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8741 Date: Wed Feb 1 02:59:09 2017 +0000
8745 Return true reason for port forwarding failures where
8746 feasible rather than always "administratively prohibited". bz#2674, ok djm@
8748 Upstream-ID: d901d9887951774e604ca970e1827afaaef9e419
8750 commit 6ba9f893838489add6ec4213c7a997b425e4a9e0
8751 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8752 Date: Mon Jan 30 23:27:39 2017 +0000
8756 Small correction to the known_hosts section on when it is
8757 updated. Patch from lkppo at free.fr some time ago, pointed out by smallm at
8760 Upstream-ID: 1834d7af179dea1a12ad2137f84566664af225d5
8762 commit c61d5ec3c11e7ff9779b6127421d9f166cf10915
8763 Author: Darren Tucker <dtucker@zip.com.au>
8764 Date: Fri Feb 3 14:10:34 2017 +1100
8766 Remove _XOPEN_SOURCE from wide char detection.
8768 Having _XOPEN_SOURCE unconditionally causes problems on some platforms
8769 and configurations, notably Solaris 64-bit binaries. It was there for
8770 the benefit of Linux put the required bits in the *-*linux* section.
8772 Patch from yvoinov at gmail.com.
8774 commit f25ee13b3e81fd80efeb871dc150fe49d7fc8afd
8775 Author: djm@openbsd.org <djm@openbsd.org>
8776 Date: Mon Jan 30 05:22:14 2017 +0000
8780 fully unbreak: some $SSH invocations did not have -F
8781 specified and could pick up the ~/.ssh/config of the user running the tests
8783 Upstream-Regress-ID: f362d1892c0d3e66212d5d3fc02d915c58ef6b89
8785 commit 6956e21fb26652887475fe77ea40d2efcf25908b
8786 Author: djm@openbsd.org <djm@openbsd.org>
8787 Date: Mon Jan 30 04:54:07 2017 +0000
8791 partially unbreak: was not specifying hostname on some
8794 Upstream-Regress-ID: bc8a5e98e57bad0a92ef4f34ed91c1d18294e2cc
8796 commit 52763dd3fe0a4678dafdf7aeb32286e514130afc
8797 Author: djm@openbsd.org <djm@openbsd.org>
8798 Date: Mon Jan 30 01:03:00 2017 +0000
8802 revise keys/principals command hang fix (bz#2655) to
8803 consume entire output, avoiding sending SIGPIPE to subprocesses early; ok
8806 Upstream-ID: 7cb04b31a61f8c78c4e48ceededcd2fd5c4ee1bc
8808 commit 381a2615a154a82c4c53b787f4a564ef894fe9ac
8809 Author: djm@openbsd.org <djm@openbsd.org>
8810 Date: Mon Jan 30 00:38:50 2017 +0000
8814 small cleanup post SSHv1 removal:
8816 remove SSHv1-isms in commented examples
8818 reorder token table to group deprecated and compile-time conditional tokens
8821 fix config dumping code for some compile-time conditional options that
8822 weren't being correctly skipped (SSHv1 and PKCS#11)
8824 Upstream-ID: f2e96b3cb3158d857c5a91ad2e15925df3060105
8826 commit 4833d01591b7eb049489d9558b65f5553387ed43
8827 Author: djm@openbsd.org <djm@openbsd.org>
8828 Date: Mon Jan 30 00:34:01 2017 +0000
8832 some explicit NULL tests when dumping configured
8833 forwardings; from Karsten Weiss
8835 Upstream-ID: 40957b8dea69672b0e50df6b4a91a94e3e37f72d
8837 commit 326e2fae9f2e3e067b5651365eba86b35ee5a6b2
8838 Author: djm@openbsd.org <djm@openbsd.org>
8839 Date: Mon Jan 30 00:32:28 2017 +0000
8843 misplaced braces in test; from Karsten Weiss
8845 Upstream-ID: f7b794074d3aae8e35b69a91d211c599c94afaae
8847 commit 3e032a95e46bfaea9f9e857678ac8fa5f63997fb
8848 Author: djm@openbsd.org <djm@openbsd.org>
8849 Date: Mon Jan 30 00:32:03 2017 +0000
8853 don't dereference authctxt before testing != NULL, it
8854 causes compilers to make assumptions; from Karsten Weiss
8856 Upstream-ID: 794243aad1e976ebc717885b7a97a25e00c031b2
8858 commit 01cfaa2b1cfb84f3cdd32d1bf82b120a8d30e057
8859 Author: djm@openbsd.org <djm@openbsd.org>
8860 Date: Fri Jan 6 02:51:16 2017 +0000
8864 use correct ssh-add program; bz#2654, from Colin Watson
8866 Upstream-Regress-ID: 7042a36e1bdaec6562f6e57e9d047efe9c7a6030
8868 commit e5c7ec67cdc42ae2584085e0fc5cc5ee91133cf5
8869 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8870 Date: Fri Jan 6 02:26:10 2017 +0000
8874 Account for timeouts in the integrity tests as failures.
8876 If the first test in a series for a given MAC happens to modify the low
8877 bytes of a packet length, then ssh will time out and this will be
8878 interpreted as a test failure. Patch from cjwatson at debian.org via
8881 Upstream-Regress-ID: e7467613b0badedaa300bc6fc7495ec2f44e2fb9
8883 commit dbaf599b61bd6e0f8469363a8c8e7f633b334018
8884 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8885 Date: Fri Jan 6 02:09:25 2017 +0000
8889 Make forwarding test less racy by using unix domain
8890 sockets instead of TCP ports where possible. Patch from cjwatson at
8891 debian.org via bz#2659.
8893 Upstream-Regress-ID: 4756375aac5916ef9d25452a1c1d5fa9e90299a9
8895 commit 9390b0031ebd6eb5488d3bc4d4333c528dffc0a6
8896 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8897 Date: Sun Jan 29 21:35:23 2017 +0000
8901 Fix typo in ~C error message for bad port forward
8902 cancellation. bz#2672, from Brad Marshall via Colin Watson and Ubuntu's
8905 Upstream-ID: 0d4a7e5ead6cc59c9a44b4c1e5435ab3aada09af
8907 commit 4ba15462ca38883b8a61a1eccc093c79462d5414
8908 Author: guenther@openbsd.org <guenther@openbsd.org>
8909 Date: Sat Jan 21 11:32:04 2017 +0000
8913 The POSIX APIs that that sockaddrs all ignore the s*_len
8914 field in the incoming socket, so userspace doesn't need to set it unless it
8915 has its own reasons for tracking the size along with the sockaddr.
8917 ok phessler@ deraadt@ florian@
8919 Upstream-ID: ca6e49e2f22f2b9e81d6d924b90ecd7e422e7437
8921 commit a1187bd3ef3e4940af849ca953a1b849dae78445
8922 Author: jmc@openbsd.org <jmc@openbsd.org>
8923 Date: Fri Jan 6 16:28:12 2017 +0000
8927 keep the tokens list sorted;
8929 Upstream-ID: b96239dae4fb3aa94146bb381afabcc7740a1638
8931 commit b64077f9767634715402014f509e58decf1e140d
8932 Author: djm@openbsd.org <djm@openbsd.org>
8933 Date: Fri Jan 6 09:27:52 2017 +0000
8939 Upstream-ID: c107d6a69bc22325d79fbf78a2a62e04bcac6895
8941 commit 5e820e9ea2e949aeb93071fe31c80b0c42f2b2de
8942 Author: djm@openbsd.org <djm@openbsd.org>
8943 Date: Fri Jan 6 03:53:58 2017 +0000
8947 show a useful error message when included config files
8948 can't be opened; bz#2653, ok dtucker@
8950 Upstream-ID: f598b73b5dfe497344cec9efc9386b4e5a3cb95b
8952 commit 13bd2e2d622d01dc85d22b94520a5b243d006049
8953 Author: djm@openbsd.org <djm@openbsd.org>
8954 Date: Fri Jan 6 03:45:41 2017 +0000
8958 sshd_config is documented to set
8959 GSSAPIStrictAcceptorCheck=yes by default, so actually make it do this.
8962 Upstream-ID: 99ef8ac51f17f0f7aec166cb2e34228d4d72a665
8964 commit f89b928534c9e77f608806a217d39a2960cc7fd0
8965 Author: djm@openbsd.org <djm@openbsd.org>
8966 Date: Fri Jan 6 03:41:58 2017 +0000
8970 Avoid confusing error message when attempting to use
8971 ssh-keyscan built without SSH protocol v.1 to scan for v.1 keys; bz#2583
8973 Upstream-ID: 5d214abd3a21337d67c6dcc5aa6f313298d0d165
8975 commit 0999533014784579aa6f01c2d3a06e3e8804b680
8976 Author: dtucker@openbsd.org <dtucker@openbsd.org>
8977 Date: Fri Jan 6 02:34:54 2017 +0000
8981 Re-add '%k' token for AuthorizedKeysCommand which was
8982 lost during the re-org in rev 1.235. bz#2656, from jboning at gmail.com.
8984 Upstream-ID: 2884e203c02764d7b3fe7472710d9c24bdc73e38
8986 commit 51045869fa084cdd016fdd721ea760417c0a3bf3
8987 Author: djm@openbsd.org <djm@openbsd.org>
8988 Date: Wed Jan 4 05:37:40 2017 +0000
8992 unbreak Unix domain socket forwarding for root; ok
8995 Upstream-ID: 6649c76eb7a3fa15409373295ca71badf56920a2
8997 commit 58fca12ba967ea5c768653535604e1522d177e44
8998 Author: Darren Tucker <dtucker@zip.com.au>
8999 Date: Mon Jan 16 09:08:32 2017 +1100
9001 Remove LOGIN_PROGRAM.
9003 UseLogin is gone, remove leftover. bz#2665, from cjwatson at debian.org
9005 commit b108ce92aae0ca0376dce9513d953be60e449ae1
9006 Author: djm@openbsd.org <djm@openbsd.org>
9007 Date: Wed Jan 4 02:21:43 2017 +0000
9011 relax PKCS#11 whitelist a bit to allow libexec as well as
9014 Upstream-ID: cf5617958e2e2d39f8285fd3bc63b557da484702
9016 commit c7995f296b9222df2846f56ecf61e5ae13d7a53d
9017 Author: djm@openbsd.org <djm@openbsd.org>
9018 Date: Tue Jan 3 05:46:51 2017 +0000
9022 check number of entries in SSH2_FXP_NAME response; avoids
9023 unreachable overflow later. Reported by Jann Horn
9025 Upstream-ID: b6b2b434a6d6035b1644ca44f24cd8104057420f
9027 commit ddd3d34e5c7979ca6f4a3a98a7d219a4ed3d98c2
9028 Author: djm@openbsd.org <djm@openbsd.org>
9029 Date: Fri Dec 30 22:08:02 2016 +0000
9033 fix deadlock when keys/principals command produces a lot of
9034 output and a key is matched early; bz#2655, patch from jboning AT gmail.com
9036 Upstream-ID: e19456429bf99087ea994432c16d00a642060afe
9038 commit 30eee7d1b2fec33c14870cc11910610be5d2aa6f
9039 Author: Darren Tucker <dtucker@zip.com.au>
9040 Date: Tue Dec 20 12:16:11 2016 +1100
9042 Re-add missing "Prerequisites" header and fix typo
9044 Patch from HARUYAMA Seigo <haruyama at unixuser org>.
9046 commit c8c60f3663165edd6a52632c6ddbfabfce1ca865
9047 Author: djm@openbsd.org <djm@openbsd.org>
9048 Date: Mon Dec 19 22:35:23 2016 +0000
9052 use standard /bin/sh equality test; from Mike Frysinger
9054 Upstream-Regress-ID: 7b6f0b63525f399844c8ac211003acb8e4b0bec2
9056 commit 4a354fc231174901f2629437c2a6e924a2dd6772
9057 Author: Damien Miller <djm@mindrot.org>
9058 Date: Mon Dec 19 15:59:26 2016 +1100
9060 crank version numbers for release
9062 commit 5f8d0bb8413d4d909cc7aa3c616fb0538224c3c9
9063 Author: djm@openbsd.org <djm@openbsd.org>
9064 Date: Mon Dec 19 04:55:51 2016 +0000
9070 Upstream-ID: 1ee404adba6bbe10ae9277cbae3a94abe2867b79
9072 commit 3a8213ea0ed843523e34e55ab9c852332bab4c7b
9073 Author: djm@openbsd.org <djm@openbsd.org>
9074 Date: Mon Dec 19 04:55:18 2016 +0000
9078 remove testcase that depends on exact output and
9079 behaviour of snprintf(..., "%s", NULL)
9081 Upstream-Regress-ID: cab4288531766bd9593cb556613b91a2eeefb56f
9083 commit eae735a82d759054f6ec7b4e887fb7a5692c66d7
9084 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9085 Date: Mon Dec 19 03:32:57 2016 +0000
9089 Use LOGNAME to get current user and fall back to whoami if
9090 not set. Mainly to benefit -portable since some platforms don't have whoami.
9092 Upstream-Regress-ID: e3a16b7836a3ae24dc8f8a4e43fdf8127a60bdfa
9094 commit 0d2f88428487518eea60602bd593989013831dcf
9095 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9096 Date: Fri Dec 16 03:51:19 2016 +0000
9100 Add regression test for AllowUsers and DenyUsers. Patch from
9101 Zev Weiss <zev at bewilderbeest.net>
9103 Upstream-Regress-ID: 8f1aac24d52728398871dac14ad26ea38b533fb9
9105 commit 3bc8180a008929f6fe98af4a56fb37d04444b417
9106 Author: Darren Tucker <dtucker@zip.com.au>
9107 Date: Fri Dec 16 15:02:24 2016 +1100
9109 Add missing monitor.h include.
9111 Fixes warning pointed out by Zev Weiss <zev at bewilderbeest.net>
9113 commit 410681f9015d76cc7b137dd90dac897f673244a0
9114 Author: djm@openbsd.org <djm@openbsd.org>
9115 Date: Fri Dec 16 02:48:55 2016 +0000
9119 revert to rev1.2; the new bits in this test depend on changes
9120 to ssh that aren't yet committed
9122 Upstream-Regress-ID: 828ffc2c7afcf65d50ff2cf3dfc47a073ad39123
9124 commit 2f2ffa4fbe4b671bbffa0611f15ba44cff64d58e
9125 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9126 Date: Fri Dec 16 01:06:27 2016 +0000
9130 Move the "stop sshd" code into its own helper function.
9131 Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@
9133 Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329
9135 commit e15e7152331e3976b35475fd4e9c72897ad0f074
9136 Author: djm@openbsd.org <djm@openbsd.org>
9137 Date: Fri Dec 16 01:01:07 2016 +0000
9141 regression test for certificates along with private key
9142 with no public half. bz#2617, mostly from Adam Eijdenberg
9144 Upstream-Regress-ID: 2e74dc2c726f4dc839609b3ce045466b69f01115
9146 commit 9a70ec085faf6e55db311cd1a329f1a35ad2a500
9147 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9148 Date: Thu Dec 15 23:50:37 2016 +0000
9152 Use $SUDO to read pidfile in case root's umask is
9153 restricted. From portable.
9155 Upstream-Regress-ID: f6b1c7ffbc5a0dfb7d430adb2883344899174a98
9157 commit fe06b68f824f8f55670442fb31f2c03526dd326c
9158 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9159 Date: Thu Dec 15 21:29:05 2016 +0000
9163 Add missing braces in DenyUsers code. Patch from zev at
9164 bewilderbeest.net, ok deraadt@
9166 Upstream-ID: d747ace338dcf943b077925f90f85f789714b54e
9168 commit dcc7d74242a574fd5c4afbb4224795b1644321e7
9169 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9170 Date: Thu Dec 15 21:20:41 2016 +0000
9174 Fix text in error message. Patch from zev at
9177 Upstream-ID: deb0486e175e7282f98f9a15035d76c55c84f7f6
9179 commit b737e4d7433577403a31cff6614f6a1b0b5e22f4
9180 Author: djm@openbsd.org <djm@openbsd.org>
9181 Date: Wed Dec 14 00:36:34 2016 +0000
9185 disable Unix-domain socket forwarding when privsep is
9188 Upstream-ID: ab61516ae0faadad407857808517efa900a0d6d0
9190 commit 08a1e7014d65c5b59416a0e138c1f73f417496eb
9191 Author: djm@openbsd.org <djm@openbsd.org>
9192 Date: Fri Dec 9 03:04:29 2016 +0000
9196 log connections dropped in excess of MaxStartups at
9197 verbose LogLevel; bz#2613 based on diff from Tomas Kuthan; ok dtucker@
9199 Upstream-ID: 703ae690dbf9b56620a6018f8a3b2389ce76d92b
9201 commit 10e290ec00964b2bf70faab15a10a5574bb80527
9202 Author: Darren Tucker <dtucker@zip.com.au>
9203 Date: Tue Dec 13 13:51:32 2016 +1100
9205 Get default of TEST_SSH_UTF8 from environment.
9207 commit b9b8ba3f9ed92c6220b58d70d1e6d8aa3eea1104
9208 Author: Darren Tucker <dtucker@zip.com.au>
9209 Date: Tue Dec 13 12:56:40 2016 +1100
9211 Remove commented-out includes.
9213 These commented-out includes have "Still needed?" comments. Since
9214 they've been commented out for ~13 years I assert that they're not.
9216 commit 25275f1c9d5f01a0877d39444e8f90521a598ea0
9217 Author: Darren Tucker <dtucker@zip.com.au>
9218 Date: Tue Dec 13 12:54:23 2016 +1100
9220 Add prototype for strcasestr in compat library.
9222 commit afec07732aa2985142f3e0b9a01eb6391f523dec
9223 Author: Darren Tucker <dtucker@zip.com.au>
9224 Date: Tue Dec 13 10:23:03 2016 +1100
9226 Add strcasestr to compat library.
9228 Fixes build on (at least) Solaris 10.
9230 commit dda78a03af32e7994f132d923c2046e98b7c56c8
9231 Author: Damien Miller <djm@mindrot.org>
9232 Date: Mon Dec 12 13:57:10 2016 +1100
9234 Force Turkish locales back to C/POSIX; bz#2643
9236 Turkish locales are unique in their handling of the letters 'i' and
9237 'I' (yes, they are different letters) and OpenSSH isn't remotely
9238 prepared to deal with that. For now, the best we can do is to force
9239 OpenSSH to use the C/POSIX locale and try to preserve the UTF-8
9240 encoding if possible.
9244 commit c35995048f41239fc8895aadc3374c5f75180554
9245 Author: Darren Tucker <dtucker@zip.com.au>
9246 Date: Fri Dec 9 12:52:02 2016 +1100
9248 exit is in stdlib.h not unistd.h (that's _exit).
9250 commit d399a8b914aace62418c0cfa20341aa37a192f98
9251 Author: Darren Tucker <dtucker@zip.com.au>
9252 Date: Fri Dec 9 12:33:25 2016 +1100
9254 Include <unistd.h> for exit in utf8 locale test.
9256 commit 47b8c99ab3221188ad3926108dd9d36da3b528ec
9257 Author: Darren Tucker <dtucker@zip.com.au>
9258 Date: Thu Dec 8 15:48:34 2016 +1100
9260 Check for utf8 local support before testing it.
9262 Check for utf8 local support and if not found, do not attempt to run the
9263 utf8 tests. Suggested by djm@
9265 commit 4089fc1885b3a2822204effbb02b74e3da58240d
9266 Author: Darren Tucker <dtucker@zip.com.au>
9267 Date: Thu Dec 8 12:57:24 2016 +1100
9269 Use AC_PATH_TOOL for krb5-config.
9271 This will use the host-prefixed version when cross compiling; patch from
9272 david.michael at coreos.com.
9274 commit b4867e0712c89b93be905220c82f0a15e6865d1e
9275 Author: djm@openbsd.org <djm@openbsd.org>
9276 Date: Tue Dec 6 07:48:01 2016 +0000
9280 make IdentityFile successfully load and use certificates that
9281 have no corresponding bare public key. E.g. just a private id_rsa and
9282 certificate id_rsa-cert.pub (and no id_rsa.pub).
9286 Upstream-ID: c1e9699b8c0e3b63cc4189e6972e3522b6292604
9288 commit c9792783a98881eb7ed295680013ca97a958f8ac
9289 Author: Damien Miller <djm@mindrot.org>
9290 Date: Fri Nov 25 14:04:21 2016 +1100
9292 Add a gnome-ssh-askpass3 target for GTK+3 version
9294 Based on patch from Colin Watson via bz#2640
9296 commit 7be85ae02b9de0993ce0a1d1e978e11329f6e763
9297 Author: Damien Miller <djm@mindrot.org>
9298 Date: Fri Nov 25 14:03:53 2016 +1100
9300 Make gnome-ssh-askpass2.c GTK+3-friendly
9302 Patch from Colin Watson via bz#2640
9304 commit b9844a45c7f0162fd1b5465683879793d4cc4aaa
9305 Author: djm@openbsd.org <djm@openbsd.org>
9306 Date: Sun Dec 4 23:54:02 2016 +0000
9310 Fix public key authentication when multiple
9311 authentication is in use. Instead of deleting and re-preparing the entire
9312 keys list, just reset the 'used' flags; the keys list is already in a good
9313 order (with already- tried keys at the back)
9315 Analysis and patch from Vincent Brillault on bz#2642; ok dtucker@
9317 Upstream-ID: 7123f12dc2f3bcaae715853035a97923d7300176
9319 commit f2398eb774075c687b13af5bc22009eb08889abe
9320 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9321 Date: Sun Dec 4 22:27:25 2016 +0000
9325 Unlink PidFile on SIGHUP and always recreate it when the
9326 new sshd starts. Regression tests (and possibly other things) depend on the
9327 pidfile being recreated after SIGHUP, and unlinking it means it won't contain
9328 a stale pid if sshd fails to restart. ok djm@ markus@
9330 Upstream-ID: 132dd6dda0c77dd49d2f15b2573b5794f6160870
9332 commit 85aa2efeba51a96bf6834f9accf2935d96150296
9333 Author: djm@openbsd.org <djm@openbsd.org>
9334 Date: Wed Nov 30 03:01:33 2016 +0000
9338 test new behaviour of cert force-command restriction vs.
9339 authorized_key/ principals
9341 Upstream-Regress-ID: 399efa7469d40c404c0b0a295064ce75d495387c
9343 commit 5d333131cd8519d022389cfd3236280818dae1bc
9344 Author: jmc@openbsd.org <jmc@openbsd.org>
9345 Date: Wed Nov 30 06:54:26 2016 +0000
9349 tweak previous; while here fix up FILES and AUTHORS;
9351 Upstream-ID: 93f6e54086145a75df8d8ec7d8689bdadbbac8fa
9353 commit 786d5994da79151180cb14a6cf157ebbba61c0cc
9354 Author: djm@openbsd.org <djm@openbsd.org>
9355 Date: Wed Nov 30 03:07:37 2016 +0000
9359 add a whitelist of paths from which ssh-agent will load
9360 (via ssh-pkcs11-helper) a PKCS#11 module; ok markus@
9362 Upstream-ID: fe79769469d9cd6d26fe0dc15751b83ef2a06e8f
9364 commit 7844f357cdd90530eec81340847783f1f1da010b
9365 Author: djm@openbsd.org <djm@openbsd.org>
9366 Date: Wed Nov 30 03:00:05 2016 +0000
9370 Add a sshd_config DisableForwaring option that disables
9371 X11, agent, TCP, tunnel and Unix domain socket forwarding, as well as
9372 anything else we might implement in the future.
9374 This, like the 'restrict' authorized_keys flag, is intended to be a
9375 simple and future-proof way of restricting an account. Suggested as
9376 a complement to 'restrict' by Jann Horn; ok markus@
9378 Upstream-ID: 203803f66e533a474086b38a59ceb4cf2410fcf7
9380 commit fd6dcef2030d23c43f986d26979f84619c10589d
9381 Author: djm@openbsd.org <djm@openbsd.org>
9382 Date: Wed Nov 30 02:57:40 2016 +0000
9386 When a forced-command appears in both a certificate and
9387 an authorized keys/principals command= restriction, refuse to accept the
9388 certificate unless they are identical.
9390 The previous (documented) behaviour of having the certificate forced-
9391 command override the other could be a bit confused and more error-prone.
9393 Pointed out by Jann Horn of Project Zero; ok dtucker@
9395 Upstream-ID: 79d811b6eb6bbe1221bf146dde6928f92d2cd05f
9397 commit 7fc4766ac78abae81ee75b22b7550720bfa28a33
9398 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9399 Date: Wed Nov 30 00:28:31 2016 +0000
9403 On startup, check to see if sshd is already daemonized
9404 and if so, skip the call to daemon() and do not rewrite the PidFile. This
9405 means that when sshd re-execs itself on SIGHUP the process ID will no longer
9406 change. Should address bz#2641. ok djm@ markus@.
9408 Upstream-ID: 5ea0355580056fb3b25c1fd6364307d9638a37b9
9410 commit c9f880c195c65f1dddcbc4ce9d6bfea7747debcc
9411 Author: Damien Miller <djm@mindrot.org>
9412 Date: Wed Nov 30 13:51:49 2016 +1100
9414 factor out common PRNG reseed before privdrop
9416 Add a call to RAND_poll() to ensure than more than pid+time gets
9417 stirred into child processes states. Prompted by analysis from Jann
9418 Horn at Project Zero. ok dtucker@
9420 commit 79e4829ec81dead1b30999e1626eca589319a47f
9421 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9422 Date: Fri Nov 25 03:02:01 2016 +0000
9426 Allow PuTTY interop tests to run unattended. bz#2639,
9427 patch from cjwatson at debian.org.
9429 Upstream-Regress-ID: 4345253558ac23b2082aebabccd48377433b6fe0
9431 commit 504c3a9a1bf090f6b27260fc3e8ea7d984d163dc
9432 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9433 Date: Fri Nov 25 02:56:49 2016 +0000
9437 Reverse args to sshd-log-wrapper. Matches change in
9438 portable, where it allows sshd do be optionally run under Valgrind.
9440 Upstream-Regress-ID: b438d1c6726dc5caa2a45153e6103a0393faa906
9442 commit bd13017736ec2f8f9ca498fe109fb0035f322733
9443 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9444 Date: Fri Nov 25 02:49:18 2016 +0000
9448 Fix typo in trace message; from portable.
9450 Upstream-Regress-ID: 4c4a2ba0d37faf5fd230a91b4c7edb5699fbd73a
9452 commit 7da751d8b007c7f3e814fd5737c2351440d78b4c
9453 Author: tb@openbsd.org <tb@openbsd.org>
9454 Date: Tue Nov 1 13:43:27 2016 +0000
9458 Clean up MALLOC_OPTIONS. For the unittests, move
9459 MALLOC_OPTIONS and TEST_ENV to unittets/Makefile.inc.
9463 Upstream-Regress-ID: 890d497e0a38eeddfebb11cc429098d76cf29f12
9465 commit 36f58e68221bced35e06d1cca8d97c48807a8b71
9466 Author: tb@openbsd.org <tb@openbsd.org>
9467 Date: Mon Oct 31 23:45:08 2016 +0000
9471 Remove the obsolete A and P flags from MALLOC_OPTIONS.
9475 Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59
9477 commit b0899ee26a6630883c0f2350098b6a35e647f512
9478 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9479 Date: Tue Nov 29 03:54:50 2016 +0000
9483 Factor out code to disconnect from controlling terminal
9484 into its own function. ok djm@
9486 Upstream-ID: 39fd9e8ebd7222615a837312face5cc7ae962885
9488 commit 54d022026aae4f53fa74cc636e4a032d9689b64d
9489 Author: djm@openbsd.org <djm@openbsd.org>
9490 Date: Fri Nov 25 23:24:45 2016 +0000
9494 use sshbuf_allocate() to pre-allocate the buffer used for
9495 loading keys. This avoids implicit realloc inside the buffer code, which
9496 might theoretically leave fragments of the key on the heap. This doesn't
9497 appear to happen in practice for normal sized keys, but was observed for
9498 novelty oversize ones.
9500 Pointed out by Jann Horn of Project Zero; ok markus@
9502 Upstream-ID: d620e1d46a29fdea56aeadeda120879eddc60ab1
9504 commit a9c746088787549bb5b1ae3add7d06a1b6d93d5e
9505 Author: djm@openbsd.org <djm@openbsd.org>
9506 Date: Fri Nov 25 23:22:04 2016 +0000
9510 split allocation out of sshbuf_reserve() into a separate
9511 sshbuf_allocate() function; ok markus@
9513 Upstream-ID: 11b8a2795afeeb1418d508a2c8095b3355577ec2
9515 commit f0ddedee460486fa0e32fefb2950548009e5026e
9516 Author: markus@openbsd.org <markus@openbsd.org>
9517 Date: Wed Nov 23 23:14:15 2016 +0000
9521 allow ClientAlive{Interval,CountMax} in Match; ok dtucker,
9524 Upstream-ID: 8beb4c1eadd588f1080b58932281983864979f55
9526 commit 1a6f9d2e2493d445cd9ee496e6e3c2a2f283f66a
9527 Author: djm@openbsd.org <djm@openbsd.org>
9528 Date: Tue Nov 8 22:04:34 2016 +0000
9532 unbreak DenyUsers; reported by henning@
9534 Upstream-ID: 1c67d4148f5e953c35acdb62e7c08ae8e33f7cb2
9536 commit 010359b32659f455fddd2bd85fd7cc4d7a3b994a
9537 Author: djm@openbsd.org <djm@openbsd.org>
9538 Date: Sun Nov 6 05:46:37 2016 +0000
9542 Validate address ranges for AllowUser/DenyUsers at
9543 configuration load time and refuse to accept bad ones. It was previously
9544 possible to specify invalid CIDR address ranges (e.g. djm@127.1.2.3/55) and
9545 these would always match.
9547 Thanks to Laurence Parry for a detailed bug report. ok markus (for
9548 a previous diff version)
9550 Upstream-ID: 9dfcdd9672b06e65233ea4434c38226680d40bfb
9552 commit efb494e81d1317209256b38b49f4280897c61e69
9553 Author: djm@openbsd.org <djm@openbsd.org>
9554 Date: Fri Oct 28 03:33:52 2016 +0000
9558 Improve pkcs11_add_provider() logging: demote some
9559 excessively verbose error()s to debug()s, include PKCS#11 provider name and
9560 slot in log messages where possible. bz#2610, based on patch from Jakub Jelen
9562 Upstream-ID: 3223ef693cfcbff9079edfc7e89f55bf63e1973d
9564 commit 5ee3fb5affd7646f141749483205ade5fc54adaf
9565 Author: Darren Tucker <dtucker@zip.com.au>
9566 Date: Tue Nov 1 08:12:33 2016 +1100
9568 Use ptrace(PT_DENY_ATTACH, ..) on OS X.
9570 commit 315d2a4e674d0b7115574645cb51f968420ebb34
9571 Author: Damien Miller <djm@mindrot.org>
9572 Date: Fri Oct 28 14:34:07 2016 +1100
9574 Unbreak AES-CTR ciphers on old (~0.9.8) OpenSSL
9578 commit a9ff3950b8e80ff971b4d44bbce96df27aed28af
9579 Author: Darren Tucker <dtucker@zip.com.au>
9580 Date: Fri Oct 28 14:26:58 2016 +1100
9582 Move OPENSSL_NO_RIPEMD160 to compat.
9584 Move OPENSSL_NO_RIPEMD160 to compat and add ifdefs to mac.c around the
9587 commit bce58885160e5db2adda3054c3b81fe770f7285a
9588 Author: Darren Tucker <dtucker@zip.com.au>
9589 Date: Fri Oct 28 13:52:31 2016 +1100
9591 Check if RIPEMD160 is disabled in OpenSSL.
9593 commit d924640d4c355d1b5eca1f4cc60146a9975dbbff
9594 Author: Darren Tucker <dtucker@zip.com.au>
9595 Date: Fri Oct 28 13:38:19 2016 +1100
9597 Skip ssh1 specfic ciphers.
9599 cipher-3des1.c and cipher-bf1.c are specific to sshv1 so don't even try
9600 to compile them when Protocol 1 is not enabled.
9602 commit 79d078e7a49caef746516d9710ec369ba45feab6
9603 Author: jsg@openbsd.org <jsg@openbsd.org>
9604 Date: Tue Oct 25 04:08:13 2016 +0000
9608 Fix logic in add_local_forward() that inverted a test
9609 when code was refactored out into bind_permitted(). This broke ssh port
9610 forwarding for non-priv ports as a non root user.
9612 ok dtucker@ 'looks good' deraadt@
9614 Upstream-ID: ddb8156ca03cc99997de284ce7777536ff9570c9
9616 commit a903e315dee483e555c8a3a02c2946937f9b4e5d
9617 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9618 Date: Mon Oct 24 01:09:17 2016 +0000
9622 Remove dead breaks, found via opencoverage.net. ok
9625 Upstream-ID: ad9cc655829d67fad219762810770787ba913069
9627 commit b4e96b4c9bea4182846e4942ba2048e6d708ee54
9628 Author: Darren Tucker <dtucker@zip.com.au>
9629 Date: Wed Oct 26 08:43:25 2016 +1100
9631 Use !=NULL instead of >0 for getdefaultproj.
9633 getdefaultproj() returns a pointer so test it for NULL inequality
9634 instead of >0. Fixes compiler warning and is more correct. Patch from
9637 commit 1c4ef0b808d3d38232aeeb1cebb7e9a43def42c5
9638 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9639 Date: Sun Oct 23 22:04:05 2016 +0000
9643 Factor out "can bind to low ports" check into its own function. This will
9644 make it easier for Portable to support platforms with permissions models
9645 other than uid==0 (eg bz#2625). ok djm@, "doesn't offend me too much"
9648 Upstream-ID: 86213df4183e92b8f189a6d2dac858c994bfface
9650 commit 0b9ee623d57e5de7e83e66fd61a7ba9a5be98894
9651 Author: dtucker@openbsd.org <dtucker@openbsd.org>
9652 Date: Wed Oct 19 23:21:56 2016 +0000
9656 When tearing down ControlMaster connecctions, don't
9657 pollute stderr when LogLevel=quiet. Patch from Tim Kuijsten via tech@.
9659 Upstream-ID: d9b3a68b2a7c2f2fc7f74678e29a4618d55ceced
9661 commit 09e6a7d8354224933febc08ddcbc2010f542284e
9662 Author: Darren Tucker <dtucker@zip.com.au>
9663 Date: Mon Oct 24 09:06:18 2016 +1100
9665 Wrap stdint.h include in ifdef.
9667 commit 08d9e9516e587b25127545c029e5464b2e7f2919
9668 Author: Darren Tucker <dtucker@zip.com.au>
9669 Date: Fri Oct 21 09:46:46 2016 +1100
9673 commit 461f50e7ab8751d3a55e9158c44c13031db7ba1d
9674 Author: Darren Tucker <dtucker@zip.com.au>
9675 Date: Fri Oct 21 06:55:58 2016 +1100
9677 Update links to https.
9679 www.openssh.com now supports https and ftp.openbsd.org no longer
9680 supports ftp. Make all links to these https.
9682 commit dd4e7212a6141f37742de97795e79db51e4427ad
9683 Author: Darren Tucker <dtucker@zip.com.au>
9684 Date: Fri Oct 21 06:48:46 2016 +1100
9686 Update host key generation examples.
9688 Remove ssh1 host key generation, add ssh-keygen -A
9690 commit 6d49ae82634c67e9a4d4af882bee20b40bb8c639
9691 Author: Darren Tucker <dtucker@zip.com.au>
9692 Date: Fri Oct 21 05:22:55 2016 +1100
9696 Make links to openssh.com HTTPS now that it's supported, point release
9697 notes link to the HTML release notes page, and update a couple of other
9698 links and bits of text.
9700 commit fe0d1ca6ace06376625084b004ee533f2c2ea9d6
9701 Author: Darren Tucker <dtucker@zip.com.au>
9702 Date: Thu Oct 20 03:42:09 2016 +1100
9704 Remote channels .orig and .rej files.
9706 These files were incorrectly added during an OpenBSD sync.