]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
2 days agoupstream: include openssl/bn.h explicitly in files where we use BN_* master anongit/master
djm@openbsd.org [Fri, 3 Oct 2025 00:08:02 +0000 (00:08 +0000)] 
upstream: include openssl/bn.h explicitly in files where we use BN_*

makes things simpler for portable; from Mike Frysinger

OpenBSD-Commit-ID: 717e93403fd1108e175afd7451b5a4ab46a598fe

3 days agoupstream: Relax array check slightly. Prevents compiler warnings github-selfhosted/master github/master
dtucker@openbsd.org [Thu, 2 Oct 2025 08:38:43 +0000 (08:38 +0000)] 
upstream: Relax array check slightly. Prevents compiler warnings

in -portable when there are no kbdint devices present.  ok djm@

OpenBSD-Commit-ID: c1c050cecd642d6073c792201908fd225191df93

3 days agoupstream: backout r1.243 (fix for fatal during tab-completion with
djm@openbsd.org [Thu, 2 Oct 2025 04:23:11 +0000 (04:23 +0000)] 
upstream: backout r1.243 (fix for fatal during tab-completion with

some multibyte sequences) as it breaks the common case for tab completion.

Will deal with it properly after release.

OpenBSD-Commit-ID: 196d00f5ff19579214de45357f16a1fb2d624be1

3 days agoPass COMPATINCLUDES down to openbsd-compat too.
Darren Tucker [Thu, 2 Oct 2025 00:48:04 +0000 (10:48 +1000)] 
Pass COMPATINCLUDES down to openbsd-compat too.

Fixes build on Solaris, AIX and probably others.

4 days agoPass new "compat includes" path via AC_SUBST.
Darren Tucker [Wed, 1 Oct 2025 04:34:02 +0000 (14:34 +1000)] 
Pass new "compat includes" path via AC_SUBST.

This fixes the build when the directory path containing a space.
Found by Sevan Janiyan, tested by Job Snijders.  This doesn't fix
"make tests", however that is a different, pre-existing problem
that needs to be addressed separately.

4 days agoRemove compat "include" dir during distclean.
Darren Tucker [Wed, 1 Oct 2025 03:37:35 +0000 (13:37 +1000)] 
Remove compat "include" dir during distclean.

4 days agoupstream: Set keys to NULL after freeing in tests where the
dtucker@openbsd.org [Wed, 1 Oct 2025 00:33:37 +0000 (00:33 +0000)] 
upstream: Set keys to NULL after freeing in tests where the

variables will be used again.  Should prevent Coverity "potential use after
free" warnings.

OpenBSD-Regress-ID: 24d141657d25977e41dfb0c58e9b74ab093972bf

4 days agoupstream: Get rid of utf8 droppings in commment since it confuses
dtucker@openbsd.org [Wed, 1 Oct 2025 00:30:19 +0000 (00:30 +0000)] 
upstream: Get rid of utf8 droppings in commment since it confuses

older shells. From Sevan Janiyan via openssh-unix-dev.

OpenBSD-Regress-ID: 67c11a5cff6ef23538c77e9b29d538e175e6cfe3

4 days agoUpdate OpenSSL & LibreSSL versions we test against.
Darren Tucker [Wed, 1 Oct 2025 02:17:54 +0000 (12:17 +1000)] 
Update OpenSSL & LibreSSL versions we test against.

5 days agoupstream: during sftp uploads, avoid a condition where a failed write
djm@openbsd.org [Tue, 30 Sep 2025 00:10:42 +0000 (00:10 +0000)] 
upstream: during sftp uploads, avoid a condition where a failed write

could be ignored if a subsequent write succeeded.

This is unlikely but technically possible because sftp servers are
allowed to reorder requests.

Reported by Graziano Stefani, ok tb@

OpenBSD-Commit-ID: 03904bce2c7f787223d01d7e1179fde15753eca3

5 days agoupstream: avoid a fatal() when sftp tab-completes filenames that
djm@openbsd.org [Tue, 30 Sep 2025 00:06:06 +0000 (00:06 +0000)] 
upstream: avoid a fatal() when sftp tab-completes filenames that

share common utf-8 characters that don't encode to a complete codepoint

from menthu.zhou via GHPR#587; ok dtucker@

OpenBSD-Commit-ID: e07e4d8a8cac032ab536570b8214e6ef6839b585

5 days agoupstream: fix memory leak in mux_client_request_stdio_fwd GHPR#575
djm@openbsd.org [Tue, 30 Sep 2025 00:03:09 +0000 (00:03 +0000)] 
upstream: fix memory leak in mux_client_request_stdio_fwd GHPR#575

by Boris Tonofa; ok dtucker

OpenBSD-Commit-ID: 410cdd05242304bd0196b9172ce5fcaf89d2d8ce

5 days agoDon't log audit messages with UNKNOWN hostname
Allison Karlitskaya [Wed, 3 Sep 2025 18:07:55 +0000 (20:07 +0200)] 
Don't log audit messages with UNKNOWN hostname

The `host` parameter to audit_log_acct_message() is documented as
follows:

      host - The hostname if known. If not available pass a NULL.

but we pass the string "UNKNOWN" in case we don't know the hostname.
Make sure we pass NULL instead.

This avoids having the audit system attempt to perform a DNS lookup on
the hostname "UNKNOWN", which tends to result in long delays when
attempting to login.

5 days agoensure struct passwd fields are non-NULL in pwcopy
zhangjun [Fri, 22 Aug 2025 08:49:07 +0000 (16:49 +0800)] 
ensure struct passwd fields are non-NULL in pwcopy

Android libc can return NULL pw_gecos, for example.

5 days agoupstream: Add explicit check for array overflow.
dtucker@openbsd.org [Mon, 29 Sep 2025 21:37:52 +0000 (21:37 +0000)] 
upstream: Add explicit check for array overflow.

The array is bounded by a NULL sentinel which already prevents this,
however since we check the bit vector for overflow Coverity assumes that
check is for the devices array and flags it as a potential overflow.
Adding this additional check on the array placates CID 896018.  ok djm@
deraadt@

OpenBSD-Commit-ID: e92fff41341b38e4206a70655cc9acaaa032ebee

5 days agoupstream: Move ifdef to start of file. Removes diff vs portable.
dtucker@openbsd.org [Mon, 29 Sep 2025 21:30:15 +0000 (21:30 +0000)] 
upstream: Move ifdef to start of file. Removes diff vs portable.

OpenBSD-Commit-ID: 55058ac3d477e4c696575039f5b275522b99ffea

5 days agoupstream: Include misc.h. Removes diff vs portable.
dtucker@openbsd.org [Mon, 29 Sep 2025 21:29:22 +0000 (21:29 +0000)] 
upstream: Include misc.h. Removes diff vs portable.

OpenBSD-Commit-ID: 8aa48451fe5c37f04a339450c4ed9cfb8f4c288f

5 days agoupstream: Sort headers as per KNF. Removes diff vs portable.
dtucker@openbsd.org [Mon, 29 Sep 2025 21:28:33 +0000 (21:28 +0000)] 
upstream: Sort headers as per KNF. Removes diff vs portable.

OpenBSD-Commit-ID: 55f5b9eaeb826a25cfb506a78136094275a71bcb

5 days agoupstream: Null out keys after freeing in tests in the case where we
dtucker@openbsd.org [Mon, 29 Sep 2025 07:40:55 +0000 (07:40 +0000)] 
upstream: Null out keys after freeing in tests in the case where we

potentially reuse the variable.  Fixes Coverity CID 405057.

OpenBSD-Regress-ID: c52e86502b33bfa6e448448a74a0217dd519dd58

6 days agoupstream: avoid spurious error message when loading certificates
djm@openbsd.org [Mon, 29 Sep 2025 03:17:54 +0000 (03:17 +0000)] 
upstream: avoid spurious error message when loading certificates

only bz3869

OpenBSD-Commit-ID: e7848fec50d15cc142fed946aa8f79abef3c5be7

6 days agoupstream: kbd-interactive device names should be matched against
djm@openbsd.org [Mon, 29 Sep 2025 02:32:15 +0000 (02:32 +0000)] 
upstream: kbd-interactive device names should be matched against

the full device name, not a prefix. Doesn't matter in practice as there is
only one kbd-int device supported (PAM xor BSD auth), and an attacker would
still need to successfully authenticate against an incorrectly-selected
device.

reported by ashamedbit, NobleMathews; ok deraadt@

OpenBSD-Commit-ID: cf75d4f99405fbb41354c4ae724a3b39a3b58f82

6 days agoupstream: avoid use-after-free in update_krl_from_file() found with
jsg@openbsd.org [Thu, 25 Sep 2025 12:52:21 +0000 (12:52 +0000)] 
upstream: avoid use-after-free in update_krl_from_file() found with

clang scan-build, ok dtucker@

OpenBSD-Commit-ID: 8ec86eca573740c94d5bc7e252959174555f4eb8

8 days agoStop testing OpenBSD ubsan until fixed upstream.
Darren Tucker [Sat, 27 Sep 2025 10:20:34 +0000 (20:20 +1000)] 
Stop testing OpenBSD ubsan until fixed upstream.

9 days agoupstream: Use $OBJ for temp file in maxstartups idempotence test.
dtucker@openbsd.org [Fri, 26 Sep 2025 04:40:45 +0000 (04:40 +0000)] 
upstream: Use $OBJ for temp file in maxstartups idempotence test.

Fixes test in -portable when run out-of-tree.

OpenBSD-Regress-ID: 8578be08238af4abe2dc91af1c199f7f71f1a7a2

9 days agoShorten workflow names to fit in a single line.
Darren Tucker [Fri, 26 Sep 2025 12:28:13 +0000 (22:28 +1000)] 
Shorten workflow names to fit in a single line.

9 days agoUpdate link to oss-fuzz bug tracker.
Darren Tucker [Fri, 26 Sep 2025 12:26:33 +0000 (22:26 +1000)] 
Update link to oss-fuzz bug tracker.

Remove 9.8 branch.

9 days agoupstream: Check return codes of sshbuf functions.
dtucker@openbsd.org [Thu, 25 Sep 2025 22:17:29 +0000 (22:17 +0000)] 
upstream: Check return codes of sshbuf functions.

Fixes Coverity CIDs 405059 and 405061.

OpenBSD-Regress-ID: defa55d32892172251bbd5efd15731ce55888247

9 days agoReplace hand-rolled modulo with arc4random_uniform.
Darren Tucker [Thu, 25 Sep 2025 22:23:21 +0000 (08:23 +1000)] 
Replace hand-rolled modulo with arc4random_uniform.

Fixes potential modulo-by-zero UB flagged by Coverity CID 405068

10 days agoRemove status bits from OpenSSL >=3 version check.
Darren Tucker [Thu, 25 Sep 2025 07:50:07 +0000 (17:50 +1000)] 
Remove status bits from OpenSSL >=3 version check.

OpenSSL traditionally did not guarantee ABI compatibility across release
(and development) versions.  Because of this, OpenSSH checked the lower 4
"status" bits returned by OpenSSL_version_num(), which were originally
set to 0 for development versions and 0xf for release versions and, if
they did not match, would report the discrepancy and exit.

OpenSSL (unintentionally) changed these bits in the 3.0.0 and subsequent
3.x releases, setting them to zero in the release versions (which happened
to also match the documentation), then changed them back in the 3.5.3
release.  If OpenSSL was upgraded to (or from) this version without
recompiling OpenSSH, it would cause OpenSSH flag it as potentially
incompatible and refuse to use it.  Ultimately OpenSSL rolled this
back, but the check now has no value so is being removed for OpenSSL
versions >=3.

bz#3865 and https://github.com/openssl/openssl/issues/28575, ok djm@

10 days agoUpdate pledge() interface to match current OpenBSD.
Darren Tucker [Thu, 25 Sep 2025 08:06:55 +0000 (18:06 +1000)] 
Update pledge() interface to match current OpenBSD.

ok djm@

10 days agoMerge all putty tests into a single test.
Darren Tucker [Tue, 23 Sep 2025 12:12:19 +0000 (22:12 +1000)] 
Merge all putty tests into a single test.

The lets us reuse the built OpenSSH binaries and replaces 12*4min of
tests with a single 14min one.

10 days agoAdd #ifdefs in pwfree to match those in pwcopy.
Darren Tucker [Thu, 25 Sep 2025 08:20:53 +0000 (18:20 +1000)] 
Add #ifdefs in pwfree to match those in pwcopy.

Fixes build on many platforms.

10 days agoupstream: fix some one-off leaks in ssh.c; ok dtucker@
djm@openbsd.org [Thu, 25 Sep 2025 07:05:11 +0000 (07:05 +0000)] 
upstream: fix some one-off leaks in ssh.c; ok dtucker@

OpenBSD-Commit-ID: bf3c27ffe4b3cccb6553b554ec4c04929065a2bc

10 days agoupstream: fix some one-off leaks in ssh-keygen; ok dtucker@
djm@openbsd.org [Thu, 25 Sep 2025 07:04:38 +0000 (07:04 +0000)] 
upstream: fix some one-off leaks in ssh-keygen; ok dtucker@

OpenBSD-Commit-ID: 32f51289c93246474659aa49067926fcab9e02e8

10 days agoupstream: fix some leaks in ssh-add; feedback/ok dtucker@
djm@openbsd.org [Thu, 25 Sep 2025 07:00:43 +0000 (07:00 +0000)] 
upstream: fix some leaks in ssh-add; feedback/ok dtucker@

OpenBSD-Commit-ID: 441302917de31a128c1d6d63acccc67042fcf349

10 days agoupstream: fix some leaks; feedback/ok dtucker@
djm@openbsd.org [Thu, 25 Sep 2025 06:57:54 +0000 (06:57 +0000)] 
upstream: fix some leaks; feedback/ok dtucker@

OpenBSD-Commit-ID: 05bdbc2e494b87a4a79e509020bd8249c86a4ff0

10 days agoupstream: wait for the unprivileged sshd-auth process to exit
djm@openbsd.org [Thu, 25 Sep 2025 06:45:50 +0000 (06:45 +0000)] 
upstream: wait for the unprivileged sshd-auth process to exit

before closing the fd it uses to report log messages

This avoids a race where the child process notices the
fd was closed before exiting and spams the logs.

ok dtucker@

OpenBSD-Commit-ID: 7cddaa41be3b955e6bed570900db7ab8817b1e76

10 days agoupstream: add some functions to free various structs, including
djm@openbsd.org [Thu, 25 Sep 2025 06:33:19 +0000 (06:33 +0000)] 
upstream: add some functions to free various structs, including

channels data and packet state; ok dtucker@ tb@

OpenBSD-Commit-ID: a8b3705309d632cdae370d4147a03e703087b0d1

10 days agoupstream: fix leaks of config objects in
djm@openbsd.org [Thu, 25 Sep 2025 06:31:42 +0000 (06:31 +0000)] 
upstream: fix leaks of config objects in

mm_decode_activate_server_options ok dtucker@ tb@

OpenBSD-Commit-ID: 211f4d7d02e847bd1bcb460f6beb11658809a742

10 days agoupstream: clarify intent and avoid (harmess, defined behaviour)
djm@openbsd.org [Thu, 25 Sep 2025 06:25:38 +0000 (06:25 +0000)] 
upstream: clarify intent and avoid (harmess, defined behaviour)

unsigned underflow. ok tb@

OpenBSD-Commit-ID: b73bf5f1f381c3e4561a6cc706fb1cd77c939cd8

10 days agoupstream: consistently use NULL for null pointer constants found
jsg@openbsd.org [Thu, 25 Sep 2025 06:23:19 +0000 (06:23 +0000)] 
upstream: consistently use NULL for null pointer constants found

with sparse, ok djm@

OpenBSD-Commit-ID: 1067504b63732d809d0d57ad4bc626818d112772

10 days agoupstream: remove unneeded externs ok djm@
jsg@openbsd.org [Thu, 25 Sep 2025 02:15:39 +0000 (02:15 +0000)] 
upstream: remove unneeded externs ok djm@

OpenBSD-Commit-ID: fe553193e910a122505142a4e1db7358cc1ae653

10 days agoupstream: remove prototype for removed ssh_packet_set_tos() ok
jsg@openbsd.org [Thu, 25 Sep 2025 02:12:16 +0000 (02:12 +0000)] 
upstream: remove prototype for removed ssh_packet_set_tos() ok

djm@

OpenBSD-Commit-ID: 396f82995074ef4d7b9ce44168266ef4640d9985

10 days agoupstream: spelling; ok dtucker@
jsg@openbsd.org [Wed, 24 Sep 2025 00:51:28 +0000 (00:51 +0000)] 
upstream: spelling; ok dtucker@

OpenBSD-Commit-ID: 93870117b0153859dd8baa80b97e44d4558c786b

12 days agoMerge VM tests into a single workflow file.
Darren Tucker [Tue, 23 Sep 2025 06:51:34 +0000 (16:51 +1000)] 
Merge VM tests into a single workflow file.

Should make it easier to manage, although it may cause a few extra runs.

12 days agoTest openssl-3.6 branch not beta1.
Darren Tucker [Tue, 23 Sep 2025 06:38:45 +0000 (16:38 +1000)] 
Test openssl-3.6 branch not beta1.

12 days agoTest openssl-3.6.0-beta1.
Darren Tucker [Tue, 23 Sep 2025 05:51:14 +0000 (15:51 +1000)] 
Test openssl-3.6.0-beta1.

12 days agoSpecify rpath when building OpenSSL.
Darren Tucker [Tue, 23 Sep 2025 01:32:57 +0000 (11:32 +1000)] 
Specify rpath when building OpenSSL.

13 days agoFactor out OpenSSL install and test more versions.
Darren Tucker [Mon, 22 Sep 2025 05:26:17 +0000 (15:26 +1000)] 
Factor out OpenSSL install and test more versions.

Move OpenSSL installation into its own script with a "-a" option to
install the "next" version to test for ABI compatibility.

13 days agoExclude generated openbsd-compat/include directory.
Darren Tucker [Mon, 22 Sep 2025 06:55:49 +0000 (16:55 +1000)] 
Exclude generated openbsd-compat/include directory.

2 weeks agoAdd OpenSSL 3.x ABI cross-compatibility test.
Darren Tucker [Sat, 20 Sep 2025 05:07:36 +0000 (15:07 +1000)] 
Add OpenSSL 3.x ABI cross-compatibility test.

2 weeks agoAdd tests for OpenSSL 3.4 and 3.5 versions.
Darren Tucker [Sat, 20 Sep 2025 05:05:19 +0000 (15:05 +1000)] 
Add tests for OpenSSL 3.4 and 3.5 versions.

2 weeks agoBuild OpenSSL with -j4 to speed it up.
Darren Tucker [Sat, 20 Sep 2025 05:53:04 +0000 (15:53 +1000)] 
Build OpenSSL with -j4 to speed it up.

2 weeks agoRerun tests if run_tests.sh changes.
Darren Tucker [Sat, 20 Sep 2025 05:16:30 +0000 (15:16 +1000)] 
Rerun tests if run_tests.sh changes.

2 weeks agoupstream: log at level INFO when PerSourcePenalties actually blocks
djm@openbsd.org [Fri, 19 Sep 2025 01:32:45 +0000 (01:32 +0000)] 
upstream: log at level INFO when PerSourcePenalties actually blocks

access to a source address range. Previously this was logged at level
VERBOSE, which hid enforcement actions under default config settings.

ok dtucker, markus

OpenBSD-Commit-ID: ea2b0d7c2253ff5205719d74b526cf2870df894d

2 weeks agoWhitespace.
Darren Tucker [Wed, 17 Sep 2025 07:41:41 +0000 (17:41 +1000)] 
Whitespace.

2 weeks agoMove Gihub VMs to their own status line.
Darren Tucker [Wed, 17 Sep 2025 07:33:25 +0000 (17:33 +1000)] 
Move Gihub VMs to their own status line.

2 weeks agoUse relative URLs for status
Darren Tucker [Tue, 16 Sep 2025 13:00:14 +0000 (23:00 +1000)] 
Use relative URLs for status

2 weeks agoAdd VM test targets via vmaction on Github.
Darren Tucker [Mon, 15 Sep 2025 07:21:15 +0000 (17:21 +1000)] 
Add VM test targets via vmaction on Github.

2 weeks agoupstream: memory leaks in unit tests
djm@openbsd.org [Mon, 15 Sep 2025 03:00:22 +0000 (03:00 +0000)] 
upstream: memory leaks in unit tests

OpenBSD-Regress-ID: af11ac7b8034b99ca324af4dae1ef5cd7700b273

2 weeks agoupstream: fix leaks of struct sftp_conn in scp; ok dtucker@
djm@openbsd.org [Mon, 15 Sep 2025 05:17:37 +0000 (05:17 +0000)] 
upstream: fix leaks of struct sftp_conn in scp; ok dtucker@

OpenBSD-Commit-ID: 76bea50b5b87b750c3771bf80feb6067d994a9d2

2 weeks agoupstream: leak of principals file lines; ok dtucker@
djm@openbsd.org [Mon, 15 Sep 2025 04:52:41 +0000 (04:52 +0000)] 
upstream: leak of principals file lines; ok dtucker@

OpenBSD-Commit-ID: 918bf1b70e5a969059300f3c23d45911690d9015

2 weeks agoupstream: leak of authentication options at exit; ok dtucker@
djm@openbsd.org [Mon, 15 Sep 2025 04:52:12 +0000 (04:52 +0000)] 
upstream: leak of authentication options at exit; ok dtucker@

OpenBSD-Commit-ID: ba559799c2ff9b10afc3abefb1797c0843a6ff24

2 weeks agoupstream: memleak of keys not used for authentication; ok
djm@openbsd.org [Mon, 15 Sep 2025 04:51:35 +0000 (04:51 +0000)] 
upstream: memleak of keys not used for authentication; ok

dtucker@

OpenBSD-Commit-ID: ddfda79d243150fbd382d8f2cd75a90a072b3669

2 weeks agoupstream: memleak of certificate path; ok dtucker@
djm@openbsd.org [Mon, 15 Sep 2025 04:50:42 +0000 (04:50 +0000)] 
upstream: memleak of certificate path; ok dtucker@

OpenBSD-Commit-ID: 90dc5390f2756ba339e2e6df54d4b8651d64c1e7

2 weeks agoupstream: memleak of hostkey when downgrading host cert->key; ok
djm@openbsd.org [Mon, 15 Sep 2025 04:49:41 +0000 (04:49 +0000)] 
upstream: memleak of hostkey when downgrading host cert->key; ok

dtucker

OpenBSD-Commit-ID: f6f1f38a8ec144fb615434f6877066cf4610b826

2 weeks agoupstream: memleak of editline history; ok dtucker@
djm@openbsd.org [Mon, 15 Sep 2025 04:49:00 +0000 (04:49 +0000)] 
upstream: memleak of editline history; ok dtucker@

OpenBSD-Commit-ID: a244c54eb074cf7fbe28f7ac4f03ace270f7a999

2 weeks agoupstream: memleak of rfwd callback context; ok dtucker@
djm@openbsd.org [Mon, 15 Sep 2025 04:48:29 +0000 (04:48 +0000)] 
upstream: memleak of rfwd callback context; ok dtucker@

OpenBSD-Commit-ID: 70b2aafeaace90703dd16a44a2a0b723d9155f33

2 weeks agoupstream: memleaks of request packet and hostkeys blob; ok
djm@openbsd.org [Mon, 15 Sep 2025 04:47:49 +0000 (04:47 +0000)] 
upstream: memleaks of request packet and hostkeys blob; ok

dtucker@

OpenBSD-Commit-ID: 313b13a8e36b4ca8e064ee56792e67e0670a386a

2 weeks agoupstream: memleak of KRL revoked certs struct; ok dtucker
djm@openbsd.org [Mon, 15 Sep 2025 04:41:20 +0000 (04:41 +0000)] 
upstream: memleak of KRL revoked certs struct; ok dtucker

OpenBSD-Commit-ID: f319868e0b2de49c41c735e75b87c403f009f5f9

2 weeks agoupstream: memleak of kex->server_sig_algs; ok dtucker@
djm@openbsd.org [Mon, 15 Sep 2025 04:40:34 +0000 (04:40 +0000)] 
upstream: memleak of kex->server_sig_algs; ok dtucker@

OpenBSD-Commit-ID: 41a3f64edd2c9b8addb2e445514ae25c24819e2c

2 weeks agoupstream: fix memleak of channel forwarding permissions; ok
djm@openbsd.org [Mon, 15 Sep 2025 04:39:58 +0000 (04:39 +0000)] 
upstream: fix memleak of channel forwarding permissions; ok

dtucker@

OpenBSD-Commit-ID: 069745547109bc8fcc09fab5b19c53599cae99fd

2 weeks agoupstream: when merging auth options into the active set, don't
djm@openbsd.org [Mon, 15 Sep 2025 04:39:15 +0000 (04:39 +0000)] 
upstream: when merging auth options into the active set, don't

leak the old struct sshauthopt; ok dtucker@

OpenBSD-Commit-ID: c6bfd7bc2932e37f811b3c53272c3b919d33e75b

2 weeks agoupstream: fix memleak when applying certificate options; ok
djm@openbsd.org [Mon, 15 Sep 2025 04:38:00 +0000 (04:38 +0000)] 
upstream: fix memleak when applying certificate options; ok

dtucker

OpenBSD-Commit-ID: 36c219dcc05f4df82a0f9c500bdf5dbfea925289

3 weeks agoupstream: disable ssh-add autoexpiry of certificates when testing
djm@openbsd.org [Thu, 11 Sep 2025 07:23:32 +0000 (07:23 +0000)] 
upstream: disable ssh-add autoexpiry of certificates when testing

expired certificates

OpenBSD-Regress-ID: 64aadd23d37fd0b3a06498151f2cf83be7ac342c

3 weeks agoupstream: correct getopt() string
djm@openbsd.org [Thu, 11 Sep 2025 07:22:37 +0000 (07:22 +0000)] 
upstream: correct getopt() string

OpenBSD-Commit-ID: 05ef9581a3dab32ec93aa5b9c3349ed1e7da9ec8

3 weeks agoupstream: need time.h for time(3)
djm@openbsd.org [Thu, 11 Sep 2025 03:29:58 +0000 (03:29 +0000)] 
upstream: need time.h for time(3)

OpenBSD-Commit-ID: 530964039cccab679432b6c5b28d2b0aa9760b00

3 weeks agoupstream: When adding certificates to an agent, set the expiry to
djm@openbsd.org [Thu, 11 Sep 2025 02:54:42 +0000 (02:54 +0000)] 
upstream: When adding certificates to an agent, set the expiry to

the certificate expiry time plus a short (5 min) grace period.

This will cause the agent to automtically remove certificates shortly
after they expire.

A new ssh-add -N option disables this behaviour.

Feedback/ok deraadt@

OpenBSD-Commit-ID: 92fed1bba1025069ad45deebb534be7530e181df

3 weeks agoupstream: remove unused 0-sized files; ok deraadt@
jsg@openbsd.org [Mon, 8 Sep 2025 00:31:54 +0000 (00:31 +0000)] 
upstream: remove unused 0-sized files; ok deraadt@

OpenBSD-Commit-ID: 7e8178786157e863f6ff63c5d55200d7b6b04f9e

3 weeks agoupstream: Tabs->spaces. Removes diff vs portable.
dtucker@openbsd.org [Fri, 5 Sep 2025 10:34:35 +0000 (10:34 +0000)] 
upstream: Tabs->spaces. Removes diff vs portable.

OpenBSD-Commit-ID: 06598021a9f08188dab29ac956b2baa002a0ff85

3 weeks ago modified: regress/rekey.sh
Tim Rice [Mon, 8 Sep 2025 19:53:10 +0000 (12:53 -0700)] 
modified:   regress/rekey.sh
Fix for when building out of tree.

4 weeks agoAccept OpenSSL 4.0.0-dev versions.
Darren Tucker [Sun, 7 Sep 2025 03:35:22 +0000 (13:35 +1000)] 
Accept OpenSSL 4.0.0-dev versions.

They seem to work, at least for now.

4 weeks agoUse SSH_TUN_COMPAT_AF on FreeBSD.
Maxim Khon [Mon, 18 Aug 2025 12:05:42 +0000 (12:05 +0000)] 
Use SSH_TUN_COMPAT_AF on FreeBSD.

Otherwise tun forwarding from other OSes fails as soon as the first IPv6
message is sent by the other side (which is usually a Router Solicitation
ICMPv6 message which is sent as soon as the interface is up): all other
OS'es use SSH_TUN_COMPAT_AF or SSH_TUN_PREPEND_AF which effectively uses
OpenBSD AF_INET/AF_INET6 values.

4 weeks agoCheck for nlist function.
Darren Tucker [Fri, 5 Sep 2025 11:32:30 +0000 (21:32 +1000)] 
Check for nlist function.

Check for nlist function presence before attenmpting to use it instead
of relying on the presence of the nlist.h header.  Mac OS X, in particular
has the header, but only has the function in the 32bit libraries.

4 weeks agoupstream: Order includes as per KNF and add time.h. Removes diff
dtucker@openbsd.org [Fri, 5 Sep 2025 10:23:55 +0000 (10:23 +0000)] 
upstream: Order includes as per KNF and add time.h. Removes diff

vs portable.

OpenBSD-Commit-ID: 38043f0bfa17c48ef6d1a744c2834b4405bc9311

4 weeks agoupstream: Order headers as per KNF. Removes diff vs portable.
dtucker@openbsd.org [Fri, 5 Sep 2025 10:17:21 +0000 (10:17 +0000)] 
upstream: Order headers as per KNF. Removes diff vs portable.

OpenBSD-Commit-ID: 4df519fd9fa13ce9653adf7a3d1076e20591d886

4 weeks agoupstream: Order headers as per KNF.
dtucker@openbsd.org [Fri, 5 Sep 2025 10:01:35 +0000 (10:01 +0000)] 
upstream: Order headers as per KNF.

OpenBSD-Commit-ID: 7156b69b0364c68e181e0f6fa17c0f05c72e8670

4 weeks agoResync header order with upstream.
Darren Tucker [Fri, 5 Sep 2025 10:39:16 +0000 (20:39 +1000)] 
Resync header order with upstream.

4 weeks agoResync header order with upstream.
Darren Tucker [Fri, 5 Sep 2025 10:37:04 +0000 (20:37 +1000)] 
Resync header order with upstream.

4 weeks agoSync includes with upstream.
Darren Tucker [Fri, 5 Sep 2025 10:30:20 +0000 (20:30 +1000)] 
Sync includes with upstream.

4 weeks agoMove ssh-pkcs11.h include to match upstream.
Darren Tucker [Fri, 5 Sep 2025 10:26:14 +0000 (20:26 +1000)] 
Move ssh-pkcs11.h include to match upstream.

4 weeks agoReorder includes to match upstream.
Darren Tucker [Fri, 5 Sep 2025 10:20:27 +0000 (20:20 +1000)] 
Reorder includes to match upstream.

4 weeks agoupstream: Order headers as per KNF. Removes diff vs portable.
dtucker@openbsd.org [Fri, 5 Sep 2025 09:58:08 +0000 (09:58 +0000)] 
upstream: Order headers as per KNF. Removes diff vs portable.

OpenBSD-Commit-ID: db72be57429418f6a4319bbe34c98fc103e11ce0

4 weeks agoupstream: Order headers as per KNF. Also removes diff vs
dtucker@openbsd.org [Fri, 5 Sep 2025 09:49:26 +0000 (09:49 +0000)] 
upstream: Order headers as per KNF. Also removes diff vs

-portable.

OpenBSD-Commit-ID: 2061307dc938712e524bc9da48a52f545e43670e

4 weeks agoupstream: Remove unused rmd160.h header. ripemd160 support was
dtucker@openbsd.org [Fri, 5 Sep 2025 09:31:31 +0000 (09:31 +0000)] 
upstream: Remove unused rmd160.h header. ripemd160 support was

removed in 2017.

OpenBSD-Commit-ID: 937fca21498b921adf6e04bac120f4a2e7975b3c

4 weeks agoCreate replacement nlist.h if needed.
Darren Tucker [Fri, 5 Sep 2025 10:07:16 +0000 (20:07 +1000)] 
Create replacement nlist.h if needed.

Remove #ifdef HAVE_NLIST_H wrapper.  ok djm@

4 weeks agoCreate replacement endian.h if needed.
Darren Tucker [Fri, 5 Sep 2025 09:55:20 +0000 (19:55 +1000)] 
Create replacement endian.h if needed.

Remove #ifdef HAVE_ENDIAN_H wrapper.  ok djm@

4 weeks agoAdd /* WITH_OPENSSL */ comments.
Darren Tucker [Fri, 5 Sep 2025 09:52:48 +0000 (19:52 +1000)] 
Add /* WITH_OPENSSL */ comments.

Removes diffs vs upstream.

4 weeks agoMove sys/time.h include to match upstream.
Darren Tucker [Fri, 5 Sep 2025 09:22:37 +0000 (19:22 +1000)] 
Move sys/time.h include to match upstream.

4 weeks agoCreate replacement netgroup.h if needed.
Darren Tucker [Fri, 5 Sep 2025 09:13:52 +0000 (19:13 +1000)] 
Create replacement netgroup.h if needed.

Remove #ifdef HAVE_NETGROUP_H wrapper.  ok djm@