Commit Graph

12659 Commits

Author SHA1 Message Date
Philip Hands
0efa0e1c41
put the -i before -[pP] (matching man pages)
The man pages (ssh, sftp & ssh-copy-id) all list -i before the port
setting, so make the output match that order, which also seems more
natural with the port being next to the server.

SSH-Copy-ID-Upstream: 34d5d614172c78f9a42249466c4b81975b8883a1
2024-08-17 11:19:27 +10:00
Shreyas Mahangade
87831345e9
Minor space issue fixed
SSH-Copy-ID-Upstream: 335e44d7be78b03962a54c3a5c99a2ff45294a54
2024-08-17 11:19:26 +10:00
Shreyas Mahangade
2f3010f473
Show identity file in 'ssh' command
- Previously no identity file is shown in "ssh" command output on the line "Now try logging into the..."
- This commit makes sure whenever "ssh-copy-id" with "-i" is invoked, it also reflects in "ssh" command

SSH-Copy-ID-Upstream: 58e022ec26cb2315eb3be581d01e0ba787082428
2024-08-17 11:19:24 +10:00
Damien Miller
a13856374b
more OPENSSL_HAS_ECC 2024-08-16 08:30:20 +10:00
Damien Miller
4da2a1a7f6
fix merge botch that broke !OPENSSL_HAS_ECC 2024-08-15 23:35:54 +10:00
Damien Miller
2c53d2f32b
missed OPENSSL_HAS_ECC case 2024-08-15 15:09:45 +10:00
Damien Miller
342dd7a219
retire testing aginst older LibreSSL versions
libressl prior to 3.4.x lack support for the EVP_DigestSign and
EVP_DigestVerify APIs that we need now that sshkey is converted
to EVP_PKEY.

If someone makes a good case for why we should support these versions
then we could bring back support with wrappers.
2024-08-15 15:06:55 +10:00
Damien Miller
a7c6ea8eeb
sync TEST_MALLOC_OPTIONS for OpenBSD 2024-08-15 12:44:17 +10:00
Damien Miller
60c2cf22e8
remove gratuitious difference from OpenBSD 2024-08-15 12:43:47 +10:00
djm@openbsd.org
339c4fc60a
upstream: adapt to EVP_PKEY conversion
OpenBSD-Regress-ID: 0e2d4efb0ed0e392e23cd8fda183fe56531ac446
2024-08-15 12:11:26 +10:00
djm@openbsd.org
63a94f99b9
upstream: test transfers in mux proxy mode too
OpenBSD-Regress-ID: 2edfc980628cfef3550649cab8d69fa23b5cd6c4
2024-08-15 12:08:34 +10:00
djm@openbsd.org
7bdfc20516
upstream: Convert RSA and ECDSA key to the libcrypto EVP_PKEY API.
DSA remains unconverted as it will be removed within six months.

Based on patches originally from Dmitry Belyavskiy, but significantly
reworked based on feedback from Bob Beck, Joel Sing and especially
Theo Buehler (apologies to anyone I've missed).

ok tb@

OpenBSD-Commit-ID: d098744e89f1dc7e5952a6817bef234eced648b5
2024-08-15 12:07:59 +10:00
tobias@openbsd.org
0af06e2c5b
upstream: Reorder calloc arguments
The first argument should be the amount, the second argument should be the
element size. Fixing this also silences some gcc compiler warnings for
portable.

Spotted with Benny Baumann (BenBE at geshi dot org).

ok djm@

OpenBSD-Commit-ID: 711ad6f7bd7fb48bf52208f2cf9f108cddb6d41a
2024-08-15 11:01:50 +10:00
tobias@openbsd.org
56ce0aa3c6
upstream: Extend sshbuf validation
Multiple sshbuf structs can be linked through a parent/child relationship.
Make sure that a single sshbuf cannot be its own parent. If this would ever
happen, it would result in reference counting issues.

This is a cheap way of testing this with very little overhead. It does not
detect A->B->A linkages though for performance reason and the fact that it
takes a programming error for this to occur anyway.

Authored with Benny Baumann (BenBE at geshi dot org).

ok djm@

OpenBSD-Commit-ID: fb3fa9ee2cad3c7e842ebadfd7f5db220c4aaf16
2024-08-15 11:01:49 +10:00
tobias@openbsd.org
fc48ddf699
upstream: Use freezero for better readability
It has the same meaning as the current pair of calling explicit_bzero
and free. Spotted with Benny Baumann (BenBE at geshi dot org).

ok djm@

OpenBSD-Commit-ID: 939fbe9ccf52d0d48c5fa53694d6f3bb9927970c
2024-08-15 11:01:49 +10:00
tobias@openbsd.org
1ff6907ec2
upstream: Fix typo in comment
Spotted with Benny Baumann (BenBE at geshi dot org).

ok djm@

OpenBSD-Commit-ID: 829160ac8ef3ad3409695ce3a3ade835061cae57
2024-08-15 11:01:48 +10:00
dlg@openbsd.org
487faaed8f
upstream: add a random amount of time (up to 4 seconds) to the
grace login time.

ok deraadt@ djm@

OpenBSD-Commit-ID: abd3c57aaa5861517529b322df79b6be35ee67f4
2024-08-15 11:01:48 +10:00
naddy@openbsd.org
2865f5b752
upstream: document the reduced logingrace penalty
OpenBSD-Commit-ID: 9b63e0e3599d524ddc10edc4f978081382c3548b
2024-08-15 11:01:32 +10:00
Darren Tucker
1ec0a64c5d
Explicitly install libssl-devel cygwin.
Should fix CI tests for cygwin default config.
2024-07-28 21:49:56 +10:00
djm@openbsd.org
0bf6e5bb75
upstream: reduce logingrace penalty.
A single forgotton login that times out should be below the penalty
threshold.

ok deraadt/claudio

OpenBSD-Commit-ID: cee1f7d17597c97bff8e5092af5d136fdb08f81d
2024-07-26 09:49:08 +10:00
djm@openbsd.org
29fb6f6d46
upstream: Fix proxy multiplexing (-O proxy) bug
If a mux started with ControlPersist then later has a forwarding added using
mux proxy connection and the forwarding was used, then when the mux proxy
session terminates, the mux master process will send a channel close to the
server with a bad channel ID and crash the connection.

This was caused by my stupidly reusing c->remote_id for mux channel
associations when I should have just added another member to struct channel.

ok markus@

OpenBSD-Commit-ID: c9f474e0124e3fe456c5e43749b97d75e65b82b2
2024-07-26 08:51:40 +10:00
djm@openbsd.org
53d1d30743
upstream: mention mux proxy mode
OpenBSD-Commit-ID: fd77a77779f06d316a314e4540dc57c93fc3369a
2024-07-26 08:51:19 +10:00
jsg@openbsd.org
a9b90859d2
upstream: fix double word; ok dtucker@
OpenBSD-Commit-ID: e6aff005914fa350b896d2be030be3d3b56ec0e8
2024-07-26 08:51:18 +10:00
Darren Tucker
b05fda224b
Check for SA_RESTART before using it.
ok djm@
2024-07-25 17:59:35 +10:00
Yuichiro Naito
c276672fc0
Class-imposed login restrictions
If the following functions are available,
add an additional check if users are allowed to login imposed by login class.

* auth_hostok(3)
* auth_timeok(3)

These functions are implemented on FreeBSD.
2024-07-20 11:08:18 +10:00
djm@openbsd.org
7717b9e915
upstream: correct keyword; from Yatao Su via GHPR509
OpenBSD-Commit-ID: 81c778c76dea7ef407603caa157eb0c381c52ad2
2024-07-11 07:59:06 +10:00
djm@openbsd.org
f2b78bb8f1
upstream: don't need return at end of void function
OpenBSD-Commit-ID: 42d322d37f13aa075ae7b1ad9eef591e20b89717
2024-07-08 13:05:41 +10:00
djm@openbsd.org
a395d37a81
upstream: fix grammar: "a pattern lists" -> "one or more pattern
lists"

OpenBSD-Commit-ID: f3c844763398faa9800687e8ff6621225498202a
2024-07-08 13:05:25 +10:00
Darren Tucker
8b664df759
Cast to sockaddr * in systemd interface.
Fixes build with musl libx.  bz#3707.
2024-07-07 18:46:19 +10:00
Darren Tucker
30c8c81da2
Add 9.8 branch to ci-status page. 2024-07-04 20:14:21 +10:00
Samuel Thibault
ee6b9e6616
Fix detection of setres*id on GNU/Hurd
Like Linux, proper _SOURCE macros need to be set to get declarations of
various standard functions, notably setres*id. Now that Debian is using
-Werror=implicit-function-declaration this is really required. While at
it, define other _SOURCE macros like on GNU/Linux, since GNU/Hurd uses
the same glibc.
2024-07-03 19:22:50 +10:00
Damien Miller
fa41f6592f
version numbers 2024-07-01 14:33:26 +10:00
djm@openbsd.org
bfebb8a513
upstream: openssh-9.8
OpenBSD-Commit-ID: 5f8b89e38a4c5f7c6d52ffa19f796d49f36fab19
2024-07-01 14:32:51 +10:00
djm@openbsd.org
146c420d29
upstream: when sending ObscureKeystrokeTiming chaff packets, we
can't rely on channel_did_enqueue to tell that there is data to send. This
flag indicates that the channels code enqueued a packet on _this_ ppoll()
iteration, not that data was enqueued in _any_ ppoll() iteration in the
timeslice. ok markus@

OpenBSD-Commit-ID: 009b74fd2769b36b5284a0188ade182f00564136
2024-07-01 14:32:45 +10:00
djm@openbsd.org
637e4dfea4
upstream: use "lcd" to change directory before "lls" rather then "cd",
since the directory we're trying to list is local. Spotted by Corinna
Vinschen

OpenBSD-Regress-ID: 821feca4a4bebe491944e624c8f7f2990b891415
2024-07-01 14:32:39 +10:00
djm@openbsd.org
c8cfe258ce
upstream: delete obsolete comment
OpenBSD-Commit-ID: 5fb04f298ed155053f3fbfdf0c6fe7cdf84bbfa2
2024-06-28 09:07:27 +10:00
djm@openbsd.org
94b9d37100
upstream: retire unused API
OpenBSD-Commit-ID: 3e30d7b0615e2707f6bbe70f61b1c2f72f78161b
2024-06-28 08:37:11 +10:00
jmc@openbsd.org
268c3a7f57
upstream: ssl(8) no longer contains a HISTORY section;
OpenBSD-Commit-ID: 83b7ff34433d79595e9c2a5d2a561a6660251245
2024-06-28 08:36:16 +10:00
djm@openbsd.org
12b6cc09ce
upstream: move child process waitpid() loop out of SIGCHLD handler;
ok deraadt

OpenBSD-Commit-ID: 65815a39564e431414aed7c5ace8076f4e9ca741
2024-06-28 08:36:15 +10:00
deraadt@openbsd.org
d6bcd13297
upstream: Instead of using possibly complex ssh_signal(), write all
the parts of the grace_alarm_handler() using the exact things allowed by the
signal-safe rules.  This is a good rule of thumb: Handlers should be written
to either set a global volatile sig_atomic_t inspected from outside, and/or
directly perform only safe operations listed in our sigaction(2) manual page.
ok djm markus

OpenBSD-Commit-ID: 14168ae8368aab76e4ed79e17a667cb46f404ecd
2024-06-28 08:34:49 +10:00
deraadt@openbsd.org
b8793e2b08
upstream: save_errno wrappers inside two small signal handlers that
perform system calls, for systems with libc that do perform libc sigtramps.
ok djm markus

OpenBSD-Commit-ID: 7749b56419a7c9dcfe4c6c04811e429813346c62
2024-06-28 08:34:49 +10:00
jmc@openbsd.org
f23e9332c4
upstream: - uppercase start of sentence - correct sentence grammar
ok djm

OpenBSD-Commit-ID: 1ec4b0fdb633a43667f2c8fff1d600bd647dde25
2024-06-28 08:34:48 +10:00
djm@openbsd.org
1839e3eb71
upstream: mention SshdSessionPath option
OpenBSD-Commit-ID: c29734d36c21003973b15c1c9965c35f36cef30c
2024-06-28 08:34:48 +10:00
Darren Tucker
603193e32a
Rerun upstream tests on .sh file changes too. 2024-06-20 18:45:14 +10:00
dtucker@openbsd.org
dbbf9337c1
upstream: Work around dbclient cipher/mac query bug.
Unlike earlier versions, recent Dropbear (at least v2024.85) requires
a host arg when querying supported ciphers and macs via "-c/-m
help".  Earlier versions accept but do not require it, so always
provide it.  If these queries fail, skip the test with a warning.

OpenBSD-Regress-ID: 98eb863a3f0363416922efb273885e6b3c7f68d4
2024-06-20 18:34:50 +10:00
dtucker@openbsd.org
8de2c8cebc
upstream: Remove dropbear key types not supported
by current OpenSSH. Allows subsequent test runs to work if OpenSSH is
rebuilt w/out OpenSSL.

OpenBSD-Regress-ID: e0129eb2b1d31771105903a8055216fbba20a770
2024-06-20 18:34:35 +10:00
djm@openbsd.org
e9b6471c59
upstream: stricter check for overfull tables in penalty record path
OpenBSD-Commit-ID: 7df01e648a0723418c554e64a9f2b6d38db060a6
2024-06-20 10:19:10 +10:00
djm@openbsd.org
d9336d344e
upstream: put back reaping of preauth child process when writes
from the monitor fail. Not sure how this got lost in the avalanche of
patches.

OpenBSD-Commit-ID: eb7eb36371e1ac01050b32b70fb2b3e5d98e72f5
2024-06-20 10:19:10 +10:00
naddy@openbsd.org
579d9adb70
upstream: remove one more mention of DSA
OpenBSD-Commit-ID: 8515f55a15f02836ba657df341415f63c60526ca
2024-06-20 10:19:09 +10:00
Darren Tucker
7089b5f843
Move -f to the place needed to restart sshd. 2024-06-19 23:09:05 +10:00