Commit Graph

11806 Commits

Author SHA1 Message Date
dtucker@openbsd.org 5f76286a12 upstream: Simplify forward-control test.
Since we no longer need to support SSH1 we don't need to run shell
commands on the other end of the connection and can use ssh -N instead.
This also makes the test less racy.

OpenBSD-Regress-ID: 32e94ce272820cc398f30b848b2b0f080d10302c
2022-04-20 15:36:53 +10:00
djm@openbsd.org 687bbf2357 upstream: regression test for sftp cp command
OpenBSD-Regress-ID: c96bea9edde3a384b254785e7f9b2b24a81cdf82
2022-04-20 15:31:55 +10:00
dtucker@openbsd.org f1233f19a6 upstream: Import regenerated moduli
OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
2022-04-20 15:30:13 +10:00
djm@openbsd.org fec014785d upstream: Try to continue running local I/O for channels in state
OPEN during SSH transport rekeying. The most visible benefit is that it
should make ~-escapes work in the client (e.g. to exit) if the connection
happened to have stalled during a rekey event. Based work by and ok dtucker@

OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45
2022-04-20 15:08:54 +10:00
dtucker@openbsd.org e68154b0d4 upstream: Import regenerated moduli
OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
2022-04-20 15:08:54 +10:00
tj@openbsd.org 69928b106d upstream: list the correct version number
for when usage of the sftp protocol became default and fix a typo
from ed maste

OpenBSD-Commit-ID: 24e1795ed2283fdeacf16413c2f07503bcdebb31
2022-04-16 14:37:15 +10:00
dtucker@openbsd.org 21042a05c0 upstream: Correct path for system known hosts file in description
of IgnoreUserKnownHosts.  Patch from Martin Vahlensieck via tech@

OpenBSD-Commit-ID: 9b7784f054fa5aa4d63cb36bd563889477127215
2022-04-16 14:36:48 +10:00
Darren Tucker 53f4aff60a Resync moduli.5 with upstream.
1.18: remove duplicate publication year; carsten dot kunze at arcor dot de
1.19: ssh-keygen's -G/-T have been replaced with -M generate/screen.
2022-04-16 14:33:20 +10:00
Darren Tucker d2b888762b Retire fbsd6 test VM.
It's long since out of support, relatively slow (it's i686) and the
compiler has trouble with PIE.
2022-04-16 14:31:13 +10:00
djm@openbsd.org cd1f700098 upstream: clear io_want/io_ready flags at start of poll() cycle;
avoids plausible spin during rekeying if channel io_want flags are reused
across cycles. ok markus@ deraadt@

OpenBSD-Commit-ID: 91034f855b7c73cd2591657c49ac30f10322b967
2022-04-12 09:35:31 +10:00
dtucker@openbsd.org aa19203027 upstream: Note that curve25519-sha256 was later published in
RFC8731.  ok djm@

OpenBSD-Commit-ID: 2ac2b5d642d4cf5918eaec8653cad9a4460b2743
2022-04-12 09:35:31 +10:00
djm@openbsd.org 4673fa8f2b upstream: two defensive changes from Tobias Stoeckmann via GHPR287
enforce stricter invarient for sshbuf_set_parent() - never allow
a buffer to have a previously-set parent changed.

In sshbuf_reset(), if the reallocation fails, then zero the entire
buffer and not the (potentially smaller) default initial alloc size.

OpenBSD-Commit-ID: 14583203aa5d50ad38d2e209ae10abaf8955e6a9
2022-04-12 09:35:31 +10:00
Damien Miller 26eef015e2 Revert "update build-aux files to match autoconf-2.71"
This reverts commit 0a8ca39fac.

It turns out that the checked-in copies of these files are actually newer
than autoconf-2.71's copies, so this was effectively a downgrade.
Spotted by Bo Anderson via github
2022-04-11 16:07:09 +10:00
Damien Miller 0a8ca39fac update build-aux files to match autoconf-2.71
i.e. config.guess, config.sub and install-sh
2022-04-08 14:48:58 +10:00
Damien Miller 94eb6858ef update version numbers for release 2022-04-06 10:47:48 +10:00
djm@openbsd.org 8e4a8eadf4 upstream: openssh-9.0
OpenBSD-Commit-ID: 0dfb461188f4513ec024c1534da8c1ce14c20b64
2022-04-06 09:16:11 +10:00
naddy@openbsd.org a9f23ea2e3 upstream: ssh: document sntrup761x25519-sha512@openssh.com as
default KEX

OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171
2022-04-06 09:16:05 +10:00
naddy@openbsd.org 9ec2713d12 upstream: man pages: add missing commas between subordinate and
main clauses

jmc@ dislikes a comma before "then" in a conditional, so leave those
untouched.

ok jmc@

OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3
2022-04-06 09:16:05 +10:00
Darren Tucker 3741df98ff Disable security key on fbsd6 test host. 2022-04-04 23:52:11 +10:00
Darren Tucker 32c12236f2 Specify TEST_SHELL=bash on AIX.
The system shells cause the agent-restrict test to fail due to some
quoting so explicitly specify bash until we can get configure to
autmatically work around that.
2022-04-04 15:16:51 +10:00
Darren Tucker 90452c8b69 Only return events from ppoll that were requested.
If the underlying system's select() returns bits that were not in the
request set, our ppoll() implementation can return revents for events
not requested, which can apparently cause a hang.  Only return revents
for activity in the requested event set.  bz#3416, analysis and fix by
yaroslav.kuzmin at vmssoftware com, ok djm@
2022-04-01 23:38:44 +11:00
Darren Tucker 6c49eb5fab Only run regression tests on slow VMs. 2022-04-01 23:21:40 +11:00
Darren Tucker f67e479039 Increase test timeout to allow slow VMs to finish 2022-04-01 23:21:06 +11:00
Darren Tucker 02488c1b54 Use bash or ksh if available for SH in Makefile. 2022-04-01 16:29:14 +11:00
Darren Tucker 34c7018c31 Set Makefile SHELL as determined by configure.
This should improve compatibility for users with non-POSIX shells.  If
using Makefile.in directly (eg make -f Makefile.in distprep) then SHELL
will need to be specified on the command line (along with MANFMT in that
particular case).  ok djm@
2022-04-01 14:56:54 +11:00
Darren Tucker 5b054d7640 Skip slow tests on (very) slow test targets. 2022-04-01 13:16:47 +11:00
Damien Miller b275818065 depend 2022-03-31 14:11:36 +11:00
djm@openbsd.org 3fa539c3ff upstream: add a sftp client "cp" command that supports server-side
copying of files. Useful for this task and for testing the copy-data
extension. Patch from Mike Frysinger; ok dtucker@

OpenBSD-Commit-ID: 1bb1b950af0d49f0d5425b1f267e197aa1b57444
2022-03-31 14:09:42 +11:00
djm@openbsd.org 7988bfc4b7 upstream: add support for the "corp-data" protocol extension to
allow server-side copies to be performed without having to go via the client.
Patch by Mike Frysinger, ok dtucker@

OpenBSD-Commit-ID: 00aa510940fedd66dab1843b58682de4eb7156d5
2022-03-31 14:09:42 +11:00
djm@openbsd.org 32dc1c29a4 upstream: select post-quantum KEX
sntrup761x25519-sha512@openssh.com as the default; ok markus@

OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9
2022-03-31 08:16:38 +11:00
djm@openbsd.org d6556de1db upstream: fix poll() spin when a channel's output fd closes without
data in the channel buffer. Introduce more exact packing of channel fds into
the pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@

OpenBSD-Commit-ID: 06740737849c9047785622ad5d472cb6a3907d10
2022-03-31 08:16:38 +11:00
djm@openbsd.org 8a74a96d25 upstream: ssh is almost out of getopt() characters; note the
remaining remaining available ones in a comment

OpenBSD-Commit-ID: 48d38cef59d6bc8e84c6c066f6d601875d3253fd
2022-03-30 15:34:33 +11:00
djm@openbsd.org 6d4fc51adb upstream: avoid NULL deref via ssh-keygen -Y find-principals.
bz3409, reported by Mateusz Adamowski

OpenBSD-Commit-ID: a3b2c02438052ee858e0ee18e5a288586b5df2c5
2022-03-30 15:34:33 +11:00
Darren Tucker e937514920 Add AIX 5.1 test target. 2022-03-28 17:51:03 +11:00
Darren Tucker 4bbe815ba9 Drop leading "v" from release version identifier.
It's present in the git tags but not in the release tarball names.
Also drop extra "/" from URL path.
2022-03-26 22:01:31 +11:00
Darren Tucker f5cdd3b3c2 Use tarballs when testing LibreSSL releases.
This means they'll still work when the combination of -portable and
openbsd github repos no longer match.
2022-03-26 16:28:04 +11:00
Darren Tucker 24dc37d198 Remove now-unused passwd variable. 2022-03-26 15:02:45 +11:00
Darren Tucker 5b467ceef2 Missing semicolon. 2022-03-26 13:15:44 +11:00
Darren Tucker 2923d026e5 Factor out platform-specific locked account check.
Also fixes an incorrect free on platforms with both libiaf and shadow
passwords (probably only Unixware).  Prompted by github PR#284,
originally from @c3h2_ctf and stoeckmann@.
2022-03-26 12:49:50 +11:00
Darren Tucker d23efe4b12 Add OpenWRT mips and mipsel test targets. 2022-03-26 08:13:46 +11:00
djm@openbsd.org 16ea8b8583 upstream: don't leak argument list; bz3404, reported by Balu
Gajjala ok dtucker@

OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6
2022-03-20 19:54:35 +11:00
djm@openbsd.org a72bde294f upstream: make addargs() and replacearg() a little more robust and
improve error reporting

make freeargs(NULL) a noop like the other free functions

ok dtucker as part of bz3403

OpenBSD-Commit-ID: 15f86da83176978b4d1d288caa24c766dfa2983d
2022-03-20 19:54:35 +11:00
djm@openbsd.org 731087d261 upstream: don't try to resolve ListenAddress directives in the sshd
re-exec path - we're never going to use the result and if the operation fails
then it can prevent connections from being accepted. Reported by Aaron
Poffenberger; with / ok dtucker@

OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60
2022-03-20 19:54:35 +11:00
djm@openbsd.org 1c83c08212 upstream: remove blank line
OpenBSD-Commit-ID: d5e0182965b2fbfb03ad5f256d1a1ce5706bcddf
2022-03-20 19:54:35 +11:00
djm@openbsd.org 807be68684 upstream: helpful comment
OpenBSD-Commit-ID: e3315a45cb04e7feeb614d76ec80a9fe4ca0e8c7
2022-03-18 13:33:36 +11:00
djm@openbsd.org a0b5816f8f upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV
will ensue. Patch from Mateusz Adamowski via GHPR#307

OpenBSD-Commit-ID: 99e8ec38f9feb38bce6de240335be34aedeba5fd
2022-03-18 13:33:36 +11:00
djm@openbsd.org 5a252d54a6 upstream: improve DEBUG_CHANNEL_POLL debugging message
OpenBSD-Commit-ID: 2275eb7bc4707d019b1a0194b9c92c0b78da848f
2022-03-18 13:33:36 +11:00
cheloha@openbsd.org ce324cf58b upstream: ssh: xstrdup(): use memcpy(3)
Copying the given string into the buffer with strlcpy(3) confers no
benefit in this context because we have already determined the
string's length with strlen(3) in order to allocate that buffer.

Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2

ok dtucker@ millert@

OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a
2022-03-18 13:33:36 +11:00
Darren Tucker 2893c5e764 Resync fmt_scaled. with OpenBSD.
Fixes underflow reported in bz#3401.
2022-03-11 18:43:58 +11:00
Darren Tucker 5ae31a0fdd Provide killpg implementation.
Based on github PR#301 for Tandem NonStop.
2022-03-09 09:41:56 +11:00