Edit: /usr/share/doc/openssh/ChangeLog (289319B)
commit 46d1fb16b20e971b9ac15e86a3d3e350b49c9ad6
Author: Damien Miller
Date: Fri Sep 20 08:20:13 2024 +1000
update version numbers
commit 0bdca1f218971b38728a0a129f482476baff0968
Author: djm@openbsd.org
Date: Thu Sep 19 22:17:44 2024 +0000
upstream: openssh-9.9
OpenBSD-Commit-ID: 303417285f1a73b9cb7a2ae78d3f493bbbe31f98
commit ef2d7f2d3e1b4c9ae71bacf963e76a92ab8be543
Author: Damien Miller
Date: Wed Sep 18 16:03:23 2024 +1000
include openbsd-compat/base64.c license in LICENSE
commit 7ef362b989c8d1f7596f557f22e5924b9c08f0ea
Author: Damien Miller
Date: Wed Sep 18 09:01:23 2024 +1000
conditionally include mman.h in arc4random code
commit 5fb2b5ad0e748732a27fd8cc16a7ca3c21770806
Author: Damien Miller
Date: Tue Sep 17 11:53:24 2024 +1000
fix bug in recently-added sntrup761 fuzzer
key values need to be static to persist across invocations;
spotted by the Qualys Security Advisory team.
commit 0ca128c9ee894f1b0067abd473bfb33171df67f8
Author: djm@openbsd.org
Date: Mon Sep 16 05:37:05 2024 +0000
upstream: use 64 bit math to avoid signed underflow. upstream code
relies on using -fwrapv to provide defined over/underflow behaviour, but we
use -ftrapv to catch integer errors and abort the program. ok dtucker@
OpenBSD-Commit-ID: 8933369b33c17b5f02479503d0a92d87bc3a574b
commit f82e5e22cad88c81d8a117de74241328c7b101c3
Author: jmc@openbsd.org
Date: Sun Sep 15 08:27:38 2024 +0000
upstream: minor grammar/sort fixes for refuseconnection; ok djm
OpenBSD-Commit-ID: 1c81f37b138b8b66abba811fec836388a0f3e6da
commit 0c1165fc78e8fe69b5df71f81a8f944554a68b53
Author: Damien Miller
Date: Sun Sep 15 13:30:13 2024 +1000
avoid gcc warning in fuzz test
commit ce171d0718104b643854b53443ff72f7283d33f2
Author: djm@openbsd.org
Date: Sun Sep 15 03:09:44 2024 +0000
upstream: bad whitespace in config dump output
OpenBSD-Commit-ID: d899c13b0e8061d209298eaf58fe53e3643e967c
commit 671c440786a5a66216922f15d0007b60f1e6733f
Author: Damien Miller
Date: Sun Sep 15 12:53:59 2024 +1000
use construct_utmp to construct btmp records
Simpler and removes some code with the old-style BSD license.
commit 930cb02b6113df72fbc732b9feb8e4f490952a81
Author: djm@openbsd.org
Date: Sun Sep 15 02:20:51 2024 +0000
upstream: update the Streamlined NTRU Prime code from the "ref"
implementation in SUPERCOP 20201130 to the "compact" implementation in
SUPERCOP 20240808. The new version is substantially faster. Thanks to Daniel
J Bernstein for pointing out the new implementation (and of course for
writing it).
tested in snaps/ok deraadt@
OpenBSD-Commit-ID: bf1a77924c125ecdbf03e2f3df8ad13bd3dafdcb
commit 9306d6017e0ce5dea6824c29ca5ba5673c2923ad
Author: djm@openbsd.org
Date: Sun Sep 15 01:19:56 2024 +0000
upstream: document Match invalid-user
OpenBSD-Commit-ID: 2c84a9b517283e9711e2812c1f268081dcb02081
commit 0118a4da21147a88a56dc8b90bbc2849fefd5c1e
Author: djm@openbsd.org
Date: Sun Sep 15 01:18:26 2024 +0000
upstream: add a "Match invalid-user" predicate to sshd_config Match
options.
This allows writing Match conditions that trigger for invalid username.
E.g.
PerSourcePenalties refuseconnection:90s
Match invalid-user
RefuseConnection yes
Will effectively penalise bots try to guess passwords for bogus accounts,
at the cost of implicitly revealing which accounts are invalid.
feedback markus@
OpenBSD-Commit-ID: 93d3a46ca04bbd9d84a94d1e1d9d3a21073fbb07
commit 7875975136f275619427604900cb0ffd7020e845
Author: djm@openbsd.org
Date: Sun Sep 15 01:11:26 2024 +0000
upstream: Add a "refuseconnection" penalty class to sshd_config
PerSourcePenalties
This allows penalising connection sources that have had connections
dropped by the RefuseConnection option. ok markus@
OpenBSD-Commit-ID: 3c8443c427470bb3eac1880aa075cb4864463cb6
commit 8d21713b669b8516ca6d43424a356fccc37212bb
Author: djm@openbsd.org
Date: Sun Sep 15 01:09:40 2024 +0000
upstream: Add a sshd_config "RefuseConnection" option
If set, this will terminate the connection at the first authentication
request (this is the earliest we can evaluate sshd_config Match blocks)
ok markus@
OpenBSD-Commit-ID: 43cc2533984074c44d0d2f92eb93f661e7a0b09c
commit acad117e66018fe1fa5caf41b36e6dfbd61f76a1
Author: djm@openbsd.org
Date: Sun Sep 15 00:58:01 2024 +0000
upstream: switch sshd_config Match processing to the argv tokeniser
too; ok markus@
OpenBSD-Commit-ID: b74b5b0385f2e0379670e2b869318a65b0bc3923
commit baec3f7f4c60cd5aa1bb9adbeb6dfa4a172502a8
Author: djm@openbsd.org
Date: Sun Sep 15 00:57:36 2024 +0000
upstream: switch "Match" directive processing over to the argv
string tokeniser, making it possible to use shell-like quoting in Match
directives, particularly "Match exec". ok markus@
OpenBSD-Commit-ID: 0877309650b76f624b2194c35dbacaf065e769a5
commit dd424d7c382c2074ab70f1b8ad4f169a10f60ee7
Author: djm@openbsd.org
Date: Sun Sep 15 00:47:01 2024 +0000
upstream: include pathname in some of the ssh-keygen passphrase
prompts. Helps the user know what's going on when ssh-keygen is invoked via
other tools. Requested in GHPR503
OpenBSD-Commit-ID: 613b0bb6cf845b7e787d69a5b314057ceda6a8b6
commit 62bbf8f825cc390ecb0523752ddac1435006f206
Author: djm@openbsd.org
Date: Sun Sep 15 00:41:18 2024 +0000
upstream: Do not apply authorized_keys options when signature
verification fails. Prevents restrictive key options being incorrectly
applied to subsequent keys in authorized_keys. bz3733, ok markus@
OpenBSD-Commit-ID: ba3776d9da4642443c19dbc015a1333622eb5a4e
commit 49f325fd47af4e53fcd7aafdbcc280e53f5aa5ce
Author: Wu Weixin
Date: Fri Aug 2 22:16:40 2024 +0800
Fix without_openssl always being set to 1
In Fedora systems, %{?rhel} is empty. In RHEL systems, %{?fedora} is
empty. Therefore, the original code always sets without_openssl to 1.
commit c21c3a2419bbc1c59cb1a16ea356e703e99a90d9
Author: djm@openbsd.org
Date: Thu Sep 12 00:36:27 2024 +0000
upstream: Relax absolute path requirement back to what it was prior to
OpenSSH 9.8, which incorrectly required that sshd was started with an
absolute path in inetd mode. bz3717, patch from Colin Wilson
OpenBSD-Commit-ID: 25c57f22764897242d942853f8cccc5e991ea058
commit 1bc426f51b0a5cfdcfbd205218f0b6839ffe91e9
Author: naddy@openbsd.org
Date: Mon Sep 9 14:41:21 2024 +0000
upstream: document the mlkem768x25519-sha256 key exchange algorithm
OpenBSD-Commit-ID: fa18dccdd9753dd287e62ecab189b3de45672521
commit 0a2db61a5ffc64d2e2961c52964f933879952fc7
Author: Darren Tucker
Date: Tue Sep 10 21:11:14 2024 +1000
Spell omnios test host correctly.
commit 059ed698a47c9af541a49cf754fd09f984ac5a21
Author: Darren Tucker
Date: Tue Sep 10 18:52:02 2024 +1000
Add omnios test target.
commit f4ff91575a448b19176ceaa8fd6843a25f39d572
Author: Darren Tucker
Date: Tue Sep 10 18:45:55 2024 +1000
Wrap stdint.h in ifdef.
commit ff714f001d20a9c843ee1fd9d92a16d40567d264
Author: Darren Tucker
Date: Mon Sep 9 19:31:54 2024 +1000
Also test PAM on dfly64.
commit 509b757c052ea969b3a41fc36818b44801caf1cf
Author: Damien Miller
Date: Mon Sep 9 21:50:14 2024 +1000
stubs for ML-KEM KEX functions
used for C89 compilers
commit 273581210c99ce7275b8efdefbb9f89e1c22e341
Author: Damien Miller
Date: Mon Sep 9 17:30:38 2024 +1000
declare defeat trying to detect C89 compilers
I can't find a reliable way to detect the features the ML-KEM code
requires in configure. Give up for now and use VLA support (that we
can detect) as a proxy for "old compiler" and turn off ML-KEM if
it isn't supported.
commit e8a0f19b56dfa20f98ea9876d7171ec315fb338a
Author: Damien Miller
Date: Mon Sep 9 16:46:40 2024 +1000
fix previous; check for C99 compound literals
The previous commit was incorrect (or at least insufficient), the
ML-KEM code is actually using compound literals, so test for them.
commit 7c07bec1446978bebe0780ed822c8fedfb377ae8
Author: Damien Miller
Date: Mon Sep 9 16:06:21 2024 +1000
test for compiler feature needed for ML-KEM
The ML-KEM implementation we uses need the compiler to support
C99-style named struct initialisers (e.g foo = {.bar = 1}). We
still support (barely) building OpenSSH with older compilers, so
add a configure test for this.
commit d469d5f348772058789d35332d1ccb0b109c28ef
Author: djm@openbsd.org
Date: Mon Sep 9 03:13:39 2024 +0000
upstream: test mlkem768x25519-sha256
OpenBSD-Regress-ID: 7baf6bc39ae55648db1a2bfdc55a624954847611
commit 62fb2b51bb7f6863c3ab697f397b2068da1c993f
Author: djm@openbsd.org
Date: Mon Sep 9 02:39:57 2024 +0000
upstream: pull post-quantum ML-KEM/x25519 key exchange out from
compile-time flag now than an IANA codepoint has been assigned for the
algorithm.
Add mlkem768x25519-sha256 in 2nd KexAlgorithms preference slot.
ok markus@
OpenBSD-Commit-ID: 9f50a0fae7d7ae8b27fcca11f8dc6f979207451a
commit a8ad7a2952111c6ce32949a775df94286550af6b
Author: djm@openbsd.org
Date: Fri Sep 6 02:30:44 2024 +0000
upstream: make parsing user@host consistently look for the last '@' in
the string rather than the first. This makes it possible to use usernames
that contain '@' characters.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Prompted by Max Zettlmeißl; feedback/ok millert@
OpenBSD-Commit-ID: 0b16eec246cda15469ebdcf3b1e2479810e394c5
commit 13cc78d016b67a74a67f1c97c7c348084cd9212c
Author: djm@openbsd.org
Date: Wed Sep 4 05:33:34 2024 +0000
upstream: be more strict in parsing key type names. Only allow
shortnames (e.g "rsa") in user-interface code and require full SSH protocol
names (e.g. "ssh-rsa") everywhere else.
Prompted by bz3725; ok markus@
OpenBSD-Commit-ID: b3d8de9dac37992eab78adbf84fab2fe0d84b187
commit ef8472309a68e319018def6f8ea47aeb40d806f5
Author: djm@openbsd.org
Date: Wed Sep 4 05:11:33 2024 +0000
upstream: fix RCSID in output
OpenBSD-Commit-ID: 889ae07f2d2193ddc4351711919134664951dd76
commit ba2ef20c75c5268d4d1257adfc2ac11c930d31e1
Author: jmc@openbsd.org
Date: Tue Sep 3 06:17:48 2024 +0000
upstream: envrionment -> environment;
OpenBSD-Commit-ID: b719f39c20e8c671ec6135c832d6cc67a595af9c
commit e66c0c5673a4304a3a9fbf8305c6a19f8653740f
Author: Damien Miller
Date: Wed Sep 4 15:35:29 2024 +1000
add basic fuzzers for our import of sntrup761
commit d19dea6330ecd4eb403fef2423bd7e127f4c9828
Author: djm@openbsd.org
Date: Tue Sep 3 05:58:56 2024 +0000
upstream: regression test for Include variable expansion
OpenBSD-Regress-ID: 35477da3ba1abd9ca64bc49080c50a9c1350c6ca
commit 8c4d6a628051e318bae2f283e8dc38b896400862
Author: djm@openbsd.org
Date: Tue Sep 3 05:29:55 2024 +0000
upstream: allow the "Include" directive to expand the same set of
%-tokens that "Match Exec" and environment variables.
ok dtucker@
OpenBSD-Commit-ID: 12ef521eaa966a9241e684258564f52f1f3c5d37
commit 51b82648b6827675fc0cde21175fd1ed8e89aab2
Author: djm@openbsd.org
Date: Mon Sep 2 12:18:35 2024 +0000
upstream: missing ifdef
OpenBSD-Commit-ID: 85f09da957dd39fd0abe08fe5ee19393f25c2021
commit f68312eb593943127b39ba79a4d7fa438c34c153
Author: djm@openbsd.org
Date: Mon Sep 2 12:13:56 2024 +0000
upstream: Add experimental support for hybrid post-quantum key exchange
ML-KEM768 with ECDH/X25519 from the Internet-draft:
https://datatracker.ietf.org/doc/html/draft-kampanakis-curdle-ssh-pq-ke-03
This is based on previous patches from markus@ but adapted to use the
final FIPS203 standard ML-KEM using a formally-verified implementation
from libcrux.
Note this key exchange method is still a draft and thus subject to
change. It is therefore disabled by default; set MLKEM=yes to build it.
We're making it available now to make it easy for other SSH
implementations to test against it.
ok markus@ deraadt@
OpenBSD-Commit-ID: 02a8730a570b63fa8acd9913ec66353735dea42c
commit 05f2b141cfcc60c7cdedf9450d2b9d390c19eaad
Author: Antonio Larrosa
Date: Fri Aug 23 12:21:06 2024 +0200
Don't skip audit before exitting cleanup_exit
This fixes an issue where the SSH_CONNECTION_ABANDON event is not
audited because cleanup_exit overrides the regular _exit too soon and
as a result, failed auth attempts are not logged correctly.
The problem was introduced in 81c1099d22b81ebfd20a334ce986c4f753b0db29
where the code from upstream was merged before the audit_event call when
it should have been merged right before the _exit call in order to honor
the comment that just mentions an override of the exit value.
commit 16eaf9d401e70996f89f3f417738a8db421aa959
Author: djm@openbsd.org
Date: Wed Aug 28 12:08:26 2024 +0000
upstream: fix test: -F is the argument to specify a non-default
ssh_config, not -f (this is sadly not a new bug)
OpenBSD-Regress-ID: 45a7bda4cf33f2cea218507d8b6a55cddbcfb322
commit 10ccf611ab8ecba9ce6b0548c5ccd8c1220baf92
Author: deraadt@openbsd.org
Date: Fri Aug 23 04:51:00 2024 +0000
upstream: As defined in the RFC, the SSH protocol has negotiable
compression support (which is requested as the name "zlib"). Compression
starts very early in the session. Relative early in OpenSSH lifetime, privsep
was added to sshd, and this required a shared-memory hack so the two
processes could see what was going on in the dataflow. This shared-memory
hack was soon recognized as a tremendous complexity risk, because it put libz
(which very much trusts it's memory) in a dangerous place, and a new option
("zlib@openssh.com") was added begins compression after authentication (aka
delayed-compression). That change also permitted removal of the
shared-memory hack. Despite removal from the server, the old "zlib" support
remained in the client, to allow negotiation with non-OpenSSH daemons which
lack the delayed-compression option. This commit deletes support for the
older "zlib" option in the client. It reduces our featureset in a small way,
and encourages other servers to move to a better design. The SSH protocol is
different enough that compressed-key-material attacks like BEAST are
unlikely, but who wants to take the chance? We encourage other ssh servers
who care about optional compression support to add delayed-zlib support.
(Some already do "zlib@openssh.com") ok djm markus
OpenBSD-Commit-ID: 6df986f38e4ab389f795a6e39e7c6857a763ba72
commit aee54878255d71bf93aa6e91bbd4eb1825c0d1b9
Author: djm@openbsd.org
Date: Thu Aug 22 23:11:30 2024 +0000
upstream: sntrup761x25519-sha512 now has an IANA codepoint assigned, so
we can make the algorithm available without the @openssh.com suffix too. ok
markus@ deraadt@
OpenBSD-Commit-ID: eeed8fcde688143a737729d3d56d20ab4353770f
commit a76a6b85108e3032c8175611ecc5746e7131f876
Author: Darren Tucker
Date: Thu Aug 22 20:36:12 2024 +1000
Move rekey test into valgrind-2.
Now that the rekey test has been optimized it's fast enough to not be in
its own valgrind test, so move it into valgrind-2, which is currently
the quickest of the others, bringing all of them to roughly the same
runtime of ~1.1 hours.
commit 7e75e3f57c41b9a6e6401e7674d7c2ff5c33975b
Author: dtucker@openbsd.org
Date: Thu Aug 22 10:21:02 2024 +0000
upstream: Use aes128-ctr for MAC tests since default has implicit MAC.
Also verify that the Cipher or MAC we intended to use is actually the one
selected during the test.
OpenBSD-Regress-ID: ff43fed30552afe23d1364526fe8cf88cbfafe1d
commit ebc890b8b4ba08c84cd1066b7b94b2b11f6c4cb4
Author: Damien Miller
Date: Thu Aug 22 09:45:49 2024 +1000
fix incorrect default for PasswordAuthentication
merge botch spotted by gsgleason
commit 15ace435ea1c2fab2a1cc7d9c3157fe20c776b80
Author: dtucker@openbsd.org
Date: Wed Aug 21 10:33:27 2024 +0000
upstream: Some awks won't match on the \r so delete it instead. Fixes
regress in portable on, eg Solaris.
OpenBSD-Regress-ID: 44a96d6d2f8341d89b7d5fff777502b92ac9e9ba
commit 51c96b6ed627779a04493a8fe25747996a37f3c2
Author: dtucker@openbsd.org
Date: Wed Aug 21 07:06:27 2024 +0000
upstream: Import regenerated moduli.
OpenBSD-Commit-ID: 5db7049ad5558dee5b2079d3422e8ddab187c1cc
commit 25c52f37a82c4da48ec537de37d7c168982b8d6d
Author: dtucker@openbsd.org
Date: Wed Aug 21 06:59:08 2024 +0000
upstream: Use curve25519-sha256 kex where possible.
Except where we're explicitly testing a different kex, use
curve25519-sha256 since it's faster than the default and supported even
when configured without OpenSSL. Add a check to ensure that the kex we
intended to test is the one we actually tested. Speeds test up by ~5%.
OpenBSD-Regress-ID: 3b27fcc2ae953cb08fd82a0d3155c498b226d6e0
commit 3eb62b7ba49483c309b483eb9002a679014f3887
Author: dtucker@openbsd.org
Date: Tue Aug 20 12:36:59 2024 +0000
upstream: Send only as much data as needed to trigger rekeying. Speeds
up tests by about 10% in the common case, hopefully more when instrumented
with something like valgrind.
OpenBSD-Regress-ID: 7bf9292b4803357efcf0baf7cfbdc8521f212da1
commit cbd3f034bbf7853618fac99d7d868a2250154ea7
Author: Damien Miller
Date: Wed Aug 21 09:18:29 2024 +1000
simplify sshkey_prekey_alloc(); always use mmap
commit 4442bbc2fc661277a6dabfedb756a7e15ee8b8b8
Author: dtucker@openbsd.org
Date: Tue Aug 20 09:15:49 2024 +0000
upstream: Merge AEAD test into main test loop.
Removes 3 duplicate tests and speeds overall test up by about 1%.
OpenBSD-Regress-ID: 5e5c9ff3f7588091ed369e34ac28520490ad2619
commit 829976a63fd1efae3a4c3e7c16fded59d92edb67
Author: dtucker@openbsd.org
Date: Tue Aug 20 09:02:45 2024 +0000
upstream: Set a default RekeyLimit of 256k.
Used unless overridden by a command-line flag, which simplifies some of
the ssh command lines.
OpenBSD-Regress-ID: e7cffa57027088e10336e412b34113969f88cb87
commit 57d02c9ea36aebad4e7146d46e041b6b2e582f7f
Author: dtucker@openbsd.org
Date: Tue Aug 20 07:52:43 2024 +0000
upstream: Add Compression=no to default ssh_config.
All of the rekey tests use it (otherwise the encrypted byte counts would
not match) so this lets us simplify the command lines.
OpenBSD-Regress-ID: dab7ce10f4cf6c68827eb8658141272aab3ea262
commit 7254eb26f7c0772c4b47c3b32f6d1b15855cdd8c
Author: dtucker@openbsd.org
Date: Tue Aug 20 07:41:35 2024 +0000
upstream: Remove duplicate curve25519-sha256 kex.
curve25519-sha256@libssh.org is the pre-standardization name for the same
thing, so remove it as a duplicate. Speeds up test by a tiny amount.
OpenBSD-Regress-ID: 5a5ee5fa1595a6e140b1cc16040bedf5996a5715
commit 749896b874928c2785256cae4d75161dc3bfcc7d
Author: dtucker@openbsd.org
Date: Tue Aug 20 07:27:25 2024 +0000
upstream: Unnest rekey param parsing test and use ssh not sshd.
ssh uses the same parsing code, now has "-G" to dump its config and is
slightly faster to start up. This speeds up the test slightly (~5%) in the
common case but should help more during instrumented tests, eg under
valgrind, where startup costs are magnified.
OpenBSD-Regress-ID: 07c3acaf4c728e641033071f4441afc88141b0d0
commit 2b1762115481ff2b7a60fd4db2ae69b725437462
Author: djm@openbsd.org
Date: Tue Aug 20 11:10:04 2024 +0000
upstream: actually use the length parameter that was passed in rather
than a constant (this makes no difference in practice because the length is
always the same); reported by martin AT nmkd.net
OpenBSD-Commit-ID: 4aecce232c2fe9b16e9217ff6bcb3c848d853e7e
commit d922762ca16a7381131b242f49d7376c41fabcb5
Author: Damien Miller
Date: Tue Aug 20 13:55:30 2024 +1000
private key coredump protection for Linux/FreeBSD
platforms not supporting coredump exclusion using mmap/madvise flags
fall back to plain old malloc(3).
commit cc048ca536d6bed6f2285b07040b0d57cd559ba5
Author: djm@openbsd.org
Date: Tue Aug 20 03:48:30 2024 +0000
upstream: place shielded keys (i.e. keys at rest in RAM) into memory
allocated using mmap(3) with MAP_CONCEAL set. This prevents exposure of the
key material in coredumps, etc (this is in addition to other measures we take
in this area).
ok deraadt@
OpenBSD-Commit-ID: cbbae59f337a00c9858d6358bc65f74e62261369
commit a0b35c791cad1f85481b23ba46373060292e1c80
Author: djm@openbsd.org
Date: Sat Aug 17 08:35:04 2024 +0000
upstream: mention that ed25519 is the default key type generated and
clarify that rsa-sha2-512 is the default signature scheme when RSA is in use.
Based on GHPR505 from SebastianRzk
OpenBSD-Commit-ID: 1d90df71636a04601685d2a10a8233bcc8d4f4c5
commit 127a50f2c80572ed1a021feb11ecf941e92cbbef
Author: djm@openbsd.org
Date: Sat Aug 17 08:23:04 2024 +0000
upstream: fix minor memory leak in Subsystem option parsing; from
Antonio Larrosa via GHPR515
OpenBSD-Commit-ID: fff3bbefd1b2c45c98cbe45c6b857b15d8a2d364
commit 171427261d2079941eb1041079dbae875da37cbc
Author: djm@openbsd.org
Date: Sat Aug 17 08:09:50 2024 +0000
upstream: fix swapping of source and destination addresses in some sshd
log messages
OpenBSD-Commit-ID: 24d4cbb86325275df1f037545aa3b91456e52d25
commit 2a50a8f1fa57857a5e124a2280bcf61cc63c77f7
Author: Darren Tucker
Date: Sat Aug 17 11:10:19 2024 +1000
Add compat functions for EVP_Digest{Sign,Verify}.
This should make LibreSSL 3.1.x through 3.3.x work again. Code from
tb@, ok djm@. Restore the test configs covering those.
commit 1c3a7145260e03037cc18715b883880836fd122d
Author: Philip Hands
Date: Thu Aug 8 13:03:51 2024 +0200
make sure that usage & man page match
SSH-Copy-ID-Upstream: da5b1abe55b72a16e0430e7598e1573da01779c0
commit cd0d681645b9adcf2467e7838bfd9d5142de4c4e
Author: Philip Hands
Date: Thu Aug 8 13:01:47 2024 +0200
update copyright notices
Bump the year to 2024, but also reflect the fact that hands.com Ltd. has
been wound up in the UK, and its assets (including this copyright) have
now reverted to its owner, Philip Hands.
SSH-Copy-ID-Upstream: 0e4c4d072747a6568b11a790c29dd1b4ce663d7f
commit 7fc9ccdce18841ebd0a97e31e43258512ab32a32
Author: Philip Hands
Date: Sun Aug 4 20:45:00 2024 +0200
restore optionality of -i's argument
SSH-Copy-ID-Upstream: f70e3abb510e4eeb040b47894e41828246c1b720
commit c37aa7012b1a3c2c322fd19e71310aadc90fc674
Author: Philip Hands
Date: Fri Aug 2 15:52:07 2024 +0200
avoid exploring .ssh/id*.pub subdirectories
SSH-Copy-ID-Upstream: 0b9e08b7707ad16de3c8e6a0410d9f42fbd56997
commit 777dce9e2e0d12f7e81e162f77749f30899869fe
Author: Philip Hands
Date: Fri Aug 2 10:07:11 2024 +0200
ensure that we're always told the source of keys
SSH-Copy-ID-Upstream: 1bee96f4793e8ec3fab9f9361204ae58f5cc7cae
commit fb94fd2339848e40cad6c9bb42b822244cc1a7bc
Author: Philip Hands
Date: Wed Jul 31 23:19:51 2024 +0200
add $HOME to ERROR if one cannot write to ~/.ssh
SSH-Copy-ID-Upstream: ebef3e9c06e0447bff06e9d84b33023cf592e0ba
commit eb5aafa1ffaeee75799141ec5ded406a65ec7d18
Author: Philip Hands
Date: Wed Jul 31 23:19:03 2024 +0200
assert that SCRATCH_DIR is a writable directory
SSH-Copy-ID-Upstream: ecb2b9d10883b9a16df56c83896c9bb47a80cde2
commit abcc460a2af46f0d812f8433d97a8eae1d80724c
Author: Philip Hands
Date: Wed Jul 31 23:17:54 2024 +0200
quote to avoid potential for word splitting
SSH-Copy-ID-Upstream: f379adbe06ac2ef1daf0f130752234c7f8b97e3c
commit b3f91411fd1473605f74c40c1a91a024c7171e27
Author: Philip Hands
Date: Wed Jul 31 23:15:11 2024 +0200
ensure ERROR output goes to STDERR
SSH-Copy-ID-Upstream: ac394b05eead3b91feb7c2ae4129a3e9b892f1e2
commit 674b8f30f0dbacd787eb1e4e7e1ece34b5543d8f
Author: Philip Hands
Date: Thu Aug 1 14:03:06 2024 +0200
avoid extra space when no arg given to -i option
SSH-Copy-ID-Upstream: feca9e67e6e37c5653445d1c733569d7abb1770e
commit 0efa0e1c41427c0c6ba839a18c72c1afcd7b7cc0
Author: Philip Hands
Date: Wed Jul 31 23:28:36 2024 +0200
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
commit 87831345e9745f2d13bd7a4a7972809f6788f331
Author: Shreyas Mahangade
Date: Mon Jul 29 15:26:05 2024 +0000
Minor space issue fixed
SSH-Copy-ID-Upstream: 335e44d7be78b03962a54c3a5c99a2ff45294a54
commit 2f3010f4736b4b3f5c10a4be97a24e90ff04c5e7
Author: Shreyas Mahangade
Date: Mon Jul 29 16:55:28 2024 +0530
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
commit a13856374b894397a7682b32257ed0bf67cfede9
Author: Damien Miller
Date: Fri Aug 16 08:30:20 2024 +1000
more OPENSSL_HAS_ECC
commit 4da2a1a7f648979bea6eaf3b17f5f250faed4afc
Author: Damien Miller
Date: Thu Aug 15 23:35:54 2024 +1000
fix merge botch that broke !OPENSSL_HAS_ECC
commit 2c53d2f32b8e3992b61682c909ae5bc5122b6e5d
Author: Damien Miller
Date: Thu Aug 15 15:09:45 2024 +1000
missed OPENSSL_HAS_ECC case
commit 342dd7a219f39119b8b686b5aaa99c8e15ede368
Author: Damien Miller
Date: Thu Aug 15 15:06:55 2024 +1000
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.
commit a7c6ea8eebe0f179141ec5dbf0c9e5354417930f
Author: Damien Miller
Date: Thu Aug 15 12:44:17 2024 +1000
sync TEST_MALLOC_OPTIONS for OpenBSD
commit 60c2cf22e8f64f35d8b1175e4671257313f2e4d3
Author: Damien Miller
Date: Thu Aug 15 12:43:47 2024 +1000
remove gratuitious difference from OpenBSD
commit 339c4fc60a6250429d41fa8713f783d82aad4551
Author: djm@openbsd.org
Date: Thu Aug 15 00:52:23 2024 +0000
upstream: adapt to EVP_PKEY conversion
OpenBSD-Regress-ID: 0e2d4efb0ed0e392e23cd8fda183fe56531ac446
commit 63a94f99b9d7c8a48182a40192e45879d1ba8791
Author: djm@openbsd.org
Date: Fri Jul 19 04:33:36 2024 +0000
upstream: test transfers in mux proxy mode too
OpenBSD-Regress-ID: 2edfc980628cfef3550649cab8d69fa23b5cd6c4
commit 7bdfc20516e288b58c8c847958059c7b141eeff9
Author: djm@openbsd.org
Date: Thu Aug 15 00:51:51 2024 +0000
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
commit 0af06e2c5b898992a18c74333e75a0136506acc6
Author: tobias@openbsd.org
Date: Wed Aug 14 15:42:18 2024 +0000
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
commit 56ce0aa3c6cf28d9fcbce3207457abeac91b5050
Author: tobias@openbsd.org
Date: Wed Aug 14 15:40:30 2024 +0000
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
commit fc48ddf6998188517af42dce807e2088b6a0c0be
Author: tobias@openbsd.org
Date: Wed Aug 14 15:37:11 2024 +0000
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
commit 1ff6907ec26dac6ac59fe9fe232899a63b4c14d8
Author: tobias@openbsd.org
Date: Wed Aug 14 15:35:23 2024 +0000
upstream: Fix typo in comment
Spotted with Benny Baumann (BenBE at geshi dot org).
ok djm@
OpenBSD-Commit-ID: 829160ac8ef3ad3409695ce3a3ade835061cae57
commit 487faaed8f3bb9ffb19e8f807a3da72895b16421
Author: dlg@openbsd.org
Date: Wed Jul 31 12:00:18 2024 +0000
upstream: add a random amount of time (up to 4 seconds) to the
grace login time.
ok deraadt@ djm@
OpenBSD-Commit-ID: abd3c57aaa5861517529b322df79b6be35ee67f4
commit 2865f5b7520bed3e74fbbb5f8d7a44193d7a4314
Author: naddy@openbsd.org
Date: Fri Jul 26 15:24:49 2024 +0000
upstream: document the reduced logingrace penalty
OpenBSD-Commit-ID: 9b63e0e3599d524ddc10edc4f978081382c3548b
commit 1ec0a64c5dc57b8a2053a93b5ef0d02ff8598e5c
Author: Darren Tucker
Date: Sun Jul 28 21:26:51 2024 +1000
Explicitly install libssl-devel cygwin.
Should fix CI tests for cygwin default config.
commit 0bf6e5bb750b66b25c20a1c5a471f91850de3748
Author: djm@openbsd.org
Date: Thu Jul 25 23:44:01 2024 +0000
upstream: reduce logingrace penalty.
A single forgotton login that times out should be below the penalty
threshold.
ok deraadt/claudio
OpenBSD-Commit-ID: cee1f7d17597c97bff8e5092af5d136fdb08f81d
commit 29fb6f6d46b67770084b4f12bcf8a01bd535041b
Author: djm@openbsd.org
Date: Thu Jul 25 22:40:08 2024 +0000
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
commit 53d1d307438517805989c7d5616d752739a97e03
Author: djm@openbsd.org
Date: Thu Jul 18 01:47:27 2024 +0000
upstream: mention mux proxy mode
OpenBSD-Commit-ID: fd77a77779f06d316a314e4540dc57c93fc3369a
commit a9b90859d252c2f5a24142f985d38610ac74685f
Author: jsg@openbsd.org
Date: Sun Jul 14 10:19:23 2024 +0000
upstream: fix double word; ok dtucker@
OpenBSD-Commit-ID: e6aff005914fa350b896d2be030be3d3b56ec0e8
commit b05fda224bbcd2f641254534ed2175c42487f3c8
Author: Darren Tucker
Date: Thu Jul 25 17:59:35 2024 +1000
Check for SA_RESTART before using it.
ok djm@
commit c276672fc0e99f0c4389988d54a84c203ce325b6
Author: Yuichiro Naito
Date: Wed Sep 1 10:19:32 2021 +0900
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.
commit 7717b9e9155209916cc6b4b4b54f4e8fa578e889
Author: djm@openbsd.org
Date: Wed Jul 10 21:58:34 2024 +0000
upstream: correct keyword; from Yatao Su via GHPR509
OpenBSD-Commit-ID: 81c778c76dea7ef407603caa157eb0c381c52ad2
commit f2b78bb8f149d6b4d1f62c21aa1f06995dccf4ce
Author: djm@openbsd.org
Date: Mon Jul 8 03:04:34 2024 +0000
upstream: don't need return at end of void function
OpenBSD-Commit-ID: 42d322d37f13aa075ae7b1ad9eef591e20b89717
commit a395d37a813c0177cb5bfc4bebf5a52badb73cf0
Author: djm@openbsd.org
Date: Thu Jul 4 22:53:59 2024 +0000
upstream: fix grammar: "a pattern lists" -> "one or more pattern
lists"
OpenBSD-Commit-ID: f3c844763398faa9800687e8ff6621225498202a
commit 8b664df75966e5aed8dabea00b8838303d3488b8
Author: Darren Tucker
Date: Sun Jul 7 18:46:19 2024 +1000
Cast to sockaddr * in systemd interface.
Fixes build with musl libx. bz#3707.
commit 30c8c81da2169e78357d08dbb0ddd823b60e93bc
Author: Darren Tucker
Date: Thu Jul 4 20:12:26 2024 +1000
Add 9.8 branch to ci-status page.
commit ee6b9e661633fcefd29dba0c811cecbc4d027f6f
Author: Samuel Thibault
Date: Tue Mar 26 22:15:08 2024 +0100
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.
commit fa41f6592ff1b6ead4a652ac75af31eabb05b912
Author: Damien Miller
Date: Mon Jul 1 14:33:26 2024 +1000
version numbers
commit bfebb8a5130a792c5356bd06e1ddef72a0a0449f
Author: djm@openbsd.org
Date: Mon Jul 1 04:31:59 2024 +0000
upstream: openssh-9.8
OpenBSD-Commit-ID: 5f8b89e38a4c5f7c6d52ffa19f796d49f36fab19
commit 146c420d29d055cc75c8606327a1cf8439fe3a08
Author: djm@openbsd.org
Date: Mon Jul 1 04:31:17 2024 +0000
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
commit 637e4dfea4ed81264e264b6200172ce319c64ead
Author: djm@openbsd.org
Date: Mon Jul 1 03:10:19 2024 +0000
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
commit c8cfe258cee0b8466ea84597bf15e1fcff3bc328
Author: djm@openbsd.org
Date: Thu Jun 27 23:01:15 2024 +0000
upstream: delete obsolete comment
OpenBSD-Commit-ID: 5fb04f298ed155053f3fbfdf0c6fe7cdf84bbfa2
commit 94b9d37100f6fa536aaa1d1a0e4926fe44fbf04d
Author: djm@openbsd.org
Date: Thu Jun 27 22:36:44 2024 +0000
upstream: retire unused API
OpenBSD-Commit-ID: 3e30d7b0615e2707f6bbe70f61b1c2f72f78161b
commit 268c3a7f5783e731ed60f4e28da66ee3743581d3
Author: jmc@openbsd.org
Date: Thu Jun 27 21:02:16 2024 +0000
upstream: ssl(8) no longer contains a HISTORY section;
OpenBSD-Commit-ID: 83b7ff34433d79595e9c2a5d2a561a6660251245
commit 12b6cc09ce6c430681f03af2a8069e37a664690b
Author: djm@openbsd.org
Date: Wed Jun 26 23:47:46 2024 +0000
upstream: move child process waitpid() loop out of SIGCHLD handler;
ok deraadt
OpenBSD-Commit-ID: 65815a39564e431414aed7c5ace8076f4e9ca741
commit d6bcd13297c2ab8b528df5a6898f994734849031
Author: deraadt@openbsd.org
Date: Wed Jun 26 23:16:52 2024 +0000
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
commit b8793e2b0851f7d71b97554fa5260b23796d6277
Author: deraadt@openbsd.org
Date: Wed Jun 26 23:14:14 2024 +0000
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
commit f23e9332c4c8df37465c4a4f38275ea98980ed7e
Author: jmc@openbsd.org
Date: Mon Jun 24 06:59:39 2024 +0000
upstream: - uppercase start of sentence - correct sentence grammar
ok djm
OpenBSD-Commit-ID: 1ec4b0fdb633a43667f2c8fff1d600bd647dde25
commit 1839e3eb71a759aa795602c1e4196300f4ac2615
Author: djm@openbsd.org
Date: Mon Jun 24 04:05:11 2024 +0000
upstream: mention SshdSessionPath option
OpenBSD-Commit-ID: c29734d36c21003973b15c1c9965c35f36cef30c
commit 603193e32aef5db7d60c58066d5de89806e79312
Author: Darren Tucker
Date: Thu Jun 20 18:45:14 2024 +1000
Rerun upstream tests on .sh file changes too.
commit dbbf9337c19381786a8e5a8a49152fe6b80c780d
Author: dtucker@openbsd.org
Date: Thu Jun 20 08:23:18 2024 +0000
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
commit 8de2c8cebc46bbdb94b7a2c120fcadfb66a3cccc
Author: dtucker@openbsd.org
Date: Thu Jun 20 08:18:34 2024 +0000
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
commit e9b6471c59b21e5d9ef1b3832d4bf727338add85
Author: djm@openbsd.org
Date: Thu Jun 20 00:18:05 2024 +0000
upstream: stricter check for overfull tables in penalty record path
OpenBSD-Commit-ID: 7df01e648a0723418c554e64a9f2b6d38db060a6
commit d9336d344eb2a1e898c5e66147b3f108c7214694
Author: djm@openbsd.org
Date: Wed Jun 19 23:24:47 2024 +0000
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
commit 579d9adb70ec0206a788eb5c63804c31a67e9310
Author: naddy@openbsd.org
Date: Mon Jun 17 13:50:18 2024 +0000
upstream: remove one more mention of DSA
OpenBSD-Commit-ID: 8515f55a15f02836ba657df341415f63c60526ca
commit 7089b5f8436ef0b8d3d3ad9ce01045fb9e7aab15
Author: Darren Tucker
Date: Wed Jun 19 23:09:05 2024 +1000
Move -f to the place needed to restart sshd.
commit d5f83cfd852b14a25f347f082ab539a9454702ad
Author: Darren Tucker
Date: Wed Jun 19 21:04:01 2024 +1000
Need to supply "-f" to restart sshd.
commit fad34b4ca25c0ef31e5aa841d461b6f21da5b8c1
Author: dtucker@openbsd.org
Date: Wed Jun 19 10:15:51 2024 +0000
upstream: Provide defaults for ciphers and macs
if querying for them fails since on some versions of Dropbear (at least
v2024.85) "-m help" doesn't seem to work. Enable all supported pubkey
algorithms in the server.
OpenBSD-Regress-ID: 4f95556a49ee9f621789f25217c367a33d2745ca
commit 5521060e35ada9f957cecdddc06d0524e75409ef
Author: dtucker@openbsd.org
Date: Wed Jun 19 10:10:46 2024 +0000
upstream: Use ed25519 keys for kex tests
since that's supported by OpenSSH even when built without OpenSSL.
Only test diffie-hellman kex if OpenSSH is compiled with support for it.
OpenBSD-Regress-ID: a5d09ef9bbd171f9e4ec73ed0d9eeb49a8878e97
commit dbd3b833f6e3815e58f2dc6e14f61a51bcd4d6bd
Author: dtucker@openbsd.org
Date: Wed Jun 19 10:08:34 2024 +0000
upstream: Rework dropbear key setup
to always generate ed25519 keys, other types only if OpenSSH has support
for the corresponding key type.
OpenBSD-Regress-ID: 8f91f12604cddb9f8d93aa34f3f93a3f6074395d
commit d6218504e11ae9148adf410fc69b0710a052be36
Author: Darren Tucker
Date: Wed Jun 19 20:20:24 2024 +1000
Restart sshd after installing it for testing.
When installing an sshd built without OpenSSL the mismatch between
the running sshd and newly installed sshd-session will cause the
remainder of the test to fail.
commit 786a4465b6bb702daf4fb17b7c3bcb42b52f0b46
Author: Darren Tucker
Date: Tue Jun 18 19:59:59 2024 +1000
Remove macos-11 runner.
Github is retiring them soon.
commit df1c72a55edbebac14363b57de66ac6a147ecc67
Author: Damien Miller
Date: Wed Jun 19 09:34:34 2024 +1000
PAMServiceName may appear in a Match block
commit de1c2e70e5a5dc3c8d2fe04b24cc93d8ef6930e7
Author: dtucker@openbsd.org
Date: Tue Jun 18 08:11:48 2024 +0000
upstream: Re-enable ssh-dss tests
... if ssh is compiled with DSA support
OpenBSD-Regress-ID: bbfaf8c17f2b50a2d46ac35cb97af99b990c990d
commit dabc2c7cf3c141e8e5d5a1a60d6c1d2d2422cf43
Author: anton@openbsd.org
Date: Tue Jun 18 06:14:27 2024 +0000
upstream: Stop using DSA in dropbear interop tests.
OpenBSD-Regress-ID: abfd4457d99d8cc1417fd22ca2c570270f74c1cf
commit 761438012710169445acc179e3870c53c862bda0
Author: Damien Miller
Date: Tue Jun 18 12:29:45 2024 +1000
missed a bit of DSA in the fuzzer
commit 3f9cc47da588e8de520720e59f98438043fdaf93
Author: Damien Miller
Date: Tue Jun 18 09:35:53 2024 +1000
DSA support is disabled, so remove from fuzzers
commit 00eb95957dea5484b2c7c043f7d2bbc87301bef2
Author: djm@openbsd.org
Date: Mon Jun 17 08:30:29 2024 +0000
upstream: disable the DSA signature algorithm by default; ok
markus@
(yes, I know this expands to "the Digitial Signature Algorithm
signature algorithm)
OpenBSD-Commit-ID: 961ef594e46dd2dcade8dd5721fa565cee79ffed
commit 5603befe11c9464ea26fe77cbacc95a7cc0b1ea7
Author: djm@openbsd.org
Date: Mon Jun 17 08:28:31 2024 +0000
upstream: promote connection-closed messages from verbose to info
log level; they could be the only record of the connection terminating if the
client doesn't send a SSH2_MSG_DISCONNECT message. ok dtucker@
OpenBSD-Commit-ID: 0c8bfaf5e9fdff945cee09ac21e641f6c5d65d3c
commit b00331402fe5c60d577f3ffcc35e49286cdc6b47
Author: Damien Miller
Date: Mon Jun 17 17:02:18 2024 +1000
propagate PAM crashes to PerSourcePenalties
If the PAM subprocess crashes, exit with a crash status that will be
picked up by the sshd(8) listener process where it can be used by
PerSourcePenalties to block the client. This is similar handling to
the privsep preauth process.
commit 1c207f456ace38987deda047758d13fbf857f948
Author: Damien Miller
Date: Mon Jun 17 15:06:01 2024 +1000
minix doesn't have loopback, so skip penalty tests
pointed out by dtucker@
commit 48443d202eaec52d4d39defdd709a4499a7140c6
Author: djm@openbsd.org
Date: Sun Jun 16 11:54:49 2024 +0000
upstream: same treatment for this test
OpenBSD-Regress-ID: d0cc9efca7833e673ea7b0cb3a679a3acee8d4c7
commit 45562a95ea11d328c22d97bf39401cd29684fb1f
Author: djm@openbsd.org
Date: Sun Jun 16 08:18:06 2024 +0000
upstream: penalty test is still a bit racy
OpenBSD-Regress-ID: 90c9ac224db454637baf1ebee5857e007321e824
commit 8d0f7eb147ef72d18acb16c0b18672d44941a8ca
Author: djm@openbsd.org
Date: Sat Jun 15 03:59:10 2024 +0000
upstream: crank up penalty timeouts so this should work on even the
slowest of test builders
OpenBSD-Regress-ID: 70bda39c83e3fc9d0f3c1fad4542ed33e173d468
commit 93c75471a1202ab3e29db6938648d4e2602c0475
Author: jmc@openbsd.org
Date: Fri Jun 14 05:20:34 2024 +0000
upstream: sort -q in the options list;
OpenBSD-Commit-ID: 6839b38378f38f754de638a5e988c13b4164cc7c
commit dd7807bbe80a93ffb4616f2bd5cf83ad5a5595fb
Author: djm@openbsd.org
Date: Fri Jun 14 05:01:22 2024 +0000
upstream: clarify KEXAlgorithms supported vs available. Inspired by
bz3701 from Colin Watson.
OpenBSD-Commit-ID: e698e69bea19bd52971d253f2b1094490c4701f7
commit d172ad56df85b68316dbadbedad16761a1265874
Author: djm@openbsd.org
Date: Fri Jun 14 05:00:42 2024 +0000
upstream: ssh-keyscan -q man bits
OpenBSD-Commit-ID: ba28d0e1ac609a4c99c453e57e86560c79079db1
commit 092e4ff9ccaacbe035f286feb1b56ed499604743
Author: Damien Miller
Date: Fri Jun 14 14:46:35 2024 +1000
skip penalty-expire test in valgrind test env
commit 2866ad08a9c50d7b67ce9424ca990532b806a21a
Author: djm@openbsd.org
Date: Fri Jun 14 04:43:11 2024 +0000
upstream: split the PerSourcePenalties test in two: one tests penalty
enforcement but not penalty expiry, the other tests penalty expiry.
This lets us disable the expiry testing in certain CI test environments.
OpenBSD-Regress-ID: f56811064f3e3cb52ee73a206b8c2a06af1c8791
commit b2c64bc170d75823622a37cab3ca1804ca87ad16
Author: Damien Miller
Date: Fri Jun 14 14:19:23 2024 +1000
add a sshd_config PamServiceName option
Allows selecting which PAM service name to use when UsePAM is
enabled. Defaults to "sshd" unless overridden at compile time
by defining SSHD_PAM_SERVICE.
bz2102, ok dtucker@
commit 9f032a4dd17bf0ae6066223d82aa5e784285d987
Author: djm@openbsd.org
Date: Fri Jun 14 00:26:12 2024 +0000
upstream: don't redirect stderr for ssh-keyscan we expect to succeed
OpenBSD-Regress-ID: 8878b8eb4e070ed2e343166d3eb86db4a08a216c
commit 1e84d0cf40e94ae3a77d6a7ca8c036d8e3d55a40
Author: djm@openbsd.org
Date: Fri Jun 14 00:25:25 2024 +0000
upstream: make host/banner comments go to stderr instead of stdout,
so they are useful as comments without extra shell redirection and so they
don't clutter actual errors on stderr.
Add a -q flag to shut them up.
ok dtucker@
OpenBSD-Commit-ID: bec813de56a71adb5c1a76adcf49621130d24264
commit 3e806d011855d6bd648ec95b9df630ebbd11c3bf
Author: naddy@openbsd.org
Date: Thu Jun 13 15:06:33 2024 +0000
upstream: separate keywords with comma
OpenBSD-Commit-ID: d65a99666202a8188c4991c18d14374a229f7be5
commit abfd1f7a3cbd0a92581a0febba254b2f6649c0d9
Author: djm@openbsd.org
Date: Fri Jun 14 00:23:55 2024 +0000
upstream: specify an algorithm for ssh-keyscan, otherwise it will make
multiple attempts simultaneously and confuse the test
OpenBSD-Regress-ID: 6e910f3315c4345053db1bf5cbf61826b194d0b9
commit a8fbe2f7d0d96d299ee8e69769e3b51067978748
Author: Damien Miller
Date: Thu Jun 13 16:41:29 2024 +1000
sshd: don't use argv[0] as PAM service name
sshd would implicitly use argv[0] as the PAM service name to
allow people to select different PAM service names by making
differently-named copies/links to the sshd binary.
Splitting sshd into sshd/sshd-session broke this, as the process
that starts PAM is always sshd-session and the user has no control
over this.
Hardcode "sshd" as the default PAM service name unless/until we
figure out a better way. Should unbreak OSX integration tests.
commit bf204bd05c3ae650f87e2b96527688579f59774c
Author: Damien Miller
Date: Thu Jun 13 15:00:28 2024 +1000
prepare for checking in autogenerated files
We plan to check in automatically generated files (config.h.in, etc) on
release branches. These files are normally ignored by .gitignore, but
this shuffles the contents of this file to make it easy to un-ignore
them.
commit 425f79a837489904c343b349ef00e09aeaa4e752
Author: Damien Miller
Date: Thu Jun 13 14:41:33 2024 +1000
typo in comment
commit afe10313c1fa8d478af399ee7d54c8f85503013b
Author: Damien Miller
Date: Thu Jun 13 14:35:25 2024 +1000
fix PTY allocation on Cygwin, broken by sshd split
Cygwin doesn't support FD passing and so used to disable post-auth
privilege separation entirely because privsep requires PTY allocation
to happen in the privileged monitor process with the PTY file
descriptors being passed back to the unprivileged process.
This brings back a minimal version of the previous special treatment
for Cygwin (and any other platform that sets DISABLE_FD_PASSING):
privilege separation remains enabled, but PTY allocation happens in
the post-auth user process rather than the monitor.
This either requires PTY allocation to not need privilege to begin
with (this appears to be the case on Cygwin), or the post-auth
privsep process retain privilege (other platforms that set the
DISABLE_FD_PASSING option).
Keeping privileges here is bad, but the non-Cygwin systems that set
DISABLE_FD_PASSING are so deeply legacy that this is likely to be the
least of their problems.
commit f66d4df5749551380a8c4ae642347675a0b6a2e9
Author: Damien Miller
Date: Thu Jun 13 11:33:09 2024 +1000
delay lookup of privsep user until config loaded
sshd-session attempting to use options.kerberos_authentication to
decide whether it needed to lookup the privsep user before the
configuration was loaded. This caused it to get a placeholder value
that caused it always to try to lookup the privsep user, breaking at
least one test environment.
commit f1c42858b94f5d9b58867b34dce3afb39c6b56a8
Author: Damien Miller
Date: Thu Jun 13 11:16:57 2024 +1000
missing file for PerSourcePenalties regress test
commit 4de80ff4e6fab5a6bb0028e7d57c6c23d1485adb
Author: djm@openbsd.org
Date: Wed Jun 12 22:36:00 2024 +0000
upstream: split PerSourcePenalties address tracking. Previously it
used one shared table and overflow policy for IPv4 and IPv6 addresses, now it
will use separate tables and optionally different overflow policies.
This prevents misbehaviour from IPv6 addresses (which are vastly easier
to obtain many of) from affecting IPv4 connections and may allow for
stricter overflow policies.
ok deraadt@
OpenBSD-Commit-ID: 12637ed0aa4d5f1f3e702da42ea967cbd8bfdfd9
commit 06ab4c6931b0aaa4334db2faaa7e1069e76d0df6
Author: jmc@openbsd.org
Date: Tue Jun 11 05:24:39 2024 +0000
upstream: do not mark up "(default: 20ms)";
OpenBSD-Commit-ID: 54151ecdecfa1b67dcdda4fd24826ef6e2148ad4
commit cfe243cd9fde148ed060637876e27bb55ac78be9
Author: djm@openbsd.org
Date: Tue Jun 11 02:54:51 2024 +0000
upstream: reap preauth net child if it hangs up during privsep message
send, not just message receive
OpenBSD-Commit-ID: 02a093f4ab4f8f83f0cd1ea2bb35b9ca420448f0
commit b0a711c00b9c64afd1c9d6fb538275c6604a2676
Author: djm@openbsd.org
Date: Tue Jun 11 01:58:27 2024 +0000
upstream: fix PIDFILE handling, broken for SUDO=doas in last commit
here
OpenBSD-Regress-ID: 96fec579af228f87a036e94801eb294af9074625
commit 90fb801e2d9241be50a2a7ff79428386442a041f
Author: djm@openbsd.org
Date: Tue Jun 11 02:00:30 2024 +0000
upstream: reap the pre-auth [net] child if it hangs up during privsep
message sending, not just receiving
OpenBSD-Commit-ID: f7341605bf08c4c15830910446e6775323f2f8cb
commit ef878d58798f6688c7f4d4e417dc0c29023ea831
Author: djm@openbsd.org
Date: Tue Jun 11 01:23:25 2024 +0000
upstream: a little more RB_TREE paranoia
OpenBSD-Commit-ID: 8dc2fd21eebd8830c4a4d25461ac4fe228e11156
commit fc4e96b2174d6a894d2033421699d091679baced
Author: djm@openbsd.org
Date: Tue Jun 11 01:22:25 2024 +0000
upstream: fix off-by-one comparison for PerSourcePenalty
OpenBSD-Commit-ID: af4f5d01c41ef870b23e55655bfbf73474a6c02b
commit 82c836df4ff41145553cd7adb11c5b985aeaa06f
Author: djm@openbsd.org
Date: Tue Jun 11 01:21:41 2024 +0000
upstream: move tree init before possible early return
OpenBSD-Commit-ID: 72e2c5b69f151c08a7c5bf5ad929b97a92c273df
commit a2300f015cc4939c4d9c564b58b74e71202dc978
Author: djm@openbsd.org
Date: Tue Jun 11 01:07:35 2024 +0000
upstream: update to mention that PerSourcePenalties default to
being enabled and document the default values for each parameter.
OpenBSD-Commit-ID: b981288bddfb097aad269f62df4081c688ce0034
commit 41987efd356d3fc30139aeab4b09374acf8f91a0
Author: djm@openbsd.org
Date: Tue Jun 11 00:44:52 2024 +0000
upstream: reap the [net] child if it hangs up while writing privsep
message payloads, not just the message header
OpenBSD-Commit-ID: 24dbd400aa381ac96be7ed2dd49018487dfef6ce
commit 6211aa085fa91155a24922e5329576ac9a8f3175
Author: djm@openbsd.org
Date: Tue Jun 11 00:40:21 2024 +0000
upstream: log waitpid() status for abnormal exits
OpenBSD-Commit-ID: b317930e06b51819c1a2bc6a4359764fecfb1c2d
commit a59634c7adb9ae988748d99963dfafb3070d8d41
Author: djm@openbsd.org
Date: Tue Jun 11 00:36:20 2024 +0000
upstream: correct error message
OpenBSD-Commit-ID: 581f60f73099083392887206860229ab104620ed
commit fa7d7a667f2ee031e72873e36de2d2a36bca973b
Author: deraadt@openbsd.org
Date: Fri Jun 7 13:23:30 2024 +0000
upstream: avoid shadowing issues which some compilers won't accept
ok djm
OpenBSD-Commit-ID: 1e89572397dda83433d58c4fa6333a08f51170d4
commit 3ad4cd9eeca5c9bc6706db44b6de88e2e4513fd6
Author: jmc@openbsd.org
Date: Thu Jun 6 21:14:49 2024 +0000
upstream: escape the final dot at eol in "e.g." to avoid double
spacing;
OpenBSD-Commit-ID: 0a9fb10bc9f7d577afe2da3f498a08bc431115b9
commit 0e0c69761a4c33ccd4a256560f522784a753d1a8
Author: djm@openbsd.org
Date: Thu Jun 6 20:25:48 2024 +0000
upstream: enable PerSourcePenalties by default.
ok markus
NB. if you run a sshd that accepts connections from behind large NAT
blocks, proxies or anything else that aggregates many possible users
behind few IP addresses, then this change may cause legitimate traffic
to be denied.
Please read the PerSourcePenalties, PerSourcePenaltyExemptList and
PerSourceNetBlockSize options in sshd_config(5) for how to tune your
sshd(8) for your specific circumstances.
OpenBSD-Commit-ID: 24a0e5c23d37e5a63e16d2c6da3920a51078f6ce
commit bd1f74741daabeaf20939a85cd8cec08c76d0bec
Author: djm@openbsd.org
Date: Thu Jun 6 20:20:42 2024 +0000
upstream: mention that PerSourcePenalties don't affect concurrent
in-progress connections.
OpenBSD-Commit-ID: 20389da6264f2c97ac3463edfaa1182c212d420c
commit 9774b938578327d88a651f4c63c504809717590a
Author: djm@openbsd.org
Date: Thu Jun 6 19:49:25 2024 +0000
upstream: regress test for PerSourcePenalties
OpenBSD-Regress-ID: a1af13d411b25a727742644459d26480b9a1b0f1
commit b8ebd86cefe9812204a10c028dc90de29918667d
Author: djm@openbsd.org
Date: Thu Jun 6 19:48:40 2024 +0000
upstream: make sure logs are saved from sshd run via start_sshd
OpenBSD-Regress-ID: de4ef0e32e3ab85ff3a6c36eb08d1909c0dd1b4a
commit d7b2070bdaa4ebbfafb9975c1d5a62b73289d31f
Author: djm@openbsd.org
Date: Thu Jun 6 19:47:48 2024 +0000
upstream: simplify
OpenBSD-Regress-ID: 50316e0d1ae0c0a057a45af042253e54ce23d11c
commit e6ea3d224513b6bfb93818809d4c7397f5995ba2
Author: djm@openbsd.org
Date: Thu Jun 6 18:48:13 2024 +0000
upstream: prepare for PerSourcePenalties being enabled by default
in future
OpenBSD-Regress-ID: 5236c6d1c823997aac5a35e2915da30f1903bec7
commit c0cb3b8c837761816a60a3cdb54062668df09652
Author: djm@openbsd.org
Date: Thu Jun 6 19:50:01 2024 +0000
upstream: disable stderr redirection before closing fds
OpenBSD-Commit-ID: d42cb895ee4542098050367fc35321c9303f003a
commit 81c1099d22b81ebfd20a334ce986c4f753b0db29
Author: djm@openbsd.org
Date: Thu Jun 6 17:15:25 2024 +0000
upstream: Add a facility to sshd(8) to penalise particular
problematic client behaviours, controlled by two new sshd_config(5) options:
PerSourcePenalties and PerSourcePenaltyExemptList.
When PerSourcePenalties are enabled, sshd(8) will monitor the exit
status of its child pre-auth session processes. Through the exit
status, it can observe situations where the session did not
authenticate as expected. These conditions include when the client
repeatedly attempted authentication unsucessfully (possibly indicating
an attack against one or more accounts, e.g. password guessing), or
when client behaviour caused sshd to crash (possibly indicating
attempts to exploit sshd).
When such a condition is observed, sshd will record a penalty of some
duration (e.g. 30 seconds) against the client's address. If this time
is above a minimum threshold specified by the PerSourcePenalties, then
connections from the client address will be refused (along with any
others in the same PerSourceNetBlockSize CIDR range).
Repeated offenses by the same client address will accrue greater
penalties, up to a configurable maximum. A PerSourcePenaltyExemptList
option allows certain address ranges to be exempt from all penalties.
We hope these options will make it significantly more difficult for
attackers to find accounts with weak/guessable passwords or exploit
bugs in sshd(8) itself.
PerSourcePenalties is off by default, but we expect to enable it
automatically in the near future.
much feedback markus@ and others, ok markus@
OpenBSD-Commit-ID: 89ded70eccb2b4926ef0366a4d58a693de366cca
commit 916b0b6174e203cf2c5ec9bcf409472eb7ffbf43
Author: Damien Miller
Date: Fri Jun 7 03:31:02 2024 +1000
whitespace
commit 49b55e44182b8294419aa580cbf043d5b9e3d953
Author: deraadt@openbsd.org
Date: Tue Jun 4 15:14:45 2024 +0000
upstream: enable -fret-clean on amd64, for libc libcrypto ld.so
kernel, and all the ssh tools. The dynamic objects are entirely ret-clean,
static binaries will contain a blend of cleaning and non-cleaning callers.
OpenBSD-Commit-ID: 112aacedd3b61cc5c34b1fa6d9fb759214179172
commit cc80d51d034bcb24fd0f2564a4bdf1612000a2a2
Author: Damien Miller
Date: Wed Jun 5 02:21:30 2024 +1000
remove PRIVSEP macros for osx
commit 8785491123d4d722b310c20f383570be758f8263
Author: djm@openbsd.org
Date: Sat Jun 1 07:03:37 2024 +0000
upstream: be really strict with fds reserved for communication with the
separate sshd-session process - reserve them early and fatal if we can't
dup2(2) them later. The pre-split fallback to re-reading the configuration
files is not possible, so sshd-session absolutely requires the fd the
configuration is passed over to be in order.
ok deraadt@
OpenBSD-Commit-ID: 308a98ef3c8a6665ebf92c7c9a0fc9600ccd7065
commit f1c8918cb98459910fb159373baea053ba4108c0
Author: Damien Miller
Date: Fri May 31 19:12:26 2024 +1000
depend
commit 94b4866cb1f4b0ed29a9f367047b30f81002316f
Author: Damien Miller
Date: Fri May 31 19:11:14 2024 +1000
rename need_privsep to need_chroot
privsep is mandatory, chroot is optional (disabled when running
sshd as non-root)
commit e68a95142e5024b144f8eeccd5ffdee42c34f44c
Author: Damien Miller
Date: Fri May 31 19:05:34 2024 +1000
remove remaining use_privsep mention
commit b21d271f651d2536dca819cc6d74032fe98634db
Author: djm@openbsd.org
Date: Fri May 31 09:01:08 2024 +0000
upstream: warn when -r (deprecated option to disable re-exec) is
passed
OpenBSD-Commit-ID: 73145ef5150edbe3ce7889f0844ed8fa6155f551
commit a4b5bc246cbca476deeeb4462aa31746a56e3021
Author: djm@openbsd.org
Date: Fri May 31 08:49:35 2024 +0000
upstream: typos
OpenBSD-Commit-ID: edfa72eb06bfa65da30fabf7d2fe76d2d33f77bf
commit 8054b906983ceaed01fabd8188d3dac24c05ba39
Author: djm@openbsd.org
Date: Mon May 27 01:52:26 2024 +0000
upstream: don't need sys/queue.h here
OpenBSD-Commit-ID: dd137396828171eb19e4911581812ca58de6c578
commit 210d4239733da6180ce853538aeb9413d5c62ad5
Author: naddy@openbsd.org
Date: Sun May 26 20:35:12 2024 +0000
upstream: remove references to SSH1 and DSA server keys
OpenBSD-Commit-ID: 57cc1c98d4f998981473734f144b904af7d178a2
commit f0b9261d7fdd0ef86806b49fe76344bd16770cd0
Author: jsg@openbsd.org
Date: Thu May 23 23:47:16 2024 +0000
upstream: remove unused struct fwd_perm_list, no decl with complete
type ok djm@
OpenBSD-Commit-ID: 416fb3970b7e73c76d2963c4f00cf96f2b2ee2fb
commit 2477a98c3ef78e63b11a1393656e00288f52ae97
Author: naddy@openbsd.org
Date: Wed May 22 15:24:55 2024 +0000
upstream: Do not pass -Werror twice when building with clang.
OpenBSD-Commit-ID: 5f378c38ad8976d507786dc4db9283a879ec8cd0
commit 435844f5675245b4271f8581f15e6d1f34fde3bc
Author: miod@openbsd.org
Date: Wed May 22 11:49:36 2024 +0000
upstream: Do not pass -Werror if building with gcc 3, for asn1.h
and bio.h cause (admittedly bogus) warnings with gcc 3.
OpenBSD-Commit-ID: fb39324748824cb0387e9d67c41d1bef945c54ea
commit fc5dc092830de23767c6ef67baa18310a64ee533
Author: djm@openbsd.org
Date: Wed May 22 04:20:00 2024 +0000
upstream: this test has been broken since 2014, and has been
testing the same key exchange algorithm repeatedly instead of testing all of
them. Spotted by nreilly AT blackberry.com in bz3692
Who broke the test? me.
OpenBSD-Regress-ID: 48f4f5946276f975667141957d25441b3c9a50e2
commit fd4816791beaed2fdae7eea3e1494d1972b2a39d
Author: anton@openbsd.org
Date: Sun May 19 19:10:01 2024 +0000
upstream: Add missing kex-names.c source file required since the
ssh split.
OpenBSD-Regress-ID: ca666223f828fc4b069cb9016bff1eb50faf9fbb
commit beccb7319c5449f6454889013403c336446d622e
Author: naddy@openbsd.org
Date: Fri May 17 14:42:00 2024 +0000
upstream: remove duplicate copy of relink kit for sshd-session
OpenBSD-Commit-ID: 6d2ded4cd91d4d727c2b26e099b91ea935bed504
commit dcd79fa141311c287e0595ede684b7116122fae0
Author: jsg@openbsd.org
Date: Fri May 17 06:42:04 2024 +0000
upstream: remove prototypes with no matching function; ok djm@
OpenBSD-Commit-ID: 6d9065dadea5f14a01bece0dbfe2fba1be31c693
commit 6454a05e7c6574d70adf17efe505a8581a86ca4f
Author: jsg@openbsd.org
Date: Fri May 17 06:38:00 2024 +0000
upstream: remove externs for removed vars; ok djm@
OpenBSD-Commit-ID: f51ea791d45c15d4927eb4ae7d877ccc1e5a2aab
commit f3e4db4601ef7d2feb1d6f7447e432aaf353a616
Author: deraadt@openbsd.org
Date: Fri May 17 06:11:17 2024 +0000
upstream: -Werror was turned on (probably just for development),
and this is a simple way to satisfy older gcc.
OpenBSD-Commit-ID: 7f698df54384b437ce33ab7405f0b86c87019e86
commit 24a1f3e5ad6f4a49377d4c74c36637e9a239efd0
Author: Damien Miller
Date: Fri May 17 14:50:43 2024 +1000
attempt at updating RPM specs for sshd-session
commit 17b566eeb7a0c6acc9c48b35c08885901186f861
Author: djm@openbsd.org
Date: Fri May 17 04:42:13 2024 +0000
upstream: g/c unused variable
OpenBSD-Commit-ID: aa6ef0778a1f1bde0d73efba72a777c48d2bd010
commit 01fb82eb2aa0a4eaf5c394ea8bb37ea4c26f8a3f
Author: jsg@openbsd.org
Date: Fri May 17 02:39:11 2024 +0000
upstream: spelling; ok djm@
OpenBSD-Commit-ID: bdea29bb3ed2a5a7782999c4c663b219d2270483
commit b88b690e99145a021fc1a1a116a11e0bce0594e7
Author: djm@openbsd.org
Date: Fri May 17 01:45:22 2024 +0000
upstream: allow overriding the sshd-session binary path
OpenBSD-Regress-ID: 5058cd1c4b6ca1a15474e33546142931d9f964da
commit a68f80f2511f0e0c5cef737a8284cc2dfabad818
Author: anton@openbsd.org
Date: Wed Apr 3 06:01:11 2024 +0000
upstream: Since ssh-agent(1) is only readable by root by now, use
ssh(1) while generating data in tests.
OpenBSD-Regress-ID: 24eb40de2e6b0ace185caaba35e2d470331ffe68
commit 92e55890314ce2b0be21a43ebcbc043b4abc232f
Author: djm@openbsd.org
Date: Fri May 17 01:17:40 2024 +0000
upstream: fix incorrect debug option name introduce in previous
commit
OpenBSD-Commit-ID: 66d69e22b1c072c694a7267c847f212284614ed3
commit 4ad72878af7b6ec28da6e230e36a91650ebe84c1
Author: deraadt@openbsd.org
Date: Fri May 17 00:33:25 2024 +0000
upstream: construct and install a relink-kit for sshd-session ok
djm
OpenBSD-Commit-ID: 8b3820adb4da4e139c4b3cffbcc0bde9f08bf0c6
commit 02e679a2cb3f6df8e9dbb1519ed578226485157f
Author: Damien Miller
Date: Fri May 17 12:21:27 2024 +1000
Makefile support for sshd-session
commit c0416035c5eaf70a8450d11c8833c5f7068ee7ad
Author: djm@openbsd.org
Date: Fri May 17 00:32:32 2024 +0000
upstream: missing files from previous
OpenBSD-Commit-ID: 4b7be4434d8799f02365552b641a7a70a7ebeb2f
commit 03e3de416ed7c34faeb692967737be4a7bbe2eb5
Author: djm@openbsd.org
Date: Fri May 17 00:30:23 2024 +0000
upstream: Start the process of splitting sshd into separate
binaries. This step splits sshd into a listener and a session binary. More
splits are planned.
After this changes, the listener binary will validate the configuration,
load the hostkeys, listen on port 22 and manage MaxStartups only. All
session handling will be performed by a new sshd-session binary that the
listener fork+execs.
This reduces the listener process to the minimum necessary and sets us
up for future work on the sshd-session binary.
feedback/ok markus@ deraadt@
NB. if you're updating via source, please restart sshd after installing,
otherwise you run the risk of locking yourself out.
OpenBSD-Commit-ID: 43c04a1ab96cdbdeb53d2df0125a6d42c5f19934
commit 1c0d81357921f8d3bab06841df649edac515ae5b
Author: djm@openbsd.org
Date: Thu May 9 09:46:47 2024 +0000
upstream: simplify exit message handling, which was more complicated
than it needed to be because of unexpunged ssh1 remnants. ok markus@
OpenBSD-Commit-ID: 8b0cd2c0dee75fb053718f442aa89510b684610b
commit cbbbf76aa6cd54fce32eacce1300e7abcf9461d4
Author: tobias@openbsd.org
Date: Mon May 6 19:26:17 2024 +0000
upstream: remove SSH1 leftovers
Authored with Space Meyer
ok djm
OpenBSD-Commit-ID: 81db602e4cb407baae472689db1c222ed7b2afa3
commit bc5dcb8ab9a4e8af54a724883732af378f42ea78
Author: tobias@openbsd.org
Date: Tue Apr 30 15:40:43 2024 +0000
upstream: never close stdin
The sanitise_stdfd call makes sure that standard file descriptors are
open (if they were closed, they are connected with /dev/null).
Do not close stdin in any case to prevent error messages when stdin is
read multiple times and to prevent later usage of fd 0 for connections,
e.g.
echo localhost | ssh-keyscan -f - -f -
While at it, make stdin-related error messages nicer.
Authored with Max Kunzelmann
ok djm
OpenBSD-Commit-ID: 48e9b7938e2fa2f9bd47e6de6df66a31e0b375d3
commit 6a42b70e56bef1aacdcdf06352396e837883e84f
Author: Damien Miller
Date: Wed May 8 09:43:59 2024 +1000
sync getrrsetbyname.c with recent upstream changes
commit 385ecb31e147dfea59c1c488a1d2011d3867e60e
Author: djm@openbsd.org
Date: Tue Apr 30 06:23:51 2024 +0000
upstream: fix home-directory extension implementation, it always
returned the current user's home directory contrary to the spec.
Patch from Jakub Jelen via GHPR477
OpenBSD-Commit-ID: 5afd775eab7f9cbe222d7fbae4c793de6c3b3d28
commit 14e2b16bc67ffcc188906f65008667e22f73d103
Author: djm@openbsd.org
Date: Tue Apr 30 06:16:55 2024 +0000
upstream: flush stdout after writing "sftp>" prompt when not using
editline.
From Alpine Linux via GHPR480
OpenBSD-Commit-ID: 80bdc7ffe0358dc090eb9b93e6dedb2b087b24cd
commit 2e69a724051488e3fb3cd11531c4b5bc1764945b
Author: djm@openbsd.org
Date: Tue Apr 30 05:53:03 2024 +0000
upstream: stricter validation of messaging socket fd number; disallow
usage of stderr. Based on GHPR492 by RealHurrison
OpenBSD-Commit-ID: 73dbbe82ea16f73ce1d044d3232bc869ae2f2ce8
commit da757b022bf18c6f7d04e685a10cd96ed00f83da
Author: djm@openbsd.org
Date: Tue Apr 30 05:45:56 2024 +0000
upstream: add missing reserved fields to key constraint protocol
documentation.
from Wiktor Kwapisiewicz via GHPR487
OpenBSD-Commit-ID: 0dfb69998cfdb3fa00cbb0e7809e7d2f6126e3df
commit 16d0b82fa08038f35f1b3630c70116979f49784f
Author: Damien Miller
Date: Tue Apr 30 12:39:34 2024 +1000
depend
commit 66aaa678dbe59aa21d0d9d89a3596ecedde0254b
Author: djm@openbsd.org
Date: Tue Apr 30 02:14:10 2024 +0000
upstream: correctly restore sigprocmask around ppoll() reported
by Tõivo Leedjärv; ok deraadt@
OpenBSD-Commit-ID: c0c0f89de5294a166578f071eade2501929c4686
commit 80fb0eb21551aed3aebb009ab20aeffeb01e44e0
Author: djm@openbsd.org
Date: Tue Apr 30 02:10:49 2024 +0000
upstream: add explict check for server hostkey type against
HostkeyAlgorithms. Allows HostkeyAlgorithms to disable implicit fallback from
certificate keys to plain keys. ok markus@
OpenBSD-Commit-ID: 364087e4a395ff9b2f42bf3aefdb2090bb23643a
commit 5b28096d31ff7d80748fc845553a4aef5bb05d86
Author: jsg@openbsd.org
Date: Tue Apr 23 13:34:50 2024 +0000
upstream: correct indentation; no functional change ok tb@
OpenBSD-Commit-ID: dd9702fd43de546bc6a3f4f025c74d6f3692a0d4
commit fd3cb8a82784e05f621dea5b56ac6f89bc53c067
Author: semarie@openbsd.org
Date: Thu Apr 4 16:00:51 2024 +0000
upstream: set right mode on ssh-agent at boot-time
which sthen@
ok deraadt@
OpenBSD-Commit-ID: 662b5056a2c6171563e1626f9c69f27862b5e7af
commit 54343a260e3aa4bceca1852dde31cd08e2abd82b
Author: deraadt@openbsd.org
Date: Tue Apr 2 12:22:38 2024 +0000
upstream: Oops, incorrect hex conversion spotted by claudio.
While here try to improve how it reads a bit better. Surprising the
regression tests didn't spot this error, maybe it fails to roundtrip the
values.
OpenBSD-Commit-ID: 866cfcc1955aef8f3fc32da0b70c353a1b859f2e
commit ec78c31409590ad74efc194f886273ed080a545a
Author: deraadt@openbsd.org
Date: Tue Apr 2 10:02:08 2024 +0000
upstream: for parse_ipqos(), use strtonum() instead of mostly
idiomatic strtoul(), but wow it's so gross. ok djm
OpenBSD-Commit-ID: cec14a76af2eb7b225300c80fc0e21052be67b05
commit 8176e1a6c2e6da9361a7abb6fbf6c23c299f495b
Author: deraadt@openbsd.org
Date: Tue Apr 2 09:56:58 2024 +0000
upstream: can shortcut by returning strtonum() value directly; ok
djm
OpenBSD-Commit-ID: 7bb2dd3d6d1f288dac14247d1de446e3d7ba8b8e
commit 9f543d7022a781f80bb696f9d73f1d1c6f9e31d6
Author: deraadt@openbsd.org
Date: Tue Apr 2 09:52:14 2024 +0000
upstream: rewrite convtime() to use a isdigit-scanner and
strtonum() instead of strange strtoul can might be fooled by garage
characters. passes regress/usr.bin/ssh/unittests/misc ok djm
OpenBSD-Commit-ID: 4b1ef826bb16047aea3f3bdcb385b72ffd450abc
commit 8673137f780d8d9e4cda3c4605cb5d88d5cea271
Author: claudio@openbsd.org
Date: Tue Apr 2 09:48:24 2024 +0000
upstream: Remove unused ptr[3] char array in pkcs11_decode_hex.
OK deraadt@
OpenBSD-Commit-ID: 3d14433e39fd558f662d3b0431c4c555ef920481
commit c7fec708f331f108343d69e4d74c9a5d86d6cfe7
Author: deraadt@openbsd.org
Date: Tue Apr 2 09:32:28 2024 +0000
upstream: Replace non-idiomatic strtoul(, 16) to parse a region
of 2-character hex sequences with a low-level replacement designed just for
the task. ok djm
OpenBSD-Commit-ID: 67bab8b8a4329a19a0add5085eacd6f4cc215e85
commit 019a5f483b0f588da6270ec401d0b4bb35032f3f
Author: deraadt@openbsd.org
Date: Tue Apr 2 09:29:31 2024 +0000
upstream: Use strtonum() instead of severely non-idomatic
strtoul() In particular this will now reject trailing garbage, ie.
'12garbage'. ok djm
OpenBSD-Commit-ID: c82d95e3ccbfedfc91a8041c2f8bf0cf987d1501
commit 8231ca046fa39ea4eb99b79e0a6e09dec50ac952
Author: deraadt@openbsd.org
Date: Mon Apr 1 15:50:17 2024 +0000
upstream: also create a relink kit for ssh-agent, since it is a
long-running setgid program carrying keys with some (not very powerful)
communication channels. solution for testing the binary from dtucker.
agreement from djm. Will add it into /etc/rc in a few days.
OpenBSD-Commit-ID: 2fe8d707ae35ba23c7916adcb818bb5b66837ba0
commit bf7bf50bd6a14e49c9c243cb8f4de31e555a5a2e
Author: deraadt@openbsd.org
Date: Mon Apr 1 15:48:16 2024 +0000
upstream: new-style relink kit for sshd. The old scheme created
a Makefile by concatenating two Makefiles and was incredibly fragile. In the
new way a narrow-purposed install.sh script is created and shipped with the
objects. A recently commited /etc/rc script understands these files.
OpenBSD-Commit-ID: ef9341d5a50f0d33e3a6fbe995e92964bc7ef2d3
commit 00e63688920905e326d8667cb47f17a156b6dc8f
Author: renmingshuai
Date: Fri Apr 12 10:20:49 2024 +0800
Shell syntax fix (leftover from a sync).
Signed-off-by: renmingshuai
commit 2eded551ba96e66bc3afbbcc883812c2eac02bd7
Author: Darren Tucker
Date: Thu Apr 25 13:20:19 2024 +1000
Merge flags for OpenSSL 3.x versions.
OpenSSL has moved to 3.4 which we don't currently accept. Based on
the OpenSSL versioning policy[0] it looks like all of the 3.x versions
should work with OpenSSH, so remove the distinction in configure and
accept all of them.
[0] https://openssl.org/policies/general/versioning-policy.html
commit 8673245918081c6d1dc7fb3733c8eb2c5a902c5e
Author: Darren Tucker
Date: Thu Apr 25 13:19:03 2024 +1000
Remove 9.6 branch from status page.
commit 70d43049747fa3c66cf876d52271859407cec2fa
Author: Darren Tucker
Date: Thu Apr 25 13:16:58 2024 +1000
Update LibreSSL and OpenSSL versions tested.
Update LibreSSL versions to current releases (3.8.4 & 3.9.1).
Add newly-released OpenSSL 3.3.0, and add tests against the 3.1 and
3.3 branches.
commit 88351eca17dcc55189991ba60e50819b6d4193c1
Author: 90
Date: Fri Apr 5 19:36:06 2024 +0100
Fix missing header for systemd notification
commit 08f579231cd38a1c657aaa6ddeb8ab57a1fd4f5c
Author: Damien Miller
Date: Wed Apr 3 14:40:32 2024 +1100
notify systemd on listen and reload
Standalone implementation that does not depend on libsystemd.
With assistance from Luca Boccassi, and feedback/testing from Colin
Watson. bz2641
commit 43e7c1c07cf6aae7f4394ca8ae91a3efc46514e2
Author: Darren Tucker
Date: Sun Mar 31 21:51:57 2024 +1100
Port changes from selfhosted to upstream tests.
Should get them working again.
commit 281ea25a44bff53eefb4af7bab7aa670b1f8b6b2
Author: Darren Tucker
Date: Sat Mar 30 18:20:16 2024 +1100
Check if OpenSSL implementation supports DSA.
If --enable/disable-dsa-keys is not specified, set based on what OpenSSL
supports. If specified as enabled, but not supported by OpenSSL error
out. ok djm@
commit 2d2c068de8d696fe3246f390b146197f51ea1e83
Author: djm@openbsd.org
Date: Sat Mar 30 05:56:22 2024 +0000
upstream: in OpenSSH private key format, correct type for subsequent
private keys in blob. From Jakub Jelen via GHPR430
OpenBSD-Commit-ID: d17dbf47554de2d752061592f95b5d772baab50b
commit c2c0bdd3e96b3ef66d77fccb85ff4962dc76caf0
Author: Eero Häkkinen
Date: Sat Sep 16 00:55:08 2023 +0300
Expose SSH_AUTH_INFO_0 always to PAM auth modules.
This changes SSH_AUTH_INFO_0 to be exposed to PAM auth modules also
when a password authentication method is in use and not only
when a keyboard-interactive authentication method is in use.
commit 02c5ad23124ae801cf248d99ea5068fc4331ca01
Author: Darren Tucker
Date: Wed Mar 27 17:42:58 2024 +1100
Rearrange selfhosted VM scheduling.
Instead of trying to infer the type of the self hosted tests in each of
the driver scripts (inconsistently...), set one of the following
variables to "true" in the workflow:
VM: tests run in a virtual machine.
EPHEMERAL: tests run on an ephemeral virtual machine.
PERSISTENT: tests run on a persistent virtual machine
REMOTE: tests run on a physical remote host.
EPHEMERAL VMs can have multiple instances of any given VM can exist
simultaneously and are run by a runner pool. The other types have a
dedicated runner instance and can only run a single test at a time.
Other settings:
SSHFS: We need to sshfs mount over the repo so the workflow can collect
build artifacts. This also implies the tests must be run over ssh.
DEBUG_ACTIONS: enable "set -x" in scripts for debugging.
commit cd8a72707c02615365d0851ac51063ab6bfe258f
Author: Damien Miller
Date: Sat Mar 30 16:05:59 2024 +1100
add new token-based signing key for dtucker@
Verified in person and via signature with old key.
Will remove old key in a bit.
commit 8d0e46c1ddb5b7f0992591b0dc5d8aaa77cc9dba
Author: Alkaid
Date: Tue Mar 12 03:59:12 2024 -0700
Fix OpenSSL ED25519 support detection
Wrong function signature in configure.ac prevents openssh from enabling
the recently new support for ED25519 priv keys in PEM PKCS8 format.
commit 697359be9c23ee43618243cdbcc9c7981e766752
Author: djm@openbsd.org
Date: Sat Mar 30 04:27:44 2024 +0000
upstream: allow WAYLAND_DISPLAY to enable SSH_ASKPASS
From dkg via GHPR479; ok dtucker@
OpenBSD-Commit-ID: 1ac1f9c45da44eabbae89375393c662349239257
commit 7844705b0364574cc70b941be72036c2c2966363
Author: dtucker@openbsd.org
Date: Fri Mar 29 10:40:07 2024 +0000
upstream: Use egrep instead of grep -E.
Some plaforms don't have the latter so this makes things easier
in -portable.
OpenBSD-Regress-ID: ff82260eb0db1f11130200b25d820cf73753bbe3
commit 22b2b6c555334bffdf357a2e4aa74308b03b83c3
Author: dtucker@openbsd.org
Date: Tue Mar 26 08:09:16 2024 +0000
upstream: test -h is the POSIXly way of testing for a symlink. Reduces
diff vs Portable.
OpenBSD-Regress-ID: 6f31cd6e231e3b8c5c2ca0307573ccb7484bff7d
commit edcff77f82c2bb2b5653b36f1e47274c5ef3e8be
Author: Darren Tucker