ChangeLog

<<<<<<< HEAD
commit 8cf3d17ecc7a988c535648133f66392b26beb605
Merge: 1bed65a80 3957cc291
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Oct 2 14:07:17 2025 -0400

    Merge remote-tracking branch 'openssh-master/master' into port_10.1_18.7.1
=======
commit 2d8a388de215d9959d72bb11f03e07a6eb2e4614
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 10 13:37:07 2025 +1100

    depend

commit 1d2676f4ffae35e2db37a35c385efaf2932cd639
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 9 14:53:04 2025 +1100

    update versions

commit ecd65a492bd0ed3a44a1c07428107b2e148bfee4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 8 00:32:52 2025 +0000

    upstream: openssh-10.2
    
    The only change since 10.1 is the channels.c fix
    
    OpenBSD-Commit-ID: 5eebeb0db14c694efd4ee96b5f16112e3e5d5ba9

commit ea9af2921cb6af8e65341531db3a7351917f0a92
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 8 21:02:16 2025 +0000

    upstream: fix crash at exit (visible via ssh-keygen -D) when
    
    multiple keys loaded. ok markus deraadt dtucker
    
    OpenBSD-Commit-ID: baa9763ec69d162108dafd962792ec5610ff45c9

commit e49013576074ccd2d7ae75fb824170c739ce97a1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 9 10:07:40 2025 +1100

    link ssh-keygen directly against ssh-pkcs11.c
    
    Matches what OpenBSD does and fixes ssh-keygen regression in
    certifying keys using a CA key hosted via ssh-agent (bz3877)

commit 684f2ceff8c0eeb775e8653cf32609f8fbfe07b1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 9 13:10:27 2025 +1100

    some fixes to p11_setup
    
    1. Use the ssh-keygen under test and not the one in $PATH
    2. Include a test PKCS#11 operation to ensure that the P11 stack is
       working correctly.
    
    Previously, it was possible for p11_setup to return success on
    configurations with PKCS#11 support disabled.

commit af17ae64a5cfee42334883d2802f40f779131740
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 9 13:12:15 2025 +1100

    complete PKCS#11 stubs and move to ssh-pkcs11.c
    
    Should unbreak --disable-pkcs11 builds

commit bcf7c05a473f92a35f4f3b561fd7a1e339e0a30f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 8 11:26:52 2025 +1100

    Fix header name and move return outside of ifdef.
    
    Fixes from Mike Frysinger via Github PR#597.

commit b937061fe4922caced7b91442b3233c0bd763492
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 7 21:10:33 2025 +1100

    Check HAVE_MMAP too now that configure sets it.

commit 8d57083c062f03098c9f767ec8d6278dc549a2f6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 7 21:07:05 2025 +1100

    Use calloc for sshkeys if mmap is not supported.
    
    Based on Github PR#597 from Mike Frysinger, any bugs added by me.

commit c97b931bffa481c72ff4bfddd9d59a2110899289
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 7 20:25:07 2025 +1100

    Add fcntl.h to includes.
    
    From FreeBSD via bz#3874: "This was previously included due to nested
    includes in Heimdal's headers.  Without this, the build fails with an
    error due to redefining AT_FDCWD."

commit 8aa13832315e52c4404c993a59c6139b44ac6114
Author: Daan De Meyer <daan.j.demeyer@gmail.com>
Date:   Mon Mar 20 20:22:14 2023 +0100

    Only set PAM_RHOST if the remote host is not "UNKNOWN"
    
    When using sshd's -i option with stdio that is not a AF_INET/AF_INET6
    socket, auth_get_canonical_hostname() returns "UNKNOWN" which is then
    set as the value of PAM_RHOST, causing pam to try to do a reverse DNS
    query of "UNKNOWN", which times out multiple times, causing a
    substantial slowdown when logging in.
    
    To fix this, let's only set PAM_RHOST if the hostname is not "UNKNOWN".

commit 0bd6649ea80ead0cd6404dbc25b64937421b556e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 7 20:10:56 2025 +1100

    Don't copy native host keys for hostbased test.
    
    Some github runners (notably macos-14) seem to have host keys where
    public and private do not match, so generate our own keys for testing
    purposes.

commit 33b63718d40ccc555b8c7a24331a3790b2efc6c5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 7 20:10:07 2025 +1100

    Add 10.1 branch to ci-status page.

commit 52411f15353257e9ec883fc044b7a56b6fca242d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 7 20:04:40 2025 +1100

    Add clock_gettime compat shim.
    
    This fixes the build on macOS prior to 10.12 Sierra, since it does not
    have it.  Found and tested by Sevan Janiyan.

commit beae06f56e0d0a66ca535896149d5fb0b2e8a1b4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 7 08:02:32 2025 +0000

    upstream: don't reuse c->isatty for signalling that the remote channel
    
    has a tty attached as this causes side effects, e.g. in channel_handle_rfd().
    bz3872
    
    ok markus@
    
    OpenBSD-Commit-ID: 4cd8a9f641498ca6089442e59bad0fd3dcbe85f8

commit 476bab6259d5a6ea0402ec79bc47ed61e2c15e86
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 6 12:52:25 2025 +1100

    depend

commit af956575eba6bf6b6d6bc817e1aa6ed73a365984
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 6 12:51:13 2025 +1100

    update versions

commit 2fd0945913a30fbbe7c02503347961df03f28e66
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 6 12:48:16 2025 +1100

    sync ssh-copy-id to upstream version 527be673f4d

commit 981bb32bc6062fa5d6f11de7ffb732967463bf57
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 6 01:45:22 2025 +0000

    upstream: openssh-10.1
    
    OpenBSD-Commit-ID: 2a232c2d2fc05a23519f69bc29e6d8c076b97d97

commit b9a640a1a0dccfb56be684cc7ade402f57cf7ebd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 3 01:03:45 2025 +0000

    upstream: If write() returned short, the subsequent write would restart
    
    from the beginning of the buffer not the end of what was written.  Fix, since
    we want modpipe to corrupt data for testing purposes deliberately not
    accidentally.  ok djm@
    
    OpenBSD-Regress-ID: 50ca74d287445c58944f070bb92dc13b1d054b43

commit a0e5446ac85aca5a3ef9844eeedf787300fdb8b3
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Oct 4 21:41:35 2025 +0000

    upstream: typos: a ssh* -> an ssh*
    
    ok dtucker@
    
    OpenBSD-Commit-ID: a70fd2e1b23089260e8f5a7921b0debc06b011cb

commit ade92f53c3bd4ad7dcd95334a194add57ec9ff71
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 3 00:09:26 2025 +0000

    upstream: stray newline
    
    OpenBSD-Commit-ID: b47ed4fa93b781c7ec8ae2936526a290f4e17e1f

commit a9cbe10da2be5be76755af0cea029db0f9c1f263
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 3 00:08:02 2025 +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
>>>>>>> V_10_2_P1

commit 3957cc2914cdc88932c972413853f8b68c1ffba5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Oct 2 08:38:43 2025 +0000

    upstream: Relax array check slightly. Prevents compiler warnings
    
    in -portable when there are no kbdint devices present.  ok djm@
    
    OpenBSD-Commit-ID: c1c050cecd642d6073c792201908fd225191df93

commit 6a239b057be2897d7a597daaf5394f2e7312dc65
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 2 04:23:11 2025 +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

commit b9f6a84ea383d811216de38219472214963c10b2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 2 10:48:04 2025 +1000

    Pass COMPATINCLUDES down to openbsd-compat too.
    
    Fixes build on Solaris, AIX and probably others.

<<<<<<< HEAD
commit 1bed65a8062045da543f10c68bcb934f2741e04d
Merge: 037e1857a 047e0221e
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Oct 1 14:35:47 2025 -0400

    Merge of Oct 1 2025 OpenSSH Master

=======
>>>>>>> V_10_2_P1
commit 047e0221eaf9815775e8ea78c6d6add5ab0f68c7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 1 14:34:02 2025 +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.

commit 5c50ddbe4deac83995edc1d014e9ba0d5efa18a6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 1 13:37:35 2025 +1000

    Remove compat "include" dir during distclean.

commit aceabd62ce5833716dd2e99d4be4fcb603d263cc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Oct 1 00:33:37 2025 +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

commit eb30a0d1493a97b5c14728846576dc6af5d442da
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Oct 1 00:30:19 2025 +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

commit d478e250230e917eeb5032238df0b9af357404ee
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 1 12:17:54 2025 +1000

    Update OpenSSL & LibreSSL versions we test against.

<<<<<<< HEAD
commit 037e1857a4d9d27c19e39cdcd050c18ae820817b
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Sep 30 15:29:17 2025 -0400

    Typos in readconf.c

commit 9aaf2997f7cb13e8825df1b8f96122de14adebc0
Merge: 1f58137c7 2c504a74e
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Sep 30 15:25:49 2025 -0400

    Initial pass at porting 10.1 into 18.7.1

commit 1f58137c71178f08392cf710d7de0a6f37158409
Merge: 27d8b7e9a 7d6d075ac
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Sep 30 11:44:23 2025 -0400

    Merge pull request #137 from rapier1/dev_minor
    
    HPN-SSH 18.7.1 Release

=======
>>>>>>> V_10_2_P1
commit 2c504a74ed81d13c8198a89ed1040d0fc5f73129
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 30 00:10:42 2025 +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

commit 1f7556753869654ba5e2bf61e384c5da2db5ca6a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 30 00:06:06 2025 +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

commit 42b14ff1e06fd683c7d15a6b2816c16108873a5a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 30 00:03:09 2025 +0000

    upstream: fix memory leak in mux_client_request_stdio_fwd GHPR#575
    
    by Boris Tonofa; ok dtucker
    
    OpenBSD-Commit-ID: 410cdd05242304bd0196b9172ce5fcaf89d2d8ce

commit e5055ef26abcffd3f99669e411ea6b35ca166111
Author: Allison Karlitskaya <allison.karlitskaya@redhat.com>
Date:   Wed Sep 3 20:07:55 2025 +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.

commit d343df4019b4369ce7f87e9bf6bbc80b81cd263d
Author: zhangjun <zhangjun-tc@dfmc.com.cn>
Date:   Fri Aug 22 16:49:07 2025 +0800

    ensure struct passwd fields are non-NULL in pwcopy
    
    Android libc can return NULL pw_gecos, for example.

commit 893a579e4b37e6bd89d206dc8e7ac2a906ccf114
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 29 21:37:52 2025 +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

commit 90f49a185ac1a786d9f7e9a710b369afb3692a65
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 29 21:30:15 2025 +0000

    upstream: Move ifdef to start of file. Removes diff vs portable.
    
    OpenBSD-Commit-ID: 55058ac3d477e4c696575039f5b275522b99ffea

commit 2f71b44d48dc8da7fb743d6ffe609aea5a645edb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 29 21:29:22 2025 +0000

    upstream: Include misc.h. Removes diff vs portable.
    
    OpenBSD-Commit-ID: 8aa48451fe5c37f04a339450c4ed9cfb8f4c288f

commit dfb991bdd826517bbce1cf62ce07bcb3e48a2f27
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 29 21:28:33 2025 +0000

    upstream: Sort headers as per KNF. Removes diff vs portable.
    
    OpenBSD-Commit-ID: 55f5b9eaeb826a25cfb506a78136094275a71bcb

commit c82f4dd6b723a8365b4c538d7c99fe8e46985ed0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 29 07:40:55 2025 +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

<<<<<<< HEAD
commit 7d6d075ac1f1f8d64fcb4cb6f2836e44dd7480ee
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 29 15:48:35 2025 -0400

    Push portable release number to p2 to reflect openssh repo

commit d9af599ae81161f77f1b4dc9f83fef4f850259f1
Merge: b60b4bb7d 32e2da91c
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 29 15:39:41 2025 -0400

    Merge pull request #136 from rapier1/feature_increment_version
    
    Increment version number

commit 32e2da91c35b5ab1345bdee1ce0fb0f492e3531d
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 29 15:33:33 2025 -0400

    Increment version number

=======
>>>>>>> V_10_2_P1
commit fda31e1e5179b4e70c27094ebb303ee47c11a5a7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 29 03:17:54 2025 +0000

    upstream: avoid spurious error message when loading certificates
    
    only bz3869
    
    OpenBSD-Commit-ID: e7848fec50d15cc142fed946aa8f79abef3c5be7

commit bcd88ded2fff97652d4236405a3354ca66f90f7e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 29 02:32:15 2025 +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

commit b1c4bf5c2f1c2b30698dbaadc5d823862213f1fc
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Sep 25 12:52:21 2025 +0000

    upstream: avoid use-after-free in update_krl_from_file() found with
    
    clang scan-build, ok dtucker@
    
    OpenBSD-Commit-ID: 8ec86eca573740c94d5bc7e252959174555f4eb8

commit b06a150bc903a0cf898406384d5a34059d0f2d8f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Sep 27 20:20:34 2025 +1000

    Stop testing OpenBSD ubsan until fixed upstream.

commit 97b32fa2af25c16aec4de85c5cbb63fd038b4dfa
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 26 04:40:45 2025 +0000

    upstream: Use $OBJ for temp file in maxstartups idempotence test.
    
    Fixes test in -portable when run out-of-tree.
    
    OpenBSD-Regress-ID: 8578be08238af4abe2dc91af1c199f7f71f1a7a2

commit b4ceca952b85752958d849508294afdc56dfcb9f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 26 22:28:13 2025 +1000

    Shorten workflow names to fit in a single line.

commit 9824ec515ed6256c1a98d66049471053f965b75e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 26 22:26:33 2025 +1000

    Update link to oss-fuzz bug tracker.
    
    Remove 9.8 branch.

commit 37d996bd0537837f15fc540d5aebb1ef2faf2268
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Sep 25 22:17:29 2025 +0000

    upstream: Check return codes of sshbuf functions.
    
    Fixes Coverity CIDs 405059 and 405061.
    
    OpenBSD-Regress-ID: defa55d32892172251bbd5efd15731ce55888247

commit 6c3c9f03c3c2cc4e40decbb49b8486abfb9e57df
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 26 08:23:21 2025 +1000

    Replace hand-rolled modulo with arc4random_uniform.
    
    Fixes potential modulo-by-zero UB flagged by Coverity CID 405068

commit e914e61eb88e22e5b725c399698256c54589ca32
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Sep 25 17:50:07 2025 +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@

commit 35f3e2a41c2afe7a68a8a4efb3eb385e7f8d247d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Sep 25 18:06:55 2025 +1000

    Update pledge() interface to match current OpenBSD.
    
    ok djm@

commit 7ce3823547578a3b083085744c1fea39237197a2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 23 22:12:19 2025 +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.

commit 1362f6c0f4ca3306a201a6572bb9ec0d47d8edb3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Sep 25 18:20:53 2025 +1000

    Add #ifdefs in pwfree to match those in pwcopy.
    
    Fixes build on many platforms.

commit 8235dc3d82c0ac347a3600df0907c6573720fbaa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 25 07:05:11 2025 +0000

    upstream: fix some one-off leaks in ssh.c; ok dtucker@
    
    OpenBSD-Commit-ID: bf3c27ffe4b3cccb6553b554ec4c04929065a2bc

commit 846987d1233f24bbe87ebed347e328f45525388a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 25 07:04:38 2025 +0000

    upstream: fix some one-off leaks in ssh-keygen; ok dtucker@
    
    OpenBSD-Commit-ID: 32f51289c93246474659aa49067926fcab9e02e8

commit a1a7df8b3694fdd7b55ad6bb8fa7b3d5d7f5b89a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 25 07:00:43 2025 +0000

    upstream: fix some leaks in ssh-add; feedback/ok dtucker@
    
    OpenBSD-Commit-ID: 441302917de31a128c1d6d63acccc67042fcf349

commit a8a2702bcd9e81a086e6d2c278f1b62f9d8bf3a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 25 06:57:54 2025 +0000

    upstream: fix some leaks; feedback/ok dtucker@
    
    OpenBSD-Commit-ID: 05bdbc2e494b87a4a79e509020bd8249c86a4ff0

commit a071af0682d686de85cf471f5e04deaee4d90adb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 25 06:45:50 2025 +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

commit 4fddebe7f524b3403c876c3b399d5ce7ce3390a6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 25 06:33:19 2025 +0000

    upstream: add some functions to free various structs, including
    
    channels data and packet state; ok dtucker@ tb@
    
    OpenBSD-Commit-ID: a8b3705309d632cdae370d4147a03e703087b0d1

commit d0c1e73d408a24b2db18c0aa1a0108bea0f24210
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 25 06:31:42 2025 +0000

    upstream: fix leaks of config objects in
    
    mm_decode_activate_server_options ok dtucker@ tb@
    
    OpenBSD-Commit-ID: 211f4d7d02e847bd1bcb460f6beb11658809a742

commit b62aa85dcbc8f03bf91d26d14fbf8fd5e172d882
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 25 06:25:38 2025 +0000

    upstream: clarify intent and avoid (harmess, defined behaviour)
    
    unsigned underflow. ok tb@
    
    OpenBSD-Commit-ID: b73bf5f1f381c3e4561a6cc706fb1cd77c939cd8

commit 6f28a935cc7d073e6647643e81d98b5831df204f
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Sep 25 06:23:19 2025 +0000

    upstream: consistently use NULL for null pointer constants found
    
    with sparse, ok djm@
    
    OpenBSD-Commit-ID: 1067504b63732d809d0d57ad4bc626818d112772

commit 0af7e5b690e2cfe8824f04f154b0e543509dbefd
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Sep 25 02:15:39 2025 +0000

    upstream: remove unneeded externs ok djm@
    
    OpenBSD-Commit-ID: fe553193e910a122505142a4e1db7358cc1ae653

commit ae62a16118bb96a8e449ef25f5e55ef86a52cefb
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Sep 25 02:12:16 2025 +0000

    upstream: remove prototype for removed ssh_packet_set_tos() ok
    
    djm@
    
    OpenBSD-Commit-ID: 396f82995074ef4d7b9ce44168266ef4640d9985

commit d8588478850463f8945aa18d0358b2b227f8b57a
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Sep 24 00:51:28 2025 +0000

    upstream: spelling; ok dtucker@
    
    OpenBSD-Commit-ID: 93870117b0153859dd8baa80b97e44d4558c786b

commit eff358890a7cab1e7c2fec62e5b9914d2c1c8703
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 23 16:51:34 2025 +1000

    Merge VM tests into a single workflow file.
    
    Should make it easier to manage, although it may cause a few extra runs.

commit d00015d21190517a1f505eb8120f716b1c2e4055
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 23 16:38:45 2025 +1000

    Test openssl-3.6 branch not beta1.

commit 31fce4fc5aaf79b9a4bccf09467e86c56b482bde
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 23 15:51:14 2025 +1000

    Test openssl-3.6.0-beta1.

commit b94e7251a17a497669e825cb70ac79c96bdc3472
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 23 11:32:57 2025 +1000

    Specify rpath when building OpenSSL.

<<<<<<< HEAD
commit b60b4bb7dd208efa4f22a95738303e8dd5184c39
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 22 17:38:47 2025 -0400

    Typo in servconf.c

commit a45dc2bbaa363447daa839a03336473af286e51e
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 22 16:52:29 2025 -0400

    Screwed up the revert in servconf.
    
    I used the new DSCP values from the 10.1 branch
    instead of the 10.0 current. Annoying mistake

commit 7be4edd2b2a1a952a70a0d4f4792e3a583fb1cbd
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 22 16:45:11 2025 -0400

    Needed to update the documentation for IPQoS

commit 3893444c40501f5ab54319aa463f96de308b5496
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 22 16:30:44 2025 -0400

    Reverted change to srevconf.c IPQoS options.
    
    We should only need to change the IPQoS options for the client
    side to support RFC 8305.

commit 0929ca44b7296320b085fe5803bbd62a69e30bfd
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 22 14:36:05 2025 -0400

    Make beta

=======
>>>>>>> V_10_2_P1
commit 83853aa5e35f3da0690bccd2983764d4e749a670
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 22 15:26:17 2025 +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.

commit 2c1d38f7ffc8b8ec244bfe17ec8a85b3d737dcab
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 22 16:55:49 2025 +1000

    Exclude generated openbsd-compat/include directory.

commit 67b3ed101a18348b564507f55e3ed4b7e0d23ff9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Sep 20 15:07:36 2025 +1000

    Add OpenSSL 3.x ABI cross-compatibility test.

commit c682c9f45a10ee0dc37fd716cfccd42271f92ddc
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Sep 20 15:05:19 2025 +1000

    Add tests for OpenSSL 3.4 and 3.5 versions.

commit 1659d0ac095608b809fd3173d2c48b7b39d40b02
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Sep 20 15:53:04 2025 +1000

    Build OpenSSL with -j4 to speed it up.

commit ca9ac1109e2c875ea33da6818c1841aa2181e962
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Sep 20 15:16:30 2025 +1000

    Rerun tests if run_tests.sh changes.

<<<<<<< HEAD
commit 311b5db3d1b69b4a9b61677cf11514254efd4ad0
Merge: 698575f40 301963eef
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 19 16:48:01 2025 -0400

    Merge pull request #132 from rapier1/feature-fips-mode-check
    
    Disable the parallel AES-CTR cipher under FIPS mode.

commit 301963eef556ff716fe3f56efbae45d26904f96e
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 19 16:41:59 2025 -0400

    Minor change in HPN-README

commit 3b0ecec676dc7d143fbd6f0a4dc74d80c104831b
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 19 16:39:19 2025 -0400

    Typos in comments for misc.c fips_enabled().

commit 9b80ca074dbcd8e8f1aaf76a814ab5659fce6d97
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 19 16:36:41 2025 -0400

    Fix typoes in HPN-README

commit 2734b16e03b761aac2e72a40cccb70ff12ade32b
Merge: 20b3f4001 698575f40
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 19 12:36:13 2025 -0400

    Merge branch 'dev_minor' into feature-fips-mode-check

commit 20b3f4001c3cf250f67f94e25c18574111aa0abc
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 19 12:33:05 2025 -0400

    Delete aclocal.m4 and config.h.in

=======
>>>>>>> V_10_2_P1
commit bc328144f149af07139a0f2c1329018cd85b86b7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 19 01:32:45 2025 +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

<<<<<<< HEAD
commit 698575f40cdf57eadd040361df4dbe6c0289f3e4
Merge: c5b27f6d6 bdc5dcddf
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 18 15:44:16 2025 -0400

    Merge pull request #131 from rapier1/feature-happy-eyes
    
    Feature happy eyes

commit c5b27f6d64eeead3120bfa75aae6539062c51bb4
Merge: 27d8b7e9a bbeeec17f
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 18 15:43:49 2025 -0400

    Merge pull request #133 from rapier1/bug_CI_system
    
    Bug ci system

commit 8e6d3dae0ecae14f5e703611ed8d4a71da3b6f9d
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 18 14:58:03 2025 -0400

    Updated HPN-README. Changed fips_enabled().
    
    fips_enabled() in misc.c originally had debug messages that
    reported if the parallel ciphers were enabled or not. This
    was the wrong place for those messages. They should be in
    session.c and ssh.c when we check the FIPS status.
    
    Also, the function had unclear variable names. These were
    updated to be more descriptive.

commit bbeeec17fa4f909be5da82f2f4cc04111518a0aa
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 18 14:36:18 2025 -0400

    Pull fix for agent-restrict failures of MacOS15 from OpenSSH

commit cb7bc41b6aacf5b3390804afcfecf4c08087ec49
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 18 12:24:21 2025 -0400

    Neglected to add scp-resume.sh to repo. Other
    changes requested from review.

commit fe39a907d1419fb011f9ae1cd457012b90b6cfe7
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 17 17:38:17 2025 -0400

    Whitespace error in c-cpp.yml.
    
    Tabs not allowed in indents.

commit 92189921f7bd139de292f7a6550ac3f08d07c3b8
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 17 16:18:32 2025 -0400

    Remove parallel CC20 from cipher list if not using OpenSSL.
    
    This came up under CI testing with MacOS.

commit 07f058a70454480aa49947fc6ec39a41e64a2cae
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 17 16:13:40 2025 -0400

    Various fixes to resolve problem with the CI tests
    
    These fixes include pushing the SCP resume tests to their
    own test script. They don't work under windows so we now
    skip them.
    
    It also includes a change to the XOR function in cipher-ctr-mt.
    We were trying to do a 64 bit XOR but it was causing UBs in
    some of the CI tests. Until we have that resolved we need to
    stick with 32 bit XORs. Which we *really* need to resolve.
    
    The last major thing was that valgrind was consistently hanging on
    the rekey test (valgrind-5). Using the --fair-sched=try option
    for thread serialization in valgrind resolves that issue.

commit 9736a40c836a845591728b64e92356f52e8de8e1
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 17 15:07:30 2025 -0400

    Disable the parallel AES-CTR cipher under FIPS mode.
    
    While the AES-CTR algorithm is FIPS certified this implementation
    is not. This causes FIPS to automatically error out when the aes-ctr-mt
    cipher is loaded. This can be resolved by using the DisableMTAES options but
    this requires the user to be aware of it and know why FIPS is erroring out.
    This will automatically detect if FIPS mode is enabled on fedora variants that
    write to /proc/sys/crypto/fips_enabled. In the event this entry doesn't exist
    or that we can't read from it we assume that FIPS mode is not enabled and
    we allow parallel ciphers.
    
    This does not apply to the ChaCha20 cipher as the algorithm itself is not
    FIPS validated and it's up to the admin to make sure it's not being
    offered as an option.

commit bdc5dcddf44323fe8081ac8e449a2d33da230225
Merge: 18b6d1f6a 27d8b7e9a
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 17 14:06:52 2025 -0400

    Merge branch 'dev_minor' into feature-happy-eyes

commit 18b6d1f6a5544785ad28b00b09306064ec3c5317
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 17 14:04:05 2025 -0400

    Update HPN-README

commit f26be1c90f75d40b28b8f3a3a83be2156b766397
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 17 13:44:04 2025 -0400

    Added logic to handle the IP QoS issue in commit acd4634f.
    
    We were previously resolving the issue by changing the defaults
    for all connections. We now only change the QoS defaults if
    we are using RRFC 8305.

commit 0a878a79785b66275041e771f140af8b23bd2683
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 17 13:28:09 2025 -0400

    Cleanup up of debug statements. Code review.

=======
>>>>>>> V_10_2_P1
commit 80993390bed15bbd1c348f3352e55d0db01ca0fd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 17 17:41:41 2025 +1000

    Whitespace.

commit fc704057ce6b75637645a4b9c917565b3563e21b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 17 17:33:25 2025 +1000

    Move Gihub VMs to their own status line.

commit 2202e5f9008003044cac01ed70d83deec42ad4e0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 16 23:00:14 2025 +1000

    Use relative URLs for status

commit 7c32e09ea3e5c7e1fa0b7e2d4ddc83f8beadafed
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 15 17:21:15 2025 +1000

    Add VM test targets via vmaction on Github.

commit a4aa090a3d40dddb07d5ebebc501f6457541a501
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 03:00:22 2025 +0000

    upstream: memory leaks in unit tests
    
    OpenBSD-Regress-ID: af11ac7b8034b99ca324af4dae1ef5cd7700b273

commit 6f5942454ad6756355f3b4983ab882cf15e44440
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 05:17:37 2025 +0000

    upstream: fix leaks of struct sftp_conn in scp; ok dtucker@
    
    OpenBSD-Commit-ID: 76bea50b5b87b750c3771bf80feb6067d994a9d2

commit 52f38c76fcb38dfe619d8caa3bb4bb782c785026
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:52:41 2025 +0000

    upstream: leak of principals file lines; ok dtucker@
    
    OpenBSD-Commit-ID: 918bf1b70e5a969059300f3c23d45911690d9015

commit b9464cee0fd084d89d91696a17b3621b4cf512bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:52:12 2025 +0000

    upstream: leak of authentication options at exit; ok dtucker@
    
    OpenBSD-Commit-ID: ba559799c2ff9b10afc3abefb1797c0843a6ff24

commit 0bb37080c86674de7cdfb56c80add3cd316c68a8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:51:35 2025 +0000

    upstream: memleak of keys not used for authentication; ok
    
    dtucker@
    
    OpenBSD-Commit-ID: ddfda79d243150fbd382d8f2cd75a90a072b3669

commit ee99f6e93e0ee90eedbd27ffb9b7f9fef7b98010
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:50:42 2025 +0000

    upstream: memleak of certificate path; ok dtucker@
    
    OpenBSD-Commit-ID: 90dc5390f2756ba339e2e6df54d4b8651d64c1e7

commit 42fc6b6f9fbf58293b070f4de377c7695c275a8a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:49:41 2025 +0000

    upstream: memleak of hostkey when downgrading host cert->key; ok
    
    dtucker
    
    OpenBSD-Commit-ID: f6f1f38a8ec144fb615434f6877066cf4610b826

commit bc60bd55cbc1f8139c840668733b51475cbefd93
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:49:00 2025 +0000

    upstream: memleak of editline history; ok dtucker@
    
    OpenBSD-Commit-ID: a244c54eb074cf7fbe28f7ac4f03ace270f7a999

commit ee77ab9b2ca2d70daf8d4352f5daffa8036ece64
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:48:29 2025 +0000

    upstream: memleak of rfwd callback context; ok dtucker@
    
    OpenBSD-Commit-ID: 70b2aafeaace90703dd16a44a2a0b723d9155f33

commit 0088b3f0ab2c615ae95b9f374963abaa0ab837ec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:47:49 2025 +0000

    upstream: memleaks of request packet and hostkeys blob; ok
    
    dtucker@
    
    OpenBSD-Commit-ID: 313b13a8e36b4ca8e064ee56792e67e0670a386a

commit d68451a25808c4eee74b898873cd4761f73651ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:41:20 2025 +0000

    upstream: memleak of KRL revoked certs struct; ok dtucker
    
    OpenBSD-Commit-ID: f319868e0b2de49c41c735e75b87c403f009f5f9

commit 67940cc2f329427d3acb64d4893faf4527e58d5c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:40:34 2025 +0000

    upstream: memleak of kex->server_sig_algs; ok dtucker@
    
    OpenBSD-Commit-ID: 41a3f64edd2c9b8addb2e445514ae25c24819e2c

commit fae8e41741d23298c94a1ea3ef8704a1cc186cb5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:39:58 2025 +0000

    upstream: fix memleak of channel forwarding permissions; ok
    
    dtucker@
    
    OpenBSD-Commit-ID: 069745547109bc8fcc09fab5b19c53599cae99fd

commit 03872018c14ed943bc01a4e88be59195a742f106
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:39:15 2025 +0000

    upstream: when merging auth options into the active set, don't
    
    leak the old struct sshauthopt; ok dtucker@
    
    OpenBSD-Commit-ID: c6bfd7bc2932e37f811b3c53272c3b919d33e75b

commit efed5da4ced88170cf474246eff771dd16c7092f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 15 04:38:00 2025 +0000

    upstream: fix memleak when applying certificate options; ok
    
    dtucker
    
    OpenBSD-Commit-ID: 36c219dcc05f4df82a0f9c500bdf5dbfea925289

commit edc601707b583a2c900e49621e048c26574edd3a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 11 07:23:32 2025 +0000

    upstream: disable ssh-add autoexpiry of certificates when testing
    
    expired certificates
    
    OpenBSD-Regress-ID: 64aadd23d37fd0b3a06498151f2cf83be7ac342c

commit c60153e4878f3a6700af69adbdd1863003e78abf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 11 07:22:37 2025 +0000

    upstream: correct getopt() string
    
    OpenBSD-Commit-ID: 05ef9581a3dab32ec93aa5b9c3349ed1e7da9ec8

commit 7a4738af45201c115a9e20f830f30ed38ce6be76
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 11 03:29:58 2025 +0000

    upstream: need time.h for time(3)
    
    OpenBSD-Commit-ID: 530964039cccab679432b6c5b28d2b0aa9760b00

commit 0c719c6aabc061f02a907fc96c390d0449b49f26
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 11 02:54:42 2025 +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

commit e9dcccc3541b0ae1c43581ed26215d5cc82e4be0
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Mon Sep 8 00:31:54 2025 +0000

    upstream: remove unused 0-sized files; ok deraadt@
    
    OpenBSD-Commit-ID: 7e8178786157e863f6ff63c5d55200d7b6b04f9e

commit d16b1b484a024ee6b35094e7d9d55bf96b96253b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 5 10:34:35 2025 +0000

    upstream: Tabs->spaces. Removes diff vs portable.
    
    OpenBSD-Commit-ID: 06598021a9f08188dab29ac956b2baa002a0ff85

commit 3d8ae7f235b96da604b08c44ae83420e367eeab4
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 8 12:53:10 2025 -0700

            modified:   regress/rekey.sh
            Fix for when building out of tree.

commit 54abadd3f286efea0dbbdbfea8011d5e1e30c074
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Sep 7 13:35:22 2025 +1000

    Accept OpenSSL 4.0.0-dev versions.
    
    They seem to work, at least for now.

commit 67a8bf4e4057597170bfa923fe2ce5bf90c43974
Author: Maxim Khon <fjoe@samodelkin.net>
Date:   Mon Aug 18 12:05:42 2025 +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.

commit 3ca274e44cb2c2351376fc14e4c3e92ba4a8f87b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 21:32:30 2025 +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.

commit ee32a36c62424f13907023595bfa8b23a528ced1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 5 10:23:55 2025 +0000

    upstream: Order includes as per KNF and add time.h. Removes diff
    
    vs portable.
    
    OpenBSD-Commit-ID: 38043f0bfa17c48ef6d1a744c2834b4405bc9311

commit 0ac179c9540e2b05b4c1194db69ce01306c253d3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 5 10:17:21 2025 +0000

    upstream: Order headers as per KNF. Removes diff vs portable.
    
    OpenBSD-Commit-ID: 4df519fd9fa13ce9653adf7a3d1076e20591d886

commit e80322284f3ee70b6b760a9f83179470d675e5ba
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 5 10:01:35 2025 +0000

    upstream: Order headers as per KNF.
    
    OpenBSD-Commit-ID: 7156b69b0364c68e181e0f6fa17c0f05c72e8670

commit bb8ac0515e68cab63db2d026eb60127185a3d2b8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 20:39:16 2025 +1000

    Resync header order with upstream.

commit 024b694249482698b0c73d24da0eaec696fca8c8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 20:37:04 2025 +1000

    Resync header order with upstream.

commit aed6a958bc108faab64bc2855d6ed93894cfc6ff
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 20:30:20 2025 +1000

    Sync includes with upstream.

commit 22cfd2dd32f34f0cea218dd651f3aa9544b6e3b5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 20:26:14 2025 +1000

    Move ssh-pkcs11.h include to match upstream.

commit b34c16bc4cac2962cc6a7517efbc4fed2c8a2d9a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 20:20:27 2025 +1000

    Reorder includes to match upstream.

commit 441a8fa9a0178704bce497bff92ca43fcf04bf7a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 5 09:58:08 2025 +0000

    upstream: Order headers as per KNF. Removes diff vs portable.
    
    OpenBSD-Commit-ID: db72be57429418f6a4319bbe34c98fc103e11ce0

commit 19d6a7afb256c4afc571dbf56a013ef91cd9596f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 5 09:49:26 2025 +0000

    upstream: Order headers as per KNF. Also removes diff vs
    
    -portable.
    
    OpenBSD-Commit-ID: 2061307dc938712e524bc9da48a52f545e43670e

commit 932e9f200bd48b7568eb21ec456c67ec92d517e2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 5 09:31:31 2025 +0000

    upstream: Remove unused rmd160.h header. ripemd160 support was
    
    removed in 2017.
    
    OpenBSD-Commit-ID: 937fca21498b921adf6e04bac120f4a2e7975b3c

commit f93de828b9b0f29bff51d38ea92d0759595ec30b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 20:07:16 2025 +1000

    Create replacement nlist.h if needed.
    
    Remove #ifdef HAVE_NLIST_H wrapper.  ok djm@

commit 6aac2beaa53467e83f6a137376b6dcf423ab6f6c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 19:55:20 2025 +1000

    Create replacement endian.h if needed.
    
    Remove #ifdef HAVE_ENDIAN_H wrapper.  ok djm@

commit a60721c894f0a2ce973876d0f55617e187e6fab1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 19:52:48 2025 +1000

    Add /* WITH_OPENSSL */ comments.
    
    Removes diffs vs upstream.

commit c729a833298d9d55ffb22771cf1400dfdc640164
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 19:22:37 2025 +1000

    Move sys/time.h include to match upstream.

commit caa973dd06a7be43c29353b256c9a473f5ad9882
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 19:13:52 2025 +1000

    Create replacement netgroup.h if needed.
    
    Remove #ifdef HAVE_NETGROUP_H wrapper.  ok djm@

commit 7d30526b7df14d960a5de63d6af823ffdab86518
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 18:24:59 2025 +1000

    Remove stray #endif left from previous.

commit 4911f2600fdbb1959311bb1886bfe51f7dd4a74e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 18:08:51 2025 +1000

    Create replacement libgen.h if needed.
    
    Remove #ifdef HAVE_LIBGEN_H wrapper.  ok djm@

commit 65dcdb56f5daee519ec824ae17e64412d2492f90
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 18:05:15 2025 +1000

    Create replacement sys/un.h if needed.
    
    Remove #ifdef HAVE_SYS_UN_H wrapper.  ok djm@

commit 60334af5a908ac3b263d2ec696f9977e20b739cb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 18:03:55 2025 +1000

    Reformat replacement header check one per line.

commit cd9ba068e36b0f37374d2eba2d19dacc7ea9a167
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 17:55:33 2025 +1000

    Create replacement time.h if needed.
    
    Remove #ifdef HAVE_TIME_H wrapper.  ok djm@

commit ea586edbcbec7089f768ed682a79a399eaa1e5b1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 17:50:18 2025 +1000

    Create replacement sys/stat.h if needed.
    
    Remove #ifdef HAVE_SYS_STAT_H wrapper.  ok djm@

commit 59b80707c6cf45230597a800e7d2ce6b00ce35b5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 17:44:07 2025 +1000

    Create replacement sys/time.h if needed.
    
    Remove #ifdef HAVE_SYS_TIME_H wrapper.  ok djm@

commit 82fed5110fe09e9af258a8f5a2f92ffb397fff5b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 17:31:15 2025 +1000

    Create replacement ifaddrs.h if needed.
    
    Remove #ifdef HAVE_IFADDRS_H wrapper.  ok djm@

commit 53887d8ebc583b51e996cb2bdeb11e054d36343b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 17:27:43 2025 +1000

    Create replacement util.h if needed.
    
    Remove #ifdef HAVE_UTIL_H wrapper.  ok djm@

commit 5f09983d1e724097bd577097fb0f2c00c2436f21
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 17:24:50 2025 +1000

    Create replacement paths.h if needed.
    
    Remove #ifdef HAVE_PATHS_H wrapper.  ok djm@

commit d45b17dc5a0598dda2b11dc89598203408d2d59c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 17:17:52 2025 +1000

    Create replacement poll.h if needed.
    
    Remove #ifdef HAVE_POLL_H wrapper.  ok djm@

commit 9b2c5a2db0650e394597839ef00d797f57568937
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 5 17:06:14 2025 +1000

    Fill in missing system header files.
    
    Create replacement header files inside openbsd-compat for common headers
    that are missing on a given platform.  Usually these are just empty,
    but in some cases they'll include the equivalent file.  This avoids
    having to wrap those includes in '#ifdef HAVE_FOO_H' and reduces the
    diff vs OpenBSD.
    
    If we create any such headers, add the path to includes.
    
    Initially just stdint.h, more to follow.
    
    ok djm@

commit f64701ca25795548a61614d0b13391d6dfa7f38c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 4 03:04:44 2025 +0000

    upstream: repair test after changes to percent expansion of usernames
    
    on the commandline.
    
    Test more cases that should/shouldn't expand and lightly test
    username validity checks.
    
    OpenBSD-Regress-ID: ad4c12c70bdf1f959abfebd1637ecff1b49a484c

commit 45698669d49949868b1f3d13dfda1b7cb70060ad
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 4 00:37:10 2025 +0000

    upstream: unit tests for sshbuf_equals and sshbuf_dtourlb64; ok
    
    deraadt@
    
    OpenBSD-Regress-ID: bab54e2d4caa813036a63ee67e92c93e6712a5b9

commit 4be445116f1b56f14254b98d8b132bb25777e160
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 4 00:34:17 2025 +0000

    upstream: unit tests for a bunch of misc.c functions; ok deraadt@
    
    OpenBSD-Regress-ID: 886cf142605405e777ee77a96b48694dc2e9235d

commit e3699ff47df336f57da2e78188d0057f8368af56
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 4 00:32:31 2025 +0000

    upstream: fix sshbuf_dtourlb64() to not choke on empty buffers;
    
    previously it incorrectly returned an error in this situation; ok deraadt
    
    OpenBSD-Commit-ID: e62773d6e8cb95a19aab54f0af0edbcd47b345c0

commit 8e85ad33cfcc71e03594e53f2e19d8ce2e27dcc6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 4 00:31:49 2025 +0000

    upstream: fix rtrim() function to not attempt to delete whitespace
    
    inside a string, just at the end. ok deraadt@
    
    OpenBSD-Commit-ID: d44deaa43580cd88de978dd5509b14e905b67b84

commit 43b3bff47bb029f2299bacb6a36057981b39fdb0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 4 00:30:06 2025 +0000

    upstream: don't allow \0 characters in url-encoded strings.
    
    Suggested by David Leadbeater, ok deraadt@
    
    OpenBSD-Commit-ID: c92196cef0f970ceabc1e8007a80b01e9b7cd49c

commit 35d5917652106aede47621bb3f64044604164043
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 4 00:29:09 2025 +0000

    upstream: Improve rules for %-expansion of username.
    
    Usernames passed on the commandline will no longer be subject to
    % expansion. Some tools invoke ssh with connection information
    (i.e. usernames and host names) supplied from untrusted sources.
    These may contain % expansion sequences which could yield
    unexpected results.
    
    Since openssh-9.6, all usernames have been subject to validity
    checking. This change tightens the validity checks by refusing
    usernames that include control characters (again, these can cause
    surprises when supplied adversarially).
    
    This change also relaxes the validity checks in one small way:
    usernames supplied via the configuration file as literals (i.e.
    include no % expansion characters) are not subject to these
    validity checks. This allows usernames that contain arbitrary
    characters to be used, but only via configuration files. This
    is done on the basis that ssh's configuration is trusted.
    
    Pointed out by David Leadbeater, ok deraadt@
    
    OpenBSD-Commit-ID: e2f0c871fbe664aba30607321575e7c7fc798362

commit f38a552dc71f20df2544338099e3fe2563f1a9ca
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 3 09:42:39 2025 +1000

    missing header

commit cc4eb3d6943cb57e08ab3abbcf92644deb429e46
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 2 11:08:34 2025 +0000

    upstream: simplify algorithm list functions using xextendf(); ok
    
    dtucker@
    
    OpenBSD-Commit-ID: ffc5f8d0c25b95705a8a66c8b634f98d23bd92dc

commit 8866d24cdd1d6e73bb3220b753f94e255c49ff96
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 2 11:04:58 2025 +0000

    upstream: unit test for xextendf()
    
    OpenBSD-Regress-ID: ddb3b4db1a52dda23696b967470882fe2b9c3af7

commit 2f369d3fd0ff3715c2b32dff5cb35c0330272445
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 2 09:41:23 2025 +0000

    upstream: fix comment on sshbuf_froms() - it *returns* an error
    
    code, the allocated buffer is passed via argument
    
    OpenBSD-Commit-ID: b2b0a76df71328f39c3e2ad941a4d87085d8335d

commit 6fd93060bb2ec35a7f0bf96d1a74104bab49e017
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 2 09:40:19 2025 +0000

    upstream: GssStrictAcceptor was missing from sshd -T output; fix
    
    OpenBSD-Commit-ID: 6014049ccfedc48a208e37d5488ade6bdc2d1c44

commit d94a9a8c54e9036961c1100c6f445c50ab9b6b40
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 19:38:39 2025 +1000

    portable-specific comment grammer/spelling fixes

commit a0b095fa03d3c08d723a803ce25540fddd955c53
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 2 09:34:48 2025 +0000

    upstream: grammar and typos in comments
    
    OpenBSD-Commit-ID: de954daffcd0147ce142d55e8a374810cd19d7ed

commit 23a2bb750547a9a5251cbc44c5ceb1d05303befe
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 19:30:07 2025 +1000

    replace remaining manual logging of __func__
    
    Use the appropriate log macro that prepends the function name
    (e.g. logit_f/debug2_f/etc).

commit a9b0b69f15e63bc4e8c8b38e24ee85ea076a7e11
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 2 09:26:21 2025 +0000

    upstream: replace remaining cases where we manually included __func__
    
    in a debug or error log with the respective *_f log variant
    
    OpenBSD-Commit-ID: 46a280d78bcc0bc98f28e65a30b613366600328f

commit 19f7cb39eecb4b8f768f37e8294dc3a9142e022b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 1 23:55:29 2025 +0000

    upstream: test MaxStatups idempotency; ok dtucker@
    
    OpenBSD-Regress-ID: b5d713c2709000fa5e41d82c0cf8627e13cb43f9

commit c357c4a1e626feba9a968b5f0cb832b989b2d433
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 21 05:55:30 2025 +0000

    upstream: benchmark more diffie-hellman-group* KEXs
    
    use current KEX names, i.e. remove the "@openssh.com" where the KEX
    has been standardised
    
    OpenBSD-Regress-ID: a67e9da4efd9a971d39cb2481093f836046f9b7f

commit 9313233a735733821dfd170b70782fb7da492962
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 2 01:03:43 2025 +0000

    upstream: fix previous
    
    OpenBSD-Commit-ID: 09d95dfb5e064a1d0e74afba8d77474cc1d110a4

commit 683d0abe596b069a896f1688f86256f1beeb0cdc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 1 23:53:16 2025 +0000

    upstream: Make MaxStartups and PerSourceNetBlockSize first-match-wins
    
    as advertised. bz3859 reported by jan.v.hofmann; ok dtucker
    
    OpenBSD-Commit-ID: 08f7786f1b3b4a05a106cdbd2dc5f1f2d8299447

commit a9a3f025d76f06a6601e6e8d52b468ec467865d9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 29 03:50:38 2025 +0000

    upstream: remove experimental support for XMSS keys;
    
    ok deraadt markus
    
    OpenBSD-Commit-ID: 38eaf4df6189acad9e46eddf7cf32d7f6d07df35

commit 908e9d55139bed19ed87d6fec749974eb42702c6
Author: caspar@openbsd.org <caspar@openbsd.org>
Date:   Mon Aug 18 18:39:33 2025 +0000

    upstream: ssh_config.5: say "post-quantum" instead of "post quantum
    
    safe", and rephrase the sentence to make it easier to read.
    
    Input djm@, input and OK deraadt@, OK dtucker@
    
    OpenBSD-Commit-ID: c3ee4d1cafdcfc20cc0d2f086021efce4b19c075

commit ceca966bde4ab38b2434876416da12fe16747459
Author: job@openbsd.org <job@openbsd.org>
Date:   Mon Aug 18 09:16:36 2025 +0000

    upstream: Delete unused accessor function
    
    OK dtucker@
    
    OpenBSD-Commit-ID: 93b59ac088fb254e1189729ece5bb9656d6e810b

commit 3ef1a87d0a29eac94f32371af628e81eb2e2d817
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 18 17:00:26 2025 +1000

    Fix pledge(2) special casing
    
    Unbreaks non-OpenBSD platforms

commit 5e9ca80fe65e407428dc46ed45804724d08b91b7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 18 16:47:23 2025 +1000

    Match version instead of groups in connect-bigconf
    
    The connect-bigconf makes a giant config file to test config passing
    between the sshd subprocesses. Previously it used a bunch of "Match
    group" lines to construct a large file. However checking group
    membership can be expensive (e.g. if a large groups database is
    present or if group lookup is remote via NSS). This could be slow
    enough to exceed LoginGraceTime.
    
    This switches it to "Match version" which is just a string compare
    and does just as well for making a giant nonsense config file.

commit 6c84609e5f9ddd49e250d5cf190b2820dbeca178
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 18 16:47:00 2025 +1000

    depend

commit 9184fa363687fcb5dac056b093fb3b8e9d327242
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 18 16:45:15 2025 +1000

    check for setsockopt IP_TOS in OpenBSD pledge
    
    OpenBSD has recently relaxed the pledge(2) sandbox to allow some
    setsockopt options to be changed without the "inet" promise.
    
    This adds compatibility for OpenBSD that predates this relaxation.

commit ae44cd74f3a4ac711152f50b2712803ccf785593
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 18 04:50:35 2025 +0000

    upstream: cast
    
    OpenBSD-Commit-ID: d69bd2328513c2dcd99f4f346b77e2bd90cf1964

commit c2c8bae39380392449ac3297061cbfc486126ad5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 18 04:38:21 2025 +0000

    upstream: missing set_log_handler() call in ssh-auth.c, exposed after
    
    last commit
    
    OpenBSD-Commit-ID: 09f5c3cf33c18b8ad321edbf96c30ae3deada2b0

commit 056022261e6cf7eb65bbacac72afe5f4d5945f2c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 18 14:22:32 2025 +1000

    depend

commit b7ee13fbbb4ebafcf71f29685f053ecb97d1bcef
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 18 14:22:18 2025 +1000

    wrap SIGINFO in ifdef

commit 289239046b2c4b0076c14394ae9703a879e78706
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 18 03:43:01 2025 +0000

    upstream: Make ssh(1) and sshd(8) set IP QoS (aka IP_TOS, IPV6_TCLASS)
    
    continually at runtime based on what sessions/channels are open.
    
    Previously, ssh(1) and sshd(8) would pick a QoS value when they
    were started and use it for the whole connection. This could
    produce suboptimal choices for the QoS value, e.g. for multiplexed
    sessions that started interactive but picked up a sftp client,
    or sessions that moved large amounts of data via port forwarding.
    
    Now the QoS value will change to the non-interactive IPQoS whenever
    a "non-interactive" channel is open; basically any channel that lacks
    a tty other than agent forwarding.
    
    This is important now that the default interactive IPQoS is EF
    (Expedited Forwarding), as many networks are configured to allow
    only relatively small amounts of traffic of this class and they will
    aggressively deprioritise the entire connection if this is exceeded.
    
    NB. because ssh(1) and sshd(8) now change IP_TOS/IPV6_TCLASS
    continually via setsockopt(), this commit requires a recent pledge(2)
    change that landed recently in the OpenBSD kernel. Please ensure
    you have updated to a kernel from within the last two weeks before
    updating OpenSSH.
    
    with job@ deraadt@
    
    OpenBSD-Commit-ID: 325fc41717eecdf5e4b534bfa8d66817425b840f

commit dc5147028ff19213a32281dad07bba02e58da3fa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 18 03:29:11 2025 +0000

    upstream: SIGINFO handler for sshd(8) to dump active
    
    channels/sessions ok deraadt@
    
    OpenBSD-Commit-ID: 9955cb6d157c6d7aa23a819e8ef61b1edabc8b7d

commit f807a598c96be683d97810481e954ec9db6b0027
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 18 03:28:36 2025 +0000

    upstream: SIGINFO handler for ssh(1) to dump active
    
    channels/sessions ok deraadt@
    
    OpenBSD-Commit-ID: 12f88a5044bca40ef5f41ff61b1755d0e25df901

commit 9b61679d73a8a001c25ab308db8a3162456010cf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 18 03:28:02 2025 +0000

    upstream: add channel_report_open() to report (to logs) open
    
    channels; ok deraadt@ (as part of bigger diff)
    
    OpenBSD-Commit-ID: 7f691e25366c5621d7ed6f7f9018d868f7511c0d

commit 80b5ffd22abd4093201939e31d1ea6dc8cc7913a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 18 01:59:53 2025 +0000

    upstream: make -E a no-op in sshd-auth. Redirecting logging to a
    
    file doesn't work in this program as logging already goes via the parent
    sshd-session process. ok dtucker@
    
    OpenBSD-Commit-ID: 73325b9e69364117c18305f896c620a3abcf4f87

commit 3a039108bd25ff10047d7fa64750ed7df10c717c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 18 13:46:37 2025 +1000

    allow some socket syscalls in seccomp sandbox
    
    Allow getsockname(2), getpeername(2) and getsockopt(2).
    
    Also allow setsockopt(2) but only IP_TOS and IPV6_TCLASS.
    
    Note that systems that use the older socketcall(2) mux syscall will
    not have IP_TOS and IPV6_TCLASS allowlisted. On these platforms,
    these calls will be soft-blocked (i.e. will fail rather than
    terminate the whole process with a sandbox violation).
    
    Needed for upcoming IPQoS change; ok dtucker@

commit a00f5b02e171bc6d6fb130050afb7a08f5ece1d8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 18 13:44:53 2025 +1000

    handle futex_time64 properly in seccomp sandbox
    
    Previously we only allowed __NR_futex, but some 32-bit systems
    apparently support __NR_futex_time64. We had support for this
    in the sandbox, but because of a macro error only __NR_futex was
    allowlisted.
    
    ok dtucker@

commit 32deb00b38b4ee2b3302f261ea1e68c04e020a08
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Aug 14 10:03:44 2025 +0000

    upstream: Cast serial no for %lld to prevent compiler warnings on some
    
    platforms.
    
    OpenBSD-Commit-ID: afadd741622f16c6733d461c0d6053ed52868a57

commit 883886c959ecab152650e231335857eb3193c662
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Aug 14 09:44:39 2025 +0000

    upstream: Cast serial no for %lld to prevent compiler warnings on some
    
    platforms.
    
    OpenBSD-Commit-ID: 46c6063284d318f7e4dc922479a3e394c94b0588

commit fde5a4d2cd01bea700439fa6d5bbad88e65c99bd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Aug 14 09:26:53 2025 +0000

    upstream: Cast serial no for %lld to prevent compiler warnings on some
    
    platforms.
    
    OpenBSD-Commit-ID: 15644234b58abc9c6da2994f0422a5aa344a9e89

<<<<<<< HEAD
commit 27d8b7e9a5500ff36fad33f1aa60dfecb5af73e2
Merge: 7351c8c41 e3d333cda
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Aug 13 12:47:45 2025 -0400

    Merge pull request #128 from rapier1/dev_minor
    
    Fixes to CI system

commit e3d333cda1e557bf8b02dd1ba1b329bc98f63ee7
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Aug 13 11:07:06 2025 -0400

    Remove AWS-LC and Boringssl tests.

=======
>>>>>>> V_10_2_P1
commit ab5074dfb614e3801fecbd376d8ed4cea613c629
Author: sthen@openbsd.org <sthen@openbsd.org>
Date:   Tue Aug 12 11:09:48 2025 +0000

    upstream: fix typo, ok markus dtucker
    
    OpenBSD-Commit-ID: 8f223da7633752162c64a659c6cf55202703d870

commit 8b6c1f402feb9eb6438003a312d7ffe8d5669896
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Mon Aug 11 14:37:43 2025 +0000

    upstream: Handle localtime_r() failure by return "UNKNOWN-TIME"
    
    which is only used in user-visible contexts.  freebsd 288773 shows their
    localtime_r() has failed at least once for unknown reason. discussed with djm
    
    OpenBSD-Commit-ID: 68f4c92d46b2578d4594b0ed940958d597fd61ac

<<<<<<< HEAD
commit a06d2d823ec1fa3784b0e17d4c4f37c26f723fd0
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Aug 12 17:29:55 2025 -0400

    Whitespace typo on line 19 in c-cpp.yml

commit 3e6d0b6fec1a43830c1a2c4593d8b56e6c86ce54
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Aug 12 17:27:57 2025 -0400

    Neglected to update cifuzz.yml, github-repo-stats.yml, and FUNDING.yml

commit 40b5261926c31e1c78fca582b4bb6497597868b1
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Aug 12 17:24:46 2025 -0400

    Revised CI files resolve prior failures.
    
    Something changed in the CI system and a lot of tests run against
    Ubuntu 24.04/latest were failing. This turned out to be an issue
    with the CI files. I pulled a new copy from OpenSSH and they seem to
    work now,

commit 314144316a46cff915826ad7b4121f9c419045fd
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Aug 12 16:12:28 2025 -0400

    Starting over from scratch with the latest CI tests from OpenSSH

commit 2ffc4d7bcbdb071a4cc616c784bcd968436eee9e
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Aug 12 15:57:48 2025 -0400

    Might have been a whitespace error on line 168

commit b541cccaff68175525a172235b344cf7efe772e7
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Aug 12 15:55:33 2025 -0400

    Hunting down a typo on line 21.
    Not sure what the issue is.

commit e021e230756858f55030290192d2818c4be810b0
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Aug 12 15:51:00 2025 -0400

    Had tabs in the workflow file. That's not allowed

commit 6bca5a385e3e9535e789107bbda49cca6330c565
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Aug 12 15:41:59 2025 -0400

    Trying to update the CI system.

=======
>>>>>>> V_10_2_P1
commit 0e1b8aa27f7c86d412c9e54ad9e2cae30d9ddab4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 11 10:55:38 2025 +0000

    upstream: ssh(1): add a warning when the connection negotiates a
    
    non-post quantum safe key agreement algorithm.
    
    Controlled via a new WarnWeakCrypto ssh_config option, defaulting
    to on. This option might grow additional weak crypto warnings in
    the future.
    
    More details at https://openssh.com/pq.html
    
    mostly by deraadt@ feedback dtucker@ ok deraadt@
    
    OpenBSD-Commit-ID: 974ff243a1eccceac6a1a9d8fab3bcc89d74a2a4

commit 2ebc6384258b58ace0ad2adb2593744f62749235
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 6 23:44:09 2025 +0000

    upstream: all state related to the ssh connection should live in
    
    struct ssh or struct packet_state; one static int escaped this rule, so move
    it to struct packet_state now.
    
    ok millert tb
    
    OpenBSD-Commit-ID: bd6737168bf61a836ffbdc99ee4803468db90a53

commit 60b909fb110f77c1ffd15cceb5d09b8e3f79b27e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Aug 6 11:22:53 2025 +0000

    upstream: Improve sentence. ok djm@
    
    OpenBSD-Commit-ID: 9c481ddd6bad110af7e530ba90db41f6d5fe2273

commit 9ffa98111dbe53bf86d07da8e01ded8c5c25456b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 6 04:53:04 2025 +0000

    upstream: when refusing a certificate for user authentication, log
    
    enough information to identify the certificate in addition to the reason why
    it was being denied. Makes debugging certificate authz problems a bit easier.
    
    ok dlg@
    
    OpenBSD-Commit-ID: 4c4621b2e70412754b3fe7540af8f4bf02b722b1

commit 2a31009c36eb2da412c2784fe131fcb6ba800978
Author: job@openbsd.org <job@openbsd.org>
Date:   Tue Aug 5 09:08:16 2025 +0000

    upstream: Use the operating system default DSCP marking for
    
    non-interactive traffic
    
    It seems the CS1 traffic class mark is considered ambiguous and therefore
    somewhat unhelpful (see RFC 8622 for more considerations). But, the new
    'LE' scavenger class (also proposed in RFC 8622) offers high probability
    of excessive delays & high packet loss, which would be inappropriate
    for use with, for example, X11 forwardings. In fact, it is not known to
    SSH what's appropriate because SSH is not aware of the content of what
    passing through session forwardings. Therefore, no marking is appropriate.
    Non-interactive traffic simply is best effort.
    
    OK djm@ deraadt@
    
    OpenBSD-Commit-ID: db1da1a432ecd53fc28feb84287aedb6bec80b01

commit 6ebd472c391a73574abe02771712d407c48e130d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 5 04:00:15 2025 +0000

    upstream: a bunch of the protocol extensions we support now have RFCs
    
    and I-Ds that are more complete and detailed than what we have in the
    PROTOCOL.* files. Refer to these when possible instead of documenting them
    here.
    
    OpenBSD-Commit-ID: 4fa5b0fcf5d5f24093d33d9e82c7ca4850d50d70

commit ec3465f59c651405e395092f3ad606f8992328d8
Author: job@openbsd.org <job@openbsd.org>
Date:   Thu Jul 31 11:23:39 2025 +0000

    upstream: Deprecate support for IPv4 type-of-service (TOS) IPQoS
    
    keywords
    
    Type of Service (ToS) was deprecated in the late nineties and replaced
    with the Differentiated Services architecture. Diffserv has significant
    advantages for operators because this mechanism offers more granularity.
    
    OpenSSH switched its default IPQoS from ToS to DSCP values in 2018.
    
    IPQoS configurations with 'lowdelay', 'reliability', or 'throughput' will be
    ignored and instead the system default QoS settings apply. Additionally, a
    debug message is logged about the deprecation with a suggestion to use DSCP.
    
    with/OK deraadt@ sthen@ djm@
    
    OpenBSD-Commit-ID: 40c8c0c5cb20151a348728703536af2ec1c754ba

commit 65909fa114e7dd7511800db2b7bacb8774afe887
Author: job@openbsd.org <job@openbsd.org>
Date:   Thu Jul 31 09:38:41 2025 +0000

    upstream: Set default IPQoS for interactive sessions to Expedited
    
    Forwarding (EF)
    
    Marking interactive session data with DSCP value EF (RFC3246, RFC3247)
    helps inform the network on relative priority compared to other traffic.
    This is especially useful for differentiated treatment over wireless media.
    
    Following the reconciled IETF Diffserv to IEEE 802.11 mappings (RFC 8325),
    traffic marked with DSCP value EF maps to User Priority 6 in QoS Control,
    in turn mapping to the high priority WMM AC_VO access category.
    
    OK djm@
    
    OpenBSD-Commit-ID: aadda7b9da794d70d7c6b381a861a0610afce1b3

<<<<<<< HEAD
commit 8ea78abd81e8eb2be94c522a8258f4d44b58b6da
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Aug 4 16:30:57 2025 -0400

    Test

commit cb988e646e0f5edac307732721ae74c755b72334
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Aug 4 16:29:20 2025 -0400

    Test

=======
>>>>>>> V_10_2_P1
commit d1c6c67a50fc957010fa027c6ab970424e9b9142
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 2 14:49:00 2025 +1000

    Disable security key tests for bigendian interop

commit e85248df3f1073343da87a6b00512e6a1e4a863d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 2 12:51:42 2025 +1000

    Comment out atime restore test.
    
    This works on filesystems mounted 'noatime', but on others the stat()
    resets atime causing the test to fail.

commit b1c4cedbee107dc611ce091f27ea9f1de28ee378
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 1 19:29:00 2025 +1000

    Replace fbsd64ppc VM with physical host.
    
    Run 64bit bigendian interop test on NetBSD arm64be instead.

commit 284abbed9a8d815b1ec5e96aff885d77e26537e7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jul 30 10:17:13 2025 +0000

    upstream: Plug leak in case where sigp is passed as NULL. Coverity CID
    
    483725, ok djm@
    
    OpenBSD-Commit-ID: 47cf7b399c84e102b670b9f97ab6926c9a7256b5

commit dc630e6d81be8aa495254839731e4f3521cf9e31
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 30 04:27:42 2025 +0000

    upstream: unbreak WITH_OPENSSL=no builds, also allowing ed25519
    
    keys to be used via PKCS#11 when OpenSSH is built without libcrypto.
    
    OpenBSD-Commit-ID: ecf26fdf7591bf2c98bac5136fbc36e0b59c3fc2

commit a5bec2cdfc4f38ddb6211809851aae29ba99a35a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 30 04:19:17 2025 +0000

    upstream: fix variable name in disabled code
    
    OpenBSD-Commit-ID: 5612e979575d5da933c8b720d296423fd84392f5

<<<<<<< HEAD
commit af892368c8d61109303f23019550fbc5a4517b48
Merge: acd4634fa e97b21de4
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 29 15:54:35 2025 -0400

    Added HappyDelay option.
    
    This is a runtime option to specify the delay between
    starting the IPv6 connection and the IPv4 connection.
    The default is 250ms as per RFC 8305. This must be a
    positive integer. 0 or negative values will be rewritten
    to a value of 1ms.
    
    Updated documentation to include HappyEye options.

commit acd4634fabc8431e31b0630ea0c8b29ca230eefd
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 29 13:57:54 2025 -0400

    Happy Eyeballs was being hammered by IPQoS defaults
    
    The default IPQoS for SSH had changed from
    interactive = lowdelay
    bulk = throughput
    to
    interactive = af21
    bulk = cs1
    
    The result of this being that in test scenarios, where we used
    tc qdisc to insert delay on IPv6, the IPv4 connections ended up
    having the same effective delay as the IPv6. This meant that we'd
    always end up using the IPv6 connection even though IPv4 was
    not being delayed. I don't really understand DSCP enough to undertand
    why this is happening but this might be a test artifact. In any case,
    being that both IPv4 and IPv6 had the same effective delay the IPv6
    connection would always end up winning the race because of the
    250ms pause between the IPv6 and IPv4 attempts.
    
    This commit stil lhas too many debug statements in it but
    it works for testing.

=======
>>>>>>> V_10_2_P1
commit 5e4bfe6c16924b1c21a733f3e218cfcba98e301e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 26 19:19:46 2025 +1000

    more ec/ed25519 fixing

commit 2603098959eff55cbe188c3dfcbe5302808a80fc
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 26 14:27:53 2025 +1000

    repair build for libcrypto without ed25519 support

commit a729163c56ecc002c0cb04db56e7d86ceec2e8b0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 26 01:53:31 2025 +0000

    upstream: regression tests for Ed25519 keys in PKCS#11 tokens
    
    OpenBSD-Regress-ID: 50067c0716abfea3a526b4a0c8f1fe15e7665c0f

commit 361ff0ca308ac02449e71689fc5ea72114db43db
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 26 01:51:44 2025 +0000

    upstream: Support ed25519 keys hosted on PKCS#11 tokens.
    
    Tested on Yubikeys and against SoftHSM2.
    
    feedback/ok tb@
    
    OpenBSD-Commit-ID: 90ddb6529f2e12e98e8bba21d8592e60579ce2e4

commit 2b530cc3005a71c5ba6b712978872fc9c147439c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 25 13:06:07 2025 +0000

    upstream: update our PKCS#11 API header to v3.0;
    
    feedback/ok tb@
    
    OpenBSD-Commit-ID: e67fa6a26e515c2b1fb7b0d1519d138aafb3e017

<<<<<<< HEAD
commit e97b21de4a46b644c8bf81fe2f3dcbe3b76d3d6f
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jul 25 16:03:59 2025 -0400

    checkpoint

commit dad70e503a51f1511576bcc05e419dea989696f1
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jul 25 13:24:37 2025 -0400

    Checkpoint

=======
>>>>>>> V_10_2_P1
commit 550d2a4a66c50f7641563a63b900761d99efb24a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 25 23:04:33 2025 +1000

    another attempt at fixing !EC builds

commit ed1e370d84e9dc39bc31c19cca12222d991fdc6f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 25 11:50:45 2025 +0000

    upstream: Don't snprintf a NULL since not all platforms support it.
    
    OpenBSD-Commit-ID: 6e0c268e40047e96fab6bc56dc340580b537183b

commit eedab8db12d57c4f4583f6b60e48a4ce25b47b9c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 25 16:21:43 2025 +1000

    unbreak !EC builds

commit 203f5ac6cfa0e257db7509d4bb830e8a4bba6211
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 24 06:04:47 2025 +0000

    upstream: test code now needs to link ssh-pkcs11-client.c any time
    
    sshkey.c is included
    
    OpenBSD-Regress-ID: 9d07188eae9a96801c3150b3433bb220626d4443

commit 33b4f05c8ddab24aa6c47afb313b8cbd0d4b77f4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 25 12:47:17 2025 +1000

    update clang-16 -> clang-19

commit 03e9e993ef1ef5accc6457152278cab5988f9b3d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 25 12:46:59 2025 +1000

    include ssh-pkcs11-client.o as common dep

commit 2f5269938a8e4769f484c9d45419a86529078ede
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 25 12:46:10 2025 +1000

    remove vestigial stub

commit bf33a73c40522ce60961d4fff316a7187fb06ca0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 24 23:27:04 2025 +0000

    upstream: this should include stdlib.h explicitly
    
    OpenBSD-Commit-ID: 1c0cc5c3838344b33ae4ab7aa62c01530357bf29

commit 9f8ccc3b81b53324cc489f3fe00f03c329c0acb2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 24 06:59:51 2025 +0000

    upstream: less stale reference to PKCS#1 1.5 hash OIDs; feedback
    
    from tb@
    
    OpenBSD-Commit-ID: 9fda77978491a130a7b77d87d40c79277b796721

commit 1641ab8744f500f55f12155d03f1a3116aaea374
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 24 06:12:08 2025 +0000

    upstream: factor out encoding of a raw ed25519 signature into its
    
    ssh form into a separate function
    
    OpenBSD-Commit-ID: 3711c6d6b52dde0bd1f17884da5cddb8716f1b64

commit a8c0e5c871c0c7ee5ae93e353b1499a53c09c71d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 24 05:44:55 2025 +0000

    upstream: Help OpenSSH's PKCS#11 support kick its meth habit.
    
    The PKCS#11 code in OpenSSH used the libcrypto public key method API
    (e.g. the delightfully named RSA_meth_free()) to delegate signing
    operations to external keys. This had one advantage - that it was
    basically transparent to callers, but also had a big disadvantage -
    that we'd manually have to track the method implementations, their
    state and their relationships to the underlying PKCS#11 objects.
    
    This rips this out and replaces it with explicit delegation to
    PKCS#11 code for externally hosted keys via the ssh-pkcs11-helper
    subprocess. This is very similar to how we handle FIDO keys in
    OpenSSH (i.e. via ssh-sk-helper). All we need to track now is a
    much simpler mapping of public key -> helper subprocess.
    
    Kicking our libcrypto meth dependency also makes it much easier
    to support Ed25519 keys in PKCS#11, which will happen in a subsequent
    commit.
    
    feedback / ok tb@
    
    OpenBSD-Commit-ID: a5a1eaf57971cf15e0cdc5a513e313541c8a35f0

<<<<<<< HEAD
commit 89b88357b88e9913c2ca03f0d5b9c5ccab5935e1
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jul 24 12:12:40 2025 -0400

    Checkpoint

=======
>>>>>>> V_10_2_P1
commit 259c66aebe4e1f9d60e548f728ff74083bcccddf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 24 22:02:49 2025 +1000

    Remove DEBUG_ACTIONS variable.
    
    If needed it can be set in github if needed.

commit 40fb2dc4ece76c8f0c624d90a17bc1bbf47f3729
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 23 05:07:19 2025 +0000

    upstream: add a ssh_config RefuseConnection option that, when
    
    encountered while processing an active section in a configuration file,
    terminates ssh(1) with an error message that contains the argument to the
    option.
    
    This may be useful for expressing reminders or warnings in config
    files, for example:
    
    Match host foo
           RefuseConnection "foo is deprecated, use splork instead"
    
    ok djg
    
    OpenBSD-Commit-ID: 5b0072fcd08ad3932ab21e27bbaa66b008d44237

commit defc806574d2256036d69a291caf0f3484844de6
Author: miod@openbsd.org <miod@openbsd.org>
Date:   Sat Jul 12 05:28:33 2025 +0000

    upstream: Add missing inter-library dependencies to LDADD and
    
    DPADD. ok tb@ deraadt@
    
    OpenBSD-Commit-ID: a05e13a7e2c0b65bb4b47184fef731243431c6ff

commit e6805e2a6b33e001e1a7257b85ab779fd592a578
Author: Jan Tojnar <jtojnar@gmail.com>
Date:   Thu May 18 16:30:35 2023 +0200

    Add gnome-ssh-askpass4 for GNOME 40+
    
    GTK 3 has been in maintenance mode for a while now, and it is on the road
    to being abandoned. As a result, the dialogue looks out of place on modern
    systems.
    
    We could port it to GTK 4 but without the program being registered as an
    application (i.e. having a .desktop file), GNOME Shell would ask for
    permission to grab input every time.
    
    Let’s instead use the GNOME Shell’s native prompt through the unstable
    Gcr API.

commit f9dc519259804702cab0fa0ca8b193a360e3ec38
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 11 17:20:27 2025 -0700

    let ga_init() fail gracefully if getgrouplist does
    
    Apparently getgrouplist() can fail on OSX for when passed a non-existent
    group name. Other platforms seem to return a group list consisting of
    the numeric gid passed to the function.
    
    This makes ga_init() handle this failure case gracefully, where it will
    return success but with an empty group list array.
    
    bz3848; ok dtucker@

commit f01a899b92ab8c5e6ff71214658bd09636c47e87
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 11 23:26:59 2025 +0000

    upstream: add a "Match Group NoSuchGroup" to exercise groupaccess.c
    
    OpenBSD-Regress-ID: 7ff58e6f0eb21eb9064dd0cfa78c3b6f34b5f713

commit 1052fa62b35e0bb25b0c1efb9fdd7870e4a68ab6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 11 15:36:49 2025 -0700

    more diagnostics when getgrouplist fails

commit eddd1d2daa64a6ab1a915ca88436fa41aede44d4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 4 09:51:01 2025 +0000

    upstream: Fix mistracking of MaxStartups process exits in some
    
    situations. At worst, this can cause all MaxStartups slots to fill and sshd
    to refuse new connections.
    
    Diagnosis by xnor; ok dtucker@
    
    OpenBSD-Commit-ID: 10273033055552557196730f898ed6308b36a78d

commit c971f3d93efe4c00d73b276cdbab66e7c66c9b5c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 5 20:50:50 2025 +1000

    Add include for gssapi definitions.
    
    Patch from dbelyavs at redhat.com via bz#3846.

commit 007b69f21cf9e64125b241d4411a5e47f5028aa8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 4 07:52:17 2025 +0000

    upstream: add a regress test for configurations > 256KB
    
    mostly by Dmitry Belyavskiy
    
    OpenBSD-Regress-ID: fcedb249e4cf2447e078a839877f99730ee79024

commit 0cf38d74463bcf80510e7fd1b3d9328e7d91eb00
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 4 07:47:35 2025 +0000

    upstream: the messaging layer between sshd-session and sshd-auth had a
    
    maximum message size of 256KB. Some people apparently have configurations
    larger than this and would hit this limit.
    
    Worse, there was no good logging that could help diagnose what was
    going wrong.
    
    So this bumps the maximum message size to 4MB and implements an early
    check (usable via the sshd -t test mode) that will report it to the
    user where it is hopefully more visible.
    
    bz3808, reported by Dmitry Belyavskiy, ok dtucker@
    
    OpenBSD-Commit-ID: 69c303fb68cbd1a4735936835d67a71e7b57f63b

commit fd10cea0f16e928ae2b52fbeadccd475d0438eb4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 4 00:17:55 2025 +0000

    upstream: mux: fix incorrect return value check in local forward
    
    cancellation
    
    channel_cancel_lport_listener() returns 1 on success and 0 on failure.
    The previous code incorrectly checked for `== -1`, a value the function
    never returns, so failure was not detected and the "port not found"
    error message was never shown when cancelling dynamic or local port
    forwards.
    
    From: Boris Tonofa <b.tonofa@ideco.ru>
    
    OpenBSD-Commit-ID: 3e9d2252a4d0bd318d4f25e2b518afb44acea170

commit 29cf521486bf97ab9de5b9b356f812107e0671bc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 13:47:38 2025 +1000

    wrap some autoconf macros in AC_CACHE_CHECK
    
    This allows skipping/overriding the OSSH_CHECK_CFLAG_COMPILE and
    OSSH_CHECK_CFLAG_LINK macros used to discover supported compiler
    or linker flags. E.g.
    
      $ ./configure ossh_cv_cflag__fzero_call_used_regs_used=no
      [...]
      checking if cc supports compile flag -ftrapv and linking succeeds... yes
      checking if cc supports compile flag -fzero-call-used-regs=used and linking succeeds... (cached) no
      checking if cc supports compile flag -ftrivial-auto-var-init=zero... yes
    
    Patch from Colin Watson, ok dtucker@

commit b28e91aff80fd24341de8cb3c34dc454d6b75228
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jun 29 08:20:21 2025 +0000

    upstream: Add shebang path to askpass script. Required for exec on
    
    some platforms (musl, probably others).
    
    OpenBSD-Regress-ID: 35cdeed12ae701afcb812f800c04d817325cd22a

commit 83d3ffc0fc0f5e4473ab43f0d42a1cf9497ce0b5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jun 29 05:35:00 2025 +0000

    upstream: Check dropbear server version for required features.
    
    Dropbear added the '-D' flag in version 2025.87.  We need that for the
    dropbear-server test, so skip on older versions.
    
    OpenBSD-Regress-ID: 9db0b84edd54d3c00ab17db1dc6d62af4644c550

commit 0b17d564cfae82f2a52e9b4d588657da47ea4e43
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jun 29 14:34:48 2025 +1000

    Encrypt temporary password we're setting.
    
    Now that we want to actually use the random password for tests, we need
    to correctly encrypt it, instead of just setting it to a random string
    that's not the "locked" value.

commit 700205bd861c25cc7564010cf63d984d8db5098a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jun 29 11:27:17 2025 +1000

    Fix env again.

commit 223a1beac7b7be9252f69055781c9c15f4d8a607
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jun 29 11:24:42 2025 +1000

    Move env again.

commit d32614b448528ac08a65caac323a34b4f559a204
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jun 29 11:22:00 2025 +1000

    Move env to where it (hopefully) belongs.

commit 8a9384de483b8fb69a800e0347273686a5715fc3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jun 29 11:14:18 2025 +1000

    Enable password tests on Github ephemeral VMs.

commit bcfe7340d9b622ecd978c87dbf885c8b5a503ca2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jun 28 13:34:08 2025 +0000

    upstream: Add simple regression test for dropbear as a server.
    
    OpenBSD-Regress-ID: 7abe1f6607d0cd49839918aade8f135d2462d389

commit 838d5ec4b12fb519ed9db76e5beccf11b7ee212f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 24 12:28:23 2025 +0000

    upstream: Add simple test for password auth. Requires some setup
    
    so does not run by default.
    
    OpenBSD-Regress-ID: d5ded47a266b031fc91f99882f07161ab6d1bb70

commit 57fb460165ae3b2d591f2468d7fe13cc1abda26d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 17 01:24:32 2025 +0000

    upstream: add RCS ID
    
    OpenBSD-Regress-ID: 6e30094e3bf0a1c65efb75c67a87093304a3e619

commit 688fa02728f2efbf18388bc1a8e94e7ba7ee4f11
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 24 09:22:03 2025 +0000

    upstream: make "Match !final" not trigger a 2nd pass ssh_config
    
    parsing pass (unless hostname canonicalisation or a separate "Match final"
    does). bz3843
    
    ok dtucker@
    
    OpenBSD-Commit-ID: ce82b6034828888f0f3f1c812e08f5e87400d802

commit 5ba8391d697740a838fd8811434f707f0e079baa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 19 05:49:05 2025 +0000

    upstream: better debug diagnostics when loading keys. Will now list
    
    key fingerprint and algorithm (not just algorithm number) as well as making
    it explicit which keys didn't load.
    
    OpenBSD-Commit-ID: ee3e77a0271ab502e653922c6d161b1e091f8fee

commit b360f3a675e24b0dbb2ec30d985e3b6756996c0d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 17 01:20:17 2025 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: 6e96814bcf70d0edbb0749ec61cc4fd8707f286d

commit ad38ec5f1b6768944d64ed7709da8706538b5509
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 17 01:19:27 2025 +0000

    upstream: fix leak on error path; Coverity CID 481976
    
    OpenBSD-Commit-ID: 963dba2c804e2fd8efea2256092899874d0dbc7b

commit 5f761cdb2331a12318bde24db5ca84ee144a51d1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jun 17 21:46:37 2025 +1000

    Update obsd tests to use current images.

commit 1e8347e3543a415067ccc556aefea97656ecafb7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 17 09:48:47 2025 +1000

    add sshd-auth to RPM spec files

commit dd800444943bd64913507f6005586136d49f63db
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 16 09:09:42 2025 +0000

    upstream: Limit each moduli size to a max of 100 entries.
    
    OpenBSD-Commit-ID: 747219d54565030ff7c45298b9f5e971801f6cb2

commit 05f7bf46d1e2c101e9cbdd3df2ccee484bed969f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 16 09:07:08 2025 +0000

    upstream: Now that ssh-keygen defaults to the maximum memory for
    
    moduli generation we no longer need to run it twice to get enough.  Use mkdir
    -p instead of a conditional, which allows "make -jN" to work without error.
    
    OpenBSD-Commit-ID: c2eb57285424f819f9520fa33e0d6d3c4a361a5e

commit df3f903d616763a105570610a616dacf0f83438e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 16 09:02:19 2025 +0000

    upstream: Fix overflow check in sshbuf_dup_string. It's already
    
    constrained by SSHBUF_SIZE_MAX, but still worth fixing the check.  Patch from
    afonot via github PR#573, with & ok djm@
    
    OpenBSD-Commit-ID: 438888498e66472fc6a48133196d6538d27bff18

commit 80916d0d3794e2f92dd6998d7c45daba484e4f18
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 16 08:53:04 2025 +0000

    upstream: Plug mem leak. Patch from afonot via github PR#574, ok djm@
    
    OpenBSD-Commit-ID: 65619f14ef206028ce39bc31f704b832a0609688

commit bd1bd7e8296aa51a4b3958cef2fbb17894ba94e9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 16 08:49:27 2025 +0000

    upstream: Save return value from sshbuf_len instead of calling it
    
    multiple times. Fixes Coverity CID 470521.
    
    OpenBSD-Regress-ID: 356b8b43c8a232deaf445c1ff7526577b177a8e9

commit 2827b6ac304ded8f99e8fbc12e7299133fadb2c2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 13 07:35:14 2025 +0000

    upstream: Plug leak. Coverity CID 405058.
    
    OpenBSD-Regress-ID: 7fb2fce68d2cb063cdb94d5d66f84fa3a2902792

commit 9cdc72b829e9f0e24dedc533cbe87291d8a88c9e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 13 07:23:07 2025 +0000

    upstream: Remove dead code flagged by Coverity CID 307783. ok djm@
    
    OpenBSD-Regress-ID: e579f5ec2fd2eb2fe2bad654d16f2ba655a3e035

commit 930a45ee759728c8ba711c45a2a985b8191bd297
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 12 10:09:39 2025 +0000

    upstream: Set user, host and path to NULL immediately before calling
    
    parse_user_host_path in tests.  This ensures that we don't accidentally use
    the previous value if the function under test doesn't set them Also fixes
    Coverity CIDs 405056 405065 405066.
    
    OpenBSD-Regress-ID: 43678ff59001712f32214fe303b1c21c163c2960

commit 2314d87f9b8b430532111fd6e5e8df0cf9068c9c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 12 09:26:57 2025 +0000

    upstream: Plug mem leak on error path here too.
    
    Coverity CID 307781.
    
    OpenBSD-Regress-ID: 18e053d9b661fbb4227d3db03172077c1216bb2e

commit 567ef4e7ddc5c1e7a461560963a1dc759669821d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 12 09:19:43 2025 +0000

    upstream: Plug mem leak on error path.
    
    Coverity CID 307776.
    
    OpenBSD-Regress-ID: c44246690973e1b8643e51079a2faa7ace26490c

<<<<<<< HEAD
commit 5bed099db6051a03b6f9dea6110658cea97b5867
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Jun 11 17:11:50 2025 -0400

    Comments in happyeyeballs.c

=======
>>>>>>> V_10_2_P1
commit 5d415897ac04e237f1fa73b9dcb9ba8fb3ac812b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 11 13:27:11 2025 +0000

    upstream: Remove dead code ternary. We always report at least
    
    KB/s, so B/s is never used.  Coverity CID 291809, ok djm@
    
    OpenBSD-Commit-ID: a67c5bcc9e19c8965bfeace0e337b13660efa058

commit 4b3d27032ba88dd089b721f3bbe3e4a8d23b4ae1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 11 13:24:05 2025 +0000

    upstream: Improve termination condition of while loop to compare
    
    size_t's.  Assuming read() does what it's supposed to this shouldn't matter,
    but should be more robust.  Flagged by Coverity CID 470514, ok djm@
    
    OpenBSD-Commit-ID: d7b5ad60feb797b3464964b9ea67fd78fb9d6cc6

commit 5530e5f83b3cd3425ea3dbab02da15140befdd91
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jun 10 18:40:56 2025 +1000

    Replace Windows 2019 runners with 2025 ones.
    
    The windows-2019 runners are being decomissioned.

commit a22ff3c6f11edd00c19981f9cb85d3b25d305a56
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 4 18:33:52 2025 +1000

    Disable _FORTIFY_SOURCE during snprintf test.
    
    Prevents mistakenly detecting snprintf as broken on FreeBSD 15 with
    _FORTIFY_SOURCE enabled.  bz#3809, patch from jlduran at gmail.com

commit 203bb886797677aa5d61b57be83cfdc1b634bc9c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 2 14:09:34 2025 +0000

    upstream: Fix x11_channel_used_recently() to return true when channel
    
    has been used within the last second, instead of more than a second ago.
    Should fix ~5s delay on X client startup when ObscureKeystrokeTiming is
    enabled. bz#3820, ok (& sigh) djm@
    
    OpenBSD-Commit-ID: b741011e81fb3e3d42711d9bd3ed8a959924dee4

commit dc6c134b48ba4bcfadedcea17b4eddac329601d9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu May 29 13:27:27 2025 +0000

    upstream: When there's more than one x11 channel in use, return
    
    lastused of most recently used x11 channel instead of the last one found. ok
    djm@
    
    OpenBSD-Commit-ID: 94a72bf988d40a5bae2e38608f4e117f712569fe

commit 73ef0563a59f90324f8426c017f38e20341b555f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat May 24 11:41:51 2025 +0000

    upstream: replace xmalloc+memset(0) with xcalloc(); from AZero13 via
    
    GHPR417
    
    OpenBSD-Commit-ID: 921079436a4900325d22bd3b6a90c8d0d54f62f8

commit 3a61f5ed66231881bee432c7e7c6add066c086af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat May 24 09:46:16 2025 +0000

    upstream: fix punctuation around host key fingerprints to make them
    
    easier to copy and paste.
    
    Patch from Till Maas via GHPR556; ok dtucker@
    
    OpenBSD-Commit-ID: c0100182a30b6925c8cdb2225b18140264594b7b

commit b12d4ab1e16f57c6c348b483b1dbdd4530aaaddd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat May 24 08:13:29 2025 +0000

    upstream: Replace strncmp + byte count with strprefix in Penalty
    
    config parsing. ok kn@, djm@
    
    OpenBSD-Commit-ID: 34a41bb1b9ba37fb6c7eb29a7ea909547bf02a5a

commit a356d978e30dd9870c0b3a7d8edca535b0cd2809
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat May 24 08:09:32 2025 +0000

    upstream: Make the display number check relative to
    
    X11DisplayOffset.
    
    This will allows people to use X11DisplayOffset to configure much higher
    port ranges if they really want, while not changing the default behaviour.
    Patch from Roman Gubarev via github PR#559, ok djm@
    
    OpenBSD-Commit-ID: e0926af5dc0c11e364452b624c3ad0cda88550b5

commit e18983d03ab969e2f12485d5c0ee61e6d745a649
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 24 17:20:57 2025 +1000

    Remove progressmeter.o from libssh.a.
    
    It's now explicitly included by the binaries that need it (scp & sftp).
    bz#3810, patch from jlduran at gmail.com

commit f8967045ad9d588bc11426642070bf8549065e62
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat May 24 06:50:28 2025 +0000

    upstream: Null out keys between test runs.
    
    BENCH_START and BENCH_FINISH are actually a while() loop in disguise,
    so if sshkey_generate does not reset the key pointer on failure the test
    may incorrectly pass.  It also confuses Coverity (CID 551234).
    
    OpenBSD-Regress-ID: bf4d32079fc6df6dce1f26c2025f4ed492f13936

commit a26091ecdb2a3d72b77baf3c253e676a3c835a24
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat May 24 04:41:12 2025 +0000

    upstream: add some verbosity
    
    OpenBSD-Regress-ID: 11c86cda4435b5f9ab6172c4742b95899666c977

commit 484563ec70e30472ab4484d49bca9a83771d785c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat May 24 04:41:03 2025 +0000

    upstream: use start_ssh_agent() to ensure we get logging
    
    add some verbosity
    
    OpenBSD-Regress-ID: a89bf64696b9fb1b91be318e6b8940c9ab21c616

commit e3c58113ebb3397b252ff26e0e94f726b7db7a8a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat May 24 04:40:37 2025 +0000

    upstream: add a start_ssh_agent() function that sets up an agent
    
    with logging
    
    OpenBSD-Regress-ID: 7f9f30f9c64acbd4b418a5e1a19140cc988071a8

commit 3de011ef7a761751afe28ac7ef97fe330d784595
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat May 24 06:43:37 2025 +0000

    upstream: Plug leak of startup_pollfd in debug and child paths.
    
    Coverity CID 405024, ok djm@
    
    OpenBSD-Commit-ID: db46047229253e9c4470c8bbf5f82706ac021377

commit d0245389bc55f16082cadd0a39dda5af1c415dfa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 24 17:11:38 2025 +1000

    ssh-keygen changes were fixup'ed into single commit.

commit 140bae1df2b7246bb43439d039bf994159973585
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:   Mon Sep 30 13:14:11 2024 +0200

    auth-pam: Check the user didn't change during PAM transaction
    
    PAM modules can change the user during their execution, in such case ssh
    would still use the user that has been provided giving potentially
    access to another user with the credentials of another one.
    
    So prevent this to happen, by ensuring that the final PAM user is
    matching the one that initiated the transaction.

commit 216824172724a50a4a75439fb2b4b8edccf5b733
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat May 24 03:37:40 2025 +0000

    upstream: Remove ssh-keygen's moduli screen -Omemory option.
    
    This vaguely made sense 20 years ago, but these days you'd be hard
    pressed to *find* a machine small enough to not support the maximum
    (127MB), and no one is screening moduli on such machines anyway,
    so just use the max.  This also fixes Coverity CID 470522 by deleting
    code in question.  "kill it with fire" djm@.
    
    OpenBSD-Commit-ID: 39036aa406a99f0a91923aa3a96afff1205558e6

commit f5cd14e81fa29b4924959cb2e1f9c206aae2d502
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat May 24 02:33:33 2025 +0000

    upstream: Fix compile error on 32bit platforms.
    
    Spotted by & ok tb@
    
    OpenBSD-Commit-ID: cbcf518247886f3c7518fc54cb3bd911ffc69db7

commit eccc15014fe146e8590568e6737a3097bfac3415
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat May 24 02:01:28 2025 +0000

    upstream: Use pointer from strprefix in error message,
    
    missed in previous.
    
    OpenBSD-Commit-ID: d2cdec6cf0fcd4b0ee25e4e3fad8bc8cf0ee657d

commit 91903511d0597c3bea218167f9ca5a176fa0dc20
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 23 12:52:45 2025 +0000

    upstream: Replace strncmp and strncasecmp with hand-counting bytes
    
    with strprefix. nits lucas@, ok lucas@ djm@
    
    OpenBSD-Commit-ID: f0888807f151ea2bdaf6fed36303ae81f259d1d4

commit 0c64d69e4e24a3ab06f7922ef389e7399c4dfb88
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 23 11:54:50 2025 +0000

    upstream: Include stdint.h for UINT32_MAX.
    
    OpenBSD-Commit-ID: edc29ed67e8bd03bac729d9b4849066d1d3a8cb9

commit 3e11478f585408888defa56fa47e8dc6567378d0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 23 11:25:35 2025 +0000

    upstream: Ensure args to nh_update() fit within uint32, which it
    
    should always anyway. Placates Coverity CID 470520.  While there, fix the
    upstream URL.  ok djm@
    
    OpenBSD-Commit-ID: 2478e89fde089a49fa02f9faf6287d35959c9f92

commit f097d7bd07da4634c1a723d1dc4fcf56e7d0e147
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 23 09:26:25 2025 +0000

    upstream: Don't leak the args list. Coverity CIDs 481569 & 481570,
    
    ok job@ tb@.
    
    OpenBSD-Commit-ID: becabcd00513d13d1435b68b7ccffa7151b72393

commit a4ea7f6042f25b41061a83445016a1ea4f470f7b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 23 08:40:13 2025 +0000

    upstream: Explictly set LC_ALL=C on each sort invocation.
    
    Remove it from sshd_config (where it could be overridden by shell startup
    scripts, eg on macos-15) causing random test failures.  with & ok djm@
    
    OpenBSD-Regress-ID: ad0a6678964784096e9a9e6d15ead36beed92f18

commit 7674c03caed80cb3565d14690c92068a14051967
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 23 16:39:18 2025 +1000

    Allow setting LTESTS in repo variables.

commit d8b5bd36078e5b6d78da4633f0cc9b90ffda8b50
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 23 16:26:20 2025 +1000

    Rename debugging variable RUN_ONLY_TEST.
    
    to RUN_ONLY_TARGET_CONFIG to make it more obvious what it matches.

commit a79a2c1190bd3124da21d9e1582dd94877c7f972
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 23 16:11:48 2025 +1000

    chown regress logs before uploading.

commit 24889a33071086b6f1f62568b0c2bd0a4955ac49
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 23 01:14:35 2025 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: 07e29dc891e29b31e03e2e5493658b4a9ac19431

commit 4b8bee62d72ffb3c419c9ead6c9fb1a586283868
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri May 23 00:40:45 2025 +0000

    upstream: use "const char * const" for malloc_options here also
    
    OpenBSD-Commit-ID: 869715b9c7e1dd5b85efd07814e7e53f0286eea2

commit 6629eee21ca9d0a597a04dcac744a1ad882f912e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu May 22 12:14:19 2025 +0000

    upstream: Adjust debug message to prevent (unsigned) integer overflow.
    
    Fixes Coverity CID 481110, ok djm@
    
    OpenBSD-Commit-ID: 26178bf3b812707fb498ea85d076cadd1f2eb686

commit 7acb70e05e9977ceca7b33df84ceaea337b1efef
Author: bluhm@openbsd.org <bluhm@openbsd.org>
Date:   Thu May 22 04:34:18 2025 +0000

    upstream: Fix OpenBSD RCS ID typos. from Andrius V
    
    OpenBSD-Regress-ID: 5c03a2ef5323969fc4978f2eec4f1a25c48c572a

<<<<<<< HEAD
commit 24f3d646c2cefa7000aa15d534257a5dc3676457
Merge: 99aa50a16 88052b186
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu May 22 14:37:44 2025 -0400

    trying o fix a merge issue

commit 99aa50a16f21d393c35932623f6a1f04825dc04f
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu May 22 14:34:26 2025 -0400

    Added copright notice and comments to happyeyeballs.[c|h]
    
    I also forgot to add those files to the commit.

commit e834ed893a2dfee24798e3fbf104a239a37e62dd
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu May 22 14:18:05 2025 -0400

    Move Happy Eyeballs functions to separate file happyeyeballs.c.
    
    The makes the happy_eyeballs function public so we can use it elsewhere
    if necessary. It also reduces the code complexity in sshconnect.c.

=======
>>>>>>> V_10_2_P1
commit 2b2a7a2a0d70023b439080bb2770ff36522dbea8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 22 22:09:48 2025 +1000

    Remove debug change accidentally commited.
    
    Fixes Coverity CID 481160.

commit 450a8a1df1577ddbe68fe8da1fb8514d3781ef32
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 22 21:16:37 2025 +1000

    Collect all of regress dir on failure.
    
    This may allow us to sort through its entrails and determine the cause
    of some types of failures.

commit de25e739781c4c09d20abd410f50f0a6f192dc72
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 22 18:42:44 2025 +1000

    minimal shims for fstatat(2)/unlinkat(2) in agent
    
    Add some very minimal and task-specific replacements for
    fstatat(2) and unlinkat(2) in the ssh-agent socket cleanup
    loop, for platforms that lack these functions. ok dtucker@

commit 6d192645a613aa814d51050b0458f37265b90d6c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu May 22 04:22:03 2025 +0000

    upstream: Output the current name for PermitRootLogin's
    
    "prohibit-password" in sshd -T instead of its deprecated alias
    "without-password".  bz#3788, patch from cjwatson at debian.org.
    
    OpenBSD-Commit-ID: 2d5df18d5ad33a9b6c7547ec78a8e6ea13813df9

commit 1ccf42378df202472e7254f37f7dabb2f5723955
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu May 22 03:53:46 2025 +0000

    upstream: Copy arg to be passed to dirname().
    
    POSIX allows dirname() to modify its args and return a pointer into it,
    so this prevents an overlapping strlcpy.  bz#3819, patch from cjwatson
    at debian.org
    
    OpenBSD-Commit-ID: c32e496e6a1618aba31c8b7a9d4e1376c5ea6aa1

commit b5877b7b3e597f47578ade9dbe7e4332f112dfc4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu May 22 03:41:10 2025 +0000

    upstream: Add $OpenBSD$ marker for easier syncing.
    
    OpenBSD-Commit-ID: 27ff3e1e2e6610d9981ebe43ae9b783236800035

commit 58d094c7cb974d7bd3ba6eb1059b186a2ac3dd55
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 21 12:12:20 2025 +0000

    upstream: Correct FILES section to mention new default path to
    
    agent sockets. Spotted by / ok jmc@
    
    OpenBSD-Commit-ID: 91d736d78d71a4276c9cbb075b1462bbc3df55a6

commit d1d5c8b9b8de8283618c18d0dafdec6a209911cc
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 22 12:25:35 2025 +1000

    Fix nc install some more.

commit 49a2412ad23162e44be9e0b2cb12f6daf6b666d7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 22 12:21:11 2025 +1000

    Fix cvs up of nc.

commit df22801b3f0ae245f825cf9c9dbb4543e41a7c5c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 22 11:34:04 2025 +1000

    Install nc during upstream test.
    
    This ensures that the installed nc matches the expectations of the
    regress tests.

commit e391c5289c2b687ff886cf780dc8fcb426e4d5d2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 22 10:52:31 2025 +1000

    Remove 9.7 branch from CI status page.
    
    It's been obsolete long enough that github no longer reports its
    status.

<<<<<<< HEAD
commit d62a21d9831b49007d172a455a98fd81862fcf51
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed May 21 16:52:20 2025 -0400

    Add RFC 8305 compliance to HPN-SSH.
    
    This is a patched based on one written by
    Kim Minh Kaplan and submitted to OpenSSH in 2018.
    This implements *some* features of RFC 8305 but,
    significnatly, does not do asynchronous DNS queries.
    It is currently only implemented for direct and proxy
    connections as found in sshconnect.c. This is the first
    version of the patch and is not in its final form. Eventually
    the RFC 8305 methods will be moved their own file and the
    necessary methods made public for use elsewhere in the
    code base.
    
    Note: the regression test is of dubious value as the
    tests happen on localhost. It's mostly to ensure that
    any connection can take place rather than testing the
    functionality of the imeplementation. This will likely
    change in future versions.

commit 88052b1865d612bfd2fd6438961fe6aec38b608e
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed May 21 16:52:20 2025 -0400

    Add RFC 8305 compliance to HPN-SSH.
    
    This is a patched based on one written by
    Kim Minh Kaplan and submitted to OpenSSH in 2018.
    This implements *some* features of RFC 8305 but,
    significnatly, does not do asynchronous DNS queries.
    It is currently only implemented for direct and proxy
    connections as found in sshconnect.c. This is the first
    version of the patch and is not in its final form. Eventually
    the RFC 8305 methods will be moved their own file and the
    necessary methods made public for use elsewhere in the
    code base.

=======
>>>>>>> V_10_2_P1
commit b71773c20d566fa5dcaf9edf3139bdcb3f2c4bc2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 21 19:14:47 2025 +1000

    pull a small netcat SOCKS4A fix from upstream

commit 0adb2db25eff3fe1c90c55654387ae1e4e18a396
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 21 08:41:52 2025 +0000

    upstream: test SOCKS4A; ok tb
    
    OpenBSD-Regress-ID: d880b75280295cd581a86e39bb0996d347f122d2

commit 5699f4e9553c6a228fd9dc578d99e3aa6451c014
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 21 08:36:39 2025 +0000

    upstream: remove log tarballing "it seemed like a good idea at the
    
    time" - dtucker@
    
    ensure that log files have correct perms when running under sudo/doas
    
    ok dtucker@
    
    OpenBSD-Regress-ID: 20588c14b05de9519f85d638b374b66ae0678c89

commit 0c14e6b69a20f20d602e0e72559ca3f4dbc797fb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 21 06:44:24 2025 +0000

    upstream: use logit_f("...") instead of logit("func: ...")
    
    OpenBSD-Commit-ID: c8d49eb39a9abff3cbcaeaf7df9d48468a5a0695

commit 1743589d038476f28dc4dfb1f69317649ae22ac5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 21 06:43:48 2025 +0000

    upstream: function to make a sshbuf from a hex string; useful in
    
    tests
    
    also constify some arguments
    
    OpenBSD-Commit-ID: 00f9c25b256be0efd73f2d8268ff041bc45ffb2c

commit 83729cf503289104d7e64a69be14579523988cb6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 21 18:47:46 2025 +1000

    merge netcat SOCKS4A support from OpenBSD
    
    Not a full sync of this file as we have diverged substantially
    from upstream (it has libtls support, etc.)

commit 750f1867476bda36879f69e25e8f52cb45c58807
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 20 22:17:02 2025 +1000

    Include OpenSSL compat shim where needed.

commit 6fb728df50c1afd338cb0223a84ce24579577eff
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 20 19:28:55 2025 +1000

    Run all tests on Cygwin again.
    
    ... now that we've fixed ci-setup on Cygwin.

commit 648a3a008cf1cfa54631d2f0457b5313c455f484
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 20 18:48:23 2025 +1000

    Use USERNAME rather than LOGNAME on Cygwin.
    
    LOGNAME is specified by POSIX, but Windows (or at least, github's
    Windows images) don't set it.

commit 0214e53124c09528b6ee29b9a551442b5611a454
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 20 18:28:52 2025 +1000

    Add debug output when setting up CI environment.

commit 9d9a2c0369419f3b4952e597db7b8696f54e7f3a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 20 19:16:38 2025 +1000

    Include openssl compat shims in test.
    
    Fixes tests on platforms using older LibreSSL releases prior to 3.4.

commit 1a9b1cfa4e8b807c7f82fdba8f730c2abdbba071
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 20 18:14:06 2025 +1000

    Add compat shims for EC_POINT affine_coordinates
    
    LibreSSL <3.4 does not have EC_POINT_[gs]et_affine_coordinates
    but does have the now-deprecated _GFp variantes.  We still support
    LibreSSL back as far as 3.2.x so add a compat shim.

commit cff2175200b412a9207a4fe5c1bdcc54e8a73d07
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon May 12 05:42:02 2025 +0000

    upstream: Use EC_POINT_[sg]et_affine_coordinates()
    
    It is available in all supported OpenSSL flavors/versions and the _GFp
    variants will be removed from LibreSSL.
    
    ok hshoexer jsing
    
    OpenBSD-Regress-ID: 66cf1561e7b6c49002978f2d6720956f33a882f0

commit 2d35e24739b515394017b74465a0996c384cf28f
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon May 12 05:41:20 2025 +0000

    upstream: Use EC_POINT_[sg]et_affine_coordinates()
    
    It is available in all supported OpenSSL flavors/versions and the _GFp
    variants will be removed from LibreSSL.
    
    ok hshoexer jsing
    
    OpenBSD-Commit-ID: ecedca0e1ffa80e0c9ef7c787bc6a972882c596b

commit 17003b9f1cd7b7bf1f52493cc4a1ab95727c3ed7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 9 02:42:03 2025 +0000

    upstream: make the progress-meter code safe against being called
    
    when not initialised; spotted by tb@ feedback/ok tb@ deraadt@
    
    OpenBSD-Commit-ID: a9fda1ee08a24c62e0981ff6d15ca93b63467038

commit 2d023e7a95d673e93ccc1978bf8931f7335b2b53
Author: tedu@openbsd.org <tedu@openbsd.org>
Date:   Thu May 8 17:32:53 2025 +0000

    upstream: convert a last quad_t to int64_t. ok deraadt djm
    
    OpenBSD-Commit-ID: 1c9e01ba1a9ccf442a9cdf10f222077f66885f1f

commit fc8c56ade809f66f7df4b5153a4d92593631c12a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 20 15:01:29 2025 +1000

    Set runner pasword to random string.
    
    The most recent version of the Github ubuntu-latest image sets the
    password field to "!" which sshd considers to be a locked account,
    breaking most of the tests.

commit c404686c17daeda7e95ca6fc14c8a4a570cf975d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun May 11 22:54:13 2025 +1000

    Debug log for why an account is considered locked.

commit ee1d31781cf0d292a50b4df4cb8cb6ffcbfbe9af
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun May 11 16:35:31 2025 +1000

    Move debug log output into separate workflow step.
    
    Should reduce the need to scroll back to find out which test actually
    failed.

commit ddfb78a15f57a33427d462b9c401de5c8e6799da
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 10 21:48:06 2025 +1000

    Skip sftp-perm on Cygwin too.

commit 8846caccb86b3f5a4f1c10bfffcc9cf1adc17925
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 10 10:23:30 2025 +1000

    Remove CYGWIN binmode as it's now obsolete.

commit cf795d55437e6c1ffe85e90e0fae00e885e50036
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 10 09:25:18 2025 +1000

    Also skip sftp-cmds test on Cygwin.
    
    Fails at the hardlink step.

commit d1b28639c1cb382943bd92c68992ea74af9b5773
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 10 08:52:11 2025 +1000

    Tell Cygwin to use native symlinks.

commit 56782dad7d7f96b4943951227515bd7904ac3cf7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 10 08:26:37 2025 +1000

    Skip keygen-knownhost test on Cygwin.
    
    It fails but at this time it's not clear why.

commit d5cbac2364b03e55b733a2422a07e78e16d2a118
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 10 07:59:44 2025 +1000

    Pass Cygwin setup location to CI setup.
    
    (instead of hard coding it, wrongly).

commit 82f1f52c5582f005761e4e200c279ddd9c6781e4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 10 06:37:24 2025 +1000

    Add RUN_ONLY_TEST to limit which tests are run.
    
    For testing, you can set the repo variable RUN_ONLY_TEST in your repo
    (Repo -> Settings -> Security -> Actions -> Variables) to run only that test.

commit 140ba45895de8ebfb3e2517b0ddee58729979c29
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 9 19:32:06 2025 +1000

    Move misc-agent.o to LIBSSH_OBJS.
    
    It's needed by the fuzzer.

commit 3357bf2fe2d11b6ed4465c1ed2871bd1099cbbc5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 9 19:08:36 2025 +1000

    Put PRIV_ECDSA back, it's still used.
    
    Should fix oss-fuzz test.

commit f5726215957bb34e18bb872d527845c2f64e2389
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 8 18:56:39 2025 +1000

    Since it's unused, make dirfd() take void *.
    
    Some platforms (eg Old BSDs) in some configurations define DIR to "void
    *", which causes compile errors in the no-op implementation.

commit 1511f113a27d8aafe080aa6493cb3c0cf2b5abe0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 8 11:38:24 2025 +1000

    Add no-op implmentation of dirfd().
    
    Fixes build on pre-POSIX.1 2008 systems.

commit 086369736a9496b39af0d9f09443fa81b59b7f05
Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date:   Wed Apr 16 10:18:34 2025 +1000

    ssh-agent: exit 0 from SIGTERM under systemd socket-activation
    
    When the ssh-agent service is configured to be launched under systemd
    socket-activation, the user can inspect the status of the agent with
    something like:
    
        systemctl --user status ssh-agent.service
    
    If the user does:
    
        systemctl --user stop ssh-agent.service
    
    it causes the `systemd --user` supervisor to send a SIGTERM to the
    agent, which terminates while leaving the systemd-managed socket in
    place.  That's good, and as expected. (If the user wants to close the
    socket, they can do "systemctl --user stop ssh-agent.socket" instead)
    
    But because ssh-agent exits with code 2 in response to a SIGTERM, the
    supervisor marks the service as "failed", even though the state of the
    supervised service is exactly the same as during session startup (not
    running, ready to launch when a client connects to the socket).
    
    This change makes ssh-agent exit cleanly (code 0) in response to a
    SIGTERM when launched under socket activation. This aligns the systemd
    supervisor's understanding of the state of supervised ssh-agent with
    reality.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>

commit 755c3d082e59e6884f28d30e6333a1444e9173d1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed May 7 21:05:06 2025 +1000

    Skip d_type check on platforms that don't have it.
    
    On those, the subsequent stat() should catch the sockets.

commit 207289a5663bdf49903e1aeb938dcc0924e2ac63
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 7 10:44:26 2025 +0000

    upstream: Rename sockaddr_un sun -> sunaddr.
    
    This makes things easier in -portable, where on Solaris an derivatives
    "sun" is defined to "1", causing compilation errors.  ok deraadt@.
    
    OpenBSD-Commit-ID: 0669043afb49856b57b382f0489221bd98305d3b

commit 7cc8e150d51a4545b86d996692b541419b35d1a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 6 06:05:48 2025 +0000

    upstream: remove DSA from the regression/unit test suite too.
    
    OpenBSD-Regress-ID: 4424d2eaf0bce3887318ef6d18de6c06f3617d6e

commit 0404fa799746c283325a463c363436eb152daefc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 15 05:31:24 2025 +0000

    upstream: another missing ifdef
    
    OpenBSD-Regress-ID: 4f71f8f122eac4cbf7f1d2088a9be45317dd3e4a

commit c5dbbe8805caaee132545ab4cffd3b2221e80975
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 15 05:00:13 2025 +0000

    upstream: missing ifdef
    
    OpenBSD-Regress-ID: 7260fb672de5738c17dec06c71a5be0186bb2b09

commit 93e904a673a632604525fdc98b940b7996f1ce54
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 7 04:10:21 2025 +0000

    upstream: memory leak on error path; bz3821
    
    OpenBSD-Commit-ID: 65577596a15ad6dd9a1ab3fc24c1c31303ee6e2b

commit 55b38ff4d7286c8fac2a472da664462e0f2d75e0
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue May 6 15:15:05 2025 +0000

    upstream: test ssh-agent with the -T flag to force the old /tmp
    
    location rather than inside the homedir.  During relink operation,
    /.ssh/agent was created which is surprising.  This test sequence could use
    some improvement so this is a temporary fix. observed by florian, change ok
    semarie
    
    OpenBSD-Commit-ID: c7246a6b519ac390ca550719f91acfdaef1fa0f0

commit a32d28d792567253bb601362f36391f155f8f772
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 6 05:40:56 2025 +0000

    upstream: finally remove DSA signature support from OpenSSH.
    
    feedback/ok tb@, ok deraadt@
    
    OpenBSD-Commit-ID: bfe6ee73c1b676c81a2901030c791f8ec888228f

commit 928f8dcc1bb622c25be409c34374b655d0149373
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 5 05:51:11 2025 +0000

    upstream: Now that there's an I-D for certificate keys, refer to
    
    that instead of the much more basic format description we had previously.
    
    OpenBSD-Commit-ID: cf01e0727a813fee8626ad7b3aa240621cc92014

commit fe883543bece18c975fa53aa02104f0433645d99
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon May 5 05:47:28 2025 +0000

    upstream: - add full stop to the text in -a - move the -U and -u
    
    text to the correct place
    
    OpenBSD-Commit-ID: 2fb484337a0978c703f61983bb14bc5cbaf898c2

commit 5fd6ef297dec23e3574646b6334087131230d0a6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 6 19:01:00 2025 +1000

    Add minimal implementations of fstatat and unlinkat.
    
    Fixes build on some pre-POSIX.1-2008 platforms.

commit d2480827b3ef6ec119965822afdff35d734b2dee
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 6 08:15:34 2025 +1000

    New location of cygwin setup.

commit 57eb87b15bd0343372f99d661ce95efb25a16f1e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 6 08:07:23 2025 +1000

    Boringssl now puts libcrypto in a different place.

commit 61525ba967ac1bb7394ea0792aa6030bcbbad049
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 5 20:45:42 2025 +1000

    Handle systems that don't have st_mtim.
    
    Ignores nanoseconds, but it's checking for >1h old so a few nanoseconds
    shouldn't matter much.  Fixes build on Mac OS X.

commit 27861e9b15151898841097c14ee974c026093131
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 5 19:09:25 2025 +1000

    Supply timespecsub if needed.

commit 7c0e6626e4be53efcfbb92f0c6382a76f1138e38
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 5 19:08:48 2025 +1000

    includes.h for compat, time.h for clock_gettime.

commit 7a7cc3cf721fe7fe9f4925d92bb7c694b8550a7f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 5 18:51:34 2025 +1000

    Cygwin install in back on D:

commit 6ab8133c067a8e91ba69ce7ca04f95b50f2f2d7b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 5 14:59:30 2025 +1000

    depend

commit 12912429cf39cfeca97dd18a8f875ad9824d1751
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 5 03:35:06 2025 +0000

    upstream: missing file in previous commit
    
    OpenBSD-Commit-ID: e526c97fcb2fd9f0b7b229720972426ab437d7eb

commit 80162f9d7e7eadca4ffd0bd1c015d38cb1821ab6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 5 02:48:06 2025 +0000

    upstream: Move agent listener sockets from /tmp to under
    
    ~/.ssh/agent for both ssh-agent(1) and forwarded sockets in sshd(8).
    
    This ensures processes (such as Firefox) that have restricted
    filesystem access that includes /tmp (via unveil(3)) do not have the
    ability to use keys in an agent.
    
    Moving the default directory has the consequence that the OS will no
    longer clean up stale agent sockets, so ssh-agent now gains this
    ability.
    
    To support $HOME on NFS, the socket path includes a truncated hash of
    the hostname. ssh-agent will by default only clean up sockets from
    the same hostname.
    
    ssh-agent gains some new flags: -U suppresses the automatic cleanup
    of stale sockets when it starts. -u forces a cleanup without
    keeping a running agent, -uu forces a cleanup that ignores the
    hostname. -T makes ssh-agent put the socket back in /tmp.
    
    feedback deraadt@ naddy@, doitdoitdoit deraadt@
    
    OpenBSD-Commit-ID: 8383dabd98092fe5498d5f7f15c7d314b03a93e1

commit 566443b5f5d7bc4c5310313b4e46232760850c7a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 5 02:40:30 2025 +0000

    upstream: correct log messages; the reap function is used for more
    
    than just the preauth process now
    
    OpenBSD-Commit-ID: 768c5b674bd77802bb197c31dba78559f1174c02

commit e048230106fb3f5e7cc07abc311c6feb5f52fd05
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 30 05:26:15 2025 +0000

    upstream: make writing known_hosts lines more atomic, by writing
    
    the entire line in one operation and using unbuffered stdio.
    
    Usually writes to this file are serialised on the "Are you sure you
    want to continue connecting?" prompt, but if host key checking is
    disabled and connections were being made with high concurrency
    then interleaved writes might have been possible.
    
    feedback/ok deraadt@ millert@
    
    OpenBSD-Commit-ID: d11222b49dabe5cfe0937b49cb439ba3d4847b08

commit c991273c18afc490313a9f282383eaf59d9c13b9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 30 05:23:15 2025 +0000

    upstream: fix a out-of-bounds read if the known_hosts file is
    
    truncated after the hostname.
    
    Reported by the OpenAI Security Research Team
    
    ok deraadt@
    
    OpenBSD-Commit-ID: c0b516d7c80c4779a403826f73bcd8adbbc54ebd

commit b5b405fee7f3e79d44e2d2971a4b6b4cc53f112e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Apr 20 09:07:57 2025 +1000

    Set Windows permssions on regress dir.
    
    Prevents "unprotected private key file" error when running tests.

commit 76631fdd04824c3e50ea6551d3611b1fe0216a41
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 18 08:18:52 2025 +1000

    Add 10.0 branch to test status page.

commit c627b468d3b99e487e2b24c90958ae57e633d681
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 18 08:14:16 2025 +1000

    cygwin-install-action now puts setup.exe on D:

commit 52bddbc1a7f53a1e5c871767913648eb639ac6d5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 18 08:10:32 2025 +1000

    Include time.h for clock_gettime().

commit 9b50cb171b5c56184ce6fa3994ce62f9882d2daf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 17 16:51:14 2025 +1000

    Add includes.h for new tests.
    
    Fixes builds on older platforms.

commit 46e52fdae08b89264a0b23f94391c2bf637def34
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 16 22:29:17 2025 +1000

    Provide INFINITY if it's not provided.
    
    INFINITY is specified in c99, so define if not provided.

commit 849c2fd894aa87a7e40c71e8d5bda5392b1205be
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 15 21:58:49 2025 +1000

    Look for sqrt(), possibly in libm.
    
    The unit tests now use sqrt(), which in some platforms (notably
    DragonFlyBSD and Solaris) is not in libc but rather libm.  Since only
    the unit tests use this, add TESTLIBS and if necessary put libm in it.

commit 1ec5b39f1f673beac039bb42c98a11aa2b08a0b2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 15 09:22:25 2025 +0000

    upstream: Cast signalled_keydrop to int when logging to prevent warning
    
    on platforms where sig_atomic_t is not the same as int.  bz#3811, patch from
    jlduran at gmail com.
    
    OpenBSD-Commit-ID: b6bc9e9006e7f81ade57d41a48623a4323deca6c

commit f3d465530e75cb6c02e2cde1d15e6c4bb51ebfd9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 15 04:00:42 2025 +0000

    upstream: basic benchmarking support for the unit test framework enable
    
    with "make UNITTEST_BENCHMARK=yes"
    
    ok dtucker@
    
    OpenBSD-Regress-ID: 7f16a2e247f860897ca46ff87bccbe6002a32564

commit 609fe2cae2459d721ac11d23cd27b8a94397ef3c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Apr 14 05:41:42 2025 +0000

    upstream: rework the text for -3 to make it clearer what default
    
    behaviour is, and adjust the text for -R to make them more consistent;
    
    issue raised by mikhail mp39590;
    behaviour explained by naddy
    
    ok djm
    
    OpenBSD-Commit-ID: 15ff3bd1518d86c84fa8e91d7aa72cfdb41dccc8

<<<<<<< HEAD
commit 7351c8c41bf504c1da33d4fa9778c8a8ba6435c8
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 10 17:02:58 2025 -0400

    Neglected to add documentation for MPTCP to the HPN-README

commit 02827a8051bae7abc353960be4eb483a7f63bbf7
Merge: 5334968dd 1dfc85f68
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 10 16:53:32 2025 -0400

    Merge pull request #121 from rapier1/dev_minor
    
    Merge OpenSSH 10.0 into HPNSSH 18.7.0

commit 1dfc85f68939c9c6a8d9b12cbf902dda14a0d352
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 10 14:52:33 2025 -0400

    Move the process to insert the none cipher into the kex proposals
    into sshd_auth.c
    
    This process was originally in sshd.c but the correct values for
    options.ciphers were not being properly picked up in do_ssh2_kex.
    By moving this into the do_ssh2_kex function in sshd-auth.c none is
    properly added to the list of available ciphers.

commit 01a0d63b6c251d3b457a8e87a5c10417aebde841
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Apr 9 11:58:45 2025 -0400

    Clean up of autogenerated files.

commit ede97420e4a25d9acbd2d54a825ba735c9486a44
Merge: 95d31b0ea 2593769fb
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Apr 9 11:51:32 2025 -0400

    Merge OpenSSH 10.0p1 release into HPN-SSH 18.7.0

commit 2593769fb291fe6c542173927698c69e9f9a08b9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 17:02:43 2025 +1000

    autogenerated files for release

=======
>>>>>>> V_10_2_P1
commit 8725dbc5b5fcc3e326fc71189ef8dba4333362cc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 17:02:17 2025 +1000

    update version numbers

commit cc7feb9458ad3b893b53dc9c7500d1affd208bde
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 9 07:00:21 2025 +0000

    upstream: openssh-10.0
    
    OpenBSD-Commit-ID: db5b4a1f1c9e988f8f166b56dc5643606294b403

commit fc86875e6acb36401dfc1dfb6b628a9d1460f367
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 9 07:00:03 2025 +0000

    upstream: Fix logic error in DisableForwarding option. This option
    
    was documented as disabling X11 and agent forwarding but it failed to do so.
    Spotted by Tim Rice.
    
    OpenBSD-Commit-ID: fffc89195968f7eedd2fc57f0b1f1ef3193f5ed1

commit dd73459e351b0a2908aed90910c8ff9b0b381c6d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 9 01:24:40 2025 +0000

    upstream: oops, I accidentally backed out the typo fix
    
    OpenBSD-Commit-ID: f485f79bf3e9ebbe1de13ac96150cf458956cfd8

commit 0cb945891944bada5850e85d60afa3c807cf1af6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 9 01:23:47 2025 +0000

    upstream: typo
    
    OpenBSD-Commit-ID: f912725c7d303720706b3ccfb2cb846d46296d13

commit cd4a6bd50b658d707867caa1f5aa40b35c2b6c19
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 09:49:55 2025 +1000

    initialise websafe_allowlist in agent fuzzer

commit 55b7cb48af96c1102ef8ab5a73bb329cbed30945
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 8 23:10:46 2025 +0000

    upstream: typo
    
    OpenBSD-Regress-ID: 08477b936d1d0c1e8a98aa1c0e1bdde8871894c9

commit 985d8cbcd3438cc36b4e709476f1783e358ddfb1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 8 23:10:08 2025 +0000

    upstream: typo
    
    OpenBSD-Commit-ID: 6e683e13e72bf1e43bbd3bbc6a8332d5a98bdc99

<<<<<<< HEAD
commit 95d31b0ea784918a606664b8e4b05e7c54fe0594
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 8 15:33:16 2025 -0400

    Remove boringssl and aws-lc tests from CI tests.
    
    boringssl and aws-lc are not supported by HPN-SSH.

commit 71256fb4523018a6dc44371ecde3eaf9da69ee5d
Merge: 986eb94c2 000c3d14e
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Apr 7 14:50:41 2025 -0400

    Merge branch 'openssh_master' into feature_mptcp_test

commit 986eb94c2cff4ba113d5dd1777e9cfc5d48a2885
Merge: 4fce456c7 f878b723f
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Apr 7 14:49:51 2025 -0400

    Merge branch 'feature_mptcp_test' of github.com:/rapier1/hpn-ssh into feature_mptcp_test

=======
>>>>>>> V_10_2_P1
commit 000c3d14e94d8f7597087c457260ea9417045b65
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Apr 7 08:12:22 2025 +0000

    upstream: Include time.h for time().
    
    Fixes warning on some platforms when building without openssl.
    
    OpenBSD-Commit-ID: 04ca29b8eaae1860c7adde3e770baa1866e30a54

commit 49b8b9bf829e08af22366530614a5e59ac341ca9
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Wed Apr 2 04:28:03 2025 +0000

    upstream: Wrap #include <openssl/dsa.h> in #ifdef WITH_DSA
    
    ok djm
    
    OpenBSD-Commit-ID: ed01a7c102243f84e4a317aefb431916d98aab15

<<<<<<< HEAD
commit f878b723fa343fb1d25829d58b2a108b97858926
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Apr 4 13:21:21 2025 -0400

    Enhance visibility of warning for regression tests.
    
    The warned test is now printed in red with
    preceeding and trailing newlines. This is to make it
    more visible

commit 5d67b7d542e536393e9e49ebf7cec61e52df568c
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Apr 4 13:15:49 2025 -0400

    Merged the HPN-SSH 18.7 port for the runup to the
    OpenSSH 10.0 release. Added regression test.
    
    This version of the MPTCP code gets rid of the configure test and
    relies on the socket not being created if they request mptcp
    and it doesn't exist on their system.
    
    Additionally, created a regression test for mptcp based on
    the simple connect test. If this test fails it will *not*
    exit the tests as a whole but will issue a warning instead.
    This isn't properly communicated to the master make file but
    it's what we have. If a warning is thrown we do keep a copy of the
    logs.

commit 2c6dbec77513404ad3a70438affffdd29fc95fa9
Merge: 64a5038df 1c2e61203
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Apr 4 11:43:19 2025 -0400

    First pass at merging MPTCP into 18.7.0

commit 4fce456c7c5cb2806c9e852abdf546e3a7d37aff
Merge: 64a5038df 1c2e61203
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 3 17:40:34 2025 -0400

    Missed some debug statements in sshd-auth.c

commit 1c2e612033d60559ec286d9e72b9d94e9b5a80be
Merge: 5334968dd f80fb819e
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 3 15:09:18 2025 -0400

    First pass at incorporating OpenSSH 10.0.
    
    This does not include the MPTCP work

=======
>>>>>>> V_10_2_P1
commit f80fb819e5521e13f167edbcc3eed66e22ad0c2a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 3 09:10:19 2025 +1100

    remove all instances of -pie from LDFLAGS
    
    Previously only the first instance of this flag was removed.
    Unbreaks build on OpenSUSE Tumbleweed. Patch from Antonio Larrosa

commit 6c9872faa1c297a84c6d3e3b95a927be99eadbf6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 1 23:23:20 2025 +0000

    upstream: remove ability to enable DSA support. Actual code will be
    
    g/c'd separately. ok deraadt@
    
    OpenBSD-Commit-ID: 2a032b75156c4d922e8343fa97ff6bc227f09819

<<<<<<< HEAD
commit 64a5038dfb96149a94eef54a5c89a52bda889db2
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Mar 31 17:04:23 2025 -0400

    Get MPTCP availablity in configure.
    Fail if MPTCP is requested and not available.

=======
>>>>>>> V_10_2_P1
commit 8460aaa4e1f8680f03cc5334556b9440b401f010
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 28 21:45:55 2025 +0000

    upstream: Add TEST_SSH_SSHD_ENV to sshd lines here too.
    
    OpenBSD-Regress-ID: 045f2c88b42d694b404db51c5de5eca20d748ff1

<<<<<<< HEAD
commit 5fa5271ed8db79da18ca324b524b9983caf158b8
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Mar 28 14:52:45 2025 -0400

    I missed some duplicate lines in a merge/

commit d296fc3fbb45eebdce11d9f6bd378108de76d9e4
Merge: b0135edd5 5334968dd
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Mar 28 14:12:29 2025 -0400

    Update MPTCP branch to current master (18.6.2)

=======
>>>>>>> V_10_2_P1
commit 5e60f5937b9c33190b9d7614f72d85d4a9b38d3d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 28 06:04:07 2025 +0000

    upstream: Pass "ControlMaster no" to ssh when invoked by scp & sftp.
    
    If you have ControlMaster auto (or yes) in your config, and the
    first connection you make is via scp or sftp, then you may get a
    few unexpected options applied to it (eg ForwardX11 no), since sftp
    and sftp explicitly disable those for reasons.  These effects will
    persist beyond the initial scp or sftp command.
    
    This explicitly disables persistent session *creation* by scp and sftp.
    It will not prevent them from using an existing session if one has
    already been created.
    
    From Github PR#557, ok djm@ kn@
    
    OpenBSD-Commit-ID: 9dad7c737466837e0150c4318920f46d844770c4

commit bbd36869dfb4b770cc9e6a345c04a585a0955aec
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 28 05:41:15 2025 +0000

    upstream: Set sshd environment variables during sshd test run too.
    
    OpenBSD-Regress-ID: 50cb325d92c390a2909662c901f6ac5d80b6f74d

commit 98f05b1484daddef2f56b79e24540523b5016143
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 28 05:36:24 2025 +0000

    upstream: Add TEST_SSH_SSHD_ENV variable which is added to sshd's
    
    environment. Will be used in Portable to tweak behaviour of tcmalloc's
    debugging.
    
    OpenBSD-Regress-ID: 67e38c3c4517ddb72c8a3549a3325a166d7bb6d6

commit 8cd9ed4df0eccc825eca0c45354a37332e125e38
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 28 05:33:30 2025 +0000

    upstream: chown log directory in addition to log files.
    
    OpenBSD-Regress-ID: b520d54a0bbf2c6554413c798218bda26b385ad9

commit e32de6bf4f3229d4838beb127de45eed1377ccc5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 28 16:47:58 2025 +1100

    Be explicit about environment variables for tests.
    
    This will make it easier to reproduce a test failure by cut-and-paste of
    the corresponding line from the github log.

commit 77a3e6ba47381547b3fe4b29223256f276fbd07e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 28 16:46:40 2025 +1100

    Add tcmalloc flags to TEST_SSH_SSHD_ENV.
    
    This will get passed to sshd via test-exec.sh.

commit a73890e340fbd6121251854b658a72d738b86c84
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 27 23:04:44 2025 +1100

    Add PuTTY 0.81, 0.82 and 0.83 to tests.

commit 90a28de0d49570324d1695c0b4686354ef3bcae0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 27 22:30:40 2025 +1100

    Include TCMALLOC_STACKTRACE_METHOD in output.
    
    If TCMALLOC_STACKTRACE_METHOD happens to be set, include it in the debug
    output to make reproducing test cases easier.

commit fd5a6bb6dd7657c4bd8cd0ee11d5c8ddf0d927b2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 27 20:15:11 2025 +1100

    Test with-linux-memlock-onfault in kitchensink.

commit 22330711e2459c23d9736ee16e0e2ee0fcc30b9a
Author: Collin Funk <collin.funk1@gmail.com>
Date:   Wed Mar 26 18:24:59 2025 -0700

    Include fcntl.h so AT_FDCWD does not get redefined.

commit 6c49e5f7dcaf886b4a702a6c003cae9dca04d3ea
Author: Daniil Tatianin <d-tatianin@yandex-team.ru>
Date:   Thu Feb 27 11:37:13 2025 +0300

    Add support for locking memory on Linux
    
    Linux wakes up kcompactd threads in order to make more contiguous memory
    available on the system, it does this by migrating live movable pages
    (actively modifying live processes' page tables and constantly flooding
    them with page invalidation IPIs, which can be up to millions per
    second), which causes the process to become unresponsive for up to
    seconds or even minutes in some severe cases. In case of sshd, we want
    to always be able to connect to the system, even if it's under heavy
    kcompactd load.
    
    Introduce an option to protect sshd and its children sessions from being
    compacted by kcompactd (this works in cojunction with
    compact_unevictable_allowed = 0). Note that we depend on MCL_ONFAULT
    being available, which was introduced in linux 4.4. MCL_ONFAULT allows
    the system to lock pages lazily, thus drastically reducing memory usage
    of a locked process (without MCL_ONFAULT, every existing mapping in the
    process is instantly write-faulted).

commit fdc4853c5b1567934d43ab13282f03033cc21325
Author: Daniil Tatianin <d-tatianin@yandex-team.ru>
Date:   Thu Feb 27 11:46:25 2025 +0300

    platform: introduce a way to hook new session start
    
    Previously this was possible via post_fork_child, but ever since sshd
    was split into multiple binaries, this is now no longer possible becase
    of execv.

<<<<<<< HEAD
commit 5334968dd69fab9f72420c0e09d75f417310ffb0
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Mar 19 10:00:02 2025 -0400

    Neglected to increment version number

=======
>>>>>>> V_10_2_P1
commit 1b311b6b17be81577514c38e8be4f5740d7df496
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 19 06:11:15 2025 +0000

    upstream: Prevent theoretical NULL deref in throughlocal_sftp.
    
    Coverity CID 405019, although at the moment it's not reachable. ok djm@
    
    OpenBSD-Commit-ID: 630d46c1021b69fbb470e349976c70e9a48b7644

commit 96493ebd6ff48bbb802576e208794a26928569b0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Mar 19 17:35:10 2025 +1100

    Fix workflow syntax again.

commit 575c43fd4c44d376b1771c0fdaf4941021ba88c9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 18 20:54:48 2025 +1100

    Differentiate logfiles better.

commit 8a1294638f3a47d46263ea574fa85c8e115ea893
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 18 20:27:46 2025 +1100

    Fix another typo in workflow.

commit bd9e6bbcc864b3e10c4e11f5aec1b3a5e3a89b55
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 18 18:16:12 2025 +1100

    Fix syntax error in workflow.

commit ce88a1bb4a2e6425752094f7a2eb4adfb0ca7971
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 18 18:13:14 2025 +1100

    Identify each logfile while printing them.

commit b58e429960c4791fc4e30bb7c70d1f77d538b546
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 18 04:53:14 2025 +0000

    upstream: fix NULL dereference for Match conditions missing
    
    arguments, e.g. "Match user". Spotted by Coverity (CID 477813)
    
    OpenBSD-Commit-ID: 13584281cfa23b8ebc41f9d128a6b9464ae960d4

commit 0ce5281f017c3ad7bdcc2bbd9745119a73e0cbb8
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Fri Mar 14 09:49:49 2025 +0000

    upstream: Fix EVP_CIPHER_CTX_ctrl() return checks
    
    While this API tries to translate negative return values (i.e. -1) to 0
    in BoringSSL and LibreSSL, it is still possible for it to return negative
    values in prinicple. We even incorrectly document that -1 can be returned
    while Boring and OpenSSL plead the Fifth.
    
    In OpenSSL 3 there are now code paths that explicitly return -1 and they
    started shifting their return checks to <= 0 - of course they do this in
    inconsistent and sometimes incorrect manner. While these paths aren't
    reachable from ssh right now, who can really tell what happens in the two
    hundred lines of inscrutable bloated mess this has become.
    
    So error check with <= 0 to ensure that we don't accidentally translate an
    error to success.
    
    ok markus schwarze
    
    OpenBSD-Commit-ID: a855c833cf4ecfce43bedc761f26ad924f70483c

<<<<<<< HEAD
commit aeb3e35ce0cd89e09fbe78cb0d4e9ae39b43d2e0
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Mar 17 11:55:13 2025 -0400

    Fix typo in README.md

commit 403dd8810f0a0df4bac967fd50bf3d61ded1d6ea
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Mar 17 11:54:12 2025 -0400

    Fix typo in REDDME.md

=======
>>>>>>> V_10_2_P1
commit 2e81100763d5885e500f065b04c16ed87ce74318
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 17 21:35:55 2025 +1100

    Fix debug log path.

<<<<<<< HEAD
commit 672c88f6c75993c4f5ee2a5308693de588d431ff
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Mar 14 10:26:59 2025 -0400

    Updated README.md to introduce HPN-SSH more effectively

=======
>>>>>>> V_10_2_P1
commit 442a44970179d70ebb62bba792699eaec978a1db
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 14 16:24:06 2025 +1100

    Also lazily unmount workspace in case of straggers.

commit 20427f6735fe5ddab31911ce5315adc71acf47d8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 14 16:17:39 2025 +1100

    Make sure upstream tests run on correct hardware.

commit 91a2f70a56827ae31649baf17227b0914ac5aa36
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 14 13:47:27 2025 +1100

    Add OpenBSD upstream test on obsdsnap-arm64.

commit c20f7413525602b0ea786d8974d03a81f7ca2a92
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 13 10:45:53 2025 +1100

    rebuild .depend

commit d47ef958b89c6fa809302d654009d3dfabe11b75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 12 22:43:44 2025 +0000

    upstream: remove assumption that the sshd_config and any configs
    
    included from it can fit in a (possibly enlarged) socket buffer, by having
    the sshd listener mainloop actively manage sending the configuration to the
    sshd-session subprocess.
    
    work by markus@ w/ a little feedback from me;
    ok me and committing on his behalf
    
    OpenBSD-Commit-ID: 8f54451483f64951853074adb76bc4f838eaf3ae

commit 9c90b563943c16418d737433ac478974b8761ee5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 11 11:46:44 2025 +0000

    upstream: Prime caches for DNS names needed for tests.
    
    When running the SSHFP tests, particularly on an ephemeral VM, the first
    query or two can fail for some reason, presumably because something isn't
    fully initialized or something.  To work around this, issue queries for the
    names we'll need before we need them.
    
    OpenBSD-Regress-ID: 900841133540e7dead253407db5a874a6ed09eca

commit 10124eefe875a3e4e1cfb84ebe6a613ed3213b78
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 11 09:06:50 2025 +0000

    upstream: Some dd's don't understand "1m", so handle seperately.
    
    OpenBSD-Regress-ID: 1d983b27c96f28f69d3a288c19e8d8c58e1b2ee3

commit c21c8fc319376c2f5e0da166e9e89a97a245ae72
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 11 19:17:46 2025 +1100

    Lazily unmount github workspace at end of workflow.
    
    Sometimes when a test times out the workspace is still busy when we try
    to unmount it, which leaves the runner unusable until it's cleaned up
    manually. We try to unmount this in the first step, but that usually
    doesn't work since it fails during setup before it starts our workflow.
    Move it to the end and make it a lazy unmount so it hopefully works
    eventually.

commit 4bcbac742968f5086cfd4c570a51de25ef77931f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 11 07:50:20 2025 +0000

    upstream: Add regress test for sftp resume.
    
    OpenBSD-Regress-ID: 37f629b3014338fa23a85df1e1bb320ea12282e1

commit e2c4f070b43a4fd7d59a9350e2fe78df605830b5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 11 07:46:02 2025 +0000

    upstream: Use ssh binary instead of the (smaller) script when
    
    preparing test data files since it's faster.
    
    OpenBSD-Regress-ID: 4215e42682fdb73e131e10645d4a1a23a91d64f5

commit 62f02e95ba5cda4649c482d30f4370e2360eb94d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 11 07:43:45 2025 +0000

    upstream: Set up dbclient's known_hosts as it expects.
    
    OpenBSD-Regress-ID: 9e0898e8423237ce5023be53787bb4062e0d0418

commit 395284bd52887dbaf7e78200c857d7f2d9ce398e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 11 07:43:03 2025 +0000

    upstream: Use $DBCLIENT to access dbclient for consistency.
    
    OpenBSD-Regress-ID: 81e1b41e1ffc49aba1e6fcaeb6242f3b7875ea3c

commit 97e10c0005a784622c61cb4e8bb7858b410bbcc6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 11 07:42:08 2025 +0000

    upstream: Check if dbclient supports SHA1 before trying SHA1-based
    
    KEX.
    
    Dropbear 2025.87 removed SHA1 support by default, which means
    diffie-hellman-group14-sha1 is not available.  Unfortunately there isn't a
    flag to query supported KEX, so instead check MACs and if it doesn't have
    SHA1 methods, assuming SHA1 based KEXes are likewise not available.  Spotted
    by anton@.
    
    OpenBSD-Regress-ID: acfa8e26c001cb18b9fb81a27271c3b51288d304

commit 29a5127f808d00aa539fd27d83a65c2c56179b0e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 11 07:48:51 2025 +0000

    upstream: Set highwater when resuming a "put". Prevents bogus "server
    
    reordered acks" debug message.  ok djm@
    
    OpenBSD-Commit-ID: aa7f6d0fc2e893c8c278ea3e6e0974c2eca83f5d

commit 6575859d7acb110acf408707f98ed9744ca7d692
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 3 06:54:37 2025 +0000

    upstream: Test for %-token and env var expansion in SetEnv.
    
    OpenBSD-Regress-ID: bd6139a6177ac4afb29a0ce4afc23567b22ef9f9

commit fd7ad8d7bf7dbdeb8f11a8b51aa9d31df1a17e52
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Mar 2 07:41:06 2025 +0000

    upstream: Also test User expansions when supplied via -l option and
    
    user@host.
    
    OpenBSD-Regress-ID: 56415859260b53ef0dd20f71225ba5fdf6320f50

commit e6cfd783f1491b502db9322aa970822c63f1667d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Mar 1 06:12:47 2025 +0000

    upstream: Tests for User expansion of %-tokens and environment
    
    variables.
    
    OpenBSD-Regress-ID: 7ed21dd0e09fb1f3537b8b177f171018aa501628

commit 197e503b8e4b642ce0f405a5d65da4256fa96431
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 16:25:58 2024 +0000

    upstream: use glob(3) wildcards in AuthorizedKeys/PrincipalsFile
    
    tests to exercise this feature; ok dtucker
    
    OpenBSD-Regress-ID: 7f7b19c0b05b1862cc6521ce61b2b301a3f9cc3b

commit 396202180180a4ac16788d469508a348789dafa1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 10:37:42 2024 +0000

    upstream: implement attestation verification for ED25519 keys
    
    OpenBSD-Regress-ID: c44fa5cdb434375a8b5545fdb4fc651061afca1f

commit b49875428cda9c16c5bd52552100da2b419cda5f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 3 06:53:09 2025 +0000

    upstream: Add %-token and environment variable expansion to SetEnv.
    
    feedback deraadt@ jmc@, nits and ok djm@
    
    OpenBSD-Commit-ID: 2f6e5070481cb73e6f35fd1c6608c1eeff88a5c1

commit b6bba67e6c31d268480773e4fed16d0a32b4218e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Mar 2 22:44:00 2025 +0000

    upstream: fix PerSourcePenalty incorrectly using "crash" penalty when
    
    LoginGraceTime was exceeded. Reported by irwin AT princeton.edu via bz3797
    
    OpenBSD-Commit-ID: 1ba3e490a5a9451359618c550d995380af454d25

commit 38d69fee1b06948f160d94abd07b6b297630d30a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 2 22:06:53 2025 +1100

    include __builtin_popcount replacement function
    
    Some systems/compilers lack __builtin_popcount(), so replace it as
    necessary. Reported by Dennis Clarke; ok dtucker@

commit c94138d02a45dda5015f38f5a60b0bdde29019c1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Mar 2 11:03:13 2025 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: 1bd8953a37451ef7e0991f9fceec5e8005fe986a

commit 65d2c59628e68e166046efa69e76c1d395a8df6e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Mar 2 07:02:49 2025 +0000

    upstream: Make a copy of the user when handling ssh -l, so that
    
    later during User token expansion we don't end up freeing a member of argv.
    Spotted by anton@'s regress tests.
    
    OpenBSD-Commit-ID: 2f671a4f5726b66d123b88b1fdd1a90581339955

commit bd30cf784d6e825ef71592fb723c41d4f2fd407b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Mar 1 06:11:26 2025 +0000

    upstream: Allow %-token and environment variable expansion in User,
    
    with the exception of %r and %C which are self-referential.  Requested in
    bz#3477, ok djm@, man page improvements jmc@
    
    OpenBSD-Commit-ID: caeb46251ee073662f6f5864c6f7b92d8ac80fa8

commit 94f59dcfc57f95ae044f75c3ce544329c8956c35
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 1 10:28:59 2025 +1100

    Rebuild config files if Makefile changes.
    
    This ensures paths are updated if they are changed by re-running configure.
    Patch from rapier at psc.edu.

<<<<<<< HEAD
commit 982eb7c48df28109b8f0c1f32dfef003f64493bb
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Feb 26 16:23:30 2025 -0500

    Update SECURITY.md

commit 6be670656aa23fe99bbebbdb73bc114f2409e707
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Feb 26 16:23:06 2025 -0500

    Update SECURITY.md

=======
>>>>>>> V_10_2_P1
commit dfd9880585db1570656022f9fe1519df673f7b8a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 26 18:16:03 2025 +1100

    Check for le32toh, le64toh, htole64 individually.
    
    It appears that at least some versions of endian.h in glibc do not have
    the latter two, so check for and replace each one individually.
    bz#3794, ok djm@

commit cb99e8eb228df366af33f4fe88d7a9dd0dbf0756
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 25 06:25:30 2025 +0000

    upstream: ressurect fix for "match invalid-user" that got clobbered
    
    by 1.423
    
    OpenBSD-Commit-ID: d18bf0945976e0f3467d710d4bc8bdbe181c0567

commit 487cf4c18c123b66c1f3f733398cd37e6b2ab6ab
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Feb 21 18:22:41 2025 +0000

    upstream: Also prohibit , (comma) in hostnames, proposed by David
    
    Leadbeater ok djm millert
    
    OpenBSD-Commit-ID: 2837fa31dc6e81976f510f0a259edaa559b20b07

commit 3bc6de98c830bd5207f6c371ba69c5874f06305b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 17:27:50 2025 +1100

    Try to fix github tcmalloc target failure
    
    tcmalloc may, depending on the stacktrace generator it uses, create
    pipe(2) fds during shared library initialisation. These will later
    get clobbered by ssh/sshd calling closefrom() and chaos will ensue.
    Tell tcmalloc to use an unwinder that doesn't pull this stuff.

commit 922e54bbfe8c8479453693ef52350338f0c19124
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 21 13:44:35 2025 +1100

    cleanup last mention of ubuntu-20.04

commit bc4b3f6dc1738d389e5c9dcca8c56d7e153fee49
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 21 13:44:13 2025 +1100

    prune gcc/clang versions to be tested
    
    Test only the oldest and latest versions of each

commit 94b73755f931d592a612ef5cb998694643eab5ff
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 21 11:30:22 2025 +1100

    Update AWS-LC version number
    
    Patch from Shubham Mittal bz bz3792

commit 6887099fae6d9f3482e1075d034e9343dc413200
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 21 11:22:34 2025 +1100

    adjust workflows for ubuntu version transition
    
    remove workflows for unsupported compilers, add a few for additional
    supported compilers, move some workflows to run on ubuntu-latest

commit 33bb47e6f74f2ca8093946e6f462d655a9ae46d3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 20 17:10:32 2025 +1100

    Add ubuntu-*-arm test runners

commit a0c95fbb215b2168fa51b15906e2d6990d7fef6b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 20 17:03:28 2025 +1100

    remove ubuntu-20.04 Github action runners
    
    ubuntu-20.04 is deprecated now, so migrate all its unique runners
    to ubuntu-22.04.
    
    ok dtucker@

<<<<<<< HEAD
commit eaba0781198f75e2ad62497e855285ec09ec7870
Merge: 5294d009e 122d44157
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Feb 18 16:12:42 2025 -0500

    Merge pull request #113 from rapier1/security_hpnssh_18.6.2-9.9p2
    
    HPN-SSH 18.6.2 for OpenSSH 9.9p2. Security release.

commit 122d44157b03ac7780813dbd4a1b7d1e0e82204e
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Feb 18 15:43:44 2025 -0500

    Remove .guthub/ci-status.md as that's for OpenSSH only

commit d530a8e6c72c34c26d6d5285d38a165d4006a1f7
Merge: 5294d009e d76b26751
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Feb 18 12:05:02 2025 -0500

    Rerun autoheader to update config.h.in

commit d76b2675116617394cd355a3437b4963a562b64d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 18 19:15:08 2025 +1100

    autogenerated files for release

commit 6ebc4dd77a479892d5ca0cd2a567a651f70aad82
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 18 19:03:42 2025 +1100

    openssh-9.9p2

=======
>>>>>>> V_10_2_P1
commit 0cbeedba81b57c56379e1d202b9ccd3b72af7ddc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 18 19:03:42 2025 +1100

    openssh-9.9p2

<<<<<<< HEAD
commit 38df39ecf278a7ab5794fb03c01286f2cfe82c0d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 18 08:02:48 2025 +0000

    upstream: Fix cases where error codes were not correctly set
    
    Reported by the Qualys Security Advisory team. ok markus@
    
    OpenBSD-Commit-ID: 7bcd4ffe0fa1e27ff98d451fb9c22f5fae6e610d

commit 5e07dee272c34e193362fba8eda0e3c453f3c773
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 18 08:02:12 2025 +0000

    upstream: Don't reply to PING in preauth phase or during KEX
    
    Reported by the Qualys Security Advisory team. ok markus@
    
    OpenBSD-Commit-ID: c656ac4abd1504389d1733d85152044b15830217

=======
>>>>>>> V_10_2_P1
commit 0832aac79517611dd4de93ad0a83577994d9c907
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 18 08:02:48 2025 +0000

    upstream: Fix cases where error codes were not correctly set
    
    Reported by the Qualys Security Advisory team. ok markus@
    
    OpenBSD-Commit-ID: 7bcd4ffe0fa1e27ff98d451fb9c22f5fae6e610d

commit 6ce00f0c2ecbb9f75023dbe627ee6460bcec78c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 18 08:02:12 2025 +0000

    upstream: Don't reply to PING in preauth phase or during KEX
    
    Reported by the Qualys Security Advisory team. ok markus@
    
    OpenBSD-Commit-ID: c656ac4abd1504389d1733d85152044b15830217

commit 9e5bd74a85192c00a842f63d7ab788713b4284c3
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Feb 15 06:48:56 2025 +0000

    upstream: - use \& when contructs like "e.g." end a line, to avoid
    
    double spacing - macro is Qq not Oq
    
    OpenBSD-Commit-ID: 17e5d2d7f288cc7fc536e3af252224525f9fb43a

commit f519e71fb7a46314ae16e2a75490649dc0bd01a2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 15 13:12:40 2025 +1100

    depend

commit 9131ac64b0ebe66dc1de9d44bf8d1bd64a24c350
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 15 01:52:07 2025 +0000

    upstream: add "Match version" support to ssh_config. Allows
    
    matching on the local version of OpenSSH, e.g. "Match version OpenSSH_10.*"
    
    ok markus@
    
    OpenBSD-Commit-ID: c0cb504d0b9e43ccf12e68a544a7cd625e89758d

commit 192a20df00c8a56fe7d92ffa23d959c865d7fb9e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 15 01:50:47 2025 +0000

    upstream: Add support for "Match sessiontype" to ssh_config. Allows
    
    matching on the type of session requested, either "shell" for interactive
    sessions, "exec" for command execution sessions, "subsystem" for subsystem
    requests, such as sftp, or "none" for transport/forwarding-only sessions.
    
    ok markus@
    
    OpenBSD-Commit-ID: eff5c001aecb2283d36639cfb28c0935a8bfd468

commit caa3c0c77082888236b0b0c4feb3e6879731b3ba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 15 01:48:30 2025 +0000

    upstream: "Match command ..." support for ssh_config to allow
    
    matching on the remote command specified on the commandline.
    
    Also relaxes matching rules for `Match tagged` to allow
    `Match tagged ""` to match an empty tag value. This also works
    for command.
    
    ok markus@
    
    OpenBSD-Commit-ID: 00dcfea425bf58d824bf5e3464cfc2409121b60d

<<<<<<< HEAD
commit fb071011fb843142282b8b8a69cbb15e9b0b9485
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 10 23:00:29 2025 +0000

    upstream: fix "Match invalid-user" from incorrectly being activated
    
    in initial configuration pass when no other predicates were present on the
    match line
    
    OpenBSD-Commit-ID: 02703b4bd207fafd03788bc4e7774bf80be6c9a8

=======
>>>>>>> V_10_2_P1
commit 38f6000e9851a00e2e4b8e1eb4ea6a243ef7e6a3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 11 10:32:26 2025 +1100

    depend

commit aa1409e7a0a5605f0127651a3ba5a348666325bc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 10 23:19:26 2025 +0000

    upstream: include arguments the command was invoked with, and
    
    operating system name, version and architecture in startup debugging output;
    ok dtucker
    
    OpenBSD-Commit-ID: 2a509d319aaf31a6bf9998e1842832883fbc3edd

commit 857ac20f5fe19f183defba5dbf4b7d9e6400230c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 10 23:16:51 2025 +0000

    upstream: include line number in Match debug messages, makes it a
    
    little easier to see what's going on
    
    OpenBSD-Commit-ID: 1fcf4aa2ee667711b9497ded0fa52d757c69b1df

commit af49d474e481d2d78b2f06b06a06b0b37629358e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 10 23:00:29 2025 +0000

    upstream: fix "Match invalid-user" from incorrectly being activated
    
    in initial configuration pass when no other predicates were present on the
    match line
    
    OpenBSD-Commit-ID: 02703b4bd207fafd03788bc4e7774bf80be6c9a8

commit 1c67bae3f5834e48ded71c406f2039dea6e536db
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Sun Feb 9 18:24:08 2025 +0000

    upstream: In a section 1 manual, use the plain English words
    
    "standard output" rather than the overly technical abbreviation "stdout" - we
    are not talking about a device file or a FILE * object here. Issue reported
    by <onf at disroot dot org> on the groff mailing list.
    
    OpenBSD-Commit-ID: a0816999f970e6159523bed8484f62c42ec93109

commit 85b3d68dd931416ede657f371f1d60cdc3a66f34
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 17 00:09:41 2025 +0000

    upstream: Fix debug logging of user specific delay. Patch from
    
    Achim Leitner (fjl5) via github PR#552.
    
    OpenBSD-Commit-ID: 834a869ed9b15058d3c1ef0cd75402ef989255d8

commit e4e5b06fdf4532705669c0ae944b364022d16b9d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 16 06:37:10 2025 +0000

    upstream: Call log_init in sshd-auth and sshd-session immediately
    
    after parsing the config file so that any log settings set in the config file
    take effect immediately.  Move version banners to immediately after that, and
    make them distinct per binary.  ok djm@
    
    OpenBSD-Commit-ID: acf3d090638edf9b6e6f78eed96b537fe671f0f5

commit 0643994b20f2cc54bca80842a984b3052ff1a6a9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 15 22:23:13 2025 +0000

    upstream: Use strprefix helper when processing sshd -C test args
    
    instead of counting bytes by hand.  ok djm@
    
    OpenBSD-Commit-ID: 2866d369d96fe04bf76112260ac37e489f98a9a9

commit 66efd0fbb6b8b95f8a520f2cdf8ede14e62b30b3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 6 09:38:09 2025 +1100

    add support for AWS-LC (AWS libcrypto)
    
    Patch from Shubham Mittal via bz3784; ok dtucker

<<<<<<< HEAD
commit 5294d009efa4892f0a28123dffe80b7c6dee64db
Merge: c3eebd9df e00cd6e24
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jan 30 17:09:43 2025 -0500

    Merge pull request #111 from rapier1/bug_remove_configure
    
    Crank version number to 18.6.1

commit e00cd6e2498435a7e57a7b9c20f4124b80548592
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jan 30 17:09:02 2025 -0500

    Crank version numbver to 18.6.1

commit c3eebd9df3d1969121e21affc603db512f4ce8cc
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jan 30 17:04:27 2025 -0500

    Configure script removed from repo.
    
    We should not have a prebuilt configure script in our
    repo. All user must run autoconf before building hpnssh.
    
    I figured this out with input from iam-TJ from github.
    Thank you!

=======
>>>>>>> V_10_2_P1
commit 826483d51a9fee60703298bbf839d9ce37943474
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Dec 16 15:36:54 2024 -0800

    fix old typo (s/SYSVINITSTOPT/SYSVINITSTOP/)

commit 1a8ce460f1d0c3f7304edba0733783b57b430e21
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 12 09:09:09 2024 +0000

    upstream: Plug leak on error path, spotted by Coverity. ok djm@
    
    OpenBSD-Commit-ID: b1859959374b4709569760cae0866d22a16606d3

commit 924f996144fc0ae1a659fadcfc2237d1ae935fc4
Author: Xavier Hsinyuan <me@lstlx.com>
Date:   Mon Dec 9 11:21:05 2024 +0800

    Add $(srcdir) for standalone sk-libfido2 make target.
    
    Fix out-of-tree build failure due to incorrect path for `sk-usbhid.c`.

commit bbc9c18e84de29c83fa03e69290979fcca54a2b2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Dec 7 10:12:19 2024 +0000

    upstream: replace bespoke logging of MaxSessions enforcement with
    
    new ratelimited logging infrastructure.
    
    Add ratelimits to logging of connections dropped by PerSourcePenalties
    
    ok dtucker
    
    OpenBSD-Commit-ID: f22fe7c39607e4361aadf95e33773ffd68c59489

commit 5a6ddf946cf105189c2c99a04f86ce95edc55fc5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Dec 7 10:05:36 2024 +0000

    upstream: add infrastructure for ratelimited logging; feedback/ok
    
    dtucker
    
    OpenBSD-Commit-ID: 18a83e5ac09d59aaf1e834fd6b796db89dd842e7

commit 85f0c1e75e8f6c5d83b8070918ee2f6ab16d403e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 16:24:27 2024 +0000

    upstream: allow glob(3) patterns for sshd_config AuthorizedKeysFile
    
    and AuthorizedPrincipalsFile directives; bz2755 ok dtucker
    
    OpenBSD-Commit-ID: 3e3e05a17fca39bba78b993a07b44664519adf7f

commit 9a9ffee6e10bcd039f1f9385599577441ebe542a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 16:21:48 2024 +0000

    upstream: support VersionAddendum in the client, mirroring the
    
    option of the same name in the server; bz2745 ok dtucker@
    
    OpenBSD-Commit-ID: 6ff7905b3f9806649bde750515786553fb89cdf4

commit 41ab0ccecd68232e196efae5e224b31ca104c423
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 16:02:12 2024 +0000

    upstream: clarify encoding of options/extensions; bz2389
    
    OpenBSD-Commit-ID: c4e92356d44dfe6d0a4416deecb33d1d1eba016c

commit 5488810359f0fd91e2f7b919c70a3798e46376cb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 15:17:15 2024 +0000

    upstream: ignore SIGPIPE here; some downstreams have had this for
    
    years...
    
    OpenBSD-Commit-ID: 73674ee4f8ceb8fc9cb8de71d8ddea0c721eb035

commit 4389a792d9078212366eba124a3eed36e009d09e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 15:12:56 2024 +0000

    upstream: sync -o option lists with ssh.1; requested jmc@
    
    OpenBSD-Commit-ID: a7ac295b444da7b2ca7a33a52370594f6897f6bb

commit 6b9cd095565ddc5402d5096dce248fa0521dbda3
Author: Fabio Pedretti <pedretti.fabio@gmail.com>
Date:   Mon Oct 16 17:12:24 2023 +0200

    Remove ancient RHL 6.x config in RPM spec.
    
    It looks like build6x options were intended for RHL 6.x
    (the Red Hat distro predating Fedora, not RHEL), but were
    then applied to RHEL.
    
    Completely remove support for this ancient configuration.
    
    Successfully built, installed and run on RHEL 6. This also
    remove a build warning about deprecation of PreReq.

commit 5cacfa798f92b707491375fed748d1d1bcb33ec9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 6 23:54:45 2024 +1100

    Add new hardware-backed signing key for myself.
    
    Retire old non-hardware based signing key.

commit f129b6ee1d4361799e65307216e3a4d5544356b7
Author: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date:   Sat Nov 2 22:05:45 2024 +0100

    Fix configure implicit declaration and format warnings.

commit 11a5e5179077f73c2d45bcdf3f60153ae3f17815
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 6 07:05:54 2024 +0000

    upstream: Expand $SSH to absolute path if it's not already.
    
    Prevents problem later in increase_datafile_size if ssh is not in
    the path.  Patch from quaresmajose via GHPR#510.
    
    OpenBSD-Regress-ID: 2670a66af8b827410ca7139f0a89f4501cece77b

commit dc2ef8f0944a4ff7ba19e52fd17b4654e6bd9b93
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 6 06:55:28 2024 +0000

    upstream: Change "login again" to "log in again"
    
    in password change message.  From ThinLinc-Zeijlon via github PR#532.
    
    OpenBSD-Commit-ID: fea5e9bc04caf613a118c419f16863733b340cf1

commit 8252f346eb21cd6b30816f905b7d94f10962373e
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Dec 5 22:45:03 2024 +0000

    upstream: catch up documentation: AES-GCM is preferred to AES-CTR
    
    OpenBSD-Commit-ID: 63360924b6834507fe70020edb936f5075043a9e

commit 9a2f4c75081769bd45eba2bf3fab0a32b25f1879
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 6 17:56:17 2024 +1100

    Change text from "login to" to "log in to".
    
    From ThinLinc-Zeijlon via GHPR#532.

commit 24dcf368d816b06136a02845ebd0c7846bf18927
Author: Xavier Hsinyuan <me@lstlx.com>
Date:   Fri Dec 6 11:56:34 2024 +0800

    Fix configure message typo in sk-libfido2 standalone.

commit 1a0cac2f3411a22d69ae6918eff48456b805e73b
Author: Alexander Kanavin <alex@linutronix.de>
Date:   Thu Dec 5 16:26:46 2024 +0100

    Skip 2038 key expiry test on 64 bit time_t systems.
    
    This allows testing Y2038 with system time set to after that (i.e. 2040),
    so that actual Y2038 issues can be exposed, and not masked by key expiry
    errors.
    
    Signed-off-by: Alexander Kanavin <alex@linutronix.de>

commit 6b4611dc1232c5d2c8e43201f580f19aab320c87
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 6 01:45:52 2024 +1100

    Skip 64bit expiry time test on 32bit time_t.

commit c9b7866a7dc5e6c30f5aa9d22dd0bbafda0d496f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 5 14:28:39 2024 +0000

    upstream: Add key expiry test in the 64bit time_t range for additional
    
    coverage. From Alexander Kanavin via bz#3684.
    
    OpenBSD-Regress-ID: bdf6eb3c2421f2e1e11483d03b34c7931d1bccf7

commit 790c913b5fc6ee93ae14793443dc85a0f574b7eb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 19:24:56 2024 +1100

    typo

commit d23a23aaeeabc228792e3fd7eb5f2fa6ae13c482
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 08:47:02 2024 +1100

    add a Makefile target for ssh-verify-attestation
    
    Not built by default, but easier than doing it by hand

commit d0ac63d0f8b5f778d5fd326701ef4489bc27635e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 5 06:49:26 2024 +0000

    upstream: De-magic the x11 base port number into a define. ok djm@
    
    OpenBSD-Commit-ID: 23b85ca9d222cb739b9c33ee5e4d6ac9fdeecbfa

commit 9998c93d57bf0f1df2bc93e0bc2d8112c6f8c720
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 5 06:47:00 2024 +0000

    upstream: Prevent integer overflow in x11 port handling. These are
    
    theoretically possible if the admin misconfigures X11DisplayOffset or the
    user misconfigures their own $DISPLAY, but don't happen in normal operation.
    From Suhov Roman via bz#3730, ok djm@
    
    OpenBSD-Commit-ID: e9e3860f1a19b862ccf07dc8ecbe8f1e1034f4ed

commit 8c9ee046d40e4254c6c1711783ea11027b72c3e9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 4 16:42:49 2024 +0000

    upstream: add a work-in-progress tool to verify FIDO attestation
    
    blobs that ssh-keygen can write when enrolling FIDO keys.
    
    OpenBSD-Regress-ID: 6c97bf3f46e48866677ad69f54b77683eb92437f

commit 50c640d874d0246dd0a0d949398c3d7f757c716a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Dec 4 10:51:13 2024 +0000

    upstream: Don't assume existence of SK provider in test. Patch from
    
    balu.gajjala at gmail via bz#3402.
    
    OpenBSD-Regress-ID: d571932016d07d135b54433d07520b9e1901db43

commit 73d782693144262570d3585b62f16b183170c014
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 4 14:37:55 2024 +0000

    upstream: sync the list of options accepted by -o with ssh_config.5
    
    prompted by bz3455
    
    OpenBSD-Commit-ID: 0ecbfa70aea6c769bcc259defe07182edf461f57

commit 6993d9f0959534b0b7d52e17b95e9e79fb0b3d0a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 4 14:24:20 2024 +0000

    upstream: don't screw up ssh-keygen -l output when the file
    
    contains CR characters; GHPR236 bz3385, fix from Dmitry Belyavskiy
    
    OpenBSD-Commit-ID: e458cf6b0adcea5b69ef4c7ba38e590841d02ef4

commit c0b03c2534946fc114880092177aa4a3683ced2d
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Tue Dec 3 22:30:03 2024 +0000

    upstream: spelling; ok djm@
    
    OpenBSD-Commit-ID: c8ff3f70020451eef214e598117b7ce1a29853ef

commit 97eb247f40167f44324e88a537d5b4fe771a63b2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Dec 3 16:27:53 2024 +0000

    upstream: Remove fallback to compiled-in gropup for dhgex when the
    
    moduli file exists, but does not contain moduli within the client-requested
    range. The fallback behaviour remains for the case where the moduli file does
    not exist (typically, running tests prior to installing). From bz#2793, based
    in part on patch from Joe Testa, ok djm@
    
    OpenBSD-Commit-ID: b1a8c5dbbedf249b42474679ebaf14db7332b1ab

commit 30c746265ebde29806dba77c92fb1fd3803cbf5c
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Tue Dec 3 15:53:51 2024 +0000

    upstream: Remove redundant field of definition check
    
    This will allow us to get rid of EC_GROUP_method_of() in the near future.
    
    ok djm
    
    OpenBSD-Commit-ID: b4a3d2e00990cf5c2ec6881c21ddca67327c2df8

commit eaa1744f34c30740328fd0a0d84b5f2f9e6918c1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 00:59:19 2024 +1100

    don't ignore changes in regress Makefiles
    
    reported by Torben Hansen in bz2880

commit 66e986880b2472fefaad781f10113b138b65ff27
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 00:01:33 2024 +1100

    Support systemd-style socket activation in agent
    
    Adds support for systemd LISTEN_PID/LISTEN_FDS socket activation to
    ssh-agent. Activated when these environment variables are set and
    the agent is started with the -d or -D option and no socket path
    is set.
    
    Based on GHPR502 by Daniel Kahn Gillmor, ok dtucker

commit 9b57c099f57152e6c94f633c114f544087f4bdaa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 4 21:36:01 2024 +1100

    Update readme files to better reflect reality.
    
    Prompted by bz#3738, ok djm@.

commit ffa885db1b960451d426455045d2f51288e48ee8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Dec 3 14:12:47 2024 +0000

    upstream: Improve description of KbdInteractiveAuthentication.
    
    Based on bz#3658, fixes jmc@ ok markus@ djm@.
    
    OpenBSD-Commit-ID: 9fadb56b9afed554d501acbba911c685acd6ffc2

commit b460f82a67795bba37c6cc6c78f788e5b435b4cb
Author: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date:   Sat Nov 2 17:53:23 2024 +0100

    Inherit DESTDIR from the environment.
    
    autoconf packages conventionally inherit the DESTDIR variable from the
    environment.

commit 9da7fa7c7464df241ae5d17da94e4ebed9013719
Author: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date:   Sat Nov 2 22:10:39 2024 +0100

    Define u_short and u_long if needed.

commit d3a7ff7cecbc23cc37044bdf02e7118d05bf3c35
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 3 08:31:49 2024 +0000

    upstream: support FIDO tokens that return no attestation data, e.g.
    
    recent WinHello. From Michael Braun via GHPR542
    
    OpenBSD-Commit-ID: a71b0542f2f7819ba0e33a88908e01b6fc49e4ce

commit 96b64056c812620014b65371a9e3ac86bfcd08d5
Author: Thorsten Kukuk <kukuk@suse.com>
Date:   Tue Nov 19 10:53:28 2024 +0100

    Add wtmpdb support as Y2038 safe wtmp replacement

commit 1d9563a56f2ad5b0c0aeef20e19c1a03ad54f88a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 2 14:06:42 2024 +0000

    upstream: unbreak
    
    OpenBSD-Commit-ID: 05b6c31f4a6e385338f43cc0e08776cea75802a1

commit d75837b9f6d0d6cc18ed5078789ea0f3dad08f00
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 2 13:37:18 2024 +0000

    upstream: prefer AES-GCM to AES-CTR; ok deraadt markus
    
    OpenBSD-Commit-ID: 8366a72e0f300ee31c5dab2c95025387ec15bbc9

commit e19cd494b567a73dc390e09b47c1e21545e6116b
Author: Shiva Kaul <shiva.kaul@gmail.com>
Date:   Mon Dec 2 02:04:20 2024 -0500

    Fix compilation with DEBUG_SK enabled
    
    In `ssh_ecdsa_sk_verify`, the `datalen` variable was renamed to `dlen` -- but not in this debugging block.

commit 67ace92be0718df7e0f52c0a76684fc2ebae4089
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 29 00:13:36 2024 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: 311d271bf0fab8a119e84f4f696d8cd40731692f

commit ca0697a90e5720ba4d76cb0ae9d5572b5260a16c
Author: Jeremy Stott <jeremy@stott.co.nz>
Date:   Sat Oct 19 12:10:52 2024 +1300

    Add make target for standalone sk-libfido2
    
    Add a Makefile target for sk-libfido2, the standalone fido2 security
    key shared library, suitable for use with the SecurityKeyProvider
    option.
    
    Add a new configure option `--with-security-key-standalone` that
    optionally sets the shared library target sk-libfido2$(SHLIBEXT), and
    adds it to $(TARGETS).
    
    misc.h is required when SK_STANDALONE is defined, because of the use
    of `monotime_tv` in `sk_select_by_touch`.
    
    Sets the shared library extension for sk-libfido2 is by setting
    `SHLIBEXT` depending on the platform in configure.ac.
    
    Add the shared library to the CI builds in the `sk` target config to
    make sure it can compile under the same conditions as
    `--with-security-key-builtin`.
    
    Add a libssh-pic.a static library that compiles with `-fPIC` reusing
    .c.lo method in sk-dummy.so for use in the shared library sk-libfido2.
    
    Note, a separate static library libssh-pic.a is needed, since defining
    -DSK_STANDALONE excludes some symbols needed in sshkey.lo.

commit 74d70841efbf41b9fcc8e6f6f4777d2e9d7e2004
Author: Arnout Engelen <arnout@bzzt.net>
Date:   Fri Oct 18 13:42:38 2024 +0200

    mdoc2man: balance nested square brackets
    
    I noticed the square brackets in `destination [command [argument...]`
    in the synopsis for the `ssh.1` manpage were not balanced,
    this balances them.
    
    Signed-off-by: Arnout Engelen <arnout@bzzt.net>

commit 8eabd2ae2ca1d7756417a1ee5b41f09c5d997634
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 27 16:07:08 2024 +0000

    upstream: fix argument of "Compression" directive in ssh -G config
    
    dump, which used to work but broke in 9.8
    
    OpenBSD-Commit-ID: c79936242d29c70d01941b28d2d07fd0b85fe46f

commit 53c03961769d8879a81398074ea3cb36253d4f2e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 27 13:27:34 2024 +0000

    upstream: new name/link for agent I-D
    
    OpenBSD-Commit-ID: e3420f3925a297a1b2ab7dfe7c7d274cfc8e1193

commit 785e3c9110df8f2d30e42ce8b45969c49700f35b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 27 13:00:23 2024 +0000

    upstream: mention that biometrics may be used for FIDO key user
    
    verification as well as PIN. Prompted by Zack Newman, ok jmc@
    
    OpenBSD-Commit-ID: b774a4438c9be70012661ee278450790d21277b8

commit fd2e64c9ec9ea3e89e396be0db41aaf982ae1210
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 26 22:05:51 2024 +0000

    upstream: g/c outdated XXX comments
    
    OpenBSD-Commit-ID: 74d0c0b74994d9a4343c4d7ea4948cb34f609a6c

commit 0ad34a6193357d286042322ea7347262a6fb0778
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 26 22:02:28 2024 +0000

    upstream: regression test for UpdateHostkeys with multiple keys backed
    
    by ssh-agent. Patch from Maxime Rey.
    
    OpenBSD-Regress-ID: 1777ab6e639e57c0e20cbcb6df60455b49fd8bb3

commit 84023656d91b78f1ef86c8321ec563f2e90f7227
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 26 22:01:37 2024 +0000

    upstream: Explicitly specify the signature algorithm when signing
    
    hostkeys-prove requests.
    
    Fixes a corner-case triggered by UpdateHostKeys with one or more unknown
    host keys stored in ssh-agent where sshd refuses to accept the signature
    coming back from the agent.
    
    Report/fix from Maxime Rey
    
    OpenBSD-Commit-ID: 460c7d527a24f92b7e5f68ca1a2fa242ebf0d086

commit d1c1cfc5e4e9b43593d4642810ea8135e4c7db49
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 26 21:23:35 2024 +0000

    upstream: when using RSA keys to sign messages, select the
    
    signature algorithm based on the requested hash algorithm ("-Ohashalg=xxx").
    
    This allows using something other than rsa-sha2-512, which may not
    be supported on all signing backends, e.g. some smartcards only
    support SHA256.
    
    Patch from Morten Linderud; ok markus@
    
    OpenBSD-Commit-ID: 246353fac24e92629263996558c6788348363ad7

commit ac7544654441280071b90a4129a47467d40f2389
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 24 23:47:50 2024 +0000

    upstream: turn off CDIAGFLAGS and turn back on INSTALL_STRIP
    
    accidentally changed in last commit
    
    OpenBSD-Commit-ID: 6d07e4606997e36b860621a14dd41975f2902f8f

commit 953fa5b59afb04c3c74ed82d7bace65c13cd8baa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 9 11:41:44 2024 +1100

    Disable security key for bigendian interop.
    
    It doesn't currently work.  It's not clear why, but I suspect
    sk-dummy.so ends up being built for the wrong architecture.

commit a80eb71c428c474098087c672398f200be8fabdf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 9 05:14:16 2024 +1100

    Reshuffle OpenWRT test configs.
    
    Move the the flags used by the OpenWRT distro to mipsel target and
    enable OpenSSL on all targets to improve coverage.
    
    Explicitly disable security key and openssl on mips target so that host
    end of the bigendian interop tests don't attempt them and fail (since
    they're not enabled on the target side).

commit d2709c461359e4129311cdff81ee05242d6c53cd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 9 03:26:08 2024 +1100

    Add keytype to bigendian interop test.

commit 50ac0f0e0627d29fd9becf5e15e8ceca5ad18078
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 9 03:24:29 2024 +1100

    Ignore chown failure, eg due to dangling symlinks.

commit 9e528e65a03245cf28e814f09b88c701bec935d1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 2 18:05:41 2024 +1100

    Test bigendian interop.
    
    Where our test target is a bigendian system, do an additional build on
    the runner host (which is little endian) and test interop between the two.
    Should hopefully catch obvious endianness bugs.

commit dd416f5bfa96ac1ff44b27a93f7b55ee627c6baf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 19:44:29 2024 +1100

    Allow overridding TEST_SSH_SSHD.
    
    This will allow tests to specify an alternative sshd, eg on a remote
    machine with different endianness.

commit 82662d562cf54829df8a941cdfb2fd307e1d9a90
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 6 22:51:26 2024 +0000

    upstream: ssh-agent implemented an all-or-nothing allow-list of
    
    FIDO application IDs for security key-backed keys, to prevent web key handles
    from being used remotely as this would likely lead to unpleasant surprises.
    By default, only application IDs that start with "ssh:*" are allowed.
    
    This adds a -Owebsafe-allow=... argument that can override the default
    list with a more or less restrictive one. The default remains unchanged.
    
    ok markus@
    
    OpenBSD-Commit-ID: 957c1ed92a8d7c87453b9341f70cb3f4e6b23e8d

commit 593a0b65c55c1e06a8c22b084aefc395aedb0127
Author: jca@openbsd.org <jca@openbsd.org>
Date:   Mon Nov 4 21:59:15 2024 +0000

    upstream: Ignore extra groups that don't fit in the buffer passed
    
    to getgrouplist(3)
    
    Our kernel supports 16 groups (NGROUPS_MAX), but nothing prevents
    an admin from adding a user to more groups.  With that tweak we'll keep
    on ignoring them instead of potentially reading past the buffer passed to
    getgrouplist(3).  That behavior is explicitely described in initgroups(3).
    
    ok millert@ gilles@
    
    OpenBSD-Commit-ID: a959fc45ea3431b36f52eda04faefc58bcde00db

commit e7adebeff3a9d038d0eaeeb0fcefedf29acb7e90
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 14:39:27 2024 +1100

    Add git signing key for Tim Rice

<<<<<<< HEAD
commit 729a26a978dd39db60d4625bdfb5405baa629e59
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 30 14:25:14 2024 +1100

    fix uint64_t types; reported by Tom G. Christensen

=======
>>>>>>> V_10_2_P1
commit da4b84845e874f12af7e0686170fa391c919d1df
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 18:51:22 2024 +1100

    Correct path to c-cpp.yml file in workflow config.

commit 28740aa2c75392a9c4191eb9523f9b20853e2932
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 18:44:42 2024 +1100

    Test new OpenSSL and LibreSSL releases.`

commit a74809fe06540f16231b354ffe21fcbf39e81f73
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 18:44:00 2024 +1100

    Add nbsd10 default test config.

commit 88b35cbdc1500efece65cd6a9a20a72cf7e46eaa
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 30 14:25:14 2024 +1100

    fix uint64_t types; reported by Tom G. Christensen

<<<<<<< HEAD
commit 33c5f384ae03a5d1a0bd46ca0fac3c62e4eaf784
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 27 13:28:11 2024 +1100

    htole64() etc for systems without endian.h

commit fe8d28a7ebbaa35cfc04a21263627f05c237e460
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 27 02:06:59 2024 +0000

    upstream: explicitly include endian.h
    
    OpenBSD-Commit-ID: 13511fdef7535bdbc35b644c90090013da43a318

commit 11f348196b3fb51c3d8d1f4f36db9d73f03149ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 27 02:06:01 2024 +0000

    upstream: fix ML-KEM768x25519 KEX on big-endian systems; spotted by
    
    jsg@ feedback/ok deraadt@
    
    OpenBSD-Commit-ID: 26d81a430811672bc762687166986cad40d28cc0

=======
>>>>>>> V_10_2_P1
commit ef7c26cd2f0f9a8222f851d1e551f6dfd3113f8b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 27 13:28:11 2024 +1100

    htole64() etc for systems without endian.h

commit 0c3927c45f8a57b511c874c4d51a8c89414f74ef
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 27 02:06:59 2024 +0000

    upstream: explicitly include endian.h
    
    OpenBSD-Commit-ID: 13511fdef7535bdbc35b644c90090013da43a318

commit cf3e48ee8ba1beeccddd2f203b558fa102be67a2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 27 02:06:01 2024 +0000

    upstream: fix ML-KEM768x25519 KEX on big-endian systems; spotted by
    
    jsg@ feedback/ok deraadt@
    
    OpenBSD-Commit-ID: 26d81a430811672bc762687166986cad40d28cc0

commit ae566d51b64fa3dce7063e7745b9b35f8f47abde
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri Oct 25 21:53:24 2024 +0000

    upstream: mlkem768x25519-sha256 has been promoted to default key
    
    exchange
    
    OpenBSD-Commit-ID: 5a3259a193fd42108a869ebf650b95b5f2d08dcf

commit 3af1dba1384ca896df6e973c70398c41d36de1ea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 25 19:04:30 2024 +1100

    Retire the minix3 test config.
    
    It got broken by the sshd-auth change, it's not obvious why, and the
    platform lacks the debugging tools (eg gdb, strace) to figure it out.
    The upstream project seems effectively dead (6 years since the last
    commit, 10 since the last release).  It was useful while it lasted
    (we found a real bug because of it) but its time seems to have passed.

commit 3b240cc44b8de9175280ddbe59331317d427b0e3
Author: Preetish Amballi <amballip@gmail.com>
Date:   Mon Oct 21 14:07:02 2024 +0000

    Updated gitignore to ignore sshd-session and sshd-auth targets

commit 326495744f06a0ab18ee0d16f87b3fe91cac92fb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 25 19:01:02 2024 +1100

    Simplify pselect shim and remove side effects.
    
    Instead of maintaing state (pipe descriptors, signal handlers) across
    pselect-on-select invocations, set up and restore them each call.
    This prevents outside factors (eg a closefrom or signal handler
    installation) from potentially causing problems.  This does result in a
    drop in throughput of a couple of percent on geriatric platforms without
    a native pselect due to the extra overhead.  Tweaks & ok djm@

commit e53b615f3934ffac1efb3c1e491d126b9b09fd24
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 25 01:34:18 2024 +0000

    upstream: promote mlkem768x25519-sha256 to be the default key exchange;
    
    ok markus@
    
    OpenBSD-Commit-ID: fc673065e6505bb06b2e2b9362f78ccb4200a828

commit de644b1831b970f6655f871c051774cc871e8e74
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 24 03:28:34 2024 +0000

    upstream: test SIGUSR1 dropping all keys from ssh-agent
    
    OpenBSD-Regress-ID: 8654b9aa8eb695b1499fffc408c25319592bf0e0

commit e86d7a077ce9a2b9ee9d4138c358a17cbdb786f9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 24 03:15:47 2024 +0000

    upstream: amake ssh-agent drop all keys when it receives SIGUSR1;
    
    let's users zap keys without access to $SSH_AUTH_SOCK
    
    ok deraadt@
    
    OpenBSD-Commit-ID: dae9db0516b1011e5ba8c655ac702fce42e6c023

commit 94cdfebec852a2429c008cc2a55f8e4183f36972
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 24 03:14:37 2024 +0000

    upstream: relax valid_domain() checks to allow an underscore as the
    
    first character. ok deraadt@
    
    OpenBSD-Commit-ID: 3f8be6d32496e5596dd8b14e19cb067ddd7969ef

commit 1b05d5437bf45bee5e3104772dea06ed51764f1b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 22 07:13:28 2024 +0000

    upstream: Remove sshd logfile in start_sshd
    
    ... and ssh and sshd log wrappers before recreating them.  Prevents "can't
    create" errors during tests when running tests without SUDO after having
    run them with SUDO.
    
    OpenBSD-Regress-ID: 2f0a83532e3dccd673a9bf0291090277268c69a6

commit 307ab3c7720f8879b835614b02687358ee4df9b9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 22 06:16:26 2024 +0000

    upstream: Add a sshd debug wrapper
    
    ... to run all of the subprograms from the build directory while
    developing and debugging.  Should help prevent accidentally testing
    against unchanged installed sshd-auth and sshd-session binaries. ok djm@
    
    OpenBSD-Commit-ID: 61760cdc98c2bc8f1e9f83a6f97cca0f66b52e69

commit 87bd1cb3ccba5e91d2650eb7f753c898ee43858e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 22 06:13:00 2024 +0000

    upstream: Make debug call printf("%s", NULL) safe.
    
    Prevents problems on platforms where this isn't safe (which it's not
    required to be).  ok djm@
    
    OpenBSD-Commit-ID: 8fa4ce3ad90915c925b81b99a79ab920b0523387

commit c44c349edd157b2c00c42bd5ef5f9dfb37de26f3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 22 17:48:32 2024 +1100

    Resync cvsid missed in commit 6072e4c9.

commit fe4305c37ffe53540a67586854e25f05cf615849
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 05:53:26 2024 +0000

    upstream: mention that LocalForward and RemoteForward can accept Unix
    
    domain socket paths; GHPR115
    
    OpenBSD-Commit-ID: a8a34d0a0c51a9ddab3dfce615f9878fa76ef842

commit 9c97b6af8e052ab5ffe0f9096fadc8f9a4d0ed0f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 05:45:40 2024 +0000

    upstream: remove duplicate check; GHPR392 from Pedro Martelletto
    
    OpenBSD-Commit-ID: 597ab7dd3f0e78939d2659fc1904d0f39ee95487

commit d9cd208e89a471a3ff8adfcec68d6210af9e9fd5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 05:37:24 2024 +0000

    upstream: allow "-" as output file for moduli screening
    
    based on GHPR393
    
    OpenBSD-Commit-ID: 1517763764eb55d03a6092dd120d2909c6fef0e1

commit 5eb5c4b2820d0636b1eccee646fb32ec946c4a95
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 05:32:51 2024 +0000

    upstream: ssh-keyscan doesn't need it's own sshfatal() definition, it
    
    can use the shared one from fatal.c
    
    based on GHPR401 from lengyijun
    
    OpenBSD-Commit-ID: 8ea75ea99f27f464c9223cbc89cb046ccf9cd5c4

commit 0a1e75499e2c6fc258ee903645c878480949f362
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 05:14:51 2024 +0000

    upstream: in _ssh_order_hostkeyalgs() consider ECDSA curve type when
    
    arranging the hostkey algorithms. AFAIK this code is unused in OpenSSH, but I
    guess others are using it
    
    based on GHPR387 from Pawel Jakub Dawidek
    
    OpenBSD-Commit-ID: 4d462495ac0c40f7b7dd66178e0005b9b2128225

commit d01ee7a88c5f4b1aa8c75a7c739f8f3bc1ad8bde
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 05:03:34 2024 +0000

    upstream: require control-escape character sequences passed via the '-e
    
    ^x' commandline to be exactly two characters long. Avoids one by OOB read if
    ssh is invoked as "ssh -e^ ..."
    
    Spotted by Maciej Domanski in GHPR368
    
    OpenBSD-Commit-ID: baa72bc60898fc5639e6c62de7493a202c95823d

commit 74ff6382f5743e09930e6cbd195dac65cd6062c9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 04:30:09 2024 +0000

    upstream: remove addr.[ch] functions that are unused and
    
    visbility-restrict ones that are unused outside the implementation itself;
    based on GHPR#282 by tobias@
    
    OpenBSD-Commit-ID: a0140f2418b4d46cfaa7b33febc0a0931f9b2744

commit a9d6d7d93c533fa729f08b405e786d912553f33e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 04:14:59 2024 +0000

    upstream: unreachable POLLERR case; from ya0guang via GHPR485
    
    OpenBSD-Commit-ID: b3c82655190532b01eb817e532742cfaa4687eff

commit d76424bf279ff951383e21213eb3759ea4090674
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 18 04:11:54 2024 +0000

    upstream: s/Sx/Cm/ for external references; from Domen Puncer
    
    Kugler via GHPR501
    
    OpenBSD-Commit-ID: f864a34feb5d5ff17160cf7c42ad0f7744fe8a3f

commit ca204b994e2981e7bf95627b3105408917105649
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Mon Oct 14 23:53:34 2024 +0000

    upstream: mention SshdAuthPath option; ok djm@
    
    OpenBSD-Commit-ID: 9a5d3add25e4e77bd3805bc5583a842ecf34d85c

commit be27770e840c4dd9d9fcad1aa879400c727d7c2f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 18 13:37:55 2024 +1100

    Remove references to systrace and pledge sandboxes.
    
    ok djm@

commit 49e64bf63fbf2f14961062dafe8ef08cb816bb08
Author: Pavel Miadzvedzeu <pmiadzvedzeu@gmail.com>
Date:   Wed Apr 24 10:19:56 2024 +0300

    Fix "undeclared 'ut'" error by replacing it with 'utx'

commit 67f684733f60f66479854a2867b953de731e71b2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 17 20:50:29 2024 +1100

    Seed RNG when starting up sshd-auth.
    
    Makes builds configured --without-openssl work again since otherwise
    the first use of the RNG comes after the sandbox init and it can't
    open /dev/random.

commit c06c681aeebbe8e84e7410095514e7ee91f7e6cb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 17 19:18:23 2024 +1100

    MacOS 12 runners are deprecated, replace with 15.

commit 39db1f23bafb48a7c0cc9c65c716a0370f4cc677
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 13:28:47 2024 +1100

    Fix lookup path for sshd-auth; bz3745

<<<<<<< HEAD
commit 541d3ba50af9cc396075be5e448a7d591479d06b
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Oct 16 15:56:48 2024 -0400

    Documentation fixes in README.md and HPNSSHInstallation.txt
    
    Provided by oregonpillow @ github

=======
>>>>>>> V_10_2_P1
commit c537eeb1ae5f069450053b0027e64efe5bdb37d2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 16 08:28:21 2024 +1100

    fix breakage; missing saved_argc symbol

commit 98a0883bdef28a06c7e017f27adf21ba57898bf4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 14 17:17:50 2024 +1100

    fix capsicum sandbox

commit 164ea4380564a2a83713eacf71908e3946e5e4e4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 14 17:16:41 2024 +1100

    put back some portable bits for sshd-auth.c

commit f8edf08c258ee2918689872c4702302052729726
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 14 14:49:25 2024 +1100

    there's only one sandbox, move to a static global

commit 4482f0042b41d3d63c3845d7ba9fcf47c9252a84
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 14 14:49:20 2024 +1100

    depend

commit 74856204a353a187dc6e7706c6cf84b7f14d775d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 14 03:02:08 2024 +0000

    upstream: regress support for split sshd-auth binary
    
    OpenBSD-Regress-ID: df7d18a87b475f70004770f0f4e404adba5f6ab7

commit 461741083d7254595fecea274e60fe3ebf3ce3f9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 27 01:05:54 2024 +0000

    upstream: test some more Match syntax, including criteria=arg and
    
    negations
    
    OpenBSD-Regress-ID: 67476baccc60bf1a255fd4e329ada950047b8b8d

commit 6072e4c9385713e9c166f32cfca6a7e603d4f0b8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 14 01:57:50 2024 +0000

    upstream: Split per-connection sshd-session binary
    
    This splits the user authentication code from the sshd-session
    binary into a separate sshd-auth binary. This will be executed by
    sshd-session to complete the user authentication phase of the
    protocol only.
    
    Splitting this code into a separate binary ensures that the crucial
    pre-authentication attack surface has an entirely disjoint address
    space from the code used for the rest of the connection. It also
    yields a small runtime memory saving as the authentication code will
    be unloaded after thhe authentication phase completes.
    
    Joint work with markus@ feedback deraadt@
    
    Tested in snaps since last week
    
    OpenBSD-Commit-ID: 9c3b2087ae08626ec31b4177b023db600e986d9c

commit fe6c6330c1a94c7a537efe9069853ce7a275c50a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 13 22:20:06 2024 +0000

    upstream: don't start the ObscureKeystrokeTiming mitigations if
    
    there has been traffic on a X11 forwarding channel recently.
    
    Should fix X11 forwarding performance problems when this setting is
    enabled. Patch from Antonio Larrosa via bz3655
    
    OpenBSD-Commit-ID: 820284a92eb4592fcd3d181a62c1b86b08a4a7ab

commit 538cd28598ae942c94b99855b06fdd937e2e7381
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sat Oct 12 10:50:37 2024 +0000

    upstream: remove duplicate misc.h include ok dtucker@
    
    OpenBSD-Commit-ID: fdd056e7854294834d54632b4282b877cfe4c12e

commit 0051381a8c33740a77a1eca6859efa1c78887d80
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 6 23:37:17 2024 +0000

    upstream: Turn off finite field (a.k.a modp) Diffie-Hellman key
    
    exchange in sshd by default. Specifically, this removes the
    diffie-hellman-group* and diffie-hellman-group-exchange-* methods. The client
    is unchanged and continues to support these methods by default.
    
    Finite field Diffie Hellman is slow and computationally expensive for
    the same security level as Elliptic Curve DH or PQ key agreement while
    offering no redeeming advantages.
    
    ECDH has been specified for the SSH protocol for 15 years and some
    form of ECDH has been the default key exchange in OpenSSH for the last
    14 years.
    
    ok markus@
    
    OpenBSD-Commit-ID: 4e238ad480a33312667cc10ae0eb6393abaec8da

<<<<<<< HEAD
commit 347fb921d5ab64f24c962bb83f276cba5da422f4
Merge: 1f72ea21d c7bc8d5ba
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Oct 2 11:29:04 2024 -0400

    Merge pull request #106 from rapier1/dev_minor
    
    Merge OpenSSH 9.9 into HPN-SSH 18.6.0

commit c7bc8d5ba1e09d807839c039d487b2c72b1af961
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 30 14:25:37 2024 -0400

    Copy/Paste error/typo in regress/rekey.sh

commit ba9c2f19bc7c0b62b21dad1e8d97f2a704bbce7e
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 30 14:19:07 2024 -0400

    Updated method to skip none MAC regression test.
    
    It's easier and less error prone to just filter the
    none MAC from the list of MACs to test.

commit b0050bdd7b071ea6151b884adea98a208cb9d1f0
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Sep 30 14:15:18 2024 -0400

    Fix test of none MAC in rekey regression test.
    
    The none MAC is valid in HPN-SSH but it's not enabled by
    default in sshd_config. So when the rekey tests tries to test
    it then it will fail. This doesn't occur in all scenarious but
    absolutely under OSX and other cases in which openssl is disabled.

commit 7ba2f82a0ff04c84f52904b45eb3f3b99001714f
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 27 15:36:06 2024 -0400

    This fixes an issues that was preventing compilation on some big-endian architectures.
    
    A one line fix provided by Mattias Ellert.
    See https://github.com/rapier1/hpn-ssh/pull/93 for the PR.

commit 19bcb2d90c6caf14abf386b644fb24eb7afab889
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 26 23:55:08 2024 +0000

    upstream: fix previous change to ssh_config Match, which broken on
    
    negated Matches; spotted by phessler@ ok deraadt@
    
    OpenBSD-Commit-ID: b1c6acec66cd5bd1252feff1d02ad7129ced37c7

=======
>>>>>>> V_10_2_P1
commit 67a115e7a56dbdc3f5a58c64b29231151f3670f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 26 23:55:08 2024 +0000

    upstream: fix previous change to ssh_config Match, which broken on
    
    negated Matches; spotted by phessler@ ok deraadt@
    
    OpenBSD-Commit-ID: b1c6acec66cd5bd1252feff1d02ad7129ced37c7

commit 220b6c1290042acd5180d783dea01efe1365c265
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Sep 25 23:01:39 2024 +0000

    upstream: remove some unused defines; ok djm@
    
    OpenBSD-Commit-ID: 3a63e4e11d455704f684c28715d61b17f91e0996

commit 3ef4f6e8a4d774f73852391fdccbb95f39fc71bf
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Sep 25 06:13:01 2024 +0000

    upstream: remove some unneeded Xo/Xc calls; from evan silberman the
    
    original diff had a couple of errors, which i've fixed
    
    OpenBSD-Commit-ID: f37ad5888adbc0d4e1cd6b6de237841f4b1e650d

<<<<<<< HEAD
commit 66878e12a207fa9746dee3e2bdcca29b704cf035
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 25 01:24:04 2024 +0000

    upstream: fix regression introduced when I switched the "Match"
    
    criteria tokeniser to a more shell-like one. Apparently the old tokeniser
    (accidentally?) allowed "Match criteria=argument" as well as the "Match
    criteria argument" syntax that we tested for.
    
    People were using this syntax so this adds back support for
    "Match criteria=argument"
    
    bz3739 ok dtucker
    
    OpenBSD-Commit-ID: d1eebedb8c902002b75b75debfe1eeea1801f58a

commit ff2cd1dd5711ff88efdf26662d6189d980439a1f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 25 11:15:45 2024 +1000

    gss-serv.c needs sys/param.h
    
    From Void Linux

commit 2c12ae8cf9b0b7549ae097c4123abeda0ee63e5b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 25 11:13:05 2024 +1000

    build construct_utmp() when USE_BTMP is set
    
    Fixes compile error on Void Linux/Musl

commit c7fda601186ff28128cfe3eab9c9c0622de096e1
Author: Christoph Ostarek <christoph@zededa.com>
Date:   Wed Jul 3 12:46:59 2024 +0200

    fix utmpx ifdef
    
    02e16ad95fb1f56ab004b01a10aab89f7103c55d did a copy-paste for
    utmpx, but forgot to change the ifdef appropriately

=======
>>>>>>> V_10_2_P1
commit 3f02368e8e9121847727c46b280efc280e5eb615
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 25 01:24:04 2024 +0000

    upstream: fix regression introduced when I switched the "Match"
    
    criteria tokeniser to a more shell-like one. Apparently the old tokeniser
    (accidentally?) allowed "Match criteria=argument" as well as the "Match
    criteria argument" syntax that we tested for.
    
    People were using this syntax so this adds back support for
    "Match criteria=argument"
    
    bz3739 ok dtucker
    
    OpenBSD-Commit-ID: d1eebedb8c902002b75b75debfe1eeea1801f58a

commit 9517cc58577f85a0ba5f8bb46778dff625f0688f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 24 02:28:17 2024 +0000

    upstream: some extra paranoia, reminded by jsg@
    
    OpenBSD-Commit-ID: 22072bfa1df1391858ae7768a6c627e08593a91e

commit 815a94e86a68c1000b8310cb47695cea9329516c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 25 11:15:45 2024 +1000

    gss-serv.c needs sys/param.h
    
    From Void Linux

commit 76a618d2842c34c16cd21a4efc7230e2f459008d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 25 11:13:05 2024 +1000

    build construct_utmp() when USE_BTMP is set
    
    Fixes compile error on Void Linux/Musl

commit d3aee17f6d395202eaa42a0c449b6da41f61527c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 24 18:41:44 2024 +1000

    Test the flags from OpenWRT's package.

commit 0f5d19e6fe4b58a89e6dc8c71a2aae30365d193e
Author: Christoph Ostarek <christoph@zededa.com>
Date:   Wed Jul 3 12:46:59 2024 +0200

    fix utmpx ifdef
    
    02e16ad95fb1f56ab004b01a10aab89f7103c55d did a copy-paste for
    utmpx, but forgot to change the ifdef appropriately

commit e03239f999acf9dc3da0f2f72bde36abbe678911
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sun Sep 22 12:56:21 2024 +0000

    upstream: remove some unused defines; ok djm@
    
    OpenBSD-Commit-ID: 81869ee6356fdbff19dae6ff757095e6b24de712

commit a35f543d3a6275fef781e515c262d1c687c3bc28
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Fri Sep 20 02:00:46 2024 +0000

    upstream: remove unneeded semicolons; checked by millert@
    
    OpenBSD-Commit-ID: 3fb621a58e04b759a875ad6a33f35bb57ca80231

<<<<<<< HEAD
commit 7cf4dc414de689c467e58e49fb83f6609c3ed36b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 23 20:54:26 2024 +1000

    Remove non-9.9 branch statuses.

commit 8513f4d30ae85d17b3b08da6bc3be76f8c73123c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 23 20:52:31 2024 +1000

    Add 9.9 branch to CI status console.

=======
>>>>>>> V_10_2_P1
commit 1641f2d4d6e05d2147913442864cae546e64f08b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 23 20:52:31 2024 +1000

    Add 9.9 branch to CI status console.

<<<<<<< HEAD
commit a0df478f6cea9ead230c6c40e4a2054d4dee41a5
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 20 17:45:15 2024 -0400

    Crank vesrion number.

commit f30380ca04b53d3a1d6c27e1b12564e645fab0ee
Merge: 1f72ea21d 53a80baae
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 20 17:11:35 2024 -0400

    First pass at porting 9.9 into 18.6.0
    
    The only parts of the merge that conflicted were in the
    document dates of some of the man pages and some CI
    config files. This has not yet passed regression or
    functionality tests.

commit 53a80baaebda180f46e6e8571f3ff800e1f5c496
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 20 08:20:48 2024 +1000

    autogenerated files for release

=======
>>>>>>> V_10_2_P1
commit 46d1fb16b20e971b9ac15e86a3d3e350b49c9ad6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 20 08:20:13 2024 +1000

    update version numbers

commit 0bdca1f218971b38728a0a129f482476baff0968
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 19 22:17:44 2024 +0000

    upstream: openssh-9.9
    
    OpenBSD-Commit-ID: 303417285f1a73b9cb7a2ae78d3f493bbbe31f98

<<<<<<< HEAD
commit 1f72ea21da03cdbe94705908eda584171474c3a0
Merge: cf9597fd7 87c8cd329
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 19 14:00:54 2024 -0400

    Merge pull request #101 from rapier1/update_version_string
    
    Push the version string

commit 87c8cd329c60b2aecd9906fdd865bb5f9e5adea1
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 19 13:59:07 2024 -0400

    Push the version string

commit cf9597fd7bdd0b874f2edfd3571c62f0e580c56c
Merge: 15b6f4118 e2381f6ba
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 19 13:34:06 2024 -0400

    Merge pull request #100 from rapier1/bug_pam_18.5.0_fix
    
    Fix issue with pam where it was looking for an sshd pam file instead hpnsshd

commit e2381f6ba9c32908fb25463d893ec579a8a069fb
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 19 13:15:10 2024 -0400

    Fix issue with pam where it was looking for an sshd pam file instead of hpnsshd.
    
    Mitch found this. Seems to have been cause by a change in OpenSSH 9.8 where
    they made the pam service configurable and made the default sshd. This will
    work in most situations because OpenSSH is already installed but will fail
    if the only installed ssh server is hpn-ssh. This fix simply changes the default
    name from 'sshd' to 'hpnsshd'.

=======
>>>>>>> V_10_2_P1
commit ef2d7f2d3e1b4c9ae71bacf963e76a92ab8be543
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 18 16:03:23 2024 +1000

    include openbsd-compat/base64.c license in LICENSE

commit 7ef362b989c8d1f7596f557f22e5924b9c08f0ea
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 18 09:01:23 2024 +1000

    conditionally include mman.h in arc4random code

commit 5fb2b5ad0e748732a27fd8cc16a7ca3c21770806
Author: Damien Miller <djm@mindrot.org>
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 <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 <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 <djm@mindrot.org>
Date:   Sun Sep 15 13:30:13 2024 +1000

    avoid gcc warning in fuzz test

commit ce171d0718104b643854b53443ff72f7283d33f2
Author: djm@openbsd.org <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 <djm@mindrot.org>
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 <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 <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 <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 <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 <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 <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 <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 <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 <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

<<<<<<< HEAD
commit 15b6f411881b7bb0bc5139418eae46796a4f0a97
Merge: 52bc5fd19 4585f916c
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Sep 13 13:57:08 2024 -0400

    Release of HPN-18.5.0 incorporating OpenSSH 9.8p1
    
    This release brings HPN-SSH up to OpenSSH 9.8 which brings
    along all of the changes in OpenSSH. This includes changes
    to the hpnsshd server; specifically splitting the server into
    relative barebones listener and a hpnsshd-session client that
    handles the user interaction on the server side.
    
    There are limited changes to HPN-SSH itself aside from a minor
    change to the versioning to make it RFC compliant. Thanks to
    Lupo Luchini for pointing this out.

=======
>>>>>>> V_10_2_P1
commit 49f325fd47af4e53fcd7aafdbcc280e53f5aa5ce
Author: Wu Weixin <wuweixin@gmail.com>
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 <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 <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 <dtucker@dtucker.net>
Date:   Tue Sep 10 21:11:14 2024 +1000

    Spell omnios test host correctly.

commit 059ed698a47c9af541a49cf754fd09f984ac5a21
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 10 18:52:02 2024 +1000

    Add omnios test target.

commit f4ff91575a448b19176ceaa8fd6843a25f39d572
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 10 18:45:55 2024 +1000

    Wrap stdint.h in ifdef.

commit ff714f001d20a9c843ee1fd9d92a16d40567d264
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 9 19:31:54 2024 +1000

    Also test PAM on dfly64.

commit 509b757c052ea969b3a41fc36818b44801caf1cf
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 9 21:50:14 2024 +1000

    stubs for ML-KEM KEX functions
    
    used for C89 compilers

commit 273581210c99ce7275b8efdefbb9f89e1c22e341
Author: Damien Miller <djm@mindrot.org>
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 <djm@mindrot.org>
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 <djm@mindrot.org>
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 <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 <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 <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

<<<<<<< HEAD
commit 4585f916c56f995b3f8bd5c46f32d017dd7cc18b
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 5 11:24:48 2024 -0400

    Changed hyphen in version string to underscore.
    
    According to RFC 4253 the version string cannot include
    a hyphen or minus sign in the protoversion or softwareversion
    stanzas. So while you can use a hyphen between those stanzas
    you cannot include a hypen in the stanza. Since the hpn version
    is part of the softwareversion stanza we can't include a hypen.
    Chnaging it to an underscore is acceptable and won't break
    our compatability tests in compat.c
    See RFC 4253 Section 4.2.
    
    brought to our attention by Lapo Luchini via github
    issue #97

=======
>>>>>>> V_10_2_P1
commit 13cc78d016b67a74a67f1c97c7c348084cd9212c
Author: djm@openbsd.org <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 <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 <jmc@openbsd.org>
Date:   Tue Sep 3 06:17:48 2024 +0000

    upstream: envrionment -> environment;
    
    OpenBSD-Commit-ID: b719f39c20e8c671ec6135c832d6cc67a595af9c

commit e66c0c5673a4304a3a9fbf8305c6a19f8653740f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 15:35:29 2024 +1000

    add basic fuzzers for our import of sntrup761

commit d19dea6330ecd4eb403fef2423bd7e127f4c9828
Author: djm@openbsd.org <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 <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 <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 <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 <alarrosa@suse.com>
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 <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 <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 <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 <dtucker@dtucker.net>
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 <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 <djm@mindrot.org>
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 <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 <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 <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 <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 <djm@mindrot.org>
Date:   Wed Aug 21 09:18:29 2024 +1000

    simplify sshkey_prekey_alloc(); always use mmap

commit 4442bbc2fc661277a6dabfedb756a7e15ee8b8b8
Author: dtucker@openbsd.org <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 <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 <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 <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 <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 <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 <djm@mindrot.org>
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 <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 <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 <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 <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 <dtucker@dtucker.net>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <phil@hands.com>
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 <smahanga@redhat.com>
Date:   Mon Jul 29 15:26:05 2024 +0000

    Minor space issue fixed
    
    SSH-Copy-ID-Upstream: 335e44d7be78b03962a54c3a5c99a2ff45294a54

commit 2f3010f4736b4b3f5c10a4be97a24e90ff04c5e7
Author: Shreyas Mahangade <smahanga@redhat.com>
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 <djm@mindrot.org>
Date:   Fri Aug 16 08:30:20 2024 +1000

    more OPENSSL_HAS_ECC

commit 4da2a1a7f648979bea6eaf3b17f5f250faed4afc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 15 23:35:54 2024 +1000

    fix merge botch that broke !OPENSSL_HAS_ECC

commit 2c53d2f32b8e3992b61682c909ae5bc5122b6e5d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 15 15:09:45 2024 +1000

    missed OPENSSL_HAS_ECC case

commit 342dd7a219f39119b8b686b5aaa99c8e15ede368
Author: Damien Miller <djm@mindrot.org>
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 <djm@mindrot.org>
Date:   Thu Aug 15 12:44:17 2024 +1000

    sync TEST_MALLOC_OPTIONS for OpenBSD

commit 60c2cf22e8f64f35d8b1175e4671257313f2e4d3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 15 12:43:47 2024 +1000

    remove gratuitious difference from OpenBSD

commit 339c4fc60a6250429d41fa8713f783d82aad4551
Author: djm@openbsd.org <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 <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 <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 <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 <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 <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 <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 <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 <naddy@openbsd.org>
Date:   Fri Jul 26 15:24:49 2024 +0000

    upstream: document the reduced logingrace penalty
    
    OpenBSD-Commit-ID: 9b63e0e3599d524ddc10edc4f978081382c3548b

<<<<<<< HEAD
commit c171bdca46f82775119d65a53c2bde47113bad1e
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Aug 9 17:35:26 2024 -0400

    Cygwin Issues.
    
    There have been issues with cygwin/windows CI tests. I think I
    have identified the problem as missing steps in the workflow file.
    This also incorporates a minor change in the dependencies for cygwin.
    That was taken from openssh master.

commit 9150b5475711b93ac100f9d3c96a2c92cae669b2
Merge: ad1e0186c 6e97c21ce
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Aug 9 16:04:16 2024 -0400

    Forward port 9.8 to HPN-SSH 18.5.0
    
    This is the first pass of the 9.8 port that will be subject to the
    github ci tests. It is passing local regression tests.

=======
>>>>>>> V_10_2_P1
commit 1ec0a64c5dc57b8a2053a93b5ef0d02ff8598e5c
Author: Darren Tucker <dtucker@dtucker.net>
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 <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 <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 <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 <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 <dtucker@dtucker.net>
Date:   Thu Jul 25 17:59:35 2024 +1000

    Check for SA_RESTART before using it.
    
    ok djm@

commit c276672fc0e99f0c4389988d54a84c203ce325b6
Author: Yuichiro Naito <naito.yuichiro@gmail.com>
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 <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 <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 <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 <dtucker@dtucker.net>
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 <dtucker@dtucker.net>
Date:   Thu Jul 4 20:12:26 2024 +1000

    Add 9.8 branch to ci-status page.

commit ee6b9e661633fcefd29dba0c811cecbc4d027f6f
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
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.

<<<<<<< HEAD
commit 52bc5fd19cb532ab4262389165ae529779004b03
Merge: 783d8b2b8 ad1e0186c
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 2 16:06:08 2024 -0400

    Merge pull request #90 from rapier1/dev_minor
    
    Resolve CVE aka regreSSHion bug.

commit ad1e0186c1ce03e9dbb13ce62637e33b69ced20d
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 2 14:11:46 2024 -0400

    Had an ifdef in the wrong place.
    
    The ifdef add to log.c was in the wrong place and
    throwing an error for unused argument

commit 93fa8bf0f970c0c1afe34f8d980602d1f1da2222
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 2 14:08:11 2024 -0400

    Resolve CVE aka regreSSHion bug.
    
    This incorporates the fixes provided by DJM. This is a
    backport to 9.7 unti we can get the 9.8 port working
    correctly.

commit 6e97c21cee0828ebc528c3a8d081f8b47c3c862b
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 2 12:10:51 2024 -0400

    More adjustments to CI tests

commit 8e0a546b549fed29875820653a5709206527b591
Merge: 3fc03e9d4 032af0555
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 1 14:34:01 2024 -0400

    Merge pull request #86 from klardotsh/klardotsh/restore-disablemtaes
    
    cipher: Restore DisableMTAES capability to resolve FIPS SIGSEGV.

commit 3fc03e9d4e302027457fe7dfed44674a2fbeca8d
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 1 14:12:56 2024 -0400

    Error in workflow file. Missed a tab.

commit 9d60bf8bfd21b2373112d5a71adbc7ec83bca0d6
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 1 14:12:04 2024 -0400

    Error in workflow file. Tabs need to be spaces.

commit b664c446cfa8fdcc105a9dc1e144cd47347d30bb
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 1 14:10:59 2024 -0400

    Error in workflow file.
    
    That didn't work. Trying to convert tabs to spaces now.

commit 47fd3fb2244ad16c15f8c50f18e45c364c32f32b
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 1 14:08:19 2024 -0400

    Error in workflow file.
    
    Trying to use ubuntu-24.04 as a target but that might be
    throwing an error. This is a test to see if removing that
    fixes the issue

commit 9aefbefab71e4802c5a61abe2a5b99fc44fd6cfb
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 1 14:05:14 2024 -0400

    Update c-cpp workflow for github regression tests.
    
    I had been using Ubuntu 24.04 as the target platform for everything
    however, that release doesn't have access to a number of the
    clang and gcc versions we are testing so I had to roll those
    back. This may require more tuning.

commit f6d478a40c76165baeaa20a6e0a92504058d4e44
Merge: cac53c99c fa41f6592
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 1 11:53:33 2024 -0400

    Merge to release version of OpenSSH 9.8
    
    This will be HPN-SSH 18.5.

commit cac53c99ced963ce2795a2ff4dcf7115637284d5
Merge: a05465635 cfe243cd9
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 1 11:34:01 2024 -0400

    Port to 9.8

=======
>>>>>>> V_10_2_P1
commit fa41f6592ff1b6ead4a652ac75af31eabb05b912
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 1 14:33:26 2024 +1000

    version numbers

commit bfebb8a5130a792c5356bd06e1ddef72a0a0449f
Author: djm@openbsd.org <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 <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 <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

<<<<<<< HEAD
commit 032af05556ae5f2c345c45135100edf5066f2b7b
Author: Josh Klar <josh.klar@servicenow.com>
Date:   Fri Jun 28 17:31:46 2024 -0700

    cipher: Restore DisableMTAES capability to resolve FIPS SIGSEGV.

=======
>>>>>>> V_10_2_P1
commit c8cfe258cee0b8466ea84597bf15e1fcff3bc328
Author: djm@openbsd.org <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 <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 <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 <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 <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 <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 <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 <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 <dtucker@dtucker.net>
Date:   Thu Jun 20 18:45:14 2024 +1000

    Rerun upstream tests on .sh file changes too.

commit dbbf9337c19381786a8e5a8a49152fe6b80c780d
Author: dtucker@openbsd.org <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 <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 <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 <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 <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 <dtucker@dtucker.net>
Date:   Wed Jun 19 23:09:05 2024 +1000

    Move -f to the place needed to restart sshd.

commit d5f83cfd852b14a25f347f082ab539a9454702ad
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 19 21:04:01 2024 +1000

    Need to supply "-f" to restart sshd.

commit fad34b4ca25c0ef31e5aa841d461b6f21da5b8c1
Author: dtucker@openbsd.org <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 <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 <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 <dtucker@dtucker.net>
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 <dtucker@dtucker.net>
Date:   Tue Jun 18 19:59:59 2024 +1000

    Remove macos-11 runner.
    
    Github is retiring them soon.

commit df1c72a55edbebac14363b57de66ac6a147ecc67
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 19 09:34:34 2024 +1000

    PAMServiceName may appear in a Match block

commit de1c2e70e5a5dc3c8d2fe04b24cc93d8ef6930e7
Author: dtucker@openbsd.org <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 <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 <djm@mindrot.org>
Date:   Tue Jun 18 12:29:45 2024 +1000

    missed a bit of DSA in the fuzzer

commit 3f9cc47da588e8de520720e59f98438043fdaf93
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 18 09:35:53 2024 +1000

    DSA support is disabled, so remove from fuzzers

commit 00eb95957dea5484b2c7c043f7d2bbc87301bef2
Author: djm@openbsd.org <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 <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 <djm@mindrot.org>
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 <djm@mindrot.org>
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 <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 <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 <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 <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 <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 <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 <djm@mindrot.org>
Date:   Fri Jun 14 14:46:35 2024 +1000

    skip penalty-expire test in valgrind test env

commit 2866ad08a9c50d7b67ce9424ca990532b806a21a
Author: djm@openbsd.org <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 <djm@mindrot.org>
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 <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 <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 <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 <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 <djm@mindrot.org>
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 <djm@mindrot.org>
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 <djm@mindrot.org>
Date:   Thu Jun 13 14:41:33 2024 +1000

    typo in comment

commit afe10313c1fa8d478af399ee7d54c8f85503013b
Author: Damien Miller <djm@mindrot.org>
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 <djm@mindrot.org>
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 <djm@mindrot.org>
Date:   Thu Jun 13 11:16:57 2024 +1000

    missing file for PerSourcePenalties regress test

commit 4de80ff4e6fab5a6bb0028e7d57c6c23d1485adb
Author: djm@openbsd.org <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 <jmc@openbsd.org>
Date:   Tue Jun 11 05:24:39 2024 +0000

    upstream: do not mark up "(default: 20ms)";
    
    OpenBSD-Commit-ID: 54151ecdecfa1b67dcdda4fd24826ef6e2148ad4

<<<<<<< HEAD
commit b0135edd5f8cb3f42d5b2575c99f1c52a9e2182f
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jun 11 13:09:34 2024 -0400

    Add hpnsshd-session to .gitignore

=======
>>>>>>> V_10_2_P1
commit cfe243cd9fde148ed060637876e27bb55ac78be9
Author: djm@openbsd.org <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <djm@openbsd.org>
Date:   Thu Jun 6 19:47:48 2024 +0000

    upstream: simplify
    
    OpenBSD-Regress-ID: 50316e0d1ae0c0a057a45af042253e54ce23d11c

commit e6ea3d224513b6bfb93818809d4c7397f5995ba2
Author: djm@openbsd.org <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 <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 <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 <djm@mindrot.org>
Date:   Fri Jun 7 03:31:02 2024 +1000

    whitespace

commit 49b55e44182b8294419aa580cbf043d5b9e3d953
Author: deraadt@openbsd.org <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 <djm@mindrot.org>
Date:   Wed Jun 5 02:21:30 2024 +1000

    remove PRIVSEP macros for osx

commit 8785491123d4d722b310c20f383570be758f8263
Author: djm@openbsd.org <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 <djm@mindrot.org>
Date:   Fri May 31 19:12:26 2024 +1000

    depend

commit 94b4866cb1f4b0ed29a9f367047b30f81002316f
Author: Damien Miller <djm@mindrot.org>
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 <djm@mindrot.org>
Date:   Fri May 31 19:05:34 2024 +1000

    remove remaining use_privsep mention

commit b21d271f651d2536dca819cc6d74032fe98634db
Author: djm@openbsd.org <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 <djm@openbsd.org>
Date:   Fri May 31 08:49:35 2024 +0000

    upstream: typos
    
    OpenBSD-Commit-ID: edfa72eb06bfa65da30fabf7d2fe76d2d33f77bf

commit 8054b906983ceaed01fabd8188d3dac24c05ba39
Author: djm@openbsd.org <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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

<<<<<<< HEAD
commit a054656351ba881f57b657d4ca68d0cdcdda33c7
Merge: 24a1f3e5a 783d8b2b8
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue May 21 17:27:48 2024 -0400

    Porting HPN-SSH to split sshd listener.
    
    OpenSSH is splitting sshd into a listener and an session daemon.
    This commit is a first pass at porting HPN-SSH into that
    configuration. It current passes all regression tests.
    Functionality tests have not yet been conducted.

=======
>>>>>>> V_10_2_P1
commit 24a1f3e5ad6f4a49377d4c74c36637e9a239efd0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 17 14:50:43 2024 +1000

    attempt at updating RPM specs for sshd-session

commit 17b566eeb7a0c6acc9c48b35c08885901186f861
Author: djm@openbsd.org <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 <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 <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 <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 <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 <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 <djm@mindrot.org>
Date:   Fri May 17 12:21:27 2024 +1000

    Makefile support for sshd-session

commit c0416035c5eaf70a8450d11c8833c5f7068ee7ad
Author: djm@openbsd.org <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 <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

<<<<<<< HEAD
commit 589a82705ac104776ac7426b06f95a85275add32
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon May 13 17:30:56 2024 -0400

    Incorporate MPTCP from evrardco.
    
    See https://github.com/openssh/openssh-portable/pull/335/commits
    This creates a new runtime option of UseMPTCP that will allow
    HPN-SSH to make use of MultiPath TCP. This only works under Linux
    at this point.

=======
>>>>>>> V_10_2_P1
commit 1c0d81357921f8d3bab06841df649edac515ae5b
Author: djm@openbsd.org <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 <tobias@openbsd.org>
Date:   Mon May 6 19:26:17 2024 +0000

    upstream: remove SSH1 leftovers
    
    Authored with Space Meyer <git at the-space dot agency>
    
    ok djm
    
    OpenBSD-Commit-ID: 81db602e4cb407baae472689db1c222ed7b2afa3

commit bc5dcb8ab9a4e8af54a724883732af378f42ea78
Author: tobias@openbsd.org <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 <maxdev at posteo dot de>
    
    ok djm
    
    OpenBSD-Commit-ID: 48e9b7938e2fa2f9bd47e6de6df66a31e0b375d3

commit 6a42b70e56bef1aacdcdf06352396e837883e84f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 8 09:43:59 2024 +1000

    sync getrrsetbyname.c with recent upstream changes

<<<<<<< HEAD
commit 783d8b2b8262a87a21b104da5cf281b80345a0c2
Merge: 4aa6f04fb bd7ad0305
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 30 17:28:58 2024 -0400

    Merge pull request #83 from rapier1/release_candidates
    
    Official Release of 18.4.1

=======
>>>>>>> V_10_2_P1
commit 385ecb31e147dfea59c1c488a1d2011d3867e60e
Author: djm@openbsd.org <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 <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 <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 <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 <djm@mindrot.org>
Date:   Tue Apr 30 12:39:34 2024 +1000

    depend

commit 66aaa678dbe59aa21d0d9d89a3596ecedde0254b
Author: djm@openbsd.org <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <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 <renmingshuai@huawei.com>
Date:   Fri Apr 12 10:20:49 2024 +0800

    Shell syntax fix (leftover from a sync).
    
    Signed-off-by: renmingshuai <renmingshuai@huawei.com>

commit 2eded551ba96e66bc3afbbcc883812c2eac02bd7
Author: Darren Tucker <dtucker@dtucker.net>
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 <dtucker@dtucker.net>
Date:   Thu Apr 25 13:19:03 2024 +1000

    Remove 9.6 branch from status page.

commit 70d43049747fa3c66cf876d52271859407cec2fa
Author: Darren Tucker <dtucker@dtucker.net>
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.

<<<<<<< HEAD
commit bd7ad03050adda455aa13e0a89aa4fd1627fe265
Merge: 6112792c6 956957e7d
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Apr 24 17:03:22 2024 -0400

    Merge pull request #81 from rapier1/dev_minor
    
    Update to 18.4.1

commit 956957e7df3c11175807936c4e56de008c677b84
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Apr 22 15:48:26 2024 -0400

    Crank version number. Remove BufferLimit option.
    
    The HPNBufferLimit option was intended to clamp the inbound
    flow control buffer to half of the available window. Unfortunately,
    it looks like it's been broken for some time with a tendancy
    to reduce the window to zero and cut the connection.
    
    As this option was specifically to deal with one special case and
    it's broken, fixing it doesn't seem like the right thing to do.

commit 535def6f0f24aa016b31931a24fbdb96d96b418e
Author: Chris Rapier <rapier@psc.edu>
Date:   Sat Apr 20 18:36:44 2024 -0400

    Typo in assigning buffer type via sshbuf_type().
    
    I was passing a string instead of the int from
    the enum.
    This version also tries to start the oss-fuzz
    integration.

commit 879ba8a9f497619772bd2e7e097ee3661f99af7b
Merge: bef6104dc 33398dba9
Author: Chris Rapier <rapier@psc.edu>
Date:   Sat Apr 20 10:28:32 2024 -0400

    Merge branch 'dev_minor' into oss_fuzz_tests

commit 33398dba971155dff44f22fe93ca3181ebf423ef
Author: Chris Rapier <rapier@psc.edu>
Date:   Sat Apr 20 10:24:28 2024 -0400

    Cleanup of patch updated comments.
    
    Removed references to items that are no longer implemented.
    Removed the timestamp element of the sshbuf struct.
    Removed time_diff from sshbuf.c as that used the buffer
    time stamp.

commit e8fd3de11bb83350796501eb040586e5d99425cc
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Apr 19 16:05:16 2024 -0400

    Whitespace cleanup

commit 41c3036ee4d519e309d6eb7b138460e52267cae6
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Apr 19 14:38:54 2024 -0400

    Provide headroom for channel input buffer.
    
            /* we need to reserve a small amount of overhead on the input buffer
             * or we can enter into a pathological state during bulk
             * data transfers. We use a fraction of the max size as we want it to scale
             * with the size of the input buffer. If we do it for all of the buffers
             * we fail the regression unit tests. This seems like a reasonable
             * solution. Of course, I still need to figure out *why* this is
             * happening and come up with an actual fix. TODO
             * cjr 4/19/2024 */

commit edb2beaae7851b429639af0b491753127ee68469
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 18 17:18:27 2024 -0400

    Rebuilt sshbuf.c from 9.7p1
    
    I realized that the existing sshbuf.c might have had
    multiple conflicting attempts to fix issues found in
    previous versions. So I started from the original sshbuf.c
    and added the accelerated buffer growth back into it. This
    seems to work in that it's not trying to grow past the
    maximum buffer size and it's passing the regression tests.

commit 345a450a240c1b59a3253a49d74bff0a3a07d960
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 18 14:39:58 2024 -0400

    Checkpoint

commit 56536761ba1396f53c0b01fb5bea8c4683d11dd9
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 18 12:59:36 2024 -0400

    Add enum for buffer types.
    
    This patch extends the sshbuf struct by adding a
    type field (int). This field is populated by entries
    from the sshbuf_types enum. This is set via the sshbuf_type()
    function. This type field is used in sshbuff_allocate to
    determine if a buffer (channel input and output) need to be
    grown to support auto-tuning.

commit a591fcc62d9ff7570852132464d4830979295065
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Apr 17 17:45:43 2024 -0400

    Attempt to resolve outbuffer growing past maximum size.
    
    Three primary changes:
    1) Reduce SSHBUF_MAX_SIZE to 128MB. This may
       impact performance so it's subject to change.
    2) Only grow the channel input and channel output buffers
       in sshbuf_allocate. Right now I'm doing a string match on
       the labels. If this ends up being something we'll use
       long term we'll want to make the labels an enum for faster
       comparisons.
    3) In sshbuf_check_reserve we are no longer checking
       aganst  max_size/2 - len <= size - offset but against
       max_size - len. This seems to prevent the output buffer
       from thowing SSH_ERR_NO_BUFFER_SPACE.
    
    This has not been fully tested and may not be the right solution.

commit bef6104dcbafa2f0315c5504c1078b85af001a01
Merge: e7e5e9cdd b2008da46
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 11 13:51:13 2024 -0400

    Merge branch 'oss_fuzz_tests' of github.com:rapier1/hpn-ssh into oss_fuzz_tests

commit b2008da4654cc0cd25f2a063cecab96a18332cdc
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 11 13:44:30 2024 -0400

    Revert "Temp checkpoint."
    
    This reverts commit 9abcc4e7e0d1473e5b775710d8dbe5f21ff83797.

commit 62d64cd07e1ec5a1062dcc28b78db9ed4430f009
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 11 13:44:02 2024 -0400

    Revert "Temp checkpoint."
    
    This reverts commit 3db1f6e2494119482fe295e76120ee4226f4810b.

commit e7e5e9cdd511b5c70a23bd1adb125f9d9f7206d2
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 11 13:42:55 2024 -0400

    Configure.ac tests to allow OpenSSL 3.4
    
    This change explicitly allows the use of OpenSSL 3.4.
    Configure.ac has a switch statement that depends on the
    reported version of OpenSSL. We need to update these tests
    for each point release of OpenSSL.

commit 4aa6f04fb329dc04d8212ffc3f310d7966f8b7e9
Merge: 1cfdd6596 6112792c6
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Apr 10 15:56:11 2024 -0400

    Merge pull request #75 from rapier1/release_candidates
    
    Merge release candidate for 18.4.0 into master

commit 9abcc4e7e0d1473e5b775710d8dbe5f21ff83797
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 9 17:16:21 2024 -0400

    Temp checkpoint.
    
    Trying to assign nulls to values in ssh-dss.c ssh_dss_equal.

commit 3db1f6e2494119482fe295e76120ee4226f4810b
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 9 17:12:44 2024 -0400

    Temp checkpoint.
    
    Trying to assign nulls to values in ssh-rsa.c ssh_rsa_equal.

commit 79b66e91a470e5011933c9ba0d45460c73501a31
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 9 16:52:54 2024 -0400

    Fix a minor memory leak in kex.c.
    
    We need to ensure that cc20-mt and cc20-serial are in the
    kex proposal string. However, the prior method created a small memory
    leak. This patch resolves that leak. Passes regression and fuzz testing.

=======
>>>>>>> V_10_2_P1
commit 88351eca17dcc55189991ba60e50819b6d4193c1
Author: 90 <hi@90.gripe>
Date:   Fri Apr 5 19:36:06 2024 +0100

    Fix missing header for systemd notification

commit 08f579231cd38a1c657aaa6ddeb8ab57a1fd4f5c
Author: Damien Miller <djm@mindrot.org>
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 <dtucker@dtucker.net>
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 <dtucker@dtucker.net>
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 <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 <Eero+git@xn--Hkkinen-5wa.fi>
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 <dtucker@dtucker.net>
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 <djm@mindrot.org>
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 <zgf574564920@gmail.com>
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 <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 <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 <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

<<<<<<< HEAD
commit 6112792c60c5d360cc21d8ecfbdbe6638bbba748
Merge: 2a3392d66 9d2f53750
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Thu Mar 28 10:51:28 2024 -0400

    Merge pull request #69 from rapier1/dev_minor
    
    Dev minor

=======
>>>>>>> V_10_2_P1
commit edcff77f82c2bb2b5653b36f1e47274c5ef3e8be
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 26 18:58:58 2024 +1100

    Fix name of OpenBSD upstream CI jobs.

commit 861b084429940e024f1b6e9c2779eac95d7a45db
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 26 18:55:33 2024 +1100

    Resync with upstream: ${} around DATAFILE.

commit 63f248c7693e7f0a3b9a13d2980ac9a7e37f2aea
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 25 19:28:09 2024 +0000

    upstream: optional debugging
    
    OpenBSD-Regress-ID: b4852bf97ac8fb2e3530f2d5f999edd66058d7bc

commit 16e2ebe06a62f09d4877b769876d92d6008a896f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 25 06:05:42 2024 +0000

    upstream: Verify string returned from local shell command.
    
    OpenBSD-Regress-ID: 5039bde24d33d809aebfa8d3ad7fe9053224e6f8

commit b326f7a1f39ff31324cc3fe2735178fb474c04a4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 25 03:30:31 2024 +0000

    upstream: Improve shell portability: grep -q is not portable so
    
    redirect stdout, and use printf instead of relying on echo to do \n
    substitution.  Reduces diff vs Portable.
    
    Also resync somewhat with upstream.
    
    OpenBSD-Regress-ID: 9ae876a8ec4c4725f1e9820a0667360ee2398337

commit dbf2e319f0c582613fa45a735ea3c242ce56946b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 25 02:07:08 2024 +0000

    upstream: Save error code from SSH for use inside case statement,
    
    from portable. In some shells, "case" will reset the value of $?, so save it
    first.
    
    OpenBSD-Regress-ID: da32e5be19299cb4f0f7de7f29c11257a62d6949

commit d2c8c4fa7def4fb057ed05b3db57b62c810a26f6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 25 01:40:47 2024 +0000

    upstream: Increase timeout. Resyncs with portable where some of
    
    the test VMs are slow enough for this to matter.
    
    OpenBSD-Regress-ID: 6a83a693602eb0312f06a4ad2cd6f40d99d24b26

commit 83621b63514a84791623db3efb59d38bc4bf9563
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 25 01:28:29 2024 +0000

    upstream: In PuTTY interop test, don't assume the PuTTY major
    
    version is 0. Patch from cjwatson at debian.org via bz#3671.
    
    OpenBSD-Regress-ID: 835ed03c1b04ad46be82e674495521f11b840191

commit 8a421b927700f3834b4d985778e252b8e3299f83
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 26 18:38:14 2024 +1100

    Really mkdir /usr/local/etc in CI tests.

commit 2946ed522c47ce045314533d426b4e379f745e59
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 26 17:19:09 2024 +1100

    Better short name for OpenBSD upstream CI jobs too.

commit 18dbe8eff647aacb82d7e86b4ce63d5beee11f25
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 26 17:13:52 2024 +1100

    Ensure /usr/local/etc exists before using in tests.

commit 5fc1085128e3348bb1b5ee4d955cc767b019b3ad
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 26 16:50:46 2024 +1100

    Be more specific about when to rerun workflows.

commit 5516923e8ae3da0823fea0d7d28aa813627142c0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 26 16:35:27 2024 +1100

    Add short names for test jobs on github CI.

commit dc37d2d2470b4a9cedcee9ac926b7362214e3305
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 26 16:26:14 2024 +1100

    If we're using xpg4's id, remember to pass args.

commit fe169487937780392b23d3ff3c00e5898c10f784
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 26 01:23:11 2024 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: ad3d1486d105b008c93e952d158e5af4d9d4c531

commit 151146f03b490d19145cd421763aa7d42f5c50e2
Author: job@openbsd.org <job@openbsd.org>
Date:   Thu Mar 14 06:23:14 2024 +0000

    upstream: Clarify how literal IPv6 addresses can be used in -J mode
    
    OK djm@
    
    OpenBSD-Commit-ID: 524ddae97746b3563ad4a887dfd0a6e6ba114c50

commit 0d5bdc87a675271862b67eb6a9fb13a202fb4894
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 25 16:14:21 2024 +1100

    Add Mac OS X 14 test targets.

commit 2d7964a03e1f50a48040ec6912c0a956df909d21
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 25 14:05:40 2024 +1100

    Move xpg4 'id' handling into test-exec.sh.
    
    Handle replacement of 'id' the same way as we do other Portable specific
    replacements in test-exec.sh.  This brings percent.sh back into sync
    with upstream.

commit 75d1d49ed10d978171cdafad28bdbffdbd48f41e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 25 10:38:03 2024 +1100

    Update branches shown on ci-status to 9.7 and 9.6.

commit f9193f03db0029fc9c31fbdb5c66a2737446bd8f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 25 09:28:02 2024 +1100

    Improve detection of -fzero-call-used-regs=used.
    
    Should better detect problems with gcc 13 on m68k.  bz#3673 from Colin
    Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934
    
    Signed-off-by: Darren Tucker <dtucker@dtucker.net>

<<<<<<< HEAD
commit 9d2f537502244f9cae079f219617cb078464998f
Merge: 196110f94 41ebf6efa
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 14 16:05:35 2024 -0400

    Merge branch 'dev_minor' of github.com:rapier1/hpn-ssh into dev_minor

commit 196110f94342e0567615d46bcc95c20675b503a1
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 14 16:05:01 2024 -0400

    Documentation update for FallbackPort switch and to explicitly state that
    hpnssh uses port 2222 as the default port.
    Files touched: hpnssh.1 hpnssh_config.5

commit 41ebf6efa76627e471327050955eb7ffeab82e67
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Mar 12 16:04:54 2024 -0400

    I seem to have forgotten to actually remove the C89 test so this
    should fix that oversight.

commit 90127cd94fff6e4ecc7c9780d036eaf0bddb451f
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Mar 12 16:00:34 2024 -0400

    binn.[c|h] are no lnoger C89 compliant so we are removing the C89 test from the
    CI workflow. I don't think this will be a major issue with our projected audience.
    Additionally, in binn.c instances of BOOL value; needed to be defined or the
    -Werror tests failed. Likewise, I need to move the position of a /*fall through*/ in binn.c

commit 44937cd3ff4512edad1fe6cb4a822696618598ad
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Mar 12 14:23:24 2024 -0400

    Neglected to apply two fixes from another branches.
    1) Updated binn.c and binn.h to the latest versions
    2) Removed unnecessary double dereferencing from metrics.[c|h]

commit ebcdb90815d964073c0a6e275f5623fb2f0c27ea
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Mar 11 15:41:53 2024 -0400

    Working merge of OpenSSH 9.7 into HPN-SSH. This is tentatively
    marked as HPN-SSH 18.4.0. Minimal changes were required. The only notable
    changes are in regression tests to deal with compatibility tests and what
    seems to be typo in the OpenSSH source Makefile for the regression tests. These
    changes are to resolve issues with compatibility tests and when building
    without openssl libraries.

commit 065e63da4d9feef303bd5a6da04b64e1bcf6c7a0
Merge: 1cfdd6596 86bdd3853
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Mar 11 15:37:53 2024 -0400

    This is a staging commit for merging HPN-SSH to OpenSSH 9.7
    This commit should not be used as it contains unresolved
    merge conflicts.

=======
>>>>>>> V_10_2_P1
commit 86bdd3853f4d32c85e295e6216a2fe0953ad93f0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 11 16:20:49 2024 +1100

    version number in README

commit 282721418e6465bc39ccfd39bb0133e670ee4423
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 11 16:20:08 2024 +1100

    crank RPM spec versions

commit 3876a3bbd2ca84d23ba20f8b69ba83270c04ce3a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 11 04:59:47 2024 +0000

    upstream: openssh-9.7
    
    OpenBSD-Commit-ID: 618ececf58b8cdae016b149787af06240f7b0cbc

commit 8fc109cc614954a8eb2738c48c0db36a62af9a06
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 11 12:59:26 2024 +1100

    Test against current OpenSSL and LibreSSL releases.
    
    Add LibreSSL 3.9.0, bump older branches to their respective current
    releases.

commit 26b09b45fec7b88ba09042c09be4157e58e231e2
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 10 16:24:57 2024 +1100

    quote regexes used to test for algorithm support
    
    Fixes test failures on Solaris 8 reported by Tom G. Christensen

commit a6a740a4948d10a622b505135bb485c10f21db5e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 9 05:12:13 2024 +0000

    upstream: avoid logging in signal handler by converting mainloop to
    
    ppoll() bz3670, reported by Ben Hamilton; ok dtucker@
    
    OpenBSD-Commit-ID: e58f18042b86425405ca09e6e9d7dfa1df9f5f7f

commit cd82f7526e0481720567ae41db7849ab1c27e27b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 8 22:16:32 2024 +0000

    upstream: skip more whitespace, fixes find-principals on
    
    allowed_signers files with blank lines; reported by Wiktor Kwapisiewicz
    
    OpenBSD-Commit-ID: b3a22a2afd753d70766f34bc7f309c03706b5298

commit 2f9d2af5cb19905d87f37d1e11c9f035ac5daf3b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 8 11:34:10 2024 +0000

    upstream: Invoke ProxyCommand that uses stderr redirection via
    
    $TEST_SHELL. Fixes test when run by a user whose login shell is tcsh.
    Found by vinschen at redhat.com.
    
    OpenBSD-Regress-ID: f68d79e7f00caa8d216ebe00ee5f0adbb944062a

commit 9b3f0beb4007a7e01dfedabb429097fb593deae6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 7 17:18:14 2024 +1100

    Prefer openssl binary from --with-ssl-dir directory.
    
    Use openssl in the directory specified by --with-ssl-dir as long
    as it's functional.  Reported by The Doctor.

commit c47e1c9c7911f38b2fc2fb01b1f6ae3a3121a838
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 6 02:59:59 2024 +0000

    upstream: fix memory leak in mux proxy mode when requesting forwarding.
    
    found by RASU JSC, reported by Maks Mishin in GHPR#467
    
    OpenBSD-Commit-ID: 97d96a166b1ad4b8d229864a553e3e56d3116860

commit 242742827fea4508e68097c128e802edc79addb5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 6 00:31:04 2024 +0000

    upstream: wrap a few PKCS#11-specific bits in ENABLE_PKCS11
    
    OpenBSD-Commit-ID: 463e4a69eef3426a43a2b922c4e7b2011885d923

commit d52b6509210e2043f33e5a1de58dd4a0d5d48c2a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 6 11:31:36 2024 +1100

    disable RSA tests when algorithm is not supported
    
    Unbreaks "make test" when compiled --without-openssl.
    
    Similar treatment to how we do DSA and ECDSA.

commit 668d270a6c77e8b5a1da26ecad2e6de9f62c8fe4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 6 10:33:20 2024 +1100

    add a --without-retpoline configure option
    
    discussed with deraadt and dtucker a while ago

commit 3deb501f86fc47e175ef6a3eaba9b9846a80d444
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 4 04:13:18 2024 +0000

    upstream: fix leak of CanonicalizePermittedCNAMEs on error path;
    
    spotted by Coverity (CID 438039)
    
    OpenBSD-Commit-ID: 208839699939721f452a4418afc028a9f9d3d8af

commit 65a44a8a4f7d902a64d4e60eda84384b2e2a24a2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 4 02:16:11 2024 +0000

    upstream: Separate parsing of string array options from applying them
    
    to the active configuration. This fixes the config parser from erroneously
    rejecting cases like:
    
    AuthenticationMethods password
    Match User ivy
     AuthenticationMethods any
    
    bz3657 ok markus@
    
    OpenBSD-Commit-ID: 7f196cba634c2a3dba115f3fac3c4635a2199491

<<<<<<< HEAD
commit 1cfdd65960413d21db4381f5fbda183acb880f47
Merge: 5ada7a096 34637c053
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Thu Feb 22 15:51:30 2024 -0500

    Merge pull request #67 from rapier1/bug-128bit-xor
    
    crank subversion

commit 34637c05332764d3a3800bb5d41e1fff9c325e1d
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Feb 22 15:48:29 2024 -0500

    crank subversion

commit 5ada7a09609aad746b6cfbc1d8544dba0f9c3778
Merge: 2a3392d66 ca7744e47
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Thu Feb 22 15:36:16 2024 -0500

    Merge pull request #66 from rapier1/bug-128bit-xor
    
    Temporary bug fix for 128bit xors in AES-CTR-MT.

commit ca7744e47518eec9b995f484d3e6e4a1de4f446c
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Feb 22 15:31:58 2024 -0500

    Temporary bug fix for 128bit xors in AES-CTR-MT. Not sure of the
    cause but it's happening under GCC13 and not GCC12 or GCC11 so
    we are thinking something has changed there. This shouldn't impact
    performance all that much.

=======
>>>>>>> V_10_2_P1
commit 6886e1b1f55c90942e4e6deed930f8ac32e0f938
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 22 17:59:35 2024 +1100

    Add nbsd10 test target.

commit d86bf8a3f6ea4fa7887406c2aa9959db71fa41be
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 22 12:06:10 2024 +1100

    more descriptive configure test name

commit 9ee335aacc9f5bdc4cc2c19fafb45e27be7d234e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 21 06:17:29 2024 +0000

    upstream: explain arguments of internal-sftp GHPR#454 from Niklas
    
    Hambüchen
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 0335d641ae6b5b6201b9ffd5dd06345ebbd0a3f3

commit d1164cb1001dd208fee88aaa9b43d5e6fd917274
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 21 06:06:43 2024 +0000

    upstream: clarify permissions requirements for ChrootDirectory Part
    
    of GHPR#454 from Niklas Hambüchen
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: d37bc8786317a11649c62ff5e2936441186ef7a0

commit d410e17d186552d0717f18217d0d049486754365
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 21 06:05:06 2024 +0000

    upstream: .Cm for a keyword. Part of GHPR#454 from Niklas Hambüchen
    
    OpenBSD-Commit-ID: d59c52559f926fa82859035d79749fbb4a3ce18a

commit ab73f9678ebf06b32d6361b88b50b42775e0565b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 21 06:01:13 2024 +0000

    upstream: fix typo in match directive predicate (s/tagged/tag) GHPR#462
    
    from Tobias Manske
    
    OpenBSD-Commit-ID: 05b23b772677d48aa82eefd7ebebd369ae758908

commit 9844aa2521ccfb1a2d73745680327b79e0574445
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 21 05:57:34 2024 +0000

    upstream: fix proxy multiplexing mode, broken when keystroke timing
    
    obfuscation was added. GHPR#463 from montag451
    
    OpenBSD-Commit-ID: 4e412d59b3f557d431f1d81c715a3bc0491cc677

commit ee6d932acb532f80b11bb7cf161668c70ec8a117
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 20 04:10:03 2024 +0000

    upstream: don't append a gratuitous space to the end of subsystem
    
    arguments; bz3667
    
    OpenBSD-Commit-ID: e11023aeb3f30b77a674e37b8292c862926d5dc6

commit e27f032aa8fcbae9b2e7c451baaf4b8ac6fa3d45
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 19 09:25:52 2024 +0000

    upstream: Always define puttysetup function.
    
    OpenBSD-Regress-ID: b4c0ccfa4006a1bc5dfd99ccf21c854d3ce2aee0

commit 84046f9991abef5f46b040b10cf3d494f933a17b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 9 08:56:59 2024 +0000

    upstream: Exapnd PuTTY test coverage.
    
    Expand the set of ciphers, MACs and KEX methods in the PuTTY interop
    tests.
    
    OpenBSD-Regress-ID: dd28d97d48efe7329a396d0d505ee2907bf7fc57

commit bbf541ee2afe07b08a8b56fa0dc6f38fcfceef2a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 9 08:47:42 2024 +0000

    upstream: Factor out PuTTY setup.
    
    Factor out PuTTY and call only when needed.
    
    This allows us to avoid PuTTY key setup when it's not needed, which
    speeds up the overall test run by a couple of percent.
    
    OpenBSD-Regress-ID: c25eaccc3c91bc874400f7c85ce40e9032358c1c

commit d31c21c57fb4245271680a1e5043cf6470a96766
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Feb 10 11:28:52 2024 +0000

    upstream: clean sshd random relinking kit; ok miod@
    
    OpenBSD-Commit-ID: 509bb19bb9762a4b3b589af98bac2e730541b6d4

commit 4dbc5a363ff53a2fcecf6bc3bcc038badc12f118
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 2 00:13:34 2024 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: b24680bc755b621ea801ff8edf6f0f02b68edae1

commit efde85dda2130272af24cc346f6c3cd326182ff1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 19 17:29:31 2024 +1100

    Improve error message for OpenSSL header check.
    
    bz#3668, ok djm@

commit cbbdf868bce431a59e2fa36ca244d5739429408d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 7 13:45:02 2024 +1100

    Interop test against PuTTY snapshot and releases.

commit 91898bf786b0f149f962c4c96c08a46f29888c10
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 6 16:21:05 2024 +1100

    Put privsep dir on OS X on /usr/local.
    
    On some runners we can't create /var/empty, so put it some place we can
    write.  Should fix test breakage on Max OS X 11.

commit be5ed8ebed8388c5056bfde4688308cc873c18b9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 6 11:19:42 2024 +1100

    Add --disable-fd-passing option.
    
    .. and enable for the minix3 test VM.  This will cause it to more reliably
    skip tests that need FD passing and should fix the current test breakage.

commit 0f6a8a0d0a518fd78c4cbebfdac990a57a1c4e41
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 6 11:18:44 2024 +1100

    Use "skip" function instead doing it ourselves.

<<<<<<< HEAD
commit 2a3392d668c8722bb23cbb58ca7d9edcaa8fa8b5
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Feb 2 11:43:45 2024 -0500

    Trigger CI workflow for release_candidates branch

commit 4bb06c850f2e0b2caa5a6db247bd391c9b6a42d6
Merge: 1be8f2bbc c398f2758
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Feb 2 11:12:51 2024 -0500

    Merge pull request #64 from rapier1/18.3-testing
    
    Merging 18.3-testing into release_candidates after successful review.

commit c398f2758bfeec11fc58ca1e05e4c43f98ef0d8b
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Feb 1 17:27:45 2024 -0500

    Revert "Trying out using the tcpi_rcv_space value from tcp_info instead of"
    
    This should not have been pushed to guthub.
    
    This reverts commit 77aaba167a7fbcad999052f69548d96be04be0f6.

=======
>>>>>>> V_10_2_P1
commit 3ad669f81aabbd2ba9fbd472903f680f598e1e99
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 1 14:01:18 2024 +1100

    ignore some vim droppings

commit c283f29d23611a06bbee06bcf458f2fffad721d9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 1 02:37:33 2024 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: bf9e4a1049562ee4322684fbdce07142f04fdbb7

<<<<<<< HEAD
commit 77aaba167a7fbcad999052f69548d96be04be0f6
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Jan 31 16:58:13 2024 -0500

    Trying out using the tcpi_rcv_space value from tcp_info instead of
    SO_RCV_BUF as SO_RCV_BUF might end up overbuffering the connection.

commit 28c8606a9c018cf0c28fab764bfc74872e391a47
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jan 25 16:38:23 2024 -0500

    There is a situation in SSH -> HPN connection the advertised
    window will 16MB and then it will cause some odd behaviour
    on the part of the ssh client. Basically it looks like it's
    doing a lot of expensive drains and fills on a buffer
    that significantly impacts throughput. This is a fix that
    annoys me because *any* SSH to HPN connection is now limited
    to a maximum recieve window of 15MB. Which is not
    optimal in anyway. Still, it's better than the through
    put of the pathological state which significantly slower.

commit 38854e0c754c705faff94a99d912c711c2a29ab7
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jan 25 15:37:20 2024 -0500

    testing

commit 218c234943c04a1ea0ab5642842509a25e83ef86
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jan 25 14:16:06 2024 -0500

    Checkpoint

commit 1be8f2bbc86ea8b9bf4ba65f48b0fc81023b900e
Merge: 70844a7f5 b357fbc5a
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jan 16 13:48:47 2024 -0500

    Merge pull request #61 from rapier1/dev_minor
    
    Promote dev_minor to RC for 18.3.0 incorporating OpenSSH 9.6

commit b357fbc5af26e69e633d96a9a7cf8cb93ce0b282
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jan 16 13:43:37 2024 -0500

    Fixing a typo in a comment and seeing
    how toi make requested changes in a PR review.

=======
>>>>>>> V_10_2_P1
commit 0d96b1506b2f4757fefa5d1f884d49e96a6fd4c3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 16 14:40:18 2024 +1100

    skip tests that use multiplexing on Windows
    
    Some tests here use multiplexing, skip these if DISABLE_FD_PASSING
    is set. Should unbreak tests on Windows.

commit 50080fa42f5f744b798ee29400c0710f1b59f50e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 11 04:50:28 2024 +0000

    upstream: don't disable RSA test when DSA is disabled; bug introduced
    
    in last commit
    
    OpenBSD-Regress-ID: 8780a7250bf742b33010e9336359a1c516f2d7b5

commit 415c94ce17288e0cdcb9e58cc91fba78d33c8457
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 11 01:45:58 2024 +0000

    upstream: make DSA testing optional, defaulting to on
    
    ok markus
    
    OpenBSD-Regress-ID: dfc27b5574e3f19dc4043395594cea5f90b8572a

commit f9311e8921d92c5efca767227a497ab63280ac39
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 11 01:51:16 2024 +0000

    upstream: ensure key_fd is filled when DSA is disabled; spotted by
    
    tb@
    
    OpenBSD-Commit-ID: 9dd417b6eec3cf67e870f147464a8d93f076dce7

commit 4e838120a759d187b036036610402cbda33f3203
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 11 01:45:36 2024 +0000

    upstream: make DSA key support compile-time optional, defaulting to
    
    on
    
    ok markus@
    
    OpenBSD-Commit-ID: 4f8e98fc1fd6de399d0921d5b31b3127a03f581d

commit afcc9028bfc411bc26d20bba803b83f90cb84e26
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jan 10 06:33:13 2024 +0000

    upstream: fix incorrect capitalisation;
    
    OpenBSD-Commit-ID: cb07eb06e15fa2334660ac73e98f29b6a1931984

<<<<<<< HEAD
commit 7cd06081f05681654675357baaff2f28f26c25da
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Jan 10 13:08:19 2024 -0500

    Fixed a non-impactful typo in ssh-add.c. This fix comes from the
    mailing list where it was confirmed to be a typo.

=======
>>>>>>> V_10_2_P1
commit 9707c8170c0c1baeb1e06e5a53f604498193885f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 9 22:19:36 2024 +0000

    upstream: extend ChannelTimeout regression test to exercise multiplexed
    
    connections and the new "global" timeout type. ok dtucker@
    
    OpenBSD-Regress-ID: f10d19f697024e9941acad7c2057f73d6eacb8a2

commit b31b12d28de96e1d43581d32f34da8db27e11c03
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 9 22:19:00 2024 +0000

    upstream: add a "global" ChannelTimeout type to ssh(1) and sshd(8)
    
    that watches all open channels and will close all open channels if there is
    no traffic on any of them for the specified interval. This is in addition to
    the existing per-channel timeouts added a few releases ago.
    
    This supports use-cases like having a session + x11 forwarding channel
    open where one may be idle for an extended period but the other is
    actively used. The global timeout would allow closing both channels when
    both have been idle for too long.
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 0054157d24d2eaa5dc1a9a9859afefc13d1d7eb3

commit 602f4beeeda5bb0eca181f8753d923a2997d0a51
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 9 21:39:14 2024 +0000

    upstream: adapt ssh_api.c code for kex-strict
    
    from markus@ ok me
    
    OpenBSD-Commit-ID: 4d9f256852af2a5b882b12cae9447f8f00f933ac

<<<<<<< HEAD
commit 2c08ebf449be298311d180a98c0e5bb1df3150a4
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jan 9 15:05:22 2024 -0500

    More portable fix for the qidx issue.
    We still don't really understand why it's happening. As long as that init
    happens after the pthread_rwlock_rdlock(&aes_mt_ctx->tid_lock); line it's fine.
    Tentatively thinking it's a weird compiler optimization problem. Commentted in line
    as well.
    
    Also add a fix (from OpenSSH) to compile failures if there is no EC in
    openssl.

commit a64a047fe071e05d9fda9f2ebee6e98f15ec8306
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jan 9 14:32:35 2024 -0500

    I was getting a warning/error saying
    'cipher-ctr-mt-functions.c: In function ‘thread_loop’:
    cipher-ctr-mt-functions.c:218:13: error: variable ‘qidx’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
      218 |         int qidx;
          |             ^~~~
    cc1: all warnings being treated as errors
    '
    Moving the initialization of qidx from the top of the function
    to the for loop declaration resolved this.

commit 7a5ffb6189872227284dadaddfc3244b039b9511
Merge: 8241b9c05 134f70287
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jan 8 11:30:15 2024 -0500

    first pass as merging 9.6

=======
>>>>>>> V_10_2_P1
commit 42ba34aba8708cf96583ff52975d95a8b47d990d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 8 16:26:37 2024 +1100

    nite that recent OSX tun/tap is unsupported

commit 690bc125f9a3b20e47745fa8f5b5e1fd5820247f
Author: Sevan Janiyan <venture37@geeklan.co.uk>
Date:   Wed Dec 27 04:57:49 2023 +0000

    README.platform: update tuntap url

commit 6b8be2ccd7dd091808f86af52066b0c2ec30483a
Author: Rose <83477269+AtariDreams@users.noreply.github.com>
Date:   Tue Dec 19 11:48:20 2023 -0500

    Fix compilation error in ssh-pcks11-client.c
    
    Compilation fails becaus of an undefined reference to helper_by_ec,
    because we forgot the preprocessor conditional that excludes that function
    from being called in unsupported configurations.

commit 219c8134157744886ee6ac5b8c1650abcd981f4c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 8 05:11:18 2024 +0000

    upstream: Remove outdated note from PROTOCOL.mux
    
    Port forward close by control master is already implemented
    by `mux_master_process_close_fwd` in `mux.c`
    
    GHPR442 from bigb4ng
    
    OpenBSD-Commit-ID: ad0734fe5916d2dc7dd02b588906cea4df0482fb

commit 4c3cf362631ccc4ffd422e572f075d5d594feace
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 8 05:05:15 2024 +0000

    upstream: fix missing field in users-groups-by-id@openssh.com reply
    
    documentation
    
    GHPR441 from TJ Saunders
    
    OpenBSD-Commit-ID: ff5733ff6ef4cd24e0758ebeed557aa91184c674

commit f64cede2a3c298b50a2659a8b53eb3ab2c0b8d23
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 8 04:10:03 2024 +0000

    upstream: make kex-strict section more explicit about its intent:
    
    banning all messages not strictly required in KEX
    
    OpenBSD-Commit-ID: fc33a2d7f3b7013a7fb7500bdbaa8254ebc88116

commit 698fe6fd61cbcb8e3e0e874a561d4335a49fbde5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 8 14:46:19 2024 +1100

    update fuzzer example makefile to clang16

commit fc332cb2d602c60983a8ec9f89412754ace06425
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 8 14:45:49 2024 +1100

    unbreak fuzzers - missing pkcs11_make_cert()
    
    provide stub for use in fuzzer harness

commit 9ea0a4524ae3276546248a926b6641b2fbc8421b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 8 14:45:14 2024 +1100

    unbreak fuzzers for clang16
    
    getopt() needs a throw() attribute to compile, so supply one when compiling
    things with C++

commit a72833d00788ef91100c643536ac08ada46440e1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 8 00:34:33 2024 +0000

    upstream: remove ext-info-* in the kex.c code, not in callers;
    
    with/ok markus@
    
    OpenBSD-Commit-ID: c06fe2d3a0605c517ff7d65e38ec7b2d1b0b2799

commit 86f9e96d9bcfd1f5cd4bf8fb57a9b4c242df67df
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 8 00:30:39 2024 +0000

    upstream: fix typo; spotted by Albert Chin
    
    OpenBSD-Commit-ID: 77140b520a43375b886e535eb8bd842a268f9368

commit f0cbd26ec91bd49719fb3eea7ca44d2380318b9a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 4 09:51:49 2024 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: 5a636f6ca7f25bfe775df4952f7aac90a7fcbbee

commit 64ddf776531ca4933832beecc8b7ebe1b937e081
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Dec 20 00:06:25 2023 +0000

    upstream: spelling; ok markus@
    
    OpenBSD-Commit-ID: 9d01f2e9d59a999d5d42fc3b3efcf8dfb892e31b

commit 503fbe9ea238a4637e8778208bde8c09bcf78475
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Dec 19 06:57:34 2023 +0000

    upstream: sort -C, and add to usage(); ok djm
    
    OpenBSD-Commit-ID: 80141b2a5d60c8593e3c65ca3c53c431262c812f

commit 5413b1c7ff5a19c6a7d44bd98c5a83eb47819ba6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 19 06:41:14 2023 +0000

    upstream: correct section numbers; from Ed Maste
    
    OpenBSD-Commit-ID: e289576ee5651528404cb2fb68945556052cf83f

commit 430ef864645cff83a4022f5b050174c840e275da
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 15:58:56 2023 +0000

    upstream: match flag type (s/int/u_int)
    
    OpenBSD-Commit-ID: 9422289747c35ccb7b31d0e1888ccd5e74ad566a

commit 1036d77b34a5fa15e56f516b81b9928006848cbd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 22 17:56:26 2023 +1100

    better detection of broken -fzero-call-used-regs
    
    gcc 13.2.0 on ppc64le refuses to compile some function, including
    cipher.c:compression_alg_list() with an error:
    
    > sorry, unimplemented: argument ‘used’ is not supportedcw
    > for ‘-fzero-call-used-regs’ on this target
    
    This extends the autoconf will-it-work test with a similarly-
    structured function that seems to catch this.
    
    Spotted/tested by Colin Watson; bz3645

commit 8241b9c0529228b4b86d88b1a6076fb9f97e4a99
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 19 01:59:50 2023 +1100

    crank versions

commit 2f2c65cb5f1518a9c556d3e8efa27ea0ca305c6b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 19 01:59:06 2023 +1100

    depend

commit e48cdee8e19059203b1aeeabec2350b8375fa61f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:50:08 2023 +0000

    upstream: regress test for agent PKCS#11-backed certificates
    
    OpenBSD-Regress-ID: 38f681777cb944a8cc3bf9d0ad62959a16764df9

commit 2f512f862df1d5f456f82a0334c9e8cc7208a2a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:49:39 2023 +0000

    upstream: regress test for constrained PKCS#11 keys
    
    OpenBSD-Regress-ID: b2f26ae95d609d12257b43aef7cd7714c82618ff

commit cdddd66412ca5920ed4d3ebbfa6ace12dbd9b82f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:48:44 2023 +0000

    upstream: openssh-9.6
    
    OpenBSD-Commit-ID: 21759837cf0e0092d9a2079f8fb562071c11016b

commit 6d51feab157cedf1e7ef5b3f8781ca8ff9c4ab1b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:48:08 2023 +0000

    upstream: ssh-agent: record failed session-bind attempts
    
    Record failed attempts to session-bind a connection and refuse signing
    operations on that connection henceforth.
    
    Prevents a future situation where we add a new hostkey type that is not
    recognised by an older ssh-agent, that consequently causes session-bind
    to fail (this situation is only likely to arise when people mix ssh(1)
    and ssh-agent(1) of different versions on the same host). Previously,
    after such a failure the agent socket would be considered unbound and
    not subject to restriction.
    
    Spotted by Jann Horn
    
    OpenBSD-Commit-ID: b0fdd023e920aa4831413f640de4c5307b53552e

commit 7ef3787c84b6b524501211b11a26c742f829af1a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:47:44 2023 +0000

    upstream: ban user/hostnames with most shell metacharacters
    
    This makes ssh(1) refuse user or host names provided on the
    commandline that contain most shell metacharacters.
    
    Some programs that invoke ssh(1) using untrusted data do not filter
    metacharacters in arguments they supply. This could create
    interactions with user-specified ProxyCommand and other directives
    that allow shell injection attacks to occur.
    
    It's a mistake to invoke ssh(1) with arbitrary untrusted arguments,
    but getting this stuff right can be tricky, so this should prevent
    most obvious ways of creating risky situations. It however is not
    and cannot be perfect: ssh(1) has no practical way of interpreting
    what shell quoting rules are in use and how they interact with the
    user's specified ProxyCommand.
    
    To allow configurations that use strange user or hostnames to
    continue to work, this strictness is applied only to names coming
    from the commandline. Names specified using User or Hostname
    directives in ssh_config(5) are not affected.
    
    feedback/ok millert@ markus@ dtucker@ deraadt@
    
    OpenBSD-Commit-ID: 3b487348b5964f3e77b6b4d3da4c3b439e94b2d9

commit 0cb50eefdd29f0fec31d0e71cc4b004a5f704e67
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:47:20 2023 +0000

    upstream: stricter handling of channel window limits
    
    This makes ssh/sshd more strict in handling non-compliant peers that
    send more data than the advertised channel window allows. Previously
    the additional data would be silently discarded. This change will
    cause ssh/sshd to terminate the connection if the channel window is
    exceeded by more than a small grace allowance.
    
    ok markus@
    
    OpenBSD-Commit-ID: 811e21b41831eba3dd7f67b3d409a438f20d3037

commit 4448a2938abc76e6bd33ba09b2ec17a216dfb491
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:46:56 2023 +0000

    upstream: Make it possible to load certs from PKCS#11 tokens
    
    Adds a protocol extension to allow grafting certificates supplied by
    ssh-add to keys loaded from PKCS#11 tokens in the agent.
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: bb5433cd28ede2bc910996eb3c0b53e20f86037f

commit 881d9c6af9da4257c69c327c4e2f1508b2fa754b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:46:12 2023 +0000

    upstream: apply destination constraints to all p11 keys
    
    Previously applied only to the first key returned from each token.
    
    ok markus@
    
    OpenBSD-Commit-ID: 36df3afb8eb94eec6b2541f063d0d164ef8b488d

commit a7ed931caeb68947d30af8a795f4108b6efad761
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:45:49 2023 +0000

    upstream: add "ext-info-in-auth@openssh.com" extension
    
    This adds another transport protocol extension to allow a sshd to send
    SSH2_MSG_EXT_INFO during user authentication, after the server has
    learned the username that is being logged in to.
    
    This lets sshd to update the acceptable signature algoritms for public
    key authentication, and allows these to be varied via sshd_config(5)
    "Match" directives, which are evaluated after the server learns the
    username being authenticated.
    
    Full details in the PROTOCOL file
    
    OpenBSD-Commit-ID: 1de7da7f2b6c32a46043d75fcd49b0cbb7db7779

commit 1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 14:45:17 2023 +0000

    upstream: implement "strict key exchange" in ssh and sshd
    
    This adds a protocol extension to improve the integrity of the SSH
    transport protocol, particular in and around the initial key exchange
    (KEX) phase.
    
    Full details of the extension are in the PROTOCOL file.
    
    with markus@
    
    OpenBSD-Commit-ID: 2a66ac962f0a630d7945fee54004ed9e9c439f14

commit 59d691b886c79e70b1d1c4ab744e81fd176222fd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 18 14:49:11 2023 +1100

    better detection of broken -fzero-call-used-regs
    
    Use OSSH_CHECK_CFLAG_LINK() for detection of these flags and extend
    test program to exercise varargs, which seems to catch more stuff.
    
    ok dtucker@

commit aa7b21708511a6d4aed3839fc9f6e82e849dd4a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 13 03:28:19 2023 +0000

    upstream: when invoking KnownHostsCommand to determine the order of
    
    host key algorithms to request, ensure that the hostname passed to the
    command is decorated with the port number for ports other than 22.
    
    This matches the behaviour of KnownHostsCommand when invoked to look
    up the actual host key.
    
    bz3643, ok dtucker@
    
    OpenBSD-Commit-ID: 5cfabc0b7c6c7ab473666df314f377b1f15420b1

commit 4086bd6652c0badccc020218a62190a7798fb72c
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Dec 8 09:18:39 2023 +0000

    upstream: prevent leak in sshsig_match_principals; ok djm@
    
    OpenBSD-Commit-ID: 594f61ad4819ff5c72dfe99ba666a17f0e1030ae

commit 19d3ee2f3adf7d9a606ff015c1e153744702c4c9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 6 21:06:48 2023 +0000

    upstream: short circuit debug log processing early if we're not going
    
    to log anything. From Kobe Housen
    
    OpenBSD-Commit-ID: 2bcddd695872a1bef137cfff7823044dcded90ea

<<<<<<< HEAD
commit 134f702876fc9445add7eb646cd199e0db083aec
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Nov 29 17:47:12 2023 -0500

    Add github-repo-stats workflow file

=======
>>>>>>> V_10_2_P1
commit 947affad4831df015c498c00c6351ea6f13895d5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 27 09:37:28 2023 +1100

    Add tests for OpenSSL 3.2.0 and 3.2 stable branch.

commit 747dce36206675ca6b885010a835733df469351b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 25 09:03:38 2023 +1100

    Use non-zero arg in compiler test program.
    
    Now that we're running the test program, passing zero to the test function
    can cause divide-by-zero exceptions which might show up in logs.

commit 3d44a5c56585d1c351dbc006240a591b6da502b1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 24 00:31:30 2023 +0000

    upstream: Plug mem leak of msg when processing a quit message.
    
    Coverity CID#427852, ok djm@
    
    OpenBSD-Commit-ID: bf85362addbe2134c3d8c4b80f16601fbff823b7

commit 1d7f9b6e297877bd00973e6dc5c0642dbefc3b5f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 23 03:37:05 2023 +0000

    upstream: Include existing mux path in debug message.
    
    OpenBSD-Commit-ID: 1c3641be10c2f4fbad2a1b088a441d072e18bf16

commit f29934066bd0e561a2e516b7e584fb92d2eedee0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 23 19:41:27 2023 +1100

    Add an Ubuntu 22.04 test VM.
    
    This is the same version as Github's runners so most of the testing on
    it is over there, but having a local VM makes debugging much easier.

commit a93284a780cd3972afe5f89086b75d564ba157f3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 23 19:36:22 2023 +1100

    Add gcc-12 -Werror test on Ubuntu 22.04.
    
    Explictly specify gcc-11 on Ubuntu 22.04 (it's the system compiler).

commit 670f5a647e98b6fd95ad64f789f87ee3274b481b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 23 19:34:57 2023 +1100

    Check return value from write to prevent warning.
    
    ... and since we're testing for flags with -Werror, this caused
    configure to mis-detect compiler flags.

commit cea007d691cfedfa07a5b8599f97ce0511f53fc9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 22 21:18:55 2023 +1100

    Run compiler test program when compiling natively.
    
    ok djm@

commit ee0d305828f13536c0a416bbf9c3e81039d9ea55
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 22 21:18:07 2023 +1100

    Factor out compiler test program into a macro.
    
    ok djm@

commit de304c76316b029df460673725a9104224b9959b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 22 08:55:36 2023 +1100

    Add fbsd14 VM to test pool.

commit 99a2df5e1994cdcb44ba2187b5f34d0e9190be91
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 21 16:19:29 2023 +1100

    Expand -fzero-call-used-regs test to cover gcc 11.
    
    It turns out that gcc also has some problems with -fzero-call-used-regs,
    at least v11 on mips.  Previously the test in OSSH_CHECK_CFLAG_COMPILE
    was sufficient to catch it with "=all", but not sufficient for "=used".
    Expand the testcase and include it in the other tests for good measure.
    See bz#3629.  ok djm@.

commit ff220d4010717f7bfbbc02a2400666fb9d24f250
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 21 14:04:34 2023 +1100

    Stop using -fzero-call-used-regs=all
    
    ... since it seems to be problematic with several different versions of
    clang.  Only use -fzero-call-used-regs=used which is less
    problematic, except with Apple's clang where we don't use it at all.
    bz#3629, ok djm@

commit 2a19e02f36b16f0f6cc915f7d1e60ead5e36303b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 21 14:02:18 2023 +1100

    Allow for vendor prefix on clang version numbers.
    
    Correctly detects the version of OpenBSD's native clang, as well as
    Apple's.  Spotted tb@, ok djm@.

commit c52db0114826d73eff6cdbf205e9c1fa4f7ca6c6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 20 02:50:00 2023 +0000

    upstream: set errno=EAFNOSUPPORT when filtering addresses that don't
    
    match AddressFamily; yields slightly better error message if no address
    matches. bz#3526
    
    OpenBSD-Commit-ID: 29cea900ddd8b04a4d1968da5c4a893be2ebd9e6

commit 26f3f3bbc69196d908cad6558c8c7dc5beb8d74a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 15 23:03:38 2023 +0000

    upstream: when connecting via socket (the default case), filter
    
    addresses by AddressFamily if one was specified. Fixes the case where, if
    CanonicalizeHostname is enabled, ssh may ignore AddressFamily. bz5326; ok
    dtucker
    
    OpenBSD-Commit-ID: 6c7d7751f6cd055126b2b268a7b64dcafa447439

commit 050c335c8da43741ed0df2570ebfbd5d1dfd0a31
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 15 22:51:49 2023 +0000

    upstream: when deciding whether to enable keystroke timing
    
    obfuscation, only consider enabling it when a channel with a tty is open.
    
    Avoids turning on the obfucation when X11 forwarding only is in use,
    which slows it right down. Reported by Roger Marsh
    
    OpenBSD-Commit-ID: c292f738db410f729190f92de100c39ec931a4f1

commit 676377ce67807a24e08a54cd60ec832946cc6cae
Author: tobhe@openbsd.org <tobhe@openbsd.org>
Date:   Mon Nov 13 09:18:19 2023 +0000

    upstream: Make sure sftp_get_limits() only returns 0 if 'limits'
    
    was initialized. This fixes a potential uninitialized use of 'limits' in
    sftp_init() if sftp_get_limits() returned early because of an unexpected
    message type.
    
    ok djm@
    
    OpenBSD-Commit-ID: 1c177d7c3becc1d71bc8763eecf61873a1d3884c

commit 64e0600f23c6dec36c3875392ac95b8a9100c2d6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 13 20:03:31 2023 +1100

    Test current releases of LibreSSL and OpenSSL.
    
    Retire some of the older releases.

commit c8ed7cc545879ac15f6ce428be4b29c35598bb2a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Nov 1 02:08:38 2023 +0000

    upstream: Specify ssh binary to use
    
    ... instead of relying on installed one.  Fixes test failures in -portable
    when running tests prior to installation.
    
    OpenBSD-Regress-ID: b6d6ba71c23209c616efc805a60d9a445d53a685

commit e9fc2c48121cada1b4dcc5dadea5d447fe0093c3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 1 13:11:31 2023 +1100

    Put long-running test targets on hipri runners.
    
    Some of the selfhosted test targets take a long time to run for various
    reasons, so label them for "libvirt-hipri" runners so that they can
    start immediately.  This should reduce the time to complete all tests.

commit 7ddf27668f0e21233f08c0ab2fe9ee3fdd6ab1e2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 1 00:29:46 2023 +0000

    upstream: add some tests of forced commands overriding Subsystem
    
    directives
    
    OpenBSD-Regress-ID: eb48610282f6371672bdf2a8b5d2aa33cfbd322b

commit fb06f9b5a065dfbbef5916fc4accc03c0bf026dd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 31 04:15:40 2023 +0000

    upstream: Don't try to use sudo inside sshd log wrapper.
    
    We still need to check if we're using sudo since we don't want to chown
    unecessarily, as on some platforms this causes an error which pollutes
    stderr. We also don't want to unnecessarily invoke sudo, since it's
    running in the context of the proxycommand, on *other* platforms it
    may not be able to authenticate, and if we're using SUDO then it should
    already be privileged.
    
    OpenBSD-Regress-ID: 70d58df7503db699de579a9479300e5f3735f4ee

commit fc3cc33e88c242c704781c6c48087838f1dcfa2a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 31 02:58:45 2023 +0000

    upstream: Only try to chmod logfile if we have sudo. If we don't have
    
    sudo then we won't need to chmod.
    
    OpenBSD-Regress-ID: dbad2f5ece839658ef8af3376cb1fb1cabe2e324

commit 3a506598fddd3f18f9095af3fe917f24cbdd32e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 30 23:00:25 2023 +0000

    upstream: move PKCS#11 setup code to test-exec.sh so it can be reused
    
    elsewhere
    
    OpenBSD-Regress-ID: 1d29e6be40f994419795d9e660a8d07f538f0acb

commit f82fa227a52661c37404a6d33bbabf14fed05db0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 30 17:32:00 2023 +0000

    upstream: tidy and refactor PKCS#11 setup code
    
    Replace the use of a perl script to delete the controlling TTY with a
    SSH_ASKPASS script to directly load the PIN.
    
    Move PKCS#11 setup code to functions in anticipation of it being used
    elsewhere in additional tests.
    
    Reduce stdout spam
    
    OpenBSD-Regress-ID: 07705c31de30bab9601a95daf1ee6bef821dd262

commit 3cf698c6d4ffa9be1da55672a3519e2135a6366a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 30 21:35:03 2023 +1100

    Add obsd74 test VM and retire obsd69 and obsd70.

commit 3e21d58a09894acb38dc69ed615d101131f473d0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 30 18:34:12 2023 +1100

    Add OpenSSL 3.3.0 as a known dev version.

commit 917ba181c2cbdb250a443589ec732aa36fd51ffa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 30 13:32:03 2023 +1100

    Restore nopasswd sudo rule on Mac OS X.
    
    This seems to be missing from some (but not all) github runners, so
    restore it if it seems to be missing.

commit c5698abad6d4ec98ca20bcaaabaeacd5e1ec3f4f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 30 13:26:52 2023 +1100

    Don't exit early when setting up on Mac OS X.
    
    We probably need some of the other bits in there (specifically, setting
    the perms on the home directory) so make it less of a special snowflake.

commit 1d6a878ceba60b9dc14037dddc8f036070c0065f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Oct 29 06:22:07 2023 +0000

    upstream: Only try to chown logfiles that exist to prevent spurious
    
    errors.
    
    OpenBSD-Regress-ID: f1b20a476734e885078c481f1324c9ea03af991e

commit e612376427a66f835e284f6b426d16d7c85301bc
Author: anton@openbsd.org <anton@openbsd.org>
Date:   Thu Oct 26 18:52:45 2023 +0000

    upstream: make use of bsd.regress.mk in extra and interop targets; ok
    
    dtucker@
    
    OpenBSD-Regress-ID: 7ea21b5f6fc4506165093b2123d88d20ff13a4f0

<<<<<<< HEAD
commit c868a3b35e1f1d4c0e811a66596312c464cc76e2
Merge: 5c1ad8dcb 70844a7f5
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Oct 27 15:34:08 2023 -0400

    Merge pull request #56 from rapier1/release_candidates
    
    Merge 18.2.0-RC1 into Master

=======
>>>>>>> V_10_2_P1
commit ea0039173957d0edcd6469b9614dcedb44dcb4f9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Oct 26 12:44:07 2023 +0000

    upstream: Skip conch interop tests when not enabled instead of fatal.
    
    OpenBSD-Regress-ID: b0abf81c24ac6c21f367233663228ba16fa96a46

commit d220b9ed5494252b26b95f05be118472bc3ab5c0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Oct 25 05:38:08 2023 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: 95f5dd6107e8902b87dc5b005ef2b53f1ff378b8

commit a611e4db4009447a0151f31a44e235ca32ed4429
Author: anton@openbsd.org <anton@openbsd.org>
Date:   Wed Oct 25 08:01:59 2023 +0000

    upstream: ssh conch interop tests requires a controlling terminal;
    
    ok dtucker@
    
    OpenBSD-Regress-ID: cbf2701bc347c2f19d907f113779c666f1ecae4a

commit da951b5e08c167acb5d6e2eec6f146502f5d6ed8
Author: anton@openbsd.org <anton@openbsd.org>
Date:   Mon Oct 23 11:30:49 2023 +0000

    upstream: Use private key that is allowed by sshd defaults in conch
    
    interop tests.
    
    ok dtucker@
    
    OpenBSD-Regress-ID: 3b7f65c8f409c328bcd4b704f60cb3d31746f045

commit 1ca166dbb3c0ce632b98869cd955f69320aa6fe8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 20 20:43:00 2023 +1100

    Install Dropbear for interop testing.

commit f993bb58351c5cb71e61aede63805a34a6d4daea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 20 20:39:03 2023 +1100

    Resync PuTTY and Conch path handling with upstream.
    
    Now that configure finds these for us we can remove these -portable
    specific changes.

commit ff85becd5f5f06a76efa45d30fb204a3c5e5215c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 20 20:35:46 2023 +1100

    Have configure find PuTTY and Conch binaries.
    
    This will let us remove some -portable specific changes from
    test-exec.sh.

commit c54a50359b9cecddbf3ffcdc26efcb3cd6071ec1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 20 07:37:07 2023 +0000

    upstream: Allow overriding the locations of the Dropbear binaries
    
    similar to what we do for the PuTTY ones.
    
    OpenBSD-Regress-ID: 7de0e00518fb0c8fdc5f243b7f82f523c936049c

commit fbaa707d455a61d0aef8ae65e02a25bac5351e5c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 20 06:56:45 2023 +0000

    upstream: Add interop test with Dropbear.
    
    Right now this is only dbclient not the Dropbear server since it won't
    currently run as a ProxyCommand.
    
    OpenBSD-Regress-ID: 8cb898c414fcdb252ca6328896b0687acdaee496

commit c2003d0dbdcdb61ca336c3f90c5c2b4a09c8e73f
Author: Fabio Pedretti <pedretti.fabio@gmail.com>
Date:   Mon Oct 16 11:59:53 2023 +0200

    Update openssl-devel dependency in RPM spec.
    
    Since openssh 9.4p1, openssl >= 1.1.1 is required, so
    build with --without-openssl elsewhere.
    According to https://repology.org/project/openssl/versions
    openssl 1.1.1 is available on fedora >= 29 and rhel >= 8.
    Successfully build tested, installed and run on rhel 6

commit 064e09cd632721c7e6889904e07767443ee23821
Author: Fabio Pedretti <pedretti.fabio@gmail.com>
Date:   Mon Oct 16 10:13:06 2023 +0200

    Remove reference of dropped sshd.pam.old file
    
    The file was removed in openssh 8.8

commit 62db354b696b378a164b6e478cb6b0171dcb0c3d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Oct 16 08:40:00 2023 +0000

    upstream: Move declaration of "len" into the block where it's used.
    
    This lets us compile Portable with -Werror with when OpenSSL doesn't have
    Ed25519 support.
    
    OpenBSD-Commit-ID: e02e4b4af351946562a7caee905da60eff16ba29

commit 6eee8c972d5901d10e80634a006b4e346b2c8c19
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 13 15:15:05 2023 +1100

    run t-extra regress tests
    
    This exposes the t-extra regress tests (including agent-pkcs11.sh) as
    a new extra-tests target in the top level Makefile and runs them by
    default. ok dtucker@

commit 637624dbbac13f2bc3c8ec5b15c9d627d07f2935
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 12 22:01:23 2023 +1100

    Don't use make -j2.
    
    While we have 2 cores available on github runners, not using it means
    that the most recent log message is the actual failure, rather than
    having to search back through the log for it.

commit 971e0cfcfd52ef1d73cf5244074c306a60006e89
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 12 16:23:05 2023 +1100

    Correct arg order for ED255519 AC_LINK_IFELSE test.

commit c616e64688b2a0c1b4daad69b056099be998d121
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 12 03:51:08 2023 +0000

    upstream: typos and extra debug trace calls
    
    OpenBSD-Regress-ID: 98a2a6b9333743274359e3c0f0e65cf919a591d1

commit c49a3fbf10162128c67c59562348de2041188974
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 12 03:48:53 2023 +0000

    upstream: ensure logs are owned by correct user; feedback/ok
    
    dtucker@
    
    OpenBSD-Regress-ID: c3297af8f07717f1d400a5d34529962f1a76b5a3

commit 5ec0ed79ac074c3437b25f6cba8b8cf21c8d4587
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 12 03:36:32 2023 +0000

    upstream: 64 %-expansion keys ought to be enough for anybody; ok
    
    dtucker (we just hit the previous limit in some cases)
    
    OpenBSD-Commit-ID: 84070f8001ec22ff5d669f836b62f206e08c5787

commit f59a94e22e46db2c23eddeb871aa9e8d93ab0016
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 12 02:48:43 2023 +0000

    upstream: don't dereference NULL pointer when hashing jumphost
    
    OpenBSD-Commit-ID: 251c0263e1759a921341c7efe7f1d4c73e1c70f4

commit 281c79168edcc303abfd5bca983616eaa24c5f32
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 12 13:20:01 2023 +1100

    Solaris: prefer PRIV_XPOLICY to PRIV_LIMIT
    
    If the system support PRIV_XPOLICY and one is set, then don't
    modify PRIV_LIMIT. bz2833, patch from Ron Jordan, ok dtucker@

commit 98fc34df837f3a3b79d2a111b96fe8a39adcab55
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 12 02:18:18 2023 +0000

    upstream: add %j token that expands to the configured ProxyJump
    
    hostname (or the empty string if this option is not being used). bz3610, ok
    dtucker
    
    OpenBSD-Commit-ID: ce9983f7efe6a178db90dc5c1698df025df5e339

commit 7f3180be8a85320b5d3221714b40c16e66881249
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 12 02:15:53 2023 +0000

    upstream: release GSS OIDs only at end of authentication; bz2982,
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 0daa41e0525ae63cae4483519ecaa37ac485d94c

commit a612b93de5d86e955bfb6e24278f621118eea500
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 12 02:12:53 2023 +0000

    upstream: mask SIGINT/TERM/QUIT/HUP before checking quit_pending
    
    and use ppoll() to unmask them in the mainloop. Avoids race condition between
    signaling ssh to exit and polling. bz3531; ok dtucker
    
    OpenBSD-Commit-ID: 5c14e1aabcddedb95cdf972283d9c0d5083229e7

commit 531b27a006116fe7aff325510aaa576f24844452
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 11 23:23:58 2023 +0000

    upstream: sync usage() with ssh.1; spotted by kn@
    
    OpenBSD-Commit-ID: 191a85639477dcb5fa1616d270d93b7c8d5c1dfd

commit 64f7ca881b19be754425dca60d1590d306c9d1d0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 11 23:14:33 2023 +0000

    upstream: ssh -Q does not make sense with other command-line options,
    
    so give it its own line in the manpage
    
    OpenBSD-Commit-ID: 00a747f0655c12122bbb77c2796be0013c105361

commit a752a6c0e1001f93696d7025f0c867f0376e2ecf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 11 22:42:26 2023 +0000

    upstream: add ChannelTimeout support to the client, mirroring the
    
    same option in the server. ok markus@
    
    OpenBSD-Commit-ID: 55630b26f390ac063980cfe7ad8c54b03284ef02

commit 76e91e7238cdc5662bc818e2a48d466283840d23
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 11 22:41:05 2023 +0000

    upstream: add support for reading ED25519 private keys in PEM PKCS8
    
    format; ok markus@ tb@
    
    OpenBSD-Commit-ID: 01b85c91757e6b057e9b23b8a23f96415c3c7174

<<<<<<< HEAD
commit 70844a7f5d74db20fab06f440973bdff23340eed
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Oct 11 11:01:32 2023 -0400

    Updated documentation to remove references to HPNBufferSize
    and TcpRcvBuf. Neither option are supported any more.

=======
>>>>>>> V_10_2_P1
commit fc77c8e352c0f44125425c05265e3a00c183d78a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 11 06:40:54 2023 +0000

    upstream: mention "none" is a valid argument to IdentityFile; bz3080
    
    OpenBSD-Commit-ID: 1b4fb590ef731099349a7d468b77f02b240ac926

commit c97520d23d1fe53d30725a2af25d2dddd6f2faff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 11 05:42:08 2023 +0000

    upstream: in olde rcp/scp protocol mode, when rejecting a path from the
    
    server as not matching the glob that the client sent, log (at debug level)
    the received pathname as well as the list of possible expected paths expanded
    from the glob. bz2966
    
    OpenBSD-Commit-ID: 0bd8db8a595334ca86bca8f36e23fc0395315765

commit 208c2b719879805983398160791d6a1ef9c2c3fc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 11 04:46:29 2023 +0000

    upstream: s/%.100s/%s/ in SSH- banner construction as there's no
    
    reason to limit its size: the version string bring included is a compile time
    constant going into an allocated banner string.
    
    OpenBSD-Commit-ID: 0ef73304b9bf3e534c60900cd84ab699f859ebcd

commit 0354790826b97c41bbd171a965574e159b58d83e
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Tue Oct 10 06:49:54 2023 +0000

    upstream: Garbage collect cipher_get_keyiv_len()
    
    This is a compat20 leftover, unused since 2017.
    
    ok djm
    
    OpenBSD-Commit-ID: 91fa5497c9dc6883064624ac27813a567883fdce

<<<<<<< HEAD
commit 4a775bd3303dd2e7ff41c9fc4c3eb2c115ce0176
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Oct 10 17:55:26 2023 -0400

    This gets rid of everything related to hpn_buffer_size

commit e903aa1bd12b97120aad4ed6e7dc5478a432f912
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Oct 10 16:25:56 2023 -0400

    Testing the removal of the HPNBufferSize and TcpRcvBuf options as
    a) they don't seem to have any sort of impact anymore. This was
       likely due to a change in the code sometime in the past 16 years
       that I overlooked.
    b) the only reason to reimplement them is to create a bandwidth
       limiting service which can be implemented in other, more straighforward ways
    The upside is that it decreases the codes complexity a bit along with making
    it less likely to generate user confusion. Follow up is to see what else
    can be simplified and possibly even removing options.hpn_buffer_size entirely.
    It's still there because some code paths use it but I don't know if it makes
    sense in those situations (like X11 forwarding).

commit 8b3859aec54135355056b94dd0e1ecb8913ada93
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Oct 10 14:52:06 2023 -0400

    Testing a change to the CI workflow. Trying to deprioritize
    Ubuntu 20.04.

=======
>>>>>>> V_10_2_P1
commit 8d29ee4115001a02641386ae394992c65ed279e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 10 03:57:45 2023 +0000

    upstream: Reserve a range of "local extension" message numbers that
    
    OpenSSH promises not to use (comment change only)
    
    OpenBSD-Commit-ID: e61795b453d4892d2c99ce1039112c4a00250e03
<<<<<<< HEAD

commit fd93bb238459adb3c587af81ca4028c39fe2e74d
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Oct 9 17:36:07 2023 -0400

    Turns out the c89 CI test wasn't actually testing c89. It does now
    and showed a lot of issues in binn.h and binn.c. Primarily issues with
    using c++ // style comments. There was also an issue in that it wasn't picking up
    the fact that inline isn't allowed in c89. That was resolved by including
    config.h in binn.h

commit b6ccab8679ec36bd82e3ddb0249143c29e6070af
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Oct 9 10:19:38 2023 -0400

    Valgrind 5 (rekey tests) are taking far too long and
    leading to multiple other CI test being cancelled as
    the time limit is exceeded. We'll return to this one
    as soon as we figure out a few things.

commit d625c81f89f822d6672030c3d8c2ca4b66bc0d60
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Oct 6 17:11:06 2023 -0400

    Crank version number

commit 6f608a767797c85810d8e6b933734d42d38f0a4f
Merge: 5c1ad8dcb 80a2f64b8
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Oct 6 17:09:59 2023 -0400

    First pass at porting HPN-SSH to 9.5p1. This will end up being
    18.2.0

commit 90b0d73d63a706e85f6431f05a62d2ce1b476472
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 6 03:32:15 2023 +0000

    upstream: typo in error message
    
    OpenBSD-Regress-ID: 6a8edf0dc39941298e3780b147b10c0a600b4fee

commit e84517f51532ec913d8fb01a8aab7307134774bb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 6 03:25:14 2023 +0000

    upstream: Perform the softhsm2 setup as discrete steps rather than
    
    as a long shell pipeline. Makes it easier to figure out what has happened
    when it breaks.
    
    OpenBSD-Regress-ID: b3f1292115fed65765d0a95414df16e27772d81c

commit cb54becff4d776238e0e9072943ba0872260535d
Author: claudio@openbsd.org <claudio@openbsd.org>
Date:   Sun Sep 24 08:14:13 2023 +0000

    upstream: REGRESS_FAIL_EARLY defaults to yes now. So no need to
    
    overload the value here anymore. OK tb@ bluhm@
    
    OpenBSD-Regress-ID: f063330f1bebbcd373100afccebc91a965b14496

commit f01f5137ceba65baf34ceac5a298c12ac01b1fef
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Oct 4 05:42:10 2023 +0000

    upstream: spelling fix;
    
    OpenBSD-Commit-ID: 493f95121567e5ab0d9dd1150f873b5535ca0195

commit 80a2f64b8c1d27383cc83d182b73920d1e6a91f1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 4 15:34:10 2023 +1100

    crank version numbers

commit f65f187b105d9b5c12fd750a211397d08c17c6d4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 4 04:04:09 2023 +0000

    upstream: openssh-9.5
    
    OpenBSD-Commit-ID: 5e0af680480bd3b6f5560cf840ad032d48fd6b16

commit ffe27e54a4bb18d5d3bbd3f4cc93a41b8d94dfd2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 4 04:03:50 2023 +0000

    upstream: add some cautionary text about % token expansion and
    
    shell metacharacters; based on report from vinci AT protonmail.ch
    
    OpenBSD-Commit-ID: aa1450a54fcee2f153ef70368d90edb1e7019113

commit 60ec3d54fd1ebfe2dda75893fa1e870b8dffbb0d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 3 23:56:10 2023 +0000

    upstream: fix link to agent draft; spotted by Jann Horn
    
    OpenBSD-Commit-ID: ff5bda21a83ec013db683e282256a85201d2dc4b

commit 12e2d4b13f6f63ce2de13cbfcc9e4d0d4b4ab231
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 4 10:54:04 2023 +1100

    use portable provider allowlist path in manpage
    
    spotted by Jann Horn

commit 6c2c6ffde75df95fd838039850d3dd3d84956d87
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue Sep 19 20:37:07 2023 +0000

    upstream: typo; from Jim Spath
    
    OpenBSD-Commit-ID: 2f5fba917b5d4fcf93d9e0b0756c7f63189e228e

commit 5c1ad8dcb9d3cc0917761b0b73f6fda753b760e8
Merge: ab9495715 e1c4cf3c5
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 20 14:39:44 2023 -0400

    This is the 18.1.0 release of HPN-SSH based on OpenSSH 9.4. The major changes
    included in this release are the introduction of a parallel ChaCha20-Poly1305 cipher
    called chacha20-poly1305-mt@hpnssh.org. This is now the default cipher used by
    HPN-SSH. You may use the serial version of the cipher by explcitly calling it
    with -cchacha20-poly1035@openssh.com if you perfer. However, this will only have
    an impact on the local instantiation of hpnssh or hpnsshd. To use serial ChaCha20
    on both ends of the connection you must run both the server and client with the
    serial version.
    
    We have also imrpoved the efficacy of the Poly1305 MAC by using OpenSSL functions
    to compute the MAC instead of the portable C implementation included in OpenSSH. Our
    implemtation of Poly1305 will fall back to the portable implementation if the OpenSSL
    EVP is not available.
    
    There have been other minor changes to improve code readability, improve compatibility
    with LibreSSL, support Alpine more gracefully, and so forth.
    
    Lastly, the versioning scheme as been normalize to Major.Minor.Fix. For example,
    this version is 18.1.0 meaning that it is the 18th Major release, the 1st minor
    release, and there 0 fixes/patches applied. In this scheme a minor bug fix will
    increment the Fix value. A forward port to a new version of OpenSSH or a performance
    improvement will increment the Minor value (and reset the Fix value). The introduction
    of a major change or functionality will increment the Major value while resetting
    both Minor and Fix to 1 and 0 respectively.
    
    Okayed by mwd@psc.edu and rapier@psc.edu

commit e1c4cf3c557b623ef4b0dead85d0278f7c1753b6
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 14 15:00:37 2023 -0400

    Removed MUSL from CI tests until we can figure out how to build against it.
    Updated Makefile.in to clean regress better.

commit e8dd25047796461196e8ed29c4697083a1128139
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Sep 14 11:53:56 2023 -0400

    Seems that I had the wrong type (u_int instead of size_t) in the definition
    of ssh_aes_ctr() in cipher-ctr-mt.c. Thsi was causing the 'with errors' tests
    in the CI build to die.
    I have no idea whu this wasn't happening before.

commit c80ab4603a8185fc67bba784b87cf1002b9d2aa9
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 17:18:47 2023 -0400

    Removed tests to build against windows. We can come back to that
    later but it will involve cygwin madness

commit 98ff74de756249f5bc5b65e184b73d11f890e15c
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 17:16:58 2023 -0400

    OpenSSH changed one of the defined types in their openbsd compat work. This was
    causing cipher-ctr-mt to fail when built against OSSL1.1.
    
    Also, it was a white space issue. Tabs seem to be disallowed in the yml files
    for the github ci system

commit a136e125a1a36fd20b2dc55cd95c5dd6e65c8bfd
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 17:00:48 2023 -0400

    last test. maybe it's a white space issue?

commit 8a2c03e26edf90229502995b375825606b1a3271
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 16:51:03 2023 -0400

    Bug in .github/workflows/c-cpp.yml. This is a test to see what the problem might be. part 2

commit 246ecf98f388437fa28d0b4521708f4ae4c85749
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 16:50:09 2023 -0400

    Bug in .github/workflows/c-cpp.yml. This is a test to see what the

commit e6980e06fc0d9d61e6ccf27ae8c72adec5f4833d
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 16:48:40 2023 -0400

    Bug in .github/configs

commit 18fbf570f635e7389d11d8b652bc61b7062b966f
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 16:44:07 2023 -0400

    Negelected to have defines for WITH_OPENSSL3 in confdigure.ac and updated the version

commit e44dd52c3ed643954192aac046ec7d2c20af36b2
Merge: daa5b2d86 b86ad347a
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 15:44:44 2023 -0400

    first pass at proting 18.1 to 9.4

commit b86ad347a5f13d10c8601cc1b2049b771ad218fc
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Sep 13 14:46:03 2023 -0400

    Minor cleanup

commit 308dcc598a06bafeeec3d957ee8420b520521106
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Sep 12 16:52:31 2023 -0400

    Change the NUMSTREAMS define to 64. Lower memory use and current tests
    show that there isn't much, if any, performance impact

commit 31593992602679c77397be8a4eb88706b9fbf1f5
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Sep 12 15:05:37 2023 -0400

    Missed a necessary free in the thread manager

commit 84d541259d955db3a9fc3d946312a11b2f6f035e
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Tue Sep 12 04:34:37 2023 -0400

    Rework CC20-MT to spawn threads on the fly
    
    Simplify the thread handling by spawning threads as needed. Rename
    thread functions to be more descriptive (worker_thread and
    manager_thread). The manager thread now spawns worker threads and joins
    them as soon as they're complete.

commit 333ff006018395a39b1910d840857545254b5863
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Mon Sep 11 11:10:23 2023 -0400

    Add missing return-code checking in CC20-MT
    
    Check return codes in CC20-MT initialization function and implement
    cleanup upon encountering a failure condition. Also properly add missing
    cleanup code for OpenSSL 1.x in the chachapoly_free_mt() function.

commit b6b49130a0089b297245ee39e769231d7c763014
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 10 23:12:32 2023 +0000

    upstream: rename remote_glob() -> sftp_glob() to match other API
    
    OpenBSD-Commit-ID: d9dfb3708d824ec02970a84d96cf5937e0887229

commit 21b79af6c8d2357c822c84cef3fbdb8001ed263b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 10 03:51:55 2023 +0000

    upstream: typo in comment
    
    OpenBSD-Commit-ID: 69285e0ce962a7c6b0ab5f17a293c60a0a360a18

commit 41232d25532b4d2ef6c5db62efc0cf50a79d26ca
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Sep 10 15:45:38 2023 +1000

    Use zero-call-used-regs=used with Apple compilers.
    
    Apple's versions of clang have version numbers that do not match the
    corresponding upstream clang versions.  Unfortunately, they do still
    have the clang-15 zero-call-used-regs=all bug, so for now use the value
    that doesn't result in segfaults.  We could allowlist future versions
    that are known to work.  bz#3584 (and probably also our github CI
    failures).

commit 90ccc5918ea505bf156c31148b6b59a1bf5d6dc6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 10 03:25:53 2023 +0000

    upstream: randomise keystroke obfuscation intervals and average
    
    interval rate. ok dtucker@
    
    OpenBSD-Commit-ID: 05f61d051ab418fcfc4857ff306e420037502382

commit 3c6ab59f09ada20d4c90c15df6979a07e02e008d
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 8 12:57:03 2023 -0400

    Prevent failing CC20-MT threads from pinning CPU
    
    Break the while loop if the pthread_cond_wait() call fails. This
    prevents the thread from spinning indefinitely.

commit a8ab7d94ab2bae733fe09890b94f130a42dfdf63
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 8 12:52:58 2023 -0400

    Fix pthread_cleanup_pop() issue
    
    Move the CC20-MT failure condition of pthread_cond_wait outside of the
    while loop, so that pthread_cleanup_push() and pthread_cleanup_pop()
    remain correctly paired in the same context.

commit 4b162054d9069276d2e03b98cf96f570aaf22a2e
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 8 12:46:27 2023 -0400

    Maintain code style
    
    Add spaces after 'if' keywords.

commit dfa6485bec86f38329389cbde62ea045f2199562
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 8 12:18:05 2023 -0400

    Add return-code checks to CC20-MT cipher cleanup
    
    Verify that cleanup operations are completing successfully, because
    failed cleanups could accumulate and lead to a denial of service.

commit 67876a67780b6bb63c6a8395c0058b54416be4cf
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 8 11:57:04 2023 -0400

    Add warning/TODO messages to CC20-MT code
    
    Indicate specific areas of concern where abnormal execution could cause
    significant problems.

commit 5979a94db447d150ac2acc8cffbd5f2daa823280
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 8 11:38:32 2023 -0400

    Check mutex return codes in CC20-MT threadloop
    
    Verify that when a worker thread tries to lock a mutex, it actually gets
    locked. Without these checks, a call to pthread_mutex_lock() could fail
    without interrupting the thread, leading to race conditions and likely
    undefined behavior.

commit bd1b9e52f5fa94d87223c90905c5fdc1a7c32aa6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 8 06:34:24 2023 +0000

    upstream: fix sizeof(*ptr) instead sizeof(ptr) in realloc (pointer here
    
    is char**, so harmless); spotted in CID 416964
    
    OpenBSD-Commit-ID: c61caa4a5a667ee20bb1042098861e6c72c69002

commit c4f966482983e18601eec70a1563115de836616f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 8 06:10:57 2023 +0000

    upstream: regress test recursive remote-remote directories copies where
    
    the directory contains a symlink to another directory.
    
    also remove errant `set -x` that snuck in at some point
    
    OpenBSD-Regress-ID: 1c94a48bdbd633ef2285954ee257725cd7bc456f

commit 5e1dfe5014ebc194641678303e22ab3bba15f4e5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 8 06:10:02 2023 +0000

    upstream: fix recursive remote-remote copies of directories that
    
    contain symlinks to other directories (similar to bz3611)
    
    OpenBSD-Commit-ID: 7e19d2ae09b4f941bf8eecc3955c9120171da37f

commit 7c0ce2bf98b303b6ad91493ee3247d96c18ba1f6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 8 05:50:57 2023 +0000

    upstream: regress test for recursive copies of directories containing
    
    symlinks to other directories. bz3611, ok dtucker@
    
    OpenBSD-Regress-ID: eaa4c29cc5cddff4e72a16bcce14aeb1ecfc94b9

commit 2de990142a83bf60ef694378b8598706bc654b08
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 8 05:56:13 2023 +0000

    upstream: the sftp code was one of my first contributions to
    
    OpenSSH and it shows - the function names are terrible.
    
    Rename do_blah() to sftp_blah() to make them less so.
    
    Completely mechanical except for sftp_stat() and sftp_lstat() which
    change from returning a pointer to a static variable (error-prone) to
    taking a pointer to a caller-provided receiver.
    
    OpenBSD-Commit-ID: eb54d6a72d0bbba4d623e2175cf5cc4c75dc2ba4

commit 249d8bd0472b53e3a2a0e138b4c030a31e83346a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 8 05:50:12 2023 +0000

    upstream: fix scp in SFTP mode recursive upload and download of
    
    directories that contain symlinks to other directories. In scp mode, the
    links would be followed, but in SFTP mode they were not. bz3611, ok dtucker@
    
    OpenBSD-Commit-ID: 9760fda668eaa94a992250d7670dfbc62a45197c

commit 0e1f4401c466fa4fdaea81b6dadc8dd1fc4cf0af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 6 23:36:09 2023 +0000

    upstream: regression test for override of subsystem in match blocks
    
    OpenBSD-Regress-ID: 5f8135da3bfda71067084c048d717b0e8793e87c

commit 8a1450c62035e834d8a79a5d0d1c904236f9dcfe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 6 23:35:35 2023 +0000

    upstream: allow override of Sybsystem directives in sshd Match
    
    blocks
    
    OpenBSD-Commit-ID: 3911d18a826a2d2fe7e4519075cf3e57af439722

commit 6e52826e2a74d077147a82ead8d4fbd5b54f4e3b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 6 23:26:37 2023 +0000

    upstream: allocate the subsystems array as necessary and remove the
    
    fixed limit of subsystems. Saves a few kb of memory in the server and makes
    it more like the other options.
    
    OpenBSD-Commit-ID: e683dfca6bdcbc3cc339bb6c6517c0c4736a547f

commit e19069c9fac4c111d6496b19c7f7db43b4f07b4f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 6 23:23:53 2023 +0000

    upstream: preserve quoting of Subsystem commands and arguments.
    
    This may change behaviour of exotic configurations, but the most common
    subsystem configuration (sftp-server) is unlikely to be affected.
    
    OpenBSD-Commit-ID: 8ffa296aeca981de5b0945242ce75aa6dee479bf

commit 52dfe3c72d98503d8b7c6f64fc7e19d685636c0b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 6 23:21:36 2023 +0000

    upstream: downgrade duplicate Subsystem directives from being a
    
    fatal error to being a debug message to match behaviour with just about all
    other directives.
    
    OpenBSD-Commit-ID: fc90ed2cc0c18d4eb8e33d2c5e98d25f282588ce

commit 1ee0a16e07b6f0847ff463d7b5221c4bf1876e25
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 6 23:18:15 2023 +0000

    upstream: handle cr+lf (instead of just cr) in sshsig signature
    
    files
    
    OpenBSD-Commit-ID: 647460a212b916540016d066568816507375fd7f

commit e1c284d60a928bcdd60bc575c6f9604663502770
Author: job@openbsd.org <job@openbsd.org>
Date:   Mon Sep 4 10:29:58 2023 +0000

    upstream: Generate Ed25519 keys when invoked without arguments
    
    Ed25519 public keys are very convenient due to their small size.
    OpenSSH has supported Ed25519 since version 6.5 (January 2014).
    
    OK djm@ markus@ sthen@ deraadt@
    
    OpenBSD-Commit-ID: f498beaad19c8cdcc357381a60df4a9c69858b3f

commit 694150ad92765574ff82a18f4e86322bd3231e68
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 4 00:08:14 2023 +0000

    upstream: trigger keystroke timing obfucation only if the channels
    
    layer enqueud some data in the last poll() cycle; this avoids triggering the
    obfuscatior for non-channels data like ClientAlive probes and also fixes a
    related problem were the obfucations would be triggered on fully quiescent
    connections.
    
    Based on / tested by naddy@
    
    OpenBSD-Commit-ID: d98f32dc62d7663ff4660e4556e184032a0db123

commit b5fd97896b59a3a46245cf438cc8b16c795d9f74
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 4 00:04:02 2023 +0000

    upstream: avoid bogus "obfuscate_keystroke_timing: stopping ..."
    
    debug messages when keystroke timing obfuscation was never started; spotted
    by naddy@
    
    OpenBSD-Commit-ID: 5c270d35f7d2974db5c1646e9c64188f9393be31

commit ccf7d913db34e49b7a6db1b8331bd402004c840d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 4 00:01:46 2023 +0000

    upstream: make channel_output_poll() return a flag indicating
    
    whether channel data was enqueued. Will be used to improve keystroke timing
    obfuscation. Problem spotted by / tested by naddy@
    
    OpenBSD-Commit-ID: f9776c7b0065ba7c3bbe50431fd3b629f44314d0

commit 43254b326ac6e2131dbd750f9464dc62c14bd5a7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 3 23:59:32 2023 +0000

    upstream: set interactive mode for ControlPersist sessions if they
    
    originally requested a tty; enables keystroke timing obfuscation for most
    ControlPersist sessions. Spotted by naddy@
    
    OpenBSD-Commit-ID: 72783a26254202e2f3f41a2818a19956fe49a772

commit b53ac254b76e586472de5a2300ec73d0de1f18a1
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 15:29:57 2023 -0400

    Fix trivial typo in kex.c
    
    Change "cppstr" to "ccpstr", because it's not chaPHA20-poly1305, after
    all.

commit 93fa92d0102fc382ad4906c3a64bd990c77091bb
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 15:24:35 2023 -0400

    Add comments for code readability
    
    Add comments to kex.c to explain when and where uses of the serial CC20
    implementation get promoted to the multithreaded implementation of the
    same cipher.

commit 4c964eb86826adb398643bfe269b4993e156a53c
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 15:16:18 2023 -0400

    Refactor list-patching to a separate function
    
    Move most of the new code in kex_ready() into a separate function,
    patch_list(), which has the added bonus of being called twice instead of
    duplicating the code. There's a probable memory leak that must be
    investigated later.

commit a9220429754136693d2fa22c5e261e8bfc38dc4c
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 13:53:43 2023 -0400

    Add comment to sshkey.c to explain commit 66d2e6
    
    Add a corresponding comment in sshkey.c to clarify the reason for a
    previous commit, so that future review doesn't need to reference the
    commit message.

commit 6ab37626243859439ade0de90ad7d3e76a4f4806
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 13:35:58 2023 -0400

    Drop unnecessary #ifdef in sshkey-xmss.c
    
    Reduce code complexity and improve readability by dropping another
    preprocessor conditional, since again, the ensuing code block is always
    safe, even when compiled without OpenSSL.

commit 66d2e67afcbd60c6d0344724aaed494e48af33f2
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 13:20:55 2023 -0400

    Drop an unnecessary #ifdef
    
    Reduce code complexity and improve readability by dropping a
    preprocessor conditional, since the ensuing code block is always safe,
    even when compiled without OpenSSL.

commit e1f89158122e1c56b9b50023d96e634345f8093b
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 12:48:43 2023 -0400

    Fix obvious error in sshkey-xmss.c
    
    Drop an extra parameter from calls to cipher_crypt() in sshkey-xmss.c.
    This wasn't caught earlier due to it being an untested and uncompiled
    codepath.

commit 0c0dd661c97a6be5b223ffbecb9aa222c78cf664
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 12:38:44 2023 -0400

    Implement CIPHER_ENCRYPT and CIPHER_DECRYPT
    
    Improve code readability by replacing arbitrary zeros and ones with the
    already-existing preprocessor directives for this purpose,
    CIPHER_ENCRYPT and CIPHER_DECRYPT.

commit 280b4de0f99d4e5a4a2af36aaefff6691abaad30
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 12:33:45 2023 -0400

    Introduce CIPHER_SERIAL for function-call clarity
    
    Replace constant zeros and ones in the final parameter of calls to
    cipher_init() with CIPHER_SERIAL and (hypothetically)
    CIPHER_MULTITHREADED to improve code readability.

commit d6b4ed230f58aa58d016790c45fc9d3ce034c5ee
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 11:54:33 2023 -0400

    Clarify function parameter name in cipher.c
    
    Rename a parameter in cipher_init from "post_auth" to "enable_threads"
    to be more descriptive of the function of the parameter.

commit 6ac38104c260ed62fb97d22de1fe3eb96ec8123f
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 11:13:07 2023 -0400

    Add missing WITH_OPENSSL preprocessor directives
    
    Correct a potential issue where CC20-MT code and data structures were
    being referenced even when OpenSSL is disabled at compile-time.

commit 75b4dbf55ae13fa61422a1123cc5867bdce349f3
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 11:09:59 2023 -0400

    Remove commented-out packet.h function signatures
    
    Remove function signatures that have previously been commented out.
    These functions were implemented to simplify another section of code,
    but the simplification was unsuccessful in practice.

commit a3b5a9bc0372d7a9b5866c23c856aafd2422ffff
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 10:49:03 2023 -0400

    Remove redundant code branches
    
    Remove a few "else" branches which are redundant with the next statement
    anyway. These two structures are equivalent:
    if (...) { return f(); } else { return g(); }
    if (...) { return f(); } return g();
    but this structure is redundant:
    if (...) { return f(); } else { return g(); } return g();
    It has been simplified to the latter of the two aforementioned
    equivalent structures, since that plays nicer with nearby "#ifdef"s.

commit 89d15de950d9cd68e5e9d5874a3470ba38a350d2
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri Sep 1 10:45:42 2023 -0400

    Delete already-deactivated code
    
    Remove a few lines of code which had already been commented out, and
    which currently use a comment style which goes against our style guide.

commit ff3eda68ceb2e2bb8f48e3faceb96076c3e85c20
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 31 23:02:35 2023 +1000

    Set LLONG_MAX for C89 test.
    
    If we don't have LLONG_MAX, configure will figure out that it can get it
    by setting -std=gnu99, at which point we won't be testing C89 any more.
    To avoid this, feed it in via CFLAGS.

commit f98031773db361424d59e3301aa92aacf423d920
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 29 02:50:10 2023 +0000

    upstream: make PerSourceMaxStartups first-match-wins; ok dtucker@
    
    OpenBSD-Commit-ID: dac0c24cb709e3c595b8b4f422a0355dc5a3b4e7

commit cfa66857db90cd908de131e0041a50ffc17c7df8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 28 09:52:09 2023 +0000

    upstream: descriptive text shouldn't be under .Cm
    
    OpenBSD-Commit-ID: b1afaeb456a52bc8a58f4f9f8b2f9fa8f6bf651b

commit 01dbf3d46651b7d6ddf5e45d233839bbfffaeaec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 28 09:48:11 2023 +0000

    upstream: limit artificial login delay to a reasonable maximum (5s)
    
    and don't delay at all for the "none" authentication mechanism. Patch by
    Dmitry Belyavskiy in bz3602 with polish/ok dtucker@
    
    OpenBSD-Commit-ID: 85b364676dd84cf1de0e98fc2fbdcb1a844ce515

commit 528da5b9d7c5da01ed7a73ff21c722e1b5326006
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Aug 28 05:32:28 2023 +0000

    upstream: add spacing for punctuation when macro args;
    
    OpenBSD-Commit-ID: e80343c16ce0420b2aec98701527cf90371bd0db

commit 3867361ca691d0956ef7d5fb8181cf554a91d84a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 28 04:06:52 2023 +0000

    upstream: explicit long long type in timing calculations (doesn't
    
    matter, since the range is pre-clamped)
    
    OpenBSD-Commit-ID: f786ed902d04a5b8ecc581d068fea1a79aa772de

commit 7603ba71264e7fa938325c37eca993e2fa61272f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 28 03:31:16 2023 +0000

    upstream: Add keystroke timing obfuscation to the client.
    
    This attempts to hide inter-keystroke timings by sending interactive
    traffic at fixed intervals (default: every 20ms) when there is only a
    small amount of data being sent. It also sends fake "chaff" keystrokes
    for a random interval after the last real keystroke. These are
    controlled by a new ssh_config ObscureKeystrokeTiming keyword/
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 02231ddd4f442212820976068c34a36e3c1b15be

commit dce6d80d2ed3cad2c516082682d5f6ca877ef714
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 28 03:28:43 2023 +0000

    upstream: Introduce a transport-level ping facility
    
    This adds a pair of SSH transport protocol messages SSH2_MSG_PING/PONG
    to implement a ping capability. These messages use numbers in the "local
    extensions" number space and are advertised using a "ping@openssh.com"
    ext-info message with a string version number of "0".
    
    ok markus@
    
    OpenBSD-Commit-ID: b6b3c4cb2084c62f85a8dc67cf74954015eb547f

commit d2d247938b38b928f8a6e1a47a330c5584d3a358
Author: tobhe@openbsd.org <tobhe@openbsd.org>
Date:   Mon Aug 21 21:16:18 2023 +0000

    upstream: Log errors in kex_exchange_identification() with level
    
    verbose instead of error to reduce preauth log spam. All of those get logged
    with a more generic error message by sshpkt_fatal().
    
    feedback from sthen@
    ok djm@
    
    OpenBSD-Commit-ID: bd47dab4695b134a44c379f0e9a39eed33047809

commit 9d7193a8359639801193ad661a59d1ae4dc3d302
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 21 04:59:54 2023 +0000

    upstream: correct math for ClientAliveInterval that caused the
    
    probes to be sent less frequently than configured; from Dawid Majchrzak
    
    OpenBSD-Commit-ID: 641153e7c05117436ddfc58267aa267ca8b80038

commit 3c6ab63b383b0b7630da175941e01de9db32a256
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 25 14:48:02 2023 +1000

    Include Portable version in sshd version string.
    
    bz#3608, ok djm@

commit 17fa6cd10a26e193bb6f65d21264d2fe553bcd87
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 21 19:47:58 2023 +1000

    obsd-arm64 host is real hardware...
    
    so put in the correct config location.

commit 598ca75c85acaaacee5ef954251e489cc20d7be9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 21 18:38:36 2023 +1000

    Add OpenBSD ARM64 test host.

commit 1acac79bfbe207e8db639e8043524962037c8feb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 21 18:05:26 2023 +1000

    Add test for zlib development branch.

commit 84efebf352fc700e9040c8065707c63caedd36a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 21 04:36:46 2023 +0000

    upstream: want stdlib.h for free(3)
    
    OpenBSD-Commit-ID: 743af3c6e3ce5e6cecd051668f0327a01f44af29

commit cb4ed12ffc332d1f72d054ed92655b5f1c38f621
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 19 07:39:08 2023 +1000

    Fix zlib version check for 1.3 and future version.
    
    bz#3604.

commit 25b75e21f16bccdaa472ea1889b293c9bd51a87b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 14 11:10:08 2023 +1000

    Add 9.4 branch to CI status page.

commit 803e22eabd3ba75485eedd8b7b44d6ace79f2052
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 18 01:37:41 2023 +0000

    upstream: fix regression in OpenSSH 9.4 (mux.c r1.99) that caused
    
    multiplexed sessions to ignore SIGINT under some circumstances. Reported by /
    feedback naddy@, ok dtucker@
    
    OpenBSD-Commit-ID: 4d5c6c894664f50149153fd4764f21f43e7d7e5a

commit e706bca324a70f68dadfd0ec69edfdd486eed23a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 16 16:14:11 2023 +0000

    upstream: defence-in-depth MaxAuthTries check in monitor; ok markus
    
    OpenBSD-Commit-ID: 65a4225dc708e2dae71315adf93677edace46c21

commit d1ab7eb90474df656d5e9935bae6df0bd000d343
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 14 03:37:00 2023 +0000

    upstream: add message number of SSH2_MSG_NEWCOMPRESS defined in RFC8308
    
    OpenBSD-Commit-ID: 6c984171c96ed67effd7b5092f3d3975d55d6028

commit fa8da52934cb7dff6f660a143276bdb28bb9bbe1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Aug 13 15:01:27 2023 +1000

    Add obsd72 and obsd73 test targets.

commit f9f18006678d2eac8b0c5a5dddf17ab7c50d1e9f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 10 23:05:48 2023 +0000

    upstream: better debug logging of sessions' exit status
    
    OpenBSD-Commit-ID: 82237567fcd4098797cbdd17efa6ade08e1a36b0

commit a8c57bcb077f0cfdffcf9f23866bf73bb93e185c
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Aug 10 14:37:32 2023 +0000

    upstream: drop a wayward comma, ok jmc@
    
    OpenBSD-Commit-ID: 5c11fbb9592a29b37bbf36f66df50db9d38182c6

commit e962f9b318a238db1becc53c2bf79dd3a49095b4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 10 11:10:22 2023 +1000

    depend

commit 0fcb60bf83130dfa428bc4422b3a3ac20fb528af
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 10 11:05:42 2023 +1000

    update versions in RPM specs

commit d0cee4298491314f09afa1c4383a66d913150b26
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 10 11:05:14 2023 +1000

    update version in README

commit 78b4dc6684f4d35943b46b24ee645edfdb9974f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 10 01:01:07 2023 +0000

    upstream: openssh-9.4
    
    OpenBSD-Commit-ID: 71fc1e01a4c4ea061b252bd399cda7be757e6e35

commit 58ca4f0aa8c4306ac0a629c9a85fb1efaf4ff092
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 10 11:30:24 2023 +1000

    Only include unistd.h once.

commit daa5b2d869ee5a16f3ef9035aa0ad3c70cf4028e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 10 11:10:22 2023 +1000

    depend

commit 41bfb63f5101fbacde9d8d2ada863f9ee16df194
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 10 11:05:42 2023 +1000

    update versions in RPM specs

commit e598b92b1eecedac21667edf1fe92078eaf8f2b1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 10 11:05:14 2023 +1000

    update version in README

commit e797e5ffa74377c8696e3b0559a258d836479239
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 10 01:01:07 2023 +0000

    upstream: openssh-9.4
    
    OpenBSD-Commit-ID: 71fc1e01a4c4ea061b252bd399cda7be757e6e35

commit 3961ed02dc578517a9d2535128cff5c3a5460d28
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 10 09:08:49 2023 +1000

    wrap poll.h include in HAVE_POLL_H

commit e535fbe2af893046c28adfcd787c1fdbae36a24a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 4 06:32:40 2023 +0000

    upstream: Apply ConnectTimeout to multiplexing local socket
    
    connections.  If the multiplex socket exists but the connection times out,
    ssh will fall back to a direct connection the same way it would if the socket
    did not exist at all.  ok djm@
    
    OpenBSD-Commit-ID: 2fbe1a36d4a24b98531b2d298a6557c8285dc1b4

commit 9d92e7b24848fcc605945f7c2e3460c7c31832ce
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 3 19:35:33 2023 +1000

    Fix RNG seeding for OpenSSL w/out self seeding.
    
    When sshd is built with an OpenSSL that does not self-seed, it would
    fail in the preauth privsep process while handling a new connection.
    Sanity checked by djm@

commit f70010d9b0b3e7e95de8aa0b961e1d74362cfb5d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 2 23:04:38 2023 +0000

    upstream: CheckHostIP has defaulted to 'no' for a while; make the
    
    commented- out config option match. From Ed Maste
    
    OpenBSD-Commit-ID: e66e934c45a9077cb1d51fc4f8d3df4505db58d9

commit c88a8788f9865d02b986d00405b9f0be65ad0b5a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Aug 1 08:15:04 2023 +0000

    upstream: remove unnecessary if statement.
    
    github PR#422 from eyalasulin999, ok djm@
    
    OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55

commit 77b8b865cd5a8c79a47605c0c5b2bacf4692c4d5
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jul 28 05:42:36 2023 +0000

    upstream: %C is a callable macro in mdoc(7)
    
    so, as we do for %D, escape it;
    
    OpenBSD-Commit-ID: 538cfcddbbb59dc3a8739604319491dcb8e0c0c9

commit e0f91aa9c2fbfc951e9ced7e1305455fc614d3f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 28 05:33:15 2023 +0000

    upstream: don't need to start a command here; use ssh -N instead.
    
    Fixes failure on cygwin spotted by Darren
    
    OpenBSD-Regress-ID: ff678a8cc69160a3b862733d935ec4a383f93cfb

commit f446a44f30bc680e0d026a4204844b02646c1c2d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 17 05:52:01 2023 +0000

    upstream: add LTESTS_FROM variable to allow skipping of tests up to
    
    a specific point. e.g. "make LTESTS_FROM=t-sftp" will only run the sftp.sh
    test and subsequent ones. ok dtucker@
    
    OpenBSD-Regress-ID: 07f653de731def074b29293db946042706fcead3

commit 8eb8899d612440a9b608bee7f916081d3d0b7812
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 12 06:37:42 2023 +0000

    upstream: test ChrootDirectory in Match block
    
    OpenBSD-Regress-ID: a6150262f39065939f025e546af2a346ffe674c1

commit e43f43d3f19516222e9a143468ea0dc1b3ab67b6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 12 06:36:27 2023 +0000

    upstream: better error messages
    
    OpenBSD-Regress-ID: 55e4186604e80259496d841e690ea2090981bc7a

commit 6958f00acf3b9e0b3730f7287e69996bcf3ceda4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 27 22:26:49 2023 +0000

    upstream: don't incorrectly truncate logged strings retrieved from
    
    PKCS#11 modules; based on GHPR406 by Jakub Jelen; ok markus
    
    OpenBSD-Commit-ID: 7ed1082f23a13b38c373008f856fd301d50012f9

commit d1ffde6b55170cd4b9a72bfd9a3f17508e6cf714
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 27 22:25:17 2023 +0000

    upstream: make sshd_config AuthorizedPrincipalsCommand and
    
    AuthorizedKeysCommand accept the %D (routing domain) and a new %C (connection
    address/port 4-tuple) as expansion sequences; ok markus
    
    OpenBSD-Commit-ID: ee9a48bf1a74c4ace71b69de69cfdaa2a7388565

commit 999a2886ca1844a7a74b905e5f2c8c701f9838cd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 27 22:23:05 2023 +0000

    upstream: increase default KDF work-factor for OpenSSH format
    
    private keys from 16 to 24; { feedback ok } x { deraadt markus }
    
    OpenBSD-Commit-ID: a3afb1383f8ff0a49613d449f02395d9e8d4a9ec

commit 0fa803a1dd1c7b546c166000e23a869cf6c4ec10
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 27 02:25:09 2023 +1000

    Prefer OpenSSL's SHA256 in sk-dummy.so
    
    Previously sk-dummy.so used libc's (or compat's) SHA256 since it may be
    built without OpenSSL.  In many cases, however, including both libc's
    and OpenSSL's headers together caused conflicting definitions.
    
    We tried working around this (on OpenSSL <1.1 you could define
    OPENSSL_NO_SHA, NetBSD had USE_LIBC_SHA2, various #define hacks) with
    varying levels of success.  Since OpenSSL >=1.1 removed OPENSSL_NO_SHA
    and including most OpenSSL headers would bring sha.h in, even if it
    wasn't used directly this was a constant hassle.
    
    Admit defeat and use OpenSSL's SHA256 unless we aren't using OpenSSL at
    all.  ok djm@

commit 36cdb5dbf55c99c0faad06066f56a7c341258c1f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 27 10:29:44 2023 +1000

    Retire dfly58 test VM.  Add dfly64.

commit 2d34205dab08ede9b0676efa57647fc49e6decbe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 26 23:06:00 2023 +0000

    upstream: make ssh -f (fork after authentication) work properly in
    
    multiplexed cases (inc. ControlPersist). bz3589 bz3589 Based on patches by
    Peter Chubb; ok dtucker@
    
    OpenBSD-Commit-ID: a7a2976a54b93e6767dc846b85647e6ec26969ac

commit 076aeda86a7ee9be8fd2f0181ec7b9729a6ceb37
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sun Jul 23 20:04:45 2023 +0000

    upstream: man page typos; ok jmc@
    
    OpenBSD-Commit-ID: e6ddfef94b0eb867ad88abe07cedc8ed581c07f0

commit 135e7d5fe31f700e6dfc61ce914970c5ee7175ba
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Jul 20 05:43:39 2023 +0000

    upstream: tweak the allow-remote-pkcs11 text;
    
    OpenBSD-Commit-ID: bc965460a89edf76865b7279b45cf9cbdebd558a

commit c2ae55c9646fb07be29626046558e4cba5703a61
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 25 16:01:33 2023 -0400

    1) Fixed a problem in AES-MT where it would crash if the stack size for the
       threads isn't large enough. In Linux it's 8MB (which oveersized) and in
       things like Alpine its (128k). Set it to 1MB.
    2) Added a routine that will fix issues when it's being built under Alpine. This
       allows for some stack metrics to be gathered. This changed metrics.h metrics.c and
       configure.ac. The change in configure.ac is to automatically check if the application
       is being built under Alpine. This reads /etc/os-release and parses out the OS ID. Right
       now the only test in the case statement is for Alpine but now we have a system if we need
       more stuff like this.
    3) minor change to a typedef in the CC20 fastXOR. Should be a little more portable.

commit 5f83342b61d1f76c141de608ed2bd293990416bd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 25 13:00:22 2023 +1000

    Handle a couple more OpenSSL no-ecc cases.
    
    ok djm@

commit 58388ffd5487920dc7c941cc99b508fcc3573870
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jul 20 16:50:23 2023 -0400

    Turns out that fix won't help with the PMA issues in MacOS CI
    targets. /etc/pam.d is a protected directory and you need some
    sort of user intervention to grant permission to allow the terminal
    to make these changes. This is in addition to using sudo. As of now
    we'll need to use self hosted runners to make this happen.
    
    What's interesting is that it pam.d doesn't fail under the ubuntu
    tests. For some reason it's either not actually testing pam or
    it's using the sshd control file. It would be nice if the behaviour
    was predictable

commit edc2ef4e418e514c99701451fae4428ec04ce538
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 20 12:53:44 2023 +1000

    depend

commit 51fda734e0d3c2df256fc03e8b060c4305be6e59
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 20 12:53:21 2023 +1000

    Bring back OPENSSL_HAS_ECC to ssh-pkcs11-client

commit a1bda23be66c773f63bd07913cda6ae2c404de9c
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Jul 19 16:44:24 2023 -0400

    1) updated version string to new format.
    2) macos with pam was failing CI tests because it
       explicitly needs a module named hpnsshd. I think
       I modifed setup-ci.sh to handle that.

commit ab9495715b35116df3ee123d2d0f84013f79ca84
Merge: 0239f5163 9795c4016
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Jul 19 15:26:02 2023 -0400

    Merging 9.3p2 to deal wth CVE-2023-38408. No other changes
    aside from a version bump

commit 099cdf59ce1e72f55d421c8445bf6321b3004755
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 19 14:03:45 2023 +0000

    upstream: Separate ssh-pkcs11-helpers for each p11 module
    
    Make ssh-pkcs11-client start an independent helper for each provider,
    providing better isolation between modules and reliability if a single
    module misbehaves.
    
    This also implements reference counting of PKCS#11-hosted keys,
    allowing ssh-pkcs11-helper subprocesses to be automatically reaped
    when no remaining keys reference them. This fixes some bugs we have
    that make PKCS11 keys unusable after they have been deleted, e.g.
    https://bugzilla.mindrot.org/show_bug.cgi?id=3125
    
    ok markus@
    
    OpenBSD-Commit-ID: 0ce188b14fe271ab0568f4500070d96c5657244e

commit 29ef8a04866ca14688d5b7fed7b8b9deab851f77
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 19 14:02:27 2023 +0000

    upstream: Ensure FIDO/PKCS11 libraries contain expected symbols
    
    This checks via nlist(3) that candidate provider libraries contain one
    of the symbols that we will require prior to dlopen(), which can cause
    a number of side effects, including execution of constructors.
    
    Feedback deraadt; ok markus
    
    OpenBSD-Commit-ID: 1508a5fbd74e329e69a55b56c453c292029aefbe

commit 1f2731f5d7a8f8a8385c6031667ed29072c0d92a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 19 13:56:33 2023 +0000

    upstream: Disallow remote addition of FIDO/PKCS11 provider
    
    libraries to ssh-agent by default.
    
    The old behaviour of allowing remote clients from loading providers
    can be restored using `ssh-agent -O allow-remote-pkcs11`.
    
    Detection of local/remote clients requires a ssh(1) that supports
    the `session-bind@openssh.com` extension. Forwarding access to a
    ssh-agent socket using non-OpenSSH tools may circumvent this control.
    
    ok markus@
    
    OpenBSD-Commit-ID: 4c2bdf79b214ae7e60cc8c39a45501344fa7bd7c

commit 892506b13654301f69f9545f48213fc210e5c5cc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 19 13:55:53 2023 +0000

    upstream: terminate process if requested to load a PKCS#11 provider
    
    that isn't a PKCS#11 provider; from / ok markus@
    
    OpenBSD-Commit-ID: 39532cf18b115881bb4cfaee32084497aadfa05c

commit 9795c4016ae35162072144df032c8b262433b462
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 19 16:27:12 2023 +1000

    OpenSSH 9.3p2

commit bde3635f3c9324bad132cf9ed917813d6abb599e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 19 16:31:09 2023 +1000

    update version in README

commit f673f2f3e5f67099018fc281a6b5fb918142472e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 19 16:31:00 2023 +1000

    update RPM spec versions

commit d7790cdce72a1b6982795baa2b4d6f0bdbb0100d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 7 13:30:15 2023 +1000

    disallow remote addition of FIDO/PKCS11 keys
    
    Depends on the local client performing the session-bind@openssh.com
    operation, so non-OpenSSH local client may circumvent this.

commit b23fe83f06ee7e721033769cfa03ae840476d280
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 13 12:09:34 2023 +1000

    terminate pkcs11 process for bad libraries

commit f3f56df8ec476b2de6cbdbdfdb77a2a61087829d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 19 12:07:18 2023 +1000

    agent_fuzz doesn't want stdint.h conditionalised

commit e0f87f595e21880f61b9a8cc02e6be690423aa35
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 20:04:58 2023 -0400

    Replaced explicit OpenSSL version checks with a configure time define
    of WITH_OPENSSL3. This has no real functional change but it's more flexible
    and easier to read.

commit 1aaa04024b9a16dbb35010c43f182c9b4a855840
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 18:32:03 2023 -0400

    Problem with yaml in c-cpp.yml. Maybe an issue with having tabs
    instead of spaces?

commit cdd7652e8d69ef0c6edbcf6678ad61273f6cb44d
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 18:28:39 2023 -0400

    Reinstating full range of CI tests.
    Also, LibreSSL doesn't support blake2b512 as a digest which is,
    of course, what we are using for the resume feature in scp. So we
    need to disable that function for LibreSSL

commit 6eef555a1b5f959eb4798facea6ff318e46000cc
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 16:43:06 2023 -0400

    It would help if I did not have errors in configure.ac

commit f307ca29e0d03fb49ad68f4e13f63019a9682c93
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 16:38:37 2023 -0400

    I was trying to fix the wrong thing with LibreSSl. I had the
    CI set up to use libressl 3.7.0 but we only support 3.7.1 and
    higher

commit d8357287e8526da4d1bf42d67bb8770bd1c7cca1
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 16:30:28 2023 -0400

    more libressl configure.ac tests

commit 8072efade7772173c494cce8b932d7ad1cc45423
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 16:13:06 2023 -0400

    testing libressl things

commit 261cd1820e19ded2443bb07c60dc1b34f7af741c
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 15:36:50 2023 -0400

    Fixing CI yaml bug

commit 1339dab39e72489aec270cbb7aad4471be2baf18
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 15:35:16 2023 -0400

    testing some new CI tests

commit 1801369d7abb3c0a9a504b5056e0b780d20f2590
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jul 18 14:53:22 2023 -0400

    Release candidate for 18v1. This incorporates all the changes
    required to get the old RC working with the CI tests.

commit 750911fd31d307a767cc86e3bfa90bbbb77b1a25
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 18 15:41:12 2023 +1000

    conditionalise stdint.h inclusion on HAVE_STDINT_H
    
    fixes build on AIX5 at least

commit ff047504fa6e008c4092f8929881816b8993bea0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 18 15:30:45 2023 +1000

    conditionalise match localnetwork on ifaddrs.h
    
    Fixes build breakage on platforms that lack getifaddrs()

commit 5853c91da5cac170a59fc13df0c18820998ccc43
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jul 17 13:59:33 2023 -0400

    This fix should deal with the problem where it
    was failing regress/rekey.sh on systems with 1 or 2 cores

commit b87b03282e466ca2927954ce93f5dbf0bfdc68f6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 17 06:16:33 2023 +0000

    upstream: missing match localnetwork negation check
    
    OpenBSD-Commit-ID: 9a08ed8dae27d3f38cf280f1b28d4e0ff41a737a

commit 6d6e185ba29ef4274164b77eab4dc763907f8821
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Jul 17 05:41:53 2023 +0000

    upstream: - add -P to usage() - sync the arg name to -J in usage()
    
    with that in ssh.1 - reformat usage() to match what "man ssh" does on 80width
    
    OpenBSD-Commit-ID: 5235dd7aa42e5bf90ae54579d519f92fc107036e

commit f1a9898283a0638667b587ee4a950afd61ab51b0
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Jul 17 05:38:10 2023 +0000

    upstream: -P before -p in SYNOPSIS;
    
    OpenBSD-Commit-ID: 535f5257c779e26c6a662a038d241b017f8cab7c

commit eef4d7e873568e1c84c36bb4034e2c3378250a61
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Mon Jul 17 05:36:14 2023 +0000

    upstream: configuation -> configuration
    
    OpenBSD-Commit-ID: 4776ced33b780f1db0b2902faec99312f26a726b

commit dc1dbe94cf6532bd546a3373ad436404f8850e5f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 17 05:26:38 2023 +0000

    upstream: move other RCSIDs to before their respective license blocks
    
    too no code change
    
    OpenBSD-Commit-ID: ef5bf46b57726e4260a63b032b0b5ac3b4fe9cd4

commit ebe11044681caff78834ca6b78311ad19c1860b8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 17 05:22:30 2023 +0000

    upstream: Move RCSID to before license block and away from #includes,
    
    where it caused merge conflict in -portable for each commit :(
    
    OpenBSD-Commit-ID: 756ebac963df3245258b962e88150ebab9d5fc20

commit 05c08e5f628de3ecf6f7ea20947735bcfa3201e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 17 05:20:15 2023 +0000

    upstream: return SSH_ERR_KRL_BAD_MAGIC when a KRL doesn't contain a
    
    valid magic number and not SSH_ERR_MESSAGE_INCOMPLETE; the former is needed
    to fall back to text revocation lists in some cases; fixes t-cert-hostkey.
    
    OpenBSD-Commit-ID: 5c670a6c0f027e99b7774ef29f18ba088549c7e1

commit c6fad2c3d19b74f0bd0af1ef040fc74f3a1d9ebb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 17 14:56:14 2023 +1000

    avoid AF_LINK on platforms that don't define it

commit 919bc3d3b712c920de1ae6be5ac6561c98886d7e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 17 04:08:31 2023 +0000

    upstream: Add support for configuration tags to ssh(1).
    
    This adds a ssh_config(5) "Tag" directive and corresponding
    "Match tag" predicate that may be used to select blocks of
    configuration similar to the pf.conf(5) keywords of the same
    name.
    
    ok markus
    
    OpenBSD-Commit-ID: dc08358e70e702b59ac3e591827e5a96141b06a3

commit 3071d85a47061c1bdaf11a0ac233b501ecba862c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 17 04:04:36 2023 +0000

    upstream: add a "match localnetwork" predicate.
    
    This allows matching on the addresses of available network interfaces
    and may be used to vary the effective client configuration based on
    network location (e.g. to use a ProxyJump when not on a particular
    network).
    
    ok markus@
    
    OpenBSD-Commit-ID: cffb6ff9a3803abfc52b5cad0aa190c5e424c139

commit beec17bb311365b75a0a5941418d4b96df7d7888
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 17 04:01:10 2023 +0000

    upstream: remove vestigal support for KRL signatures
    
    When the KRL format was originally defined, it included support for
    signing of KRL objects. However, the code to sign KRLs and verify KRL
    signatues was never completed in OpenSSH.
    
    Now, some years later, we have SSHSIG support in ssh-keygen that is
    more general, well tested and actually works. So this removes the
    semi-finished KRL signing/verification support from OpenSSH and
    refactors the remaining code to realise the benefit - primarily, we
    no longer need to perform multiple parsing passes over KRL objects.
    
    ok markus@
    
    OpenBSD-Commit-ID: 517437bab3d8180f695c775410c052340e038804

commit 449566f64c21b4578d5c0c431badd0328adc53ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 17 03:57:21 2023 +0000

    upstream: Support for KRL extensions.
    
    This defines wire formats for optional KRL extensions and implements
    parsing of the new submessages. No actual extensions are supported at
    this point.
    
    ok markus
    
    OpenBSD-Commit-ID: ae2fcde9a22a9ba7f765bd4f36b3f5901d8c3fa7

commit 18ea857770e84825a3a6238bb37f54864487b59f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 14 07:44:21 2023 +0000

    upstream: Include stdint.h for SIZE_MAX. Fixes OPENSSL=no build.
    
    OpenBSD-Commit-ID: e7c31034a5434f2ead3579b13a7892960651e6b0

commit 20b768fcd13effe0f2d3619661b6c8592c773553
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 14 17:07:32 2023 +1000

    Fix typo in declaration of nmesg.

commit 4b94d09542e36ebde2eb9ad89bc68431609932de
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 14 15:34:47 2023 +1000

    portable-specific int overflow defence-in-depth
    
    These too are unreachable, but we want the code to be safe regardless of
    context. Reported by Yair Mizrahi @ JFrog

commit 2ee48adb9fc8692e8d6ac679dcc9f35e89ad68f0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 14 05:31:44 2023 +0000

    upstream: add defence-in-depth checks for some unreachable integer
    
    overflows reported by Yair Mizrahi @ JFrog; feedback/ok millert@
    
    OpenBSD-Commit-ID: 52af085f4e7ef9f9d8423d8c1840a6a88bda90bd

commit 4b43bc358ae6f6b19a973679246dc5172f6ac41b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 10 04:51:26 2023 +0000

    upstream: misplaced debug message
    
    OpenBSD-Commit-ID: d0f12af0a5067a756aa707bc39a83fa6f58bf7e5

commit 8c7203bcee4c4f98a22487b4631fe068b992099b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 12 11:41:19 2023 +1000

    replace deprecate selinux matchpathcon function
    
    This function is apparently deprecated. Documentation on what is the
    supposed replacement is is non-existent, so this follows the approach
    glibc used https://sourceware.org/git/?p=glibc.git;a=patch;h=f278835f59
    
    ok dtucker@

commit 2da325e7a3423aab7569b90fb5d00755c1da2527
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jul 7 17:06:26 2023 -0400

    Missed a debig in the regress/rekey.sh test I put in there

commit 7e8800f5d701efffa39ccb63ca1e095ea777c31a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 6 22:17:59 2023 +0000

    upstream: minleft and maxsign are u_int so cast appropriately. Prompted
    
    by github PR#410, ok deraadt.
    
    OpenBSD-Commit-ID: 0514cd51db3ec60239966622a0d3495b15406ddd

commit 94842bfe9b09fc93189c6ed0dc9bbebc1d44a426
Author: dlg@openbsd.org <dlg@openbsd.org>
Date:   Tue Jul 4 03:59:21 2023 +0000

    upstream: add support for unix domain sockets to ssh -W
    
    ok djm@ dtucker@
    
    OpenBSD-Commit-ID: 3e6d47567b895c7c28855c7bd614e106c987a6d8

commit 6b1aeb819822db00e2f920f37b2be9339fc9431a
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jul 6 14:06:31 2023 -0400

    Restored rekey.sh to its original form.

commit 00b019a4fe13d57550cf851ebf4c846410960afd
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jul 6 14:04:10 2023 -0400

    Elminating the swtich to CC20MT did pass all of the expected regression tests.
    So I'm restoring that functionality as we now know it's something in the
    cipher code itself.

commit a95fc5eed09a0238fb127b6c50e8498432b79dae
Author: David Seifert <soap@gentoo.org>
Date:   Fri May 12 14:06:01 2023 +0200

    gss-serv.c: `MAXHOSTNAMELEN` -> `HOST_NAME_MAX`
    
    `MAXHOSTNAMELEN` is not defined in POSIX, which breaks on musl:
    https://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html
    
    Bug: https://bugs.gentoo.org/834044

commit b1bec5ce72ea0065d8a56805481ff18605ea3a1b
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jun 30 15:28:10 2023 -0400

    Another try to get cc20mt from loading. This time by disabling in kex.c

commit 9b15ce6e990b9e881066b1f7182269afc455e90f
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jun 30 14:58:08 2023 -0400

    Trying to get this to run with cc20mt disabled in the regress test

commit 3669b52075800c0714bcafb6cfb6393d6376a535
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jun 30 14:30:42 2023 -0400

    more changes to at least try to get the exit code

commit d119e07fdc7e99d4d2f7a59d8a6c56e487d08399
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jun 30 12:12:59 2023 -0400

    Forgot to hit save when restoring fastXOR

commit 917dd1ff41ba4c8c9542bdcacd199b993e070e1a
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jun 30 12:12:24 2023 -0400

    It wasn't fastXOR. Still seeing the same issue. The specific test it is failing in
    regress/rekey.sh is in ssh_data_rekeying() and where it tests the return value of
    the operation. However, when I try to print the return value it's always
    0. So I'm skipping that test and relying on the comparison. This is just a test
    because I'm wondering if it's actually working but the return code is somehow
    messed up. Not a great test but it's sommething

commit 9c6770854c5dd5c20379d7b371e653b00b5b99ce
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jun 30 10:03:57 2023 -0400

    This is just a test to see if fastXOR really is a problem or not.
    I got rid of all the fanciness and replaced it with a very simple
    forloop doing the xor one byte at a time.

commit 6872945b23cc2d011f13d553f0b781f15a281209
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jun 29 17:25:14 2023 -0400

    Changed a few more things. First, we had been using a complex set of voids to pass
    data to pthread functions e.g pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock,...
    but pthread_cleanup_push((void *) pthread_mutex_unlock,... works just as well and we don't
    get warnings like this anymore:
    cast between incompatible function types from ‘int (*)(pthread_mutex_t *)’ {aka ‘int (*)(union <anonymous> *)’} to ‘void (*)(void *)’ */
    Also, when defining the provider in cipher-ctr-mt-provider.c I was getting warning about
    missing initializer for field ‘algorithm_description’ of ‘OSSL_ALGORITHM’
    Turns out that the struct has 4 instead of 3 members. Tacking on a NULL in
    OSSL_ALGORITHM aes_mt_ciphers[] fixed that warning.

commit a3bccc1af8beef0e957d0bec831228958119a6cf
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jun 29 16:52:10 2023 -0400

    fastXOR was using 128bit chunks but that was causing unaligned load/store errors
    in sanitize. I don't know if we need to care about that but I'm pushing this anyway
    to see if it helps with the other problems we have been seeing.

commit 5b2969a057fcdba21fbd19d61481c7a990d65b2f
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Jun 28 16:13:54 2023 -0400

    The error seems very random. It's not consistent on the CI tests which makes me think
    it's something particular to the CC20MT cipher. However, I cant recreate it on my
    local systems even when it matches one fo the failed runs. Even when I run
    the rekey test, where things seem to be failing, multiple times. So I'm
    pushing out some more debugging statements in regress/rekey.sh.

commit 8e09ff92e52db5c4d49607213429f473e6bdcd3f
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Jun 28 14:09:29 2023 -0400

    There is a weird issue where the CI tests are randomly failing on github. The problem
    seems to occur in the rekey when the rekeylimit is set to 256k. I've tested it
    locally but I can't recreate the error. So I removed the 256k test and am pushing it
    back to CI to see if it's specific to the 256K test

commit 782fac8fc37747ee7c5e81113de1a832333786c8
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jun 27 17:38:02 2023 -0400

    Notes in comments. Pushed to rerun the tests.

commit 9aa6c0b11a8161467e73566d1b0f867ffd0a4912
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jun 27 14:41:07 2023 -0400

    Previous version was using gettid in a debug statement. That's not portable so removed.
    Additionally, under C99 &c getpid needs to load unistd.h. That's being done now.

commit 6a03a53357df714cfe6b0f55e76d96a7414f3666
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jun 27 14:09:53 2023 -0400

    I had an #endif in the wrong place preventing proper flow in cipher.c when
    using OpenSSL the the CC20 and CC20MT cipher.

commit e9b13f86c6189ea3171387c9282885c141b7d954
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jun 26 14:33:51 2023 -0400

    Those wraps didn't go far enough. Now if it's built without openssl everything
    related to the CC20MT cipher is ifdef'd away.

commit 8ca776cc9320fe6318d7b728beb6f17696ca5ac5
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jun 26 12:27:24 2023 -0400

    The prior commit didn't actually work. Now I'm just wrapping the calls to
    CC20MT functions in ifdefs. Still think there is a better way to do this.

commit 1682e231ae5215435d847837f7b10543f3b87e1b
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jun 26 12:05:56 2023 -0400

    Need to make sure that the functions in CC20MT are defined as they are
    included in cipher.c. So we load the header for CC20MT even if we aren't
    building with openssl.

commit 46a5e05f782e35f862e90c8039912141efcc0acd
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Jun 23 14:23:44 2023 -0400

    Looks like this was a commit that never got pushed. Here is the log from it
        Turns out that the NONE MAC still makes all of the EVP calls and other
        associated work that would happen with a regular MAC. The difference is
        that we're not depending on OpenSSL to do anything except return NULL.
        However, there is a way in OpenSSH to simply disable all of those routines
        by setting mac->enabled to 0. We still need to force both ends to negotiate to
        the NONE MAC though. So the prior work on the NONE MAC has to remain but this
        does work and saves cycles. So all good.

commit 8a6cd08850f576e7527c52a1b086cae82fab290e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 23 09:49:02 2023 +1000

    Update runner OS version for hardenedmalloc test.
    
    Hardenedmalloc dropped support for "legacy glibc" versions in their
    64dad0a69 so use a newer Ubuntu version for the runner for that test.

commit 925a16810d11fd1d6683ce403d47ffb2aaa02ee9
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jun 22 16:16:21 2023 -0400

    1) Now includes startup files for systemd and init.d.
    2) Updated HPN-README with more explicit information about SSL lib support.
    3) Updated HPNSSHInstallation.txt with information about the files in 1).
    4) Added license information and some comments to CC20 files.

commit cfca6f17e64baed6822bb927ed9f372ce64d9c5b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 22 15:04:03 2023 +1000

    handle sysconf(SC_OPEN_MAX) returning > INT_MAX;
    
    bz3581; ok dtucker

commit c1c2ca1365b3f7b626683690bd2c68265f6d8ffd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 21 05:10:26 2023 +0000

    upstream: better validate CASignatureAlgorithms in ssh_config and
    
    sshd_config.
    
    Previously this directive would accept certificate algorithm names, but
    these were unusable in practice as OpenSSH does not support CA chains.
    
    part of bz3577; ok dtucker@
    
    OpenBSD-Commit-ID: a992d410c8a78ec982701bc3f91043dbdb359912

commit 4e73cd0f4ab3e5b576c56cac9732da62c8fc0565
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 21 05:08:32 2023 +0000

    upstream: make `ssh -Q CASignatureAlgorithms` only list signature
    
    algorithms that are valid for CA signing. Previous behaviour was to list all
    signing algorithms, including certificate algorithms (OpenSSH certificates do
    not support CA chains). part of bz3577; ok dtucker@
    
    OpenBSD-Commit-ID: 99c2b072dbac0f44fd1f2269e3ff6c1b5d7d3e59

commit a69062f1695ac9c3c3dea29d3044c72aaa6af0ea
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 21 05:06:04 2023 +0000

    upstream: handle rlimits > INT_MAX (rlim_t is u64); ok dtucker
    
    bz3581
    
    OpenBSD-Commit-ID: 31cf59c041becc0e5ccb0a77106f812c4cd1cd74

commit 8d33f2aa6bb895a7f85a47189913639086347b75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 20 23:59:33 2023 +0000

    upstream: prepare for support for connecting to unix domain sockets
    
    using ssh -W by explicitly decoding PORT_STREAMLOCAL (a negative number) from
    the u32 that's passed over the multiplexing socket; previously code would
    just cast, which is UB.
    
    OpenBSD-Commit-ID: e5ac5f40d354096c51e8c118a5c1b2d2b7a31384

commit b4ac435b4e67f8eb5932d8f59eb5b3cf7dc38df0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 20 00:05:09 2023 +0000

    upstream: reset comment=NULL for each key in do_fingerprint();
    
    fixes "no comment" not showing on when running `ssh-keygen -l` on multiple
    keys where one has a comment and other following keys do not. Patch from
    Markus Kuhn via GHPR407, bz3580
    
    OpenBSD-Commit-ID: 3cce84456fdcd67dc6b84e369f92c6686d111d9b

commit b53a809a549dcd4fbde554c6aa283e597b15ea33
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Jun 5 13:24:36 2023 +0000

    upstream: Store timeouts as int, not u_int as they are limited to
    
    INT_MAX. Fixes sign compare warnings systems with 32-bit time_t due to type
    promotion.  OK djm@
    
    OpenBSD-Commit-ID: 48081e9ad35705c5f1705711704a4c2ff94e87b7

commit ae1751b3f3bd2f227e89a7abb8d2ac7a3c06ba70
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Jun 15 10:03:49 2023 -0400

    This is release candidate 1 for 17.14. This includes major changes to the
    functionality of the default chacha20-poly1305 (CC20) cipher by introducing a
    new default of a parallelized chacha20-poly1305 (CC20-MT) cipher. The candidate also
    introduces using the OpenSSL poly1305 digest function to replace the native
    poly1305 code when compiled with OpenSSL 1.1. When compiled against OpenSSL 3.0+
    poly1305 will use the EVP_MAC functions instead. In ideal conditions we are
    seeing improvements of upwards of 30% over HPNSSH-17v13 and about 100% over
    OpenSSH.
    
    Note: We are also seeing improvements when only the receiver is 17v14 as the
    receiver often has higher CPU requirements than the sender.

commit 08834b60aa09e54a078512ad7882f5893bc027cd
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jun 13 17:16:12 2023 -0400

    Checkpoint - issues with too many rekeys caused by logic in cipher-switch.
    'So when I call cipher switch I get the send and receive context and extract the ciphername from it. I can’t use the method you developed because it crashes multiplexing. If I test the ciphername against chacha20-poly1305-mt@hpnssh.org it fails because the name it’s getting chacha20-poly1305@openssh.com. If I change the strcmp test to chacha20-poly1305@openssh.com it works and multiple threads fire up. This also seems to work when using openssh on one side or the other. I’m just confused. I’m happy it’s working but I’m confused.

commit 723d2d34b55a5673330f7be2a748a29ccd1c4c3c
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Jun 13 13:40:30 2023 -0400

    checkpoint failing keyscan regress

commit 55c536f1b8ede510575adc016b02753b22f5943e
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Sun Jun 11 21:00:45 2023 -0400

    Use a special CC20-MT thread to sync with workers
    
    Move main/worker synchronization into a separate thread that gets
    spawned by the main thread dynamically when necessary, allowing the
    main thread to more quickly finish its call to crypt().

commit 0743b5b4d749a5cbb76a095f3dd8d55e8a01971c
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Jun 5 17:02:57 2023 -0400

    Fixed a problem with the keystream buffer being too short in CC20-MT.
    Also, updated the if/defs for using the EVP_Digest for poly1305 in OSSL 1.1

commit 6c9182a2fbcd82d65305171c8b256bca2bb9b438
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Sun May 28 14:11:48 2023 -0400

    Remove unnecessary checks from CC20 MT
    
    Improve the multithreaded chacha20-poly1305-mt@hpnssh.org cipher by
    removing certain checks from performance-critical sections. These
    conditionals did not improve security, and if failed, there was no way
    to recover, so they only served a debugging purpose. The checks can be
    re-enabled by via "#define SAFETY".

commit 3265f127fab52be4bc0a8deb52228d21f3b8e55d
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Sun May 28 13:57:47 2023 -0400

    Implement Poly1305 using OpenSSL's digest signing
    
    Demonstrate the significant performance improvement attainable by using
    OpenSSL's implementation of Poly1305, accessed through EVP_DigestSign
    functions.
    
    Need to add error-code checking.

commit 0239f51632aaeb2e649624d017d43b23efda06d5
Merge: ca574dbcb 31817f93f
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri May 26 13:45:34 2023 -0400

    Merge pull request #43 from mpounsett/INSTALL_USER_CREATE_ORDER
    
    Reorder user creation and install steps in install instructions

commit 5d838b9fb8b46134ba1872f7f668299a138e6071
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Thu May 25 13:31:39 2023 -0400

    Add a missing semicolon
    
    Correct the simplest of typographical errors...

commit 7ccc8a1b00c6a7fadcea51c93898205033b5a413
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Thu May 25 13:28:36 2023 -0400

    Fix segmentation fault in poly_auth
    
    Correct a regression caused by the Poly1305 MAC not being initialized in
    the multithreaded CC20 context. Previously, it was being initialized by
    the embedded calls to the serial context, but with the multithreaded
    context now standing independently, it needs to initialize the MAC
    itself.

commit 2709809fd616a0991dc18e3a58dea10fb383c3f0
Author: Philip Hands <phil@hands.com>
Date:   Wed May 24 19:41:14 2023 +0200

    fixup! if -s & -p specified, mention 'sftp -P' on
    
    success
    
    SSH-Copy-ID-Upstream: 32686e7c65b4fa2846e474d3315102dfa0f043b0

commit 204e0bf05161b7641500d7ab266c21217412379f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Aug 3 21:25:48 2021 +1000

    Make ssh-copy-id(1) consistent with OpenSSH.
    
    This makes the ssh-copy-id man page more consistent with the rest of the
    OpenSSH man pages:
    - new sentence, new line
    - no sentences >80
    - N.B. -> NB
    - zap unused .Pp
    - zap trailing whitespace
    
    Report from Debian via mindrot bz#3331, diff from jmc at openbsd.org.
    
    SSH-Copy-ID-Upstream: d8974cfb6242316460ed22a1ccc662800a50c5d3

commit 9de79df66d1430d290fab670bb4b18612875e518
Author: Philip Hands <phil@hands.com>
Date:   Wed May 24 11:45:43 2023 +0200

    if -s & -p specified, mention 'sftp -P' on success
    
    This was inspired by this:
     https://github.com/openssh/openssh-portable/pull/321
    but I thought that it was better to not do the sed patching.
    
    BTW the reason one can get away with using $SSH_OPTS throughout, despite
    the lowercase -p in there, even if sftp is in use, is that the sftp call
    is using the already-established ssh master connection, so the port was
    passed to the earlier ssh.
    
    SSH-Copy-ID-Upstream: 1c124d9bfafdbe28a00b683367ebf5750ce12eb2

commit 801cda54c00e0f4e7d89345a90874c8d05dc233a
Author: Philip Hands <phil@hands.com>
Date:   Tue May 23 23:07:11 2023 +0200

    drop whitespace
    
    SSH-Copy-ID-Upstream: e604fae1cdee35c18055d35dcec530cf12ef00ad

commit 288482f53613f3e74544eb92deeb24f7c7f1f371
Author: Philip Hands <phil@hands.com>
Date:   Tue May 23 20:52:13 2023 +0200

    make -x also apply to the target script
    
    SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4

commit b79e7b88ed44f0e4339f0ff35c96c78a92175a8d
Author: Philip Hands <phil@hands.com>
Date:   Tue May 23 16:46:42 2023 +0200

    add -t option to specify the target path
    
    Allow the default target path (.ssh/authorized_files) to be over-riden
    
    This was inspired by this MR from Panagiotis Cheilaris <philaris@cs.ntua.gr>
    
     https://gitlab.com/phil_hands/ssh-copy-id/-/merge_requests/8
    
    SSH-Copy-ID-Upstream: a942a0e076874adb6d8b2f0fb76d6c7918190fcd

commit 914f4ad138714c471ba72fb6d5496b6235320edd
Author: Carlos Rodríguez Gili <carlos.rodriguez-gili@upc.edu>
Date:   Tue Apr 20 19:23:57 2021 +0200

    Fix test error for /bin/sh on Solaris 10 and older
    
    On Solaris 10 and older targets /bin/sh is not POSIX-compliant.
    Test -z `...` fails with error 'sh: test: argument expected'.
    Using quotes around backticks fixes this and doesn't break
    POSIX compatibility.
    
    SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065

commit bd382dca316c721aed1e45edcf4c4e0f6374afb0
Author: Jakub Jelen <jjelen@redhat.com>
Date:   Tue Mar 2 21:34:05 2021 +0000

    Remove outdated comment
    
    The commit b068122 removed the code dropping the trailing colon, but the comment stayed leaving the code confusing for future readers
    
    SSH-Copy-ID-Upstream: 930d39f238117cd53810240ec989d0356aa1c1f6

commit bdcaf7939029433635d63aade8f9ac762aca2bbe
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed May 10 18:50:46 2023 +1000

    Special case OpenWrt instead of Dropbear.
    
    OpenWrt overrides the location of authorized_keys for root.  Currently we
    assume that all Dropbear installations behave this way, which is not the
    case.  Check for OpenWrt and root user before using that location instead
    of assuming that for all Dropbear servers.  Prompted by Github PR#250.
    
    SSH-Copy-ID-Upstream: 0e1f5d443a9967483c33945793107ae3f3e4af2d

commit cf84498f67abe93f813a296167b406a0db7b288e
Author: Philip Hands <phil@hands.com>
Date:   Thu May 18 18:20:55 2023 +0200

    ssh-copy-id: add -x option (for debugging)
    
    This option causes the ssh-copy-id to run with set -x
    
    SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844

commit b4a1efdcb88f03394c08e7f68ed4e11676830002
Author: Philip Hands <phil@hands.com>
Date:   Thu May 18 17:14:41 2023 +0200

    update copyright notices
    
    SSH-Copy-ID-Upstream: c284ed33b361814ea48ff68cbd01ca525b2bf117

commit dd98571a01c6bf9cafba3db08cf09d1bf0527af6
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Thu May 25 04:12:24 2023 -0400

    Remove unnecessary parameter from cipher functions
    
    Remove the pre-auth/post-auth indication parameter from the function
    signatures of cipher_crypt() and cipher_get_length(), since they are no
    longer used.

commit eba9547d987fd91de18fc98e11bf80e27ed13ceb
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Thu May 25 03:59:10 2023 -0400

    Remove unnecessary temp variable from packet.c
    
    Free *ccp earlier in packet.c since we don't need *oldccp anymore, which
    simplifies some of the if/then/else conditionals.

commit 823290751bd9e7ecd5aa0a92cea85c3edf133861
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Thu May 25 03:39:22 2023 -0400

    Rework Multi-threaded CC20 to be a separate cipher
    
    Completely separate the multithreaded implementation of
    ChaCha20-Poly1305 from the serial implementation by establishing a new
    cipher name, "chacha20-poly1305-mt@hpnssh.org". This allows a number of
    simplifications both inside and outside of the multithreaded cipher
    implementation. The pre-auth/post-auth check now happens in packet.c
    before each cipher initialization. During pre-auth, the serial cipher is
    initialized despite retaining the multithreaded cipher's name,
    separating the "intent" from the temporary reality. This allows packet.c
    to determine whether it should continue using the serial cipher through
    a rekey or switch to the multithreaded cipher. Users can now choose at
    run-time whether to use the serial or multithreaded cipher by specifying
    them by name, just like any other cipher.
    
    Move sequence number propagation into packet.c. The sequence number is
    no longer propagated forward by reading data from the previous cipher
    context. Instead, it is passed as an extra parameter to cipher_init.

commit fcd78e31cdd45a7e69ccfe6d8a3b1037dc1de290
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 24 23:01:06 2023 +0000

    upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand
    
    appears previously in configuration. Reported by John Meyers in bz3574 ok
    dtucker@
    
    OpenBSD-Commit-ID: 1c92e4517284386703936e1d3abaa36cfacf1951

commit ed57ca61a8b73a482e14bc2861faefa543979ea7
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri May 19 12:24:56 2023 -0400

    Change CC20-MT to depend on rekeying after auth
    
    Improve compatibility with OSSL 3.x by removing dependency on
    EVP_CIPHER_CTX_copy(). This leaves no way to "promote" a single-threaded
    CC20 context to multithreaded, since there's no practical way to extract
    the encryption keys from the serial EVP contexts, and each multithreaded
    worker needs its own EVP contexts. The need for promotion can be avoided
    by requiring a rekey immediately after authentication. This is
    completely working correctly, yet, however, since there's evidence that
    it's calling CC20-MT functions before rekeying.

commit 4fa5cff0f47eb4ae7f36be06e0b1b08bab480272
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri May 12 12:37:05 2023 -0400

    Comment out noisy debug statements
    
    Some of these debug statements appeared to be affecting performance,
    even when debug mode is not enabled.

commit 5fe6f0d5ee3f3da3236da946d8234a88a82ca3e9
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri May 12 12:30:41 2023 -0400

    Reimplement multithreaded ChaCha20 using batches
    
    Significantly rework the multithreaded ChaCha20-Poly1305 implementation
    to change the way the main thread triggers the worker threads to
    generate new keystreams. Previously, every time a keystream was
    consumed, the main thread would trigger a worker to replace it. With
    this new implementation, keystreams are generated in batches, and the
    main thread only wakes the workers when a complete batch of keystreams
    have been consumed. Two batches are tracked at a time, so the main
    thread can read from one batch while the workers are generating the next
    batch in the other memory space. This greatly reduces the number of
    mutex checks and context switches, since there are fewer "small jobs"
    and more "big jobs" for workers, and the main thread doesn't need to
    worry about any synchronization while it's looping through keystreams
    inside one batch. Mutex locks only get invoked on the transition between
    batches.

commit f764d85b3d7f9f1c46f7161e8e0bf384529151bb
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri May 12 12:18:06 2023 -0400

    Incrementally improve performance of MT ChaCha20
    
    Improve CPU efficiency by reducing unnecessary loop cycles. All worker
    threads were previously woken every time the main thread consumed a
    keystream, because they all shared the same pthreads_cond_t structure.
    This change implements a separate pthreads_cond_t for each worker
    thread, so that the main thread can selectively wake only the threads
    that actually have work to do. I'm not certain whether it's appropriate
    for multiple pthreads_cond_t to be associated with the same
    pthreads_mutex_t lock (the seqnr lock), but I think this is OK.
    
    Also, when main does wake a worker, stop scanning EVERY keystream
    looking for ones that need to be updated. Consumed keystreams will be
    sequential, so the worker can start at the first consumed keystream and
    proceed until it first encounters an unused keystream, then stop. This
    has the added benefit of chasing the main thread through the keystreams
    without having to return to the pthread_cond_wait as often.
    
    Prevent main from falling back to serial mode when it catches up to the
    worker threads. Instead, spin on a mutex and repeatedly check the
    variable until the worker threads generate the necessary keystream.

commit 7891248f457bd27a2241c03da9be4feac44006d9
Merge: 135968b85 ca574dbcb
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri May 12 00:33:18 2023 -0400

    Merge branch 'master' into mwd-chacha20libcrypto-mt
    
    Resynchronizing with master

commit 135968b85ff2e11152dbd59ffed4668f3b545df1
Merge: 990e52bc5 992e8ee31
Author: Mitchell Dorrell <mwd@psc.edu>
Date:   Fri May 12 00:30:46 2023 -0400

    Merge branch 'master' into mwd-chacha20libcrypto-mt
    
    Also includes simplifications to cipher-chachapoly-libcrypto-mt.

commit 5ec5504f1d328d5bfa64280cd617c3efec4f78f3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 10 10:04:20 2023 +0000

    upstream: Remove unused prototypes for ssh1 RSA functions.
    
    From lengyijun via github PR#396.
    
    OpenBSD-Commit-ID: 379a5afa8b7a0f3cba0c8a9bcceb4e5e33a5c1ef

commit fbf362b3891ae4b36052d1b39f37fc618b41c476
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 9 19:26:56 2023 +1000

    main(void) to prevent unused variable warning.

commit baf854c8bb0a6d0af5c696c801e631a48dabbaba
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 9 19:25:45 2023 +1000

    Remove warning pragma since clang doesn't like it.

commit 5fbb7a1349fbbb48ccb1b8cafff2c1854370d87d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 9 17:13:33 2023 +1000

    Suppress warning for snprintf truncation test.

commit 47742c513e4e045ecc985c6483fc5c8b050acda2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 9 17:12:50 2023 +1000

    Update OpenSSL compat test for 3.x.

commit 86ad25d455a2313126125540e61e0f9314283f88
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 8 20:23:08 2023 +1000

    Add macos13 PAM test target.

commit 77cca2c4b13bc6e5f389565583b6202b0d1bccc2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 8 20:14:46 2023 +1000

    Skip agent-peereid test on macos13.
    
    sudo -S nobody doesn't work on the github runners (probably a
    permission issue) so skip that test.

commit b356b8e91678ea295bcf44df5248c3fbf499fdcf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 8 20:14:28 2023 +1000

    Include config.guess in debug output.

commit b7afd8a4ecaca8afd3179b55e9db79c0ff210237
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 8 20:12:59 2023 +1000

    Handle OpenSSL >=3 ABI compatibility.
    
    Beyond OpenSSL 3.0, the ABI compatibility guarantees are wider (only
    major must match instead of major and minor in earlier versions).
    bz#3548, ok djm@

commit 0e9e2663eb2c6e9c3e10d15d70418312ae67e542
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon May 1 08:57:29 2023 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: 3d5f811cfcaed8cc4a97e1db49ac61bdf118113c

commit d9687f49682e1e93383fc15ab2018850b2ef38c3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 1 11:45:14 2023 +1000

    Add macos-13 test target.
    
    Also flatten OS list for clarity.

commit aacfd6767497b8fa6d41ecdd3f8e265d1e9ef1f6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 22:54:22 2023 +0000

    upstream: adjust ftruncate() logic to handle servers that reorder
    
    requests.
    
    sftp/scp will ftruncate the destination file after a transfer completes,
    to deal with the case where a longer destination file already existed.
    We tracked the highest contiguous block transferred to deal with this
    case, but our naive tracking doesn't deal with servers that reorder
    requests - a misfeature strictly permitted by the protocol but seldom
    implemented.
    
    Adjust the logic to ftruncate() at the highest absolute block received
    when the transfer is successful. feedback deraadt@ ok markus@
    
    prompted by https://github.com/openssh/openssh-portable/commit/9b733#commitcomment-110679778
    
    OpenBSD-Commit-ID: 4af7fac75958ad8507b4fea58706f3ff0cfddb1b

commit c8eb3941758615c8284a48fff47872db926da63c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 26 01:36:03 2023 +0000

    upstream: Check for ProxyJump=none in CanonicalizeHostname logic.
    
    Previously ssh would incorrectly refuse to canonicalise the hostname
    if ProxyJump was explicitly set to "none" when CanonicalizeHostname=yes
    
    bz3567; ok dtucker
    
    OpenBSD-Commit-ID: 80a58e43c3a32f97361282f756ec8d3f37989efd

commit ac383f3a5c6f529a2e8a5bc44af79a08c7da294e
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Apr 12 14:22:04 2023 +0000

    upstream: remove duplicate signal.h include
    
    OpenBSD-Commit-ID: 30c0a34d74d91ddd0e6992525da70d3293392f70

commit 740dafa20f3f3d325f6f5d44e990b8c8a6d3d816
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Apr 12 08:53:54 2023 +0000

    upstream: fix double words ok dtucker@
    
    OpenBSD-Commit-ID: 44d3223902fbce5276422bdc8063ab72a4078489

commit ca574dbcb48b1e52d47390f5be03481421b05ed8
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 11 14:53:36 2023 -0400

    I had failed to reinsert some code to handle oRekeyLimit that I had taken out
    for testing purposes. This was causing the rekey regression test to fail.

commit 5a3b9631c78467bac12580defa76b08a5cdcd83a
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 11 13:54:11 2023 -0400

    Memory usage is way down. 1) I stopped over committing memory in sshbuf_allocate and
    2) I changed PACKET_MAX_SIZE from a define at 256KB to a variable that is 256KB pre-auth
    (to handle large banners) to SSH_IOBUFSZ + 1KB post auth.
    My concerns about the aes-ctr-mt cipher being slow were not founded. I was testing the
    wrong version.

commit 5d93a1fb8fc3e2b6adb19e86ba7a61723896e9e6
Merge: 865d67bac aa5383c10
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 11 10:38:07 2023 -0400

    Merge branch 'buffer-fix' into pre-stage
    
    Last round of fixes to handle excessive memory usage.

commit aa5383c10b8edff4e0415561e373d421db0be183
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 11 10:37:04 2023 -0400

    I think this takes care of the memory issues. However,
    it looks like there might be something going on with the
    aes-ctr-mt cipher. It seems to be slower than the default
    cipher. I need to verify that.

commit 6452f89577ec4f22440c31b8e19b061d1a7c4b2a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 11 16:49:19 2023 +1000

    Test against LibreSSL 3.7.2.

commit b9bfb5dcaded58a9b0b8d2a3dc3bbc3f8278b885
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Apr 10 14:50:12 2023 -0400

    Still trying to figure out how to maintain a minimal memory profile
    while maintaining performance. When the memory is huge (by setting
    rlen to a huge size in sshbuf_allocate) we get higher perfomance but
    the memory usage is stupid.
    
    This commit also change the rekey frequency for CC20. That was taken
    from a post made by Damien Miller

commit 865d67bac7eb79a42df5a3ce4cf7c2180e111595
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Apr 7 13:43:25 2023 -0400

    /* OpenSSH usings 256KB packet size max but that consumes a
     * lot of memory with the buffers we are using. However, we need
     * a large packet size if the banner that's being sent is large.
     * So we need a 256KB packet pre authentication and a smaller one
     * in this case SSH_IOBUFSZ + 1KB, afterwards. So we change
     * PACKET_MAX_SIZE from a #define to a global. Then, in the function
     * ssh_packet_set_authentcated we reduce the size to something
     * more memory efficient. -cjr 04/07/23
     */

commit 20da8e994210d1816daf134f4deaf9b8b2d0b8eb
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 6 17:55:44 2023 -0400

    banner size 100,000 test is failing. Removing it for now to see
    if it fails other tests. Will address this. Might be related to change in packet_size_max

commit d1ccfb0a4c6929a1c83d0e2f2748bdad38625791
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 6 17:35:08 2023 -0400

    It turns out that I had serious memory issues that were consuming at least 500MB on each side.
    Basically, it was how I was forcing things to grown to the maximum allocation size in
    sshbuf_allocate. Additionally, PACKET_MAX_SIZE was putting more pressure on things when it was
    at the default of 256KB. I reduced it to SSH_IOBUFSZ + 1K (so 33KB) and it seems to be a lot
    more responsive and a lot less memory hungry.
    
    Lastly, I added two new thingt o aid with debugging. The first is the ability to label the sshbuf structs
    that are being created. This is just a freeform text label that defaults to the function name of
    the function that called sshbuf_new. Second is a routine called read_mem_stats that gets the
    current memory usage of the application. This only works under linux though as it requires access
    to proc.

commit b1f600237b8509db65544508fde248d2c5227c5b
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 6 17:25:45 2023 -0400

    missed a couple of debugs

commit 7ce51dbc6c8b49923b5bfc7773dc09bb9c8ea2f1
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 6 17:23:54 2023 -0400

    checkpoint  - extra debugs and such removed

commit ed25051f737b56e66aee2008b8e2a66c263eba4a
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 6 17:05:37 2023 -0400

    checkpoint - starting to remove debugs and tests 2

commit 01007a674b7d4ccf0005375d12e89c2f0819a6cd
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 6 17:03:34 2023 -0400

    checkpoint - starting to remove debugs and tests

commit f21f04db01e4e51d7b3c013d887d0d6ae5a81016
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 6 16:30:25 2023 -0400

    checkpoint

commit 69cba3e3d897e04f0bdb5c9eb03a3cdf5028c182
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Apr 6 13:01:17 2023 -0400

    checkpoint - reduced the stack size of the threads. Some minor benefit

commit 2138f6be595ca106fe4805a1e3ab9c4d8acc697b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 6 14:33:10 2023 +1000

    remove unused upper-case const strings in fmtfp
    
    no float format that uses upper-case is supported nor are hex floats.
    ok dtucker

commit 484c5e6168fdb22cbcd73c4ff987cf9ca47989ca
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 6 03:56:02 2023 +0000

    upstream: simplify sshsig_find_principals() similar to what happened to
    
    sshsig_check_allowed_keys() in r1.31, removing some dead code
    
    OpenBSD-Commit-ID: a493e628d4d6c08f878c276d998f4313ba61702d

commit 3a7b110fbc7e096423f8f7b459deffe4c65d70f4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 6 03:21:31 2023 +0000

    upstream: remove redundant ssh!=NULL check; we'd already
    
    dereferenced it
    
    OpenBSD-Commit-ID: 852bf12591ec5a9fb12dcbde9b1fd3945ad0df3c

commit 2519110659a1efac6c976895a86659d1b341c91b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 6 03:19:32 2023 +0000

    upstream: match_user() shouldn't be called with user==NULL unless
    
    host and ipaddr are also NULL
    
    OpenBSD-Commit-ID: fa3518346c21483e9e01a2e4b9436ae501daf8ea

commit 3b9ceaad7ad63c1c03c2a89e148340ad3a62a482
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 6 03:12:32 2023 +0000

    upstream: don't care about glob() return value here.
    
    OpenBSD-Commit-ID: 85bb82fea90478a482e9f65a1bec0aa24227fd66

commit 272772d1965f47d6c6a69eaa31078729fd6f7e99
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Apr 5 15:23:28 2023 -0400

    checkpoint

commit 6869dfbb61e71bf3cc0d1124b368e0f9e73444d2
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 4 17:40:08 2023 -0400

    checkpoint trying to find source of memory in aes cipher init

commit 2b25bf96fc7bcb0470218ca300381076f58abf25
Author: Chris Rapier <rapier@psc.edu>
Date:   Tue Apr 4 12:50:02 2023 -0400

    The memory epxlosion is happening in all versions of the
    threaded aes-ctr cipher. So it's not a provider issue which is good. I might be over allocating
    one of the structs. This seems like the most likely thing. I'm going to check to
    see if this memory issue happens in older versions next.

commit a5c4dfd1f152948fb011a00b34d64371762a2ea9
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Apr 3 16:18:56 2023 -0400

    testing if I need both ssh_packet_set_authenticated and

commit ef310e644982858136968ba61166f2e9182b32fe
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Apr 3 16:18:03 2023 -0400

    commit

commit 7e24679c57c59b64a13468991b93647b15306d74
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Apr 3 16:17:16 2023 -0400

    do the same for the server side

commit 5909af195ed3d6942688020417c09b498c5b16b6
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Apr 3 16:11:40 2023 -0400

    a prior change wasn't allowing aes_ctr_mt to rekey directly
    after authentication. This should fix it

commit 09d8da0849e2791b2500267cda333cd238f38754
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Apr 3 08:10:54 2023 +0000

    upstream: Move up null check and simplify process_escapes.
    
    Based on Coverity CID 291863 which points out we check the channel
    pointer for NULLness after dereferencing it.  Move this to the start
    of the function, and while there simplify initialization of efc a bit.
    ok djm@
    
    OpenBSD-Commit-ID: de36e5ad6fde0fe263ca134e986b9095dc59380a

commit b36b162be5e6206f12b734222b7bc517c13a6bc8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 14:51:20 2023 +1100

    need va_end() after va_copy(); ok dtucker
    
    spotted by Coverity

commit 9d16b1c9e4941b156e99e1df2b4ec0f368ee52dd
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Mar 31 11:27:17 2023 -0400

    checkpoint reduce PMS to 36K as a test

commit f703757234a5c585553e72bba279b255a272750a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 31 05:56:36 2023 +0000

    upstream: Explicitly ignore return from waitpid here too.
    
    OpenBSD-Commit-ID: eef2403df083c61028969fc679ee370373eacacb

commit 6b73aa29035991d1448a1a76f63ac152a6bf931c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 31 04:45:08 2023 +0000

    upstream: Explictly ignore return codes
    
    where we don't check them.
    
    OpenBSD-Commit-ID: 1ffb03038ba1b6b72667be50cf5e5e396b5f2740

commit 6f0308a3e717ebe68eeb3f95253612fab5dbf20e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 31 04:42:29 2023 +0000

    upstream: Return immediately from get_sock_port
    
    if sock <0 so we don't call getsockname on a negative FD.  From Coverity
    CID 291840, ok djm@
    
    OpenBSD-Commit-ID: de1c1130646230c2eda559831fc6bfd1b61d9618

commit 1c1124dc901fca1ea2cb762044b8f1a5793a2bed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 31 04:23:02 2023 +0000

    upstream: don't leak arg2 on parse_pubkey_algos error path; ok
    
    dtucker@
    
    OpenBSD-Commit-ID: 7d0270ad3dd102412ca76add2b3760518abdef75

commit 8ba2d4764bb6a4701cd447d8b52604622ffe65f4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 31 04:22:27 2023 +0000

    upstream: clamp max number of GSSAPI mechanisms to 2048; ok dtucker
    
    OpenBSD-Commit-ID: ce66db603a913d3dd57063e330cb5494d70722c4

commit 1883841fc13d0eada8743cac5d3abe142ee2efa7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 31 04:21:56 2023 +0000

    upstream: don't print key if printing hostname failed; with/ok
    
    dtucker@
    
    OpenBSD-Commit-ID: ad42971a6ee5a46feab2d79f7f656f8cf4b119f3

commit c6011129cafe4c411f6ef670a4cf271314708eb8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 31 04:04:15 2023 +0000

    upstream: remove redundant test
    
    OpenBSD-Commit-ID: 6a0b719f9b1ae9d42ad8c5b144c7962c93792f7c

commit 4fb29eeafb40a2076c0dbe54e46b687c318f87aa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 31 04:00:37 2023 +0000

    upstream: don't attempt to decode a ridiculous number of
    
    attributes; harmless because of bounds elsewhere, but better to be explicit
    
    OpenBSD-Commit-ID: 1a34f4b6896155b80327d15dc7ccf294b538a9f2

commit fc437c154ef724621a4af236de9bc7e51a8381ae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 31 03:22:49 2023 +0000

    upstream: remove unused variable; prompted by Coverity CID 291879
    
    OpenBSD-Commit-ID: 4c7d20ef776887b0ba1aabcfc1b14690e4ad0a40

commit 0eb8131e4a53b33a8fc9b9ab694e6b6778b87ade
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 31 00:44:29 2023 +0000

    upstream: Check fd against >=0 instead of >0 in error path. The
    
    dup could in theory return fd 0 although currently it doesn't in practice.
    From Dmitry Belyavskiy vi github PR#238.
    
    OpenBSD-Commit-ID: 4a95f3f7330394dffee5c749d52713cbf3b54846

commit 7174ba6f8a431ca4257767a260fc50e204068242
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 30 07:19:50 2023 +0000

    upstream: Ignore return value from muxclient(). It normally loops
    
    without returning, but it if returns on failure we immediately exit.
    Coverity CID 405050.
    
    OpenBSD-Commit-ID: ab3fde6da384ea588226037c38635a6b2e015295

commit a4c1c2513e36f111eeaa1322c510067930e5e51e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 14:17:22 2023 +1100

    don't call connect() on negative socket
    
    Coverity CID 405037

commit 85b54e8eb3efbc3aa291c86267d789963747829b
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 30 16:53:14 2023 -0400

    checkpoint trying to increase PACKET_MAX_SIZE again

commit d73848700d6e4d98d5c0396ce1ea34a01fb94ef8
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 30 16:38:10 2023 -0400

    checkpoint - testing something

commit 3911857c94981775de36cb53430bb703f8765485
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 30 16:02:22 2023 -0400

    checkpoint - remove excess debugs

commit 08ff1b2e70b0f639bc213bff8116478eb5c1bb91
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 30 08:56:14 2023 -0400

    checkpoint reduce packet max size

commit 34ee842cdd981a759fe8f0d4a37521f9a1c63170
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 30 03:05:01 2023 +0000

    upstream: return SSH_ERR_KEY_NOT_FOUND if the allowed_signers file
    
    is empty, not SSH_ERR_INTERNAL_ERROR. Also remove some dead code spotted
    by Coverity; with/ok dtucker@
    
    OpenBSD-Commit-ID: 898a1e817cda9869554b1f586a434f67bcc3b650

commit f108e77a9dc9852e72215af1bf27731c48434557
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 30 00:49:37 2023 +0000

    upstream: Remove dead code from inside if block.
    
    The only way the if statement can be true is if both dup()s fail, and
    in that case the tmp2 can never be set. Coverity CID 291805, ok djm@
    
    OpenBSD-Commit-ID: c0d6089b3fb725015462040cd94e23237449f0c8

commit 05b8e88ebe23db690abbfb1a91111abea09cde08
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 30 13:53:29 2023 +1100

    child_set_eng: verify both env pointer and count.
    
    If child_set env was called with a NULL env pointer and a non-zero count
    it would end up in a null deref, although we don't currently do this.
    Prompted by Coverity CID 291850, tweak & ok djm@

commit 28f1b8ef9b84b8cd2f6c9889a0c60aa4a90dadfa
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 29 01:07:48 2023 +0000

    upstream: Ignore return from sshpkt_disconnect
    
    since we set our own return value for the function.  Coverity CID 291797,
    ok djm@
    
    OpenBSD-Commit-ID: 710b57ba954c139240895e23feea41f203201f04

commit c3da05d95922f5550bcc7815e799474d6a160175
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 29 00:59:08 2023 +0000

    upstream: Plug potential mem leak in process_put.
    
    It allocates abs_dst inside a loop but only frees it on exit, so free
    inside the loop if necessary.  Coverity CID 291837, ok djm@
    
    OpenBSD-Commit-ID: a01616503a185519b16f00dde25d34ceaf4ae1a3

commit 13ae327eae598b1043e5ec30e4b170edb3c898a5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 29 00:18:35 2023 +0000

    upstream: fix memory leak; Coverity CID 291848
    
    with/ok dtucker@
    
    OpenBSD-Commit-ID: 37f80cb5d075ead5a00ad1b74175684ab1156ff8

commit 9ffa76e1284c85bf459c3dcb8e995733a8967e1b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 28 07:44:32 2023 +0000

    upstream: Plug more mem leaks in sftp by making
    
    make_absolute_pwd_glob work in the same way as make_absolute: you
    pass it a dynamically allocated string and it either returns it, or
    frees it and allocates a new one. Patch from emaste at freebsd.org and
    https://reviews.freebsd.org/D37253 ok djm@
    
    OpenBSD-Commit-ID: 85f7404e9d47fd28b222fbc412678f3361d2dffc

commit 82b2b8326962b1a98af279bc5bbbbbcab15b3e45
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 28 06:12:38 2023 +0000

    upstream: Remove compat code for OpenSSL < 1.1.*
    
    since -portable no longer supports them.
    
    OpenBSD-Commit-ID: ea2893783331947cd29a67612b4e56f818f185ff

commit b500afcf00ae1b6b73b2ccf171111dfbfeaef74d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 27 23:56:54 2023 +0000

    upstream: Remove compat code for OpenSSL 1.0.*
    
    versions now that -portable has dropped support for those versions.
    
    OpenBSD-Regress-ID: 82a8eacd87aec28e4aa19f17246ddde9d5ce7fe7

commit 727560e6011efcb36d2f3ac6910444bc775abaa1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 28 18:06:42 2023 +1100

    Prevent conflicts between Solaris SHA2 and OpenSSL.
    
    We used to prevent conflicts between native SHA2 headers and OpenSSL's
    by setting OPENSSL_NO_SHA but that was removed prior to OpenSSL 1.1.0

commit 46db8e14b7f186d32173dcdecd5b785334429b8b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 28 12:44:03 2023 +1100

    Remove HEADER_SHA_H from previous...
    
    since it causes more problems than it solves.

commit 72bd68d37387aa5f81da928f6e82f1c88ed8f674
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 28 10:35:18 2023 +1100

    Replace OPENSSL_NO_SHA with HEADER_SHA_H.
    
    Since this test doesn't use OpenSSL's SHA2 and may cause conflicts we
    don't want to include it, but OPENSSL_NO_SHA was removed beginning in
    OpenSSL's 1.1 series.

commit 99668f2e6e0deb833e46cfab56db59ff0fc28c7e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 28 09:50:06 2023 +1100

    Configure with --target instead of deprecated form.

commit fc22161b5cb49f2861af4e8055f97d5c0989e972
Author: Chris Rapier <rapier@psc.edu>
Date:   Mon Mar 27 16:09:29 2023 -0400

    imported the buffer label work from buffer-names

commit 31817f93fbb3fe27cb26779f688c6e519023c5e8
Author: Matthew Pounsett <matt@conundrum.com>
Date:   Mon Mar 27 10:45:40 2023 -0400

    Reorder user creation and install steps in install instructions, fixes #42

commit f751d9306c62cd1061f966e6a7483d9bab9c379b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 27 22:05:29 2023 +1100

    Pass rpath when building 64bit Solaris.

commit a64b935cd450ee8d04c26c9cd728629cf9ca5c91
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 27 19:21:19 2023 +1100

    Explicitly disable OpenSSL on AIX test VM.

commit 7ebc6f060fc2f70495a56e16d210baae6424cd96
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 27 03:56:50 2023 +0000

    upstream: Add RevokedHostKeys to percent expansion test.
    
    OpenBSD-Regress-ID: c077fd12a38005dd53d878c5b944154dec88d2ff

commit f1a17de150f8d309d0c52f9abfaebf11c51a8537
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 27 03:56:11 2023 +0000

    upstream: Add tilde and environment variable expansion to
    
    RevokedHostKeys. bz#3552, ok djm@
    
    OpenBSD-Commit-ID: ce5d8e0219b63cded594c17d4c2958c06918ec0d

commit 009eb4cb48a9708ab9174684dcbcc0f942907abe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 27 03:31:05 2023 +0000

    upstream: fix test: getnameinfo returns a non-zero value on error, not
    
    (neccessarily) -1. From GHPR#384
    
    OpenBSD-Commit-ID: d35e2b71268f66f5543a7ea68751972b3ae22b25

commit 4f0a676486700f10a4788f7e9426e94e39c1c89e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 27 03:25:08 2023 +0000

    upstream: scp: when copying local->remote, check that source file
    
    exists before opening SFTP connection to the server. Based on GHPR#370 ok
    dtucker, markus
    
    OpenBSD-Commit-ID: b4dd68e15bfe22ce4fac9960a1066a2b721e54fb

commit 154d8baf631327163571760c2c524bc93c37567c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 27 12:22:30 2023 +1100

    Also look for gdb error message from OpenIndiana.

commit fbd3811ddb2b6ce2e6dba91fde7352c8978e5412
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 27 11:08:00 2023 +1100

    Explicitly disable security key test on aix51 VM.
    
    We don't know how to build the shared objects required for the security
    key tests so skip them.

commit 4922ac3be8a996780ef3dc220411da2e27c29d9c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Mar 26 14:49:43 2023 +1100

    Split libcrypto and other config flags.
    
    This should allow the automatic OpenSSL version selection in the tests
    to work better.

commit 4a948b1469f185e871160a2d70e2a0fce2858f9e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Mar 26 14:39:45 2023 +1100

    Specify test target if we build without OpenSSL.
    
    When we decide we can't use the versions of OpenSSL available, also
    restrict the tests we run to avoid the ones that need OpenSSL.

commit b308c636f5b5d89eecb98be00b3d56306a005a09
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Mar 26 14:22:53 2023 +1100

    Find suitable OpenSSL version.
    
    Check the installed OpenSSL versions for a suitable one, and if there
    isn't (and we don't have a specific version configured) then build
    without OpenSSL.

commit 021ea5c2860f133f44790970968e0e73208b3a87
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 24 15:02:52 2023 +1100

    Github testing support for BoringSSL

commit 9a97cd106466a2a9bda2bfaa4c48c4f1b2cc9c1b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 24 15:34:29 2023 +1100

    BoringSSL doesn't support EC_POINT_point2bn()
    
    so don't invoke it in unittest

commit cc5969c033a032d126ff78e5d95cf20abbede4c7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 24 15:34:05 2023 +1100

    another ERR_load_CRYPTO_strings() vestige

commit 4974293899a068133e976f81d6693670d2b576ca
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 24 15:24:05 2023 +1100

    don't use obsolete ERR_load_CRYPTO_strings()
    
    OpenSSL (and elsewhere in OpenSSH) uses ERR_load_crypto_strings()

commit 3c527d55f906e6970d17c4cab6db90ae9e013235
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 24 15:23:05 2023 +1100

    Allow building with BoringSSL

commit b7e27cfd7f163fc16b4c5d041cc28ee488a5eeec
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 24 15:21:18 2023 +1100

    put back SSLeay_version compat in configure test
    
    Needed to detect old versions and give good "your version is bad"
    messages at configure time; spotted by dtucker@

commit 7280401bdd77ca54be6867a154cc01e0d72612e0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 24 13:56:25 2023 +1100

    remove support for old libcrypto
    
    OpenSSH now requires LibreSSL 3.1.0 or greater or
    OpenSSL 1.1.1 or greater
    
    with/ok dtucker@

commit 9349d8244d62803f91295cd3aff5424b466c2a3e
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 17:28:44 2023 -0400

    checkpoint - that change redudes throughput on paths with delay

commit ab0f7d94b7a17da30bdf5de5450a9fe96d95ccb5
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 17:25:51 2023 -0400

    checkpoint - change SSHBUF_SIZE_MAX again to 16MB this time down from a max of 256MB

commit 26839e65ee108a2fb809df14e9fef1c69cd3678c
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 17:23:40 2023 -0400

    checkpoint - change SSHBUF_SIZE_MAX again

commit 6e8c76d453c153f8efeb6f0831f3ad8a02f8052f
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 17:20:32 2023 -0400

    checkpoint - change SSHBUF_SIZE_MAX

commit 0f4fc94d47c6ebe1164876d84ebc2b1d017cc751
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 17:10:48 2023 -0400

    checkpoint

commit 57b080aa67b924142d5c6070fa90e7a0d0e9e09c
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 17:03:58 2023 -0400

    checkpoint

commit 23c5960add584871f8d31923db80f42a7863621f
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 16:12:49 2023 -0400

    checkpoint

commit eab20ce632a7e0fc7b67aaee520bc424e4076d33
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 16:10:24 2023 -0400

    checkpoint

commit 1fd7fe4ea0bf47362e6d351151932769cbaee96e
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 15:47:29 2023 -0400

    checkpoint

commit 26139e2ba80cf3efcd6b9720232bc1ea27fb915e
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 15:04:00 2023 -0400

    checkpoint

commit cb3069370c6d1d6a3066da515a1e8d4816d4b256
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 15:02:41 2023 -0400

    checkpoint

commit db7ac79bc61815dab0f0c8b8aac6bf007a568ff9
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 23 14:43:23 2023 -0400

    Trying to reduce memory footprint.

commit abda22fb48302f2142233f71d27c74040288c518
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Mar 19 15:36:13 2023 +1100

    Test latest OpenSSL 1.1, 3.0 and LibreSSL 3.7.

commit 992e8ee31769a904c042a68884a0f13ee52a377a
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Mar 17 09:58:32 2023 -0400

    crank version number. hpn17v12

commit 1df6f1684c40cd98fe52d956b756bc700ba2d5f7
Author: Chris Rapier <rapier@psc.edu>
Date:   Fri Mar 17 09:32:41 2023 -0400

    LibreSSL, as of version 3.7.1, now supports the EVP_CIPHER_meth_* functions so
    we can go back to supporting it. These functions are necessary to support the
    aes-ctr-mt functions.

commit 40712a4678df25da917eb478d8940afafa3eb946
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 16 15:39:01 2023 -0400

    Removed the CI tests that depend on selfhosted runners. We don't have those.

commit f8ddc5380b1f128c2dd1092a0b95c9b0f4937c65
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 16 15:15:58 2023 -0400

    Fixed an issue with the progressmeter.

commit b80bd7d31ecd61a17e4f2e2e57c647c12ec07e2a
Merge: d4200c475 cb30fbdbe
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 16 14:43:05 2023 -0400

    This is the merge against the released version of OpenSSH 9.3

commit d4200c475417de2849e53e7d7990103c4f1519ed
Author: Chris Rapier <rapier@psc.edu>
Date:   Thu Mar 16 11:36:43 2023 -0400

    Changed the cifuzz test to only run
    for the master and pre-stage branches

commit 610ac1cb077cd5a1ebfc21612154bfa13d2ec825
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 16 21:38:04 2023 +1100

    Show 9.3 branch instead of 9.2.

commit cb30fbdbee869f1ce11f06aa97e1cb8717a0b645
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 08:28:19 2023 +1100

    depend

commit 1dba63eb10c40b6fda9f5012ed6ae87e2d3d028e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 08:27:54 2023 +1100

    crank version

commit ba7532d0dac9aaf0ad7270664c43837fc9f64a5f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 15 21:19:57 2023 +0000

    upstream: openssh-9.3
    
    OpenBSD-Commit-ID: 8011495f2449c1029bb316bd015eab2e00509848

commit 7dac438bc32ed2364fa7270cf2f8ed4a6cf3f95d
Author: Chris Rapier <rapier@psc.edu>
Date:   Wed Mar 15 17:00:27 2023 -0400

    First pass at porting hpnssh to the alpha release of 9.3

commit 6fd4daafb949b66bf555f3100f715a9ec64c3390
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 14 07:28:47 2023 +0000

    upstream: Free KRL ptr in addition to its contents.
    
    From Coverity CID 291841, ok djm@
    
    OpenBSD-Commit-ID: f146ba08b1b43af4e0d7ad8c4dae3748b4fa31b6

commit 1d270bd303afaf6d94e9098cbbf18e5e539e2088
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 14 07:26:25 2023 +0000

    upstream: Check pointer for NULL before deref.
    
    None of the existing callers seem to do that, but it's worth checking.
    From Coverity CID 291834, ok djm@
    
    OpenBSD-Commit-ID: a0a97113f192a7cb1a2c97b932f677f573cda7a4

commit d95af508e78c0cd3dce56b83853baaa59ae295cf
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Mar 12 10:40:39 2023 +0000

    upstream: Limit number of entries in SSH2_MSG_EXT_INFO
    
    request. This is already constrained by the maximum SSH packet size but this
    makes it explicit.  Prompted by Coverity CID 291868, ok djm@ markus@
    
    OpenBSD-Commit-ID: aea023819aa44a2dcb9dd0fbec10561896fc3a09

commit 8f287ba60d342b3e2f750e7332d2131e3ec7ecd0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Mar 12 09:41:18 2023 +0000

    upstream: calloc can return NULL but xcalloc can't.
    
    From Coverity CID 291881, ok djm@
    
    OpenBSD-Commit-ID: 50204b755f66b2ec7ac3cfe379d07d85ca161d2b

commit 83a56a49fd50f4acf900f934279482e4ef329715
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 07:17:08 2023 +0000

    upstream: Explicitly ignore return from fcntl
    
    (... FD_CLOEXEC) here too.  Coverity CID 291853.
    
    OpenBSD-Commit-ID: 99d8b3da9d0be1d07ca8dd8e98800a890349e9b5

commit 0fda9d704d3bbf54a5e64ce02a6fecb11fe7f047
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 10 15:59:46 2023 +1100

    bounds checking for getrrsetbyname() replacement;
    
    Spotted by Coverity in CID 405033; ok millert@

commit 89b8df518f21677045599df0ad3e5dd0f39909b5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 04:06:21 2023 +0000

    upstream: Plug mem leak on error path. Coverity CID 405026, ok djm@.
    
    OpenBSD-Commit-ID: 8212ca05d01966fb5e72205c592b2257708a2aac

commit bf4dae0ad192c3e2f03f7223834b00d88ace3d3e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 10 14:46:57 2023 +1100

    Add prototypes for mkstemp replacements.
    
    Should prevent warnings due to our wrapper function.

commit 4e04d68d6a33cdc73b831fd4b5e6124175555d3d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 03:01:51 2023 +0000

    upstream: Expliticly ignore return code from fcntl(.. FD_CLOEXEC) since
    
    there's not much we can do anyway.  From Coverity CID 291857, ok djm@
    
    OpenBSD-Commit-ID: 051429dd07af8db3fec10d82cdc78d90bb051729

commit d6d38fd77cbe091c59e1bb720c3a494df4990640
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 02:32:04 2023 +0000

    upstream: Like sshd_config, some ssh_config options are not
    
    first-match-wins. sshd_config.5 was fixed in r1.348, this is the same for
    this file
    
    OpenBSD-Commit-ID: 7be55b9351cde449b136afcc52d07aa4113b215e

commit 7187d3f86bf8f2066cc9941f217d23b0cacae25e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 02:24:56 2023 +0000

    upstream: Remove no-op (int) > INT_MAX checks
    
    since they can never be true. From Coverity CID 405031, ok djm@
    
    OpenBSD-Commit-ID: 9df3783b181e056595e2bb9edf7ed41d61cf8e84

commit 77adde4305542ebe3005dd456122624fe2347b01
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 10 13:27:29 2023 +1100

    Wrap mkstemp calls with umask set/restore.
    
    glibc versions 2.06 and earlier did not set a umask on files created by
    mkstemp created the world-writable.  Wrap mkstemp to set and restore
    the umask.  From Coverity (CIDs 291826 291886 291891), ok djm@

commit 633d3dc2a1e9e2a013d019a0576a0771c8423713
Author: jcs@openbsd.org <jcs@openbsd.org>
Date:   Thu Mar 9 21:06:24 2023 +0000

    upstream: modify parentheses in conditionals to make it clearer what is
    
    being assigned and what is being checked
    
    ok djm dtucker
    
    OpenBSD-Commit-ID: 19c10baa46ae559474409f75a5cb3d0eade7a9b8

commit 733030840c4772f858de95d5940ec0c37663e8b0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 9 07:11:05 2023 +0000

    upstream: Re-split the merge of the reorder-hostkeys test.
    
    In the kex_proposal_populate_entries change I merged the the check for
    reordering hostkeys with the actual reordering, but kex_assemble_names
    mutates options.hostkeyalgorithms which renders the check ineffective.
    Put the check back where it was.  Spotted and tested by jsg@, ok djm@
    
    OpenBSD-Commit-ID: a7469f25a738db5567395d1881e32479a7ffc9de

commit 54ac4ab2b53ce9fcb66b8250dee91c070e4167ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 9 06:58:26 2023 +0000

    upstream: include destination constraints for smartcard keys too.
    
    Spotted by Luci Stanescu; ok deraadt@ markus@
    
    OpenBSD-Commit-ID: add879fac6903a1cb1d1e42c4309e5359c3d870f

commit bfd1ad01d974a316b60622759ad17537fa2d92b4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 9 18:24:54 2023 +1100

    Limit the number of PAM environment variables.
    
    xcalloc has its own limits, but these are specific to PAM.  From
    Coverity CID 405198, ok djm@

commit a231414970e01a35f45a295d5f93698fa1249b28
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 9 18:19:44 2023 +1100

    Limit the number of PAM environment variables.
    
    From Coverity CID 405194, tweaks and ok djm@

commit 36c6c3eff5e4a669ff414b9daf85f919666e8e03
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 8 06:21:32 2023 +0000

    upstream: Plug mem leak. Coverity CID 405196, ok djm@
    
    OpenBSD-Commit-ID: 175f09349387c292f626da68f65f334faaa085f2

commit dfb9b736e1ccf9e6b03eea21cd961f4fd0634c98
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Wed Mar 8 05:33:53 2023 +0000

    upstream: ssh-pkcs11: synchronize error messages with errors
    
    A handful of error messages contained incorrect function names or
    otherwise inaccurate descriptions. Fix them to match reality.
    
    input/ok djm
    
    OpenBSD-Commit-ID: 165a15db52f75b31e1804b043480c36af09f3411
=======
>>>>>>> V_10_2_P1